@openclaw/amazon-bedrock-provider 2026.10.2 → 2026.10.5-beta.2

package/dist/bedrock-options.js

@@ -19,7 +19,6 @@ function getModelMatchCandidates(modelId, modelName) {
 		return [lower, lower.replace(/[\s_.:]+/g, "-")];
 	});
 }
-/** Return whether a Bedrock model is known to support Anthropic prompt caching. */
 function supportsBedrockClaudePromptCaching(modelId, modelName) {
 	const candidates = getModelMatchCandidates(modelId, modelName);
 	if (!candidates.some((s) => s.includes("claude"))) {

package/dist/discovery.js

@@ -103,72 +103,6 @@ const DEFAULT_COST = {
 	cacheWrite: 0
 };
 const discoveryCache = /* @__PURE__ */ new Map();
-function includesTextModalities(modalities) {
-	return (modalities ?? []).some((entry) => normalizeOptionalLowercaseString(entry) === "text");
-}
-function mapInputModalities(summary) {
-	const inputs = (summary.inputModalities ?? []).map(normalizeOptionalLowercaseString).filter((modality) => modality === "text" || modality === "image");
-	return inputs.length > 0 ? [...new Set(inputs)] : ["text"];
-}
-function inferReasoningSupport(summary) {
-	if (supportsClaudeAdaptiveThinking({ id: summary.modelId })) return true;
-	const haystack = normalizeLowercaseStringOrEmpty(`${summary.modelId ?? ""} ${summary.modelName ?? ""}`);
-	return haystack.includes("reasoning") || haystack.includes("thinking");
-}
-function resolveDefaultContextWindow(config) {
-	const value = Math.floor(config?.defaultContextWindow ?? DEFAULT_CONTEXT_WINDOW);
-	return value > 0 ? value : DEFAULT_CONTEXT_WINDOW;
-}
-function resolveDefaultMaxTokens(config) {
-	const value = Math.floor(config?.defaultMaxTokens ?? DEFAULT_MAX_TOKENS);
-	return value > 0 ? value : DEFAULT_MAX_TOKENS;
-}
-function matchesProviderFilter(summary, filter) {
-	if (filter.length === 0) return true;
-	const providerName = summary.providerName ?? (typeof summary.modelId === "string" ? summary.modelId.split(".")[0] : void 0);
-	const normalized = normalizeOptionalLowercaseString(providerName);
-	if (!normalized) return false;
-	return filter.includes(normalized);
-}
-function shouldIncludeSummary(summary, filter) {
-	return Boolean(summary.modelId?.trim() && matchesProviderFilter(summary, filter) && summary.responseStreamingSupported === true && !isKnownClaudeMythosPreviewModelId(summary.modelId) && includesTextModalities(summary.outputModalities) && typeof summary.modelLifecycle?.status === "string" && summary.modelLifecycle.status.toUpperCase() === "ACTIVE");
-}
-function toModelDefinition(summary, defaults) {
-	const id = summary.modelId?.trim() ?? "";
-	const thinkingLevelMap = resolveBedrockNativeThinkingLevelMap(id);
-	return {
-		id,
-		name: summary.modelName?.trim() || id,
-		reasoning: inferReasoningSupport(summary),
-		input: mapInputModalities(summary),
-		cost: DEFAULT_COST,
-		contextWindow: resolveKnownContextWindow(id) ?? defaults.contextWindow,
-		maxTokens: isClaude5BedrockModel({ id }) ? 128e3 : defaults.maxTokens,
-		...thinkingLevelMap ? { thinkingLevelMap } : {}
-	};
-}
-/**
-* Resolve the base foundation model ID from an inference profile.
-*
-* System-defined profiles use a region prefix:
-*   "us.anthropic.claude-sonnet-4-6" → "anthropic.claude-sonnet-4-6"
-*
-* Application profiles carry the model ARN in their models[] array:
-*   models[0].modelArn = "arn:aws:bedrock:us-east-1::foundation-model/anthropic.claude-sonnet-4-6"
-*   → "anthropic.claude-sonnet-4-6"
-*/
-function resolveBaseModelId(profile) {
-	const firstArn = profile.models?.[0]?.modelArn;
-	if (firstArn) {
-		const arnMatch = /foundation-model\/(.+)$/.exec(firstArn);
-		if (arnMatch) return arnMatch[1];
-	}
-	if (profile.type === "SYSTEM_DEFINED") {
-		const id = profile.inferenceProfileId ?? "";
-		const prefixMatch = /^(?:us|eu|ap|apac|au|jp|global)\.(.+)$/i.exec(id);
-		if (prefixMatch) return prefixMatch[1];
-	}
-}
 /**
 * Fetch raw inference profile summaries from the Bedrock control plane.
 * All pages must succeed before discovery can cache a complete catalog.
@@ -187,56 +121,14 @@ async function fetchInferenceProfileSummaries(client, createListInferenceProfile
 	} while (nextToken);
 	return profiles;
 }
-/**
-* Convert raw inference profile summaries into model definitions.
-*
-* Each profile inherits capabilities (modalities, reasoning, context window,
-* cost) from its underlying foundation model. This ensures that
-* "us.anthropic.claude-sonnet-4-6" has the same capabilities as
-* "anthropic.claude-sonnet-4-6" — including image input, reasoning support,
-* and token limits.
-*
-* When the foundation model isn't found in the map (e.g. the model is only
-* available via inference profiles in this region), safe defaults are used.
-*/
-function resolveInferenceProfiles(profiles, defaults, providerFilter, foundationModels) {
-	const discovered = [];
-	for (const profile of profiles) {
-		if (!profile.inferenceProfileId?.trim()) continue;
-		if (profile.status !== "ACTIVE") continue;
-		if (providerFilter.length > 0) {
-			if (!(profile.models ?? []).some((m) => {
-				const provider = m.modelArn?.split("/")?.[1]?.split(".")?.[0];
-				return provider ? providerFilter.includes(normalizeOptionalLowercaseString(provider) ?? "") : false;
-			})) continue;
-		}
-		const baseModelId = resolveBaseModelId(profile);
-		if (isKnownClaudeMythosPreviewModelId(baseModelId ?? profile.inferenceProfileId)) continue;
-		const baseModel = baseModelId ? foundationModels.get(normalizeLowercaseStringOrEmpty(baseModelId)) : void 0;
-		const knownThinkingLevelMap = resolveBedrockNativeThinkingLevelMap(baseModelId ?? profile.inferenceProfileId);
-		const contractModelId = baseModelId ?? profile.inferenceProfileId;
-		const claude5 = isClaude5BedrockModel({ id: contractModelId });
-		const canonicalClaudeId = resolveClaudeModelIdentity({ id: baseModelId });
-		discovered.push({
-			id: profile.inferenceProfileId,
-			name: profile.inferenceProfileName?.trim() || profile.inferenceProfileId,
-			reasoning: baseModel?.reasoning ?? supportsClaudeAdaptiveThinking({ id: baseModelId ?? profile.inferenceProfileId }),
-			input: baseModel?.input ?? (claude5 ? ["text", "image"] : ["text"]),
-			cost: baseModel?.cost ?? DEFAULT_COST,
-			contextWindow: baseModel?.contextWindow ?? resolveKnownContextWindow(contractModelId) ?? defaults.contextWindow,
-			maxTokens: baseModel?.maxTokens ?? (claude5 ? 128e3 : defaults.maxTokens),
-			...baseModel?.thinkingLevelMap || knownThinkingLevelMap ? { thinkingLevelMap: baseModel?.thinkingLevelMap ?? knownThinkingLevelMap } : {},
-			...canonicalClaudeId.startsWith("claude-") ? { params: { canonicalModelId: canonicalClaudeId } } : {}
-		});
-	}
-	return discovered;
-}
 /** Public discovery is advisory by default; catalog owners opt into strict acquisition. */
 async function discoverBedrockModels(params) {
 	const refreshIntervalSeconds = Math.max(0, Math.floor(params.config?.refreshInterval ?? DEFAULT_REFRESH_INTERVAL_SECONDS));
 	const providerFilter = normalizeSortedUniqueTrimmedStringList(params.config?.providerFilter?.map(normalizeOptionalLowercaseString));
-	const defaultContextWindow = resolveDefaultContextWindow(params.config);
-	const defaultMaxTokens = resolveDefaultMaxTokens(params.config);
+	const contextWindow = Math.floor(params.config?.defaultContextWindow ?? DEFAULT_CONTEXT_WINDOW);
+	const maxTokens = Math.floor(params.config?.defaultMaxTokens ?? DEFAULT_MAX_TOKENS);
+	const defaultContextWindow = contextWindow > 0 ? contextWindow : DEFAULT_CONTEXT_WINDOW;
+	const defaultMaxTokens = maxTokens > 0 ? maxTokens : DEFAULT_MAX_TOKENS;
 	const cacheKey = JSON.stringify({
 		region: params.region,
 		discoveryMode: params.discoveryMode,
@@ -245,14 +137,14 @@ async function discoverBedrockModels(params) {
 		defaultContextWindow,
 		defaultMaxTokens
 	});
-	const now = params.now?.() ?? Date.now();
+	const now = Date.now();
 	if (refreshIntervalSeconds > 0) {
 		const cached = discoveryCache.get(cacheKey);
 		if (cached && isFutureDateTimestampMs(cached.expiresAt, { nowMs: now })) return cached.result;
 		discoveryCache.delete(cacheKey);
 	}
 	const sdk = await loadBedrockControlPlaneSdk();
-	const client = (params.clientFactory ?? ((region) => sdk.createClient(region)))(params.region);
+	const client = sdk.createClient(params.region);
 	const discoveryPromise = (async () => {
 		try {
 			const foundationCommand = sdk.createListFoundationModelsCommand();
@@ -268,24 +160,62 @@ async function discoverBedrockModels(params) {
 			const seenIds = /* @__PURE__ */ new Set();
 			const foundationModels = /* @__PURE__ */ new Map();
 			for (const summary of foundationResponse.modelSummaries ?? []) {
-				if (!shouldIncludeSummary(summary, providerFilter)) continue;
-				const def = toModelDefinition(summary, {
-					contextWindow: defaultContextWindow,
-					maxTokens: defaultMaxTokens
-				});
+				if (!summary.modelId?.trim()) continue;
+				if (providerFilter.length > 0) {
+					const providerName = summary.providerName ?? (typeof summary.modelId === "string" ? summary.modelId.split(".")[0] : void 0);
+					const provider = normalizeOptionalLowercaseString(providerName);
+					if (!provider || !providerFilter.includes(provider)) continue;
+				}
+				if (summary.responseStreamingSupported !== true || isKnownClaudeMythosPreviewModelId(summary.modelId) || !(summary.outputModalities ?? []).some((entry) => normalizeOptionalLowercaseString(entry) === "text") || typeof summary.modelLifecycle?.status !== "string" || summary.modelLifecycle.status.toUpperCase() !== "ACTIVE") continue;
+				const input = (summary.inputModalities ?? []).map(normalizeOptionalLowercaseString).filter((modality) => modality === "text" || modality === "image");
+				const reasoningHint = normalizeLowercaseStringOrEmpty(`${summary.modelId ?? ""} ${summary.modelName ?? ""}`);
+				const id = summary.modelId?.trim() ?? "";
+				const thinkingLevelMap = resolveBedrockNativeThinkingLevelMap(id);
+				const def = {
+					id,
+					name: summary.modelName?.trim() || id,
+					reasoning: supportsClaudeAdaptiveThinking({ id: summary.modelId }) || reasoningHint.includes("reasoning") || reasoningHint.includes("thinking"),
+					input: input.length > 0 ? [...new Set(input)] : ["text"],
+					cost: DEFAULT_COST,
+					contextWindow: resolveKnownContextWindow(id) ?? defaultContextWindow,
+					maxTokens: isClaude5BedrockModel({ id }) ? 128e3 : defaultMaxTokens,
+					...thinkingLevelMap ? { thinkingLevelMap } : {}
+				};
 				discovered.push(def);
 				const normalizedId = normalizeLowercaseStringOrEmpty(def.id);
 				seenIds.add(normalizedId);
 				foundationModels.set(normalizedId, def);
 			}
-			const inferenceProfiles = resolveInferenceProfiles(profileSummaries, {
-				contextWindow: defaultContextWindow,
-				maxTokens: defaultMaxTokens
-			}, providerFilter, foundationModels);
-			for (const profile of inferenceProfiles) {
-				const normalizedId = normalizeLowercaseStringOrEmpty(profile.id);
+			for (const profile of profileSummaries) {
+				if (!profile.inferenceProfileId?.trim()) continue;
+				if (profile.status !== "ACTIVE") continue;
+				if (providerFilter.length > 0) {
+					if (!(profile.models ?? []).some((m) => {
+						const provider = m.modelArn?.split("/")?.[1]?.split(".")?.[0];
+						return provider ? providerFilter.includes(normalizeOptionalLowercaseString(provider) ?? "") : false;
+					})) continue;
+				}
+				const baseModelId = /foundation-model\/(.+)$/.exec(profile.models?.[0]?.modelArn ?? "")?.[1] ?? (profile.type === "SYSTEM_DEFINED" ? /^(?:us|eu|ap|apac|au|jp|global)\.(.+)$/i.exec(profile.inferenceProfileId ?? "")?.[1] : void 0);
+				if (isKnownClaudeMythosPreviewModelId(baseModelId ?? profile.inferenceProfileId)) continue;
+				const baseModel = baseModelId ? foundationModels.get(normalizeLowercaseStringOrEmpty(baseModelId)) : void 0;
+				const knownThinkingLevelMap = resolveBedrockNativeThinkingLevelMap(baseModelId ?? profile.inferenceProfileId);
+				const contractModelId = baseModelId ?? profile.inferenceProfileId;
+				const claude5 = isClaude5BedrockModel({ id: contractModelId });
+				const canonicalClaudeId = resolveClaudeModelIdentity({ id: baseModelId });
+				const definition = {
+					id: profile.inferenceProfileId,
+					name: profile.inferenceProfileName?.trim() || profile.inferenceProfileId,
+					reasoning: baseModel?.reasoning ?? supportsClaudeAdaptiveThinking({ id: baseModelId ?? profile.inferenceProfileId }),
+					input: baseModel?.input ?? (claude5 ? ["text", "image"] : ["text"]),
+					cost: baseModel?.cost ?? DEFAULT_COST,
+					contextWindow: baseModel?.contextWindow ?? resolveKnownContextWindow(contractModelId) ?? defaultContextWindow,
+					maxTokens: baseModel?.maxTokens ?? (claude5 ? 128e3 : defaultMaxTokens),
+					...baseModel?.thinkingLevelMap || knownThinkingLevelMap ? { thinkingLevelMap: baseModel?.thinkingLevelMap ?? knownThinkingLevelMap } : {},
+					...canonicalClaudeId.startsWith("claude-") ? { params: { canonicalModelId: canonicalClaudeId } } : {}
+				};
+				const normalizedId = normalizeLowercaseStringOrEmpty(definition.id);
 				if (!seenIds.has(normalizedId)) {
-					discovered.push(profile);
+					discovered.push(definition);
 					seenIds.add(normalizedId);
 				}
 			}
@@ -328,8 +258,7 @@ async function resolveImplicitBedrockProvider(params) {
 	const models = await discoverBedrockModels({
 		region,
 		discoveryMode: params.discoveryMode,
-		config: discoveryConfig,
-		clientFactory: params.clientFactory
+		config: discoveryConfig
 	});
 	if (models.length === 0 && params.discoveryMode !== "strict") return null;
 	return {

package/dist/embedding-provider.js

@@ -2,7 +2,6 @@ import { bedrockCredentialDefaultProvider } from "./aws-credential-refresh.js";
 import { asOptionalRecord, normalizeLowercaseStringOrEmpty, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { debugEmbeddingsLog, normalizeEmbeddingModelWithPrefixes, sanitizeAndNormalizeEmbedding } from "openclaw/plugin-sdk/memory-core-host-engine-embeddings";
 //#region extensions/amazon-bedrock/embedding-provider.ts
-/** Default Bedrock embedding model used when no explicit model is configured. */
 const DEFAULT_BEDROCK_EMBEDDING_MODEL = "amazon.titan-embed-text-v2:0";
 const MODELS = {
 	"amazon.titan-embed-text-v2:0": {
@@ -75,7 +74,6 @@ const MODELS = {
 		family: "twelvelabs"
 	}
 };
-/** Strip AWS inference profile prefix (us., eu., ap., apac., au., jp., global.) from model ID. */
 function stripInferenceProfilePrefix(modelId) {
 	return modelId.replace(/^(?:us|eu|ap|apac|au|jp|global)\./, "");
 }
@@ -89,7 +87,6 @@ function resolveSpec(modelId) {
 		if (spec) return spec;
 	}
 }
-/** Infer family from model ID prefix when not in catalog. */
 function inferFamily(modelId) {
 	const id = normalizeLowercaseStringOrEmpty(stripInferenceProfilePrefix(modelId));
 	if (id.startsWith("amazon.titan-embed-text-v2")) return "titan-v2";
@@ -100,16 +97,7 @@ function inferFamily(modelId) {
 	if (id.startsWith("twelvelabs.")) return "twelvelabs";
 	return "titan-v1";
 }
-let sdkPromise = null;
 let credentialProviderPromise = null;
-async function loadSdk() {
-	try {
-		return await (sdkPromise ??= import("@aws-sdk/client-bedrock-runtime"));
-	} catch {
-		sdkPromise = null;
-		throw new Error("No API key found for provider bedrock: @aws-sdk/client-bedrock-runtime is not installed. Install it with: npm install @aws-sdk/client-bedrock-runtime");
-	}
-}
 function loadDefaultCredentialProvider() {
 	return credentialProviderPromise ??= import("@aws-sdk/credential-provider-node").then(({ defaultProvider }) => defaultProvider).catch(() => null);
 }
@@ -202,7 +190,9 @@ function parseCohereBatch(family, raw) {
 	return asNumberArrayBatch(embeddings);
 }
 async function createBedrockEmbeddingProvider(options) {
-	const { BedrockRuntimeClient, InvokeModelCommand } = await loadSdk();
+	const { BedrockRuntimeClient, InvokeModelCommand } = await import("@aws-sdk/client-bedrock-runtime").catch(() => {
+		throw new Error("No API key found for provider bedrock: @aws-sdk/client-bedrock-runtime is not installed. Install it with: npm install @aws-sdk/client-bedrock-runtime");
+	});
 	const client = resolveBedrockEmbeddingClient(options, BedrockRuntimeClient);
 	const spec = resolveSpec(client.model);
 	const family = spec?.family ?? inferFamily(client.model);

package/dist/memory-embedding-adapter.js

@@ -1,11 +1,6 @@
 import { DEFAULT_BEDROCK_EMBEDDING_MODEL, createBedrockEmbeddingProvider, hasAwsCredentials } from "./embedding-provider.js";
 import { isMissingEmbeddingApiKeyError } from "openclaw/plugin-sdk/embedding-provider-adapter";
 //#region extensions/amazon-bedrock/memory-embedding-adapter.ts
-/**
-* Memory embedding adapter for Amazon Bedrock. It exposes Bedrock embeddings to
-* the memory-core engine and verifies AWS credentials before auto-selection.
-*/
-/** Memory-core adapter descriptor for Bedrock embeddings. */
 const bedrockMemoryEmbeddingProviderAdapter = {
 	id: "bedrock",
 	defaultModel: DEFAULT_BEDROCK_EMBEDDING_MODEL,

package/dist/provider-policy-api.js

@@ -5,7 +5,6 @@ import { normalizeProviderId } from "openclaw/plugin-sdk/model-ref-parse";
 * Provider-policy API for Amazon Bedrock. Core asks this plugin for thinking
 * profiles without importing provider registration or streaming code.
 */
-/** 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, params.params);

package/dist/register.sync.runtime.js

@@ -93,14 +93,6 @@ const BEDROCK_APP_INFERENCE_PROFILE_RE = /^arn:aws(-cn|-us-gov)?:bedrock:.*:appl
 function isBedrockAppInferenceProfile(modelId) {
 	return BEDROCK_APP_INFERENCE_PROFILE_RE.test(modelId);
 }
-/**
-* Extract the region from a Bedrock ARN.
-* e.g. "arn:aws:bedrock:us-east-1:123:application-inference-profile/abc" → "us-east-1"
-*/
-function extractRegionFromArn(arn) {
-	const parts = arn.split(":");
-	return parts.length >= 4 && parts[3] ? parts[3] : void 0;
-}
 const appProfileTraitsCache = /* @__PURE__ */ new Map();
 async function resolveAppProfileTraits(modelId, fallbackRegion, signal) {
 	const cached = appProfileTraitsCache.get(modelId);
@@ -108,7 +100,7 @@ async function resolveAppProfileTraits(modelId, fallbackRegion, signal) {
 	let client;
 	try {
 		signal?.throwIfAborted();
-		const region = extractRegionFromArn(modelId) ?? fallbackRegion;
+		const region = modelId.split(":")[3] || fallbackRegion;
 		const sdk = await loadBedrockControlPlaneSdk();
 		signal?.throwIfAborted();
 		const controlPlaneClient = sdk.createClient(region);
@@ -168,7 +160,6 @@ function patchMaxThinkingEffort(payload) {
 	fields.output_config = outputConfig;
 	payload.additionalModelRequestFields = fields;
 }
-/** Register Amazon Bedrock provider, discovery catalog, stream wrappers, and embeddings. */
 function registerAmazonBedrockPlugin(api) {
 	const providerId = "amazon-bedrock";
 	const bedrockRegionRe = /bedrock-runtime\.([a-z0-9-]+)\.amazonaws\./;
@@ -184,15 +175,6 @@ function registerAmazonBedrockPlugin(api) {
 		return resolvePluginConfigObject(config, providerId) ?? (config ? void 0 : startupPluginConfig);
 	}
 	api.registerEmbeddingProvider(bedrockMemoryEmbeddingProviderAdapter);
-	const baseWrapStreamFn = ({ modelId, model, streamFn }) => {
-		const modelRef = {
-			id: modelId,
-			params: model?.params
-		};
-		if (resolveBedrockPromptCachePolicy(modelRef) === "nova" || isAnthropicBedrockModel(modelId) || resolveClaudeModelIdentity(modelRef).startsWith("claude-")) return streamFn;
-		if (isBedrockAppInferenceProfile(modelId)) return streamFn;
-		return createBedrockNoCacheWrapper(streamFn);
-	};
 	function omitUnsupportedClaudeTemperature(modelRef, options) {
 		const canonicalModelId = resolveClaudeModelIdentity(modelRef);
 		if (!(isOpus47OrNewerBedrockModelRef(modelRef.id) || isOpus47OrNewerBedrockModelRef(canonicalModelId) || resolveClaudeFable5ModelIdentity(modelRef) !== void 0) || !("temperature" in options)) return options;
@@ -205,12 +187,10 @@ function registerAmazonBedrockPlugin(api) {
 		if (!inferenceConfig || typeof inferenceConfig !== "object") return;
 		delete inferenceConfig.temperature;
 	}
-	/** Extract the AWS region from a bedrock-runtime baseUrl. */
 	function extractRegionFromBaseUrl(baseUrl) {
 		if (!baseUrl) return;
 		return bedrockRegionRe.exec(baseUrl)?.[1];
 	}
-	/** Resolve the AWS region for Bedrock API calls from provider-specific baseUrl. */
 	function resolveBedrockRegion(config, selectedProvider) {
 		const providers = config?.models?.providers ?? {};
 		const exact = providers[selectedProvider]?.baseUrl;
@@ -261,11 +241,8 @@ function registerAmazonBedrockPlugin(api) {
 			const canonicalModelId = resolveClaudeModelIdentity(modelRef);
 			const opus47OrNewer = isOpus47OrNewerBedrockModelRef(modelId) || isOpus47OrNewerBedrockModelRef(canonicalModelId);
 			const supportsNativeMax = supportsBedrockNativeMaxEffort(modelId, model?.params);
-			let wrapped = baseWrapStreamFn({
-				modelId,
-				model,
-				streamFn
-			});
+			const heuristicMatch = isAnthropicBedrockModel(modelId);
+			let wrapped = resolveBedrockPromptCachePolicy(modelRef) === "nova" || heuristicMatch || canonicalModelId.startsWith("claude-") || isBedrockAppInferenceProfile(modelId) ? streamFn : createBedrockNoCacheWrapper(streamFn);
 			if (wrapped && currentGuardrail?.guardrailIdentifier && currentGuardrail.guardrailVersion) wrapped = createGuardrailStreamWrapper(wrapped, currentGuardrail);
 			const serviceTier = resolveBedrockServiceTier(extraParams, (message) => api.logger.warn(message));
 			if (serviceTier && wrapped) {
@@ -279,7 +256,6 @@ function registerAmazonBedrockPlugin(api) {
 			const shouldOmitTemperature = opus47OrNewer || fable5 || isLatestAdaptiveBedrockModelRef(modelId, model?.params);
 			const shouldPatchMaxThinking = supportsNativeMax && thinkingLevel === "max";
 			const shouldPatchPayload = shouldOmitTemperature || shouldPatchMaxThinking;
-			const heuristicMatch = isAnthropicBedrockModel(modelId);
 			if (!region && !mayNeedCacheInjection && !shouldOmitTemperature && !shouldPatchMaxThinking) return wrapped;
 			const underlying = wrapped ?? streamFn;
 			if (!underlying) return wrapped;

package/dist/stream.runtime.js

@@ -4,7 +4,7 @@ import { isClaude5BedrockModel, resolveBedrockClaudeThinkingProfile, supportsBed
 import { AssistantMessageEventStream, adjustMaxTokensForThinking, buildBaseOptions, calculateCost, clampReasoning, createHttpProxyAgentsForTarget, createToolArgumentPreviewSchedule, hasRuntimeContextMarker, parseStreamingJson, sanitizeSurrogates, transformMessages } from "openclaw/plugin-sdk/llm";
 import { bindsClaudeThinkingPrefix, requiresClaudeMandatoryAdaptiveThinking, resolveClaudeFable5ModelIdentity, resolveClaudeModelIdentity, resolveClaudeOpus5ModelIdentity, resolveClaudeSonnet5ModelIdentity, supportsClaudeAdaptiveThinking, supportsClaudeNativeXhighEffort } from "openclaw/plugin-sdk/provider-model-shared";
 import { applyAnthropicRefusal, createDeferredEventBuffer, notifyLlmRequestActivity } from "openclaw/plugin-sdk/provider-stream-shared";
-import { buildAssistantMessage, coerceTransportToolCallArguments, createEmptyTransportUsage, describeToolResultMediaPlaceholder, failTransportStream, finalizeTerminalToolCallArguments, notifyProviderHttpMetadata, splitSystemPromptCacheBoundary, stripSystemPromptCacheBoundary } from "openclaw/plugin-sdk/provider-transport-runtime";
+import { buildAssistantMessage, coerceTransportToolCallArguments, createEmptyTransportUsage, describeToolResultMediaPlaceholder, failTransportStream, finalizeTerminalToolCallArguments, notifyProviderHttpMetadata, sortPromptCacheToolsByName, splitSystemPromptCacheBoundary, stripSystemPromptCacheBoundary } from "openclaw/plugin-sdk/provider-transport-runtime";
 import { asOptionalRecord, isRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { BedrockRuntimeClient, BedrockRuntimeServiceException, CacheTTL, ConversationRole, ConverseStreamCommand, ImageFormat, StopReason, ToolResultStatus } from "@aws-sdk/client-bedrock-runtime";
 import { NodeHttpHandler } from "@smithy/node-http-handler";
@@ -42,12 +42,17 @@ const streamBedrock = (model, context, options = {}) => {
 			stopReason: "stop"
 		});
 		const blocks = output.content;
-		const pendingToolCallEnds = [];
-		const toolArgumentPreviewSchedules = /* @__PURE__ */ new WeakMap();
-		const redactedReasoningChunks = /* @__PURE__ */ new Map();
 		const fable5 = resolveClaudeFable5ModelIdentity(model) !== void 0;
 		const refusalBuffer = isClaude5BedrockModel(model) ? createDeferredEventBuffer(stream) : void 0;
 		const eventSink = refusalBuffer ?? stream;
+		const blockState = {
+			blocks,
+			output,
+			stream: eventSink,
+			toolArgumentPreviewSchedules: /* @__PURE__ */ new WeakMap(),
+			redactedReasoningChunks: /* @__PURE__ */ new Map(),
+			pendingToolCallEnds: []
+		};
 		const config = {
 			profile: options.profile,
 			...resolveBedrockRuntimeAuth(options.bearerToken)
@@ -118,9 +123,9 @@ const streamBedrock = (model, context, options = {}) => {
 						type: "start",
 						partial: output
 					});
-				} else if (item.contentBlockStart) handleContentBlockStart(item.contentBlockStart, blocks, output, eventSink, toolArgumentPreviewSchedules);
-				else if (item.contentBlockDelta) handleContentBlockDelta(item.contentBlockDelta, blocks, output, eventSink, redactedReasoningChunks, toolArgumentPreviewSchedules);
-				else if (item.contentBlockStop) handleContentBlockStop(item.contentBlockStop, blocks, output, eventSink, redactedReasoningChunks, pendingToolCallEnds);
+				} else if (item.contentBlockStart) handleContentBlockStart(item.contentBlockStart, blockState);
+				else if (item.contentBlockDelta) handleContentBlockDelta(item.contentBlockDelta, blockState);
+				else if (item.contentBlockStop) handleContentBlockStop(item.contentBlockStop, blockState);
 				else if (item.messageStop) {
 					sawMessageStop = true;
 					if (item.messageStop.stopReason === "refusal") applyAnthropicRefusal(output, readBedrockStopDetails(item.messageStop.additionalModelResponseFields), model.provider);
@@ -139,8 +144,8 @@ const streamBedrock = (model, context, options = {}) => {
 			if (!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(output.errorMessage ?? "An unknown error occurred");
-			for (const block of blocks) if (block.index !== void 0 && block.type !== "toolCall") handleContentBlockStop({ contentBlockIndex: block.index }, blocks, output, eventSink, redactedReasoningChunks, pendingToolCallEnds);
-			flushPendingBedrockToolCalls(pendingToolCallEnds, blocks, output, eventSink);
+			for (const block of blocks) if (block.index !== void 0 && block.type !== "toolCall") handleContentBlockStop({ contentBlockIndex: block.index }, blockState);
+			flushPendingBedrockToolCalls(blockState);
 			refusalBuffer?.flush();
 			stream.push({
 				type: "done",
@@ -225,7 +230,7 @@ function resolveSimpleBedrockOptions(model, options) {
 	}
 	return base;
 }
-function handleContentBlockStart(event, blocks, output, stream, toolArgumentPreviewSchedules) {
+function handleContentBlockStart(event, { blocks, output, stream, toolArgumentPreviewSchedules }) {
 	const index = event.contentBlockIndex;
 	const start = event.start;
 	if (start?.toolUse) {
@@ -247,7 +252,7 @@ function handleContentBlockStart(event, blocks, output, stream, toolArgumentPrev
 		});
 	}
 }
-function handleContentBlockDelta(event, blocks, output, stream, redactedReasoningChunks, toolArgumentPreviewSchedules) {
+function handleContentBlockDelta(event, { blocks, output, stream, redactedReasoningChunks, toolArgumentPreviewSchedules }) {
 	const contentBlockIndex = event.contentBlockIndex;
 	const delta = event.delta;
 	let index = blocks.findIndex((b) => b.index === contentBlockIndex);
@@ -341,7 +346,7 @@ function handleMetadata(event, model, output) {
 		calculateCost(model, output.usage);
 	}
 }
-function handleContentBlockStop(event, blocks, output, stream, redactedReasoningChunks, pendingToolCallEnds) {
+function handleContentBlockStop(event, { blocks, output, stream, redactedReasoningChunks, pendingToolCallEnds }) {
 	const index = blocks.findIndex((b) => b.index === event.contentBlockIndex);
 	const block = blocks[index];
 	if (!block) return;
@@ -381,7 +386,7 @@ function handleContentBlockStop(event, blocks, output, stream, redactedReasoning
 			});
 	}
 }
-function flushPendingBedrockToolCalls(pending, blocks, output, stream) {
+function flushPendingBedrockToolCalls({ pendingToolCallEnds: pending, blocks, output, stream }) {
 	if (blocks.some((block) => block.type === "toolCall" && block.index !== void 0)) throw new Error("Provider completed stream with an incomplete tool call");
 	finalizeTerminalToolCallArguments(pending.map(({ block }) => block), (block) => block.partialJson && block.partialJson.length > 0 ? block.partialJson : block.arguments);
 	for (const toolCall of pending) {
@@ -480,15 +485,19 @@ function buildSystemPrompt(systemPrompt, cacheRetention, cachePoint) {
 function normalizeToolCallId(id) {
 	return id.replace(/[^a-zA-Z0-9_-]/g, "_").slice(0, 64);
 }
-function createBedrockToolResult(message) {
+function convertTextImageContent(blocks, skipEmptyImages) {
 	const content = [];
-	for (const block of message.content) {
+	for (const block of blocks) {
 		if (block.type === "text") {
 			content.push({ text: sanitizeSurrogates(block.text) });
 			continue;
 		}
-		if (block.type === "image" && describeToolResultMediaPlaceholder([block])) content.push({ image: createImageBlock(block.mimeType, block.data) });
+		if (block.type === "image" && (!skipEmptyImages || describeToolResultMediaPlaceholder([block]))) content.push({ image: createImageBlock(block.mimeType, block.data) });
 	}
+	return content;
+}
+function createBedrockToolResult(message) {
+	const content = convertTextImageContent(message.content, true);
 	return { toolResult: {
 		toolUseId: message.toolCallId,
 		content: content.length > 0 ? content : [{ text: describeToolResultMediaPlaceholder(message.content) ?? "(no output)" }],
@@ -503,17 +512,7 @@ function convertMessages(context, model, cachePoint) {
 		const m = expectDefined(transformedMessages[i], "message conversion index is in bounds");
 		switch (m.role) {
 			case "user": {
-				const content = [];
-				if (typeof m.content === "string") content.push({ text: sanitizeSurrogates(m.content) });
-				else for (const c of m.content) switch (c.type) {
-					case "text":
-						content.push({ text: sanitizeSurrogates(c.text) });
-						break;
-					case "image":
-						content.push({ image: createImageBlock(c.mimeType, c.data) });
-						break;
-					default: continue;
-				}
+				const content = typeof m.content === "string" ? [{ text: sanitizeSurrogates(m.content) }] : convertTextImageContent(m.content, false);
 				if (content.length === 0) continue;
 				if (hasRuntimeContextMarker(m) && !bindsClaudeThinkingPrefix(model) && firstVolatileMessageIndex === void 0) firstVolatileMessageIndex = result.length;
 				result.push({
@@ -612,7 +611,7 @@ function convertMessages(context, model, cachePoint) {
 }
 function convertToolConfig(tools, toolChoice) {
 	if (!tools?.length || toolChoice === "none") return;
-	const bedrockTools = tools.map((tool) => ({ toolSpec: {
+	const bedrockTools = sortPromptCacheToolsByName(tools).map((tool) => ({ toolSpec: {
 		name: tool.name,
 		description: tool.description,
 		inputSchema: { json: { ...tool.parameters } }

package/dist/thinking-policy.js

@@ -19,14 +19,12 @@ function isOpus47Or48BedrockModelRef(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 or newer. */
 function isOpus47OrNewerBedrockModelRef(modelRef) {
 	return isOpus5BedrockModelRef(modelRef) || isOpus47Or48BedrockModelRef(modelRef);
 }
 function isMythosPreviewBedrockModelRef(modelRef) {
 	return /(?:^|[/.:])(?:(?:us|eu|ap|apac|au|jp|global)\.)?(?:anthropic\.)?claude-mythos-preview(?:$|[-.:/])/i.test(modelRef);
 }
-/** Return whether a Bedrock Claude ref needs latest adaptive-thinking request shaping. */
 function isLatestAdaptiveBedrockModelRef(modelId, params) {
 	const modelRef = {
 		id: modelId,
@@ -35,7 +33,6 @@ function isLatestAdaptiveBedrockModelRef(modelId, params) {
 	const canonicalModelId = resolveClaudeModelIdentity(modelRef);
 	return isClaude5BedrockModel(modelRef) || [modelId, canonicalModelId].some((candidate) => isOpus47OrNewerBedrockModelRef(candidate) || isMythosPreviewBedrockModelRef(candidate));
 }
-/** Return whether a Bedrock Claude ref supports max effort. */
 function supportsBedrockNativeMaxEffort(modelId, params) {
 	if (isClaude5BedrockModel({
 		id: modelId,
@@ -46,7 +43,6 @@ function supportsBedrockNativeMaxEffort(modelId, params) {
 		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,
@@ -74,7 +70,6 @@ function resolveBedrockNativeThinkingLevelMap(modelId, params) {
 		max: "max"
 	};
 }
-/** Resolve supported Claude thinking levels for a Bedrock model id. */
 function resolveBedrockClaudeThinkingProfile(modelId, params) {
 	const trimmed = modelId.trim();
 	const modelRefs = [trimmed, resolveClaudeModelIdentity({

package/node_modules/@aws-sdk/client-bedrock/dist-cjs/index.js

@@ -86,7 +86,7 @@ const commonParams = {
     UseDualStack: { type: "builtInParams", name: "useDualstackEndpoint" },
 };
 
-var version = "3.1135.0";
+var version = "3.1145.0";
 var packageInfo = {
 	version: version};
 
@@ -1622,10 +1622,10 @@ const _wP = "wordPolicy";
 const _wPC = "wordPolicyConfig";
 const _xact = "x-amz-client-token";
 const n0 = "com.amazonaws.bedrock";
-const _s_registry = TypeRegistry.for(_s);
+const _s_registry = new TypeRegistry(_s);
 var BedrockServiceException$ = [-3, _s, "BedrockServiceException", 0, [], []];
 _s_registry.registerError(BedrockServiceException$, BedrockServiceException);
-const n0_registry = TypeRegistry.for(n0);
+const n0_registry = new TypeRegistry(n0);
 var AccessDeniedException$ = [-3, n0, _ADE,
     { [_e]: _c, [_hE]: 403 },
     [_m],

package/node_modules/@aws-sdk/client-bedrock/dist-es/schemas/schemas_0.js

@@ -1345,10 +1345,10 @@ const n0 = "com.amazonaws.bedrock";
 import { TypeRegistry } from "@smithy/core/schema";
 import { BedrockServiceException } from "../models/BedrockServiceException";
 import { AccessDeniedException, ConflictException, InternalServerException, ResourceInUseException, ResourceNotFoundException, ServiceQuotaExceededException, ServiceUnavailableException, ThrottlingException, TooManyTagsException, ValidationException, } from "../models/errors";
-const _s_registry = TypeRegistry.for(_s);
+const _s_registry = new TypeRegistry(_s);
 export var BedrockServiceException$ = [-3, _s, "BedrockServiceException", 0, [], []];
 _s_registry.registerError(BedrockServiceException$, BedrockServiceException);
-const n0_registry = TypeRegistry.for(n0);
+const n0_registry = new TypeRegistry(n0);
 export var AccessDeniedException$ = [-3, n0, _ADE,
     { [_e]: _c, [_hE]: 403 },
     [_m],