@oxecli/oxe 1.0.105 → 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/package.json

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