@app-vitals/agent-runtime 0.16.1 → 0.16.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@app-vitals/agent-runtime",
-  "version": "0.16.1",
+  "version": "0.16.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/app-vitals/agent.git",
@@ -40,8 +40,8 @@
     "./workspace-paths": "./workspace-paths.ts"
   },
   "dependencies": {
-    "@app-vitals/agent-admin": "0.16.1",
-    "@app-vitals/agent-lib": "0.16.1",
+    "@app-vitals/agent-admin": "0.16.2",
+    "@app-vitals/agent-lib": "0.16.2",
     "@octokit/auth-app": "^8.2.0",
     "@sentry/bun": "^10.63.0",
     "@slack/bolt": "^5.0.0",

package/setup.integration.test.ts

@@ -894,6 +894,19 @@ describe("findStalePluginSpecs", () => {
 // these tests depend on ambient sandbox/image state.
 const NO_EXTRA_MARKETPLACES: string[] = [];
 
+const SHIPWRIGHT_ROW: AgentPlugin = {
+  plugin: "shipwright",
+  marketplace: "shipwright",
+};
+
+// A repo root carrying a local marketplace (coding image); platform images ship none.
+const repoRoot = (): string => {
+  const root = join(testHome, "repo-root");
+  mkdirSync(join(root, ".claude-plugin"), { recursive: true });
+  writeFileSync(join(root, ".claude-plugin", "marketplace.json"), "{}");
+  return root;
+};
+
 describe("installPlugins", () => {
   it("registers local marketplace then installs shipwright@shipwright using the shipwright marketplace", async () => {
     const calls: Array<{ cmd: string; args: string[] }> = [];
@@ -909,20 +922,15 @@ describe("installPlugins", () => {
     await installPlugins(
       mockExec,
       testHome,
-      [],
-      "/repo/root",
+      [SHIPWRIGHT_ROW],
+      repoRoot(),
       join(testHome, "nonexistent.json"),
       NO_EXTRA_MARKETPLACES,
     );
 
     // marketplace add + 1 install + 1 update = 3 calls (no stale paths)
     expect(calls).toHaveLength(3);
-    expect(calls[0].args).toEqual([
-      "plugin",
-      "marketplace",
-      "add",
-      "/repo/root",
-    ]);
+    expect(calls[0].args).toEqual(["plugin", "marketplace", "add", repoRoot()]);
     expect(calls[1].args).toEqual([
       "plugin",
       "install",
@@ -935,7 +943,7 @@ describe("installPlugins", () => {
     ]);
   });
 
-  it("installs agent-specific plugins after default plugins", async () => {
+  it("installs row plugins in row order", async () => {
     const calls: Array<{ cmd: string; args: string[] }> = [];
     const mockExec = async (
       cmd: string,
@@ -947,6 +955,7 @@ describe("installPlugins", () => {
     };
 
     const agentPlugins: AgentPlugin[] = [
+      SHIPWRIGHT_ROW,
       { marketplace: "my-marketplace", plugin: "custom-plugin" },
       { marketplace: "other-market", plugin: "another-plugin" },
     ];
@@ -955,7 +964,7 @@ describe("installPlugins", () => {
       mockExec,
       testHome,
       agentPlugins,
-      "/repo/root",
+      repoRoot(),
       join(testHome, "nonexistent.json"),
       NO_EXTRA_MARKETPLACES,
     );
@@ -963,14 +972,9 @@ describe("installPlugins", () => {
     // 1 marketplace add + 3 installs + 3 updates = 7 calls
     expect(calls).toHaveLength(7);
 
-    expect(calls[0].args).toEqual([
-      "plugin",
-      "marketplace",
-      "add",
-      "/repo/root",
-    ]);
+    expect(calls[0].args).toEqual(["plugin", "marketplace", "add", repoRoot()]);
 
-    // installs: default first, then agent-specific
+    // installs in row order
     expect(calls[1].args).toEqual([
       "plugin",
       "install",
@@ -987,7 +991,7 @@ describe("installPlugins", () => {
       "another-plugin@other-market",
     ]);
 
-    // updates: default first, then agent-specific
+    // updates in row order
     expect(calls[4].args).toEqual([
       "plugin",
       "update",
@@ -1005,7 +1009,7 @@ describe("installPlugins", () => {
     ]);
   });
 
-  it("empty agentPlugins installs only default plugins", async () => {
+  it("no plugin rows installs nothing (platform agents)", async () => {
     const calls: Array<{ args: string[] }> = [];
     const mockExec = async (
       _cmd: string,
@@ -1020,15 +1024,12 @@ describe("installPlugins", () => {
       mockExec,
       testHome,
       [],
-      "/repo/root",
+      "/repo/root-without-marketplace",
       join(testHome, "nonexistent.json"),
       NO_EXTRA_MARKETPLACES,
     );
 
-    // marketplace add + 1 install + 1 update = 3 calls
-    expect(calls).toHaveLength(3);
-    expect(calls[1].args).toContain("shipwright@shipwright");
-    expect(calls[2].args).toContain("shipwright@shipwright");
+    expect(calls).toEqual([]);
   });
 
   it("is non-fatal when the claude binary isn't available", async () => {
@@ -1040,8 +1041,8 @@ describe("installPlugins", () => {
       installPlugins(
         throwingExec,
         testHome,
-        [],
-        "/repo/root",
+        [SHIPWRIGHT_ROW],
+        repoRoot(),
         join(testHome, "nonexistent.json"),
         NO_EXTRA_MARKETPLACES,
       ),
@@ -1067,8 +1068,8 @@ describe("installPlugins", () => {
       installPlugins(
         mockExec,
         testHome,
-        [],
-        "/repo/root",
+        [SHIPWRIGHT_ROW],
+        repoRoot(),
         join(testHome, "nonexistent.json"),
         NO_EXTRA_MARKETPLACES,
       ),
@@ -1097,8 +1098,8 @@ describe("installPlugins", () => {
       installPlugins(
         mockExec,
         testHome,
-        [],
-        "/repo/root",
+        [SHIPWRIGHT_ROW],
+        repoRoot(),
         join(testHome, "nonexistent.json"),
         NO_EXTRA_MARKETPLACES,
       ),
@@ -1123,8 +1124,8 @@ describe("installPlugins", () => {
       installPlugins(
         mockExec,
         testHome,
-        [],
-        "/repo/root",
+        [SHIPWRIGHT_ROW],
+        repoRoot(),
         join(testHome, "nonexistent.json"),
         NO_EXTRA_MARKETPLACES,
       ),
@@ -1163,8 +1164,8 @@ describe("installPlugins", () => {
     await installPlugins(
       mockExec,
       testHome,
-      [],
-      "/repo/root",
+      [SHIPWRIGHT_ROW],
+      repoRoot(),
       manifestPath,
       NO_EXTRA_MARKETPLACES,
     );
@@ -1224,20 +1225,15 @@ describe("installPlugins", () => {
     await installPlugins(
       mockExec,
       testHome,
-      [],
-      "/repo/root",
+      [SHIPWRIGHT_ROW],
+      repoRoot(),
       manifestPath,
       NO_EXTRA_MARKETPLACES,
     );
 
     // marketplace add + uninstall (failed) = 2 calls; install and update are skipped
     expect(calls).toHaveLength(2);
-    expect(calls[0].args).toEqual([
-      "plugin",
-      "marketplace",
-      "add",
-      "/repo/root",
-    ]);
+    expect(calls[0].args).toEqual(["plugin", "marketplace", "add", repoRoot()]);
     expect(calls[1].args).toEqual([
       "plugin",
       "uninstall",
@@ -1277,8 +1273,8 @@ describe("installPlugins", () => {
     await installPlugins(
       mockExec,
       testHome,
-      [],
-      "/repo/root",
+      [SHIPWRIGHT_ROW],
+      repoRoot(),
       manifestPath,
       NO_EXTRA_MARKETPLACES,
     );
@@ -1392,8 +1388,8 @@ describe("installPlugins — extra marketplace discovery", () => {
     await installPlugins(
       mockExec,
       testHome,
-      [],
-      "/repo/root",
+      [SHIPWRIGHT_ROW],
+      repoRoot(),
       join(testHome, "nonexistent.json"),
       undefined, // use default discovery — pass conventionRoot via extraMarketplacesRoot
       conventionRoot,
@@ -1403,7 +1399,7 @@ describe("installPlugins — extra marketplace discovery", () => {
     const addCalls = calls.filter((c) => c.args[1] === "marketplace");
     expect(addCalls.length).toBeGreaterThanOrEqual(2);
     expect(addCalls[0].args[3]).toBe(extraMarketDir);
-    expect(addCalls[1].args[3]).toBe("/repo/root");
+    expect(addCalls[1].args[3]).toBe(repoRoot());
 
     // All install calls must come after all marketplace add calls
     const installIdx = calls.findIndex((c) => c.args[1] === "install");
@@ -1444,8 +1440,8 @@ describe("installPlugins — extra marketplace discovery", () => {
     await installPlugins(
       mockExec,
       testHome,
-      [],
-      "/repo/root",
+      [SHIPWRIGHT_ROW],
+      repoRoot(),
       join(testHome, "nonexistent.json"),
       undefined,
       conventionRoot,
@@ -1457,7 +1453,7 @@ describe("installPlugins — extra marketplace discovery", () => {
     const addDirs = addCalls.map((c) => c.args[3]);
     expect(addDirs).toContain(validDir);
     expect(addDirs).not.toContain(invalidDir);
-    expect(addDirs).toContain("/repo/root");
+    expect(addDirs).toContain(repoRoot());
   });
 
   it("is backward compatible when no extra marketplace dirs exist", async () => {
@@ -1478,8 +1474,8 @@ describe("installPlugins — extra marketplace discovery", () => {
     await installPlugins(
       mockExec,
       testHome,
-      [],
-      "/repo/root",
+      [SHIPWRIGHT_ROW],
+      repoRoot(),
       join(testHome, "nonexistent.json"),
       undefined,
       conventionRoot,
@@ -1488,7 +1484,7 @@ describe("installPlugins — extra marketplace discovery", () => {
     // Only the /repo/root marketplace add — same as before this feature
     const addCalls = calls.filter((c) => c.args[1] === "marketplace");
     expect(addCalls).toHaveLength(1);
-    expect(addCalls[0].args[3]).toBe("/repo/root");
+    expect(addCalls[0].args[3]).toBe(repoRoot());
     // marketplace add + install + update = 3 calls total
     expect(calls).toHaveLength(3);
   });

package/setup.ts

@@ -57,12 +57,6 @@ export function resolveShipwrightRepoRoot(
   return env.SHIPWRIGHT_REPO_ROOT || DEFAULT_SHIPWRIGHT_REPO_ROOT;
 }
 
-// Local marketplace name — matches the `name` field in .claude-plugin/marketplace.json.
-const SHIPWRIGHT_MARKETPLACE = "shipwright";
-
-// Default plugin installed on all Shipwright agents.
-const DEFAULT_PLUGINS: readonly string[] = ["shipwright"];
-
 // The persona templates a type's templatesDir must provide or it is not usable.
 // Everything else (VOICE, mise, requirements, BOOTSTRAP) falls back per file to
 // the built-in workspace/ dir, and SPECIALTY.md.template is optional (ARD-6.2).
@@ -399,15 +393,15 @@ export function findStalePluginSpecs(
 }
 
 /**
- * Installs the shipwright default plugins plus any agent-specific plugins
- * from the config bundle. All commands are idempotent (exit 0 when already
+ * Installs the plugins in the agent's own AgentPlugin rows (seeded from the
+ * specialty manifest at create time). No plugin is installed by default. All commands are idempotent (exit 0 when already
  * present / already at latest), so reboots are a silent no-op.
  *
  * Non-fatal — a missing `claude` binary or network blip logs and returns
  * without throwing, so startup is never blocked.
  *
- * Install order: defaults first, then agent-specific plugins.
- * Update order: same.
+ * The built-in marketplace is only registered when `shipwrightRepoRoot` has a
+ * `.claude-plugin/marketplace.json` (the platform image ships none).
  *
  * Marketplace registration order:
  *   1. Extra baked marketplaces (discovered from `extraMarketplacesRoot` or
@@ -463,24 +457,22 @@ export async function installPlugins(
 
     // Register the local (built-in) shipwright marketplace so `claude plugin install`
     // can resolve plugins by name. Idempotent — safe to call on every startup.
-    const add = await execFn(
-      "claude",
-      ["plugin", "marketplace", "add", shipwrightRepoRoot],
-      { cwd },
-    );
-    if (add.exitCode !== 0) {
-      console.warn(
-        `[agent] claude plugin marketplace add exited ${add.exitCode}: ${add.stdout}`,
+    if (
+      existsSync(join(shipwrightRepoRoot, ".claude-plugin", "marketplace.json"))
+    ) {
+      const add = await execFn(
+        "claude",
+        ["plugin", "marketplace", "add", shipwrightRepoRoot],
+        { cwd },
       );
+      if (add.exitCode !== 0) {
+        console.warn(
+          `[agent] claude plugin marketplace add exited ${add.exitCode}: ${add.stdout}`,
+        );
+      }
     }
 
-    const defaultPluginSpecs = DEFAULT_PLUGINS.map(
-      (name) => `${name}@${SHIPWRIGHT_MARKETPLACE}`,
-    );
-    const agentPluginSpecs = agentPlugins.map(
-      (p) => `${p.plugin}@${p.marketplace}`,
-    );
-    const allSpecs = [...defaultPluginSpecs, ...agentPluginSpecs];
+    const allSpecs = agentPlugins.map((p) => `${p.plugin}@${p.marketplace}`);
 
     // Uninstall any plugin whose recorded installPath no longer exists. This
     // clears stale manifest entries left over from a different-HOME container
@@ -502,7 +494,7 @@ export async function installPlugins(
       }
     }
 
-    // Install all plugins (defaults then agent-specific).
+    // Install all plugins .
     // Skip any stale spec whose uninstall failed — install is idempotent and
     // would silently succeed without fixing the stale path, hiding the breakage.
     for (const spec of allSpecs) {
@@ -517,7 +509,7 @@ export async function installPlugins(
       }
     }
 
-    // Update all plugins (defaults then agent-specific).
+    // Update all plugins .
     // Skip specs whose uninstall failed for the same reason as the install loop.
     for (const spec of allSpecs) {
       if (failedUninstalls.has(spec)) continue;

package/setup.unit.test.ts

@@ -4,7 +4,7 @@
  * Pure logic tests: no I/O, no real binaries, injected exec doubles only.
  */
 
-import { describe, expect, it } from "bun:test";
+import { afterEach, beforeEach, describe, expect, it } from "bun:test";
 import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
@@ -22,56 +22,64 @@ import {
 // these tests depend on ambient sandbox/image state.
 const NO_EXTRA_MARKETPLACES: string[] = [];
 
-describe("installPlugins — local marketplace", () => {
-  it("registers the marketplace before installing plugins", async () => {
-    const calls: Array<{ cmd: string; args: string[] }> = [];
-    const mockExec = async (
-      cmd: string,
-      args: string[],
-      _opts: { cwd: string },
-    ) => {
-      calls.push({ cmd, args });
-      return { stdout: "", exitCode: 0 };
-    };
+const SHIPWRIGHT_ROW = { plugin: "shipwright", marketplace: "shipwright" };
+
+// A repo root that carries a local marketplace (a coding image); the platform
+// image has none.
+const makeMarketplaceRoot = (): string => {
+  const root = mkdtempSync(join(tmpdir(), "mkt-root-"));
+  mkdirSync(join(root, ".claude-plugin"), { recursive: true });
+  writeFileSync(join(root, ".claude-plugin", "marketplace.json"), "{}");
+  return root;
+};
+
+const recordCalls = () => {
+  const calls: Array<{ cmd: string; args: string[] }> = [];
+  const exec = async (cmd: string, args: string[], _opts: { cwd: string }) => {
+    calls.push({ cmd, args });
+    return { stdout: "", exitCode: 0 };
+  };
+  return { calls, exec };
+};
 
-    await installPlugins(
-      mockExec,
+describe("installPlugins — local marketplace", () => {
+  let root: string;
+  beforeEach(() => {
+    root = makeMarketplaceRoot();
+  });
+  afterEach(() => rmSync(root, { recursive: true, force: true }));
+
+  const run = (
+    exec: ReturnType<typeof recordCalls>["exec"],
+    plugins: Array<{ plugin: string; marketplace: string }>,
+    repoRoot = root,
+    extra: string[] = NO_EXTRA_MARKETPLACES,
+  ) =>
+    installPlugins(
+      exec,
       "/tmp/cwd",
-      [],
-      "/repo/root",
+      plugins,
+      repoRoot,
       "/tmp/nonexistent-manifest.json",
-      NO_EXTRA_MARKETPLACES,
+      extra,
     );
 
-    // First call must be marketplace add
-    expect(calls[0].args).toEqual([
-      "plugin",
-      "marketplace",
-      "add",
-      "/repo/root",
-    ]);
+  it("registers the marketplace before installing plugins", async () => {
+    const { calls, exec } = recordCalls();
+    await run(exec, [SHIPWRIGHT_ROW]);
+    expect(calls[0].args).toEqual(["plugin", "marketplace", "add", root]);
   });
 
-  it("installs and updates shipwright@shipwright using the shipwright marketplace name", async () => {
-    const calls: Array<{ cmd: string; args: string[] }> = [];
-    const mockExec = async (
-      cmd: string,
-      args: string[],
-      _opts: { cwd: string },
-    ) => {
-      calls.push({ cmd, args });
-      return { stdout: "", exitCode: 0 };
-    };
-
-    await installPlugins(
-      mockExec,
-      "/tmp/cwd",
-      [],
-      "/repo/root",
-      "/tmp/nonexistent-manifest.json",
-      NO_EXTRA_MARKETPLACES,
-    );
+  it("installs nothing when the agent has no plugin rows", async () => {
+    const { calls, exec } = recordCalls();
+    await run(exec, []);
+    expect(calls.filter((c) => c.args[1] === "install")).toEqual([]);
+    expect(calls.filter((c) => c.args[1] === "update")).toEqual([]);
+  });
 
+  it("installs and updates shipwright@shipwright for a coding agent's shipwright row", async () => {
+    const { calls, exec } = recordCalls();
+    await run(exec, [SHIPWRIGHT_ROW]);
     // marketplace add + install + update = 3 calls
     expect(calls).toHaveLength(3);
     expect(calls[1].args).toEqual([
@@ -87,29 +95,14 @@ describe("installPlugins — local marketplace", () => {
   });
 
   it("agent plugins use their own marketplace, not the local one", async () => {
-    const calls: Array<{ cmd: string; args: string[] }> = [];
-    const mockExec = async (
-      cmd: string,
-      args: string[],
-      _opts: { cwd: string },
-    ) => {
-      calls.push({ cmd, args });
-      return { stdout: "", exitCode: 0 };
-    };
-
-    await installPlugins(
-      mockExec,
-      "/tmp/cwd",
-      [{ plugin: "my-plugin", marketplace: "org/my-marketplace" }],
-      "/repo/root",
-      "/tmp/nonexistent-manifest.json",
-      NO_EXTRA_MARKETPLACES,
-    );
-
+    const { calls, exec } = recordCalls();
+    await run(exec, [
+      SHIPWRIGHT_ROW,
+      { plugin: "my-plugin", marketplace: "org/my-marketplace" },
+    ]);
     // marketplace add + 2 installs + 2 updates = 5 calls
     expect(calls).toHaveLength(5);
-    const specs = calls.slice(1).map((c) => c.args[2]);
-    expect(specs).toEqual([
+    expect(calls.slice(1).map((c) => c.args[2])).toEqual([
       "shipwright@shipwright",
       "my-plugin@org/my-marketplace",
       "shipwright@shipwright",
@@ -117,128 +110,30 @@ describe("installPlugins — local marketplace", () => {
     ]);
   });
 
-  it("passes the repoRoot to marketplace add", async () => {
-    const calls: Array<{ cmd: string; args: string[] }> = [];
-    const mockExec = async (
-      cmd: string,
-      args: string[],
-      _opts: { cwd: string },
-    ) => {
-      calls.push({ cmd, args });
-      return { stdout: "", exitCode: 0 };
-    };
-
-    await installPlugins(
-      mockExec,
-      "/tmp/cwd",
-      [],
-      "/custom/repo/root",
-      "/tmp/nonexistent-manifest.json",
-      NO_EXTRA_MARKETPLACES,
-    );
-
-    expect(calls[0].args).toEqual([
-      "plugin",
-      "marketplace",
-      "add",
-      "/custom/repo/root",
-    ]);
+  it("skips the local marketplace add when the repo root has no marketplace", async () => {
+    const { calls, exec } = recordCalls();
+    await run(exec, [], "/repo/root");
+    expect(calls).toEqual([]);
   });
 
-  it("registers extra marketplaces before the /app marketplace", async () => {
-    const calls: Array<{ cmd: string; args: string[] }> = [];
-    const mockExec = async (
-      cmd: string,
-      args: string[],
-      _opts: { cwd: string },
-    ) => {
-      calls.push({ cmd, args });
-      return { stdout: "", exitCode: 0 };
-    };
-
-    // Pass a non-existent root so discoverBakedMarketplaces can't find dirs —
-    // we inject via extraMarketplaceDirs directly instead.
-    await installPlugins(
-      mockExec,
-      "/tmp/cwd",
-      [],
-      "/repo/root",
-      "/tmp/nonexistent-manifest.json",
-      ["/opt/shipwright/marketplaces/my-marketplace"],
-    );
-
-    // Extra marketplace add must come BEFORE the /repo/root marketplace add
+  it("registers extra marketplaces before the local marketplace", async () => {
+    const { calls, exec } = recordCalls();
+    await run(exec, [], root, ["/opt/shipwright/marketplaces/my-marketplace"]);
     const addCalls = calls.filter((c) => c.args[1] === "marketplace");
     expect(addCalls[0].args[3]).toBe(
       "/opt/shipwright/marketplaces/my-marketplace",
     );
-    expect(addCalls[1].args[3]).toBe("/repo/root");
-  });
-
-  it("is a no-op when no extra marketplace dirs exist", async () => {
-    const calls: Array<{ cmd: string; args: string[] }> = [];
-    const mockExec = async (
-      cmd: string,
-      args: string[],
-      _opts: { cwd: string },
-    ) => {
-      calls.push({ cmd, args });
-      return { stdout: "", exitCode: 0 };
-    };
-
-    await installPlugins(
-      mockExec,
-      "/tmp/cwd",
-      [],
-      "/repo/root",
-      "/tmp/nonexistent-manifest.json",
-      NO_EXTRA_MARKETPLACES,
-    );
-
-    // Only the /repo/root marketplace add — no extra adds
-    const addCalls = calls.filter((c) => c.args[1] === "marketplace");
-    expect(addCalls).toHaveLength(1);
-    expect(addCalls[0].args[3]).toBe("/repo/root");
+    expect(addCalls[1].args[3]).toBe(root);
   });
 
   it("never reads the real BAKED_MARKETPLACES_ROOT when extraMarketplaceDirs is injected (isolation regression)", async () => {
-    // Regression test for T-002: previously, tests that omitted the
-    // extraMarketplaceDirs arg silently fell through to
-    // discoverBakedMarketplaces(BAKED_MARKETPLACES_ROOT), which performs a
-    // real existsSync/readdirSync against /opt/shipwright/marketplaces. On any
-    // image/sandbox that bakes a marketplace there (this sandbox does), that
-    // extra ambient `marketplace add` call would silently appear before the
-    // expected calls and break exact-match assertions below.
-    //
-    // This test asserts the injected empty array wins deterministically,
-    // regardless of what (if anything) actually exists on disk at
-    // /opt/shipwright/marketplaces in the environment running the suite.
-    const calls: Array<{ cmd: string; args: string[] }> = [];
-    const mockExec = async (
-      cmd: string,
-      args: string[],
-      _opts: { cwd: string },
-    ) => {
-      calls.push({ cmd, args });
-      return { stdout: "", exitCode: 0 };
-    };
-
-    await installPlugins(
-      mockExec,
-      "/tmp/cwd",
-      [],
-      "/repo/root",
-      "/tmp/nonexistent-manifest.json",
-      NO_EXTRA_MARKETPLACES,
-    );
-
-    // Exactly one marketplace add (the built-in shipwright one) — no extra
-    // marketplace add sneaks in from real fs discovery, no matter what's
-    // actually present on disk at BAKED_MARKETPLACES_ROOT in this environment.
+    // The injected empty array must win over real fs discovery of
+    // /opt/shipwright/marketplaces, whatever the sandbox has baked there.
+    const { calls, exec } = recordCalls();
+    await run(exec, [SHIPWRIGHT_ROW]);
     const addCalls = calls.filter((c) => c.args[1] === "marketplace");
     expect(addCalls).toHaveLength(1);
-    expect(addCalls[0].args[3]).toBe("/repo/root");
-    // Full call count is deterministic: marketplace add + install + update = 3.
+    expect(addCalls[0].args[3]).toBe(root);
     expect(calls).toHaveLength(3);
   });
 });
@@ -368,19 +263,24 @@ describe("SHIPWRIGHT_REPO_ROOT override (PCB-1.1)", () => {
       "/tmp/nonexistent-baked-root",
       env,
     );
-    return calls[0][3];
+    return calls[0]?.[3];
   };
 
   it("installPlugins registers the marketplace from SHIPWRIGHT_REPO_ROOT when set", async () => {
-    expect(await registerRoot({ SHIPWRIGHT_REPO_ROOT: "/opt/custom" })).toBe(
-      "/opt/custom",
-    );
+    const custom = makeMarketplaceRoot();
+    try {
+      expect(await registerRoot({ SHIPWRIGHT_REPO_ROOT: custom })).toBe(custom);
+    } finally {
+      rmSync(custom, { recursive: true, force: true });
+    }
   });
 
   it("installPlugins keeps the computed default when unset or empty", async () => {
     const unset = await registerRoot({});
-    expect(unset).toBe(resolveShipwrightRepoRoot({}));
-    expect(unset).not.toBe("/opt/custom");
+    // Only registered when the computed default root carries a marketplace.
+    expect(unset === undefined || unset === resolveShipwrightRepoRoot({})).toBe(
+      true,
+    );
     expect(await registerRoot({ SHIPWRIGHT_REPO_ROOT: "" })).toBe(unset);
   });