perf(plugins): reuse active web provider registry

src/plugins/web-provider-runtime-shared.test.ts

@@ -6,6 +6,7 @@ const mocks = vi.hoisted(() => ({
   resolveCompatibleRuntimePluginRegistry: vi.fn(),
   resolvePluginRegistryLoadCacheKey: vi.fn((options: unknown) => JSON.stringify(options)),
   resolveRuntimePluginRegistry: vi.fn(),
+  getActivePluginRegistry: vi.fn(() => null),
   getActivePluginRegistryWorkspaceDir: vi.fn(() => undefined),
   buildPluginRuntimeLoadOptionsFromValues: vi.fn(
     (_values: unknown, overrides?: Record<string, unknown>) => ({
@@ -29,6 +30,7 @@ vi.mock("./loader.js", () => ({
 }));
 
 vi.mock("./runtime.js", () => ({
+  getActivePluginRegistry: mocks.getActivePluginRegistry,
   getActivePluginRegistryWorkspaceDir: mocks.getActivePluginRegistryWorkspaceDir,
 }));
 
@@ -56,6 +58,8 @@ describe("web-provider-runtime-shared", () => {
       JSON.stringify(options),
     );
     mocks.resolveRuntimePluginRegistry.mockReset();
+    mocks.getActivePluginRegistry.mockReset();
+    mocks.getActivePluginRegistry.mockReturnValue(null);
     mocks.getActivePluginRegistryWorkspaceDir.mockReset();
     mocks.getActivePluginRegistryWorkspaceDir.mockReturnValue(undefined);
     mocks.buildPluginRuntimeLoadOptionsFromValues.mockReset();
@@ -156,4 +160,75 @@ describe("web-provider-runtime-shared", () => {
       }),
     );
   });
+
+  it("reuses the active registry after deriving web provider candidates from resolved config", () => {
+    const activeRegistry = { source: "active" };
+    const resolvedConfig = { plugins: { entries: { brave: { enabled: true } } } };
+    const resolveCandidatePluginIds = vi.fn(() => ["brave"]);
+    const mapRegistryProviders = vi.fn(() => ["provider"]);
+    mocks.resolveCompatibleRuntimePluginRegistry.mockReturnValue(null);
+    mocks.getActivePluginRegistry.mockReturnValue(activeRegistry);
+
+    const providers = resolvePluginWebProviders(
+      {
+        config: { plugins: { entries: {} } },
+        env: { BRAVE_API_KEY: "key" },
+        onlyPluginIds: ["brave", "firecrawl"],
+        origin: "bundled",
+        workspaceDir: "/workspace",
+      },
+      {
+        resolveBundledResolutionConfig: () => ({
+          config: resolvedConfig,
+          activationSourceConfig: { plugins: { entries: {} } },
+          autoEnabledReasons: { brave: ["env"] },
+        }),
+        resolveCandidatePluginIds,
+        mapRegistryProviders,
+      },
+    );
+
+    expect(providers).toEqual(["provider"]);
+    expect(resolveCandidatePluginIds).toHaveBeenCalledWith({
+      config: resolvedConfig,
+      workspaceDir: "/workspace",
+      env: { BRAVE_API_KEY: "key" },
+      onlyPluginIds: ["brave", "firecrawl"],
+      origin: "bundled",
+    });
+    expect(mapRegistryProviders).toHaveBeenCalledWith({
+      registry: activeRegistry,
+      onlyPluginIds: ["brave"],
+    });
+    expect(mocks.loadOpenClawPlugins).not.toHaveBeenCalled();
+  });
+
+  it("preserves explicit empty candidate scopes when reusing the active registry", () => {
+    const activeRegistry = { source: "active" };
+    const mapRegistryProviders = vi.fn(() => []);
+    mocks.resolveCompatibleRuntimePluginRegistry.mockReturnValue(null);
+    mocks.getActivePluginRegistry.mockReturnValue(activeRegistry);
+
+    resolvePluginWebProviders(
+      {
+        config: {},
+        onlyPluginIds: [],
+      },
+      {
+        resolveBundledResolutionConfig: () => ({
+          config: {},
+          activationSourceConfig: {},
+          autoEnabledReasons: {},
+        }),
+        resolveCandidatePluginIds: () => [],
+        mapRegistryProviders,
+      },
+    );
+
+    expect(mapRegistryProviders).toHaveBeenCalledWith({
+      registry: activeRegistry,
+      onlyPluginIds: [],
+    });
+    expect(mocks.loadOpenClawPlugins).not.toHaveBeenCalled();
+  });
 });

src/plugins/web-provider-runtime-shared.ts

@@ -9,7 +9,7 @@ import type { PluginLoadOptions } from "./loader.js";
 import type { PluginManifestRecord } from "./manifest-registry.js";
 import { hasExplicitPluginIdScope, normalizePluginIdScope } from "./plugin-scope.js";
 import type { PluginRegistry } from "./registry.js";
-import { getActivePluginRegistryWorkspaceDir } from "./runtime.js";
+import { getActivePluginRegistry, getActivePluginRegistryWorkspaceDir } from "./runtime.js";
 import {
   buildPluginRuntimeLoadOptionsFromValues,
   createPluginRuntimeLoaderLogger,
@@ -58,7 +58,7 @@ type ResolveWebProviderRuntimeDeps<TEntry> = {
   }) => TEntry[] | null;
 };
 
-function resolveWebProviderLoadOptions<TEntry>(
+function resolveWebProviderRuntimeContext<TEntry>(
   params: ResolvePluginWebProvidersParams,
   deps: ResolveWebProviderRuntimeDeps<TEntry>,
 ) {
@@ -79,19 +79,35 @@ function resolveWebProviderLoadOptions<TEntry>(
       origin: params.origin,
     }),
   );
+  return {
+    activationSourceConfig,
+    autoEnabledReasons,
+    config,
+    env,
+    onlyPluginIds,
+    workspaceDir,
+  };
+}
+
+function resolveWebProviderLoadOptions<TEntry>(
+  context: ReturnType<typeof resolveWebProviderRuntimeContext<TEntry>>,
+  params: ResolvePluginWebProvidersParams,
+) {
   return buildPluginRuntimeLoadOptionsFromValues(
     {
-      env,
-      config,
-      activationSourceConfig,
-      autoEnabledReasons,
-      workspaceDir,
+      env: context.env,
+      config: context.config,
+      activationSourceConfig: context.activationSourceConfig,
+      autoEnabledReasons: context.autoEnabledReasons,
+      workspaceDir: context.workspaceDir,
       logger: createPluginRuntimeLoaderLogger(),
     },
     {
       cache: params.cache ?? false,
       activate: params.activate ?? false,
-      ...(hasExplicitPluginIdScope(onlyPluginIds) ? { onlyPluginIds } : {}),
+      ...(hasExplicitPluginIdScope(context.onlyPluginIds)
+        ? { onlyPluginIds: context.onlyPluginIds }
+        : {}),
     },
   );
 }
@@ -149,20 +165,28 @@ export function resolvePluginWebProviders<TEntry>(
     return deps.mapRegistryProviders({ registry, onlyPluginIds: pluginIds });
   }
 
-  const loadOptions = resolveWebProviderLoadOptions(params, deps);
+  const context = resolveWebProviderRuntimeContext(params, deps);
+  const loadOptions = resolveWebProviderLoadOptions(context, params);
   const compatible = resolveCompatibleRuntimePluginRegistry(loadOptions);
   if (compatible) {
     return deps.mapRegistryProviders({
       registry: compatible,
-      onlyPluginIds: params.onlyPluginIds,
+      onlyPluginIds: context.onlyPluginIds,
     });
   }
   if (isPluginRegistryLoadInFlight(loadOptions)) {
     return [];
   }
+  const activeRegistry = getActivePluginRegistry();
+  if (activeRegistry) {
+    return deps.mapRegistryProviders({
+      registry: activeRegistry,
+      onlyPluginIds: context.onlyPluginIds,
+    });
+  }
   return deps.mapRegistryProviders({
     registry: loadOpenClawPlugins(loadOptions),
-    onlyPluginIds: params.onlyPluginIds,
+    onlyPluginIds: context.onlyPluginIds,
   });
 }
 
@@ -171,7 +195,9 @@ export function resolveRuntimeWebProviders<TEntry>(
   deps: ResolveWebProviderRuntimeDeps<TEntry>,
 ): TEntry[] {
   const loadOptions =
-    params.config === undefined ? undefined : resolveWebProviderLoadOptions(params, deps);
+    params.config === undefined
+      ? undefined
+      : resolveWebProviderLoadOptions(resolveWebProviderRuntimeContext(params, deps), params);
   const runtimeRegistry = resolveRuntimePluginRegistry(loadOptions);
   if (runtimeRegistry) {
     return deps.mapRegistryProviders({