@openclaw/ai 2026.9.1-beta.1 → 2026.9.2

package/dist/{anthropic-DI4PZKKB.mjs → anthropic-BDdqdVLK.mjs}

@@ -1,19 +1,19 @@
-import { n as getEnvApiKey, r as __exportAll } from "./env-api-keys-DrgeBuva.mjs";
-import { d as resolveClaudeSonnet5ModelIdentity, g as supportsClaudeNativeXhighEffort, p as supportsClaudeAdaptiveThinking, u as resolveClaudeOpus5ModelIdentity } from "./src-Bu3FiFAG.mjs";
-import { t as AssistantMessageEventStream } from "./event-stream-uSMZJ3FA.mjs";
+import { t as __exportAll } from "./rolldown-runtime-BhDjJH2R.mjs";
+import { _ as supportsClaudeAdaptiveThinking, b as supportsClaudeNativeXhighEffort, h as resolveClaudeSonnet5ModelIdentity, m as resolveClaudeOpus5ModelIdentity } from "./src-2qBGKg8O.mjs";
+import { t as AssistantMessageEventStream } from "./event-stream-BgDvQeum.mjs";
 import { o as isRecord } from "./utf16-slice-qz3nsy87.mjs";
-import { r as calculateCost, t as sanitizeSurrogates } from "./sanitize-unicode-DCkltN94.mjs";
-import { S as usesClaudeStreamingRefusalContract, _ as prepareClaudeNoPrefillRequestContext, a as describeToolResultMediaPlaceholder, c as extractToolResultText, d as isImageWithMediaPayload, f as ANTHROPIC_CLAUDE_CODE_BILLING_SYSTEM_BLOCK, g as mapAnthropicStopReason, m as applyClaudeRequestContract, n as getAiTransportHost, p as ANTHROPIC_CLAUDE_CODE_VERSION, r as resolveAiTransportHeaderSentinels, s as extractToolResultBlockText, v as requiresClaudeAdaptiveThinking, x as usesClaudeFable5MessagesContract, y as resolveAnthropicThinkingEffort } from "./host-D51fmkH6.mjs";
-import { n as projectProviderError } from "./provider-error-DDOs_Bz0.mjs";
+import { r as calculateCost, t as sanitizeSurrogates } from "./sanitize-unicode-D6xUvZaS.mjs";
+import { S as usesClaudeStreamingRefusalContract, _ as prepareClaudeNoPrefillRequestContext, a as describeToolResultMediaPlaceholder, c as extractToolResultText, d as isImageWithMediaPayload, f as ANTHROPIC_CLAUDE_CODE_BILLING_SYSTEM_BLOCK, g as mapAnthropicStopReason, m as applyClaudeRequestContract, n as getAiTransportHost, p as ANTHROPIC_CLAUDE_CODE_VERSION, r as resolveAiTransportHeaderSentinels, s as extractToolResultBlockText, v as requiresClaudeAdaptiveThinking, x as usesClaudeFable5MessagesContract, y as resolveAnthropicThinkingEffort } from "./host-CEvLw30U.mjs";
+import { A as createAnthropicInlineImageBudget, B as resolveAnthropicContextManagementBetaHeader, C as ANTHROPIC_SERVER_SIDE_FALLBACKS, D as readAnthropicFallbackBoundary, E as applyAnthropicFallbackBoundary, G as omitFoundryBearerCredentialHeaders, K as usesFoundryBearerAuth, M as resolveAnthropicImageMediaType, N as applyAnthropicCacheControlToMessages, O as resolveAnthropicFallbackServingModelCost, P as applyAnthropicContextManagementToRequest, R as isDirectAnthropicModel, S as readAnthropicInputTransformations, W as isAnthropicOAuthApiKey, _ as toClaudeCodeToolName, a as suppressAnthropicCompaction, b as findActiveAnthropicToolTurnAssistantIndex, f as normalizeAnthropicToolCallId, g as resolveOriginalAnthropicToolName, h as reconcileAnthropicToolChoice, j as normalizeAnthropicInlineContent, k as applyAnthropicRefusal, m as projectAnthropicTools, n as createCompactionCapture, o as applyAnthropicMessageDeltaUsage, p as normalizeAnthropicToolChoice, r as isAnthropicReplayRejection, s as applyAnthropicMessageStartUsage, t as buildAnthropicReplayPlan, v as ANTHROPIC_OMITTED_REASONING_TEXT, w as ANTHROPIC_SERVER_SIDE_FALLBACK_BETA, x as logAnthropicThinkingDrops, y as applyAnthropicThinkingBindingControls, z as logAnthropicContextEdits } from "./anthropic-compaction-replay-DB2FGLQc.mjs";
 import { t as resolveCacheRetention } from "./cache-retention-0x979a5V.mjs";
-import { c as splitSystemPromptCacheBoundary, l as stripSystemPromptCacheBoundary, n as buildBaseOptions, r as clampMaxTokensToModel, t as adjustMaxTokensForThinking } from "./simple-options-CFj7x3J4.mjs";
-import { t as MALFORMED_STREAMING_FRAGMENT_ERROR_MESSAGE } from "./transport-utils-LJ1_rbi-.mjs";
-import { A as resolveAnthropicImageMediaType, C as readAnthropicFallbackBoundary, D as usesFoundryBearerAuth, E as omitFoundryBearerCredentialHeaders, O as createAnthropicInlineImageBudget, S as applyAnthropicFallbackBoundary, T as applyAnthropicRefusal, _ as ANTHROPIC_OMITTED_REASONING_TEXT, a as applyAnthropicMessageDeltaUsage, b as ANTHROPIC_SERVER_SIDE_FALLBACK_BETA, d as normalizeAnthropicToolCallId, f as normalizeAnthropicToolChoice, g as toClaudeCodeToolName, h as resolveOriginalAnthropicToolName, i as suppressAnthropicCompaction, j as applyAnthropicCacheControlToMessages, k as normalizeAnthropicInlineContent, m as reconcileAnthropicToolChoice, n as createCompactionCapture, o as applyAnthropicMessageStartUsage, p as projectAnthropicTools, r as isAnthropicReplayRejection, t as buildAnthropicReplayPlan, v as findActiveAnthropicToolTurnAssistantIndex, w as resolveAnthropicFallbackServingModelCost, y as ANTHROPIC_SERVER_SIDE_FALLBACKS } from "./anthropic-compaction-replay-nhKaCXu6.mjs";
-import { _ as transportAbortError, f as notifyProviderHttpResponse, s as finalizeTerminalToolCallArguments } from "./transport-stream-shared-ljShVIZB.mjs";
+import { d as stripSystemPromptCacheBoundary, n as buildBaseOptions, r as clampMaxTokensToModel, t as adjustMaxTokensForThinking, u as splitSystemPromptCacheBoundary } from "./simple-options-BjHCCh4v.mjs";
+import { t as MALFORMED_STREAMING_FRAGMENT_ERROR_MESSAGE } from "./transport-utils-7il795_9.mjs";
+import { n as getEnvApiKey } from "./env-api-keys-bktO00EJ.mjs";
+import { _ as transportAbortError, f as notifyProviderHttpResponse, s as finalizeTerminalToolCallArguments, t as assignTransportErrorDetails } from "./transport-stream-shared-CZqMhfIw.mjs";
 import { t as createDeferredEventBuffer } from "./deferred-event-buffer-DAvyP7qA.mjs";
 import { n as parseJsonWithRepair, r as parseStreamingJson, t as createToolArgumentPreviewSchedule } from "./json-parse-BuAJEbdW.mjs";
 import { t as notifyLlmRequestActivity } from "./llm-request-activity-BjtkplhG.mjs";
-import { t as transformProviderMessages } from "./provider-transcript-transform-C01bQ5a3.mjs";
+import { t as transformProviderMessages } from "./provider-transcript-transform-BaMbI1hr.mjs";
 import { i as resolveCloudflareBaseUrl, n as hasCopilotVisionInput, t as buildCopilotDynamicHeaders } from "./github-copilot-headers-NCJtz9i0.mjs";
 import Anthropic from "@anthropic-ai/sdk";
 import { Stream } from "@anthropic-ai/sdk/core/streaming.js";
@@ -108,11 +108,12 @@ const ANTHROPIC_MESSAGE_EVENTS = /* @__PURE__ */ new Set([
 	"content_block_delta",
 	"content_block_stop"
 ]);
-async function* iterateAnthropicEvents(response, requireMessageStop = false) {
+async function* iterateAnthropicEvents(response, requireMessageStop = false, signal) {
 	if (!response.body) throw new Error("Attempted to iterate over an Anthropic response with no body");
 	let sawMessageEnd = false;
 	for await (const sse of Stream.rawEvents(response)) {
 		if (sse.event === "error") throw new Error(sse.data);
+		notifyLlmRequestActivity(signal);
 		if (!ANTHROPIC_MESSAGE_EVENTS.has(sse.event ?? "")) continue;
 		try {
 			const event = parseJsonWithRepair(sse.data);
@@ -153,15 +154,17 @@ const streamAnthropic = (model, context, options) => {
 			stopReason: "stop",
 			timestamp: Date.now()
 		};
-		const refusalBuffer = usesClaudeStreamingRefusalContract(model) ? createDeferredEventBuffer(stream, () => notifyLlmRequestActivity(requestOptions?.signal)) : void 0;
+		const refusalBuffer = usesClaudeStreamingRefusalContract(model) ? createDeferredEventBuffer(stream) : void 0;
 		const eventSink = refusalBuffer ?? stream;
 		let costModel = model;
 		let messageStartPromptUsage;
 		let usedCompactionReplay = false;
+		let inputTransformations;
 		try {
 			let client;
 			let isOAuth;
 			let serverSideFallback = false;
+			let directApiKeyBetaHeader;
 			if (requestOptions?.client) {
 				client = requestOptions.client;
 				isOAuth = false;
@@ -180,18 +183,22 @@ const streamAnthropic = (model, context, options) => {
 				client = created.client;
 				isOAuth = created.isOAuthToken;
 				serverSideFallback = created.serverSideFallback;
+				directApiKeyBetaHeader = created.directApiKeyBetaHeader;
 			}
 			const builtParams = await buildParams(model, requestContext, isOAuth, requestOptions, serverSideFallback);
 			usedCompactionReplay = builtParams.usedCompactionReplay;
 			let params = builtParams.params;
 			const toolProjection = builtParams.toolProjection;
+			applyAnthropicContextManagementToRequest(params, model, requestOptions, directApiKeyBetaHeader);
 			const nextParams = await requestOptions?.onPayload?.(params, model);
 			if (nextParams !== void 0) params = nextParams;
 			applyClaudeRequestContract(params, model);
+			const betaHeader = resolveAnthropicContextManagementBetaHeader(params, directApiKeyBetaHeader);
 			const sdkRequestOptions = {
 				...requestOptions?.signal ? { signal: requestOptions.signal } : {},
 				...requestOptions?.timeoutMs !== void 0 ? { timeout: requestOptions.timeoutMs } : {},
-				maxRetries: requestOptions?.maxRetries ?? 0
+				maxRetries: 0,
+				headers: applyAnthropicThinkingBindingControls(params, betaHeader) ?? (betaHeader !== void 0 ? { "anthropic-beta": betaHeader } : void 0)
 			};
 			const response = await client.messages.create({
 				...params,
@@ -207,200 +214,206 @@ const streamAnthropic = (model, context, options) => {
 			const toolArgumentPreviewSchedules = /* @__PURE__ */ new WeakMap();
 			const sealedToolCalls = [];
 			const compactionCapture = createCompactionCapture(output, model, requestOptions);
-			const requireMessageStop = refusalBuffer !== void 0 || model.provider === "anthropic" && isAnthropicPublicEndpoint(model.baseUrl);
-			for await (const event of iterateAnthropicEvents(response, requireMessageStop)) if (event.type === "message_start") {
-				output.responseId = event.message.id;
-				output.responseModel = event.message.model;
-				messageStartPromptUsage = applyAnthropicMessageStartUsage(output.usage, event.message.usage);
-				calculateCost(costModel, output.usage);
-				eventSink.push({
-					type: "start",
-					partial: output
-				});
-			} else if (event.type === "content_block_start") {
-				const rawContentBlock = isRecord(event.content_block) ? event.content_block : void 0;
-				if (requestOptions?.anthropicServerCompaction === true && compactionCapture.begin(event.index, rawContentBlock, output.content.length)) continue;
-				const fallbackBoundary = refusalBuffer ? readAnthropicFallbackBoundary(event.content_block) : null;
-				if (fallbackBoundary) {
-					refusalBuffer?.discard();
-					sealedToolCalls.length = 0;
-					blockIndexes.clear();
-					applyAnthropicFallbackBoundary({
-						output,
-						boundary: fallbackBoundary,
-						provider: model.provider
-					});
-					costModel = {
-						...model,
-						cost: resolveAnthropicFallbackServingModelCost({
-							requestedModelId: model.id,
-							servingModelId: fallbackBoundary.toModel,
-							requestedCost: model.cost
-						})
-					};
+			const requireMessageStop = refusalBuffer !== void 0 || isDirectAnthropicModel(model);
+			for await (const event of iterateAnthropicEvents(response, requireMessageStop, requestOptions?.signal)) {
+				inputTransformations = readAnthropicInputTransformations(event) ?? inputTransformations;
+				if (event.type === "message_start") {
+					output.responseId = event.message.id;
+					output.responseModel = event.message.model;
+					messageStartPromptUsage = applyAnthropicMessageStartUsage(output.usage, event.message.usage);
 					calculateCost(costModel, output.usage);
 					eventSink.push({
 						type: "start",
 						partial: output
 					});
-					for (const [i, block] of blocks.entries()) {
-						if (block.type !== "text") continue;
-						delete block.index;
+				} else if (event.type === "content_block_start") {
+					const rawContentBlock = isRecord(event.content_block) ? event.content_block : void 0;
+					if (requestOptions?.anthropicServerCompaction === true && compactionCapture.begin(event.index, rawContentBlock, output.content.length)) continue;
+					const fallbackBoundary = refusalBuffer ? readAnthropicFallbackBoundary(event.content_block) : null;
+					if (fallbackBoundary) {
+						refusalBuffer?.discard();
+						sealedToolCalls.length = 0;
+						blockIndexes.clear();
+						applyAnthropicFallbackBoundary({
+							output,
+							boundary: fallbackBoundary,
+							provider: model.provider
+						});
+						costModel = {
+							...model,
+							cost: resolveAnthropicFallbackServingModelCost({
+								requestedModelId: model.id,
+								servingModelId: fallbackBoundary.toModel,
+								requestedCost: model.cost
+							})
+						};
+						calculateCost(costModel, output.usage);
+						eventSink.push({
+							type: "start",
+							partial: output
+						});
+						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
+							});
+							eventSink.push({
+								type: "text_end",
+								contentIndex: i,
+								content: block.text,
+								partial: output
+							});
+						}
+					} else if (event.content_block.type === "text") {
+						const block = {
+							type: "text",
+							text: "",
+							index: event.index
+						};
+						output.content.push(block);
+						blockIndexes.set(event.index, output.content.length - 1);
 						eventSink.push({
 							type: "text_start",
-							contentIndex: i,
+							contentIndex: output.content.length - 1,
 							partial: output
 						});
-						if (block.text) eventSink.push({
-							type: "text_delta",
-							contentIndex: i,
-							delta: block.text,
+					} else if (event.content_block.type === "thinking") {
+						const block = {
+							type: "thinking",
+							thinking: "",
+							thinkingSignature: "",
+							index: event.index
+						};
+						output.content.push(block);
+						blockIndexes.set(event.index, output.content.length - 1);
+						eventSink.push({
+							type: "thinking_start",
+							contentIndex: output.content.length - 1,
 							partial: output
 						});
+					} else if (event.content_block.type === "redacted_thinking") {
+						const block = {
+							type: "thinking",
+							thinking: "[Reasoning redacted]",
+							thinkingSignature: event.content_block.data,
+							redacted: true,
+							index: event.index
+						};
+						output.content.push(block);
+						blockIndexes.set(event.index, output.content.length - 1);
 						eventSink.push({
-							type: "text_end",
-							contentIndex: i,
-							content: block.text,
+							type: "thinking_start",
+							contentIndex: output.content.length - 1,
 							partial: output
 						});
-					}
-				} else if (event.content_block.type === "text") {
-					const block = {
-						type: "text",
-						text: "",
-						index: event.index
-					};
-					output.content.push(block);
-					blockIndexes.set(event.index, output.content.length - 1);
-					eventSink.push({
-						type: "text_start",
-						contentIndex: output.content.length - 1,
-						partial: output
-					});
-				} else if (event.content_block.type === "thinking") {
-					const block = {
-						type: "thinking",
-						thinking: "",
-						thinkingSignature: "",
-						index: event.index
-					};
-					output.content.push(block);
-					blockIndexes.set(event.index, output.content.length - 1);
-					eventSink.push({
-						type: "thinking_start",
-						contentIndex: output.content.length - 1,
-						partial: output
-					});
-				} else if (event.content_block.type === "redacted_thinking") {
-					const block = {
-						type: "thinking",
-						thinking: "[Reasoning redacted]",
-						thinkingSignature: event.content_block.data,
-						redacted: true,
-						index: event.index
-					};
-					output.content.push(block);
-					blockIndexes.set(event.index, output.content.length - 1);
-					eventSink.push({
-						type: "thinking_start",
-						contentIndex: output.content.length - 1,
-						partial: output
-					});
-				} else if (event.content_block.type === "tool_use") {
-					const block = {
-						type: "toolCall",
-						id: event.content_block.id,
-						name: isOAuth ? resolveOriginalAnthropicToolName(event.content_block.name, toolProjection) : event.content_block.name,
-						arguments: event.content_block.input ?? {},
-						partialJson: "",
-						index: event.index
-					};
-					output.content.push(block);
-					blockIndexes.set(event.index, output.content.length - 1);
-					toolArgumentPreviewSchedules.set(block, createToolArgumentPreviewSchedule());
-					eventSink.push({
-						type: "toolcall_start",
-						contentIndex: output.content.length - 1,
-						partial: output
-					});
-				}
-			} else if (event.type === "content_block_delta") {
-				const rawDelta = isRecord(event.delta) ? event.delta : void 0;
-				if (compactionCapture.delta(event.index, rawDelta)) continue;
-				else if (event.delta.type === "text_delta") {
-					const index = blockIndexes.get(event.index);
-					const block = index === void 0 ? void 0 : blocks[index];
-					if (index !== void 0 && block?.type === "text") {
-						block.text += event.delta.text;
+					} else if (event.content_block.type === "tool_use") {
+						const block = {
+							type: "toolCall",
+							id: event.content_block.id,
+							name: isOAuth ? resolveOriginalAnthropicToolName(event.content_block.name, toolProjection) : event.content_block.name,
+							arguments: event.content_block.input ?? {},
+							partialJson: "",
+							index: event.index
+						};
+						output.content.push(block);
+						blockIndexes.set(event.index, output.content.length - 1);
+						toolArgumentPreviewSchedules.set(block, createToolArgumentPreviewSchedule());
 						eventSink.push({
-							type: "text_delta",
-							contentIndex: index,
-							delta: event.delta.text,
+							type: "toolcall_start",
+							contentIndex: output.content.length - 1,
 							partial: output
 						});
 					}
-				} else if (event.delta.type === "thinking_delta") {
+				} else if (event.type === "content_block_delta") {
+					const rawDelta = isRecord(event.delta) ? event.delta : void 0;
+					if (compactionCapture.delta(event.index, rawDelta)) continue;
+					else if (event.delta.type === "text_delta") {
+						const index = blockIndexes.get(event.index);
+						const block = index === void 0 ? void 0 : blocks[index];
+						if (index !== void 0 && block?.type === "text") {
+							block.text += event.delta.text;
+							eventSink.push({
+								type: "text_delta",
+								contentIndex: index,
+								delta: event.delta.text,
+								partial: output
+							});
+						}
+					} else if (event.delta.type === "thinking_delta") {
+						const index = blockIndexes.get(event.index);
+						const block = index === void 0 ? void 0 : blocks[index];
+						if (index !== void 0 && block?.type === "thinking") {
+							block.thinking += event.delta.thinking;
+							eventSink.push({
+								type: "thinking_delta",
+								contentIndex: index,
+								delta: event.delta.thinking,
+								partial: output
+							});
+						}
+					} else if (event.delta.type === "input_json_delta") {
+						const index = blockIndexes.get(event.index);
+						const block = index === void 0 ? void 0 : blocks[index];
+						if (index !== void 0 && block?.type === "toolCall") {
+							block.partialJson = (block.partialJson ?? "") + event.delta.partial_json;
+							if (toolArgumentPreviewSchedules.get(block)?.(block.partialJson.length)) block.arguments = parseStreamingJson(block.partialJson);
+							eventSink.push({
+								type: "toolcall_delta",
+								contentIndex: index,
+								delta: event.delta.partial_json,
+								partial: output
+							});
+						}
+					} else if (event.delta.type === "signature_delta") {
+						const index = blockIndexes.get(event.index);
+						const block = index === void 0 ? void 0 : blocks[index];
+						if (index !== void 0 && block?.type === "thinking") {
+							block.thinkingSignature = block.thinkingSignature || "";
+							block.thinkingSignature += event.delta.signature;
+						}
+					}
+				} else if (event.type === "content_block_stop") {
+					if (compactionCapture.complete(event.index)) continue;
 					const index = blockIndexes.get(event.index);
 					const block = index === void 0 ? void 0 : blocks[index];
-					if (index !== void 0 && block?.type === "thinking") {
-						block.thinking += event.delta.thinking;
-						eventSink.push({
-							type: "thinking_delta",
+					if (index !== void 0 && block) {
+						blockIndexes.delete(event.index);
+						delete block.index;
+						if (block.type === "text") eventSink.push({
+							type: "text_end",
 							contentIndex: index,
-							delta: event.delta.thinking,
+							content: block.text,
 							partial: output
 						});
-					}
-				} else if (event.delta.type === "input_json_delta") {
-					const index = blockIndexes.get(event.index);
-					const block = index === void 0 ? void 0 : blocks[index];
-					if (index !== void 0 && block?.type === "toolCall") {
-						block.partialJson = (block.partialJson ?? "") + event.delta.partial_json;
-						if (toolArgumentPreviewSchedules.get(block)?.(block.partialJson.length)) block.arguments = parseStreamingJson(block.partialJson);
-						eventSink.push({
-							type: "toolcall_delta",
+						else if (block.type === "thinking") eventSink.push({
+							type: "thinking_end",
 							contentIndex: index,
-							delta: event.delta.partial_json,
+							content: block.thinking,
 							partial: output
 						});
+						else if (block.type === "toolCall") sealedToolCalls.push({
+							block,
+							contentIndex: index
+						});
 					}
-				} else if (event.delta.type === "signature_delta") {
-					const index = blockIndexes.get(event.index);
-					const block = index === void 0 ? void 0 : blocks[index];
-					if (index !== void 0 && block?.type === "thinking") {
-						block.thinkingSignature = block.thinkingSignature || "";
-						block.thinkingSignature += event.delta.signature;
+				} else if (event.type === "message_delta") {
+					logAnthropicContextEdits(event);
+					if (event.delta.stop_reason) {
+						if (event.delta.stop_reason === "refusal") applyAnthropicRefusal(output, event.delta.stop_details, model.provider);
+						else output.stopReason = mapAnthropicStopReason(event.delta.stop_reason);
 					}
+					applyAnthropicMessageDeltaUsage(output.usage, event.usage, messageStartPromptUsage);
+					calculateCost(costModel, output.usage);
 				}
-			} else if (event.type === "content_block_stop") {
-				if (compactionCapture.complete(event.index)) continue;
-				const index = blockIndexes.get(event.index);
-				const block = index === void 0 ? void 0 : blocks[index];
-				if (index !== void 0 && block) {
-					blockIndexes.delete(event.index);
-					delete block.index;
-					if (block.type === "text") eventSink.push({
-						type: "text_end",
-						contentIndex: index,
-						content: block.text,
-						partial: output
-					});
-					else if (block.type === "thinking") eventSink.push({
-						type: "thinking_end",
-						contentIndex: index,
-						content: block.thinking,
-						partial: output
-					});
-					else if (block.type === "toolCall") sealedToolCalls.push({
-						block,
-						contentIndex: index
-					});
-				}
-			} else if (event.type === "message_delta") {
-				if (event.delta.stop_reason) if (event.delta.stop_reason === "refusal") applyAnthropicRefusal(output, event.delta.stop_details, model.provider);
-				else output.stopReason = mapAnthropicStopReason(event.delta.stop_reason);
-				if (event.usage) applyAnthropicMessageDeltaUsage(output.usage, event.usage, messageStartPromptUsage);
-				calculateCost(costModel, output.usage);
 			}
 			if (requestOptions?.signal?.aborted) throw transportAbortError(requestOptions.signal);
 			if (output.stopReason === "aborted" || output.stopReason === "error") throw new Error(output.errorMessage ?? "An unknown error occurred");
@@ -423,6 +436,7 @@ const streamAnthropic = (model, context, options) => {
 			});
 			stream.end();
 		} catch (error) {
+			const terminal = assignTransportErrorDetails(output, error, requestOptions?.signal);
 			output.content = output.content.filter((block) => block.type !== "toolCall");
 			for (const block of output.content) {
 				delete block.index;
@@ -433,14 +447,14 @@ const streamAnthropic = (model, context, options) => {
 				output.content = [];
 			}
 			if (usedCompactionReplay && isAnthropicReplayRejection(error)) suppressAnthropicCompaction(output, model, requestOptions);
-			const terminal = projectProviderError(error, requestOptions?.signal);
-			Object.assign(output, terminal);
 			stream.push({
 				type: "error",
 				reason: terminal.stopReason,
 				error: output
 			});
 			stream.end();
+		} finally {
+			logAnthropicThinkingDrops(inputTransformations);
 		}
 	})();
 	return stream;
@@ -462,6 +476,8 @@ const streamSimpleAnthropic = (model, context, options) => {
 	const base = {
 		...buildBaseOptions(model, options, apiKey),
 		anthropicServerCompaction: options?.anthropicServerCompaction,
+		anthropicCompactThreshold: options?.anthropicCompactThreshold,
+		cacheTtlPruning: options?.cacheTtlPruning,
 		authProfileId: options?.authProfileId,
 		maxTokens: clampMaxTokensToModel(model, options?.maxTokens ?? model.maxTokens),
 		toolChoice: options?.toolChoice
@@ -500,17 +516,6 @@ const streamSimpleAnthropic = (model, context, options) => {
 		thinkingBudgetTokens: thinkingEnabled ? adjusted.thinkingBudget : void 0
 	});
 };
-function isOAuthToken(apiKey) {
-	return getAiTransportHost().resolveSecretSentinel(apiKey).includes("sk-ant-oat");
-}
-function isAnthropicPublicEndpoint(baseUrl) {
-	if (!baseUrl) return true;
-	try {
-		return new URL(baseUrl).hostname.toLowerCase() === "api.anthropic.com";
-	} catch {
-		return false;
-	}
-}
 /**
 * Server-side refusal fallback is a first-party Claude API beta: proxies and
 * Bedrock/Vertex/Foundry reject the `fallbacks` param, and OAuth (Claude Code
@@ -518,7 +523,7 @@ function isAnthropicPublicEndpoint(baseUrl) {
 */
 function supportsAnthropicServerSideFallback(model) {
 	if (!usesClaudeFable5MessagesContract(model) && resolveClaudeOpus5ModelIdentity(model) === void 0 || model.provider !== "anthropic") return false;
-	return isAnthropicPublicEndpoint(model.baseUrl);
+	return isDirectAnthropicModel(model);
 }
 function createClient(model, apiKey, thinkingEnabled, interleavedThinking, useFineGrainedToolStreamingBeta, optionsHeaders, dynamicHeaders, sessionId) {
 	const needsInterleavedBeta = interleavedThinking && !supportsClaudeAdaptiveThinking(model);
@@ -539,7 +544,8 @@ function createClient(model, apiKey, thinkingEnabled, interleavedThinking, useFi
 				Authorization: null,
 				...betaFeatures.length > 0 ? { "anthropic-beta": betaFeatures.join(",") } : {}
 			}, model.headers, optionsHeaders),
-			fetch
+			fetch,
+			maxRetries: 0
 		}),
 		isOAuthToken: false,
 		serverSideFallback: false
@@ -555,7 +561,8 @@ function createClient(model, apiKey, thinkingEnabled, interleavedThinking, useFi
 				"anthropic-dangerous-direct-browser-access": "true",
 				...betaFeatures.length > 0 ? { "anthropic-beta": betaFeatures.join(",") } : {}
 			}, model.headers, dynamicHeaders, optionsHeaders),
-			fetch
+			fetch,
+			maxRetries: 0
 		}),
 		isOAuthToken: false,
 		serverSideFallback: false
@@ -574,12 +581,13 @@ function createClient(model, apiKey, thinkingEnabled, interleavedThinking, useFi
 				"anthropic-dangerous-direct-browser-access": "true",
 				...betaFeatures.length > 0 ? { "anthropic-beta": betaFeatures.join(",") } : {}
 			}, omitFoundryBearerCredentialHeaders(model.headers), dynamicHeaders, optionsHeaders),
-			fetch
+			fetch,
+			maxRetries: 0
 		}),
 		isOAuthToken: false,
 		serverSideFallback: false
 	};
-	if (isOAuthToken(apiKey)) return {
+	if (isAnthropicOAuthApiKey(apiKey)) return {
 		client: new Anthropic({
 			apiKey: null,
 			authToken: apiKey,
@@ -596,7 +604,8 @@ function createClient(model, apiKey, thinkingEnabled, interleavedThinking, useFi
 				"user-agent": `claude-cli/${ANTHROPIC_CLAUDE_CODE_VERSION}`,
 				"x-app": "cli"
 			}, model.headers, optionsHeaders),
-			fetch
+			fetch,
+			maxRetries: 0
 		}),
 		isOAuthToken: true,
 		serverSideFallback: false
@@ -604,21 +613,24 @@ function createClient(model, apiKey, thinkingEnabled, interleavedThinking, useFi
 	const serverSideFallback = supportsAnthropicServerSideFallback(model);
 	if (serverSideFallback) betaFeatures.push(ANTHROPIC_SERVER_SIDE_FALLBACK_BETA);
 	const sessionAffinityHeaders = sessionId && getAnthropicCompat(model).sendSessionAffinityHeaders ? { "x-session-affinity": sessionId } : {};
+	const defaultHeaders = mergeHeaders({
+		accept: "application/json",
+		"anthropic-dangerous-direct-browser-access": "true",
+		...betaFeatures.length > 0 ? { "anthropic-beta": betaFeatures.join(",") } : {}
+	}, sessionAffinityHeaders, model.headers, optionsHeaders);
 	return {
 		client: new Anthropic({
 			apiKey,
 			authToken: null,
 			baseURL: model.baseUrl,
 			dangerouslyAllowBrowser: true,
-			defaultHeaders: mergeHeaders({
-				accept: "application/json",
-				"anthropic-dangerous-direct-browser-access": "true",
-				...betaFeatures.length > 0 ? { "anthropic-beta": betaFeatures.join(",") } : {}
-			}, sessionAffinityHeaders, model.headers, optionsHeaders),
-			fetch
+			defaultHeaders,
+			fetch,
+			maxRetries: 0
 		}),
 		isOAuthToken: false,
-		serverSideFallback
+		serverSideFallback,
+		directApiKeyBetaHeader: isDirectAnthropicModel(model) ? Object.entries(defaultHeaders).findLast(([name]) => name.toLowerCase() === "anthropic-beta")?.[1] ?? "" : void 0
 	};
 }
 async function buildParams(model, context, isOAuthTokenResult, options, serverSideFallback = false) {
@@ -684,22 +696,17 @@ async function buildParams(model, context, isOAuthTokenResult, options, serverSi
 async function convertMessages(messages, model, isOAuthTokenValue, cacheControl, messageCacheControlLimit = 4, replayThinkingEnabled = true, allowEmptySignature = false, compaction) {
 	const params = [];
 	const imageBudget = createAnthropicInlineImageBudget();
-	const cacheBreakpointOptOutParamIndexes = /* @__PURE__ */ new Set();
 	const transformedMessages = transformProviderMessages(messages, model, normalizeAnthropicToolCallId);
 	const activeToolTurnAssistantIndex = replayThinkingEnabled ? -1 : findActiveAnthropicToolTurnAssistantIndex(transformedMessages);
 	for (let i = 0; i < transformedMessages.length; i++) {
 		const msg = transformedMessages[i];
 		if (!msg) continue;
 		if (msg.role === "user") {
-			const isRuntimeContextCarrier = msg.runtimeContextCarrier === true;
 			if (typeof msg.content === "string") {
-				if (msg.content.trim().length > 0) {
-					if (isRuntimeContextCarrier) cacheBreakpointOptOutParamIndexes.add(params.length);
-					params.push({
-						role: "user",
-						content: sanitizeSurrogates(msg.content)
-					});
-				}
+				if (msg.content.trim().length > 0) params.push({
+					role: "user",
+					content: sanitizeSurrogates(msg.content)
+				});
 			} else {
 				const filteredBlocks = (await normalizeAnthropicInlineContent(msg.content, imageBudget)).map((item) => {
 					if (item.type === "text") return {
@@ -719,7 +726,6 @@ async function convertMessages(messages, model, isOAuthTokenValue, cacheControl,
 					return true;
 				});
 				if (filteredBlocks.length === 0) continue;
-				if (isRuntimeContextCarrier) cacheBreakpointOptOutParamIndexes.add(params.length);
 				params.push({
 					role: "user",
 					content: filteredBlocks
@@ -804,7 +810,7 @@ async function convertMessages(messages, model, isOAuthTokenValue, cacheControl,
 			});
 		}
 	}
-	if (cacheControl) applyAnthropicCacheControlToMessages(params, cacheControl, messageCacheControlLimit, cacheBreakpointOptOutParamIndexes);
+	if (cacheControl) applyAnthropicCacheControlToMessages(params, cacheControl, messageCacheControlLimit, /* @__PURE__ */ new Set());
 	return params;
 }
 function buildAnthropicSystemBlocks(systemPrompt, isOAuthTokenResult, cacheControl) {