Record return in shared enter detection

Author: jahooma

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

@@ -58,6 +58,13 @@ describe('terminal enter detection', () => {
     expect(isPlainEnterKey({ name: '', sequence: '\x1bOM' })).toBe(true)
   })
 
+  test('plain Enter detection records return before later linefeed checks', () => {
+    expect(isLinefeedActingAsEnter()).toBe(true)
+    expect(isPlainEnterKey({ name: 'return', sequence: '\r' })).toBe(true)
+    expect(isLinefeedActingAsEnter()).toBe(false)
+    expect(isPlainEnterKey({ name: 'linefeed', sequence: '\n' })).toBe(false)
+  })
+
   test('does not recognize modified keypad Enter as plain Enter', () => {
     expect(
       isPlainEnterKey({

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

@@ -25,6 +25,10 @@ export function shouldMarkReturnKeySeen(key: EnterDetectionKey): boolean {
 }
 
 export function isPlainEnterKey(key: EnterDetectionKey): boolean {
+  // Some local interceptors consume Enter before the global keyboard hooks see
+  // it, so record non-keypad Return here before consulting the linefeed fallback.
+  markReturnKeySeenForKey(key)
+
   return (
     (key.name === 'return' ||
       key.name === 'enter' ||