@app-vitals/agent-runtime 0.16.2 → 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.2",
+  "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.2",
-    "@app-vitals/agent-lib": "0.16.2",
+    "@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.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
@@ -69,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,
@@ -93,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`);
     }
@@ -165,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.",
     );
   }
 }

package/setup.unit.test.ts

@@ -162,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[] = [];
@@ -234,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$/);
   });
 });
@@ -288,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