@app-vitals/agent-runtime 0.6.0 → 0.6.1

package/package.json

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

package/setup.ts

@@ -40,7 +40,18 @@ const WORKSPACE_TEMPLATE_DIR =
 // Repo root — two levels up from agent/src/. In Docker this is /app; on the Pi
 // it resolves to the checkout root. Uses a local marketplace so plugins are always
 // available regardless of whether the GitHub repo is accessible.
-const SHIPWRIGHT_REPO_ROOT = join(import.meta.dir, "..", "..", "..");
+const DEFAULT_SHIPWRIGHT_REPO_ROOT = join(import.meta.dir, "..", "..", "..");
+
+/**
+ * The repo root used for the built-in marketplace and specialty lookup.
+ * `SHIPWRIGHT_REPO_ROOT` overrides the computed default (which resolves to `/`
+ * in the platform image layout); unset or empty keeps the computed default.
+ */
+export function resolveShipwrightRepoRoot(
+  env: Record<string, string | undefined> = process.env,
+): string {
+  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";
@@ -73,10 +84,11 @@ const REQUIRED_TEMPLATES: readonly string[] = [
  */
 export function resolveTemplatesDir(
   requestedType: string | undefined,
-  repoRoot: string = SHIPWRIGHT_REPO_ROOT,
+  repoRootOverride?: string,
   warn: (message: string) => void = (m) => console.warn(m),
   env: Record<string, string | undefined> = process.env,
 ): string {
+  const repoRoot = repoRootOverride ?? resolveShipwrightRepoRoot(env);
   const typeName =
     requestedType ||
     env.SHIPWRIGHT_DEFAULT_AGENT_TYPE ||
@@ -393,7 +405,7 @@ export async function installPlugins(
   execFn: ExecFn = defaultExec,
   cwd: string = process.cwd(),
   agentPlugins: AgentPlugin[] = [],
-  shipwrightRepoRoot: string = SHIPWRIGHT_REPO_ROOT,
+  shipwrightRepoRootOverride?: string,
   pluginManifestPath: string = join(
     process.env.HOME ?? "/root",
     ".claude",
@@ -402,7 +414,10 @@ export async function installPlugins(
   ),
   extraMarketplaceDirs?: string[],
   extraMarketplacesRoot: string = BAKED_MARKETPLACES_ROOT,
+  env: Record<string, string | undefined> = process.env,
 ): Promise<void> {
+  const shipwrightRepoRoot =
+    shipwrightRepoRootOverride ?? resolveShipwrightRepoRoot(env);
   try {
     // Determine which extra marketplace dirs to register.
     // Explicit list (injected via tests) takes precedence over discovery.

package/setup.unit.test.ts

@@ -5,7 +5,15 @@
  */
 
 import { describe, expect, it } from "bun:test";
-import { discoverBakedMarketplaces, installPlugins } from "./setup.ts";
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import {
+  discoverBakedMarketplaces,
+  installPlugins,
+  resolveShipwrightRepoRoot,
+  resolveTemplatesDir,
+} from "./setup.ts";
 
 // Explicit empty extra-marketplace list — every call in this describe block
 // must pass this (or an intentional array) instead of omitting the arg.
@@ -284,3 +292,94 @@ describe("resolveTemplatesDir option resolution (AEP-1.2)", () => {
     expect(dir).toMatch(/workspace$/);
   });
 });
+
+describe("SHIPWRIGHT_REPO_ROOT override (PCB-1.1)", () => {
+  const recordExec = () => {
+    const calls: string[][] = [];
+    const exec = async (_cmd: string, args: string[]) => {
+      calls.push(args);
+      return { stdout: "", exitCode: 0 };
+    };
+    return { calls, exec };
+  };
+  const registerRoot = async (env: Record<string, string | undefined>) => {
+    const { calls, exec } = recordExec();
+    await installPlugins(
+      exec,
+      "/tmp/cwd",
+      [],
+      undefined,
+      "/tmp/nonexistent-manifest.json",
+      NO_EXTRA_MARKETPLACES,
+      "/tmp/nonexistent-baked-root",
+      env,
+    );
+    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",
+    );
+  });
+
+  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");
+    expect(await registerRoot({ SHIPWRIGHT_REPO_ROOT: "" })).toBe(unset);
+  });
+
+  describe("resolveTemplatesDir", () => {
+    const makeRoot = () => {
+      const root = mkdtempSync(join(tmpdir(), "repo-root-"));
+      const dir = join(root, "specialties", "foo");
+      mkdirSync(join(dir, "tpl"), { recursive: true });
+      writeFileSync(join(dir, "manifest.yaml"), "identity:\n  templatesDir: tpl\n");
+      for (const f of [
+        "CLAUDE.md.template",
+        "SOUL.md.template",
+        "IDENTITY.md.template",
+      ]) {
+        writeFileSync(join(dir, "tpl", f), "x");
+      }
+      return { root, tpl: join(dir, "tpl") };
+    };
+
+    it("looks up specialties under SHIPWRIGHT_REPO_ROOT when set", () => {
+      const { root, tpl } = makeRoot();
+      try {
+        const warnings: string[] = [];
+        const dir = resolveTemplatesDir(
+          "foo",
+          undefined,
+          (m) => warnings.push(m),
+          { SHIPWRIGHT_REPO_ROOT: root },
+        );
+        expect(warnings).toEqual([]);
+        expect(dir).toBe(tpl);
+      } finally {
+        rmSync(root, { recursive: true, force: true });
+      }
+    });
+
+    it("does not use the override when unset or empty", () => {
+      const { root, tpl } = makeRoot();
+      try {
+        for (const env of [{}, { SHIPWRIGHT_REPO_ROOT: "" }]) {
+          const warnings: string[] = [];
+          const dir = resolveTemplatesDir(
+            "foo",
+            undefined,
+            (m) => warnings.push(m),
+            env,
+          );
+          expect(dir).not.toBe(tpl);
+          expect(warnings).toHaveLength(1);
+        }
+      } finally {
+        rmSync(root, { recursive: true, force: true });
+      }
+    });
+  });
+});