pi-anthropic-oauth 0.1.2 → 0.1.3

package/package.json

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

package/src/convert.ts

@@ -54,6 +54,24 @@ export function convertPiMessagesToAnthropic(
   isOAuth: boolean,
 ): MessageParam[] {
   const params: MessageParam[] = [];
+  const toolIdMap = new Map<string, string>();
+  const usedToolIds = new Set<string>();
+
+  const getAnthropicToolId = (id: string): string => {
+    const existing = toolIdMap.get(id);
+    if (existing) return existing;
+
+    let base = sanitizeSurrogates(id).replace(/[^a-zA-Z0-9_-]/g, "_");
+    if (!base) base = "tool";
+    let candidate = base;
+    let suffix = 1;
+    while (usedToolIds.has(candidate)) {
+      candidate = `${base}_${suffix++}`;
+    }
+    usedToolIds.add(candidate);
+    toolIdMap.set(id, candidate);
+    return candidate;
+  };
 
   for (let i = 0; i < messages.length; i++) {
     const message = messages[i];
@@ -81,19 +99,11 @@ export function convertPiMessagesToAnthropic(
         if (block.type === "text" && block.text.trim()) {
           blocks.push({ type: "text", text: sanitizeSurrogates(block.text) });
         } else if (block.type === "thinking" && block.thinking.trim()) {
-          if (block.thinkingSignature) {
-            blocks.push({
-              type: "thinking" as never,
-              thinking: sanitizeSurrogates(block.thinking),
-              signature: block.thinkingSignature,
-            });
-          } else {
-            blocks.push({ type: "text", text: sanitizeSurrogates(block.thinking) });
-          }
+          blocks.push({ type: "text", text: sanitizeSurrogates(block.thinking) });
         } else if (block.type === "toolCall") {
           blocks.push({
             type: "tool_use",
-            id: block.id,
+            id: getAnthropicToolId(block.id),
             name: isOAuth ? toClaudeCodeToolName(block.name) : block.name,
             input: block.arguments,
           });
@@ -107,7 +117,7 @@ export function convertPiMessagesToAnthropic(
       const toolResults = [
         {
           type: "tool_result" as const,
-          tool_use_id: message.toolCallId,
+          tool_use_id: getAnthropicToolId(message.toolCallId),
           content: convertToolResultContentToAnthropic(message.content),
           is_error: message.isError,
         },
@@ -118,7 +128,7 @@ export function convertPiMessagesToAnthropic(
         const nextMessage = messages[j] as ToolResultMessage;
         toolResults.push({
           type: "tool_result" as const,
-          tool_use_id: nextMessage.toolCallId,
+          tool_use_id: getAnthropicToolId(nextMessage.toolCallId),
           content: convertToolResultContentToAnthropic(nextMessage.content),
           is_error: nextMessage.isError,
         });

package/src/stream.ts

@@ -111,10 +111,13 @@ export function streamAnthropicOAuth(
         dangerouslyAllowBrowser: true,
       });
 
+      const maxTokens =
+        options?.maxTokens || Math.floor(model.maxTokens / 3);
+
       const params: MessageCreateParamsStreaming = {
         model: model.id,
         messages: convertPiMessagesToAnthropic(context.messages, isOAuth),
-        max_tokens: options?.maxTokens || Math.floor(model.maxTokens / 3),
+        max_tokens: maxTokens,
         stream: true,
       };
 
@@ -123,7 +126,7 @@ export function streamAnthropicOAuth(
       if (context.tools?.length)
         params.tools = convertPiToolsToAnthropic(context.tools, isOAuth);
 
-      if (options?.reasoning && model.reasoning) {
+      if (options?.reasoning && model.reasoning && maxTokens > 1) {
         const defaultBudgets: Record<string, number> = {
           minimal: 1024,
           low: 4096,
@@ -135,10 +138,12 @@ export function streamAnthropicOAuth(
           options.thinkingBudgets?.[
             options.reasoning as keyof typeof options.thinkingBudgets
           ];
+        const requestedBudget =
+          customBudget ?? defaultBudgets[options.reasoning] ?? 10240;
+
         params.thinking = {
           type: "enabled",
-          budget_tokens:
-            customBudget ?? defaultBudgets[options.reasoning] ?? 10240,
+          budget_tokens: Math.min(requestedBudget, maxTokens - 1),
         };
       }