Fix keypad enter LF detection

Author: jahooma

cli/src/components/multiline-input.tsx

@@ -21,7 +21,10 @@ import {
   isKeypadEnter,
 } from '../utils/keypad-keys'
 import { clamp } from '../utils/math'
-import { isLinefeedActingAsEnter, markReturnKeySeen } from '../utils/terminal-enter-detection'
+import {
+  isLinefeedActingAsEnter,
+  markReturnKeySeenForKey,
+} from '../utils/terminal-enter-detection'
 import { supportsTruecolor } from '../utils/theme-system'
 import { calculateNewCursorPosition } from '../utils/word-wrap-utils'
 
@@ -554,9 +557,7 @@ export const MultilineInput = forwardRef<
       const isReturnOrEnter =
         key.name === 'return' || key.name === 'enter' || keypadEnter
 
-      if (isReturnOrEnter) {
-        markReturnKeySeen()
-      }
+      markReturnKeySeenForKey(key)
 
       const linefeedIsEnter = lowerKeyName === 'linefeed' && isLinefeedActingAsEnter()
       const isEnterKey = isReturnOrEnter || linefeedIsEnter

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

@@ -12,7 +12,7 @@ import {
   type ChatKeyboardState,
   type ChatKeyboardAction,
 } from '../utils/keyboard-actions'
-import { markReturnKeySeen } from '../utils/terminal-enter-detection'
+import { markReturnKeySeenForKey } from '../utils/terminal-enter-detection'
 
 import type { KeyEvent } from '@opentui/core'
 
@@ -305,9 +305,7 @@ export function useChatKeyboard({
           reportActivity()
         }
 
-        if (key.name === 'return' || key.name === 'enter') {
-          markReturnKeySeen()
-        }
+        markReturnKeySeenForKey(key)
 
         const action = resolveChatKeyboardAction(key, state)
         const handled = dispatchAction(action, handlers)

cli/src/utils/__tests__/terminal-enter-detection.test.ts

@@ -0,0 +1,42 @@
+import { afterEach, beforeEach, describe, expect, test } from 'bun:test'
+
+import {
+  isLinefeedActingAsEnter,
+  markReturnKeySeenForKey,
+  resetReturnKeySeenForTests,
+  shouldMarkReturnKeySeen,
+} from '../terminal-enter-detection'
+
+describe('terminal enter detection', () => {
+  beforeEach(() => {
+    resetReturnKeySeenForTests(false)
+  })
+
+  afterEach(() => {
+    resetReturnKeySeenForTests()
+  })
+
+  test('marks real carriage-return Enter as return seen', () => {
+    expect(shouldMarkReturnKeySeen({ name: 'return', sequence: '\r' })).toBe(
+      true,
+    )
+
+    markReturnKeySeenForKey({ name: 'return', sequence: '\r' })
+
+    expect(isLinefeedActingAsEnter()).toBe(false)
+  })
+
+  test('does not mark keypad Enter escape sequences as return seen', () => {
+    expect(
+      shouldMarkReturnKeySeen({ name: 'kpenter', sequence: '\x1b[57414u' }),
+    ).toBe(false)
+    expect(shouldMarkReturnKeySeen({ name: '', sequence: '\x1bOM' })).toBe(
+      false,
+    )
+
+    markReturnKeySeenForKey({ name: 'kpenter', sequence: '\x1b[57414u' })
+    markReturnKeySeenForKey({ name: '', sequence: '\x1bOM' })
+
+    expect(isLinefeedActingAsEnter()).toBe(true)
+  })
+})

cli/src/utils/terminal-enter-detection.ts

@@ -5,13 +5,38 @@
  * ever seen a \r ("return") key event. On macOS, Enter always sends \r.
  */
 
-let hasSeenReturnKey = process.platform === 'darwin'
+type EnterDetectionKey = {
+  name?: string
+  sequence?: string
+}
+
+const defaultHasSeenReturnKey = process.platform === 'darwin'
+
+let hasSeenReturnKey = defaultHasSeenReturnKey
+
+export function shouldMarkReturnKeySeen(key: EnterDetectionKey): boolean {
+  return (
+    (key.name === 'return' || key.name === 'enter') && key.sequence === '\r'
+  )
+}
 
 export function markReturnKeySeen(): void {
   hasSeenReturnKey = true
 }
 
+export function markReturnKeySeenForKey(key: EnterDetectionKey): void {
+  if (shouldMarkReturnKeySeen(key)) {
+    markReturnKeySeen()
+  }
+}
+
 /** True when a "linefeed" (\n) key event should be treated as Enter. */
 export function isLinefeedActingAsEnter(): boolean {
   return !hasSeenReturnKey
 }
+
+export function resetReturnKeySeenForTests(
+  hasSeenReturn: boolean = defaultHasSeenReturnKey,
+): void {
+  hasSeenReturnKey = hasSeenReturn
+}