@app-vitals/agent-runtime 0.16.2 → 1.1.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/{shipwright-config-client.ts → agent-config-client.ts}

@@ -1,8 +1,8 @@
 /**
- * agent/src/runtime/shipwright-config-client.ts
+ * agent/src/runtime/agent-config-client.ts
  *
- * - ShipwrightConfigClient — interface for DI (used by entrypoint and tests)
- * - RecordedShipwrightConfigClient — cassette-backed double for tests
+ * - AgentConfigClient — interface for DI (used by entrypoint and tests)
+ * - RecordedAgentConfigClient — cassette-backed double for tests
  *
  * The HTTP implementation was consolidated into HttpShipwrightRuntimeClient
  * (shipwright-runtime-client.ts). Wire that via getAgentConfigBundle() as the
@@ -13,17 +13,17 @@ import type { AgentConfigResponse } from "@app-vitals/agent-admin";
 
 // ─── Interface ────────────────────────────────────────────────────────────────
 
-export interface ShipwrightConfigClient {
+export interface AgentConfigClient {
   getConfig(agentId: string): Promise<AgentConfigResponse>;
 }
 
-// ─── RecordedShipwrightConfigClient ───────────────────────────────────────────
+// ─── RecordedAgentConfigClient ───────────────────────────────────────────
 
 /**
  * Cassette-backed client for tests.
  * Returns a fixed AgentConfigResponse on every call — no network required.
  */
-export class RecordedShipwrightConfigClient implements ShipwrightConfigClient {
+export class RecordedAgentConfigClient implements AgentConfigClient {
   private readonly cassette: AgentConfigResponse;
 
   constructor(cassette: AgentConfigResponse) {

package/boot.ts

@@ -364,8 +364,9 @@ export async function startAgent(
         message: string,
         sessionKey?: string,
         onProgress?: ProgressCallback,
+        signal?: AbortSignal,
         extraEnv?: Record<string, string>,
-      ) => runner(message, sessionKey, onProgress, undefined, extraEnv),
+      ) => runner(message, sessionKey, onProgress, signal, extraEnv),
       markdownToSlack,
       threadKey,
       undefined, // appFactory — default Bolt App

package/cutover-validate.integration.test.ts

@@ -10,7 +10,7 @@ import type {
   AgentCronJob,
 } from "@app-vitals/agent-admin";
 import {
-  type ShipwrightConfigClient,
+  type CutoverConfigClient,
   validateCutover,
 } from "./cutover-validate.ts";
 
@@ -62,7 +62,7 @@ function makeConfig(env: Record<string, string>): AgentConfigResponse {
 
 // ─── Recorded double ──────────────────────────────────────────────────────────
 
-class RecordedShipwrightConfigClient implements ShipwrightConfigClient {
+class RecordedAgentConfigClient implements CutoverConfigClient {
   constructor(
     private readonly config: AgentConfigResponse,
     private readonly crons: AgentCronJob[],
@@ -100,7 +100,7 @@ function makePatEnv(): Record<string, string> {
 
 describe("validateCutover", () => {
   it("returns all passing when SLACK_BOT_TOKEN + GitHub App creds + crons present", async () => {
-    const client = new RecordedShipwrightConfigClient(
+    const client = new RecordedAgentConfigClient(
       makeConfig(makeAppAuthEnv()),
       [makeCron("cron-1")],
     );
@@ -109,7 +109,7 @@ describe("validateCutover", () => {
   });
 
   it("returns all passing when SLACK_BOT_TOKEN + GH_TOKEN (PAT) + crons present", async () => {
-    const client = new RecordedShipwrightConfigClient(
+    const client = new RecordedAgentConfigClient(
       makeConfig(makePatEnv()),
       [makeCron("cron-1")],
     );
@@ -119,7 +119,7 @@ describe("validateCutover", () => {
 
   it("does NOT fail when SLACK_BOT_TOKEN is missing — a chat-only agent is a supported configuration", async () => {
     const { SLACK_BOT_TOKEN: _s, ...env } = makeAppAuthEnv();
-    const client = new RecordedShipwrightConfigClient(makeConfig(env), [
+    const client = new RecordedAgentConfigClient(makeConfig(env), [
       makeCron("cron-1"),
     ]);
     const results = await validateCutover(client, AGENT_ID);
@@ -132,7 +132,7 @@ describe("validateCutover", () => {
   });
 
   it("reports SLACK_BOT_TOKEN as present when it is set", async () => {
-    const client = new RecordedShipwrightConfigClient(
+    const client = new RecordedAgentConfigClient(
       makeConfig(makeAppAuthEnv()),
       [makeCron("cron-1")],
     );
@@ -144,7 +144,7 @@ describe("validateCutover", () => {
 
   it("names no failing check when only SLACK_BOT_TOKEN is missing", async () => {
     const { SLACK_BOT_TOKEN: _s, ...env } = makeAppAuthEnv();
-    const client = new RecordedShipwrightConfigClient(makeConfig(env), [
+    const client = new RecordedAgentConfigClient(makeConfig(env), [
       makeCron("cron-1"),
     ]);
     const results = await validateCutover(client, AGENT_ID);
@@ -152,7 +152,7 @@ describe("validateCutover", () => {
   });
 
   it("fails when GitHub auth credentials are missing", async () => {
-    const client = new RecordedShipwrightConfigClient(
+    const client = new RecordedAgentConfigClient(
       makeConfig({ SLACK_BOT_TOKEN: "xoxb-token" }),
       [makeCron("cron-1")],
     );
@@ -163,7 +163,7 @@ describe("validateCutover", () => {
   });
 
   it("fails when no crons are present", async () => {
-    const client = new RecordedShipwrightConfigClient(
+    const client = new RecordedAgentConfigClient(
       makeConfig(makeAppAuthEnv()),
       [],
     );
@@ -174,7 +174,7 @@ describe("validateCutover", () => {
   });
 
   it("reports all failing checks when multiple checks fail", async () => {
-    const client = new RecordedShipwrightConfigClient(makeConfig({}), []);
+    const client = new RecordedAgentConfigClient(makeConfig({}), []);
     const results = await validateCutover(client, AGENT_ID);
     const failed = results.filter((r) => !r.passed);
     expect(failed.length).toBeGreaterThanOrEqual(2);
@@ -192,7 +192,7 @@ describe("validateCutover", () => {
       GH_APP_PRIVATE_KEY: "some-key",
       // GH_APP_INSTALLATION_ID intentionally omitted — discovered at runtime
     };
-    const client = new RecordedShipwrightConfigClient(makeConfig(env), [
+    const client = new RecordedAgentConfigClient(makeConfig(env), [
       makeCron("cron-1"),
     ]);
     const results = await validateCutover(client, AGENT_ID);
@@ -207,7 +207,7 @@ describe("validateCutover", () => {
       GH_APP_ID: "12345",
       GH_APP_INSTALLATION_ID: "67890",
     };
-    const client = new RecordedShipwrightConfigClient(makeConfig(env), [
+    const client = new RecordedAgentConfigClient(makeConfig(env), [
       makeCron("cron-1"),
     ]);
     const results = await validateCutover(client, AGENT_ID);
@@ -222,7 +222,7 @@ describe("validateCutover", () => {
       ...makeCron("cron-disabled"),
       enabled: false,
     };
-    const client = new RecordedShipwrightConfigClient(
+    const client = new RecordedAgentConfigClient(
       makeConfig(makeAppAuthEnv()),
       [disabledCron],
     );
@@ -239,7 +239,7 @@ describe("validateCutover", () => {
       GH_APP_PRIVATE_KEY: "some-key",
       GH_APP_INSTALLATION_ID: "11111",
     };
-    const client = new RecordedShipwrightConfigClient(makeConfig(env), [
+    const client = new RecordedAgentConfigClient(makeConfig(env), [
       makeCron("cron-1"),
     ]);
     const results = await validateCutover(client, AGENT_ID);

package/cutover-validate.ts

@@ -15,11 +15,11 @@ import type {
   AgentConfigResponse,
   AgentCronJob,
 } from "@app-vitals/agent-admin";
+import type { AgentConfigClient } from "./agent-config-client.ts";
 
 // ─── Types ────────────────────────────────────────────────────────────────────
 
-export interface ShipwrightConfigClient {
-  getConfig(agentId: string): Promise<AgentConfigResponse>;
+export interface CutoverConfigClient extends AgentConfigClient {
   getCrons(agentId: string): Promise<AgentCronJob[]>;
 }
 
@@ -39,7 +39,7 @@ function hasGitHubAuth(env: Record<string, string>): boolean {
 }
 
 export async function validateCutover(
-  client: ShipwrightConfigClient,
+  client: CutoverConfigClient,
   agentId: string,
 ): Promise<CheckResult[]> {
   const [config, crons] = await Promise.all([

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/entrypoint.integration.test.ts

@@ -2,7 +2,7 @@
  * agent/src/runtime/entrypoint.integration.test.ts
  *
  * Integration tests for the startup sequence in entrypoint.ts.
- * Uses RecordedShipwrightConfigClient (cassette-backed) — no real HTTP.
+ * Uses RecordedAgentConfigClient (cassette-backed) — no real HTTP.
  * Isolation contract: no mock.module(), no global overrides.
  */
 
@@ -12,8 +12,8 @@ import { join } from "node:path";
 import type { AgentConfigResponse } from "@app-vitals/agent-admin";
 import type { EntrypointDeps } from "./entrypoint.ts";
 import { runEntrypoint } from "./entrypoint.ts";
-import type { ShipwrightConfigClient } from "./shipwright-config-client.ts";
-import { RecordedShipwrightConfigClient } from "./shipwright-config-client.ts";
+import type { AgentConfigClient } from "./agent-config-client.ts";
+import { RecordedAgentConfigClient } from "./agent-config-client.ts";
 
 // ─── Test fixtures ─────────────────────────────────────────────────────────────
 
@@ -70,7 +70,7 @@ interface SetupGitHubAuthCall {
 }
 
 function makeDeps(
-  configClient: ShipwrightConfigClient,
+  configClient: AgentConfigClient,
   overrides: Partial<EntrypointDeps> = {},
 ): {
   deps: EntrypointDeps;
@@ -138,7 +138,7 @@ function makeDeps(
 
 describe("runEntrypoint — happy path", () => {
   it("exports the specialty to the server process when the config carries one (ARD-6.1)", async () => {
-    const configClient = new RecordedShipwrightConfigClient({
+    const configClient = new RecordedAgentConfigClient({
       ...SAMPLE_CONFIG,
       specialty: "specialist",
     });
@@ -148,14 +148,14 @@ describe("runEntrypoint — happy path", () => {
   });
 
   it("exports the default specialty from the config bundle (AGR-6.3: specialty is required)", async () => {
-    const configClient = new RecordedShipwrightConfigClient(SAMPLE_CONFIG);
+    const configClient = new RecordedAgentConfigClient(SAMPLE_CONFIG);
     const { deps, appliedEnv } = makeDeps(configClient);
     await runEntrypoint(deps);
     expect(appliedEnv.SHIPWRIGHT_AGENT_TYPE).toBe("coding");
   });
 
   it("fetches config and applies env vars from the bundle", async () => {
-    const configClient = new RecordedShipwrightConfigClient(SAMPLE_CONFIG);
+    const configClient = new RecordedAgentConfigClient(SAMPLE_CONFIG);
     const { deps, appliedEnv } = makeDeps(configClient);
 
     await runEntrypoint(deps);
@@ -165,7 +165,7 @@ describe("runEntrypoint — happy path", () => {
   });
 
   it("symlinks ~/.claude to $AGENT_HOME/dot-claude", async () => {
-    const configClient = new RecordedShipwrightConfigClient(SAMPLE_CONFIG);
+    const configClient = new RecordedAgentConfigClient(SAMPLE_CONFIG);
     const { deps, symlinkCalls } = makeDeps(configClient);
 
     await runEntrypoint(deps);
@@ -175,7 +175,7 @@ describe("runEntrypoint — happy path", () => {
   });
 
   it("calls setupGitHubAuth", async () => {
-    const configClient = new RecordedShipwrightConfigClient(SAMPLE_CONFIG);
+    const configClient = new RecordedAgentConfigClient(SAMPLE_CONFIG);
     const { deps, githubAuthCalled } = makeDeps(configClient);
 
     await runEntrypoint(deps);
@@ -184,7 +184,7 @@ describe("runEntrypoint — happy path", () => {
   });
 
   it("calls runMiseStartup with agentHome", async () => {
-    const configClient = new RecordedShipwrightConfigClient(SAMPLE_CONFIG);
+    const configClient = new RecordedAgentConfigClient(SAMPLE_CONFIG);
     const { deps, miseCalls } = makeDeps(configClient);
 
     await runEntrypoint(deps);
@@ -194,7 +194,7 @@ describe("runEntrypoint — happy path", () => {
   });
 
   it("calls installPlugins with plugins from config", async () => {
-    const configClient = new RecordedShipwrightConfigClient(SAMPLE_CONFIG);
+    const configClient = new RecordedAgentConfigClient(SAMPLE_CONFIG);
     const { deps, pluginCalls } = makeDeps(configClient);
 
     await runEntrypoint(deps);
@@ -203,7 +203,7 @@ describe("runEntrypoint — happy path", () => {
   });
 
   it("spawns the agent server after setup completes", async () => {
-    const configClient = new RecordedShipwrightConfigClient(SAMPLE_CONFIG);
+    const configClient = new RecordedAgentConfigClient(SAMPLE_CONFIG);
     const { deps, spawnCalls } = makeDeps(configClient);
 
     await runEntrypoint(deps);
@@ -213,7 +213,7 @@ describe("runEntrypoint — happy path", () => {
   });
 
   it("does not call exit on success", async () => {
-    const configClient = new RecordedShipwrightConfigClient(SAMPLE_CONFIG);
+    const configClient = new RecordedAgentConfigClient(SAMPLE_CONFIG);
     const { deps, exitCodes } = makeDeps(configClient);
 
     await runEntrypoint(deps);
@@ -224,7 +224,7 @@ describe("runEntrypoint — happy path", () => {
 
 describe("runEntrypoint — missing required vars", () => {
   it("exits non-zero when agentId is missing", async () => {
-    const configClient = new RecordedShipwrightConfigClient(SAMPLE_CONFIG);
+    const configClient = new RecordedAgentConfigClient(SAMPLE_CONFIG);
     const { deps, exitCodes } = makeDeps(configClient, { agentId: undefined });
 
     await runEntrypoint(deps);
@@ -234,7 +234,7 @@ describe("runEntrypoint — missing required vars", () => {
   });
 
   it("exits non-zero when apiUrl is missing", async () => {
-    const configClient = new RecordedShipwrightConfigClient(SAMPLE_CONFIG);
+    const configClient = new RecordedAgentConfigClient(SAMPLE_CONFIG);
     const { deps, exitCodes } = makeDeps(configClient, { apiUrl: undefined });
 
     await runEntrypoint(deps);
@@ -244,7 +244,7 @@ describe("runEntrypoint — missing required vars", () => {
   });
 
   it("exits non-zero when apiKey is missing", async () => {
-    const configClient = new RecordedShipwrightConfigClient(SAMPLE_CONFIG);
+    const configClient = new RecordedAgentConfigClient(SAMPLE_CONFIG);
     const { deps, exitCodes } = makeDeps(configClient, { apiKey: undefined });
 
     await runEntrypoint(deps);
@@ -254,9 +254,9 @@ describe("runEntrypoint — missing required vars", () => {
   });
 
   it("does not fetch config when required vars are missing", async () => {
-    const configClient = new RecordedShipwrightConfigClient(SAMPLE_CONFIG);
+    const configClient = new RecordedAgentConfigClient(SAMPLE_CONFIG);
     let fetchCalled = false;
-    const trackingClient: ShipwrightConfigClient = {
+    const trackingClient: AgentConfigClient = {
       getConfig: async (agentId: string) => {
         fetchCalled = true;
         return configClient.getConfig(agentId);
@@ -289,7 +289,7 @@ describe("runEntrypoint — config with empty env", () => {
       cleanupMergedWorktrees: true,
       cleanupAfterDays: 14,
     };
-    const configClient = new RecordedShipwrightConfigClient(emptyConfig);
+    const configClient = new RecordedAgentConfigClient(emptyConfig);
     const { deps, exitCodes, spawnCalls } = makeDeps(configClient);
 
     await runEntrypoint(deps);
@@ -302,7 +302,7 @@ describe("runEntrypoint — config with empty env", () => {
 
 describe("runEntrypoint — startup timeout", () => {
   it("exits non-zero when startup exceeds startupTimeoutMs", async () => {
-    const hangingClient: ShipwrightConfigClient = {
+    const hangingClient: AgentConfigClient = {
       getConfig: () => new Promise(() => {}), // never resolves
     };
     const { deps, exitCodes } = makeDeps(hangingClient, {

package/entrypoint.ts

@@ -19,7 +19,7 @@
 
 import { join } from "node:path";
 import type { AgentPlugin } from "@app-vitals/agent-admin";
-import type { ShipwrightConfigClient } from "./shipwright-config-client.ts";
+import type { AgentConfigClient } from "./agent-config-client.ts";
 
 // ─── Types ────────────────────────────────────────────────────────────────────
 
@@ -34,7 +34,7 @@ export interface EntrypointDeps {
   apiUrl: string | undefined;
   apiKey: string | undefined;
   agentHome: string;
-  configClient: ShipwrightConfigClient;
+  configClient: AgentConfigClient;
   applyEnv: (env: Record<string, string>) => void;
   symlinkDotClaude: (target: string, linkPath: string) => void;
   setupGitHubAuth: () => Promise<void>;
@@ -98,7 +98,7 @@ export async function runEntrypoint(deps: EntrypointDeps): Promise<void> {
 
   const startup = async () => {
     // Step 2: Fetch config from Shipwright API
-    let config: Awaited<ReturnType<ShipwrightConfigClient["getConfig"]>>;
+    let config: Awaited<ReturnType<AgentConfigClient["getConfig"]>>;
     try {
       config = await configClient.getConfig(agentId as string);
       console.log(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@app-vitals/agent-runtime",
-  "version": "0.16.2",
+  "version": "1.1.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.1.0",
+    "@app-vitals/agent-lib": "1.1.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/slack-chat-conversation.integration.test.ts

@@ -156,6 +156,7 @@ describe("Slack chat conversation journey — DM multi-turn continuity", () => {
       "[U1]: Hey, can you look into the failing build?",
       "D100:1000.001",
       expect.any(Function),
+      expect.any(AbortSignal),
       { SLACK_CHANNEL_ID: "D100", SLACK_THREAD_TS: "1000.001" },
     );
     expect(say1).toHaveBeenCalledWith({
@@ -200,6 +201,7 @@ describe("Slack chat conversation journey — DM multi-turn continuity", () => {
       "[U1]: Any update?",
       establishedKey,
       expect.any(Function),
+      expect.any(AbortSignal),
       { SLACK_CHANNEL_ID: "D100", SLACK_THREAD_TS: "1000.001" },
     );
     expect(say2).toHaveBeenCalledWith({
@@ -250,6 +252,7 @@ describe("Slack chat conversation journey — channel app_mention thread continu
       "[U2]: <@UBOT123> can you check the deploy?",
       mentionKey,
       expect.any(Function),
+      expect.any(AbortSignal),
       { SLACK_CHANNEL_ID: "C500", SLACK_THREAD_TS: "2000.001" },
     );
     expect(say1).toHaveBeenCalledWith({
@@ -291,6 +294,7 @@ describe("Slack chat conversation journey — channel app_mention thread continu
       "[Thread message — respond normally, or use [silent] if no response is needed]\n[U2]: thanks, any update?",
       mentionKey,
       expect.any(Function),
+      expect.any(AbortSignal),
       { SLACK_CHANNEL_ID: "C500", SLACK_THREAD_TS: "2000.001" },
     );
     expect(say2).toHaveBeenCalledWith({

package/slack.integration.test.ts

@@ -404,6 +404,7 @@ describe("message handler — DM routing", () => {
       "Hello from rich text",
       "D123:111.222",
       expect.any(Function),
+      expect.any(AbortSignal),
       { SLACK_CHANNEL_ID: "D123", SLACK_THREAD_TS: "111.222" },
     );
   });
@@ -429,6 +430,7 @@ describe("message handler — DM routing", () => {
       "Plain text wins",
       "D123:111.222",
       expect.any(Function),
+      expect.any(AbortSignal),
       { SLACK_CHANNEL_ID: "D123", SLACK_THREAD_TS: "111.222" },
     );
   });
@@ -443,6 +445,7 @@ describe("message handler — DM routing", () => {
       "Do the thing",
       "D123:111.222",
       expect.any(Function),
+      expect.any(AbortSignal),
       { SLACK_CHANNEL_ID: "D123", SLACK_THREAD_TS: "111.222" },
     );
   });
@@ -453,6 +456,7 @@ describe("message handler — DM routing", () => {
       "Hello bot",
       "D456:0.9",
       expect.any(Function),
+      expect.any(AbortSignal),
       { SLACK_CHANNEL_ID: "D456", SLACK_THREAD_TS: "0.9" },
     );
   });
@@ -1009,6 +1013,7 @@ describe("message handler — channel thread routing", () => {
       "[Thread message — respond normally, or use [silent] if no response is needed]\nFollowup message",
       "C123:1.0",
       expect.any(Function),
+      expect.any(AbortSignal),
       { SLACK_CHANNEL_ID: "C123", SLACK_THREAD_TS: "1.0" },
     );
     expect(client.chat.appendStream).toHaveBeenCalled();
@@ -1062,6 +1067,7 @@ describe("message handler — channel thread routing", () => {
       "[Thread message — respond normally, or use [silent] if no response is needed]\nFollowup message",
       "C123:1.0",
       expect.any(Function),
+      expect.any(AbortSignal),
       { SLACK_CHANNEL_ID: "C123", SLACK_THREAD_TS: "1.0" },
     );
     expect(client.chat.appendStream).toHaveBeenCalled();
@@ -1085,6 +1091,7 @@ describe("message handler — channel thread routing", () => {
       "[Thread message — respond normally, or use [silent] if no response is needed]\nGood work bot",
       "C-CRON:200.0",
       expect.any(Function),
+      expect.any(AbortSignal),
       { SLACK_CHANNEL_ID: "C-CRON", SLACK_THREAD_TS: "200.0" },
     );
     expect(client.chat.appendStream).toHaveBeenCalled();
@@ -1254,6 +1261,7 @@ describe("message handler — file handling", () => {
       "[file: /tmp/test-image.jpg]\nlook at this",
       "D1:1.1",
       expect.any(Function),
+      expect.any(AbortSignal),
       { SLACK_CHANNEL_ID: "D1", SLACK_THREAD_TS: "1.1" },
     );
   });
@@ -1279,6 +1287,7 @@ describe("message handler — file handling", () => {
       "[file: /tmp/test.pdf]",
       "D1:1.1",
       expect.any(Function),
+      expect.any(AbortSignal),
       { SLACK_CHANNEL_ID: "D1", SLACK_THREAD_TS: "1.1" },
     );
   });
@@ -1305,6 +1314,7 @@ describe("message handler — file handling", () => {
       "here is a file",
       "D1:1.1",
       expect.any(Function),
+      expect.any(AbortSignal),
       { SLACK_CHANNEL_ID: "D1", SLACK_THREAD_TS: "1.1" },
     );
   });
@@ -1333,6 +1343,7 @@ describe("message handler — file handling", () => {
       "with erroring file",
       "D1:1.1",
       expect.any(Function),
+      expect.any(AbortSignal),
       { SLACK_CHANNEL_ID: "D1", SLACK_THREAD_TS: "1.1" },
     );
   });
@@ -1390,6 +1401,7 @@ describe("app_mention handler", () => {
       "<@UBOT> do something",
       "C999:222.333",
       expect.any(Function),
+      expect.any(AbortSignal),
       { SLACK_CHANNEL_ID: "C999", SLACK_THREAD_TS: "222.333" },
     );
   });
@@ -1400,6 +1412,7 @@ describe("app_mention handler", () => {
       "<@UBOT> do something",
       "C999:1.1",
       expect.any(Function),
+      expect.any(AbortSignal),
       { SLACK_CHANNEL_ID: "C999", SLACK_THREAD_TS: "1.1" },
     );
   });
@@ -1713,6 +1726,7 @@ describe("app_mention handler — file handling", () => {
       "[file: /tmp/test-mention-image.jpg]\n<@UBOT> look at this",
       "C999:222.333",
       expect.any(Function),
+      expect.any(AbortSignal),
       { SLACK_CHANNEL_ID: "C999", SLACK_THREAD_TS: "222.333" },
     );
   });
@@ -1745,6 +1759,7 @@ describe("app_mention handler — file handling", () => {
       "<@UBOT> here is a file",
       "C999:222.333",
       expect.any(Function),
+      expect.any(AbortSignal),
       { SLACK_CHANNEL_ID: "C999", SLACK_THREAD_TS: "222.333" },
     );
   });
@@ -1763,6 +1778,7 @@ describe("app_mention handler — file handling", () => {
       "<@UBOT> with erroring file",
       "C999:222.333",
       expect.any(Function),
+      expect.any(AbortSignal),
       { SLACK_CHANNEL_ID: "C999", SLACK_THREAD_TS: "222.333" },
     );
   });
@@ -1795,6 +1811,7 @@ describe("app_mention handler — file handling", () => {
       "[file: /tmp/mention-image.jpg]\n<@UBOT> look at this",
       "C999:222.333",
       expect.any(Function),
+      expect.any(AbortSignal),
       { SLACK_CHANNEL_ID: "C999", SLACK_THREAD_TS: "222.333" },
     );
   });
@@ -2088,6 +2105,7 @@ describe("user name context — message handler", () => {
       "[Dan]: hello",
       "D1:1.1",
       expect.any(Function),
+      expect.any(AbortSignal),
       { SLACK_CHANNEL_ID: "D1", SLACK_THREAD_TS: "1.1" },
     );
   });
@@ -2109,6 +2127,7 @@ describe("user name context — message handler", () => {
       "hello",
       "D1:1.1",
       expect.any(Function),
+      expect.any(AbortSignal),
       { SLACK_CHANNEL_ID: "D1", SLACK_THREAD_TS: "1.1" },
     );
   });
@@ -2138,6 +2157,7 @@ describe("user name context — app_mention handler", () => {
       "[Dan]: <@UBOT> do something",
       "C999:222.333",
       expect.any(Function),
+      expect.any(AbortSignal),
       { SLACK_CHANNEL_ID: "C999", SLACK_THREAD_TS: "222.333" },
     );
   });
@@ -2158,6 +2178,7 @@ describe("user name context — app_mention handler", () => {
       "<@UBOT> do something",
       "C999:222.333",
       expect.any(Function),
+      expect.any(AbortSignal),
       { SLACK_CHANNEL_ID: "C999", SLACK_THREAD_TS: "222.333" },
     );
   });

package/slack.ts

@@ -31,6 +31,7 @@ import {
 } from "./chat-token-reporter.ts";
 import type { ClaudeRunResult, ProgressCallback } from "./claude.ts";
 import {
+  ClaudeAbortedError,
   ClaudeRunError,
   ClaudeTimeoutError,
   reportClaudeError,
@@ -157,6 +158,7 @@ export type ClaudeRunner = (
   message: string,
   sessionKey?: string,
   onProgress?: ProgressCallback,
+  signal?: AbortSignal,
   extraEnv?: Record<string, string>,
 ) => Promise<ClaudeRunResult>;
 
@@ -596,11 +598,17 @@ export function createSlackApp(
   // (right after finish()) — so it never leaks entries for completed runs.
   // Closure-scoped (one instance per createSlackApp() call), same lifecycle
   // as threadStatusTracker above — never module-level.
-  const liveStreams = new Map<string, SlackProgress>();
-
-  function registerStream(progress: SlackProgress): void {
+  const liveStreams = new Map<
+    string,
+    { progress: SlackProgress; controller: AbortController }
+  >();
+
+  function registerStream(
+    progress: SlackProgress,
+    controller: AbortController,
+  ): void {
     const key = progress.streamKey();
-    if (key) liveStreams.set(key, progress);
+    if (key) liveStreams.set(key, { progress, controller });
   }
 
   function unregisterStream(progress: SlackProgress): void {
@@ -706,7 +714,8 @@ export function createSlackApp(
     // Registers the stream (no-op when startStream() failed to open one —
     // streamKey() is undefined either way) so agent_session_stopped can look
     // this instance up (AGS-1.1).
-    registerStream(progress);
+    const runController = new AbortController();
+    registerStream(progress, runController);
 
     const rawText =
       msg.text || (hasRichText ? richTextToMarkdown(msg.blocks ?? []) : "");
@@ -734,10 +743,16 @@ export function createSlackApp(
     // rather than the generic "Done" when the reply was suppressed.
     let wasSuppressed = false;
     try {
-      const runResult = await runner(prompt, sessionKey, progress.onProgress, {
-        SLACK_CHANNEL_ID: msg.channel,
-        SLACK_THREAD_TS: replyTs,
-      });
+      const runResult = await runner(
+        prompt,
+        sessionKey,
+        progress.onProgress,
+        runController.signal,
+        {
+          SLACK_CHANNEL_ID: msg.channel,
+          SLACK_THREAD_TS: replyTs,
+        },
+      );
       if (runResult.streamIncomplete) {
         // Clean process exit, but the stream never emitted a terminal
         // `result` event — treat this the same as a genuine failure rather
@@ -812,6 +827,13 @@ export function createSlackApp(
         postedText: shouldSuppress ? undefined : cleaned,
       });
     } catch (err) {
+      // A user-initiated Stop (agent_session_stopped aborts runController) makes
+      // the runner reject with ClaudeAbortedError — a deliberate cancel, not a
+      // failure: no Sentry report and no error message in the thread.
+      if (err instanceof ClaudeAbortedError) {
+        console.info("[slack] run aborted by user stop");
+        return;
+      }
       console.error("[slack] error:", err);
       reportClaudeError(sentryClient, err);
       // Mark the Thinking Steps card status:"error" (STS2-4.1 AC #1) BEFORE the
@@ -900,7 +922,8 @@ export function createSlackApp(
     await startProgress(progress, threadStatusTracker.enter(sessionKey));
     // Registers the stream so agent_session_stopped can look this instance
     // up (AGS-1.1) — see the app.message handler's identical comment above.
-    registerStream(progress);
+    const runController = new AbortController();
+    registerStream(progress, runController);
 
     let prompt = await buildPromptWithFiles(
       ev.text,
@@ -952,10 +975,16 @@ export function createSlackApp(
     // rather than the generic "Done" when the reply was suppressed.
     let wasSuppressed = false;
     try {
-      const runResult = await runner(prompt, sessionKey, progress.onProgress, {
-        SLACK_CHANNEL_ID: ev.channel,
-        SLACK_THREAD_TS: replyTs,
-      });
+      const runResult = await runner(
+        prompt,
+        sessionKey,
+        progress.onProgress,
+        runController.signal,
+        {
+          SLACK_CHANNEL_ID: ev.channel,
+          SLACK_THREAD_TS: replyTs,
+        },
+      );
       if (runResult.streamIncomplete) {
         // Clean process exit, but the stream never emitted a terminal
         // `result` event — treat this the same as a genuine failure rather
@@ -1024,6 +1053,13 @@ export function createSlackApp(
         postedText: isSilent ? undefined : cleaned,
       });
     } catch (err) {
+      // A user-initiated Stop (agent_session_stopped aborts runController) makes
+      // the runner reject with ClaudeAbortedError — a deliberate cancel, not a
+      // failure: no Sentry report and no error message in the thread.
+      if (err instanceof ClaudeAbortedError) {
+        console.info("[slack] run aborted by user stop");
+        return;
+      }
       console.error("[slack] error:", err);
       reportClaudeError(sentryClient, err);
       // Mark the Thinking Steps card status:"error" (STS2-4.1 AC #1) BEFORE the
@@ -1103,17 +1139,24 @@ export function createSlackApp(
     await startProgress(progress, threadStatusTracker.enter(sessionKey));
     // Registers the stream so agent_session_stopped can look this instance
     // up (AGS-1.1) — see the app.message handler's identical comment above.
-    registerStream(progress);
+    const runController = new AbortController();
+    registerStream(progress, runController);
 
     // Set inside the try block below (STS2-3.1) — hoisted so finishProgress()
     // in the finally block can title the stream's completion card "Ack"
     // rather than the generic "Done" when the reply was suppressed.
     let wasSuppressed = false;
     try {
-      const runResult = await runner(prompt, sessionKey, progress.onProgress, {
-        SLACK_CHANNEL_ID: ev.item.channel,
-        SLACK_THREAD_TS: ev.item.ts,
-      });
+      const runResult = await runner(
+        prompt,
+        sessionKey,
+        progress.onProgress,
+        runController.signal,
+        {
+          SLACK_CHANNEL_ID: ev.item.channel,
+          SLACK_THREAD_TS: ev.item.ts,
+        },
+      );
       if (runResult.streamIncomplete) {
         // Clean process exit, but the stream never emitted a terminal
         // `result` event — treat this the same as a genuine failure rather
@@ -1246,10 +1289,13 @@ export function createSlackApp(
     let threadTs: string | undefined;
     if (ev.channel && ev.streaming_message_ts) {
       const key = `${ev.channel}:${ev.streaming_message_ts}`;
-      const progress = liveStreams.get(key);
-      if (progress) {
+      const live = liveStreams.get(key);
+      if (live) {
+        const { progress, controller } = live;
         threadTs = progress.getThreadTs();
         progress.markExternallyStopped();
+        // SSC-1.1: cancel the in-flight Claude run, not just the stream.
+        controller.abort();
         liveStreams.delete(key);
       }
     }

package/slack.unit.test.ts

@@ -18,6 +18,7 @@
 import { describe, expect, mock, test } from "bun:test";
 import type { AgentSlackMembershipRef } from "./agent-slack-membership-ref.ts";
 import { createAgentSlackMembershipRef } from "./agent-slack-membership-ref.ts";
+import { ClaudeAbortedError } from "./claude.ts";
 import {
   createSlackApp as _createSlackApp,
   dispatchMarkers,
@@ -675,7 +676,7 @@ describe("extraEnv passed to runner — SLACK_CHANNEL_ID / SLACK_THREAD_TS (STC-
     expect(runner).toHaveBeenCalledTimes(1);
     // biome-ignore lint/suspicious/noExplicitAny: test double captures calls
     const call = (runner as any).mock.calls[0];
-    expect(call[3]).toEqual({
+    expect(call[4]).toEqual({
       SLACK_CHANNEL_ID: "D0EXAMPLE",
       SLACK_THREAD_TS: "1700000000.000100",
     });
@@ -711,7 +712,7 @@ describe("extraEnv passed to runner — SLACK_CHANNEL_ID / SLACK_THREAD_TS (STC-
     expect(runner).toHaveBeenCalledTimes(1);
     // biome-ignore lint/suspicious/noExplicitAny: test double captures calls
     const call = (runner as any).mock.calls[0];
-    expect(call[3]).toEqual({
+    expect(call[4]).toEqual({
       SLACK_CHANNEL_ID: "C0EXAMPLE",
       SLACK_THREAD_TS: "1700000000.000150",
     });
@@ -742,7 +743,7 @@ describe("extraEnv passed to runner — SLACK_CHANNEL_ID / SLACK_THREAD_TS (STC-
     expect(runner).toHaveBeenCalledTimes(1);
     // biome-ignore lint/suspicious/noExplicitAny: test double captures calls
     const call = (runner as any).mock.calls[0];
-    expect(call[3]).toEqual({
+    expect(call[4]).toEqual({
       SLACK_CHANNEL_ID: "C0EXAMPLE",
       SLACK_THREAD_TS: "1700000000.000300",
     });
@@ -778,7 +779,7 @@ describe("extraEnv passed to runner — SLACK_CHANNEL_ID / SLACK_THREAD_TS (STC-
     expect(runner).toHaveBeenCalledTimes(1);
     // biome-ignore lint/suspicious/noExplicitAny: test double captures calls
     const call = (runner as any).mock.calls[0];
-    expect(call[3]).toEqual({
+    expect(call[4]).toEqual({
       SLACK_CHANNEL_ID: "C0EXAMPLE",
       SLACK_THREAD_TS: "1700000000.000400",
     });
@@ -808,7 +809,7 @@ describe("extraEnv passed to runner — SLACK_CHANNEL_ID / SLACK_THREAD_TS (STC-
     expect(runner).toHaveBeenCalledTimes(1);
     // biome-ignore lint/suspicious/noExplicitAny: test double captures calls
     const call = (runner as any).mock.calls[0];
-    expect(call[3]).toEqual({
+    expect(call[4]).toEqual({
       SLACK_CHANNEL_ID: "D0EXAMPLE",
       SLACK_THREAD_TS: "1700000000.000500",
     });
@@ -861,11 +862,22 @@ describe("agent_session_stopped handler", () => {
       userId: string,
       client: unknown,
     ) => Promise<string | undefined>;
+    rejectOnAbort?: boolean;
   }) {
     const runner = mock(
-      (_msg: string, _key?: string) =>
-        // biome-ignore lint/suspicious/noExplicitAny: deliberately never resolves — type matches ClaudeRunner's return via cast
-        new Promise(() => {}) as any,
+      (
+        _msg: string,
+        _key?: string,
+        _onProgress?: unknown,
+        signal?: AbortSignal,
+      ) =>
+        new Promise((_resolve, reject) => {
+          if (overrides.rejectOnAbort)
+            signal?.addEventListener("abort", () =>
+              reject(new ClaudeAbortedError()),
+            );
+          // biome-ignore lint/suspicious/noExplicitAny: deliberately never resolves (or rejects on abort) — type matches ClaudeRunner's return via cast
+        }) as any,
     );
     _createSlackApp(
       runner,
@@ -927,6 +939,45 @@ describe("agent_session_stopped handler", () => {
     expect(client.chat.appendStream).not.toHaveBeenCalled();
   });
 
+  test("aborts the AbortSignal the runner observed for the in-flight run (SSC-1.1)", async () => {
+    const ref = createAgentSlackMembershipRef();
+    const { runner, client } = startAStream({
+      membershipRef: ref,
+      resolveUserEmailFn: async () => undefined,
+    });
+    await flushMicrotasks();
+
+    // biome-ignore lint/suspicious/noExplicitAny: test double captures calls
+    const signal = (runner as any).mock.calls[0][3] as AbortSignal;
+    expect(signal).toBeInstanceOf(AbortSignal);
+    expect(signal.aborted).toBe(false);
+
+    await capturedAgentSessionStoppedHandler?.({
+      event: { channel: "D123", streaming_message_ts: "stream.ts.1" },
+      client,
+    });
+
+    expect(signal.aborted).toBe(true);
+  });
+
+  test("a runner rejecting with ClaudeAbortedError after stop posts no error message (SSC-1.1)", async () => {
+    const ref = createAgentSlackMembershipRef();
+    const { client, say } = startAStream({
+      membershipRef: ref,
+      resolveUserEmailFn: async () => undefined,
+      rejectOnAbort: true,
+    });
+    await flushMicrotasks();
+
+    await capturedAgentSessionStoppedHandler?.({
+      event: { channel: "D123", streaming_message_ts: "stream.ts.1" },
+      client,
+    });
+    await flushMicrotasks();
+
+    expect(say).not.toHaveBeenCalled();
+  });
+
   test("resets the thread status via a direct agents.sessions.setStatus('active') call", async () => {
     const ref = createAgentSlackMembershipRef();
     const { client } = startAStream({

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