@app-vitals/agent-admin 0.12.0 → 0.13.1

package/src/agents-api.ts

@@ -65,7 +65,6 @@ import type { AgentEnvService } from "./agent-envs.ts";
 import type { AgentGitHubInstallationsService } from "./agent-github-installations.ts";
 import type { AgentMemberService } from "./agent-members.ts";
 import type { AgentPluginService } from "./agent-plugins.ts";
-import { resolveSpecialty } from "./agent-specialty.ts";
 import {
   type AgentProvisioner,
   hasPerAgentIdentity,
@@ -411,8 +410,6 @@ const GetAgentResultSchema = z
     reviewAuthorAllowlist: z.array(z.string()),
     patchAuthorAllowlist: z.array(z.string()),
     restrictSlackToMembers: z.boolean(),
-    typeName: z.string(),
-    /** AGR-6.1: specialty (specialty ?? typeName); additive next to typeName. */
     specialty: z.string(),
     /** COS-49.1: the pod ServiceAccount; null when unset. */
     podServiceAccountName: z.string().nullable(),
@@ -570,7 +567,7 @@ const listAgentsRoute = createRoute({
   path: "/agents",
   summary: "List all agents",
   description:
-    "Admin-only. Returns every agent's `id`, `name`, `selfHosted`, and `typeName` — used for metrics name resolution.",
+    "Admin-only. Returns every agent's `id`, `name`, `selfHosted`, and `specialty` — used for metrics name resolution.",
   responses: {
     200: {
       description: "List of agents",
@@ -585,7 +582,7 @@ const createAgentRoute = createRoute({
   path: "/agents",
   summary: "Create an agent",
   description:
-    'Admin-only. Validates name/typeName, creates the Agent row, seeds AgentTool/AgentPlugin rows from the resolved type manifest, attaches repos/allowlists/members, patches Claude credentials, and provisions Kubernetes when `runtime` is "in-cluster" — the same createAgent() implementation (APA-1.1) the web UI form at /admin/agents/new uses. Transactional: on any failure zero rows persist, and this route never returns a partial-success 200. Returns the created agent in the same shape as GET /agents/:id.',
+    'Admin-only. Validates name/specialty, creates the Agent row, seeds AgentTool/AgentPlugin rows from the resolved type manifest, attaches repos/allowlists/members, patches Claude credentials, and provisions Kubernetes when `runtime` is "in-cluster" — the same createAgent() implementation (APA-1.1) the web UI form at /admin/agents/new uses. Transactional: on any failure zero rows persist, and this route never returns a partial-success 200. Returns the created agent in the same shape as GET /agents/:id.',
   request: {
     body: {
       content: { "application/json": { schema: CreateAgentBodySchema } },
@@ -606,7 +603,7 @@ const getAgentRoute = createRoute({
   path: "/agents/{id}",
   summary: "Get an agent",
   description:
-    "Admin-only. Returns the full agent record including `selfHosted`, `repos`, `reviewAuthorAllowlist`, `patchAuthorAllowlist`, `restrictSlackToMembers`, `typeName`, `accountId` (null for unassigned agents), and `missingRequiredEnv` — required env keys declared by the agent's type manifest with no corresponding AgentEnv row yet (informational only).",
+    "Admin-only. Returns the full agent record including `selfHosted`, `repos`, `reviewAuthorAllowlist`, `patchAuthorAllowlist`, `restrictSlackToMembers`, `specialty`, `accountId` (null for unassigned agents), and `missingRequiredEnv` — required env keys declared by the agent's type manifest with no corresponding AgentEnv row yet (informational only).",
   request: { params: AgentIdParamSchema },
   responses: {
     200: {
@@ -623,7 +620,7 @@ const patchAgentRoute = createRoute({
   path: "/agents/{id}",
   summary: "Update an agent",
   description:
-    "Admin-only. Updates `selfHosted`, `repos`, `reviewAuthorAllowlist`, `patchAuthorAllowlist`, `restrictSlackToMembers`, `slackId`, `trialExpiresAt`, `accountId` (platform admin only — 403 for session members; `null` clears it; reconciles the workload of in-cluster agents; does not move historical task-store rows), and/or `podServiceAccountName` (platform admin only — 403 otherwise; `null` clears it; 409 unless SHIPWRIGHT_K8S_AGENT_POD_SERVICE_ACCOUNT_ENABLED is on; 422 for agents with a per-agent federated identity; reconciles the workload so the pod is recreated under the new ServiceAccount). `typeName` and `trialExpiryWarnedAt` are not updatable via this route. `repos` here REPLACES the whole list; for incremental changes use `POST /agents/{id}/repos` (add) and `DELETE /agents/{id}/repos/{owner}/{name}` (remove). Returns the updated agent, including a `warning` field when `restrictSlackToMembers` is set true on an agent with zero members.",
+    "Admin-only. Updates `selfHosted`, `repos`, `reviewAuthorAllowlist`, `patchAuthorAllowlist`, `restrictSlackToMembers`, `slackId`, `trialExpiresAt`, `accountId` (platform admin only — 403 for session members; `null` clears it; reconciles the workload of in-cluster agents; does not move historical task-store rows), and/or `podServiceAccountName` (platform admin only — 403 otherwise; `null` clears it; 409 unless SHIPWRIGHT_K8S_AGENT_POD_SERVICE_ACCOUNT_ENABLED is on; 422 for agents with a per-agent federated identity; reconciles the workload so the pod is recreated under the new ServiceAccount). `specialty` and `trialExpiryWarnedAt` are not updatable via this route. `repos` here REPLACES the whole list; for incremental changes use `POST /agents/{id}/repos` (add) and `DELETE /agents/{id}/repos/{owner}/{name}` (remove). Returns the updated agent, including a `warning` field when `restrictSlackToMembers` is set true on an agent with zero members.",
   request: {
     params: AgentIdParamSchema,
     body: {
@@ -1908,7 +1905,7 @@ export function createAdminApp(deps: AdminDeps): OpenAPIHono<AdminAuthEnv> {
         anthropicFederationRuleId: _r,
         k8sServiceAccountName: _k,
         ...summary
-      }) => ({ ...summary, specialty: resolveSpecialty(summary) }),
+      }) => summary,
     );
     if (c.get("isAdmin") === true || email === undefined) {
       return c.json(agents, 200);
@@ -1971,8 +1968,8 @@ export function createAdminApp(deps: AdminDeps): OpenAPIHono<AdminAuthEnv> {
       },
       {
         name: body.name,
-        typeName:
-          accountId !== undefined ? getSelfServeSpecialty() : body.typeName,
+        specialty:
+          accountId !== undefined ? getSelfServeSpecialty() : body.specialty,
         ...(accountId !== undefined ? { accountId } : {}),
         // PAI-1.2: owner comes from the authenticated caller only; the body
         // schema has no owner field, so a client-supplied one is stripped.
@@ -2818,8 +2815,7 @@ function serializeAgent(
     reviewAuthorAllowlist?: string[];
     patchAuthorAllowlist?: string[];
     restrictSlackToMembers?: boolean;
-    typeName: string;
-    specialty?: string | null;
+    specialty: string;
     accountId?: string | null;
     podServiceAccountName?: string | null;
     createdAt: Date;
@@ -2849,8 +2845,7 @@ function serializeAgent(
     reviewAuthorAllowlist: agent.reviewAuthorAllowlist ?? [],
     patchAuthorAllowlist: agent.patchAuthorAllowlist ?? [],
     restrictSlackToMembers: agent.restrictSlackToMembers ?? false,
-    typeName: agent.typeName,
-    specialty: resolveSpecialty(agent),
+    specialty: agent.specialty,
     accountId: agent.accountId ?? null,
     podServiceAccountName: agent.podServiceAccountName ?? null,
     createdAt: agent.createdAt.toISOString(),

package/src/agents.integration.test.ts

@@ -67,11 +67,11 @@ function fakeSpecialtyRegistry(
   byType: Record<string, SpecialtyManifest> = { coding: CODING_MANIFEST },
 ): SpecialtyManifestResolver {
   return {
-    getManifest(typeName: string): SpecialtyManifest {
-      return byType[typeName] ?? (byType.coding as SpecialtyManifest);
+    getManifest(specialty: string): SpecialtyManifest {
+      return byType[specialty] ?? (byType.coding as SpecialtyManifest);
     },
-    tryGetManifest(typeName: string): SpecialtyManifest | undefined {
-      return byType[typeName];
+    tryGetManifest(specialty: string): SpecialtyManifest | undefined {
+      return byType[specialty];
     },
     listTypes() {
       return Object.keys(byType).map((name) => ({ name, displayName: name }));
@@ -106,7 +106,7 @@ function makeProvisioner(
 function baseInput(overrides: Partial<Parameters<typeof createAgent>[1]> = {}) {
   return {
     name: "Test Agent",
-    typeName: "coding",
+    specialty: "coding",
     runtime: undefined,
     reposRaw: undefined,
     authorAllowlistRaw: undefined,
@@ -511,7 +511,7 @@ describeOrSkip("createAgent() — integration (real Postgres)", () => {
   });
 });
 
-describeOrSkip("Agent.specialty — dual-write + fallback read (AGR-6.1)", () => {
+describeOrSkip("Agent.specialty — final shape (AGR-6.3)", () => {
   let prisma: PrismaClient;
   let agentService: AgentService;
   const createdIds: string[] = [];
@@ -527,76 +527,63 @@ describeOrSkip("Agent.specialty — dual-write + fallback read (AGR-6.1)", () =>
     await prisma.$disconnect();
   });
 
-  it("create() writes specialty and typeName with the same value", async () => {
+  it("create() persists specialty and exposes no typeName anywhere", async () => {
     const created = await agentService.create({
-      name: "Dual Write",
-      typeName: "coding",
+      name: "Final Shape",
+      specialty: "research",
     });
     createdIds.push(created.id);
 
     const row = await prisma.agent.findUniqueOrThrow({
       where: { id: created.id },
     });
-    expect(row.typeName).toBe("coding");
-    expect(row.specialty).toBe("coding");
-    expect(created.typeName).toBe("coding");
-    expect(created.specialty).toBe("coding");
+    expect(row.specialty).toBe("research");
+    expect("typeName" in row).toBe(false);
+    expect(created.specialty).toBe("research");
+    expect("typeName" in created).toBe(false);
+
+    const columns = await prisma.$queryRaw<{ column_name: string }[]>`
+      SELECT column_name FROM information_schema.columns
+      WHERE table_name = 'Agent' AND table_schema = current_schema()`;
+    const names = columns.map((c) => c.column_name);
+    expect(names).toContain("specialty");
+    expect(names).not.toContain("typeName");
   });
 
-  it("reads prefer specialty over typeName", async () => {
+  it("every read path returns the stored specialty", async () => {
     const created = await agentService.create({
-      name: "Prefers Specialty",
-      typeName: "coding",
+      name: "Reads Specialty",
+      specialty: "research",
     });
     createdIds.push(created.id);
-    await prisma.agent.update({
-      where: { id: created.id },
-      data: { specialty: "research" },
-    });
 
-    const detail = await agentService.getDetail(created.id);
-    expect(detail?.typeName).toBe("coding");
-    expect(detail?.specialty).toBe("research");
+    expect((await agentService.getDetail(created.id))?.specialty).toBe(
+      "research",
+    );
     expect((await agentService.getSummary(created.id))?.specialty).toBe(
       "research",
     );
+    expect((await agentService.getById(created.id))?.specialty).toBe(
+      "research",
+    );
+    expect((await agentService.listByIds([created.id]))[0]?.specialty).toBe(
+      "research",
+    );
     expect(
       (await agentService.list()).find((a) => a.id === created.id)?.specialty,
     ).toBe("research");
   });
 
-  it("falls back to typeName when specialty is NULL (pre-migration row)", async () => {
-    const created = await agentService.create({
-      name: "Legacy Row",
-      typeName: "coding",
-    });
-    createdIds.push(created.id);
-    await prisma.agent.update({
-      where: { id: created.id },
-      data: { specialty: null },
-    });
-
-    const detail = await agentService.getDetail(created.id);
-    expect(detail?.specialty).toBe("coding");
-    expect((await agentService.getSummary(created.id))?.specialty).toBe(
-      "coding",
-    );
-    expect((await agentService.getById(created.id))?.specialty).toBe("coding");
-    expect((await agentService.listByIds([created.id]))[0]?.specialty).toBe(
-      "coding",
-    );
-  });
+  it("specialty is required: NULL is rejected and omitting it applies the 'coding' default", async () => {
+    await expect(
+      (async () =>
+        prisma.agent.create({
+          data: { name: "Null Specialty", specialty: null as never },
+        }))(),
+    ).rejects.toThrow();
 
-  it("createAgent() leaves both columns populated", async () => {
-    const created = await agentService.create({ name: "No Type" });
+    const created = await agentService.create({ name: "No Specialty" });
     createdIds.push(created.id);
-    const row = await prisma.agent.findUniqueOrThrow({
-      where: { id: created.id },
-    });
-    // typeName omitted: column default applies and specialty stays NULL,
-    // so the fallback read still yields the default.
-    expect(row.typeName).toBe("coding");
-    expect(row.specialty).toBeNull();
     expect(created.specialty).toBe("coding");
   });
 });

package/src/agents.ts

@@ -24,7 +24,6 @@ import {
   SpecialtyRegistry,
 } from "./specialty-manifest-loader.ts";
 import { ANTHROPIC_CREDENTIALS_BLOCKED_CODE } from "./anthropic-credential-guard.ts";
-import { resolveSpecialty, withResolvedSpecialty } from "./agent-specialty.ts";
 import type { PrismaTransactionClient } from "./prisma-tx.ts";
 
 // ─── Types ────────────────────────────────────────────────────────────────────
@@ -34,7 +33,7 @@ interface CreateAgentInput {
   slackId?: string | null;
   selfHosted?: boolean;
   /** Specialty name. Omitted means Prisma's column default ("coding") applies. */
-  typeName?: string;
+  specialty?: string;
   /** Initial repos[] — the manifest repos merged with any request-supplied repos. */
   repos?: string[];
   /** Initial reviewAuthorAllowlist[]. */
@@ -54,9 +53,7 @@ export interface AgentRecord {
   name: string;
   slackId: string | null;
   selfHosted: boolean;
-  typeName: string;
-  /** AGR-6.1: resolved specialty (specialty ?? typeName). */
-  specialty?: string;
+  specialty: string;
   createdAt: Date;
   updatedAt: Date;
   /** Owning account (SSP-5.2 admin Account column); null for legacy agents. */
@@ -84,9 +81,7 @@ export interface AgentSummary extends Partial<AgentAnthropicIdentity> {
   id: string;
   name: string;
   selfHosted: boolean;
-  typeName: string;
-  /** AGR-6.1: resolved specialty (specialty ?? typeName). */
-  specialty?: string;
+  specialty: string;
   /** Owning account; null/absent for platform agents. */
   accountId?: string | null;
 }
@@ -102,9 +97,7 @@ export interface AgentDetail extends Partial<AgentAnthropicIdentity> {
   reviewAuthorAllowlist: string[];
   patchAuthorAllowlist: string[];
   restrictSlackToMembers: boolean;
-  typeName: string;
-  /** AGR-6.1: resolved specialty (specialty ?? typeName). */
-  specialty?: string;
+  specialty: string;
   /**
    * Owning account, null for unassigned (platform) agents. Optional here so
    * existing test doubles constructing a narrower AgentDetail literal don't
@@ -209,11 +202,8 @@ interface AgentIdAndRepos {
   /**
    * ARD-6.1: the agent's Specialty name, surfaced on the runtime config
    * response so the agent process can pick its workspace template directory.
-   * Optional for the same fixture-compat reason as trialExpiresAt.
    */
-  typeName?: string;
-  /** AGR-6.1: resolved specialty (specialty ?? typeName). */
-  specialty?: string;
+  specialty: string;
   /**
    * APM-1.5: the 6 agent-policy fields, read by the runtime GET /:id/config
    * route for direct passthrough. Required (not optional) since the Prisma
@@ -263,7 +253,6 @@ const SUMMARY_SELECT = {
   id: true,
   name: true,
   selfHosted: true,
-  typeName: true,
   specialty: true,
   accountId: true,
   ownerEmail: true,
@@ -283,7 +272,6 @@ const DETAIL_SELECT = {
   reviewAuthorAllowlist: true,
   patchAuthorAllowlist: true,
   restrictSlackToMembers: true,
-  typeName: true,
   specialty: true,
   accountId: true,
   createdAt: true,
@@ -338,8 +326,8 @@ export class AgentService {
         name: input.name,
         slackId: input.slackId ?? null,
         selfHosted: input.selfHosted ?? false,
-        ...(input.typeName !== undefined
-          ? { typeName: input.typeName, specialty: input.typeName }
+        ...(input.specialty !== undefined
+          ? { specialty: input.specialty }
           : {}),
         ...(input.repos !== undefined ? { repos: input.repos } : {}),
         ...(input.reviewAuthorAllowlist !== undefined
@@ -361,10 +349,10 @@ export class AgentService {
     });
     const missingRequiredEnv = await this.computeMissingRequiredEnv(
       row.id,
-      resolveSpecialty(row),
+      row.specialty,
       client,
     );
-    return { ...withResolvedSpecialty(row), missingRequiredEnv };
+    return { ...row, missingRequiredEnv };
   }
 
   /**
@@ -395,18 +383,18 @@ export class AgentService {
   }
 
   /**
-   * List all agents (id + name + selfHosted + typeName), ordered by name asc.
+   * List all agents (id + name + selfHosted + specialty), ordered by name asc.
    */
   async list(): Promise<AgentSummary[]> {
     const rows = await this.prisma.agent.findMany({
       select: SUMMARY_SELECT,
       orderBy: { name: "asc" },
     });
-    return rows.map(withResolvedSpecialty);
+    return rows;
   }
 
   /**
-   * Get {id, name, selfHosted, typeName} for a single agent. Returns null if
+   * Get {id, name, selfHosted, specialty} for a single agent. Returns null if
    * not found.
    */
   async getSummary(id: string): Promise<AgentSummary | null> {
@@ -414,7 +402,7 @@ export class AgentService {
       where: { id },
       select: SUMMARY_SELECT,
     });
-    return row ? withResolvedSpecialty(row) : null;
+    return row;
   }
 
   /**
@@ -428,11 +416,11 @@ export class AgentService {
    */
   private async computeMissingRequiredEnv(
     agentId: string,
-    typeName: string,
+    specialty: string,
     client: PrismaTransactionClient = this.prisma,
   ): Promise<string[]> {
     const requiredKeys = this.specialtyRegistry
-      .getManifest(typeName)
+      .getManifest(specialty)
       .env.required.map((entry) => entry.key);
 
     if (requiredKeys.length === 0) return [];
@@ -447,7 +435,7 @@ export class AgentService {
   }
 
   /**
-   * Get the full agent record (incl. repos/typeName/timestamps), plus
+   * Get the full agent record (incl. repos/specialty/timestamps), plus
    * `missingRequiredEnv` (see computeMissingRequiredEnv). Returns null if not
    * found.
    */
@@ -460,9 +448,9 @@ export class AgentService {
 
     const missingRequiredEnv = await this.computeMissingRequiredEnv(
       id,
-      resolveSpecialty(row),
+      row.specialty,
     );
-    return { ...withResolvedSpecialty(row), missingRequiredEnv };
+    return { ...row, missingRequiredEnv };
   }
 
   /**
@@ -531,9 +519,9 @@ export class AgentService {
     });
     const missingRequiredEnv = await this.computeMissingRequiredEnv(
       id,
-      resolveSpecialty(row),
+      row.specialty,
     );
-    return { ...withResolvedSpecialty(row), missingRequiredEnv };
+    return { ...row, missingRequiredEnv };
   }
 
   /**
@@ -553,7 +541,6 @@ export class AgentService {
         restrictSlackToMembers: true,
         trialExpiresAt: true,
         selfHosted: true,
-        typeName: true,
         specialty: true,
         account: { select: { status: true } },
         autoPostReviews: true,
@@ -570,7 +557,7 @@ export class AgentService {
     const memberEmails = members.map((m) => m.email);
     const { account, ...rest } = row;
     return {
-      ...withResolvedSpecialty(rest),
+      ...rest,
       memberEmails,
       accountStatus: account?.status ?? null,
     };
@@ -583,7 +570,7 @@ export class AgentService {
    * order Prisma returns.
    */
   async listAll(): Promise<AgentRecord[]> {
-    return (await this.prisma.agent.findMany()).map(withResolvedSpecialty);
+    return await this.prisma.agent.findMany();
   }
 
   /**
@@ -595,7 +582,7 @@ export class AgentService {
     const rows = await this.prisma.agent.findMany({
       where: { id: { in: ids } },
     });
-    return rows.map(withResolvedSpecialty);
+    return rows;
   }
 
   /**
@@ -606,7 +593,7 @@ export class AgentService {
     const rows = await this.prisma.agent.findMany({
       where: { name: { contains: query, mode: "insensitive" } },
     });
-    return rows.map(withResolvedSpecialty);
+    return rows;
   }
 
   /**
@@ -677,10 +664,10 @@ export class AgentService {
     });
     const missingRequiredEnv = await this.computeMissingRequiredEnv(
       id,
-      resolveSpecialty(row),
+      row.specialty,
       client,
     );
-    return { ...withResolvedSpecialty(row), missingRequiredEnv };
+    return { ...row, missingRequiredEnv };
   }
 }
 
@@ -696,7 +683,7 @@ export class AgentService {
  */
 export interface CreateAgentFormInput {
   name: string | undefined;
-  typeName: string | undefined;
+  specialty: string | undefined;
   /**
    * "in-cluster" means K8s-provisioned; anything else (including absent)
    * means self-hosted — matches the pre-APA-1.1 handler's fallback rule.
@@ -845,7 +832,7 @@ type CreateAgentTxOutcome =
   | { ok: false; errorCode: CreateAgentErrorCode; errorMessage?: string };
 
 /**
- * Atomically create an agent: validate name/typeName, create the Agent row,
+ * Atomically create an agent: validate name/specialty, create the Agent row,
  * seed AgentTool/AgentPlugin from the resolved type manifest, attach
  * repos/allowlists/members, patch Claude credentials, provision Kubernetes
  * resources when requested, and best-effort reconcile system crons.
@@ -887,11 +874,11 @@ export async function createAgent(
   // Resolve the requested type BEFORE creating any row — an unknown/missing
   // type must fail with zero rows created. The resolved manifest is
   // captured (not discarded) so its tools/plugins can be seeded below.
-  const typeName = input.typeName;
-  const manifest = typeName
-    ? deps.specialtyRegistry.tryGetManifest(typeName)
+  const specialty = input.specialty;
+  const manifest = specialty
+    ? deps.specialtyRegistry.tryGetManifest(specialty)
     : undefined;
-  if (!typeName || !manifest) {
+  if (!specialty || !manifest) {
     return { ok: false, errorCode: "invalid_type" };
   }
 
@@ -936,7 +923,7 @@ export async function createAgent(
         {
           name,
           selfHosted: !inCluster,
-          typeName,
+          specialty,
           restrictSlackToMembers,
           ...(input.accountId !== undefined
             ? { accountId: input.accountId }