@app-vitals/agent-runtime 1.2.5 → 1.2.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@app-vitals/agent-runtime",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "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": "1.2.5",
-    "@app-vitals/agent-lib": "1.2.5",
+    "@app-vitals/agent-admin": "1.2.7",
+    "@app-vitals/agent-lib": "1.2.7",
     "@octokit/auth-app": "^8.2.0",
     "@sentry/bun": "^10.63.0",
     "@slack/bolt": "^5.0.0",

package/setup.integration.test.ts

@@ -1489,3 +1489,104 @@ describe("installPlugins — extra marketplace discovery", () => {
     expect(calls).toHaveLength(3);
   });
 });
+
+describe("installPlugins stale shipwright marketplace healing", () => {
+  type Exec = (
+    cmd: string,
+    args: string[],
+    opts: { cwd: string },
+  ) => Promise<{ stdout: string; exitCode: number }>;
+  const record = () => {
+    const calls: string[][] = [];
+    const exec: Exec = async (_cmd, args) => {
+      calls.push(args);
+      return { stdout: "", exitCode: 0 };
+    };
+    return { calls, exec };
+  };
+  const noMarketplaceRoot = () => join(testHome, "no-marketplace-here");
+  const bakedShipwright = () => {
+    const dir = join(testHome, "baked", "shipwright");
+    mkdirSync(join(dir, ".claude-plugin"), { recursive: true });
+    writeFileSync(join(dir, ".claude-plugin", "marketplace.json"), "{}");
+    return dir;
+  };
+  const writeRegistry = (content: string) => {
+    mkdirSync(join(testHome, "plugins"), { recursive: true });
+    writeFileSync(
+      join(testHome, "plugins", "known_marketplaces.json"),
+      content,
+    );
+  };
+  const run = (exec: Exec, root: string, dirs: string[]) =>
+    installPlugins(
+      exec,
+      testHome,
+      [],
+      root,
+      join(testHome, "plugins", "installed_plugins.json"),
+      dirs,
+    );
+
+  it("skips the repo-root add when only a baked shipwright marketplace exists", async () => {
+    const { calls, exec } = record();
+    const baked = bakedShipwright();
+    await run(exec, noMarketplaceRoot(), [baked]);
+    expect(calls).toEqual([["plugin", "marketplace", "add", baked]]);
+  });
+
+  it("removes a stale registration before adding the baked marketplace", async () => {
+    const { calls, exec } = record();
+    const baked = bakedShipwright();
+    const stale = join(testHome, "stale-app");
+    mkdirSync(stale, { recursive: true });
+    writeRegistry(JSON.stringify({ shipwright: { installLocation: stale } }));
+    await run(exec, noMarketplaceRoot(), [baked]);
+    expect(calls).toEqual([
+      ["plugin", "marketplace", "remove", "shipwright"],
+      ["plugin", "marketplace", "add", baked],
+    ]);
+  });
+
+  it("does not remove when the registered location still has a marketplace", async () => {
+    const { calls, exec } = record();
+    const baked = bakedShipwright();
+    writeRegistry(JSON.stringify({ shipwright: { installLocation: baked } }));
+    await run(exec, noMarketplaceRoot(), [baked]);
+    expect(calls).toEqual([["plugin", "marketplace", "add", baked]]);
+  });
+
+  it("attempts no remove and warns when the registry is malformed", async () => {
+    const { calls, exec } = record();
+    const baked = bakedShipwright();
+    writeRegistry("{not json");
+    const warn = console.warn;
+    const warnings: string[] = [];
+    console.warn = (...a: unknown[]) => {
+      warnings.push(a.join(" "));
+    };
+    try {
+      await run(exec, noMarketplaceRoot(), [baked]);
+    } finally {
+      console.warn = warn;
+    }
+    expect(calls).toEqual([["plugin", "marketplace", "add", baked]]);
+    expect(warnings.some((w) => w.includes("known_marketplaces.json"))).toBe(
+      true,
+    );
+  });
+
+  it("attempts no remove when the registry is absent", async () => {
+    const { calls, exec } = record();
+    const baked = bakedShipwright();
+    await run(exec, noMarketplaceRoot(), [baked]);
+    expect(calls).toEqual([["plugin", "marketplace", "add", baked]]);
+  });
+
+  it("keeps the coding-image sequence unchanged when the repo root is a marketplace", async () => {
+    const { calls, exec } = record();
+    const root = repoRoot();
+    await run(exec, root, []);
+    expect(calls).toEqual([["plugin", "marketplace", "add", root]]);
+  });
+});

package/setup.ts

@@ -20,7 +20,7 @@ import {
   unlinkSync,
   writeFileSync,
 } from "node:fs";
-import { join, resolve } from "node:path";
+import { basename, dirname, join, resolve } from "node:path";
 import type { AgentPlugin } from "@app-vitals/agent-admin";
 import {
   resolveDefaultSpecialtyName,
@@ -382,6 +382,33 @@ export function findStalePluginSpecs(
   });
 }
 
+/**
+ * Reads the Claude CLI's known-marketplaces registry
+ * (`known_marketplaces.json`, a sibling of `installed_plugins.json`) and
+ * returns the install location it records for `name`. Defensive: returns
+ * `undefined` for a missing or unparsable registry or an unknown name, and
+ * warns when the file exists but cannot be read.
+ */
+function readRegisteredMarketplaceLocation(
+  registryPath: string,
+  name: string,
+): string | undefined {
+  if (!existsSync(registryPath)) return undefined;
+  try {
+    const registry = JSON.parse(readFileSync(registryPath, "utf8")) as Record<
+      string,
+      { installLocation?: unknown } | null
+    >;
+    const location = registry?.[name]?.installLocation;
+    return typeof location === "string" ? location : undefined;
+  } catch (err) {
+    console.warn(
+      `[agent] could not read ${registryPath} (nothing to heal): ${(err as Error).message}`,
+    );
+    return undefined;
+  }
+}
+
 /**
  * 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
@@ -432,7 +459,35 @@ export async function installPlugins(
 
     // Register extra baked marketplaces BEFORE the built-in shipwright marketplace.
     // Idempotent — safe to call on every startup.
+    const registryPath = join(
+      dirname(pluginManifestPath),
+      "known_marketplaces.json",
+    );
     for (const dir of extraDirs) {
+      // Heal a stale registration: a persistent ~/.claude may still map this
+      // marketplace name to a directory that no longer holds a marketplace
+      // (e.g. `shipwright` -> /app on the specialist image). Remove it so the
+      // add below registers the baked path.
+      const name = basename(dir);
+      const registered = readRegisteredMarketplaceLocation(registryPath, name);
+      if (
+        registered !== undefined &&
+        !existsSync(join(registered, ".claude-plugin", "marketplace.json"))
+      ) {
+        console.log(
+          `[agent] marketplace ${name} is registered at ${registered} with no marketplace.json — removing before re-adding ${dir}`,
+        );
+        const remove = await execFn(
+          "claude",
+          ["plugin", "marketplace", "remove", name],
+          { cwd },
+        );
+        if (remove.exitCode !== 0) {
+          console.warn(
+            `[agent] claude plugin marketplace remove ${name} exited ${remove.exitCode}: ${remove.stdout}`,
+          );
+        }
+      }
       const extraAdd = await execFn(
         "claude",
         ["plugin", "marketplace", "add", dir],
@@ -447,9 +502,18 @@ 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 hasRepoMarketplace = existsSync(
+      join(shipwrightRepoRoot, ".claude-plugin", "marketplace.json"),
+    );
     if (
-      existsSync(join(shipwrightRepoRoot, ".claude-plugin", "marketplace.json"))
+      !hasRepoMarketplace &&
+      extraDirs.some((dir) => basename(dir) === "shipwright")
     ) {
+      console.log(
+        `[agent] ${shipwrightRepoRoot} has no marketplace.json — using baked shipwright marketplace`,
+      );
+    }
+    if (hasRepoMarketplace) {
       const add = await execFn(
         "claude",
         ["plugin", "marketplace", "add", shipwrightRepoRoot],