@agentskit/cli 0.13.41 → 0.13.42

package/dist/bin.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { createCli } from './chunk-7Q363GHQ.js';
+import { createCli } from './chunk-Z4BXQEGB.js';
 
 // src/bin.ts
 async function main() {

package/dist/{chunk-7Q363GHQ.js → chunk-Z4BXQEGB.js}

@@ -5,7 +5,7 @@ import path, { join, resolve, isAbsolute, basename, dirname, relative, sep } fro
 import { openrouter, groq, kimi, grok, deepseek, ollama, gemini, anthropic, openai } from '@agentskit/adapters';
 import { randomBytes, randomUUID, createHash } from 'crypto';
 import { writeFileSync, chmodSync, existsSync, readdirSync, statSync, readFileSync, mkdirSync, rmSync } from 'fs';
-import { spawn } from 'child_process';
+import { runShell, spawnNodeChild, killProcessTree } from '@agentskit/cross-platform';
 import React2, { useMemo, useState, useEffect, useRef } from 'react';
 import { Box, Text, render } from 'ink';
 import { useChat, StatusHeader, ChatContainer, Message, ToolCallView, ToolConfirmation, ThinkingIndicator, InputBar } from '@agentskit/ink';
@@ -16,6 +16,7 @@ import { getIntegration, integrationToolsFromEnv } from '@agentskit/integrations
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { pathToFileURL } from 'url';
 import { createRuntime, validateFlow, flowToMermaid, compileFlow, createFileStepLog } from '@agentskit/runtime';
+import { spawn } from 'child_process';
 import { createRequire } from 'module';
 import chokidar from 'chokidar';
 import kleur3 from 'kleur';
@@ -505,90 +506,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 = 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 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" };
+  }
 }
 
 // src/slash-commands.ts
@@ -1334,10 +1282,9 @@ var McpClient = class {
   }
   async start() {
     if (this.child) return;
-    const child = spawn(this.spec.command, this.spec.args ?? [], {
+    const child = 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()));
@@ -1376,11 +1323,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 killProcessTree(child.pid, signal, (sig) => child.kill(sig));
     };
     kill("SIGTERM");
     const timer = setTimeout(() => kill("SIGKILL"), DISPOSE_GRACE_MS);
@@ -3757,7 +3701,7 @@ async function indexSources(rag, config, cwd) {
 
 // package.json
 var package_default = {
-  version: "0.13.41"};
+  version: "0.13.42"};
 
 // src/commands/shared.ts
 function mergeWithConfig(options, config) {
@@ -6202,5 +6146,5 @@ function createCli() {
 }
 
 export { ChatApp, HookDispatcher, McpClient, applyPolicyToTool, applyPolicyToTools, bridgeMcpServers, buildRagFromConfig, computeCost, configHooksToHandlers, createCli, createOpenAiEmbedder, defaultPolicy, derivePreview, disposeMcpClients, evaluatePolicy, findLatestSession, findSession, forkSession, generateSessionId, getPricing, indexSources, listSessions, loadConfig, loadPlugins, mergePluginsIntoBundle, registerPricing, renameSession, renderChatHeader, renderReport, resolveChatProvider, resolveSession, runAgent, runDoctor, sessionFilePath, startDev, startTunnel, writeSessionMeta, writeStarterProject2 as writeStarterProject };
-//# sourceMappingURL=chunk-7Q363GHQ.js.map
-//# sourceMappingURL=chunk-7Q363GHQ.js.map
+//# sourceMappingURL=chunk-Z4BXQEGB.js.map
+//# sourceMappingURL=chunk-Z4BXQEGB.js.map