pi-anthropic-oauth 0.2.1 → 0.2.3

package/README.md

@@ -5,7 +5,7 @@
 Use Claude Pro/Max in Pi with browser OAuth.
 
 > [!IMPORTANT]
-> This release requires Pi 0.80.8 or later in the 0.80.x release line.
+> This extension supports Pi 0.80.8 or later.
 
 ## Features
 
@@ -13,8 +13,7 @@ Use Claude Pro/Max in Pi with browser OAuth.
 - Automatic token refresh
 - Claude Code-compatible OAuth headers and prompt shaping
 - No Anthropic API key needed
-- Uses Pi's Anthropic model registry
-- Adds Claude Opus 4.8 and Claude Fable 5 by default
+- Uses the Anthropic models available in Pi's built-in model registry
 - Auto-creates `~/.Claude Code` → `~/.pi` symlink when missing
 
 ## Quick start
@@ -101,7 +100,7 @@ To add another Anthropic model, create `~/.pi/agent/models.json`:
 ```
 
 > [!NOTE]
-> Opus 4.8 and Fable 5 are included in Pi's built-in Anthropic model catalog.
+> Opus 5 and Fable 5 are included in Pi's built-in Anthropic model catalog as `claude-opus-5` and `claude-fable-5`.
 >
 > Pi requires `baseUrl`, `apiKey`, and `api` when defining custom models in `models.json`. With this extension, requests normally authenticate through Claude Pro/Max OAuth after `/login`, so `apiKey` is only a placeholder to satisfy Pi's config requirements and does not need to be a valid Anthropic API key.
 >

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-anthropic-oauth",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Claude Pro/Max OAuth extension for Pi",
   "type": "module",
   "license": "MIT",
@@ -38,8 +38,8 @@
     "@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.80.8",
+    "@earendil-works/pi-coding-agent": ">=0.80.8"
   },
   "devDependencies": {
     "@earendil-works/pi-ai": "^0.80.8",

package/src/convert.ts

@@ -42,11 +42,28 @@ const claudeCodeTools = [
 ] as const;
 const claudeCodeToolLookup = new Map(claudeCodeTools.map((name) => [name.toLowerCase(), name]));
 
+// Anthropic's OAuth classifier rejects tool definitions with names outside
+// Claude Code's own tool set with a 400 "Third-party apps now draw from your
+// extra usage" error. Claude Code exposes MCP tools as `mcp__<server>__<tool>`,
+// so unknown tools are namespaced under `mcp__pi__`.
+const CLAUDE_CODE_MCP_TOOL_PREFIX = "mcp__pi__";
+
+function sanitizeCustomToolName(name: string): string {
+  return name.replace(/[^a-zA-Z0-9_-]/g, "_");
+}
+
 export function toClaudeCodeToolName(name: string): string {
-  return claudeCodeToolLookup.get(name.toLowerCase()) ?? name;
+  return (
+    claudeCodeToolLookup.get(name.toLowerCase()) ??
+    `${CLAUDE_CODE_MCP_TOOL_PREFIX}${sanitizeCustomToolName(name)}`
+  );
 }
 
 export function fromClaudeCodeToolName(name: string, tools?: Tool[]): string {
+  if (name.startsWith(CLAUDE_CODE_MCP_TOOL_PREFIX)) {
+    const stripped = name.slice(CLAUDE_CODE_MCP_TOOL_PREFIX.length);
+    return tools?.find((tool) => sanitizeCustomToolName(tool.name) === stripped)?.name ?? stripped;
+  }
   const lower = name.toLowerCase();
   return tools?.find((tool) => tool.name.toLowerCase() === lower)?.name ?? name;
 }