fix: keep plugin registry memo fresh for installs

steipete · steipete · commit 86d7beab9933 · 2026-05-28T23:25:12.000+01:00
diff --git a/src/plugins/plugin-registry-snapshot.test.ts b/src/plugins/plugin-registry-snapshot.test.ts
@@ -2,6 +2,7 @@ import crypto from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";
 import { afterEach, describe, expect, it, vi } from "vitest";
+import type { OpenClawConfig } from "../config/types.openclaw.js";
 import {
   clearCurrentPluginMetadataSnapshot,
   setCurrentPluginMetadataSnapshot,
@@ -428,6 +429,32 @@ describe("loadPluginRegistrySnapshotWithMetadata", () => {
     expect(result.diagnostics).toStrictEqual([]);
   });
 
+  it("refreshes a memoized derived snapshot when workspace plugins are installed", () => {
+    const tempRoot = makeTempDir();
+    const workspaceDir = path.join(tempRoot, "workspace");
+    const env = { ...createHermeticEnv(tempRoot), OPENCLAW_DISABLE_BUNDLED_PLUGINS: "1" };
+
+    const first = loadPluginRegistrySnapshotWithMetadata({ config: {}, env, workspaceDir });
+    expect(first.snapshot.plugins.map((plugin) => plugin.pluginId)).not.toContain("demo");
+
+    writePackagePlugin(path.join(workspaceDir, ".openclaw", "extensions", "demo"));
+
+    const second = loadPluginRegistrySnapshotWithMetadata({ config: {}, env, workspaceDir });
+    expect(second.snapshot.plugins.map((plugin) => plugin.pluginId)).toContain("demo");
+  });
+
+  it("ignores malformed load paths while fingerprinting memoized snapshots", () => {
+    const tempRoot = makeTempDir();
+    const env = { ...createHermeticEnv(tempRoot), OPENCLAW_DISABLE_BUNDLED_PLUGINS: "1" };
+    const config = {
+      plugins: {
+        load: { paths: "not-an-array" },
+      },
+    } as unknown as OpenClawConfig;
+
+    expect(() => loadPluginRegistrySnapshotWithMetadata({ config, env })).not.toThrow();
+  });
+
   it("keeps persisted package plugins when file hashes match", () => {
     const tempRoot = makeTempDir();
     const rootDir = path.join(tempRoot, "workspace");
diff --git a/src/plugins/plugin-registry-snapshot.ts b/src/plugins/plugin-registry-snapshot.ts
@@ -4,6 +4,7 @@ import path from "node:path";
 import { resolveUserPath } from "../utils.js";
 import { resolveCompatibilityHostVersion } from "../version.js";
 import { resolveBundledPluginsDir } from "./bundled-dir.js";
+import { normalizePluginsConfig } from "./config-state.js";
 import { getCurrentPluginMetadataSnapshot } from "./current-plugin-metadata-snapshot.js";
 import type { PluginDiscoveryResult } from "./discovery.js";
 import { fileSignatureMatches, hashJson } from "./installed-plugin-index-hash.js";
@@ -31,6 +32,7 @@ import {
 } from "./installed-plugin-index.js";
 import { registerPluginMetadataProcessMemoLifecycleClear } from "./plugin-metadata-lifecycle.js";
 import type { PluginRegistrySnapshotSource } from "./plugin-registry-snapshot.types.js";
+import { resolvePluginCacheInputs } from "./roots.js";
 
 export type PluginRegistrySnapshot = InstalledPluginIndex;
 export type PluginRegistryRecord = InstalledPluginIndexRecord;
@@ -148,11 +150,30 @@ function resolvePluginRegistrySnapshotMemoKey(
         ...(params.stateDir ? { stateDir: params.stateDir } : {}),
       }),
     ),
+    pluginRoots: fingerprintPluginSourceRoots(params, env),
     stateDir: params.stateDir ? resolveUserPath(params.stateDir, env) : null,
     workspaceDir: params.workspaceDir ? resolveUserPath(params.workspaceDir, env) : null,
   });
 }
 
+function fingerprintPluginSourceRoots(
+  params: LoadPluginRegistryParams,
+  env: NodeJS.ProcessEnv,
+): unknown {
+  const workspaceDir = params.workspaceDir ? resolveUserPath(params.workspaceDir, env) : undefined;
+  const cacheInputs = resolvePluginCacheInputs({
+    workspaceDir,
+    loadPaths: normalizePluginsConfig(params.config?.plugins).loadPaths,
+    env,
+  });
+  return {
+    global: fileFingerprint(cacheInputs.roots.global),
+    loadPaths: cacheInputs.loadPaths.map((entry) => fileFingerprint(entry)),
+    stock: cacheInputs.roots.stock ? fileFingerprint(cacheInputs.roots.stock) : null,
+    workspace: cacheInputs.roots.workspace ? fileFingerprint(cacheInputs.roots.workspace) : null,
+  };
+}
+
 function fileFingerprint(filePath: string): unknown {
   try {
     const stat = fs.statSync(filePath, { bigint: true });
