Add shortcuts for terminal close and chat with same Git state

KEYBINDINGS.md

@@ -22,7 +22,10 @@ See the full schema for more details: [`packages/contracts/src/keybindings.ts`](
   { "key": "mod+j", "command": "terminal.toggle" },
   { "key": "mod+d", "command": "terminal.split", "when": "terminalFocus" },
   { "key": "mod+n", "command": "terminal.new", "when": "terminalFocus" },
-  { "key": "mod+shift+o", "command": "chat.new" },
+  { "key": "mod+w", "command": "terminal.close", "when": "terminalFocus" },
+  { "key": "mod+n", "command": "chat.new", "when": "!terminalFocus" },
+  { "key": "mod+shift+o", "command": "chat.new", "when": "!terminalFocus" },
+  { "key": "mod+shift+n", "command": "chat.newLocal", "when": "!terminalFocus" },
   { "key": "mod+o", "command": "editor.openFavorite" }
 ]
 ```
@@ -46,7 +49,9 @@ Invalid rules are ignored. Invalid config files are ignored. Warnings are logged
 - `terminal.toggle`: open/close terminal drawer
 - `terminal.split`: split terminal (in focused terminal context by default)
 - `terminal.new`: create new terminal (in focused terminal context by default)
-- `chat.new`: create a new chat thread for the active project
+- `terminal.close`: close/kill the focused terminal (in focused terminal context by default)
+- `chat.new`: create a new chat thread preserving the active thread's branch/worktree state
+- `chat.newLocal`: create a new local chat thread for the active project (no worktree context)
 - `editor.openFavorite`: open current project/worktree in the last-used editor
 
 ### Key Syntax

apps/server/src/keybindings.ts

@@ -28,7 +28,10 @@ export const DEFAULT_KEYBINDINGS: ReadonlyArray<KeybindingRule> = [
   { key: "mod+j", command: "terminal.toggle" },
   { key: "mod+d", command: "terminal.split", when: "terminalFocus" },
   { key: "mod+n", command: "terminal.new", when: "terminalFocus" },
-  { key: "mod+shift+o", command: "chat.new" },
+  { key: "mod+w", command: "terminal.close", when: "terminalFocus" },
+  { key: "mod+n", command: "chat.new", when: "!terminalFocus" },
+  { key: "mod+shift+o", command: "chat.new", when: "!terminalFocus" },
+  { key: "mod+shift+n", command: "chat.newLocal", when: "!terminalFocus" },
   { key: "mod+o", command: "editor.openFavorite" },
 ];
 

apps/web/src/components/ChatView.tsx

@@ -52,6 +52,7 @@ import BranchToolbar from "./BranchToolbar";
 import GitActionsControl from "./GitActionsControl";
 import {
   isOpenFavoriteEditorShortcut,
+  isTerminalCloseShortcut,
   isTerminalNewShortcut,
   isTerminalSplitShortcut,
   isTerminalToggleShortcut,
@@ -278,6 +279,10 @@ export default function ChatView() {
     () => shortcutLabelForCommand(keybindings, "terminal.new"),
     [keybindings],
   );
+  const closeTerminalShortcutLabel = useMemo(
+    () => shortcutLabelForCommand(keybindings, "terminal.close"),
+    [keybindings],
+  );
 
   const envLocked = Boolean(
     activeThread &&
@@ -554,6 +559,14 @@ export default function ChatView() {
         return;
       }
 
+      if (isTerminalCloseShortcut(event, keybindings, { context: shortcutContext })) {
+        event.preventDefault();
+        event.stopPropagation();
+        if (!activeThread?.terminalOpen) return;
+        closeTerminal(activeThread.activeTerminalId);
+        return;
+      }
+
       if (!isTerminalNewShortcut(event, keybindings, { context: shortcutContext })) return;
       event.preventDefault();
       event.stopPropagation();
@@ -570,7 +583,9 @@ export default function ChatView() {
     return () => window.removeEventListener("keydown", handler);
   }, [
     activeThread?.terminalOpen,
+    activeThread?.activeTerminalId,
     activeThreadId,
+    closeTerminal,
     createNewTerminal,
     dispatch,
     splitTerminal,
@@ -1453,6 +1468,7 @@ export default function ChatView() {
           onNewTerminal={createNewTerminal}
           splitShortcutLabel={splitTerminalShortcutLabel ?? undefined}
           newShortcutLabel={newTerminalShortcutLabel ?? undefined}
+          closeShortcutLabel={closeTerminalShortcutLabel ?? undefined}
           onActiveTerminalChange={activateTerminal}
           onCloseTerminal={closeTerminal}
           onHeightChange={(height) =>

apps/web/src/components/Sidebar.tsx

@@ -7,7 +7,7 @@ import { useTheme } from "../hooks/useTheme";
 import { DEFAULT_MODEL } from "../model-logic";
 import { derivePendingApprovals } from "../session-logic";
 import { useStore } from "../store";
-import { isChatNewShortcut } from "../keybindings";
+import { isChatNewLocalShortcut, isChatNewShortcut } from "../keybindings";
 import {
   DEFAULT_THREAD_TERMINAL_HEIGHT,
   DEFAULT_THREAD_TERMINAL_ID,
@@ -140,7 +140,13 @@ export default function Sidebar() {
   }, [state.threads]);
 
   const handleNewThread = useCallback(
-    (projectId: string) => {
+    (
+      projectId: string,
+      options?: {
+        branch?: string | null;
+        worktreePath?: string | null;
+      },
+    ) => {
       dispatch({
         type: "ADD_THREAD",
         thread: {
@@ -166,8 +172,8 @@ export default function Sidebar() {
           events: [],
           error: null,
           createdAt: new Date().toISOString(),
-          branch: null,
-          worktreePath: null,
+          branch: options?.branch ?? null,
+          worktreePath: options?.worktreePath ?? null,
         },
       });
     },
@@ -381,14 +387,23 @@ export default function Sidebar() {
 
   useEffect(() => {
     const onWindowKeyDown = (event: KeyboardEvent) => {
-      if (!isChatNewShortcut(event, keybindings)) return;
-
       const activeThread = state.threads.find((t) => t.id === state.activeThreadId);
+      if (isChatNewLocalShortcut(event, keybindings)) {
+        const projectId = activeThread?.projectId ?? state.projects[0]?.id;
+        if (!projectId) return;
+        event.preventDefault();
+        handleNewThread(projectId);
+        return;
+      }
+
+      if (!isChatNewShortcut(event, keybindings)) return;
       const projectId = activeThread?.projectId ?? state.projects[0]?.id;
       if (!projectId) return;
-
       event.preventDefault();
-      handleNewThread(projectId);
+      handleNewThread(projectId, {
+        branch: activeThread?.branch ?? null,
+        worktreePath: activeThread?.worktreePath ?? null,
+      });
     };
 
     window.addEventListener("keydown", onWindowKeyDown);

apps/web/src/components/ThreadTerminalDrawer.tsx

@@ -1,5 +1,5 @@
 import { FitAddon } from "@xterm/addon-fit";
-import { Plus, SquareSplitHorizontal, TerminalSquare, Trash2 } from "lucide-react";
+import { Plus, SquareSplitHorizontal, TerminalSquare, Trash2, XIcon } from "lucide-react";
 import { type NativeApi } from "@t3tools/contracts";
 import { Terminal, type ITheme } from "@xterm/xterm";
 import {
@@ -18,10 +18,7 @@ import {
   preferredTerminalEditor,
   resolvePathLinkTarget,
 } from "../terminal-links";
-import {
-  isTerminalClearShortcut,
-  terminalNavigationShortcutData,
-} from "../keybindings";
+import { isTerminalClearShortcut, terminalNavigationShortcutData } from "../keybindings";
 import {
   DEFAULT_THREAD_TERMINAL_HEIGHT,
   DEFAULT_THREAD_TERMINAL_ID,
@@ -161,10 +158,7 @@ function TerminalViewport({
       try {
         await api.terminal.write({ threadId, terminalId, data });
       } catch (error) {
-        writeSystemMessage(
-          activeTerminal,
-          error instanceof Error ? error.message : fallbackError,
-        );
+        writeSystemMessage(activeTerminal, error instanceof Error ? error.message : fallbackError);
       }
     };
 
@@ -429,6 +423,7 @@ interface ThreadTerminalDrawerProps {
   onNewTerminal: () => void;
   splitShortcutLabel?: string | undefined;
   newShortcutLabel?: string | undefined;
+  closeShortcutLabel?: string | undefined;
   onActiveTerminalChange: (terminalId: string) => void;
   onCloseTerminal: (terminalId: string) => void;
   onHeightChange: (height: number) => void;
@@ -444,15 +439,9 @@ interface TerminalActionButtonProps {
 function TerminalActionButton({ label, className, onClick, children }: TerminalActionButtonProps) {
   return (
     <Popover>
-      <PopoverTrigger openOnHover
-        render={
-          <button
-            type="button"
-            className={className}
-            onClick={onClick}
-            aria-label={label}
-          />
-        }
+      <PopoverTrigger
+        openOnHover
+        render={<button type="button" className={className} onClick={onClick} aria-label={label} />}
       >
         {children}
       </PopoverTrigger>
@@ -483,6 +472,7 @@ export default function ThreadTerminalDrawer({
   onNewTerminal,
   splitShortcutLabel,
   newShortcutLabel,
+  closeShortcutLabel,
   onActiveTerminalChange,
   onCloseTerminal,
   onHeightChange,
@@ -598,6 +588,9 @@ export default function ThreadTerminalDrawer({
       ),
     [normalizedTerminalIds],
   );
+  const closeTerminalActionLabel = closeShortcutLabel
+    ? `Close Terminal (${closeShortcutLabel})`
+    : "Close Terminal";
 
   useEffect(() => {
     onHeightChangeRef.current = onHeightChange;
@@ -709,7 +702,9 @@ export default function ThreadTerminalDrawer({
             <TerminalActionButton
               className="p-1 text-foreground/90 transition-colors hover:bg-accent"
               onClick={onSplitTerminal}
-              label={splitShortcutLabel ? `Split Terminal (${splitShortcutLabel})` : "Split Terminal"}
+              label={
+                splitShortcutLabel ? `Split Terminal (${splitShortcutLabel})` : "Split Terminal"
+              }
             >
               <SquareSplitHorizontal className="size-3.25" />
             </TerminalActionButton>
@@ -725,7 +720,7 @@ export default function ThreadTerminalDrawer({
             <TerminalActionButton
               className="p-1 text-foreground/90 transition-colors hover:bg-accent"
               onClick={() => onCloseTerminal(resolvedActiveTerminalId)}
-              label="Close Terminal"
+              label={closeTerminalActionLabel}
             >
               <Trash2 className="size-3.25" />
             </TerminalActionButton>
@@ -805,16 +800,14 @@ export default function ThreadTerminalDrawer({
                   <TerminalActionButton
                     className="inline-flex h-full items-center border-l border-border/70 px-1 text-foreground/90 transition-colors hover:bg-accent/70"
                     onClick={onNewTerminal}
-                    label={
-                      newShortcutLabel ? `New Terminal (${newShortcutLabel})` : "New Terminal"
-                    }
+                    label={newShortcutLabel ? `New Terminal (${newShortcutLabel})` : "New Terminal"}
                   >
                     <Plus className="size-3.25" />
                   </TerminalActionButton>
                   <TerminalActionButton
                     className="inline-flex h-full items-center border-l border-border/70 px-1 text-foreground/90 transition-colors hover:bg-accent/70"
                     onClick={() => onCloseTerminal(resolvedActiveTerminalId)}
-                    label="Close Terminal"
+                    label={closeTerminalActionLabel}
                   >
                     <Trash2 className="size-3.25" />
                   </TerminalActionButton>
@@ -852,6 +845,9 @@ export default function ThreadTerminalDrawer({
                       >
                         {terminalGroup.terminalIds.map((terminalId) => {
                           const isActive = terminalId === resolvedActiveTerminalId;
+                          const closeTerminalLabel = `Close ${
+                            terminalLabelById.get(terminalId) ?? "terminal"
+                          }${isActive && closeShortcutLabel ? ` (${closeShortcutLabel})` : ""}`;
                           return (
                             <div
                               key={terminalId}
@@ -875,18 +871,30 @@ export default function ThreadTerminalDrawer({
                                 </span>
                               </button>
                               {normalizedTerminalIds.length > 1 && (
-                                <button
-                                  type="button"
-                                  className="rounded px-1 text-xs font-medium leading-none text-muted-foreground opacity-0 transition hover:bg-accent hover:text-foreground group-hover:opacity-100"
-                                  onClick={(event) => {
-                                    event.stopPropagation();
-                                    onCloseTerminal(terminalId);
-                                  }}
-                                  aria-label={`Close ${terminalLabelById.get(terminalId) ?? "terminal"}`}
-                                  title={`Close ${terminalLabelById.get(terminalId) ?? "terminal"}`}
-                                >
-                                  ×
-                                </button>
+                                <Popover>
+                                  <PopoverTrigger
+                                    openOnHover
+                                    render={
+                                      <button
+                                        type="button"
+                                        className="inline-flex size-3.5 items-center justify-center rounded text-xs font-medium leading-none text-muted-foreground opacity-0 transition hover:bg-accent hover:text-foreground group-hover:opacity-100"
+                                        onClick={() => onCloseTerminal(terminalId)}
+                                        aria-label={closeTerminalLabel}
+                                      />
+                                    }
+                                  >
+                                    <XIcon className="size-2.5" />
+                                  </PopoverTrigger>
+                                  <PopoverPopup
+                                    tooltipStyle
+                                    side="bottom"
+                                    sideOffset={6}
+                                    align="center"
+                                    className="pointer-events-none select-none"
+                                  >
+                                    {closeTerminalLabel}
+                                  </PopoverPopup>
+                                </Popover>
                               )}
                             </div>
                           );