Merge branch 'terminal-keyboard-shortcuts-ws0o'

Author: knowsuchagency

frontend/components/kanban/create-task-modal.tsx

@@ -1,6 +1,7 @@
-import { useState, useEffect, useMemo } from 'react'
+import { useState, useEffect, useMemo, useRef } from 'react'
 import { useNavigate } from '@tanstack/react-router'
 import { useTranslation } from 'react-i18next'
+import { useHotkeys } from '@/hooks/use-hotkeys'
 import {
   Dialog,
   DialogContent,
@@ -88,6 +89,7 @@ export function CreateTaskModal({ open: controlledOpen, onOpenChange, defaultRep
   const navigate = useNavigate()
   const createTask = useCreateTask()
   const createRepository = useCreateRepository()
+  const formRef = useRef<HTMLFormElement>(null)
   const { data: worktreeBasePath } = useWorktreeBasePath()
   const { data: defaultGitReposDir } = useDefaultGitReposDir()
   const { data: repositories } = useRepositories()
@@ -237,6 +239,19 @@ export function CreateTaskModal({ open: controlledOpen, onOpenChange, defaultRep
     )
   }
 
+  // Cmd+Enter to submit form when modal is open
+  const canSubmit = !createTask.isPending && !!title.trim() && !!repoPath
+  useHotkeys('meta+enter', () => {
+    if (formRef.current) {
+      formRef.current.requestSubmit()
+    }
+  }, {
+    enabled: open && canSubmit,
+    allowInInput: true,
+    ignoreContext: true,
+    deps: [open, canSubmit],
+  })
+
   const effectiveBranch = branch.trim() || autoGeneratedBranch
   const displayWorktreePath = effectiveBranch
     ? `${worktreeBasePath}/${effectiveBranch}`
@@ -252,7 +267,7 @@ export function CreateTaskModal({ open: controlledOpen, onOpenChange, defaultRep
           </DialogTrigger>
         )}
         <DialogContent className="sm:max-w-md max-h-[80dvh] flex flex-col overflow-hidden">
-          <form onSubmit={handleSubmit} className="flex flex-col min-h-0 flex-1">
+          <form ref={formRef} onSubmit={handleSubmit} className="flex flex-col min-h-0 flex-1">
             <DialogHeader className="shrink-0">
               <DialogTitle>{t('createModal.title')}</DialogTitle>
               <DialogDescription>

frontend/components/keyboard-shortcuts-help.tsx

@@ -42,10 +42,18 @@ const shortcutGroups: ShortcutGroup[] = [
       { labelKey: 'keyboardShortcuts', shortcut: 'meta+/' },
     ],
   },
+  {
+    titleKey: 'terminals',
+    items: [
+      { labelKey: 'newTerminal', shortcut: 'meta+d' },
+      { labelKey: 'closeTerminal', shortcut: 'meta+w' },
+    ],
+  },
   {
     titleKey: 'general',
     items: [
       { labelKey: 'closeModal', shortcut: 'escape' },
+      { labelKey: 'submitForm', shortcut: 'meta+enter' },
     ],
   },
 ]

frontend/i18n/locales/en/navigation.json

@@ -32,6 +32,7 @@
     "groups": {
       "navigation": "Navigation",
       "actions": "Actions",
+      "terminals": "Terminals (Desktop)",
       "general": "General"
     },
     "labels": {
@@ -44,7 +45,10 @@
       "commandPalette": "Command Palette",
       "newTask": "New Task",
       "keyboardShortcuts": "Keyboard Shortcuts",
-      "closeModal": "Close Modal"
+      "closeModal": "Close Modal",
+      "newTerminal": "New Terminal",
+      "closeTerminal": "Close Terminal",
+      "submitForm": "Submit Form"
     }
   }
 }

frontend/routes/terminals/index.tsx

@@ -20,6 +20,8 @@ import type { ITerminal, ITab } from '@/stores'
 import { useTasks } from '@/hooks/use-tasks'
 import { useRepositories } from '@/hooks/use-repositories'
 import { useWorktreeBasePath } from '@/hooks/use-config'
+import { useTerminalViewState } from '@/hooks/use-terminal-view-state'
+import { useHotkeys } from '@/hooks/use-hotkeys'
 import { cn } from '@/lib/utils'
 import type { Terminal as XTerm } from '@xterm/xterm'
 import type { TerminalTab, TaskStatus } from '@/types'
@@ -95,6 +97,9 @@ const TerminalsView = observer(function TerminalsView() {
   // State for tab edit dialog
   const [editingTab, setEditingTab] = useState<TerminalTab | null>(null)
 
+  // View state for tracking focused terminals
+  const { getFocusedTerminal } = useTerminalViewState()
+
   // URL is the source of truth for active tab
   // Fall back to first tab if URL doesn't specify a valid tab
   const tabIds = useMemo(() => tabs.map((t) => t.id), [tabs])
@@ -538,6 +543,26 @@ const TerminalsView = observer(function TerminalsView() {
     [updateTab]
   )
 
+  // Keyboard shortcuts (Cmd+D/W only work on desktop - browser intercepts on web)
+  useHotkeys('meta+d', handleTerminalAdd, {
+    enabled: activeTabId !== ALL_TASKS_TAB_ID && connected,
+    allowInTerminal: true,
+    deps: [handleTerminalAdd, activeTabId, connected],
+  })
+
+  useHotkeys('meta+w', () => {
+    if (activeTabId && activeTabId !== ALL_TASKS_TAB_ID) {
+      const focusedId = getFocusedTerminal(activeTabId)
+      if (focusedId) {
+        handleTerminalClose(focusedId)
+      }
+    }
+  }, {
+    enabled: activeTabId !== ALL_TASKS_TAB_ID,
+    allowInTerminal: true,
+    deps: [activeTabId, getFocusedTerminal, handleTerminalClose],
+  })
+
   return (
     <div className="flex h-full max-w-full flex-col overflow-hidden">
       {/* Tab Bar + Actions */}