agent.libx.js 0.94.24 → 0.94.25

package/dist/cli.js

@@ -1465,6 +1465,15 @@ var init_shell_sandbox = __esm({
 });
 
 // src/tools.shell.ts
+function killGroup(proc, signal) {
+  if (!proc?.pid) return false;
+  try {
+    process.kill(-proc.pid, signal);
+    return true;
+  } catch {
+    return false;
+  }
+}
 async function spawnArgvFor(command, cwd, osSandbox) {
   if (!osSandbox) return { bin: "/bin/sh", args: ["-c", command] };
   const opts = osSandbox === true ? {} : osSandbox;
@@ -1487,7 +1496,7 @@ function makeRealShellTool(options) {
   const timeoutMs = options.timeoutMs ?? 12e4;
   return {
     name: "Shell",
-    description: "Run a shell command via /bin/sh in the working directory. Executes any installed binary \u2014 ls, cat, grep, git, bun, node, curl, scripts, etc. Returns combined stdout+stderr; non-zero exits are prefixed `[exit N]`. Set `background:true` for long-running processes (servers, watchers) \u2014 returns a job id immediately; poll with ShellOutput, stop with ShellKill.",
+    description: "Run a shell command via /bin/sh in the working directory. Executes any installed binary \u2014 ls, cat, grep, git, bun, node, curl, scripts, etc. Returns combined stdout+stderr; non-zero exits are prefixed `[exit N]`. Runs non-interactively with no terminal (stdin is /dev/null): commands that prompt for input fail fast rather than hang \u2014 for privileged actions use a non-interactive flag (e.g. `sudo -n`), or ask the user to run the command themselves. Set `background:true` for long-running processes (servers, watchers) \u2014 returns a job id immediately; poll with ShellOutput, stop with ShellKill.",
     parameters: {
       type: "object",
       required: ["command"],
@@ -1547,10 +1556,12 @@ function makeRealShellTool(options) {
           };
           let proc;
           try {
-            proc = spawn3(argv.bin, argv.args, { cwd: options.cwd, env: childEnv(options), signal: ctl.signal });
+            proc = spawn3(argv.bin, argv.args, { cwd: options.cwd, env: childEnv(options), signal: ctl.signal, ...DETACHED });
           } catch (e) {
             return finish(`[exit 1] failed to spawn shell: ${e?.message ?? e}`);
           }
+          if (ctl.signal.aborted) killGroup(proc, "SIGKILL");
+          else ctl.signal.addEventListener("abort", () => killGroup(proc, "SIGKILL"), { once: true });
           const collect = (chunk) => {
             const s = typeof chunk === "string" ? chunk : chunk?.toString?.("utf8") ?? "";
             out += s;
@@ -1626,7 +1637,7 @@ ${clean(out) || "(no output yet)"}`;
     }
   ];
 }
-var log12, clean, SECRET_ENV_RE, _spawn, ShellJobRegistry, NO_JOB2;
+var log12, clean, DETACHED, SECRET_ENV_RE, _spawn, ShellJobRegistry, NO_JOB2;
 var init_tools_shell = __esm({
   "src/tools.shell.ts"() {
     "use strict";
@@ -1636,6 +1647,7 @@ var init_tools_shell = __esm({
     init_shell_sandbox();
     log12 = forComponent("shell");
     clean = (s) => truncateOutput(redactSecrets(s.replace(/\n+$/, "")));
+    DETACHED = { stdio: ["ignore", "pipe", "pipe"], detached: true };
     SECRET_ENV_RE = /(_API_KEY|_TOKEN|_SECRET|_PASSWORD|_PRIVATE_KEY|^AWS_|^GITHUB_TOKEN$|^OPENAI_|^ANTHROPIC_|^GOOGLE_|^GEMINI_|^GROQ_|^NPM_TOKEN$)/i;
     ShellJobRegistry = class {
       constructor(cfg) {
@@ -1656,7 +1668,7 @@ var init_tools_shell = __esm({
         try {
           const spawn3 = this.cfg.spawn ?? await nodeSpawn();
           const argv = this.cfg.osSandbox ? await spawnArgvFor(command, this.cfg.cwd, this.cfg.osSandbox) : { bin: "/bin/sh", args: ["-c", command] };
-          const proc = spawn3(argv.bin, argv.args, { cwd: this.cfg.cwd, env: childEnv(this.cfg) });
+          const proc = spawn3(argv.bin, argv.args, { cwd: this.cfg.cwd, env: childEnv(this.cfg), ...DETACHED });
           job.proc = proc;
           proc.stdout?.on("data", append);
           proc.stderr?.on("data", append);
@@ -1695,9 +1707,11 @@ var init_tools_shell = __esm({
         const j = this.jobs.get(id);
         if (!j) return false;
         if (j.status === "running") {
-          try {
-            j.proc?.kill("SIGTERM");
-          } catch {
+          if (!killGroup(j.proc, "SIGTERM")) {
+            try {
+              j.proc?.kill("SIGTERM");
+            } catch {
+            }
           }
           j.status = "killed";
         }