@openclaw/ai 2026.10.2 → 2026.10.5-beta.2

package/dist/{anthropic-stream-reducer-CWyWE21W.mjs → anthropic-stream-reducer-DkKeXXx4.mjs}

@@ -1,33 +1,28 @@
-import { E as supportsClaudeInHistorySystemMessages, O as supportsClaudeNativeXhighEffort, S as resolveClaudeSonnet5ModelIdentity, b as resolveClaudeOpus5ModelIdentity, d as requiresClaudeBetweenToolsThinking, g as resolveClaudeModelIdentity, h as resolveClaudeHaiku55ModelIdentity, k as supportsClaudeServerCompaction, m as resolveClaudeFable5ModelIdentity, u as bindsClaudeThinkingPrefix, w as supportsClaudeAdaptiveThinking, x as resolveClaudeSonnet55ModelIdentity, y as resolveClaudeOpus55ModelIdentity } from "./src-VWy9E7DZ.mjs";
+import { E as supportsClaudeInHistorySystemMessages, O as supportsClaudeNativeXhighEffort, S as resolveClaudeSonnet5ModelIdentity, b as resolveClaudeOpus5ModelIdentity, d as requiresClaudeBetweenToolsThinking, g as resolveClaudeModelIdentity, h as resolveClaudeHaiku55ModelIdentity, m as resolveClaudeFable5ModelIdentity, u as bindsClaudeThinkingPrefix, w as supportsClaudeAdaptiveThinking, x as resolveClaudeSonnet55ModelIdentity, y as resolveClaudeOpus55ModelIdentity } from "./src-C44MKrW5.mjs";
 import { f as hasRuntimeContextMarker } from "./types-CQc6JNG4.mjs";
-import { r as appendAssistantThinking } from "./event-stream-C5AbCAaZ.mjs";
+import { r as appendAssistantThinking } from "./event-stream-X2gmsUWv.mjs";
 import { a as asRecord, o as isRecord, r as asOptionalObjectRecord, s as readStringField } from "./record-coerce-CNDovvft.mjs";
 import { i as normalizeOptionalLowercaseString, r as normalizeNullableString } from "./string-coerce-CtgOVOSv.mjs";
-import { n as asNonNegativeFiniteNumber } from "./number-coercion-V8-BhME4.mjs";
-import { N as isImageWithMediaPayload, O as calculateCost, S as resolveAnthropicThinkingEffort, g as applyClaudeRequestContract, h as ANTHROPIC_CLAUDE_CODE_VERSION, r as getAiTransportHost, u as STREAM_ERROR_FALLBACK_TEXT, v as defaultsClaudeAdaptiveThinking, w as usesClaudeFable5MessagesContract, x as requiresClaudeAdaptiveThinking, y as mapAnthropicStopReason } from "./host-u3o8XiAp.mjs";
-import "./text-signature-D_vRrx-z.mjs";
+import { n as asNonNegativeFiniteNumber } from "./number-coercion-C3hztWoY.mjs";
+import { N as isImageWithMediaPayload, O as calculateCost, S as resolveAnthropicThinkingEffort, g as applyClaudeRequestContract, h as ANTHROPIC_CLAUDE_CODE_VERSION, r as getAiTransportHost, u as STREAM_ERROR_FALLBACK_TEXT, v as defaultsClaudeAdaptiveThinking, w as usesClaudeFable5MessagesContract, x as requiresClaudeAdaptiveThinking, y as mapAnthropicStopReason } from "./host-Bf3NjYNj.mjs";
+import { i as providerReplayContextMatches, n as buildProviderReplayContext, r as isProviderReplayContext } from "./text-signature-Drb4Erb8.mjs";
 import { n as estimateBase64DecodedBytes } from "./base64-C8CdcsjU.mjs";
-import { a as resolveProviderRequestCapabilities, i as resolveProviderEndpoint } from "./host-policy-BwhNNGQR.mjs";
+import { a as resolveProviderRequestCapabilities, i as resolveProviderEndpoint } from "./host-policy-BzZluO6_.mjs";
 import { i as resolveCacheRetention } from "./cloudflare-5qSGvIUH.mjs";
-import { C as parseJsonObjectPreservingUnsafeIntegers, E as createToolArgumentPreviewSchedule, O as parseStreamingJson, P as sanitizeSurrogates, _ as sanitizeNonEmptyTransportPayloadText, b as transportAbortError, d as iterateModelStream, i as copyProviderAcceptanceObserver, l as finalizeTerminalToolCallArguments, r as coerceTransportToolCallArguments, v as sanitizeTransportPayloadText } from "./transport-stream-shared-CCR7hSW0.mjs";
-import { C as stripSystemPromptCacheBoundary, D as sortPromptCacheToolsByName, d as describeToolResultMediaPlaceholder, m as extractToolResultText, p as extractToolResultBlockText, t as adjustMaxTokensForThinking, w as stripSystemPromptRelocatableBoundary, x as splitSystemPromptCacheBoundary } from "./simple-options-7QuSKriJ.mjs";
-import { t as parsePositiveInteger } from "./positive-integer-CwLi8LUL.mjs";
-import { n as isProviderReplayContext, r as providerReplayContextMatches, t as buildProviderReplayContext } from "./provider-replay-context-CO_Eplnc.mjs";
-import { n as transformProviderMessages } from "./assistant-output-D5762GPH.mjs";
-import { i as SCHEMA_MAP_KEYS, n as projectRuntimeToolInputSchema } from "./tool-schema-json-projection-Ct8SeBeJ.mjs";
-import { i as tagPendingCommentaryText } from "./assistant-text-phase-DVZOxbuR.mjs";
-import { t as notifyLlmRequestActivity } from "./llm-request-activity-D8f_oxHj.mjs";
+import { C as parseJsonObjectPreservingUnsafeIntegers, E as createToolArgumentPreviewSchedule, O as parseStreamingJson, P as sanitizeSurrogates, b as transportAbortError, d as iterateModelStream, i as copyProviderAcceptanceObserver, l as finalizeTerminalToolCallArguments, r as coerceTransportToolCallArguments, v as sanitizeTransportPayloadText } from "./transport-stream-shared-CWGOuLcA.mjs";
+import { C as stripSystemPromptCacheBoundary, D as sortPromptCacheToolsByName, d as describeToolResultMediaPlaceholder, m as extractToolResultText, p as extractToolResultBlockText, t as adjustMaxTokensForThinking, w as stripSystemPromptRelocatableBoundary, x as splitSystemPromptCacheBoundary } from "./simple-options-BAu4B54D.mjs";
+import { t as parsePositiveInteger } from "./positive-integer-CqWjqSi9.mjs";
+import { n as transformProviderMessages } from "./assistant-output-BuhRpLeD.mjs";
+import { i as SCHEMA_MAP_KEYS, n as projectRuntimeToolInputSchema } from "./tool-schema-json-projection-B8sG1I9v.mjs";
+import { i as tagPendingCommentaryText } from "./assistant-text-phase-Bn1hbvK9.mjs";
+import { t as notifyLlmRequestActivity } from "./llm-request-activity-CfMuh5cC.mjs";
 //#region packages/ai/src/providers/anthropic-auth-headers.ts
 /** Inspect resolved credential shape for auth routing without exposing its value. */
 function isAnthropicOAuthApiKey(apiKey) {
 	return typeof apiKey === "string" && getAiTransportHost().resolveSecretSentinel(apiKey).includes("sk-ant-oat");
 }
 function usesFoundryBearerAuth(model) {
-	return model.provider === "microsoft-foundry" && (model.authHeader === true || hasBearerAuthorizationHeader(model.headers));
-}
-function hasBearerAuthorizationHeader(headers) {
-	if (!headers) return false;
-	return Object.entries(headers).some(([key, value]) => key.toLowerCase() === "authorization" && /^bearer\s+\S+/i.test(value.trim()));
+	return model.provider === "microsoft-foundry" && (model.authHeader === true || Object.entries(model.headers ?? {}).some(([key, value]) => key.toLowerCase() === "authorization" && /^bearer\s+\S+/i.test(value.trim())));
 }
 function omitFoundryBearerCredentialHeaders(headers) {
 	if (!headers) return;
@@ -126,22 +121,19 @@ function applyAnthropicFallbackBoundary(params) {
 //#region packages/ai/src/transports/anthropic-payload-policy.ts
 const ANTHROPIC_CACHE_CONTROL_LIMIT = 4;
 const ANTHROPIC_COMPACT_THRESHOLD_MIN = 5e4;
-const ANTHROPIC_COMPACTION_INSTRUCTIONS = "Summarize the transcript inside <summary></summary> tags. Include the current state, decisions, and next steps needed to continue the task in the next context window. Do not call any tools while writing this summary; respond with text only.";
 /** Resolve the Anthropic input-token trigger, including the API's minimum. */
-function resolveAnthropicCompactThreshold(model, configured) {
+function resolveAnthropicCompactThreshold(contextWindow, configured) {
 	const configuredThreshold = parsePositiveInteger(configured);
 	if (configuredThreshold !== void 0) return Math.max(ANTHROPIC_COMPACT_THRESHOLD_MIN, configuredThreshold);
-	const contextTokens = parsePositiveInteger(model.contextTokens);
-	const contextWindow = parsePositiveInteger(model.contextWindow);
-	return Math.max(ANTHROPIC_COMPACT_THRESHOLD_MIN, Math.floor((contextTokens && contextWindow ? Math.min(contextTokens, contextWindow) : contextTokens ?? contextWindow ?? 0) * .7));
+	const resolvedContextWindow = parsePositiveInteger(contextWindow);
+	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) {
-	const configured = extraParams?.anthropicServerCompaction;
-	const enabled = configured !== false && (configured === true || supportsClaudeServerCompaction(model)) && !isAnthropicOAuthApiKey(apiKey) && normalizeOptionalLowercaseString(model.api) === "anthropic-messages" && isDirectAnthropicModel(model);
+	const enabled = extraParams?.anthropicServerCompaction === true && !isAnthropicOAuthApiKey(apiKey) && normalizeOptionalLowercaseString(model.api) === "anthropic-messages" && isDirectAnthropicModel(model);
 	return {
 		enabled,
-		...enabled ? { threshold: resolveAnthropicCompactThreshold(model, extraParams?.anthropicCompactThreshold) } : {}
+		...enabled ? { threshold: resolveAnthropicCompactThreshold(model.contextWindow, extraParams?.anthropicCompactThreshold) } : {}
 	};
 }
 function isDirectAnthropicModel(model, env = process.env) {
@@ -151,7 +143,7 @@ function isDirectAnthropicModel(model, env = process.env) {
 		baseUrl
 	};
 	const endpointClass = resolveProviderEndpoint(endpointModel).endpointClass;
-	return normalizeOptionalLowercaseString(model.provider) === "anthropic" && (endpointClass === "anthropic-public" || endpointClass === "default" && (!baseUrl || resolveBaseUrlHostname(baseUrl) === "api.anthropic.com"));
+	return normalizeOptionalLowercaseString(model.provider) === "anthropic" && (endpointClass === "anthropic-public" || endpointClass === "default" && (!baseUrl || URL.parse(baseUrl)?.hostname === "api.anthropic.com"));
 }
 function supportsAnthropicServerSideFallback(model) {
 	return (usesClaudeFable5MessagesContract(model) || resolveClaudeOpus5ModelIdentity(model) !== void 0 || resolveClaudeSonnet55ModelIdentity(model) !== void 0) && isDirectAnthropicModel(model);
@@ -160,12 +152,9 @@ function isAnthropicServerToolClearingEnabled(model, apiKey) {
 	const resolvedApiKey = apiKey && getAiTransportHost().resolveSecretSentinel(apiKey);
 	return Boolean(resolvedApiKey?.trim()) && !isAnthropicOAuthApiKey(resolvedApiKey) && normalizeOptionalLowercaseString(model.api) === "anthropic-messages" && isDirectAnthropicModel(model);
 }
-function resolveBaseUrlHostname(baseUrl) {
-	return URL.parse(baseUrl)?.hostname;
-}
 function isLongTtlEligibleEndpoint(baseUrl) {
 	if (typeof baseUrl !== "string") return false;
-	const hostname = resolveBaseUrlHostname(baseUrl);
+	const hostname = URL.parse(baseUrl)?.hostname;
 	if (!hostname) return false;
 	return hostname === "api.anthropic.com" || hostname === "aiplatform.googleapis.com" || hostname === "aiplatform.us.rep.googleapis.com" || hostname === "aiplatform.eu.rep.googleapis.com" || hostname.endsWith("-aiplatform.googleapis.com");
 }
@@ -192,8 +181,7 @@ function buildAnthropicSystemBlocks(systemPrompt, isOAuthToken, cacheControl, cl
 		type: "text",
 		text: sanitizeSurrogates(systemPrompt)
 	}] : [];
-	if (cacheControl) applyAnthropicCacheControlToSystem(blocks, cacheControl);
-	else stripAnthropicSystemPromptBoundary(blocks);
+	normalizeAnthropicSystemBlocks(blocks, cacheControl);
 	if (systemPrompt && blocks.length === 0) blocks.push({
 		type: "text",
 		text: ""
@@ -221,7 +209,7 @@ function applyAnthropicRequestCacheControl(payload, cacheControl, supportsCacheC
 	const usedMarkers = countAnthropicCacheControlMarkers(payload.system) + countAnthropicCacheControlMarkers(payload.tools);
 	applyAnthropicCacheControlToMessages(payload.messages, cacheControl, ANTHROPIC_CACHE_CONTROL_LIMIT - usedMarkers, cacheBreakpointOptOutMessageIndexes);
 }
-function applyAnthropicCacheControlToSystem(system, cacheControl) {
+function normalizeAnthropicSystemBlocks(system, cacheControl) {
 	if (!Array.isArray(system)) return;
 	const normalizedBlocks = [];
 	for (const block of system) {
@@ -235,6 +223,10 @@ function applyAnthropicCacheControlToSystem(system, cacheControl) {
 			normalizedBlocks.push(block);
 			continue;
 		}
+		if (!cacheControl) {
+			record.text = stripSystemPromptCacheBoundary(blockText);
+			continue;
+		}
 		const text = stripSystemPromptRelocatableBoundary(blockText);
 		record.text = text;
 		const split = splitSystemPromptCacheBoundary(text);
@@ -254,25 +246,17 @@ function applyAnthropicCacheControlToSystem(system, cacheControl) {
 			text: split.dynamicSuffix
 		});
 	}
-	system.splice(0, system.length, ...normalizedBlocks);
-}
-function stripAnthropicSystemPromptBoundary(system) {
-	if (!Array.isArray(system)) return;
-	for (const block of system) {
-		if (!block || typeof block !== "object") continue;
-		const record = block;
-		if (record.type === "text" && typeof record.text === "string") record.text = stripSystemPromptCacheBoundary(record.text);
-	}
+	if (cacheControl) system.splice(0, system.length, ...normalizedBlocks);
 }
 /** Apply one shared deepest-stable-message cache breakpoint policy. */
 function applyAnthropicCacheControlToMessages(messages, cacheControl, markerLimit, cacheBreakpointOptOutMessageIndexes) {
 	if (!Array.isArray(messages) || messages.length === 0 || markerLimit <= 0) return;
-	let stableEnd = messages.length;
-	for (const index of cacheBreakpointOptOutMessageIndexes) stableEnd = Math.min(stableEnd, index);
-	let marked = 0;
-	for (let i = stableEnd - 1; i >= 0 && marked < Math.min(markerLimit, 2); i--) {
-		const record = messages[i];
-		if (!isRecord(record) || record.role !== "user") continue;
+	let fallbackToolResult;
+	for (let i = messages.length - 1; i >= 0; i--) {
+		const message = messages[i];
+		if (!message || typeof message !== "object") continue;
+		const record = message;
+		if (record.role !== "user" || cacheBreakpointOptOutMessageIndexes.has(i)) continue;
 		const content = record.content;
 		const blocks = typeof content === "string" ? [{
 			type: "text",
@@ -280,16 +264,23 @@ function applyAnthropicCacheControlToMessages(messages, cacheControl, markerLimi
 		}] : content;
 		if (!Array.isArray(blocks)) continue;
 		for (let j = blocks.length - 1; j >= 0; j--) {
-			const blockRecord = blocks[j];
-			if (!isRecord(blockRecord)) continue;
-			if (blockRecord.type === "text" || blockRecord.type === "image" || blockRecord.type === "tool_result") {
+			const block = blocks[j];
+			if (!block || typeof block !== "object") continue;
+			const blockRecord = block;
+			if (blockRecord.type === "text" || blockRecord.type === "image") {
+				if (fallbackToolResult && markerLimit === 1) {
+					fallbackToolResult.cache_control = cacheControl;
+					return;
+				}
 				blockRecord.cache_control = cacheControl;
 				if (typeof content === "string") record.content = blocks;
-				marked++;
-				break;
+				if (fallbackToolResult && markerLimit > 1) fallbackToolResult.cache_control = cacheControl;
+				return;
 			}
+			if (blockRecord.type === "tool_result" && fallbackToolResult === void 0) fallbackToolResult = blockRecord;
 		}
 	}
+	if (fallbackToolResult) fallbackToolResult.cache_control = cacheControl;
 }
 function countAnthropicCacheControlMarkers(blocks) {
 	if (!Array.isArray(blocks)) return 0;
@@ -310,7 +301,7 @@ function resolveAnthropicPayloadPolicy(input, model) {
 	return {
 		allowsServiceTier: capabilities.allowsAnthropicServiceTier,
 		cacheControl: input.enableCacheControl === true ? resolveAnthropicEphemeralCacheControl(input.baseUrl, input.cacheRetention) : void 0,
-		compactThreshold: serverCompactionPlan.threshold ?? resolveAnthropicCompactThreshold(input, input.extraParams?.anthropicCompactThreshold),
+		compactThreshold: serverCompactionPlan.threshold ?? resolveAnthropicCompactThreshold(input.contextWindow, input.extraParams?.anthropicCompactThreshold),
 		serviceTier: input.serviceTier,
 		useServerCompaction: input.enableServerCompaction === true && serverCompactionPlan.enabled,
 		...input.cacheTtlPruning && normalizeOptionalLowercaseString(input.api) === "anthropic-messages" && isDirectAnthropicModel(input) ? { toolClearing: {
@@ -363,8 +354,7 @@ function applyAnthropicContextManagementEdits(payload, policy) {
 		trigger: {
 			type: "input_tokens",
 			value: policy.compactThreshold
-		},
-		instructions: ANTHROPIC_COMPACTION_INSTRUCTIONS
+		}
 	});
 	if (edits.length > 0) payload.context_management = { edits };
 }
@@ -373,7 +363,7 @@ function applyAnthropicContextManagementToRequest(payload, model, options, direc
 	applyAnthropicContextManagementEdits(payload, resolveAnthropicPayloadPolicy({
 		...model,
 		api: "anthropic-messages",
-		enableServerCompaction: options?.anthropicServerCompaction === true,
+		enableServerCompaction: true,
 		extraParams: { ...options },
 		cacheTtlPruning: options?.cacheTtlPruning
 	}));
@@ -406,8 +396,7 @@ function logAnthropicContextEdits(event) {
 /** @deprecated Anthropic-family provider payload helper; do not use from third-party plugins. */
 function applyAnthropicPayloadPolicyToParams(payloadObj, policy, cacheBreakpointOptOutMessageIndexes) {
 	if (policy.allowsServiceTier && policy.serviceTier !== void 0 && payloadObj.service_tier === void 0) payloadObj.service_tier = policy.serviceTier;
-	if (policy.cacheControl) applyAnthropicCacheControlToSystem(payloadObj.system, policy.cacheControl);
-	else stripAnthropicSystemPromptBoundary(payloadObj.system);
+	normalizeAnthropicSystemBlocks(payloadObj.system, policy.cacheControl);
 	applyAnthropicContextManagementEdits(payloadObj, policy);
 	applyAnthropicRequestCacheControl(payloadObj, policy.cacheControl, false, cacheBreakpointOptOutMessageIndexes);
 }
@@ -498,11 +487,7 @@ function captureAnthropicCompaction(output, capture, model, options) {
 		baseUrlHash: context.baseUrlHash
 	};
 }
-/**
-* Record a rejected replay on the failed output and notify the transcript owner, which must
-* durably strip the checkpoint: hosts may persist failed turns without their replay state.
-*/
-function suppressAnthropicCompaction(output, model, options, rejected) {
+function suppressAnthropicCompaction(output, model, options) {
 	const context = buildProviderReplayContext(model, options);
 	if (!context.baseUrlHash) return;
 	output.providerReplay = {
@@ -512,7 +497,6 @@ function suppressAnthropicCompaction(output, model, options, rejected) {
 		...context,
 		baseUrlHash: context.baseUrlHash
 	};
-	options?.onCompactionRejected?.({ data: rejected.content });
 }
 function resolveNewestAnthropicCompaction(messages, model, options) {
 	const context = buildProviderReplayContext(model, options);
@@ -622,9 +606,6 @@ function logAnthropicThinkingDrops(transformations) {
 	const paths = drops.slice(0, 5).map(({ reason, path }) => `${reason} at ${path}`);
 	getAiTransportHost().logWarn("anthropic", `replayed thinking dropped: ${drops.length} block(s) (${paths.join(", ")}${drops.length > 5 ? ", …" : ""})`);
 }
-function asReplayMessage(value) {
-	return value && typeof value === "object" ? value : void 0;
-}
 /**
 * Anthropic tool results continue the preceding assistant turn. Preserve that
 * turn's signed thinking even when the next request disables new thinking.
@@ -633,7 +614,7 @@ function findActiveAnthropicToolTurnAssistantIndex(messages) {
 	const toolResultIds = /* @__PURE__ */ new Set();
 	let index = messages.length - 1;
 	while (index >= 0) {
-		const message = asReplayMessage(messages[index]);
+		const message = asOptionalObjectRecord(messages[index]);
 		if (message?.role === "user" && isRecord(message.operatorMessage)) {
 			index -= 1;
 			continue;
@@ -643,12 +624,12 @@ function findActiveAnthropicToolTurnAssistantIndex(messages) {
 		index -= 1;
 	}
 	if (toolResultIds.size === 0) return -1;
-	const assistant = asReplayMessage(messages[index]);
+	const assistant = asOptionalObjectRecord(messages[index]);
 	if (assistant?.role !== "assistant" || !Array.isArray(assistant.content)) return -1;
 	const toolCallIds = /* @__PURE__ */ new Set();
 	for (const block of assistant.content) {
-		if (!block || typeof block !== "object") continue;
-		const record = block;
+		const record = asOptionalObjectRecord(block);
+		if (!record) continue;
 		if ((record.type === "toolCall" || record.type === "tool_use" || record.type === "function_call") && typeof record.id === "string") toolCallIds.add(record.id);
 	}
 	return [...toolResultIds].every((toolCallId) => toolCallIds.has(toolCallId)) ? index : -1;
@@ -798,12 +779,7 @@ function reconcileAnthropicToolChoice(choice, projection) {
 	if (projection.inputToolCount === 0) return choice;
 	if (choice.type === "tool") {
 		const requestedName = choice.name;
-		const originalMatch = projection.tools.find((tool) => tool.originalName === requestedName);
-		if (originalMatch) return {
-			...choice,
-			name: originalMatch.wireName
-		};
-		const matchedTool = projection.unavailableOriginalNames.has(requestedName) ? void 0 : projection.tools.find((tool) => tool.wireName === requestedName);
+		const matchedTool = projection.tools.find((tool) => tool.originalName === requestedName) ?? (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,
@@ -846,9 +822,6 @@ function resolveAnthropicTransportOptions(model, options, apiKey) {
 		useModelDefault: resolveClaudeHaiku55ModelIdentity(model) !== void 0 || resolveClaudeSonnet5ModelIdentity(model) !== void 0 || resolveClaudeOpus5ModelIdentity(model) !== void 0
 	});
 	if (baseMaxTokens === void 0) throw new Error(`Anthropic Messages transport requires a positive maxTokens value for ${model.provider}/${model.id}`);
-	const reasoningModelMaxTokens = resolvePositiveAnthropicTokenLimit(model.maxTokens) ?? baseMaxTokens;
-	const mandatoryAdaptiveThinking = requiresClaudeAdaptiveThinking(model);
-	const reasoning = options?.reasoning === "off" && mandatoryAdaptiveThinking ? "low" : options?.reasoning;
 	const resolved = copyProviderAcceptanceObserver(options, {
 		temperature: options?.temperature,
 		stop: options?.stop,
@@ -866,56 +839,71 @@ function resolveAnthropicTransportOptions(model, options, apiKey) {
 		toolChoice: options?.toolChoice,
 		thinkingBudgets: options?.thinkingBudgets,
 		thinkingDisplay: options?.thinkingDisplay,
-		reasoning,
+		reasoning: options?.reasoning,
 		anthropicServerCompaction: options?.anthropicServerCompaction,
 		anthropicCompactThreshold: options?.anthropicCompactThreshold,
 		cacheTtlPruning: options?.cacheTtlPruning,
 		...options?.authProfileId ? { authProfileId: options.authProfileId } : {}
 	});
+	resolved.reasoning = applyAnthropicThinkingOptions(model, resolved, options, "transport");
+	return resolved;
+}
+/** Keep both entry points on one thinking mode while retaining their output-budget policies. */
+function applyAnthropicThinkingOptions(model, resolved, options, profile) {
+	const managed = profile === "transport";
+	const reasoning = options?.reasoning === "off" && requiresClaudeAdaptiveThinking(model) ? "low" : options?.reasoning;
 	if (reasoning === "off") {
 		resolved.thinkingEnabled = false;
-		return resolved;
+		return reasoning;
 	}
-	if (!reasoning) {
-		resolved.thinkingEnabled = defaultsClaudeAdaptiveThinking(model);
+	if (!reasoning || supportsClaudeAdaptiveThinking(model) || !managed && defaultsClaudeAdaptiveThinking(model)) {
+		resolved.thinkingEnabled = Boolean(reasoning) || defaultsClaudeAdaptiveThinking(model);
 		if (resolved.thinkingEnabled) resolved.effort = resolveAnthropicThinkingEffort(model, reasoning);
-		return resolved;
-	}
-	if (supportsClaudeAdaptiveThinking(model)) {
-		resolved.thinkingEnabled = true;
-		resolved.effort = resolveAnthropicThinkingEffort(model, reasoning);
-		return resolved;
+		return reasoning;
 	}
-	const adjusted = adjustMaxTokensForThinking(baseMaxTokens, reasoningModelMaxTokens, reasoning === "max" ? "high" : reasoning, options?.thinkingBudgets);
+	const adjusted = adjustMaxTokensForThinking(resolved.maxTokens, (managed ? resolvePositiveAnthropicTokenLimit(model.maxTokens) : model.maxTokens) ?? resolved.maxTokens, managed && reasoning === "max" ? "high" : reasoning, options?.thinkingBudgets);
 	const thinkingEnabled = adjusted.thinkingBudget >= 1024;
-	resolved.maxTokens = adjusted.maxTokens;
+	if (managed || thinkingEnabled) resolved.maxTokens = adjusted.maxTokens;
 	resolved.thinkingEnabled = thinkingEnabled;
 	resolved.thinkingBudgetTokens = thinkingEnabled ? adjusted.thinkingBudget : void 0;
-	return resolved;
+	return reasoning;
+}
+/**
+* Largest completion a request may ask for once transport thinking options
+* apply, for callers that size the prompt before dispatch. Claude transports
+* (Anthropic Messages, Vertex, Bedrock, Bedrock Mantle) may add a thinking
+* budget to `maxTokens`, capped at the model's output limit; some add it even
+* for adaptive models, and their Claude detection is plugin-owned, so every
+* request on these APIs reserves the default budget for its level. Other
+* transports keep `maxTokens` as the total output limit. Over-reserving only
+* shrinks the prompt; it never overflows the window.
+*/
+function resolveCompletionTokenReservation(model, maxTokens, reasoning) {
+	if (!reasoning || reasoning === "off" || model.api !== "anthropic-messages" && model.api !== "bedrock-converse-stream") return maxTokens;
+	return adjustMaxTokensForThinking(maxTokens, resolvePositiveAnthropicTokenLimit(model.maxTokens) ?? Number.POSITIVE_INFINITY, reasoning).maxTokens;
 }
 //#endregion
 //#region packages/ai/src/transports/anthropic-messages.ts
 const NON_VISION_USER_IMAGE_PLACEHOLDER = "(image omitted: model does not support images)";
 async function convertContentBlocks(content, model, imageBudget, profile, isError) {
 	const mediaPlaceholder = describeToolResultMediaPlaceholder(content);
-	if (!((profile === "provider" || model.input.includes("image")) && content.some(isImageWithMediaPayload))) return sanitizeNonEmptyTransportPayloadText(extractToolResultText(content), mediaPlaceholder ?? (profile === "transport" ? "(no output)" : isError ? "[tool error with no output]" : ""));
+	if (!((profile === "provider" || model.input.includes("image")) && content.some(isImageWithMediaPayload))) {
+		const text = extractToolResultText(content);
+		return text.trim() ? text : mediaPlaceholder ?? (profile === "transport" ? "(no output)" : isError ? "[tool error with no output]" : "");
+	}
 	const blocks = [];
-	let hasTextBlock = false;
 	for (const block of content) {
 		const record = asOptionalObjectRecord(block);
 		if (!record) continue;
 		const blockText = extractToolResultBlockText(block);
-		if (blockText) {
-			blocks.push({
-				type: "text",
-				text: sanitizeTransportPayloadText(blockText)
-			});
-			hasTextBlock = true;
-		}
+		if (blockText) blocks.push({
+			type: "text",
+			text: blockText
+		});
 		if (!isImageWithMediaPayload(record)) continue;
 		const [normalizedImage] = await normalizeAnthropicInlineContent([{
 			type: "image",
-			data: typeof record.data === "string" ? record.data : "",
+			data: record.data,
 			mimeType: typeof record.mimeType === "string" ? record.mimeType : profile === "provider" ? "image/jpeg" : "image/png"
 		}], imageBudget);
 		if (normalizedImage?.type !== "image") continue;
@@ -928,7 +916,7 @@ async function convertContentBlocks(content, model, imageBudget, profile, isErro
 			}
 		});
 	}
-	if (!hasTextBlock) blocks.unshift({
+	if (!blocks.some((block) => block.type === "text")) blocks.unshift({
 		type: "text",
 		text: mediaPlaceholder ?? "(see attached image)"
 	});
@@ -1086,12 +1074,17 @@ async function convertAnthropicMessages(transformedMessages, model, isOAuthToken
 	return params;
 }
 /** Shared generation contract, after each entry point resolves its defaults and tool policy. */
-function buildAnthropicGenerationParams({ model, options, tools, toolProjection, profile }) {
+function buildAnthropicGenerationParams({ model, options, toolProjection, eagerToolInputStreaming, profile }) {
 	const params = {};
 	const mandatoryAdaptiveThinking = requiresClaudeAdaptiveThinking(model);
 	if (options?.temperature !== void 0 && !options?.thinkingEnabled && !supportsClaudeNativeXhighEffort(model)) params.temperature = options.temperature;
 	if (options?.stop !== void 0 && options.stop.length > 0) params.stop_sequences = options.stop;
-	if (tools && tools.length > 0) params.tools = tools;
+	if (toolProjection && toolProjection.tools.length > 0) params.tools = toolProjection.tools.map((tool) => ({
+		name: tool.wireName,
+		description: tool.description,
+		input_schema: tool.inputSchema,
+		...eagerToolInputStreaming ? { eager_input_streaming: true } : {}
+	}));
 	if (mandatoryAdaptiveThinking || model.reasoning || supportsClaudeAdaptiveThinking(model)) {
 		if (mandatoryAdaptiveThinking || options?.thinkingEnabled) {
 			const display = options?.thinkingDisplay ?? "summarized";
@@ -1120,21 +1113,6 @@ function buildAnthropicGenerationParams({ model, options, tools, toolProjection,
 	}
 	return params;
 }
-function convertAnthropicTools(tools, isOAuthTokenLocal, supportsEagerToolInputStreaming = false) {
-	const projection = projectAnthropicTools(tools, (name) => isOAuthTokenLocal ? toClaudeCodeToolName(name) : name);
-	return {
-		projection,
-		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;
-		})
-	};
-}
 /** Assemble both public Messages routes without changing their replay/default profiles. */
 async function buildAnthropicRequest(model, context, options, profile, isOAuthToken, serverSideFallback, claudeCodeVersion) {
 	const managed = profile === "transport";
@@ -1146,8 +1124,13 @@ async function buildAnthropicRequest(model, context, options, profile, isOAuthTo
 	if (managed && maxTokens === void 0) throw new Error(`Anthropic Messages transport requires a positive maxTokens value for ${model.provider}/${model.id}`);
 	const { cacheControl, supportsCacheControlOnTools } = resolveAnthropicCacheOptions(model, options?.cacheRetention);
 	const system = buildAnthropicSystemBlocks(context.systemPrompt, isOAuthToken, cacheControl, claudeCodeVersion);
-	const convertedTools = context.tools ? convertAnthropicTools(context.tools, isOAuthToken, !managed && (model.compat?.supportsEagerToolInputStreaming ?? model.provider !== "fireworks")) : void 0;
-	const toolProjection = convertedTools?.projection;
+	let toolProjection;
+	let eagerToolInputStreaming = false;
+	if (context.tools) {
+		const tools = context.tools;
+		eagerToolInputStreaming = !managed && (model.compat?.supportsEagerToolInputStreaming ?? model.provider !== "fireworks");
+		toolProjection = projectAnthropicTools(tools, (name) => isOAuthToken ? toClaudeCodeToolName(name) : name);
+	}
 	const replayPlan = buildAnthropicReplayPlan(context.messages, model, {
 		enabled: !isOAuthToken && options?.anthropicServerCompaction === true,
 		authProfileId: options?.authProfileId,
@@ -1177,15 +1160,15 @@ async function buildAnthropicRequest(model, context, options, profile, isOAuthTo
 	Object.assign(params, buildAnthropicGenerationParams({
 		model,
 		options,
-		tools: convertedTools?.tools,
 		toolProjection,
+		eagerToolInputStreaming,
 		profile
 	}));
 	applyAnthropicRequestCacheControl(params, cacheControl, supportsCacheControlOnTools, cacheBreakpointOptOutMessageIndexes);
 	return {
 		params,
 		toolProjection,
-		replayedCompaction: replayPlan.compaction
+		usedCompactionReplay: replayPlan.compaction !== void 0
 	};
 }
 /** Apply caller payload edits before restoring required request contracts and beta headers. */
@@ -1204,19 +1187,12 @@ async function prepareAnthropicRequest(initialParams, model, options, directApiK
 }
 //#endregion
 //#region packages/ai/src/providers/anthropic-refusal.ts
-function readAnthropicRefusalDetails(value) {
-	if (!value || typeof value !== "object") return {
-		category: null,
-		explanation: null
-	};
-	const details = value;
-	return {
-		category: normalizeNullableString(details.category),
-		explanation: normalizeNullableString(details.explanation)
-	};
-}
 function applyAnthropicRefusal(output, stopDetails, provider) {
-	const details = readAnthropicRefusalDetails(stopDetails);
+	const record = asOptionalObjectRecord(stopDetails);
+	const details = {
+		category: normalizeNullableString(record?.category),
+		explanation: normalizeNullableString(record?.explanation)
+	};
 	const category = details.category ? ` (category: ${details.category})` : "";
 	const explanation = details.explanation ? `: ${details.explanation}` : ".";
 	output.stopReason = "error";
@@ -1233,6 +1209,41 @@ function applyAnthropicRefusal(output, stopDetails, provider) {
 }
 //#endregion
 //#region packages/ai/src/providers/anthropic-usage.ts
+const BILLED_USAGE_KEYS = [
+	"input",
+	"output",
+	"cacheRead",
+	"cacheWrite",
+	"cacheWrite1h"
+];
+function readAnthropicBilledUsage(usage, missingCacheTokens) {
+	return {
+		input: readAnthropicUsageTokenCount(usage.input_tokens),
+		output: readAnthropicUsageTokenCount(usage.output_tokens),
+		cacheRead: readAnthropicUsageTokenCount(usage.cache_read_input_tokens ?? missingCacheTokens),
+		cacheWrite: readAnthropicUsageTokenCount(usage.cache_creation_input_tokens ?? missingCacheTokens),
+		cacheWrite1h: readAnthropicCacheWriteUsage(usage).cacheWrite1h
+	};
+}
+function applyAnthropicBilledUsage(target, resolved) {
+	for (const key of BILLED_USAGE_KEYS) {
+		const value = resolved[key];
+		if (value !== void 0) target[key] = value;
+	}
+	target.totalTokens = target.input + target.output + target.cacheRead + target.cacheWrite;
+}
+function readAnthropicIterationUsage(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return;
+	const { input, output, cacheRead, cacheWrite, cacheWrite1h } = readAnthropicBilledUsage(value);
+	if (input === void 0 || output === void 0 || cacheRead === void 0 || cacheWrite === void 0) return;
+	return {
+		input,
+		output,
+		cacheRead,
+		cacheWrite,
+		cacheWrite1h: cacheWrite1h ?? 0
+	};
+}
 function readAnthropicUsageTokenCount(value) {
 	return asNonNegativeFiniteNumber(value);
 }
@@ -1260,20 +1271,14 @@ function readAnthropicPromptUsageSnapshot(usage) {
 function readLastAnthropicIterationUsage(usage) {
 	if (usage.iterations == null) return { state: "absent" };
 	if (!Array.isArray(usage.iterations) || usage.iterations.length === 0) return { state: "invalid" };
-	const iteration = usage.iterations.at(-1);
-	if (!iteration || typeof iteration !== "object" || Array.isArray(iteration)) return { state: "invalid" };
-	const record = iteration;
-	const input = readAnthropicUsageTokenCount(record.input_tokens);
-	const cacheRead = readAnthropicUsageTokenCount(record.cache_read_input_tokens);
-	const cacheWrite = readAnthropicUsageTokenCount(record.cache_creation_input_tokens);
-	const outputTokens = readAnthropicUsageTokenCount(record.output_tokens);
-	if (input === void 0 || cacheRead === void 0 || cacheWrite === void 0 || outputTokens === void 0) return { state: "invalid" };
-	const contextPromptTokens = input + cacheRead + cacheWrite;
+	const iteration = readAnthropicIterationUsage(usage.iterations.at(-1));
+	if (!iteration) return { state: "invalid" };
+	const contextPromptTokens = iteration.input + iteration.cacheRead + iteration.cacheWrite;
 	return {
 		state: "valid",
 		usage: {
 			contextPromptTokens,
-			totalTokens: contextPromptTokens + outputTokens
+			totalTokens: contextPromptTokens + iteration.output
 		}
 	};
 }
@@ -1288,19 +1293,10 @@ function readAnthropicCompactionBilledUsage(iterations) {
 		cacheWrite1h: 0
 	};
 	for (const iteration of iterations) {
-		if (!iteration || typeof iteration !== "object" || Array.isArray(iteration)) return;
-		const record = iteration;
-		const input = readAnthropicUsageTokenCount(record.input_tokens);
-		const output = readAnthropicUsageTokenCount(record.output_tokens);
-		const cacheRead = readAnthropicUsageTokenCount(record.cache_read_input_tokens);
-		const cacheWrite = readAnthropicUsageTokenCount(record.cache_creation_input_tokens);
-		if (input === void 0 || output === void 0 || cacheRead === void 0 || cacheWrite === void 0) return;
-		sawCompaction ||= record.type === "compaction";
-		billed.input += input;
-		billed.output += output;
-		billed.cacheRead += cacheRead;
-		billed.cacheWrite += cacheWrite;
-		billed.cacheWrite1h += readAnthropicCacheWriteUsage(record).cacheWrite1h ?? 0;
+		const resolved = readAnthropicIterationUsage(iteration);
+		if (!resolved) return;
+		sawCompaction ||= iteration.type === "compaction";
+		for (const key of BILLED_USAGE_KEYS) billed[key] += resolved[key];
 	}
 	return sawCompaction ? billed : void 0;
 }
@@ -1308,18 +1304,9 @@ function readAnthropicCompactionBilledUsage(iterations) {
 function applyAnthropicMessageStartUsage(target, payload) {
 	const promptUsage = readAnthropicPromptUsageSnapshot(payload);
 	const promptTokens = promptUsage ? promptUsage.input + promptUsage.cacheRead + promptUsage.cacheWrite : 0;
-	const inputTokens = readAnthropicUsageTokenCount(payload.input_tokens);
-	if (inputTokens !== void 0) target.input = inputTokens;
-	const outputTokens = readAnthropicUsageTokenCount(payload.output_tokens);
-	if (outputTokens !== void 0) target.output = outputTokens;
-	const cacheReadTokens = payload.cache_read_input_tokens == null ? 0 : readAnthropicUsageTokenCount(payload.cache_read_input_tokens);
-	if (cacheReadTokens !== void 0) target.cacheRead = cacheReadTokens;
-	const cacheWriteTokens = payload.cache_creation_input_tokens == null ? 0 : readAnthropicUsageTokenCount(payload.cache_creation_input_tokens);
-	if (cacheWriteTokens !== void 0) target.cacheWrite = cacheWriteTokens;
-	const { cacheWrite1h } = readAnthropicCacheWriteUsage(payload);
-	if (cacheWrite1h !== void 0) target.cacheWrite1h = cacheWrite1h;
-	target.totalTokens = target.input + target.output + target.cacheRead + target.cacheWrite;
-	if (promptTokens > 0 && outputTokens !== void 0) target.contextUsage = {
+	const resolved = readAnthropicBilledUsage(payload, 0);
+	applyAnthropicBilledUsage(target, resolved);
+	if (promptTokens > 0 && resolved.output !== void 0) target.contextUsage = {
 		state: "available",
 		promptTokens,
 		totalTokens: promptTokens + target.output
@@ -1330,28 +1317,8 @@ function applyAnthropicMessageStartUsage(target, payload) {
 function applyAnthropicMessageDeltaUsage(target, usage, messageStartPromptUsage) {
 	if (!usage) return;
 	const billedIterations = readAnthropicCompactionBilledUsage(usage.iterations);
-	const inputTokens = readAnthropicUsageTokenCount(usage.input_tokens);
-	const outputTokens = readAnthropicUsageTokenCount(usage.output_tokens);
-	const cacheReadTokens = readAnthropicUsageTokenCount(usage.cache_read_input_tokens);
-	const cacheWriteTokens = readAnthropicUsageTokenCount(usage.cache_creation_input_tokens);
-	const resolved = billedIterations ?? {
-		input: inputTokens,
-		output: outputTokens,
-		cacheRead: cacheReadTokens,
-		cacheWrite: cacheWriteTokens,
-		cacheWrite1h: readAnthropicCacheWriteUsage(usage).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 reported = readAnthropicBilledUsage(usage);
+	applyAnthropicBilledUsage(target, billedIterations ?? reported);
 	const iterationUsage = readLastAnthropicIterationUsage(usage);
 	if (iterationUsage.state === "valid") target.contextUsage = {
 		state: "available",
@@ -1359,7 +1326,7 @@ function applyAnthropicMessageDeltaUsage(target, usage, messageStartPromptUsage)
 		totalTokens: iterationUsage.usage.totalTokens
 	};
 	else if (iterationUsage.state === "invalid") target.contextUsage = { state: "unavailable" };
-	else if (outputTokens !== void 0 && (messageStartPromptUsage !== void 0 || (cacheReadTokens !== void 0 || cacheWriteTokens !== void 0) && readAnthropicPromptUsageSnapshot(usage) !== void 0)) {
+	else if (reported.output !== void 0 && (messageStartPromptUsage !== void 0 || (reported.cacheRead !== void 0 || reported.cacheWrite !== void 0) && readAnthropicPromptUsageSnapshot(usage) !== void 0)) {
 		const promptTokens = target.input + target.cacheRead + target.cacheWrite;
 		target.contextUsage = {
 			state: "available",
@@ -1395,14 +1362,44 @@ async function consumeAnthropicStream(params) {
 		let sawMessageStop = false;
 		let sawStopReason = false;
 		const pendingTextEnds = [];
-		const flushPendingTextEnds = () => {
+		const flushPendingTextEnds = (classifyToolTurn = false) => {
+			if (managed && classifyToolTurn && (output.stopReason === "toolUse" || output.content.some((block) => block.type === "toolCall"))) tagPendingCommentaryText(output.content);
 			for (const event of pendingTextEnds) eventSink.push(event);
 			pendingTextEnds.length = 0;
 		};
-		const emitTextEnd = (event) => {
-			if (managed) pendingTextEnds.push(event);
+		const emitContentEnd = (block, contentIndex, deferText) => {
+			const event = {
+				type: `${block.type}_end`,
+				contentIndex,
+				content: block.type === "thinking" ? block.thinking : block.text,
+				partial: output
+			};
+			if (managed && deferText && event.type === "text_end") pendingTextEnds.push(event);
 			else eventSink.push(event);
 		};
+		const emitContentStart = (kind, contentIndex, delta = "") => {
+			eventSink.push({
+				type: `${kind}_start`,
+				contentIndex,
+				partial: output
+			});
+			if (delta.length > 0) eventSink.push({
+				type: `${kind}_delta`,
+				contentIndex,
+				delta,
+				partial: output
+			});
+		};
+		const appendContentDelta = (block, contentIndex, delta) => {
+			if (block.type === "thinking") appendAssistantThinking(block, delta);
+			else block.text += delta;
+			eventSink.push({
+				type: `${block.type}_delta`,
+				contentIndex,
+				delta,
+				partial: output
+			});
+		};
 		const eventIndexKey = (eventIndex) => typeof eventIndex === "number" ? eventIndex : -1;
 		const appendReasoningContentDelta = (kind, eventIndex, rawText) => {
 			if (typeof rawText !== "string") return false;
@@ -1424,22 +1421,10 @@ async function consumeAnthropicStream(params) {
 				output.content.push(block);
 				contentIndex = output.content.length - 1;
 				indexes.set(key, contentIndex);
-				eventSink.push({
-					type: `${kind}_start`,
-					contentIndex,
-					partial: output
-				});
+				emitContentStart(kind, contentIndex);
 			}
-			if (block.type === "thinking") {
-				appendAssistantThinking(block, text);
-				block.thinkingSignature = "reasoning_content";
-			} else if (block.type === "text") block.text += text;
-			eventSink.push({
-				type: `${kind}_delta`,
-				contentIndex,
-				delta: text,
-				partial: output
-			});
+			if (block.type === "thinking") block.thinkingSignature = "reasoning_content";
+			appendContentDelta(block, contentIndex, text);
 			return true;
 		};
 		const finishReasoningContentSidecars = (eventIndex) => {
@@ -1450,12 +1435,7 @@ async function consumeAnthropicStream(params) {
 				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
-				});
+				if (block?.type === kind) emitContentEnd(block, contentIndex, false);
 			}
 		};
 		for await (const rawEvent of iterateModelStream(params.events, options.signal)) {
@@ -1516,23 +1496,8 @@ async function consumeAnthropicStream(params) {
 					for (const [i, block] of blocks.entries()) {
 						if (block.type !== "text") continue;
 						delete block.index;
-						eventSink.push({
-							type: "text_start",
-							contentIndex: i,
-							partial: output
-						});
-						if (block.text) eventSink.push({
-							type: "text_delta",
-							contentIndex: i,
-							delta: block.text,
-							partial: output
-						});
-						emitTextEnd({
-							type: "text_end",
-							contentIndex: i,
-							content: block.text,
-							partial: output
-						});
+						emitContentStart("text", i, block.text);
+						emitContentEnd(block, i, true);
 					}
 					continue;
 				}
@@ -1554,22 +1519,11 @@ async function consumeAnthropicStream(params) {
 						redacted: true,
 						index
 					};
-					const kind = block.type;
 					const delta = block.type === "text" ? block.text : block.redacted ? "" : block.thinking;
 					output.content.push(block);
 					const contentIndex = output.content.length - 1;
 					blockIndexes.set(index, contentIndex);
-					eventSink.push({
-						type: `${kind}_start`,
-						contentIndex,
-						partial: output
-					});
-					if (delta.length > 0) eventSink.push({
-						type: `${kind}_delta`,
-						contentIndex,
-						delta,
-						partial: output
-					});
+					emitContentStart(block.type, contentIndex, delta);
 					continue;
 				}
 				if (contentBlock?.type === "tool_use") {
@@ -1609,13 +1563,7 @@ async function consumeAnthropicStream(params) {
 						const text = sanitizeTransportPayloadText(delta.content);
 						if (text.length > 0) {
 							if (block?.type === "text" && index !== void 0) {
-								block.text += text;
-								eventSink.push({
-									type: "text_delta",
-									contentIndex: index,
-									delta: text,
-									partial: output
-								});
+								appendContentDelta(block, index, text);
 								appendedContent = true;
 							} else appendedContent = appendReasoningContentDelta("text", event.index, text);
 						}
@@ -1631,31 +1579,15 @@ async function consumeAnthropicStream(params) {
 					output.content.push(block);
 					index = output.content.length - 1;
 					if (typeof event.index === "number") blockIndexes.set(event.index, index);
-					eventSink.push({
-						type: "text_start",
-						contentIndex: index,
-						partial: output
-					});
+					emitContentStart("text", index);
 				}
 				if (index === void 0) continue;
 				if (block?.type === "text" && delta?.type === "text_delta" && typeof delta.text === "string") {
-					block.text += delta.text;
-					eventSink.push({
-						type: "text_delta",
-						contentIndex: index,
-						delta: delta.text,
-						partial: output
-					});
+					appendContentDelta(block, index, delta.text);
 					continue;
 				}
 				if (block?.type === "thinking" && delta?.type === "thinking_delta" && typeof delta.thinking === "string") {
-					appendAssistantThinking(block, delta.thinking);
-					eventSink.push({
-						type: "thinking_delta",
-						contentIndex: index,
-						delta: delta.thinking,
-						partial: output
-					});
+					appendContentDelta(block, index, delta.thinking);
 					continue;
 				}
 				if (block?.type === "toolCall" && delta?.type === "input_json_delta" && typeof delta.partial_json === "string") {
@@ -1693,24 +1625,12 @@ 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
-				});
-				else if (block.type === "thinking") {
-					if (pendingSignature !== void 0) block.thinkingSignature = pendingSignature;
-					eventSink.push({
-						type: "thinking_end",
-						contentIndex: index,
-						content: block.thinking,
-						partial: output
-					});
-				} else if (block.type === "toolCall") sealedToolCalls.push({
+				if (block.type === "thinking" && pendingSignature !== void 0) block.thinkingSignature = pendingSignature;
+				if (block.type === "toolCall") sealedToolCalls.push({
 					block,
 					contentIndex: index
 				});
+				else emitContentEnd(block, index, true);
 				finishReasoningContentSidecars(event.index);
 				continue;
 			}
@@ -1725,8 +1645,7 @@ async function consumeAnthropicStream(params) {
 				}
 				applyAnthropicMessageDeltaUsage(output.usage, usage, messageStartPromptUsage);
 				calculateCost(costModel, output.usage);
-				if (managed && (output.stopReason === "toolUse" || output.content.some((block) => block.type === "toolCall"))) tagPendingCommentaryText(output.content);
-				flushPendingTextEnds();
+				flushPendingTextEnds(true);
 			}
 		}
 		if ((isDirectAnthropicModel(model) || !managed && refusalBuffer) && !sawMessageStop) throw new Error("Anthropic stream ended before message_stop");
@@ -1745,11 +1664,10 @@ async function consumeAnthropicStream(params) {
 			});
 		}
 		refusalBuffer?.flush();
-		if (managed && (output.stopReason === "toolUse" || output.content.some((block) => block.type === "toolCall"))) tagPendingCommentaryText(output.content);
-		flushPendingTextEnds();
+		flushPendingTextEnds(true);
 	} finally {
 		logAnthropicThinkingDrops(inputTransformations);
 	}
 }
 //#endregion
-export { buildAnthropicSystemBlocks as A, ANTHROPIC_SERVER_SIDE_FALLBACKS as B, isAnthropicReplayRejection as C, applyAnthropicEphemeralCacheControlMarkers as D, applyAnthropicContextManagementToRequest as E, resolveAnthropicEphemeralCacheControl as F, resolveAnthropicFallbackServingModelCost as G, CLAUDE_OPUS_FALLBACK_MODEL_COST as H, resolveAnthropicPayloadPolicy as I, usesFoundryBearerAuth as J, isAnthropicOAuthApiKey as K, resolveAnthropicRequestBetaHeader as L, isDirectAnthropicModel as M, logAnthropicContextEdits as N, applyAnthropicPayloadPolicyToParams as O, resolveAnthropicCacheOptions as P, resolveAnthropicServerCompactionPlan as R, readAnthropicInputTransformations as S, suppressAnthropicCompaction as T, applyAnthropicFallbackBoundary as U, ANTHROPIC_SERVER_SIDE_FALLBACK_BETA as V, readAnthropicFallbackBoundary as W, toClaudeCodeToolName as _, readAnthropicPromptUsageSnapshot as a, findActiveAnthropicToolTurnAssistantIndex as b, applyAnthropicRefusal as c, resolveAnthropicTransportOptions as d, normalizeAnthropicToolCallId as f, resolveOriginalAnthropicToolName as g, reconcileAnthropicToolChoice as h, readAnthropicCacheWriteUsage as i, isAnthropicServerToolClearingEnabled as j, applyAnthropicRequestCacheControl as k, buildAnthropicRequest as l, projectAnthropicTools as m, applyAnthropicMessageDeltaUsage as n, readAnthropicUsageTokenCount as o, normalizeAnthropicToolChoice as p, omitFoundryBearerCredentialHeaders as q, applyAnthropicMessageStartUsage as r, readLastAnthropicIterationUsage as s, consumeAnthropicStream as t, prepareAnthropicRequest as u, ANTHROPIC_OMITTED_REASONING_TEXT as v, resolveNewestAnthropicCompaction as w, logAnthropicThinkingDrops as x, applyAnthropicThinkingBindingControls as y, supportsAnthropicServerSideFallback as z };
+export { applyAnthropicPayloadPolicyToParams as A, resolveAnthropicServerCompactionPlan as B, logAnthropicThinkingDrops as C, suppressAnthropicCompaction as D, resolveNewestAnthropicCompaction as E, logAnthropicContextEdits as F, applyAnthropicFallbackBoundary as G, ANTHROPIC_SERVER_SIDE_FALLBACKS as H, resolveAnthropicCacheOptions as I, isAnthropicOAuthApiKey as J, readAnthropicFallbackBoundary as K, resolveAnthropicEphemeralCacheControl as L, buildAnthropicSystemBlocks as M, isAnthropicServerToolClearingEnabled as N, applyAnthropicContextManagementToRequest as O, isDirectAnthropicModel as P, resolveAnthropicPayloadPolicy as R, findActiveAnthropicToolTurnAssistantIndex as S, isAnthropicReplayRejection as T, ANTHROPIC_SERVER_SIDE_FALLBACK_BETA as U, supportsAnthropicServerSideFallback as V, CLAUDE_OPUS_FALLBACK_MODEL_COST as W, usesFoundryBearerAuth as X, omitFoundryBearerCredentialHeaders as Y, reconcileAnthropicToolChoice as _, readAnthropicPromptUsageSnapshot as a, ANTHROPIC_OMITTED_REASONING_TEXT as b, applyAnthropicRefusal as c, applyAnthropicThinkingOptions as d, resolveAnthropicTransportOptions as f, projectAnthropicTools as g, normalizeAnthropicToolChoice as h, readAnthropicCacheWriteUsage as i, applyAnthropicRequestCacheControl as j, applyAnthropicEphemeralCacheControlMarkers as k, buildAnthropicRequest as l, normalizeAnthropicToolCallId as m, applyAnthropicMessageDeltaUsage as n, readAnthropicUsageTokenCount as o, resolveCompletionTokenReservation as p, resolveAnthropicFallbackServingModelCost as q, applyAnthropicMessageStartUsage as r, readLastAnthropicIterationUsage as s, consumeAnthropicStream as t, prepareAnthropicRequest as u, resolveOriginalAnthropicToolName as v, readAnthropicInputTransformations as w, applyAnthropicThinkingBindingControls as x, toClaudeCodeToolName as y, resolveAnthropicRequestBetaHeader as z };