opencode-anthropic-multi-account 0.2.17 → 0.2.19

package/dist/index.d.ts

@@ -1,5 +1,7 @@
 import { Plugin } from '@opencode-ai/plugin';
 
 declare const ClaudeMultiAuthPlugin: Plugin;
+declare function setProviderModelsObserverForTest(observer: ((models: Record<string, unknown>) => void) | null): void;
+declare function resetProviderModelsObserverForTest(): void;
 
-export { ClaudeMultiAuthPlugin };
+export { ClaudeMultiAuthPlugin, resetProviderModelsObserverForTest, setProviderModelsObserverForTest };

package/dist/index.js

@@ -1529,8 +1529,52 @@ function loadClaudeIdentity() {
 
 // src/upstream-request.ts
 import { createHash as createHash2, randomUUID as randomUUID2 } from "crypto";
+
+// src/model-capabilities.ts
+var runtimeModelCapabilities = /* @__PURE__ */ new Map();
+function isRecord(value) {
+  return typeof value === "object" && value !== null;
+}
+function readNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
+function readBoolean(value) {
+  return typeof value === "boolean" ? value : void 0;
+}
+function normalizeModelId(modelId) {
+  const trimmed = modelId.trim().toLowerCase();
+  const slashIndex = trimmed.indexOf("/");
+  return slashIndex >= 0 ? trimmed.slice(slashIndex + 1) : trimmed;
+}
+function readLimitOutput(raw) {
+  const limit = isRecord(raw.limit) ? raw.limit : void 0;
+  const capabilityLimit = isRecord(raw.capabilities) && isRecord(raw.capabilities.limit) ? raw.capabilities.limit : void 0;
+  return readNumber(limit?.output) ?? readNumber(capabilityLimit?.output);
+}
+function readThinkingSupport(raw) {
+  return readBoolean(raw.reasoning) ?? readBoolean(raw.thinking) ?? readBoolean(raw.supportsThinking) ?? (isRecord(raw.capabilities) ? readBoolean(raw.capabilities.reasoning) ?? readBoolean(raw.capabilities.thinking) ?? readBoolean(raw.capabilities.supportsThinking) : void 0);
+}
+function ingestProviderModelsCapabilities(models) {
+  runtimeModelCapabilities.clear();
+  for (const [key, value] of Object.entries(models)) {
+    if (!isRecord(value)) {
+      continue;
+    }
+    const resolvedId = typeof value.id === "string" ? value.id : key;
+    const capability = {
+      maxOutputTokens: readLimitOutput(value),
+      supportsThinking: readThinkingSupport(value)
+    };
+    runtimeModelCapabilities.set(normalizeModelId(resolvedId), capability);
+    runtimeModelCapabilities.set(normalizeModelId(key), capability);
+  }
+}
+function getRuntimeModelCapability(modelId) {
+  return runtimeModelCapabilities.get(normalizeModelId(modelId));
+}
+
+// src/upstream-request.ts
 var BILLING_SEED = "59cf53e54c78";
-var DEFAULT_CC_VERSION = "2.1.100";
 var SESSION_IDLE_ROTATE_MS = 15 * 60 * 1e3;
 var MAX_TOOL_RESULT_TEXT_LENGTH = 30 * 1024;
 var TRUNCATION_SUFFIX = "[...truncated]";
@@ -1587,7 +1631,7 @@ function getActiveSessionId() {
 function getUpstreamSessionId() {
   return getActiveSessionId();
 }
-function isRecord(value) {
+function isRecord2(value) {
   return typeof value === "object" && value !== null;
 }
 function cloneBody(value) {
@@ -1611,7 +1655,7 @@ function stripCacheControl(value) {
     }
     return;
   }
-  if (!isRecord(value)) {
+  if (!isRecord2(value)) {
     return;
   }
   delete value.cache_control;
@@ -1633,11 +1677,15 @@ function sanitizeMessageBlock(block) {
   if (!Array.isArray(block.content)) {
     return;
   }
-  for (const item of block.content) {
-    if (isRecord(item) && typeof item.text === "string") {
-      item.text = truncateToolResultText(sanitizeAndScrubText(item.text));
+  block.content = block.content.map((item) => {
+    if (isRecord2(item) && typeof item.text === "string") {
+      return {
+        ...item,
+        text: truncateToolResultText(sanitizeAndScrubText(item.text))
+      };
     }
-  }
+    return item;
+  }).filter((item) => !isRecord2(item) || typeof item.text !== "string" || item.text.trim().length > 0);
 }
 function stripAssistantThinkingBlocks(messages) {
   for (const message of messages) {
@@ -1655,9 +1703,12 @@ function hasMeaningfulContent(content) {
     return false;
   }
   return content.some((block) => {
-    if (!isRecord(block)) {
+    if (!isRecord2(block)) {
       return false;
     }
+    if (block.type === "tool_use") {
+      return true;
+    }
     if (typeof block.text === "string" && block.text.trim().length > 0) {
       return true;
     }
@@ -1676,6 +1727,79 @@ function trimTrailingEmptyTurns(messages) {
     messages.pop();
   }
 }
+function compactMessageContent(messages) {
+  for (const message of messages) {
+    if (!Array.isArray(message.content)) {
+      continue;
+    }
+    message.content = message.content.filter((block) => {
+      if (!isRecord2(block)) {
+        return false;
+      }
+      if (block.type === "text") {
+        return typeof block.text !== "string" || block.text.trim().length > 0;
+      }
+      if (block.type === "tool_result" && Array.isArray(block.content)) {
+        return block.content.length > 0;
+      }
+      return true;
+    });
+  }
+}
+function stripUnsupportedSamplingFields(body) {
+  delete body.temperature;
+  delete body.top_p;
+  delete body.top_k;
+}
+function stripThinkingControlFields(body) {
+  delete body.thinking;
+  delete body.context_management;
+  delete body.output_config;
+}
+var ADAPTIVE_THINKING_MODEL_MATCHERS = [
+  (modelId) => modelId.includes("claude-sonnet-4-6") || modelId.includes("claude-sonnet-4.6"),
+  (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();
+}
+function supportsAdaptiveThinking(modelId) {
+  const runtimeCapability = getRuntimeModelCapability(modelId);
+  if (typeof runtimeCapability?.supportsThinking === "boolean") {
+    return runtimeCapability.supportsThinking;
+  }
+  const normalized = normalizeModelId2(modelId);
+  if (normalized.includes("haiku")) {
+    return false;
+  }
+  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 resolveMaxTokens(modelId, requestedMaxTokens) {
+  const modelCap = getModelMaxOutputTokens(modelId);
+  if (typeof requestedMaxTokens !== "number" || !Number.isFinite(requestedMaxTokens)) {
+    return modelCap;
+  }
+  const normalized = Math.floor(requestedMaxTokens);
+  if (normalized <= 0) {
+    return modelCap;
+  }
+  return Math.min(normalized, modelCap);
+}
 function normalizeSystemTexts(system) {
   if (typeof system === "string") {
     const next = sanitizeAndScrubText(system);
@@ -1693,7 +1817,7 @@ function normalizeSystemTexts(system) {
       }
       continue;
     }
-    if (isRecord(entry) && typeof entry.text === "string") {
+    if (isRecord2(entry) && typeof entry.text === "string") {
       const next = sanitizeAndScrubText(entry.text);
       if (next) {
         texts.push(next);
@@ -1727,8 +1851,29 @@ function extractFirstUserMessage(messages) {
 function hasCompleteToolSchemas(tools) {
   return tools.length > 0 && tools.every((tool2) => typeof tool2 === "object" && tool2 !== null && "input_schema" in tool2);
 }
+function enrichIncomingToolsWithTemplateSchemas(incomingTools, templateTools) {
+  if (!hasCompleteToolSchemas(templateTools) || incomingTools.length !== templateTools.length) {
+    return incomingTools;
+  }
+  return incomingTools.map((tool2, index) => {
+    if ("input_schema" in tool2) {
+      return tool2;
+    }
+    const templateTool = templateTools[index];
+    return templateTool && "input_schema" in templateTool ? { ...tool2, input_schema: templateTool.input_schema } : tool2;
+  });
+}
+function buildOutboundTools(incomingTools, templateTools) {
+  if (incomingTools.length > 0) {
+    return enrichIncomingToolsWithTemplateSchemas(incomingTools, templateTools);
+  }
+  if (!hasCompleteToolSchemas(templateTools)) {
+    return incomingTools;
+  }
+  return templateTools.map((tool2) => ({ ...tool2 }));
+}
 function getCcVersion(template) {
-  return template.cc_version ?? DEFAULT_CC_VERSION;
+  return template.cc_version ?? detectCliVersion();
 }
 function buildBillingHeader(firstUserMessage, template) {
   const version = getCcVersion(template);
@@ -1754,7 +1899,7 @@ function reverseMapToolUseNames(value, reverseLookup) {
   if (Array.isArray(value)) {
     return value.map((item) => reverseMapToolUseNames(item, reverseLookup));
   }
-  if (!isRecord(value)) {
+  if (!isRecord2(value)) {
     return value;
   }
   const cloned = {};
@@ -1787,7 +1932,7 @@ function sanitizeMessages(body) {
     return;
   }
   for (const message of messages) {
-    if (!isRecord(message)) {
+    if (!isRecord2(message)) {
       continue;
     }
     if (typeof message.content === "string") {
@@ -1798,7 +1943,7 @@ function sanitizeMessages(body) {
       continue;
     }
     for (const block of message.content) {
-      if (isRecord(block) && typeof block.text === "string") {
+      if (isRecord2(block) && typeof block.text === "string") {
         block.text = sanitizeContent(block.text);
       }
     }
@@ -1850,6 +1995,7 @@ function buildUpstreamRequest(inputBody, identity, template, options) {
       sanitizeMessageBlock(block);
     }
   }
+  compactMessageContent(messages);
   trimTrailingEmptyTurns(messages);
   const firstUserMessage = extractFirstUserMessage(messages);
   const billingHeader = buildBillingHeader(firstUserMessage, template);
@@ -1859,8 +2005,10 @@ function buildUpstreamRequest(inputBody, identity, template, options) {
   ].map((entry) => sanitizeAndScrubText(entry)).filter(Boolean).join("\n\n");
   const activeSessionId = options?.sessionId ?? getActiveSessionId();
   body.messages = messages;
+  stripUnsupportedSamplingFields(body);
+  stripThinkingControlFields(body);
   const incomingTools = Array.isArray(body.tools) ? body.tools : [];
-  body.tools = hasCompleteToolSchemas(template.tools) ? template.tools.map((tool2) => ({ ...tool2 })) : incomingTools;
+  body.tools = buildOutboundTools(incomingTools, template.tools);
   body.system = [
     {
       type: "text",
@@ -1878,17 +2026,20 @@ function buildUpstreamRequest(inputBody, identity, template, options) {
     }
   ];
   body.metadata = {
-    ...isRecord(body.metadata) ? body.metadata : {},
+    ...isRecord2(body.metadata) ? body.metadata : {},
     user_id: JSON.stringify({
       device_id: identity.deviceId,
       account_uuid: identity.accountUuid,
       session_id: activeSessionId
     })
   };
-  body.thinking = { type: "adaptive" };
-  body.context_management = DEFAULT_CONTEXT_MANAGEMENT;
-  body.output_config = DEFAULT_OUTPUT_CONFIG;
-  body.max_tokens = 64e3;
+  const modelId = typeof body.model === "string" ? body.model : "";
+  if (supportsAdaptiveThinking(modelId)) {
+    body.thinking = { type: "adaptive" };
+    body.context_management = DEFAULT_CONTEXT_MANAGEMENT;
+    body.output_config = DEFAULT_OUTPUT_CONFIG;
+  }
+  body.max_tokens = resolveMaxTokens(modelId, body.max_tokens);
   return orderBodyForOutbound(body, template.body_field_order);
 }
 function orderBodyForOutbound(body, overrideOrder) {
@@ -1962,6 +2113,149 @@ function createStreamingReverseMapper(response, reverseLookup) {
   });
 }
 
+// src/tool-flow.ts
+import { createHash as createHash3 } from "crypto";
+var TOOL_MASK_PREFIX = "tool_";
+function isRecord3(value) {
+  return typeof value === "object" && value !== null;
+}
+function shouldMaskToolName(name, claudeToolNames) {
+  if (!name) {
+    return false;
+  }
+  return !claudeToolNames.has(name) && !name.startsWith("mcp__") && !name.startsWith(TOOL_MASK_PREFIX);
+}
+function extractFirstUserText(parsed) {
+  if (!Array.isArray(parsed.messages)) {
+    return "";
+  }
+  const firstUser = parsed.messages.find((message) => message.role === "user");
+  if (!isRecord3(firstUser)) {
+    return "";
+  }
+  const content = firstUser.content;
+  if (typeof content === "string") {
+    return content.trim();
+  }
+  if (!Array.isArray(content)) {
+    return "";
+  }
+  return content.filter((block) => isRecord3(block) && block.type === "text" && typeof block.text === "string").map((block) => String(block.text)).join("\n\n").trim();
+}
+function buildMaskedToolName(seed, toolName, length = 8) {
+  const digest = createHash3("sha256").update(`tool-mask:${seed}:${toolName}`).digest("hex").slice(0, length);
+  return `${TOOL_MASK_PREFIX}${digest}`;
+}
+function collectToolNames(parsed) {
+  const names = /* @__PURE__ */ new Set();
+  if (Array.isArray(parsed.tools)) {
+    for (const tool2 of parsed.tools) {
+      if (isRecord3(tool2) && typeof tool2.name === "string") {
+        names.add(tool2.name);
+      }
+    }
+  }
+  if (Array.isArray(parsed.messages)) {
+    for (const message of parsed.messages) {
+      if (!isRecord3(message) || !Array.isArray(message.content)) {
+        continue;
+      }
+      for (const block of message.content) {
+        if (isRecord3(block) && block.type === "tool_use" && typeof block.name === "string") {
+          names.add(block.name);
+        }
+      }
+    }
+  }
+  if (isRecord3(parsed.tool_choice) && parsed.tool_choice.type === "tool" && typeof parsed.tool_choice.name === "string") {
+    names.add(parsed.tool_choice.name);
+  }
+  return [...names];
+}
+function buildClaudeToolNameSet(claudeToolNames) {
+  return new Set(claudeToolNames.filter((name) => typeof name === "string" && name.length > 0));
+}
+function buildRequestScopedToolLookup(parsed, claudeToolNames) {
+  const lookup = /* @__PURE__ */ new Map();
+  const usedOutgoing = /* @__PURE__ */ new Set();
+  const seed = extractFirstUserText(parsed);
+  const claudeToolSet = buildClaudeToolNameSet(claudeToolNames);
+  for (const originalName of collectToolNames(parsed)) {
+    if (!shouldMaskToolName(originalName, claudeToolSet)) {
+      lookup.set(originalName, originalName);
+      usedOutgoing.add(originalName);
+      continue;
+    }
+    let length = 8;
+    let masked = buildMaskedToolName(seed, originalName, length);
+    while (usedOutgoing.has(masked)) {
+      length += 2;
+      masked = buildMaskedToolName(seed, originalName, length);
+    }
+    lookup.set(masked, originalName);
+    usedOutgoing.add(masked);
+  }
+  return lookup;
+}
+function getOutgoingName(name, reverseLookup) {
+  if (!name) {
+    return name;
+  }
+  for (const [outgoing, original] of reverseLookup) {
+    if (original === name) {
+      return outgoing;
+    }
+  }
+  return name;
+}
+function rewriteToolUseNames(value, reverseLookup) {
+  if (Array.isArray(value)) {
+    return value.map((item) => rewriteToolUseNames(item, reverseLookup));
+  }
+  if (!isRecord3(value)) {
+    return value;
+  }
+  const cloned = {};
+  for (const [key, nested] of Object.entries(value)) {
+    cloned[key] = rewriteToolUseNames(nested, reverseLookup);
+  }
+  if (cloned.type === "tool_use" && typeof cloned.name === "string") {
+    cloned.name = getOutgoingName(cloned.name, reverseLookup);
+  }
+  return cloned;
+}
+function applyOutboundToolFlow(parsed, claudeToolNames) {
+  const reverseLookup = buildRequestScopedToolLookup(parsed, claudeToolNames);
+  const next = { ...parsed };
+  if (Array.isArray(parsed.tools)) {
+    next.tools = parsed.tools.map((tool2) => ({
+      ...tool2,
+      name: getOutgoingName(tool2.name, reverseLookup)
+    }));
+  }
+  if (Array.isArray(parsed.messages)) {
+    next.messages = parsed.messages.map((message) => {
+      if (!isRecord3(message) || !Array.isArray(message.content)) {
+        return message;
+      }
+      return {
+        ...message,
+        content: rewriteToolUseNames(message.content, reverseLookup)
+      };
+    });
+  }
+  if (isRecord3(parsed.tool_choice) && parsed.tool_choice.type === "tool") {
+    next.tool_choice = {
+      ...parsed.tool_choice,
+      name: getOutgoingName(parsed.tool_choice.name, reverseLookup)
+    };
+  }
+  return {
+    body: JSON.stringify(next),
+    reverseLookup
+  };
+}
+
 // src/upstream-headers.ts
 import { randomUUID as randomUUID3 } from "crypto";
 var UPSTREAM_TIMEOUT_MS = 3e5;
@@ -2048,6 +2342,9 @@ function filterBillableBetas(betas) {
 }
 
 // src/request-transform.ts
+function applyRequestToolMasking(parsed, claudeToolNames) {
+  return applyOutboundToolFlow(parsed, claudeToolNames);
+}
 function extractModelIdFromBody(body) {
   if (typeof body !== "string") {
     return "unknown";
@@ -2258,18 +2555,38 @@ function transformBodyToUpstream(body, identity, sessionId2) {
   try {
     const parsed = JSON.parse(body);
     if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
-      return body;
-    }
-    return JSON.stringify(
-      buildUpstreamRequest(
-        parsed,
-        identity,
-        loadTemplate(),
-        { sessionId: sessionId2 }
-      )
+      return { body, reverseLookup: /* @__PURE__ */ new Map() };
+    }
+    const template = loadTemplate();
+    const upstreamRequest = buildUpstreamRequest(
+      parsed,
+      identity,
+      template,
+      { sessionId: sessionId2 }
     );
+    return applyRequestToolMasking(upstreamRequest, template.tool_names);
   } catch {
-    return body;
+    return { body, reverseLookup: /* @__PURE__ */ new Map() };
+  }
+}
+async function applyResponseReverseLookup(response, reverseLookup) {
+  const contentType = response.headers.get("content-type") ?? "";
+  if (contentType.includes("text/event-stream")) {
+    return createStreamingReverseMapper(response, reverseLookup);
+  }
+  if (!contentType.includes("application/json") || reverseLookup.size === 0) {
+    return response;
+  }
+  try {
+    const payload = await response.clone().json();
+    const remapped = reverseMapResponse(payload, reverseLookup);
+    return new Response(JSON.stringify(remapped), {
+      status: response.status,
+      statusText: response.statusText,
+      headers: new Headers(response.headers)
+    });
+  } catch {
+    return response;
   }
 }
 async function enrichRateLimitResponse(response) {
@@ -2393,7 +2710,7 @@ var AccountRuntimeFactory = class {
       void recordObservedToolNames(extractToolNamesFromRequestBody(init.body)).catch(() => {
       });
     }
-    const transformedBody = typeof init?.body === "string" ? transformBodyToUpstream(init.body, this.identity, sessionId2) : init?.body;
+    const transformedRequest = typeof init?.body === "string" ? transformBodyToUpstream(init.body, this.identity, sessionId2) : { body: init?.body, reverseLookup: /* @__PURE__ */ new Map() };
     const pacingCfg = resolvePacingConfig();
     const getNow = this.pacingTestOverrides.now ?? Date.now;
     const sleepFn = this.pacingTestOverrides.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
@@ -2420,7 +2737,7 @@ var AccountRuntimeFactory = class {
         const response2 = await fetch(transformedInput, {
           ...init,
           headers: requestHeaders,
-          body: transformedBody
+          body: transformedRequest.body
         });
         return await enrichRateLimitResponse(response2);
       } catch (error) {
@@ -2453,7 +2770,7 @@ var AccountRuntimeFactory = class {
       );
       response = await performFetch(retryHeaders);
     }
-    return createStreamingReverseMapper(response);
+    return applyResponseReverseLookup(response, transformedRequest.reverseLookup);
   }
   async createRuntime(uuid) {
     const fetchWithAccount = async (input, init) => {
@@ -2463,9 +2780,8 @@ var AccountRuntimeFactory = class {
         throw new Error(`No credentials found for account ${uuid}`);
       }
       let accessToken = storedAccount.accessToken;
-      let expiresAt = storedAccount.expiresAt;
-      if (!accessToken || !expiresAt || isTokenExpired({ accessToken, expiresAt })) {
-        ({ accessToken, expiresAt } = await this.ensureFreshToken(storedAccount, uuid));
+      if (!accessToken || !storedAccount.expiresAt || isTokenExpired({ accessToken, expiresAt: storedAccount.expiresAt })) {
+        ({ accessToken } = await this.ensureFreshToken(storedAccount, uuid));
       }
       if (!accessToken) {
         throw new Error(`No access token available for account ${uuid}`);
@@ -2626,7 +2942,8 @@ var EMPTY_OAUTH_CREDENTIALS = {
   access: "",
   expires: 0
 };
-function extractFirstUserText(input) {
+var providerModelsObserverForTest = null;
+function extractFirstUserText2(input) {
   try {
     const raw = input;
     const messages = raw.messages ?? raw.request?.messages;
@@ -2819,7 +3136,7 @@ var ClaudeMultiAuthPlugin = async (ctx) => {
   });
   return {
     "experimental.chat.system.transform": (input, output) => {
-      const billingHeader = composeBillingSystemEntry(extractFirstUserText(input), claudeCodeVersion);
+      const billingHeader = composeBillingSystemEntry(extractFirstUserText2(input), claudeCodeVersion);
       prependMissingSystemEntries(output, [
         billingHeader,
         upstreamAgentIdentity,
@@ -2894,6 +3211,8 @@ var ClaudeMultiAuthPlugin = async (ctx) => {
         { type: "api", label: "Manually enter API Key" }
       ],
       async loader(getAuth, provider) {
+        providerModelsObserverForTest?.(provider.models ?? {});
+        ingestProviderModelsCapabilities(provider.models ?? {});
         const auth = await getAuth();
         if (auth.type !== "oauth") {
           stopHeartbeat();
@@ -2979,7 +3298,15 @@ var ClaudeMultiAuthPlugin = async (ctx) => {
     }
   };
 };
+function setProviderModelsObserverForTest(observer) {
+  providerModelsObserverForTest = observer;
+}
+function resetProviderModelsObserverForTest() {
+  providerModelsObserverForTest = null;
+}
 export {
-  ClaudeMultiAuthPlugin
+  ClaudeMultiAuthPlugin,
+  resetProviderModelsObserverForTest,
+  setProviderModelsObserverForTest
 };
 //# sourceMappingURL=index.js.map