@desplega.ai/agent-swarm 2.5.3 → 2.6.0

package/dist/{cli-s49hpn37.js → cli-ca6banwz.js}

@@ -5,21 +5,20 @@ import {
   postRatings
 } from "./cli-3h26v7yj.js";
 import {
-  CONTEXT_FORMULA,
-  computeContextUsedUnified,
-  clampContextPercent
-} from "./cli-a5ebc95n.js";
+  contextBoundNoteThreshold,
+  createContextBoundNote
+} from "./cli-nq677csy.js";
 import {
   SessionErrorTracker
-} from "./cli-gx4rm0qx.js";
+} from "./cli-7enjwya9.js";
 import {
   credentialsToAuthJson,
   CodexOAuthRefreshError,
   getValidCodexOAuth
-} from "./cli-kxpfx2xr.js";
+} from "./cli-0z1xjzwa.js";
 import {
   summarizeSession
-} from "./cli-mmhj8vd7.js";
+} from "./cli-ag2yrnt5.js";
 import {
   swarmRuntimeInstanceId
 } from "./cli-e8xyjvfc.js";
@@ -42,25 +41,40 @@ import {
 } from "./cli-vbhgkw9h.js";
 import {
   applyReasoningEffort
-} from "./cli-bn0rewsy.js";
+} from "./cli-c081bj3b.js";
 import {
   createSwarmEventHandler
 } from "./cli-4zsenjhy.js";
+import {
+  CONTEXT_FORMULA,
+  computeContextUsedUnified,
+  clampContextPercent,
+  init_context_window
+} from "./cli-pfk92eqz.js";
 import {
   hasCodexOAuthPoolSlots
 } from "./cli-j4bwnpkm.js";
 import {
   DEFAULT_MODEL_TIER_MAP,
   init_types
-} from "./cli-mz9afxxf.js";
+} from "./cli-4rf0f5vg.js";
+import {
+  routeCredentialStatus,
+  CODEX_GATEWAY_API_KEY,
+  deriveDefaultRoute,
+  routeUnsetEnv,
+  init_src,
+  selectCredential,
+  init_credentials
+} from "./cli-1tem6ns9.js";
 import {
   runtimeCatalogModel,
   init_runtime_model_catalog
-} from "./cli-6x9ma5w5.js";
+} from "./cli-803188pb.js";
 import {
   init_package,
   package_default
-} from "./cli-y561h5a9.js";
+} from "./cli-nn6vx2mq.js";
 import {
   isEnvFlagEnabled,
   isSessionSummarySkipped,
@@ -73,10 +87,10 @@ import {
 import {
   scrubSecrets,
   init_secret_scrubber
-} from "./cli-n4c8e3s5.js";
+} from "./cli-708wdy32.js";
 import {
   init_src2
-} from "./cli-nwyw3zhg.js";
+} from "./cli-gxee0bqa.js";
 
 // src/providers/codex-oauth/home.ts
 import os from "node:os";
@@ -85,9 +99,12 @@ function codexUserHome() {
 }
 
 // src/providers/codex-adapter.ts
+init_src();
 import { existsSync as nodeExistsSync } from "node:fs";
 import { join as join2 } from "node:path";
 init_api_key();
+init_context_window();
+init_credentials();
 init_env_flag();
 init_secret_scrubber();
 
@@ -520,8 +537,28 @@ function createCodexSwarmEventHandler(opts) {
 }
 
 // src/providers/codex-adapter.ts
+var CODEX_GATEWAY_PROVIDER_ID = "swarm-gateway";
+function codexGatewayConfig(route) {
+  return {
+    model_provider: CODEX_GATEWAY_PROVIDER_ID,
+    model_providers: {
+      [CODEX_GATEWAY_PROVIDER_ID]: {
+        name: "Swarm gateway",
+        base_url: route.baseUrl,
+        env_key: CODEX_GATEWAY_API_KEY,
+        wire_api: "responses",
+        requires_openai_auth: false
+      }
+    }
+  };
+}
 var CONTEXT_MODE_CODEX_PLUGIN = "context-mode@context-mode";
 function checkCodexCredentials2(env, opts = {}) {
+  const gateway = deriveDefaultRoute("codex", env);
+  if (gateway) {
+    const status = routeCredentialStatus(gateway, env);
+    return status.ready ? { ready: true, missing: [], satisfiedBy: "env", hint: status.hint } : { ready: false, missing: status.missing, hint: status.hint };
+  }
   const homeDir = opts.homeDir ?? env.HOME ?? "/root";
   const existsSync = opts.fs?.existsSync ?? nodeExistsSync;
   const authFile = `${homeDir}/.codex/auth.json`;
@@ -1048,6 +1085,7 @@ class CodexSession {
   errorTracker = new SessionErrorTracker;
   appliedReasoningEffort;
   pendingResult = null;
+  observeContextBound;
   constructor(thread, config, resolvedModel, initialEvents = [], skillsDir, summarizeDeps = {}) {
     this.thread = thread;
     this.config = config;
@@ -1056,6 +1094,12 @@ class CodexSession {
     this.skillsDir = skillsDir ?? process.env.CODEX_SKILLS_DIR ?? join2(codexUserHome(), ".codex", "skills");
     this.summarizeDeps = summarizeDeps;
     this.logFileHandle = Bun.file(config.logFile).writer();
+    this.observeContextBound = createContextBoundNote({
+      threshold: contextBoundNoteThreshold(config.env ?? process.env),
+      model: () => this.resolvedModel,
+      canDeliver: () => this.acceptsSteering && !this.settled && !this.aborted,
+      inject: (note) => this.deliverSteering({ mode: "steer", text: note })
+    });
     const reasoningApplication = applyReasoningEffort("codex", resolvedModel, config.reasoningEffort);
     this.appliedReasoningEffort = reasoningApplication.kind === "codex-config" ? config.reasoningEffort ?? null : null;
     this.completionPromise = new Promise((resolve) => {
@@ -1361,6 +1405,7 @@ class CodexSession {
         break;
       case "context.updated":
         this.emitContextUsage(event.usage, event.contextWindow ?? this.contextWindow);
+        this.observeContextBound(event.usage.input_tokens);
         break;
       case "error": {
         const { message } = this.formatTerminalError(event.message, event.codexErrorInfo);
@@ -1721,8 +1766,13 @@ async function createInProcessCodexSession2(config, opts = {}) {
   const bufferedEmit = (event) => {
     preSessionEvents.push(event);
   };
-  const mergedConfig = await buildCodexConfig(config, resolvedModel, bufferedEmit);
-  const authMode = await resolveCodexAuthMode(config, bufferedEmit);
+  const routeEnv = config.env ?? process.env;
+  const gateway = deriveDefaultRoute("codex", routeEnv);
+  const mergedConfig = {
+    ...await buildCodexConfig(config, resolvedModel, bufferedEmit),
+    ...gateway ? codexGatewayConfig(gateway) : {}
+  };
+  const authMode = gateway ? null : await resolveCodexAuthMode(config, bufferedEmit);
   const env = {
     PATH: process.env.PATH ?? "",
     HOME: process.env.HOME ?? "",
@@ -1733,8 +1783,17 @@ async function createInProcessCodexSession2(config, opts = {}) {
     ...buildOtelTraceparentEnv(config.env ?? process.env),
     SWARM_CODEX_APP_SERVER: "1"
   };
-  if (authMode === "chatgpt")
+  if (gateway) {
+    for (const key of routeUnsetEnv("codex", gateway))
+      delete env[key];
+    const gatewayKey = routeEnv[CODEX_GATEWAY_API_KEY];
+    if (gatewayKey)
+      env[CODEX_GATEWAY_API_KEY] = gatewayKey;
+  } else if (authMode === "chatgpt")
     delete env.OPENAI_API_KEY;
+  else if (env.OPENAI_API_KEY) {
+    env.OPENAI_API_KEY = selectCredential(env.OPENAI_API_KEY, undefined, "OPENAI_API_KEY").selected;
+  }
   const codexPathOverride = process.env.CODEX_PATH_OVERRIDE;
   if (config.resumeSessionId) {
     console.warn("[codex-adapter] resumeSessionId ignored — native resume is disabled by deprecation plan");
@@ -1816,6 +1875,12 @@ class CodexSubprocessSession {
       parentOtelEnv: buildOtelTraceparentEnv(config.env ?? process.env)
     };
     const apiKey = getApiKey();
+    const providerKeys = {};
+    for (const keyVar of ["OPENAI_API_KEY", "OPENROUTER_API_KEY", "ANTHROPIC_API_KEY"]) {
+      const value = config.env?.[keyVar] ?? process.env[keyVar];
+      if (value)
+        providerKeys[keyVar] = selectCredential(value, undefined, keyVar).selected;
+    }
     this.proc = registerProcessGroup(Bun.spawn(argv, {
       detached: detachedProcessGroup,
       env: {
@@ -1824,9 +1889,7 @@ class CodexSubprocessSession {
         ...process.env.NODE_EXTRA_CA_CERTS ? { NODE_EXTRA_CA_CERTS: process.env.NODE_EXTRA_CA_CERTS } : {},
         ...process.env.MCP_BASE_URL ? { MCP_BASE_URL: process.env.MCP_BASE_URL } : {},
         ...apiKey ? { AGENT_SWARM_API_KEY: apiKey, API_KEY: apiKey } : {},
-        ...process.env.OPENAI_API_KEY ? { OPENAI_API_KEY: process.env.OPENAI_API_KEY } : {},
-        ...process.env.OPENROUTER_API_KEY ? { OPENROUTER_API_KEY: process.env.OPENROUTER_API_KEY } : {},
-        ...process.env.ANTHROPIC_API_KEY ? { ANTHROPIC_API_KEY: process.env.ANTHROPIC_API_KEY } : {},
+        ...providerKeys,
         ...process.env.CODEX_PATH_OVERRIDE ? { CODEX_PATH_OVERRIDE: process.env.CODEX_PATH_OVERRIDE } : {},
         ...process.env.CODEX_SKILLS_DIR ? { CODEX_SKILLS_DIR: process.env.CODEX_SKILLS_DIR } : {},
         CONTEXT_MODE_EXTERNAL_MCP_NUDGE_EVERY: CTX_MODE_NUDGE_EVERY,
@@ -2056,6 +2119,9 @@ class CodexAdapter2 {
     this.threadFactory = opts.threadFactory;
   }
   async createSession(config) {
+    if (deriveDefaultRoute("codex", config.env ?? process.env)) {
+      console.log("\x1B[2m[codex]\x1B[0m Using credential: gateway");
+    }
     if (this.bypassSubprocess) {
       return createInProcessCodexSession2(config, {
         skillsDir: this.skillsDir,

package/dist/{cli-hhxjnjzs.js → cli-cz37jqss.js}

@@ -1,7 +1,3 @@
-import {
-  getContextWindowSize,
-  clampContextPercent
-} from "./cli-a5ebc95n.js";
 import {
   swarmRuntimeInstanceId
 } from "./cli-e8xyjvfc.js";
@@ -10,17 +6,22 @@ import {
 } from "./cli-jc1g9ndz.js";
 import {
   applyReasoningEffort
-} from "./cli-bn0rewsy.js";
+} from "./cli-c081bj3b.js";
+import {
+  getContextWindowSize,
+  clampContextPercent,
+  init_context_window
+} from "./cli-pfk92eqz.js";
 import {
   DEFAULT_MODEL_TIER_MAP,
   init_types
-} from "./cli-mz9afxxf.js";
+} from "./cli-4rf0f5vg.js";
 import {
   resolveTemplateFromCode,
   resolveTemplateAsync,
   init_resolver,
   init_session_templates
-} from "./cli-tx00c0h6.js";
+} from "./cli-dqygeeh5.js";
 import {
   parseEnvFlag,
   init_env_flag
@@ -29,21 +30,22 @@ import {
   scrubSecrets,
   registerVolatileSecret,
   init_secret_scrubber
-} from "./cli-n4c8e3s5.js";
+} from "./cli-708wdy32.js";
 import {
   cursorCatalogRef,
   init_src2
-} from "./cli-nwyw3zhg.js";
+} from "./cli-gxee0bqa.js";
 
 // src/providers/cursor-adapter.ts
 init_src2();
 init_session_templates();
 init_resolver();
 init_types();
+init_context_window();
+init_env_flag();
 import { mkdtemp, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-init_env_flag();
 init_secret_scrubber();
 var CURSOR_MCP_SERVER_NAME = "agent-swarm";
 var NATIVE_SYSTEM_PROMPT_ENV = "CURSOR_NATIVE_SYSTEM_PROMPT";

package/dist/{cli-6n8axjv1.js → cli-d2dpf95n.js}

@@ -1,7 +1,7 @@
 import {
   RuntimeProviderKindSchema,
   init_types
-} from "./cli-mz9afxxf.js";
+} from "./cli-4rf0f5vg.js";
 import {
   init_zod
 } from "./cli-4chz1hye.js";
@@ -21,7 +21,7 @@ import {
 import {
   scrubSecrets,
   init_secret_scrubber
-} from "./cli-n4c8e3s5.js";
+} from "./cli-708wdy32.js";
 
 // src/runtime-providers/controller.ts
 init_secret_scrubber();

package/dist/{cli-tx00c0h6.js → cli-dqygeeh5.js}

@@ -385,7 +385,7 @@ agent-fs is the shared drive between agents and people. Documents (reports, dige
 Pages: only for polished artifacts shared with a wider audience or explicitly requested; see \`pages\` skill.
 A tool a person will use, with data and actions: build an app. See the \`apps\` skill.
 Link env: \`APP_URL\` for pages, \`MCP_BASE_URL\` for the API, \`AGENT_FS_LIVE_URL\` for files. Report missing variables.
-For a file anyone outside the swarm opens, use an \`agent-fs share-create\` link; \`AGENT_FS_LIVE_URL\` links are for signed-in teammates.
+Give people the live app link \`\${AGENT_FS_LIVE_URL}/file/~/<org>/<drive>/<path>\`. Make an \`agent-fs share-create\` link only when the requester asks for one or the reader has no agent-fs login.
 `,
     variables: [],
     category: "system"
@@ -482,6 +482,22 @@ Task: {{task}}{{progressLine}}
     ],
     category: "system"
   });
+  registerTemplate({
+    eventType: "system.agent.context.bound_note",
+    header: "",
+    defaultBody: "Context is {{contextTokens}} tokens{{contextShare}}. Keep this task bounded: finish the current step, store-progress, and complete or defer instead of starting new exploration.",
+    variables: [
+      {
+        name: "contextTokens",
+        description: "Prompt size of the latest request (input + cache read + cache write tokens)"
+      },
+      {
+        name: "contextShare",
+        description: `How full the model's context window is, e.g. " (21% of the 1,000,000-token window)". Empty when the window is unknown`
+      }
+    ],
+    category: "system"
+  });
   registerTemplate({
     eventType: "system.agent.cursor.first_message",
     header: "",

package/dist/{cli-z21whrrg.js → cli-emhjcj2y.js}

@@ -4,7 +4,7 @@ import {
 import {
   workflowEventBus2,
   init_event_bus
-} from "./cli-dabehxhp.js";
+} from "./cli-kt907da6.js";
 import {
   getDbClient2,
   isRuntimePoolsEnabled,
@@ -66,7 +66,7 @@ import {
   getStaleApprovalRequests2,
   upsertKv2,
   init_db3
-} from "./cli-kxawjrxg.js";
+} from "./cli-g8ka5j4j.js";
 import {
   poolTaskRunsOnHarness,
   isRuntimePoolWakeable,
@@ -87,48 +87,48 @@ import {
   createRerouteDecisionTask,
   createPoolStarvationDecisionTask,
   canClaim
-} from "./cli-aecdcr77.js";
+} from "./cli-4hxrf0p4.js";
 import {
   runtimeStaleThresholdMinutes,
   countActiveRuntimeInstancesForAgent,
   agentsWithLiveRuntime,
   expireStaleRuntimeInstances,
   createApprovalFollowUpTask
-} from "./cli-jjznk3f7.js";
+} from "./cli-3fwqy71j.js";
 import {
   listRuntimePools2,
   init_db
-} from "./cli-vwn81jbs.js";
+} from "./cli-gf95q3bm.js";
 import {
   remediateStalledRuntime
-} from "./cli-svrj71pg.js";
+} from "./cli-c2habvsf.js";
 import {
   runSavedScriptAsAgent
-} from "./cli-p9rafdrb.js";
+} from "./cli-3gfvmzht.js";
 import {
   mintToken,
   init_users
-} from "./cli-e8jyq7d8.js";
+} from "./cli-esakngh8.js";
 import {
   TERMINAL_TASK_STATUSES,
   SUPERSEDED_WORKFLOW_TASK_REASON,
   init_types
-} from "./cli-mz9afxxf.js";
-import {
-  registerTemplate,
-  init_registry,
-  resolveTemplate,
-  init_resolver
-} from "./cli-tx00c0h6.js";
+} from "./cli-4rf0f5vg.js";
 import {
   DEFAULT_OPENROUTER_BASE_URL,
   getOpenRouterBaseUrl,
   init_openrouter_base_url
 } from "./cli-dfyv0jdy.js";
+import {
+  registerTemplate,
+  init_registry,
+  resolveTemplate,
+  init_resolver
+} from "./cli-dqygeeh5.js";
 import {
   init_package,
   package_default
-} from "./cli-y561h5a9.js";
+} from "./cli-nn6vx2mq.js";
 import {
   isEnvFlagEnabled,
   init_env_flag
@@ -136,7 +136,7 @@ import {
 import {
   scrubSecrets,
   init_secret_scrubber
-} from "./cli-n4c8e3s5.js";
+} from "./cli-708wdy32.js";
 
 // src/be/runtime-pools/routing.ts
 init_runtime_pools_flag();

package/dist/{cli-e8jyq7d8.js → cli-esakngh8.js}

@@ -5,12 +5,12 @@ import {
   validateRuntimeTokenTtlHours,
   init_swarm_config_guard,
   init_db3
-} from "./cli-kxawjrxg.js";
+} from "./cli-g8ka5j4j.js";
 import {
   registerVolatileSecret,
   unregisterVolatileSecret,
   init_secret_scrubber
-} from "./cli-n4c8e3s5.js";
+} from "./cli-708wdy32.js";
 import {
   __esm
 } from "./cli-242037k3.js";
@@ -285,6 +285,10 @@ async function mintRuntimeToken(agentId, runtimeId, ttlMs = runtimeTokenTtlMs())
 async function mintScriptRunToken(agentId, ttlMs) {
   return await insertSessionToken(agentId, null, null, ttlMs, null, undefined, null, null, true);
 }
+async function isScriptRunToken(tokenId) {
+  const row = await getDbClient2().get("SELECT scriptRun FROM session_tokens WHERE id = ?", [tokenId]);
+  return row?.scriptRun === 1;
+}
 async function insertSessionToken(agentId, taskId, runtimeId, ttlMs, parentRuntimeId = null, expiresAtCeiling, controllerId = null, parentTokenId = null, scriptRun = false) {
   const plaintext = `${SESSION_TOKEN_PREFIX}${base62(randomBytes(24))}`;
   const tokenId = randomUUID().replace(/-/g, "");
@@ -449,4 +453,4 @@ var init_users = __esm(() => {
   };
 });
 
-export { registerSessionTokenConnection, closeSessionTokenConnections, init_session_token_connections, findUserById, findUserByExternalId, findUserByEmail, findUsersByName, getUserIdentities, listUserEvents, listUserTokens, recordIdentityEvent, findOrCreateUserByEmail, linkIdentity, unlinkIdentity, mintToken, revokeToken, resolveUserByToken, InvalidRuntimeTokenError, mintSessionToken, mintRuntimeToken, mintScriptRunToken, insertSessionToken, revokeSessionToken, revokeRuntimeTokensForRuntime, AgentTokenExistsError, mintAgentToken, rotateAgentToken, revokeAgentTokens, resolveSessionToken, fingerprintApiKey, init_users };
+export { registerSessionTokenConnection, closeSessionTokenConnections, init_session_token_connections, findUserById, findUserByExternalId, findUserByEmail, findUsersByName, getUserIdentities, listUserEvents, listUserTokens, recordIdentityEvent, findOrCreateUserByEmail, linkIdentity, unlinkIdentity, mintToken, revokeToken, resolveUserByToken, InvalidRuntimeTokenError, mintSessionToken, mintRuntimeToken, mintScriptRunToken, isScriptRunToken, insertSessionToken, revokeSessionToken, revokeRuntimeTokensForRuntime, AgentTokenExistsError, mintAgentToken, rotateAgentToken, revokeAgentTokens, resolveSessionToken, fingerprintApiKey, init_users };

package/dist/{cli-ha9rmwgq.js → cli-fb8m699c.js}

@@ -6,12 +6,12 @@ import {
   isSensitiveKey,
   scrubSecrets,
   init_secret_scrubber
-} from "./cli-n4c8e3s5.js";
+} from "./cli-708wdy32.js";
 import {
   openAICompatibleKeyVars,
   openAICompatibleBaseUrlVars,
   init_src2
-} from "./cli-nwyw3zhg.js";
+} from "./cli-gxee0bqa.js";
 import {
   __esm
 } from "./cli-242037k3.js";

package/dist/{cli-35gtk1p6.js → cli-ffvsj2qw.js}

@@ -1,34 +1,45 @@
 import {
   Anthropic
-} from "./cli-p6zs9h4y.js";
+} from "./cli-rr7zx19j.js";
+import {
+  contextBoundNoteThreshold,
+  createContextBoundNote
+} from "./cli-nq677csy.js";
 import {
   checkToolLoop
 } from "./cli-0726awxw.js";
-import {
-  CONTEXT_FORMULA,
-  getContextWindowSize,
-  computeContextUsedUnified,
-  clampContextPercent
-} from "./cli-a5ebc95n.js";
 import {
   readPkgVersion
 } from "./cli-kr5tjjtz.js";
 import {
   createSwarmEventHandler
 } from "./cli-4zsenjhy.js";
+import {
+  CONTEXT_FORMULA,
+  getContextWindowSize,
+  computeContextUsedUnified,
+  clampContextPercent,
+  init_context_window
+} from "./cli-pfk92eqz.js";
+import {
+  selectCredential,
+  init_credentials
+} from "./cli-1tem6ns9.js";
 import {
   runtimeCatalogModel,
   init_runtime_model_catalog
-} from "./cli-6x9ma5w5.js";
+} from "./cli-803188pb.js";
 import {
   scrubSecrets,
   init_secret_scrubber
-} from "./cli-n4c8e3s5.js";
+} from "./cli-708wdy32.js";
 import {
   init_src2
-} from "./cli-nwyw3zhg.js";
+} from "./cli-gxee0bqa.js";
 
 // src/providers/claude-managed-adapter.ts
+init_context_window();
+init_credentials();
 init_secret_scrubber();
 
 // src/providers/claude-managed-models.ts
@@ -183,6 +194,9 @@ class ClaudeManagedSession {
   taskId;
   aborted = false;
   settled = false;
+  lastRequestContextTokens;
+  observeContextBound;
+  openToolCalls = new Set;
   constructor(client, sessionId, config, userMessageContent, seenEventIds = new Set) {
     this.client = client;
     this._sessionId = sessionId;
@@ -194,6 +208,12 @@ class ClaudeManagedSession {
     this.completionPromise = new Promise((resolve) => {
       this.resolveCompletion = resolve;
     });
+    this.observeContextBound = createContextBoundNote({
+      threshold: contextBoundNoteThreshold(config.env ?? process.env),
+      model: () => this.cost.model,
+      canDeliver: () => !this.settled && !this.aborted && this.openToolCalls.size > 0,
+      inject: (note) => this.deliverSteering({ mode: "steer", text: note })
+    });
     if (config.taskId && config.apiUrl && config.apiKey) {
       const abortRef = { current: this.abortController };
       const handler = createClaudeManagedSwarmEventHandler({
@@ -308,6 +328,8 @@ class ClaudeManagedSession {
       case "agent.tool_use": {
         const tu = event;
         this.runToolLoopCheck(tu.name, tu.input);
+        this.openToolCalls.add(tu.id);
+        this.observeContextBound(this.lastRequestContextTokens);
         this.emit({
           type: "tool_start",
           toolCallId: tu.id,
@@ -320,6 +342,8 @@ class ClaudeManagedSession {
         const tu = event;
         const fqToolName = `${tu.mcp_server_name}:${tu.name}`;
         this.runToolLoopCheck(fqToolName, tu.input);
+        this.openToolCalls.add(tu.id);
+        this.observeContextBound(this.lastRequestContextTokens);
         this.emit({
           type: "tool_start",
           toolCallId: tu.id,
@@ -330,6 +354,7 @@ class ClaudeManagedSession {
       }
       case "agent.tool_result": {
         const tr = event;
+        this.openToolCalls.delete(tr.tool_use_id);
         this.emit({
           type: "tool_end",
           toolCallId: tr.tool_use_id,
@@ -341,6 +366,7 @@ class ClaudeManagedSession {
       }
       case "agent.mcp_tool_result": {
         const tr = event;
+        this.openToolCalls.delete(tr.mcp_tool_use_id);
         this.emit({
           type: "tool_end",
           toolCallId: tr.mcp_tool_use_id,
@@ -372,6 +398,7 @@ class ClaudeManagedSession {
       case "span.model_request_end": {
         const sp = event;
         const usage = sp.model_usage;
+        this.lastRequestContextTokens = usage.input_tokens + usage.cache_read_input_tokens + usage.cache_creation_input_tokens;
         this.cost.inputTokens = (this.cost.inputTokens ?? 0) + usage.input_tokens;
         this.cost.outputTokens = (this.cost.outputTokens ?? 0) + usage.output_tokens;
         this.cost.cacheReadTokens = (this.cost.cacheReadTokens ?? 0) + usage.cache_read_input_tokens;
@@ -570,7 +597,7 @@ class ClaudeManagedAdapter2 {
     if (missing.length > 0) {
       throw new Error(`[claude-managed] Missing required env var(s): ${missing.join(", ")}. ` + `Run \`bun run src/cli.tsx claude-managed-setup\` to create an Anthropic-side ` + `agent + environment and persist their IDs to swarm_config.`);
     }
-    this.apiKey = process.env.ANTHROPIC_API_KEY;
+    this.apiKey = selectCredential(process.env.ANTHROPIC_API_KEY, undefined, "ANTHROPIC_API_KEY").selected;
     this.agentId = process.env.MANAGED_AGENT_ID;
     this.environmentId = process.env.MANAGED_ENVIRONMENT_ID;
     if (opts.client) {
@@ -580,6 +607,10 @@ class ClaudeManagedAdapter2 {
     }
   }
   async createSession(config) {
+    const taskKey = config.env?.ANTHROPIC_API_KEY;
+    const client = taskKey && this.client instanceof Anthropic ? this.client.withOptions({
+      apiKey: selectCredential(taskKey, undefined, "ANTHROPIC_API_KEY").selected
+    }) : this.client;
     if (config.resumeSessionId) {
       console.warn("[claude-managed-adapter] resumeSessionId ignored — native resume is disabled by deprecation plan");
     }
@@ -611,9 +642,9 @@ class ClaudeManagedAdapter2 {
     if (vaultIds.length > 0) {
       createParams.vault_ids = Array.from(new Set(vaultIds));
     }
-    const created = await Promise.resolve(this.client.beta.sessions.create(createParams));
+    const created = await Promise.resolve(client.beta.sessions.create(createParams));
     const sessionId = created.id;
-    return new ClaudeManagedSession(this.client, sessionId, config, userMessageContent, seenEventIds);
+    return new ClaudeManagedSession(client, sessionId, config, userMessageContent, seenEventIds);
   }
   async canResume(sessionId) {
     try {