@desplega.ai/agent-swarm 2.5.3 → 2.6.0

package/dist/{cli-qzme5949.js → cli-5rj83bam.js}

@@ -1,14 +1,14 @@
 import {
   renderSteeringDelivery
-} from "./cli-0xk505e8.js";
+} from "./cli-sxgtf5fw.js";
 import {
   authJsonToCredentialSelection,
   credentialsToAuthJson,
   loadAllCodexOAuthSlots
-} from "./cli-kxpfx2xr.js";
+} from "./cli-0z1xjzwa.js";
 import {
   effectiveReasoningEffort
-} from "./cli-bn0rewsy.js";
+} from "./cli-c081bj3b.js";
 import {
   isSkillLoaderCall,
   skillFromToolArgs,
@@ -19,8 +19,15 @@ import {
   orgIdentityStatus,
   renderMemoriesPrompt,
   isUnknownModelError,
+  timedFetch,
+  checkAnthropicApiKey,
+  checkOpenAiApiKey,
+  checkXaiApiKey,
+  checkOpenRouter,
+  checkDeepSeekApiKey,
+  checkOpenAICompatibleProvider,
   writeSkillsToFilesystem
-} from "./cli-hcpj2xqz.js";
+} from "./cli-n7asmce6.js";
 import {
   isPollTracingEnabled,
   initOtel,
@@ -30,10 +37,7 @@ import {
   injectTraceContext2,
   initialize,
   ensure
-} from "./cli-ce0ak9ms.js";
-import {
-  getContextWindowSize
-} from "./cli-a5ebc95n.js";
+} from "./cli-g20jjwt4.js";
 import {
   MAX_RATE_LIMIT_RESET_MS,
   isRateLimitMessage,
@@ -41,7 +45,7 @@ import {
   CODEX_CREDITS_EXHAUSTED_COOLDOWN_MS,
   resolveCodexCreditsExhaustedCooldownMs,
   parseRateLimitResetTime
-} from "./cli-gx4rm0qx.js";
+} from "./cli-7enjwya9.js";
 import {
   terminateRegisteredProcessGroups
 } from "./cli-3ggwdtb0.js";
@@ -51,40 +55,44 @@ import {
   canonicalAzureDevOpsRepoUrl,
   parseAzureDevOpsRepoUrl,
   resolveScriptsOnlyMode
-} from "./cli-aecdcr77.js";
+} from "./cli-4hxrf0p4.js";
 import {
   ACP_TARGET_IDS,
   isAcpTarget
-} from "./cli-5kqnemen.js";
+} from "./cli-yvy48785.js";
 import {
   checkAmpCredentials2,
   liveTestAmpCredentials2
-} from "./cli-p0rzjkya.js";
+} from "./cli-m5a9m0ak.js";
 import {
   checkClaudeCredentials2
-} from "./cli-ewm3pwbq.js";
+} from "./cli-k21gx5ht.js";
 import {
   checkClaudeManagedCredentials2
-} from "./cli-35gtk1p6.js";
+} from "./cli-ffvsj2qw.js";
 import {
   codexUserHome,
   checkCodexCredentials2
-} from "./cli-s49hpn37.js";
+} from "./cli-ca6banwz.js";
 import {
   checkCursorCredentials2
-} from "./cli-hhxjnjzs.js";
+} from "./cli-cz37jqss.js";
 import {
   checkDevinCredentials2
-} from "./cli-g1cw7xtt.js";
+} from "./cli-39rrw8yp.js";
 import {
   checkDshCredentials2
-} from "./cli-40jsnrjm.js";
+} from "./cli-az25fn5f.js";
 import {
   checkOpencodeCredentials2
-} from "./cli-avdvgcay.js";
+} from "./cli-9abdgn5t.js";
 import {
   checkGrokCredentials2
-} from "./cli-fzcn3d87.js";
+} from "./cli-m70bajzr.js";
+import {
+  getContextWindowSize,
+  init_context_window
+} from "./cli-pfk92eqz.js";
 import {
   CODEX_OAUTH_POOL_SLOTS_ENV,
   isCodexOAuthConfigKey,
@@ -93,7 +101,7 @@ import {
 } from "./cli-j4bwnpkm.js";
 import {
   validateJsonSchema
-} from "./cli-jjznk3f7.js";
+} from "./cli-3fwqy71j.js";
 import {
   mapTriggerSurface,
   init_telemetry_context,
@@ -111,7 +119,7 @@ import {
   init_vcs_repo_match,
   isApiDrainingResponse,
   init_api_drain
-} from "./cli-kxawjrxg.js";
+} from "./cli-g8ka5j4j.js";
 import {
   parseWorkerModelTierOverrides,
   resolveTaskModelSelection,
@@ -119,7 +127,7 @@ import {
   ProviderNameSchema,
   WorkerNudgeSchema,
   init_types
-} from "./cli-mz9afxxf.js";
+} from "./cli-4rf0f5vg.js";
 import {
   generateDefaultClaudeMd2,
   generateDefaultSoulMd2,
@@ -143,50 +151,43 @@ import {
   resolveClaudeMdPath,
   syncProfileFilesToServer,
   init_profile_sync
-} from "./cli-gpv60278.js";
+} from "./cli-hfeb68z4.js";
 import {
   isSteeringEnabled2,
   init_steering_enabled
 } from "./cli-4sydckyj.js";
 import {
+  init_templates3
+} from "./cli-j6rktc91.js";
+import {
+  validateRoute,
+  deriveDefaultRoute,
+  init_src,
+  modelFamilyOf,
+  windowForModelFamily,
+  parseModelLimitMessage,
+  parseCreditsRequiredMessage,
+  init_model_rate_limit_windows,
+  CREDENTIAL_POOL_VARS,
   normalizeProviderKeyAliases,
   ModelWindowExhaustedError,
+  splitCredentialPool,
   CLAUDE_CREDENTIALS_HINT,
   resolveCredentialPools,
   init_credentials
-} from "./cli-zw88zjba.js";
-import {
-  init_templates3
-} from "./cli-0ebey9hg.js";
+} from "./cli-1tem6ns9.js";
 import {
   interpolate,
   init_template,
   configureHttpResolver,
   resolveTemplateAsync,
   init_resolver
-} from "./cli-tx00c0h6.js";
-import {
-  modelFamilyOf,
-  windowForModelFamily,
-  parseModelLimitMessage,
-  parseCreditsRequiredMessage,
-  init_model_rate_limit_windows
-} from "./cli-7421jzsw.js";
-import {
-  validateRoute,
-  deriveDefaultRoute,
-  init_src
-} from "./cli-e45e4m6b.js";
-import {
-  getOpenRouterBaseUrl,
-  getOpenRouterAttributionHeaders,
-  init_openrouter_base_url
-} from "./cli-dfyv0jdy.js";
+} from "./cli-dqygeeh5.js";
 import {
   runtimeHarnessSections,
   refreshRuntimeModelCatalog,
   init_runtime_model_catalog
-} from "./cli-6x9ma5w5.js";
+} from "./cli-803188pb.js";
 import {
   getMcpBaseUrl,
   init_constants2
@@ -204,7 +205,7 @@ import {
   registerEnvSecrets,
   registerSensitiveKeyName,
   init_secret_scrubber
-} from "./cli-n4c8e3s5.js";
+} from "./cli-708wdy32.js";
 import {
   harnessModelMismatch,
   openAICompatibleProviders,
@@ -212,9 +213,10 @@ import {
   providerBaseUrl,
   providerKeyFromEnv,
   init_src2
-} from "./cli-nwyw3zhg.js";
+} from "./cli-gxee0bqa.js";
 
 // src/commands/runner.ts
+init_src();
 import { existsSync, statSync } from "node:fs";
 import { mkdir, readFile, stat, writeFile } from "node:fs/promises";
 init_base_prompt();
@@ -246,47 +248,47 @@ async function materializeCodexAuthJson(_slot, creds, deps = {}) {
 async function createProviderAdapter(provider) {
   switch (provider) {
     case "claude": {
-      const { ClaudeAdapter } = await import("./claude-adapter-hswdnm3t.js");
+      const { ClaudeAdapter } = await import("./claude-adapter-nys1kjxa.js");
       return new ClaudeAdapter;
     }
     case "pi": {
-      const { PiMonoAdapter } = await import("./pi-mono-adapter-tqsge1ay.js");
+      const { PiMonoAdapter } = await import("./pi-mono-adapter-mymbwhj0.js");
       return new PiMonoAdapter;
     }
     case "codex": {
-      const { CodexAdapter } = await import("./codex-adapter-n8ka66vf.js");
+      const { CodexAdapter } = await import("./codex-adapter-d95q4qsn.js");
       return new CodexAdapter;
     }
     case "claude-managed": {
-      const { ClaudeManagedAdapter } = await import("./claude-managed-adapter-cvbzj1h6.js");
+      const { ClaudeManagedAdapter } = await import("./claude-managed-adapter-55207973.js");
       return new ClaudeManagedAdapter;
     }
     case "devin": {
-      const { DevinAdapter } = await import("./devin-adapter-4ycy4vrf.js");
+      const { DevinAdapter } = await import("./devin-adapter-byen2cxt.js");
       return new DevinAdapter;
     }
     case "opencode": {
-      const { OpencodeAdapter } = await import("./opencode-adapter-9tppvxar.js");
+      const { OpencodeAdapter } = await import("./opencode-adapter-esv3k9yn.js");
       return new OpencodeAdapter;
     }
     case "dsh": {
-      const { DshAdapter } = await import("./dsh-adapter-kpdnhjst.js");
+      const { DshAdapter } = await import("./dsh-adapter-d4pdpb3r.js");
       return new DshAdapter;
     }
     case "amp": {
-      const { AmpAdapter } = await import("./amp-adapter-speb906t.js");
+      const { AmpAdapter } = await import("./amp-adapter-en0jy6hs.js");
       return new AmpAdapter;
     }
     case "cursor": {
-      const { CursorAdapter } = await import("./cursor-adapter-swr2k95y.js");
+      const { CursorAdapter } = await import("./cursor-adapter-4mr4jgkw.js");
       return new CursorAdapter;
     }
     case "grok": {
-      const { GrokAdapter } = await import("./grok-adapter-qtjz0whk.js");
+      const { GrokAdapter } = await import("./grok-adapter-t08b9ntm.js");
       return new GrokAdapter;
     }
     case "acp": {
-      const { ACPAdapter } = await import("./acp-adapter-gr2fcyyj.js");
+      const { ACPAdapter } = await import("./acp-adapter-dgfakfpw.js");
       return new ACPAdapter;
     }
     default:
@@ -503,6 +505,7 @@ init_codex_auth_failure();
 init_config_env_export();
 init_config_secrets();
 init_constants2();
+init_context_window();
 init_credentials();
 
 // src/utils/harness-cli-version.ts
@@ -1220,11 +1223,14 @@ async function reportCredentialOutcomeThenFinish(input, finish) {
   await finish();
 }
 
+// src/commands/credential-refresh.ts
+init_credentials();
+init_secret_scrubber();
+
 // src/commands/provider-credentials.ts
 init_src2();
 init_src();
 init_credentials();
-init_openrouter_base_url();
 init_secret_scrubber();
 function isBedrockMode(env) {
   const mode = env.BEDROCK_AUTH_MODE?.toLowerCase();
@@ -1267,7 +1273,7 @@ var CREDENTIAL_PROVIDER_CHECKERS = {
   devin: (env) => checkDevinCredentials2(env),
   opencode: (env, opts) => checkOpencodeCredentials2(env, opts),
   pi: async (env, opts) => {
-    const { checkPiMonoCredentials, listPiOpencodeGoModelIds } = await import("./pi-mono-adapter-tqsge1ay.js");
+    const { checkPiMonoCredentials, listPiOpencodeGoModelIds } = await import("./pi-mono-adapter-mymbwhj0.js");
     return {
       ...await checkPiMonoCredentials(env, opts),
       opencodeGoModels: listPiOpencodeGoModelIds()
@@ -1300,27 +1306,6 @@ async function checkProviderCredentials(provider, env, opts) {
   }
   return checker(env, opts);
 }
-var LIVE_TEST_TIMEOUT_MS = 5000;
-async function timedFetch(url, init) {
-  const controller = new AbortController;
-  const timer = setTimeout(() => controller.abort(), LIVE_TEST_TIMEOUT_MS);
-  const start = Date.now();
-  try {
-    const res = await fetch(url, { ...init, signal: controller.signal });
-    let bodyText = "";
-    try {
-      bodyText = await res.text();
-    } catch {}
-    return {
-      ok: res.ok,
-      status: res.status,
-      bodyText,
-      latency_ms: Date.now() - start
-    };
-  } finally {
-    clearTimeout(timer);
-  }
-}
 function asLiveError(err, latency_ms) {
   const raw = err instanceof Error ? err.message : String(err);
   return {
@@ -1329,75 +1314,56 @@ function asLiveError(err, latency_ms) {
     latency_ms
   };
 }
-async function checkAnthropicApiKey(apiKey) {
-  const r = await timedFetch("https://api.anthropic.com/v1/models", {
-    method: "GET",
-    headers: { "x-api-key": apiKey, "anthropic-version": "2023-06-01" }
-  });
-  if (r.ok)
-    return { ok: true, latency_ms: r.latency_ms };
-  return {
-    ok: false,
-    error: scrubSecrets(`HTTP ${r.status}: ${r.bodyText.slice(0, 200)}`),
-    latency_ms: r.latency_ms
-  };
+async function checkEachKey(keyType, value, check) {
+  const members = splitCredentialPool(value);
+  if (members.length === 0)
+    members.push(value.trim());
+  const results = await Promise.all(members.map(async (member) => {
+    const startedAt = Date.now();
+    try {
+      return await check(member);
+    } catch (err) {
+      return asLiveError(err, Date.now() - startedAt);
+    }
+  }));
+  const latency_ms = Math.max(...results.map((result) => result.latency_ms));
+  if (results.every((result) => result.skipped))
+    return { ok: true, skipped: true, latency_ms };
+  const keys = results.map((result, index) => ({
+    keyType,
+    index,
+    suffix: members[index].slice(-5),
+    ok: result.ok,
+    ...result.error !== undefined ? { error: result.error } : {},
+    ...result.httpStatus !== undefined ? { httpStatus: result.httpStatus } : {},
+    latency_ms: result.latency_ms
+  }));
+  const failed = keys.filter((key) => !key.ok);
+  if (failed.length === 0)
+    return { ok: true, latency_ms, keys };
+  const failures = failed.map((key) => `key ending ${key.suffix} (${key.httpStatus !== undefined ? `HTTP ${key.httpStatus}` : key.error ?? "Unknown error"})`).join(", ");
+  if (failed.length < keys.length) {
+    return {
+      ok: true,
+      latency_ms,
+      keys,
+      warning: `${failed.length} of ${keys.length} keys failed: ${failures}.`
+    };
+  }
+  if (keys.length === 1) {
+    return {
+      ok: false,
+      error: failed[0].error,
+      httpStatus: failed[0].httpStatus,
+      latency_ms,
+      keys
+    };
+  }
+  return { ok: false, error: `All ${keys.length} keys failed: ${failures}.`, latency_ms, keys };
 }
 function presenceCheckOk() {
   return { ok: true, latency_ms: 0 };
 }
-async function checkOpenAiApiKey(apiKey) {
-  const r = await timedFetch("https://api.openai.com/v1/models", {
-    method: "GET",
-    headers: { Authorization: `Bearer ${apiKey}` }
-  });
-  if (r.ok)
-    return { ok: true, latency_ms: r.latency_ms };
-  return {
-    ok: false,
-    error: scrubSecrets(`HTTP ${r.status}: ${r.bodyText.slice(0, 200)}`),
-    latency_ms: r.latency_ms
-  };
-}
-async function checkXaiApiKey(apiKey) {
-  const r = await timedFetch("https://api.x.ai/v1/models", {
-    method: "GET",
-    headers: { Authorization: `Bearer ${apiKey}` }
-  });
-  if (r.ok)
-    return { ok: true, latency_ms: r.latency_ms };
-  return {
-    ok: false,
-    error: scrubSecrets(`HTTP ${r.status}: ${r.bodyText.slice(0, 200)}`),
-    latency_ms: r.latency_ms
-  };
-}
-async function checkOpenRouter(apiKey) {
-  const url = `${getOpenRouterBaseUrl()}/models`;
-  const r = await timedFetch(url, {
-    method: "GET",
-    headers: { ...getOpenRouterAttributionHeaders(url), Authorization: `Bearer ${apiKey}` }
-  });
-  if (r.ok)
-    return { ok: true, latency_ms: r.latency_ms };
-  return {
-    ok: false,
-    error: scrubSecrets(`HTTP ${r.status}: ${r.bodyText.slice(0, 200)}`),
-    latency_ms: r.latency_ms
-  };
-}
-async function checkOpenAICompatibleProvider(provider, apiKey, baseUrl = provider.baseUrl) {
-  const r = await timedFetch(`${baseUrl.replace(/\/+$/, "")}/models`, {
-    method: "GET",
-    headers: { Authorization: `Bearer ${apiKey}` }
-  });
-  if (r.ok)
-    return { ok: true, latency_ms: r.latency_ms };
-  return {
-    ok: false,
-    error: scrubSecrets(`HTTP ${r.status}: ${r.bodyText.slice(0, 200)}`),
-    latency_ms: r.latency_ms
-  };
-}
 function codexAuthFileExists(env) {
   return checkCodexCredentials2(env).satisfiedBy === "file";
 }
@@ -1424,17 +1390,32 @@ async function validateProviderCredentials(provider, env = process.env, presence
             latency_ms: Date.now() - startedAt
           };
         }
-        const result = await validateRoute(route, env);
-        const latency_ms = Date.now() - startedAt;
-        if (result.status === "verified")
-          return { ok: true, latency_ms };
-        if (result.status === "configured")
-          return { ok: true, skipped: true, latency_ms };
-        return { ok: false, error: scrubSecrets(result.reason), latency_ms };
+        const checkRoute = async (routeEnv) => {
+          const start = Date.now();
+          const result = await validateRoute(route, routeEnv);
+          const latency_ms = Date.now() - start;
+          if (result.status === "verified")
+            return { ok: true, latency_ms };
+          if (result.status === "configured")
+            return { ok: true, skipped: true, latency_ms };
+          return {
+            ok: false,
+            error: scrubSecrets(result.reason),
+            httpStatus: result.httpStatus,
+            latency_ms
+          };
+        };
+        const keyVar = route.auth.kind === "subscription" ? "CLAUDE_CODE_OAUTH_TOKEN" : ("secretKey" in route.auth) ? route.auth.secretKey : undefined;
+        const value = keyVar ? env[keyVar] : undefined;
+        if (keyVar && value && CREDENTIAL_POOL_VARS.includes(keyVar)) {
+          return checkEachKey(keyVar, value, (member) => checkRoute({ ...env, [keyVar]: member }));
+        }
+        return checkRoute(env);
       }
       case "claude-managed": {
-        if (env.ANTHROPIC_API_KEY)
-          return checkAnthropicApiKey(env.ANTHROPIC_API_KEY);
+        if (env.ANTHROPIC_API_KEY) {
+          return checkEachKey("ANTHROPIC_API_KEY", env.ANTHROPIC_API_KEY, checkAnthropicApiKey);
+        }
         return {
           ok: false,
           error: "ANTHROPIC_API_KEY is not set.",
@@ -1442,14 +1423,30 @@ async function validateProviderCredentials(provider, env = process.env, presence
         };
       }
       case "codex": {
+        const gateway = deriveDefaultRoute("codex", env);
+        if (gateway) {
+          const result = await validateRoute(gateway, env);
+          const latency_ms = Date.now() - startedAt;
+          if (result.status === "verified")
+            return { ok: true, latency_ms };
+          if (result.status === "configured")
+            return { ok: true, skipped: true, latency_ms };
+          return {
+            ok: false,
+            error: scrubSecrets(result.reason),
+            httpStatus: result.httpStatus,
+            latency_ms
+          };
+        }
         if (codexAuthFileExists(env))
           return presenceCheckOk();
         if (parseCodexOAuthAccess(env.CODEX_OAUTH))
           return presenceCheckOk();
         if (hasCodexOAuthPoolSlots(env))
           return presenceCheckOk();
-        if (env.OPENAI_API_KEY)
-          return checkOpenAiApiKey(env.OPENAI_API_KEY);
+        if (env.OPENAI_API_KEY) {
+          return checkEachKey("OPENAI_API_KEY", env.OPENAI_API_KEY, checkOpenAiApiKey);
+        }
         return {
           ok: false,
           error: "No codex credential found (no ~/.codex/auth.json, CODEX_OAUTH, or OPENAI_API_KEY).",
@@ -1464,16 +1461,19 @@ async function validateProviderCredentials(provider, env = process.env, presence
         const status = presence ?? await checkProviderCredentials(provider, env);
         if (status.ready && status.satisfiedBy === "file")
           return presenceCheckOk();
-        if (env.OPENROUTER_API_KEY)
-          return checkOpenRouter(env.OPENROUTER_API_KEY);
-        if (env.ANTHROPIC_API_KEY)
-          return checkAnthropicApiKey(env.ANTHROPIC_API_KEY);
-        if (env.OPENAI_API_KEY)
-          return checkOpenAiApiKey(env.OPENAI_API_KEY);
+        if (env.OPENROUTER_API_KEY) {
+          return checkEachKey("OPENROUTER_API_KEY", env.OPENROUTER_API_KEY, checkOpenRouter);
+        }
+        if (env.ANTHROPIC_API_KEY) {
+          return checkEachKey("ANTHROPIC_API_KEY", env.ANTHROPIC_API_KEY, checkAnthropicApiKey);
+        }
+        if (env.OPENAI_API_KEY) {
+          return checkEachKey("OPENAI_API_KEY", env.OPENAI_API_KEY, checkOpenAiApiKey);
+        }
         for (const direct of openAICompatibleProviders()) {
           const key = providerKeyFromEnv(direct, env);
           if (key) {
-            return checkOpenAICompatibleProvider(direct, key, providerBaseUrl(direct, env));
+            return checkEachKey(direct.envVar, key, (member) => checkOpenAICompatibleProvider(direct, member, providerBaseUrl(direct, env)));
           }
         }
         if (status.ready)
@@ -1494,27 +1494,37 @@ async function validateProviderCredentials(provider, env = process.env, presence
           };
         }
         const baseUrl = env.DEVIN_API_BASE_URL ?? "https://api.devin.ai";
-        const r = await timedFetch(`${baseUrl.replace(/\/+$/, "")}/v3/self`, {
-          method: "GET",
-          headers: {
-            Authorization: `Bearer ${apiKey}`,
-            "Content-Type": "application/json"
-          }
+        return checkEachKey("DEVIN_API_KEY", apiKey, async (member) => {
+          const r = await timedFetch(`${baseUrl.replace(/\/+$/, "")}/v3/self`, {
+            method: "GET",
+            headers: {
+              Authorization: `Bearer ${member}`,
+              "Content-Type": "application/json"
+            }
+          });
+          if (r.ok)
+            return { ok: true, latency_ms: r.latency_ms };
+          return {
+            ok: false,
+            error: scrubSecrets(`HTTP ${r.status}: ${r.bodyText.slice(0, 200)}`),
+            httpStatus: r.status,
+            latency_ms: r.latency_ms
+          };
         });
-        if (r.ok)
-          return { ok: true, latency_ms: r.latency_ms };
-        return {
-          ok: false,
-          error: scrubSecrets(`HTTP ${r.status}: ${r.bodyText.slice(0, 200)}`),
-          latency_ms: r.latency_ms
-        };
       }
-      case "dsh":
-        return checkDshCredentials2(env).ready ? presenceCheckOk() : {
+      case "dsh": {
+        const deepseekKey = env.DEEPSEEK_API_KEY?.trim();
+        if (deepseekKey)
+          return checkEachKey("DEEPSEEK_API_KEY", deepseekKey, checkDeepSeekApiKey);
+        const openRouterKey = env.OPENROUTER_API_KEY?.trim();
+        if (openRouterKey)
+          return checkEachKey("OPENROUTER_API_KEY", openRouterKey, checkOpenRouter);
+        return {
           ok: false,
           error: "Set DEEPSEEK_API_KEY or OPENROUTER_API_KEY for dsh.",
           latency_ms: Date.now() - startedAt
         };
+      }
       case "amp": {
         if (!checkAmpCredentials2(env).ready) {
           return {
@@ -1523,12 +1533,15 @@ async function validateProviderCredentials(provider, env = process.env, presence
             latency_ms: Date.now() - startedAt
           };
         }
-        const live = await liveTestAmpCredentials2(env);
-        return live.ok ? { ok: true, latency_ms: Date.now() - startedAt } : {
-          ok: false,
-          error: live.error ?? "amp usage failed",
-          latency_ms: Date.now() - startedAt
-        };
+        return checkEachKey("AMP_API_KEY", env.AMP_API_KEY, async (member) => {
+          const start = Date.now();
+          const live = await liveTestAmpCredentials2({ ...env, AMP_API_KEY: member });
+          return live.ok ? { ok: true, latency_ms: Date.now() - start } : {
+            ok: false,
+            error: live.error ?? "amp usage failed",
+            latency_ms: Date.now() - start
+          };
+        });
       }
       case "cursor": {
         const apiKey = env.CURSOR_API_KEY?.trim();
@@ -1539,17 +1552,21 @@ async function validateProviderCredentials(provider, env = process.env, presence
             latency_ms: Date.now() - startedAt
           };
         }
-        const { liveTestCursorKey } = await import("./cursor-adapter-swr2k95y.js");
-        const result = await liveTestCursorKey(apiKey);
-        return result.ok ? { ok: true, latency_ms: Date.now() - startedAt } : { ok: false, error: result.error, latency_ms: Date.now() - startedAt };
+        const { liveTestCursorKey } = await import("./cursor-adapter-4mr4jgkw.js");
+        return checkEachKey("CURSOR_API_KEY", apiKey, async (member) => {
+          const start = Date.now();
+          const result = await liveTestCursorKey(member);
+          return result.ok ? { ok: true, latency_ms: Date.now() - start } : { ok: false, error: result.error, latency_ms: Date.now() - start };
+        });
       }
       case "grok": {
         const apiKey = env.XAI_API_KEY?.trim();
         if (apiKey)
-          return checkXaiApiKey(apiKey);
+          return checkEachKey("XAI_API_KEY", apiKey, checkXaiApiKey);
         const openRouterKey = env.OPENROUTER_API_KEY?.trim();
-        if (openRouterKey)
-          return checkOpenRouter(openRouterKey);
+        if (openRouterKey) {
+          return checkEachKey("OPENROUTER_API_KEY", openRouterKey, checkOpenRouter);
+        }
         return {
           ok: false,
           error: "Set XAI_API_KEY or OPENROUTER_API_KEY for grok.",
@@ -1581,7 +1598,9 @@ async function buildCredStatusReport(provider, env, opts = {}, kind) {
       ok: live.ok,
       error: live.error ?? null,
       latency_ms: live.latency_ms,
-      testedAt: Date.now()
+      testedAt: Date.now(),
+      ...live.warning !== undefined ? { warning: live.warning } : {},
+      ...live.keys !== undefined ? { keys: live.keys } : {}
     };
   }
   const bedrock = presence.bedrockRegion !== undefined ? {
@@ -1676,13 +1695,56 @@ function buildLatestModelReport(opts) {
 
 // src/commands/credential-refresh.ts
 var CREDENTIAL_RETRY_INTERVAL_MS = 30000;
+var KEY_RECHECK_INTERVAL_MS = 10 * 60000;
 var BEDROCK_REFRESH_INTERVAL_MS = 5 * 60 * 1000;
+function credentialFingerprint(env) {
+  return Bun.hash(JSON.stringify([...CREDENTIAL_POOL_VARS, "ANTHROPIC_AUTH_TOKEN", "ANTHROPIC_BASE_URL"].map((key) => env[key] ?? null))).toString();
+}
+function recheckableFailures(liveTest) {
+  const keys = liveTest?.keys;
+  if (keys?.length) {
+    return keys.filter((key) => !key.ok && key.keyType !== "CLAUDE_CODE_OAUTH_TOKEN").length;
+  }
+  return liveTest?.ok === false ? 1 : 0;
+}
+async function reportKeyValidation(api, keys) {
+  for (const keyType of new Set(keys.map((key) => key.keyType))) {
+    try {
+      const response = await fetch(`${api.apiUrl}/api/keys/report-validation`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${api.apiKey}`,
+          "X-Agent-ID": api.agentId
+        },
+        body: JSON.stringify({
+          keyType,
+          keys: keys.filter((key) => key.keyType === keyType).map((key) => ({
+            keyIndex: key.index,
+            keySuffix: key.suffix,
+            ok: key.ok,
+            httpStatus: key.httpStatus
+          }))
+        }),
+        signal: AbortSignal.timeout(5000)
+      });
+      if (!response.ok)
+        throw new Error(`HTTP ${response.status}`);
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      console.warn(scrubSecrets(`[credentials] Failed to report key validation: ${message}`));
+    }
+  }
+}
 async function refreshCredentialStatus(api, state, harnessProvider, env, now = Date.now()) {
   if (isCredCheckDisabled(env) || state.inFlight)
     return;
   const providerChanged = state.harnessProvider !== harnessProvider;
+  const fingerprint = credentialFingerprint(env);
+  const fingerprintChanged = state.fingerprint !== fingerprint;
   const retryDue = state.ready !== true && now - state.lastRefreshAt >= CREDENTIAL_RETRY_INTERVAL_MS;
-  if (!providerChanged && !retryDue && !shouldRefreshBedrockStatus({
+  const keyRecheckDue = state.rejectedKeys > 0 && now - state.lastRefreshAt >= KEY_RECHECK_INTERVAL_MS;
+  if (!providerChanged && !fingerprintChanged && !retryDue && !keyRecheckDue && !shouldRefreshBedrockStatus({
     harnessProvider,
     env,
     lastRefreshAt: state.lastRefreshAt,
@@ -1704,8 +1766,14 @@ async function refreshCredentialStatus(api, state, harnessProvider, env, now = D
       missing: snapshot.missing,
       credStatus: snapshot
     });
-    if (state.harnessProvider === harnessProvider)
+    if (state.harnessProvider === harnessProvider) {
       state.ready = snapshot.ready;
+      state.fingerprint = fingerprint;
+      state.rejectedKeys = recheckableFailures(snapshot.liveTest);
+      const keys = snapshot.liveTest?.keys;
+      if (keys?.length)
+        await reportKeyValidation(api, keys);
+    }
   } finally {
     state.inFlight = false;
   }
@@ -1733,7 +1801,7 @@ function resolveBackoff(override, env) {
   };
   return {
     initialMs: override?.initialMs ?? parsePositive(env.BOOT_INITIAL_BACKOFF_MS, 2000),
-    maxMs: override?.maxMs ?? parsePositive(env.BOOT_MAX_BACKOFF_MS, 30000),
+    maxMs: override?.maxMs ?? parsePositive(env.BOOT_MAX_BACKOFF_MS, 1e4),
     maxWaitSeconds: override?.maxWaitSeconds ?? parsePositive(env.BOOT_MAX_WAIT_SECONDS, 0)
   };
 }
@@ -2497,6 +2565,7 @@ async function fetchResolvedEnv(apiUrl, apiKey, agentId, baseEnv = process.env,
     env
   });
   const effectiveModel = modelSelection.model || env.MODEL_OVERRIDE || "";
+  const credentialEnv = { ...env };
   const credentialSelections = await resolveCredentialPools(env, {
     apiUrl,
     apiKey,
@@ -2505,7 +2574,7 @@ async function fetchResolvedEnv(apiUrl, apiKey, agentId, baseEnv = process.env,
     localBlocks: sessionContext?.localBlocks,
     enforceModelCapacity: sessionContext?.enforceModelCapacity
   });
-  return { env, credentialSelections, resolvedProvider, scriptsOnlyConfigValue };
+  return { env, credentialEnv, credentialSelections, resolvedProvider, scriptsOnlyConfigValue };
 }
 async function ensureAgentFsCredentials(apiUrl, apiKey, agentId) {
   if (!apiUrl || !apiKey || !agentId || agentId === "unknown")
@@ -3910,6 +3979,8 @@ async function pollForTriggerOnce(opts) {
     headers["X-Model-Tier-Overrides"] = encodeURIComponent(JSON.stringify(workerModelTierOverrides(opts.harnessProvider)));
   }
   while (Date.now() - startTime < opts.pollTimeout) {
+    if (opts.shouldStop?.())
+      return null;
     try {
       let url = `${opts.apiUrl}/api/poll`;
       if (opts.since) {
@@ -4320,7 +4391,7 @@ async function spawnProviderProcess(adapter, opts, logDir, isYolo) {
   const sessionEffort = effectiveReasoningEffort(adapter.name, model, reasoningEffortOverride);
   let oauthSelection;
   let oauthIsPoolBacked = false;
-  if (adapter.name === "codex") {
+  if (adapter.name === "codex" && !deriveDefaultRoute("codex", freshEnv)) {
     const oauthInfo = await resolveCodexOAuthCredentialInfo(opts.apiUrl, opts.apiKey);
     oauthSelection = oauthInfo?.selection;
     oauthIsPoolBacked = oauthInfo?.isPoolBacked ?? false;
@@ -5430,8 +5501,11 @@ ${additionalSystemPrompt}` : basePrompt;
     harnessProvider: null,
     ready: null,
     lastRefreshAt: 0,
-    inFlight: false
+    inFlight: false,
+    fingerprint: null,
+    rejectedKeys: 0
   };
+  let latestCredentialEnv;
   let lastHarnessReconcileAt = 0;
   const HARNESS_RECONCILE_INTERVAL_MS = 1e4;
   let lastServerCapsRefreshAt = 0;
@@ -5646,6 +5720,11 @@ ${additionalSystemPrompt}` : basePrompt;
       credentialRefreshState.harnessProvider = state.harnessProvider;
       credentialRefreshState.ready = bootCredSnapshot?.ready ?? true;
       credentialRefreshState.lastRefreshAt = Date.now();
+      credentialRefreshState.fingerprint = credentialFingerprint(process.env);
+      credentialRefreshState.rejectedKeys = recheckableFailures(bootCredSnapshot?.liveTest);
+      const keys = bootCredSnapshot?.liveTest?.keys;
+      if (keys?.length)
+        await reportKeyValidation(apiConfig, keys);
     } catch (error) {
       console.error(`[${role}] Failed to report credential readiness after recovery: ${error}`);
       process.exit(1);
@@ -6070,9 +6149,11 @@ ${additionalSystemPrompt}` : basePrompt;
       try {
         const {
           env: freshEnv,
+          credentialEnv,
           resolvedProvider,
           scriptsOnlyConfigValue
         } = await fetchResolvedEnv(apiUrl, apiKey, agentId);
+        latestCredentialEnv = credentialEnv;
         const nextScriptsOnly = resolveScriptsOnlyMode({
           env: process.env.SCRIPTS_ONLY_MCP,
           configValue: scriptsOnlyConfigValue
@@ -6085,7 +6166,7 @@ ${additionalSystemPrompt}` : basePrompt;
         console.warn(`[${role}] [harness] Reconcile fetch failed (non-fatal): ${err}`);
       }
     }
-    refreshCredentialStatus(apiConfig, credentialRefreshState, state.harnessProvider, process.env).catch((err) => console.warn(`[${role}] cred_status post_task refresh failed (non-fatal): ${err}`));
+    refreshCredentialStatus(apiConfig, credentialRefreshState, state.harnessProvider, latestCredentialEnv ?? process.env).catch((err) => console.warn(`[${role}] cred_status post_task refresh failed (non-fatal): ${err}`));
     const now = Date.now();
     for (const [taskId, task] of state.activeTasks) {
       if (vcsDetectedTasks.has(taskId))
@@ -6120,7 +6201,7 @@ ${additionalSystemPrompt}` : basePrompt;
       push: deliveryChecks.push,
       activeCount: state.activeTasks.size,
       maxConcurrent: exitAfterTasks === null ? state.maxConcurrent : Math.min(state.maxConcurrent, Math.max(0, exitAfterTasks - state.tasksProcessed)),
-      draining: state.apiDraining,
+      draining: state.apiDraining || shuttingDown,
       lastPushPingAt,
       pollInterval: PollIntervalMs
     });
@@ -6147,6 +6228,7 @@ ${additionalSystemPrompt}` : basePrompt;
         runtimeInstanceId,
         pollTimeout: effectiveTimeout,
         singlePoll: schedule.singlePoll,
+        shouldStop: () => shuttingDown,
         onPollFailure,
         harnessProvider: state.harnessProvider,
         onApiDrainSignal: (draining) => applyApiDrainSignal(state, role, draining)