@agentskit/cli 0.13.41 → 0.13.42

package/dist/index.cjs

@@ -15,12 +15,13 @@ var tools = require('@agentskit/tools');
 var skills = require('@agentskit/skills');
 var memory = require('@agentskit/memory');
 var integrations = require('@agentskit/integrations');
-var child_process = require('child_process');
+var crossPlatform = require('@agentskit/cross-platform');
 var jsxRuntime = require('react/jsx-runtime');
 var url = require('url');
 var runtime = require('@agentskit/runtime');
 var prompts = require('@inquirer/prompts');
 var kleur = require('kleur');
+var child_process = require('child_process');
 var module$1 = require('module');
 var chokidar = require('chokidar');
 var rag = require('@agentskit/rag');
@@ -39,7 +40,7 @@ var chokidar__default = /*#__PURE__*/_interopDefault(chokidar);
 
 // package.json
 var package_default = {
-  version: "0.13.41"};
+  version: "0.13.42"};
 async function loadJsonConfig(path6) {
   try {
     const raw = await promises.readFile(path6, "utf8");
@@ -925,90 +926,37 @@ function configHooksToHandlers(config) {
   }
   return handlers;
 }
-function runShellHook(entry, payload) {
-  return new Promise((resolvePromise) => {
-    const timeoutMs = entry.timeout ?? 5e3;
-    let settled = false;
-    const settle = (result) => {
-      if (settled) return;
-      settled = true;
-      clearTimeout(timer);
-      resolvePromise(result);
-    };
-    const child = child_process.spawn("sh", ["-c", entry.run], {
-      stdio: ["pipe", "pipe", "inherit"],
-      detached: true
-    });
-    let stdout = "";
-    let stdoutBytes = 0;
-    child.stdout.on("data", (chunk) => {
-      const text = chunk.toString();
-      const bytes = Buffer.byteLength(text);
-      if (stdoutBytes + bytes > MAX_HOOK_STDOUT_BYTES) {
-        if (child.pid !== void 0) {
-          try {
-            process.kill(-child.pid, "SIGKILL");
-          } catch {
-          }
-        }
-        try {
-          child.kill("SIGKILL");
-        } catch {
-        }
-        settle({ decision: "block", reason: `shell hook output exceeded ${MAX_HOOK_STDOUT_BYTES} bytes` });
-        return;
-      }
-      stdoutBytes += bytes;
-      stdout += text;
-    });
-    const timer = setTimeout(() => {
-      if (child.pid !== void 0) {
-        try {
-          process.kill(-child.pid, "SIGKILL");
-        } catch {
-        }
-      }
-      try {
-        child.kill("SIGKILL");
-      } catch {
-      }
-      settle({ decision: "block", reason: `shell hook timed out after ${timeoutMs}ms` });
-    }, timeoutMs);
-    child.stdin.on("error", () => {
-    });
-    child.on("close", (code) => {
-      if (code !== 0) {
-        settle({
-          decision: "block",
-          reason: `shell hook exited with code ${code}`
-        });
-        return;
-      }
-      const trimmed = stdout.trim();
-      if (!trimmed) {
-        settle({ decision: "continue" });
-        return;
-      }
-      try {
-        const parsed = JSON.parse(trimmed);
-        if (!parsed || typeof parsed !== "object" || !("decision" in parsed) || !["continue", "block", "modify"].includes(String(parsed.decision))) {
-          settle({ decision: "block", reason: "shell hook returned an invalid decision" });
-        } else {
-          settle(parsed);
-        }
-      } catch {
-        settle({ decision: "block", reason: "shell hook returned invalid JSON" });
-      }
-    });
-    child.on("error", (err) => {
-      settle({ decision: "block", reason: err.message });
+async function runShellHook(entry, payload) {
+  const timeoutMs = entry.timeout ?? 5e3;
+  let result;
+  try {
+    result = await crossPlatform.runShell(entry.run, {
+      input: JSON.stringify(payload),
+      timeoutMs,
+      // Hooks are fire-and-judge: no grace period once the budget is spent.
+      killGraceMs: 0,
+      maxOutputBytes: MAX_HOOK_STDOUT_BYTES
     });
-    try {
-      child.stdin.write(JSON.stringify(payload));
-      child.stdin.end();
-    } catch {
+  } catch (err) {
+    return { decision: "block", reason: err instanceof Error ? err.message : String(err) };
+  }
+  if (result.stderr) process.stderr.write(result.stderr);
+  if (result.truncated) {
+    return { decision: "block", reason: `shell hook output exceeded ${MAX_HOOK_STDOUT_BYTES} bytes` };
+  }
+  if (result.timedOut) return { decision: "block", reason: `shell hook timed out after ${timeoutMs}ms` };
+  if (result.code !== 0) return { decision: "block", reason: `shell hook exited with code ${result.code}` };
+  const trimmed = result.stdout.trim();
+  if (!trimmed) return { decision: "continue" };
+  try {
+    const parsed = JSON.parse(trimmed);
+    if (!parsed || typeof parsed !== "object" || !("decision" in parsed) || !["continue", "block", "modify"].includes(String(parsed.decision))) {
+      return { decision: "block", reason: "shell hook returned an invalid decision" };
     }
-  });
+    return parsed;
+  } catch {
+    return { decision: "block", reason: "shell hook returned invalid JSON" };
+  }
 }
 function groupIntoTurns(messages) {
   const turns = [];
@@ -1365,10 +1313,9 @@ var McpClient = class {
   }
   async start() {
     if (this.child) return;
-    const child = child_process.spawn(this.spec.command, this.spec.args ?? [], {
+    const child = crossPlatform.spawnNodeChild(this.spec.command, this.spec.args ?? [], {
       env: { ...process.env, ...this.spec.env ?? {} },
-      stdio: ["pipe", "pipe", "pipe"],
-      detached: process.platform !== "win32"
+      stdio: "pipe"
     });
     this.child = child;
     child.stdout.on("data", (chunk) => this.onStdout(chunk.toString()));
@@ -1407,11 +1354,8 @@ var McpClient = class {
     const child = this.child;
     if (!child || child.killed) return;
     const kill = (signal) => {
-      try {
-        if (process.platform !== "win32" && child.pid) process.kill(-child.pid, signal);
-        else child.kill(signal);
-      } catch {
-      }
+      if (child.pid === void 0 || child.exitCode !== null || child.signalCode !== null) return;
+      void crossPlatform.killProcessTree(child.pid, signal, (sig) => child.kill(sig));
     };
     kill("SIGTERM");
     const timer = setTimeout(() => kill("SIGKILL"), DISPOSE_GRACE_MS);