fix: restore bundled plugin runtime deps after global install

test/scripts/postinstall-bundled-plugins.test.ts

@@ -4,6 +4,7 @@ import path from "node:path";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import {
   createNestedNpmInstallEnv,
+  discoverBundledPluginRuntimeDeps,
   runBundledPluginPostinstall,
 } from "../../scripts/postinstall-bundled-plugins.mjs";
 
@@ -19,11 +20,23 @@ async function createExtensionsDir() {
   const root = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-postinstall-"));
   cleanupDirs.push(root);
   const extensionsDir = path.join(root, "dist", "extensions");
-  await fs.mkdir(path.join(extensionsDir, "acpx"), { recursive: true });
-  await fs.writeFile(path.join(extensionsDir, "acpx", "package.json"), "{}\n", "utf8");
+  await fs.mkdir(extensionsDir, { recursive: true });
   return extensionsDir;
 }
 
+async function writePluginPackage(
+  extensionsDir: string,
+  pluginId: string,
+  packageJson: Record<string, unknown>,
+) {
+  const pluginDir = path.join(extensionsDir, pluginId);
+  await fs.mkdir(pluginDir, { recursive: true });
+  await fs.writeFile(
+    path.join(pluginDir, "package.json"),
+    `${JSON.stringify(packageJson, null, 2)}\n`,
+  );
+}
+
 describe("bundled plugin postinstall", () => {
   it("clears global npm config before nested installs", () => {
     expect(
@@ -39,6 +52,11 @@ describe("bundled plugin postinstall", () => {
 
   it("installs bundled plugin deps only during global installs", async () => {
     const extensionsDir = await createExtensionsDir();
+    await writePluginPackage(extensionsDir, "acpx", {
+      dependencies: {
+        acpx: "0.4.0",
+      },
+    });
     const execSync = vi.fn();
 
     runBundledPluginPostinstall({
@@ -52,6 +70,12 @@ describe("bundled plugin postinstall", () => {
 
   it("runs nested local installs with sanitized env when the sentinel package is missing", async () => {
     const extensionsDir = await createExtensionsDir();
+    const packageRoot = path.dirname(path.dirname(extensionsDir));
+    await writePluginPackage(extensionsDir, "acpx", {
+      dependencies: {
+        acpx: "0.4.0",
+      },
+    });
     const execSync = vi.fn();
 
     runBundledPluginPostinstall({
@@ -61,24 +85,34 @@ describe("bundled plugin postinstall", () => {
         HOME: "/tmp/home",
       },
       extensionsDir,
+      packageRoot,
       execSync,
       log: { log: vi.fn(), warn: vi.fn() },
     });
 
-    expect(execSync).toHaveBeenCalledWith("npm install --omit=dev --no-save --package-lock=false", {
-      cwd: path.join(extensionsDir, "acpx"),
-      env: {
-        HOME: "/tmp/home",
+    expect(execSync).toHaveBeenCalledWith(
+      "npm install --omit=dev --no-save --package-lock=false acpx@0.4.0",
+      {
+        cwd: packageRoot,
+        env: {
+          HOME: "/tmp/home",
+        },
+        stdio: "pipe",
       },
-      stdio: "pipe",
-    });
+    );
   });
 
   it("skips reinstall when the bundled sentinel package already exists", async () => {
     const extensionsDir = await createExtensionsDir();
-    await fs.mkdir(path.join(extensionsDir, "acpx", "node_modules", "acpx"), { recursive: true });
+    const packageRoot = path.dirname(path.dirname(extensionsDir));
+    await writePluginPackage(extensionsDir, "acpx", {
+      dependencies: {
+        acpx: "0.4.0",
+      },
+    });
+    await fs.mkdir(path.join(packageRoot, "node_modules", "acpx"), { recursive: true });
     await fs.writeFile(
-      path.join(extensionsDir, "acpx", "node_modules", "acpx", "package.json"),
+      path.join(packageRoot, "node_modules", "acpx", "package.json"),
       "{}\n",
       "utf8",
     );
@@ -87,9 +121,151 @@ describe("bundled plugin postinstall", () => {
     runBundledPluginPostinstall({
       env: { npm_config_global: "true" },
       extensionsDir,
+      packageRoot,
       execSync,
     });
 
     expect(execSync).not.toHaveBeenCalled();
   });
+
+  it("discovers bundled plugin runtime deps from extension manifests", async () => {
+    const extensionsDir = await createExtensionsDir();
+    await writePluginPackage(extensionsDir, "slack", {
+      dependencies: {
+        "@slack/web-api": "7.11.0",
+      },
+    });
+    await writePluginPackage(extensionsDir, "amazon-bedrock", {
+      dependencies: {
+        "@aws-sdk/client-bedrock": "3.1020.0",
+      },
+    });
+
+    expect(discoverBundledPluginRuntimeDeps({ extensionsDir })).toEqual(
+      expect.arrayContaining([
+        {
+          name: "@slack/web-api",
+          pluginIds: ["slack"],
+          sentinelPath: path.join("node_modules", "@slack", "web-api", "package.json"),
+          version: "7.11.0",
+        },
+        {
+          name: "@aws-sdk/client-bedrock",
+          pluginIds: ["amazon-bedrock"],
+          sentinelPath: path.join("node_modules", "@aws-sdk", "client-bedrock", "package.json"),
+          version: "3.1020.0",
+        },
+      ]),
+    );
+  });
+
+  it("merges duplicate bundled runtime deps across plugins", async () => {
+    const extensionsDir = await createExtensionsDir();
+    await writePluginPackage(extensionsDir, "slack", {
+      dependencies: {
+        "https-proxy-agent": "^8.0.0",
+      },
+    });
+    await writePluginPackage(extensionsDir, "feishu", {
+      dependencies: {
+        "https-proxy-agent": "^8.0.0",
+      },
+    });
+
+    expect(discoverBundledPluginRuntimeDeps({ extensionsDir })).toEqual(
+      expect.arrayContaining([
+        {
+          name: "https-proxy-agent",
+          pluginIds: ["feishu", "slack"],
+          sentinelPath: path.join("node_modules", "https-proxy-agent", "package.json"),
+          version: "^8.0.0",
+        },
+      ]),
+    );
+  });
+
+  it("installs missing bundled plugin runtime deps during global installs", async () => {
+    const extensionsDir = await createExtensionsDir();
+    const packageRoot = path.dirname(path.dirname(extensionsDir));
+    await writePluginPackage(extensionsDir, "slack", {
+      dependencies: {
+        "@slack/web-api": "7.11.0",
+      },
+    });
+    await writePluginPackage(extensionsDir, "telegram", {
+      dependencies: {
+        grammy: "1.38.4",
+      },
+    });
+    const execSync = vi.fn();
+
+    runBundledPluginPostinstall({
+      env: {
+        npm_config_global: "true",
+        npm_config_prefix: "/opt/homebrew",
+        HOME: "/tmp/home",
+      },
+      extensionsDir,
+      packageRoot,
+      execSync,
+      log: { log: vi.fn(), warn: vi.fn() },
+    });
+
+    expect(execSync).toHaveBeenCalledWith(
+      "npm install --omit=dev --no-save --package-lock=false @slack/web-api@7.11.0 grammy@1.38.4",
+      {
+        cwd: packageRoot,
+        env: {
+          HOME: "/tmp/home",
+        },
+        stdio: "pipe",
+      },
+    );
+  });
+
+  it("installs only missing bundled plugin runtime deps", async () => {
+    const extensionsDir = await createExtensionsDir();
+    const packageRoot = path.dirname(path.dirname(extensionsDir));
+    await writePluginPackage(extensionsDir, "slack", {
+      dependencies: {
+        "@slack/web-api": "7.11.0",
+      },
+    });
+    await writePluginPackage(extensionsDir, "telegram", {
+      dependencies: {
+        grammy: "1.38.4",
+      },
+    });
+    await fs.mkdir(path.join(packageRoot, "node_modules", "@slack", "web-api"), {
+      recursive: true,
+    });
+    await fs.writeFile(
+      path.join(packageRoot, "node_modules", "@slack", "web-api", "package.json"),
+      "{}\n",
+    );
+    const execSync = vi.fn();
+
+    runBundledPluginPostinstall({
+      env: {
+        npm_config_global: "true",
+        npm_config_prefix: "/opt/homebrew",
+        HOME: "/tmp/home",
+      },
+      extensionsDir,
+      packageRoot,
+      execSync,
+      log: { log: vi.fn(), warn: vi.fn() },
+    });
+
+    expect(execSync).toHaveBeenCalledWith(
+      "npm install --omit=dev --no-save --package-lock=false grammy@1.38.4",
+      {
+        cwd: packageRoot,
+        env: {
+          HOME: "/tmp/home",
+        },
+        stdio: "pipe",
+      },
+    );
+  });
 });