opencode-anthropic-multi-account 0.2.20 → 0.2.22

package/dist/index.js

@@ -25,8 +25,8 @@ import {
   showToast,
   sleep,
   updateConfigField
-} from "./chunk-RVXWLAVK.js";
-import "./chunk-IETVH43F.js";
+} from "./chunk-TOCJ3XJM.js";
+import "./chunk-RAX4SFCO.js";
 
 // src/index.ts
 import { tool } from "@opencode-ai/plugin";
@@ -637,7 +637,6 @@ async function refreshWithOAuth(currentRefreshToken) {
 }
 
 // src/token.ts
-var PERMANENT_FAILURE_HTTP_STATUSES = /* @__PURE__ */ new Set([400, 401, 403]);
 var PERMANENT_FAILURE_MESSAGE_PATTERNS = [
   /\binvalid_grant\b/i,
   /\binvalid_scope\b/i,
@@ -660,10 +659,8 @@ async function refreshToken(currentRefreshToken, accountId, client) {
       return { ok: true, patch };
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      const statusMatch = message.match(/\b(400|401|403)\b/);
-      const hasPermanentStatus = statusMatch !== null && PERMANENT_FAILURE_HTTP_STATUSES.has(Number(statusMatch[1]));
       const hasPermanentMessage = PERMANENT_FAILURE_MESSAGE_PATTERNS.some((pattern) => pattern.test(message));
-      const isPermanent = hasPermanentStatus || hasPermanentMessage;
+      const isPermanent = hasPermanentMessage;
       await client.app.log({
         body: {
           service: ANTHROPIC_OAUTH_ADAPTER.serviceLogName,
@@ -722,7 +719,7 @@ function buildCascadePrompt(input, init) {
 }
 function createQueueAwareManager(manager, queue, cascadeStateManager) {
   return Object.create(manager, {
-    selectAccount: { value: async function selectAccount() {
+    selectAccount: { value: async function selectAccount(stickyKey) {
       await manager.refresh();
       while (queue.length > 0) {
         const next = queue.shift();
@@ -737,7 +734,7 @@ function createQueueAwareManager(manager, queue, cascadeStateManager) {
         }
         return account;
       }
-      return manager.selectAccount();
+      return manager.selectAccount(stickyKey);
     } }
   });
 }
@@ -1761,12 +1758,7 @@ 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 LARGE_OUTPUT_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;
-var LARGE_MODEL_MAX_OUTPUT_TOKENS = 128e3;
 function normalizeModelId2(modelId) {
   return modelId.trim().toLowerCase();
 }
@@ -1781,16 +1773,11 @@ function supportsAdaptiveThinking(modelId) {
   }
   return ADAPTIVE_THINKING_MODEL_MATCHERS.some((matches) => matches(normalized));
 }
-function getModelMaxOutputTokens(modelId) {
-  const runtimeCapability = getRuntimeModelCapability(modelId);
-  if (typeof runtimeCapability?.maxOutputTokens === "number") {
-    return runtimeCapability.maxOutputTokens;
-  }
-  const normalized = normalizeModelId2(modelId);
-  return LARGE_OUTPUT_MODEL_MATCHERS.some((matches) => matches(normalized)) ? LARGE_MODEL_MAX_OUTPUT_TOKENS : DEFAULT_MAX_OUTPUT_TOKENS;
+function getModelMaxOutputTokens() {
+  return DEFAULT_MAX_OUTPUT_TOKENS;
 }
-function resolveMaxTokens(modelId, requestedMaxTokens) {
-  const modelCap = getModelMaxOutputTokens(modelId);
+function resolveMaxTokens(requestedMaxTokens) {
+  const modelCap = getModelMaxOutputTokens();
   if (typeof requestedMaxTokens !== "number" || !Number.isFinite(requestedMaxTokens)) {
     return modelCap;
   }
@@ -2039,7 +2026,7 @@ function buildUpstreamRequest(inputBody, identity, template, options) {
     body.context_management = DEFAULT_CONTEXT_MANAGEMENT;
     body.output_config = DEFAULT_OUTPUT_CONFIG;
   }
-  body.max_tokens = resolveMaxTokens(modelId, body.max_tokens);
+  body.max_tokens = resolveMaxTokens(body.max_tokens);
   return orderBodyForOutbound(body, template.body_field_order);
 }
 function orderBodyForOutbound(body, overrideOrder) {
@@ -2942,6 +2929,9 @@ var EMPTY_OAUTH_CREDENTIALS = {
   access: "",
   expires: 0
 };
+if (process.env.CLAUDE_MULTI_ACCOUNT_TRACE_PLUGIN === "1") {
+  console.error("[anthropic-multi-account] module loaded");
+}
 function extractFirstUserText2(input) {
   try {
     const raw = input;
@@ -2977,6 +2967,9 @@ function applyOrderedHeaders(output, headers) {
   output.headers = Array.isArray(orderedHeaders) ? Object.fromEntries(orderedHeaders) : orderedHeaders;
 }
 var ClaudeMultiAuthPlugin = async (ctx) => {
+  if (process.env.CLAUDE_MULTI_ACCOUNT_TRACE_PLUGIN === "1") {
+    console.error("[anthropic-multi-account] plugin function called");
+  }
   const { client } = ctx;
   await loadConfig();
   const requestProfile = loadCCDerivedRequestProfile();
@@ -3073,7 +3066,20 @@ var ClaudeMultiAuthPlugin = async (ctx) => {
     });
   });
   const store = new AccountStore();
-  await syncBootstrapAuth(client, store).catch(() => {
+  await syncBootstrapAuth(client, store).then((synced) => {
+    debugLog(client, "Bootstrap auth sync completed", { synced });
+  }).catch((error) => {
+    client.app.log({
+      body: {
+        service: ANTHROPIC_OAUTH_ADAPTER.serviceLogName,
+        level: "debug",
+        message: "bootstrap auth sync failed",
+        extra: {
+          error: sanitizeError(error)
+        }
+      }
+    }).catch(() => {
+    });
   });
   let manager = null;
   let runtimeFactory = null;
@@ -3210,13 +3216,90 @@ var ClaudeMultiAuthPlugin = async (ctx) => {
         { type: "api", label: "Manually enter API Key" }
       ],
       async loader(getAuth, provider) {
-        ingestProviderModelsCapabilities(provider.models ?? {});
+        const providerModels = provider.models ?? {};
+        ingestProviderModelsCapabilities(providerModels);
+        debugLog(client, "Auth loader received provider metadata", {
+          providerId: typeof provider.id === "string" ? provider.id : void 0,
+          providerName: typeof provider.name === "string" ? provider.name : void 0,
+          modelCount: Object.keys(providerModels).length,
+          modelIds: Object.keys(providerModels)
+        });
         const auth = await getAuth();
+        debugLog(client, "Auth loader resolved auth payload", {
+          authType: typeof auth.type === "string" ? auth.type : void 0,
+          authKeys: Object.keys(auth)
+        });
         if (auth.type !== "oauth") {
-          stopHeartbeat();
-          return { apiKey: "", fetch };
+          await syncBootstrapAuth(client, store).then((synced) => {
+            debugLog(client, "Auth loader requested bootstrap auth sync", { synced });
+          }).catch((error) => {
+            client.app.log({
+              body: {
+                service: ANTHROPIC_OAUTH_ADAPTER.serviceLogName,
+                level: "debug",
+                message: "auth loader bootstrap sync failed",
+                extra: {
+                  error: sanitizeError(error)
+                }
+              }
+            }).catch(() => {
+            });
+          });
+          const recoveredFromStore = await initializeManagerFromStore();
+          debugLog(client, "Auth loader attempted store recovery", {
+            recoveredFromStore
+          });
+          if (!recoveredFromStore || !manager || !runtimeFactory) {
+            stopHeartbeat();
+            return { apiKey: "", fetch };
+          }
+          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
+                }
+              );
+            }
+          };
         }
-        for (const model of Object.values(provider.models ?? {})) {
+        for (const model of Object.values(providerModels)) {
           if (model) {
             model.cost = { input: 0, output: 0, cache: { read: 0, write: 0 } };
           }
@@ -3229,6 +3312,10 @@ var ClaudeMultiAuthPlugin = async (ctx) => {
         if (!initializedManager) {
           return { apiKey: "", fetch };
         }
+        debugLog(client, "Auth loader initialized manager state", {
+          accountCount: initializedManager.getAccountCount(),
+          activeAccountUuid: initializedManager.getActiveAccount()?.uuid
+        });
         if (initializedManager.getAccountCount() > 0) {
           const activeAccount = initializedManager.getActiveAccount();
           const activeLabel = activeAccount ? getAccountLabel(activeAccount) : "none";