Tab: also toggle agent mode

Author: jahooma

cli/src/components/multiline-input.tsx

@@ -900,7 +900,7 @@ export const MultilineInput = forwardRef<
   // Handle character input (regular chars and tab)
   const handleCharacterInput = useCallback(
     (key: KeyEvent): boolean => {
-      // Tab: insert literal tab when no modifiers are held
+      // Tab: let higher-level keyboard handlers (like chat keyboard shortcuts) handle it
       if (
         key.name === 'tab' &&
         key.sequence &&
@@ -909,9 +909,8 @@ export const MultilineInput = forwardRef<
         !key.meta &&
         !key.option
       ) {
-        preventKeyDefault(key)
-        insertTextAtCursor('\t')
-        return true
+        // Don't insert a literal tab character here; allow global keyboard handlers to process it
+        return false
       }
 
       // Regular character input

cli/src/hooks/use-chat-keyboard.ts

@@ -151,8 +151,13 @@ function dispatchAction(
     case 'mention-menu-complete':
       handlers.onMentionMenuComplete()
       return true
-    case 'open-file-menu-with-tab':
-      return handlers.onOpenFileMenuWithTab()
+    case 'open-file-menu-with-tab': {
+      const opened = handlers.onOpenFileMenuWithTab()
+      if (!opened) {
+        handlers.onToggleAgentMode()
+      }
+      return true
+    }
     case 'history-up':
       handlers.onHistoryUp()
       return true

cli/src/utils/__tests__/keyboard-actions.test.ts

@@ -358,13 +358,13 @@ describe('resolveChatKeyboardAction', () => {
       })
     })
 
-    test('tab disabled when disableSlashSuggestions is true', () => {
+    test('tab toggles agent mode when disableSlashSuggestions is true', () => {
       const state: ChatKeyboardState = {
         ...defaultState,
         disableSlashSuggestions: true,
       }
       expect(resolveChatKeyboardAction(tabKey, state)).toEqual({
-        type: 'none',
+        type: 'toggle-agent-mode',
       })
     })
   })

cli/src/utils/keyboard-actions.ts

@@ -282,8 +282,12 @@ export function resolveChatKeyboardAction(
     return { type: 'history-down' }
   }
 
-  // Priority 11: Agent mode toggle (shift-tab when not in menus)
-  if (isShiftTab && !state.slashMenuActive && !state.mentionMenuActive) {
+  // Priority 11: Agent mode toggle (tab or shift-tab when not in menus)
+  if (
+    (isShiftTab || isTab) &&
+    !state.slashMenuActive &&
+    !state.mentionMenuActive
+  ) {
     return { type: 'toggle-agent-mode' }
   }