pi-anthropic-oauth 0.2.0 → 0.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-anthropic-oauth",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Claude Pro/Max OAuth extension for Pi",
   "type": "module",
   "license": "MIT",

package/src/convert.ts

@@ -11,8 +11,10 @@ type ToolResultContentBlock =
       };
     };
 import type {
+  Api,
   ImageContent,
   Message,
+  Model,
   TextContent,
   ThinkingContent,
   Tool,
@@ -40,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;
 }
@@ -52,6 +71,7 @@ export function fromClaudeCodeToolName(name: string, tools?: Tool[]): string {
 export function convertPiMessagesToAnthropic(
   messages: Message[],
   isOAuth: boolean,
+  model: Pick<Model<Api>, "provider" | "api" | "id">,
 ): MessageParam[] {
   const params: MessageParam[] = [];
   const toolIdMap = new Map<string, string>();
@@ -131,9 +151,34 @@ export function convertPiMessagesToAnthropic(
 
       const blocks: ContentBlockParam[] = [];
       const emittedToolUseIds: string[] = [];
+      const isSameModel =
+        message.provider === model.provider &&
+        message.api === model.api &&
+        message.model === model.id;
       for (const block of message.content) {
         if (block.type === "text" && block.text.trim()) {
           blocks.push({ type: "text", text: sanitizeSurrogates(block.text) });
+        } else if (block.type === "thinking") {
+          const thinkingSignature = block.thinkingSignature?.trim();
+          if (block.redacted) {
+            if (isSameModel && thinkingSignature) {
+              blocks.push({
+                type: "redacted_thinking",
+                data: block.thinkingSignature!,
+              });
+            }
+          } else if (isSameModel && thinkingSignature) {
+            blocks.push({
+              type: "thinking",
+              thinking: sanitizeSurrogates(block.thinking),
+              signature: block.thinkingSignature!,
+            });
+          } else if (block.thinking.trim()) {
+            blocks.push({
+              type: "text",
+              text: sanitizeSurrogates(block.thinking),
+            });
+          }
         } else if (block.type === "toolCall") {
           const anthropicId = getAnthropicToolId(block.id);
           blocks.push({

package/src/stream.ts

@@ -144,7 +144,7 @@ export function streamAnthropicOAuth(
 
       const params: MessageCreateParamsStreaming = {
         model: model.id,
-        messages: convertPiMessagesToAnthropic(context.messages, isOAuth),
+        messages: convertPiMessagesToAnthropic(context.messages, isOAuth, model),
         max_tokens: maxTokens,
         stream: true,
       };
@@ -248,6 +248,19 @@ export function streamAnthropicOAuth(
               contentIndex: output.content.length - 1,
               partial: output,
             });
+          } else if (event.content_block.type === "redacted_thinking") {
+            output.content.push({
+              type: "thinking",
+              thinking: "[Reasoning redacted]",
+              thinkingSignature: event.content_block.data,
+              redacted: true,
+              index: event.index,
+            } as IndexedBlock);
+            stream.push({
+              type: "thinking_start",
+              contentIndex: output.content.length - 1,
+              partial: output,
+            });
           } else if (event.content_block.type === "tool_use") {
             output.content.push({
               type: "toolCall",
@@ -378,6 +391,14 @@ export function streamAnthropicOAuth(
           output.usage.cacheWrite =
             (event.usage as { cache_creation_input_tokens?: number })
               .cache_creation_input_tokens || 0;
+          const thinkingTokens = (
+            event.usage as {
+              output_tokens_details?: { thinking_tokens?: number };
+            }
+          ).output_tokens_details?.thinking_tokens;
+          if (thinkingTokens != null) {
+            output.usage.reasoning = thinkingTokens;
+          }
           output.usage.totalTokens =
             output.usage.input +
             output.usage.output +