@ex-machina/opencode-anthropic-auth 1.6.0 → 1.7.0

package/README.md

@@ -2,6 +2,11 @@
 
 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.
 
+> [!IMPORTANT]
+> If you are seeing issues, please try to `rm -rf ~/.config/opencode` and check your `opencode.json` config to make sure you're on the latest version.
+>
+> Try this FIRST before making an Issue. Thanks!
+
 ## Usage
 
 Add the plugin to your OpenCode configuration:
@@ -21,7 +26,7 @@ Add the plugin to your OpenCode configuration:
 
 ```json
 {
-  "plugin": ["@ex-machina/opencode-anthropic-auth@1.5.1"]
+  "plugin": ["@ex-machina/opencode-anthropic-auth@1.6.1"]
 }
 ```
 
@@ -41,7 +46,6 @@ The plugin supports the following environment variables:
 |-----------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `ANTHROPIC_BASE_URL`              | Override the API endpoint URL (e.g. for proxying). Must be a valid HTTP(S) URL.                                                                                                             |
 | `ANTHROPIC_INSECURE`              | Set to `1` or `true` to skip TLS certificate verification. Only effective when `ANTHROPIC_BASE_URL` is also set.                                                                            |
-| `EXPERIMENTAL_KEEP_SYSTEM_PROMPT` | Set to `1` or `true` to keep the sanitized system prompt in the `system[]` field instead of relocating it to a user message. See [System Prompt Sanitization](#system-prompt-sanitization). |
 
 ## How It Works
 
@@ -62,10 +66,7 @@ The Anthropic API for Max subscriptions has specific requirements for the system
 2. **Paragraph removal by anchor** — Any paragraph containing a known URL anchor (e.g. `github.com/anomalyco/opencode`, `opencode.ai/docs`) is removed entirely. This is resilient to upstream rewording — as long as the anchor URL appears somewhere in the paragraph, the removal works regardless of surrounding text changes.
 3. **Inline text replacements** — Short branded strings inside paragraphs we want to keep are replaced (e.g. "OpenCode" → "the assistant" in the professional objectivity section).
 
-Everything else in the system prompt is preserved: tone/style guidance, task management instructions, tool usage policy, environment info, skills, user/project instructions, and file paths containing "opencode". The system prompt is then **split** and only the billing header and identity line are left in the system prompt. The remainder is moved into a user message to bypass system prompt checks.
-
-> [!NOTE]
-> Set `EXPERIMENTAL_KEEP_SYSTEM_PROMPT=1` to skip the relocation step. The sanitized system prompt will remain in `system[]` in its entirety. This may cause API rejections for OAuth-authenticated requests.
+Everything else in the system prompt is preserved: tone/style guidance, task management instructions, tool usage policy, environment info, skills, user/project instructions, and file paths containing "opencode". The sanitized system prompt is structured as three blocks in `system[]`: the billing header, the Claude Code identity line, and the remaining system content.
 
 ## Development
 

package/dist/constants.d.ts

@@ -8,7 +8,7 @@ export declare const TOKEN_URL = "https://platform.claude.com/v1/oauth/token";
 export declare const OAUTH_SCOPES: string[];
 export declare const TOOL_PREFIX = "mcp_";
 export declare const REQUIRED_BETAS: string[];
-export declare const OPENCODE_IDENTITY = "You are OpenCode, the best coding agent on the planet.";
+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[];

package/dist/constants.js

@@ -18,7 +18,7 @@ export const REQUIRED_BETAS = [
     'oauth-2025-04-20',
     'interleaved-thinking-2025-05-14',
 ];
-export const OPENCODE_IDENTITY = 'You are OpenCode, the best coding agent on the planet.';
+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];

package/dist/transform.d.ts

@@ -17,7 +17,7 @@ export declare function setOAuthHeaders(headers: Headers, accessToken: string):
  * Add TOOL_PREFIX to tool names in the request body.
  * Prefixes both tool definitions and tool_use blocks in messages.
  */
-export declare function prefixToolNames(body: string): string;
+export declare function prefixToolNames(parsed: Record<string, unknown>): string;
 /**
  * Strip TOOL_PREFIX from tool names in streaming response text.
  */
@@ -27,12 +27,6 @@ export declare function stripToolPrefix(text: string): string;
  * Only effective when ANTHROPIC_BASE_URL is also set.
  */
 export declare function isInsecure(): boolean;
-/**
- * Check if system prompt relocation should be skipped.
- * When enabled, sanitized system blocks stay in system[] instead of
- * being moved to the first user message.
- */
-export declare function experimentalKeepSystemPrompt(): boolean;
 /**
  * Rewrite the request URL to add ?beta=true for /v1/messages requests.
  * When ANTHROPIC_BASE_URL is set, overrides the origin (protocol + host)
@@ -46,7 +40,7 @@ export declare function rewriteUrl(input: FetchInput): {
 /**
  * Sanitize OpenCode-branded strings from the system prompt text.
  *
- * 1. Removes the OPENCODE_IDENTITY line.
+ * 1. Removes the OPENCODE_IDENTITY paragraph.
  * 2. Removes any paragraph (text between blank lines) that contains
  *    one of the PARAGRAPH_REMOVAL_ANCHORS — typically URLs that
  *    identify OpenCode-specific content.

package/dist/transform.js

@@ -1,5 +1,5 @@
 import { buildBillingHeaderValue } from './cch';
-import { CLAUDE_CODE_ENTRYPOINT, CLAUDE_CODE_IDENTITY, OPENCODE_IDENTITY, PARAGRAPH_REMOVAL_ANCHORS, REQUIRED_BETAS, TEXT_REPLACEMENTS, TOOL_PREFIX, USER_AGENT, } from './constants';
+import { CLAUDE_CODE_ENTRYPOINT, CLAUDE_CODE_IDENTITY, OPENCODE_IDENTITY_PREFIX, PARAGRAPH_REMOVAL_ANCHORS, REQUIRED_BETAS, TEXT_REPLACEMENTS, TOOL_PREFIX, USER_AGENT, } from './constants';
 /**
  * Prefix a tool name with TOOL_PREFIX and uppercase the first character.
  * Claude Code uses PascalCase tool names (e.g. mcp_Bash, mcp_Read);
@@ -12,6 +12,10 @@ function prefixName(name) {
  * Reverse prefixName: strip TOOL_PREFIX and restore the original leading case.
  */
 function unprefixName(name) {
+    // StructuredOutput is still used as StructuredOutput
+    if (name === 'StructuredOutput') {
+        return name;
+    }
     return `${name.charAt(0).toLowerCase()}${name.slice(1)}`;
 }
 /**
@@ -76,33 +80,27 @@ export function setOAuthHeaders(headers, accessToken) {
  * Add TOOL_PREFIX to tool names in the request body.
  * Prefixes both tool definitions and tool_use blocks in messages.
  */
-export function prefixToolNames(body) {
-    try {
-        const parsed = JSON.parse(body);
-        if (parsed.tools && Array.isArray(parsed.tools)) {
-            parsed.tools = parsed.tools.map((tool) => ({
-                ...tool,
-                name: tool.name ? prefixName(tool.name) : tool.name,
-            }));
-        }
-        if (parsed.messages && Array.isArray(parsed.messages)) {
-            parsed.messages = parsed.messages.map((msg) => {
-                if (msg.content && Array.isArray(msg.content)) {
-                    msg.content = msg.content.map((block) => {
-                        if (block.type === 'tool_use' && block.name) {
-                            return { ...block, name: prefixName(block.name) };
-                        }
-                        return block;
-                    });
-                }
-                return msg;
-            });
-        }
-        return JSON.stringify(parsed);
+export function prefixToolNames(parsed) {
+    if (parsed.tools && Array.isArray(parsed.tools)) {
+        parsed.tools = parsed.tools.map((tool) => ({
+            ...tool,
+            name: tool.name ? prefixName(tool.name) : tool.name,
+        }));
     }
-    catch {
-        return body;
+    if (parsed.messages && Array.isArray(parsed.messages)) {
+        parsed.messages = parsed.messages.map((msg) => {
+            if (msg.content && Array.isArray(msg.content)) {
+                msg.content = msg.content.map((block) => {
+                    if (block.type === 'tool_use' && block.name) {
+                        return { ...block, name: prefixName(block.name) };
+                    }
+                    return block;
+                });
+            }
+            return msg;
+        });
     }
+    return JSON.stringify(parsed);
 }
 /**
  * Strip TOOL_PREFIX from tool names in streaming response text.
@@ -120,15 +118,6 @@ export function isInsecure() {
     const raw = process.env.ANTHROPIC_INSECURE?.trim();
     return raw === '1' || raw === 'true';
 }
-/**
- * Check if system prompt relocation should be skipped.
- * When enabled, sanitized system blocks stay in system[] instead of
- * being moved to the first user message.
- */
-export function experimentalKeepSystemPrompt() {
-    const raw = process.env.EXPERIMENTAL_KEEP_SYSTEM_PROMPT?.trim();
-    return raw === '1' || raw === 'true';
-}
 /**
  * Parse ANTHROPIC_BASE_URL from the environment.
  * Returns a valid HTTP(S) URL or null if unset/invalid.
@@ -192,7 +181,7 @@ export function rewriteUrl(input) {
 /**
  * Sanitize OpenCode-branded strings from the system prompt text.
  *
- * 1. Removes the OPENCODE_IDENTITY line.
+ * 1. Removes the OPENCODE_IDENTITY paragraph.
  * 2. Removes any paragraph (text between blank lines) that contains
  *    one of the PARAGRAPH_REMOVAL_ANCHORS — typically URLs that
  *    identify OpenCode-specific content.
@@ -204,17 +193,12 @@ export function rewriteUrl(input) {
  * somewhere in the paragraph, the removal works.
  */
 export function sanitizeSystemText(text) {
-    if (!text.includes(OPENCODE_IDENTITY))
-        return text;
     // Split into paragraphs (separated by one or more blank lines)
     const paragraphs = text.split(/\n\n+/);
     const filtered = paragraphs.filter((paragraph) => {
-        // Remove the identity line (may be its own paragraph or part of one)
-        if (paragraph.includes(OPENCODE_IDENTITY)) {
-            // If the paragraph is JUST the identity, drop it entirely
-            if (paragraph.trim() === OPENCODE_IDENTITY)
-                return false;
-            // Otherwise it's mixed — we'll handle inline below
+        if (paragraph.includes(OPENCODE_IDENTITY_PREFIX)) {
+            // If the paragraph contains the identity, drop it entirely
+            return false;
         }
         // Remove paragraphs containing any removal anchor
         for (const anchor of PARAGRAPH_REMOVAL_ANCHORS) {
@@ -224,8 +208,6 @@ export function sanitizeSystemText(text) {
         return true;
     });
     let result = filtered.join('\n\n');
-    // Remove the identity line if it was part of a larger paragraph
-    result = result.replace(OPENCODE_IDENTITY, '').replace(/\n{3,}/g, '\n\n');
     // Apply inline text replacements
     for (const rule of TEXT_REPLACEMENTS) {
         result = result.replace(rule.match, rule.replacement);
@@ -292,63 +274,12 @@ export function rewriteRequestBody(body) {
             : null;
         // Sanitize system prompt and prepend Claude Code identity
         parsed.system = prependClaudeCodeIdentity(parsed.system);
-        // --- Relocate non-core system entries to user messages ---
-        // Anthropic's API validates system[] content for OAuth requests.
-        // Third-party system prompts trigger a 400 rejection when they
-        // appear in `system[]`. Keep only the identity block in `system[]`
-        // and prepend everything else to the first user message.
-        if (!experimentalKeepSystemPrompt() &&
-            Array.isArray(parsed.system) &&
-            parsed.system.length > 1) {
-            const kept = [parsed.system[0]]; // identity block
-            const movedTexts = [];
-            for (let i = 1; i < parsed.system.length; i++) {
-                const entry = parsed.system[i];
-                const txt = typeof entry === 'string' ? entry : (entry?.text ?? '');
-                if (txt.length > 0)
-                    movedTexts.push(txt);
-            }
-            if (movedTexts.length > 0 && Array.isArray(parsed.messages)) {
-                const firstUser = parsed.messages.find((m) => m.role === 'user');
-                if (firstUser) {
-                    parsed.system = kept;
-                    const prefix = movedTexts.join('\n\n');
-                    if (typeof firstUser.content === 'string') {
-                        firstUser.content = `${prefix}\n\n${firstUser.content}`;
-                    }
-                    else if (Array.isArray(firstUser.content)) {
-                        firstUser.content.unshift({ type: 'text', text: prefix });
-                    }
-                }
-            }
-        }
-        const identityBlock = parsed.system[0];
-        if (billingHeader &&
-            identityBlock?.type === 'text' &&
-            identityBlock.text === CLAUDE_CODE_IDENTITY) {
-            identityBlock.text = `${billingHeader}\n\n${CLAUDE_CODE_IDENTITY}`;
-        }
-        // Prefix tool names
-        if (parsed.tools && Array.isArray(parsed.tools)) {
-            parsed.tools = parsed.tools.map((tool) => ({
-                ...tool,
-                name: tool.name ? prefixName(tool.name) : tool.name,
-            }));
-        }
-        if (parsed.messages && Array.isArray(parsed.messages)) {
-            parsed.messages = parsed.messages.map((msg) => {
-                if (msg.content && Array.isArray(msg.content)) {
-                    msg.content = msg.content.map((block) => {
-                        if (block.type === 'tool_use' && block.name) {
-                            return { ...block, name: prefixName(block.name) };
-                        }
-                        return block;
-                    });
-                }
-                return msg;
-            });
+        // Prepend the billing header as a separate system block so the
+        // final layout is: [billing header, identity, ...rest]
+        if (billingHeader && Array.isArray(parsed.system)) {
+            parsed.system.unshift({ type: 'text', text: billingHeader });
         }
-        return JSON.stringify(parsed);
+        return prefixToolNames(parsed);
     }
     catch {
         return body;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ex-machina/opencode-anthropic-auth",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ex-machina-co/opencode-anthropic-auth"