@vacbo/opencode-anthropic-fix 0.1.7 → 0.1.9

package/src/system-prompt/builder.ts

@@ -34,9 +34,9 @@
 // ===========================================================================
 
 import {
-  CLAUDE_CODE_IDENTITY_STRING,
-  COMPACT_TITLE_GENERATOR_SYSTEM_PROMPT,
-  KNOWN_IDENTITY_STRINGS,
+    CLAUDE_CODE_IDENTITY_STRING,
+    COMPACT_TITLE_GENERATOR_SYSTEM_PROMPT,
+    KNOWN_IDENTITY_STRINGS,
 } from "../constants.js";
 import { buildAnthropicBillingHeader } from "../headers/billing.js";
 import type { SignatureConfig, SystemBlock } from "../types.js";
@@ -44,47 +44,47 @@ import { dedupeSystemBlocks, isTitleGeneratorSystemBlocks } from "./normalize.js
 import { compactSystemText, sanitizeSystemText } from "./sanitize.js";
 
 export function buildSystemPromptBlocks(
-  system: SystemBlock[],
-  signature: SignatureConfig,
-  messages: unknown[],
+    system: SystemBlock[],
+    signature: SignatureConfig,
+    messages: unknown[],
 ): SystemBlock[] {
-  const titleGeneratorRequest = isTitleGeneratorSystemBlocks(system);
+    const titleGeneratorRequest = isTitleGeneratorSystemBlocks(system);
 
-  let sanitized: SystemBlock[] = system.map((item) => ({
-    ...item,
-    text: compactSystemText(
-      sanitizeSystemText(item.text, signature.sanitizeSystemPrompt === true),
-      signature.promptCompactionMode,
-    ),
-  }));
+    let sanitized: SystemBlock[] = system.map((item) => ({
+        ...item,
+        text: compactSystemText(
+            sanitizeSystemText(item.text, signature.sanitizeSystemPrompt === true),
+            signature.promptCompactionMode,
+        ),
+    }));
 
-  if (titleGeneratorRequest) {
-    sanitized = [{ type: "text", text: COMPACT_TITLE_GENERATOR_SYSTEM_PROMPT }];
-  } else if (signature.promptCompactionMode !== "off") {
-    sanitized = dedupeSystemBlocks(sanitized);
-  }
+    if (titleGeneratorRequest) {
+        sanitized = [{ type: "text", text: COMPACT_TITLE_GENERATOR_SYSTEM_PROMPT }];
+    } else if (signature.promptCompactionMode !== "off") {
+        sanitized = dedupeSystemBlocks(sanitized);
+    }
 
-  if (!signature.enabled) {
-    return sanitized;
-  }
+    if (!signature.enabled) {
+        return sanitized;
+    }
 
-  const filtered = sanitized.filter(
-    (item) => !item.text.startsWith("x-anthropic-billing-header:") && !KNOWN_IDENTITY_STRINGS.has(item.text),
-  );
+    const filtered = sanitized.filter(
+        (item) => !item.text.startsWith("x-anthropic-billing-header:") && !KNOWN_IDENTITY_STRINGS.has(item.text),
+    );
 
-  const blocks: SystemBlock[] = [];
-  const billingHeader = buildAnthropicBillingHeader(signature.claudeCliVersion, messages);
-  if (billingHeader) {
-    blocks.push({ type: "text", text: billingHeader });
-  }
+    const blocks: SystemBlock[] = [];
+    const billingHeader = buildAnthropicBillingHeader(signature.claudeCliVersion, messages);
+    if (billingHeader) {
+        blocks.push({ type: "text", text: billingHeader });
+    }
 
-  // CC 2.1.98 sends only {"type":"ephemeral"} — no scope or ttl fields.
-  blocks.push({
-    type: "text",
-    text: CLAUDE_CODE_IDENTITY_STRING,
-    cache_control: { type: "ephemeral" },
-  });
-  blocks.push(...filtered);
+    // CC 2.1.98 sends only {"type":"ephemeral"} — no scope or ttl fields.
+    blocks.push({
+        type: "text",
+        text: CLAUDE_CODE_IDENTITY_STRING,
+        cache_control: { type: "ephemeral" },
+    });
+    blocks.push(...filtered);
 
-  return blocks;
+    return blocks;
 }

package/src/system-prompt/index.ts

@@ -1,9 +1,9 @@
 export { buildSystemPromptBlocks } from "./builder.js";
 export {
-  dedupeSystemBlocks,
-  isTitleGeneratorSystemBlocks,
-  isTitleGeneratorSystemText,
-  normalizeSystemTextBlocks,
-  normalizeSystemTextForComparison,
+    dedupeSystemBlocks,
+    isTitleGeneratorSystemBlocks,
+    isTitleGeneratorSystemText,
+    normalizeSystemTextBlocks,
+    normalizeSystemTextForComparison,
 } from "./normalize.js";
 export { compactSystemText, sanitizeSystemText } from "./sanitize.js";

package/src/system-prompt/normalize.ts

@@ -5,80 +5,80 @@
 import type { SystemBlock } from "../types.js";
 
 export function normalizeSystemTextForComparison(text: string): string {
-  return text
-    .replace(/\r\n/g, "\n")
-    .split("\n")
-    .map((line) => line.trim())
-    .join("\n")
-    .replace(/\n{3,}/g, "\n\n")
-    .trim();
+    return text
+        .replace(/\r\n/g, "\n")
+        .split("\n")
+        .map((line) => line.trim())
+        .join("\n")
+        .replace(/\n{3,}/g, "\n\n")
+        .trim();
 }
 
 export function dedupeSystemBlocks(system: SystemBlock[]): SystemBlock[] {
-  const exactSeen = new Set<string>();
-  const exactDeduped: SystemBlock[] = [];
-
-  for (const item of system) {
-    const normalized = normalizeSystemTextForComparison(item.text);
-    const key = `${item.type}:${normalized}`;
-    if (exactSeen.has(key)) continue;
-    exactSeen.add(key);
-    exactDeduped.push(item);
-  }
-
-  const normalizedBlocks = exactDeduped.map((item) => normalizeSystemTextForComparison(item.text));
-  return exactDeduped.filter((_, index) => {
-    const current = normalizedBlocks[index];
-    if (current.length < 80) return true;
-
-    for (let otherIndex = 0; otherIndex < normalizedBlocks.length; otherIndex += 1) {
-      if (otherIndex === index) continue;
-      const other = normalizedBlocks[otherIndex];
-      if (other.length <= current.length + 20) continue;
-      if (other.includes(current)) return false;
+    const exactSeen = new Set<string>();
+    const exactDeduped: SystemBlock[] = [];
+
+    for (const item of system) {
+        const normalized = normalizeSystemTextForComparison(item.text);
+        const key = `${item.type}:${normalized}`;
+        if (exactSeen.has(key)) continue;
+        exactSeen.add(key);
+        exactDeduped.push(item);
     }
 
-    return true;
-  });
+    const normalizedBlocks = exactDeduped.map((item) => normalizeSystemTextForComparison(item.text));
+    return exactDeduped.filter((_, index) => {
+        const current = normalizedBlocks[index];
+        if (current.length < 80) return true;
+
+        for (let otherIndex = 0; otherIndex < normalizedBlocks.length; otherIndex += 1) {
+            if (otherIndex === index) continue;
+            const other = normalizedBlocks[otherIndex];
+            if (other.length <= current.length + 20) continue;
+            if (other.includes(current)) return false;
+        }
+
+        return true;
+    });
 }
 
 export function isTitleGeneratorSystemText(text: string): boolean {
-  const normalized = text.trim().toLowerCase();
-  return normalized.includes("you are a title generator") || normalized.includes("generate a brief title");
+    const normalized = text.trim().toLowerCase();
+    return normalized.includes("you are a title generator") || normalized.includes("generate a brief title");
 }
 
 export function isTitleGeneratorSystemBlocks(system: SystemBlock[]): boolean {
-  return system.some(
-    (item) => item.type === "text" && typeof item.text === "string" && isTitleGeneratorSystemText(item.text),
-  );
+    return system.some(
+        (item) => item.type === "text" && typeof item.text === "string" && isTitleGeneratorSystemText(item.text),
+    );
 }
 
 export function normalizeSystemTextBlocks(system: unknown[] | undefined): SystemBlock[] {
-  const output: SystemBlock[] = [];
-  if (!Array.isArray(system)) return output;
-
-  for (const item of system) {
-    if (typeof item === "string") {
-      output.push({ type: "text", text: item });
-      continue;
+    const output: SystemBlock[] = [];
+    if (!Array.isArray(system)) return output;
+
+    for (const item of system) {
+        if (typeof item === "string") {
+            output.push({ type: "text", text: item });
+            continue;
+        }
+
+        if (!item || typeof item !== "object") continue;
+        const obj = item as Record<string, unknown>;
+        if (typeof obj.text !== "string") continue;
+
+        const normalized: SystemBlock = {
+            type: typeof obj.type === "string" ? obj.type : "text",
+            text: obj.text,
+        };
+
+        // Intentionally strip cache_control from incoming system blocks.
+        // The plugin controls cache placement: only the identity block gets
+        // cache_control (added in buildSystemPromptBlocks). Passing through
+        // upstream markers causes "maximum of 4 blocks with cache_control" errors.
+
+        output.push(normalized);
     }
 
-    if (!item || typeof item !== "object") continue;
-    const obj = item as Record<string, unknown>;
-    if (typeof obj.text !== "string") continue;
-
-    const normalized: SystemBlock = {
-      type: typeof obj.type === "string" ? obj.type : "text",
-      text: obj.text,
-    };
-
-    // Intentionally strip cache_control from incoming system blocks.
-    // The plugin controls cache placement: only the identity block gets
-    // cache_control (added in buildSystemPromptBlocks). Passing through
-    // upstream markers causes "maximum of 4 blocks with cache_control" errors.
-
-    output.push(normalized);
-  }
-
-  return output;
+    return output;
 }

package/src/system-prompt/sanitize.ts

@@ -17,41 +17,41 @@ import type { PromptCompactionMode } from "../types.js";
  * `opencode-anthropic-fix` or `/path/to/opencode/dist`.
  */
 export function sanitizeSystemText(text: string, enabled = false): string {
-  if (!enabled) return text;
-  return text
-    .replace(/(?<![\w\-/])OpenCode(?![\w\-/])/g, "Claude Code")
-    .replace(/(?<![\w\-/])opencode(?![\w\-/])/gi, "Claude")
-    .replace(/OhMyClaude\s*Code/gi, "Claude Code")
-    .replace(/OhMyClaudeCode/gi, "Claude Code")
-    .replace(/(?<![\w\-/])Sisyphus(?![\w\-/])/g, "Claude Code Agent")
-    .replace(/(?<![\w\-/])Morph\s+plugin(?![\w\-/])/gi, "edit plugin")
-    .replace(/(?<![\w\-/])morph_edit(?![\w\-/])/g, "edit")
-    .replace(/(?<![\w\-/])morph_/g, "")
-    .replace(/(?<![\w\-/])OhMyClaude(?![\w\-/])/gi, "Claude");
+    if (!enabled) return text;
+    return text
+        .replace(/(?<![\w\-/])OpenCode(?![\w\-/])/g, "Claude Code")
+        .replace(/(?<![\w\-/])opencode(?![\w\-/])/gi, "Claude")
+        .replace(/OhMyClaude\s*Code/gi, "Claude Code")
+        .replace(/OhMyClaudeCode/gi, "Claude Code")
+        .replace(/(?<![\w\-/])Sisyphus(?![\w\-/])/g, "Claude Code Agent")
+        .replace(/(?<![\w\-/])Morph\s+plugin(?![\w\-/])/gi, "edit plugin")
+        .replace(/(?<![\w\-/])morph_edit(?![\w\-/])/g, "edit")
+        .replace(/(?<![\w\-/])morph_/g, "")
+        .replace(/(?<![\w\-/])OhMyClaude(?![\w\-/])/gi, "Claude");
 }
 
 export function compactSystemText(text: string, mode: PromptCompactionMode): string {
-  const withoutDuplicateIdentityPrefix = text.startsWith(`${CLAUDE_CODE_IDENTITY_STRING}\n`)
-    ? text.slice(CLAUDE_CODE_IDENTITY_STRING.length).trimStart()
-    : text;
+    const withoutDuplicateIdentityPrefix = text.startsWith(`${CLAUDE_CODE_IDENTITY_STRING}\n`)
+        ? text.slice(CLAUDE_CODE_IDENTITY_STRING.length).trimStart()
+        : text;
 
-  if (mode === "off") {
-    return withoutDuplicateIdentityPrefix.trim();
-  }
+    if (mode === "off") {
+        return withoutDuplicateIdentityPrefix.trim();
+    }
 
-  const compacted = withoutDuplicateIdentityPrefix.replace(/<example>[\s\S]*?<\/example>/gi, "\n");
+    const compacted = withoutDuplicateIdentityPrefix.replace(/<example>[\s\S]*?<\/example>/gi, "\n");
 
-  const dedupedLines: string[] = [];
-  let prevNormalized = "";
-  for (const line of compacted.split("\n")) {
-    const normalized = line.trim();
-    if (normalized && normalized === prevNormalized) continue;
-    dedupedLines.push(line);
-    prevNormalized = normalized;
-  }
+    const dedupedLines: string[] = [];
+    let prevNormalized = "";
+    for (const line of compacted.split("\n")) {
+        const normalized = line.trim();
+        if (normalized && normalized === prevNormalized) continue;
+        dedupedLines.push(line);
+        prevNormalized = normalized;
+    }
 
-  return dedupedLines
-    .join("\n")
-    .replace(/\n{3,}/g, "\n\n")
-    .trim();
+    return dedupedLines
+        .join("\n")
+        .replace(/\n{3,}/g, "\n\n")
+        .trim();
 }

package/src/thinking.ts

@@ -10,16 +10,16 @@ import type { ThinkingEffort } from "./types.ts";
  * Used when an Opus 4.6 request arrives with the legacy budgetTokens shape.
  */
 export function budgetTokensToEffort(budgetTokens: number): ThinkingEffort {
-  if (budgetTokens <= 1024) return "low";
-  if (budgetTokens <= 8000) return "medium";
-  return "high";
+    if (budgetTokens <= 1024) return "low";
+    if (budgetTokens <= 8000) return "medium";
+    return "high";
 }
 
 /**
  * Validate that a given value is a valid ThinkingEffort string.
  */
 export function isValidEffort(value: unknown): value is ThinkingEffort {
-  return value === "low" || value === "medium" || value === "high";
+    return value === "low" || value === "medium" || value === "high";
 }
 
 /**
@@ -33,25 +33,26 @@ export function isValidEffort(value: unknown): value is ThinkingEffort {
  *   3. Absent / disabled: no transform
  */
 export function normalizeThinkingBlock(thinking: unknown, model: string): unknown {
-  if (!thinking || typeof thinking !== "object" || (thinking as Record<string, unknown>).type !== "enabled") {
-    return thinking;
-  }
+    if (!thinking || typeof thinking !== "object" || (thinking as Record<string, unknown>).type !== "enabled") {
+        return thinking;
+    }
 
-  if (!isAdaptiveThinkingModel(model)) {
-    // Older models: pass through unchanged (may have budget_tokens)
-    return thinking;
-  }
+    if (!isAdaptiveThinkingModel(model)) {
+        // Older models: pass through unchanged (may have budget_tokens)
+        return thinking;
+    }
 
-  const t = thinking as Record<string, unknown>;
+    const t = thinking as Record<string, unknown>;
 
-  // Adaptive thinking models: use adaptive thinking with effort
-  if (isValidEffort(t.effort)) {
-    // Already in adaptive shape — just strip any legacy budget_tokens field
-    const { budget_tokens: _dropped, ...rest } = t;
-    return rest;
-  }
+    // Adaptive thinking models: use adaptive thinking with effort
+    if (isValidEffort(t.effort)) {
+        // Already in adaptive shape — just strip any legacy budget_tokens field
+        const { budget_tokens: _dropped, ...rest } = t;
+        return rest;
+    }
 
-  const effort: ThinkingEffort = typeof t.budget_tokens === "number" ? budgetTokensToEffort(t.budget_tokens) : "medium"; // v2.1.68 default
+    const effort: ThinkingEffort =
+        typeof t.budget_tokens === "number" ? budgetTokensToEffort(t.budget_tokens) : "medium"; // v2.1.68 default
 
-  return { type: "enabled", effort };
+    return { type: "enabled", effort };
 }