indusagi 0.13.8 → 0.13.9

package/dist/interop.js

@@ -691,7 +691,7 @@ var ToolRegistry = class {
 
 // src/capabilities/backends/node-backends.ts
 import { promises as fsp } from "node:fs";
-import { spawn as childSpawn } from "node:child_process";
+import { spawn as childSpawn, spawnSync } from "node:child_process";
 var NodeFs = class {
   async readFile(path, encoding) {
     if (encoding === void 0) {
@@ -751,6 +751,21 @@ function joinChunks(chunks) {
 function asSignal(signal) {
   return signal;
 }
+function killProcessTree(child, signal = "SIGTERM") {
+  if (child.pid === void 0) return;
+  if (process.platform === "win32") {
+    spawnSync("taskkill", ["/F", "/T", "/PID", String(child.pid)], {
+      stdio: "ignore",
+      windowsHide: true
+    });
+    return;
+  }
+  try {
+    process.kill(-child.pid, signal);
+  } catch {
+    child.kill(signal);
+  }
+}
 var NodeShell = class {
   exec(command, options) {
     if (typeof command !== "string" || command.length === 0) {
@@ -761,21 +776,30 @@ var NodeShell = class {
     return new Promise((resolve, reject) => {
       const child = childSpawn(command, {
         shell: true,
+        detached: process.platform !== "win32",
         cwd: options?.cwd,
-        env: options?.env ? { ...process.env, ...options.env } : process.env,
-        signal: options?.signal
+        env: options?.env ? { ...process.env, ...options.env } : process.env
       });
       const out = [];
       const err = [];
       let settled = false;
       let timedOut = false;
+      let aborted = false;
       let timer;
+      const abortSignal = options?.signal;
+      const onAbort = () => {
+        aborted = true;
+        killProcessTree(child);
+      };
       const finish = (fn) => {
         if (settled) return;
         settled = true;
         if (timer !== void 0) clearTimeout(timer);
+        abortSignal?.removeEventListener("abort", onAbort);
         fn();
       };
+      abortSignal?.addEventListener("abort", onAbort, { once: true });
+      if (abortSignal?.aborted) onAbort();
       child.stdout?.on("data", (chunk) => out.push(chunk));
       child.stderr?.on("data", (chunk) => err.push(chunk));
       if (options?.input !== void 0 && child.stdin) {
@@ -788,7 +812,7 @@ var NodeShell = class {
       if (limit !== void 0 && limit > 0) {
         timer = setTimeout(() => {
           timedOut = true;
-          child.kill("SIGTERM");
+          killProcessTree(child);
         }, limit);
       }
       child.on("error", (cause) => {
@@ -804,6 +828,10 @@ var NodeShell = class {
             );
             return;
           }
+          if (aborted) {
+            reject(new Error("The command was aborted and stopped."));
+            return;
+          }
           resolve({
             stdout: joinChunks(out),
             stderr: joinChunks(err),
@@ -821,11 +849,11 @@ var NodeShell = class {
     }
     const child = childSpawn(command, {
       shell: true,
+      detached: process.platform !== "win32",
       cwd: options?.cwd,
-      env: options?.env ? { ...process.env, ...options.env } : process.env,
-      signal: options?.signal
+      env: options?.env ? { ...process.env, ...options.env } : process.env
     });
-    return new NodeShellHandle(child);
+    return new NodeShellHandle(child, options?.signal);
   }
 };
 var NodeShellHandle = class {
@@ -834,27 +862,33 @@ var NodeShellHandle = class {
   exited = false;
   exitCode = null;
   exitSignal = null;
-  constructor(child) {
+  abortSignal;
+  onAbort = () => this.kill();
+  constructor(child, abortSignal) {
     this.child = child;
+    this.abortSignal = abortSignal;
     child.once(
       "close",
       (code, signal) => {
         this.exited = true;
         this.exitCode = code;
         this.exitSignal = asSignal(signal);
+        this.abortSignal?.removeEventListener("abort", this.onAbort);
         for (const listener of [...this.listeners]) {
           listener(this.exitCode, this.exitSignal);
         }
         this.listeners.clear();
       }
     );
+    this.abortSignal?.addEventListener("abort", this.onAbort, { once: true });
+    if (this.abortSignal?.aborted) this.onAbort();
   }
   get pid() {
     return this.child.pid;
   }
   kill(signal) {
     if (this.exited) return;
-    this.child.kill(signal ?? "SIGTERM");
+    killProcessTree(this.child, signal);
   }
   onExit(listener) {
     if (this.exited) {
@@ -2269,9 +2303,6 @@ function readInput2(raw) {
   }
   return { action, command, id };
 }
-function shellQuote(value) {
-  return `'${value.replace(/'/g, `'\\''`)}'`;
-}
 async function drainCapture(ctx, path, alreadyRead) {
   let full;
   try {
@@ -2307,7 +2338,7 @@ async function startJob(ctx, command) {
   await ctx.fs.mkdir(scratchDir, { recursive: true });
   await ctx.fs.writeFile(outPath, "", "utf8");
   await ctx.fs.writeFile(errPath, "", "utf8");
-  const wrapped = `( ${command} ) >${shellQuote(outPath)} 2>${shellQuote(errPath)}`;
+  const wrapped = `( ${command} ) >${SCRATCH_DIR}/${id}.out 2>${SCRATCH_DIR}/${id}.err`;
   const handle = ctx.shell.spawn(wrapped, { cwd: ctx.cwd });
   const entry = {
     id,
@@ -2387,7 +2418,7 @@ async function pollJob(ctx, id) {
     hadNewOutput: out.fresh.length > 0 || err.fresh.length > 0
   });
 }
-function stopJob(id) {
+async function stopJob(id) {
   const entry = table.remove(id);
   if (entry === void 0) {
     return asText2(
@@ -2395,14 +2426,24 @@ function stopJob(id) {
       true
     );
   }
-  entry.unsubscribe();
   const wasRunning = entry.state === "running";
   if (wasRunning) {
-    try {
-      entry.handle.kill();
-    } catch {
-    }
+    await new Promise((resolve) => {
+      let unsubscribeExit = () => {
+      };
+      unsubscribeExit = entry.handle.onExit(() => {
+        unsubscribeExit();
+        resolve();
+      });
+      try {
+        entry.handle.kill();
+      } catch {
+        unsubscribeExit();
+        resolve();
+      }
+    });
   }
+  entry.unsubscribe();
   return asJson({
     action: "stop",
     id: entry.id,

package/dist/shell-app.js

@@ -5033,7 +5033,7 @@ var ToolRegistry = class {
 
 // src/capabilities/backends/node-backends.ts
 import { promises as fsp } from "node:fs";
-import { spawn as childSpawn } from "node:child_process";
+import { spawn as childSpawn, spawnSync } from "node:child_process";
 var NodeFs = class {
   async readFile(path2, encoding) {
     if (encoding === void 0) {
@@ -5093,6 +5093,21 @@ function joinChunks(chunks) {
 function asSignal(signal) {
   return signal;
 }
+function killProcessTree(child, signal = "SIGTERM") {
+  if (child.pid === void 0) return;
+  if (process.platform === "win32") {
+    spawnSync("taskkill", ["/F", "/T", "/PID", String(child.pid)], {
+      stdio: "ignore",
+      windowsHide: true
+    });
+    return;
+  }
+  try {
+    process.kill(-child.pid, signal);
+  } catch {
+    child.kill(signal);
+  }
+}
 var NodeShell = class {
   exec(command, options) {
     if (typeof command !== "string" || command.length === 0) {
@@ -5103,21 +5118,30 @@ var NodeShell = class {
     return new Promise((resolve2, reject) => {
       const child = childSpawn(command, {
         shell: true,
+        detached: process.platform !== "win32",
         cwd: options?.cwd,
-        env: options?.env ? { ...process.env, ...options.env } : process.env,
-        signal: options?.signal
+        env: options?.env ? { ...process.env, ...options.env } : process.env
       });
       const out = [];
       const err = [];
       let settled2 = false;
       let timedOut = false;
+      let aborted = false;
       let timer;
+      const abortSignal = options?.signal;
+      const onAbort = () => {
+        aborted = true;
+        killProcessTree(child);
+      };
       const finish = (fn) => {
         if (settled2) return;
         settled2 = true;
         if (timer !== void 0) clearTimeout(timer);
+        abortSignal?.removeEventListener("abort", onAbort);
         fn();
       };
+      abortSignal?.addEventListener("abort", onAbort, { once: true });
+      if (abortSignal?.aborted) onAbort();
       child.stdout?.on("data", (chunk) => out.push(chunk));
       child.stderr?.on("data", (chunk) => err.push(chunk));
       if (options?.input !== void 0 && child.stdin) {
@@ -5130,7 +5154,7 @@ var NodeShell = class {
       if (limit !== void 0 && limit > 0) {
         timer = setTimeout(() => {
           timedOut = true;
-          child.kill("SIGTERM");
+          killProcessTree(child);
         }, limit);
       }
       child.on("error", (cause) => {
@@ -5146,6 +5170,10 @@ var NodeShell = class {
             );
             return;
           }
+          if (aborted) {
+            reject(new Error("The command was aborted and stopped."));
+            return;
+          }
           resolve2({
             stdout: joinChunks(out),
             stderr: joinChunks(err),
@@ -5163,11 +5191,11 @@ var NodeShell = class {
     }
     const child = childSpawn(command, {
       shell: true,
+      detached: process.platform !== "win32",
       cwd: options?.cwd,
-      env: options?.env ? { ...process.env, ...options.env } : process.env,
-      signal: options?.signal
+      env: options?.env ? { ...process.env, ...options.env } : process.env
     });
-    return new NodeShellHandle(child);
+    return new NodeShellHandle(child, options?.signal);
   }
 };
 var NodeShellHandle = class {
@@ -5176,27 +5204,33 @@ var NodeShellHandle = class {
   exited = false;
   exitCode = null;
   exitSignal = null;
-  constructor(child) {
+  abortSignal;
+  onAbort = () => this.kill();
+  constructor(child, abortSignal) {
     this.child = child;
+    this.abortSignal = abortSignal;
     child.once(
       "close",
       (code, signal) => {
         this.exited = true;
         this.exitCode = code;
         this.exitSignal = asSignal(signal);
+        this.abortSignal?.removeEventListener("abort", this.onAbort);
         for (const listener of [...this.listeners]) {
           listener(this.exitCode, this.exitSignal);
         }
         this.listeners.clear();
       }
     );
+    this.abortSignal?.addEventListener("abort", this.onAbort, { once: true });
+    if (this.abortSignal?.aborted) this.onAbort();
   }
   get pid() {
     return this.child.pid;
   }
   kill(signal) {
     if (this.exited) return;
-    this.child.kill(signal ?? "SIGTERM");
+    killProcessTree(this.child, signal);
   }
   onExit(listener) {
     if (this.exited) {
@@ -6627,9 +6661,6 @@ function readInput2(raw) {
   }
   return { action, command, id };
 }
-function shellQuote(value) {
-  return `'${value.replace(/'/g, `'\\''`)}'`;
-}
 async function drainCapture(ctx, path2, alreadyRead) {
   let full;
   try {
@@ -6665,7 +6696,7 @@ async function startJob(ctx, command) {
   await ctx.fs.mkdir(scratchDir, { recursive: true });
   await ctx.fs.writeFile(outPath, "", "utf8");
   await ctx.fs.writeFile(errPath, "", "utf8");
-  const wrapped = `( ${command} ) >${shellQuote(outPath)} 2>${shellQuote(errPath)}`;
+  const wrapped = `( ${command} ) >${SCRATCH_DIR}/${id}.out 2>${SCRATCH_DIR}/${id}.err`;
   const handle = ctx.shell.spawn(wrapped, { cwd: ctx.cwd });
   const entry = {
     id,
@@ -6745,7 +6776,7 @@ async function pollJob(ctx, id) {
     hadNewOutput: out.fresh.length > 0 || err.fresh.length > 0
   });
 }
-function stopJob(id) {
+async function stopJob(id) {
   const entry = table.remove(id);
   if (entry === void 0) {
     return asText2(
@@ -6753,14 +6784,24 @@ function stopJob(id) {
       true
     );
   }
-  entry.unsubscribe();
   const wasRunning = entry.state === "running";
   if (wasRunning) {
-    try {
-      entry.handle.kill();
-    } catch {
-    }
+    await new Promise((resolve2) => {
+      let unsubscribeExit = () => {
+      };
+      unsubscribeExit = entry.handle.onExit(() => {
+        unsubscribeExit();
+        resolve2();
+      });
+      try {
+        entry.handle.kill();
+      } catch {
+        unsubscribeExit();
+        resolve2();
+      }
+    });
   }
+  entry.unsubscribe();
   return asJson({
     action: "stop",
     id: entry.id,

package/dist/smithy.js

@@ -540,7 +540,7 @@ var ToolRegistry = class {
 
 // src/capabilities/backends/node-backends.ts
 import { promises as fsp } from "node:fs";
-import { spawn as childSpawn } from "node:child_process";
+import { spawn as childSpawn, spawnSync } from "node:child_process";
 var NodeFs = class {
   async readFile(path, encoding) {
     if (encoding === void 0) {
@@ -600,6 +600,21 @@ function joinChunks(chunks) {
 function asSignal(signal) {
   return signal;
 }
+function killProcessTree(child, signal = "SIGTERM") {
+  if (child.pid === void 0) return;
+  if (process.platform === "win32") {
+    spawnSync("taskkill", ["/F", "/T", "/PID", String(child.pid)], {
+      stdio: "ignore",
+      windowsHide: true
+    });
+    return;
+  }
+  try {
+    process.kill(-child.pid, signal);
+  } catch {
+    child.kill(signal);
+  }
+}
 var NodeShell = class {
   exec(command, options) {
     if (typeof command !== "string" || command.length === 0) {
@@ -610,21 +625,30 @@ var NodeShell = class {
     return new Promise((resolve2, reject) => {
       const child = childSpawn(command, {
         shell: true,
+        detached: process.platform !== "win32",
         cwd: options?.cwd,
-        env: options?.env ? { ...process.env, ...options.env } : process.env,
-        signal: options?.signal
+        env: options?.env ? { ...process.env, ...options.env } : process.env
       });
       const out = [];
       const err = [];
       let settled2 = false;
       let timedOut = false;
+      let aborted = false;
       let timer;
+      const abortSignal = options?.signal;
+      const onAbort = () => {
+        aborted = true;
+        killProcessTree(child);
+      };
       const finish = (fn) => {
         if (settled2) return;
         settled2 = true;
         if (timer !== void 0) clearTimeout(timer);
+        abortSignal?.removeEventListener("abort", onAbort);
         fn();
       };
+      abortSignal?.addEventListener("abort", onAbort, { once: true });
+      if (abortSignal?.aborted) onAbort();
       child.stdout?.on("data", (chunk) => out.push(chunk));
       child.stderr?.on("data", (chunk) => err.push(chunk));
       if (options?.input !== void 0 && child.stdin) {
@@ -637,7 +661,7 @@ var NodeShell = class {
       if (limit !== void 0 && limit > 0) {
         timer = setTimeout(() => {
           timedOut = true;
-          child.kill("SIGTERM");
+          killProcessTree(child);
         }, limit);
       }
       child.on("error", (cause) => {
@@ -653,6 +677,10 @@ var NodeShell = class {
             );
             return;
           }
+          if (aborted) {
+            reject(new Error("The command was aborted and stopped."));
+            return;
+          }
           resolve2({
             stdout: joinChunks(out),
             stderr: joinChunks(err),
@@ -670,11 +698,11 @@ var NodeShell = class {
     }
     const child = childSpawn(command, {
       shell: true,
+      detached: process.platform !== "win32",
       cwd: options?.cwd,
-      env: options?.env ? { ...process.env, ...options.env } : process.env,
-      signal: options?.signal
+      env: options?.env ? { ...process.env, ...options.env } : process.env
     });
-    return new NodeShellHandle(child);
+    return new NodeShellHandle(child, options?.signal);
   }
 };
 var NodeShellHandle = class {
@@ -683,27 +711,33 @@ var NodeShellHandle = class {
   exited = false;
   exitCode = null;
   exitSignal = null;
-  constructor(child) {
+  abortSignal;
+  onAbort = () => this.kill();
+  constructor(child, abortSignal) {
     this.child = child;
+    this.abortSignal = abortSignal;
     child.once(
       "close",
       (code, signal) => {
         this.exited = true;
         this.exitCode = code;
         this.exitSignal = asSignal(signal);
+        this.abortSignal?.removeEventListener("abort", this.onAbort);
         for (const listener of [...this.listeners]) {
           listener(this.exitCode, this.exitSignal);
         }
         this.listeners.clear();
       }
     );
+    this.abortSignal?.addEventListener("abort", this.onAbort, { once: true });
+    if (this.abortSignal?.aborted) this.onAbort();
   }
   get pid() {
     return this.child.pid;
   }
   kill(signal) {
     if (this.exited) return;
-    this.child.kill(signal ?? "SIGTERM");
+    killProcessTree(this.child, signal);
   }
   onExit(listener) {
     if (this.exited) {
@@ -2134,9 +2168,6 @@ function readInput2(raw) {
   }
   return { action, command, id };
 }
-function shellQuote(value) {
-  return `'${value.replace(/'/g, `'\\''`)}'`;
-}
 async function drainCapture(ctx, path, alreadyRead) {
   let full;
   try {
@@ -2172,7 +2203,7 @@ async function startJob(ctx, command) {
   await ctx.fs.mkdir(scratchDir, { recursive: true });
   await ctx.fs.writeFile(outPath, "", "utf8");
   await ctx.fs.writeFile(errPath, "", "utf8");
-  const wrapped = `( ${command} ) >${shellQuote(outPath)} 2>${shellQuote(errPath)}`;
+  const wrapped = `( ${command} ) >${SCRATCH_DIR}/${id}.out 2>${SCRATCH_DIR}/${id}.err`;
   const handle = ctx.shell.spawn(wrapped, { cwd: ctx.cwd });
   const entry = {
     id,
@@ -2252,7 +2283,7 @@ async function pollJob(ctx, id) {
     hadNewOutput: out.fresh.length > 0 || err.fresh.length > 0
   });
 }
-function stopJob(id) {
+async function stopJob(id) {
   const entry = table.remove(id);
   if (entry === void 0) {
     return asText2(
@@ -2260,14 +2291,24 @@ function stopJob(id) {
       true
     );
   }
-  entry.unsubscribe();
   const wasRunning = entry.state === "running";
   if (wasRunning) {
-    try {
-      entry.handle.kill();
-    } catch {
-    }
+    await new Promise((resolve2) => {
+      let unsubscribeExit = () => {
+      };
+      unsubscribeExit = entry.handle.onExit(() => {
+        unsubscribeExit();
+        resolve2();
+      });
+      try {
+        entry.handle.kill();
+      } catch {
+        unsubscribeExit();
+        resolve2();
+      }
+    });
   }
+  entry.unsubscribe();
   return asJson({
     action: "stop",
     id: entry.id,