Skip to content

fix(web): use the drawer close fallback for right-panel terminals #8421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Adolanium wants to merge 2 commits into
base: main
Choose a base branch
from
+12 −21
Open

fix(web): use the drawer close fallback for right-panel terminals #8421

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f822709
fix(web): use the drawer close fallback for right-panel terminals
Adolanium Aug 27, 2026
11293b8
fix(web): do not steal composer focus when closing panel tabs
Adolanium Aug 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 12 additions & 21 deletions apps/web/src/components/ChatView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3115,7 +3115,7 @@ function ChatViewContent(props: ChatViewProps) {
gitCwd,
storeNewTerminal,
]);
const closeTerminal = useCallback(
const closeTerminalSession = useCallback(
(terminalId: string) => {
if (!activeThreadId || !activeThreadRef) return;
const fallbackExitWrite = () =>
Expand All @@ -3137,7 +3137,6 @@ function ChatViewContent(props: ChatViewProps) {
}
})();
storeCloseTerminal(activeThreadRef, terminalId);
setTerminalFocusRequestId((value) => value + 1);
},
[
activeThreadId,
Expand All @@ -3148,6 +3147,13 @@ function ChatViewContent(props: ChatViewProps) {
writeTerminal,
],
);
const closeTerminal = useCallback(
(terminalId: string) => {
closeTerminalSession(terminalId);
setTerminalFocusRequestId((value) => value + 1);
},
[closeTerminalSession],
);
const runProjectScript = useCallback(
async (
script: ProjectScript,
Expand Down Expand Up @@ -3623,17 +3629,12 @@ function ChatViewContent(props: ChatViewProps) {
const closePanelTerminal = useCallback(
(terminalId: string) => {
if (!activeThreadRef || activeRightPanelSurface?.kind !== "terminal") return;
void closeTerminalMutation({
environmentId: activeThreadRef.environmentId,
input: { threadId: activeThreadRef.threadId, terminalId, deleteHistory: true },
});
storeCloseTerminal(activeThreadRef, terminalId);
closeTerminal(terminalId);
useRightPanelStore
.getState()
.closeTerminal(activeThreadRef, activeRightPanelSurface.id, terminalId);
setTerminalFocusRequestId((value) => value + 1);
},
[activeRightPanelSurface, activeThreadRef, closeTerminalMutation, storeCloseTerminal],
[activeRightPanelSurface, activeThreadRef, closeTerminal],
);
const requestCloseTerminal = useCallback(
(terminalId: string) => {
Expand Down Expand Up @@ -3697,22 +3698,12 @@ function ChatViewContent(props: ChatViewProps) {
}
if (surface.kind === "terminal") {
for (const terminalId of surface.terminalIds) {
storeCloseTerminal(activeThreadRef, terminalId);
void closeTerminalMutation({
environmentId: activeThreadRef.environmentId,
input: { threadId: activeThreadRef.threadId, terminalId, deleteHistory: true },
});
closeTerminalSession(terminalId);
}
}
}
},
[
activeThreadRef,
activePreviewState.sessions,
closePreview,
closeTerminalMutation,
storeCloseTerminal,
],
[activeThreadRef, activePreviewState.sessions, closePreview, closeTerminalSession],
);
const syncActivePreviewSurface = useCallback(() => {
if (!activeThreadRef) return;
Expand Down
Loading