@agentproto/driver-agent-cli 2.8.0 → 2.10.0

package/dist/{chunk-E45SX7GU.mjs → chunk-K5PKRW2Q.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';
@@ -392,6 +392,15 @@ 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(),
+  credentialDataHome: z.object({ env: z.string().regex(/^[A-Z][A-Z0-9_]*$/) }).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(),
@@ -720,15 +729,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);
     });
   });
 }
@@ -777,9 +786,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(
@@ -880,11 +897,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) {
@@ -1503,16 +1520,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 (; ; ) {
@@ -1522,8 +1539,8 @@ var EventQueue = class {
         continue;
       }
       if (this.ended) return;
-      await new Promise((resolve2) => {
-        this.resolveNext = resolve2;
+      await new Promise((resolve3) => {
+        this.resolveNext = resolve3;
       });
     }
   }
@@ -1542,9 +1559,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) {
@@ -1792,6 +1809,49 @@ function interpolateEnv(env, value) {
   }
   return out;
 }
+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 };
+}
+var CREDENTIAL_DATA_SUBDIR = "auth-data";
+function isolatedCredentialDataHome(configDir) {
+  const dir = configDir ? join(configDir, CREDENTIAL_DATA_SUBDIR) : mkdtempSync(join(tmpdir(), "agentproto-data-"));
+  mkdirSync(dir, { recursive: true });
+  return dir;
+}
 function agentCliSupportsHostContextIsolation(adapterId) {
   return adapterId === "claude-code";
 }
@@ -1981,8 +2041,8 @@ async function* promptTurn(arm, turnId, message, stderrTurnError) {
         return;
       }
       const nextEvent = iterator.next();
-      const stderrArrived = new Promise((resolve2) => {
-        wake = resolve2;
+      const stderrArrived = new Promise((resolve3) => {
+        wake = resolve3;
       });
       const winner = await Promise.race([
         nextEvent.then((result) => ({ source: "event", result })),
@@ -2111,6 +2171,26 @@ function ensureExecDirOnPath(env, execPath = process.execPath) {
   if (parts.includes(execDir)) return;
   env.PATH = [...parts, execDir].join(delimiter);
 }
+function isPlainObject(v) {
+  return typeof v === "object" && v !== null && !Array.isArray(v);
+}
+function deepMergeJson(base, over) {
+  const out = { ...base };
+  for (const [k, v] of Object.entries(over)) {
+    const prev = out[k];
+    out[k] = isPlainObject(prev) && isPlainObject(v) ? deepMergeJson(prev, v) : v;
+  }
+  return out;
+}
+function mergeJsonEnvValue(base, over) {
+  try {
+    const a = JSON.parse(base);
+    const b = JSON.parse(over);
+    if (isPlainObject(a) && isPlainObject(b)) return JSON.stringify(deepMergeJson(a, b));
+  } catch {
+  }
+  return over;
+}
 function createAgentCliRuntime(definition) {
   return {
     definition,
@@ -2128,6 +2208,7 @@ function createAgentCliRuntime(definition) {
       };
       for (const k of composed.envUnset) delete env[k];
       const authSpec = opts?.auth;
+      let credentialDataDir;
       const hasGatewayAuthToken = "ANTHROPIC_AUTH_TOKEN" in composed.env;
       const hasGatewayBaseUrl = "ANTHROPIC_BASE_URL" in composed.env;
       const resolverCoupledGateway = authSpec?.baseUrl !== void 0;
@@ -2147,6 +2228,15 @@ function createAgentCliRuntime(definition) {
             throw new RuntimeConfigError("missing_auth_credential", "opts.auth.credential", message);
           }
           env[authSpec.setEnv] = authSpec.credential;
+          if (authSpec.extraEnv) {
+            for (const [key, value] of Object.entries(authSpec.extraEnv)) {
+              env[key] = key in composed.env ? mergeJsonEnvValue(composed.env[key], value) : value;
+            }
+          }
+          if (definition.credentialDataHome && authSpec.isolateDataHome !== false) {
+            credentialDataDir = isolatedCredentialDataHome(opts?.configDir);
+            env[definition.credentialDataHome.env] = credentialDataDir;
+          }
         }
       }
       Object.assign(env, opts?.env ?? {});
@@ -2212,6 +2302,16 @@ function createAgentCliRuntime(definition) {
         );
         env.CLAUDE_CONFIG_DIR = claudeConfigDir;
       }
+      const extraWritePaths = claudeConfigDir ? [claudeConfigDir] : [];
+      if (credentialDataDir) extraWritePaths.push(credentialDataDir);
+      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({
@@ -2224,7 +2324,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) } : {}
@@ -2241,7 +2341,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 } : {},
@@ -2261,11 +2361,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) {
@@ -2486,6 +2586,6 @@ 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-E45SX7GU.mjs.map
-//# sourceMappingURL=chunk-E45SX7GU.mjs.map
+export { CREDENTIAL_DATA_SUBDIR, 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-K5PKRW2Q.mjs.map
+//# sourceMappingURL=chunk-K5PKRW2Q.mjs.map