@openclaw/amazon-bedrock-provider 2026.8.1-beta.2 → 2026.8.1-beta.3

package/dist/api.js

@@ -1,3 +1,3 @@
 import { mergeImplicitBedrockProvider, resolveBedrockConfigApiKey } from "./discovery-shared.js";
-import { discoverBedrockModels, resetBedrockDiscoveryCacheForTest, resolveImplicitBedrockProvider } from "./discovery.js";
-export { discoverBedrockModels, mergeImplicitBedrockProvider, resetBedrockDiscoveryCacheForTest, resolveBedrockConfigApiKey, resolveImplicitBedrockProvider };
+import { discoverBedrockModels, resolveImplicitBedrockProvider } from "./discovery.js";
+export { discoverBedrockModels, mergeImplicitBedrockProvider, resolveBedrockConfigApiKey, resolveImplicitBedrockProvider };

package/dist/discovery.js

@@ -278,11 +278,6 @@ function resolveInferenceProfiles(profiles, defaults, providerFilter, foundation
 	}
 	return discovered;
 }
-/** Reset Bedrock discovery cache for tests. */
-function resetBedrockDiscoveryCacheForTest() {
-	discoveryCache.clear();
-	hasLoggedBedrockError = false;
-}
 /** Discover Bedrock models and inference profiles for one region/config. */
 async function discoverBedrockModels(params) {
 	const refreshIntervalSeconds = Math.max(0, Math.floor(params.config?.refreshInterval ?? DEFAULT_REFRESH_INTERVAL_SECONDS));
@@ -400,4 +395,4 @@ async function resolveImplicitBedrockProvider(params) {
 	};
 }
 //#endregion
-export { discoverBedrockModels, resetBedrockDiscoveryCacheForTest, resolveImplicitBedrockProvider };
+export { discoverBedrockModels, resolveImplicitBedrockProvider };

package/dist/register.sync.runtime.js

@@ -5,6 +5,7 @@ import { mergeImplicitBedrockProvider, resolveBedrockConfigApiKey } from "./disc
 import { bedrockMemoryEmbeddingProviderAdapter } from "./memory-embedding-adapter.js";
 import { isLatestAdaptiveBedrockModelRef, isOpus47OrNewerBedrockModelRef, resolveBedrockClaudeThinkingProfile, resolveBedrockNativeThinkingLevelMap, supportsBedrockNativeMaxEffort } from "./thinking-policy.js";
 import { streamSimpleBedrock } from "./stream.runtime.js";
+import { adaptMemoryEmbeddingProviderAdapter } from "openclaw/plugin-sdk/memory-core-host-engine-embeddings";
 import { resolvePluginConfigObject } from "openclaw/plugin-sdk/plugin-config-runtime";
 import { buildProviderReplayFamilyHooks, normalizeProviderId, resolveClaudeFable5ModelIdentity, resolveClaudeModelIdentity, resolveClaudeMythos5ModelIdentity, resolveClaudeOpus5ModelIdentity, resolveClaudeSonnet5ModelIdentity } from "openclaw/plugin-sdk/provider-model-shared";
 import { createPayloadPatchStreamWrapper } from "openclaw/plugin-sdk/provider-stream-shared";
@@ -215,7 +216,7 @@ function registerAmazonBedrockPlugin(api) {
 	function resolveCurrentPluginConfig(config) {
 		return resolvePluginConfigObject(config, providerId) ?? (config ? void 0 : startupPluginConfig);
 	}
-	api.registerMemoryEmbeddingProvider(bedrockMemoryEmbeddingProviderAdapter);
+	api.registerEmbeddingProvider(adaptMemoryEmbeddingProviderAdapter(bedrockMemoryEmbeddingProviderAdapter));
 	const baseWrapStreamFn = ({ modelId, model, streamFn }) => {
 		const modelRef = {
 			id: modelId,

package/dist/stream.runtime.js

@@ -2,13 +2,13 @@ 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 { applyAnthropicRefusal, createDeferredEventBuffer, notifyLlmRequestActivity } from "openclaw/plugin-sdk/provider-stream-shared";
-import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { isRecord, 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";
+import { describeToolResultMediaPlaceholder, finalizeTerminalToolCallArguments, notifyProviderHttpMetadata } from "openclaw/plugin-sdk/provider-transport-runtime";
 //#region extensions/amazon-bedrock/stream.runtime.ts
 /**
 * Amazon Bedrock Converse streaming runtime. It maps OpenClaw messages/tools,
@@ -72,6 +72,7 @@ const streamBedrock = (model, context, options = {}) => {
 			timestamp: Date.now()
 		};
 		const blocks = output.content;
+		const pendingToolCallEnds = [];
 		const redactedReasoningChunks = /* @__PURE__ */ new Map();
 		const fable5 = usesClaudeFable5BedrockContract(model);
 		const refusalBuffer = usesClaudeStreamingRefusalBedrockContract(model) ? createDeferredEventBuffer(stream, () => notifyLlmRequestActivity(options.signal)) : void 0;
@@ -125,16 +126,24 @@ const streamBedrock = (model, context, options = {}) => {
 			if (nextCommandInput !== void 0) commandInput = nextCommandInput;
 			const command = new ConverseStreamCommand(commandInput);
 			const response = await client.send(command, { abortSignal: options.signal });
+			const responseIterator = response.stream[Symbol.asyncIterator]();
 			if (response.$metadata.httpStatusCode !== void 0) {
 				const responseHeaders = {};
 				if (response.$metadata.requestId) responseHeaders["x-amzn-requestid"] = response.$metadata.requestId;
-				await options?.onResponse?.({
-					status: response.$metadata.httpStatusCode,
-					headers: responseHeaders
-				}, model);
+				await notifyProviderHttpMetadata({
+					options,
+					response: {
+						status: response.$metadata.httpStatusCode,
+						headers: responseHeaders
+					},
+					model,
+					cancelStream: async () => {
+						await responseIterator.return?.();
+					}
+				});
 			}
 			let sawMessageStop = false;
-			for await (const item of response.stream) if (item.messageStart) {
+			for await (const item of { [Symbol.asyncIterator]: () => responseIterator }) if (item.messageStart) {
 				if (item.messageStart.role !== ConversationRole.ASSISTANT) throw new Error("Unexpected assistant message start but got user message start instead");
 				eventSink.push({
 					type: "start",
@@ -142,7 +151,7 @@ const streamBedrock = (model, context, options = {}) => {
 				});
 			} else if (item.contentBlockStart) handleContentBlockStart(item.contentBlockStart, blocks, output, eventSink);
 			else if (item.contentBlockDelta) handleContentBlockDelta(item.contentBlockDelta, blocks, output, eventSink, redactedReasoningChunks);
-			else if (item.contentBlockStop) handleContentBlockStop(item.contentBlockStop, blocks, output, eventSink, redactedReasoningChunks);
+			else if (item.contentBlockStop) handleContentBlockStop(item.contentBlockStop, blocks, output, eventSink, redactedReasoningChunks, pendingToolCallEnds);
 			else if (item.messageStop) {
 				sawMessageStop = true;
 				if (item.messageStop.stopReason === "refusal") applyAnthropicRefusal(output, readBedrockStopDetails(item.messageStop.additionalModelResponseFields), model.provider);
@@ -160,7 +169,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) handleContentBlockStop({ contentBlockIndex: block.index }, blocks, output, eventSink, redactedReasoningChunks);
+			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);
 			refusalBuffer?.flush();
 			stream.push({
 				type: "done",
@@ -169,6 +179,7 @@ const streamBedrock = (model, context, options = {}) => {
 			});
 			stream.end();
 		} catch (error) {
+			output.content = output.content.filter((block) => block.type !== "toolCall");
 			for (const block of output.content) {
 				delete block.index;
 				delete block.partialJson;
@@ -274,11 +285,12 @@ function handleContentBlockStart(event, blocks, output, stream) {
 	const index = event.contentBlockIndex;
 	const start = event.start;
 	if (start?.toolUse) {
+		const startArguments = isRecord(start.toolUse) ? start.toolUse.input : void 0;
 		const block = {
 			type: "toolCall",
 			id: start.toolUse.toolUseId || "",
 			name: start.toolUse.name || "",
-			arguments: {},
+			arguments: isRecord(startArguments) ? startArguments : {},
 			partialJson: "",
 			index
 		};
@@ -387,13 +399,13 @@ function handleMetadata(event, model, output) {
 		calculateCost(model, output.usage);
 	}
 }
-function handleContentBlockStop(event, blocks, output, stream, redactedReasoningChunks) {
+function handleContentBlockStop(event, blocks, output, stream, redactedReasoningChunks, pendingToolCallEnds) {
 	const index = blocks.findIndex((b) => b.index === event.contentBlockIndex);
 	const block = blocks[index];
 	if (!block) return;
-	delete block.index;
 	switch (block.type) {
 		case "text":
+			delete block.index;
 			stream.push({
 				type: "text_end",
 				contentIndex: index,
@@ -402,6 +414,7 @@ function handleContentBlockStop(event, blocks, output, stream, redactedReasoning
 			});
 			break;
 		case "thinking":
+			delete block.index;
 			if (block.redacted) {
 				const chunks = redactedReasoningChunks.get(event.contentBlockIndex);
 				if (chunks) {
@@ -419,16 +432,27 @@ function handleContentBlockStop(event, blocks, output, stream, redactedReasoning
 			});
 			break;
 		case "toolCall":
-			delete block.partialJson;
-			stream.push({
-				type: "toolcall_end",
-				contentIndex: index,
-				toolCall: block,
-				partial: output
+			delete block.index;
+			pendingToolCallEnds.push({
+				block,
+				contentIndex: index
 			});
 			break;
 	}
 }
+function flushPendingBedrockToolCalls(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) {
+		delete toolCall.block.partialJson;
+		stream.push({
+			type: "toolcall_end",
+			contentIndex: toolCall.contentIndex,
+			toolCall: toolCall.block,
+			partial: output
+		});
+	}
+}
 function resolveClaudeProfileNameModelId(modelName) {
 	const normalized = modelName?.trim().toLowerCase().replace(/[\s_.:]+/g, "-") ?? "";
 	if (!normalized.includes("claude")) return;
@@ -639,7 +663,7 @@ function convertToolConfig(tools, toolChoice) {
 	const bedrockTools = tools.map((tool) => ({ toolSpec: {
 		name: tool.name,
 		description: tool.description,
-		inputSchema: { json: tool.parameters }
+		inputSchema: { json: { ...tool.parameters } }
 	} }));
 	let bedrockToolChoice;
 	switch (toolChoice) {

package/openclaw.plugin.json

@@ -13,7 +13,7 @@
     }
   },
   "contracts": {
-    "memoryEmbeddingProviders": ["bedrock"]
+    "embeddingProviders": ["bedrock"]
   },
   "configSchema": {
     "type": "object",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/amazon-bedrock-provider",
-  "version": "2026.8.1-beta.2",
+  "version": "2026.8.1-beta.3",
   "description": "OpenClaw Amazon Bedrock provider plugin with model discovery, embeddings, and guardrail support.",
   "repository": {
     "type": "git",
@@ -25,10 +25,10 @@
       "minHostVersion": ">=2026.5.12-beta.1"
     },
     "compat": {
-      "pluginApi": ">=2026.8.1-beta.2"
+      "pluginApi": ">=2026.8.1-beta.3"
     },
     "build": {
-      "openclawVersion": "2026.8.1-beta.2",
+      "openclawVersion": "2026.8.1-beta.3",
       "bundledDist": false
     },
     "release": {
@@ -45,7 +45,7 @@
     "README.md"
   ],
   "peerDependencies": {
-    "openclaw": ">=2026.8.1-beta.2"
+    "openclaw": ">=2026.8.1-beta.3"
   },
   "peerDependenciesMeta": {
     "openclaw": {