@openclaw/amazon-bedrock-provider 2026.6.5-beta.6 → 2026.6.6-beta.1

package/dist/bedrock-options.js

@@ -13,6 +13,7 @@ function supportsBedrockPromptCaching(modelId, modelName) {
 		return false;
 	}
 	if (candidates.some((s) => s.includes("-4-"))) return true;
+	if (candidates.some((s) => s.includes("claude-fable-5"))) return true;
 	if (candidates.some((s) => s.includes("claude-3-7-sonnet"))) return true;
 	if (candidates.some((s) => s.includes("claude-3-5-haiku"))) return true;
 	return false;

package/dist/discovery.js

@@ -1,5 +1,7 @@
 import { refreshAwsSharedConfigCacheForBedrock } from "./aws-credential-refresh.js";
 import { resolveBedrockConfigApiKey } from "./discovery-shared.js";
+import { resolveBedrockNativeThinkingLevelMap } from "./thinking-policy.js";
+import { resolveClaudeFable5ModelIdentity, resolveClaudeModelIdentity, supportsClaudeAdaptiveThinking } from "openclaw/plugin-sdk/provider-model-shared";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalLowercaseString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createSubsystemLogger } from "openclaw/plugin-sdk/core";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
@@ -26,6 +28,7 @@ const DEFAULT_MAX_TOKENS = 4096;
 *          https://platform.claude.com/docs/en/about-claude/models
 */
 const KNOWN_CONTEXT_WINDOWS = {
+	"anthropic.claude-fable-5": 1e6,
 	"anthropic.claude-3-7-sonnet-20250219-v1:0": 2e5,
 	"anthropic.claude-opus-4-8": 1e6,
 	"anthropic.claude-opus-4-7": 1e6,
@@ -89,21 +92,18 @@ const KNOWN_CONTEXT_WINDOWS = {
 function resolveKnownContextWindow(modelId) {
 	const candidates = [modelId, modelId.replace(/^(?:us|eu|ap|apac|au|jp|global)\./, "")];
 	for (const candidate of candidates) {
+		if (resolveClaudeFable5ModelIdentity({ id: candidate })) return 1e6;
 		if (/(?:^|[/.:])anthropic\.claude-opus-4[.-]8(?:$|[-.:/])/i.test(candidate)) return 1e6;
 		if (KNOWN_CONTEXT_WINDOWS[candidate] !== void 0) return KNOWN_CONTEXT_WINDOWS[candidate];
 		const withoutVersionSuffix = candidate.replace(/:0$/, "");
 		if (withoutVersionSuffix !== candidate && KNOWN_CONTEXT_WINDOWS[withoutVersionSuffix] !== void 0) return KNOWN_CONTEXT_WINDOWS[withoutVersionSuffix];
 	}
 }
-function isKnownClaudeOpus47OrNewerModelId(modelId) {
-	return [modelId, modelId.replace(/^(?:us|eu|ap|apac|au|jp|global)\./, "")].some((candidate) => /(?:^|[/.:])anthropic\.claude-opus-4[.-][78](?:$|[-.:/])/i.test(candidate));
-}
 function resolveKnownThinkingLevelMap(modelId) {
-	if (!isKnownClaudeOpus47OrNewerModelId(modelId)) return;
-	return {
-		xhigh: "xhigh",
-		max: "max"
-	};
+	return resolveBedrockNativeThinkingLevelMap(modelId);
+}
+function resolveKnownMaxTokens(modelId) {
+	return resolveClaudeFable5ModelIdentity({ id: modelId }) ? 128e3 : void 0;
 }
 const DEFAULT_COST = {
 	input: 0,
@@ -167,7 +167,7 @@ function mapInputModalities(summary) {
 	return Array.from(mapped);
 }
 function inferReasoningSupport(summary) {
-	if (isKnownClaudeOpus47OrNewerModelId(summary.modelId ?? "")) return true;
+	if (supportsClaudeAdaptiveThinking({ id: summary.modelId })) return true;
 	const haystack = normalizeLowercaseStringOrEmpty(`${summary.modelId ?? ""} ${summary.modelName ?? ""}`);
 	return haystack.includes("reasoning") || haystack.includes("thinking");
 }
@@ -203,7 +203,7 @@ function toModelDefinition(summary, defaults) {
 		input: mapInputModalities(summary),
 		cost: DEFAULT_COST,
 		contextWindow: resolveKnownContextWindow(id) ?? defaults.contextWindow,
-		maxTokens: defaults.maxTokens,
+		maxTokens: resolveKnownMaxTokens(id) ?? defaults.maxTokens,
 		...thinkingLevelMap ? { thinkingLevelMap } : {}
 	};
 }
@@ -275,15 +275,17 @@ function resolveInferenceProfiles(profiles, defaults, providerFilter, foundation
 		const baseModelId = resolveBaseModelId(profile);
 		const baseModel = baseModelId ? foundationModels.get(normalizeLowercaseStringOrEmpty(baseModelId)) : void 0;
 		const knownThinkingLevelMap = resolveKnownThinkingLevelMap(baseModelId ?? profile.inferenceProfileId);
+		const canonicalClaudeId = resolveClaudeModelIdentity({ id: baseModelId });
 		discovered.push({
 			id: profile.inferenceProfileId,
 			name: profile.inferenceProfileName?.trim() || profile.inferenceProfileId,
-			reasoning: baseModel?.reasoning ?? isKnownClaudeOpus47OrNewerModelId(baseModelId ?? profile.inferenceProfileId),
+			reasoning: baseModel?.reasoning ?? supportsClaudeAdaptiveThinking({ id: baseModelId ?? profile.inferenceProfileId }),
 			input: baseModel?.input ?? ["text"],
 			cost: baseModel?.cost ?? DEFAULT_COST,
 			contextWindow: baseModel?.contextWindow ?? resolveKnownContextWindow(baseModelId ?? profile.inferenceProfileId ?? "") ?? defaults.contextWindow,
-			maxTokens: baseModel?.maxTokens ?? defaults.maxTokens,
-			...baseModel?.thinkingLevelMap || knownThinkingLevelMap ? { thinkingLevelMap: baseModel?.thinkingLevelMap ?? knownThinkingLevelMap } : {}
+			maxTokens: baseModel?.maxTokens ?? resolveKnownMaxTokens(baseModelId ?? profile.inferenceProfileId) ?? defaults.maxTokens,
+			...baseModel?.thinkingLevelMap || knownThinkingLevelMap ? { thinkingLevelMap: baseModel?.thinkingLevelMap ?? knownThinkingLevelMap } : {},
+			...canonicalClaudeId.startsWith("claude-") ? { params: { canonicalModelId: canonicalClaudeId } } : {}
 		});
 	}
 	return discovered;

package/dist/provider-policy-api.js

@@ -8,7 +8,7 @@ import { normalizeProviderId } from "openclaw/plugin-sdk/provider-model-shared";
 /** Resolve the Bedrock thinking profile for a provider/model pair. */
 function resolveThinkingProfile(params) {
 	if (normalizeProviderId(params.provider) !== "amazon-bedrock") return null;
-	return resolveBedrockClaudeThinkingProfile(params.modelId);
+	return resolveBedrockClaudeThinkingProfile(params.modelId, params.params);
 }
 //#endregion
 export { resolveThinkingProfile };

package/dist/register.sync.runtime.js

@@ -2,13 +2,32 @@ import { refreshAwsSharedConfigCacheForBedrock } from "./aws-credential-refresh.
 import { supportsBedrockPromptCaching } from "./bedrock-options.js";
 import { mergeImplicitBedrockProvider, resolveBedrockConfigApiKey } from "./discovery-shared.js";
 import { bedrockMemoryEmbeddingProviderAdapter } from "./memory-embedding-adapter.js";
+import { isOpus47OrNewerBedrockModelRef, resolveBedrockClaudeThinkingProfile, resolveBedrockNativeThinkingLevelMap, supportsBedrockNativeMaxEffort } from "./thinking-policy.js";
 import { streamBedrock, streamSimpleBedrock } from "./stream.runtime.js";
-import { isOpus47OrNewerBedrockModelRef, resolveBedrockClaudeThinkingProfile } from "./thinking-policy.js";
 import { registerApiProvider, streamSimple } from "openclaw/plugin-sdk/llm";
 import { resolvePluginConfigObject } from "openclaw/plugin-sdk/plugin-config-runtime";
-import { ANTHROPIC_BY_MODEL_REPLAY_HOOKS, normalizeProviderId } from "openclaw/plugin-sdk/provider-model-shared";
+import { ANTHROPIC_BY_MODEL_REPLAY_HOOKS, normalizeProviderId, resolveClaudeFable5ModelIdentity, resolveClaudeModelIdentity } from "openclaw/plugin-sdk/provider-model-shared";
 import { streamWithPayloadPatch } from "openclaw/plugin-sdk/provider-stream-shared";
 //#region extensions/amazon-bedrock/register.sync.runtime.ts
+function normalizeBedrockResolvedModel({ modelId, model }) {
+	const thinkingLevelMap = resolveBedrockNativeThinkingLevelMap(modelId, model.params);
+	if (!thinkingLevelMap) return;
+	const reasoning = model.reasoning || resolveClaudeFable5ModelIdentity({
+		id: modelId,
+		params: model.params
+	}) !== void 0;
+	const current = model.thinkingLevelMap;
+	const currentEfforts = current;
+	if (reasoning === model.reasoning && Object.entries(thinkingLevelMap).every(([level, effort]) => currentEfforts?.[level] === effort)) return;
+	return {
+		...model,
+		reasoning,
+		thinkingLevelMap: {
+			...thinkingLevelMap,
+			...current
+		}
+	};
+}
 const BEDROCK_SERVICE_TIER_VALUES = [
 	"flex",
 	"priority",
@@ -170,7 +189,7 @@ function injectBedrockCachePoints(payload, cacheRetention) {
 		}
 	}
 }
-function patchOpus47MaxThinkingEffort(payload) {
+function patchMaxThinkingEffort(payload) {
 	const fieldsValue = payload.additionalModelRequestFields;
 	const fields = fieldsValue && typeof fieldsValue === "object" && !Array.isArray(fieldsValue) ? fieldsValue : {};
 	const outputConfigValue = fields.output_config;
@@ -200,18 +219,23 @@ function registerAmazonBedrockPlugin(api) {
 		return resolvePluginConfigObject(config, providerId) ?? (config ? void 0 : startupPluginConfig);
 	}
 	api.registerMemoryEmbeddingProvider(bedrockMemoryEmbeddingProviderAdapter);
-	const baseWrapStreamFn = ({ modelId, streamFn }) => {
-		if (isAnthropicBedrockModel(modelId)) return streamFn;
+	const baseWrapStreamFn = ({ modelId, model, streamFn }) => {
+		const modelRef = {
+			id: modelId,
+			params: model?.params
+		};
+		if (isAnthropicBedrockModel(modelId) || resolveClaudeModelIdentity(modelRef).startsWith("claude-")) return streamFn;
 		if (isBedrockAppInferenceProfile(modelId)) return streamFn;
 		return createBedrockNoCacheWrapper(streamFn);
 	};
-	function omitDeprecatedOpus47Temperature(modelId, options) {
-		if (!isOpus47OrNewerBedrockModelRef(modelId) || !("temperature" in options)) return options;
+	function omitUnsupportedClaudeTemperature(modelRef, options) {
+		const canonicalModelId = resolveClaudeModelIdentity(modelRef);
+		if (!(isOpus47OrNewerBedrockModelRef(modelRef.id) || isOpus47OrNewerBedrockModelRef(canonicalModelId) || resolveClaudeFable5ModelIdentity(modelRef) !== void 0) || !("temperature" in options)) return options;
 		const next = { ...options };
 		delete next.temperature;
 		return next;
 	}
-	function omitDeprecatedOpus47PayloadTemperature(payload) {
+	function omitUnsupportedClaudePayloadTemperature(payload) {
 		const inferenceConfig = payload.inferenceConfig;
 		if (!inferenceConfig || typeof inferenceConfig !== "object") return;
 		delete inferenceConfig.temperature;
@@ -272,37 +296,49 @@ function registerAmazonBedrockPlugin(api) {
 			}
 		},
 		resolveConfigApiKey: ({ env }) => resolveBedrockConfigApiKey(env),
+		normalizeResolvedModel: normalizeBedrockResolvedModel,
 		...anthropicByModelReplayHooks,
 		wrapStreamFn: ({ modelId, config, model, streamFn, thinkingLevel, extraParams }) => {
 			const currentPluginConfig = resolveCurrentPluginConfig(config);
 			const currentGuardrail = currentPluginConfig?.guardrail;
+			const modelRef = {
+				id: modelId,
+				params: model?.params
+			};
+			const fable5 = resolveClaudeFable5ModelIdentity(modelRef) !== void 0;
+			const canonicalModelId = resolveClaudeModelIdentity(modelRef);
+			const opus47OrNewer = isOpus47OrNewerBedrockModelRef(modelId) || isOpus47OrNewerBedrockModelRef(canonicalModelId);
+			const supportsNativeMax = supportsBedrockNativeMaxEffort(modelId, model?.params);
 			let wrapped = (currentGuardrail?.guardrailIdentifier && currentGuardrail?.guardrailVersion ? createGuardrailWrapStreamFn(baseWrapStreamFn, currentGuardrail)({
 				modelId,
+				model,
 				streamFn
 			}) : baseWrapStreamFn({
 				modelId,
+				model,
 				streamFn
 			})) ?? void 0;
 			const serviceTier = resolveBedrockServiceTier(extraParams, (message) => api.logger.warn(message));
-			if (serviceTier && wrapped) wrapped = createBedrockServiceTierWrapper(wrapped, serviceTier);
+			if (serviceTier && wrapped) if (fable5 && serviceTier !== "default") api.logger.warn(`ignoring unsupported Fable 5 Bedrock service tier: ${serviceTier}`);
+			else wrapped = createBedrockServiceTierWrapper(wrapped, serviceTier);
 			const region = resolveBedrockRegion(config) ?? extractRegionFromBaseUrl(model?.baseUrl) ?? currentPluginConfig?.discovery?.region;
 			const mayNeedCacheInjection = isBedrockAppInferenceProfile(modelId) && !sharedRuntimeWouldInjectCachePoints(modelId);
-			const shouldOmitTemperature = isOpus47OrNewerBedrockModelRef(modelId);
-			const shouldPatchMaxThinking = shouldOmitTemperature && thinkingLevel === "max";
+			const shouldOmitTemperature = opus47OrNewer || fable5;
+			const shouldPatchMaxThinking = supportsNativeMax && thinkingLevel === "max";
 			const heuristicMatch = needsCachePointInjection(modelId);
 			if (!region && !mayNeedCacheInjection && !shouldOmitTemperature && !shouldPatchMaxThinking) return createAwsCredentialRefreshStreamWrapper(wrapped);
 			const underlying = wrapped ?? streamFn;
 			if (!underlying) return wrapped;
 			return (streamModel, context, options) => {
-				const merged = omitDeprecatedOpus47Temperature(modelId, Object.assign({}, options, region ? { region } : {}));
+				const merged = omitUnsupportedClaudeTemperature(modelRef, Object.assign({}, options, region ? { region } : {}));
 				const originalOnPayload = merged.onPayload;
 				if (!mayNeedCacheInjection) return underlying(streamModel, context, withAwsCredentialRefreshOnPayload({
 					...merged,
 					...shouldPatchMaxThinking ? { onPayload: (payload, payloadModel) => {
 						if (payload && typeof payload === "object") {
 							const payloadRecord = payload;
-							patchOpus47MaxThinkingEffort(payloadRecord);
-							omitDeprecatedOpus47PayloadTemperature(payloadRecord);
+							patchMaxThinkingEffort(payloadRecord);
+							omitUnsupportedClaudePayloadTemperature(payloadRecord);
 						}
 						return originalOnPayload?.(payload, payloadModel);
 					} } : {}
@@ -316,10 +352,10 @@ function registerAmazonBedrockPlugin(api) {
 							if (payload && typeof payload === "object") {
 								const payloadRecord = payload;
 								injectBedrockCachePoints(payloadRecord, cacheRetention);
-								if (shouldPatchMaxThinking) patchOpus47MaxThinkingEffort(payloadRecord);
-								if (shouldOmitTemperature) omitDeprecatedOpus47PayloadTemperature(payloadRecord);
+								if (shouldPatchMaxThinking) patchMaxThinkingEffort(payloadRecord);
+								if (shouldOmitTemperature) omitUnsupportedClaudePayloadTemperature(payloadRecord);
 								else if (mayNeedTemperatureTrait) {
-									if ((await resolveAppProfileTraits(modelId, region)).omitTemperature) omitDeprecatedOpus47PayloadTemperature(payloadRecord);
+									if ((await resolveAppProfileTraits(modelId, region)).omitTemperature) omitUnsupportedClaudePayloadTemperature(payloadRecord);
 								}
 							}
 							return originalOnPayload?.(payload, payloadModel);
@@ -333,8 +369,8 @@ function registerAmazonBedrockPlugin(api) {
 						if (payload && typeof payload === "object") {
 							const payloadRecord = payload;
 							if (traits.cacheEligible) injectBedrockCachePoints(payloadRecord, cacheRetention);
-							if (shouldPatchMaxThinking) patchOpus47MaxThinkingEffort(payloadRecord);
-							if (traits.omitTemperature) omitDeprecatedOpus47PayloadTemperature(payloadRecord);
+							if (shouldPatchMaxThinking) patchMaxThinkingEffort(payloadRecord);
+							if (traits.omitTemperature) omitUnsupportedClaudePayloadTemperature(payloadRecord);
 						}
 						return originalOnPayload?.(payload, payloadModel);
 					}
@@ -347,7 +383,7 @@ function registerAmazonBedrockPlugin(api) {
 			if (/ModelNotReadyException/i.test(errorMessage)) return "overloaded";
 			if (deprecatedTemperatureValidationRe.test(errorMessage)) return "format";
 		},
-		resolveThinkingProfile: ({ modelId }) => resolveBedrockClaudeThinkingProfile(modelId)
+		resolveThinkingProfile: ({ modelId, params }) => resolveBedrockClaudeThinkingProfile(modelId, params)
 	});
 }
 //#endregion

package/dist/stream.runtime.js

@@ -1,5 +1,8 @@
 import { supportsBedrockPromptCaching } from "./bedrock-options.js";
+import { supportsBedrockNativeMaxEffort } from "./thinking-policy.js";
 import { AssistantMessageEventStream, adjustMaxTokensForThinking, buildBaseOptions, calculateCost, clampReasoning, createHttpProxyAgentsForTarget, parseStreamingJson, sanitizeSurrogates, transformMessages } from "openclaw/plugin-sdk/llm";
+import { resolveClaudeFable5ModelIdentity, resolveClaudeModelIdentity, supportsClaudeAdaptiveThinking, supportsClaudeNativeXhighEffort } from "openclaw/plugin-sdk/provider-model-shared";
+import { applyAnthropicRefusal, createDeferredEventBuffer, notifyLlmRequestActivity } from "openclaw/plugin-sdk/provider-stream-shared";
 import { BedrockRuntimeClient, BedrockRuntimeServiceException, CachePointType, CacheTTL, ConversationRole, ConverseStreamCommand, ImageFormat, StopReason, ToolResultStatus } from "@aws-sdk/client-bedrock-runtime";
 import { NodeHttpHandler } from "@smithy/node-http-handler";
 //#region extensions/amazon-bedrock/stream.runtime.ts
@@ -7,6 +10,18 @@ import { NodeHttpHandler } from "@smithy/node-http-handler";
 * Amazon Bedrock Converse streaming runtime. It maps OpenClaw messages/tools,
 * thinking, cache points, images, and usage into Bedrock Converse Stream calls.
 */
+function usesClaudeFable5BedrockContract(model) {
+	return resolveClaudeFable5ModelIdentity(model) !== void 0;
+}
+function readBedrockStopDetails(fields) {
+	if (!fields || typeof fields !== "object" || Array.isArray(fields)) return;
+	const record = fields;
+	return record.stop_details ?? record.stopDetails;
+}
+function normalizeFableToolChoice(toolChoice) {
+	if (toolChoice === "any" || typeof toolChoice === "object" && toolChoice?.type === "tool") return "auto";
+	return toolChoice;
+}
 /** Stream a Bedrock Converse request using Bedrock-specific options. */
 const streamBedrock = (model, context, options = {}) => {
 	const stream = new AssistantMessageEventStream();
@@ -35,6 +50,9 @@ const streamBedrock = (model, context, options = {}) => {
 			timestamp: Date.now()
 		};
 		const blocks = output.content;
+		const fable5 = usesClaudeFable5BedrockContract(model);
+		const refusalBuffer = fable5 ? createDeferredEventBuffer(stream, () => notifyLlmRequestActivity(options.signal)) : void 0;
+		const eventSink = refusalBuffer ?? stream;
 		const config = { profile: options.profile };
 		const configuredRegion = getConfiguredBedrockRegion(options);
 		const hasConfiguredProfile = hasConfiguredBedrockProfile(options);
@@ -62,16 +80,20 @@ const streamBedrock = (model, context, options = {}) => {
 		try {
 			const client = new BedrockRuntimeClient(config);
 			const cacheRetention = resolveCacheRetention(options.cacheRetention);
+			const additionalModelRequestFields = buildAdditionalModelRequestFields(model, options);
+			const thinking = additionalModelRequestFields?.thinking;
+			const sendsAdaptiveThinking = thinking !== null && typeof thinking === "object" && thinking.type === "adaptive";
 			let commandInput = {
 				modelId: model.id,
 				messages: convertMessages(context, model, cacheRetention),
 				system: buildSystemPrompt(context.systemPrompt, model, cacheRetention),
 				inferenceConfig: {
 					...options.maxTokens !== void 0 && { maxTokens: options.maxTokens },
-					...options.temperature !== void 0 && { temperature: options.temperature }
+					...options.temperature !== void 0 && !sendsAdaptiveThinking && { temperature: options.temperature }
 				},
-				toolConfig: convertToolConfig(context.tools, options.toolChoice),
-				additionalModelRequestFields: buildAdditionalModelRequestFields(model, options),
+				toolConfig: convertToolConfig(context.tools, fable5 ? normalizeFableToolChoice(options.toolChoice) : options.toolChoice),
+				additionalModelRequestFields,
+				...fable5 ? { additionalModelResponseFieldPaths: ["/stop_details"] } : {},
 				...options.requestMetadata !== void 0 && { requestMetadata: options.requestMetadata }
 			};
 			const nextCommandInput = await options?.onPayload?.(commandInput, model);
@@ -86,24 +108,30 @@ const streamBedrock = (model, context, options = {}) => {
 					headers: responseHeaders
 				}, model);
 			}
+			let sawMessageStop = false;
 			for await (const item of response.stream) if (item.messageStart) {
 				if (item.messageStart.role !== ConversationRole.ASSISTANT) throw new Error("Unexpected assistant message start but got user message start instead");
-				stream.push({
+				eventSink.push({
 					type: "start",
 					partial: output
 				});
-			} else if (item.contentBlockStart) handleContentBlockStart(item.contentBlockStart, blocks, output, stream);
-			else if (item.contentBlockDelta) handleContentBlockDelta(item.contentBlockDelta, blocks, output, stream);
-			else if (item.contentBlockStop) handleContentBlockStop(item.contentBlockStop, blocks, output, stream);
-			else if (item.messageStop) output.stopReason = mapStopReason(item.messageStop.stopReason);
-			else if (item.metadata) handleMetadata(item.metadata, model, output);
+			} else if (item.contentBlockStart) handleContentBlockStart(item.contentBlockStart, blocks, output, eventSink);
+			else if (item.contentBlockDelta) handleContentBlockDelta(item.contentBlockDelta, blocks, output, eventSink);
+			else if (item.contentBlockStop) handleContentBlockStop(item.contentBlockStop, blocks, output, eventSink);
+			else if (item.messageStop) {
+				sawMessageStop = true;
+				if (item.messageStop.stopReason === "refusal") applyAnthropicRefusal(output, readBedrockStopDetails(item.messageStop.additionalModelResponseFields), model.provider);
+				else output.stopReason = mapStopReason(item.messageStop.stopReason);
+			} else if (item.metadata) handleMetadata(item.metadata, model, output);
 			else if (item.internalServerException) throw item.internalServerException;
 			else if (item.modelStreamErrorException) throw item.modelStreamErrorException;
 			else if (item.validationException) throw item.validationException;
 			else if (item.throttlingException) throw item.throttlingException;
 			else if (item.serviceUnavailableException) throw item.serviceUnavailableException;
+			if (refusalBuffer && !sawMessageStop) throw new Error("Bedrock stream ended before messageStop");
 			if (options.signal?.aborted) throw new Error("Request was aborted");
-			if (output.stopReason === "error" || output.stopReason === "aborted") throw new Error("An unknown error occurred");
+			if (output.stopReason === "error" || output.stopReason === "aborted") throw new Error(output.errorMessage ?? "An unknown error occurred");
+			refusalBuffer?.flush();
 			stream.push({
 				type: "done",
 				reason: output.stopReason,
@@ -115,6 +143,10 @@ const streamBedrock = (model, context, options = {}) => {
 				delete block.index;
 				delete block.partialJson;
 			}
+			if (refusalBuffer) {
+				refusalBuffer.discard();
+				output.content = [];
+			}
 			output.stopReason = options.signal?.aborted ? "aborted" : "error";
 			output.errorMessage = formatBedrockError(error);
 			stream.push({
@@ -155,12 +187,17 @@ function formatBedrockError(error) {
 /** Stream a Bedrock Converse request from the generic OpenClaw stream options. */
 const streamSimpleBedrock = (model, context, options) => {
 	const base = buildBaseOptions(model, options, void 0);
+	if (usesClaudeFable5BedrockContract(model)) return streamBedrock(model, context, {
+		...base,
+		reasoning: options?.reasoning ?? "high",
+		thinkingBudgets: options?.thinkingBudgets
+	});
 	if (!options?.reasoning) return streamBedrock(model, context, {
 		...base,
 		reasoning: void 0
 	});
 	if (isAnthropicClaudeModel(model)) {
-		if (supportsAdaptiveThinking(model.id, model.name)) return streamBedrock(model, context, {
+		if (supportsAdaptiveThinking(model)) return streamBedrock(model, context, {
 			...base,
 			reasoning: options.reasoning,
 			thinkingBudgets: options.thinkingBudgets
@@ -318,33 +355,36 @@ function handleContentBlockStop(event, blocks, output, stream) {
 			break;
 	}
 }
-/**
-* Check if the model supports adaptive thinking (Opus 4.6+, Sonnet 4.6).
-* Checks both model ID and model name to support application inference profiles
-* whose ARNs don't contain the model name.
-*/
-function getModelMatchCandidates(modelId, modelName) {
-	return (modelName ? [modelId, modelName] : [modelId]).flatMap((value) => {
-		const lower = value.toLowerCase();
-		return [lower, lower.replace(/[\s_.:]+/g, "-")];
-	});
+function resolveClaudeProfileNameModelId(modelName) {
+	const normalized = modelName?.trim().toLowerCase().replace(/[\s_.:]+/g, "-") ?? "";
+	if (!normalized.includes("claude")) return;
+	const family = /(?:fable-5|opus-4-(?:6|7|8)|sonnet-4-6)(?:$|-)/.exec(normalized)?.[0];
+	return family ? `claude-${family.replace(/-$/, "")}` : void 0;
 }
-function supportsAdaptiveThinking(modelId, modelName) {
-	return getModelMatchCandidates(modelId, modelName).some((s) => s.includes("opus-4-6") || s.includes("opus-4-7") || s.includes("opus-4-8") || s.includes("sonnet-4-6"));
+/** Check canonical metadata and profile names for adaptive Claude support. */
+function supportsAdaptiveThinking(model) {
+	const profileModelId = resolveClaudeProfileNameModelId(model.name);
+	return supportsClaudeAdaptiveThinking(model) || supportsClaudeAdaptiveThinking({ id: profileModelId });
 }
 function supportsNativeXhighEffort(model) {
-	return getModelMatchCandidates(model.id, model.name).some((s) => s.includes("opus-4-7") || s.includes("opus-4-8"));
+	const profileModelId = resolveClaudeProfileNameModelId(model.name);
+	return supportsClaudeNativeXhighEffort(model) || supportsClaudeNativeXhighEffort({ id: profileModelId });
+}
+function supportsNativeMaxEffort(model) {
+	const profileModelId = resolveClaudeProfileNameModelId(model.name);
+	return supportsBedrockNativeMaxEffort(model.id, model.params) || supportsBedrockNativeMaxEffort(profileModelId ?? "");
 }
 function mapThinkingLevelToEffort(model, level) {
-	if (level === "xhigh" && supportsNativeXhighEffort(model)) return "xhigh";
 	const mapped = level ? model.thinkingLevelMap?.[level] : void 0;
 	if (typeof mapped === "string") return mapped;
+	if ((level === "xhigh" || level === "max") && mapped === null) return "high";
 	switch (level) {
 		case "minimal":
 		case "low": return "low";
 		case "medium": return "medium";
 		case "high": return "high";
-		case "max": return supportsNativeXhighEffort(model) ? "max" : "high";
+		case "xhigh": return supportsNativeXhighEffort(model) ? "xhigh" : "high";
+		case "max": return supportsNativeMaxEffort(model) ? "max" : "high";
 		default: return "high";
 	}
 }
@@ -363,12 +403,14 @@ function resolveCacheRetention(cacheRetention) {
 * whose ARNs don't contain the model name.
 */
 function isAnthropicClaudeModel(model) {
+	if (usesClaudeFable5BedrockContract(model)) return true;
+	if (resolveClaudeModelIdentity(model).startsWith("claude-")) return true;
 	const id = model.id.toLowerCase();
 	const name = model.name?.toLowerCase() ?? "";
 	return id.includes("anthropic.claude") || id.includes("anthropic/claude") || name.includes("anthropic.claude") || name.includes("anthropic/claude") || name.includes("claude");
 }
 function supportsPromptCaching(model) {
-	return supportsBedrockPromptCaching(model.id, model.name);
+	return usesClaudeFable5BedrockContract(model) || supportsBedrockPromptCaching(model.id, model.name) || supportsBedrockPromptCaching(resolveClaudeModelIdentity(model), model.name);
 }
 /**
 * Check if the model supports thinking signatures in reasoningContent.
@@ -434,15 +476,22 @@ function convertMessages(context, model, cacheRetention) {
 							input: c.arguments
 						} });
 						break;
-					case "thinking":
-						if (c.thinking.trim().length === 0) continue;
-						if (supportsThinkingSignature(model)) if (!c.thinkingSignature || c.thinkingSignature.trim().length === 0) contentBlocks.push({ text: sanitizeSurrogates(c.thinking) });
-						else contentBlocks.push({ reasoningContent: { reasoningText: {
-							text: c.thinking,
-							signature: c.thinkingSignature
-						} } });
-						else contentBlocks.push({ text: sanitizeSurrogates(c.thinking) });
+					case "thinking": {
+						const thinkingSignature = c.thinkingSignature;
+						const normalizedThinkingSignature = thinkingSignature?.trim();
+						const supportsSignature = supportsThinkingSignature(model);
+						const hasNativeThinkingSignature = supportsSignature && Boolean(normalizedThinkingSignature) && normalizedThinkingSignature !== "reasoning_content";
+						if (c.thinking.trim().length === 0 && !hasNativeThinkingSignature) continue;
+						if (supportsSignature) {
+							if (normalizedThinkingSignature === "reasoning_content") continue;
+							if (!thinkingSignature || !normalizedThinkingSignature) contentBlocks.push({ text: sanitizeSurrogates(c.thinking) });
+							else contentBlocks.push({ reasoningContent: { reasoningText: {
+								text: c.thinking,
+								signature: thinkingSignature
+							} } });
+						} else contentBlocks.push({ text: sanitizeSurrogates(c.thinking) });
 						break;
+					}
 					default: continue;
 				}
 				if (contentBlocks.length === 0) continue;
@@ -548,10 +597,10 @@ function isGovCloudBedrockTarget(model, options) {
 	return modelId.startsWith("us-gov.") || modelId.startsWith("arn:aws-us-gov:");
 }
 function buildAdditionalModelRequestFields(model, options) {
-	if (!options.reasoning || !model.reasoning) return;
+	if (!options.reasoning || !model.reasoning && !usesClaudeFable5BedrockContract(model) && !supportsAdaptiveThinking(model)) return;
 	if (isAnthropicClaudeModel(model)) {
 		const display = isGovCloudBedrockTarget(model, options) ? void 0 : options.thinkingDisplay ?? "summarized";
-		const result = supportsAdaptiveThinking(model.id, model.name) ? {
+		const result = supportsAdaptiveThinking(model) ? {
 			thinking: {
 				type: "adaptive",
 				...display !== void 0 ? { display } : {}
@@ -573,7 +622,7 @@ function buildAdditionalModelRequestFields(model, options) {
 				...display !== void 0 ? { display } : {}
 			} };
 		})();
-		if (!supportsAdaptiveThinking(model.id, model.name) && (options.interleavedThinking ?? true)) result.anthropic_beta = ["interleaved-thinking-2025-05-14"];
+		if (!supportsAdaptiveThinking(model) && (options.interleavedThinking ?? true)) result.anthropic_beta = ["interleaved-thinking-2025-05-14"];
 		return result;
 	}
 }

package/dist/thinking-policy.js

@@ -1,3 +1,4 @@
+import { resolveClaudeFable5ModelIdentity, resolveClaudeModelIdentity } from "openclaw/plugin-sdk/provider-model-shared";
 //#region extensions/amazon-bedrock/thinking-policy.ts
 const BASE_CLAUDE_THINKING_LEVELS = [
 	{ id: "off" },
@@ -7,20 +8,69 @@ const BASE_CLAUDE_THINKING_LEVELS = [
 	{ id: "high" }
 ];
 function isOpus48BedrockModelRef(modelRef) {
-	return /(?:^|[/.:])(?:(?:us|eu|ap|apac|au|jp|global)\.)?anthropic\.claude-opus-4[.-]8(?:$|[-.:/])/i.test(modelRef);
+	return /(?:^|[/.:])(?:(?:us|eu|ap|apac|au|jp|global)\.)?(?:anthropic\.)?claude-opus-4[.-]8(?:$|[-.:/])/i.test(modelRef);
+}
+function isOpus46BedrockModelRef(modelRef) {
+	return /(?:^|[/.:])(?:(?:us|eu|ap|apac|au|jp|global)\.)?(?:anthropic\.)?claude-opus-4[.-]6(?:$|[-.:/])/i.test(modelRef);
 }
 /** Return whether a Bedrock model ref names Claude Opus 4.7. */
 function isOpus47BedrockModelRef(modelRef) {
-	return /(?:^|[/.:])(?:(?:us|eu|ap|apac|au|jp|global)\.)?anthropic\.claude-opus-4[.-]7(?:$|[-.:/])/i.test(modelRef);
+	return /(?:^|[/.:])(?:(?:us|eu|ap|apac|au|jp|global)\.)?(?:anthropic\.)?claude-opus-4[.-]7(?:$|[-.:/])/i.test(modelRef);
 }
 /** Return whether a Bedrock model ref names Claude Opus 4.7 or newer. */
 function isOpus47OrNewerBedrockModelRef(modelRef) {
 	return isOpus47BedrockModelRef(modelRef) || isOpus48BedrockModelRef(modelRef);
 }
+/** Return whether a Bedrock Claude ref supports max effort. */
+function supportsBedrockNativeMaxEffort(modelId, params) {
+	if (resolveClaudeFable5ModelIdentity({
+		id: modelId,
+		params
+	})) return true;
+	return [modelId, resolveClaudeModelIdentity({
+		id: modelId,
+		params
+	})].some((modelRef) => isOpus46BedrockModelRef(modelRef) || isOpus47OrNewerBedrockModelRef(modelRef));
+}
+/** Resolve route-specific native effort mappings for Bedrock Claude models. */
+function resolveBedrockNativeThinkingLevelMap(modelId, params) {
+	const modelRef = {
+		id: modelId,
+		params
+	};
+	if (resolveClaudeFable5ModelIdentity(modelRef)) return {
+		off: "low",
+		minimal: "low",
+		xhigh: "xhigh",
+		max: "max"
+	};
+	if (!supportsBedrockNativeMaxEffort(modelId, params)) return;
+	return {
+		xhigh: [modelId, resolveClaudeModelIdentity(modelRef)].some(isOpus47OrNewerBedrockModelRef) ? "xhigh" : null,
+		max: "max"
+	};
+}
 /** Resolve supported Claude thinking levels for a Bedrock model id. */
-function resolveBedrockClaudeThinkingProfile(modelId) {
+function resolveBedrockClaudeThinkingProfile(modelId, params) {
 	const trimmed = modelId.trim();
-	if (isOpus48BedrockModelRef(trimmed)) return {
+	const modelRefs = [trimmed, resolveClaudeModelIdentity({
+		id: trimmed,
+		params
+	})];
+	if (resolveClaudeFable5ModelIdentity({
+		id: trimmed,
+		params
+	})) return {
+		levels: [
+			...BASE_CLAUDE_THINKING_LEVELS,
+			{ id: "xhigh" },
+			{ id: "adaptive" },
+			{ id: "max" }
+		],
+		defaultLevel: "high",
+		preserveWhenCatalogReasoningFalse: true
+	};
+	if (modelRefs.some(isOpus48BedrockModelRef)) return {
 		levels: [
 			...BASE_CLAUDE_THINKING_LEVELS,
 			{ id: "xhigh" },
@@ -29,7 +79,7 @@ function resolveBedrockClaudeThinkingProfile(modelId) {
 		],
 		defaultLevel: "off"
 	};
-	if (isOpus47BedrockModelRef(trimmed)) return {
+	if (modelRefs.some(isOpus47BedrockModelRef)) return {
 		levels: [
 			...BASE_CLAUDE_THINKING_LEVELS,
 			{ id: "xhigh" },
@@ -38,11 +88,19 @@ function resolveBedrockClaudeThinkingProfile(modelId) {
 		],
 		defaultLevel: "off"
 	};
-	if (/claude-(?:opus|sonnet)-4(?:\.|-)6(?:$|[-.])/i.test(trimmed)) return {
+	if (modelRefs.some(isOpus46BedrockModelRef)) return {
+		levels: [
+			...BASE_CLAUDE_THINKING_LEVELS,
+			{ id: "adaptive" },
+			{ id: "max" }
+		],
+		defaultLevel: "adaptive"
+	};
+	if (modelRefs.some((modelRef) => /claude-sonnet-4(?:\.|-)6(?:$|[-.])/i.test(modelRef))) return {
 		levels: [...BASE_CLAUDE_THINKING_LEVELS, { id: "adaptive" }],
 		defaultLevel: "adaptive"
 	};
 	return { levels: BASE_CLAUDE_THINKING_LEVELS };
 }
 //#endregion
-export { isOpus47BedrockModelRef, isOpus47OrNewerBedrockModelRef, resolveBedrockClaudeThinkingProfile };
+export { isOpus47BedrockModelRef, isOpus47OrNewerBedrockModelRef, resolveBedrockClaudeThinkingProfile, resolveBedrockNativeThinkingLevelMap, supportsBedrockNativeMaxEffort };

package/node_modules/@aws-sdk/credential-provider-env/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/credential-provider-env",
-  "version": "3.972.41",
+  "version": "3.972.44",
   "description": "AWS credential provider that sources credentials from known environment variables",
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
@@ -22,14 +22,14 @@
   "sideEffects": false,
   "author": {
     "name": "AWS SDK for JavaScript Team",
-    "url": "https://aws.amazon.com/javascript/"
+    "url": "https://aws.amazon.com/sdk-for-javascript/"
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/core": "^3.974.15",
-    "@aws-sdk/types": "^3.973.9",
-    "@smithy/core": "^3.24.5",
-    "@smithy/types": "^4.14.2",
+    "@aws-sdk/core": "^3.974.18",
+    "@aws-sdk/types": "^3.973.11",
+    "@smithy/core": "^3.24.6",
+    "@smithy/types": "^4.14.3",
     "tslib": "^2.6.2"
   },
   "devDependencies": {