opencode-anthropic-fix 0.0.23 → 0.0.24

package/README.md

@@ -43,6 +43,7 @@ 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`
 - **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

package/index.mjs

@@ -103,7 +103,7 @@ 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";
@@ -1866,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 };

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.24",
   "main": "./index.mjs",
   "files": [
     "index.mjs",