@openclaw/ai 2026.10.5-beta.3 → 2026.10.10-beta.1

package/README.md

@@ -26,12 +26,23 @@ runtime-local policy can use `createNodeLlmRuntime`; it preserves that host acro
 provider work without replacing the process default. `createLlmRuntime` continues
 to use the process-default host.
 
+OpenAI HTTP adapters report rejected response status and headers through
+`onResponse` before consuming the error body. Successful streaming responses
+invoke the callback before the first event. Retry and failover policy remains
+with the application.
+
 Hosts that attach request state to async contexts should supply
 `runInDetachedAsyncContext` from a context-free root initialized before requests
 start. Retained HTTP continuation timers use it at creation so completed caller
 state can be collected while the response remains reusable for 90 minutes.
 The default host runs the callback directly, including in browsers.
 
+Tool-call stream producers expose cumulative argument text as `partialJson` on
+the active content block while emitting `toolcall_delta`. This transient buffer
+supports input progress; completed tool calls retain only parsed `arguments`.
+It is the live block, not a per-event snapshot: a consumer that lags behind the
+producer reads the latest value, or none once the call has finished.
+
 The explicit `@openclaw/ai/internal/anthropic`, `google-model-family`, `openai`,
 `openai-completions-compat`, `openai-responses-payload-policy`, `retry-after`, `runtime`, `shared`, and
 `tool-schema` subpaths exist for the OpenClaw application itself.

package/dist/{anthropic-BalhAzs-.mjs → anthropic-D6spfBri.mjs}

@@ -1,18 +1,18 @@
-import { t as __exportAll } from "./rolldown-runtime-BhDjJH2R.mjs";
-import { w as supportsClaudeAdaptiveThinking } from "./src-C44MKrW5.mjs";
+import { n as __exportAll } from "./reasoning-tag-text-partitioner-DzlRubwU.mjs";
+import { w as supportsClaudeAdaptiveThinking } from "./src-CyA0zJnt.mjs";
 import { t as AssistantMessageEventStream } from "./event-stream-X2gmsUWv.mjs";
-import { T as usesClaudeStreamingRefusalContract, _ as buildAnthropicClaudeCodeIdentity, a as resolveAiTransportHeaderSentinels, b as prepareClaudeNoPrefillRequestContext, r as getAiTransportHost } from "./host-Bf3NjYNj.mjs";
-import { d as streamFragmentError } from "./text-signature-Drb4Erb8.mjs";
-import { D as suppressAnthropicCompaction, J as isAnthropicOAuthApiKey, P as isDirectAnthropicModel, T as isAnthropicReplayRejection, V as supportsAnthropicServerSideFallback, X as usesFoundryBearerAuth, Y as omitFoundryBearerCredentialHeaders, d as applyAnthropicThinkingOptions, l as buildAnthropicRequest, t as consumeAnthropicStream, u as prepareAnthropicRequest } from "./anthropic-stream-reducer-DkKeXXx4.mjs";
-import { i as resolveCacheRetention, n as resolveCloudflareBaseUrl, r as buildCopilotDynamicHeaders } from "./cloudflare-5qSGvIUH.mjs";
-import { D as parseJsonWithRepair, m as notifyProviderHttpResponse, n as assignTransportErrorDetails, u as finalizeTransportStream } from "./transport-stream-shared-CWGOuLcA.mjs";
-import { n as buildBaseOptions, r as clampMaxTokensToModel } from "./simple-options-BAu4B54D.mjs";
-import { n as getEnvApiKey } from "./env-api-keys-CrxwdylR.mjs";
+import { T as usesClaudeStreamingRefusalContract, _ as buildAnthropicClaudeCodeIdentity, a as resolveAiTransportHeaderSentinels, b as prepareClaudeNoPrefillRequestContext, r as getAiTransportHost } from "./host-B2gk-d1H.mjs";
+import { u as streamFragmentError } from "./provider-replay-context-J6CfU3m1.mjs";
+import { F as supportsAnthropicServerSideFallback, H as isAnthropicOAuthApiKey, O as isDirectAnthropicModel, U as omitFoundryBearerCredentialHeaders, W as usesFoundryBearerAuth, d as applyAnthropicThinkingOptions, l as buildAnthropicRequest, t as consumeAnthropicStream, u as prepareAnthropicRequest, x as suppressAnthropicCompaction, y as isAnthropicReplayRejection } from "./anthropic-stream-reducer-CzPXOaLM.mjs";
+import { i as resolveCacheRetention, n as resolveCloudflareBaseUrl, r as buildCopilotDynamicHeaders } from "./cloudflare-Dttf8jKq.mjs";
+import { n as buildBaseOptions, r as clampMaxTokensToModel } from "./simple-options-BYgC6kse.mjs";
+import { D as parseJsonWithRepair, m as notifyProviderHttpResponse, n as assignTransportErrorDetails, u as finalizeTransportStream } from "./transport-stream-shared-CzQlAzJH.mjs";
+import { n as getEnvApiKey } from "./env-api-keys-Xd8dm_aV.mjs";
 import { t as createDeferredEventBuffer } from "./deferred-event-buffer-DAvyP7qA.mjs";
-import { t as createAssistantOutput } from "./assistant-output-BuhRpLeD.mjs";
+import { t as createAssistantOutput } from "./assistant-output-6iFA1nbC.mjs";
 import { t as notifyLlmRequestActivity } from "./llm-request-activity-CfMuh5cC.mjs";
 import { n as resolveOpencodeSessionHeaders } from "./session-affinity-DA4WHv1h.mjs";
-import { t as requireApiKey } from "./required-api-key-CFJvcFy_.mjs";
+import { t as requireApiKey } from "./required-api-key-D088S4Cd.mjs";
 import Anthropic from "@anthropic-ai/sdk";
 import { Stream } from "@anthropic-ai/sdk/core/streaming.js";
 //#region packages/ai/src/providers/anthropic.ts
@@ -59,11 +59,11 @@ const streamAnthropic = (model, context, options) => {
 	(async () => {
 		const output = createAssistantOutput(model);
 		const refusalBuffer = usesClaudeStreamingRefusalContract(model) ? createDeferredEventBuffer(stream) : void 0;
-		let usedCompactionReplay = false;
+		let replayedCompaction;
 		try {
 			const { client, isOAuthToken, serverSideFallback, directApiKeyBetaHeader, claudeCodeVersion } = createClient(model, requestContext, requestOptions);
 			const builtParams = await buildAnthropicRequest(model, requestContext, requestOptions, "provider", isOAuthToken, serverSideFallback, claudeCodeVersion);
-			usedCompactionReplay = builtParams.usedCompactionReplay;
+			replayedCompaction = builtParams.replayedCompaction;
 			const { params, headers } = await prepareAnthropicRequest(builtParams.params, model, requestOptions, directApiKeyBetaHeader);
 			const sdkRequestOptions = {
 				...requestOptions?.signal ? { signal: requestOptions.signal } : {},
@@ -98,15 +98,12 @@ const streamAnthropic = (model, context, options) => {
 		} 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;
-				delete block.partialJson;
-			}
+			for (const block of output.content) delete block.index;
 			if (refusalBuffer) {
 				refusalBuffer.discard();
 				output.content = [];
 			}
-			if (usedCompactionReplay && isAnthropicReplayRejection(error)) suppressAnthropicCompaction(output, model, requestOptions);
+			if (replayedCompaction && isAnthropicReplayRejection(error)) suppressAnthropicCompaction(output, model, requestOptions, replayedCompaction);
 			stream.push({
 				type: "error",
 				reason: terminal.stopReason,
@@ -135,6 +132,7 @@ const streamSimpleAnthropic = (model, context, options) => {
 		anthropicServerCompaction: options?.anthropicServerCompaction,
 		anthropicCompactThreshold: options?.anthropicCompactThreshold,
 		cacheTtlPruning: options?.cacheTtlPruning,
+		onCompactionRejected: options?.onCompactionRejected,
 		authProfileId: options?.authProfileId,
 		maxTokens: clampMaxTokensToModel(model, options?.maxTokens ?? model.maxTokens),
 		toolChoice: options?.toolChoice,

package/dist/{anthropic-payload-policy-DGblkHL5.d.mts → anthropic-payload-policy-Cr8xjazC.d.mts}

@@ -1,6 +1,6 @@
-import "./index-BYDvopUB.mjs";
-import { k as Model } from "./types-Bd2T86VJ.mjs";
-import { t as AnthropicContextManagementOptions } from "./provider-options-CVrXZBtA.mjs";
+import "./index-DSprYWaz.mjs";
+import { k as Model } from "./types-CVYzKrMl.mjs";
+import { t as AnthropicContextManagementOptions } from "./provider-options-DeYeaflL.mjs";
 import { TextBlockParam } from "@anthropic-ai/sdk/resources/messages.js";
 //#region packages/ai/src/transports/anthropic-payload-policy.d.ts
 /** @deprecated Anthropic-family provider payload helper; do not use from third-party plugins. */
@@ -26,9 +26,12 @@ type AnthropicPayloadPolicyInput = {
 type AnthropicPayloadPolicy = ReturnType<typeof resolveAnthropicPayloadPolicy>;
 /** Resolve the server-compaction gate and effective threshold for an Anthropic route. */
 declare function resolveAnthropicServerCompactionPlan(model: {
+  id?: string;
+  params?: Record<string, unknown>;
   provider?: unknown;
   api?: unknown;
   baseUrl?: string;
+  contextTokens?: unknown;
   contextWindow?: unknown;
 }, extraParams?: Record<string, unknown>, apiKey?: string): {
   enabled: boolean;

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

@@ -1,20 +1,20 @@
-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 { 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-CyA0zJnt.mjs";
+import { f as hasRuntimeContextMarker } from "./types-BXd0kI8-.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-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 { a as normalizeOptionalLowercaseString, i as normalizeNullableString } from "./string-coerce-Cj8sqWHx.mjs";
+import { n as asNonNegativeFiniteNumber } from "./number-coercion-37gmNkuA.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-B2gk-d1H.mjs";
+import { n as isProviderReplayContext, r as providerReplayContextMatches, t as buildProviderReplayContext } from "./provider-replay-context-J6CfU3m1.mjs";
 import { n as estimateBase64DecodedBytes } from "./base64-C8CdcsjU.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, 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 { a as resolveProviderRequestCapabilities, i as resolveProviderEndpoint } from "./host-policy-mpqGhbeM.mjs";
+import { i as resolveCacheRetention } from "./cloudflare-Dttf8jKq.mjs";
+import { t as sanitizeSurrogates } from "./sanitize-unicode-CRGuMONI.mjs";
+import { S as splitSystemPromptCacheBoundary, T as stripSystemPromptRelocatableBoundary, d as extractToolResultBlockText, f as extractToolResultText, h as preparedRequestSuffix, l as describeToolResultMediaPlaceholder, t as adjustMaxTokensForThinking, w as stripSystemPromptCacheBoundary } from "./simple-options-BYgC6kse.mjs";
+import { C as parseJsonObjectPreservingUnsafeIntegers, E as createToolArgumentPreviewSchedule, O as parseStreamingJson, b as transportAbortError, d as iterateModelStream, i as copyProviderAcceptanceObserver, l as finalizeTerminalToolCallArguments, r as coerceTransportToolCallArguments, v as sanitizeTransportPayloadText } from "./transport-stream-shared-CzQlAzJH.mjs";
+import { t as parsePositiveInteger } from "./positive-integer-Bb4Evc7L.mjs";
+import { n as transformProviderMessages } from "./assistant-output-6iFA1nbC.mjs";
+import { a as reconcileAnthropicToolChoice, i as projectAnthropicTools, n as normalizeAnthropicToolChoice, o as resolveOriginalAnthropicToolName, s as toClaudeCodeToolName, t as normalizeAnthropicToolCallId } from "./anthropic-tool-projection-BdAS3rtJ.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. */
@@ -121,19 +121,22 @@ 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(contextWindow, configured) {
+function resolveAnthropicCompactThreshold(model, 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, Math.floor((resolvedContextWindow ?? 0) * .7));
+	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));
 }
 /** Resolve the server-compaction gate and effective threshold for an Anthropic route. */
 function resolveAnthropicServerCompactionPlan(model, extraParams, apiKey) {
-	const enabled = extraParams?.anthropicServerCompaction === true && !isAnthropicOAuthApiKey(apiKey) && normalizeOptionalLowercaseString(model.api) === "anthropic-messages" && isDirectAnthropicModel(model);
+	const configured = extraParams?.anthropicServerCompaction;
+	const enabled = configured !== false && (configured === true || supportsClaudeServerCompaction(model)) && !isAnthropicOAuthApiKey(apiKey) && normalizeOptionalLowercaseString(model.api) === "anthropic-messages" && isDirectAnthropicModel(model);
 	return {
 		enabled,
-		...enabled ? { threshold: resolveAnthropicCompactThreshold(model.contextWindow, extraParams?.anthropicCompactThreshold) } : {}
+		...enabled ? { threshold: resolveAnthropicCompactThreshold(model, extraParams?.anthropicCompactThreshold) } : {}
 	};
 }
 function isDirectAnthropicModel(model, env = process.env) {
@@ -251,12 +254,12 @@ function normalizeAnthropicSystemBlocks(system, cacheControl) {
 /** 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 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;
+	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;
 		const content = record.content;
 		const blocks = typeof content === "string" ? [{
 			type: "text",
@@ -264,23 +267,16 @@ function applyAnthropicCacheControlToMessages(messages, cacheControl, markerLimi
 		}] : content;
 		if (!Array.isArray(blocks)) continue;
 		for (let j = blocks.length - 1; j >= 0; j--) {
-			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;
-				}
+			const blockRecord = blocks[j];
+			if (!isRecord(blockRecord)) continue;
+			if (blockRecord.type === "text" || blockRecord.type === "image" || blockRecord.type === "tool_result") {
 				blockRecord.cache_control = cacheControl;
 				if (typeof content === "string") record.content = blocks;
-				if (fallbackToolResult && markerLimit > 1) fallbackToolResult.cache_control = cacheControl;
-				return;
+				marked++;
+				break;
 			}
-			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;
@@ -301,7 +297,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.contextWindow, input.extraParams?.anthropicCompactThreshold),
+		compactThreshold: serverCompactionPlan.threshold ?? resolveAnthropicCompactThreshold(input, input.extraParams?.anthropicCompactThreshold),
 		serviceTier: input.serviceTier,
 		useServerCompaction: input.enableServerCompaction === true && serverCompactionPlan.enabled,
 		...input.cacheTtlPruning && normalizeOptionalLowercaseString(input.api) === "anthropic-messages" && isDirectAnthropicModel(input) ? { toolClearing: {
@@ -354,7 +350,8 @@ function applyAnthropicContextManagementEdits(payload, policy) {
 		trigger: {
 			type: "input_tokens",
 			value: policy.compactThreshold
-		}
+		},
+		instructions: ANTHROPIC_COMPACTION_INSTRUCTIONS
 	});
 	if (edits.length > 0) payload.context_management = { edits };
 }
@@ -363,7 +360,7 @@ function applyAnthropicContextManagementToRequest(payload, model, options, direc
 	applyAnthropicContextManagementEdits(payload, resolveAnthropicPayloadPolicy({
 		...model,
 		api: "anthropic-messages",
-		enableServerCompaction: true,
+		enableServerCompaction: options?.anthropicServerCompaction === true,
 		extraParams: { ...options },
 		cacheTtlPruning: options?.cacheTtlPruning
 	}));
@@ -487,7 +484,11 @@ function captureAnthropicCompaction(output, capture, model, options) {
 		baseUrlHash: context.baseUrlHash
 	};
 }
-function suppressAnthropicCompaction(output, model, options) {
+/**
+* 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) {
 	const context = buildProviderReplayContext(model, options);
 	if (!context.baseUrlHash) return;
 	output.providerReplay = {
@@ -497,6 +498,7 @@ function suppressAnthropicCompaction(output, model, options) {
 		...context,
 		baseUrlHash: context.baseUrlHash
 	};
+	options?.onCompactionRejected?.({ data: rejected.content });
 }
 function resolveNewestAnthropicCompaction(messages, model, options) {
 	const context = buildProviderReplayContext(model, options);
@@ -635,168 +637,6 @@ function findActiveAnthropicToolTurnAssistantIndex(messages) {
 	return [...toolResultIds].every((toolCallId) => toolCallIds.has(toolCallId)) ? index : -1;
 }
 //#endregion
-//#region packages/ai/src/providers/anthropic-tool-projection.ts
-const CLAUDE_CODE_TOOL_LOOKUP = new Map([
-	"Read",
-	"Write",
-	"Edit",
-	"Bash",
-	"Grep",
-	"Glob",
-	"AskUserQuestion",
-	"EnterPlanMode",
-	"ExitPlanMode",
-	"KillShell",
-	"NotebookEdit",
-	"Skill",
-	"Task",
-	"TaskOutput",
-	"TodoWrite",
-	"WebFetch",
-	"WebSearch"
-].map((name) => [name.toLowerCase(), name]));
-/** Preserve Claude Code's canonical tool casing for subscription OAuth requests. */
-function toClaudeCodeToolName(name) {
-	return CLAUDE_CODE_TOOL_LOOKUP.get(name.toLowerCase()) ?? name;
-}
-/** Anthropic rejects forced tools while extended thinking is enabled. */
-function normalizeAnthropicToolChoice(thinkingEnabled, toolChoice) {
-	if (thinkingEnabled && (toolChoice === "any" || typeof toolChoice === "object" && toolChoice.type === "tool")) return { type: "auto" };
-	return typeof toolChoice === "string" ? { type: toolChoice } : toolChoice;
-}
-/** Anthropic tool identifiers accept only ASCII word characters and dashes. */
-function normalizeAnthropicToolCallId(id) {
-	return id.replace(/[^a-zA-Z0-9_-]/g, "_").slice(0, 64);
-}
-function isProviderSupportedViolation(violation) {
-	return violation.endsWith(".$dynamicRef") || violation.endsWith(".$dynamicAnchor");
-}
-const schemaValueKeywords = /* @__PURE__ */ new Set([
-	"additionalProperties",
-	"contains",
-	"contentSchema",
-	"else",
-	"if",
-	"items",
-	"not",
-	"propertyNames",
-	"then",
-	"unevaluatedItems",
-	"unevaluatedProperties"
-]);
-const schemaArrayKeywords = /* @__PURE__ */ new Set([
-	"allOf",
-	"anyOf",
-	"oneOf",
-	"prefixItems"
-]);
-/** Normalize the detached JSON projection and report tuple changes to enclosing schemas. */
-function normalizeAnthropicJsonSchema(schema) {
-	if (!isRecord(schema)) return false;
-	let changed = false;
-	for (const [key, value] of Object.entries(schema)) {
-		if (schemaValueKeywords.has(key) && !Array.isArray(value)) {
-			changed = normalizeAnthropicJsonSchema(value) || changed;
-			continue;
-		}
-		if (schemaArrayKeywords.has(key) && Array.isArray(value)) {
-			for (const entry of value) changed = normalizeAnthropicJsonSchema(entry) || changed;
-			continue;
-		}
-		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);
-		schema.prefixItems = schema.items;
-		const additionalItems = schema.additionalItems;
-		if (typeof additionalItems === "boolean" || isRecord(additionalItems)) {
-			normalizeAnthropicJsonSchema(additionalItems);
-			schema.items = additionalItems;
-		} else delete schema.items;
-		delete schema.additionalItems;
-		changed = true;
-	}
-	if (changed) delete schema.$schema;
-	return changed;
-}
-/** Snapshots direct/custom tool descriptors before Anthropic payload construction. */
-function projectAnthropicTools(tools, toWireName) {
-	const projectedTools = [];
-	const originalNameByWireName = /* @__PURE__ */ new Map();
-	const unavailableOriginalNames = /* @__PURE__ */ new Set();
-	for (const tool of tools) {
-		let projectedTool;
-		let originalName;
-		try {
-			const name = tool.name;
-			originalName = name;
-			if (!name) continue;
-			const schemaProjection = projectRuntimeToolInputSchema(tool.parameters, `${name}.parameters`);
-			if (!isRecord(schemaProjection.schema) || schemaProjection.violations.some((violation) => !isProviderSupportedViolation(violation))) {
-				unavailableOriginalNames.add(name);
-				continue;
-			}
-			const anthropicSchema = schemaProjection.schema;
-			normalizeAnthropicJsonSchema(anthropicSchema);
-			const properties = anthropicSchema.properties;
-			const required = anthropicSchema.required;
-			if (properties !== void 0 && properties !== null && !isRecord(properties) || required !== void 0 && required !== null && (!Array.isArray(required) || required.some((entry) => typeof entry !== "string"))) {
-				unavailableOriginalNames.add(name);
-				continue;
-			}
-			let description;
-			try {
-				description = typeof tool.description === "string" ? tool.description : void 0;
-			} catch {}
-			projectedTool = {
-				originalName: name,
-				wireName: toWireName(name),
-				...description ? { description } : {},
-				inputSchema: {
-					...anthropicSchema,
-					type: "object",
-					properties: properties ?? {},
-					required: required ?? []
-				}
-			};
-		} catch {
-			if (originalName) unavailableOriginalNames.add(originalName);
-			continue;
-		}
-		const conflictingName = originalNameByWireName.get(projectedTool.wireName);
-		if (conflictingName !== void 0 && conflictingName !== projectedTool.originalName) throw new Error(`Anthropic tool names "${conflictingName}" and "${projectedTool.originalName}" both map to "${projectedTool.wireName}"`);
-		originalNameByWireName.set(projectedTool.wireName, projectedTool.originalName);
-		projectedTools.push(projectedTool);
-	}
-	return {
-		inputToolCount: tools.length,
-		unavailableOriginalNames,
-		tools: sortPromptCacheToolsByName(projectedTools)
-	};
-}
-/** Keeps forced Anthropic tool choices aligned with the projected wire names. */
-function reconcileAnthropicToolChoice(choice, projection) {
-	if (projection.inputToolCount === 0) return choice;
-	if (choice.type === "tool") {
-		const requestedName = choice.name;
-		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,
-			name: matchedTool.wireName
-		};
-	}
-	if (projection.tools.length === 0) {
-		if (choice.type === "auto") return;
-		if (choice.type === "any") throw new Error("Anthropic tool_choice requires a tool, but no tools survived schema conversion");
-	}
-	return choice;
-}
-/** Maps Claude Code wire names without trusting every direct/custom descriptor. */
-function resolveOriginalAnthropicToolName(name, projection) {
-	return projection?.tools.find((tool) => tool.wireName === name)?.originalName ?? name;
-}
-//#endregion
 //#region packages/ai/src/transports/anthropic-transport-options.ts
 const ANTHROPIC_MESSAGES_DEFAULT_MAX_TOKENS = 4096;
 const ANTHROPIC_MESSAGES_FALLBACK_CONTEXT_DIVISOR = 4;
@@ -925,6 +765,10 @@ async function convertContentBlocks(content, model, imageBudget, profile, isErro
 async function convertAnthropicMessages(transformedMessages, model, isOAuthToken, options) {
 	const params = [];
 	const appendMessage = (message) => {
+		if (message.role === "system" && (!params.length || params.at(-1)?.role === "assistant")) params.push({
+			role: "user",
+			content: "."
+		});
 		if (message.role === "user" && params.at(-1)?.role === "system") params.push({
 			role: "assistant",
 			content: [{
@@ -1058,7 +902,7 @@ async function convertAnthropicMessages(transformedMessages, model, isOAuthToken
 				if (nextMsg?.role !== "toolResult") break;
 				toolResults.push({
 					type: "tool_result",
-					tool_use_id: nextMsg.toolCallId,
+					tool_use_id: preparedRequestSuffix.has(options.context) ? preparedRequestSuffix.toolCallId(options.context, nextMsg.toolCallId, normalizeAnthropicToolCallId(nextMsg.toolCallId)) : nextMsg.toolCallId,
 					content: await convertContentBlocks(nextMsg.content, model, imageBudget, options.profile, nextMsg.isError),
 					is_error: nextMsg.isError
 				});
@@ -1137,8 +981,9 @@ async function buildAnthropicRequest(model, context, options, profile, isOAuthTo
 		sessionId: options?.sessionId
 	});
 	const cacheBreakpointOptOutMessageIndexes = /* @__PURE__ */ new Set();
-	const messages = await convertAnthropicMessages(managed ? getAiTransportHost().transformTransportMessages(replayPlan.messages, model, normalizeAnthropicToolCallId, void 0) : transformProviderMessages(replayPlan.messages, model, normalizeAnthropicToolCallId), model, isOAuthToken, {
+	const messages = await convertAnthropicMessages(managed ? getAiTransportHost().transformTransportMessages(replayPlan.messages, model, normalizeAnthropicToolCallId, { preserveUnframedToolResults: preparedRequestSuffix.has(context) }) : transformProviderMessages(replayPlan.messages, model, normalizeAnthropicToolCallId), model, isOAuthToken, {
 		profile,
+		context,
 		allowReasoningContentReplay: managed && resolveProviderEndpoint(model).endpointClass === "xiaomi-native",
 		allowEmptySignature: model.compat?.allowEmptySignature,
 		compaction: replayPlan.compaction,
@@ -1168,7 +1013,7 @@ async function buildAnthropicRequest(model, context, options, profile, isOAuthTo
 	return {
 		params,
 		toolProjection,
-		usedCompactionReplay: replayPlan.compaction !== void 0
+		replayedCompaction: replayPlan.compaction
 	};
 }
 /** Apply caller payload edits before restoring required request contracts and beta headers. */
@@ -1361,21 +1206,13 @@ async function consumeAnthropicStream(params) {
 		let sawMessageStart = false;
 		let sawMessageStop = false;
 		let sawStopReason = false;
-		const pendingTextEnds = [];
-		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 emitContentEnd = (block, contentIndex, deferText) => {
-			const event = {
+		const emitContentEnd = (block, contentIndex) => {
+			eventSink.push({
 				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({
@@ -1435,7 +1272,7 @@ async function consumeAnthropicStream(params) {
 				if (contentIndex === void 0) continue;
 				indexes.delete(key);
 				const block = output.content[contentIndex];
-				if (block?.type === kind) emitContentEnd(block, contentIndex, false);
+				if (block?.type === kind) emitContentEnd(block, contentIndex);
 			}
 		};
 		for await (const rawEvent of iterateModelStream(params.events, options.signal)) {
@@ -1472,7 +1309,6 @@ async function consumeAnthropicStream(params) {
 				if (fallbackBoundary) {
 					refusalBuffer?.discard();
 					sealedToolCalls.length = 0;
-					pendingTextEnds.length = 0;
 					blockIndexes.clear();
 					pendingThinkingSignatures.clear();
 					applyAnthropicFallbackBoundary({
@@ -1497,7 +1333,7 @@ async function consumeAnthropicStream(params) {
 						if (block.type !== "text") continue;
 						delete block.index;
 						emitContentStart("text", i, block.text);
-						emitContentEnd(block, i, true);
+						emitContentEnd(block, i);
 					}
 					continue;
 				}
@@ -1527,8 +1363,6 @@ async function consumeAnthropicStream(params) {
 					continue;
 				}
 				if (contentBlock?.type === "tool_use") {
-					if (managed) tagPendingCommentaryText(output.content);
-					flushPendingTextEnds();
 					const block = {
 						type: "toolCall",
 						id: typeof contentBlock.id === "string" ? contentBlock.id : "",
@@ -1630,7 +1464,7 @@ async function consumeAnthropicStream(params) {
 					block,
 					contentIndex: index
 				});
-				else emitContentEnd(block, index, true);
+				else emitContentEnd(block, index);
 				finishReasoningContentSidecars(event.index);
 				continue;
 			}
@@ -1644,8 +1478,8 @@ async function consumeAnthropicStream(params) {
 					else output.stopReason = mapAnthropicStopReason(delta.stop_reason);
 				}
 				applyAnthropicMessageDeltaUsage(output.usage, usage, messageStartPromptUsage);
+				if (sawStopReason && messageStartPromptUsage && typeof usage?.output_tokens === "number") output.usage.usageReport = { state: "available" };
 				calculateCost(costModel, output.usage);
-				flushPendingTextEnds(true);
 			}
 		}
 		if ((isDirectAnthropicModel(model) || !managed && refusalBuffer) && !sawMessageStop) throw new Error("Anthropic stream ended before message_stop");
@@ -1664,10 +1498,9 @@ async function consumeAnthropicStream(params) {
 			});
 		}
 		refusalBuffer?.flush();
-		flushPendingTextEnds(true);
 	} finally {
 		logAnthropicThinkingDrops(inputTransformations);
 	}
 }
 //#endregion
-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 };
+export { resolveAnthropicCacheOptions as A, readAnthropicFallbackBoundary as B, applyAnthropicEphemeralCacheControlMarkers as C, isAnthropicServerToolClearingEnabled as D, buildAnthropicSystemBlocks as E, supportsAnthropicServerSideFallback as F, isAnthropicOAuthApiKey as H, ANTHROPIC_SERVER_SIDE_FALLBACKS as I, ANTHROPIC_SERVER_SIDE_FALLBACK_BETA as L, resolveAnthropicPayloadPolicy as M, resolveAnthropicRequestBetaHeader as N, isDirectAnthropicModel as O, resolveAnthropicServerCompactionPlan as P, CLAUDE_OPUS_FALLBACK_MODEL_COST as R, applyAnthropicContextManagementToRequest as S, applyAnthropicRequestCacheControl as T, omitFoundryBearerCredentialHeaders as U, resolveAnthropicFallbackServingModelCost as V, usesFoundryBearerAuth as W, logAnthropicThinkingDrops as _, readAnthropicPromptUsageSnapshot as a, resolveNewestAnthropicCompaction as b, applyAnthropicRefusal as c, applyAnthropicThinkingOptions as d, resolveAnthropicTransportOptions as f, findActiveAnthropicToolTurnAssistantIndex as g, applyAnthropicThinkingBindingControls as h, readAnthropicCacheWriteUsage as i, resolveAnthropicEphemeralCacheControl as j, logAnthropicContextEdits as k, buildAnthropicRequest as l, ANTHROPIC_OMITTED_REASONING_TEXT as m, applyAnthropicMessageDeltaUsage as n, readAnthropicUsageTokenCount as o, resolveCompletionTokenReservation as p, applyAnthropicMessageStartUsage as r, readLastAnthropicIterationUsage as s, consumeAnthropicStream as t, prepareAnthropicRequest as u, readAnthropicInputTransformations as v, applyAnthropicPayloadPolicyToParams as w, suppressAnthropicCompaction as x, isAnthropicReplayRejection as y, applyAnthropicFallbackBoundary as z };