opencode-anthropic-fix 0.1.6 → 0.1.7

package/index.mjs

@@ -3,7 +3,7 @@ import { stdin, stdout } from "node:process";
 import { randomBytes, randomUUID, createHash as createHashCrypto } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join, resolve, basename } from "node:path";
-// xxhash-wasm import removed: CCH attestation was removed in CC v2.1.97
+import xxhashInit from "xxhash-wasm";
 import { AccountManager } from "./lib/accounts.mjs";
 import { authorize as oauthAuthorize, exchange as oauthExchange, refreshToken } from "./lib/oauth.mjs";
 import { loadConfig, loadConfigFresh, saveConfig, CLIENT_ID, getConfigDir } from "./lib/config.mjs";
@@ -2834,9 +2834,8 @@ export async function AnthropicAuthPlugin({ client, project, directory, worktree
                   _adaptiveOverride,
                   _tokenEconomy,
                 );
-                // v2.1.97: cch=00000 is now static (xxHash64 attestation removed).
-                // Send body as-is without cch replacement.
-                const finalBody = body;
+                // v2.1.107: cch attestation via xxHash64(body, seed) & 0xFFFFF
+                const finalBody = await computeAndReplaceCCH(body);
 
                 // Execute the request
                 let response;
@@ -5059,17 +5058,19 @@ process.once("beforeExit", _beforeExitHandler);
 // Request building helpers (extracted from original fetch interceptor)
 // ---------------------------------------------------------------------------
 
-const FALLBACK_CLAUDE_CLI_VERSION = "2.1.97";
+const FALLBACK_CLAUDE_CLI_VERSION = "2.1.107";
 const CLAUDE_CODE_NPM_LATEST_URL = "https://registry.npmjs.org/@anthropic-ai/claude-code/latest";
-const CLAUDE_CODE_BUILD_TIME = "2026-04-13T19:06:08Z";
+const CLAUDE_CODE_BUILD_TIME = "2026-04-14T03:13:25Z";
 
-// The @anthropic-ai/sdk version bundled with Claude Code v2.1.97.
+// The @anthropic-ai/sdk version bundled with Claude Code.
 // This is distinct from the CLI version and goes in X-Stainless-Package-Version.
-// Verified by extracting VERSION="0.208.0" from the bundled cli.js of all versions .80-.97.
-const ANTHROPIC_SDK_VERSION = "0.208.0";
+// v2.1.107 switched from @anthropic-ai/sdk v0.208.0 to v0.81.0 (confirmed via proxy capture).
+const ANTHROPIC_SDK_VERSION = "0.81.0";
 
 // Map of CLI version → bundled SDK version (update when CLI version changes)
 const CLI_TO_SDK_VERSION = new Map([
+  ["2.1.107", "0.81.0"],
+  ["2.1.105", "0.81.0"],
   ["2.1.97", "0.208.0"],
   ["2.1.96", "0.208.0"],
   ["2.1.95", "0.208.0"],
@@ -5101,11 +5102,33 @@ function getSdkVersion(cliVersion) {
 const BILLING_HASH_SALT = "59cf53e54c78";
 const BILLING_HASH_INDICES = [4, 7, 20];
 
-// cch attestation: REMOVED in v2.1.97.
-// Previously (v2.1.96), CC computed xxHash64 of the serialized body and replaced
-// "cch=00000" with the 20-bit masked hash. In v2.1.97, the xxHash64 computation
-// was completely removed — "cch=00000" is now sent as a static placeholder.
-// Sending a computed cch value would now be detected as non-genuine.
+// cch attestation: RE-ENABLED with xxHash64 (matching Bun binary's Attestation.zig).
+// The compiled Bun binary computes cch dynamically: xxHash64(body, seed) & 0xFFFFF.
+// Captured real CC v2.1.107 request shows cch=6d00f (5-hex-char, 20-bit masked hash).
+// Seed extracted from binary: 0x6E52736AC806831E (unchanged since v2.1.96).
+const CCH_SEED = 0x6e52736ac806831en; // BigInt — Attestation.zig seed
+
+/** @type {null | ((buf: Uint8Array, seed: bigint) => bigint)} */
+let _xxh64Raw = null;
+const _xxhashReady = xxhashInit().then((h) => {
+  _xxh64Raw = h.h64Raw;
+});
+
+/**
+ * Compute and replace the cch=00000 placeholder in the serialized body with
+ * xxHash64(body, seed) & 0xFFFFF, matching the Bun binary's native attestation.
+ * @param {string} body - Serialized JSON body
+ * @returns {Promise<string>} Body with cch replaced
+ */
+async function computeAndReplaceCCH(body) {
+  if (typeof body !== "string" || !body.includes("cch=00000")) return body;
+  await _xxhashReady;
+  if (!_xxh64Raw) return body; // fallback: send as-is if wasm failed to load
+  const bodyBytes = Buffer.from(body, "utf-8");
+  const hash = _xxh64Raw(bodyBytes, CCH_SEED);
+  const cch = (hash & 0xfffffn).toString(16).padStart(5, "0");
+  return body.replace("cch=00000", `cch=${cch}`);
+}
 
 /**
  * Compute the billing cache hash (cch) matching Claude Code's NP1() function.
@@ -5850,11 +5873,8 @@ function sanitizeSystemText(text) {
   if (ccStandardStart > 0) {
     sanitized = sanitized.slice(ccStandardStart);
   }
-  // Truncate to safe length — opencode customizations beyond this point
-  // diverge from real CC and trigger extra usage billing detection.
-  if (sanitized.length > MAX_SAFE_SYSTEM_TEXT_LENGTH) {
-    sanitized = sanitized.slice(0, MAX_SAFE_SYSTEM_TEXT_LENGTH);
-  }
+  // NOTE: truncation removed — real CC v2.1.107 sends 26K+ char system prompts.
+  // The server checks for CC identity/billing markers, not exact prompt length.
   return sanitized;
 }
 
@@ -6725,8 +6745,12 @@ function transformRequestBody(body, signature, runtime, betaHeader, config) {
       delete parsed.betas;
     }
     // Normalize thinking block for adaptive (Opus 4.6 / Sonnet 4.6) vs manual (older models).
+    // Real CC always sends thinking:{type:"adaptive"} for adaptive models even if the
+    // upstream SDK didn't include it. Inject it when missing to match the fingerprint.
     if (Object.prototype.hasOwnProperty.call(parsed, "thinking")) {
       parsed.thinking = normalizeThinkingBlock(parsed.thinking, parsed.model || "");
+    } else if (parsed.model && isAdaptiveThinkingModel(parsed.model)) {
+      parsed.thinking = { type: "adaptive" };
     }
 
     // Fingerprint fix: real Claude Code v2.1.87+ nests the effort control inside
@@ -6866,29 +6890,40 @@ function transformRequestBody(body, signature, runtime, betaHeader, config) {
       }
     }
 
-    // Add prefix to tools definitions
-    if (parsed.tools && Array.isArray(parsed.tools)) {
-      parsed.tools = parsed.tools.map((tool) => ({
-        ...tool,
-        name: tool.name ? `${TOOL_PREFIX}${tool.name}` : tool.name,
-      }));
+    // Tool name sanitization: Anthropic's server blocklists known non-CC tool names.
+    // opencode uses lowercase names while CC uses PascalCase. While only "todowrite"
+    // is currently confirmed blocklisted, we rename ALL core opencode tools to match
+    // CC's naming convention as a preventive measure against future blocklist additions.
+    const OC_TO_CC_TOOL_NAMES = {
+      bash: "Bash",
+      read: "Read",
+      glob: "Glob",
+      grep: "Grep",
+      edit: "Edit",
+      write: "Write",
+      webfetch: "WebFetch",
+      todowrite: "TodoWrite",
+      skill: "Skill",
+      task: "Task",
+      compress: "Compress",
+    };
+    if (Array.isArray(parsed.tools)) {
+      for (const tool of parsed.tools) {
+        if (tool.name && OC_TO_CC_TOOL_NAMES[tool.name]) {
+          tool.name = OC_TO_CC_TOOL_NAMES[tool.name];
+        }
+      }
     }
-    // Add prefix to tool_use blocks in messages
-    if (parsed.messages && Array.isArray(parsed.messages)) {
-      parsed.messages = parsed.messages.map((msg) => {
-        if (msg.content && Array.isArray(msg.content)) {
-          msg.content = msg.content.map((block) => {
-            if (block.type === "tool_use" && block.name) {
-              return {
-                ...block,
-                name: `${TOOL_PREFIX}${block.name}`,
-              };
-            }
-            return block;
-          });
+    // Also rename in tool_use blocks in messages (assistant responses referencing the tool)
+    if (Array.isArray(parsed.messages)) {
+      for (const msg of parsed.messages) {
+        if (!Array.isArray(msg.content)) continue;
+        for (const block of msg.content) {
+          if (block.type === "tool_use" && block.name && OC_TO_CC_TOOL_NAMES[block.name]) {
+            block.name = OC_TO_CC_TOOL_NAMES[block.name];
+          }
         }
-        return msg;
-      });
+      }
     }
     // Task budgets: when the task-budgets beta is active, preserve or inject output_config.
     // The beta unlocks output_config.max_output_tokens for per-task budget control.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-anthropic-fix",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "license": "GPL-3.0-or-later",
   "main": "./index.mjs",
   "files": [
@@ -43,6 +43,7 @@
     "vitest": "^4.0.18"
   },
   "dependencies": {
-    "@openauthjs/openauth": "^0.4.3"
+    "@openauthjs/openauth": "^0.4.3",
+    "xxhash-wasm": "^1.1.0"
   }
 }