opencode-anthropic-multi-account 0.2.23 → 0.2.25

package/dist/index.js

@@ -10,11 +10,11 @@ import {
   cc_derived_defaults_default,
   checkCCCompat,
   createMinimalClient,
+  data_default,
   debugLog,
   detectCliVersion,
   detectDrift,
   detectOAuthConfig,
-  fingerprint_data_default,
   formatWaitTime,
   getAccountLabel,
   getConfig,
@@ -25,11 +25,11 @@ import {
   showToast,
   sleep,
   updateConfigField
-} from "./chunk-2SN3UVSM.js";
-import "./chunk-RAX4SFCO.js";
+} from "./chunk-II7N6KHL.js";
+import "./chunk-3CTML5AX.js";
 
 // src/index.ts
-import { tool } from "@opencode-ai/plugin";
+import { tool } from "@opencode-ai/plugin/tool";
 import {
   CascadeStateManager,
   loadPoolChainConfig,
@@ -37,10 +37,10 @@ import {
   PoolManager
 } from "opencode-multi-account-core";
 
-// src/account-manager.ts
+// src/accounts/manager.ts
 import { createAccountManagerForProvider } from "opencode-multi-account-core";
 
-// src/claims.ts
+// src/accounts/claims.ts
 import { createClaimsManager } from "opencode-multi-account-core";
 var claimsManager = createClaimsManager(CLAIMS_FILENAME);
 var {
@@ -50,12 +50,12 @@ var {
   writeClaim
 } = claimsManager;
 
-// src/anthropic-oauth.ts
+// src/oauth/anthropic-oauth.ts
 import { exec } from "child_process";
 import * as v3 from "valibot";
 
-// src/cc-derived-profile.ts
-var bundledTemplate = fingerprint_data_default;
+// src/claude-code/derived-profile.ts
+var bundledTemplate = data_default;
 var derivedDefaults = cc_derived_defaults_default;
 var DEFAULT_BASE_API_URL = derivedDefaults.request?.baseApiUrl || "https://api.anthropic.com";
 var DEFAULT_ANTHROPIC_VERSION = bundledTemplate.header_values?.["anthropic-version"] || derivedDefaults.request?.anthropicVersion || "2023-06-01";
@@ -90,7 +90,7 @@ async function loadCCDerivedAuthProfile() {
   };
 }
 
-// src/oauth-callback-server.ts
+// src/oauth/callback-server.ts
 import { createServer } from "http";
 var DEFAULT_TIMEOUT_MS = 3e5;
 var SUCCESS_REDIRECT_URL = "https://platform.claude.com/oauth/code/success?app=claude-code";
@@ -186,7 +186,7 @@ function startCallbackServer(options) {
   });
 }
 
-// src/oauth-pkce.ts
+// src/oauth/pkce.ts
 import { createHash, randomBytes } from "crypto";
 function base64url(buffer) {
   return buffer.toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/g, "");
@@ -200,7 +200,7 @@ function generateState() {
   return base64url(randomBytes(32));
 }
 
-// src/token-node-request.ts
+// src/oauth/token-node-request.ts
 import * as childProcess from "child_process";
 function buildNodeTokenRequestScript() {
   return `
@@ -259,7 +259,7 @@ request.end();
 async function defaultRunNodeTokenRequest(options) {
   const script = buildNodeTokenRequestScript();
   const contentType = options.contentType ?? "application/json";
-  return await new Promise((resolve, reject) => {
+  return new Promise((resolve, reject) => {
     childProcess.execFile(
       options.executable,
       ["-e", script],
@@ -292,13 +292,13 @@ async function defaultRunNodeTokenRequest(options) {
 }
 var nodeTokenRequestRunner = defaultRunNodeTokenRequest;
 async function runNodeTokenRequest(options) {
-  return await nodeTokenRequestRunner(options);
+  return nodeTokenRequestRunner(options);
 }
 
 // src/usage.ts
 import * as v2 from "valibot";
 
-// src/types.ts
+// src/shared/types.ts
 import * as v from "valibot";
 var OAuthCredentialsSchema = v.object({
   type: v.literal("oauth"),
@@ -461,7 +461,7 @@ function getPlanLabel(account) {
   return PLAN_LABELS[account.planTier] ?? account.planTier.charAt(0).toUpperCase() + account.planTier.slice(1);
 }
 
-// src/anthropic-oauth.ts
+// src/oauth/anthropic-oauth.ts
 var TOKEN_REQUEST_EXECUTABLE = process.env.OPENCODE_REFRESH_NODE_EXECUTABLE || "node";
 var browserExec = (command, callback) => {
   exec(command, callback);
@@ -509,6 +509,18 @@ function openBrowser(url) {
   } catch {
   }
 }
+function buildAuthorizeUrl(params) {
+  const url = new URL(params.authorizeUrl);
+  url.searchParams.set("code", "true");
+  url.searchParams.set("client_id", params.clientId);
+  url.searchParams.set("response_type", "code");
+  url.searchParams.set("redirect_uri", params.redirectUri);
+  url.searchParams.set("scope", params.scopes);
+  url.searchParams.set("code_challenge", params.codeChallenge);
+  url.searchParams.set("code_challenge_method", "S256");
+  url.searchParams.set("state", params.state);
+  return url.toString();
+}
 async function postTokenEndpoint(contentType, body, timeoutMs = TOKEN_REFRESH_TIMEOUT_MS, userAgent) {
   const derivedProfile = await loadCCDerivedAuthProfile();
   const oauthConfig = derivedProfile.oauthConfig;
@@ -561,16 +573,14 @@ async function loginWithOAuth(callbacks) {
   const { port, waitForCode, stop } = await callbackServerStarter({ expectedState: state });
   const redirectUri = `http://localhost:${port}/callback`;
   try {
-    const authorizeUrl = `${cfg.authorizeUrl}?${new URLSearchParams({
-      code: "true",
-      client_id: cfg.clientId,
-      response_type: "code",
-      redirect_uri: redirectUri,
-      scope: cfg.scopes,
-      code_challenge: codeChallenge,
-      code_challenge_method: "S256",
+    const authorizeUrl = buildAuthorizeUrl({
+      authorizeUrl: cfg.authorizeUrl,
+      clientId: cfg.clientId,
+      scopes: cfg.scopes,
+      redirectUri,
+      codeChallenge,
       state
-    }).toString()}`;
+    });
     callbacks.onAuth({
       url: authorizeUrl,
       instructions: "Complete authorization in your browser."
@@ -636,7 +646,7 @@ async function refreshWithOAuth(currentRefreshToken) {
   return patch;
 }
 
-// src/token.ts
+// src/oauth/token.ts
 var PERMANENT_FAILURE_MESSAGE_PATTERNS = [
   /\binvalid_grant\b/i,
   /\binvalid_scope\b/i,
@@ -659,8 +669,7 @@ async function refreshToken(currentRefreshToken, accountId, client) {
       return { ok: true, patch };
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      const hasPermanentMessage = PERMANENT_FAILURE_MESSAGE_PATTERNS.some((pattern) => pattern.test(message));
-      const isPermanent = hasPermanentMessage;
+      const isPermanent = PERMANENT_FAILURE_MESSAGE_PATTERNS.some((pattern) => pattern.test(message));
       await client.app.log({
         body: {
           service: ANTHROPIC_OAUTH_ADAPTER.serviceLogName,
@@ -679,7 +688,7 @@ async function refreshToken(currentRefreshToken, accountId, client) {
   return refreshPromise;
 }
 
-// src/account-manager.ts
+// src/accounts/manager.ts
 var AccountManager = createAccountManagerForProvider({
   providerAuthId: "anthropic",
   getConfig,
@@ -690,10 +699,10 @@ var AccountManager = createAccountManagerForProvider({
   writeClaim
 });
 
-// src/executor.ts
+// src/runtime/executor.ts
 import { createExecutorForProvider as createExecutorForProvider2, getClearedOAuthBody } from "opencode-multi-account-core";
 
-// src/rate-limit.ts
+// src/accounts/rate-limit.ts
 import { createRateLimitHandlers } from "opencode-multi-account-core";
 var {
   fetchUsageLimits,
@@ -708,7 +717,7 @@ var {
   showToast
 });
 
-// src/pool-chain-executor.ts
+// src/runtime/pool-chain.ts
 import { createExecutorForProvider } from "opencode-multi-account-core";
 function buildCascadePrompt(input, init) {
   if (typeof init?.body === "string" && init.body.length > 0) {
@@ -793,7 +802,7 @@ async function executeWithPoolChainRotation(manager, runtimeFactory, poolManager
   }
 }
 
-// src/executor.ts
+// src/runtime/executor.ts
 var { executeWithAccountRotation: executeWithCoreAccountRotation } = createExecutorForProvider2("Anthropic", {
   handleRateLimitResponse: async (manager, client, account, response) => handleRateLimitResponse(
     manager,
@@ -845,22 +854,22 @@ async function executeWithAccountRotation(manager, runtimeFactory, client, input
   }
 }
 
-// src/ui/ansi.ts
+// src/auth-ux/menu/ansi.ts
 import {
   ANSI,
   isTTY,
   parseKey
 } from "opencode-multi-account-core";
 
-// src/ui/select.ts
+// src/auth-ux/menu/select.ts
 import {
   select
 } from "opencode-multi-account-core";
 
-// src/ui/confirm.ts
+// src/auth-ux/menu/confirm.ts
 import { confirm } from "opencode-multi-account-core";
 
-// src/ui/auth-menu.ts
+// src/auth-ux/menu/menu.ts
 function formatRelativeTime(timestamp) {
   if (!timestamp) return "never";
   const days = Math.floor((Date.now() - timestamp) / 864e5);
@@ -904,12 +913,10 @@ function buildAccountMenuItem(account) {
   const label = getAccountLabel(account);
   const status = getAccountStatus(account);
   const badge = STATUS_BADGE[status];
-  const fullLabel = `${label} ${badge}`;
   return {
-    label: fullLabel,
+    label: `${label} ${badge}`,
     hint: account.lastUsed ? `used ${formatRelativeTime(account.lastUsed)}` : "",
-    value: account,
-    disabled: false
+    value: account
   };
 }
 async function showAuthMenu(accounts) {
@@ -1064,7 +1071,7 @@ function printQuotaError(account, error) {
 `);
 }
 
-// src/account-store.ts
+// src/accounts/store.ts
 import {
   AccountStore as CoreAccountStore
 } from "opencode-multi-account-core";
@@ -1074,9 +1081,8 @@ var AccountStore = class extends CoreAccountStore {
   }
 };
 
-// src/auth-handler.ts
+// src/auth-ux/handler.ts
 import { randomUUID } from "crypto";
-import { exec as exec2 } from "child_process";
 function makeFailedFlowResult(message) {
   return {
     url: "",
@@ -1162,7 +1168,7 @@ function wrapCallbackWithManagerSync(result, manager) {
 \u2139\uFE0F  Account already exists in multi-auth pool (${countAfter} total).
 `);
         } else {
-          await persistFallback(auth);
+          await persistFallback(auth, email);
           console.log("\n\u2705 Account saved.\n");
         }
       }
@@ -1170,12 +1176,13 @@ function wrapCallbackWithManagerSync(result, manager) {
     }
   };
 }
-async function persistFallback(auth) {
+async function persistFallback(auth, email) {
   try {
     const store = new AccountStore();
     const now2 = Date.now();
     const account = {
       uuid: randomUUID(),
+      email,
       refreshToken: auth.refresh,
       accessToken: auth.access,
       expiresAt: auth.expires,
@@ -1350,7 +1357,7 @@ Retrying authentication for ${label}...
   return { triggerOAuth: false };
 }
 
-// src/proactive-refresh.ts
+// src/accounts/proactive-refresh.ts
 import { createProactiveRefreshQueueForProvider } from "opencode-multi-account-core";
 var ProactiveRefreshQueue = createProactiveRefreshQueueForProvider({
   providerAuthId: "anthropic",
@@ -1360,13 +1367,13 @@ var ProactiveRefreshQueue = createProactiveRefreshQueueForProvider({
   debugLog
 });
 
-// src/runtime-factory.ts
+// src/runtime/factory.ts
 import { TokenRefreshError } from "opencode-multi-account-core";
 
-// src/request-transform.ts
+// src/request/transform.ts
 import { randomUUID as randomUUID4 } from "crypto";
 
-// src/model-config.ts
+// src/model/config.ts
 function splitBetaFlags(value) {
   return value.split(",").map((entry) => entry.trim()).filter(Boolean);
 }
@@ -1392,7 +1399,7 @@ function getModelOverride(modelId) {
   return null;
 }
 
-// src/betas.ts
+// src/request/betas.ts
 var LONG_CONTEXT_BETAS = config.longContextBetas;
 var OAUTH_BETA = "oauth-2025-04-20";
 var excludedBetas = /* @__PURE__ */ new Map();
@@ -1449,8 +1456,8 @@ function supports1mContext(modelId) {
   if (!versionMatch) {
     return false;
   }
-  const major = Number.parseInt(versionMatch[2] ?? "0", 10);
-  const minor = Number.parseInt(versionMatch[3] ?? "0", 10);
+  const major = Number.parseInt(versionMatch[2], 10);
+  const minor = Number.parseInt(versionMatch[3], 10);
   const effectiveMinor = minor > 99 ? 0 : minor;
   return major > 4 || major === 4 && effectiveMinor >= 6;
 }
@@ -1482,7 +1489,7 @@ function getModelBetas(modelId, excluded) {
   return betas.filter((beta) => !excluded.has(beta));
 }
 
-// src/claude-identity.ts
+// src/claude-code/identity.ts
 import { readFileSync, readdirSync } from "fs";
 import { homedir } from "os";
 import { join } from "path";
@@ -1526,22 +1533,19 @@ function loadClaudeIdentity() {
   if (testOverrideIdentity) {
     return testOverrideIdentity;
   }
-  try {
-    for (const path of getCandidatePaths()) {
-      const identity = parseIdentityFile(path);
-      if (identity) {
-        return identity;
-      }
+  for (const path of getCandidatePaths()) {
+    const identity = parseIdentityFile(path);
+    if (identity) {
+      return identity;
     }
-  } catch {
   }
   return EMPTY_IDENTITY;
 }
 
-// src/upstream-request.ts
+// src/request/upstream-request.ts
 import { createHash as createHash2, randomUUID as randomUUID2 } from "crypto";
 
-// src/model-capabilities.ts
+// src/model/capabilities.ts
 var runtimeModelCapabilities = /* @__PURE__ */ new Map();
 function isRecord(value) {
   return typeof value === "object" && value !== null;
@@ -1584,13 +1588,13 @@ function getRuntimeModelCapability(modelId) {
   return runtimeModelCapabilities.get(normalizeModelId(modelId));
 }
 
-// src/upstream-request.ts
+// src/request/upstream-request.ts
 var BILLING_SEED = "59cf53e54c78";
 var SESSION_IDLE_ROTATE_MS = 15 * 60 * 1e3;
 var MAX_TOOL_RESULT_TEXT_LENGTH = 30 * 1024;
 var TRUNCATION_SUFFIX = "[...truncated]";
 var DEFAULT_CONTEXT_MANAGEMENT = {};
-var DEFAULT_OUTPUT_CONFIG = {};
+var DEFAULT_OUTPUT_CONFIG = { effort: "high" };
 var ORCHESTRATION_TAG_NAMES = [
   "system-reminder",
   "env",
@@ -1805,34 +1809,27 @@ var ADAPTIVE_THINKING_MODEL_MATCHERS = [
   (modelId) => modelId.includes("claude-opus-4-6") || modelId.includes("claude-opus-4.6"),
   (modelId) => /claude-opus-4[-._]([7-9]|\d{2,})/.test(modelId)
 ];
-var DEFAULT_MAX_OUTPUT_TOKENS = 64e3;
-function normalizeModelId2(modelId) {
-  return modelId.trim().toLowerCase();
-}
+var DEFAULT_MAX_OUTPUT_TOKENS = 32e3;
 function supportsAdaptiveThinking(modelId) {
   const runtimeCapability = getRuntimeModelCapability(modelId);
   if (typeof runtimeCapability?.supportsThinking === "boolean") {
     return runtimeCapability.supportsThinking;
   }
-  const normalized = normalizeModelId2(modelId);
+  const normalized = modelId.trim().toLowerCase();
   if (normalized.includes("haiku")) {
     return false;
   }
   return ADAPTIVE_THINKING_MODEL_MATCHERS.some((matches) => matches(normalized));
 }
-function getModelMaxOutputTokens() {
-  return DEFAULT_MAX_OUTPUT_TOKENS;
-}
 function resolveMaxTokens(requestedMaxTokens) {
-  const modelCap = getModelMaxOutputTokens();
   if (typeof requestedMaxTokens !== "number" || !Number.isFinite(requestedMaxTokens)) {
-    return modelCap;
+    return DEFAULT_MAX_OUTPUT_TOKENS;
   }
   const normalized = Math.floor(requestedMaxTokens);
   if (normalized <= 0) {
-    return modelCap;
+    return DEFAULT_MAX_OUTPUT_TOKENS;
   }
-  return Math.min(normalized, modelCap);
+  return Math.min(normalized, DEFAULT_MAX_OUTPUT_TOKENS);
 }
 function normalizeSystemTexts(system) {
   if (typeof system === "string") {
@@ -1912,7 +1909,7 @@ function getCcVersion(template) {
 function buildBillingHeader(firstUserMessage, template) {
   const version = getCcVersion(template);
   const buildTag = computeBuildTag(firstUserMessage, version);
-  return `x-anthropic-billing-header: cc_version=${version}.${buildTag}; cc_entrypoint=cli; cch=00000;`;
+  return `x-anthropic-billing-header: cc_version=${version}.${buildTag}; cc_entrypoint=sdk-cli; cch=00000;`;
 }
 function truncateToolResultText(text) {
   if (text.length <= MAX_TOOL_RESULT_TEXT_LENGTH) {
@@ -1927,7 +1924,7 @@ function getReverseName(name, reverseLookup) {
   if (reverseLookup instanceof Map) {
     return reverseLookup.get(name) ?? name;
   }
-  return typeof reverseLookup[name] === "string" ? String(reverseLookup[name]) : name;
+  return typeof reverseLookup[name] === "string" ? reverseLookup[name] : name;
 }
 function reverseMapToolUseNames(value, reverseLookup) {
   if (Array.isArray(value)) {
@@ -1981,6 +1978,9 @@ function sanitizeMessages(body) {
         block.text = sanitizeContent(block.text);
       }
     }
+    message.content = message.content.filter((block) => {
+      return !isRecord2(block) || block.type !== "text" || block.text !== "";
+    });
   }
 }
 function scrubFrameworkIdentifiers(text) {
@@ -2147,7 +2147,7 @@ function createStreamingReverseMapper(response, reverseLookup) {
   });
 }
 
-// src/tool-flow.ts
+// src/tools/flow.ts
 import { createHash as createHash3 } from "crypto";
 var TOOL_MASK_PREFIX = "tool_";
 function isRecord3(value) {
@@ -2272,7 +2272,7 @@ function applyOutboundToolFlow(parsed, claudeToolNames) {
   };
 }
 
-// src/upstream-headers.ts
+// src/request/headers.ts
 import { randomUUID as randomUUID3 } from "crypto";
 var UPSTREAM_TIMEOUT_MS = 3e5;
 var STAINLESS_PACKAGE_VERSION = "0.81.0";
@@ -2357,7 +2357,7 @@ function filterBillableBetas(betas) {
   ).join(",");
 }
 
-// src/request-transform.ts
+// src/request/transform.ts
 function applyRequestToolMasking(parsed, claudeToolNames) {
   return applyOutboundToolFlow(parsed, claudeToolNames);
 }
@@ -2404,7 +2404,7 @@ function extractToolNamesFromRequestBody(body) {
   }
 }
 
-// src/tool-observation.ts
+// src/tools/observation.ts
 import { promises as fs } from "fs";
 import { dirname, join as join2 } from "path";
 var OBSERVED_TOOL_FILE = "anthropic-observed-tools.json";
@@ -2451,7 +2451,7 @@ async function recordObservedToolNames(toolNames) {
   await saveObservedToolInventory(inventory);
 }
 
-// src/error-utils.ts
+// src/shared/error-utils.ts
 function sanitizeError(err) {
   const msg = err instanceof Error ? err.message : String(err);
   return msg.replace(/sk-ant-[a-zA-Z0-9_-]+/g, "[REDACTED]").replace(/eyJ[a-zA-Z0-9_-]+\.eyJ[a-zA-Z0-9_-]+\.[a-zA-Z0-9_-]+/g, "[REDACTED_JWT]").replace(/Bearer\s+[^\s,;]+/gi, "Bearer [REDACTED]");
@@ -2495,10 +2495,10 @@ function enrich429(body, headers) {
   }
 }
 
-// src/pacing.ts
+// src/runtime/pacing.ts
 function pickNonNegativeInt(...values) {
   for (const v4 of values) {
-    if (v4 === void 0 || v4 === null) continue;
+    if (v4 === void 0) continue;
     const n = typeof v4 === "number" ? v4 : Number.parseInt(v4, 10);
     if (Number.isFinite(n) && n >= 0) return n;
   }
@@ -2520,7 +2520,7 @@ function resolvePacingConfig(explicit = {}, env = process.env) {
   return { minGapMs: minGap, jitterMs: jitter };
 }
 
-// src/runtime-factory.ts
+// src/runtime/factory.ts
 var TOKEN_REFRESH_PERMANENT_FAILURE_STATUS = 401;
 function mergeHeaders(target, headers) {
   if (!headers) {
@@ -2837,7 +2837,7 @@ var AccountRuntimeFactory = class {
   }
 };
 
-// src/bootstrap-auth.ts
+// src/oauth/bootstrap.ts
 import { promises as fs2 } from "fs";
 import { join as join3 } from "path";
 import { getConfigDir as getConfigDir2 } from "opencode-multi-account-core";
@@ -2857,7 +2857,7 @@ function selectBootstrapAccount(accounts, activeAccountUuid) {
   const firstUsableAccount = completeAccounts.find(
     (account) => account.enabled !== false && account.isAuthDisabled !== true
   );
-  return firstUsableAccount ?? completeAccounts[0] ?? null;
+  return firstUsableAccount ?? completeAccounts[0];
 }
 async function readCurrentAuth(providerId) {
   const authPath = join3(getConfigDir2(), AUTH_JSON_FILENAME);
@@ -3009,7 +3009,7 @@ function extractFirstUserText(input) {
 }
 function composeBillingSystemEntry(firstUserMessage, version) {
   const buildTag = computeBuildTag(firstUserMessage, version);
-  return `x-anthropic-billing-header: cc_version=${version}.${buildTag}; cc_entrypoint=cli; cch=00000;`;
+  return `x-anthropic-billing-header: cc_version=${version}.${buildTag}; cc_entrypoint=sdk-cli; cch=00000;`;
 }
 function prependMissingSystemEntries(output, entries) {
   output.system ??= [];
@@ -3062,6 +3062,52 @@ var ClaudeMultiAuthPlugin = async (ctx) => {
       accessToken
     });
   };
+  const ensurePoolInfrastructure = () => {
+    if (!poolManager || !cascadeStateManager) {
+      poolManager = new PoolManager();
+      poolManager.loadPools(poolChainConfig.pools);
+      cascadeStateManager = new CascadeStateManager();
+    }
+  };
+  const createAuthLoaderResult = (activeManager) => ({
+    apiKey: "",
+    "chat.headers": async (input, output) => {
+      if (input.provider?.info?.id !== ANTHROPIC_OAUTH_ADAPTER.authProviderId) return;
+      const sessionId2 = getUpstreamSessionId();
+      applyOrderedHeaders(output, {
+        ...output.headers,
+        ...getStaticHeaders(),
+        ...getPerRequestHeaders(sessionId2),
+        "anthropic-beta": getBetaHeader()
+      });
+    },
+    async fetch(input, init) {
+      if (!activeManager || !runtimeFactory) {
+        stopHeartbeat();
+        return fetch(input, init);
+      }
+      if (activeManager.getAccountCount() === 0) {
+        stopHeartbeat();
+        throw new Error(
+          "No Anthropic accounts configured. Run `opencode auth login` to add an account."
+        );
+      }
+      ensureHeartbeat(activeManager.getActiveAccount()?.accessToken);
+      ensurePoolInfrastructure();
+      return executeWithAccountRotation(
+        activeManager,
+        runtimeFactory,
+        client,
+        input,
+        init,
+        {
+          poolManager,
+          cascadeStateManager,
+          poolChainConfig
+        }
+      );
+    }
+  });
   const startupDrift = detectDrift(template);
   if (startupDrift.drifted) {
     client.app.log({
@@ -3312,48 +3358,8 @@ var ClaudeMultiAuthPlugin = async (ctx) => {
           }
           const authProfile2 = await loadCCDerivedAuthProfile();
           return {
-            apiKey: "",
-            baseURL: authProfile2.apiV1BaseUrl,
-            "chat.headers": async (input, output) => {
-              if (input.provider?.info?.id !== ANTHROPIC_OAUTH_ADAPTER.authProviderId) return;
-              const sessionId2 = getUpstreamSessionId();
-              applyOrderedHeaders(output, {
-                ...output.headers,
-                ...getStaticHeaders(),
-                ...getPerRequestHeaders(sessionId2),
-                "anthropic-beta": getBetaHeader()
-              });
-            },
-            async fetch(input, init) {
-              if (!manager || !runtimeFactory) {
-                stopHeartbeat();
-                return fetch(input, init);
-              }
-              if (manager.getAccountCount() === 0) {
-                stopHeartbeat();
-                throw new Error(
-                  "No Anthropic accounts configured. Run `opencode auth login` to add an account."
-                );
-              }
-              ensureHeartbeat(manager.getActiveAccount()?.accessToken);
-              if (!poolManager || !cascadeStateManager) {
-                poolManager = new PoolManager();
-                poolManager.loadPools(poolChainConfig.pools);
-                cascadeStateManager = new CascadeStateManager();
-              }
-              return executeWithAccountRotation(
-                manager,
-                runtimeFactory,
-                client,
-                input,
-                init,
-                {
-                  poolManager,
-                  cascadeStateManager,
-                  poolChainConfig
-                }
-              );
-            }
+            ...createAuthLoaderResult(manager),
+            baseURL: authProfile2.apiV1BaseUrl
           };
         }
         for (const model of Object.values(providerModels)) {
@@ -3393,48 +3399,8 @@ var ClaudeMultiAuthPlugin = async (ctx) => {
         }
         const authProfile = await loadCCDerivedAuthProfile();
         return {
-          apiKey: "",
-          baseURL: authProfile.apiV1BaseUrl,
-          "chat.headers": async (input, output) => {
-            if (input.provider?.info?.id !== ANTHROPIC_OAUTH_ADAPTER.authProviderId) return;
-            const sessionId2 = getUpstreamSessionId();
-            applyOrderedHeaders(output, {
-              ...output.headers,
-              ...getStaticHeaders(),
-              ...getPerRequestHeaders(sessionId2),
-              "anthropic-beta": getBetaHeader()
-            });
-          },
-          async fetch(input, init) {
-            if (!initializedManager || !runtimeFactory) {
-              stopHeartbeat();
-              return fetch(input, init);
-            }
-            if (initializedManager.getAccountCount() === 0) {
-              stopHeartbeat();
-              throw new Error(
-                "No Anthropic accounts configured. Run `opencode auth login` to add an account."
-              );
-            }
-            ensureHeartbeat(initializedManager.getActiveAccount()?.accessToken);
-            if (!poolManager || !cascadeStateManager) {
-              poolManager = new PoolManager();
-              poolManager.loadPools(poolChainConfig.pools);
-              cascadeStateManager = new CascadeStateManager();
-            }
-            return executeWithAccountRotation(
-              initializedManager,
-              runtimeFactory,
-              client,
-              input,
-              init,
-              {
-                poolManager,
-                cascadeStateManager,
-                poolChainConfig
-              }
-            );
-          }
+          ...createAuthLoaderResult(initializedManager),
+          baseURL: authProfile.apiV1BaseUrl
         };
       }
     }