Prevent keypad enter from double submitting suggestions

Author: jahooma

cli/src/components/chat-input-bar.tsx

@@ -11,8 +11,8 @@ import { SuggestionMenu, type SuggestionItem } from './suggestion-menu'
 import { useAskUserBridge } from '../hooks/use-ask-user-bridge'
 import { useEvent } from '../hooks/use-event'
 import { useChatStore } from '../state/chat-store'
+import { shouldInterceptChatInputKey } from '../utils/chat-input-key-intercept'
 import { getInputModeConfig } from '../utils/input-modes'
-import { isLinefeedActingAsEnter } from '../utils/terminal-enter-detection'
 import { BORDER_CHARS } from '../utils/ui-constants'
 
 import type { useTheme } from '../hooks/use-theme'
@@ -133,38 +133,13 @@ export const ChatInputBar = ({
       meta?: boolean
       option?: boolean
     }) => {
-      const isPlainEnter =
-        (key.name === 'return' || key.name === 'enter' ||
-          (key.name === 'linefeed' && isLinefeedActingAsEnter())) &&
-        !key.shift &&
-        !key.ctrl &&
-        !key.meta &&
-        !key.option
-      const isTab = key.name === 'tab' && !key.ctrl && !key.meta && !key.option
-      const isUp = key.name === 'up' && !key.ctrl && !key.meta && !key.option
-      const isDown = key.name === 'down' && !key.ctrl && !key.meta && !key.option
-      const isUpDown = isUp || isDown
-
-      const hasSuggestions = hasSlashSuggestions || hasMentionSuggestions
-      if (hasSuggestions) {
-        if (isUpDown && lastEditDueToNav) {
-          return true
-        }
-        if (isPlainEnter || isTab || isUpDown) {
-          return true
-        }
-      }
-
-      const historyUpEnabled = lastEditDueToNav || cursorPosition === 0
-      const historyDownEnabled = lastEditDueToNav || cursorPosition === inputValue.length
-      if (isUp && historyUpEnabled) {
-        return true
-      }
-      if (isDown && historyDownEnabled) {
-        return true
-      }
-
-      return false
+      return shouldInterceptChatInputKey(key, {
+        hasSlashSuggestions,
+        hasMentionSuggestions,
+        lastEditDueToNav,
+        cursorPosition,
+        inputLength: inputValue.length,
+      })
     },
   )
 

cli/src/utils/__tests__/chat-input-key-intercept.test.ts

@@ -0,0 +1,40 @@
+import { describe, expect, test } from 'bun:test'
+
+import { shouldInterceptChatInputKey } from '../chat-input-key-intercept'
+
+const baseState = {
+  hasSlashSuggestions: false,
+  hasMentionSuggestions: false,
+  lastEditDueToNav: false,
+  cursorPosition: 1,
+  inputLength: 3,
+}
+
+describe('shouldInterceptChatInputKey', () => {
+  test('intercepts keypad Enter while slash suggestions are visible', () => {
+    expect(
+      shouldInterceptChatInputKey(
+        { name: 'kpenter', sequence: '\x1b[57414u' },
+        { ...baseState, hasSlashSuggestions: true },
+      ),
+    ).toBe(true)
+  })
+
+  test('intercepts raw application keypad Enter while mention suggestions are visible', () => {
+    expect(
+      shouldInterceptChatInputKey(
+        { sequence: '\x1bOM' },
+        { ...baseState, hasMentionSuggestions: true },
+      ),
+    ).toBe(true)
+  })
+
+  test('does not intercept keypad Enter without visible suggestions', () => {
+    expect(
+      shouldInterceptChatInputKey(
+        { name: 'kpenter', sequence: '\x1b[57414u' },
+        baseState,
+      ),
+    ).toBe(false)
+  })
+})

cli/src/utils/chat-input-key-intercept.ts

@@ -0,0 +1,61 @@
+import { isKeypadEnter } from './keypad-keys'
+import { isLinefeedActingAsEnter } from './terminal-enter-detection'
+
+type ChatInputKey = {
+  name?: string
+  sequence?: string
+  shift?: boolean
+  ctrl?: boolean
+  meta?: boolean
+  option?: boolean
+}
+
+type ChatInputKeyInterceptState = {
+  hasSlashSuggestions: boolean
+  hasMentionSuggestions: boolean
+  lastEditDueToNav: boolean
+  cursorPosition: number
+  inputLength: number
+}
+
+export function shouldInterceptChatInputKey(
+  key: ChatInputKey,
+  state: ChatInputKeyInterceptState,
+): boolean {
+  const isPlainEnter =
+    (key.name === 'return' ||
+      key.name === 'enter' ||
+      isKeypadEnter(key) ||
+      (key.name === 'linefeed' && isLinefeedActingAsEnter())) &&
+    !key.shift &&
+    !key.ctrl &&
+    !key.meta &&
+    !key.option
+  const isTab = key.name === 'tab' && !key.ctrl && !key.meta && !key.option
+  const isUp = key.name === 'up' && !key.ctrl && !key.meta && !key.option
+  const isDown = key.name === 'down' && !key.ctrl && !key.meta && !key.option
+  const isUpDown = isUp || isDown
+
+  const hasSuggestions =
+    state.hasSlashSuggestions || state.hasMentionSuggestions
+  if (hasSuggestions) {
+    if (isUpDown && state.lastEditDueToNav) {
+      return true
+    }
+    if (isPlainEnter || isTab || isUpDown) {
+      return true
+    }
+  }
+
+  const historyUpEnabled = state.lastEditDueToNav || state.cursorPosition === 0
+  const historyDownEnabled =
+    state.lastEditDueToNav || state.cursorPosition === state.inputLength
+  if (isUp && historyUpEnabled) {
+    return true
+  }
+  if (isDown && historyDownEnabled) {
+    return true
+  }
+
+  return false
+}