@caupulican/pi-ai 0.81.39 → 0.81.41

package/dist/providers/anthropic.js

@@ -3,8 +3,10 @@ import { calculateCost } from "../models.js";
 import { AssistantMessageEventStream } from "../utils/event-stream.js";
 import { headersToRecord } from "../utils/headers.js";
 import { parseJsonWithRepair, parseStreamingJson } from "../utils/json-parse.js";
+import { retryProviderRequest } from "../utils/provider-retry.js";
 import { sanitizeSurrogates } from "../utils/sanitize-unicode.js";
 import { StreamingLineDecoder } from "../utils/streaming-lines.js";
+import { createToolNameMap } from "../utils/tool-names.js";
 import { resolveCloudflareBaseUrl } from "./cloudflare.js";
 import { buildCopilotDynamicHeaders, hasCopilotVisionInput } from "./github-copilot-headers.js";
 import { adjustMaxTokensForThinking, buildBaseOptions } from "./simple-options.js";
@@ -60,15 +62,6 @@ const claudeCodeTools = [
 const ccToolLookup = new Map(claudeCodeTools.map((t) => [t.toLowerCase(), t]));
 // Convert tool name to CC canonical casing if it matches (case-insensitive)
 const toClaudeCodeName = (name) => ccToolLookup.get(name.toLowerCase()) ?? name;
-const fromClaudeCodeName = (name, tools) => {
-    if (tools && tools.length > 0) {
-        const lowerName = name.toLowerCase();
-        const matchedTool = tools.find((tool) => tool.name.toLowerCase() === lowerName);
-        if (matchedTool)
-            return matchedTool.name;
-    }
-    return name;
-};
 /**
  * Convert content blocks to Anthropic API format
  */
@@ -112,6 +105,7 @@ function getAnthropicCompat(model) {
     const isFireworks = model.provider === "fireworks";
     const isCloudflareAiGatewayAnthropic = model.provider === "cloudflare-ai-gateway" && model.baseUrl.includes("anthropic");
     return {
+        authFormat: model.compat?.authFormat ?? "api-key",
         supportsEagerToolInputStreaming: model.compat?.supportsEagerToolInputStreaming ?? !isFireworks,
         supportsLongCacheRetention: model.compat?.supportsLongCacheRetention ?? !isFireworks,
         sendSessionAffinityHeaders: model.compat?.sendSessionAffinityHeaders ?? !!(isFireworks || isCloudflareAiGatewayAnthropic),
@@ -129,6 +123,9 @@ function mergeHeaders(...headerSources) {
     }
     return merged;
 }
+function hasAuthorizationHeader(...headerSources) {
+    return headerSources.some((headers) => Object.entries(headers ?? {}).some(([name, value]) => name.toLowerCase() === "authorization" && value.trim().length > 0));
+}
 const ANTHROPIC_MESSAGE_EVENTS = new Set([
     "message_start",
     "message_delta",
@@ -281,7 +278,7 @@ export const streamAnthropic = (model, context, options) => {
             }
             else {
                 const apiKey = options?.apiKey;
-                if (!apiKey) {
+                if (!apiKey && !hasAuthorizationHeader(model.headers, options?.headers)) {
                     throw new Error(`No API key for provider: ${model.provider}`);
                 }
                 let copilotDynamicHeaders;
@@ -298,7 +295,8 @@ export const streamAnthropic = (model, context, options) => {
                 client = created.client;
                 isOAuth = created.isOAuthToken;
             }
-            let params = buildParams(model, context, isOAuth, options);
+            const toolNameMap = createToolNameMap(context.tools ?? [], isOAuth ? { normalizeName: toClaudeCodeName } : undefined);
+            let params = buildParams(model, context, isOAuth, toolNameMap, options);
             const nextParams = await options?.onPayload?.(params, model);
             if (nextParams !== undefined) {
                 params = nextParams;
@@ -306,9 +304,13 @@ export const streamAnthropic = (model, context, options) => {
             const requestOptions = {
                 ...(options?.signal ? { signal: options.signal } : {}),
                 ...(options?.timeoutMs !== undefined ? { timeout: options.timeoutMs } : {}),
-                maxRetries: options?.maxRetries ?? 0,
+                maxRetries: 0,
             };
-            const response = await client.messages.create({ ...params, stream: true }, requestOptions).asResponse();
+            const response = await retryProviderRequest(() => client.messages.create({ ...params, stream: true }, requestOptions).asResponse(), {
+                maxRetries: options?.maxRetries,
+                maxRetryDelayMs: options?.maxRetryDelayMs,
+                signal: options?.signal,
+            });
             await options?.onResponse?.({ status: response.status, headers: headersToRecord(response.headers) }, model);
             stream.push({ type: "start", partial: output });
             const blocks = output.content;
@@ -364,9 +366,7 @@ export const streamAnthropic = (model, context, options) => {
                         const block = {
                             type: "toolCall",
                             id: event.content_block.id,
-                            name: isOAuth
-                                ? fromClaudeCodeName(event.content_block.name, context.tools)
-                                : event.content_block.name,
+                            name: toolNameMap.toOriginalName(event.content_block.name),
                             arguments: event.content_block.input ?? {},
                             partialJson: "",
                             index: event.index,
@@ -468,24 +468,27 @@ export const streamAnthropic = (model, context, options) => {
                     }
                     // Only update usage fields if present (not null).
                     // Preserves input_tokens from message_start when proxies omit it in message_delta.
-                    if (event.usage.input_tokens != null) {
-                        output.usage.input = event.usage.input_tokens;
-                    }
-                    if (event.usage.output_tokens != null) {
-                        output.usage.output = event.usage.output_tokens;
-                    }
-                    if (event.usage.cache_read_input_tokens != null) {
-                        output.usage.cacheRead = event.usage.cache_read_input_tokens;
-                    }
-                    if (event.usage.cache_creation_input_tokens != null) {
-                        output.usage.cacheWrite = event.usage.cache_creation_input_tokens;
+                    if (event.usage) {
+                        if (event.usage.input_tokens != null) {
+                            output.usage.input = event.usage.input_tokens;
+                        }
+                        if (event.usage.output_tokens != null) {
+                            output.usage.output = event.usage.output_tokens;
+                        }
+                        if (event.usage.cache_read_input_tokens != null) {
+                            output.usage.cacheRead = event.usage.cache_read_input_tokens;
+                        }
+                        if (event.usage.cache_creation_input_tokens != null) {
+                            output.usage.cacheWrite = event.usage.cache_creation_input_tokens;
+                        }
+                        const providerCost = event.usage.cost;
+                        if (providerCost !== undefined) {
+                            output.usage.cost.total = providerCost || 0;
+                        }
                     }
                     // Anthropic doesn't provide total_tokens, compute from components
                     output.usage.totalTokens =
                         output.usage.input + output.usage.output + output.usage.cacheRead + output.usage.cacheWrite;
-                    if (event.usage.cost !== undefined) {
-                        output.usage.cost.total = event.usage.cost || 0;
-                    }
                     calculateCost(model, output.usage);
                 }
             }
@@ -534,7 +537,7 @@ function mapThinkingLevelToEffort(model, level) {
 }
 export const streamSimpleAnthropic = (model, context, options) => {
     const apiKey = options?.apiKey;
-    if (!apiKey) {
+    if (!apiKey && !hasAuthorizationHeader(model.headers, options?.headers)) {
         throw new Error(`No API key for provider: ${model.provider}`);
     }
     const base = buildBaseOptions(model, options, apiKey);
@@ -574,6 +577,23 @@ function createClient(model, apiKey, interleavedThinking, useFineGrainedToolStre
     if (needsInterleavedBeta) {
         betaFeatures.push(INTERLEAVED_THINKING_BETA);
     }
+    if (!apiKey && hasAuthorizationHeader(model.headers, optionsHeaders)) {
+        const client = new Anthropic({
+            apiKey: null,
+            authToken: null,
+            baseURL: model.provider === "cloudflare-ai-gateway" ? resolveCloudflareBaseUrl(model) : model.baseUrl,
+            dangerouslyAllowBrowser: true,
+            defaultHeaders: mergeHeaders({
+                accept: "application/json",
+                "anthropic-dangerous-direct-browser-access": "true",
+                ...(betaFeatures.length > 0 ? { "anthropic-beta": betaFeatures.join(",") } : {}),
+            }, model.headers, optionsHeaders),
+        });
+        return { client, isOAuthToken: false };
+    }
+    if (!apiKey) {
+        throw new Error(`No API key for provider: ${model.provider}`);
+    }
     if (model.provider === "cloudflare-ai-gateway") {
         const client = new Anthropic({
             apiKey: null,
@@ -591,6 +611,20 @@ function createClient(model, apiKey, interleavedThinking, useFineGrainedToolStre
         });
         return { client, isOAuthToken: false };
     }
+    if (getAnthropicCompat(model).authFormat === "bearer") {
+        const client = new Anthropic({
+            apiKey: null,
+            authToken: apiKey,
+            baseURL: model.baseUrl,
+            dangerouslyAllowBrowser: true,
+            defaultHeaders: mergeHeaders({
+                accept: "application/json",
+                "anthropic-dangerous-direct-browser-access": "true",
+                ...(betaFeatures.length > 0 ? { "anthropic-beta": betaFeatures.join(",") } : {}),
+            }, model.headers, dynamicHeaders, optionsHeaders),
+        });
+        return { client, isOAuthToken: false };
+    }
     // Copilot: Bearer auth, selective betas.
     if (model.provider === "github-copilot") {
         const client = new Anthropic({
@@ -638,12 +672,12 @@ function createClient(model, apiKey, interleavedThinking, useFineGrainedToolStre
     });
     return { client, isOAuthToken: false };
 }
-function buildParams(model, context, isOAuthToken, options) {
+function buildParams(model, context, isOAuthToken, toolNameMap, options) {
     const { cacheControl } = getCacheControl(model, options?.cacheRetention);
     const compat = getAnthropicCompat(model);
     const params = {
         model: model.id,
-        messages: convertMessages(context.messages, model, isOAuthToken, cacheControl, compat.allowEmptySignature),
+        messages: convertMessages(context.messages, model, toolNameMap, cacheControl, compat.allowEmptySignature),
         max_tokens: options?.maxTokens ?? model.maxTokens,
         stream: true,
     };
@@ -680,7 +714,7 @@ function buildParams(model, context, isOAuthToken, options) {
         params.temperature = options.temperature;
     }
     if (context.tools && context.tools.length > 0) {
-        params.tools = convertTools(context.tools, isOAuthToken, compat.supportsEagerToolInputStreaming, compat.supportsCacheControlOnTools ? cacheControl : undefined);
+        params.tools = convertTools(context.tools, toolNameMap, compat.supportsEagerToolInputStreaming, compat.supportsCacheControlOnTools ? cacheControl : undefined);
     }
     // Configure thinking mode: adaptive, budget-based, or explicitly disabled.
     if (model.reasoning) {
@@ -723,7 +757,8 @@ function buildParams(model, context, isOAuthToken, options) {
             params.tool_choice = { type: options.toolChoice };
         }
         else {
-            params.tool_choice = options.toolChoice;
+            const providerName = toolNameMap.toProviderName(options.toolChoice.name);
+            params.tool_choice = { type: "tool", name: providerName };
         }
     }
     return params;
@@ -732,7 +767,7 @@ function buildParams(model, context, isOAuthToken, options) {
 function normalizeToolCallId(id) {
     return id.replace(/[^a-zA-Z0-9_-]/g, "_").slice(0, 64);
 }
-function convertMessages(messages, model, isOAuthToken, cacheControl, allowEmptySignature = false) {
+function convertMessages(messages, model, toolNameMap, cacheControl, allowEmptySignature = false) {
     const params = [];
     // Transform messages for cross-provider compatibility
     const transformedMessages = transformMessages(messages, model, normalizeToolCallId);
@@ -825,12 +860,14 @@ function convertMessages(messages, model, isOAuthToken, cacheControl, allowEmpty
                         });
                         continue;
                     }
-                    if (block.thinking.trim().length === 0)
+                    const thinkingSignature = block.thinkingSignature;
+                    const hasThinkingSignature = !!thinkingSignature && thinkingSignature.trim().length > 0;
+                    if (block.thinking.trim().length === 0 && !hasThinkingSignature)
                         continue;
                     // If thinking signature is missing/empty (e.g., from aborted stream),
                     // convert to plain text for Anthropic. Some compatible providers emit
                     // and accept empty signatures, so let marked models preserve the block.
-                    if (!block.thinkingSignature || block.thinkingSignature.trim().length === 0) {
+                    if (!hasThinkingSignature) {
                         blocks.push(allowEmptySignature
                             ? {
                                 type: "thinking",
@@ -846,7 +883,7 @@ function convertMessages(messages, model, isOAuthToken, cacheControl, allowEmpty
                         blocks.push({
                             type: "thinking",
                             thinking: sanitizeSurrogates(block.thinking),
-                            signature: block.thinkingSignature,
+                            signature: thinkingSignature,
                         });
                     }
                 }
@@ -854,7 +891,7 @@ function convertMessages(messages, model, isOAuthToken, cacheControl, allowEmpty
                     blocks.push({
                         type: "tool_use",
                         id: block.id,
-                        name: isOAuthToken ? toClaudeCodeName(block.name) : block.name,
+                        name: toolNameMap.toProviderName(block.name),
                         input: block.arguments ?? {},
                     });
                 }
@@ -924,13 +961,13 @@ function convertMessages(messages, model, isOAuthToken, cacheControl, allowEmpty
 function shouldUseFineGrainedToolStreamingBeta(model, context) {
     return !!context.tools?.length && !getAnthropicCompat(model).supportsEagerToolInputStreaming;
 }
-function convertTools(tools, isOAuthToken, supportsEagerToolInputStreaming, cacheControl) {
+function convertTools(tools, toolNameMap, supportsEagerToolInputStreaming, cacheControl) {
     if (!tools)
         return [];
     return tools.map((tool, index) => {
         const schema = tool.parameters;
         return {
-            name: isOAuthToken ? toClaudeCodeName(tool.name) : tool.name,
+            name: toolNameMap.toProviderName(tool.name),
             description: tool.description,
             ...(supportsEagerToolInputStreaming ? { eager_input_streaming: true } : {}),
             input_schema: {