@agentproto/driver-agent-cli 2.4.4 → 2.5.1

package/dist/{chunk-UBRGTH3A.mjs → chunk-ES4VLTGZ.mjs}

@@ -1,13 +1,13 @@
 import { z } from 'zod';
 import { Writable, Readable } from 'stream';
 import { createAcpClient } from '@agentproto/acp/client';
-import { spawn } from 'child_process';
+import { spawn, execFile } from 'child_process';
 import { existsSync, readFileSync, mkdirSync, writeFileSync, rmSync, rmdirSync, mkdtempSync } from 'fs';
 import { createInterface } from 'readline';
-import { join, dirname, delimiter } from 'path';
+import { join, delimiter, dirname, basename } from 'path';
 import { tmpdir, homedir } from 'os';
 import { loadAdapterSpawnSandboxConfig, resolveCommandSandbox } from '@agentproto/command-sandbox';
-import { randomUUID } from 'crypto';
+import { randomUUID, createHash } from 'crypto';
 import { createDoctype } from '@agentproto/define-doctype';
 
 /**
@@ -584,6 +584,18 @@ function createAcpProtocolArm(options) {
       if (!session) return { applied: false, reason: "not-connected" };
       return session.setSessionMode(modeId);
     },
+    onOutOfTurnEvent(listener) {
+      if (!session) return () => {
+      };
+      return session.onOutOfTurnEvent(listener);
+    },
+    get steeringSupported() {
+      return session?.steeringSupported ?? false;
+    },
+    async steer(content) {
+      if (!session) return "promptRequired";
+      return session.steer(content);
+    },
     respondPermission(requestId, resolution) {
       return client?.respondPermission(requestId, resolution) ?? false;
     },
@@ -599,10 +611,108 @@ function toFileBasedMcpServers(servers) {
   if (!servers || servers.length === 0) return void 0;
   const out = {};
   for (const s of servers) {
-    out[s.name] = s.transport === "stdio" ? { command: s.ref ?? "" } : { url: s.ref ?? "", ...s.headers !== void 0 ? { headers: s.headers } : {} };
+    out[s.name] = s.transport === "stdio" ? {
+      command: s.ref ?? "",
+      ...s.args !== void 0 ? { args: s.args } : {},
+      ...s.env !== void 0 ? { env: s.env } : {}
+    } : { url: s.ref ?? "", ...s.headers !== void 0 ? { headers: s.headers } : {} };
   }
   return out;
 }
+var DEFAULT_GRACE_MS = 3e3;
+var DEFAULT_POLL_MS = 100;
+function descendantsOf(rootPid, rows) {
+  const byParent = /* @__PURE__ */ new Map();
+  for (const r of rows) {
+    const list = byParent.get(r.ppid);
+    if (list) list.push(r.pid);
+    else byParent.set(r.ppid, [r.pid]);
+  }
+  const out = [];
+  const seen = /* @__PURE__ */ new Set([rootPid]);
+  const queue = [rootPid];
+  while (queue.length > 0) {
+    const pid = queue.shift();
+    for (const kid of byParent.get(pid) ?? []) {
+      if (seen.has(kid)) continue;
+      seen.add(kid);
+      out.push(kid);
+      queue.push(kid);
+    }
+  }
+  return out;
+}
+async function terminateChildTree(child, opts = {}) {
+  const graceMs = opts.graceMs ?? DEFAULT_GRACE_MS;
+  const pollMs = opts.pollMs ?? DEFAULT_POLL_MS;
+  const list = opts.listProcesses ?? listProcesses;
+  const rootPid = child.pid;
+  const rootAlive = () => child.exitCode === null && child.signalCode === null;
+  if (typeof rootPid !== "number" || rootPid <= 0 || rootPid === process.pid || !rootAlive()) {
+    return { descendants: [], killed: [] };
+  }
+  const descendants = descendantsOf(rootPid, await list()).filter((p) => p !== process.pid);
+  const tracked = new Set(descendants);
+  try {
+    child.kill("SIGTERM");
+  } catch {
+  }
+  for (const pid of tracked) signal(pid, "SIGTERM");
+  const anyAlive = () => rootAlive() || [...tracked].some(isAlive);
+  const deadline = Date.now() + graceMs;
+  while (anyAlive() && Date.now() < deadline) {
+    await new Promise((r) => setTimeout(r, pollMs));
+  }
+  if (!anyAlive()) return { descendants, killed: [] };
+  const rows = await list();
+  const survivors = [...tracked].filter(isAlive);
+  for (const from of rootAlive() ? [rootPid, ...survivors] : survivors) {
+    for (const pid of descendantsOf(from, rows)) {
+      if (pid !== process.pid) tracked.add(pid);
+    }
+  }
+  const killed = [];
+  if (rootAlive()) {
+    try {
+      child.kill("SIGKILL");
+      killed.push(rootPid);
+    } catch {
+    }
+  }
+  for (const pid of tracked) {
+    if (isAlive(pid) && signal(pid, "SIGKILL")) killed.push(pid);
+  }
+  return { descendants, killed };
+}
+function signal(pid, sig) {
+  try {
+    process.kill(pid, sig);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function isAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (err) {
+    return err.code === "EPERM";
+  }
+}
+function listProcesses() {
+  return new Promise((resolve) => {
+    execFile("ps", ["-axo", "pid=,ppid="], { maxBuffer: 32 * 1024 * 1024 }, (err, stdout) => {
+      if (err) return resolve([]);
+      const out = [];
+      for (const line of stdout.split("\n")) {
+        const m = line.match(/^\s*(\d+)\s+(\d+)\s*$/);
+        if (m) out.push({ pid: Number(m[1]), ppid: Number(m[2]) });
+      }
+      resolve(out);
+    });
+  });
+}
 function defaultToolchainWritePaths() {
   const home = homedir();
   return [
@@ -667,12 +777,12 @@ async function wrapAgentCliSpawn(bin, args, opts) {
 
 // src/protocol/print-arm.ts
 function printModelMismatch(requested, reported) {
-  const basename = (id) => {
+  const basename2 = (id) => {
     const noSuffix = id.split("@")[0] ?? id;
     const segs = noSuffix.split("/");
     return (segs[segs.length - 1] ?? noSuffix).trim().toLowerCase();
   };
-  return basename(requested) !== basename(reported);
+  return basename2(requested) !== basename2(reported);
 }
 var DEFAULT_OUTPUT = ["--output-format", "stream-json"];
 var DEFAULT_PRE_PROMPT = ["--no-interactive"];
@@ -839,8 +949,9 @@ function createPrintSession(opts) {
       return { applied: false, reason: "not-supported" };
     },
     async close() {
-      activeChild?.kill("SIGTERM");
+      const closing = activeChild ? terminateChildTree(activeChild) : void 0;
       mcpRestore?.();
+      await closing;
     }
   };
 }
@@ -922,14 +1033,26 @@ function setupMcpConfigFile(opts, eventSchema) {
 }
 function extractPromptText(message) {
   if (typeof message === "string") return message;
-  if (message !== null && typeof message === "object") {
-    const m = message;
-    if (typeof m.text === "string") return m.text;
-    if (Array.isArray(message)) {
-      return message.filter((b) => b.type === "text" && typeof b.text === "string").map((b) => b.text).join("\n");
+  const blocks = Array.isArray(message) ? message : [message];
+  const texts = [];
+  for (const block of blocks) {
+    if (block !== null && typeof block === "object") {
+      const b = block;
+      if (b.type === "text" && typeof b.text === "string") {
+        texts.push(b.text);
+        continue;
+      }
+      if (b.type === void 0 && typeof b.text === "string") {
+        texts.push(b.text);
+        continue;
+      }
     }
+    const kind = block !== null && typeof block === "object" && typeof block.type === "string" ? block.type : typeof block;
+    throw new Error(
+      `this adapter has no multimodal input (capabilities.multimodal: false) \u2014 got a "${kind}" content block it can't send. Upload the file via POST /files/upload and reference its path in the prompt text instead.`
+    );
   }
-  return JSON.stringify(message);
+  return texts.join("\n");
 }
 function captureSessionId(evt, schema) {
   switch (schema) {
@@ -1724,6 +1847,48 @@ async function* promptTurn(arm, turnId, message) {
     yield evt;
   }
 }
+function npxCacheKey(packages) {
+  return createHash("sha512").update([...packages].sort((a, b) => a.localeCompare(b, "en")).join("\n")).digest("hex").slice(0, 16);
+}
+function parseExactSpec(spec) {
+  const m = /^((?:@[a-z0-9][\w.-]*\/)?[a-z0-9][\w.-]*)@(\d+\.\d+\.\d+(?:-[\w.-]+)?(?:\+[\w.-]+)?)$/i.exec(spec);
+  return m ? { name: m[1], version: m[2] } : void 0;
+}
+function binNameFromManifest(name, bin) {
+  const unscoped = name.replace(/^@[^/]+\//, "");
+  if (typeof bin === "string") return unscoped;
+  if (!bin || typeof bin !== "object") return void 0;
+  const names = Object.keys(bin);
+  if (names.length === 1) return names[0];
+  return names.includes(unscoped) ? unscoped : void 0;
+}
+function resolveNpxFastPath(bin, args, env, deps) {
+  if ((process.platform) === "win32") return void 0;
+  if (basename(bin) !== "npx") return void 0;
+  const [yes, spec, ...rest] = args;
+  if (yes !== "-y" && yes !== "--yes") return void 0;
+  if (spec === void 0) return void 0;
+  const parsed = parseExactSpec(spec);
+  if (!parsed) return void 0;
+  const exists = existsSync;
+  const readFile = ((p) => readFileSync(p, "utf8"));
+  const cacheRoot = env["npm_config_cache"] ?? env["NPM_CONFIG_CACHE"] ?? join(homedir(), ".npm");
+  const installDir = join(cacheRoot, "_npx", npxCacheKey([spec]));
+  try {
+    const pkg = JSON.parse(readFile(join(installDir, "node_modules", parsed.name, "package.json")));
+    if (pkg.version !== parsed.version) return void 0;
+    const binName = binNameFromManifest(parsed.name, pkg.bin);
+    if (!binName) return void 0;
+    const binDir = join(installDir, "node_modules", ".bin");
+    const binPath = join(binDir, binName);
+    if (!exists(binPath)) return void 0;
+    return { bin: binPath, args: rest, binDir };
+  } catch {
+    return void 0;
+  }
+}
+
+// src/define-agent-cli.ts
 var defineAgentCli = createDoctype(
   {
     aip: 45,
@@ -1827,6 +1992,12 @@ function createAgentCliRuntime(definition) {
       }
       Object.assign(env, opts?.env ?? {});
       ensureExecDirOnPath(env);
+      const npxFast = resolveNpxFastPath(resolvedBin, composed.binArgs, env);
+      if (npxFast) {
+        env.PATH = [npxFast.binDir, ...(env.PATH ?? "").split(delimiter).filter(Boolean)].join(delimiter);
+      }
+      const spawnBin = npxFast?.bin ?? resolvedBin;
+      const spawnArgs = npxFast?.args ?? composed.binArgs;
       if (opts?.additionalReadPaths?.length) {
         env.AGENTPROTO_ADDITIONAL_READ_PATHS = JSON.stringify(opts.additionalReadPaths);
       }
@@ -1874,8 +2045,8 @@ function createAgentCliRuntime(definition) {
       if (definition.protocol === "print") {
         const printModel = config?.options?.model;
         return createPrintSession({
-          bin: resolvedBin,
-          baseArgs: composed.binArgs,
+          bin: spawnBin,
+          baseArgs: spawnArgs,
           cwd,
           env,
           ...opts?.resumeSessionId ? { resumeSessionId: opts.resumeSessionId } : {},
@@ -1892,8 +2063,8 @@ function createAgentCliRuntime(definition) {
       const stderrBuf = [];
       if (definition.protocol !== "proprietary") {
         const [execBin, execArgs] = await wrapAgentCliSpawn(
-          resolvedBin,
-          composed.binArgs,
+          spawnBin,
+          spawnArgs,
           {
             mode: opts?.commandSandbox,
             cwd,
@@ -2045,9 +2216,22 @@ cwd '${cwd}' does not exist \u2014 Node reports a missing working directory with
             return arm.respondPermission(requestId, resolution);
           }
         } : {},
+        ...arm.onOutOfTurnEvent ? {
+          onOutOfTurnEvent(listener) {
+            return arm.onOutOfTurnEvent(listener);
+          }
+        } : {},
+        ...arm.steer ? {
+          // Snapshotted after `arm.connect()` resolved, like the
+          // config/mode read surfaces above.
+          steeringSupported: arm.steeringSupported === true,
+          steer(content) {
+            return arm.steer(content);
+          }
+        } : {},
         async close() {
           await arm.close();
-          if (child && !child.killed) child.kill("SIGTERM");
+          if (child) await terminateChildTree(child);
         }
       };
     }
@@ -2113,5 +2297,5 @@ function derivedModelRefusalError(definition, requested, reason) {
 }
 
 export { LEGACY_GATEWAY_MODE_IDS, LEGACY_POSTURE_MODE_IDS, RuntimeConfigError, agentCliFrontmatterSchema, applyModelCommand, autoAllowPermissionHandler, composeSpawn, createAcpProtocolArm, createAgentCliRuntime, createArmSessionControls, createJcodeMapperState, createMastraMapperState, createPrintSession, createProprietaryProtocolArm, defineAgentCli, inferLegacyModeKind, isLegacyExtractedModeId, isModelSwitchAcknowledgement, mapJcodeEvent, mapMastraEvent, parseModelSwitchCommand, planModePermissionHandler, promptTurn, resolveContinuationStrategy, runtimeConfigSchema, toFileBasedMcpServers };
-//# sourceMappingURL=chunk-UBRGTH3A.mjs.map
-//# sourceMappingURL=chunk-UBRGTH3A.mjs.map
+//# sourceMappingURL=chunk-ES4VLTGZ.mjs.map
+//# sourceMappingURL=chunk-ES4VLTGZ.mjs.map