@integrity-labs/agt-cli 0.28.766 → 0.28.768

package/dist/{chunk-LVBINNTQ.js → chunk-THSP5NB6.js}

@@ -18,7 +18,7 @@ import {
   rotateDailySession,
   sessionFileExists,
   todayLocalIso
-} from "./chunk-23KTLVYX.js";
+} from "./chunk-MBUWL4UL.js";
 import {
   reapOrphanChannelMcps
 } from "./chunk-XWVM4KPK.js";
@@ -3262,6 +3262,22 @@ var CREDENTIAL_SOURCES = [
 ];
 var ROLES = ["primary", "secondary"];
 var isRecord = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
+function parseModelPolicyModels(raw) {
+  if (raw === void 0 || raw === null) return [];
+  if (!Array.isArray(raw)) return [];
+  const out = [];
+  for (const entry of raw) {
+    if (!isRecord(entry)) return [];
+    const role = entry["role"];
+    const slot = entry["slot"];
+    const modelId = entry["model_id"];
+    if (typeof role !== "string" || !ROLES.includes(role)) return [];
+    if (typeof slot !== "string" || slot.trim() === "") return [];
+    if (typeof modelId !== "string" || modelId.trim() === "") return [];
+    out.push({ role, slot: slot.trim(), modelId: modelId.trim() });
+  }
+  return out;
+}
 function parseBinding(raw) {
   if (!isRecord(raw)) return null;
   const role = raw["role"];
@@ -3310,7 +3326,8 @@ function parseModelPolicy(raw) {
     name,
     revision,
     resolvedFrom,
-    bindings
+    bindings,
+    models: parseModelPolicyModels(raw["models"])
   };
 }
 function modelPolicyAuthComponent(policy) {
@@ -3365,16 +3382,38 @@ function policyPutsAnthropicApiKeyInEnv(policy) {
   if (!policy) return false;
   return policy.bindings.some((b) => sourceSetsAnthropicApiKey(b.credentialSource));
 }
+var CLAUDE_CODE_SLOT_ENV = /* @__PURE__ */ new Map([
+  ["primary", "ANTHROPIC_MODEL"],
+  ["small_fast", "ANTHROPIC_SMALL_FAST_MODEL"]
+]);
+function modelEnvForRole(policy, role) {
+  if (!policy) return {};
+  const out = {};
+  for (const m of policy.models) {
+    if (m.role !== role) continue;
+    const key = CLAUDE_CODE_SLOT_ENV.get(m.slot);
+    if (!key) continue;
+    out[key] = m.modelId;
+  }
+  return out;
+}
 function resolveModelPolicySpawnEnv(input) {
   const { policy, openRouterMode, gatewayToken, codeName } = input;
   const primary = primaryBinding(policy);
-  if (!policy || !primary) return { env: {}, notice: null };
+  if (!policy || !primary) return { env: {}, modelEnv: {}, notice: null };
   if (openRouterMode) {
     return {
       env: {},
+      // ENG-9816: no model either. OpenRouter sets `ANTHROPIC_MODEL` from its own
+      // config a few lines below in the caller, and two writers of one variable
+      // is how the "two actuators" problem above becomes a wrong model rather
+      // than a logged conflict.
+      modelEnv: {},
       notice: `[model-policy] '${codeName}' has policy '${policy.name}' but is in OpenRouter mode \u2014 OpenRouter wins, policy not applied (ENG-9483: unifying the two actuators is a separate migration)`
     };
   }
+  const modelEnv = modelEnvForRole(policy, primary.role);
+  const modelNote = Object.keys(modelEnv).length > 0 ? ` models=${Object.entries(modelEnv).map(([k, v]) => `${k}=${v}`).join(" ")}` : "";
   const resolution = resolveBindingCredential(primary, gatewayToken);
   switch (resolution.kind) {
     case "gateway":
@@ -3383,15 +3422,26 @@ function resolveModelPolicySpawnEnv(input) {
           ANTHROPIC_BASE_URL: resolution.baseUrl,
           ANTHROPIC_AUTH_TOKEN: resolution.authToken
         },
-        notice: `[model-policy] '${codeName}' inference via gateway ${resolution.baseUrl} (policy '${policy.name}' rev ${policy.revision}, from ${policy.resolvedFrom})`
+        modelEnv,
+        notice: `[model-policy] '${codeName}' inference via gateway ${resolution.baseUrl} (policy '${policy.name}' rev ${policy.revision}, from ${policy.resolvedFrom})${modelNote}`
       };
     case "blocked":
       return {
         env: {},
+        // No partial application. The chosen model belongs to an endpoint this
+        // manager could not honour, so applying it alone would run the agent on
+        // the host's existing credential against a model the operator picked for
+        // somewhere else — a policy half-applied, which is the one outcome this
+        // file has no branch for.
+        modelEnv: {},
         notice: `[model-policy] '${codeName}' policy '${policy.name}' NOT applied \u2014 reason=${resolution.reason}; keeping existing auth (transport=${primary.transport}, credential_source=${primary.credentialSource})`
       };
     case "host-default":
-      return { env: {}, notice: null };
+      return {
+        env: {},
+        modelEnv,
+        notice: modelNote ? `[model-policy] '${codeName}' model from policy '${policy.name}' rev ${policy.revision} (from ${policy.resolvedFrom});${modelNote}` : null
+      };
   }
 }
 
@@ -3588,7 +3638,7 @@ function restartEgressSidecar(codeName) {
   }
 }
 function buildDockerRunCommand(args) {
-  const { codeName, agentId, wrapperPath, projectDir, homeDir, runId, passApiKey, passOpenRouter, passModelPolicyGateway, egress, forwardSlackReplyBinding, forwardBlockTurnEndAllMarkers, forwardKanbanWaiting, forwardNotifyDispatch, forwardTurnFailureNotice, forwardChannelSecrets } = args;
+  const { codeName, agentId, wrapperPath, projectDir, homeDir, runId, passApiKey, passOpenRouter, passModelPolicyGateway, passModelPolicyModel, egress, forwardSlackReplyBinding, forwardBlockTurnEndAllMarkers, forwardKanbanWaiting, forwardNotifyDispatch, forwardTurnFailureNotice, forwardChannelSecrets } = args;
   const q = (s) => `'${s.replace(/'/g, `'\\''`)}'`;
   const agentDir2 = join6(homeDir, ".augmented", codeName);
   const agentIdDir = join6(homeDir, ".augmented", agentId);
@@ -3620,6 +3670,10 @@ function buildDockerRunCommand(args) {
     envArgs.push("-e ANTHROPIC_BASE_URL");
     envArgs.push("-e ANTHROPIC_AUTH_TOKEN");
   }
+  if (passModelPolicyModel) {
+    envArgs.push("-e ANTHROPIC_MODEL");
+    envArgs.push("-e ANTHROPIC_SMALL_FAST_MODEL");
+  }
   if (runId) envArgs.push(`-e ${q(`AGT_RUN_ID=${runId}`)}`);
   envArgs.push("-e AGT_API_KEY");
   envArgs.push("-e AGT_HOST");
@@ -4007,7 +4061,11 @@ function spawnSession(config, session) {
   const { codeName, projectDir, mcpConfigPath, claudeMdPath, channels, devChannels, apiHost, log: log2 } = config;
   const claudeAuthMode = config.claudeAuthMode ?? "subscription";
   const openRouterMode = !!config.openRouter;
-  const { env: policyEnv, notice: policyNotice } = resolveModelPolicySpawnEnv({
+  const {
+    env: policyEnv,
+    modelEnv: policyModelEnv,
+    notice: policyNotice
+  } = resolveModelPolicySpawnEnv({
     policy: config.modelPolicy ?? null,
     openRouterMode,
     gatewayToken: config.modelPolicyGatewayToken ?? null,
@@ -4015,6 +4073,7 @@ function spawnSession(config, session) {
   });
   if (policyNotice) log2(policyNotice);
   const policyEnvActive = Object.keys(policyEnv).length > 0;
+  const policyModelActive = Object.keys(policyModelEnv).length > 0;
   const tmuxSession = `agt-${codeName}`;
   log2(
     `[persistent-session] Starting tmux session '${tmuxSession}' for '${codeName}' (auth=${openRouterMode ? "openrouter" : claudeAuthMode})`
@@ -4109,7 +4168,7 @@ function spawnSession(config, session) {
     if (devChannels.length > 0) args.push("--dangerously-load-development-channels", ...devChannels);
     args.push("--mcp-config", mcpConfigPath);
     if (existsSync5(claudeMdPath)) args.push("--system-prompt-file", claudeMdPath);
-    if (!openRouterMode) {
+    if (!openRouterMode && !policyModelActive) {
       const modelAlias = claudeModelAlias(config.primaryModel);
       if (modelAlias) args.push("--model", modelAlias);
     }
@@ -4152,6 +4211,9 @@ function spawnSession(config, session) {
     } else if (claudeAuthMode === "api_key" && config.anthropicApiKey) {
       tmuxSessionEnvArgs.push("-e", `ANTHROPIC_API_KEY=${config.anthropicApiKey}`);
     }
+    for (const [k, v] of Object.entries(policyModelEnv)) {
+      tmuxSessionEnvArgs.push("-e", `${k}=${v}`);
+    }
     if (config.slackReplyBindingMode && config.slackReplyBindingMode !== "shadow" && !process.env["AGT_SLACK_REPLY_BINDING"]) {
       tmuxSessionEnvArgs.push("-e", `AGT_SLACK_REPLY_BINDING=${config.slackReplyBindingMode}`);
     }
@@ -4199,6 +4261,7 @@ function spawnSession(config, session) {
       // forwarded here — see the flag's docblock for why omitting this is a
       // silent fallback to the host's auth rather than a visible failure.
       passModelPolicyGateway: policyEnvActive,
+      passModelPolicyModel: policyModelActive,
       egress,
       // ENG-6476: forward the reply-routing flag env if it will be present in the
       // session env (operator-set OR materialized from the flag above).
@@ -4246,12 +4309,39 @@ function spawnSession(config, session) {
       ...apiKeyEnv,
       ...openRouterEnv,
       ...policyEnv,
+      // ENG-9816: the third site. `policyModelEnv` is empty in OpenRouter
+      // mode and for a blocked binding, so it can never overwrite
+      // `openRouterEnv`'s ANTHROPIC_MODEL above.
+      ...policyModelEnv,
       ...channelSecretEnv,
       ...config.runId ? { AGT_RUN_ID: config.runId } : {},
       AGT_API_KEY: tmuxEnv["AGT_API_KEY"],
       AGT_HOST: tmuxEnv["AGT_HOST"],
       AGT_AGENT_ID: config.agentId
-    } : { ...tmuxEnv, ...apiKeyEnv, ...openRouterEnv, ...channelSecretEnv };
+    } : {
+      ...tmuxEnv,
+      ...apiKeyEnv,
+      ...openRouterEnv,
+      // ENG-9816 (CodeRabbit, PR #5366): the BARE-host branch needs the
+      // policy vars too, and it was missing BOTH.
+      //
+      // `tmuxEnv` is `buildSpawnEnv({ base: process.env })`, so it cannot
+      // contain anything delivered by `tmux new-session -e` — which is
+      // exactly why apiKeyEnv / openRouterEnv / channelSecretEnv are each
+      // spread back in above. The policy vars arrive the same way and were
+      // not, so `probeMcpEnvSubstitution` reports them unset on every
+      // bare-host spawn: a false "missing var" line for a var that IS in
+      // the real spawn env — the inverse of the silent failure this probe
+      // exists to catch, and just as good at training an operator to skim
+      // past it.
+      //
+      // `policyEnv` is ENG-9483's and had the identical gap; the review
+      // flagged only the new variable. Fixing one and leaving the other
+      // would leave the same defect one identifier away.
+      ...policyEnv,
+      ...policyModelEnv,
+      ...channelSecretEnv
+    };
     for (const f of probeMcpEnvSubstitution({
       mcpConfigPath,
       envIntegrationsPath: join6(projectDir, ".env.integrations"),
@@ -5051,4 +5141,4 @@ export {
   stopAllSessionsAndWait,
   getProjectDir
 };
-//# sourceMappingURL=chunk-LVBINNTQ.js.map
+//# sourceMappingURL=chunk-THSP5NB6.js.map