@openclaw/amazon-bedrock-provider 2026.7.2-beta.5 → 2026.7.33

package/dist/stream.runtime.js

@@ -1,14 +1,10 @@
 import { supportsBedrockPromptCaching } from "./bedrock-options.js";
 import { supportsBedrockNativeMaxEffort } from "./thinking-policy.js";
-import { requiresClaudeMandatoryAdaptiveThinking, resolveClaudeFable5ModelIdentity, resolveClaudeModelIdentity, resolveClaudeMythos5ModelIdentity, resolveClaudeOpus5ModelIdentity, resolveClaudeSonnet5ModelIdentity, supportsClaudeAdaptiveThinking, supportsClaudeNativeXhighEffort } from "openclaw/plugin-sdk/provider-model-shared";
+import { AssistantMessageEventStream, adjustMaxTokensForThinking, buildBaseOptions, calculateCost, clampReasoning, createHttpProxyAgentsForTarget, parseStreamingJson, sanitizeSurrogates, transformMessages } from "openclaw/plugin-sdk/llm";
+import { requiresClaudeMandatoryAdaptiveThinking, resolveClaudeFable5ModelIdentity, resolveClaudeModelIdentity, resolveClaudeMythos5ModelIdentity, resolveClaudeSonnet5ModelIdentity, supportsClaudeAdaptiveThinking, supportsClaudeNativeXhighEffort } from "openclaw/plugin-sdk/provider-model-shared";
 import { applyAnthropicRefusal, createDeferredEventBuffer, notifyLlmRequestActivity } from "openclaw/plugin-sdk/provider-stream-shared";
-import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { BedrockRuntimeClient, BedrockRuntimeServiceException, CachePointType, CacheTTL, ConversationRole, ConverseStreamCommand, ImageFormat, StopReason, ToolResultStatus } from "@aws-sdk/client-bedrock-runtime";
 import { NodeHttpHandler } from "@smithy/node-http-handler";
-import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
-import { AssistantMessageEventStream, adjustMaxTokensForThinking, buildBaseOptions, calculateCost, clampReasoning, createHttpProxyAgentsForTarget, parseStreamingJson, sanitizeSurrogates, transformMessages } from "openclaw/plugin-sdk/llm";
-import { canonicalizeBase64 } from "openclaw/plugin-sdk/media-runtime";
-import { describeToolResultMediaPlaceholder } from "openclaw/plugin-sdk/provider-transport-runtime";
 //#region extensions/amazon-bedrock/stream.runtime.ts
 /**
 * Amazon Bedrock Converse streaming runtime. It maps OpenClaw messages/tools,
@@ -17,14 +13,11 @@ import { describeToolResultMediaPlaceholder } from "openclaw/plugin-sdk/provider
 function usesClaudeFable5BedrockContract(model) {
 	return resolveClaudeFable5ModelIdentity(model) !== void 0;
 }
-function usesClaudeOpus5BedrockContract(model) {
-	return resolveClaudeOpus5ModelIdentity(model) !== void 0;
-}
 function usesClaudeSonnet5BedrockContract(model) {
 	return resolveClaudeSonnet5ModelIdentity(model) !== void 0;
 }
 function usesClaudeStreamingRefusalBedrockContract(model) {
-	return usesClaudeFable5BedrockContract(model) || resolveClaudeMythos5ModelIdentity(model) !== void 0 || usesClaudeOpus5BedrockContract(model) || usesClaudeSonnet5BedrockContract(model);
+	return usesClaudeFable5BedrockContract(model) || resolveClaudeMythos5ModelIdentity(model) !== void 0 || usesClaudeSonnet5BedrockContract(model);
 }
 function readBedrockStopDetails(fields) {
 	if (!fields || typeof fields !== "object" || Array.isArray(fields)) return;
@@ -77,15 +70,14 @@ const streamBedrock = (model, context, options = {}) => {
 		const eventSink = refusalBuffer ?? stream;
 		const config = { profile: options.profile };
 		const configuredRegion = getConfiguredBedrockRegion(options);
-		const requestRegion = options.region || getBedrockModelArnRegion(model.id) || configuredRegion;
 		const hasConfiguredProfile = hasConfiguredBedrockProfile(options);
 		const endpointRegion = getStandardBedrockEndpointRegion(model.baseUrl);
-		const useExplicitEndpoint = shouldUseExplicitBedrockEndpoint(model.baseUrl, requestRegion, hasConfiguredProfile);
+		const useExplicitEndpoint = shouldUseExplicitBedrockEndpoint(model.baseUrl, configuredRegion, hasConfiguredProfile);
 		if (useExplicitEndpoint) config.endpoint = model.baseUrl;
 		const bearerToken = options.bearerToken || process.env.AWS_BEARER_TOKEN_BEDROCK || void 0;
 		const useBearerToken = bearerToken !== void 0 && process.env.AWS_BEDROCK_SKIP_AUTH !== "1";
 		if (typeof process !== "undefined" && (process.versions?.node || process.versions?.bun)) {
-			if (requestRegion) config.region = requestRegion;
+			if (configuredRegion) config.region = configuredRegion;
 			else if (endpointRegion && useExplicitEndpoint) config.region = endpointRegion;
 			else if (!hasConfiguredProfile) config.region = "us-east-1";
 			if (process.env.AWS_BEDROCK_SKIP_AUTH === "1") config.credentials = {
@@ -95,7 +87,7 @@ const streamBedrock = (model, context, options = {}) => {
 			const proxyAgents = createHttpProxyAgentsForTarget(model.baseUrl);
 			if (proxyAgents) config.requestHandler = new NodeHttpHandler(proxyAgents);
 			else if (process.env.AWS_BEDROCK_FORCE_HTTP1 === "1") config.requestHandler = new NodeHttpHandler();
-		} else config.region = requestRegion || (endpointRegion && useExplicitEndpoint ? endpointRegion : void 0) || "us-east-1";
+		} else config.region = configuredRegion || (endpointRegion && useExplicitEndpoint ? endpointRegion : void 0) || "us-east-1";
 		if (useBearerToken) {
 			config.token = { token: bearerToken };
 			config.authSchemePreference = ["httpBearerAuth"];
@@ -144,11 +136,7 @@ const streamBedrock = (model, context, options = {}) => {
 			else if (item.messageStop) {
 				sawMessageStop = true;
 				if (item.messageStop.stopReason === "refusal") applyAnthropicRefusal(output, readBedrockStopDetails(item.messageStop.additionalModelResponseFields), model.provider);
-				else {
-					const mappedStop = mapStopReason(item.messageStop.stopReason);
-					output.stopReason = mappedStop.stopReason;
-					if (mappedStop.errorMessage) output.errorMessage = mappedStop.errorMessage;
-				}
+				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;
@@ -214,10 +202,7 @@ function formatBedrockError(error) {
 /** Stream a Bedrock Converse request from the generic OpenClaw stream options. */
 const streamSimpleBedrock = (model, context, options) => streamBedrock(model, context, resolveSimpleBedrockOptions(model, options));
 function resolveSimpleBedrockOptions(model, options) {
-	const base = {
-		...options,
-		...buildBaseOptions(model, options, void 0)
-	};
+	const base = buildBaseOptions(model, options, void 0);
 	if (requiresMandatoryAdaptiveThinking(model)) return {
 		...base,
 		maxTokens: resolveAdaptiveBedrockMaxTokens(model, base.maxTokens),
@@ -225,7 +210,7 @@ function resolveSimpleBedrockOptions(model, options) {
 		thinkingBudgets: options?.thinkingBudgets
 	};
 	if (!options?.reasoning) {
-		const reasoning = usesClaudeOpus5BedrockContract(model) || isAnthropicClaudeModel(model) && requiresMandatoryAdaptiveThinking(model) ? "high" : void 0;
+		const reasoning = isAnthropicClaudeModel(model) && requiresMandatoryAdaptiveThinking(model) ? "high" : void 0;
 		return {
 			...base,
 			...reasoning !== void 0 ? { maxTokens: resolveAdaptiveBedrockMaxTokens(model, base.maxTokens) } : {},
@@ -299,7 +284,7 @@ function handleContentBlockDelta(event, blocks, output, stream) {
 			};
 			output.content.push(newBlock);
 			index = blocks.length - 1;
-			block = newBlock;
+			block = blocks[index];
 			stream.push({
 				type: "text_start",
 				contentIndex: index,
@@ -390,6 +375,7 @@ function handleContentBlockStop(event, blocks, output, stream) {
 			});
 			break;
 		case "toolCall":
+			block.arguments = parseStreamingJson(block.partialJson);
 			delete block.partialJson;
 			stream.push({
 				type: "toolcall_end",
@@ -397,13 +383,12 @@ function handleContentBlockStop(event, blocks, output, stream) {
 				toolCall: block,
 				partial: output
 			});
-			break;
 	}
 }
 function resolveClaudeProfileNameModelId(modelName) {
 	const normalized = modelName?.trim().toLowerCase().replace(/[\s_.:]+/g, "-") ?? "";
 	if (!normalized.includes("claude")) return;
-	const family = /(?:fable-5|mythos-(?:5|preview)|opus-(?:5|4-(?:6|7|8))|sonnet-(?:5|4-6))(?:$|-)/.exec(normalized)?.[0];
+	const family = /(?:fable-5|mythos-(?:5|preview)|opus-4-(?:6|7|8)|sonnet-(?:5|4-6))(?:$|-)/.exec(normalized)?.[0];
 	return family ? `claude-${family.replace(/-$/, "")}` : void 0;
 }
 function isClaudeMythosPreviewModelId(modelId) {
@@ -488,26 +473,11 @@ function normalizeToolCallId(id) {
 	const sanitized = id.replace(/[^a-zA-Z0-9_-]/g, "_");
 	return sanitized.length > 64 ? sanitized.slice(0, 64) : sanitized;
 }
-function createBedrockToolResult(message) {
-	const content = [];
-	for (const block of message.content) {
-		if (block.type === "text") {
-			content.push({ text: sanitizeSurrogates(block.text) });
-			continue;
-		}
-		if (describeToolResultMediaPlaceholder([block])) content.push({ image: createImageBlock(block.mimeType, block.data) });
-	}
-	return { toolResult: {
-		toolUseId: message.toolCallId,
-		content: content.length > 0 ? content : [{ text: "(no output)" }],
-		status: message.isError ? ToolResultStatus.ERROR : ToolResultStatus.SUCCESS
-	} };
-}
 function convertMessages(context, model, cacheRetention) {
 	const result = [];
 	const transformedMessages = transformMessages(context.messages, model, normalizeToolCallId);
 	for (let i = 0; i < transformedMessages.length; i++) {
-		const m = expectDefined(transformedMessages[i], "message conversion index is in bounds");
+		const m = transformedMessages[i];
 		switch (m.role) {
 			case "user": {
 				const content = [];
@@ -570,12 +540,19 @@ function convertMessages(context, model, cacheRetention) {
 			}
 			case "toolResult": {
 				const toolResults = [];
-				toolResults.push(createBedrockToolResult(m));
+				toolResults.push({ toolResult: {
+					toolUseId: m.toolCallId,
+					content: m.content.map((c) => c.type === "image" ? { image: createImageBlock(c.mimeType, c.data) } : { text: sanitizeSurrogates(c.text) }),
+					status: m.isError ? ToolResultStatus.ERROR : ToolResultStatus.SUCCESS
+				} });
 				let j = i + 1;
-				while (true) {
-					const nextMsg = transformedMessages.at(j);
-					if (nextMsg?.role !== "toolResult") break;
-					toolResults.push(createBedrockToolResult(nextMsg));
+				while (j < transformedMessages.length && transformedMessages[j].role === "toolResult") {
+					const nextMsg = transformedMessages[j];
+					toolResults.push({ toolResult: {
+						toolUseId: nextMsg.toolCallId,
+						content: nextMsg.content.map((c) => c.type === "image" ? { image: createImageBlock(c.mimeType, c.data) } : { text: sanitizeSurrogates(c.text) }),
+						status: nextMsg.isError ? ToolResultStatus.ERROR : ToolResultStatus.SUCCESS
+					} });
 					j++;
 				}
 				i = j - 1;
@@ -589,7 +566,7 @@ function convertMessages(context, model, cacheRetention) {
 		}
 	}
 	if (cacheRetention !== "none" && supportsPromptCaching(model) && result.length > 0) {
-		const lastMessage = expectDefined(result.at(-1), "non-empty converted message list");
+		const lastMessage = result[result.length - 1];
 		if (lastMessage.role === ConversationRole.USER && lastMessage.content) lastMessage.content.push({ cachePoint: {
 			type: CachePointType.DEFAULT,
 			...cacheRetention === "long" ? { ttl: CacheTTL.ONE_HOUR } : {}
@@ -622,29 +599,16 @@ function convertToolConfig(tools, toolChoice) {
 function mapStopReason(reason) {
 	switch (reason) {
 		case StopReason.END_TURN:
-		case StopReason.STOP_SEQUENCE: return { stopReason: "stop" };
+		case StopReason.STOP_SEQUENCE: return "stop";
 		case StopReason.MAX_TOKENS:
-		case StopReason.MODEL_CONTEXT_WINDOW_EXCEEDED: return { stopReason: "length" };
-		case StopReason.TOOL_USE: return { stopReason: "toolUse" };
-		case StopReason.CONTENT_FILTERED:
-		case StopReason.GUARDRAIL_INTERVENED:
-		case StopReason.MALFORMED_MODEL_OUTPUT:
-		case StopReason.MALFORMED_TOOL_USE: return {
-			stopReason: "error",
-			errorMessage: reason
-		};
-		default: return reason ? {
-			stopReason: "error",
-			errorMessage: reason
-		} : { stopReason: "error" };
+		case StopReason.MODEL_CONTEXT_WINDOW_EXCEEDED: return "length";
+		case StopReason.TOOL_USE: return "toolUse";
+		default: return "error";
 	}
 }
-function getBedrockModelArnRegion(modelId) {
-	return /^arn:aws(?:-[a-z0-9-]+)?:bedrock:([a-z0-9-]+):/.exec(modelId)?.[1];
-}
 function getConfiguredBedrockRegion(options) {
 	if (typeof process === "undefined") return options.region;
-	return options.region || normalizeOptionalString(process.env.AWS_REGION) || normalizeOptionalString(process.env.AWS_DEFAULT_REGION);
+	return options.region || process.env.AWS_REGION || process.env.AWS_DEFAULT_REGION || void 0;
 }
 function hasConfiguredBedrockProfile(options) {
 	if (options.profile) return true;
@@ -720,9 +684,7 @@ function createImageBlock(mimeType, data) {
 			break;
 		default: throw new Error(`Unknown image type: ${mimeType}`);
 	}
-	const canonicalBase64 = canonicalizeBase64(data);
-	if (!canonicalBase64) throw new Error("Amazon Bedrock image content has malformed base64");
-	const binaryString = atob(canonicalBase64);
+	const binaryString = atob(data);
 	const bytes = new Uint8Array(binaryString.length);
 	for (let i = 0; i < binaryString.length; i++) bytes[i] = binaryString.charCodeAt(i);
 	return {
@@ -740,6 +702,5 @@ const testing = {
 	resolveSimpleBedrockOptions,
 	shouldUseExplicitBedrockEndpoint
 };
-if (process.env.VITEST === "true") Reflect.set(globalThis, Symbol.for("openclaw.amazonBedrockStreamTestApi"), testing);
 //#endregion
-export { streamSimpleBedrock };
+export { streamBedrock, streamSimpleBedrock, testing };

package/dist/thinking-policy.js

@@ -1,4 +1,4 @@
-import { resolveClaudeFable5ModelIdentity, resolveClaudeModelIdentity, resolveClaudeMythos5ModelIdentity, resolveClaudeOpus5ModelIdentity, resolveClaudeSonnet5ModelIdentity } from "openclaw/plugin-sdk/provider-model-shared";
+import { resolveClaudeFable5ModelIdentity, resolveClaudeModelIdentity, resolveClaudeMythos5ModelIdentity, resolveClaudeSonnet5ModelIdentity } from "openclaw/plugin-sdk/provider-model-shared";
 //#region extensions/amazon-bedrock/thinking-policy.ts
 const BASE_CLAUDE_THINKING_LEVELS = [
 	{ id: "off" },
@@ -7,9 +7,6 @@ const BASE_CLAUDE_THINKING_LEVELS = [
 	{ id: "medium" },
 	{ id: "high" }
 ];
-function isOpus5BedrockModelRef(modelRef) {
-	return /(?:^|[/.:])(?:(?:us|eu|ap|apac|au|jp|global)\.)?(?:anthropic\.)?claude-opus-5(?:$|[-.:/])/i.test(modelRef);
-}
 function isOpus48BedrockModelRef(modelRef) {
 	return /(?:^|[/.:])(?:(?:us|eu|ap|apac|au|jp|global)\.)?(?:anthropic\.)?claude-opus-4[.-]8(?:$|[-.:/])/i.test(modelRef);
 }
@@ -22,7 +19,7 @@ function isOpus47BedrockModelRef(modelRef) {
 }
 /** Return whether a Bedrock model ref names Claude Opus 4.7 or newer. */
 function isOpus47OrNewerBedrockModelRef(modelRef) {
-	return isOpus5BedrockModelRef(modelRef) || isOpus47BedrockModelRef(modelRef) || isOpus48BedrockModelRef(modelRef);
+	return isOpus47BedrockModelRef(modelRef) || isOpus48BedrockModelRef(modelRef);
 }
 function isMythosPreviewBedrockModelRef(modelRef) {
 	return /(?:^|[/.:])(?:(?:us|eu|ap|apac|au|jp|global)\.)?(?:anthropic\.)?claude-mythos-preview(?:$|[-.:/])/i.test(modelRef);
@@ -34,7 +31,7 @@ function isLatestAdaptiveBedrockModelRef(modelId, params) {
 		params
 	};
 	const canonicalModelId = resolveClaudeModelIdentity(modelRef);
-	return resolveClaudeFable5ModelIdentity(modelRef) !== void 0 || resolveClaudeMythos5ModelIdentity(modelRef) !== void 0 || resolveClaudeOpus5ModelIdentity(modelRef) !== void 0 || resolveClaudeSonnet5ModelIdentity(modelRef) !== void 0 || [modelId, canonicalModelId].some((candidate) => isOpus47OrNewerBedrockModelRef(candidate) || isMythosPreviewBedrockModelRef(candidate));
+	return resolveClaudeFable5ModelIdentity(modelRef) !== void 0 || resolveClaudeMythos5ModelIdentity(modelRef) !== void 0 || resolveClaudeSonnet5ModelIdentity(modelRef) !== void 0 || [modelId, canonicalModelId].some((candidate) => isOpus47OrNewerBedrockModelRef(candidate) || isMythosPreviewBedrockModelRef(candidate));
 }
 /** Return whether a Bedrock Claude ref supports max effort. */
 function supportsBedrockNativeMaxEffort(modelId, params) {
@@ -44,9 +41,6 @@ function supportsBedrockNativeMaxEffort(modelId, params) {
 	}) || resolveClaudeMythos5ModelIdentity({
 		id: modelId,
 		params
-	}) || resolveClaudeOpus5ModelIdentity({
-		id: modelId,
-		params
 	}) || resolveClaudeSonnet5ModelIdentity({
 		id: modelId,
 		params
@@ -68,10 +62,6 @@ function resolveBedrockNativeThinkingLevelMap(modelId, params) {
 		xhigh: "xhigh",
 		max: "max"
 	};
-	if (resolveClaudeOpus5ModelIdentity(modelRef)) return {
-		xhigh: "xhigh",
-		max: "max"
-	};
 	if (resolveClaudeSonnet5ModelIdentity(modelRef)) return {
 		off: "low",
 		minimal: "low",
@@ -110,18 +100,6 @@ function resolveBedrockClaudeThinkingProfile(modelId, params) {
 		defaultLevel: "high",
 		preserveWhenCatalogReasoningFalse: true
 	};
-	if (resolveClaudeOpus5ModelIdentity({
-		id: trimmed,
-		params
-	})) return {
-		levels: [
-			...BASE_CLAUDE_THINKING_LEVELS,
-			{ id: "xhigh" },
-			{ id: "adaptive" },
-			{ id: "max" }
-		],
-		defaultLevel: "high"
-	};
 	if (modelRefs.some(isOpus48BedrockModelRef)) return {
 		levels: [
 			...BASE_CLAUDE_THINKING_LEVELS,

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.1089.0";
+var version = "3.1077.0";
 var packageInfo = {
 	version: version};
 

package/node_modules/@aws-sdk/client-bedrock/dist-types/runtimeConfig.d.ts

@@ -11,7 +11,7 @@ export declare const getRuntimeConfig: (config: BedrockClientConfig) => {
     defaultsMode: import("@smithy/types").Provider<import("@smithy/core/client").ResolvedDefaultsMode>;
     authSchemePreference: string[] | import("@smithy/types").Provider<string[]>;
     bodyLengthChecker: import("@smithy/types").BodyLengthCalculator;
-    credentialDefaultProvider: ((input: any) => import("@smithy/types").AwsCredentialIdentityProvider) | ((init?: import("@aws-sdk/credential-provider-node").DefaultProviderInit) => import("@aws-sdk/credential-provider-node").MemoizedRuntimeConfigAwsCredentialIdentityProvider);
+    credentialDefaultProvider: ((input: any) => import("@smithy/types").AwsCredentialIdentityProvider) | ((init?: import("@aws-sdk/credential-provider-node").DefaultProviderInit) => import("@aws-sdk/credential-provider-node/dist-types/runtime/memoize-chain").MemoizedRuntimeConfigAwsCredentialIdentityProvider);
     defaultUserAgentProvider: (config?: import("@aws-sdk/core/client").PreviouslyResolved) => Promise<import("@smithy/types").UserAgent>;
     httpAuthSchemes: import("@smithy/types").HttpAuthScheme[] | ({
         schemeId: string;