Skip to content

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.

fix(terminal): protect held Ctrl/Cmd+W close shortcut (#5322)

Wout Stiens553867262cf2
diff --git a/apps/desktop/src/window/DesktopWindow.test.ts b/apps/desktop/src/window/DesktopWindow.test.ts
index 3cd06cfcf..3aedd2ea6 100644
--- a/apps/desktop/src/window/DesktopWindow.test.ts
+++ b/apps/desktop/src/window/DesktopWindow.test.ts
@@ -438,6 +438,51 @@ describe("DesktopWindow", () => {
}),
);
+ it.effect("blocks only repeated Cmd+W input before it reaches the native window menu", () =>
+ Effect.gen(function* () {
+ const fakeWindow = makeFakeBrowserWindow();
+ const createCount = yield* Ref.make(0);
+ const mainWindow = yield* Ref.make<Option.Option<Electron.BrowserWindow>>(Option.none());
+ const layer = makeTestLayer({
+ window: fakeWindow.window,
+ createCount,
+ mainWindow,
+ });
+
+ yield* Effect.gen(function* () {
+ const desktopWindow = yield* DesktopWindow.DesktopWindow;
+ yield* desktopWindow.handleBackendReady(new URL("http://127.0.0.1:3773"));
+
+ const beforeInput = fakeWindow.webContentsListeners.get("before-input-event");
+ if (!beforeInput) {
+ return yield* Effect.die("before-input-event listener was not registered");
+ }
+
+ let prevented = false;
+ const event = { preventDefault: () => (prevented = true) };
+ const input = {
+ type: "keyDown",
+ isAutoRepeat: true,
+ key: "W",
+ meta: true,
+ control: false,
+ alt: false,
+ shift: false,
+ };
+ beforeInput(event, input);
+ assert.isTrue(prevented);
+
+ prevented = false;
+ beforeInput(event, { ...input, isAutoRepeat: false });
+ assert.isFalse(prevented);
+
+ prevented = false;
+ beforeInput(event, { ...input, meta: false });
+ assert.isFalse(prevented);
+ }).pipe(Effect.provide(layer));
+ }),
+ );
+
it.effect("uses the persisted main window bounds when opening the window", () =>
Effect.gen(function* () {
const fakeWindow = makeFakeBrowserWindow();
diff --git a/apps/desktop/src/window/DesktopWindow.ts b/apps/desktop/src/window/DesktopWindow.ts
index 40788009d..91915d4d3 100644
--- a/apps/desktop/src/window/DesktopWindow.ts
+++ b/apps/desktop/src/window/DesktopWindow.ts
@@ -514,6 +514,18 @@ export const make = Effect.gen(function* () {
}
});
+ // Electron's windowMenu close role owns CmdOrCtrl+W. Holding the
+ // close-terminal shortcut can outlive the terminal that handled its first
+ // press, so reject repeats before they reach the native window accelerator.
+ // Deliberate presses still flow through the renderer or native menu.
+ window.webContents.on("before-input-event", (event, input) => {
+ if (input.type !== "keyDown" || !input.isAutoRepeat) return;
+ const modifier = environment.platform === "darwin" ? input.meta : input.control;
+ if (modifier && !input.alt && !input.shift && input.key.toLowerCase() === "w") {
+ event.preventDefault();
+ }
+ });
+
window.on("page-title-updated", (event) => {
event.preventDefault();
window.setTitle(environment.displayName);
diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx
index 836687af3..c1c49fec8 100644
--- a/apps/web/src/components/ChatView.tsx
+++ b/apps/web/src/components/ChatView.tsx
@@ -171,6 +171,7 @@ import { useNowMinute } from "../hooks/useNowMinute";
import { useNewThreadHandler } from "../hooks/useHandleNewThread";
import { resolveAppModelSelectionForInstance } from "../modelSelection";
import { getTerminalFocusOwner } from "../lib/terminalFocus";
+import { preventRepeatedTerminalCloseShortcut } from "../lib/terminalCloseShortcut";
import { resolveNewDraftStartFromOrigin } from "../lib/chatThreadActions";
import {
deriveLogicalProjectKeyFromSettings,
@@ -4354,6 +4355,10 @@ function ChatViewContent(props: ChatViewProps) {
useEffect(() => {
const handler = (event: globalThis.KeyboardEvent) => {
+ if (preventRepeatedTerminalCloseShortcut(event, keybindings)) {
+ event.stopPropagation();
+ return;
+ }
if (!activeThreadId || isCommandPaletteOpen()) {
return;
}
diff --git a/apps/web/src/components/ThreadTerminalDrawer.tsx b/apps/web/src/components/ThreadTerminalDrawer.tsx
index dd7da7386..5c7f6a774 100644
--- a/apps/web/src/components/ThreadTerminalDrawer.tsx
+++ b/apps/web/src/components/ThreadTerminalDrawer.tsx
@@ -43,7 +43,6 @@ import { isTerminalLinkActivation, resolvePathLinkTarget } from "../terminal-lin
import {
isDiffToggleShortcut,
isTerminalClearShortcut,
- isTerminalCloseShortcut,
isTerminalNewShortcut,
isTerminalSplitShortcut,
isTerminalSplitVerticalShortcut,
@@ -63,6 +62,7 @@ import { previewEnvironment } from "../state/preview";
import { terminalEnvironment } from "../state/terminal";
import { openTerminalLinkInPreview } from "./preview/openTerminalLinkInPreview";
import { useAtomCommand } from "../state/use-atom-command";
+import { preventTerminalCloseShortcut } from "../lib/terminalCloseShortcut";
const MIN_DRAWER_HEIGHT = 180;
const MAX_DRAWER_HEIGHT_RATIO = 0.75;
@@ -527,12 +527,14 @@ export function TerminalViewport({
function handleBeforeKey(event: KeyboardEvent): boolean {
const currentKeybindings = keybindingsRef.current;
const options = { context: { terminalFocus: true, terminalOpen: true } };
+ if (preventTerminalCloseShortcut(event, currentKeybindings)) {
+ return false;
+ }
if (
isTerminalToggleShortcut(event, currentKeybindings, options) ||
isTerminalSplitShortcut(event, currentKeybindings, options) ||
isTerminalSplitVerticalShortcut(event, currentKeybindings, options) ||
isTerminalNewShortcut(event, currentKeybindings, options) ||
- isTerminalCloseShortcut(event, currentKeybindings, options) ||
isDiffToggleShortcut(event, currentKeybindings, options)
) {
return false;
diff --git a/apps/web/src/lib/terminalCloseShortcut.test.ts b/apps/web/src/lib/terminalCloseShortcut.test.ts
new file mode 100644
index 000000000..2b02714d7
--- /dev/null
+++ b/apps/web/src/lib/terminalCloseShortcut.test.ts
@@ -0,0 +1,93 @@
+import { describe, expect, it } from "vite-plus/test";
+
+import type { ResolvedKeybindingsConfig } from "@t3tools/contracts";
+
+import {
+ preventRepeatedTerminalCloseShortcut,
+ preventTerminalCloseShortcut,
+ type TerminalCloseShortcutEvent,
+} from "./terminalCloseShortcut";
+
+const keybindings = [
+ {
+ command: "terminal.close",
+ shortcut: {
+ key: "w",
+ metaKey: false,
+ ctrlKey: false,
+ shiftKey: false,
+ altKey: false,
+ modKey: true,
+ },
+ whenAst: { type: "identifier", name: "terminalFocus" },
+ },
+] satisfies ResolvedKeybindingsConfig;
+
+type KeyboardEventOverrides = Partial<
+ Pick<
+ TerminalCloseShortcutEvent,
+ "key" | "code" | "metaKey" | "ctrlKey" | "shiftKey" | "altKey" | "repeat"
+ >
+>;
+
+function keyboardEvent(
+ overrides: KeyboardEventOverrides = {},
+): TerminalCloseShortcutEvent & { readonly defaultPrevented: boolean } {
+ let defaultPrevented = false;
+ return {
+ key: "w",
+ code: "KeyW",
+ metaKey: false,
+ ctrlKey: true,
+ shiftKey: false,
+ altKey: false,
+ repeat: false,
+ ...overrides,
+ preventDefault: () => {
+ defaultPrevented = true;
+ },
+ get defaultPrevented() {
+ return defaultPrevented;
+ },
+ };
+}
+
+describe("terminal close shortcut guards", () => {
+ it("prevents the browser default for a deliberate terminal close", () => {
+ const event = keyboardEvent();
+
+ expect(preventTerminalCloseShortcut(event, keybindings, "Linux x86_64")).toBe(true);
+ expect(event.defaultPrevented).toBe(true);
+ });
+
+ it("keeps held close repeats from closing the browser after the last terminal unmounts", () => {
+ const firstPress = keyboardEvent();
+ expect(preventTerminalCloseShortcut(firstPress, keybindings, "Linux x86_64")).toBe(true);
+
+ let browserCloseCount = 0;
+ for (const repeat of [true, true, true]) {
+ const event = keyboardEvent({ repeat });
+ preventRepeatedTerminalCloseShortcut(event, keybindings, "Linux x86_64");
+ if (!event.defaultPrevented) browserCloseCount += 1;
+ }
+
+ expect(browserCloseCount).toBe(0);
+ expect(preventRepeatedTerminalCloseShortcut(keyboardEvent(), keybindings, "Linux x86_64")).toBe(
+ false,
+ );
+ });
+
+ it("leaves a non-repeated window close and unrelated repeats alone", () => {
+ const deliberateWindowClose = keyboardEvent({ repeat: false });
+ const unrelatedRepeat = keyboardEvent({ key: "q", code: "KeyQ", repeat: true });
+
+ expect(
+ preventRepeatedTerminalCloseShortcut(deliberateWindowClose, keybindings, "Linux x86_64"),
+ ).toBe(false);
+ expect(deliberateWindowClose.defaultPrevented).toBe(false);
+ expect(preventRepeatedTerminalCloseShortcut(unrelatedRepeat, keybindings, "Linux x86_64")).toBe(
+ false,
+ );
+ expect(unrelatedRepeat.defaultPrevented).toBe(false);
+ });
+});
diff --git a/apps/web/src/lib/terminalCloseShortcut.ts b/apps/web/src/lib/terminalCloseShortcut.ts
new file mode 100644
index 000000000..047f87308
--- /dev/null
+++ b/apps/web/src/lib/terminalCloseShortcut.ts
@@ -0,0 +1,36 @@
+import type { ResolvedKeybindingsConfig } from "@t3tools/contracts";
+
+import { isTerminalCloseShortcut, type ShortcutEventLike } from "../keybindings";
+
+export interface TerminalCloseShortcutEvent extends ShortcutEventLike {
+ readonly repeat?: boolean;
+ readonly preventDefault: () => void;
+}
+
+function terminalCloseShortcutOptions(platform?: string) {
+ return {
+ ...(platform === undefined ? {} : { platform }),
+ context: { terminalFocus: true, terminalOpen: true },
+ };
+}
+
+export function preventTerminalCloseShortcut(
+ event: TerminalCloseShortcutEvent,
+ keybindings: ResolvedKeybindingsConfig,
+ platform?: string,
+): boolean {
+ if (!isTerminalCloseShortcut(event, keybindings, terminalCloseShortcutOptions(platform))) {
+ return false;
+ }
+ event.preventDefault();
+ return true;
+}
+
+export function preventRepeatedTerminalCloseShortcut(
+ event: TerminalCloseShortcutEvent,
+ keybindings: ResolvedKeybindingsConfig,
+ platform?: string,
+): boolean {
+ if (!event.repeat) return false;
+ return preventTerminalCloseShortcut(event, keybindings, platform);
+}