@gotgenes/pi-anthropic-auth 0.1.0 → 0.2.1

package/README.md

@@ -1,5 +1,12 @@
 # pi-anthropic-auth
 
+[![npm version](https://img.shields.io/npm/v/@gotgenes/pi-anthropic-auth?style=flat&logo=npm&logoColor=white)](https://www.npmjs.com/package/@gotgenes/pi-anthropic-auth)
+[![CI](https://img.shields.io/github/actions/workflow/status/gotgenes/pi-anthropic-auth/ci.yml?style=flat&logo=github&label=CI)](https://github.com/gotgenes/pi-anthropic-auth/actions/workflows/ci.yml)
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg?style=flat)](https://opensource.org/licenses/MIT)
+[![TypeScript](https://img.shields.io/badge/TypeScript-5.x-3178C6?style=flat&logo=typescript&logoColor=white)](https://www.typescriptlang.org/)
+[![pnpm](https://img.shields.io/badge/pnpm-%3E%3D9-F69220?style=flat&logo=pnpm&logoColor=white)](https://pnpm.io/)
+[![Pi Package](https://img.shields.io/badge/Pi-Package-6366F1?style=flat)](https://pi.mariozechner.at/)
+
 Minimal Pi extension package for Anthropic Claude Pro/Max OAuth compatibility.
 
 ## Purpose
@@ -28,53 +35,63 @@ The extension currently does the following:
 
 The extension does not currently replace Pi's built-in Anthropic streaming transport.
 
-## Requirements
+## Install
 
-1. `pnpm`
-2. a local `pi` installation
-3. Anthropic OAuth credentials configured through Pi
+```bash
+pi install npm:@gotgenes/pi-anthropic-auth
+```
 
-## Install Dependencies
+To try it without permanently installing:
 
 ```bash
-pnpm install
+pi -e npm:@gotgenes/pi-anthropic-auth
 ```
 
+## Usage Notes
+
+1. `/login anthropic` should continue using Pi's native Anthropic UX.
+2. API-key Anthropic behavior should remain the baseline behavior.
+3. The extension's compatibility logic is intended to affect only Anthropic OAuth requests.
+
 ## Development
 
-Typecheck:
+### Requirements
 
-```bash
-pnpm run build
-```
+1. `pnpm`
+2. a local `pi` installation
+3. Anthropic OAuth credentials configured through Pi
 
-Run tests:
+### Install Dependencies
 
 ```bash
-pnpm test
+pnpm install
 ```
 
-Run both:
+### Typecheck
 
 ```bash
 pnpm run check
 ```
 
-## Load In Pi
+### Run Tests
 
-You can load the extension directly from the local source file:
+```bash
+pnpm test
+```
+
+### Build
 
 ```bash
-pi -e /absolute/path/to/pi-anthropic-auth/src/index.ts
+pnpm run build
 ```
 
-Example:
+### Load Local Build In Pi
 
 ```bash
-pi -e /Users/chris/development/pi-anthropic-auth/src/index.ts
+pi -e /absolute/path/to/pi-anthropic-auth/dist/index.js
 ```
 
-## Fast Repro Loop
+### Fast Repro Loop
 
 The most useful non-interactive repro loop is:
 
@@ -83,7 +100,7 @@ pi \
   --model anthropic/claude-sonnet-4-6 \
   --no-session \
   --tools read,grep,find,ls \
-  -e /Users/chris/development/pi-anthropic-auth/src/index.ts \
+  -e /Users/chris/development/pi-anthropic-auth/dist/index.js \
   -p "How many lines are in @AGENTS.md ?"
 ```
 
@@ -95,12 +112,6 @@ That path was used to validate:
 4. structured output
 5. expired-token refresh
 
-## Usage Notes
-
-1. `/login anthropic` should continue using Pi's native Anthropic UX.
-2. API-key Anthropic behavior should remain the baseline behavior.
-3. The extension's compatibility logic is intended to affect only Anthropic OAuth requests.
-
 ## Project Skills
 
 Project-local skills live in `.agents/skills/`:
@@ -120,6 +131,10 @@ Project-local skills live in `.agents/skills/`:
 7. `AGENTS.md`
 8. `.agents/skills/`
 
+## Acknowledgments
+
+This project was inspired by [opencode-anthropic-auth](https://github.com/ex-machina-co/opencode-anthropic-auth/), which solved the same Anthropic OAuth compatibility problem for [OpenCode](https://opencode.ai/).
+
 ## License
 
 MIT

package/dist/constants.d.ts

@@ -0,0 +1,45 @@
+/**
+ * Prefix of Pi's built-in default system prompt preamble.
+ *
+ * Used to detect whether a system block contains Pi's original verbose
+ * preamble so it can be replaced with the minimal neutral prompt.
+ */
+export declare const PI_DEFAULT_PROMPT_PREFIX = "You are an expert coding assistant operating inside pi, a coding agent harness.";
+/**
+ * Prefix of the minimal neutral Anthropic OAuth system prompt.
+ *
+ * Used as a detection marker in request shaping to identify system blocks
+ * that have already been shaped.  Must match the first line of
+ * MINIMAL_ANTHROPIC_OAUTH_PROMPT.
+ */
+export declare const MINIMAL_ANTHROPIC_OAUTH_PROMPT_PREFIX = "You are an expert coding assistant.";
+/**
+ * Minimal neutral system prompt used for Anthropic OAuth requests.
+ *
+ * Replaces Pi's verbose default preamble to avoid prompt fingerprinting
+ * while preserving any project context that follows.
+ */
+export declare const MINIMAL_ANTHROPIC_OAUTH_PROMPT: string;
+/**
+ * Prefix of Claude Code's identity injection block.
+ *
+ * Used to detect OAuth Anthropic payloads built by Pi's built-in Anthropic
+ * provider, which injects a "You are Claude Code, Anthropic's official CLI"
+ * system block for OAuth sessions.
+ */
+export declare const CLAUDE_CODE_IDENTITY_PREFIX = "You are Claude Code, Anthropic's official CLI";
+/**
+ * Claude Code version string embedded in the billing header.
+ *
+ * **Must be kept in sync with the current Claude Code release.**
+ * Update this value when a new Claude Code version ships.  If it drifts
+ * too far from what Anthropic expects, OAuth requests may be rejected or
+ * counted incorrectly.
+ */
+export declare const CLAUDE_CODE_VERSION = "2.1.87";
+/** Salt used in the billing header suffix hash. */
+export declare const BILLING_HEADER_SALT = "59cf53e54c78";
+/** Character positions sampled from the first user message for the billing hash. */
+export declare const BILLING_HEADER_POSITIONS: readonly [4, 7, 20];
+/** Entrypoint identifier included in the billing header. */
+export declare const CLAUDE_CODE_ENTRYPOINT = "sdk-cli";

package/dist/constants.js

@@ -0,0 +1,62 @@
+/**
+ * Prefix of Pi's built-in default system prompt preamble.
+ *
+ * Used to detect whether a system block contains Pi's original verbose
+ * preamble so it can be replaced with the minimal neutral prompt.
+ */
+export const PI_DEFAULT_PROMPT_PREFIX = "You are an expert coding assistant operating inside pi, a coding agent harness.";
+/**
+ * Prefix of the minimal neutral Anthropic OAuth system prompt.
+ *
+ * Used as a detection marker in request shaping to identify system blocks
+ * that have already been shaped.  Must match the first line of
+ * MINIMAL_ANTHROPIC_OAUTH_PROMPT.
+ */
+export const MINIMAL_ANTHROPIC_OAUTH_PROMPT_PREFIX = "You are an expert coding assistant.";
+/**
+ * Minimal neutral system prompt used for Anthropic OAuth requests.
+ *
+ * Replaces Pi's verbose default preamble to avoid prompt fingerprinting
+ * while preserving any project context that follows.
+ */
+export const MINIMAL_ANTHROPIC_OAUTH_PROMPT = [
+    MINIMAL_ANTHROPIC_OAUTH_PROMPT_PREFIX,
+    "Be concise and helpful.",
+    "Use the available tools to answer the user's request.",
+    "Show file paths clearly when working with files.",
+].join("\n");
+/**
+ * Prefix of Claude Code's identity injection block.
+ *
+ * Used to detect OAuth Anthropic payloads built by Pi's built-in Anthropic
+ * provider, which injects a "You are Claude Code, Anthropic's official CLI"
+ * system block for OAuth sessions.
+ */
+export const CLAUDE_CODE_IDENTITY_PREFIX = "You are Claude Code, Anthropic's official CLI";
+// ---------------------------------------------------------------------------
+// Billing header constants
+//
+// These values are used to build the x-anthropic-billing-header injected into
+// OAuth requests.  They must match the values Anthropic's backend expects for
+// the current Claude Code release.
+//
+// CLAUDE_CODE_VERSION must be updated when Anthropic ships a new Claude Code
+// version.  There is no upstream source to import it from; check the current
+// version at https://github.com/anthropics/claude-code or in a working Claude
+// Code installation (`claude --version`).
+// ---------------------------------------------------------------------------
+/**
+ * Claude Code version string embedded in the billing header.
+ *
+ * **Must be kept in sync with the current Claude Code release.**
+ * Update this value when a new Claude Code version ships.  If it drifts
+ * too far from what Anthropic expects, OAuth requests may be rejected or
+ * counted incorrectly.
+ */
+export const CLAUDE_CODE_VERSION = "2.1.87";
+/** Salt used in the billing header suffix hash. */
+export const BILLING_HEADER_SALT = "59cf53e54c78";
+/** Character positions sampled from the first user message for the billing hash. */
+export const BILLING_HEADER_POSITIONS = [4, 7, 20];
+/** Entrypoint identifier included in the billing header. */
+export const CLAUDE_CODE_ENTRYPOINT = "sdk-cli";

package/dist/index.js

@@ -1,15 +1,9 @@
 import { anthropicOAuthOverride } from "./anthropic-oauth.js";
 import { shapeAnthropicOAuthPayload } from "./request-shaping.js";
-import { shapeAnthropicOAuthSystemPrompt } from "./system-prompt-shaping.js";
 export default function (pi) {
     pi.registerProvider("anthropic", {
         oauth: anthropicOAuthOverride,
     });
-    pi.on("before_agent_start", (event) => {
-        return {
-            systemPrompt: shapeAnthropicOAuthSystemPrompt(event.systemPrompt),
-        };
-    });
     pi.on("before_provider_request", (event) => {
         return shapeAnthropicOAuthPayload(event.payload);
     });

package/dist/request-shaping.js

@@ -1,11 +1,7 @@
 import { createHash } from "node:crypto";
+import { BILLING_HEADER_POSITIONS, BILLING_HEADER_SALT, CLAUDE_CODE_ENTRYPOINT, CLAUDE_CODE_IDENTITY_PREFIX, CLAUDE_CODE_VERSION, MINIMAL_ANTHROPIC_OAUTH_PROMPT_PREFIX, } from "./constants.js";
+import { shapeSystemBlocks } from "./system-prompt-shaping.js";
 const ANTHROPIC_OAUTH_BETAS = ["claude-code-20250219", "oauth-2025-04-20"];
-const BILLING_HEADER_SALT = "59cf53e54c78";
-const BILLING_HEADER_POSITIONS = [4, 7, 20];
-const CLAUDE_CODE_VERSION = "2.1.87";
-const CLAUDE_CODE_ENTRYPOINT = "sdk-cli";
-const CLAUDE_CODE_IDENTITY_PREFIX = "You are Claude Code, Anthropic's official CLI";
-const PI_MINIMAL_ANTHROPIC_PROMPT_PREFIX = "You are an expert coding assistant.";
 function isRecord(value) {
     return value !== null && typeof value === "object" && !Array.isArray(value);
 }
@@ -29,13 +25,7 @@ function hasOAuthAnthropicSystemMarker(block) {
     }
     return (block.text.includes(CLAUDE_CODE_IDENTITY_PREFIX) ||
         block.text.includes("x-anthropic-billing-header:") ||
-        block.text.startsWith(PI_MINIMAL_ANTHROPIC_PROMPT_PREFIX));
-}
-function _hasClaudeCodeIdentity(block) {
-    return (isRecord(block) &&
-        block.type === "text" &&
-        typeof block.text === "string" &&
-        block.text.includes(CLAUDE_CODE_IDENTITY_PREFIX));
+        block.text.startsWith(MINIMAL_ANTHROPIC_OAUTH_PROMPT_PREFIX));
 }
 function getFirstUserText(messages) {
     const firstUserMessage = messages.find((message) => message.role === "user");
@@ -78,7 +68,7 @@ function normalizeSystemBlock(block) {
     if (isRecord(block) && typeof block.text === "string") {
         return {
             ...block,
-            type: block.type === "text" ? "text" : "text",
+            type: "text",
             text: block.text,
         };
     }
@@ -107,6 +97,15 @@ function mergeAnthropicBetas(betaHeader) {
         .filter(Boolean);
     return [...new Set([...ANTHROPIC_OAUTH_BETAS, ...existing])].join(",");
 }
+/**
+ * Splits assistant messages that interleave text and tool_use blocks.
+ *
+ * The Anthropic API rejects assistant turns where non-tool_use blocks follow
+ * a tool_use block.  Pi's serializer can produce this ordering, so we split
+ * the message into two consecutive assistant turns: one with text blocks and
+ * one with tool_use blocks.  The reordering is safe because the text and
+ * tool_use blocks are semantically independent within a single turn.
+ */
 function splitAssistantToolUseTrailingContent(messages) {
     return messages.flatMap((message) => {
         if (message.role !== "assistant" || !Array.isArray(message.content)) {
@@ -137,10 +136,13 @@ export function shapeAnthropicOAuthPayload(payload) {
         return payload;
     }
     const normalizedMessages = splitAssistantToolUseTrailingContent(messages);
+    const shapedSystem = Array.isArray(payload.system)
+        ? shapeSystemBlocks(payload.system)
+        : payload.system;
     const shapedPayload = {
         ...payload,
         messages: normalizedMessages,
-        system: prependBillingHeader(payload.system, normalizedMessages),
+        system: prependBillingHeader(shapedSystem, normalizedMessages),
     };
     if (typeof payload["anthropic-beta"] === "string") {
         shapedPayload["anthropic-beta"] = mergeAnthropicBetas(payload["anthropic-beta"]);

package/dist/system-prompt-shaping.d.ts

@@ -1 +1,22 @@
+/**
+ * Shape a system prompt string for Anthropic OAuth compatibility.
+ *
+ * Replaces Pi's verbose default preamble with a minimal neutral prompt while
+ * preserving any project context that follows.  Returns the original string
+ * unchanged when Pi's default preamble is not detected.
+ */
 export declare function shapeAnthropicOAuthSystemPrompt(systemPrompt: string): string;
+type TextBlock = {
+    type: "text";
+    text: string;
+    [key: string]: unknown;
+};
+/**
+ * Apply system prompt shaping to an array of Anthropic system text blocks.
+ *
+ * Finds the first block containing Pi's default prompt preamble and replaces
+ * its text in-place (returning a new array).  Blocks without the preamble are
+ * passed through unchanged.
+ */
+export declare function shapeSystemBlocks(blocks: TextBlock[]): TextBlock[];
+export {};

package/dist/system-prompt-shaping.js

@@ -1,14 +1,15 @@
-const PI_DEFAULT_PROMPT_PREFIX = "You are an expert coding assistant operating inside pi, a coding agent harness.";
-const MINIMAL_ANTHROPIC_OAUTH_PROMPT = [
-    "You are an expert coding assistant.",
-    "Be concise and helpful.",
-    "Use the available tools to answer the user's request.",
-    "Show file paths clearly when working with files.",
-].join("\n");
+import { MINIMAL_ANTHROPIC_OAUTH_PROMPT, PI_DEFAULT_PROMPT_PREFIX, } from "./constants.js";
 function findProjectContextStart(systemPrompt) {
     const marker = "\n\n# Project Context\n\n";
     return systemPrompt.indexOf(marker);
 }
+/**
+ * Shape a system prompt string for Anthropic OAuth compatibility.
+ *
+ * Replaces Pi's verbose default preamble with a minimal neutral prompt while
+ * preserving any project context that follows.  Returns the original string
+ * unchanged when Pi's default preamble is not detected.
+ */
 export function shapeAnthropicOAuthSystemPrompt(systemPrompt) {
     if (!systemPrompt.includes(PI_DEFAULT_PROMPT_PREFIX)) {
         return systemPrompt;
@@ -19,3 +20,19 @@ export function shapeAnthropicOAuthSystemPrompt(systemPrompt) {
     }
     return `${MINIMAL_ANTHROPIC_OAUTH_PROMPT}${systemPrompt.slice(projectContextStart)}`;
 }
+/**
+ * Apply system prompt shaping to an array of Anthropic system text blocks.
+ *
+ * Finds the first block containing Pi's default prompt preamble and replaces
+ * its text in-place (returning a new array).  Blocks without the preamble are
+ * passed through unchanged.
+ */
+export function shapeSystemBlocks(blocks) {
+    return blocks.map((block) => {
+        if (block.type !== "text" ||
+            !block.text.includes(PI_DEFAULT_PROMPT_PREFIX)) {
+            return block;
+        }
+        return { ...block, text: shapeAnthropicOAuthSystemPrompt(block.text) };
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gotgenes/pi-anthropic-auth",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "Pi extension package for Anthropic OAuth compatibility",
   "author": {
     "name": "Chris Lasher"
@@ -32,28 +32,31 @@
   },
   "scripts": {
     "build": "tsc -p tsconfig.build.json",
-    "check": "tsc -p tsconfig.json --noEmit",
+    "check": "tsc -p tsconfig.check.json --noEmit",
     "lint": "biome check .",
     "lint:fix": "biome check --write .",
     "lint:md": "markdownlint-cli2 '*.md'",
     "lint:all": "pnpm run lint && pnpm run lint:md",
     "format": "biome format --write .",
-    "test": "tsx --test test/**/*.test.ts"
+    "test": "tsx --test test/**/*.test.ts",
+    "prepublishOnly": "pnpm run check && pnpm run test && pnpm run build"
   },
   "pi": {
     "extensions": [
       "./dist/index.js"
     ]
   },
-  "dependencies": {
-    "@anthropic-ai/sdk": "^0.52.0",
-    "@mariozechner/pi-ai": "^0.68.0",
-    "@mariozechner/pi-coding-agent": "^0.68.0"
+  "peerDependencies": {
+    "@mariozechner/pi-ai": "*",
+    "@mariozechner/pi-coding-agent": "*"
   },
   "devDependencies": {
+    "@anthropic-ai/sdk": "^0.52.0",
     "@biomejs/biome": "^2.4.12",
+    "@mariozechner/pi-ai": "^0.68.0",
+    "@mariozechner/pi-coding-agent": "^0.68.0",
     "markdownlint-cli2": "^0.22.0",
     "tsx": "^4.20.6",
-    "typescript": "^5.9.3"
+    "typescript": "^6.0.3"
   }
 }