fix: Escape key now closes slash and mention dropdown menus

- Add close-slash-menu and close-mention-menu action types
- Escape removes the trigger character (/ or @) and query from input
- Priority 5.5: menus close before stream interrupt or agent unfocus
- Add comprehensive tests for menu close behavior

Author: brandonkachen

cli/src/chat.tsx

@@ -867,6 +867,36 @@ export const Chat = ({
           pauseQueue()
         }
       },
+      onCloseSlashMenu: () => {
+        // Remove the slash and query from input to close the menu
+        if (slashContext.startIndex >= 0) {
+          const before = inputValue.slice(0, slashContext.startIndex)
+          const after = inputValue.slice(
+            slashContext.startIndex + 1 + slashContext.query.length,
+          )
+          setInputValue({
+            text: before + after,
+            cursorPosition: before.length,
+            lastEditDueToNav: false,
+          })
+        }
+        setSlashSelectedIndex(0)
+      },
+      onCloseMentionMenu: () => {
+        // Remove the @ and query from input to close the menu
+        if (mentionContext.startIndex >= 0) {
+          const before = inputValue.slice(0, mentionContext.startIndex)
+          const after = inputValue.slice(
+            mentionContext.startIndex + 1 + mentionContext.query.length,
+          )
+          setInputValue({
+            text: before + after,
+            cursorPosition: before.length,
+            lastEditDueToNav: false,
+          })
+        }
+        setAgentSelectedIndex(0)
+      },
       onSlashMenuDown: () => setSlashSelectedIndex((prev) => prev + 1),
       onSlashMenuUp: () => setSlashSelectedIndex((prev) => prev - 1),
       onSlashMenuTab: () => {
@@ -1060,6 +1090,7 @@ export const Chat = ({
       setSlashSelectedIndex,
       slashMatches,
       slashSelectedIndex,
+      slashContext,
       onSubmitPrompt,
       agentMode,
       handleCommandResult,
@@ -1068,6 +1099,7 @@ export const Chat = ({
       fileMatches,
       agentSelectedIndex,
       mentionContext,
+      inputValue,
       cursorPosition,
       openFileMenuWithTab,
       navigateUp,

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

@@ -33,6 +33,7 @@ export type ChatKeyboardHandlers = {
   onInterruptStream: () => void
 
   // Slash menu handlers
+  onCloseSlashMenu: () => void
   onSlashMenuDown: () => void
   onSlashMenuUp: () => void
   onSlashMenuTab: () => void
@@ -41,6 +42,7 @@ export type ChatKeyboardHandlers = {
   onSlashMenuComplete: () => void
 
   // Mention menu handlers
+  onCloseMentionMenu: () => void
   onMentionMenuDown: () => void
   onMentionMenuUp: () => void
   onMentionMenuTab: () => void
@@ -125,6 +127,12 @@ function dispatchAction(
     case 'interrupt-stream':
       handlers.onInterruptStream()
       return true
+    case 'close-slash-menu':
+      handlers.onCloseSlashMenu()
+      return true
+    case 'close-mention-menu':
+      handlers.onCloseMentionMenu()
+      return true
     case 'slash-menu-down':
       handlers.onSlashMenuDown()
       return true

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

@@ -200,6 +200,90 @@ describe('resolveChatKeyboardAction', () => {
     })
   })
 
+  describe('escape closes menus', () => {
+    test('escape closes slash menu when active', () => {
+      const state: ChatKeyboardState = {
+        ...defaultState,
+        slashMenuActive: true,
+        slashMatchesLength: 5,
+        slashSelectedIndex: 2,
+      }
+      expect(resolveChatKeyboardAction(escapeKey, state)).toEqual({
+        type: 'close-slash-menu',
+      })
+    })
+
+    test('escape closes mention menu when active', () => {
+      const state: ChatKeyboardState = {
+        ...defaultState,
+        mentionMenuActive: true,
+        totalMentionMatches: 5,
+        agentSelectedIndex: 2,
+      }
+      expect(resolveChatKeyboardAction(escapeKey, state)).toEqual({
+        type: 'close-mention-menu',
+      })
+    })
+
+    test('escape does not close slash menu when disabled', () => {
+      const state: ChatKeyboardState = {
+        ...defaultState,
+        slashMenuActive: true,
+        slashMatchesLength: 5,
+        disableSlashSuggestions: true,
+      }
+      expect(resolveChatKeyboardAction(escapeKey, state)).toEqual({
+        type: 'none',
+      })
+    })
+
+    test('escape does not close slash menu with no matches', () => {
+      const state: ChatKeyboardState = {
+        ...defaultState,
+        slashMenuActive: true,
+        slashMatchesLength: 0,
+      }
+      expect(resolveChatKeyboardAction(escapeKey, state)).toEqual({
+        type: 'none',
+      })
+    })
+
+    test('escape does not close mention menu with no matches', () => {
+      const state: ChatKeyboardState = {
+        ...defaultState,
+        mentionMenuActive: true,
+        totalMentionMatches: 0,
+      }
+      expect(resolveChatKeyboardAction(escapeKey, state)).toEqual({
+        type: 'none',
+      })
+    })
+
+    test('escape in feedback mode exits feedback before closing menu', () => {
+      const state: ChatKeyboardState = {
+        ...defaultState,
+        feedbackMode: true,
+        slashMenuActive: true,
+        slashMatchesLength: 5,
+      }
+      expect(resolveChatKeyboardAction(escapeKey, state)).toEqual({
+        type: 'exit-feedback-mode',
+      })
+    })
+
+    test('escape in non-default mode exits mode before closing menu', () => {
+      const state: ChatKeyboardState = {
+        ...defaultState,
+        inputMode: 'bash',
+        slashMenuActive: true,
+        slashMatchesLength: 5,
+      }
+      expect(resolveChatKeyboardAction(escapeKey, state)).toEqual({
+        type: 'exit-input-mode',
+      })
+    })
+  })
+
   describe('slash menu navigation', () => {
     const slashMenuState: ChatKeyboardState = {
       ...defaultState,

cli/src/utils/keyboard-actions.ts

@@ -60,6 +60,8 @@ export type ChatKeyboardAction =
   | { type: 'interrupt-stream' }
 
   // Menu navigation
+  | { type: 'close-slash-menu' }
+  | { type: 'close-mention-menu' }
   | { type: 'slash-menu-down' }
   | { type: 'slash-menu-up' }
   | { type: 'slash-menu-tab' }
@@ -187,6 +189,20 @@ export function resolveChatKeyboardAction(
     return { type: 'backspace-exit-mode' }
   }
 
+  // Priority 5.5: Escape closes active menus
+  if (isEscape) {
+    if (
+      state.slashMenuActive &&
+      state.slashMatchesLength > 0 &&
+      !state.disableSlashSuggestions
+    ) {
+      return { type: 'close-slash-menu' }
+    }
+    if (state.mentionMenuActive && state.totalMentionMatches > 0) {
+      return { type: 'close-mention-menu' }
+    }
+  }
+
   // Priority 6: Slash menu navigation (when active and not disabled)
   // Skip menu navigation for Up/Down if history navigation is enabled (user is paging through history)
   if (