@oxecli/oxe 1.0.67 → 1.0.69

package/dist/ui.js

@@ -9,7 +9,7 @@ export function enableRawStdin() {
         readline.emitKeypressEvents(process.stdin);
         if (process.stdin.isTTY) {
             process.stdin.setRawMode(true);
-            process.stdout.write("\x1b[?9001h\x1b[>1u");
+            process.stdout.write("\x1b[>1u");
         }
         process.stdin.resume();
         hideCursor();
@@ -927,7 +927,7 @@ export function renderBufferWithCursor(buffer, pasteSpans, prefix, label, cursor
  *   application (SS3):        ESC O M
  *   win32-input-mode:         ESC [ G ; R ; C ; VK ; MOD u
  *                             (VK = 13 for Enter, MOD = raw bitmask where
- *                              bit0 = Shift)
+ *                              bit2 = Shift)
  */
 function parseEnterSequence(seq) {
     if (!seq)
@@ -939,7 +939,7 @@ function parseEnterSequence(seq) {
         if (vk !== 13)
             return null;
         const mod = parseInt(m[5], 10);
-        return mod & 1 ? "newline" : "submit";
+        return mod & 4 ? "newline" : "submit";
     }
     // modifyOtherKeys / kitty: ESC [ 27 ; M ; 13 ~ (or _)
     m = seq.match(/^\x1b\[27;(\d+);13[~_]$/);
@@ -1045,9 +1045,10 @@ function decodeWin32Key(seq) {
         return null;
     const vk = parseInt(m[4], 10);
     const mod = parseInt(m[5], 10);
-    const shift = (mod & 1) === 1;
-    const ctrl = (mod & 4) === 4;
-    const alt = (mod & 2) === 2;
+    // win32-input-mode MOD bitmask: bit2 = Shift, bit1 = Ctrl, bit0 = Alt
+    const shift = (mod & 4) === 4;
+    const ctrl = (mod & 2) === 2;
+    const alt = (mod & 1) === 1;
     const cmd = (c) => ({ type: "cmd", cmd: c });
     const text = (t) => ({ type: "text", text: t });
     // Control combos
@@ -1136,14 +1137,19 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
         // `\x1b[27;2;13~`), which Node's readline splits into several keypress
         // events instead of one, so they must be reassembled here.
         let modSeq = "";
+        let modSeqTimeout = null;
         readline.emitKeypressEvents(process.stdin);
         if (process.stdin.isTTY) {
             process.stdin.setRawMode(true);
             process.stdout.write("\x1b[?2004h");
-            // Enable win32-input-mode (preferred by Windows Terminal) and CSI-u
-            // disambiguation so Shift+Enter arrives as a distinct code instead of a
-            // plain Enter. Harmless if a terminal doesn't support them.
-            process.stdout.write("\x1b[?9001h\x1b[>1u");
+            // Enable CSI-u disambiguation so Shift+Enter arrives as a distinct code
+            // (`\x1b[13;2u`) instead of a plain Enter. Plain keys still arrive as
+            // single keypress events. Deliberately NOT enabling win32-input-mode
+            // (`\x1b[?9001h`): it rewrites EVERY keystroke into a long CSI sequence
+            // that readline splits across many events, and an interrupted split
+            // leaves modSeq stuck so the next keystroke is silently dropped —
+            // that regression made typing in the prompt impossible.
+            process.stdout.write("\x1b[>1u");
         }
         process.stdin.resume();
         hideCursor();
@@ -1166,10 +1172,12 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
             if (done)
                 return;
             done = true;
-            process.stdout.write("\x1b[?2004l\x1b[?9001l");
+            process.stdout.write("\x1b[?2004l");
             process.stdin.setRawMode(false);
             if (pasteBurstTimer)
                 clearTimeout(pasteBurstTimer);
+            if (modSeqTimeout)
+                clearTimeout(modSeqTimeout);
             clearBox();
             process.stdin.removeListener("keypress", onKeypress);
             process.stdin.pause();
@@ -1583,25 +1591,43 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
             }
         };
         const onKeypress = (str, key) => {
-            // Reassemble modifier-prefixed / win32-input-mode CSI sequences, which
-            // Node's readline splits into several keypress events (e.g. Shift+Enter
-            // arriving as `\x1b[27;2;` + "1" + "3" + "~", or a win32-input-mode
-            // sequence `\x1b[0;1;1;13;2u` arriving piecemeal). A "partial CSI" is
-            // any ESC [ sequence readline left unterminated; we keep appending until
-            // it ends in a terminator, then classify it.
+            // Reassemble modifier-prefixed CSI sequences that Node's readline may
+            // split across keypress events (e.g. `\x1b[13;2u` arriving as `\x1b[13;2`
+            // + "u"). Only start/continue accumulation on bytes that can belong to a
+            // CSI sequence: digits / `;` while incomplete, or a terminator byte
+            // [A-Z~_u] that completes it. Any other keystroke (a typed letter, for
+            // instance) ABANDONS the partial instead of being swallowed, so a stuck
+            // partial can never eat input.
             const seq = key?.sequence || str || "";
-            if (modSeq) {
-                modSeq += str || seq || "";
-                if (/^\x1b\[[\d;]*[a-zA-Z~_u]$/.test(modSeq)) {
-                    const full = modSeq;
+            if (seq.startsWith("\x1b[") && /^\x1b\[[\d;]*$/.test(seq)) {
+                modSeq = seq;
+                if (modSeqTimeout)
+                    clearTimeout(modSeqTimeout);
+                modSeqTimeout = setTimeout(() => {
                     modSeq = "";
-                    handleRawSequence(full);
-                }
+                    modSeqTimeout = null;
+                }, 200);
                 return;
             }
-            if (/^\x1b\[[\d;]*$/.test(seq)) {
-                modSeq = seq;
-                return;
+            if (modSeq) {
+                const s = str ?? seq ?? "";
+                const completes = /^\x1b\[[\d;]*[A-Z~_u]$/.test(modSeq + s);
+                if (/^[0-9;]$/.test(s) || completes) {
+                    modSeq += s;
+                    if (completes) {
+                        const full = modSeq;
+                        modSeq = "";
+                        if (modSeqTimeout)
+                            clearTimeout(modSeqTimeout);
+                        modSeqTimeout = null;
+                        handleRawSequence(full);
+                    }
+                    return;
+                }
+                modSeq = "";
+                if (modSeqTimeout)
+                    clearTimeout(modSeqTimeout);
+                modSeqTimeout = null;
             }
             if (consumeBracketedPaste(str, key))
                 return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxecli/oxe",
-  "version": "1.0.67",
+  "version": "1.0.69",
   "publishConfig": {
     "access": "public"
   },