opencode-anthropic-fix 0.0.22 → 0.0.24

package/README.md

@@ -43,11 +43,12 @@ The [original plugin](https://github.com/anomalyco/opencode-anthropic-auth) prov
 - **Standalone CLI** — manage accounts without opening OpenCode
 - **Configurable strategies** — sticky, round-robin, or hybrid account selection
 - **Claude Code signature emulation** — full HTTP header, system prompt, beta flag, and metadata mimicry derived from Claude Code's open source code
-- **Adaptive thinking for Opus 4.6** — automatically uses `adaptive-thinking-2026-01-28` and maps `budgetTokens` to effort levels (`low`/`medium`/`high`)
+- **OAuth endpoint fingerprint parity** — sends Claude Code-style `User-Agent` on `/v1/oauth/token` and `/v1/oauth/revoke` to match current OAuth validation
+- **Effort-based thinking for Opus 4.6** — maps `budgetTokens` to effort levels (`low`/`medium`/`high`) and includes `effort-2025-11-24`
 - **1M context limit override** — patches `model.limit.context` so OpenCode compacts at the right threshold while `models.dev` catches up
 - **Runtime config + custom betas** — `/anthropic set`, `/anthropic config`, and `/anthropic betas` slash commands for live feature toggling without restarting OpenCode
-- **Files API integration** — upload, list, download, and manage files via `/anthropic files` with auto-included `files-api-2025-04-14` beta
-- **Code execution support** — auto-includes `code-execution-2025-08-25` beta for sandbox code execution (non-Haiku models)
+- **Files API integration** — upload, list, download, and manage files via `/anthropic files` with endpoint/content-scoped `files-api-2025-04-14` beta injection
+- **Code execution support** — available via explicit custom beta opt-in (`code-execution-2025-08-25`), not auto-enabled
 
 ## Installation
 
@@ -271,6 +272,8 @@ Add or remove beta flags that get included in every `anthropic-beta` header. Per
 /anthropic betas                   # show active betas (auto + custom) with presets
 /anthropic betas add <beta-name>   # add a custom beta
 /anthropic betas remove <beta-name> # remove a custom beta
+/anthropic betas add 1m            # shortcut => context-1m-2025-08-07
+/anthropic betas add fast          # shortcut => fast-mode-2026-02-01
 ```
 
 **Available preset betas** (shown by `/anthropic betas`):
@@ -284,6 +287,8 @@ Add or remove beta flags that get included in every `anthropic-beta` header. Per
 | `compact-2026-01-12`              | Conversation compaction endpoint                  |
 | `mcp-servers-2025-12-04`          | MCP servers in API request payload                |
 | `web-search-2025-03-05`           | Web search (Vertex/Foundry only)                  |
+| `context-1m-2025-08-07`           | 1M context beta (provider/model dependent)        |
+| `fast-mode-2026-02-01`            | Faster Opus mode (experimental)                   |
 
 Example workflow:
 
@@ -295,7 +300,7 @@ Example workflow:
 
 ### Files API management
 
-Upload, list, download, and delete files via the Anthropic Files API. The `files-api-2025-04-14` beta is auto-included in every request.
+Upload, list, download, and delete files via the Anthropic Files API. The `files-api-2025-04-14` beta is injected only when needed (`/v1/files` requests or Messages payloads with `file_id`).
 
 ```text
 /anthropic files                       # list files across ALL accounts
@@ -370,7 +375,7 @@ Some Anthropic API features maintain server-side per-account state that breaks w
 | ------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------- |
 | **Files API** (`files-api-2025-04-14`)                 | `file_id` is per-account; referencing Account A's file from Account B = `file_not_found`                         | **Auto-pinning**: the plugin tracks which account owns each `file_id` and routes the request accordingly |
 | **Prompt Caching** (`prompt-caching-scope-2026-01-05`) | Cache is per-workspace; alternating accounts means zero cache hits, doubling token costs                         | **Auto-skipped** in round-robin: the `prompt-caching-scope` beta is excluded from the header             |
-| **Code Execution** (`code-execution-2025-08-25`)       | Sandbox state is ephemeral per-request; multi-step workflows lose files/state when routed to a different account | **Auto-skipped** in round-robin: the `code-execution` beta is excluded from the header                   |
+| **Code Execution** (`code-execution-2025-08-25`)       | Sandbox state is ephemeral per-request; multi-step workflows lose files/state when routed to a different account | **Manual opt-in only**: add the beta explicitly, and prefer sticky/pinned sessions for multi-step flows  |
 | **Message Batches** (`message-batches-2024-09-24`)     | `batch_id` is per-account; polling from wrong account = 404                                                      | No automatic mitigation (not auto-included)                                                              |
 
 **Recommendation for round-robin users:** If you need prompt caching or code execution, pin each OpenCode session to a single account:
@@ -383,7 +388,7 @@ OPENCODE_ANTHROPIC_INITIAL_ACCOUNT=1 opencode
 OPENCODE_ANTHROPIC_INITIAL_ACCOUNT=2 opencode
 ```
 
-This automatically overrides the strategy to `sticky` for that session, re-enabling all betas. Other sessions are unaffected.
+This automatically overrides the strategy to `sticky` for that session, re-enabling strategy-sensitive auto betas (for example `prompt-caching-scope-2026-01-05`). Other sessions are unaffected.
 
 ## Configuration
 
@@ -471,6 +476,7 @@ Configuration is stored at `~/.config/opencode/anthropic-auth.json`. All setting
 | `OPENCODE_ANTHROPIC_DEBUG_SYSTEM_PROMPT`           | Set to `1` to log the final transformed `system` prompt to stderr (title-generator requests are skipped).                                                 |
 | `OPENCODE_ANTHROPIC_OVERRIDE_MODEL_LIMITS`         | Set to `0` to disable context limit overrides for 1M-window models (e.g. when models.dev has been updated).                                               |
 | `OPENCODE_ANTHROPIC_INITIAL_ACCOUNT`               | Pin this session to a specific account (1-based index or email). Overrides strategy to `sticky`. See [Round-Robin Limitations](#round-robin-limitations). |
+| `CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS`           | Set to `1` to suppress experimental auto-betas (mirrors Claude Code gateway safety switch).                                                               |
 
 ### OAuth-only behavior
 
@@ -496,7 +502,7 @@ The plugin also:
 - Emulates Claude-style request headers and beta flags by default
 - Sanitizes "OpenCode" references to "Claude Code" in system prompts (required by Anthropic's API)
 - In `prompt_compaction="minimal"`, deduplicates repeated/contained system blocks and uses a compact dedicated prompt for internal title-generation requests
-- Adds `?beta=true` to `/v1/messages` requests
+- Adds `?beta=true` to `/v1/messages` and `/v1/messages/count_tokens` requests
 
 When signature emulation is disabled (`signature_emulation.enabled=false`), the plugin falls back to legacy behavior including the Claude Code system prompt prefix.
 

package/index.mjs

@@ -103,9 +103,11 @@ async function promptManageAccounts(accountManager) {
 // Request building helpers (extracted from original fetch interceptor)
 // ---------------------------------------------------------------------------
 
-const FALLBACK_CLAUDE_CLI_VERSION = "2.1.76";
+const FALLBACK_CLAUDE_CLI_VERSION = "2.1.79";
 const CLAUDE_CODE_NPM_LATEST_URL = "https://registry.npmjs.org/@anthropic-ai/claude-code/latest";
 const CLAUDE_CODE_BETA_FLAG = "claude-code-20250219";
+const EFFORT_BETA_FLAG = "effort-2025-11-24";
+const TOKEN_COUNTING_BETA_FLAG = "token-counting-2024-11-01";
 const BILLING_HASH_SALT = "59cf53e54c78";
 const BILLING_HASH_POSITIONS = [4, 7, 20];
 const CLAUDE_CODE_IDENTITY_STRING = "You are Claude Code, Anthropic's official CLI for Claude.";
@@ -122,6 +124,32 @@ const BEDROCK_UNSUPPORTED_BETAS = new Set([
   "code-execution-2025-08-25",
   "files-api-2025-04-14",
 ]);
+const EXPERIMENTAL_BETA_FLAGS = new Set([
+  "adaptive-thinking-2026-01-28",
+  "advanced-tool-use-2025-11-20",
+  "afk-mode-2026-01-31",
+  "code-execution-2025-08-25",
+  "context-1m-2025-08-07",
+  "context-management-2025-06-27",
+  "fast-mode-2026-02-01",
+  "files-api-2025-04-14",
+  "fine-grained-tool-streaming-2025-05-14",
+  "interleaved-thinking-2025-05-14",
+  "prompt-caching-scope-2026-01-05",
+  "redact-thinking-2026-02-12",
+  "structured-outputs-2025-12-15",
+  "tool-examples-2025-10-29",
+  "tool-search-tool-2025-10-19",
+  "web-search-2025-03-05",
+]);
+const BETA_SHORTCUTS = new Map([
+  ["1m", "context-1m-2025-08-07"],
+  ["1m-context", "context-1m-2025-08-07"],
+  ["context-1m", "context-1m-2025-08-07"],
+  ["fast", "fast-mode-2026-02-01"],
+  ["fast-mode", "fast-mode-2026-02-01"],
+  ["opus-fast", "fast-mode-2026-02-01"],
+]);
 const STAINLESS_HELPER_KEYS = [
   "x_stainless_helper",
   "x-stainless-helper",
@@ -162,6 +190,17 @@ function isFalsyEnv(value) {
   return normalized === "0" || normalized === "false" || normalized === "no";
 }
 
+/**
+ * @param {string | undefined} value
+ * @returns {string}
+ */
+function resolveBetaShortcut(value) {
+  if (!value) return "";
+  const trimmed = value.trim();
+  const mapped = BETA_SHORTCUTS.get(trimmed.toLowerCase());
+  return mapped || trimmed;
+}
+
 /**
  * @returns {boolean}
  */
@@ -341,11 +380,11 @@ function detectProvider(requestUrl) {
 
 /**
  * @param {string | undefined} body
- * @returns {{model: string, tools: any[], messages: any[]}}
+ * @returns {{model: string, tools: any[], messages: any[], hasFileReferences: boolean}}
  */
 function parseRequestBodyMetadata(body) {
   if (!body || typeof body !== "string") {
-    return { model: "", tools: [], messages: [] };
+    return { model: "", tools: [], messages: [], hasFileReferences: false };
   }
 
   try {
@@ -353,9 +392,10 @@ function parseRequestBodyMetadata(body) {
     const model = typeof parsed?.model === "string" ? parsed.model : "";
     const tools = Array.isArray(parsed?.tools) ? parsed.tools : [];
     const messages = Array.isArray(parsed?.messages) ? parsed.messages : [];
-    return { model, tools, messages };
+    const hasFileReferences = extractFileIds(parsed).length > 0;
+    return { model, tools, messages, hasFileReferences };
   } catch {
-    return { model: "", tools: [], messages: [] };
+    return { model: "", tools: [], messages: [], hasFileReferences: false };
   }
 }
 
@@ -663,19 +703,40 @@ function buildSystemPromptBlocks(system, signature, messages) {
  * @param {"anthropic" | "bedrock" | "vertex" | "foundry"} provider
  * @param {string[]} [customBetas]
  * @param {import('./lib/config.mjs').AccountSelectionStrategy} [strategy]
+ * @param {string} [requestPath]
+ * @param {boolean} [hasFileReferences]
  * @returns {string}
  */
-function buildAnthropicBetaHeader(incomingBeta, signatureEnabled, model, provider, customBetas, strategy) {
+function buildAnthropicBetaHeader(
+  incomingBeta,
+  signatureEnabled,
+  model,
+  provider,
+  customBetas,
+  strategy,
+  requestPath,
+  hasFileReferences,
+) {
   const incomingBetasList = incomingBeta
     .split(",")
     .map((b) => b.trim())
     .filter(Boolean);
 
   const betas = ["oauth-2025-04-20"];
+  const disableExperimentalBetas = isTruthyEnv(process.env.CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS);
+  const isMessagesCountTokensPath = requestPath === "/v1/messages/count_tokens";
+  const isFilesEndpoint = requestPath?.startsWith("/v1/files") ?? false;
 
   if (!signatureEnabled) {
     betas.push("interleaved-thinking-2025-05-14");
-    return [...new Set([...betas, ...incomingBetasList])].join(",");
+    if (isMessagesCountTokensPath) {
+      betas.push(TOKEN_COUNTING_BETA_FLAG);
+    }
+    let mergedBetas = [...new Set([...betas, ...incomingBetasList])];
+    if (disableExperimentalBetas) {
+      mergedBetas = mergedBetas.filter((beta) => !EXPERIMENTAL_BETA_FLAGS.has(beta));
+    }
+    return mergedBetas.join(",");
   }
 
   const nonInteractive = isNonInteractiveMode();
@@ -684,72 +745,75 @@ function buildAnthropicBetaHeader(incomingBeta, signatureEnabled, model, provide
 
   if (!haiku) {
     betas.push(CLAUDE_CODE_BETA_FLAG);
-    // Code execution sandbox state is per-account; skip in round-robin to avoid
-    // losing sandbox state mid-workflow when requests rotate between accounts.
-    if (!isRoundRobin) {
-      betas.push("code-execution-2025-08-25");
-    }
   }
 
-  // Files API is model-independent; enables /v1/files endpoint and file_id references.
-  // Safe in round-robin because file-ID account pinning routes requests to the correct account.
-  betas.push("files-api-2025-04-14");
+  // Files API beta is endpoint/content-scoped instead of globally applied.
+  if ((isFilesEndpoint || hasFileReferences) && !disableExperimentalBetas) {
+    betas.push("files-api-2025-04-14");
+  }
 
   if (isOpus46Model(model)) {
-    // Opus 4.6 uses adaptive thinking — model decides how much to think based on task complexity.
-    // The effort parameter guides it; budgetTokens/interleaved-thinking are for older models.
-    if (!isTruthyEnv(process.env.DISABLE_INTERLEAVED_THINKING)) {
-      betas.push("adaptive-thinking-2026-01-28");
-    }
-  } else if (!isTruthyEnv(process.env.DISABLE_INTERLEAVED_THINKING) && supportsThinking(model)) {
+    // Opus 4.6 uses effort-based thinking controls.
+    betas.push(EFFORT_BETA_FLAG);
+  } else if (
+    !disableExperimentalBetas &&
+    !isTruthyEnv(process.env.DISABLE_INTERLEAVED_THINKING) &&
+    supportsThinking(model)
+  ) {
     betas.push("interleaved-thinking-2025-05-14");
   }
 
   // context-1m-2025-08-07 is only supported for API key users; OAuth provider does not support it.
   // For OAuth (this plugin's only auth mode), compaction is gated by model.limit.input instead.
-  if (hasOneMillionContext(model) && provider !== "anthropic") {
+  if (!disableExperimentalBetas && hasOneMillionContext(model) && provider !== "anthropic") {
     betas.push("context-1m-2025-08-07");
   }
 
   if (
+    !disableExperimentalBetas &&
     nonInteractive &&
     (isTruthyEnv(process.env.USE_API_CONTEXT_MANAGEMENT) || isTruthyEnv(process.env.TENGU_MARBLE_ANVIL))
   ) {
     betas.push("context-management-2025-06-27");
   }
 
-  if (supportsStructuredOutputs(model) && isTruthyEnv(process.env.TENGU_TOOL_PEAR)) {
+  if (!disableExperimentalBetas && supportsStructuredOutputs(model) && isTruthyEnv(process.env.TENGU_TOOL_PEAR)) {
     betas.push("structured-outputs-2025-12-15");
   }
 
-  if (nonInteractive && isTruthyEnv(process.env.TENGU_SCARF_COFFEE)) {
+  if (!disableExperimentalBetas && nonInteractive && isTruthyEnv(process.env.TENGU_SCARF_COFFEE)) {
     betas.push("tool-examples-2025-10-29");
   }
 
-  if ((provider === "vertex" || provider === "foundry") && supportsWebSearch(model)) {
+  if (!disableExperimentalBetas && (provider === "vertex" || provider === "foundry") && supportsWebSearch(model)) {
     betas.push("web-search-2025-03-05");
   }
 
   // Prompt caching is per-workspace (since Feb 2026); round-robin across accounts
   // means zero cache hits and doubled token costs. Skip in round-robin.
-  if (nonInteractive && !isRoundRobin) {
+  if (!disableExperimentalBetas && nonInteractive && !isRoundRobin) {
     betas.push("prompt-caching-scope-2026-01-05");
   }
 
-  if (process.env.ANTHROPIC_BETAS && !haiku) {
+  if (isMessagesCountTokensPath) {
+    betas.push(TOKEN_COUNTING_BETA_FLAG);
+  }
+
+  if (process.env.ANTHROPIC_BETAS) {
     const envBetas = process.env.ANTHROPIC_BETAS.split(",")
       .map((b) => b.trim())
       .filter(Boolean);
     betas.push(...envBetas);
   }
 
-  betas.push("fine-grained-tool-streaming-2025-05-14");
-
   if (Array.isArray(customBetas)) {
     betas.push(...customBetas.filter(Boolean));
   }
 
-  const mergedBetas = [...new Set([...betas, ...incomingBetasList])];
+  let mergedBetas = [...new Set([...betas, ...incomingBetasList])];
+  if (disableExperimentalBetas) {
+    mergedBetas = mergedBetas.filter((beta) => !EXPERIMENTAL_BETA_FLAGS.has(beta));
+  }
   if (provider === "bedrock") {
     return mergedBetas.filter((beta) => !BEDROCK_UNSUPPORTED_BETAS.has(beta)).join(",");
   }
@@ -759,7 +823,7 @@ function buildAnthropicBetaHeader(incomingBeta, signatureEnabled, model, provide
 /** @typedef {'low' | 'medium' | 'high'} ThinkingEffort */
 
 /**
- * Map budgetTokens to an adaptive thinking effort level.
+ * Map budgetTokens to an effort level.
  * Used when an Opus 4.6 request arrives with the legacy budgetTokens shape.
  * @param {number} budgetTokens
  * @returns {ThinkingEffort}
@@ -781,11 +845,11 @@ function isValidEffort(value) {
 
 /**
  * Normalise the `thinking` block in the request body for the target model:
- * - Opus 4.6 (adaptive thinking): produces `{ type: "enabled", effort: <effort> }`
+ * - Opus 4.6 (effort-based thinking): produces `{ type: "enabled", effort: <effort> }`
  * - Older models: passes the existing thinking block through unchanged.
  *
  * Handles three incoming shapes:
- *   1. Already adaptive: `{ type: "enabled", effort: "..." }` → kept as-is for Opus 4.6
+ *   1. Already effort-based: `{ type: "enabled", effort: "..." }` → kept as-is for Opus 4.6
  *   2. Legacy manual: `{ type: "enabled", budget_tokens: N }` → mapped to effort for Opus 4.6
  *   3. Absent / disabled: no transform
  *
@@ -873,7 +937,7 @@ async function fetchLatestClaudeCodeVersion(timeoutMs = 1200) {
  * @param {string} accessToken
  * @param {string | undefined} requestBody
  * @param {URL | null} requestUrl
- * @param {{enabled: boolean, claudeCliVersion: string, strategy?: import('./lib/config.mjs').AccountSelectionStrategy}} signature
+ * @param {{enabled: boolean, claudeCliVersion: string, strategy?: import('./lib/config.mjs').AccountSelectionStrategy, customBetas?: string[]}} signature
  * @returns {Headers}
  */
 function buildRequestHeaders(input, requestInit, accessToken, requestBody, requestUrl, signature) {
@@ -905,7 +969,7 @@ function buildRequestHeaders(input, requestInit, accessToken, requestBody, reque
 
   // Preserve all incoming beta headers while ensuring OAuth requirements
   const incomingBeta = requestHeaders.get("anthropic-beta") || "";
-  const { model, tools, messages } = parseRequestBodyMetadata(requestBody);
+  const { model, tools, messages, hasFileReferences } = parseRequestBodyMetadata(requestBody);
   const provider = detectProvider(requestUrl);
   const mergedBetas = buildAnthropicBetaHeader(
     incomingBeta,
@@ -914,6 +978,8 @@ function buildRequestHeaders(input, requestInit, accessToken, requestBody, reque
     provider,
     signature.customBetas,
     signature.strategy,
+    requestUrl?.pathname,
+    hasFileReferences,
   );
 
   const authTokenOverride = process.env.ANTHROPIC_AUTH_TOKEN?.trim();
@@ -1040,7 +1106,7 @@ function transformRequestBody(body, signature, runtime) {
 }
 
 /**
- * Transform the request URL: add ?beta=true to /v1/messages.
+ * Transform the request URL: add ?beta=true to /v1/messages and /v1/messages/count_tokens.
  * Preserves behaviors F1-F3.
  *
  * @param {any} input
@@ -1059,7 +1125,11 @@ function transformRequestUrl(input) {
     requestUrl = null;
   }
 
-  if (requestUrl && requestUrl.pathname === "/v1/messages" && !requestUrl.searchParams.has("beta")) {
+  if (
+    requestUrl &&
+    (requestUrl.pathname === "/v1/messages" || requestUrl.pathname === "/v1/messages/count_tokens") &&
+    !requestUrl.searchParams.has("beta")
+  ) {
     requestUrl.searchParams.set("beta", "true");
     requestInput = input instanceof Request ? new Request(requestUrl.toString(), input) : requestUrl;
   }
@@ -1796,7 +1866,12 @@ export async function AnthropicAuthPlugin({ client }) {
 
     const credentials = await exchange(code, pending.verifier);
     if (credentials.type === "failed") {
-      return { ok: false, message: "Token exchange failed. The code may be invalid or expired." };
+      return {
+        ok: false,
+        message: credentials.details
+          ? `Token exchange failed (${credentials.details}).`
+          : "Token exchange failed. The code may be invalid or expired.",
+      };
     }
 
     const stored = (await loadAccounts()) || { version: 1, accounts: [], activeIndex: 0 };
@@ -2039,12 +2114,12 @@ export async function AnthropicAuthPlugin({ client }) {
           "",
           "Preset betas (auto-computed per model/provider):",
           "  oauth-2025-04-20, claude-code-20250219,",
-          "  interleaved-thinking-2025-05-14 OR adaptive-thinking-2026-01-28,",
-          "  fine-grained-tool-streaming-2025-05-14,",
-          `  code-execution-2025-08-25 (non-Haiku${strategy === "round-robin" ? ", skipped in round-robin" : ""}),`,
-          "  files-api-2025-04-14,",
+          "  interleaved-thinking-2025-05-14 (non-Opus 4.6) OR effort-2025-11-24 (Opus 4.6),",
+          "  files-api-2025-04-14 (only /v1/files and requests with file_id),",
+          "  token-counting-2024-11-01 (only /v1/messages/count_tokens),",
           `  prompt-caching-scope-2026-01-05 (non-interactive${strategy === "round-robin" ? ", skipped in round-robin" : ""})`,
           "",
+          `Experimental betas: ${isTruthyEnv(process.env.CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS) ? "disabled (CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS=1)" : "enabled"}`,
           `Strategy: ${strategy}${initialAccountPinned ? " (pinned via OPENCODE_ANTHROPIC_INITIAL_ACCOUNT)" : ""}`,
           `Custom betas: ${fresh.custom_betas.length ? fresh.custom_betas.join(", ") : "(none)"}`,
           "",
@@ -2055,6 +2130,8 @@ export async function AnthropicAuthPlugin({ client }) {
           "  /anthropic betas add web-search-2025-03-05",
           "  /anthropic betas add compact-2026-01-12",
           "  /anthropic betas add mcp-servers-2025-12-04",
+          "  /anthropic betas add 1m   (shortcut for context-1m-2025-08-07)",
+          "  /anthropic betas add fast (shortcut for fast-mode-2026-02-01)",
           "",
           "Remove: /anthropic betas remove <beta>",
         ];
@@ -2063,11 +2140,12 @@ export async function AnthropicAuthPlugin({ client }) {
       }
 
       if (action === "add") {
-        const beta = args[2]?.trim();
-        if (!beta) {
+        const betaInput = args[2]?.trim();
+        if (!betaInput) {
           await sendCommandMessage(input.sessionID, "▣ Anthropic Betas\n\nUsage: /anthropic betas add <beta-name>");
           return;
         }
+        const beta = resolveBetaShortcut(betaInput);
         const fresh = loadConfigFresh();
         const current = fresh.custom_betas || [];
         if (current.includes(beta)) {
@@ -2076,16 +2154,21 @@ export async function AnthropicAuthPlugin({ client }) {
         }
         saveConfig({ custom_betas: [...current, beta] });
         Object.assign(config, loadConfigFresh());
-        await sendCommandMessage(input.sessionID, `▣ Anthropic Betas\n\nAdded: ${beta}`);
+        const fromShortcut = beta !== betaInput;
+        await sendCommandMessage(
+          input.sessionID,
+          `▣ Anthropic Betas\n\nAdded: ${beta}${fromShortcut ? ` (from shortcut: ${betaInput})` : ""}`,
+        );
         return;
       }
 
       if (action === "remove" || action === "rm") {
-        const beta = args[2]?.trim();
-        if (!beta) {
+        const betaInput = args[2]?.trim();
+        if (!betaInput) {
           await sendCommandMessage(input.sessionID, "▣ Anthropic Betas\n\nUsage: /anthropic betas remove <beta-name>");
           return;
         }
+        const beta = resolveBetaShortcut(betaInput);
         const fresh = loadConfigFresh();
         const current = fresh.custom_betas || [];
         if (!current.includes(beta)) {
@@ -2164,7 +2247,7 @@ export async function AnthropicAuthPlugin({ client }) {
         }
         return {
           authorization: `Bearer ${tok}`,
-          "anthropic-beta": "files-api-2025-04-14",
+          "anthropic-beta": "oauth-2025-04-20,files-api-2025-04-14",
         };
       }
 
@@ -2291,7 +2374,7 @@ export async function AnthropicAuthPlugin({ client }) {
             method: "POST",
             headers: {
               authorization: authHeaders.authorization,
-              "anthropic-beta": "files-api-2025-04-14",
+              "anthropic-beta": "oauth-2025-04-20,files-api-2025-04-14",
             },
             body: form,
           });

package/lib/oauth.mjs

@@ -5,6 +5,14 @@ import { CLIENT_ID } from "./config.mjs";
 // OAuth helpers — shared between plugin (index.mjs) and CLI (cli.mjs)
 // ---------------------------------------------------------------------------
 
+const OAUTH_CONSOLE_HOST = "platform.claude.com";
+const OAUTH_MAX_HOST = "claude.ai";
+const OAUTH_REDIRECT_URI = `https://${OAUTH_CONSOLE_HOST}/oauth/code/callback`;
+const OAUTH_TOKEN_URL = `https://${OAUTH_CONSOLE_HOST}/v1/oauth/token`;
+const OAUTH_REVOKE_URL = `https://${OAUTH_CONSOLE_HOST}/v1/oauth/revoke`;
+const OAUTH_CLI_VERSION_PROFILE = "2.1.79";
+const OAUTH_USER_AGENT = `claude-cli/${OAUTH_CLI_VERSION_PROFILE} (external, cli)`;
+
 function base64url(input) {
   return Buffer.from(input).toString("base64url");
 }
@@ -23,11 +31,11 @@ function generatePKCE() {
 export async function authorize(mode) {
   const pkce = generatePKCE();
 
-  const url = new URL(`https://${mode === "console" ? "console.anthropic.com" : "claude.ai"}/oauth/authorize`);
+  const url = new URL(`https://${mode === "console" ? OAUTH_CONSOLE_HOST : OAUTH_MAX_HOST}/oauth/authorize`);
   url.searchParams.set("code", "true");
   url.searchParams.set("client_id", CLIENT_ID);
   url.searchParams.set("response_type", "code");
-  url.searchParams.set("redirect_uri", "https://console.anthropic.com/oauth/code/callback");
+  url.searchParams.set("redirect_uri", OAUTH_REDIRECT_URI);
   url.searchParams.set("scope", "org:create_api_key user:profile user:inference");
   url.searchParams.set("code_challenge", pkce.challenge);
   url.searchParams.set("code_challenge_method", "S256");
@@ -42,28 +50,79 @@ export async function authorize(mode) {
  * Exchange an authorization code for tokens.
  * @param {string} code
  * @param {string} verifier
- * @returns {Promise<{type: "success", refresh: string, access: string, expires: number, email?: string} | {type: "failed"}>}
+ * @returns {Promise<
+ *   | { type: "success", refresh: string, access: string, expires: number, email?: string }
+ *   | { type: "failed", status?: number, code?: string, reason?: string, details?: string }
+ * >}
  */
 export async function exchange(code, verifier) {
-  const splits = code.split("#");
-  const result = await fetch("https://console.anthropic.com/v1/oauth/token", {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify({
-      code: splits[0],
-      state: splits[1],
-      grant_type: "authorization_code",
-      client_id: CLIENT_ID,
-      redirect_uri: "https://console.anthropic.com/oauth/code/callback",
-      code_verifier: verifier,
-    }),
-  });
-  if (!result.ok)
+  const fail = (status, rawText = "") => {
+    let errorCode;
+    let reason;
+
+    if (rawText) {
+      try {
+        const parsed = JSON.parse(rawText);
+        if (typeof parsed.error === "string" && parsed.error) {
+          errorCode = parsed.error;
+        }
+        if (typeof parsed.error_description === "string" && parsed.error_description) {
+          reason = parsed.error_description;
+        } else if (typeof parsed.message === "string" && parsed.message) {
+          reason = parsed.message;
+        }
+      } catch {
+        reason = rawText.trim() || undefined;
+      }
+    }
+
+    const detailsParts = [];
+    if (typeof status === "number") detailsParts.push(`HTTP ${status}`);
+    if (errorCode) detailsParts.push(errorCode);
+    if (reason) detailsParts.push(reason);
+
     return {
       type: "failed",
+      ...(typeof status === "number" ? { status } : {}),
+      ...(errorCode ? { code: errorCode } : {}),
+      ...(reason ? { reason } : {}),
+      ...(detailsParts.length ? { details: detailsParts.join(" · ") } : {}),
     };
+  };
+
+  const splits = code.split("#");
+  let result;
+  try {
+    result = await fetch(OAUTH_TOKEN_URL, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "User-Agent": OAUTH_USER_AGENT,
+      },
+      body: JSON.stringify({
+        code: splits[0],
+        state: splits[1],
+        grant_type: "authorization_code",
+        client_id: CLIENT_ID,
+        redirect_uri: OAUTH_REDIRECT_URI,
+        code_verifier: verifier,
+      }),
+    });
+  } catch (err) {
+    return fail(undefined, err instanceof Error ? err.message : String(err));
+  }
+
+  if (!result.ok) {
+    const raw =
+      typeof result.text === "function"
+        ? await result
+            .text()
+            .then((value) => (typeof value === "string" ? value : ""))
+            .catch(() => "")
+        : "";
+    return fail(result.status, raw);
+  }
+
   const json = await result.json();
   return {
     type: "success",
@@ -86,9 +145,12 @@ export async function exchange(code, verifier) {
  */
 export async function revoke(refreshToken) {
   try {
-    const resp = await fetch("https://console.anthropic.com/v1/oauth/revoke", {
+    const resp = await fetch(OAUTH_REVOKE_URL, {
       method: "POST",
-      headers: { "Content-Type": "application/json" },
+      headers: {
+        "Content-Type": "application/json",
+        "User-Agent": OAUTH_USER_AGENT,
+      },
       body: JSON.stringify({
         token: refreshToken,
         token_type_hint: "refresh_token",
@@ -110,9 +172,12 @@ export async function revoke(refreshToken) {
  * @throws {Error} On HTTP errors or network failures
  */
 export async function refreshToken(refreshTokenValue, options = {}) {
-  const resp = await fetch("https://console.anthropic.com/v1/oauth/token", {
+  const resp = await fetch(OAUTH_TOKEN_URL, {
     method: "POST",
-    headers: { "Content-Type": "application/json" },
+    headers: {
+      "Content-Type": "application/json",
+      "User-Agent": OAUTH_USER_AGENT,
+    },
     body: JSON.stringify({
       grant_type: "refresh_token",
       client_id: CLIENT_ID,

package/lib/oauth.test.mjs

@@ -0,0 +1,49 @@
+import { beforeEach, afterEach, describe, expect, it, vi } from "vitest";
+import { exchange, refreshToken, revoke } from "./oauth.mjs";
+
+const mockFetch = vi.fn();
+
+describe("oauth headers", () => {
+  beforeEach(() => {
+    vi.resetAllMocks();
+    vi.stubGlobal("fetch", mockFetch);
+  });
+
+  afterEach(() => {
+    vi.unstubAllGlobals();
+  });
+
+  it("sends Claude Code user-agent on token exchange", async () => {
+    mockFetch.mockResolvedValueOnce({
+      ok: false,
+      status: 400,
+      text: async () => "",
+    });
+
+    await exchange("code#state", "verifier");
+
+    const [, init] = mockFetch.mock.calls[0];
+    expect(init.headers["User-Agent"]).toBe("claude-cli/2.1.79 (external, cli)");
+  });
+
+  it("sends Claude Code user-agent on token refresh", async () => {
+    mockFetch.mockResolvedValueOnce({
+      ok: true,
+      json: async () => ({ access_token: "a", refresh_token: "r", expires_in: 3600 }),
+    });
+
+    await refreshToken("refresh-token");
+
+    const [, init] = mockFetch.mock.calls[0];
+    expect(init.headers["User-Agent"]).toBe("claude-cli/2.1.79 (external, cli)");
+  });
+
+  it("sends Claude Code user-agent on token revoke", async () => {
+    mockFetch.mockResolvedValueOnce({ ok: true });
+
+    await revoke("refresh-token");
+
+    const [, init] = mockFetch.mock.calls[0];
+    expect(init.headers["User-Agent"]).toBe("claude-cli/2.1.79 (external, cli)");
+  });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-anthropic-fix",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "main": "./index.mjs",
   "files": [
     "index.mjs",