@gotgenes/pi-anthropic-auth 0.2.1 → 0.4.0

package/README.md

@@ -7,33 +7,14 @@
 [![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.
+A [Pi](https://pi.mariozechner.at/) extension that improves compatibility with Anthropic Claude Pro/Max OAuth (i.e., your Claude subscription) while preserving Pi's normal Anthropic behavior.
 
-## Purpose
+## What It Does
 
-This package minimally overrides Pi's built-in `anthropic` provider to improve Claude Pro/Max OAuth compatibility while preserving Pi's normal Anthropic behavior wherever possible.
+Pi works great with Anthropic API keys out of the box.
+This extension fills in the gaps for users who want to use their **Claude Pro or Max subscription** via OAuth instead.
 
-The design goal is to preserve:
-
-1. built-in provider name: `anthropic`
-2. built-in model list
-3. normal Anthropic API-key behavior
-4. native `/login anthropic` UX
-
-## Current Behavior
-
-The extension currently does the following:
-
-1. re-registers the built-in `anthropic` provider with only an `oauth` override
-2. reuses Pi's native Anthropic login and refresh helpers from `@mariozechner/pi-ai/oauth`
-3. preserves the old refresh token when refresh responses omit `refresh_token`
-4. shapes OAuth Anthropic request payloads through `before_provider_request`
-5. prepends the Anthropic billing/content-consistency header block to `system[]`
-6. avoids adding `cache_control` to the injected billing block
-7. normalizes assistant `[tool_use..., text]` ordering for Anthropic OAuth payloads
-8. replaces Pi's default prompt body with a minimal neutral prompt for Anthropic OAuth when the default Pi harness prompt is detected, while preserving project context
-
-The extension does not currently replace Pi's built-in Anthropic streaming transport.
+It keeps everything you'd expect — the built-in `anthropic` provider, the full model list, API-key behavior, and the native `/login anthropic` flow — and layers on the compatibility fixes needed to make OAuth subscriptions work reliably.
 
 ## Install
 
@@ -47,90 +28,35 @@ To try it without permanently installing:
 pi -e npm:@gotgenes/pi-anthropic-auth
 ```
 
-## Usage Notes
+## Usage
 
-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.
+1. Run `/login anthropic` as usual — Pi's native Anthropic login flow is preserved.
+2. Select a Claude Pro/Max model and start chatting. The extension handles compatibility transparently.
+3. API-key behavior is unaffected; the extension's changes apply only to OAuth sessions.
 
 ## Development
 
 ### Requirements
 
-1. `pnpm`
-2. a local `pi` installation
-3. Anthropic OAuth credentials configured through Pi
+- `pnpm`
+- a local `pi` installation
+- Anthropic OAuth credentials configured through Pi
 
-### Install Dependencies
+### Commands
 
 ```bash
-pnpm install
+pnpm install      # install dependencies
+pnpm run check    # typecheck
+pnpm test         # run tests
+pnpm run build    # compile
 ```
 
-### Typecheck
-
-```bash
-pnpm run check
-```
-
-### Run Tests
-
-```bash
-pnpm test
-```
-
-### Build
-
-```bash
-pnpm run build
-```
-
-### Load Local Build In Pi
+### Load a Local Build
 
 ```bash
 pi -e /absolute/path/to/pi-anthropic-auth/dist/index.js
 ```
 
-### Fast Repro Loop
-
-The most useful non-interactive repro loop is:
-
-```bash
-pi \
-  --model anthropic/claude-sonnet-4-6 \
-  --no-session \
-  --tools read,grep,find,ls \
-  -e /Users/chris/development/pi-anthropic-auth/dist/index.js \
-  -p "How many lines are in @AGENTS.md ?"
-```
-
-That path was used to validate:
-
-1. simple prompts
-2. tool use
-3. multi-turn continuation
-4. structured output
-5. expired-token refresh
-
-## Project Skills
-
-Project-local skills live in `.agents/skills/`:
-
-1. `anthropic`: Anthropic OAuth debugging workflow and lessons learned
-2. `pi-cli-repro`: repeatable `pi -p ... -e ...` repro workflow
-3. `frontmatter`: Pi skill frontmatter template and rules
-
-## Key Files
-
-1. `src/index.ts`
-2. `src/anthropic-oauth.ts`
-3. `src/request-shaping.ts`
-4. `src/system-prompt-shaping.ts`
-5. `docs/plans/minimal-anthropic-override.md`
-6. `docs/plans/gap-analysis-and-next-steps.md`
-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/).

package/dist/constants.d.ts

@@ -36,10 +36,35 @@ export declare const CLAUDE_CODE_IDENTITY_PREFIX = "You are Claude Code, Anthrop
  * too far from what Anthropic expects, OAuth requests may be rejected or
  * counted incorrectly.
  */
-export declare const CLAUDE_CODE_VERSION = "2.1.87";
+export declare const CLAUDE_CODE_VERSION = "2.1.108";
 /** 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";
+/**
+ * Strings whose presence in a paragraph marks it as Pi-specific and droppable.
+ *
+ * Each entry is checked with `paragraph.includes(anchor)`.
+ */
+export declare const PARAGRAPH_REMOVAL_ANCHORS: readonly string[];
+/**
+ * Inline text replacements applied after paragraph removal.
+ *
+ * These handle known Anthropic classifier trigger phrases that may appear
+ * in paragraphs we want to keep.  Each rule is applied with `replaceAll`.
+ *
+ * The "Here is some useful information..." phrase was isolated by
+ * `opencode-anthropic-auth` via sliding-window bisection of a 10KB failing
+ * prompt.  When it reaches Anthropic combined with typical agent context,
+ * /v1/messages responds with a 400 disguised as "You're out of extra usage."
+ * Replacing the word "useful" is enough to unblock the request.
+ *
+ * We don't currently emit this phrase, but it's included as a documented
+ * future risk per Issue #10.
+ */
+export declare const TEXT_REPLACEMENTS: readonly {
+    match: string;
+    replacement: string;
+}[];

package/dist/constants.js

@@ -53,10 +53,56 @@ export const CLAUDE_CODE_IDENTITY_PREFIX = "You are Claude Code, Anthropic's off
  * too far from what Anthropic expects, OAuth requests may be rejected or
  * counted incorrectly.
  */
-export const CLAUDE_CODE_VERSION = "2.1.87";
+export const CLAUDE_CODE_VERSION = "2.1.108";
 /** 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";
+// ---------------------------------------------------------------------------
+// Anchor-driven sanitizer constants
+//
+// Used by the system prompt sanitizer to remove Pi-specific paragraphs
+// (identity, documentation references, filler) while preserving extension-
+// contributed content (tool snippets, guidelines, appended content).
+//
+// A paragraph is any text between blank lines.  If a paragraph contains any
+// anchor string, it is dropped entirely.  This is resilient to upstream
+// rewording — as long as the anchor still appears somewhere in the paragraph,
+// removal works regardless of surrounding text changes.
+// ---------------------------------------------------------------------------
+/**
+ * Strings whose presence in a paragraph marks it as Pi-specific and droppable.
+ *
+ * Each entry is checked with `paragraph.includes(anchor)`.
+ */
+export const PARAGRAPH_REMOVAL_ANCHORS = [
+    // Pi identity sentence
+    "operating inside pi, a coding agent harness",
+    // Pi-specific filler about custom tools
+    "In addition to the tools above",
+    // Pi documentation block — references Pi-specific docs/paths
+    "Pi documentation (read only when the user asks about pi itself",
+];
+/**
+ * Inline text replacements applied after paragraph removal.
+ *
+ * These handle known Anthropic classifier trigger phrases that may appear
+ * in paragraphs we want to keep.  Each rule is applied with `replaceAll`.
+ *
+ * The "Here is some useful information..." phrase was isolated by
+ * `opencode-anthropic-auth` via sliding-window bisection of a 10KB failing
+ * prompt.  When it reaches Anthropic combined with typical agent context,
+ * /v1/messages responds with a 400 disguised as "You're out of extra usage."
+ * Replacing the word "useful" is enough to unblock the request.
+ *
+ * We don't currently emit this phrase, but it's included as a documented
+ * future risk per Issue #10.
+ */
+export const TEXT_REPLACEMENTS = [
+    {
+        match: "Here is some useful information about the environment you are running in:",
+        replacement: "Environment context you are running in:",
+    },
+];

package/dist/request-shaping.js

@@ -1,7 +1,6 @@
 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"];
 function isRecord(value) {
     return value !== null && typeof value === "object" && !Array.isArray(value);
 }
@@ -90,13 +89,6 @@ function prependBillingHeader(system, messages) {
     const billingBlock = { type: "text", text: billingHeader };
     return [billingBlock, ...systemBlocks];
 }
-function mergeAnthropicBetas(betaHeader) {
-    const existing = (betaHeader ?? "")
-        .split(",")
-        .map((value) => value.trim())
-        .filter(Boolean);
-    return [...new Set([...ANTHROPIC_OAUTH_BETAS, ...existing])].join(",");
-}
 /**
  * Splits assistant messages that interleave text and tool_use blocks.
  *
@@ -139,13 +131,9 @@ export function shapeAnthropicOAuthPayload(payload) {
     const shapedSystem = Array.isArray(payload.system)
         ? shapeSystemBlocks(payload.system)
         : payload.system;
-    const shapedPayload = {
+    return {
         ...payload,
         messages: normalizedMessages,
         system: prependBillingHeader(shapedSystem, normalizedMessages),
     };
-    if (typeof payload["anthropic-beta"] === "string") {
-        shapedPayload["anthropic-beta"] = mergeAnthropicBetas(payload["anthropic-beta"]);
-    }
-    return shapedPayload;
 }

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

@@ -1,9 +1,27 @@
+/**
+ * Sanitize system prompt text by removing paragraphs containing known
+ * Pi-specific anchor strings and applying inline text replacements for
+ * known Anthropic classifier trigger phrases.
+ *
+ * A paragraph is any text between blank lines (`\n\n`).
+ *
+ * This approach is resilient to upstream rewording — as long as the anchor
+ * string still appears somewhere in the paragraph, removal works regardless
+ * of how the surrounding text changes.
+ */
+export declare function sanitizeSystemText(text: string): string;
 /**
  * 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.
+ * Uses an anchor-driven sanitizer to remove Pi-specific paragraphs
+ * (identity, documentation references, filler) while preserving
+ * extension-contributed content (tool snippets, guidelines, appended
+ * content, project context, skills, and date/cwd footer).
+ *
+ * Prepends a minimal neutral prompt to replace the removed Pi identity.
+ *
+ * If the Pi default prompt prefix is not present, the prompt is returned
+ * unchanged — this gates shaping so non-Pi prompts pass through.
  */
 export declare function shapeAnthropicOAuthSystemPrompt(systemPrompt: string): string;
 type TextBlock = {

package/dist/system-prompt-shaping.js

@@ -1,24 +1,52 @@
-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);
+import { MINIMAL_ANTHROPIC_OAUTH_PROMPT, PARAGRAPH_REMOVAL_ANCHORS, PI_DEFAULT_PROMPT_PREFIX, TEXT_REPLACEMENTS, } from "./constants.js";
+/**
+ * Sanitize system prompt text by removing paragraphs containing known
+ * Pi-specific anchor strings and applying inline text replacements for
+ * known Anthropic classifier trigger phrases.
+ *
+ * A paragraph is any text between blank lines (`\n\n`).
+ *
+ * This approach is resilient to upstream rewording — as long as the anchor
+ * string still appears somewhere in the paragraph, removal works regardless
+ * of how the surrounding text changes.
+ */
+export function sanitizeSystemText(text) {
+    const paragraphs = text.split(/\n\n+/);
+    const filtered = paragraphs.filter((paragraph) => {
+        for (const anchor of PARAGRAPH_REMOVAL_ANCHORS) {
+            if (paragraph.includes(anchor))
+                return false;
+        }
+        return true;
+    });
+    let result = filtered.join("\n\n");
+    for (const rule of TEXT_REPLACEMENTS) {
+        result = result.replaceAll(rule.match, rule.replacement);
+    }
+    return result.trim();
 }
 /**
  * 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.
+ * Uses an anchor-driven sanitizer to remove Pi-specific paragraphs
+ * (identity, documentation references, filler) while preserving
+ * extension-contributed content (tool snippets, guidelines, appended
+ * content, project context, skills, and date/cwd footer).
+ *
+ * Prepends a minimal neutral prompt to replace the removed Pi identity.
+ *
+ * If the Pi default prompt prefix is not present, the prompt is returned
+ * unchanged — this gates shaping so non-Pi prompts pass through.
  */
 export function shapeAnthropicOAuthSystemPrompt(systemPrompt) {
     if (!systemPrompt.includes(PI_DEFAULT_PROMPT_PREFIX)) {
         return systemPrompt;
     }
-    const projectContextStart = findProjectContextStart(systemPrompt);
-    if (projectContextStart === -1) {
+    const sanitized = sanitizeSystemText(systemPrompt);
+    if (!sanitized) {
         return MINIMAL_ANTHROPIC_OAUTH_PROMPT;
     }
-    return `${MINIMAL_ANTHROPIC_OAUTH_PROMPT}${systemPrompt.slice(projectContextStart)}`;
+    return `${MINIMAL_ANTHROPIC_OAUTH_PROMPT}\n\n${sanitized}`;
 }
 /**
  * Apply system prompt shaping to an array of Anthropic system text blocks.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gotgenes/pi-anthropic-auth",
-  "version": "0.2.1",
+  "version": "0.4.0",
   "description": "Pi extension package for Anthropic OAuth compatibility",
   "author": {
     "name": "Chris Lasher"
@@ -38,7 +38,8 @@
     "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": "vitest run",
+    "test:watch": "vitest",
     "prepublishOnly": "pnpm run check && pnpm run test && pnpm run build"
   },
   "pi": {
@@ -56,7 +57,7 @@
     "@mariozechner/pi-ai": "^0.68.0",
     "@mariozechner/pi-coding-agent": "^0.68.0",
     "markdownlint-cli2": "^0.22.0",
-    "tsx": "^4.20.6",
-    "typescript": "^6.0.3"
+    "typescript": "^6.0.3",
+    "vitest": "^4.1.5"
   }
 }