@agentproto/driver-agent-cli 2.3.0 → 2.4.1

package/dist/{chunk-774L5IO5.mjs → chunk-E4MSI6PV.mjs}

@@ -4,7 +4,7 @@ import { createAcpClient } from '@agentproto/acp/client';
 import { spawn } from 'child_process';
 import { existsSync, readFileSync, mkdirSync, writeFileSync, rmSync, rmdirSync, mkdtempSync } from 'fs';
 import { createInterface } from 'readline';
-import { join } from 'path';
+import { join, dirname, delimiter } from 'path';
 import { tmpdir, homedir } from 'os';
 import { loadAdapterSpawnSandboxConfig, resolveCommandSandbox } from '@agentproto/command-sandbox';
 import { randomUUID } from 'crypto';
@@ -151,11 +151,14 @@ var authSchema = z.object({
     grace_s: z.number().int().nonnegative().optional()
   }).strict().optional()
 }).strict();
-var authSubscriptionSchema = z.object({
+var authSubscriptionEntrySchema = z.object({
   setEnv: z.string().min(1).optional(),
   external: z.boolean().optional(),
   conflictEnv: z.array(z.string()).optional(),
-  unsetEnvAdd: z.array(z.string()).optional()
+  unsetEnvAdd: z.array(z.string()).optional(),
+  // Provider scope for a multi-provider adapter's bearer surface (pi's
+  // ANTHROPIC_OAUTH_TOKEN is anthropic-only) — see AgentCliAuthSubscription.
+  provider: z.string().min(1).optional()
 }).strict().superRefine((v, ctx) => {
   if (v.external) {
     if (v.setEnv !== void 0) {
@@ -173,6 +176,20 @@ var authSubscriptionSchema = z.object({
     });
   }
 });
+var authSubscriptionSchema = z.union([authSubscriptionEntrySchema, z.array(authSubscriptionEntrySchema).min(1)]).superRefine((v, ctx) => {
+  if (!Array.isArray(v)) return;
+  const seen = /* @__PURE__ */ new Set();
+  for (const entry of v) {
+    const key = entry.provider ?? "\0unscoped";
+    if (seen.has(key)) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: entry.provider ? `authSubscription: duplicate provider scope "${entry.provider}" \u2014 two entries claim the same provider, which is ambiguous at spawn time.` : "authSubscription: more than one unscoped entry (no `provider`) \u2014 ambiguous which one applies at spawn time."
+      });
+    }
+    seen.add(key);
+  }
+});
 var sessionSchema = z.object({
   mode: z.enum(["ephemeral", "persistent", "resumable"]).default("ephemeral"),
   idle_timeout_ms: z.number().int().min(1e3).default(6e5),
@@ -493,6 +510,9 @@ function createAcpProtocolArm(options) {
     get availableConfigOptions() {
       return session?.availableConfigOptions ?? [];
     },
+    get modelApplyRejection() {
+      return session?.modelApplyRejection;
+    },
     get availableModes() {
       return session?.availableModes ?? [];
     },
@@ -646,6 +666,14 @@ async function wrapAgentCliSpawn(bin, args, opts) {
 }
 
 // src/protocol/print-arm.ts
+function printModelMismatch(requested, reported) {
+  const basename = (id) => {
+    const noSuffix = id.split("@")[0] ?? id;
+    const segs = noSuffix.split("/");
+    return (segs[segs.length - 1] ?? noSuffix).trim().toLowerCase();
+  };
+  return basename(requested) !== basename(reported);
+}
 var DEFAULT_OUTPUT = ["--output-format", "stream-json"];
 var DEFAULT_PRE_PROMPT = ["--no-interactive"];
 var DEFAULT_RESUME = { flag: "--resume", kind: "value" };
@@ -683,6 +711,7 @@ function createPrintSession(opts) {
         mode: opts.commandSandbox,
         cwd: opts.cwd,
         ...opts.extraWritePaths ? { extraWritePaths: opts.extraWritePaths } : {},
+        ...opts.extraReadPaths ? { extraReadPaths: opts.extraReadPaths } : {},
         label: "print-arm"
       });
       const child = spawn(execBin, execArgs, {
@@ -725,14 +754,29 @@ function createPrintSession(opts) {
         const jcodeState = eventSchema === "jcode-ndjson" ? createJcodeMapperState() : void 0;
         const rl = createInterface({ input: child.stdout, crlfDelay: Infinity });
         const queue = new EventQueue();
+        let modelMismatchAborted = false;
         rl.on("line", (line) => {
           if (!line.trim()) return;
+          if (modelMismatchAborted) return;
           let evt;
           try {
             evt = JSON.parse(line);
           } catch {
             return;
           }
+          if (opts.expectedModel && eventSchema === "jcode-ndjson" && evt.type === "start" && typeof evt.model === "string" && printModelMismatch(opts.expectedModel, evt.model)) {
+            modelMismatchAborted = true;
+            const provider = typeof evt.provider === "string" ? ` (provider ${evt.provider})` : "";
+            queue.push({
+              kind: "error",
+              error: {
+                message: `model mismatch: requested "${opts.expectedModel}" but the agent started on "${evt.model}"${provider} \u2014 its CLI silently fell back to a default it resolved itself. This adapter routes AND bills by the model id, so the turn was aborted instead of silently running (and billing) a model you didn't ask for. Check the id against the adapter's model menu.`
+              }
+            });
+            queue.end();
+            child.kill("SIGTERM");
+            return;
+          }
           const csid = captureSessionId(evt, eventSchema);
           if (csid) capturedSessionId = csid;
           const sid = capturedSessionId || sessionId || "";
@@ -1626,6 +1670,13 @@ function createArmSessionControls(arm, definition) {
     }
   };
 }
+var MODEL_SWITCH_ACK_RE = /switch|model\s+set|now using/i;
+function isModelSwitchAcknowledgement(evt) {
+  return MODEL_SWITCH_ACK_RE.test(JSON.stringify(evt));
+}
+function parseModelSwitchCommand(text) {
+  return /^\s*\/model\s+(\S+)/i.exec(text)?.[1];
+}
 async function applyModelCommand(arm, modelId) {
   const turnId = randomUUID();
   let acked = false;
@@ -1634,7 +1685,7 @@ async function applyModelCommand(arm, modelId) {
       type: "text",
       text: `/model ${modelId}`
     })) {
-      if (/switch|model\s+set|now using/i.test(JSON.stringify(evt))) acked = true;
+      if (isModelSwitchAcknowledgement(evt)) acked = true;
     }
   } catch (err) {
     const reason = err instanceof Error ? err.message : String(err);
@@ -1709,8 +1760,24 @@ var defineAgentCli = createDoctype(
     }
   }
 );
-function resolveSpawnBin(bin) {
-  return bin === "node" ? process.execPath : bin;
+function resolveSpawnBin(bin, deps) {
+  const execPath = process.execPath;
+  if (bin === "node") return execPath;
+  if (bin === "npx" || bin === "npm") {
+    const exists = existsSync;
+    const sibling = join(
+      dirname(execPath),
+      process.platform === "win32" ? `${bin}.cmd` : bin
+    );
+    if (exists(sibling)) return sibling;
+  }
+  return bin;
+}
+function ensureExecDirOnPath(env, execPath = process.execPath) {
+  const execDir = dirname(execPath);
+  const parts = (env.PATH ?? "").split(delimiter).filter(Boolean);
+  if (parts.includes(execDir)) return;
+  env.PATH = [...parts, execDir].join(delimiter);
 }
 function createAgentCliRuntime(definition) {
   return {
@@ -1751,6 +1818,10 @@ function createAgentCliRuntime(definition) {
         }
       }
       Object.assign(env, opts?.env ?? {});
+      ensureExecDirOnPath(env);
+      if (opts?.additionalReadPaths?.length) {
+        env.AGENTPROTO_ADDITIONAL_READ_PATHS = JSON.stringify(opts.additionalReadPaths);
+      }
       const permissionMode = resolveClaudeCodePermissionMode(
         definition,
         opts?.posture,
@@ -1793,6 +1864,7 @@ function createAgentCliRuntime(definition) {
         env.CLAUDE_CONFIG_DIR = claudeConfigDir;
       }
       if (definition.protocol === "print") {
+        const printModel = config?.options?.model;
         return createPrintSession({
           bin: resolvedBin,
           baseArgs: composed.binArgs,
@@ -1802,7 +1874,10 @@ function createAgentCliRuntime(definition) {
           ...opts?.mcpServers ? { mcpServers: opts.mcpServers } : {},
           printConfig: definition.print,
           commandSandbox: opts?.commandSandbox,
-          ...claudeConfigDir ? { extraWritePaths: [claudeConfigDir] } : {}
+          ...claudeConfigDir ? { extraWritePaths: [claudeConfigDir] } : {},
+          // 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) } : {}
         });
       }
       let child;
@@ -1815,6 +1890,9 @@ function createAgentCliRuntime(definition) {
             mode: opts?.commandSandbox,
             cwd,
             ...claudeConfigDir ? { extraWritePaths: [claudeConfigDir] } : {},
+            // Exact-file read grant (see additionalReadPaths above):
+            // READ-only exceptions to the confinement boundary, never writes.
+            ...opts?.additionalReadPaths?.length ? { extraReadPaths: opts.additionalReadPaths } : {},
             label: definition.id
           }
         );
@@ -1835,8 +1913,10 @@ function createAgentCliRuntime(definition) {
         });
         if (spawnFailure) {
           const isEnoent = spawnFailure.code === "ENOENT";
-          const enoentHint = isEnoent ? `
-'${execBin}' was not found on the daemon's PATH. If it works in your own terminal, the daemon's environment may be stale \u2014 try \`agentproto daemon restart\`.` : "";
+          const cwdMissing = isEnoent && !existsSync(cwd);
+          const enoentHint = !isEnoent ? "" : cwdMissing ? `
+cwd '${cwd}' does not exist \u2014 Node reports a missing working directory with this same ENOENT. Recreate the directory, or pass a valid cwd/workspace (is the workspace path stale, or its worktree removed?).` : `
+'${execBin}' was not found on the daemon's PATH. If it works in your own terminal, the daemon's environment may be stale \u2014 restart the daemon from a shell where \`which ${definition.bin}\` resolves (\`agentproto daemon restart\`).`;
           throw new Error(
             `agent-cli '${definition.id}': failed to spawn '${execBin} ${execArgs.join(" ")}': ${spawnFailure.message}${enoentHint}`
           );
@@ -1889,8 +1969,25 @@ function createAgentCliRuntime(definition) {
         ...turnIdleTimeoutMs !== void 0 ? { turnIdleTimeoutMs } : {},
         ...opts?.permissionHold ? { permissionHold: true } : {}
       });
+      if (configModel && definition.routeSelection === "derived-from-model" && arm.modelApplyRejection) {
+        const { requested, reason } = arm.modelApplyRejection;
+        await arm.close().catch(() => {
+        });
+        if (child && !child.killed) child.kill("SIGTERM");
+        throw derivedModelRefusalError(definition, requested, reason);
+      }
       if (optModel && modelApply === "command") {
-        await applyModelCommand(arm, String(optModel));
+        const commandResult = await applyModelCommand(arm, String(optModel));
+        if (!commandResult.applied && definition.routeSelection === "derived-from-model") {
+          await arm.close().catch(() => {
+          });
+          if (child && !child.killed) child.kill("SIGTERM");
+          throw derivedModelRefusalError(
+            definition,
+            String(optModel),
+            commandResult.reason ?? "model switch not acknowledged"
+          );
+        }
       }
       const sessionId = arm.sessionId ?? randomUUID();
       let currentTurnId;
@@ -1999,7 +2096,14 @@ function filterStringEnv(env) {
   }
   return out;
 }
+function derivedModelRefusalError(definition, requested, reason) {
+  const first = definition.models?.allowed?.[0];
+  const example = (typeof first === "string" ? first : first?.id) ?? "openrouter/anthropic/claude-sonnet-4-6";
+  return new Error(
+    `${definition.bin}: refusing to start on the default model \u2014 the requested model "${requested}" was not applied (${reason}). This adapter routes AND bills by the model id's own provider prefix, so continuing would silently run (and bill) a model you didn't ask for. Use the adapter's "<provider>/<model>" form (e.g. "${example}"), or pick an id from its model menu.`
+  );
+}
 
-export { LEGACY_GATEWAY_MODE_IDS, LEGACY_POSTURE_MODE_IDS, RuntimeConfigError, agentCliFrontmatterSchema, applyModelCommand, autoAllowPermissionHandler, composeSpawn, createAcpProtocolArm, createAgentCliRuntime, createArmSessionControls, createJcodeMapperState, createMastraMapperState, createPrintSession, createProprietaryProtocolArm, defineAgentCli, inferLegacyModeKind, isLegacyExtractedModeId, mapJcodeEvent, mapMastraEvent, planModePermissionHandler, promptTurn, resolveContinuationStrategy, runtimeConfigSchema, toFileBasedMcpServers };
-//# sourceMappingURL=chunk-774L5IO5.mjs.map
-//# sourceMappingURL=chunk-774L5IO5.mjs.map
+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-E4MSI6PV.mjs.map
+//# sourceMappingURL=chunk-E4MSI6PV.mjs.map