Revert "perf(plugins): extend discovery threading to loader, manifest registr…" (#84278)

RomneyDa · web-flow · commit 3d96111a5afe · 2026-05-19T12:35:27.000-07:00
This reverts commit f5f0b2c.
diff --git a/src/plugins/config-contracts.ts b/src/plugins/config-contracts.ts
@@ -1,6 +1,6 @@
 import type { OpenClawConfig } from "../config/types.openclaw.js";
 import { isRecord } from "../utils.js";
-import { discoverOpenClawPlugins, type PluginDiscoveryResult } from "./discovery.js";
+import { discoverOpenClawPlugins } from "./discovery.js";
 import { loadPluginManifestRegistry } from "./manifest-registry.js";
 import type { PluginManifestConfigContracts } from "./manifest.js";
 import type { PluginOrigin } from "./plugin-origin.types.js";
@@ -114,13 +114,6 @@ export function resolvePluginConfigContractsById(params: {
   fallbackToBundledMetadataForResolvedBundled?: boolean;
   fallbackBundledPluginIds?: readonly string[];
   pluginIds: readonly string[];
-  /**
-   * Pre-computed discovery result. When supplied, the bundled-fallback path
-   * skips its internal `discoverOpenClawPlugins` call so callers sharing a
-   * discovery snapshot across registry helpers avoid redundant filesystem
-   * walks.
-   */
-  discovery?: PluginDiscoveryResult;
 }): ReadonlyMap<string, PluginConfigContractMetadata> {
   const matches = new Map<string, PluginConfigContractMetadata>();
   const pluginIds = [
@@ -139,12 +132,10 @@ export function resolvePluginConfigContractsById(params: {
     if (bundledContractFallbacks.has(pluginId)) {
       return bundledContractFallbacks.get(pluginId);
     }
-    const discovery =
-      params.discovery ??
-      discoverOpenClawPlugins({
-        workspaceDir: params.workspaceDir,
-        env: params.env,
-      });
+    const discovery = discoverOpenClawPlugins({
+      workspaceDir: params.workspaceDir,
+      env: params.env,
+    });
     const registry = loadPluginManifestRegistry({
       config: params.config,
       workspaceDir: params.workspaceDir,
diff --git a/src/plugins/discovery-threading.test.ts b/src/plugins/discovery-threading.test.ts
diff --git a/src/plugins/installed-plugin-index-registry.ts b/src/plugins/installed-plugin-index-registry.ts
@@ -25,14 +25,12 @@ export function resolveInstalledPluginIndexRegistry(params: LoadInstalledPluginI
   const normalized = normalizePluginsConfig(params.config?.plugins);
   const installRecords =
     params.installRecords ?? loadInstalledPluginIndexInstallRecordsSync({ env: params.env });
-  const discovery =
-    params.discovery ??
-    discoverOpenClawPlugins({
-      workspaceDir: params.workspaceDir,
-      extraPaths: normalized.loadPaths,
-      env: params.env,
-      installRecords,
-    });
+  const discovery = discoverOpenClawPlugins({
+    workspaceDir: params.workspaceDir,
+    extraPaths: normalized.loadPaths,
+    env: params.env,
+    installRecords,
+  });
   return {
     candidates: discovery.candidates,
     registry: loadPluginManifestRegistry({
diff --git a/src/plugins/installed-plugin-index-types.ts b/src/plugins/installed-plugin-index-types.ts
@@ -1,7 +1,7 @@
 import type { OpenClawConfig } from "../config/types.js";
 import type { PluginInstallRecord } from "../config/types.plugins.js";
 import type { PluginCompatCode } from "./compat/registry.js";
-import type { PluginCandidate, PluginDiscoveryResult } from "./discovery.js";
+import type { PluginCandidate } from "./discovery.js";
 import type { PluginInstallSourceInfo } from "./install-source-info.js";
 import type { InstalledPluginFileSignature } from "./installed-plugin-index-hash.js";
 import type { PluginManifestRecord } from "./manifest-registry.js";
@@ -130,13 +130,6 @@ export type LoadInstalledPluginIndexParams = {
   installRecords?: Record<string, PluginInstallRecord>;
   candidates?: PluginCandidate[];
   diagnostics?: PluginDiagnostic[];
-  /**
-   * Pre-computed discovery result. When supplied (and `candidates` is not),
-   * the internal `discoverOpenClawPlugins` call is skipped. Callers sharing a
-   * discovery snapshot across registry helpers in the same flow should supply
-   * this to avoid redundant filesystem walks.
-   */
-  discovery?: PluginDiscoveryResult;
   now?: () => Date;
 };
 
diff --git a/src/plugins/loader.ts b/src/plugins/loader.ts
@@ -50,11 +50,7 @@ import {
   type NormalizedPluginsConfig,
 } from "./config-state.js";
 import { isPluginEnabledByDefaultForPlatform } from "./default-enablement.js";
-import {
-  discoverOpenClawPlugins,
-  type PluginCandidate,
-  type PluginDiscoveryResult,
-} from "./discovery.js";
+import { discoverOpenClawPlugins, type PluginCandidate } from "./discovery.js";
 import { shouldRejectHardlinkedPluginFiles } from "./hardlink-policy.js";
 import { getGlobalHookRunner, initializeGlobalHookRunner } from "./hook-runner-global.js";
 import { toSafeImportPath } from "./import-specifier.js";
@@ -202,14 +198,6 @@ export type PluginLoadOptions = {
   loadModules?: boolean;
   throwOnLoadError?: boolean;
   manifestRegistry?: PluginManifestRegistry;
-  /**
-   * Pre-computed plugin discovery result. When supplied, internal calls to
-   * `discoverOpenClawPlugins` are skipped. Callers in the same startup flow
-   * can compute one discovery result and share it across loader entry points
-   * to eliminate redundant filesystem walks. Ignored when `manifestRegistry`
-   * is also provided (the registry already implies a discovery snapshot).
-   */
-  discovery?: PluginDiscoveryResult;
 };
 
 function detailPluginStartupTrace(
@@ -1702,13 +1690,12 @@ export function loadOpenClawPlugins(options: PluginLoadOptions = {}): PluginRegi
           candidates: createPluginCandidatesFromManifestRegistry(suppliedManifestRegistry),
           diagnostics: [] as PluginDiagnostic[],
         }
-      : (options.discovery ??
-        discoverOpenClawPlugins({
+      : discoverOpenClawPlugins({
           workspaceDir: options.workspaceDir,
           extraPaths: normalized.loadPaths,
           env,
           installRecords,
-        }));
+        });
     const manifestRegistry =
       suppliedManifestRegistry ??
       loadPluginManifestRegistry({
@@ -2572,14 +2559,12 @@ export async function loadOpenClawPluginCliRegistry(
     activateGlobalSideEffects: false,
   });
 
-  const discovery =
-    options.discovery ??
-    discoverOpenClawPlugins({
-      workspaceDir: options.workspaceDir,
-      extraPaths: normalized.loadPaths,
-      env,
-      installRecords,
-    });
+  const discovery = discoverOpenClawPlugins({
+    workspaceDir: options.workspaceDir,
+    extraPaths: normalized.loadPaths,
+    env,
+    installRecords,
+  });
   const manifestRegistry = loadPluginManifestRegistry({
     config: cfg,
     workspaceDir: options.workspaceDir,
diff --git a/src/plugins/manifest-registry.ts b/src/plugins/manifest-registry.ts
@@ -10,11 +10,7 @@ import { resolveUserPath } from "../utils.js";
 import { resolveCompatibilityHostVersion } from "../version.js";
 import { loadBundleManifest } from "./bundle-manifest.js";
 import { normalizePluginsConfigWithResolver } from "./config-policy.js";
-import {
-  discoverOpenClawPlugins,
-  type PluginCandidate,
-  type PluginDiscoveryResult,
-} from "./discovery.js";
+import { discoverOpenClawPlugins, type PluginCandidate } from "./discovery.js";
 import { shouldRejectHardlinkedPluginFiles } from "./hardlink-policy.js";
 import { loadInstalledPluginIndexInstallRecordsSync } from "./installed-plugin-index-record-reader.js";
 import type { PluginManifestCommandAlias } from "./manifest-command-aliases.js";
@@ -920,13 +916,6 @@ export function loadPluginManifestRegistry(
     diagnostics?: PluginDiagnostic[];
     installRecords?: Record<string, PluginInstallRecord>;
     bundledChannelConfigCollector?: BundledChannelConfigCollector;
-    /**
-     * Pre-computed discovery result. When supplied (and `candidates` is not),
-     * the internal `discoverOpenClawPlugins` call is skipped. Callers sharing
-     * a discovery snapshot across multiple registry helpers in the same flow
-     * should supply this to avoid redundant filesystem walks.
-     */
-    discovery?: PluginDiscoveryResult;
   } = {},
 ): PluginManifestRegistry {
   const config = params.config ?? {};
@@ -947,13 +936,12 @@ export function loadPluginManifestRegistry(
         candidates: params.candidates,
         diagnostics: params.diagnostics ?? [],
       }
-    : (params.discovery ??
-      discoverOpenClawPlugins({
+    : discoverOpenClawPlugins({
         workspaceDir: params.workspaceDir,
         extraPaths: normalized.loadPaths,
         env,
         installRecords: getInstallRecords(),
-      }));
+      });
   const diagnostics: PluginDiagnostic[] = [...discovery.diagnostics];
   const candidates: PluginCandidate[] = discovery.candidates;
   const records: PluginManifestRecord[] = [];
