Gate the CRLF-submit fallback on never having seen a real paste

The guard from the previous commit ran on every keystroke regardless of
whether the terminal actually needed it. A terminal proves it negotiates
DEC 2004 the first time it fires a real paste event -- from then on every
paste arrives as that one event, never as raw keystrokes, so the fallback
has nothing left to guard against. Retire it for the session once that
happens instead of re-running it forever; terminals that never send a
paste event keep the guard, since they've never shown they can do better.

Also moves the bookkeeping (last keypress time, whether it was printable,
whether to swallow the next linefeed) off AppShell and into the key
handler's own closure -- nothing outside that handler read it.

Author: TheGreatAxios

src/tui-opentui/prompt-features.test.ts

@@ -281,6 +281,49 @@ describe("un-bracketed paste vs. deliberate Enter", () => {
       { width: 80, height: 24 },
     )
   })
+
+  // The false-positive direction: once this terminal has proven it negotiates
+  // DEC 2004 by firing one real bracketed paste, the raw-keystroke fallback
+  // must retire for the rest of the session -- otherwise a fast typist's
+  // genuine Enter risks being read as paste forever, on every keystroke, on
+  // every terminal, most of which never needed the fallback at all.
+  //
+  // This cannot be distinguished from actual paste by timing alone: the
+  // harness dispatches keys synchronously, so a "fast typist" and a "paste
+  // replay" produce the identical zero-elapsed-time shape. The capability
+  // gate is what makes the distinction possible -- this test exercises that
+  // gate, not a timing threshold.
+  test("a keystroke burst after a real paste no longer triggers the CRLF fallback", async () => {
+    await withTestRenderer(
+      async (h) => {
+        const shell = createAppShell(h.renderer, {
+          terminal: { columns: 80, rows: 24 },
+          wireKeys: true,
+          run: "idle",
+        })
+        try {
+          const submitted: string[] = []
+          setShellBridgeHooks(shell, {
+            onSubmit: (text) => submitted.push(text),
+            onInterrupt: () => {},
+            exclusive: true,
+          })
+          shell.prompt.focus()
+          await h.mockInput.pasteBracketedText("proves DEC 2004")
+          shell.prompt.value = ""
+
+          await h.mockInput.typeText("hi\r")
+          await h.renderOnce()
+
+          expect(submitted).toEqual(["hi"])
+          expect(shell.prompt.value).toBe("")
+        } finally {
+          shell.dispose()
+        }
+      },
+      { width: 80, height: 24 },
+    )
+  })
 })
 
 describe("sent-message recall", () => {

src/tui-opentui/shell.ts

@@ -665,12 +665,6 @@ export type AppShell = {
    * ./prompt-kill-ring.js).
    */
   promptKillRing: KillRing
-  /** `Date.now()` of the last keypress; detects an un-bracketed paste burst (see `PASTE_BURST_MS`). */
-  lastKeyAt: number
-  /** Whether that last keypress inserted a plain character (see `isPrintableInsertKey`). */
-  lastKeyWasPrintable: boolean
-  /** A converted CR is about to be followed by its CRLF partner LF; swallow that LF. */
-  suppressNextLinefeed: boolean
   /** Images attached with Ctrl+P, sent with the next prompt submit. */
   pendingAttachments: PendingImageAttachment[]
   /** Up/Down recall of messages already sent in this session. */
@@ -4542,6 +4536,21 @@ export function createAppShell(
     session = enqueue(session, `seed-${i + 1}`)
   }
 
+  // A real bracketed-paste event proves this terminal negotiates DEC 2004:
+  // every paste from here on arrives as one `paste` event, never as raw
+  // keystrokes, so the CRLF-submit fallback below has nothing left to guard
+  // against and turns itself off for the rest of the session. Terminals that
+  // never send one keep the guard, since they've never shown they can do
+  // better. Un-bracketed-paste bookkeeping only this key handler reads, so it
+  // lives in this closure rather than on the shared AppShell.
+  let sawBracketedPaste = false
+  let lastKeyAt = 0
+  let lastKeyWasPrintable = false
+  let suppressNextLinefeed = false
+  const onPaste = (): void => {
+    sawBracketedPaste = true
+  }
+
   const onKey = (key: KeyEvent): void => {
     if (disposed) return
 
@@ -4690,43 +4699,45 @@ export function createAppShell(
     // Ctrl+Y/Alt+Y need somewhere to yank it back from.
     const keyName = typeof key.name === "string" ? key.name.toLowerCase() : ""
 
-    // The LF half of a CRLF pair the block below just turned into a newline:
-    // without this, "line one\r\nline two" would insert two newlines, one for
-    // the converted CR and one for the LF arriving right behind it.
-    const suppressLinefeed = shell.suppressNextLinefeed
-    shell.suppressNextLinefeed = false
-    if (suppressLinefeed && keyName === "linefeed" && !key.ctrl && !key.meta && !key.option) {
-      key.preventDefault()
-      return
-    }
+    // Everything below this line is the un-bracketed-paste fallback, and a
+    // terminal that has ever fired a real `paste` event has proven it never
+    // needs it: every future paste arrives as one `paste` event, not raw
+    // keystrokes, so re-running these checks on it would only risk a false
+    // positive for no benefit.
+    if (!sawBracketedPaste) {
+      // The LF half of a CRLF pair the block below just turned into a
+      // newline: without this, "line one\r\nline two" would insert two
+      // newlines, one for the converted CR and one for the LF right behind it.
+      const suppressLinefeed = suppressNextLinefeed
+      suppressNextLinefeed = false
+      if (suppressLinefeed && keyName === "linefeed" && !key.ctrl && !key.meta && !key.option) {
+        key.preventDefault()
+        return
+      }
 
-    // A terminal that never negotiated bracketed paste (DEC 2004) hands a
-    // multi-line paste to us as ordinary keystrokes, CR and all -- and a bare
-    // CR is the same "return" that submits. Left alone, pasting three lines
-    // sends three separate messages instead of composing one. Bracketed paste
-    // delivers the whole blob as one `paste` event and never reaches here, so
-    // this only fires on the raw-keystroke fallback.
-    //
-    // Detecting it needs two signals, not one: a lone fast Enter can happen
-    // (key rollover, a scripted "send keys"), and a lone printable character
-    // right before Enter is just typing. What never happens from a human is a
-    // printable character landing, then Enter, both inside a keystroke burst
-    // — that shape is unique to a paste being replayed byte-for-byte. Gating
-    // on both keeps a deliberate Ctrl+J-then-Enter (newline, then send) safe,
-    // since Ctrl+J is not "a printable character," while still catching
-    // "...end of line one<CR><LF>line two..." arriving as raw keystrokes.
-    const now = Date.now()
-    const sincePreviousKey = now - shell.lastKeyAt
-    const previousKeyWasPrintable = shell.lastKeyWasPrintable
-    shell.lastKeyAt = now
-    shell.lastKeyWasPrintable = isPrintableInsertKey(key)
-    const isBareReturn =
-      !key.ctrl && !key.meta && !key.option && (keyName === "return" || keyName === "kpenter")
-    if (isBareReturn && previousKeyWasPrintable && sincePreviousKey < PASTE_BURST_MS) {
-      key.preventDefault()
-      shell.prompt.insertText("\n")
-      shell.suppressNextLinefeed = true
-      return
+      // A bare CR is the same "return" that submits. Left alone, pasting
+      // three lines here sends three separate messages instead of composing
+      // one. Detecting it needs two signals, not one: a lone fast Enter can
+      // happen (key rollover, a scripted "send keys"), and a lone printable
+      // character right before Enter is just typing. What never happens from
+      // a human is a printable character landing, then Enter, both inside a
+      // keystroke burst -- that shape is unique to a paste being replayed
+      // byte-for-byte. Gating on both keeps a deliberate Ctrl+J-then-Enter
+      // (newline, then send) safe, since Ctrl+J is not "a printable
+      // character," while still catching "...line one<CR><LF>line two...".
+      const now = Date.now()
+      const sincePreviousKey = now - lastKeyAt
+      const previousKeyWasPrintable = lastKeyWasPrintable
+      lastKeyAt = now
+      lastKeyWasPrintable = isPrintableInsertKey(key)
+      const isBareReturn =
+        !key.ctrl && !key.meta && !key.option && (keyName === "return" || keyName === "kpenter")
+      if (isBareReturn && previousKeyWasPrintable && sincePreviousKey < PASTE_BURST_MS) {
+        key.preventDefault()
+        shell.prompt.insertText("\n")
+        suppressNextLinefeed = true
+        return
+      }
     }
 
     const isCtrlKillYank =
@@ -4989,6 +5000,7 @@ export function createAppShell(
 
   if (wireKeys) {
     renderer.keyInput.on("keypress", onKey)
+    renderer.keyInput.on("paste", onPaste)
     prompt.onSubmit = onEnter
   }
   renderer.on(CliRenderEvents.FRAME, onFrame)
@@ -5047,9 +5059,6 @@ export function createAppShell(
     parentStreamLog: null,
     parentStreamLogBase: null,
     promptKillRing: emptyKillRing,
-    lastKeyAt: 0,
-    lastKeyWasPrintable: false,
-    suppressNextLinefeed: false,
     pendingAttachments: [],
     sentHistory: createSentHistoryBrowse([]),
     disposed: false,
@@ -5059,6 +5068,7 @@ export function createAppShell(
       shell.disposed = true
       if (wireKeys) {
         renderer.keyInput.off("keypress", onKey)
+        renderer.keyInput.off("paste", onPaste)
         prompt.onSubmit = undefined
       }
       renderer.off(CliRenderEvents.FRAME, onFrame)