@oxecli/oxe 1.0.64 → 1.0.66

package/dist/cli.js

@@ -466,7 +466,10 @@ export class CLI {
                         this.story[this.story.length - 1]["type"] === "user") {
                         this.story.pop();
                     }
-                    if (this.interruptPending) {
+                    // Exit cleanly on: a second Ctrl+C, or a first Ctrl+C while idle
+                    // (no active query). Only an in-flight query's first Ctrl+C keeps
+                    // running so the agent can be interrupted without a stray key exiting.
+                    if (this.interruptPending || !wasActive) {
                         this.saveSession(engine);
                         await engine.cleanupStoredResponses();
                         process.stdout.write("\nClosing terminal session. Goodbye!\n\n");
@@ -474,9 +477,7 @@ export class CLI {
                     }
                     this.interruptPending = true;
                     process.stdout.write("\n");
-                    process.stdout.write(wasActive
-                        ? "\x1b[2mInterrupted agent. Press Ctrl+C again to exit, or type a new prompt.\x1b[0m\n"
-                        : "\x1b[2mNo active query. Press Ctrl+C again to exit.\x1b[0m\n");
+                    process.stdout.write("\x1b[2mInterrupted agent. Press Ctrl+C again to exit, or type a new prompt.\x1b[0m\n");
                     continue;
                 }
                 throw err;

package/dist/ui.js

@@ -902,10 +902,37 @@ export function renderBufferWithCursor(buffer, pasteSpans, prefix, label, cursor
     const totalRows = body.length + 2;
     return { frame, cursorRow, cursorCol, totalRows };
 }
+/**
+ * Generic CSI Shift+Enter detection. The modifier encoding used by CSI-u,
+ * legacy and kitty/modifyOtherKeys is a bitmask + 1, where Shift is bit0
+ * (so modifier 2 = shift, 4 = shift+alt, 6 = shift+ctrl, ...). Enter has
+ * key code 13. Handles:
+ *   CSI-u / legacy:      ESC [ 13 ; M u   and   ESC [ 13 ; M ~
+ *   modifyOtherKeys:     ESC [ 27 ; M ; 13 ~
+ *   application:         ESC O M
+ */
+function csiShiftEnter(seq) {
+    if (seq === "\x1bOM")
+        return true;
+    // modifyOtherKeys: ESC [ 27 ; M ; 13 ~
+    const mod = seq.match(/^\x1b\[27;(\d+);13[~_]$/);
+    if (mod) {
+        const m = parseInt(mod[1], 10);
+        return Number.isInteger(m) && ((m - 1) & 1) === 1;
+    }
+    // CSI-u / legacy: ESC [ 13 ; M u  (or ~ or _)
+    const csi = seq.match(/^\x1b\[13;(\d+)[~u_]$/);
+    if (csi) {
+        const m = parseInt(csi[1], 10);
+        return Number.isInteger(m) && ((m - 1) & 1) === 1;
+    }
+    return false;
+}
 export function isShiftEnterKey(str, key) {
     if (!key)
         return false;
     const seq = key.sequence || str || "";
+    // Shift modifier reported by readline on a return/enter/linefeed key.
     if (key.shift &&
         (key.name === "return" ||
             key.name === "enter" ||
@@ -914,13 +941,8 @@ export function isShiftEnterKey(str, key) {
             seq === "\n")) {
         return true;
     }
-    if (seq === "\x1b[13;2u" ||
-        seq === "\x1b[13;2~" ||
-        seq === "\x1b[13;2_" ||
-        seq === "\x1b[27;2;13~" ||
-        seq === "\x1bOM") {
+    if (csiShiftEnter(seq))
         return true;
-    }
     return false;
 }
 export const isNewlineKey = isShiftEnterKey;
@@ -973,6 +995,9 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
         if (process.stdin.isTTY) {
             process.stdin.setRawMode(true);
             process.stdout.write("\x1b[?2004h");
+            // Enable CSI-u "disambiguate" (flags=1) so a terminal that supports it
+            // reports Shift+Enter as a distinct `ESC [ 13 ; 2 u` code instead of
+            // collapsing it into a plain Enter.
             process.stdout.write("\x1b[>1u");
         }
         process.stdin.resume();
@@ -1003,6 +1028,7 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
             clearBox();
             process.stdin.removeListener("keypress", onKeypress);
             process.stdin.pause();
+            showCursor();
             if (isErr)
                 reject(value);
             else
@@ -1319,17 +1345,17 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = []) {
         const onKeypress = (str, key) => {
             // Reassemble a modifier-prefixed CSI sequence that readline splits up,
             // e.g. Shift+Enter arriving as `\x1b[27;2;` + "1" + "3" + "~".
-            if (key?.sequence === "\x1b[27;2;") {
-                modSeq = "\x1b[27;2;";
+            if (key?.sequence === "\x1b[27;" || key?.sequence === "\x1b[27;2;") {
+                modSeq = key.sequence;
                 return;
             }
             if (modSeq) {
                 modSeq += str || key?.sequence || "";
-                if (modSeq.endsWith("~")) {
+                if (/[~u_]/.test(modSeq.slice(-1)) || modSeq.endsWith("~")) {
                     const full = modSeq;
                     modSeq = "";
-                    // `\x1b[27;2;13~` is Shift+Enter (modifier 2 = shift, key 13 = Enter).
-                    if (full === "\x1b[27;2;13~") {
+                    // e.g. `\x1b[27;2;13~` = Shift+Enter.
+                    if (csiShiftEnter(full)) {
                         insert("\n");
                         repaint();
                     }

package/package.json

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