Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.
Add shortcuts for terminal close and chat with same Git state
Julius Marmingec42d6a6a6489
diff --git a/KEYBINDINGS.md b/KEYBINDINGS.mdindex e3be8baac..7734d4ebe 100644--- a/KEYBINDINGS.md+++ b/KEYBINDINGS.md@@ -22,7 +22,9 @@ 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+w", "command": "terminal.close", "when": "terminalFocus" },{ "key": "mod+shift+o", "command": "chat.new" },+ { "key": "mod+shift+n", "command": "chat.newSameGitState" },{ "key": "mod+o", "command": "editor.openFavorite" }]```@@ -46,7 +48,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)+- `terminal.close`: close/kill the focused terminal (in focused terminal context by default)- `chat.new`: create a new chat thread for the active project+- `chat.newSameGitState`: create a new chat thread preserving the active thread's branch/worktree state- `editor.openFavorite`: open current project/worktree in the last-used editor### Key Syntaxdiff --git a/apps/server/src/keybindings.test.ts b/apps/server/src/keybindings.test.tsindex d761588e9..18ecbabc0 100644--- a/apps/server/src/keybindings.test.ts+++ b/apps/server/src/keybindings.test.ts@@ -1,6 +1,10 @@import { assert, describe, it } from "vitest";-import { compileResolvedKeybindingRule, parseKeybindingShortcut } from "./keybindings";+import {+ DEFAULT_KEYBINDINGS,+ compileResolvedKeybindingRule,+ parseKeybindingShortcut,+} from "./keybindings";describe("server keybindings", () => {it("parses shortcuts including plus key", () => {@@ -66,4 +70,16 @@ describe("server keybindings", () => {}),);});++ it("defines defaults for terminal.close and chat.newSameGitState", () => {+ assert.deepInclude(DEFAULT_KEYBINDINGS, {+ key: "mod+w",+ command: "terminal.close",+ when: "terminalFocus",+ });+ assert.deepInclude(DEFAULT_KEYBINDINGS, {+ key: "mod+shift+n",+ command: "chat.newSameGitState",+ });+ });});diff --git a/apps/server/src/keybindings.ts b/apps/server/src/keybindings.tsindex b9a0b4d78..5750b4f4b 100644--- a/apps/server/src/keybindings.ts+++ b/apps/server/src/keybindings.ts@@ -28,7 +28,9 @@ 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+w", command: "terminal.close", when: "terminalFocus" },{ key: "mod+shift+o", command: "chat.new" },+ { key: "mod+shift+n", command: "chat.newSameGitState" },{ key: "mod+o", command: "editor.openFavorite" },];diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsxindex 5114a2446..d308ec63f 100644--- a/apps/web/src/components/ChatView.tsx+++ b/apps/web/src/components/ChatView.tsx@@ -52,6 +52,7 @@ import BranchToolbar from "./BranchToolbar";import GitActionsControl from "./GitActionsControl";import {isOpenFavoriteEditorShortcut,+ isTerminalCloseShortcut,isTerminalNewShortcut,isTerminalSplitShortcut,isTerminalToggleShortcut,@@ -554,6 +555,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 +579,9 @@ export default function ChatView() {return () => window.removeEventListener("keydown", handler);}, [activeThread?.terminalOpen,+ activeThread?.activeTerminalId,activeThreadId,+ closeTerminal,createNewTerminal,dispatch,splitTerminal,diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsxindex 60392d004..2a3deef38 100644--- a/apps/web/src/components/Sidebar.tsx+++ b/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 { isChatNewSameGitStateShortcut, 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,12 +387,21 @@ 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 (isChatNewSameGitStateShortcut(event, keybindings)) {+ const projectId = activeThread?.projectId ?? state.projects[0]?.id;+ if (!projectId) return;+ event.preventDefault();+ handleNewThread(projectId, {+ branch: activeThread?.branch ?? null,+ worktreePath: activeThread?.worktreePath ?? null,+ });+ return;+ }++ if (!isChatNewShortcut(event, keybindings)) return;const projectId = activeThread?.projectId ?? state.projects[0]?.id;if (!projectId) return;-event.preventDefault();handleNewThread(projectId);};diff --git a/apps/web/src/keybindings.test.ts b/apps/web/src/keybindings.test.tsindex 4ceb1b920..25df37f43 100644--- a/apps/web/src/keybindings.test.ts+++ b/apps/web/src/keybindings.test.ts@@ -7,10 +7,12 @@ import {type ResolvedKeybindingsConfig,} from "@t3tools/contracts";import {+ isChatNewSameGitStateShortcut,formatShortcutLabel,isChatNewShortcut,isOpenFavoriteEditorShortcut,isTerminalClearShortcut,+ isTerminalCloseShortcut,isTerminalNewShortcut,isTerminalSplitShortcut,isTerminalToggleShortcut,@@ -83,7 +85,13 @@ const DEFAULT_BINDINGS = compile([command: "terminal.new",whenAst: whenIdentifier("terminalFocus"),},+ {+ shortcut: modShortcut("w"),+ command: "terminal.close",+ whenAst: whenIdentifier("terminalFocus"),+ },{ shortcut: modShortcut("o", { shiftKey: true }), command: "chat.new" },+ { shortcut: modShortcut("n", { shiftKey: true }), command: "chat.newSameGitState" },{ shortcut: modShortcut("o"), command: "editor.openFavorite" },]);@@ -101,8 +109,8 @@ describe("isTerminalToggleShortcut", () => {});});-describe("split/new terminal shortcuts", () => {- it("requires terminalFocus for default split/new bindings", () => {+describe("split/new/close terminal shortcuts", () => {+ it("requires terminalFocus for default split/new/close bindings", () => {assert.isFalse(isTerminalSplitShortcut(event({ key: "d", metaKey: true }), DEFAULT_BINDINGS, {platform: "MacIntel",@@ -115,6 +123,12 @@ describe("split/new terminal shortcuts", () => {context: { terminalFocus: false },}),);+ assert.isFalse(+ isTerminalCloseShortcut(event({ key: "w", ctrlKey: true }), DEFAULT_BINDINGS, {+ platform: "Linux",+ context: { terminalFocus: false },+ }),+ );});it("matches split/new when terminalFocus is true", () => {@@ -130,6 +144,12 @@ describe("split/new terminal shortcuts", () => {context: { terminalFocus: true },}),);+ assert.isTrue(+ isTerminalCloseShortcut(event({ key: "w", ctrlKey: true }), DEFAULT_BINDINGS, {+ platform: "Linux",+ context: { terminalFocus: true },+ }),+ );});it("supports when expressions", () => {@@ -225,6 +245,27 @@ describe("chat/editor shortcuts", () => {);});+ it("matches chat.newSameGitState shortcut", () => {+ assert.isTrue(+ isChatNewSameGitStateShortcut(+ event({ key: "n", metaKey: true, shiftKey: true }),+ DEFAULT_BINDINGS,+ {+ platform: "MacIntel",+ },+ ),+ );+ assert.isTrue(+ isChatNewSameGitStateShortcut(+ event({ key: "n", ctrlKey: true, shiftKey: true }),+ DEFAULT_BINDINGS,+ {+ platform: "Linux",+ },+ ),+ );+ });+it("matches editor.openFavorite shortcut", () => {assert.isTrue(isOpenFavoriteEditorShortcut(event({ key: "o", metaKey: true }), DEFAULT_BINDINGS, {diff --git a/apps/web/src/keybindings.ts b/apps/web/src/keybindings.tsindex 4efcd6fee..070dcae67 100644--- a/apps/web/src/keybindings.ts+++ b/apps/web/src/keybindings.ts@@ -190,6 +190,14 @@ export function isTerminalNewShortcut(return matchesCommandShortcut(event, keybindings, "terminal.new", options);}+export function isTerminalCloseShortcut(+ event: ShortcutEventLike,+ keybindings: ResolvedKeybindingsConfig,+ options?: ShortcutMatchOptions,+): boolean {+ return matchesCommandShortcut(event, keybindings, "terminal.close", options);+}+export function isChatNewShortcut(event: ShortcutEventLike,keybindings: ResolvedKeybindingsConfig,@@ -198,6 +206,14 @@ export function isChatNewShortcut(return matchesCommandShortcut(event, keybindings, "chat.new", options);}+export function isChatNewSameGitStateShortcut(+ event: ShortcutEventLike,+ keybindings: ResolvedKeybindingsConfig,+ options?: ShortcutMatchOptions,+): boolean {+ return matchesCommandShortcut(event, keybindings, "chat.newSameGitState", options);+}+export function isOpenFavoriteEditorShortcut(event: ShortcutEventLike,keybindings: ResolvedKeybindingsConfig,diff --git a/packages/contracts/src/keybindings.test.ts b/packages/contracts/src/keybindings.test.tsindex 3427e581c..7e782a3db 100644--- a/packages/contracts/src/keybindings.test.ts+++ b/packages/contracts/src/keybindings.test.ts@@ -14,6 +14,12 @@ describe("keybindings contracts", () => {command: "terminal.toggle",});assert.strictEqual(parsed.command, "terminal.toggle");++ const parsedClose = keybindingRuleSchema.parse({+ key: "mod+w",+ command: "terminal.close",+ });+ assert.strictEqual(parsedClose.command, "terminal.close");});it("rejects invalid command values", () => {diff --git a/packages/contracts/src/keybindings.ts b/packages/contracts/src/keybindings.tsindex 921fcbd1d..62dc84062 100644--- a/packages/contracts/src/keybindings.ts+++ b/packages/contracts/src/keybindings.ts@@ -4,7 +4,9 @@ export const keybindingCommandSchema = z.enum(["terminal.toggle","terminal.split","terminal.new",+ "terminal.close","chat.new",+ "chat.newSameGitState","editor.openFavorite",]);