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

package/README.md

@@ -5,7 +5,7 @@ Official OpenClaw provider plugin for Amazon Bedrock. It adds Bedrock model disc
 Install from OpenClaw:
 
 ```bash
-openclaw plugins install @openclaw/amazon-bedrock-provider
+openclaw plugin add @openclaw/amazon-bedrock-provider
 ```
 
 Configure AWS credentials and region through your normal OpenClaw credential/profile setup, then select Bedrock models with the `amazon-bedrock/...` provider prefix.

package/dist/aws-credential-refresh.js

@@ -1,8 +1,4 @@
 //#region extensions/amazon-bedrock/aws-credential-refresh.ts
-/**
-* AWS shared config cache refresh helpers for Bedrock. They nudge the AWS SDK
-* to re-read profile/SSO config when no static credentials are present.
-*/
 function hasStaticAwsCredentialEnv(env) {
 	return Boolean(env.AWS_ACCESS_KEY_ID && env.AWS_SECRET_ACCESS_KEY);
 }
@@ -11,11 +7,13 @@ function shouldRefreshAwsSharedConfigCacheForBedrock(env) {
 	if (env.AWS_BEDROCK_SKIP_AUTH === "1" || env.AWS_BEARER_TOKEN_BEDROCK) return false;
 	return !hasStaticAwsCredentialEnv(env);
 }
+async function loadSharedIniFileLoader() {
+	return await import("@smithy/shared-ini-file-loader");
+}
 /** Refresh Smithy shared config files when Bedrock needs default-chain credentials. */
 async function refreshAwsSharedConfigCacheForBedrock(env = process.env) {
 	if (!shouldRefreshAwsSharedConfigCacheForBedrock(env)) return;
-	const { loadSharedConfigFiles } = await import("@smithy/shared-ini-file-loader");
-	await loadSharedConfigFiles({ ignoreCache: true });
+	await (await loadSharedIniFileLoader()).loadSharedConfigFiles({ ignoreCache: true });
 }
 //#endregion
 export { refreshAwsSharedConfigCacheForBedrock };

package/dist/bedrock-options.js

@@ -13,7 +13,7 @@ function supportsBedrockPromptCaching(modelId, modelName) {
 		return false;
 	}
 	if (candidates.some((s) => s.includes("-4-"))) return true;
-	if (candidates.some((candidate) => candidate.includes("claude-fable-5") || candidate.includes("claude-mythos-5") || candidate.includes("claude-opus-5") || candidate.includes("claude-sonnet-5"))) return true;
+	if (candidates.some((candidate) => candidate.includes("claude-fable-5") || candidate.includes("claude-mythos-5") || candidate.includes("claude-sonnet-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,9 +1,8 @@
 import { refreshAwsSharedConfigCacheForBedrock } from "./aws-credential-refresh.js";
-import { loadBedrockControlPlaneSdk, runBedrockControlPlaneRequest } from "./control-plane.js";
 import { resolveBedrockConfigApiKey } from "./discovery-shared.js";
 import { resolveBedrockNativeThinkingLevelMap } from "./thinking-policy.js";
-import { resolveClaudeFable5ModelIdentity, resolveClaudeModelIdentity, resolveClaudeMythos5ModelIdentity, resolveClaudeOpus5ModelIdentity, resolveClaudeSonnet5ModelIdentity, supportsClaudeAdaptiveThinking } from "openclaw/plugin-sdk/provider-model-shared";
-import { normalizeLowercaseStringOrEmpty, normalizeOptionalLowercaseString, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { resolveClaudeFable5ModelIdentity, resolveClaudeModelIdentity, resolveClaudeMythos5ModelIdentity, resolveClaudeSonnet5ModelIdentity, 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";
 import { isFutureDateTimestampMs, resolveExpiresAtMsFromDurationSeconds } from "openclaw/plugin-sdk/number-runtime";
@@ -32,12 +31,13 @@ const KNOWN_CONTEXT_WINDOWS = {
 	"anthropic.claude-fable-5": 1e6,
 	"anthropic.claude-mythos-5": 1e6,
 	"anthropic.claude-sonnet-5": 1e6,
-	"anthropic.claude-opus-5": 1e6,
 	"anthropic.claude-3-7-sonnet-20250219-v1:0": 2e5,
 	"anthropic.claude-opus-4-8": 1e6,
 	"anthropic.claude-opus-4-7": 1e6,
 	"anthropic.claude-opus-4-6-v1": 1e6,
+	"anthropic.claude-opus-4-6-v1:0": 1e6,
 	"anthropic.claude-sonnet-4-6": 1e6,
+	"anthropic.claude-sonnet-4-6-v1:0": 1e6,
 	"anthropic.claude-sonnet-4-5-20250929-v1:0": 2e5,
 	"anthropic.claude-sonnet-4-20250514-v1:0": 2e5,
 	"anthropic.claude-opus-4-5-20251101-v1:0": 2e5,
@@ -94,7 +94,7 @@ 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 }) || resolveClaudeMythos5ModelIdentity({ id: candidate }) || resolveClaudeSonnet5ModelIdentity({ id: candidate }) || resolveClaudeOpus5ModelIdentity({ id: candidate })) return 1e6;
+		if (resolveClaudeFable5ModelIdentity({ id: candidate }) || resolveClaudeMythos5ModelIdentity({ id: candidate }) || resolveClaudeSonnet5ModelIdentity({ 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$/, "");
@@ -108,10 +108,10 @@ function resolveKnownThinkingLevelMap(modelId) {
 	return resolveBedrockNativeThinkingLevelMap(modelId);
 }
 function resolveKnownMaxTokens(modelId) {
-	return resolveClaudeFable5ModelIdentity({ id: modelId }) || resolveClaudeMythos5ModelIdentity({ id: modelId }) || resolveClaudeSonnet5ModelIdentity({ id: modelId }) || resolveClaudeOpus5ModelIdentity({ id: modelId }) ? 128e3 : void 0;
+	return resolveClaudeFable5ModelIdentity({ id: modelId }) || resolveClaudeMythos5ModelIdentity({ id: modelId }) || resolveClaudeSonnet5ModelIdentity({ id: modelId }) ? 128e3 : void 0;
 }
 function resolveKnownInput(modelId) {
-	return resolveClaudeFable5ModelIdentity({ id: modelId }) || resolveClaudeMythos5ModelIdentity({ id: modelId }) || resolveClaudeSonnet5ModelIdentity({ id: modelId }) || resolveClaudeOpus5ModelIdentity({ id: modelId }) ? ["text", "image"] : void 0;
+	return resolveClaudeFable5ModelIdentity({ id: modelId }) || resolveClaudeMythos5ModelIdentity({ id: modelId }) || resolveClaudeSonnet5ModelIdentity({ id: modelId }) ? ["text", "image"] : void 0;
 }
 const DEFAULT_COST = {
 	input: 0,
@@ -119,6 +119,33 @@ const DEFAULT_COST = {
 	cacheRead: 0,
 	cacheWrite: 0
 };
+async function loadBedrockDiscoverySdk() {
+	const { BedrockClient, ListFoundationModelsCommand, ListInferenceProfilesCommand } = await import("@aws-sdk/client-bedrock");
+	return {
+		createClient: (region) => new BedrockClient({ region }),
+		createListFoundationModelsCommand: () => new ListFoundationModelsCommand({}),
+		createListInferenceProfilesCommand: (input) => new ListInferenceProfilesCommand(input)
+	};
+}
+function createInjectedClientDiscoverySdk() {
+	class ListFoundationModelsCommand {
+		constructor(input = {}) {
+			this.input = input;
+		}
+	}
+	class ListInferenceProfilesCommand {
+		constructor(input = {}) {
+			this.input = input;
+		}
+	}
+	return {
+		createClient() {
+			throw new Error("clientFactory is required for injected Bedrock discovery commands");
+		},
+		createListFoundationModelsCommand: () => new ListFoundationModelsCommand({}),
+		createListInferenceProfilesCommand: (input) => new ListInferenceProfilesCommand(input)
+	};
+}
 const discoveryCache = /* @__PURE__ */ new Map();
 let hasLoggedBedrockError = false;
 function normalizeProviderFilter(filter) {
@@ -162,7 +189,8 @@ function resolveDefaultMaxTokens(config) {
 }
 function matchesProviderFilter(summary, filter) {
 	if (filter.length === 0) return true;
-	const normalized = normalizeOptionalLowercaseString(summary.providerName ?? (typeof summary.modelId === "string" ? summary.modelId.split(".")[0] : void 0));
+	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);
 }
@@ -221,11 +249,7 @@ async function fetchInferenceProfileSummaries(client, createListInferenceProfile
 		const profiles = [];
 		let nextToken;
 		do {
-			const command = createListInferenceProfilesCommand({ nextToken });
-			const response = await runBedrockControlPlaneRequest({
-				operation: "Bedrock ListInferenceProfiles",
-				send: (options) => client.send(command, options)
-			});
+			const response = await client.send(createListInferenceProfilesCommand({ nextToken }));
 			for (const summary of response.inferenceProfileSummaries ?? []) profiles.push(summary);
 			nextToken = response.nextToken;
 		} while (nextToken);
@@ -305,51 +329,44 @@ async function discoverBedrockModels(params) {
 		}
 		if (cached) discoveryCache.delete(cacheKey);
 	}
-	const sdk = await loadBedrockControlPlaneSdk();
+	const sdk = params.clientFactory ? createInjectedClientDiscoverySdk() : await loadBedrockDiscoverySdk();
 	const clientFactory = params.clientFactory ?? ((region) => sdk.createClient(region));
 	if (!params.clientFactory) await refreshAwsSharedConfigCacheForBedrock();
 	const client = clientFactory(params.region);
 	const discoveryPromise = (async () => {
-		try {
-			const foundationCommand = sdk.createListFoundationModelsCommand();
-			const [foundationResponse, profileSummaries] = await Promise.all([runBedrockControlPlaneRequest({
-				operation: "Bedrock ListFoundationModels",
-				send: (options) => client.send(foundationCommand, options)
-			}), fetchInferenceProfileSummaries(client, (input) => sdk.createListInferenceProfilesCommand(input))]);
-			const discovered = [];
-			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
-				});
-				discovered.push(def);
-				const normalizedId = normalizeLowercaseStringOrEmpty(def.id);
-				seenIds.add(normalizedId);
-				foundationModels.set(normalizedId, def);
-			}
-			const inferenceProfiles = resolveInferenceProfiles(profileSummaries, {
+		const [rawFoundationResponse, profileSummaries] = await Promise.all([client.send(sdk.createListFoundationModelsCommand()), fetchInferenceProfileSummaries(client, (input) => sdk.createListInferenceProfilesCommand(input))]);
+		const foundationResponse = rawFoundationResponse;
+		const discovered = [];
+		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
-			}, providerFilter, foundationModels);
-			for (const profile of inferenceProfiles) {
-				const normalizedId = normalizeLowercaseStringOrEmpty(profile.id);
-				if (!seenIds.has(normalizedId)) {
-					discovered.push(profile);
-					seenIds.add(normalizedId);
-				}
-			}
-			return discovered.toSorted((a, b) => {
-				const aGlobal = a.id.startsWith("global.") ? 0 : 1;
-				const bGlobal = b.id.startsWith("global.") ? 0 : 1;
-				if (aGlobal !== bGlobal) return aGlobal - bGlobal;
-				return a.name.localeCompare(b.name);
 			});
-		} finally {
-			client.destroy();
+			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);
+			if (!seenIds.has(normalizedId)) {
+				discovered.push(profile);
+				seenIds.add(normalizedId);
+			}
+		}
+		return discovered.toSorted((a, b) => {
+			const aGlobal = a.id.startsWith("global.") ? 0 : 1;
+			const bGlobal = b.id.startsWith("global.") ? 0 : 1;
+			if (aGlobal !== bGlobal) return aGlobal - bGlobal;
+			return a.name.localeCompare(b.name);
+		});
 	})();
 	if (refreshIntervalSeconds > 0) {
 		const expiresAt = resolveExpiresAtMsFromDurationSeconds(refreshIntervalSeconds, { nowMs: now });
@@ -385,7 +402,7 @@ async function resolveImplicitBedrockProvider(params) {
 	const hasAwsCreds = resolveBedrockConfigApiKey(env) !== void 0;
 	if (enabled === false) return null;
 	if (enabled !== true && !hasAwsCreds) return null;
-	const region = discoveryConfig?.region ?? normalizeOptionalString(env.AWS_REGION) ?? normalizeOptionalString(env.AWS_DEFAULT_REGION) ?? "us-east-1";
+	const region = discoveryConfig?.region ?? env.AWS_REGION ?? env.AWS_DEFAULT_REGION ?? "us-east-1";
 	const models = await discoverBedrockModels({
 		region,
 		config: discoveryConfig,

package/dist/embedding-provider.js

@@ -1,6 +1,6 @@
 import { refreshAwsSharedConfigCacheForBedrock } from "./aws-credential-refresh.js";
 import { debugEmbeddingsLog, sanitizeAndNormalizeEmbedding } from "openclaw/plugin-sdk/memory-core-host-engine-embeddings";
-import { asOptionalRecord, normalizeLowercaseStringOrEmpty, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { asOptionalRecord, normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/amazon-bedrock/embedding-provider.ts
 /**
 * Amazon Bedrock embedding provider runtime. It normalizes model-specific
@@ -104,18 +104,25 @@ function inferFamily(modelId) {
 	if (id.startsWith("twelvelabs.")) return "twelvelabs";
 	return "titan-v1";
 }
-let sdkPromise = null;
-let credentialProviderPromise = null;
+let sdkCache = null;
+let credentialProviderSdkCache;
 async function loadSdk() {
+	if (sdkCache) return sdkCache;
 	try {
-		return await (sdkPromise ??= import("@aws-sdk/client-bedrock-runtime"));
+		sdkCache = await import("@aws-sdk/client-bedrock-runtime");
+		return sdkCache;
 	} 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);
+async function loadCredentialProviderSdk() {
+	if (credentialProviderSdkCache !== void 0) return credentialProviderSdkCache;
+	try {
+		credentialProviderSdkCache = await import("@aws-sdk/credential-provider-node");
+	} catch {
+		credentialProviderSdkCache = null;
+	}
+	return credentialProviderSdkCache;
 }
 const MODEL_PREFIX_RE = /^(?:bedrock|amazon-bedrock|aws)\//;
 const REGION_RE = /bedrock-runtime\.([a-z0-9-]+)\./;
@@ -216,7 +223,6 @@ const testing = {
 	parseSingle,
 	stripInferenceProfilePrefix
 };
-if (process.env.VITEST === "true") Reflect.set(globalThis, Symbol.for("openclaw.amazonBedrockEmbeddingTestApi"), testing);
 async function createBedrockEmbeddingProvider(options) {
 	const client = resolveBedrockEmbeddingClient(options);
 	const { BedrockRuntimeClient, InvokeModelCommand } = await loadSdk();
@@ -277,7 +283,7 @@ function resolveBedrockEmbeddingClient(options) {
 	const model = normalizeBedrockEmbeddingModel(options.model);
 	const spec = resolveSpec(model);
 	const providerConfig = options.config.models?.providers?.["amazon-bedrock"];
-	const region = regionFromUrl(options.remote?.baseUrl) ?? regionFromUrl(providerConfig?.baseUrl) ?? normalizeOptionalString(process.env.AWS_REGION) ?? normalizeOptionalString(process.env.AWS_DEFAULT_REGION) ?? "us-east-1";
+	const region = regionFromUrl(options.remote?.baseUrl) ?? regionFromUrl(providerConfig?.baseUrl) ?? process.env.AWS_REGION ?? process.env.AWS_DEFAULT_REGION ?? "us-east-1";
 	let dimensions;
 	if (options.outputDimensionality != null) {
 		if (spec?.validDims && !spec.validDims.includes(options.outputDimensionality)) throw new Error(`Invalid dimensions ${options.outputDimensionality} for ${model}. Valid values: ${spec.validDims.join(", ")}`);
@@ -289,13 +295,13 @@ function resolveBedrockEmbeddingClient(options) {
 		dimensions
 	};
 }
-async function hasAwsCredentials(env = process.env, loadCredentialProvider = loadDefaultCredentialProvider) {
+async function hasAwsCredentials(env = process.env, loadCredentialProvider = loadCredentialProviderSdk) {
 	if (env.AWS_ACCESS_KEY_ID?.trim() && env.AWS_SECRET_ACCESS_KEY?.trim()) return true;
 	if (env.AWS_BEARER_TOKEN_BEDROCK?.trim()) return true;
-	const defaultProvider = await loadCredentialProvider();
-	if (!defaultProvider) return false;
+	const credentialProviderSdk = await loadCredentialProvider();
+	if (!credentialProviderSdk) return false;
 	try {
-		const credentials = await defaultProvider({
+		const credentials = await credentialProviderSdk.defaultProvider({
 			timeout: 1e3,
 			maxRetries: 0
 		})();
@@ -305,4 +311,4 @@ async function hasAwsCredentials(env = process.env, loadCredentialProvider = loa
 	}
 }
 //#endregion
-export { DEFAULT_BEDROCK_EMBEDDING_MODEL, createBedrockEmbeddingProvider, hasAwsCredentials };
+export { DEFAULT_BEDROCK_EMBEDDING_MODEL, testing as __testing, testing, createBedrockEmbeddingProvider, hasAwsCredentials };

package/dist/memory-embedding-adapter.js

@@ -15,7 +15,7 @@ const bedrockMemoryEmbeddingProviderAdapter = {
 	allowExplicitWhenConfiguredAuto: true,
 	shouldContinueAutoSelection: isMissingEmbeddingApiKeyError,
 	create: async (options) => {
-		if (!await hasAwsCredentials()) throw new Error("No API key found for provider \"bedrock\". AWS credentials are not available. Set AWS_ACCESS_KEY_ID/AWS_SECRET_ACCESS_KEY, AWS_PROFILE, or AWS_BEARER_TOKEN_BEDROCK, configure an EC2/ECS/EKS role, or set memory.search.provider to another provider.");
+		if (!await hasAwsCredentials()) throw new Error("No API key found for provider \"bedrock\". AWS credentials are not available. Set AWS_ACCESS_KEY_ID/AWS_SECRET_ACCESS_KEY, AWS_PROFILE, or AWS_BEARER_TOKEN_BEDROCK, configure an EC2/ECS/EKS role, or set agents.defaults.memorySearch.provider to another provider.");
 		const { provider, client } = await createBedrockEmbeddingProvider({
 			...options,
 			provider: "bedrock",

package/dist/register.sync.runtime.js

@@ -1,12 +1,12 @@
 import { refreshAwsSharedConfigCacheForBedrock } from "./aws-credential-refresh.js";
 import { supportsBedrockPromptCaching } from "./bedrock-options.js";
-import { loadBedrockControlPlaneSdk, runBedrockControlPlaneRequest } from "./control-plane.js";
 import { mergeImplicitBedrockProvider, resolveBedrockConfigApiKey } from "./discovery-shared.js";
 import { bedrockMemoryEmbeddingProviderAdapter } from "./memory-embedding-adapter.js";
 import { isLatestAdaptiveBedrockModelRef, isOpus47OrNewerBedrockModelRef, resolveBedrockClaudeThinkingProfile, resolveBedrockNativeThinkingLevelMap, supportsBedrockNativeMaxEffort } from "./thinking-policy.js";
-import { streamSimpleBedrock } from "./stream.runtime.js";
+import { streamBedrock, streamSimpleBedrock } from "./stream.runtime.js";
+import { registerApiProvider, streamSimple } from "openclaw/plugin-sdk/llm";
 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 { ANTHROPIC_BY_MODEL_REPLAY_HOOKS, normalizeProviderId, resolveClaudeFable5ModelIdentity, resolveClaudeModelIdentity, resolveClaudeMythos5ModelIdentity, resolveClaudeSonnet5ModelIdentity } 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 }) {
@@ -18,9 +18,6 @@ function normalizeBedrockResolvedModel({ modelId, model }) {
 	}) !== void 0 || resolveClaudeMythos5ModelIdentity({
 		id: modelId,
 		params: model.params
-	}) !== void 0 || resolveClaudeOpus5ModelIdentity({
-		id: modelId,
-		params: model.params
 	}) !== void 0;
 	const current = model.thinkingLevelMap;
 	const currentEfforts = current;
@@ -46,12 +43,8 @@ function isAnthropicBedrockModel(modelId) {
 	if (/^arn:aws(-cn|-us-gov)?:bedrock:/.test(normalized) && normalized.includes(":application-inference-profile/")) return (normalized.split(":application-inference-profile/")[1] ?? "").includes("claude");
 	return false;
 }
-const bedrockStreamFn = (model, context, options) => {
-	if (model.api !== "bedrock-converse-stream") throw new Error(`Amazon Bedrock stream received unsupported API: ${model.api}`);
-	return streamSimpleBedrock(model, context, options);
-};
 function createBedrockNoCacheWrapper(baseStreamFn) {
-	const underlying = baseStreamFn ?? bedrockStreamFn;
+	const underlying = baseStreamFn ?? streamSimple;
 	return (model, context, options) => underlying(model, context, {
 		...options,
 		cacheRetention: "none"
@@ -136,24 +129,18 @@ function resolvedModelSupportsCaching(modelArn) {
 	return supportsBedrockPromptCaching(modelArn);
 }
 const appProfileTraitsCache = /* @__PURE__ */ new Map();
-async function resolveAppProfileTraits(modelId, fallbackRegion, signal) {
+async function createBedrockControlPlane(region) {
+	await refreshAwsSharedConfigCacheForBedrock();
+	const { BedrockClient, GetInferenceProfileCommand } = await import("@aws-sdk/client-bedrock");
+	const client = new BedrockClient(region ? { region } : {});
+	return { getInferenceProfile: async (input) => await client.send(new GetInferenceProfileCommand(input)) };
+}
+async function resolveAppProfileTraits(modelId, fallbackRegion) {
 	const cached = appProfileTraitsCache.get(modelId);
 	if (cached) return cached;
-	let client;
 	try {
-		signal?.throwIfAborted();
-		const region = extractRegionFromArn(modelId) ?? fallbackRegion;
-		const sdk = await loadBedrockControlPlaneSdk();
-		signal?.throwIfAborted();
-		const controlPlaneClient = sdk.createClient(region);
-		client = controlPlaneClient;
-		const command = sdk.createGetInferenceProfileCommand({ inferenceProfileIdentifier: modelId });
-		const models = (await runBedrockControlPlaneRequest({
-			operation: "Bedrock GetInferenceProfile",
-			signal,
-			send: (options) => controlPlaneClient.send(command, options)
-		})).models ?? [];
-		const modelArns = models.map((model) => model.modelArn ?? "");
+		const models = (await (await createBedrockControlPlane(extractRegionFromArn(modelId) ?? fallbackRegion)).getInferenceProfile({ inferenceProfileIdentifier: modelId })).models ?? [];
+		const modelArns = models.map((m) => m.modelArn ?? "");
 		const traits = {
 			cacheEligible: models.length > 0 && modelArns.every((modelArn) => resolvedModelSupportsCaching(modelArn)),
 			omitTemperature: modelArns.some(isOpus47OrNewerBedrockModelRef)
@@ -161,13 +148,10 @@ async function resolveAppProfileTraits(modelId, fallbackRegion, signal) {
 		appProfileTraitsCache.set(modelId, traits);
 		return traits;
 	} catch {
-		signal?.throwIfAborted();
 		return {
 			cacheEligible: isAnthropicBedrockModel(modelId),
 			omitTemperature: isOpus47OrNewerBedrockModelRef(modelId)
 		};
-	} finally {
-		client?.destroy();
 	}
 }
 function hasCachePoint(blocks) {
@@ -189,8 +173,9 @@ function injectBedrockCachePoints(payload, cacheRetention) {
 	const system = payload.system;
 	if (Array.isArray(system) && system.length > 0 && !hasCachePoint(system)) system.push(point);
 	const messages = payload.messages;
-	if (Array.isArray(messages) && messages.length > 0) {
-		for (const msg of messages.toReversed()) if (msg.role === "user" && Array.isArray(msg.content)) {
+	if (Array.isArray(messages) && messages.length > 0) for (let i = messages.length - 1; i >= 0; i--) {
+		const msg = messages[i];
+		if (msg.role === "user" && Array.isArray(msg.content)) {
 			if (!hasCachePoint(msg.content)) msg.content.push(point);
 			break;
 		}
@@ -215,8 +200,13 @@ function registerAmazonBedrockPlugin(api) {
 		/ModelStreamErrorException.*(?:Input is too long|too many input tokens)/i
 	];
 	const deprecatedTemperatureValidationRe = /ValidationException[\s\S]*(?:invalid_request_error[\s\S]*)?temperature[\s\S]*deprecated|ValidationException[\s\S]*deprecated[\s\S]*temperature/i;
-	const anthropicByModelReplayHooks = buildProviderReplayFamilyHooks({ family: "anthropic-by-model" });
+	const anthropicByModelReplayHooks = ANTHROPIC_BY_MODEL_REPLAY_HOOKS;
 	const startupPluginConfig = api.pluginConfig ?? {};
+	registerApiProvider({
+		api: "bedrock-converse-stream",
+		stream: streamBedrock,
+		streamSimple: streamSimpleBedrock
+	}, `plugin:${providerId}`);
 	function resolveCurrentPluginConfig(config) {
 		return resolvePluginConfigObject(config, providerId) ?? (config ? void 0 : startupPluginConfig);
 	}
@@ -247,10 +237,7 @@ function registerAmazonBedrockPlugin(api) {
 		return {
 			...options,
 			onPayload: async (payload, payloadModel) => {
-				const signal = options.signal;
-				signal?.throwIfAborted();
 				await refreshAwsSharedConfigCacheForBedrock();
-				signal?.throwIfAborted();
 				return originalOnPayload?.(payload, payloadModel);
 			}
 		};
@@ -302,7 +289,6 @@ function registerAmazonBedrockPlugin(api) {
 		},
 		resolveConfigApiKey: ({ env }) => resolveBedrockConfigApiKey(env),
 		normalizeResolvedModel: normalizeBedrockResolvedModel,
-		createStreamFn: ({ model }) => model.api === "bedrock-converse-stream" ? bedrockStreamFn : void 0,
 		...anthropicByModelReplayHooks,
 		wrapStreamFn: ({ modelId, config, model, streamFn, thinkingLevel, extraParams }) => {
 			const currentPluginConfig = resolveCurrentPluginConfig(config);
@@ -312,7 +298,6 @@ function registerAmazonBedrockPlugin(api) {
 				params: model?.params
 			};
 			const fable5 = resolveClaudeFable5ModelIdentity(modelRef) !== void 0;
-			const opus5 = resolveClaudeOpus5ModelIdentity(modelRef) !== void 0;
 			const sonnet5 = resolveClaudeSonnet5ModelIdentity(modelRef) !== void 0;
 			const canonicalModelId = resolveClaudeModelIdentity(modelRef);
 			const opus47OrNewer = isOpus47OrNewerBedrockModelRef(modelId) || isOpus47OrNewerBedrockModelRef(canonicalModelId);
@@ -327,10 +312,12 @@ function registerAmazonBedrockPlugin(api) {
 				streamFn
 			})) ?? void 0;
 			const serviceTier = resolveBedrockServiceTier(extraParams, (message) => api.logger.warn(message));
-			if (serviceTier && wrapped) if ((fable5 || opus5 || sonnet5) && serviceTier !== "default") {
-				const modelLabel = fable5 ? "Fable 5" : opus5 ? "Opus 5" : "Sonnet 5";
-				api.logger.warn(`ignoring unsupported ${modelLabel} Bedrock service tier: ${serviceTier}`);
-			} else wrapped = createBedrockServiceTierWrapper(wrapped, serviceTier);
+			if (serviceTier && wrapped) {
+				if ((fable5 || sonnet5) && serviceTier !== "default") {
+					const modelLabel = fable5 ? "Fable 5" : "Sonnet 5";
+					api.logger.warn(`ignoring unsupported ${modelLabel} 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 = opus47OrNewer || fable5 || isLatestAdaptiveBedrockModelRef(modelId, model?.params);
@@ -366,7 +353,7 @@ function registerAmazonBedrockPlugin(api) {
 								if (shouldPatchMaxThinking) patchMaxThinkingEffort(payloadRecord);
 								if (shouldOmitTemperature) omitUnsupportedClaudePayloadTemperature(payloadRecord);
 								else if (mayNeedTemperatureTrait) {
-									if ((await resolveAppProfileTraits(modelId, region, merged.signal)).omitTemperature) omitUnsupportedClaudePayloadTemperature(payloadRecord);
+									if ((await resolveAppProfileTraits(modelId, region)).omitTemperature) omitUnsupportedClaudePayloadTemperature(payloadRecord);
 								}
 							}
 							return originalOnPayload?.(payload, payloadModel);
@@ -376,7 +363,7 @@ function registerAmazonBedrockPlugin(api) {
 				return underlying(streamModel, context, withAwsCredentialRefreshOnPayload({
 					...merged,
 					onPayload: async (payload, payloadModel) => {
-						const traits = await resolveAppProfileTraits(modelId, region, merged.signal);
+						const traits = await resolveAppProfileTraits(modelId, region);
 						if (payload && typeof payload === "object") {
 							const payloadRecord = payload;
 							if (traits.cacheEligible) injectBedrockCachePoints(payloadRecord, cacheRetention);