@agentproto/driver-agent-cli 2.7.1 → 2.9.0

package/dist/{chunk-Y3FGLQ4R.mjs → chunk-AN5G6ENG.mjs}

@@ -2,7 +2,7 @@ import { z } from 'zod';
 import { Writable, Readable } from 'stream';
 import { createAcpClient } from '@agentproto/acp/client';
 import { spawn, execFile } from 'child_process';
-import { existsSync, readFileSync, mkdirSync, writeFileSync, rmSync, rmdirSync, realpathSync, mkdtempSync } from 'fs';
+import { existsSync, readFileSync, mkdirSync, writeFileSync, rmSync, rmdirSync, realpathSync, mkdtempSync, lstatSync, unlinkSync, symlinkSync } from 'fs';
 import { createInterface } from 'readline';
 import { join, isAbsolute, resolve, delimiter, dirname, basename } from 'path';
 import { tmpdir, homedir } from 'os';
@@ -242,6 +242,13 @@ var capabilitiesSchema = z.object({
    * as a PTY session. Distinct from ACP-level `resumable`.
    */
   nativeTerminalResume: z.boolean().optional(),
+  /**
+   * Harness defers mounted MCP tools behind its own native search tool
+   * (Claude Code `ToolSearch`). Makes the daemon's `/mcp` self-mount default
+   * to eager for this adapter instead of double-deferring behind the
+   * daemon's `tool_search`. Defaults to false (conservative).
+   */
+  nativeToolSearch: z.boolean().optional(),
   /**
    * Adapter can ingest a filesystem path that the host UI just placed
    * on disk (host-side drag-drop into a terminal pastes the path
@@ -385,6 +392,14 @@ var agentCliFrontmatterSchema = z.object({
   routeSelection: z.enum(["free", "derived-from-model"]).optional(),
   authEnforce: z.enum(["always", "when-configured"]).optional(),
   sandbox: z.union([z.string(), z.record(z.string(), z.unknown())]),
+  stateHome: z.object({
+    env: z.string().regex(/^[A-Z][A-Z0-9_]*$/),
+    defaultDir: z.string().min(1).refine((d) => !d.startsWith("/") && !d.split("/").includes(".."), {
+      message: "defaultDir must be relative to $HOME and stay inside it"
+    }),
+    share: z.array(z.string().regex(/^[^/]+$/)).optional(),
+    seed: z.record(z.string().regex(/^[^/]+$/).refine((n) => n !== "." && n !== "..", { message: "seed names a file of the home" }), z.string()).optional()
+  }).strict().optional(),
   runner: z.union([z.string(), z.record(z.string(), z.unknown())]).optional(),
   protocol: z.enum(["acp", "mcp", "proprietary", "print"]),
   acp: z.string().optional(),
@@ -713,15 +728,15 @@ function isAlive(pid) {
   }
 }
 function listProcesses() {
-  return new Promise((resolve2) => {
+  return new Promise((resolve3) => {
     execFile("ps", ["-axo", "pid=,ppid="], { maxBuffer: 32 * 1024 * 1024 }, (err, stdout) => {
-      if (err) return resolve2([]);
+      if (err) return resolve3([]);
       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]) });
       }
-      resolve2(out);
+      resolve3(out);
     });
   });
 }
@@ -770,9 +785,17 @@ function defaultToolchainReadPaths() {
     // macOS Keychain DB — git/gh credential retrieval (read-only; see doc above)
   ];
 }
+function effectiveSpawnSandboxMode(opts, configured) {
+  return opts.zones ? opts.mode ?? "workspace" : opts.mode ?? configured;
+}
+async function willConfineAgentCliSpawn(opts) {
+  const cfg = await loadAdapterSpawnSandboxConfig(opts.cwd);
+  const mode = effectiveSpawnSandboxMode(opts, cfg.mode);
+  return mode !== void 0 && mode !== "off";
+}
 async function wrapAgentCliSpawn(bin, args, opts) {
   const cfg = await loadAdapterSpawnSandboxConfig(opts.cwd);
-  const mode = opts.zones ? opts.mode ?? "workspace" : opts.mode ?? cfg.mode;
+  const mode = effectiveSpawnSandboxMode(opts, cfg.mode);
   if (mode === void 0) return [bin, args];
   if (mode === "off" && opts.zones) {
     throw new Error(
@@ -873,11 +896,11 @@ function createPrintSession(opts) {
       });
       activeChild = child;
       let spawnFailure;
-      await new Promise((resolve2) => {
-        child.once("spawn", () => resolve2());
+      await new Promise((resolve3) => {
+        child.once("spawn", () => resolve3());
         child.once("error", (err) => {
           spawnFailure = err;
-          resolve2();
+          resolve3();
         });
       });
       if (spawnFailure) {
@@ -1496,16 +1519,16 @@ var EventQueue = class {
         `print-arm: event backlog exceeded ${QUEUE_HIGH_WATER_MARK} buffered events \u2014 downstream consumer is not keeping up. The child's stdout is still being drained (no ENOBUFS), but memory will grow until the consumer catches up.`
       );
     }
-    const resolve2 = this.resolveNext;
+    const resolve3 = this.resolveNext;
     this.resolveNext = null;
-    resolve2?.();
+    resolve3?.();
   }
   /** Signal that no further events will be pushed. */
   end() {
     this.ended = true;
-    const resolve2 = this.resolveNext;
+    const resolve3 = this.resolveNext;
     this.resolveNext = null;
-    resolve2?.();
+    resolve3?.();
   }
   async *[Symbol.asyncIterator]() {
     for (; ; ) {
@@ -1515,8 +1538,8 @@ var EventQueue = class {
         continue;
       }
       if (this.ended) return;
-      await new Promise((resolve2) => {
-        this.resolveNext = resolve2;
+      await new Promise((resolve3) => {
+        this.resolveNext = resolve3;
       });
     }
   }
@@ -1535,9 +1558,9 @@ function mapMastraFinishReason(raw) {
   }
 }
 function waitForExit(child) {
-  return new Promise((resolve2) => {
-    child.once("exit", (code) => resolve2(code));
-    child.once("error", () => resolve2(null));
+  return new Promise((resolve3) => {
+    child.once("exit", (code) => resolve3(code));
+    child.once("error", () => resolve3(null));
   });
 }
 async function createProprietaryProtocolArm(options) {
@@ -1910,20 +1933,132 @@ async function applyModelCommand(arm, modelId) {
   }
   return { applied: true, model: modelId };
 }
-async function* promptTurn(arm, turnId, message) {
-  await arm.send(turnId, message);
+function parseLogfmtLine(line) {
+  const out = {};
+  const re = /([A-Za-z0-9_.-]+)=("(?:[^"\\]|\\.)*"|\S+)/g;
+  let m;
+  while ((m = re.exec(line)) !== null) {
+    const key = m[1];
+    let value = m[2];
+    if (value.startsWith('"')) {
+      value = value.slice(1, -1).replace(/\\(.)/g, "$1");
+    }
+    out[key] = value;
+  }
+  return out;
+}
+function providerMessageFromError(raw) {
+  const m = raw.match(/^[A-Za-z_][\w.]*(?:Error|Exception)\s*:\s*([\s\S]+)$/);
+  return (m ? m[1] : raw).trim();
+}
+function parseStderrStreamError(line) {
+  if (!line.includes("stream error")) return void 0;
+  const fields = parseLogfmtLine(line);
+  if ((fields.level ?? "").toUpperCase() !== "ERROR") return void 0;
+  if (fields.message !== "stream error") return void 0;
+  if (fields.small === "true") return void 0;
+  if (fields.agent === "title") return void 0;
+  const raw = fields["error.error"] ?? fields.error;
+  if (!raw) return void 0;
+  return providerMessageFromError(raw);
+}
+async function* promptTurn(arm, turnId, message, stderrTurnError) {
   const stderrTail = arm._stderrTail;
-  for await (const evt of arm.events()) {
-    if (evt.kind === "error" && typeof stderrTail === "function") {
-      const tail = stderrTail();
-      if (tail) {
-        const existing = evt.error.data ?? {};
-        evt.error.data = { ...existing, stderr: tail };
+  const pendingErrors = [];
+  let wake;
+  const unsubscribe = stderrTurnError && arm._onStderrLine ? arm._onStderrLine((line) => {
+    const parsed = stderrTurnError(line);
+    if (parsed === void 0) return;
+    pendingErrors.push(parsed);
+    wake?.();
+    wake = void 0;
+  }) : void 0;
+  let iterator;
+  try {
+    await arm.send(turnId, message);
+    iterator = arm.events()[Symbol.asyncIterator]();
+    while (true) {
+      if (pendingErrors.length > 0) {
+        await arm.cancel(turnId).catch(() => {
+        });
+        yield {
+          kind: "error",
+          sessionId: arm.sessionId,
+          error: {
+            message: pendingErrors.join("\n"),
+            data: { stderr: stderrTail?.() ?? "" }
+          }
+        };
+        yield {
+          kind: "turn-end",
+          sessionId: arm.sessionId ?? "",
+          reason: "error"
+        };
+        return;
+      }
+      const nextEvent = iterator.next();
+      const stderrArrived = new Promise((resolve3) => {
+        wake = resolve3;
+      });
+      const winner = await Promise.race([
+        nextEvent.then((result) => ({ source: "event", result })),
+        stderrArrived.then(() => ({ source: "stderr" }))
+      ]);
+      if (winner.source === "stderr") continue;
+      if (winner.result.done) return;
+      const evt = winner.result.value;
+      if (evt.kind === "error" && typeof stderrTail === "function") {
+        const tail = stderrTail();
+        if (tail) {
+          const existing = evt.error.data ?? {};
+          evt.error.data = { ...existing, stderr: tail };
+        }
       }
+      yield evt;
     }
-    yield evt;
+  } finally {
+    unsubscribe?.();
+    void iterator?.return?.()?.catch?.(() => {
+    });
   }
 }
+function realStateHome(stateHome, env) {
+  const fromEnv = env[stateHome.env];
+  if (fromEnv && isAbsolute(fromEnv)) return fromEnv;
+  return resolve(homedir(), stateHome.defaultDir);
+}
+function prepareIsolatedStateHome(stateHome, opts) {
+  const real = realStateHome(stateHome, opts.env);
+  let dir;
+  if (opts.configDir) {
+    dir = opts.configDir;
+    mkdirSync(dir, { recursive: true });
+  } else {
+    dir = mkdtempSync(join(tmpdir(), `agentproto-${stateHome.env.toLowerCase()}-`));
+  }
+  const writePaths = [dir];
+  for (const name of stateHome.share ?? []) {
+    const target = join(real, name);
+    const link = join(dir, name);
+    try {
+      lstatSync(link);
+      unlinkSync(link);
+    } catch {
+    }
+    if (!existsSync(target)) continue;
+    symlinkSync(target, link);
+    writePaths.push(realpathSync(target));
+  }
+  for (const [name, content] of Object.entries(stateHome.seed ?? {})) {
+    const file = join(dir, name);
+    try {
+      unlinkSync(file);
+    } catch {
+    }
+    writeFileSync(file, content);
+  }
+  return { dir, writePaths };
+}
 function npxCacheKey(packages) {
   return createHash("sha512").update([...packages].sort((a, b) => a.localeCompare(b, "en")).join("\n")).digest("hex").slice(0, 16);
 }
@@ -2130,6 +2265,15 @@ function createAgentCliRuntime(definition) {
         );
         env.CLAUDE_CONFIG_DIR = claudeConfigDir;
       }
+      const extraWritePaths = claudeConfigDir ? [claudeConfigDir] : [];
+      if (definition.stateHome && definition.protocol !== "proprietary" && await willConfineAgentCliSpawn({ mode: opts?.commandSandbox, cwd, zones: opts?.fsZones })) {
+        const isolated = prepareIsolatedStateHome(definition.stateHome, {
+          ...opts?.configDir ? { configDir: opts.configDir } : {},
+          env
+        });
+        env[definition.stateHome.env] = isolated.dir;
+        extraWritePaths.push(...isolated.writePaths);
+      }
       if (definition.protocol === "print") {
         const printModel = config?.options?.model;
         return createPrintSession({
@@ -2142,7 +2286,7 @@ function createAgentCliRuntime(definition) {
           printConfig: definition.print,
           commandSandbox: opts?.commandSandbox,
           ...opts?.fsZones ? { fsZones: opts.fsZones } : {},
-          ...claudeConfigDir ? { extraWritePaths: [claudeConfigDir] } : {},
+          ...extraWritePaths.length ? { extraWritePaths } : {},
           // Exact-file read grant — see the ACP arm's wrapAgentCliSpawn call.
           ...opts?.additionalReadPaths?.length ? { extraReadPaths: opts.additionalReadPaths } : {},
           ...definition.routeSelection === "derived-from-model" && printModel ? { expectedModel: String(printModel) } : {}
@@ -2150,6 +2294,7 @@ function createAgentCliRuntime(definition) {
       }
       let child;
       const stderrBuf = [];
+      const stderrLineListeners = /* @__PURE__ */ new Set();
       if (definition.protocol !== "proprietary") {
         const [execBin, execArgs] = await wrapAgentCliSpawn(
           finalBin,
@@ -2158,7 +2303,7 @@ function createAgentCliRuntime(definition) {
             mode: opts?.commandSandbox,
             cwd,
             ...opts?.fsZones ? { zones: opts.fsZones } : {},
-            ...claudeConfigDir ? { extraWritePaths: [claudeConfigDir] } : {},
+            ...extraWritePaths.length ? { extraWritePaths } : {},
             // Exact-file read grant (see additionalReadPaths above):
             // READ-only exceptions to the confinement boundary, never writes.
             ...opts?.additionalReadPaths?.length ? { extraReadPaths: opts.additionalReadPaths } : {},
@@ -2178,11 +2323,11 @@ function createAgentCliRuntime(definition) {
         });
         child = spawned;
         let spawnFailure;
-        await new Promise((resolve2) => {
-          spawned.once("spawn", () => resolve2());
+        await new Promise((resolve3) => {
+          spawned.once("spawn", () => resolve3());
           spawned.once("error", (err) => {
             spawnFailure = err;
-            resolve2();
+            resolve3();
           });
         });
         if (spawnFailure) {
@@ -2205,6 +2350,7 @@ cwd '${cwd}' does not exist \u2014 Node reports a missing working directory with
             if (!line) continue;
             stderrBuf.push(line);
             if (stderrBuf.length > STDERR_KEEP_LINES) stderrBuf.shift();
+            for (const listener of stderrLineListeners) listener(line);
           }
         });
       }
@@ -2216,6 +2362,10 @@ cwd '${cwd}' does not exist \u2014 Node reports a missing working directory with
         opts?.permissionHold ?? false
       );
       arm._stderrTail = () => stderrBuf.join("\n");
+      arm._onStderrLine = (listener) => {
+        stderrLineListeners.add(listener);
+        return () => stderrLineListeners.delete(listener);
+      };
       const abortController = new AbortController();
       if (opts?.signal) {
         opts.signal.addEventListener("abort", () => abortController.abort(), {
@@ -2282,7 +2432,8 @@ cwd '${cwd}' does not exist \u2014 Node reports a missing working directory with
         send(message) {
           const turnId = randomUUID();
           currentTurnId = turnId;
-          return promptTurn(arm, turnId, message);
+          const stderrTurnError = definition.id === "opencode" ? parseStderrStreamError : void 0;
+          return promptTurn(arm, turnId, message, stderrTurnError);
         },
         /**
          * Cancel the in-flight turn — the wire equivalent of Ctrl-C at the
@@ -2398,5 +2549,5 @@ function derivedModelRefusalError(definition, requested, reason) {
 }
 
 export { LEGACY_GATEWAY_MODE_IDS, LEGACY_POSTURE_MODE_IDS, RuntimeConfigError, agentCliFrontmatterSchema, agentCliSupportsHostContextIsolation, applyModelCommand, autoAllowPermissionHandler, composeSpawn, createAcpProtocolArm, createAgentCliRuntime, createArmSessionControls, createJcodeMapperState, createMastraMapperState, createPrintSession, createProprietaryProtocolArm, defineAgentCli, hostContextExcludes, inferLegacyModeKind, isLegacyExtractedModeId, isModelSwitchAcknowledgement, mapJcodeEvent, mapMastraEvent, parseModelSwitchCommand, planModePermissionHandler, promptTurn, resolveContinuationStrategy, runtimeConfigSchema, toFileBasedMcpServers };
-//# sourceMappingURL=chunk-Y3FGLQ4R.mjs.map
-//# sourceMappingURL=chunk-Y3FGLQ4R.mjs.map
+//# sourceMappingURL=chunk-AN5G6ENG.mjs.map
+//# sourceMappingURL=chunk-AN5G6ENG.mjs.map