@draht/ai 2026.10.20 → 2026.10.23

package/dist/api/anthropic-messages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"anthropic-messages.d.ts","sourceRoot":"","sources":["../../src/api/anthropic-messages.ts"],"names":[],"mappings":"AAAA,OAAO,SAAiC,MAAM,mBAAmB,CAAC;AAoBlE,OAAO,KAAK,EASX,mBAAmB,EAEnB,cAAc,EACd,aAAa,EAMb,MAAM,aAAa,CAAC;AAqJrB,MAAM,MAAM,eAAe,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,KAAK,CAAC;AAE1E,MAAM,MAAM,wBAAwB,GAAG,YAAY,GAAG,SAAS,CAAC;AA2ChE,MAAM,WAAW,gBAAiB,SAAQ,aAAa;IACtD;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB;;;;;;;;;;;OAWG;IACH,eAAe,CAAC,EAAE,wBAAwB,CAAC;IAC3C;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACtE;;;;OAIG;IACH,MAAM,CAAC,EAAE,SAAS,CAAC;CACnB;AAwRD,eAAO,MAAM,MAAM,EAAE,cAAc,CAAC,oBAAoB,EAAE,gBAAgB,CA0UzE,CAAC;AA2BF,eAAO,MAAM,YAAY,EAAE,cAAc,CAAC,oBAAoB,EAAE,mBAAmB,CAgDlF,CAAC"}
+{"version":3,"file":"anthropic-messages.d.ts","sourceRoot":"","sources":["../../src/api/anthropic-messages.ts"],"names":[],"mappings":"AAAA,OAAO,SAAiC,MAAM,mBAAmB,CAAC;AAoBlE,OAAO,KAAK,EASX,mBAAmB,EAEnB,cAAc,EACd,aAAa,EAMb,MAAM,aAAa,CAAC;AAuJrB,MAAM,MAAM,eAAe,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,KAAK,CAAC;AAE1E,MAAM,MAAM,wBAAwB,GAAG,YAAY,GAAG,SAAS,CAAC;AA2ChE,MAAM,WAAW,gBAAiB,SAAQ,aAAa;IACtD;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB;;;;;;;;;;;OAWG;IACH,eAAe,CAAC,EAAE,wBAAwB,CAAC;IAC3C;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACtE;;;;OAIG;IACH,MAAM,CAAC,EAAE,SAAS,CAAC;CACnB;AAoRD,eAAO,MAAM,MAAM,EAAE,cAAc,CAAC,oBAAoB,EAAE,gBAAgB,CA2WzE,CAAC;AA2BF,eAAO,MAAM,YAAY,EAAE,cAAc,CAAC,oBAAoB,EAAE,mBAAmB,CAgDlF,CAAC"}

package/dist/api/anthropic-messages.js

@@ -2,19 +2,19 @@ import Anthropic, {} from "@anthropic-ai/sdk";
 import { ANTHROPIC_FEDERATION_RULE_ID_ENV, ANTHROPIC_IDENTITY_TOKEN_FILE_ENV, ANTHROPIC_ORGANIZATION_ID_ENV, ANTHROPIC_SERVICE_ACCOUNT_ID_ENV, ANTHROPIC_WORKSPACE_ID_ENV, } from "../env-api-keys.js";
 import { calculateCost } from "../models.js";
 import { appendAssistantMessageDiagnostic } from "../utils/diagnostics.js";
-import { getDrahtUserAgent } from "../utils/draht-user-agent.js";
 import { AssistantMessageEventStream } from "../utils/event-stream.js";
 import { headersToRecord } from "../utils/headers.js";
-import { parseJsonWithRepair, parseStreamingJson } from "../utils/json-parse.js";
+import { getIdentityHeaders } from "../utils/identity.js";
+import { parseJsonWithRepair, parseStreamingJson, parseToolCallArguments } from "../utils/json-parse.js";
 import { getProviderEnvValue } from "../utils/provider-env.js";
 import { retryProviderRequest } from "../utils/provider-retry.js";
 import { sanitizeSurrogates } from "../utils/sanitize-unicode.js";
 import { getSystemMessageText, renderSystemMessageUpdate } from "../utils/text.js";
-import { getCurrentTools, getDeclaredTools, getInitialSystemMessage, hasToolRedefinitions, resolveTranscript, } from "../utils/transcript.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 DRAHT_CACHE_RETENTION for backward compatibility.
@@ -75,6 +75,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 +102,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");
@@ -116,16 +119,16 @@ const INTERLEAVED_THINKING_BETA = "interleaved-thinking-2025-05-14";
 const SERVER_SIDE_FALLBACK_BETA = "server-side-fallback-2026-07-01";
 const MID_CONVERSATION_OUTPUT_CONFIG_BETA = "mid-conversation-output-config-2026-07-01";
 const THINKING_BINDING_CONTROLS_BETA = "thinking-binding-controls-2026-08-01";
-const MID_CONVERSATION_TOOL_CHANGES_BETA = "mid-conversation-tool-changes-2026-07-01";
+const INLINE_TOOLS_BETA = "inline-tools-2026-09-15";
 /**
  * Stable deferred tool declared whenever native tool changes are in use. Anthropic adds
- * hidden prompt scaffolding as soon as any tool has `defer_loading`; declaring this
- * placeholder from the first request keeps that scaffolding in the cached prefix, so the
- * first real late tool does not invalidate the cache (measured: full miss without it).
- * It is never activated and the model cannot see it.
+ * hidden prompt scaffolding for mid-conversation tool changes; declaring this placeholder
+ * from the first request keeps that scaffolding in the cached prefix, so the first tool
+ * change does not invalidate the cache (measured: full miss without it). It is never
+ * activated and the model cannot see it.
  */
 const DEFERRED_TOOL_PLACEHOLDER = {
-    name: "__pi_deferred_placeholder__",
+    name: "__draht_deferred_placeholder__",
     description: "Reserved placeholder. Never available. Never call this.",
     input_schema: { type: "object", properties: {}, required: [] },
     defer_loading: true,
@@ -157,9 +160,6 @@ function mergeHeaders(...headerSources) {
     }
     return merged;
 }
-function mergeClientHeaders(...headerSources) {
-    return mergeHeaders({ "User-Agent": getDrahtUserAgent() }, ...headerSources);
-}
 function hasHeader(headers, name) {
     if (!headers)
         return false;
@@ -378,14 +378,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,25 +419,59 @@ 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;
@@ -593,7 +625,7 @@ export const stream = (model, context, options) => {
                             });
                         }
                         else if (block.type === "toolCall") {
-                            block.arguments = parseStreamingJson(block.partialJson);
+                            Object.assign(block, parseToolCallArguments(block.partialJson));
                             // Finalize in-place and strip the scratch buffer so replay only
                             // carries parsed arguments.
                             delete block.partialJson;
@@ -748,7 +780,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 +789,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 +804,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 +820,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);
@@ -852,32 +884,42 @@ function getBetaFeatures(model, context, isOAuthToken, nativeToolChanges, option
         features.push(MID_CONVERSATION_OUTPUT_CONFIG_BETA, THINKING_BINDING_CONTROLS_BETA);
     }
     if (nativeToolChanges)
-        features.push(MID_CONVERSATION_TOOL_CHANGES_BETA);
+        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);
     const initialSystemText = initialSystemMessage ? getSystemMessageText(initialSystemMessage) : "";
     const transformedMessages = transformMessages(context.messages, model, normalizeToolCallId);
     const conversationMessages = initialSystemMessage ? transformedMessages.slice(1) : transformedMessages;
-    // Native tool changes reference tools by name, so a redefined name cannot be expressed,
-    // and Anthropic rejects a tool list where every tool is deferred, so there must be an
-    // initial active tool to anchor the deferred ones. Otherwise the current tool list is sent.
+    // Native tool changes keep the request-level tool list fixed and define every later tool
+    // 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 &&
-        !hasToolRedefinitions(context.messages);
-    const converted = convertMessages(conversationMessages, isOAuthToken, cacheControl, compat.allowEmptySignature, model.compat?.supportsMidConvoEffort === true ? model.provider : undefined, nativeToolChanges);
+    const nativeToolChanges = compat.supportsMidConvoSystemMessages && compat.supportsMidConvoToolChanges && initialTools.length > 0;
+    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 } : {}),
@@ -918,27 +960,26 @@ function buildParams(model, context, isOAuthToken, options) {
     }
     const toolCacheControl = compat.supportsCacheControlOnTools ? cacheControl : undefined;
     if (nativeToolChanges) {
-        // Initial tools stay active with the cache breakpoint on the last one. Every later
-        // declaration is deferred and only surfaced by its `tool_addition` block; removed
-        // tools stay declared and are withdrawn by `tool_removal`. The request-level list
-        // therefore only grows, keeping the cached prefix intact across tool changes.
-        const initialNames = new Set(initialTools.map((tool) => tool.name));
-        const laterTools = getDeclaredTools(context.messages).filter((tool) => !initialNames.has(tool.name));
-        params.tools = [
-            ...convertTools(initialTools, isOAuthToken, compat.supportsEagerToolInputStreaming, compat.supportsStrictTools, toolCacheControl),
-            DEFERRED_TOOL_PLACEHOLDER,
-            ...convertTools(laterTools, isOAuthToken, compat.supportsEagerToolInputStreaming, compat.supportsStrictTools).map((tool) => ({ ...tool, defer_loading: true })),
-        ];
+        // Initial tools stay active with the cache breakpoint on the last one, followed by the
+        // 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 = [...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",
@@ -946,29 +987,24 @@ function buildParams(model, context, isOAuthToken, options) {
         };
         params.output_config = { effort: "high" };
     }
-    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) {
@@ -989,21 +1025,23 @@ 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,
     };
 }
-function convertMessages(transformedMessages, isOAuthToken, cacheControl, allowEmptySignature = false, managedProvider, nativeToolChanges = false) {
+function convertMessages(transformedMessages, isOAuthToken, cacheControl, allowEmptySignature = false, managedProvider, 
+/** Converts tool definitions for native `tool_addition` blocks; undefined when tool changes are not native. */
+convertToolDefinitions) {
     const params = [];
     const assistantLevels = new Map();
     // Later system messages are held back and emitted directly before the next assistant
@@ -1025,18 +1063,20 @@ function convertMessages(transformedMessages, isOAuthToken, cacheControl, allowE
             const blocks = [];
             if (text.length > 0)
                 blocks.push({ type: "text", text: sanitizeSurrogates(text) });
-            if (nativeToolChanges) {
+            if (convertToolDefinitions) {
+                const added = msg.toolsAdded ?? [];
+                const redefined = new Set(added.map((tool) => tool.name));
                 for (const tool of msg.toolsRemoved ?? []) {
+                    // A new definition under the same name replaces the old one, so no removal is needed.
+                    if (redefined.has(tool.name))
+                        continue;
                     blocks.push({
                         type: "tool_removal",
                         tool: { type: "tool_reference", name: isOAuthToken ? toClaudeCodeName(tool.name) : tool.name },
                     });
                 }
-                for (const tool of msg.toolsAdded ?? []) {
-                    blocks.push({
-                        type: "tool_addition",
-                        tool: { type: "tool_reference", name: isOAuthToken ? toClaudeCodeName(tool.name) : tool.name },
-                    });
+                for (const definition of convertToolDefinitions(added)) {
+                    blocks.push({ type: "tool_addition", tool: { type: "tool_definition", definition } });
                 }
             }
             if (blocks.length > 0)
@@ -1060,14 +1100,7 @@ function convertMessages(transformedMessages, isOAuthToken, cacheControl, allowE
                         };
                     }
                     else {
-                        return {
-                            type: "image",
-                            source: {
-                                type: "base64",
-                                media_type: item.mimeType,
-                                data: item.data,
-                            },
-                        };
+                        return convertImageBlock(item);
                     }
                 });
                 const filteredBlocks = blocks.filter((b) => {
@@ -1158,16 +1191,24 @@ function convertMessages(transformedMessages, isOAuthToken, cacheControl, allowE
         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],
             });
         }
     }
@@ -1254,11 +1295,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 = {