opencode-anthropic-fix 0.0.23 → 0.0.25

package/README.md

@@ -43,7 +43,9 @@ 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
+- **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`
+- **Upstream-aligned auto betas** — `advanced-tool-use-2025-11-20` and `fast-mode-2026-02-01` auto-included to match Claude Code 2.1.79+ (`redact-thinking-2026-02-12` available as opt-in to preserve thinking block visibility)
 - **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 endpoint/content-scoped `files-api-2025-04-14` beta injection
@@ -272,7 +274,6 @@ Add or remove beta flags that get included in every `anthropic-beta` header. Per
 /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`):
@@ -287,7 +288,7 @@ Add or remove beta flags that get included in every `anthropic-beta` header. Per
 | `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)                   |
+| `redact-thinking-2026-02-12`      | Hide thinking blocks from responses (opt-in)      |
 
 Example workflow:
 

package/index.mjs

@@ -1,6 +1,6 @@
 import { createInterface } from "node:readline/promises";
 import { stdin, stdout } from "node:process";
-import { createHash, randomUUID } from "node:crypto";
+import { randomBytes, randomUUID } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join, resolve, basename } from "node:path";
 import { AccountManager } from "./lib/accounts.mjs";
@@ -103,13 +103,14 @@ 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 REDACT_THINKING_BETA_FLAG = "redact-thinking-2026-02-12";
+const ADVANCED_TOOL_USE_BETA_FLAG = "advanced-tool-use-2025-11-20";
+const FAST_MODE_BETA_FLAG = "fast-mode-2026-02-01";
 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.";
 const KNOWN_IDENTITY_STRINGS = new Set([
   CLAUDE_CODE_IDENTITY_STRING,
@@ -429,39 +430,6 @@ function buildStainlessHelperHeader(tools, messages) {
   return Array.from(helpers).join(", ");
 }
 
-/**
- * @param {any} content
- * @returns {string}
- */
-function extractTextContent(content) {
-  if (typeof content === "string") return content;
-  if (!Array.isArray(content)) return "";
-
-  const parts = [];
-  for (const block of content) {
-    if (!block || typeof block !== "object") continue;
-    if (block.type === "text" && typeof block.text === "string") {
-      parts.push(block.text);
-    }
-  }
-  return parts.join("\n");
-}
-
-/**
- * @param {any[]} messages
- * @returns {string}
- */
-function getFirstUserText(messages) {
-  for (const message of messages) {
-    if (!message || typeof message !== "object") continue;
-    if (message.role !== "user") continue;
-
-    const text = extractTextContent(message.content);
-    if (text) return text;
-  }
-  return "";
-}
-
 /**
  * @param {{id?: string, accountUuid?: string} | null | undefined} account
  * @returns {string}
@@ -503,18 +471,12 @@ function buildRequestMetadata(input) {
  * @param {any[]} messages
  * @returns {string}
  */
-function buildAnthropicBillingHeader(claudeCliVersion, messages) {
+function buildAnthropicBillingHeader(claudeCliVersion) {
   if (isFalsyEnv(process.env.CLAUDE_CODE_ATTRIBUTION_HEADER)) return "";
 
-  const firstUserText = getFirstUserText(messages);
-  const sampled = BILLING_HASH_POSITIONS.map((position) => firstUserText[position] || "0").join("");
-  const hash = createHash("sha256")
-    .update(`${BILLING_HASH_SALT}${sampled}${claudeCliVersion}`)
-    .digest("hex")
-    .slice(0, 3);
-
-  const entrypoint = process.env.CLAUDE_CODE_ENTRYPOINT || "unknown";
-  return `x-anthropic-billing-header: cc_version=${claudeCliVersion}.${hash}; cc_entrypoint=${entrypoint}; cch=00000;`;
+  const cch = randomBytes(3).toString("hex").slice(0, 5);
+  const entrypoint = process.env.CLAUDE_CODE_ENTRYPOINT || "cli";
+  return `x-anthropic-billing-header: cc_version=${claudeCliVersion}; cc_entrypoint=${entrypoint}; cch=${cch};`;
 }
 
 /**
@@ -659,10 +621,9 @@ function normalizeSystemTextBlocks(system) {
 /**
  * @param {Array<{type: string, text: string, cache_control?: {type: string}}>} system
  * @param {{enabled: boolean, claudeCliVersion: string, promptCompactionMode: 'minimal' | 'off'}} signature
- * @param {any[]} messages
  * @returns {Array<{type: string, text: string, cache_control?: {type: string}}>}
  */
-function buildSystemPromptBlocks(system, signature, messages) {
+function buildSystemPromptBlocks(system, signature) {
   const titleGeneratorRequest = isTitleGeneratorSystemBlocks(system);
 
   let sanitized = system.map((item) => ({
@@ -685,7 +646,7 @@ function buildSystemPromptBlocks(system, signature, messages) {
   );
 
   const blocks = [];
-  const billingHeader = buildAnthropicBillingHeader(signature.claudeCliVersion, messages);
+  const billingHeader = buildAnthropicBillingHeader(signature.claudeCliVersion);
   if (billingHeader) {
     blocks.push({ type: "text", text: billingHeader });
   }
@@ -752,6 +713,20 @@ function buildAnthropicBetaHeader(
     betas.push("files-api-2025-04-14");
   }
 
+  // NOTE: redact-thinking-2026-02-12 is in upstream 2.1.79+ base profile but
+  // intentionally NOT auto-included here — OpenCode users benefit from seeing
+  // thinking blocks. Available via /anthropic betas add redact-thinking-2026-02-12.
+
+  // Advanced tool use improvements — in upstream 2.1.79+ base profile.
+  if (!disableExperimentalBetas) {
+    betas.push(ADVANCED_TOOL_USE_BETA_FLAG);
+  }
+
+  // Fast mode — in upstream 2.1.79+ base profile.
+  if (!disableExperimentalBetas) {
+    betas.push(FAST_MODE_BETA_FLAG);
+  }
+
   if (isOpus46Model(model)) {
     // Opus 4.6 uses effort-based thinking controls.
     betas.push(EFFORT_BETA_FLAG);
@@ -1049,15 +1024,13 @@ function transformRequestBody(body, signature, runtime) {
     if (Object.prototype.hasOwnProperty.call(parsed, "betas")) {
       delete parsed.betas;
     }
-    const messages = Array.isArray(parsed.messages) ? parsed.messages : [];
-
     // Normalize thinking block for adaptive (Opus 4.6) vs manual (older models).
     if (Object.prototype.hasOwnProperty.call(parsed, "thinking")) {
       parsed.thinking = normalizeThinkingBlock(parsed.thinking, parsed.model || "");
     }
 
     // Sanitize system prompt and optionally inject Claude Code identity/billing blocks.
-    parsed.system = buildSystemPromptBlocks(normalizeSystemTextBlocks(parsed.system), signature, messages);
+    parsed.system = buildSystemPromptBlocks(normalizeSystemTextBlocks(parsed.system), signature);
 
     if (signature.enabled) {
       const currentMetadata =
@@ -1866,7 +1839,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 };
@@ -2109,6 +2087,7 @@ export async function AnthropicAuthPlugin({ client }) {
           "",
           "Preset betas (auto-computed per model/provider):",
           "  oauth-2025-04-20, claude-code-20250219,",
+          "  advanced-tool-use-2025-11-20, fast-mode-2026-02-01,",
           "  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),",
@@ -2125,8 +2104,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 redact-thinking-2026-02-12",
           "  /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>",
         ];

package/lib/oauth.mjs

@@ -10,6 +10,8 @@ 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");
@@ -48,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(OAUTH_TOKEN_URL, {
-    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: OAUTH_REDIRECT_URI,
-      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",
@@ -94,7 +147,10 @@ export async function revoke(refreshToken) {
   try {
     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",
@@ -118,7 +174,10 @@ export async function revoke(refreshToken) {
 export async function refreshToken(refreshTokenValue, options = {}) {
   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.23",
+  "version": "0.0.25",
   "main": "./index.mjs",
   "files": [
     "index.mjs",