opencode-anthropic-multi-account 0.2.22 → 0.2.23

package/dist/index.js

@@ -25,7 +25,7 @@ import {
   showToast,
   sleep,
   updateConfigField
-} from "./chunk-TOCJ3XJM.js";
+} from "./chunk-2SN3UVSM.js";
 import "./chunk-RAX4SFCO.js";
 
 // src/index.ts
@@ -1394,6 +1394,7 @@ function getModelOverride(modelId) {
 
 // src/betas.ts
 var LONG_CONTEXT_BETAS = config.longContextBetas;
+var OAUTH_BETA = "oauth-2025-04-20";
 var excludedBetas = /* @__PURE__ */ new Map();
 var lastBetaFlagsEnv = process.env.ANTHROPIC_BETA_FLAGS;
 var lastModelId;
@@ -1417,6 +1418,19 @@ function addExcludedBeta(modelId, beta) {
 function isLongContextError(responseBody) {
   return responseBody.includes("Extra usage is required for long context requests") || responseBody.includes("long context beta is not yet available");
 }
+function isUnexpectedBetaError(responseBody) {
+  return responseBody.includes("Unexpected value") && responseBody.includes("anthropic-beta");
+}
+function extractRejectedBetas(responseBody) {
+  const match = /Unexpected value\(s\):\s*([^\n]+?)\s*for the anthropic-beta header/i.exec(responseBody);
+  if (!match?.[1]) {
+    return [];
+  }
+  return match[1].split(",").map((value) => value.trim().replace(/^['"]|['"]$/g, "")).filter(Boolean);
+}
+function ensureOauthBeta(betas) {
+  return betas.includes(OAUTH_BETA) ? betas : [OAUTH_BETA, ...betas];
+}
 function getNextBetaToExclude(modelId) {
   const excluded = getExcludedBetas(modelId);
   for (const beta of LONG_CONTEXT_BETAS) {
@@ -1703,7 +1717,7 @@ function hasMeaningfulContent(content) {
     if (!isRecord2(block)) {
       return false;
     }
-    if (block.type === "tool_use") {
+    if (block.type === "tool_use" || block.type === "tool_result") {
       return true;
     }
     if (typeof block.text === "string" && block.text.trim().length > 0) {
@@ -1736,13 +1750,46 @@ function compactMessageContent(messages) {
       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 collectToolUseIds(message) {
+  if (!Array.isArray(message.content)) {
+    return [];
+  }
+  return message.content.filter((block) => isRecord2(block) && block.type === "tool_use" && typeof block.id === "string").map((block) => String(block.id));
+}
+function collectToolResultIds(message) {
+  if (!Array.isArray(message.content)) {
+    return /* @__PURE__ */ new Set();
+  }
+  return new Set(
+    message.content.filter((block) => isRecord2(block) && block.type === "tool_result" && typeof block.tool_use_id === "string").map((block) => String(block.tool_use_id))
+  );
+}
+function getDanglingToolUseError(messages) {
+  for (let index = 0; index < messages.length; index += 1) {
+    const current = messages[index];
+    if (!current || current.role !== "assistant") {
+      continue;
+    }
+    const toolUseIds = collectToolUseIds(current);
+    if (toolUseIds.length === 0) {
+      continue;
+    }
+    const next = messages[index + 1];
+    if (!next || next.role !== "user") {
+      return `Dangling tool_use after assistant turn ${index}: ${toolUseIds.join(", ")}`;
+    }
+    const toolResultIds = collectToolResultIds(next);
+    const missing = toolUseIds.filter((toolUseId) => !toolResultIds.has(toolUseId));
+    if (missing.length > 0) {
+      return `Missing tool_result for assistant turn ${index}: ${missing.join(", ")}`;
+    }
+  }
+  return null;
+}
 function stripUnsupportedSamplingFields(body) {
   delete body.temperature;
   delete body.top_p;
@@ -2112,25 +2159,8 @@ function shouldMaskToolName(name, claudeToolNames) {
   }
   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);
+function buildMaskedToolName(toolName, length = 8) {
+  const digest = createHash3("sha256").update(`tool-mask:${toolName}`).digest("hex").slice(0, length);
   return `${TOOL_MASK_PREFIX}${digest}`;
 }
 function collectToolNames(parsed) {
@@ -2165,7 +2195,6 @@ function buildClaudeToolNameSet(claudeToolNames) {
 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)) {
@@ -2174,10 +2203,10 @@ function buildRequestScopedToolLookup(parsed, claudeToolNames) {
       continue;
     }
     let length = 8;
-    let masked = buildMaskedToolName(seed, originalName, length);
+    let masked = buildMaskedToolName(originalName, length);
     while (usedOutgoing.has(masked)) {
       length += 2;
-      masked = buildMaskedToolName(seed, originalName, length);
+      masked = buildMaskedToolName(originalName, length);
     }
     lookup.set(masked, originalName);
     usedOutgoing.add(masked);
@@ -2542,7 +2571,7 @@ function transformBodyToUpstream(body, identity, sessionId2) {
   try {
     const parsed = JSON.parse(body);
     if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
-      return { body, reverseLookup: /* @__PURE__ */ new Map() };
+      return { body, reverseLookup: /* @__PURE__ */ new Map(), validationError: null };
     }
     const template = loadTemplate();
     const upstreamRequest = buildUpstreamRequest(
@@ -2551,9 +2580,16 @@ function transformBodyToUpstream(body, identity, sessionId2) {
       template,
       { sessionId: sessionId2 }
     );
-    return applyRequestToolMasking(upstreamRequest, template.tool_names);
+    const validationError = getDanglingToolUseError(
+      Array.isArray(upstreamRequest.messages) ? upstreamRequest.messages : []
+    );
+    const maskedRequest = applyRequestToolMasking(upstreamRequest, template.tool_names);
+    return {
+      ...maskedRequest,
+      validationError
+    };
   } catch {
-    return { body, reverseLookup: /* @__PURE__ */ new Map() };
+    return { body, reverseLookup: /* @__PURE__ */ new Map(), validationError: null };
   }
 }
 async function applyResponseReverseLookup(response, reverseLookup) {
@@ -2665,11 +2701,11 @@ var AccountRuntimeFactory = class {
     return { accessToken: refreshed.patch.accessToken, expiresAt: refreshed.patch.expiresAt };
   }
   buildOutboundHeaders(incomingHeaders, sessionId2, accessToken, modelId, excludedBetas2) {
-    const mergedBetas = deduplicateBetas([
+    const mergedBetas = deduplicateBetas(ensureOauthBeta([
       ...excludeBetas(splitBetaValues(getBetaHeader()), excludedBetas2),
       ...getModelBetas(modelId, excludedBetas2),
       ...excludeBetas(splitBetaValues(incomingHeaders["anthropic-beta"]), excludedBetas2)
-    ]).join(",");
+    ])).join(",");
     const outbound = {
       ...incomingHeaders,
       ...getStaticHeaders(),
@@ -2697,7 +2733,18 @@ var AccountRuntimeFactory = class {
       void recordObservedToolNames(extractToolNamesFromRequestBody(init.body)).catch(() => {
       });
     }
-    const transformedRequest = typeof init?.body === "string" ? transformBodyToUpstream(init.body, this.identity, sessionId2) : { body: init?.body, reverseLookup: /* @__PURE__ */ new Map() };
+    const transformedRequest = typeof init?.body === "string" ? transformBodyToUpstream(init.body, this.identity, sessionId2) : { body: init?.body, reverseLookup: /* @__PURE__ */ new Map(), validationError: null };
+    if (transformedRequest.validationError) {
+      return new Response(JSON.stringify({
+        error: {
+          message: transformedRequest.validationError,
+          type: "invalid_request_error"
+        }
+      }), {
+        status: 400,
+        headers: { "content-type": "application/json" }
+      });
+    }
     const pacingCfg = resolvePacingConfig();
     const getNow = this.pacingTestOverrides.now ?? Date.now;
     const sleepFn = this.pacingTestOverrides.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
@@ -2740,14 +2787,24 @@ var AccountRuntimeFactory = class {
         break;
       }
       const responseBody = await response.clone().text();
-      if (!isLongContextError(responseBody)) {
+      if (!isLongContextError(responseBody) && !isUnexpectedBetaError(responseBody)) {
         break;
       }
-      const betaToExclude = getNextBetaToExclude(modelId);
-      if (!betaToExclude) {
-        break;
+      if (isUnexpectedBetaError(responseBody)) {
+        const rejectedBetas = extractRejectedBetas(responseBody);
+        if (rejectedBetas.length === 0) {
+          break;
+        }
+        for (const rejectedBeta of rejectedBetas) {
+          addExcludedBeta(modelId, rejectedBeta);
+        }
+      } else {
+        const betaToExclude = getNextBetaToExclude(modelId);
+        if (!betaToExclude) {
+          break;
+        }
+        addExcludedBeta(modelId, betaToExclude);
       }
-      addExcludedBeta(modelId, betaToExclude);
       const retryHeaders = this.buildOutboundHeaders(
         incomingHeaders,
         sessionId2,
@@ -2932,7 +2989,7 @@ var EMPTY_OAUTH_CREDENTIALS = {
 if (process.env.CLAUDE_MULTI_ACCOUNT_TRACE_PLUGIN === "1") {
   console.error("[anthropic-multi-account] module loaded");
 }
-function extractFirstUserText2(input) {
+function extractFirstUserText(input) {
   try {
     const raw = input;
     const messages = raw.messages ?? raw.request?.messages;
@@ -3141,7 +3198,7 @@ var ClaudeMultiAuthPlugin = async (ctx) => {
   });
   return {
     "experimental.chat.system.transform": (input, output) => {
-      const billingHeader = composeBillingSystemEntry(extractFirstUserText2(input), claudeCodeVersion);
+      const billingHeader = composeBillingSystemEntry(extractFirstUserText(input), claudeCodeVersion);
       prependMissingSystemEntries(output, [
         billingHeader,
         upstreamAgentIdentity,