fix: keep Bedrock live smoke on Bedrock runtime (#99607)

brian-bell · openclaw-clownfish[bot] · web-flow · commit bacb33a90912 · 2026-07-06T08:19:42.000-07:00
* fix: preserve Bedrock live API providers

* fix: derive Bedrock smoke region from AWS config

* fix: honor Bedrock discovery region in smoke

* fix: keep Bedrock live smoke on Bedrock runtime

---------

Co-authored-by: openclaw-clownfish[bot] &lt;280122609+openclaw-clownfish[bot]@users.noreply.github.com&gt;
diff --git a/packages/ai/src/api-registry.test.ts b/packages/ai/src/api-registry.test.ts
@@ -1,11 +1,16 @@
 // LLM Runtime tests cover api registry behavior.
-import { describe, expect, it, vi } from "vitest";
+import { afterEach, describe, expect, it, vi } from "vitest";
 import {
   createApiRegistry,
   createAssistantMessageEventStream,
   createLlmRuntime,
   type Model,
 } from "./index.js";
+import {
+  getApiProvider,
+  streamSimple as streamSimpleDefault,
+  unregisterApiProviders,
+} from "./internal/default-runtime.js";
 
 const TEST_SOURCE_ID = "test:llm-runtime-api-registry";
 const emptyStream = () => createAssistantMessageEventStream();
@@ -24,6 +29,10 @@ const model = {
 } satisfies Model;
 
 describe("LLM API registry", () => {
+  afterEach(() => {
+    unregisterApiProviders(TEST_SOURCE_ID);
+  });
+
   it("rejects mismatched model API calls", () => {
     const registry = createApiRegistry();
     registry.registerApiProvider(
@@ -56,6 +65,27 @@ describe("LLM API registry", () => {
     );
   });
 
+  it("shares default runtime registrations across duplicated module instances", async () => {
+    const duplicateRuntime = (await import(
+      ["./internal/default-runtime.js", "duplicate-runtime"].join("?")
+    )) as typeof import("./internal/default-runtime.js");
+    const streamSimple = vi.fn(emptyStream);
+    duplicateRuntime.registerApiProvider(
+      {
+        api: "test-api",
+        stream: emptyStream,
+        streamSimple,
+      },
+      TEST_SOURCE_ID,
+    );
+
+    expect(getApiProvider("test-api")).toBeDefined();
+
+    streamSimpleDefault(model, { messages: [] });
+
+    expect(streamSimple).toHaveBeenCalledOnce();
+  });
+
   it("unregisters every provider owned by one source", () => {
     const registry = createApiRegistry();
     for (const api of ["test-api", "test-api-2"] as const) {
diff --git a/packages/ai/src/internal/default-runtime.ts b/packages/ai/src/internal/default-runtime.ts
@@ -2,11 +2,32 @@
 // facade (src/llm). Deliberately not part of the public package API: external
 // consumers create isolated runtimes via createLlmRuntime(); exporting these
 // from the root barrel would reintroduce the mutable process-global registry.
-import { createApiRegistry } from "../api-registry.js";
-import { createLlmRuntime } from "../stream.js";
+import { createApiRegistry, type ApiRegistry } from "../api-registry.js";
+import { createLlmRuntime, type LlmRuntime } from "../stream.js";
 
-export const defaultApiRegistry = createApiRegistry();
-export const defaultLlmRuntime = createLlmRuntime(defaultApiRegistry);
+type DefaultRuntimeState = {
+  registry: ApiRegistry;
+  runtime: LlmRuntime;
+};
+
+const DEFAULT_RUNTIME_KEY = Symbol.for("openclaw.ai.defaultRuntime");
+
+function resolveDefaultRuntime(): DefaultRuntimeState {
+  const globalStore = globalThis as Record<PropertyKey, unknown>;
+  if (Object.hasOwn(globalStore, DEFAULT_RUNTIME_KEY)) {
+    return globalStore[DEFAULT_RUNTIME_KEY] as DefaultRuntimeState;
+  }
+  const registry = createApiRegistry();
+  const runtime = createLlmRuntime(registry);
+  const state = { registry, runtime };
+  globalStore[DEFAULT_RUNTIME_KEY] = state;
+  return state;
+}
+
+const defaultRuntime = resolveDefaultRuntime();
+
+export const defaultApiRegistry = defaultRuntime.registry;
+export const defaultLlmRuntime = defaultRuntime.runtime;
 
 export const {
   registerApiProvider,
diff --git a/src/gateway/gateway-models.profiles.live.test.ts b/src/gateway/gateway-models.profiles.live.test.ts
