@fractaal/pi-ai 0.86.8 → 1.4.1

package/dist/api/anthropic-messages.js

@@ -4,17 +4,19 @@ 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 } 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 { buildCopilotDynamicHeaders, hasCopilotVisionInput } from "./github-copilot-headers.js";
 import { adjustMaxTokensForThinking, buildBaseOptions, clampMaxTokensToContext } from "./simple-options.js";
-import { transformMessages } from "./transform-messages.js";
+import { splitErrorToolResultImages, transformMessages } from "./transform-messages.js";
 /**
  * Resolve cache retention preference.
  * Defaults to "short" and uses PI_CACHE_RETENTION for backward compatibility.
@@ -75,6 +77,16 @@ const fromClaudeCodeName = (name, tools) => {
     }
     return name;
 };
+function convertImageBlock(image) {
+    return {
+        type: "image",
+        source: {
+            type: "base64",
+            media_type: image.mimeType,
+            data: image.data,
+        },
+    };
+}
 /**
  * Convert content blocks to Anthropic API format
  */
@@ -92,14 +104,7 @@ function convertContentBlocks(content) {
                 text: sanitizeSurrogates(block.text),
             };
         }
-        return {
-            type: "image",
-            source: {
-                type: "base64",
-                media_type: block.mimeType,
-                data: block.data,
-            },
-        };
+        return convertImageBlock(block);
     });
     // If only images (no text), add placeholder text block
     const hasText = blocks.some((b) => b.type === "text");
@@ -157,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;
@@ -378,14 +380,12 @@ export const stream = (model, context, options) => {
     const normalizedContext = resolveTranscript(context, getAnthropicCompat(model).supportsMidConvoSystemMessages);
     const currentTools = getCurrentTools(normalizedContext.messages);
     (async () => {
-        const providerThinkingLevel = model.compat?.supportsMidConvoEffort ? (options?.effort ?? "high") : undefined;
         const output = {
             role: "assistant",
             content: [],
             api: model.api,
             provider: model.provider,
             model: model.id,
-            ...(providerThinkingLevel === undefined ? {} : { providerThinkingLevel }),
             usage: {
                 input: 0,
                 output: 0,
@@ -421,28 +421,67 @@ 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;
             }
-            let params = buildParams(model, normalizedContext, isOAuth, options);
-            const nextParams = await options?.onPayload?.(params, model);
-            if (nextParams !== undefined) {
-                params = { ...nextParams, stream: true };
-            }
             const requestOptions = {
                 ...(options?.signal ? { signal: options.signal } : {}),
                 ...(options?.timeoutMs !== undefined ? { timeout: options.timeoutMs } : {}),
                 maxRetries: 0,
             };
-            const response = await retryProviderRequest(() => client.beta.messages.create(params, requestOptions).asResponse(), {
-                maxRetries: options?.maxRetries,
-                maxRetryDelayMs: options?.maxRetryDelayMs,
-                signal: options?.signal,
-            });
+            let disablePreferredStrictTools = false;
+            let response;
+            for (;;) {
+                options?.signal?.throwIfAborted();
+                const built = buildParams(model, normalizedContext, isOAuth, options, disablePreferredStrictTools);
+                if (built.providerThinkingLevel)
+                    output.providerThinkingLevel = built.providerThinkingLevel;
+                let params = built.params;
+                const nextParams = await options?.onPayload?.(params, model);
+                if (nextParams !== undefined) {
+                    params = { ...nextParams, stream: true };
+                }
+                try {
+                    response = await retryProviderRequest(() => client.beta.messages.create(params, requestOptions).asResponse(), {
+                        maxRetries: options?.maxRetries,
+                        maxRetryDelayMs: options?.maxRetryDelayMs,
+                        signal: options?.signal,
+                    });
+                    break;
+                }
+                catch (error) {
+                    // Only downgrade a rejected request, never an already-started stream.
+                    if (options?.signal?.aborted ||
+                        disablePreferredStrictTools ||
+                        !built.hasPreferredStrictTools ||
+                        !(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))) {
+                        throw error;
+                    }
+                    disablePreferredStrictTools = true;
+                    appendAssistantMessageDiagnostic(output, {
+                        type: "anthropic_strict_tools_fallback",
+                        timestamp: Date.now(),
+                        error: { message: error.message },
+                        details: { reason: "strict_tool_limits_exceeded" },
+                    });
+                }
+            }
             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") {
@@ -477,105 +516,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",
@@ -592,11 +618,8 @@ export const stream = (model, context, options) => {
                                 partial: output,
                             });
                         }
-                        else if (block.type === "toolCall") {
-                            block.arguments = parseStreamingJson(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,
@@ -648,6 +671,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) {
@@ -676,11 +704,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 });
@@ -748,7 +771,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({
@@ -757,14 +780,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,
@@ -772,7 +795,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}`,
@@ -788,7 +811,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);
@@ -855,7 +878,7 @@ function getBetaFeatures(model, context, isOAuthToken, nativeToolChanges, option
         features.push(INLINE_TOOLS_BETA);
     return [...new Set(features)];
 }
-function buildParams(model, context, isOAuthToken, options) {
+function buildParams(model, context, isOAuthToken, options, disablePreferredStrictTools = false) {
     const { cacheControl } = getCacheControl(model, options?.cacheRetention, options?.env);
     const compat = getAnthropicCompat(model);
     const initialSystemMessage = getInitialSystemMessage(context.messages);
@@ -866,18 +889,28 @@ function buildParams(model, context, isOAuthToken, options) {
     // by value in a `tool_addition` block, which also expresses same-name redefinitions.
     // Anthropic rejects a tool list where every tool is deferred, so there must be an initial
     // active tool to anchor the placeholder. Otherwise the current tool list is sent.
+    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";
+        })) {
+            hasPreferredStrictTools = true;
+        }
+        return definitions;
+    };
     const initialTools = initialSystemMessage?.toolsAdded ?? [];
     const nativeToolChanges = compat.supportsMidConvoSystemMessages && compat.supportsMidConvoToolChanges && initialTools.length > 0;
-    const converted = convertMessages(conversationMessages, isOAuthToken, cacheControl, compat.allowEmptySignature, model.compat?.supportsMidConvoEffort === true ? model.provider : undefined, nativeToolChanges
-        ? (tools) => convertTools(tools, isOAuthToken, compat.supportsEagerToolInputStreaming, compat.supportsStrictTools)
-        : undefined);
+    const thinkingDisabled = model.reasoning && options?.thinkingEnabled === false && model.thinkingLevelMap?.off !== null;
+    // Effort cannot change between messages while thinking is disabled, so "off" sends no effort markers.
+    const effortMessages = model.compat?.supportsMidConvoEffort === true && !thinkingDisabled;
+    const converted = convertMessages(conversationMessages, isOAuthToken, cacheControl, compat.allowEmptySignature, effortMessages ? model.provider : undefined, nativeToolChanges ? convertToolDefinitions : undefined);
     const activeEffort = options?.effort ?? "high";
     const betaFeatures = getBetaFeatures(model, context, isOAuthToken, nativeToolChanges, options);
     const params = {
         model: model.id,
-        messages: model.compat?.supportsMidConvoEffort === true
-            ? insertThinkingLevelMessages(converted, activeEffort)
-            : converted.messages,
+        messages: effortMessages ? insertThinkingLevelMessages(converted, activeEffort) : converted.messages,
         max_tokens: options?.maxTokens ?? model.maxTokens,
         stream: true,
         ...(betaFeatures.length > 0 ? { betas: betaFeatures } : {}),
@@ -922,50 +955,50 @@ function buildParams(model, context, isOAuthToken, options) {
         // placeholder. The list never changes afterwards: later tools are defined by value in
         // `tool_addition` blocks and withdrawn by `tool_removal`, so the cached prefix survives
         // every tool change.
-        params.tools = [
-            ...convertTools(initialTools, isOAuthToken, compat.supportsEagerToolInputStreaming, compat.supportsStrictTools, toolCacheControl),
-            DEFERRED_TOOL_PLACEHOLDER,
-        ];
+        params.tools = [...convertToolDefinitions(initialTools, toolCacheControl), DEFERRED_TOOL_PLACEHOLDER];
     }
     else {
         const tools = getCurrentTools(context.messages);
         if (tools.length > 0) {
-            params.tools = convertTools(tools, isOAuthToken, compat.supportsEagerToolInputStreaming, compat.supportsStrictTools, toolCacheControl);
+            params.tools = convertToolDefinitions(tools, toolCacheControl);
         }
     }
-    // Managed effort models always use adaptive thinking so prefix mismatches can
-    // be dropped instead of surfacing as persistent 400 responses.
-    if (model.compat?.supportsMidConvoEffort === true) {
+    if (thinkingDisabled) {
+        // No effort is sent, so the model default applies. Anthropic rejects `block_binding`
+        // with disabled thinking.
+        params.thinking = { type: "disabled" };
+    }
+    else if (effortMessages) {
+        // Managed effort models use adaptive thinking so prefix mismatches can
+        // be dropped instead of surfacing as persistent 400 responses.
         params.thinking = {
             type: "adaptive",
             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) {
-        if (options?.thinkingEnabled) {
-            // Default to "summarized" so Opus 4.7 and Mythos Preview behave like
-            // older Claude 4 models (whose API default is also "summarized").
-            const display = options.thinkingDisplay ?? "summarized";
-            if (model.compat?.forceAdaptiveThinking === true) {
-                // Adaptive thinking: Claude decides when and how much to think.
-                params.thinking = { type: "adaptive", display };
-                if (options.effort) {
-                    params.output_config = { effort: options.effort };
-                }
-            }
-            else {
-                // Budget-based thinking for older models
-                params.thinking = {
-                    type: "enabled",
-                    budget_tokens: options.thinkingBudgetTokens || 1024,
-                    display,
-                };
+    else if (model.reasoning && options?.thinkingEnabled) {
+        // Default to "summarized" so Opus 4.7 and Mythos Preview behave like
+        // older Claude 4 models (whose API default is also "summarized").
+        const display = options.thinkingDisplay ?? "summarized";
+        if (model.compat?.forceAdaptiveThinking === true) {
+            // Adaptive thinking: Claude decides when and how much to think.
+            params.thinking = { type: "adaptive", display };
+            if (options.effort) {
+                params.output_config = { effort: options.effort };
             }
         }
-        else if (options?.thinkingEnabled === false && model.thinkingLevelMap?.off !== null) {
-            params.thinking = { type: "disabled" };
+        else {
+            // Budget-based thinking for older models
+            params.thinking = {
+                type: "enabled",
+                budget_tokens: options.thinkingBudgetTokens || 1024,
+                display,
+            };
         }
     }
     if (options?.metadata) {
@@ -986,17 +1019,17 @@ function buildParams(model, context, isOAuthToken, options) {
     if (allowedFallbackModels && allowedFallbackModels.length > 0) {
         params.fallbacks = allowedFallbackModels.map((fallback) => ({ model: fallback.model }));
     }
-    return params;
+    return { params, hasPreferredStrictTools, providerThinkingLevel: effortMessages ? activeEffort : undefined };
 }
 // Normalize tool call IDs to match Anthropic's required pattern and length
 function normalizeToolCallId(id) {
     return id.replace(/[^a-zA-Z0-9_-]/g, "_").slice(0, 64);
 }
-function convertToolResult(msg) {
+function convertToolResult(msg, content = msg.content) {
     return {
         type: "tool_result",
         tool_use_id: msg.toolCallId,
-        content: convertContentBlocks(msg.content),
+        content: convertContentBlocks(content),
         is_error: msg.isError,
     };
 }
@@ -1006,7 +1039,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.
@@ -1061,14 +1096,7 @@ convertToolDefinitions) {
                         };
                     }
                     else {
-                        return {
-                            type: "image",
-                            source: {
-                                type: "base64",
-                                media_type: item.mimeType,
-                                data: item.data,
-                            },
-                        };
+                        return convertImageBlock(item);
                     }
                 });
                 const filteredBlocks = blocks.filter((b) => {
@@ -1086,7 +1114,6 @@ convertToolDefinitions) {
             }
         }
         else if (msg.role === "assistant") {
-            flushPendingSystemMessages();
             const blocks = [];
             for (const block of msg.content) {
                 if (block.type === "text") {
@@ -1144,6 +1171,7 @@ convertToolDefinitions) {
             }
             if (blocks.length === 0)
                 continue;
+            flushPendingSystemMessages();
             const messageIndex = params.length;
             params.push({
                 role: "assistant",
@@ -1159,16 +1187,24 @@ convertToolDefinitions) {
         else if (msg.role === "toolResult") {
             // Collect all consecutive toolResult messages, needed for z.ai Anthropic endpoint.
             const toolResults = [];
+            // Anthropic rejects error tool results that contain anything but text, so their images follow
+            // all tool results of the turn, which must come first in the user message (#10794).
+            const errorImages = [];
             let j = i;
             while (j < transformedMessages.length && transformedMessages[j].role === "toolResult") {
-                toolResults.push(convertToolResult(transformedMessages[j]));
+                const toolMsg = transformedMessages[j];
+                const split = splitErrorToolResultImages(toolMsg);
+                toolResults.push(convertToolResult(toolMsg, split?.content));
+                if (split) {
+                    errorImages.push({ type: "text", text: split.caption }, ...split.images.map(convertImageBlock));
+                }
                 j++;
             }
             // Skip the messages we've already processed.
             i = j - 1;
             params.push({
                 role: "user",
-                content: toolResults,
+                content: [...toolResults, ...errorImages],
             });
         }
     }
@@ -1255,11 +1291,14 @@ const isAnthropicStrictUnsupportedKeyword = (key, value) => {
         return typeof value !== "string" || !ANTHROPIC_STRICT_STRING_FORMATS.has(value);
     return false;
 };
-function convertTools(tools, isOAuthToken, supportsEagerToolInputStreaming, supportsStrictTools, cacheControl) {
+function convertTools(tools, isOAuthToken, supportsEagerToolInputStreaming, supportsStrictTools, cacheControl, disablePreferredStrictTools = false) {
     if (!tools)
         return [];
     return tools.map((tool, index) => {
-        const strict = resolveJsonSchemaStrictSampling(tool, supportsStrictTools, isAnthropicStrictUnsupportedKeyword);
+        const config = tool.constrainedSampling;
+        const strict = disablePreferredStrictTools && config && config.type === "json_schema" && config.strict === "prefer"
+            ? undefined
+            : resolveJsonSchemaStrictSampling(tool, supportsStrictTools, isAnthropicStrictUnsupportedKeyword);
         const parameters = getJsonSchemaToolParameters(tool, strict);
         const schema = parameters;
         const legacyInputSchema = {