@openclaw/ai 2026.9.6 → 2026.9.8

package/dist/{anthropic-stream-reducer-D6ZI1wwj.mjs → anthropic-stream-reducer-DrsBCsFY.mjs}

@@ -1,17 +1,17 @@
-import { S as supportsClaudeNativeXhighEffort, c as bindsClaudeThinkingPrefix, d as resolveClaudeFable5ModelIdentity, f as resolveClaudeModelIdentity, g as resolveClaudeOpus5ModelIdentity, h as resolveClaudeOpus55ModelIdentity, y as supportsClaudeAdaptiveThinking } from "./src-DwGYYyZp.mjs";
-import { r as appendAssistantThinking } from "./event-stream-D8PARQfL.mjs";
+import { S as supportsClaudeAdaptiveThinking, T as supportsClaudeNativeXhighEffort, _ as resolveClaudeOpus55ModelIdentity, l as bindsClaudeThinkingPrefix, m as resolveClaudeModelIdentity, p as resolveClaudeFable5ModelIdentity, u as requiresClaudeBetweenToolsThinking, v as resolveClaudeOpus5ModelIdentity, y as resolveClaudeSonnet55ModelIdentity } from "./src-H4aXcFuX.mjs";
+import { r as appendAssistantThinking } from "./event-stream-vd9UnCAU.mjs";
+import { a as asRecord, o as isRecord, r as asOptionalObjectRecord, s as readStringField } from "./record-coerce-CNDovvft.mjs";
+import { _ as requiresClaudeAdaptiveThinking, d as ANTHROPIC_CLAUDE_CODE_VERSION, h as mapAnthropicStopReason, k as isImageWithMediaPayload, n as getAiTransportHost, v as resolveAnthropicThinkingEffort, w as calculateCost } from "./host-DwBmNMCC.mjs";
 import { i as normalizeOptionalLowercaseString, r as normalizeNullableString } from "./string-coerce-fsri9iCu.mjs";
-import { a as asRecord, o as isRecord, r as asOptionalObjectRecord, s as readStringField } from "./record-coerce-DwRYMj3t.mjs";
-import { C as mapAnthropicStopReason, E as resolveAnthropicThinkingEffort, M as calculateCost, T as requiresClaudeAdaptiveThinking, _ as isImageWithMediaPayload, d as describeToolResultMediaPlaceholder, m as extractToolResultText, n as getAiTransportHost, p as extractToolResultBlockText, v as sanitizeSurrogates, y as ANTHROPIC_CLAUDE_CODE_VERSION } from "./host-yTvBrYM2.mjs";
-import { i as asNonNegativeFiniteNumber, n as estimateBase64DecodedBytes } from "./base64-CPmadnUf.mjs";
-import "./transport-utils-03Qi0CN2.mjs";
-import { a as resolveProviderRequestCapabilities, i as resolveProviderEndpoint } from "./host-policy-DZO3oPPk.mjs";
+import { i as asNonNegativeFiniteNumber, n as estimateBase64DecodedBytes } from "./base64-C1PsYcRQ.mjs";
+import "./transport-utils-CqXzku3R.mjs";
+import { i as resolveProviderRequestCapabilities, r as resolveProviderEndpoint } from "./host-policy-wK-ay_RK.mjs";
 import { t as resolveCacheRetention } from "./cache-retention-0x979a5V.mjs";
-import { f as splitSystemPromptCacheBoundary, h as stripSystemPromptRelocatableBoundary, m as stripSystemPromptCacheBoundary, v as sortPromptCacheToolsByName } from "./simple-options-np1XPuhm.mjs";
-import { t as parsePositiveInteger } from "./positive-integer-BiUxrd71.mjs";
-import { n as projectRuntimeToolInputSchema } from "./tool-schema-json-projection-CD9c_fK8.mjs";
-import { E as parseStreamingJson, _ as sanitizeTransportPayloadText, c as finalizeTerminalToolCallArguments, g as sanitizeNonEmptyTransportPayloadText, r as coerceTransportToolCallArguments, v as transportAbortError, w as createToolArgumentPreviewSchedule, x as parseJsonObjectPreservingUnsafeIntegers } from "./transport-stream-shared-B5RioB_Q.mjs";
-import { n as providerReplayContextMatches, t as buildProviderReplayContext } from "./provider-replay-context-DPr3w20a.mjs";
+import { C as parseJsonObjectPreservingUnsafeIntegers, E as createToolArgumentPreviewSchedule, O as parseStreamingJson, _ as sanitizeNonEmptyTransportPayloadText, b as transportAbortError, d as iterateModelStream, j as sanitizeSurrogates, l as finalizeTerminalToolCallArguments, r as coerceTransportToolCallArguments, v as sanitizeTransportPayloadText } from "./transport-stream-shared-BU5pwY6W.mjs";
+import { C as stripSystemPromptCacheBoundary, D as sortPromptCacheToolsByName, d as describeToolResultMediaPlaceholder, m as extractToolResultText, p as extractToolResultBlockText, w as stripSystemPromptRelocatableBoundary, x as splitSystemPromptCacheBoundary } from "./simple-options-BkDPMuxw.mjs";
+import { t as parsePositiveInteger } from "./positive-integer-CjN5OJbH.mjs";
+import { i as SCHEMA_MAP_KEYS, n as projectRuntimeToolInputSchema } from "./tool-schema-json-projection-Ct8SeBeJ.mjs";
+import { n as providerReplayContextMatches, t as buildProviderReplayContext } from "./provider-replay-context-Bs5aWE1d.mjs";
 import { i as tagPendingCommentaryText } from "./assistant-text-phase-C20rxWwP.mjs";
 import { t as notifyLlmRequestActivity } from "./llm-request-activity-BjtkplhG.mjs";
 //#region packages/ai/src/providers/anthropic-auth-headers.ts
@@ -37,12 +37,90 @@ function omitFoundryBearerCredentialHeaders(headers) {
 	return Object.keys(next).length > 0 ? next : void 0;
 }
 //#endregion
-//#region packages/ai/src/transports/anthropic-payload-policy.ts
+//#region packages/ai/src/providers/anthropic-server-fallback.ts
+/** Anthropic beta that re-serves safety refusals on an allowed fallback model. */
+const ANTHROPIC_SERVER_SIDE_FALLBACK_BETA = "server-side-fallback-2026-07-01";
+/** Let Anthropic select the recommended model for each refusal category. */
+const ANTHROPIC_SERVER_SIDE_FALLBACKS = "default";
+const CLAUDE_OPUS_FALLBACK_MODEL_COST = {
+	input: 5,
+	output: 25,
+	cacheRead: .5,
+	cacheWrite: 6.25
+};
+const CLAUDE_OPUS_55_FALLBACK_MODEL_COST = {
+	input: 4,
+	output: 20,
+	cacheRead: .2,
+	cacheWrite: 5
+};
+function resolveFallbackModelIdentity(modelId) {
+	if (!modelId?.trim()) return null;
+	const ref = { id: modelId };
+	const normalized = resolveClaudeModelIdentity(ref);
+	if (resolveClaudeOpus55ModelIdentity(ref)) return "claude-opus-5-5";
+	if (normalized === "opus" || normalized === "opus-5" || resolveClaudeOpus5ModelIdentity(ref)) return "claude-opus-5";
+	if (resolveClaudeFable5ModelIdentity(ref)) return "claude-fable-5";
+	if (/^claude-opus-4-8(?=$|[^a-z0-9])/.test(normalized)) return "claude-opus-4-8";
+	return normalized || null;
+}
+function resolveClaudeOpusFallbackCost(modelId) {
+	if (modelId === "claude-opus-5-5") return CLAUDE_OPUS_55_FALLBACK_MODEL_COST;
+	return modelId === "claude-opus-5" || modelId === "claude-opus-4-8" ? CLAUDE_OPUS_FALLBACK_MODEL_COST : void 0;
+}
+/** Resolve billed rates from the serving model reported by Anthropic's fallback stream. */
+function resolveAnthropicFallbackServingModelCost(params) {
+	const requestedModelId = resolveFallbackModelIdentity(params.requestedModelId);
+	const servingModelId = resolveFallbackModelIdentity(params.servingModelId);
+	const servingCost = resolveClaudeOpusFallbackCost(servingModelId);
+	if (!servingCost || servingModelId === requestedModelId) return params.requestedCost;
+	const requestedCost = resolveClaudeOpusFallbackCost(requestedModelId);
+	if (requestedCost === servingCost) return params.requestedCost;
+	if (!requestedCost) return servingCost;
+	return {
+		input: params.requestedCost.input / requestedCost.input * servingCost.input,
+		output: params.requestedCost.output / requestedCost.output * servingCost.output,
+		cacheRead: params.requestedCost.cacheRead / requestedCost.cacheRead * servingCost.cacheRead,
+		cacheWrite: params.requestedCost.cacheWrite / requestedCost.cacheWrite * servingCost.cacheWrite
+	};
+}
+function readBoundaryModel(value) {
+	if (!value || typeof value !== "object") return null;
+	const model = value.model;
+	return typeof model === "string" && model.trim() ? model : null;
+}
+/** Reads a `fallback` content block marking where one model's output gives way to the next. */
+function readAnthropicFallbackBoundary(block) {
+	if (!block || typeof block !== "object") return null;
+	const record = block;
+	if (record.type !== "fallback") return null;
+	return {
+		fromModel: readBoundaryModel(record.from),
+		toModel: readBoundaryModel(record.to)
+	};
+}
 /**
-* Anthropic-family request payload policy helpers.
-* Applies service-tier and cache-control markers only when provider endpoint
-* capabilities allow them.
+* Drops pre-fallback thinking/tool calls while preserving the text prefix that
+* the serving model continued. Dropped tool calls must never execute or replay.
 */
+function applyAnthropicFallbackBoundary(params) {
+	const { output, boundary } = params;
+	const survivors = output.content.filter((block) => block.type === "text");
+	for (const survivor of survivors) delete survivor.textSignature;
+	output.content.splice(0, output.content.length, ...survivors);
+	if (boundary.toModel) output.responseModel = boundary.toModel;
+	output.diagnostics = [...output.diagnostics ?? [], {
+		type: "provider_fallback",
+		timestamp: Date.now(),
+		details: {
+			provider: params.provider,
+			fromModel: boundary.fromModel,
+			toModel: boundary.toModel
+		}
+	}];
+}
+//#endregion
+//#region packages/ai/src/transports/anthropic-payload-policy.ts
 const ANTHROPIC_CACHE_CONTROL_LIMIT = 4;
 const ANTHROPIC_COMPACT_THRESHOLD_MIN = 5e4;
 /** Resolve the Anthropic input-token trigger, including the API's minimum. */
@@ -50,7 +128,7 @@ function resolveAnthropicCompactThreshold(contextWindow, configured) {
 	const configuredThreshold = parsePositiveInteger(configured);
 	if (configuredThreshold !== void 0) return Math.max(ANTHROPIC_COMPACT_THRESHOLD_MIN, configuredThreshold);
 	const resolvedContextWindow = parsePositiveInteger(contextWindow);
-	return Math.max(ANTHROPIC_COMPACT_THRESHOLD_MIN, resolvedContextWindow === void 0 ? ANTHROPIC_COMPACT_THRESHOLD_MIN : Math.floor(resolvedContextWindow * .7));
+	return Math.max(ANTHROPIC_COMPACT_THRESHOLD_MIN, Math.floor((resolvedContextWindow ?? 0) * .7));
 }
 /** Resolve the server-compaction gate and effective threshold for an Anthropic route. */
 function resolveAnthropicServerCompactionPlan(model, extraParams, apiKey) {
@@ -309,10 +387,11 @@ function applyAnthropicContextManagementToRequest(payload, model, options, direc
 		cacheTtlPruning: options?.cacheTtlPruning
 	}));
 }
-function resolveAnthropicContextManagementBetaHeader(payload, directApiKeyBetaHeader) {
-	if (directApiKeyBetaHeader === void 0 || !isRecord(payload.context_management)) return directApiKeyBetaHeader;
-	const edits = payload.context_management.edits;
+function resolveAnthropicRequestBetaHeader(payload, directApiKeyBetaHeader) {
+	if (directApiKeyBetaHeader === void 0) return directApiKeyBetaHeader;
+	const edits = isRecord(payload.context_management) ? payload.context_management.edits : void 0;
 	const betas = new Set(directApiKeyBetaHeader.split(",").map((beta) => beta.trim()).filter(Boolean));
+	if (payload.fallbacks === "default") betas.add(ANTHROPIC_SERVER_SIDE_FALLBACK_BETA);
 	for (const edit of Array.isArray(edits) ? edits : []) {
 		if (!isRecord(edit)) continue;
 		if (edit.type === "clear_tool_uses_20250919") betas.add("context-management-2025-06-27");
@@ -372,89 +451,6 @@ function applyAnthropicEphemeralCacheControlMarkers(payloadObj, cacheControl = {
 	}
 }
 //#endregion
-//#region packages/ai/src/providers/anthropic-server-fallback.ts
-/** Anthropic beta that re-serves safety refusals on an allowed fallback model. */
-const ANTHROPIC_SERVER_SIDE_FALLBACK_BETA = "server-side-fallback-2026-07-01";
-/** Let Anthropic select the recommended model for each refusal category. */
-const ANTHROPIC_SERVER_SIDE_FALLBACKS = "default";
-const CLAUDE_OPUS_FALLBACK_MODEL_COST = {
-	input: 5,
-	output: 25,
-	cacheRead: .5,
-	cacheWrite: 6.25
-};
-const CLAUDE_OPUS_55_FALLBACK_MODEL_COST = {
-	input: 4,
-	output: 20,
-	cacheRead: .2,
-	cacheWrite: 5
-};
-function resolveFallbackModelIdentity(modelId) {
-	if (!modelId?.trim()) return null;
-	const ref = { id: modelId };
-	const normalized = resolveClaudeModelIdentity(ref);
-	if (resolveClaudeOpus55ModelIdentity(ref)) return "claude-opus-5-5";
-	if (normalized === "opus" || normalized === "opus-5" || resolveClaudeOpus5ModelIdentity(ref)) return "claude-opus-5";
-	if (resolveClaudeFable5ModelIdentity(ref)) return "claude-fable-5";
-	if (/^claude-opus-4-8(?=$|[^a-z0-9])/.test(normalized)) return "claude-opus-4-8";
-	return normalized || null;
-}
-function resolveClaudeOpusFallbackCost(modelId) {
-	if (modelId === "claude-opus-5-5") return CLAUDE_OPUS_55_FALLBACK_MODEL_COST;
-	return modelId === "claude-opus-5" || modelId === "claude-opus-4-8" ? CLAUDE_OPUS_FALLBACK_MODEL_COST : void 0;
-}
-/** Resolve billed rates from the serving model reported by Anthropic's fallback stream. */
-function resolveAnthropicFallbackServingModelCost(params) {
-	const requestedModelId = resolveFallbackModelIdentity(params.requestedModelId);
-	const servingModelId = resolveFallbackModelIdentity(params.servingModelId);
-	const servingCost = resolveClaudeOpusFallbackCost(servingModelId);
-	if (!servingCost || servingModelId === requestedModelId) return params.requestedCost;
-	const requestedCost = resolveClaudeOpusFallbackCost(requestedModelId);
-	if (requestedCost === servingCost) return params.requestedCost;
-	if (!requestedCost) return servingCost;
-	return {
-		input: params.requestedCost.input / requestedCost.input * servingCost.input,
-		output: params.requestedCost.output / requestedCost.output * servingCost.output,
-		cacheRead: params.requestedCost.cacheRead / requestedCost.cacheRead * servingCost.cacheRead,
-		cacheWrite: params.requestedCost.cacheWrite / requestedCost.cacheWrite * servingCost.cacheWrite
-	};
-}
-function readBoundaryModel(value) {
-	if (!value || typeof value !== "object") return null;
-	const model = value.model;
-	return typeof model === "string" && model.trim() ? model : null;
-}
-/** Reads a `fallback` content block marking where one model's output gives way to the next. */
-function readAnthropicFallbackBoundary(block) {
-	if (!block || typeof block !== "object") return null;
-	const record = block;
-	if (record.type !== "fallback") return null;
-	return {
-		fromModel: readBoundaryModel(record.from),
-		toModel: readBoundaryModel(record.to)
-	};
-}
-/**
-* Drops pre-fallback thinking/tool calls while preserving the text prefix that
-* the serving model continued. Dropped tool calls must never execute or replay.
-*/
-function applyAnthropicFallbackBoundary(params) {
-	const { output, boundary } = params;
-	const survivors = output.content.filter((block) => block.type === "text");
-	for (const survivor of survivors) delete survivor.textSignature;
-	output.content.splice(0, output.content.length, ...survivors);
-	if (boundary.toModel) output.responseModel = boundary.toModel;
-	output.diagnostics = [...output.diagnostics ?? [], {
-		type: "provider_fallback",
-		timestamp: Date.now(),
-		details: {
-			provider: params.provider,
-			fromModel: boundary.fromModel,
-			toModel: boundary.toModel
-		}
-	}];
-}
-//#endregion
 //#region packages/ai/src/providers/anthropic-thinking-replay.ts
 const ANTHROPIC_OMITTED_REASONING_TEXT = "[assistant reasoning omitted]";
 function applyAnthropicThinkingBindingControls(params, directApiKeyBetaHeader) {
@@ -557,14 +553,6 @@ const schemaArrayKeywords = /* @__PURE__ */ new Set([
 	"oneOf",
 	"prefixItems"
 ]);
-const schemaMapKeywords = /* @__PURE__ */ new Set([
-	"$defs",
-	"definitions",
-	"dependencies",
-	"dependentSchemas",
-	"patternProperties",
-	"properties"
-]);
 /** Normalize the detached JSON projection and report tuple changes to enclosing schemas. */
 function normalizeAnthropicJsonSchema(schema) {
 	if (!isRecord(schema)) return false;
@@ -578,7 +566,7 @@ function normalizeAnthropicJsonSchema(schema) {
 			for (const entry of value) changed = normalizeAnthropicJsonSchema(entry) || changed;
 			continue;
 		}
-		if (schemaMapKeywords.has(key) && isRecord(value)) for (const entry of Object.values(value)) changed = normalizeAnthropicJsonSchema(entry) || changed;
+		if (SCHEMA_MAP_KEYS.has(key) && isRecord(value)) for (const entry of Object.values(value)) changed = normalizeAnthropicJsonSchema(entry) || changed;
 	}
 	if (Array.isArray(schema.items)) {
 		for (const entry of schema.items) normalizeAnthropicJsonSchema(entry);
@@ -659,8 +647,7 @@ function reconcileAnthropicToolChoice(choice, projection) {
 			...choice,
 			name: originalMatch.wireName
 		};
-		if (projection.unavailableOriginalNames.has(requestedName)) throw new Error(`Anthropic tool_choice requested unavailable tool "${requestedName}" after schema conversion`);
-		const matchedTool = projection.tools.find((tool) => tool.wireName === requestedName);
+		const matchedTool = projection.unavailableOriginalNames.has(requestedName) ? void 0 : projection.tools.find((tool) => tool.wireName === requestedName);
 		if (!matchedTool) throw new Error(`Anthropic tool_choice requested unavailable tool "${requestedName}" after schema conversion`);
 		return {
 			...choice,
@@ -873,7 +860,7 @@ async function convertContentBlocks(content, model, imageBudget, profile, isErro
 }
 async function convertAnthropicMessages(transformedMessages, model, isOAuthToken, options) {
 	const params = [];
-	const retainRuntimeContext = bindsClaudeThinkingPrefix(model);
+	const modelRetainsRuntimeContext = bindsClaudeThinkingPrefix(model);
 	const imageBudget = createAnthropicInlineImageBudget();
 	const allowReasoningContentReplay = options.allowReasoningContentReplay === true;
 	const replayThinkingEnabled = options.replayThinkingEnabled !== false;
@@ -883,40 +870,32 @@ async function convertAnthropicMessages(transformedMessages, model, isOAuthToken
 		const msg = transformedMessages[i];
 		if (!msg) continue;
 		if (msg.role === "user") {
+			let content;
 			if (typeof msg.content === "string") {
-				if (msg.content.trim().length > 0) {
-					if (msg.runtimeContextCarrier && !retainRuntimeContext) options.cacheBreakpointOptOutMessageIndexes?.add(params.length);
-					const userParam = {
-						role: "user",
-						content: sanitizeTransportPayloadText(msg.content)
-					};
-					params.push(userParam);
-				}
-				continue;
+				if (msg.content.trim().length === 0) continue;
+				content = sanitizeTransportPayloadText(msg.content);
+			} else {
+				content = (!managed || model.input.includes("image") ? await normalizeAnthropicInlineContent(msg.content, imageBudget) : msg.content.map((item) => item.type === "image" ? {
+					type: "text",
+					text: NON_VISION_USER_IMAGE_PLACEHOLDER
+				} : item)).map((item) => item.type === "text" ? {
+					type: "text",
+					text: sanitizeTransportPayloadText(item.text)
+				} : {
+					type: "image",
+					source: {
+						type: "base64",
+						media_type: resolveAnthropicImageMediaType(item.mimeType),
+						data: item.data
+					}
+				}).filter((block) => block.type === "text" ? block.text.trim().length > 0 : !managed || model.input.includes("image"));
+				if (content.length === 0) continue;
 			}
-			const blocks = (!managed || model.input.includes("image") ? await normalizeAnthropicInlineContent(msg.content, imageBudget) : msg.content.map((item) => item.type === "image" ? {
-				type: "text",
-				text: NON_VISION_USER_IMAGE_PLACEHOLDER
-			} : item)).map((item) => item.type === "text" ? {
-				type: "text",
-				text: sanitizeTransportPayloadText(item.text)
-			} : {
-				type: "image",
-				source: {
-					type: "base64",
-					media_type: resolveAnthropicImageMediaType(item.mimeType),
-					data: item.data
-				}
-			});
-			let filteredBlocks = !managed || model.input.includes("image") ? blocks : blocks.filter((block) => block.type !== "image");
-			filteredBlocks = filteredBlocks.filter((block) => block.type !== "text" || block.text.trim().length > 0);
-			if (filteredBlocks.length === 0) continue;
-			if (msg.runtimeContextCarrier && !retainRuntimeContext) options.cacheBreakpointOptOutMessageIndexes?.add(params.length);
-			const userParam = {
+			if (msg.runtimeContextCarrier && !(msg.runtimeContextCarrierRetained ?? modelRetainsRuntimeContext)) options.cacheBreakpointOptOutMessageIndexes?.add(params.length);
+			params.push({
 				role: "user",
-				content: filteredBlocks
-			};
-			params.push(userParam);
+				content
+			});
 			continue;
 		}
 		if (msg.role === "assistant") {
@@ -952,24 +931,14 @@ async function convertAnthropicMessages(transformedMessages, model, isOAuthToken
 						type: "text",
 						text: sanitizeTransportPayloadText(block.thinking)
 					});
-					else {
-						const thinking = thinkingSignature === "reasoning_content" ? sanitizeTransportPayloadText(block.thinking) : block.thinking;
-						if (thinkingSignature === "reasoning_content") {
-							if (allowReasoningContentReplay) {
-								blocks.push({
-									type: "thinking",
-									thinking,
-									signature: thinkingSignature ?? ""
-								});
-								reasoningContent.push(thinking);
-							}
-							continue;
-						}
+					else if (!isReasoningContent || allowReasoningContentReplay) {
+						const thinking = isReasoningContent ? sanitizeTransportPayloadText(block.thinking) : block.thinking;
 						blocks.push({
 							type: "thinking",
 							thinking,
 							signature: thinkingSignature ?? ""
 						});
+						if (isReasoningContent) reasoningContent.push(thinking);
 					}
 					continue;
 				}
@@ -1044,14 +1013,14 @@ function buildAnthropicGenerationParams({ model, options, tools, toolProjection,
 				budget_tokens: options?.thinkingBudgetTokens ?? 1024,
 				...profile === "provider" ? { display } : {}
 			};
-		} else if (options?.thinkingEnabled === false) params.thinking = { type: "disabled" };
+		} else if (options?.thinkingEnabled === false) params.thinking = requiresClaudeBetweenToolsThinking(model) ? { type: "between_tools" } : { type: "disabled" };
 	}
 	if (options?.metadata) {
 		const userId = options.metadata.user_id;
 		if (typeof userId === "string") params.metadata = { user_id: userId };
 	}
 	if (options?.toolChoice) {
-		const normalizedToolChoice = normalizeAnthropicToolChoice(mandatoryAdaptiveThinking || options?.thinkingEnabled === true, options.toolChoice);
+		const normalizedToolChoice = normalizeAnthropicToolChoice(mandatoryAdaptiveThinking || options?.thinkingEnabled === true || resolveClaudeSonnet55ModelIdentity(model) !== void 0, options.toolChoice);
 		const projectedToolChoice = toolProjection ? reconcileAnthropicToolChoice(normalizedToolChoice, toolProjection) : normalizedToolChoice;
 		if (projectedToolChoice) params.tool_choice = projectedToolChoice;
 	}
@@ -1059,19 +1028,17 @@ function buildAnthropicGenerationParams({ model, options, tools, toolProjection,
 }
 function convertAnthropicTools(tools, isOAuthTokenLocal, supportsEagerToolInputStreaming = false) {
 	const projection = projectAnthropicTools(tools, (name) => isOAuthTokenLocal ? toClaudeCodeToolName(name) : name);
-	const convertedTools = [];
-	for (const tool of projection.tools) {
-		const convertedTool = {
-			name: tool.wireName,
-			description: tool.description,
-			input_schema: tool.inputSchema
-		};
-		if (supportsEagerToolInputStreaming) convertedTool.eager_input_streaming = true;
-		convertedTools.push(convertedTool);
-	}
 	return {
 		projection,
-		tools: convertedTools
+		tools: projection.tools.map((tool) => {
+			const projected = {
+				name: tool.wireName,
+				description: tool.description,
+				input_schema: tool.inputSchema
+			};
+			if (supportsEagerToolInputStreaming) projected.eager_input_streaming = true;
+			return projected;
+		})
 	};
 }
 //#endregion
@@ -1214,11 +1181,16 @@ function applyAnthropicMessageDeltaUsage(target, usage, messageStartPromptUsage)
 		cacheWrite: cacheWriteTokens,
 		cacheWrite1h: readAnthropicCacheWriteUsage(usage).cacheWrite1h
 	};
-	if (resolved.input !== void 0) target.input = resolved.input;
-	if (resolved.output !== void 0) target.output = resolved.output;
-	if (resolved.cacheRead !== void 0) target.cacheRead = resolved.cacheRead;
-	if (resolved.cacheWrite !== void 0) target.cacheWrite = resolved.cacheWrite;
-	if (resolved.cacheWrite1h !== void 0) target.cacheWrite1h = resolved.cacheWrite1h;
+	for (const key of [
+		"input",
+		"output",
+		"cacheRead",
+		"cacheWrite",
+		"cacheWrite1h"
+	]) {
+		const value = resolved[key];
+		if (value !== void 0) target[key] = value;
+	}
 	target.totalTokens = target.input + target.output + target.cacheRead + target.cacheWrite;
 	const iterationUsage = readLastAnthropicIterationUsage(usage);
 	if (iterationUsage.state === "valid") target.contextUsage = {
@@ -1246,7 +1218,6 @@ async function consumeAnthropicStream(params) {
 	let costModel = model;
 	let messageStartPromptUsage;
 	let inputTransformations;
-	const anthropicStream = params.events;
 	try {
 		const blocks = output.content;
 		const blockIndexes = /* @__PURE__ */ new Map();
@@ -1256,8 +1227,10 @@ async function consumeAnthropicStream(params) {
 		const compactionCapture = createCompactionCapture(output, model, options);
 		const pendingThinkingSignatures = /* @__PURE__ */ new Map();
 		const allowReasoningContentReplay = managed && resolveProviderEndpoint(model).endpointClass === "xiaomi-native";
-		const reasoningContentThinkingBlocks = /* @__PURE__ */ new Map();
-		const reasoningContentTextBlocks = /* @__PURE__ */ new Map();
+		const reasoningContentBlocks = {
+			thinking: /* @__PURE__ */ new Map(),
+			text: /* @__PURE__ */ new Map()
+		};
 		let sawMessageStart = false;
 		let sawMessageStop = false;
 		let sawStopReason = false;
@@ -1271,64 +1244,39 @@ async function consumeAnthropicStream(params) {
 			else eventSink.push(event);
 		};
 		const eventIndexKey = (eventIndex) => typeof eventIndex === "number" ? eventIndex : -1;
-		const appendReasoningContentThinkingDelta = (eventIndex, rawText) => {
+		const appendReasoningContentDelta = (kind, eventIndex, rawText) => {
 			if (typeof rawText !== "string") return false;
 			const text = sanitizeTransportPayloadText(rawText);
 			if (text.length === 0) return false;
+			const indexes = reasoningContentBlocks[kind];
 			const key = eventIndexKey(eventIndex);
-			let contentIndex = reasoningContentThinkingBlocks.get(key);
+			let contentIndex = indexes.get(key);
 			let block = contentIndex === void 0 ? void 0 : blocks[contentIndex];
-			if (!block || block.type !== "thinking") {
-				block = {
+			if (!block || block.type !== kind) {
+				block = kind === "thinking" ? {
 					type: "thinking",
 					thinking: "",
 					thinkingSignature: "reasoning_content"
-				};
-				output.content.push(block);
-				contentIndex = output.content.length - 1;
-				reasoningContentThinkingBlocks.set(key, contentIndex);
-				eventSink.push({
-					type: "thinking_start",
-					contentIndex,
-					partial: output
-				});
-			}
-			if (contentIndex === void 0) return false;
-			appendAssistantThinking(block, text);
-			block.thinkingSignature = "reasoning_content";
-			eventSink.push({
-				type: "thinking_delta",
-				contentIndex,
-				delta: text,
-				partial: output
-			});
-			return true;
-		};
-		const appendReasoningContentTextDelta = (eventIndex, rawText) => {
-			if (typeof rawText !== "string") return false;
-			const text = sanitizeTransportPayloadText(rawText);
-			if (text.length === 0) return false;
-			const key = eventIndexKey(eventIndex);
-			let contentIndex = reasoningContentTextBlocks.get(key);
-			let block = contentIndex === void 0 ? void 0 : blocks[contentIndex];
-			if (!block || block.type !== "text") {
-				block = {
+				} : {
 					type: "text",
 					text: ""
 				};
 				output.content.push(block);
 				contentIndex = output.content.length - 1;
-				reasoningContentTextBlocks.set(key, contentIndex);
+				indexes.set(key, contentIndex);
 				eventSink.push({
-					type: "text_start",
+					type: `${kind}_start`,
 					contentIndex,
 					partial: output
 				});
 			}
 			if (contentIndex === void 0) return false;
-			block.text += text;
+			if (block.type === "thinking") {
+				appendAssistantThinking(block, text);
+				block.thinkingSignature = "reasoning_content";
+			} else if (block.type === "text") block.text += text;
 			eventSink.push({
-				type: "text_delta",
+				type: `${kind}_delta`,
 				contentIndex,
 				delta: text,
 				partial: output
@@ -1337,29 +1285,21 @@ async function consumeAnthropicStream(params) {
 		};
 		const finishReasoningContentSidecars = (eventIndex) => {
 			const key = eventIndexKey(eventIndex);
-			const thinkingContentIndex = reasoningContentThinkingBlocks.get(key);
-			if (thinkingContentIndex !== void 0) {
-				reasoningContentThinkingBlocks.delete(key);
-				const block = output.content[thinkingContentIndex];
-				if (block?.type === "thinking") eventSink.push({
-					type: "thinking_end",
-					contentIndex: thinkingContentIndex,
-					content: block.thinking,
+			for (const kind of ["thinking", "text"]) {
+				const indexes = reasoningContentBlocks[kind];
+				const contentIndex = indexes.get(key);
+				if (contentIndex === void 0) continue;
+				indexes.delete(key);
+				const block = output.content[contentIndex];
+				if (block?.type === kind) eventSink.push({
+					type: `${kind}_end`,
+					contentIndex,
+					content: block.type === "thinking" ? block.thinking : block.text,
 					partial: output
 				});
 			}
-			const textContentIndex = reasoningContentTextBlocks.get(key);
-			if (textContentIndex === void 0) return;
-			reasoningContentTextBlocks.delete(key);
-			const block = output.content[textContentIndex];
-			if (block?.type === "text") eventSink.push({
-				type: "text_end",
-				contentIndex: textContentIndex,
-				content: block.text,
-				partial: output
-			});
 		};
-		for await (const rawEvent of anthropicStream) {
+		for await (const rawEvent of iterateModelStream(params.events, options.signal)) {
 			const event = asRecord(rawEvent);
 			inputTransformations = readAnthropicInputTransformations(event) ?? inputTransformations;
 			if (managed) notifyLlmRequestActivity(options.signal);
@@ -1532,7 +1472,7 @@ async function consumeAnthropicStream(params) {
 				let index = eventIndex === void 0 ? void 0 : blockIndexes.get(eventIndex);
 				let block = index === void 0 ? void 0 : blocks[index];
 				if (allowReasoningContentReplay) {
-					const appendedThinking = appendReasoningContentThinkingDelta(event.index, delta?.reasoning_content);
+					const appendedThinking = appendReasoningContentDelta("thinking", event.index, delta?.reasoning_content);
 					const hasNativeAnthropicDelta = delta?.type === "text_delta" && typeof delta.text === "string" || delta?.type === "thinking_delta" && typeof delta.thinking === "string" || delta?.type === "input_json_delta" && typeof delta.partial_json === "string" || delta?.type === "signature_delta" && typeof delta.signature === "string";
 					let appendedContent = false;
 					if (!hasNativeAnthropicDelta && typeof delta?.content === "string" && delta.content.length > 0) {
@@ -1547,7 +1487,7 @@ async function consumeAnthropicStream(params) {
 									partial: output
 								});
 								appendedContent = true;
-							} else appendedContent = appendReasoningContentTextDelta(event.index, text);
+							} else appendedContent = appendReasoningContentDelta("text", event.index, text);
 						}
 					}
 					if ((appendedThinking || appendedContent) && !hasNativeAnthropicDelta) continue;
@@ -1623,17 +1563,13 @@ async function consumeAnthropicStream(params) {
 				}
 				blockIndexes.delete(eventIndex);
 				delete block.index;
-				if (block.type === "text") {
-					emitTextEnd({
-						type: "text_end",
-						contentIndex: index,
-						content: block.text,
-						partial: output
-					});
-					finishReasoningContentSidecars(event.index);
-					continue;
-				}
-				if (block.type === "thinking") {
+				if (block.type === "text") emitTextEnd({
+					type: "text_end",
+					contentIndex: index,
+					content: block.text,
+					partial: output
+				});
+				else if (block.type === "thinking") {
 					if (pendingSignature !== void 0) block.thinkingSignature = pendingSignature;
 					eventSink.push({
 						type: "thinking_end",
@@ -1641,16 +1577,11 @@ async function consumeAnthropicStream(params) {
 						content: block.thinking,
 						partial: output
 					});
-					finishReasoningContentSidecars(event.index);
-					continue;
-				}
-				if (block.type === "toolCall") {
-					sealedToolCalls.push({
-						block,
-						contentIndex: index
-					});
-					finishReasoningContentSidecars(event.index);
-				}
+				} else if (block.type === "toolCall") sealedToolCalls.push({
+					block,
+					contentIndex: index
+				});
+				finishReasoningContentSidecars(event.index);
 				continue;
 			}
 			if (event.type === "message_delta") {
@@ -1691,4 +1622,4 @@ async function consumeAnthropicStream(params) {
 	}
 }
 //#endregion
-export { applyAnthropicFallbackBoundary as A, logAnthropicContextEdits as B, applyAnthropicThinkingBindingControls as C, ANTHROPIC_SERVER_SIDE_FALLBACKS as D, readAnthropicInputTransformations as E, applyAnthropicPayloadPolicyToParams as F, resolveAnthropicServerCompactionPlan as G, resolveAnthropicContextManagementBetaHeader as H, applyAnthropicRequestCacheControl as I, usesFoundryBearerAuth as J, isAnthropicOAuthApiKey as K, buildAnthropicSystemBlocks as L, resolveAnthropicFallbackServingModelCost as M, applyAnthropicContextManagementToRequest as N, ANTHROPIC_SERVER_SIDE_FALLBACK_BETA as O, applyAnthropicEphemeralCacheControlMarkers as P, isAnthropicServerToolClearingEnabled as R, ANTHROPIC_OMITTED_REASONING_TEXT as S, logAnthropicThinkingDrops as T, resolveAnthropicEphemeralCacheControl as U, resolveAnthropicCacheOptions as V, resolveAnthropicPayloadPolicy as W, normalizeAnthropicToolChoice as _, readAnthropicPromptUsageSnapshot as a, resolveOriginalAnthropicToolName as b, applyAnthropicRefusal as c, convertAnthropicTools as d, buildAnthropicReplayPlan as f, normalizeAnthropicToolCallId as g, suppressAnthropicCompaction as h, readAnthropicCacheWriteUsage as i, readAnthropicFallbackBoundary as j, CLAUDE_OPUS_FALLBACK_MODEL_COST as k, buildAnthropicGenerationParams as l, resolveNewestAnthropicCompaction as m, applyAnthropicMessageDeltaUsage as n, readAnthropicUsageTokenCount as o, isAnthropicReplayRejection as p, omitFoundryBearerCredentialHeaders as q, applyAnthropicMessageStartUsage as r, readLastAnthropicIterationUsage as s, consumeAnthropicStream as t, convertAnthropicMessages as u, projectAnthropicTools as v, findActiveAnthropicToolTurnAssistantIndex as w, toClaudeCodeToolName as x, reconcileAnthropicToolChoice as y, isDirectAnthropicModel as z };
+export { applyAnthropicRequestCacheControl as A, ANTHROPIC_SERVER_SIDE_FALLBACKS as B, applyAnthropicThinkingBindingControls as C, applyAnthropicContextManagementToRequest as D, readAnthropicInputTransformations as E, resolveAnthropicCacheOptions as F, resolveAnthropicFallbackServingModelCost as G, CLAUDE_OPUS_FALLBACK_MODEL_COST as H, resolveAnthropicEphemeralCacheControl as I, usesFoundryBearerAuth as J, isAnthropicOAuthApiKey as K, resolveAnthropicPayloadPolicy as L, isAnthropicServerToolClearingEnabled as M, isDirectAnthropicModel as N, applyAnthropicEphemeralCacheControlMarkers as O, logAnthropicContextEdits as P, resolveAnthropicRequestBetaHeader as R, ANTHROPIC_OMITTED_REASONING_TEXT as S, logAnthropicThinkingDrops as T, applyAnthropicFallbackBoundary as U, ANTHROPIC_SERVER_SIDE_FALLBACK_BETA as V, readAnthropicFallbackBoundary as W, normalizeAnthropicToolChoice as _, readAnthropicPromptUsageSnapshot as a, resolveOriginalAnthropicToolName as b, applyAnthropicRefusal as c, convertAnthropicTools as d, buildAnthropicReplayPlan as f, normalizeAnthropicToolCallId as g, suppressAnthropicCompaction as h, readAnthropicCacheWriteUsage as i, buildAnthropicSystemBlocks as j, applyAnthropicPayloadPolicyToParams as k, buildAnthropicGenerationParams as l, resolveNewestAnthropicCompaction as m, applyAnthropicMessageDeltaUsage as n, readAnthropicUsageTokenCount as o, isAnthropicReplayRejection as p, omitFoundryBearerCredentialHeaders as q, applyAnthropicMessageStartUsage as r, readLastAnthropicIterationUsage as s, consumeAnthropicStream as t, convertAnthropicMessages as u, projectAnthropicTools as v, findActiveAnthropicToolTurnAssistantIndex as w, toClaudeCodeToolName as x, reconcileAnthropicToolChoice as y, resolveAnthropicServerCompactionPlan as z };