fix: avoid rescanning repaired plugin peers

shakkernerd · shakkernerd · commit 6e5042cd62e7 · 2026-05-13T15:26:40.000+01:00
diff --git a/src/infra/npm-managed-root.ts b/src/infra/npm-managed-root.ts
@@ -427,6 +427,13 @@ export async function syncManagedNpmRootPeerDependencies(params: {
   return changed;
 }
 
+export async function readManagedNpmRootPeerDependencyNames(params: {
+  npmRoot: string;
+}): Promise<Set<string>> {
+  const manifest = await readManagedNpmRootManifest(path.join(params.npmRoot, "package.json"));
+  return new Set(readManagedPeerDependencyKeys(manifest.openclaw));
+}
+
 export async function repairManagedNpmRootOpenClawPeer(params: {
   npmRoot: string;
   timeoutMs?: number;
diff --git a/src/plugins/install.npm-spec.e2e.test.ts b/src/plugins/install.npm-spec.e2e.test.ts
@@ -52,6 +52,7 @@ async function packPlugin(params: {
   pluginId: string;
   version: string;
   rootDir: string;
+  indexJs?: string;
 }): Promise<PackedVersion> {
   const packageDir = path.join(params.rootDir, `package-${params.packageName}-${params.version}`);
   const peerDependenciesMeta = params.peerDependencies
@@ -94,7 +95,11 @@ async function packPlugin(params: {
     )}\n`,
     "utf8",
   );
-  await fs.writeFile(path.join(packageDir, "dist", "index.js"), "export {};\n", "utf8");
+  await fs.writeFile(
+    path.join(packageDir, "dist", "index.js"),
+    params.indexJs ?? "export {};\n",
+    "utf8",
+  );
 
   const packOutput = execFileSync(
     "npm",
@@ -439,6 +444,102 @@ describe("installPluginFromNpmSpec e2e", () => {
     ).resolves.toBeTruthy();
   });
 
+  it("does not attribute repaired pre-existing peer dependencies to later installs", async () => {
+    const rootDir = await makeTempDir("npm-plugin-repaired-peer-scan-e2e");
+    const npmRoot = path.join(rootDir, "managed-npm");
+    const pluginWithRuntimePeer = `existing-peer-plugin-${crypto.randomUUID().replace(/-/g, "").slice(0, 12)}`;
+    const laterPlugin = `later-plugin-${crypto.randomUUID().replace(/-/g, "").slice(0, 12)}`;
+    const runtimePeer = `runtime-peer-${crypto.randomUUID().replace(/-/g, "").slice(0, 12)}`;
+    const registry = await startStaticRegistry([
+      {
+        packageName: pluginWithRuntimePeer,
+        latest: "1.0.0",
+        versions: [
+          await packPlugin({
+            packageName: pluginWithRuntimePeer,
+            peerDependencies: { [runtimePeer]: "^1.0.0" },
+            peerDependenciesMeta: {},
+            pluginId: pluginWithRuntimePeer,
+            version: "1.0.0",
+            rootDir,
+          }),
+        ],
+      },
+      {
+        packageName: laterPlugin,
+        latest: "1.0.0",
+        versions: [
+          await packPlugin({
+            packageName: laterPlugin,
+            pluginId: laterPlugin,
+            version: "1.0.0",
+            rootDir,
+          }),
+        ],
+      },
+      {
+        packageName: runtimePeer,
+        latest: "1.0.0",
+        versions: [
+          await packPlugin({
+            indexJs: "eval('1');\n",
+            packageName: runtimePeer,
+            pluginId: runtimePeer,
+            version: "1.0.0",
+            rootDir,
+          }),
+        ],
+      },
+    ]);
+    process.env.NPM_CONFIG_REGISTRY = registry;
+    process.env.npm_config_registry = registry;
+
+    await fs.mkdir(npmRoot, { recursive: true });
+    await fs.writeFile(
+      path.join(npmRoot, "package.json"),
+      `${JSON.stringify(
+        {
+          private: true,
+          dependencies: { [pluginWithRuntimePeer]: "1.0.0" },
+        },
+        null,
+        2,
+      )}\n`,
+      "utf8",
+    );
+    await execFileAsync(
+      "npm",
+      [
+        "install",
+        "--omit=dev",
+        "--omit=peer",
+        "--legacy-peer-deps",
+        "--loglevel=error",
+        "--ignore-scripts",
+        "--no-audit",
+        "--no-fund",
+      ],
+      { cwd: npmRoot },
+    );
+    await expect(
+      fs.lstat(path.join(npmRoot, "node_modules", runtimePeer, "package.json")),
+    ).rejects.toHaveProperty("code", "ENOENT");
+
+    const later = await installPluginFromNpmSpec({
+      spec: `${laterPlugin}@1.0.0`,
+      npmDir: npmRoot,
+      logger: { info: () => {}, warn: () => {} },
+      timeoutMs: 120_000,
+    });
+    if (!later.ok) {
+      throw new Error(later.error);
+    }
+
+    await expect(
+      fs.lstat(path.join(npmRoot, "node_modules", runtimePeer, "package.json")),
+    ).resolves.toBeTruthy();
+  });
+
   it("scrubs host peers when installing beside an existing host-peer plugin", async () => {
     const rootDir = await makeTempDir("npm-plugin-sibling-peer-e2e");
     const npmRoot = path.join(rootDir, "managed-npm");
diff --git a/src/plugins/install.ts b/src/plugins/install.ts
@@ -12,6 +12,7 @@ import {
 import { resolveNpmIntegrityDriftWithDefaultMessage } from "../infra/npm-integrity.js";
 import {
   readManagedNpmRootInstalledDependency,
+  readManagedNpmRootPeerDependencyNames,
   readOpenClawManagedNpmRootOverrides,
   repairManagedNpmRootOpenClawPeer,
   removeManagedNpmRootDependency,
@@ -465,11 +466,16 @@ function resolveManagedNpmRootPackageDir(npmRoot: string, packageName: string):
 
 async function listNewManagedNpmRootPackageDirs(params: {
   beforeInstallPackageNames: Set<string>;
+  excludePackageNames?: Set<string>;
   npmRoot: string;
 }): Promise<string[]> {
   const afterInstallPackageNames = await listManagedNpmRootPackageNames(params.npmRoot);
   return [...afterInstallPackageNames]
-    .filter((packageName) => !params.beforeInstallPackageNames.has(packageName))
+    .filter(
+      (packageName) =>
+        !params.beforeInstallPackageNames.has(packageName) &&
+        !params.excludePackageNames?.has(packageName),
+    )
     .map((packageName) => resolveManagedNpmRootPackageDir(params.npmRoot, packageName))
     .toSorted((left, right) => left.localeCompare(right));
 }
@@ -572,6 +578,9 @@ async function installPluginFromManagedNpmRoot(
     managedOverrides,
   });
   await syncManagedNpmRootPeerDependencies({ npmRoot, managedOverrides });
+  const preExistingManagedPeerDependencyNames = await readManagedNpmRootPeerDependencyNames({
+    npmRoot,
+  });
   const npmInstallArgs = [
     "npm",
     ...createSafeNpmInstallArgs({
@@ -751,6 +760,7 @@ async function installPluginFromManagedNpmRoot(
 
   const newRootPackageDirs = await listNewManagedNpmRootPackageDirs({
     beforeInstallPackageNames: preInstallRootPackageNames,
+    excludePackageNames: preExistingManagedPeerDependencyNames,
     npmRoot,
   });
   const result = await installPluginFromInstalledPackageDir({
