@sahiljassal/opencode-anthropic-auth 2.0.0 → 2.1.0

package/README.md

@@ -36,9 +36,9 @@ This reduces token usage and latency on repeated requests by reusing cached prom
 
 ## Configuration
 
-| Variable | Description |
-|---|---|
-| `ANTHROPIC_BASE_URL` | Override API endpoint URL (e.g. for proxying). Must be a valid HTTP(S) URL. |
+| Variable             | Description                                                                              |
+| -------------------- | ---------------------------------------------------------------------------------------- |
+| `ANTHROPIC_BASE_URL` | Override API endpoint URL (e.g. for proxying). Must be a valid HTTP(S) URL.              |
 | `ANTHROPIC_INSECURE` | Set to `1` or `true` to skip TLS verification. Only effective with `ANTHROPIC_BASE_URL`. |
 
 ## License

package/dist/constants.d.ts

@@ -7,6 +7,13 @@ export declare const CODE_CALLBACK_URL = "https://platform.claude.com/oauth/code
 export declare const TOKEN_URL = "https://platform.claude.com/v1/oauth/token";
 export declare const OAUTH_SCOPES: string[];
 export declare const TOOL_PREFIX = "mcp_";
+/**
+ * Anthropic's sliding-window lookback for cache breakpoints.
+ * If the distance (in content blocks) between the previous user-role
+ * message anchor and the latest one exceeds this threshold, a bridge
+ * anchor is needed so the earlier slots are still within the window.
+ */
+export declare const ANTHROPIC_CACHE_LOOKBACK_BLOCKS = 20;
 export declare const REQUIRED_BETAS: string[];
 export declare const OPENCODE_IDENTITY_PREFIX = "You are OpenCode";
 export declare const CLAUDE_CODE_IDENTITY = "You are a Claude agent, built on Anthropic's Claude Agent SDK.";

package/dist/constants.js

@@ -14,6 +14,13 @@ export const OAUTH_SCOPES = [
     'user:file_upload',
 ];
 export const TOOL_PREFIX = 'mcp_';
+/**
+ * Anthropic's sliding-window lookback for cache breakpoints.
+ * If the distance (in content blocks) between the previous user-role
+ * message anchor and the latest one exceeds this threshold, a bridge
+ * anchor is needed so the earlier slots are still within the window.
+ */
+export const ANTHROPIC_CACHE_LOOKBACK_BLOCKS = 20;
 export const REQUIRED_BETAS = [
     'oauth-2025-04-20',
     'interleaved-thinking-2025-05-14',

package/dist/transform.js

@@ -1,4 +1,4 @@
-import { CLAUDE_CODE_IDENTITY, OPENCODE_IDENTITY_PREFIX, PARAGRAPH_REMOVAL_ANCHORS, REQUIRED_BETAS, TEXT_REPLACEMENTS, TOOL_PREFIX, USER_AGENT, } from "./constants.js";
+import { ANTHROPIC_CACHE_LOOKBACK_BLOCKS, CLAUDE_CODE_IDENTITY, OPENCODE_IDENTITY_PREFIX, PARAGRAPH_REMOVAL_ANCHORS, REQUIRED_BETAS, TEXT_REPLACEMENTS, TOOL_PREFIX, USER_AGENT, } from "./constants.js";
 /**
  * Prefix a tool name with TOOL_PREFIX and uppercase the first character.
  * Claude Code uses PascalCase tool names (e.g. mcp_Bash, mcp_Read);
@@ -217,6 +217,9 @@ function isRecord(value) {
     return value != null && typeof value === 'object' && !Array.isArray(value);
 }
 const CACHE_1H = { type: 'ephemeral', ttl: '1h' };
+// ---------------------------------------------------------------------------
+// Cache control primitives
+// ---------------------------------------------------------------------------
 function removeCacheControl(value) {
     if (!isRecord(value))
         return;
@@ -245,36 +248,199 @@ function setWireCacheControl(value) {
     value.cache_control = { ...CACHE_1H };
     return true;
 }
-function setMessageCacheAnchor(message) {
+// ---------------------------------------------------------------------------
+// Content-block helpers
+// ---------------------------------------------------------------------------
+/**
+ * Returns true for content block types that accept cache_control.
+ * Anthropic rejects cache_control on thinking / redacted_thinking blocks.
+ */
+function isCacheableContentBlock(block) {
+    if (!isRecord(block))
+        return false;
+    return block.type !== 'thinking' && block.type !== 'redacted_thinking';
+}
+/**
+ * Normalises message content to an array of blocks, then filters to only
+ * cacheable types.  Returns undefined when there is nothing to anchor.
+ */
+function getCacheableContentBlocks(message) {
     if (!isRecord(message))
+        return undefined;
+    let blocks;
+    if (Array.isArray(message.content)) {
+        blocks = message.content;
+    }
+    else if (typeof message.content === 'string') {
+        // Normalise inline string to block array in place so downstream sees array
+        const normalised = [{ type: 'text', text: message.content }];
+        message.content = normalised;
+        blocks = normalised;
+    }
+    else {
+        return undefined;
+    }
+    const cacheable = blocks.filter(isCacheableContentBlock);
+    return cacheable.length > 0 ? cacheable : undefined;
+}
+/**
+ * Total cacheable content-block count for a message (used for lookback math).
+ */
+function messageContentBlockCount(message) {
+    return getCacheableContentBlocks(message)?.length ?? 0;
+}
+// ---------------------------------------------------------------------------
+// Message-anchor setters
+// ---------------------------------------------------------------------------
+/**
+ * Anchor the last cacheable block of a message.
+ * Returns false (and sets nothing) when there are no cacheable blocks.
+ */
+function setMessageCacheAnchor(message) {
+    const blocks = getCacheableContentBlocks(message);
+    if (!blocks)
         return false;
-    const content = Array.isArray(message.content)
-        ? message.content
-        : typeof message.content === 'string'
-            ? [{ type: 'text', text: message.content }]
-            : null;
-    if (!content?.length)
-        return setWireCacheControl(message);
-    message.content = content;
-    const target = [...content]
-        .reverse()
-        .find((b) => isRecord(b) && b.type !== 'thinking');
-    return setWireCacheControl(target ?? message);
+    return setWireCacheControl(blocks[blocks.length - 1]);
 }
-function applyHybridCache1h(parsed) {
-    removeAllCacheControls(parsed);
-    // Cache last system block after the identity block
-    if (Array.isArray(parsed.system)) {
-        const identityIdx = parsed.system.findIndex((b) => isRecord(b) && b.text === CLAUDE_CODE_IDENTITY);
-        const cacheableSystem = parsed.system
-            .slice(identityIdx >= 0 ? identityIdx + 1 : 0)
-            .filter(isRecord);
-        setWireCacheControl(cacheableSystem[cacheableSystem.length - 1]);
+/**
+ * Anchor the FIRST cacheable block of a message (for magic-context split).
+ */
+function setFirstMessageCacheAnchor(message) {
+    const blocks = getCacheableContentBlocks(message);
+    if (!blocks)
+        return false;
+    return setWireCacheControl(blocks[0]);
+}
+/**
+ * Anchor the SECOND cacheable block of a message (for magic-context split).
+ * Returns false when fewer than two cacheable blocks exist.
+ */
+function setSecondMessageCacheAnchor(message) {
+    const blocks = getCacheableContentBlocks(message);
+    if (!blocks || blocks.length < 2)
+        return false;
+    return setWireCacheControl(blocks[1]);
+}
+/**
+ * Walk all messages and collect user-role (or tool_result) anchor positions.
+ * Returns the `latest` position (index > 1) and a `bridge` position placed
+ * whenever the cumulative block distance from bridge→latest exceeds
+ * ANTHROPIC_CACHE_LOOKBACK_BLOCKS, ensuring both are within the sliding window.
+ */
+function selectHybridMessageAnchors(messages) {
+    // Collect positions of user-role messages that have cacheable content
+    const userPositions = messages
+        .map((msg, index) => {
+        if (!isRecord(msg))
+            return null;
+        if (msg.role !== 'user')
+            return null;
+        const blockCount = messageContentBlockCount(msg);
+        if (blockCount === 0)
+            return null;
+        return { index, blockCount };
+    })
+        .filter((p) => p !== null);
+    // We only care about positions beyond index 1 (0 and 1 are always anchored)
+    const rollingPositions = userPositions.filter((p) => p.index > 1);
+    if (rollingPositions.length === 0) {
+        return { latest: undefined, bridge: undefined };
+    }
+    // Non-null: rollingPositions is non-empty (early return guards above)
+    // biome-ignore lint/style/noNonNullAssertion: guarded by length check above
+    const latest = rollingPositions[rollingPositions.length - 1];
+    // Find a bridge: walk back from latest until cumulative blocks exceed window
+    let bridge;
+    let cumulativeBlocks = latest.blockCount;
+    for (let i = rollingPositions.length - 2; i >= 0; i--) {
+        // biome-ignore lint/style/noNonNullAssertion: index is within bounds
+        cumulativeBlocks += rollingPositions[i].blockCount;
+        if (cumulativeBlocks > ANTHROPIC_CACHE_LOOKBACK_BLOCKS) {
+            bridge = rollingPositions[i];
+            break;
+        }
     }
+    return { latest, bridge };
+}
+// ---------------------------------------------------------------------------
+// System-anchor setter
+// ---------------------------------------------------------------------------
+/**
+ * Place a cache anchor on the last system block that follows the
+ * CLAUDE_CODE_IDENTITY block.  When there are no system blocks, or all
+ * system blocks precede the identity, nothing is anchored.
+ */
+function setHybridSystemAnchor(parsed) {
+    if (!Array.isArray(parsed.system))
+        return;
+    const identityIdx = parsed.system.findIndex((b) => isRecord(b) && b.text === CLAUDE_CODE_IDENTITY);
+    const afterIdentity = parsed.system
+        .slice(identityIdx >= 0 ? identityIdx + 1 : 0)
+        .filter(isRecord);
+    setWireCacheControl(afterIdentity[afterIdentity.length - 1]);
+}
+// ---------------------------------------------------------------------------
+// Trailing-assistant strip (Tier 2)
+// ---------------------------------------------------------------------------
+/**
+ * Remove trailing assistant-role messages.  OAuth endpoints reject requests
+ * that end with an assistant turn (assistant prefill is not supported).
+ */
+function stripTrailingAssistantMessages(parsed) {
     if (!Array.isArray(parsed.messages))
         return;
-    setMessageCacheAnchor(parsed.messages[0]);
-    setMessageCacheAnchor(parsed.messages[1]);
+    while (parsed.messages.length > 0 &&
+        isRecord(parsed.messages[parsed.messages.length - 1]) &&
+        parsed.messages[parsed.messages.length - 1].role === 'assistant') {
+        parsed.messages.pop();
+    }
+}
+// ---------------------------------------------------------------------------
+// Main hybrid cache logic
+// ---------------------------------------------------------------------------
+/**
+ * Apply hybrid 1h prompt-caching breakpoints to parsed request body.
+ *
+ * Breakpoint slots (Anthropic supports max 4 per request):
+ *   1. Last system block after the identity block  (skipped when bridge used)
+ *   2. messages[0] — first cacheable block         (magic-context: slot 2a)
+ *   3. messages[0] — second cacheable block        (magic-context split only)
+ *      OR messages[1] last cacheable block         (normal path)
+ *      OR bridge user message                      (when bridge detected)
+ *   4. Latest user/tool-result message (index > 1) (when present)
+ */
+function applyHybridCache1h(parsed) {
+    removeAllCacheControls(parsed);
+    const messages = Array.isArray(parsed.messages) ? parsed.messages : [];
+    const { latest, bridge } = selectHybridMessageAnchors(messages);
+    // --- Slot 1: system anchor (skip when bridge will occupy a slot) ---
+    if (!bridge) {
+        setHybridSystemAnchor(parsed);
+    }
+    // --- Slots 2 & 3: messages[0] ---
+    const msg0 = messages[0];
+    const msg0Blocks = getCacheableContentBlocks(msg0);
+    if (msg0Blocks && msg0Blocks.length >= 2) {
+        // Magic-context split: stable prefix is in block[0] and block[1];
+        // anchoring last block would bust cache every turn.
+        setFirstMessageCacheAnchor(msg0);
+        setSecondMessageCacheAnchor(msg0);
+    }
+    else {
+        setMessageCacheAnchor(msg0);
+        // --- Slot 3 (normal): messages[1] or bridge ---
+        if (bridge) {
+            setHybridSystemAnchor(parsed); // system anchor reclaimed for bridge support
+            setMessageCacheAnchor(messages[bridge.index]);
+        }
+        else {
+            setMessageCacheAnchor(messages[1]);
+        }
+    }
+    // --- Slot 4: rolling latest user anchor ---
+    if (latest) {
+        setMessageCacheAnchor(messages[latest.index]);
+    }
 }
 /**
  * Sanitize system prompt and prepend Claude Code identity.
@@ -329,6 +495,7 @@ export function rewriteRequestBody(body) {
     try {
         const parsed = JSON.parse(body);
         parsed.system = prependClaudeCodeIdentity(parsed.system);
+        stripTrailingAssistantMessages(parsed);
         applyHybridCache1h(parsed);
         return prefixToolNames(parsed);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sahiljassal/opencode-anthropic-auth",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shljsl75891/opencode-anthropic-auth.git"
@@ -31,14 +31,14 @@
     "@opencode-ai/plugin": "*"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.4.15",
+    "@biomejs/biome": "2.4.16",
     "@changesets/changelog-github": "^0.7.0",
     "@changesets/cli": "^2.31.0",
-    "@opencode-ai/plugin": "1.14.50",
+    "@opencode-ai/plugin": "1.17.3",
     "@tsconfig/bun": "1.0.10",
     "@types/bun": "1.3.14",
     "dedent": "^1.7.2",
-    "lefthook": "2.1.6",
+    "lefthook": "2.1.9",
     "typescript": "6.0.3"
   }
 }