@vacbo/opencode-anthropic-fix 0.1.7 → 0.1.9

package/src/constants.ts

@@ -14,58 +14,58 @@ export const TOKEN_COUNTING_BETA_FLAG = "token-counting-2024-11-01";
 export const CLAUDE_CODE_IDENTITY_STRING = "You are Claude Code, Anthropic's official CLI for Claude.";
 
 export const KNOWN_IDENTITY_STRINGS = new Set([
-  CLAUDE_CODE_IDENTITY_STRING,
-  "You are Claude Code, Anthropic's official CLI for Claude, running within the Claude Agent SDK.",
-  "You are a Claude agent, built on Anthropic's Claude Agent SDK.",
+    CLAUDE_CODE_IDENTITY_STRING,
+    "You are Claude Code, Anthropic's official CLI for Claude, running within the Claude Agent SDK.",
+    "You are a Claude agent, built on Anthropic's Claude Agent SDK.",
 ]);
 
 export const BEDROCK_UNSUPPORTED_BETAS = new Set([
-  "interleaved-thinking-2025-05-14",
-  "context-1m-2025-08-07",
-  "tool-search-tool-2025-10-19",
+    "interleaved-thinking-2025-05-14",
+    "context-1m-2025-08-07",
+    "tool-search-tool-2025-10-19",
 ]);
 
 export const EXPERIMENTAL_BETA_FLAGS = new Set([
-  "adaptive-thinking-2026-01-28",
-  "advanced-tool-use-2025-11-20",
-  "advisor-tool-2026-03-01",
-  "afk-mode-2026-01-31",
-  "ccr-byoc-2025-07-29",
-  "ccr-triggers-2026-01-30",
-  "code-execution-2025-08-25",
-  "context-1m-2025-08-07",
-  "context-management-2025-06-27",
-  "environments-2025-11-01",
-  "fast-mode-2026-02-01",
-  "files-api-2025-04-14",
-  "fine-grained-tool-streaming-2025-05-14",
-  "interleaved-thinking-2025-05-14",
-  "mcp-client-2025-11-20",
-  "prompt-caching-scope-2026-01-05",
-  "redact-thinking-2026-02-12",
-  "skills-2025-10-02",
-  "structured-outputs-2025-12-15",
-  "task-budgets-2026-03-13",
-  "token-efficient-tools-2026-03-28",
-  "tool-search-tool-2025-10-19",
-  "web-search-2025-03-05",
+    "adaptive-thinking-2026-01-28",
+    "advanced-tool-use-2025-11-20",
+    "advisor-tool-2026-03-01",
+    "afk-mode-2026-01-31",
+    "ccr-byoc-2025-07-29",
+    "ccr-triggers-2026-01-30",
+    "code-execution-2025-08-25",
+    "context-1m-2025-08-07",
+    "context-management-2025-06-27",
+    "environments-2025-11-01",
+    "fast-mode-2026-02-01",
+    "files-api-2025-04-14",
+    "fine-grained-tool-streaming-2025-05-14",
+    "interleaved-thinking-2025-05-14",
+    "mcp-client-2025-11-20",
+    "prompt-caching-scope-2026-01-05",
+    "redact-thinking-2026-02-12",
+    "skills-2025-10-02",
+    "structured-outputs-2025-12-15",
+    "task-budgets-2026-03-13",
+    "token-efficient-tools-2026-03-28",
+    "tool-search-tool-2025-10-19",
+    "web-search-2025-03-05",
 ]);
 
 export const BETA_SHORTCUTS = new Map<string, string>([
-  ["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"],
+    ["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"],
 ]);
 
 export const STAINLESS_HELPER_KEYS = [
-  "x_stainless_helper",
-  "x-stainless-helper",
-  "stainless_helper",
-  "stainlessHelper",
-  "_stainless_helper",
+    "x_stainless_helper",
+    "x-stainless-helper",
+    "stainless_helper",
+    "stainlessHelper",
+    "_stainless_helper",
 ] as const;
 
 export const USER_ID_STORAGE_FILE = "anthropic-signature-user-id";
@@ -75,12 +75,12 @@ export const PENDING_OAUTH_TTL_MS = 10 * 60 * 1000;
 export const FOREGROUND_EXPIRY_BUFFER_MS = 5 * 60 * 1000; // 5 minutes
 
 export const COMPACT_TITLE_GENERATOR_SYSTEM_PROMPT = [
-  "You are a title generator. You output ONLY a thread title. Nothing else.",
-  "",
-  "Rules:",
-  "- Use the same language as the user message.",
-  "- Output exactly one line.",
-  "- Keep the title at or below 50 characters.",
-  "- No explanations, prefixes, or suffixes.",
-  "- Keep important technical terms, numbers, and filenames when present.",
+    "You are a title generator. You output ONLY a thread title. Nothing else.",
+    "",
+    "Rules:",
+    "- Use the same language as the user message.",
+    "- Output exactly one line.",
+    "- Keep the title at or below 50 characters.",
+    "- No explanations, prefixes, or suffixes.",
+    "- Keep important technical terms, numbers, and filenames when present.",
 ].join("\n");

package/src/drift/cch-constants.ts

@@ -3,131 +3,131 @@ export const EXPECTED_CCH_SALT = "59cf53e54c78";
 export const EXPECTED_CCH_SEED = 0x6e52_736a_c806_831en;
 
 export const EXPECTED_XXHASH64_PRIMES = [
-  0x9e37_79b1_85eb_ca87n,
-  0xc2b2_ae3d_27d4_eb4fn,
-  0x1656_67b1_9e37_79f9n,
-  0x85eb_ca77_c2b2_ae63n,
-  0x27d4_eb2f_1656_67c5n,
+    0x9e37_79b1_85eb_ca87n,
+    0xc2b2_ae3d_27d4_eb4fn,
+    0x1656_67b1_9e37_79f9n,
+    0x85eb_ca77_c2b2_ae63n,
+    0x27d4_eb2f_1656_67c5n,
 ] as const;
 
 export type DriftSeverity = "critical" | "warning";
 
 export interface DriftFinding {
-  name: string;
-  severity: DriftSeverity;
-  expected: string;
-  actual: string;
-  count: number;
+    name: string;
+    severity: DriftSeverity;
+    expected: string;
+    actual: string;
+    count: number;
 }
 
 export interface DriftScanReport {
-  target: string;
-  mode: "standalone" | "bundle";
-  findings: DriftFinding[];
-  checked: {
-    placeholder: number;
-    salt: number;
-    seed: number;
-    primes: number[];
-  };
-  passed: boolean;
+    target: string;
+    mode: "standalone" | "bundle";
+    findings: DriftFinding[];
+    checked: {
+        placeholder: number;
+        salt: number;
+        seed: number;
+        primes: number[];
+    };
+    passed: boolean;
 }
 
 function encodeAscii(value: string): Uint8Array {
-  return new TextEncoder().encode(value);
+    return new TextEncoder().encode(value);
 }
 
 export function bigintToLittleEndianBytes(value: bigint): Uint8Array {
-  const bytes = new Uint8Array(8);
-  let remaining = value;
-  for (let index = 0; index < bytes.length; index += 1) {
-    bytes[index] = Number(remaining & 0xffn);
-    remaining >>= 8n;
-  }
-  return bytes;
+    const bytes = new Uint8Array(8);
+    let remaining = value;
+    for (let index = 0; index < bytes.length; index += 1) {
+        bytes[index] = Number(remaining & 0xffn);
+        remaining >>= 8n;
+    }
+    return bytes;
 }
 
 export function findAllOccurrences(haystack: Uint8Array, needle: Uint8Array): number[] {
-  if (needle.length === 0 || haystack.length < needle.length) {
-    return [];
-  }
+    if (needle.length === 0 || haystack.length < needle.length) {
+        return [];
+    }
 
-  const matches: number[] = [];
-  outer: for (let start = 0; start <= haystack.length - needle.length; start += 1) {
-    for (let offset = 0; offset < needle.length; offset += 1) {
-      if (haystack[start + offset] !== needle[offset]) {
-        continue outer;
-      }
+    const matches: number[] = [];
+    outer: for (let start = 0; start <= haystack.length - needle.length; start += 1) {
+        for (let offset = 0; offset < needle.length; offset += 1) {
+            if (haystack[start + offset] !== needle[offset]) {
+                continue outer;
+            }
+        }
+        matches.push(start);
     }
-    matches.push(start);
-  }
-  return matches;
+    return matches;
 }
 
 function addFinding(
-  findings: DriftFinding[],
-  count: number,
-  name: string,
-  severity: DriftSeverity,
-  expected: string,
-  actual: string,
+    findings: DriftFinding[],
+    count: number,
+    name: string,
+    severity: DriftSeverity,
+    expected: string,
+    actual: string,
 ): void {
-  if (count > 0) {
-    return;
-  }
-  findings.push({ name, severity, expected, actual, count });
+    if (count > 0) {
+        return;
+    }
+    findings.push({ name, severity, expected, actual, count });
 }
 
 export function scanCchConstants(bytes: Uint8Array, target: string, mode: "standalone" | "bundle"): DriftScanReport {
-  const placeholderMatches = findAllOccurrences(bytes, encodeAscii(`cch=${EXPECTED_CCH_PLACEHOLDER}`));
-  const saltMatches = findAllOccurrences(bytes, encodeAscii(EXPECTED_CCH_SALT));
-  const seedMatches = findAllOccurrences(bytes, bigintToLittleEndianBytes(EXPECTED_CCH_SEED));
-  const primeMatches = EXPECTED_XXHASH64_PRIMES.map(
-    (prime) => findAllOccurrences(bytes, bigintToLittleEndianBytes(prime)).length,
-  );
-
-  const findings: DriftFinding[] = [];
-  addFinding(
-    findings,
-    placeholderMatches.length,
-    "cch placeholder",
-    "critical",
-    `cch=${EXPECTED_CCH_PLACEHOLDER}`,
-    "not found",
-  );
-  addFinding(findings, saltMatches.length, "cc_version salt", "critical", EXPECTED_CCH_SALT, "not found");
+    const placeholderMatches = findAllOccurrences(bytes, encodeAscii(`cch=${EXPECTED_CCH_PLACEHOLDER}`));
+    const saltMatches = findAllOccurrences(bytes, encodeAscii(EXPECTED_CCH_SALT));
+    const seedMatches = findAllOccurrences(bytes, bigintToLittleEndianBytes(EXPECTED_CCH_SEED));
+    const primeMatches = EXPECTED_XXHASH64_PRIMES.map(
+        (prime) => findAllOccurrences(bytes, bigintToLittleEndianBytes(prime)).length,
+    );
 
-  if (mode === "standalone") {
+    const findings: DriftFinding[] = [];
     addFinding(
-      findings,
-      seedMatches.length,
-      "native cch seed",
-      "critical",
-      `0x${EXPECTED_CCH_SEED.toString(16)}`,
-      "not found",
-    );
-    for (const [index, count] of primeMatches.entries()) {
-      addFinding(
         findings,
-        count,
-        `xxHash64 prime ${index + 1}`,
-        "warning",
-        `0x${EXPECTED_XXHASH64_PRIMES[index].toString(16)}`,
+        placeholderMatches.length,
+        "cch placeholder",
+        "critical",
+        `cch=${EXPECTED_CCH_PLACEHOLDER}`,
         "not found",
-      );
+    );
+    addFinding(findings, saltMatches.length, "cc_version salt", "critical", EXPECTED_CCH_SALT, "not found");
+
+    if (mode === "standalone") {
+        addFinding(
+            findings,
+            seedMatches.length,
+            "native cch seed",
+            "critical",
+            `0x${EXPECTED_CCH_SEED.toString(16)}`,
+            "not found",
+        );
+        for (const [index, count] of primeMatches.entries()) {
+            addFinding(
+                findings,
+                count,
+                `xxHash64 prime ${index + 1}`,
+                "warning",
+                `0x${EXPECTED_XXHASH64_PRIMES[index].toString(16)}`,
+                "not found",
+            );
+        }
     }
-  }
 
-  return {
-    target,
-    mode,
-    findings,
-    checked: {
-      placeholder: placeholderMatches.length,
-      salt: saltMatches.length,
-      seed: seedMatches.length,
-      primes: primeMatches,
-    },
-    passed: findings.length === 0,
-  };
+    return {
+        target,
+        mode,
+        findings,
+        checked: {
+            placeholder: placeholderMatches.length,
+            salt: saltMatches.length,
+            seed: seedMatches.length,
+            primes: primeMatches,
+        },
+        passed: findings.length === 0,
+    };
 }

package/src/env.ts

@@ -9,138 +9,144 @@ import { getConfigDir } from "./config.js";
 import { BETA_SHORTCUTS, DEBUG_SYSTEM_PROMPT_ENV, USER_ID_STORAGE_FILE } from "./constants.ts";
 
 export function isTruthyEnv(value: string | undefined): boolean {
-  if (!value) return false;
-  const normalized = value.trim().toLowerCase();
-  return normalized === "1" || normalized === "true" || normalized === "yes";
+    if (!value) return false;
+    const normalized = value.trim().toLowerCase();
+    return normalized === "1" || normalized === "true" || normalized === "yes";
 }
 
 export function isFalsyEnv(value: string | undefined): boolean {
-  if (!value) return false;
-  const normalized = value.trim().toLowerCase();
-  return normalized === "0" || normalized === "false" || normalized === "no";
+    if (!value) return false;
+    const normalized = value.trim().toLowerCase();
+    return normalized === "0" || normalized === "false" || normalized === "no";
 }
 
 export function isNonInteractiveMode(): boolean {
-  if (isTruthyEnv(process.env.CI)) return true;
-  return !process.stdout.isTTY;
+    if (isTruthyEnv(process.env.CI)) return true;
+    return !process.stdout.isTTY;
 }
 
 export function getClaudeEntrypoint(): string {
-  return process.env.CLAUDE_CODE_ENTRYPOINT || "cli";
+    return process.env.CLAUDE_CODE_ENTRYPOINT || "cli";
 }
 
 export function resolveBetaShortcut(value: string | undefined): string {
-  if (!value) return "";
-  const trimmed = value.trim();
-  const mapped = BETA_SHORTCUTS.get(trimmed.toLowerCase());
-  return mapped || trimmed;
+    if (!value) return "";
+    const trimmed = value.trim();
+    const mapped = BETA_SHORTCUTS.get(trimmed.toLowerCase());
+    return mapped || trimmed;
 }
 
 export function parseAnthropicCustomHeaders(): Record<string, string> {
-  const raw = process.env.ANTHROPIC_CUSTOM_HEADERS;
-  if (!raw) return {};
-
-  const headers: Record<string, string> = {};
-  for (const line of raw.split(/\r?\n/)) {
-    const trimmed = line.trim();
-    if (!trimmed) continue;
-    const sep = trimmed.indexOf(":");
-    if (sep <= 0) continue;
-    const key = trimmed.slice(0, sep).trim();
-    const value = trimmed.slice(sep + 1).trim();
-    if (!key || !value) continue;
-    headers[key] = value;
-  }
-
-  return headers;
+    const raw = process.env.ANTHROPIC_CUSTOM_HEADERS;
+    if (!raw) return {};
+
+    const headers: Record<string, string> = {};
+    for (const line of raw.split(/\r?\n/)) {
+        const trimmed = line.trim();
+        if (!trimmed) continue;
+        const sep = trimmed.indexOf(":");
+        if (sep <= 0) continue;
+        const key = trimmed.slice(0, sep).trim();
+        const value = trimmed.slice(sep + 1).trim();
+        if (!key || !value) continue;
+        headers[key] = value;
+    }
+
+    return headers;
 }
 
 export function getOrCreateSignatureUserId(): string {
-  const envUserId = process.env.OPENCODE_ANTHROPIC_SIGNATURE_USER_ID?.trim();
-  if (envUserId) return envUserId;
-
-  const configDir = getConfigDir();
-  const userIdPath = join(configDir, USER_ID_STORAGE_FILE);
-
-  try {
-    if (existsSync(userIdPath)) {
-      const existing = readFileSync(userIdPath, "utf-8").trim();
-      // CC uses 64-char hex (32 random bytes). Accept existing hex IDs;
-      // regenerate if we find an old UUID-format ID.
-      if (existing && /^[0-9a-f]{64}$/.test(existing)) return existing;
+    const envUserId = process.env.OPENCODE_ANTHROPIC_SIGNATURE_USER_ID?.trim();
+    if (envUserId) return envUserId;
+
+    const configDir = getConfigDir();
+    const userIdPath = join(configDir, USER_ID_STORAGE_FILE);
+
+    try {
+        if (existsSync(userIdPath)) {
+            const existing = readFileSync(userIdPath, "utf-8").trim();
+            // CC uses 64-char hex (32 random bytes). Accept existing hex IDs;
+            // regenerate if we find an old UUID-format ID.
+            if (existing && /^[0-9a-f]{64}$/.test(existing)) return existing;
+        }
+    } catch {
+        // fall through and generate a new id
+    }
+
+    // CC generates device_id as randomBytes(32).toString("hex") → 64-char hex
+    const generated = randomBytes(32).toString("hex");
+    try {
+        mkdirSync(configDir, { recursive: true });
+        writeFileSync(userIdPath, `${generated}\n`, {
+            encoding: "utf-8",
+            mode: 0o600,
+        });
+    } catch {
+        // Ignore filesystem errors; caller still gets generated ID for this runtime.
     }
-  } catch {
-    // fall through and generate a new id
-  }
-
-  // CC generates device_id as randomBytes(32).toString("hex") → 64-char hex
-  const generated = randomBytes(32).toString("hex");
-  try {
-    mkdirSync(configDir, { recursive: true });
-    writeFileSync(userIdPath, `${generated}\n`, {
-      encoding: "utf-8",
-      mode: 0o600,
-    });
-  } catch {
-    // Ignore filesystem errors; caller still gets generated ID for this runtime.
-  }
-  return generated;
+    return generated;
 }
 
 export function shouldDebugSystemPrompt(): boolean {
-  return isTruthyEnv(process.env[DEBUG_SYSTEM_PROMPT_ENV]);
+    return isTruthyEnv(process.env[DEBUG_SYSTEM_PROMPT_ENV]);
 }
 
 export function logTransformedSystemPrompt(body: string | undefined): void {
-  if (!shouldDebugSystemPrompt()) return;
-  if (!body || typeof body !== "string") return;
-
-  try {
-    const parsed = JSON.parse(body);
-    if (!Object.hasOwn(parsed, "system")) return;
-    // Avoid circular import: inline the title-check here
-    const isTitleGeneratorText = (text: unknown): boolean => {
-      if (typeof text !== "string") return false;
-      const lowered = text.trim().toLowerCase();
-      return lowered.includes("you are a title generator") || lowered.includes("generate a brief title");
-    };
-
-    const system = parsed.system;
-    if (
-      Array.isArray(system) &&
-      system.some((item: { type?: string; text?: string }) => item.type === "text" && isTitleGeneratorText(item.text))
-    ) {
-      return;
-    }
-
-    // The plugin relocates non-CC system blocks into the first user message
-    // wrapped in <system-instructions>. Check there too so title-generator
-    // requests are still suppressed from the debug log after the relocation
-    // pass runs.
-    const messages = parsed.messages;
-    if (Array.isArray(messages) && messages.length > 0) {
-      const firstMsg = messages[0];
-      if (firstMsg && firstMsg.role === "user") {
-        const content = firstMsg.content;
-        if (typeof content === "string" && isTitleGeneratorText(content)) {
-          return;
+    if (!shouldDebugSystemPrompt()) return;
+    if (!body || typeof body !== "string") return;
+
+    try {
+        const parsed = JSON.parse(body);
+        if (!Object.hasOwn(parsed, "system")) return;
+        // Avoid circular import: inline the title-check here
+        const isTitleGeneratorText = (text: unknown): boolean => {
+            if (typeof text !== "string") return false;
+            const lowered = text.trim().toLowerCase();
+            return lowered.includes("you are a title generator") || lowered.includes("generate a brief title");
+        };
+
+        const system = parsed.system;
+        if (
+            Array.isArray(system) &&
+            system.some(
+                (item: { type?: string; text?: string }) => item.type === "text" && isTitleGeneratorText(item.text),
+            )
+        ) {
+            return;
         }
-        if (Array.isArray(content)) {
-          for (const block of content) {
-            if (block && typeof block === "object" && isTitleGeneratorText((block as { text?: unknown }).text)) {
-              return;
+
+        // The plugin relocates non-CC system blocks into the first user message
+        // wrapped in <system-instructions>. Check there too so title-generator
+        // requests are still suppressed from the debug log after the relocation
+        // pass runs.
+        const messages = parsed.messages;
+        if (Array.isArray(messages) && messages.length > 0) {
+            const firstMsg = messages[0];
+            if (firstMsg && firstMsg.role === "user") {
+                const content = firstMsg.content;
+                if (typeof content === "string" && isTitleGeneratorText(content)) {
+                    return;
+                }
+                if (Array.isArray(content)) {
+                    for (const block of content) {
+                        if (
+                            block &&
+                            typeof block === "object" &&
+                            isTitleGeneratorText((block as { text?: unknown }).text)
+                        ) {
+                            return;
+                        }
+                    }
+                }
             }
-          }
         }
-      }
-    }
 
-    // eslint-disable-next-line no-console -- explicit debug logger gated by OPENCODE_ANTHROPIC_DEBUG_SYSTEM_PROMPT
-    console.error(
-      "[opencode-anthropic-auth][system-debug] transformed system:",
-      JSON.stringify(parsed.system, null, 2),
-    );
-  } catch {
-    // Ignore parse errors in debug logging path.
-  }
+        // eslint-disable-next-line no-console -- explicit debug logger gated by OPENCODE_ANTHROPIC_DEBUG_SYSTEM_PROMPT
+        console.error(
+            "[opencode-anthropic-auth][system-debug] transformed system:",
+            JSON.stringify(parsed.system, null, 2),
+        );
+    } catch {
+        // Ignore parse errors in debug logging path.
+    }
 }