@app-vitals/agent-runtime 0.16.1 → 1.0.0

package/Dockerfile

@@ -175,7 +175,7 @@ RUN if [ -f bun.lock ]; then bun install --frozen-lockfile; else bun install; fi
 COPY runtime/ ./runtime/
 COPY admin/ ./admin/
 COPY lib/ ./lib/
-# Agent-type definitions (setup.ts reads identity.templatesDir from them).
+# Agent-type definitions (setup.ts reads each type's templates/ from them).
 COPY agent-types/ ./agent-types/
 # Composition root spawned by runtime/entrypoint.ts (../index.ts).
 COPY index.ts ./index.ts

package/default-specialty.shipped.integration.test.ts

@@ -7,43 +7,29 @@
 import { describe, expect, it } from "bun:test";
 import { existsSync } from "node:fs";
 import { join } from "node:path";
-import { SpecialtyRegistry } from "@app-vitals/agent-admin/specialty-manifest-loader";
+import { SpecialtyTypes } from "@app-vitals/agent-admin/specialty-types";
 import {
   resolveDefaultSpecialtyName,
-  resolveSpecialtiesDir,
   SHIPPED_AGENT_TYPES_DIR,
 } from "@app-vitals/agent-lib/default-specialty";
+import { SPECIALIST_TYPE } from "@app-vitals/agent-lib/specialist-type";
 import { resolveTemplatesDir } from "./setup.ts";
 
 const EMPTY_ENV: Record<string, string | undefined> = {};
 
 describe("platform-only boot with empty env", () => {
-  it("SpecialtyRegistry resolves the default specialist type from the shipped agent-types/ without warning", () => {
-    const warnings: string[] = [];
-    const registry = new SpecialtyRegistry({
-      typesDir: resolveSpecialtiesDir(EMPTY_ENV),
-      defaultTypeName: resolveDefaultSpecialtyName(EMPTY_ENV),
-      warn: (m) => warnings.push(m),
-    });
-    const manifest = registry.getManifest(
-      resolveDefaultSpecialtyName(EMPTY_ENV),
-    );
-    expect(manifest.metadata.name).toBe("specialist");
-    expect(warnings).toEqual([]);
-    expect(registry.listTypes().map((t) => t.name)).toContain("specialist");
+  it("the default type resolves to the built-in specialist type", () => {
+    const defaultName = resolveDefaultSpecialtyName(EMPTY_ENV);
+    const types = new SpecialtyTypes({ defaultTypeName: defaultName });
+    expect(defaultName).toBe("specialist");
+    expect(types.tryGetType(defaultName)).toBe(SPECIALIST_TYPE);
+    expect(types.listTypes().map((t) => t.name)).toEqual(["specialist"]);
   });
 
-  it("an unknown type warns and resolves to the shipped specialist manifest", () => {
-    const warnings: string[] = [];
-    const registry = new SpecialtyRegistry({
-      typesDir: SHIPPED_AGENT_TYPES_DIR,
-      defaultTypeName: "specialist",
-      warn: (m) => warnings.push(m),
-    });
-    expect(registry.getManifest("no-such-type").metadata.name).toBe(
-      "specialist",
-    );
-    expect(warnings).toHaveLength(1);
+  it("a stored legacy type still resolves to the specialist floor, but is not a valid new type", () => {
+    const types = new SpecialtyTypes({ defaultTypeName: "specialist" });
+    expect(types.getType("no-such-type")).toBe(SPECIALIST_TYPE);
+    expect(types.tryGetType("no-such-type")).toBeUndefined();
   });
 
   it("runtime resolveTemplatesDir agrees: the default type's shipped templates, no warning", () => {
@@ -56,6 +42,12 @@ describe("platform-only boot with empty env", () => {
     );
     expect(warnings).toEqual([]);
     expect(dir).toBe(join(SHIPPED_AGENT_TYPES_DIR, "specialist", "templates"));
+    expect(dir).toBe(
+      join(import.meta.dir, "..", SPECIALIST_TYPE.templatesDir).replace(
+        /\/$/,
+        "",
+      ),
+    );
     expect(existsSync(join(dir, "CLAUDE.md.template"))).toBe(true);
   });
 });

package/package.json

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

package/setup.fixture.integration.test.ts

@@ -92,18 +92,9 @@ describe("fixture specialty templates", () => {
 });
 
 describe("coding is not special-cased (PCD-2.2)", () => {
-  const writeCodingManifest = (templatesDir: string) => {
+  it("resolves coding through the templates/ convention under the specialties dir", () => {
     const specialties = join(root, "specialties");
-    mkdirSync(join(specialties, "coding"), { recursive: true });
-    writeFileSync(
-      join(specialties, "coding", "manifest.yaml"),
-      `identity:\n  templatesDir: ${templatesDir}\n`,
-    );
-    return specialties;
-  };
-
-  it("resolves coding through its manifest identity.templatesDir", () => {
-    const tpl = join(root, "coding-tpl");
+    const tpl = join(specialties, "coding", "templates");
     mkdirSync(tpl, { recursive: true });
     for (const f of [
       "CLAUDE.md.template",
@@ -113,7 +104,7 @@ describe("coding is not special-cased (PCD-2.2)", () => {
       writeFileSync(join(tpl, f), "x");
     const warnings: string[] = [];
     const dir = resolveTemplatesDir("coding", root, (m) => warnings.push(m), {
-      SHIPWRIGHT_SPECIALTIES_DIR: writeCodingManifest(tpl),
+      SHIPWRIGHT_SPECIALTIES_DIR: specialties,
     });
     expect(dir).toBe(tpl);
     expect(warnings).toEqual([]);

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

@@ -20,12 +20,13 @@ import {
   unlinkSync,
   writeFileSync,
 } from "node:fs";
-import { dirname, join, resolve } from "node:path";
+import { join, resolve } from "node:path";
 import type { AgentPlugin } from "@app-vitals/agent-admin";
 import {
   resolveDefaultSpecialtyName,
   resolveSpecialtiesDir,
 } from "@app-vitals/agent-lib/default-specialty";
+import { SPECIALIST_TYPE } from "@app-vitals/agent-lib/specialist-type";
 
 // ---------------------------------------------------------------------------
 // Template loading
@@ -57,12 +58,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).
@@ -75,17 +70,17 @@ const REQUIRED_TEMPLATES: readonly string[] = [
 /**
  * Resolves the workspace template directory for a specialty (ARD-6.1).
  *
- * Reads `identity.templatesDir` from `<specialtiesDir>/<specialty>/manifest.yaml`,
- * where specialtiesDir is SHIPWRIGHT_SPECIALTIES_DIR or the shipped
- * `agent-types/` (shared helper: @app-vitals/agent-lib/default-specialty). A
- * relative templatesDir resolves against the repo root, then the specialties
- * dir's parent (how the shipped manifests spell it: `agent-types/<t>/templates/`),
- * then the manifest's own directory. An absent type resolves as the default
- * type (`specialist`, or SHIPWRIGHT_DEFAULT_AGENT_TYPE). Returns the built-in
- * (generic) workspace/ dir for any type that does not resolve (no manifest,
- * unparseable, or the directory is missing or lacks a required template),
- * logging a warning. An unknown requested type first falls back to the default
- * type's templates (with a warning) before the built-in dir. Never throws: a template lookup must not fail boot.
+ * A type's templates live at `<specialtiesDir>/<specialty>/templates/`, where
+ * specialtiesDir is SHIPWRIGHT_SPECIALTIES_DIR or the shipped `agent-types/`
+ * (shared helper: @app-vitals/agent-lib/default-specialty). The built-in
+ * specialist type additionally resolves its record's `templatesDir`
+ * (lib/specialist-type.ts) against the repo root. An absent type resolves as
+ * the default type (`specialist`, or SHIPWRIGHT_DEFAULT_AGENT_TYPE). Returns
+ * the built-in (generic) workspace/ dir for any type that does not resolve
+ * (the directory is missing or lacks a required template), logging a warning.
+ * An unknown requested type first falls back to the default type's templates
+ * (with a warning) before the built-in dir. Never throws: a template lookup
+ * must not fail boot.
  */
 export function resolveTemplatesDir(
   requestedType: string | undefined,
@@ -99,24 +94,13 @@ export function resolveTemplatesDir(
   const specialtiesDir = resolveSpecialtiesDir(env);
 
   const lookup = (name: string): string => {
-    const manifestPath = join(specialtiesDir, name, "manifest.yaml");
-    const manifest = Bun.YAML.parse(readFileSync(manifestPath, "utf8")) as {
-      identity?: { templatesDir?: unknown };
-    };
-    const templatesDir = manifest?.identity?.templatesDir;
-    if (typeof templatesDir !== "string" || templatesDir === "") {
-      throw new Error("manifest has no identity.templatesDir");
+    const candidates = [join(specialtiesDir, name, "templates")];
+    if (name === SPECIALIST_TYPE.name) {
+      candidates.push(resolve(repoRoot, SPECIALIST_TYPE.templatesDir));
     }
-    // Manifests spell templatesDir relative to the repo root, or (shipped
-    // agent-types/, where the repo root may not be the image root) relative to
-    // the specialties dir's parent; a self-contained specialty (e.g. the
-    // platform test fixture) spells it relative to its own directory.
     const dir =
-      [
-        resolve(repoRoot, templatesDir),
-        resolve(dirname(specialtiesDir), templatesDir),
-      ].find((candidate) => existsSync(candidate)) ??
-      resolve(dirname(manifestPath), templatesDir);
+      candidates.find((candidate) => existsSync(candidate)) ??
+      (candidates[0] as string);
     if (!statSync(dir).isDirectory()) {
       throw new Error(`${dir} is not a directory`);
     }
@@ -171,7 +155,7 @@ function readTemplate(
       `Missing workspace template: ${path}. The runtime ships no product ` +
         "templates of its own: set SHIPWRIGHT_SPECIALTIES_DIR to a directory " +
         "of specialties and SHIPWRIGHT_DEFAULT_AGENT_TYPE to the specialty " +
-        "whose identity.templatesDir provides it.",
+        "whose templates/ directory provides it.",
     );
   }
 }
@@ -399,15 +383,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 +447,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 +484,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 +499,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);
   });
 });
@@ -267,7 +162,7 @@ describe("discoverBakedMarketplaces", () => {
 });
 
 describe("resolveTemplatesDir option resolution (AEP-1.2)", () => {
-  it("resolves the shipped specialist manifest to agent-types/specialist/templates/ with no warning (SAI-1.2)", async () => {
+  it("resolves the shipped specialist type to agent-types/specialist/templates/ with no warning (SAI-1.2)", async () => {
     const { resolveTemplatesDir } = await import("./setup.ts");
     const repoRoot = join(import.meta.dir, "..");
     const warnings: string[] = [];
@@ -339,10 +234,10 @@ describe("resolveTemplatesDir option resolution (AEP-1.2)", () => {
         SHIPWRIGHT_SPECIALTIES_DIR: "/fixture/types",
       },
     );
-    // Missing fixture manifest → warns naming the type, falls back built-in.
+    // Missing fixture templates dir → warns naming the type, falls back built-in.
     expect(warnings).toHaveLength(1);
     expect(warnings[0]).toContain('"base"');
-    expect(warnings[0]).toContain("/fixture/types/base/manifest.yaml");
+    expect(warnings[0]).toContain("/fixture/types/base/templates");
     expect(dir).toMatch(/workspace$/);
   });
 });
@@ -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);
   });
 
@@ -388,22 +288,18 @@ describe("SHIPWRIGHT_REPO_ROOT override (PCB-1.1)", () => {
     const makeRoot = () => {
       const root = mkdtempSync(join(tmpdir(), "repo-root-"));
       const dir = join(root, "types", "foo");
-      mkdirSync(join(dir, "tpl"), { recursive: true });
-      writeFileSync(
-        join(dir, "manifest.yaml"),
-        "identity:\n  templatesDir: tpl\n",
-      );
+      mkdirSync(join(dir, "templates"), { recursive: true });
       for (const f of [
         "CLAUDE.md.template",
         "SOUL.md.template",
         "IDENTITY.md.template",
       ]) {
-        writeFileSync(join(dir, "tpl", f), "x");
+        writeFileSync(join(dir, "templates", f), "x");
       }
-      return { root, tpl: join(dir, "tpl") };
+      return { root, tpl: join(dir, "templates") };
     };
 
-    it("resolves templatesDir against SHIPWRIGHT_REPO_ROOT when set", () => {
+    it("resolves a type's templates/ under SHIPWRIGHT_SPECIALTIES_DIR when SHIPWRIGHT_REPO_ROOT is set", () => {
       const { root, tpl } = makeRoot();
       try {
         const warnings: string[] = [];

package/workspace/SPECIALTY.md.template.content.test.ts

@@ -4,7 +4,7 @@
  * The platform's SPECIALTY.md.template is the generic fallback for every agent
  * type, so it must stay a neutral stub. Specialty-specific pipeline content
  * (e.g. the coding specialty's Shipwright workflow) is shipped by the specialty
- * itself through its manifest's identity.templatesDir.
+ * itself in its templates/ directory.
  *
  * Content-assertion only: readFileSync, no I/O beyond local file reads.
  */

package/fixtures/specialties/fixture/manifest.yaml

@@ -1,35 +0,0 @@
-# Minimal fixture specialty (AGR-1.9). Platform tests point
-# SHIPWRIGHT_SPECIALTIES_DIR at the parent of this directory and
-# SHIPWRIGHT_DEFAULT_AGENT_TYPE at "fixture", so the platform test suite needs
-# no coding specialty. It is test data, not a product specialty: no crons, no
-# plugins, no GitHub scope.
-apiVersion: shipwright.dev/v1alpha1
-kind: Specialty
-metadata:
-  name: fixture
-  displayName: Fixture Agent
-  description: Minimal specialty used by the platform test suite.
-  version: 1.0.0
-  skills: []
-identity:
-  # Resolved against the repo root first, then against this manifest's own directory.
-  templatesDir: templates/
-crons: []
-plugins:
-  - fixture-plugin
-tools:
-  - Bash
-  - WebSearch
-env:
-  required:
-    - key: CLAUDE_CODE_OAUTH_TOKEN
-      description: Claude Code OAuth token used to authenticate the agent's Claude sessions.
-      secret: true
-  optional:
-    - key: GH_TOKEN
-      description: GitHub Personal Access Token.
-      secret: true
-members: []
-repos: []
-chat: true
-voice: true