fix: reuse plugin metadata during runtime loading

shakkernerd · shakkernerd · commit c90e42aaa766 · 2026-05-17T01:55:16.000+01:00
diff --git a/src/agents/tools/manifest-capability-availability.ts b/src/agents/tools/manifest-capability-availability.ts
@@ -68,7 +68,9 @@ export function getCurrentCapabilityMetadataSnapshot(params: {
 }): PluginMetadataSnapshot | undefined {
   return getCurrentPluginMetadataSnapshot({
     config: params.config,
-    ...(params.workspaceDir ? { workspaceDir: params.workspaceDir } : {}),
+    ...(params.workspaceDir
+      ? { workspaceDir: params.workspaceDir }
+      : { allowWorkspaceScopedSnapshot: true }),
   });
 }
 
@@ -80,7 +82,9 @@ export function loadCapabilityMetadataSnapshot(params: {
   return (
     getCurrentPluginMetadataSnapshot({
       config: params.config,
-      ...(params.workspaceDir ? { workspaceDir: params.workspaceDir } : {}),
+      ...(params.workspaceDir
+        ? { workspaceDir: params.workspaceDir }
+        : { allowWorkspaceScopedSnapshot: true }),
     }) ??
     loadManifestContractSnapshot({
       config: params.config,
diff --git a/src/plugins/manifest-model-id-normalization.ts b/src/plugins/manifest-model-id-normalization.ts
@@ -46,7 +46,7 @@ function resolveMetadataSnapshotForPolicies(
   const current = getCurrentPluginMetadataSnapshot({
     config: params.config,
     env,
-    workspaceDir,
+    ...(workspaceDir !== undefined ? { workspaceDir } : { allowWorkspaceScopedSnapshot: true }),
   });
   if (current) {
     return { snapshot: current, cacheable: true };
diff --git a/src/plugins/runtime/load-context.test.ts b/src/plugins/runtime/load-context.test.ts
@@ -9,6 +9,18 @@ const resolveAgentWorkspaceDirMock = vi.fn<
 const resolveDefaultAgentIdMock = vi.fn<
   typeof import("../../agents/agent-scope.js").resolveDefaultAgentId
 >(() => "default");
+const manifestRegistry = { diagnostics: [], plugins: [] };
+const metadataSnapshot = {
+  configFingerprint: "fingerprint",
+  diagnostics: [],
+  index: { plugins: [], policyHash: "policy" },
+  manifestRegistry,
+  plugins: [],
+  policyHash: "policy",
+  workspaceDir: "/resolved-workspace",
+};
+const loadPluginMetadataSnapshotMock = vi.fn(() => metadataSnapshot);
+const setCurrentPluginMetadataSnapshotMock = vi.fn();
 
 let resolvePluginRuntimeLoadContext: typeof import("./load-context.js").resolvePluginRuntimeLoadContext;
 let buildPluginRuntimeLoadOptions: typeof import("./load-context.js").buildPluginRuntimeLoadOptions;
@@ -29,6 +41,14 @@ vi.mock("../../agents/agent-scope.js", () => ({
   resolveDefaultAgentId: resolveDefaultAgentIdMock,
 }));
 
+vi.mock("../plugin-metadata-snapshot.js", () => ({
+  loadPluginMetadataSnapshot: loadPluginMetadataSnapshotMock,
+}));
+
+vi.mock("../current-plugin-metadata-snapshot.js", () => ({
+  setCurrentPluginMetadataSnapshot: setCurrentPluginMetadataSnapshotMock,
+}));
+
 describe("resolvePluginRuntimeLoadContext", () => {
   beforeEach(async () => {
     vi.resetModules();
@@ -38,6 +58,8 @@ describe("resolvePluginRuntimeLoadContext", () => {
       await import("./load-context.js"));
     loadConfigMock.mockReset();
     applyPluginAutoEnableMock.mockReset();
+    loadPluginMetadataSnapshotMock.mockClear();
+    setCurrentPluginMetadataSnapshotMock.mockClear();
     resolveAgentWorkspaceDirMock.mockClear();
     resolveDefaultAgentIdMock.mockClear();
 
@@ -84,10 +106,23 @@ describe("resolvePluginRuntimeLoadContext", () => {
       workspaceDir: "/resolved-workspace",
       env,
       logger: context.logger,
+      manifestRegistry,
+    });
+    expect(loadPluginMetadataSnapshotMock).toHaveBeenCalledWith({
+      config: rawConfig,
+      env,
+      workspaceDir: "/resolved-workspace",
     });
     expect(applyPluginAutoEnableMock).toHaveBeenCalledWith({
       config: rawConfig,
       env,
+      manifestRegistry,
+    });
+    expect(setCurrentPluginMetadataSnapshotMock).toHaveBeenCalledWith(metadataSnapshot, {
+      config: rawConfig,
+      compatibleConfigs: [resolvedConfig, rawConfig],
+      env,
+      workspaceDir: "/resolved-workspace",
     });
     expect(resolveDefaultAgentIdMock).toHaveBeenCalledWith(resolvedConfig);
     expect(resolveAgentWorkspaceDirMock).toHaveBeenCalledWith(resolvedConfig, "default");
@@ -111,6 +146,7 @@ describe("resolvePluginRuntimeLoadContext", () => {
     expect(applyPluginAutoEnableMock).toHaveBeenCalledWith({
       config: runtimeConfig,
       env: process.env,
+      manifestRegistry,
     });
   });
 
@@ -134,6 +170,7 @@ describe("resolvePluginRuntimeLoadContext", () => {
       workspaceDir: "/explicit-workspace",
       env: context.env,
       logger: context.logger,
+      manifestRegistry,
       cache: false,
       activate: false,
       onlyPluginIds: ["demo"],
diff --git a/src/plugins/runtime/load-context.ts b/src/plugins/runtime/load-context.ts
@@ -4,8 +4,10 @@ import { applyPluginAutoEnable } from "../../config/plugin-auto-enable.js";
 import type { OpenClawConfig } from "../../config/types.openclaw.js";
 import { createSubsystemLogger } from "../../logging.js";
 import { resolvePluginActivationSourceConfig } from "../activation-source-config.js";
+import { setCurrentPluginMetadataSnapshot } from "../current-plugin-metadata-snapshot.js";
 import type { PluginLoadOptions } from "../loader.js";
 import type { PluginManifestRegistry } from "../manifest-registry.js";
+import { loadPluginMetadataSnapshot } from "../plugin-metadata-snapshot.js";
 import type { PluginLogger } from "../types.js";
 
 const log = createSubsystemLogger("plugins");
@@ -18,11 +20,18 @@ export type PluginRuntimeLoadContext = {
   workspaceDir: string | undefined;
   env: NodeJS.ProcessEnv;
   logger: PluginLogger;
+  manifestRegistry?: PluginManifestRegistry;
 };
 
 export type PluginRuntimeResolvedLoadValues = Pick<
   PluginLoadOptions,
-  "config" | "activationSourceConfig" | "autoEnabledReasons" | "workspaceDir" | "env" | "logger"
+  | "config"
+  | "activationSourceConfig"
+  | "autoEnabledReasons"
+  | "workspaceDir"
+  | "env"
+  | "logger"
+  | "manifestRegistry"
 >;
 
 export type PluginRuntimeLoadContextOptions = {
@@ -48,18 +57,36 @@ export function resolvePluginRuntimeLoadContext(
 ): PluginRuntimeLoadContext {
   const env = options?.env ?? process.env;
   const rawConfig = options?.config ?? getRuntimeConfig();
+  const rawWorkspaceDir =
+    options?.workspaceDir ?? resolveAgentWorkspaceDir(rawConfig, resolveDefaultAgentId(rawConfig));
+  const metadataSnapshot = options?.manifestRegistry
+    ? undefined
+    : loadPluginMetadataSnapshot({
+        config: rawConfig,
+        env,
+        workspaceDir: rawWorkspaceDir,
+      });
+  const manifestRegistry = options?.manifestRegistry ?? metadataSnapshot?.manifestRegistry;
   const activationSourceConfig = resolvePluginActivationSourceConfig({
     config: rawConfig,
     activationSourceConfig: options?.activationSourceConfig,
   });
   const autoEnabled = applyPluginAutoEnable({
     config: rawConfig,
     env,
-    manifestRegistry: options?.manifestRegistry,
+    manifestRegistry,
   });
   const config = autoEnabled.config;
   const workspaceDir =
     options?.workspaceDir ?? resolveAgentWorkspaceDir(config, resolveDefaultAgentId(config));
+  if (metadataSnapshot) {
+    setCurrentPluginMetadataSnapshot(metadataSnapshot, {
+      config: rawConfig,
+      compatibleConfigs: [config, activationSourceConfig],
+      env,
+      workspaceDir,
+    });
+  }
   return {
     rawConfig,
     config,
@@ -68,6 +95,7 @@ export function resolvePluginRuntimeLoadContext(
     workspaceDir,
     env,
     logger: options?.logger ?? createPluginRuntimeLoaderLogger(),
+    ...(manifestRegistry ? { manifestRegistry } : {}),
   };
 }
 
@@ -89,6 +117,7 @@ export function buildPluginRuntimeLoadOptionsFromValues(
     workspaceDir: values.workspaceDir,
     env: values.env,
     logger: values.logger,
+    ...(values.manifestRegistry ? { manifestRegistry: values.manifestRegistry } : {}),
     ...overrides,
   };
 }
diff --git a/src/plugins/setup-registry.runtime.ts b/src/plugins/setup-registry.runtime.ts
@@ -60,7 +60,7 @@ function resolveMetadataSnapshotForSetupCliBackends(
   const current = getCurrentPluginMetadataSnapshot({
     config: params.config,
     env,
-    workspaceDir,
+    ...(workspaceDir !== undefined ? { workspaceDir } : { allowWorkspaceScopedSnapshot: true }),
   });
   if (current) {
     return { snapshot: current, cacheable: true };
