diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/Terminal.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/Terminal.tsx index 7568a42dff5..637130215cc 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/Terminal.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/Terminal.tsx @@ -185,6 +185,9 @@ export const Terminal = ({ tabId, workspaceId }: TerminalProps) => { writeRef.current({ tabId, data: "\\\n" }); } }, + onClear: () => { + xterm.clear(); + }, }); const cleanupFocus = setupFocusListener( diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/helpers.ts b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/helpers.ts index 945e591eef8..4fa8311f2a4 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/helpers.ts +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/helpers.ts @@ -130,12 +130,15 @@ export function createTerminalInstance( export interface KeyboardHandlerOptions { /** Callback for Shift+Enter to create a line continuation (like iTerm) */ onShiftEnter?: () => void; + /** Callback for Cmd+K to clear the terminal */ + onClear?: () => void; } /** * Setup keyboard handling for xterm including: * - Shortcut forwarding: App hotkeys are re-dispatched to document for react-hotkeys-hook * - Shift+Enter: Creates a line continuation (like iTerm) instead of executing + * - Cmd+K: Clears the terminal */ export function setupKeyboardHandler( xterm: XTerm, @@ -157,6 +160,21 @@ export function setupKeyboardHandler( return false; } + // Handle Cmd+K to clear terminal (handle directly since it needs xterm access) + const isClearShortcut = + event.key.toLowerCase() === "k" && + event.metaKey && + !event.shiftKey && + !event.ctrlKey && + !event.altKey; + + if (isClearShortcut) { + if (event.type === "keydown" && options.onClear) { + options.onClear(); + } + return false; + } + if (event.type !== "keydown") return true; if (!event.metaKey && !event.ctrlKey) return true; diff --git a/apps/desktop/src/shared/hotkeys.ts b/apps/desktop/src/shared/hotkeys.ts index 078690834bc..b30187e6c2b 100644 --- a/apps/desktop/src/shared/hotkeys.ts +++ b/apps/desktop/src/shared/hotkeys.ts @@ -113,6 +113,11 @@ export const HOTKEYS = { label: "Close Terminal", category: "Terminal", }, + CLEAR_TERMINAL: { + keys: "meta+k", + label: "Clear Terminal", + category: "Terminal", + }, PREV_TERMINAL: { keys: "meta+up", label: "Previous Terminal",