pi-anthropic-oauth 0.2.3 → 0.3.0

package/README.md

@@ -47,9 +47,17 @@ pi update npm:pi-anthropic-oauth
 > [!NOTE]
 > Anthropic auth changes are closely monitored for quick compatibility updates.
 
+## Claude Code version override
+
+Anthropic gates new models on the Claude Code client version (error `claude_code_version_too_old`). The version is sent in both the OAuth user agent and the billing header of the system prompt. Override it without reinstalling:
+
+```bash
+PI_ANTHROPIC_OAUTH_CLAUDE_CODE_VERSION=2.1.280
+```
+
 ## System prompt rewriting
 
-When using Claude Pro/Max OAuth, the extension prepends Claude Code identity text and rewrites standalone `Pi` / `pi` references in Pi's system prompt to `Claude Code`. The rewrite mode defaults to `aggressive`:
+When using Claude Pro/Max OAuth, the extension prepends the Claude Code billing-header and identity system blocks and rewrites standalone `Pi` / `pi` references in Pi's system prompt to `Claude Code`. The rewrite mode defaults to `aggressive`:
 
 ```bash
 PI_ANTHROPIC_OAUTH_REWRITE_MODE=aggressive

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-anthropic-oauth",
-  "version": "0.2.3",
+  "version": "0.3.0",
   "description": "Claude Pro/Max OAuth extension for Pi",
   "type": "module",
   "license": "MIT",
@@ -38,12 +38,12 @@
     "@anthropic-ai/sdk": "^0.52.0"
   },
   "peerDependencies": {
-    "@earendil-works/pi-ai": ">=0.80.8",
-    "@earendil-works/pi-coding-agent": ">=0.80.8"
+    "@earendil-works/pi-ai": ">=0.86.0",
+    "@earendil-works/pi-coding-agent": ">=0.86.0"
   },
   "devDependencies": {
-    "@earendil-works/pi-ai": "^0.80.8",
-    "@earendil-works/pi-coding-agent": "^0.80.8",
+    "@earendil-works/pi-ai": "^0.86.1",
+    "@earendil-works/pi-coding-agent": "^0.86.1",
     "typescript": "^5.9.3"
   }
 }

package/src/auth.ts

@@ -3,6 +3,7 @@ import type {
   OAuthCredentials,
   OAuthLoginCallbacks,
 } from "@earendil-works/pi-ai";
+import { makeClaudeCodeUserAgent } from "./version.js";
 
 const CLIENT_ID = "9d1c250a-e61b-44d9-88ed-5944d1962f5e";
 const AUTHORIZE_URL = "https://claude.ai/oauth/authorize";
@@ -16,7 +17,7 @@ const SCOPES = [
   "user:mcp_servers",
   "user:file_upload",
 ].join(" ");
-const USER_AGENT = "claude-code/2.1.97";
+const USER_AGENT = makeClaudeCodeUserAgent();
 const CALLBACK_PORT = 53692;
 const CALLBACK_HOST = "127.0.0.1";
 const LOCAL_CALLBACK_TIMEOUT = 5 * 60 * 1000;

package/src/prompt.ts

@@ -1,5 +1,21 @@
+import { randomUUID } from "node:crypto";
+import { getClaudeCodeVersion } from "./version.js";
+
 const CLAUDE_CODE_IDENTITY =
-  "You are Claude Code, Anthropic's official CLI for Claude.";
+  "You are a Claude agent, built on Anthropic's Claude Agent SDK.";
+
+/**
+ * Anthropic's OAuth classifier rejects premium-model requests that do not
+ * open with a Claude Code billing-header system block. The `cch` and
+ * `cc_prompt_id` keys must be present, but their values are not validated,
+ * and the block must not carry `cache_control`.
+ */
+export function buildClaudeCodeBillingBlock(): MessageContentBlock {
+  return {
+    type: "text",
+    text: `x-anthropic-billing-header: cc_version=${getClaudeCodeVersion()}; cc_entrypoint=cli; cch=00000; cc_prompt_id=${randomUUID()}`,
+  };
+}
 const PI_REMOVAL_ANCHORS = [
   "pi-coding-agent",
   "@earendil-works/pi-coding-agent",
@@ -32,7 +48,15 @@ type MessageContentBlock = {
 };
 
 export function sanitizeSurrogates(text: string): string {
-  return text.replace(/[\uD800-\uDFFF]/g, "\uFFFD");
+  // Replace only *unpaired* surrogates: a high surrogate not followed by a low
+  // surrogate, or a low surrogate not preceded by a high surrogate. Valid
+  // surrogate pairs (non-BMP characters such as emoji) must pass through
+  // untouched. Equivalent to String.prototype.toWellFormed(), which requires
+  // Node 20+ while this package supports Node >=18.
+  return text.replace(
+    /[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g,
+    "\uFFFD",
+  );
 }
 
 export function buildAnthropicSystemPrompt(
@@ -42,11 +66,8 @@ export function buildAnthropicSystemPrompt(
   const blocks: MessageContentBlock[] = [];
 
   if (isOAuth) {
-    blocks.push({
-      type: "text",
-      text: CLAUDE_CODE_IDENTITY,
-      cache_control: { type: "ephemeral" },
-    });
+    blocks.push(buildClaudeCodeBillingBlock());
+    blocks.push({ type: "text", text: CLAUDE_CODE_IDENTITY });
   }
 
   const sanitized = systemPrompt ? sanitizeSystemText(systemPrompt) : "";

package/src/stream.ts

@@ -5,11 +5,15 @@ import {
   type AssistantMessage,
   type AssistantMessageEventStream,
   calculateCost,
-  type Context,
+  collapseSystemMessages,
   createAssistantMessageEventStream,
+  getCurrentSystemPrompt,
+  getCurrentTools,
+  type JsonObject,
   type Model,
   type SimpleStreamOptions,
   type StopReason,
+  type TranscriptContext,
 } from "@earendil-works/pi-ai";
 import { isClaudeOAuthAccessToken, USER_AGENT } from "./auth.js";
 import {
@@ -94,11 +98,19 @@ function makeDefaultHeaders(
 
 export function streamAnthropicOAuth(
   model: Model<Api>,
-  context: Context,
+  context: TranscriptContext,
   options?: SimpleStreamOptions,
 ): AssistantMessageEventStream {
   const stream = createAssistantMessageEventStream();
 
+  // Anthropic has no mid-conversation system messages: fold system-message
+  // patches into the leading system message, then read the current prompt and
+  // tool declarations from the transcript (pi >= 0.86 no longer provides
+  // context.systemPrompt / context.tools).
+  const transcript = collapseSystemMessages(context);
+  const tools = getCurrentTools(transcript.messages);
+  const systemPrompt = getCurrentSystemPrompt(transcript.messages);
+
   void (async () => {
     const output: AssistantMessage = {
       role: "assistant",
@@ -144,15 +156,15 @@ export function streamAnthropicOAuth(
 
       const params: MessageCreateParamsStreaming = {
         model: model.id,
-        messages: convertPiMessagesToAnthropic(context.messages, isOAuth, model),
+        messages: convertPiMessagesToAnthropic(transcript.messages, isOAuth, model),
         max_tokens: maxTokens,
         stream: true,
       };
 
-      const system = buildAnthropicSystemPrompt(context.systemPrompt, isOAuth);
+      const system = buildAnthropicSystemPrompt(systemPrompt, isOAuth);
       if (system) params.system = system as never;
-      if (context.tools?.length)
-        params.tools = convertPiToolsToAnthropic(context.tools, isOAuth);
+      if (tools.length)
+        params.tools = convertPiToolsToAnthropic(tools, isOAuth);
 
       if (options?.reasoning && model.reasoning && maxTokens > 1) {
         const defaultBudgets: Record<string, number> = {
@@ -168,11 +180,40 @@ export function streamAnthropicOAuth(
           ];
         const requestedBudget =
           customBudget ?? defaultBudgets[options.reasoning] ?? 10240;
+        const display = "summarized";
+        const forceAdaptive = (
+          model.compat as { forceAdaptiveThinking?: boolean } | undefined
+        )?.forceAdaptiveThinking;
+        const id = model.id.toLowerCase().replace(/\./g, "-");
+        const adaptive =
+          forceAdaptive === true ||
+          (forceAdaptive !== false &&
+            (/claude-(?:opus|sonnet|haiku|fable|mythos)-5(?:-|$)/.test(id) ||
+              /claude-(?:opus|sonnet|haiku|fable|mythos)-4-(?:[6-9]|\d{2,})(?:-|$)/.test(
+                id,
+              )));
 
-        params.thinking = {
-          type: "enabled",
-          budget_tokens: Math.min(requestedBudget, maxTokens - 1),
-        };
+        if (adaptive) {
+          const mapped = model.thinkingLevelMap?.[options.reasoning];
+          const effort =
+            typeof mapped === "string"
+              ? mapped
+              : options.reasoning === "minimal" || options.reasoning === "low"
+                ? "low"
+                : options.reasoning === "medium"
+                  ? "medium"
+                  : options.reasoning === "high"
+                    ? "high"
+                    : "high";
+          params.thinking = { type: "adaptive", display } as never;
+          Object.assign(params, { output_config: { effort } });
+        } else {
+          params.thinking = {
+            type: "enabled",
+            budget_tokens: Math.min(requestedBudget, maxTokens - 1),
+            display,
+          } as never;
+        }
       }
 
       // Raw stream instead of the MessageStream helper: MessageStream
@@ -268,7 +309,7 @@ export function streamAnthropicOAuth(
               name: isOAuth
                 ? fromClaudeCodeToolName(
                     event.content_block.name,
-                    context.tools,
+                    tools,
                   )
                 : event.content_block.name,
               arguments: {},
@@ -322,10 +363,7 @@ export function streamAnthropicOAuth(
           ) {
             block.partialJson += event.delta.partial_json;
             try {
-              block.arguments = JSON.parse(block.partialJson) as Record<
-                string,
-                unknown
-              >;
+              block.arguments = JSON.parse(block.partialJson) as JsonObject;
             } catch {}
             stream.push({
               type: "toolcall_delta",
@@ -361,10 +399,7 @@ export function streamAnthropicOAuth(
             });
           } else if (block.type === "toolCall") {
             try {
-              block.arguments = JSON.parse(block.partialJson) as Record<
-                string,
-                unknown
-              >;
+              block.arguments = JSON.parse(block.partialJson) as JsonObject;
             } catch {}
             delete (block as { partialJson?: string }).partialJson;
             stream.push({

package/src/version.ts

@@ -0,0 +1,24 @@
+export const CLAUDE_CODE_VERSION_ENV = "PI_ANTHROPIC_OAUTH_CLAUDE_CODE_VERSION";
+const DEFAULT_CLAUDE_CODE_VERSION = "2.1.280";
+
+/**
+ * Claude Code version advertised to the API (user agent and billing header).
+ *
+ * Anthropic gates new models on the client version; override with
+ * PI_ANTHROPIC_OAUTH_CLAUDE_CODE_VERSION when a newer one is required.
+ */
+export function getClaudeCodeVersion(
+  env: NodeJS.ProcessEnv = process.env,
+): string {
+  return env[CLAUDE_CODE_VERSION_ENV]?.trim() || DEFAULT_CLAUDE_CODE_VERSION;
+}
+
+/**
+ * User agent matching the current Claude Code CLI client. The classifier
+ * rejects the older `claude-code/<ver>` form for premium models.
+ */
+export function makeClaudeCodeUserAgent(
+  env: NodeJS.ProcessEnv = process.env,
+): string {
+  return `claude-cli/${getClaudeCodeVersion(env)} (external, cli)`;
+}