perf(config): avoid stale implicit auto-enable cache

ai-hpc · ai-hpc · commit d937944e7081 · 2026-06-05T09:41:36.000+02:00
diff --git a/src/config/plugin-auto-enable.apply.ts b/src/config/plugin-auto-enable.apply.ts
@@ -12,8 +12,6 @@ import type {
 import { hashRuntimeConfigValue } from "./runtime-snapshot.js";
 import type { OpenClawConfig } from "./types.openclaw.js";
 
-const ABSENT_PLUGIN_AUTO_ENABLE_INPUT = {};
-
 type PluginAutoEnableCacheEntry = {
   configFingerprint: string;
   envFingerprint: string;
@@ -54,10 +52,6 @@ function getOrCreateWeakMap<K extends object, V>(
   return next;
 }
 
-function resolveInputIdentityKey(value: object | undefined): object {
-  return value ?? ABSENT_PLUGIN_AUTO_ENABLE_INPUT;
-}
-
 function stableFingerprintValue(value: unknown): string {
   if (value === null || typeof value !== "object") {
     return JSON.stringify(value) ?? "null";
@@ -133,10 +127,8 @@ export function applyPluginAutoEnable(params: {
   discovery?: PluginDiscoveryResult;
 }): PluginAutoEnableResult {
   const config = params.config;
-  if (config && typeof config === "object") {
+  if (config && typeof config === "object" && params.manifestRegistry && params.discovery) {
     const env = params.env ?? process.env;
-    const manifestRegistry = resolveInputIdentityKey(params.manifestRegistry);
-    const discovery = resolveInputIdentityKey(params.discovery);
     const envCache = getOrCreateWeakMap(
       (sameTurnApplyCache ??= new WeakMap()),
       config,
@@ -149,10 +141,10 @@ export function applyPluginAutoEnable(params: {
     );
     const discoveryCache = getOrCreateWeakMap(
       registryCache,
-      manifestRegistry,
+      params.manifestRegistry,
       () => new WeakMap<object, PluginAutoEnableCacheEntry>(),
     );
-    const cached = discoveryCache.get(discovery);
+    const cached = discoveryCache.get(params.discovery);
     if (cached && isPluginAutoEnableCacheEntryFresh({ entry: cached, config, env })) {
       return cached.result;
     }
@@ -163,7 +155,7 @@ export function applyPluginAutoEnable(params: {
       env: params.env,
       manifestRegistry: params.manifestRegistry,
     });
-    discoveryCache.set(discovery, createPluginAutoEnableCacheEntry({ config, env, result }));
+    discoveryCache.set(params.discovery, createPluginAutoEnableCacheEntry({ config, env, result }));
     scheduleSameTurnApplyCacheClear();
     return result;
   }
diff --git a/src/config/plugin-auto-enable.core.test.ts b/src/config/plugin-auto-enable.core.test.ts
@@ -2,6 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { afterAll, afterEach, describe, expect, it, vi } from "vitest";
 import { setCurrentPluginMetadataSnapshot } from "../plugins/current-plugin-metadata-snapshot.js";
+import type { PluginDiscoveryResult } from "../plugins/discovery.js";
 import { resolveInstalledPluginIndexPolicyHash } from "../plugins/installed-plugin-index-policy.js";
 import type { PluginManifestRegistry } from "../plugins/manifest-registry.js";
 import type { PluginMetadataSnapshot } from "../plugins/plugin-metadata-snapshot.js";
@@ -61,6 +62,7 @@ vi.mock("../plugins/setup-registry.js", () => ({
 }));
 
 const env = makeIsolatedEnv();
+const emptyDiscovery: PluginDiscoveryResult = { candidates: [], diagnostics: [] };
 
 function createPluginMetadataSnapshot(params: {
   config?: OpenClawConfig;
@@ -1029,6 +1031,7 @@ describe("applyPluginAutoEnable core", () => {
 
   it("reuses same-turn auto-enable results for identical fanout inputs", async () => {
     setupRegistryMock.resolvePluginSetupAutoEnableReasons.mockClear();
+    const manifestRegistry = makeRegistry([{ id: "browser", channels: [] }]);
     const config: OpenClawConfig = {
       plugins: {
         entries: {
@@ -1039,22 +1042,61 @@ describe("applyPluginAutoEnable core", () => {
       },
     };
 
-    const first = applyPluginAutoEnable({ config, env });
-    const second = applyPluginAutoEnable({ config, env });
+    const first = applyPluginAutoEnable({
+      config,
+      discovery: emptyDiscovery,
+      env,
+      manifestRegistry,
+    });
+    const second = applyPluginAutoEnable({
+      config,
+      discovery: emptyDiscovery,
+      env,
+      manifestRegistry,
+    });
 
     expect(second).toBe(first);
     expect(setupRegistryMock.resolvePluginSetupAutoEnableReasons).toHaveBeenCalledTimes(1);
 
     await new Promise<void>((resolve) => {
       setImmediate(resolve);
     });
-    const third = applyPluginAutoEnable({ config, env });
+    const third = applyPluginAutoEnable({
+      config,
+      discovery: emptyDiscovery,
+      env,
+      manifestRegistry,
+    });
 
     expect(third).not.toBe(first);
     expect(third).toEqual(first);
     expect(setupRegistryMock.resolvePluginSetupAutoEnableReasons).toHaveBeenCalledTimes(2);
   });
 
+  it("does not reuse same-turn results for omitted metadata after current snapshot replacement", () => {
+    const config: OpenClawConfig = {
+      channels: { apn: { someKey: "value" } },
+    };
+    const firstRegistry = makeRegistry([{ id: "apn-one", channels: ["apn"] }]);
+    const secondRegistry = makeRegistry([{ id: "apn-two", channels: ["apn"] }]);
+    setCurrentPluginMetadataSnapshot(
+      createPluginMetadataSnapshot({ config, manifestRegistry: firstRegistry }),
+      { config, env },
+    );
+
+    const first = applyPluginAutoEnable({ config, env });
+    setCurrentPluginMetadataSnapshot(
+      createPluginMetadataSnapshot({ config, manifestRegistry: secondRegistry }),
+      { config, env },
+    );
+    const second = applyPluginAutoEnable({ config, env });
+
+    expect(first.config.plugins?.entries?.["apn-one"]?.enabled).toBe(true);
+    expect(second.config.plugins?.entries?.["apn-two"]?.enabled).toBe(true);
+    expect(second.config.plugins?.entries?.["apn-one"]).toBeUndefined();
+    expect(second).not.toBe(first);
+  });
+
   it("does not reuse same-turn auto-enable results across registry or env inputs", () => {
     const channelConfig: OpenClawConfig = {
       channels: { apn: { someKey: "value" } },
