@sahiljassal/opencode-anthropic-auth 2.1.0 → 2.1.1

package/README.md

@@ -5,7 +5,7 @@
 >
 > Use your best judgment and don't abuse your subscription.
 
-Fork of [ex-machina-co/opencode-anthropic-auth](https://github.com/ex-machina-co/opencode-anthropic-auth).
+Fork of [ex-machina-co/opencode-anthropic-auth](https://github.com/ex-machina-co/opencode-anthropic-auth), with caching improvements inspired by [cortexkit/anthropic-auth](https://github.com/cortexkit/anthropic-auth).
 
 An [OpenCode](https://github.com/anomalyco/opencode) plugin that provides Anthropic OAuth authentication, enabling Claude Pro/Max users to use their subscription directly with OpenCode.
 
@@ -27,12 +27,22 @@ Add to your OpenCode config (`~/.config/opencode/opencode.json`):
 
 ## Prompt Caching
 
-This fork applies **hybrid 1-hour ephemeral prompt caching** on every request:
+This fork applies **hybrid 1-hour ephemeral prompt caching** on every request, placing up to 4 breakpoints strategically:
 
-- Strips any existing `cache_control` blocks from the request
-- Anchors a `1h` ephemeral cache on the last system block (after identity) and the first two user messages
+| Breakpoint | Behaviour |
+|---|---|
+| **System anchor** | Last system block after the identity block (skipped when bridge occupies the slot) |
+| **messages[0]** | Magic-context split: anchors block[0] + block[1] when stable prefix and volatile delta are merged; otherwise anchors the last cacheable block |
+| **messages[1] / bridge** | Last cacheable block of messages[1]; replaced by a bridge anchor when a tool-heavy session pushes the latest user boundary outside Anthropic's 20-block lookback window |
+| **Rolling latest** | Most recent user message beyond index 1, keeping cache hot across long sessions |
 
-This reduces token usage and latency on repeated requests by reusing cached prompt prefixes.
+Additional behaviours:
+
+- **System tail coalescing** — plugin-added system blocks beyond the primary prompt are merged into one block before placing the system anchor, preventing cache busts when block layout changes between requests
+- **Trailing assistant strip** — assistant messages at the tail of the request are removed before forwarding (OAuth rejects assistant prefill)
+- **Thinking block guard** — `thinking` and `redacted_thinking` blocks are excluded from cache anchor placement; messages containing only thinking blocks receive no `cache_control` (avoids Anthropic 400)
+- **SSE retryable errors** — transient server errors (`api_error`, `overloaded_error`, `server_error`) emitted inside HTTP 200 streams are detected and thrown as connection-reset errors so OpenCode auto-retries
+- **Buffered stream rewriting** — tool name stripping buffers partial `"name"` tokens across chunk boundaries to avoid corruption
 
 ## Configuration
 

package/dist/constants.d.ts

@@ -19,9 +19,9 @@ 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.";
 export declare const CCH_SALT = "59cf53e54c78";
 export declare const CCH_POSITIONS: number[];
-export declare const CLAUDE_CODE_VERSION = "2.1.87";
-export declare const CLAUDE_CODE_ENTRYPOINT = "sdk-cli";
-export declare const USER_AGENT = "claude-cli/2.1.87 (external, cli)";
+export declare const CLAUDE_CODE_VERSION = "2.1.177";
+export declare const CLAUDE_CODE_ENTRYPOINT = "cli";
+export declare const USER_AGENT = "claude-cli/2.1.177 (external, cli)";
 /**
  * Anchors that identify paragraphs to remove from the system prompt.
  * Any paragraph (text between blank lines) containing one of these

package/dist/constants.js

@@ -29,9 +29,9 @@ export const OPENCODE_IDENTITY_PREFIX = 'You are OpenCode';
 export const CLAUDE_CODE_IDENTITY = "You are a Claude agent, built on Anthropic's Claude Agent SDK.";
 export const CCH_SALT = '59cf53e54c78';
 export const CCH_POSITIONS = [4, 7, 20];
-export const CLAUDE_CODE_VERSION = '2.1.87';
-export const CLAUDE_CODE_ENTRYPOINT = 'sdk-cli';
-export const USER_AGENT = 'claude-cli/2.1.87 (external, cli)';
+export const CLAUDE_CODE_VERSION = '2.1.177';
+export const CLAUDE_CODE_ENTRYPOINT = 'cli';
+export const USER_AGENT = 'claude-cli/2.1.177 (external, cli)';
 /**
  * Anchors that identify paragraphs to remove from the system prompt.
  * Any paragraph (text between blank lines) containing one of these

package/dist/transform.d.ts

@@ -67,8 +67,20 @@ export declare function prependClaudeCodeIdentity(system: unknown): SystemBlock[
  * and apply hybrid 1h prompt caching.
  */
 export declare function rewriteRequestBody(body: string): string;
+/**
+ * Error thrown when Anthropic emits a retryable server-side error *inside*
+ * an HTTP 200 stream.  OpenCode recognises ECONNRESET + anthropic-sse syscall
+ * and applies its normal auto-retry flow instead of surfacing an unknown error.
+ */
+export type RetryableAnthropicStreamError = Error & {
+    code: 'ECONNRESET';
+    syscall: 'anthropic-sse';
+    providerErrorType?: string;
+};
 /**
  * Create a streaming response that strips the tool prefix from tool names.
+ * Detects retryable Anthropic server errors inside HTTP 200 streams and
+ * throws a connection-reset-style error so OpenCode can auto-retry.
  */
 export declare function createStrippedStream(response: Response): Response;
 export {};

package/dist/transform.js

@@ -365,6 +365,51 @@ function selectHybridMessageAnchors(messages) {
 // ---------------------------------------------------------------------------
 // System-anchor setter
 // ---------------------------------------------------------------------------
+function systemBlockText(block) {
+    return isRecord(block) && typeof block.text === 'string' ? block.text : '';
+}
+/**
+ * Merge all plugin-added system instruction blocks (those after the primary
+ * OpenCode/system prompt block) into a single block before placing the hybrid
+ * system cache anchor.
+ *
+ * OpenCode normally emits these as one merged block, but some hooks can cause
+ * them to arrive split across multiple blocks.  Without coalescing, byte-
+ * identical system text flips between merged/split layouts and moves the
+ * cache_control breakpoint — busting the cache every turn.
+ *
+ * Block layout after prependClaudeCodeIdentity:
+ *   [billing-header?] [identity] [primary system prompt] [plugin blocks…]
+ * We preserve everything up to and including the primary prompt block and
+ * merge all remaining plugin blocks into one.
+ */
+function coalesceHybridSystemTail(parsed) {
+    if (!Array.isArray(parsed.system))
+        return;
+    const system = parsed.system;
+    let prefixCount = 0;
+    // Skip optional billing-header block (not present in this fork but guard is safe)
+    if (systemBlockText(system[prefixCount]).startsWith('x-anthropic-billing-header:')) {
+        prefixCount++;
+    }
+    // Skip identity block
+    if (systemBlockText(system[prefixCount]) === CLAUDE_CODE_IDENTITY) {
+        prefixCount++;
+    }
+    // tailStart points to the first plugin-added block (one after primary prompt)
+    const tailStart = prefixCount + 1;
+    if (tailStart >= system.length - 1)
+        return;
+    const firstTail = system[tailStart];
+    if (!isRecord(firstTail))
+        return;
+    const mergedText = system.slice(tailStart).map(systemBlockText).join('\n');
+    system.splice(tailStart, system.length - tailStart, {
+        ...firstTail,
+        type: 'text',
+        text: mergedText,
+    });
+}
 /**
  * Place a cache anchor on the last system block that follows the
  * CLAUDE_CODE_IDENTITY block.  When there are no system blocks, or all
@@ -411,6 +456,7 @@ function stripTrailingAssistantMessages(parsed) {
  */
 function applyHybridCache1h(parsed) {
     removeAllCacheControls(parsed);
+    coalesceHybridSystemTail(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) ---
@@ -503,8 +549,146 @@ export function rewriteRequestBody(body) {
         return body;
     }
 }
+/** Find the first SSE event boundary (\n\n or \r\n\r\n) in a text buffer. */
+function findSseBoundary(value) {
+    const lf = value.indexOf('\n\n');
+    const crlf = value.indexOf('\r\n\r\n');
+    if (lf === -1)
+        return crlf === -1 ? null : { index: crlf, length: 4 };
+    if (crlf === -1 || lf < crlf)
+        return { index: lf, length: 2 };
+    return { index: crlf, length: 4 };
+}
+function asDiagnosticRecord(value) {
+    return value != null && typeof value === 'object' && !Array.isArray(value)
+        ? value
+        : undefined;
+}
+function stringField(record, key) {
+    const v = record?.[key];
+    return typeof v === 'string' ? v : undefined;
+}
+function isRetryableAnthropicStreamError(errorType, message) {
+    const t = errorType?.toLowerCase();
+    const m = message.toLowerCase();
+    return (t === 'api_error' ||
+        t === 'overloaded_error' ||
+        t === 'server_error' ||
+        t === 'internal_server_error' ||
+        m.includes('internal server error') ||
+        m.includes('server overloaded'));
+}
+function retryableAnthropicStreamError(errorType, message) {
+    const detail = errorType ? `${errorType}: ${message}` : message;
+    const err = new Error(`Anthropic stream error: ${detail}`);
+    err.code = 'ECONNRESET';
+    err.syscall = 'anthropic-sse';
+    if (errorType)
+        err.providerErrorType = errorType;
+    return err;
+}
+function retryableAnthropicStreamErrorFromRawEvent(rawEvent) {
+    if (!rawEvent.includes('error'))
+        return null;
+    let eventName;
+    const dataLines = [];
+    for (const line of rawEvent.split(/\r?\n/)) {
+        if (line.startsWith('event:')) {
+            eventName = line.slice('event:'.length).trim();
+        }
+        else if (line.startsWith('data:')) {
+            const v = line.slice('data:'.length);
+            dataLines.push(v.startsWith(' ') ? v.slice(1) : v);
+        }
+    }
+    const dataText = dataLines.join('\n');
+    if (!dataText || dataText === '[DONE]')
+        return null;
+    let parsed;
+    try {
+        parsed = JSON.parse(dataText);
+    }
+    catch {
+        return null;
+    }
+    const data = asDiagnosticRecord(parsed);
+    if (eventName !== 'error' && stringField(data, 'type') !== 'error')
+        return null;
+    const errorObj = asDiagnosticRecord(data?.error);
+    const errorType = stringField(errorObj, 'type') ??
+        stringField(errorObj, 'code') ??
+        undefined;
+    const message = stringField(errorObj, 'message') ??
+        stringField(data, 'message') ??
+        errorType ??
+        'Anthropic stream error';
+    if (!isRetryableAnthropicStreamError(errorType, message))
+        return null;
+    return retryableAnthropicStreamError(errorType, message);
+}
+function createSseErrorState() {
+    return { pending: '' };
+}
+function updateSseErrorState(state, text) {
+    if (!text)
+        return null;
+    state.pending += text;
+    while (true) {
+        const boundary = findSseBoundary(state.pending);
+        if (!boundary)
+            break;
+        const rawEvent = state.pending.slice(0, boundary.index);
+        state.pending = state.pending.slice(boundary.index + boundary.length);
+        const err = retryableAnthropicStreamErrorFromRawEvent(rawEvent);
+        if (err)
+            return err;
+    }
+    return null;
+}
+// ---------------------------------------------------------------------------
+// Buffered tool-prefix rewriting (v1.10.0)
+// ---------------------------------------------------------------------------
+/**
+ * Rewrite the tool prefix from the safe portion of a text buffer.
+ * Holds back any suffix that could be the start of a partial `"name"` marker
+ * spanning a chunk boundary.  Pass flush=true on stream end to emit everything.
+ */
+function splitToolPrefixRewriteBuffer(buffer, flush = false) {
+    if (flush)
+        return { ready: stripToolPrefix(buffer), pending: '' };
+    let keepFrom = buffer.length;
+    const marker = '"name"';
+    // Hold back any suffix that starts a partial marker
+    const partialStart = Math.max(0, buffer.length - marker.length + 1);
+    for (let i = partialStart; i < buffer.length; i++) {
+        if (marker.startsWith(buffer.slice(i))) {
+            keepFrom = Math.min(keepFrom, i);
+            break;
+        }
+    }
+    // Also hold back if the last occurrence of the marker is incomplete
+    const lastMarker = buffer.lastIndexOf(marker);
+    if (lastMarker !== -1) {
+        const tail = buffer.slice(lastMarker);
+        if (/^"name"\s*(?::\s*(?:"[^"]*)?)?$/.test(tail)) {
+            keepFrom = Math.min(keepFrom, lastMarker);
+        }
+    }
+    if (keepFrom < buffer.length) {
+        return {
+            ready: stripToolPrefix(buffer.slice(0, keepFrom)),
+            pending: buffer.slice(keepFrom),
+        };
+    }
+    return { ready: stripToolPrefix(buffer), pending: '' };
+}
+// ---------------------------------------------------------------------------
+// Stream response wrapper
+// ---------------------------------------------------------------------------
 /**
  * Create a streaming response that strips the tool prefix from tool names.
+ * Detects retryable Anthropic server errors inside HTTP 200 streams and
+ * throws a connection-reset-style error so OpenCode can auto-retry.
  */
 export function createStrippedStream(response) {
     if (!response.body)
@@ -512,16 +696,56 @@ export function createStrippedStream(response) {
     const reader = response.body.getReader();
     const decoder = new TextDecoder();
     const encoder = new TextEncoder();
+    let pending = '';
+    let readerReleased = false;
+    const sseErrors = createSseErrorState();
+    const releaseReader = () => {
+        if (readerReleased)
+            return;
+        readerReleased = true;
+        reader.releaseLock();
+    };
     const stream = new ReadableStream({
         async pull(controller) {
-            const { done, value } = await reader.read();
-            if (done) {
-                controller.close();
-                return;
+            try {
+                const { done, value } = await reader.read();
+                if (done) {
+                    const finalDecoded = decoder.decode();
+                    const retryableError = updateSseErrorState(sseErrors, finalDecoded);
+                    if (retryableError) {
+                        releaseReader();
+                        throw retryableError;
+                    }
+                    const { ready } = splitToolPrefixRewriteBuffer(`${pending}${finalDecoded}`, true);
+                    if (ready)
+                        controller.enqueue(encoder.encode(ready));
+                    releaseReader();
+                    controller.close();
+                    return;
+                }
+                const decoded = decoder.decode(value, { stream: true });
+                const retryableError = updateSseErrorState(sseErrors, decoded);
+                if (retryableError) {
+                    releaseReader();
+                    throw retryableError;
+                }
+                const { ready, pending: nextPending } = splitToolPrefixRewriteBuffer(pending + decoded);
+                pending = nextPending;
+                if (ready)
+                    controller.enqueue(encoder.encode(ready));
+            }
+            catch (error) {
+                releaseReader();
+                throw error;
+            }
+        },
+        async cancel(reason) {
+            try {
+                await reader.cancel(reason);
+            }
+            finally {
+                releaseReader();
             }
-            let text = decoder.decode(value, { stream: true });
-            text = stripToolPrefix(text);
-            controller.enqueue(encoder.encode(text));
         },
     });
     return new Response(stream, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sahiljassal/opencode-anthropic-auth",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shljsl75891/opencode-anthropic-auth.git"