perf(gateway): thread discovery into applyPluginAutoEnable call sites

RomneyDa · RomneyDa · commit f16042590fc6 · 2026-05-24T13:28:43.000-07:00
Every gateway applyPluginAutoEnable call now passes the snapshot's
PluginDiscoveryResult so the bundled-channel cascade (collectConfiguredChannelIds
→ listBundledChannelIdsWith* → listPotentialConfiguredChannelPresenceSignals)
short-circuits instead of each leaf re-firing discovery.

Startup-time sites pull discovery from the snapshot/lookup-table they already
hold:
- server-plugin-bootstrap.ts (pluginLookUpTable)
- server-startup-plugins.ts (pluginMetadataSnapshot)
- server-startup-config.ts (pluginMetadataSnapshot)
- server-plugins.ts (pluginLookUpTable, both call sites)

Per-RPC sites (server.impl getRuntimeConfig callback, server-methods/channels
status + start handlers, server-methods/send) source discovery via
getCurrentPluginMetadataSnapshot using the runtime config to validate
compatibility. Falls through to the original slow path when the snapshot is
absent or incompatible.
diff --git a/src/gateway/server-methods/channels.ts b/src/gateway/server-methods/channels.ts
@@ -13,6 +13,7 @@ import { readConfigFileSnapshot } from "../../config/config.js";
 import { applyPluginAutoEnable } from "../../config/plugin-auto-enable.js";
 import type { OpenClawConfig } from "../../config/types.openclaw.js";
 import { getChannelActivity } from "../../infra/channel-activity.js";
+import { getCurrentPluginMetadataSnapshot } from "../../plugins/current-plugin-metadata-snapshot.js";
 import { DEFAULT_ACCOUNT_ID } from "../../routing/session-key.js";
 import { defaultRuntime } from "../../runtime.js";
 import { normalizeOptionalString } from "../../shared/string-coerce.js";
@@ -301,9 +302,16 @@ export const channelsHandlers: GatewayRequestHandlers = {
     const rawChannel = (params as { channel?: unknown }).channel;
     const requestedChannel =
       typeof rawChannel === "string" ? normalizeChannelId(rawChannel) : undefined;
+    const runtimeConfig = context.getRuntimeConfig();
+    const currentSnapshot = getCurrentPluginMetadataSnapshot({
+      config: runtimeConfig,
+      env: process.env,
+    });
     const cfg = applyPluginAutoEnable({
-      config: context.getRuntimeConfig(),
+      config: runtimeConfig,
       env: process.env,
+      manifestRegistry: currentSnapshot?.manifestRegistry,
+      discovery: currentSnapshot?.discovery,
     }).config;
     const runtime = context.getRuntimeSnapshot();
     const plugins = listChannelPlugins();
@@ -579,9 +587,16 @@ export const channelsHandlers: GatewayRequestHandlers = {
       return;
     }
     try {
+      const runtimeConfig = context.getRuntimeConfig();
+      const currentSnapshot = getCurrentPluginMetadataSnapshot({
+        config: runtimeConfig,
+        env: process.env,
+      });
       const cfg = applyPluginAutoEnable({
-        config: context.getRuntimeConfig(),
+        config: runtimeConfig,
         env: process.env,
+        manifestRegistry: currentSnapshot?.manifestRegistry,
+        discovery: currentSnapshot?.discovery,
       }).config;
       const payload = await startChannelAccount({
         channelId,
diff --git a/src/gateway/server-methods/send.ts b/src/gateway/server-methods/send.ts
@@ -21,6 +21,7 @@ import { maybeResolveIdLikeTarget } from "../../infra/outbound/target-resolver.j
 import { resolveOutboundTarget } from "../../infra/outbound/targets.js";
 import { extractToolPayload } from "../../infra/outbound/tool-payload.js";
 import { getAgentScopedMediaLocalRoots } from "../../media/local-roots.js";
+import { getCurrentPluginMetadataSnapshot } from "../../plugins/current-plugin-metadata-snapshot.js";
 import { normalizePollInput } from "../../polls.js";
 import { parseThreadSessionSuffix } from "../../sessions/session-key-utils.js";
 import {
@@ -131,9 +132,16 @@ async function resolveRequestedChannel(params: {
       error: errorShape(ErrorCodes.INVALID_REQUEST, params.unsupportedMessage(channelInput)),
     };
   }
+  const runtimeConfig = params.context.getRuntimeConfig();
+  const currentSnapshot = getCurrentPluginMetadataSnapshot({
+    config: runtimeConfig,
+    env: process.env,
+  });
   const cfg = applyPluginAutoEnable({
-    config: params.context.getRuntimeConfig(),
+    config: runtimeConfig,
     env: process.env,
+    manifestRegistry: currentSnapshot?.manifestRegistry,
+    discovery: currentSnapshot?.discovery,
   }).config;
   let channel = normalizedChannel;
   if (!channel) {
diff --git a/src/gateway/server-plugin-bootstrap.ts b/src/gateway/server-plugin-bootstrap.ts
@@ -83,6 +83,7 @@ export function prepareGatewayPluginLoad(params: GatewayPluginBootstrapParams) {
     ...(params.pluginLookUpTable?.manifestRegistry
       ? { manifestRegistry: params.pluginLookUpTable.manifestRegistry }
       : {}),
+    discovery: params.pluginLookUpTable?.discovery,
   });
   const resolvedConfig =
     activationSourceConfig === params.cfg
diff --git a/src/gateway/server-plugins.ts b/src/gateway/server-plugins.ts
@@ -636,6 +636,7 @@ export function loadGatewayPlugins(params: {
           ...(params.pluginLookUpTable?.manifestRegistry
             ? { manifestRegistry: params.pluginLookUpTable.manifestRegistry }
             : {}),
+          discovery: params.pluginLookUpTable?.discovery,
         })
       : undefined;
   const autoEnableMs = performance.now() - started;
@@ -659,6 +660,7 @@ export function loadGatewayPlugins(params: {
             ...(params.pluginLookUpTable?.manifestRegistry
               ? { manifestRegistry: params.pluginLookUpTable.manifestRegistry }
               : {}),
+            discovery: params.pluginLookUpTable?.discovery,
           });
   const resolvedConfigMs = performance.now() - started;
   const resolvedConfig = autoEnabled.config;
diff --git a/src/gateway/server-startup-config.ts b/src/gateway/server-startup-config.ts
@@ -125,6 +125,7 @@ export async function loadGatewayStartupConfigSnapshot(params: {
           ...(pluginMetadataSnapshot?.manifestRegistry
             ? { manifestRegistry: pluginMetadataSnapshot.manifestRegistry }
             : {}),
+          discovery: pluginMetadataSnapshot?.discovery,
         }),
       );
   if (autoEnable.changes.length === 0) {
diff --git a/src/gateway/server-startup-plugins.ts b/src/gateway/server-startup-plugins.ts
@@ -87,6 +87,7 @@ export async function prepareGatewayPluginBootstrap(params: {
           ...(params.pluginMetadataSnapshot?.manifestRegistry
             ? { manifestRegistry: params.pluginMetadataSnapshot.manifestRegistry }
             : {}),
+          discovery: params.pluginMetadataSnapshot?.discovery,
         }).config,
       });
   const pluginsGloballyDisabled = gatewayPluginConfig.plugins?.enabled === false;
diff --git a/src/gateway/server.impl.ts b/src/gateway/server.impl.ts
@@ -41,6 +41,7 @@ import { startDiagnosticHeartbeat, stopDiagnosticHeartbeat } from "../logging/di
 import { createSubsystemLogger, runtimeForLogger } from "../logging/subsystem.js";
 import {
   clearCurrentPluginMetadataSnapshot,
+  getCurrentPluginMetadataSnapshot,
   setCurrentPluginMetadataSnapshot,
 } from "../plugins/current-plugin-metadata-snapshot.js";
 import type { PluginHookGatewayCronService } from "../plugins/hook-types.js";
@@ -836,11 +837,19 @@ export async function startGatewayServer(
   });
   const { createChannelManager } = await import("./server-channels.js");
   const channelManager = createChannelManager({
-    getRuntimeConfig: () =>
-      applyPluginAutoEnable({
-        config: getRuntimeConfig(),
+    getRuntimeConfig: () => {
+      const runtimeConfig = getRuntimeConfig();
+      const currentSnapshot = getCurrentPluginMetadataSnapshot({
+        config: runtimeConfig,
         env: process.env,
-      }).config,
+      });
+      return applyPluginAutoEnable({
+        config: runtimeConfig,
+        env: process.env,
+        manifestRegistry: currentSnapshot?.manifestRegistry,
+        discovery: currentSnapshot?.discovery,
+      }).config;
+    },
     channelLogs,
     channelRuntimeEnvs,
     resolveChannelRuntime: getChannelRuntime,
