@earendil-works/pi-ai 1.3.0 → 1.5.0

package/dist/api/anthropic-messages.js

@@ -4,14 +4,16 @@ import { calculateCost } from "../models.js";
 import { appendAssistantMessageDiagnostic } from "../utils/diagnostics.js";
 import { AssistantMessageEventStream } from "../utils/event-stream.js";
 import { headersToRecord } from "../utils/headers.js";
-import { parseJsonWithRepair, parseStreamingJson, parseToolCallArguments } from "../utils/json-parse.js";
-import { getPiUserAgent } from "../utils/pi-user-agent.js";
+import { getIdentityHeaders } from "../utils/identity.js";
+import { parseJsonWithRepair } from "../utils/json-parse.js";
+import { applyOpenRouterReportedCost, isOpenRouterModel, } from "../utils/openrouter-cost.js";
 import { getProviderEnvValue } from "../utils/provider-env.js";
 import { retryProviderRequest } from "../utils/provider-retry.js";
 import { sanitizeSurrogates } from "../utils/sanitize-unicode.js";
+import { ToolCallArgumentsStream } from "../utils/streaming-json.js";
 import { getSystemMessageText, renderSystemMessageUpdate } from "../utils/text.js";
 import { getCurrentTools, getInitialSystemMessage, resolveTranscript, } from "../utils/transcript.js";
-import { getJsonSchemaToolParameters, resolveJsonSchemaStrictSampling, } from "./constrained-sampling.js";
+import { getJsonSchemaToolParameters, isStrictToolLimitErrorMessage, prefersJsonSchemaStrictSampling, resolveJsonSchemaStrictSampling, } from "./constrained-sampling.js";
 import { buildCopilotDynamicHeaders, hasCopilotVisionInput } from "./github-copilot-headers.js";
 import { adjustMaxTokensForThinking, buildBaseOptions, clampMaxTokensToContext } from "./simple-options.js";
 import { splitErrorToolResultImages, transformMessages } from "./transform-messages.js";
@@ -160,9 +162,6 @@ function mergeHeaders(...headerSources) {
     }
     return merged;
 }
-function mergeClientHeaders(...headerSources) {
-    return mergeHeaders({ "User-Agent": getPiUserAgent() }, ...headerSources);
-}
 function hasHeader(headers, name) {
     if (!headers)
         return false;
@@ -422,7 +421,7 @@ export const stream = (model, context, options) => {
                 }
                 const cacheRetention = resolveCacheRetention(options?.cacheRetention, options?.env);
                 const cacheSessionId = cacheRetention === "none" ? undefined : options?.sessionId;
-                const created = createClient(model, apiKey, options?.headers, options?.fetch, copilotDynamicHeaders, cacheSessionId, federation);
+                const created = createClient(model, apiKey, options?.headers, options?.fetch, copilotDynamicHeaders, cacheSessionId, federation, options?.identity);
                 client = created.client;
                 isOAuth = created.isOAuthToken;
             }
@@ -459,11 +458,7 @@ export const stream = (model, context, options) => {
                         !(error instanceof Anthropic.APIError) ||
                         error.status !== 400 ||
                         error.type !== "invalid_request_error" ||
-                        ![
-                            "The compiled grammar is too large",
-                            "Too many strict tools (",
-                            "Schemas contains too many parameters with union types (",
-                        ].some((message) => error.message.includes(message))) {
+                        !isStrictToolLimitErrorMessage(error.message)) {
                         throw error;
                     }
                     disablePreferredStrictTools = true;
@@ -477,7 +472,12 @@ export const stream = (model, context, options) => {
             }
             await options?.onResponse?.({ status: response.status, headers: headersToRecord(response.headers) }, model);
             stream.push({ type: "start", partial: output });
-            const blocks = output.content;
+            // Stream state per Anthropic block index, kept off the content blocks so it never reaches partials.
+            const openBlocks = new Map();
+            const openBlock = (anthropicIndex) => {
+                const open = openBlocks.get(anthropicIndex);
+                return open === undefined ? undefined : { ...open, block: output.content[open.contentIndex] };
+            };
             for await (const event of iterateAnthropicEvents(response, options?.signal)) {
                 await options?.onProviderStreamEvent?.(event, model);
                 if (event.type === "message_start") {
@@ -512,105 +512,92 @@ export const stream = (model, context, options) => {
                         continue;
                     }
                     if (event.content_block.type === "text") {
-                        const block = {
-                            type: "text",
-                            text: event.content_block.text ?? "",
-                            index: event.index,
-                        };
-                        output.content.push(block);
+                        output.content.push({ type: "text", text: event.content_block.text ?? "" });
+                        openBlocks.set(event.index, { contentIndex: output.content.length - 1 });
                         stream.push({ type: "text_start", contentIndex: output.content.length - 1, partial: output });
                     }
                     else if (event.content_block.type === "thinking") {
-                        const block = {
+                        output.content.push({
                             type: "thinking",
                             thinking: event.content_block.thinking ?? "",
                             thinkingSignature: event.content_block.signature ?? "",
-                            index: event.index,
-                        };
-                        output.content.push(block);
+                        });
+                        openBlocks.set(event.index, { contentIndex: output.content.length - 1 });
                         stream.push({ type: "thinking_start", contentIndex: output.content.length - 1, partial: output });
                     }
                     else if (event.content_block.type === "redacted_thinking") {
-                        const block = {
+                        output.content.push({
                             type: "thinking",
                             thinking: "[Reasoning redacted]",
                             thinkingSignature: event.content_block.data,
                             redacted: true,
-                            index: event.index,
-                        };
-                        output.content.push(block);
+                        });
+                        openBlocks.set(event.index, { contentIndex: output.content.length - 1 });
                         stream.push({ type: "thinking_start", contentIndex: output.content.length - 1, partial: output });
                     }
                     else if (event.content_block.type === "tool_use") {
-                        const block = {
+                        output.content.push({
                             type: "toolCall",
                             id: event.content_block.id,
                             name: isOAuth
                                 ? fromClaudeCodeName(event.content_block.name, currentTools)
                                 : event.content_block.name,
                             arguments: event.content_block.input ?? {},
-                            partialJson: "",
-                            index: event.index,
-                        };
-                        output.content.push(block);
+                        });
+                        openBlocks.set(event.index, {
+                            contentIndex: output.content.length - 1,
+                            arguments: new ToolCallArgumentsStream(),
+                        });
                         stream.push({ type: "toolcall_start", contentIndex: output.content.length - 1, partial: output });
                     }
                 }
                 else if (event.type === "content_block_delta") {
+                    const open = openBlock(event.index);
                     if (event.delta.type === "text_delta") {
-                        const index = blocks.findIndex((b) => b.index === event.index);
-                        const block = blocks[index];
-                        if (block && block.type === "text") {
-                            block.text += event.delta.text;
+                        if (open?.block.type === "text") {
+                            open.block.text += event.delta.text;
                             stream.push({
                                 type: "text_delta",
-                                contentIndex: index,
+                                contentIndex: open.contentIndex,
                                 delta: event.delta.text,
                                 partial: output,
                             });
                         }
                     }
                     else if (event.delta.type === "thinking_delta") {
-                        const index = blocks.findIndex((b) => b.index === event.index);
-                        const block = blocks[index];
-                        if (block && block.type === "thinking") {
-                            block.thinking += event.delta.thinking;
+                        if (open?.block.type === "thinking") {
+                            open.block.thinking += event.delta.thinking;
                             stream.push({
                                 type: "thinking_delta",
-                                contentIndex: index,
+                                contentIndex: open.contentIndex,
                                 delta: event.delta.thinking,
                                 partial: output,
                             });
                         }
                     }
                     else if (event.delta.type === "input_json_delta") {
-                        const index = blocks.findIndex((b) => b.index === event.index);
-                        const block = blocks[index];
-                        if (block && block.type === "toolCall") {
-                            block.partialJson += event.delta.partial_json;
-                            block.arguments = parseStreamingJson(block.partialJson);
+                        if (open?.block.type === "toolCall" && open.arguments !== undefined) {
+                            open.block.arguments = open.arguments.append(event.delta.partial_json);
                             stream.push({
                                 type: "toolcall_delta",
-                                contentIndex: index,
+                                contentIndex: open.contentIndex,
                                 delta: event.delta.partial_json,
                                 partial: output,
                             });
                         }
                     }
                     else if (event.delta.type === "signature_delta") {
-                        const index = blocks.findIndex((b) => b.index === event.index);
-                        const block = blocks[index];
-                        if (block && block.type === "thinking") {
-                            block.thinkingSignature = block.thinkingSignature || "";
-                            block.thinkingSignature += event.delta.signature;
+                        if (open?.block.type === "thinking") {
+                            open.block.thinkingSignature = open.block.thinkingSignature || "";
+                            open.block.thinkingSignature += event.delta.signature;
                         }
                     }
                 }
                 else if (event.type === "content_block_stop") {
-                    const index = blocks.findIndex((b) => b.index === event.index);
-                    const block = blocks[index];
-                    if (block) {
-                        delete block.index;
+                    const open = openBlock(event.index);
+                    openBlocks.delete(event.index);
+                    if (open) {
+                        const { block, contentIndex: index } = open;
                         if (block.type === "text") {
                             stream.push({
                                 type: "text_end",
@@ -627,11 +614,8 @@ export const stream = (model, context, options) => {
                                 partial: output,
                             });
                         }
-                        else if (block.type === "toolCall") {
-                            Object.assign(block, parseToolCallArguments(block.partialJson));
-                            // Finalize in-place and strip the scratch buffer so replay only
-                            // carries parsed arguments.
-                            delete block.partialJson;
+                        else if (block.type === "toolCall" && open.arguments !== undefined) {
+                            Object.assign(block, open.arguments.finish());
                             stream.push({
                                 type: "toolcall_end",
                                 contentIndex: index,
@@ -683,6 +667,11 @@ export const stream = (model, context, options) => {
                     output.usage.totalTokens =
                         output.usage.input + output.usage.output + output.usage.cacheRead + output.usage.cacheWrite;
                     calculateCost(usageModel, output.usage);
+                    if (isOpenRouterModel(model) && event.usage) {
+                        // OpenRouter adds billing fields to streamed message_delta usage at runtime,
+                        // although its OpenAPI schema and the Anthropic SDK do not type those fields.
+                        applyOpenRouterReportedCost(output.usage, event.usage);
+                    }
                 }
             }
             if (options?.signal?.aborted) {
@@ -711,11 +700,6 @@ export const stream = (model, context, options) => {
             stream.end();
         }
         catch (error) {
-            for (const block of output.content) {
-                delete block.index;
-                // partialJson is only a streaming scratch buffer; never persist it.
-                delete block.partialJson;
-            }
             output.stopReason = options?.signal?.aborted ? "aborted" : "error";
             output.errorMessage = error instanceof Error ? error.message : JSON.stringify(error);
             stream.push({ type: "error", reason: output.stopReason, error: output });
@@ -783,7 +767,7 @@ export const streamSimple = (model, context, options) => {
 function isOAuthToken(apiKey) {
     return apiKey.includes("sk-ant-oat");
 }
-function createClient(model, apiKey, optionsHeaders, fetch, dynamicHeaders, sessionId, federation) {
+function createClient(model, apiKey, optionsHeaders, fetch, dynamicHeaders, sessionId, federation, identity) {
     // Copilot: Bearer auth.
     if (model.provider === "github-copilot") {
         const client = new PiAnthropic({
@@ -792,14 +776,14 @@ function createClient(model, apiKey, optionsHeaders, fetch, dynamicHeaders, sess
             baseURL: model.baseUrl,
             dangerouslyAllowBrowser: true,
             fetch,
-            defaultHeaders: mergeClientHeaders({
+            defaultHeaders: mergeHeaders(getIdentityHeaders(model, identity), {
                 accept: "application/json",
                 "anthropic-dangerous-direct-browser-access": "true",
             }, model.headers, dynamicHeaders, optionsHeaders),
         });
         return { client, isOAuthToken: false };
     }
-    // OAuth: Bearer auth, Claude Code identity headers
+    // OAuth: Bearer auth, Claude Code identity headers instead of the client identity.
     if (apiKey && isOAuthToken(apiKey)) {
         const client = new PiAnthropic({
             apiKey: null,
@@ -807,7 +791,7 @@ function createClient(model, apiKey, optionsHeaders, fetch, dynamicHeaders, sess
             baseURL: model.baseUrl,
             dangerouslyAllowBrowser: true,
             fetch,
-            defaultHeaders: mergeClientHeaders({
+            defaultHeaders: mergeHeaders({
                 accept: "application/json",
                 "anthropic-dangerous-direct-browser-access": "true",
                 "user-agent": `claude-cli/${claudeCodeVersion}`,
@@ -823,7 +807,7 @@ function createClient(model, apiKey, optionsHeaders, fetch, dynamicHeaders, sess
         const header = compat.sessionAffinityFormat === "openrouter" ? "x-session-id" : "x-session-affinity";
         sessionAffinityHeaders[header] = sessionId;
     }
-    const defaultHeaders = mergeClientHeaders({
+    const defaultHeaders = mergeHeaders(getIdentityHeaders(model, identity), {
         accept: "application/json",
         "anthropic-dangerous-direct-browser-access": "true",
     }, sessionAffinityHeaders, model.headers, optionsHeaders);
@@ -904,10 +888,7 @@ function buildParams(model, context, isOAuthToken, options, disablePreferredStri
     let hasPreferredStrictTools = false;
     const convertToolDefinitions = (tools, toolCacheControl) => {
         const definitions = convertTools(tools, isOAuthToken, compat.supportsEagerToolInputStreaming, compat.supportsStrictTools, toolCacheControl, disablePreferredStrictTools);
-        if (definitions.some((definition, index) => {
-            const config = tools[index].constrainedSampling;
-            return definition.strict === true && config && config.type === "json_schema" && config.strict === "prefer";
-        })) {
+        if (definitions.some((definition, index) => definition.strict === true && prefersJsonSchemaStrictSampling(tools[index]))) {
             hasPreferredStrictTools = true;
         }
         return definitions;
@@ -988,7 +969,10 @@ function buildParams(model, context, isOAuthToken, options, disablePreferredStri
             display: options?.thinkingDisplay ?? "summarized",
             block_binding: { prefix_mismatch_behavior: "drop_block" },
         };
-        params.output_config = { effort: "high" };
+        // Effort markers set the level for every reply. The top-level effort is part of the cached
+        // prompt, so it stays fixed. It is "low" because organizations can cap effort and reject
+        // requests containing any level above the cap.
+        params.output_config = { effort: "low" };
     }
     else if (model.reasoning && options?.thinkingEnabled) {
         // Default to "summarized" so Opus 4.7 and Mythos Preview behave like
@@ -1048,7 +1032,9 @@ convertToolDefinitions) {
     const params = [];
     const assistantLevels = new Map();
     // Later system messages are held back and emitted directly before the next assistant
-    // message (or at the end of the transcript). Anthropic requires `tool_result` blocks to
+    // message that is sent (or at the end of the transcript). Assistant messages that convert to
+    // no blocks are dropped, so holding past them keeps an update from landing before a user
+    // message (#11091). Anthropic requires `tool_result` blocks to
     // immediately follow their `tool_use`, so a system message between them is rejected; this
     // also mirrors where the managed-effort system messages are inserted. As a result an
     // update placed before a user message in the transcript lands after it on the wire.
@@ -1121,7 +1107,6 @@ convertToolDefinitions) {
             }
         }
         else if (msg.role === "assistant") {
-            flushPendingSystemMessages();
             const blocks = [];
             for (const block of msg.content) {
                 if (block.type === "text") {
@@ -1179,6 +1164,7 @@ convertToolDefinitions) {
             }
             if (blocks.length === 0)
                 continue;
+            flushPendingSystemMessages();
             const messageIndex = params.length;
             params.push({
                 role: "assistant",
@@ -1302,8 +1288,7 @@ function convertTools(tools, isOAuthToken, supportsEagerToolInputStreaming, supp
     if (!tools)
         return [];
     return tools.map((tool, index) => {
-        const config = tool.constrainedSampling;
-        const strict = disablePreferredStrictTools && config && config.type === "json_schema" && config.strict === "prefer"
+        const strict = disablePreferredStrictTools && prefersJsonSchemaStrictSampling(tool)
             ? undefined
             : resolveJsonSchemaStrictSampling(tool, supportsStrictTools, isAnthropicStrictUnsupportedKeyword);
         const parameters = getJsonSchemaToolParameters(tool, strict);