@vacbo/opencode-anthropic-fix 0.0.44 → 0.0.45

package/dist/opencode-anthropic-auth-plugin.js

@@ -4,10 +4,16 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
 var __esm = (fn, res) => function __init() {
   return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
 };
-var __commonJS = (cb, mod) => function __require() {
+var __commonJS = (cb, mod) => function __require2() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
 var __export = (target, all) => {
@@ -5558,14 +5564,25 @@ function buildAnthropicBillingHeader(claudeCliVersion, messages) {
   let versionSuffix = "";
   if (Array.isArray(messages)) {
     const firstUserMsg = messages.find(
-      (m) => m !== null && typeof m === "object" && m.role === "user" && typeof m.content === "string"
+      (m) => m !== null && typeof m === "object" && m.role === "user"
     );
     if (firstUserMsg) {
-      const text = firstUserMsg.content;
-      const salt = "59cf53e54c78";
-      const picked = [4, 7, 20].map((i) => i < text.length ? text[i] : "0").join("");
-      const hash = createHash2("sha256").update(salt + picked + claudeCliVersion).digest("hex");
-      versionSuffix = `.${hash.slice(0, 3)}`;
+      let text = "";
+      const content = firstUserMsg.content;
+      if (typeof content === "string") {
+        text = content;
+      } else if (Array.isArray(content)) {
+        const textBlock = content.find((b) => b.type === "text");
+        if (textBlock && typeof textBlock.text === "string") {
+          text = textBlock.text;
+        }
+      }
+      if (text) {
+        const salt = "59cf53e54c78";
+        const picked = [4, 7, 20].map((i) => i < text.length ? text[i] : "0").join("");
+        const hash = createHash2("sha256").update(salt + picked + claudeCliVersion).digest("hex");
+        versionSuffix = `.${hash.slice(0, 3)}`;
+      }
     }
   }
   const entrypoint = process.env.CLAUDE_CODE_ENTRYPOINT || "cli";
@@ -6534,7 +6551,24 @@ function stopBunProxy() {
 async function fetchViaBun(input, init) {
   const port = await ensureBunProxy();
   const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
-  if (!port) return fetch(input, init);
+  if (!port) {
+    console.error("[bun-fetch] WARNING: No proxy available, using Node.js fetch (will route to extra usage!)");
+    return fetch(input, init);
+  }
+  console.error(`[bun-fetch] Routing through Bun proxy at :${port} \u2192 ${url}`);
+  if (init.body && url.includes("/v1/messages") && !url.includes("count_tokens")) {
+    try {
+      const { writeFileSync: writeFileSync6 } = __require("node:fs");
+      writeFileSync6("/tmp/opencode-last-request.json", typeof init.body === "string" ? init.body : JSON.stringify(init.body));
+      const hdrs = {};
+      init.headers.forEach((v, k) => {
+        hdrs[k] = k === "authorization" ? "Bearer ***" : v;
+      });
+      writeFileSync6("/tmp/opencode-last-headers.json", JSON.stringify(hdrs, null, 2));
+      console.error("[bun-fetch] Dumped request to /tmp/opencode-last-request.json");
+    } catch {
+    }
+  }
   const headers = new Headers(init.headers);
   headers.set("x-proxy-url", url);
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vacbo/opencode-anthropic-fix",
-  "version": "0.0.44",
+  "version": "0.0.45",
   "main": "./dist/opencode-anthropic-auth-plugin.js",
   "bin": {
     "opencode-anthropic-auth": "./dist/opencode-anthropic-auth-cli.mjs",

package/src/bun-fetch.ts

@@ -190,7 +190,24 @@ export async function fetchViaBun(
   const port = await ensureBunProxy();
   const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
 
-  if (!port) return fetch(input, init as RequestInit);
+  if (!port) {
+    console.error("[bun-fetch] WARNING: No proxy available, using Node.js fetch (will route to extra usage!)");
+    return fetch(input, init as RequestInit);
+  }
+
+  console.error(`[bun-fetch] Routing through Bun proxy at :${port} → ${url}`);
+
+  // Dump full request for debugging
+  if (init.body && url.includes("/v1/messages") && !url.includes("count_tokens")) {
+    try {
+      const { writeFileSync } = require("node:fs");
+      writeFileSync("/tmp/opencode-last-request.json", typeof init.body === "string" ? init.body : JSON.stringify(init.body));
+      const hdrs: Record<string, string> = {};
+      init.headers.forEach((v: string, k: string) => { hdrs[k] = k === "authorization" ? "Bearer ***" : v; });
+      writeFileSync("/tmp/opencode-last-headers.json", JSON.stringify(hdrs, null, 2));
+      console.error("[bun-fetch] Dumped request to /tmp/opencode-last-request.json");
+    } catch { /* ignore */ }
+  }
 
   const headers = new Headers(init.headers);
   headers.set("x-proxy-url", url);

package/src/headers/billing.ts

@@ -9,21 +9,33 @@ export function buildAnthropicBillingHeader(claudeCliVersion: string, messages:
   // the CLI version, then taking the first 3 hex chars of that combined string.
   let versionSuffix = "";
   if (Array.isArray(messages)) {
+    // Find first user message (CC uses first non-meta user turn)
     const firstUserMsg = messages.find(
       (m) =>
         m !== null &&
         typeof m === "object" &&
-        (m as Record<string, unknown>).role === "user" &&
-        typeof (m as Record<string, unknown>).content === "string",
+        (m as Record<string, unknown>).role === "user",
     ) as Record<string, unknown> | undefined;
     if (firstUserMsg) {
-      const text = firstUserMsg.content as string;
-      const salt = "59cf53e54c78";
-      const picked = [4, 7, 20].map((i) => (i < text.length ? text[i] : "0")).join("");
-      const hash = createHash("sha256")
-        .update(salt + picked + claudeCliVersion)
-        .digest("hex");
-      versionSuffix = `.${hash.slice(0, 3)}`;
+      // Extract text from string or content-block array
+      let text = "";
+      const content = firstUserMsg.content;
+      if (typeof content === "string") {
+        text = content;
+      } else if (Array.isArray(content)) {
+        const textBlock = (content as Array<Record<string, unknown>>).find((b) => b.type === "text");
+        if (textBlock && typeof textBlock.text === "string") {
+          text = textBlock.text;
+        }
+      }
+      if (text) {
+        const salt = "59cf53e54c78";
+        const picked = [4, 7, 20].map((i) => (i < text.length ? text[i] : "0")).join("");
+        const hash = createHash("sha256")
+          .update(salt + picked + claudeCliVersion)
+          .digest("hex");
+        versionSuffix = `.${hash.slice(0, 3)}`;
+      }
     }
   }