@oxecli/oxe 1.0.104 → 1.0.106

package/README.md

@@ -36,5 +36,9 @@ Install Oxe globally with npm:
 
 
 
+**Info**
+
+
+
 Oxe can inspect your project, make the required changes, run commands, and show you what it is doing along the way.
 

package/dist/engine.js

@@ -82,7 +82,7 @@ export class InferenceEngine {
             }
         }
     }
-    async runTool(name, argumentsJson) {
+    async runTool(name, argumentsJson, signal) {
         let args = {};
         try {
             args = argumentsJson ? JSON.parse(argumentsJson) : {};
@@ -103,7 +103,7 @@ export class InferenceEngine {
                     result = toolEditFile(args.path, args.old_string, args.new_string, args.replace_all);
                     break;
                 case "bash":
-                    result = await toolBash(args.command, args.timeout, args.cwd);
+                    result = await toolBash(args.command, args.timeout, args.cwd, signal);
                     break;
                 case "glob":
                     result = toolGlob(args.pattern, args.path, args.limit, args.depth);
@@ -591,7 +591,7 @@ export class InferenceEngine {
                     dockTransientStart("flush");
                     const toolSpinner = new Spinner();
                     toolSpinner.startDots("\x1b[90m╰─\x1b[0m Working");
-                    const rawResult = await this.runTool(c.name, c.arguments);
+                    const rawResult = await this.runTool(c.name, c.arguments, this.activeAbort?.signal);
                     // A tool call was made, which interrupts any current working phase,
                     // so the next agent iteration may commit a fresh "Worked for …" block.
                     this.workedCommitted = false;

package/dist/tools.js

@@ -586,7 +586,7 @@ function terminateProcessTree(proc) {
         }
     }
 }
-export function toolBash(command, timeout = 60, cwd) {
+export function toolBash(command, timeout = 60, cwd, signal) {
     try {
         let t = typeof timeout === "number" ? timeout : parseInt(String(timeout), 10);
         if (Number.isNaN(t))
@@ -597,6 +597,10 @@ export function toolBash(command, timeout = 60, cwd) {
             return Promise.resolve(`Error: working directory not found: ${cwd}`);
         }
         return new Promise((resolve) => {
+            if (signal && signal.aborted) {
+                resolve("Error: command aborted");
+                return;
+            }
             let child;
             try {
                 if (process.platform === "win32") {
@@ -621,6 +625,18 @@ export function toolBash(command, timeout = 60, cwd) {
             let stdout = "";
             let stderr = "";
             let finished = false;
+            const onAbort = () => {
+                if (finished)
+                    return;
+                terminateProcessTree({
+                    pid: child.pid,
+                    kill: (sig) => child.kill(sig),
+                });
+                finished = true;
+                clearTimeout(timer);
+                resolve("Error: command aborted");
+            };
+            signal?.addEventListener("abort", onAbort, { once: true });
             const timer = setTimeout(() => {
                 if (finished)
                     return;
@@ -633,6 +649,8 @@ export function toolBash(command, timeout = 60, cwd) {
                 if (output)
                     msg += `\n${output}`;
                 finished = true;
+                clearTimeout(timer);
+                signal?.removeEventListener("abort", onAbort);
                 resolve(msg);
             }, t * 1000);
             child.stdout?.on("data", (d) => (stdout += d.toString("utf-8")));
@@ -642,6 +660,7 @@ export function toolBash(command, timeout = 60, cwd) {
                     return;
                 finished = true;
                 clearTimeout(timer);
+                signal?.removeEventListener("abort", onAbort);
                 resolve(`Error: ${err}`);
             });
             child.on("close", (code) => {
@@ -649,6 +668,7 @@ export function toolBash(command, timeout = 60, cwd) {
                     return;
                 finished = true;
                 clearTimeout(timer);
+                signal?.removeEventListener("abort", onAbort);
                 const output = (stdout + stderr).trim() || "(no output)";
                 resolve(`exit code: ${code}\n${output}`);
             });

package/dist/ui.js

@@ -1394,7 +1394,6 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
         let draft = null;
         let bracketedPaste = false;
         let bracketedPasteBuffer = "";
-        let bracketedPasteSince = 0;
         let pasteBurst = false;
         let pasteBurstTimer = null;
         readline.emitKeypressEvents(process.stdin);
@@ -1719,19 +1718,17 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
             const end = "\x1b[201~";
             const sequence = key?.sequence || "";
             const value = str || "";
-            if (!bracketedPaste && (sequence === start || value === start)) {
+            // A new paste-start while already inside a paste means the previous paste
+            // was aborted (its end marker never arrived). Reset and start over so we
+            // never swallow subsequent typing.
+            if ((key?.name === "paste-start" || sequence === start || value === start)) {
                 bracketedPaste = true;
-                bracketedPasteSince = Date.now();
                 bracketedPasteBuffer = "";
                 const inline = value === start ? "" : value.startsWith(start) ? value.slice(start.length) : "";
                 if (inline)
                     bracketedPasteBuffer = inline;
                 if (inline.includes(end)) {
-                    const endAt = inline.indexOf(end);
-                    const pasted = inline
-                        .slice(0, endAt)
-                        .replace(/\r\n/g, "\n")
-                        .replace(/\r/g, "\n");
+                    const pasted = inline.slice(0, inline.indexOf(end)).replace(/\r\n/g, "\n").replace(/\r/g, "\n");
                     bracketedPaste = false;
                     bracketedPasteBuffer = "";
                     if (pasted)
@@ -1742,30 +1739,12 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
             }
             if (!bracketedPaste)
                 return false;
-            // Safety net: if the paste-end marker (\x1b[201~) was lost — interrupted
-            // paste, split escape sequence, or a terminal quirk — bracketedPaste stays
-            // true and every later keystroke is swallowed here, which looks like the
-            // input field locked up (even Ctrl+C is captured as a paste chunk). If the
-            // paste has been open far longer than any real paste takes and a fresh
-            // single-printable-char keystroke arrives, flush the buffered text as
-            // literal input and reset so typing works again.
-            if (Date.now() - bracketedPasteSince > 3000 &&
-                str &&
-                str.length === 1 &&
-                !key?.ctrl &&
-                !key?.meta) {
-                const pasted = bracketedPasteBuffer
-                    .replace(/\r\n/g, "\n")
-                    .replace(/\r/g, "\n");
-                bracketedPaste = false;
-                bracketedPasteBuffer = "";
-                if (pasted) {
-                    insert(pasted, true);
-                    repaint();
-                }
-                return false; // let this keystroke be handled normally below
-            }
-            if (sequence === end || value === end) {
+            // Close on the end marker. readline emits it as a dedicated keypress
+            // (key.name === "paste-end", sequence === \x1b[201~); also scan the raw
+            // value in case a terminal delivers it embedded in a larger chunk.
+            const endAt = value.indexOf(end);
+            if (key?.name === "paste-end" || sequence === end || value === end || endAt >= 0) {
+                bracketedPasteBuffer += endAt >= 0 ? value.slice(0, endAt) : "";
                 const pasted = bracketedPasteBuffer.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
                 bracketedPaste = false;
                 bracketedPasteBuffer = "";
@@ -1775,21 +1754,8 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
                 return true;
             }
             const chunk = value || (sequence && !sequence.startsWith("\x1b[") ? sequence : "");
-            if (chunk) {
-                const endAt = chunk.indexOf(end);
-                if (endAt >= 0) {
-                    bracketedPasteBuffer += chunk.slice(0, endAt);
-                    const pasted = bracketedPasteBuffer.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
-                    bracketedPaste = false;
-                    bracketedPasteBuffer = "";
-                    if (pasted)
-                        insert(pasted, true);
-                    repaint();
-                }
-                else {
-                    bracketedPasteBuffer += chunk;
-                }
-            }
+            if (chunk)
+                bracketedPasteBuffer += chunk;
             return true;
         };
         const markPasteBurst = () => {
@@ -1802,14 +1768,9 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
             }, 500);
         };
         const onKeypress = (str, key) => {
-            if (consumeBracketedPaste(str, key))
-                return;
-            if (pasteBurst && str && str.length === 1 && !key?.ctrl && !key?.meta) {
-                pasteBurst = false;
-                if (pasteBurstTimer)
-                    clearTimeout(pasteBurstTimer);
-                pasteBurstTimer = null;
-            }
+            // Interrupts (Ctrl+C/D/Z) must be handled BEFORE bracketed-paste capture so
+            // that even a stuck/interrupted paste can always be escaped — otherwise the
+            // paste handler swallows them and the field appears locked with no way out.
             if (key && key.ctrl && key.name === "c") {
                 settle(new Error("interrupt"), true);
                 return;
@@ -1818,6 +1779,14 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
                 settle(new Error("eof"), true);
                 return;
             }
+            if (consumeBracketedPaste(str, key))
+                return;
+            if (pasteBurst && str && str.length === 1 && !key?.ctrl && !key?.meta) {
+                pasteBurst = false;
+                if (pasteBurstTimer)
+                    clearTimeout(pasteBurstTimer);
+                pasteBurstTimer = null;
+            }
             if (key && key.ctrl && key.name === "a") {
                 cursor = 0;
                 repaint();

package/package.json

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