@fradser/pi-agent-teams 0.9.2 → 1.0.0

package/src/types.ts

@@ -1,148 +1,39 @@
-import type { Static, TSchema, TString, TObject, TUnion } from "typebox";
+import type { TSchema, TString, TObject, TUnion } from "typebox";
 import { Type } from "typebox";
-import { WORKER_BUILTIN_TOOLS } from "./worker-tools.ts";
-
-// ── Teammate ──────────────────────────────────────────────────────
-
-export const TeammateStatus = Type.Union(
-  [
-    Type.Literal("starting"),
-    Type.Literal("idle"),
-    Type.Literal("working"),
-    Type.Literal("stopped"),
-  ],
-  { description: "Lifecycle of a resident teammate" },
-);
-export type TeammateStatus = Static<typeof TeammateStatus>;
-
-export interface WorkerAssignment {
-  id: string;
-  kind: "direct" | "board";
-  /** Resource tags prevent concurrent mutating assignments from overlapping. */
-  resources: string[];
-  /** A terminal direct assignment is closed until the leader explicitly reopens it. */
-  closed?: boolean;
-}
-
-/** A named, long-lived child Pi process on the team roster. */
-export interface Teammate {
-  /** Unique among living teammates; also the mailbox and roster key. */
-  name: string;
-  /** Resolved agent definition name. */
-  agent: string;
-  /** Per-spawn capability identity, regenerated for every process. */
-  spawnId: string;
-  /** Stable Work Item selected by agent; each reopen creates a new assignment attempt. */
-  workId?: string;
-  context?: "fresh" | "fork";
-  pid: number;
-  status: TeammateStatus;
-  /** Working directory (the worktree root when isolated). */
-  cwd?: string;
-  /** Whether this teammate owns a dedicated Git worktree. */
-  isolation: "worktree" | "none";
-  /** Board task currently claimed by this teammate, if any. */
-  currentTaskId?: string;
-  /** The one assignment this worker is allowed to execute. Direct assignments
-   * and board claims are mutually exclusive until the leader opens another. */
-  assignment?: WorkerAssignment;
-  /** Most recent assignment retained for successor handoff after release or shutdown. */
-  lastAssignment?: WorkerAssignment;
-  lastTaskId?: string;
-  /** Effective launch model reference ("provider/model"); absent when Pi picks its default. */
-  model?: string;
-  /** Live assistant text assembled from the RPC stream. */
-  liveText?: string;
-  /** Current child tool name, if a tool is executing. */
-  activeTool?: string;
-  /** Live assistant reasoning streamed while no tool runs. */
-  liveThinking?: string;
-  /** Assistant turns observed in the current wake-up sequence. */
-  turns?: number;
-  /** The child finished its current sequence and awaits the next prompt. */
-  sequenceEnded?: boolean;
-  /** Leader reports are closed until a new prompt starts after a terminal report. */
-  reportSequenceEnded?: boolean;
-  /** When the harness last sent a claimable-task notice to this teammate. */
-  lastNoticeAt?: number;
-  /** Claimable task ids already announced to this teammate; one notice per id until it re-arms. */
-  noticedTaskIds?: string[];
-  usage?: WorkerUsage;
-  error?: string;
-  /** Effective tool allowlist granted to the child process (role tools plus
-   *  the capability set). Absent only for legacy snapshots. */
-  tools?: string[];
-  /** True once recognized model/stream activity was observed for this
-   * incarnation; console telemetry only, never a leader notification. */
-  modelOutputSeen?: boolean;
-  createdAt: number;
-  updatedAt: number;
-  stoppedAt?: number;
-  /** Last wall-clock time output was observed (any stream event or prompt delivery). */
-  lastOutputAt?: number;
-}
-
-// ── Task board ────────────────────────────────────────────────────
-
-export const TaskStatus = Type.Union(
-  [
-    Type.Literal("pending"),
-    Type.Literal("claimed"),
-    Type.Literal("completed"),
-    Type.Literal("superseded"),
-  ],
-  { description: "Board lifecycle of a task" },
-);
-export type TaskStatus = Static<typeof TaskStatus>;
-
-/** One task on the shared board. Only the leader process writes board state. */
-export interface BoardTask {
-  id: string;
-  subject: string;
-  description?: string;
-  /** Task ids that must complete before this task is claimable. */
-  dependsOn: string[];
-  /** Completion gate: a review prompt a fresh one-shot reviewer answers with
-   *  VERDICT: PASS or FAIL; overrides the agent-role default. */
-  verify?: string;
-  /** Mutating work must use stable resource tags such as `firmware/sub-node`.
-   *  A resource conflicts with itself and any slash-prefixed descendant. */
-  resources: string[];
-  status: TaskStatus;
-  claimedBy?: string;
-  /** Replacement task that made this task obsolete. */
-  supersededBy?: string;
-  result?: string;
-  /** Deferred mail archived when an accepted result closes its Work Item. */
-  deferredMessages?: Array<{ from: string; subject: string; body: string; timestamp: number }>;
-  errorMessage?: string;
-  createdAt: number;
-  updatedAt: number;
-  completedAt?: number;
-}
-
-/** A claim or submission intent expressed by a worker through marker files.
- * Workers never write the board file itself. `status` applies to submissions. */
-export interface TaskIntent {
-  taskId: string;
-  worker: string;
-  spawnId: string;
-  assignmentId?: string;
-  status?: "completed" | "failed";
-  result?: string;
-  timestamp: number;
-}
-
-// ── Spawn ─────────────────────────────────────────────────────────
-
-/** Token/cost usage reported by a teammate (accumulated across sequences). */
-export interface WorkerUsage {
-  input: number;
-  output: number;
-  cacheRead: number;
-  cacheWrite: number;
-  totalTokens: number;
-  cost: number;
+import { AGENT_BUILTIN_TOOLS } from "@fradser/pi-subagents";
+
+// ── Roster ───────────────────────────────────────────────────────
+// A child process on the roster is an execution fact, so the type lives in
+// @fradser/pi-subagents with the code that manages it. Re-exported here because
+// the coordination vocabulary below (TeamState) references it and callers read
+// this module as the package's type surface.
+
+export type { Agent, AgentStatus, AgentUsage } from "@fradser/pi-subagents";
+import type { Agent } from "@fradser/pi-subagents";
+
+// ── Task tasks ────────────────────────────────────────────────────
+// The Work Item data model lives in @fradser/pi-tasks. Re-exported here because the
+// coordination vocabulary below (Agent, TeamState) references it and callers
+// read this module as the package's type surface.
+
+export type { Task, TaskIntent, TaskStatus } from "@fradser/pi-tasks";
+// The assignment a teammate holds is the task domain's own shape. Re-exported
+// under the historical name so the coordination vocabulary stays readable.
+export type { WorkAssignment as WorkerAssignment } from "@fradser/pi-tasks";
+import type { Task } from "@fradser/pi-tasks";
+
+/**
+ * The result shape every coordination tool returns.
+ *
+ * Declared because `additionalProperties: false` and a single `required` on a
+ * flat schema cannot express per-action requirements, so refusals are reported
+ * here rather than thrown. Every tool reports failure this way, and a caller
+ * reads one shape whatever went wrong.
+ */
+export interface CoordinationToolResult {
+  content: Array<{ type: "text"; text: string }>;
+  details: Record<string, unknown>;
+  isError?: boolean;
 }
 
 // ── Mailbox ───────────────────────────────────────────────────────
@@ -216,13 +107,10 @@ export interface InboxMessage {
 
 export const InlineAgentDefinitionParams = Type.Object({
   description: Type.String({ minLength: 1, description: "Routing contract for the generated Agent" }),
-  tools: Type.Optional(Type.Array(Type.String(), { description: `Explicit minimal tool grant. Canonical built-ins: ${WORKER_BUILTIN_TOOLS.join(", ")}. Omitted or [] means coordination-only (agent_event and work), with no file or shell access. No aliases or inherited leader extension tools.` })),
+  tools: Type.Optional(Type.Array(Type.String(), { description: `Explicit minimal tool grant. Canonical built-ins: ${AGENT_BUILTIN_TOOLS.join(", ")}. Omitted or [] means coordination-only (message and task), with no file or shell access. No aliases or inherited leader extension tools.` })),
   model: Type.Optional(Type.String({ description: "Provider/model pin or inherit" })),
   verify: Type.Optional(Type.String({ description: "Default Work verification gate" })),
-  worktree: Type.Optional(Type.Boolean({ description: "Dedicated Git worktree" })),
   prompt: Type.String({ minLength: 1, description: "Agent role prompt" }),
-  persist: Type.Optional(Type.Boolean({ description: "Persist only when explicitly requested" })),
-  persistScope: Type.Optional(Type.Union([Type.Literal("project"), Type.Literal("project-local")])),
 }, { additionalProperties: false });
 
 /** Some harnesses deliver object/array parameters as JSON strings and Pi
@@ -260,6 +148,10 @@ function mergeBranchSubSchemas(pool: any[]): any {
   return { anyOf: pool };
 }
 
+/** The root also declares `type: "object"`. A schema that carries `properties`
+ * without an explicit object type is rejected by Google's GenerateContent API
+ * ("parameters.properties: only allowed for OBJECT type"), which the Gemini
+ * routes reach through their provider translators. */
 function actionUnion<T extends TObject[]>(branches: [...T], options?: Record<string, unknown>): TUnion<T> {
   const pools: Record<string, any[]> = {};
   for (const branch of branches) {
@@ -273,7 +165,7 @@ function actionUnion<T extends TObject[]>(branches: [...T], options?: Record<str
   }
   const properties: Record<string, any> = {};
   for (const [key, pool] of Object.entries(pools)) properties[key] = mergeBranchSubSchemas(pool);
-  return Type.Union(branches, { ...options, properties } as never) as TUnion<T>;
+  return Type.Union(branches, { type: "object", ...options, properties } as never) as TUnion<T>;
 }
 
 /** Tolerate harnesses that deliver object or array parameters as JSON strings. */
@@ -314,7 +206,7 @@ export const AgentActionParams = actionUnion([
 ], { description: "Delegate, start, inspect, or stop an Agent session" });
 
 /** Shut down one living teammate. */
-/** Create a board task (leader-only). */
+/** Create a task set task (leader-only). */
 /** First public Work interface slice. Work creation reuses the current
  * single-writer task record until every acquisition path shares one lifecycle. */
 export const WorkToolParams = actionUnion([
@@ -353,12 +245,19 @@ export const WorkToolParams = actionUnion([
   }, { additionalProperties: false }),
 ], { description: "Create, list, assign, release, reopen, or supersede current Work Items" });
 
-/** Shared leader/worker read-only board view. */
-/** Shared communication event parameters across Leader, Worker, and Peers. */
+/** Shared leader/worker read-only tasks view. */
+/** The one communication primitive, across Leader, Worker, and Peers.
+ *
+ * `body` rather than `message`: the field is the text of a message, and a
+ * parameter named after the tool is a small way of making every caller write
+ * `message: { message: ... }`. `kind` rather than `intent`: the two values are
+ * what the recipient owes the sender — nothing, or a decision — and that is a
+ * kind of message, not an intent the tool acts on.
+ */
 export const AgentEventParams = Type.Object({
-  message: Type.String({ description: "Message content" }),
+  body: Type.String({ description: "Message content" }),
   to: Type.Optional(Type.String({ minLength: 1, description: "Recipient Agent, leader, or exact session route" })),
-  intent: Type.Optional(Type.Union([Type.Literal("inform"), Type.Literal("request")])),
+  kind: Type.Optional(Type.Union([Type.Literal("inform"), Type.Literal("request")])),
 }, { additionalProperties: false });
 
 /** The reserved recipient name for reports to the team leader. */
@@ -366,7 +265,7 @@ export const LEADER_RECIPIENT = "leader";
 
 /** The single messaging primitive: addressed peer mail and leader reports.
  * `status` is honored only for to="leader" terminal reports. */
-/** Self-claim a pending board task. */
+/** Self-claim a pending tasks task. */
 /** Worker-only Work claim operation. It queues an intent; the single-writer
  * harness remains the only authority that can grant ownership. */
 export const WorkerWorkToolParams = actionUnion([
@@ -393,8 +292,8 @@ export const TEAM_RUNTIME_VERSION = 2;
 
 export interface TeamState {
   runtimeVersion: number;
-  teammates: Record<string, Teammate>;
-  tasks: Record<string, BoardTask>;
+  agents: Record<string, Agent>;
+  tasks: Record<string, Task>;
   /** Unified teammate model for this session; spawns without a role pin use it. */
   defaultModel?: string;
   /** Single leader inbox for teammate reports and harness diagnostics. */

package/src/ui.ts

@@ -1,5 +1,6 @@
+import { isTaskReplaced } from "@fradser/pi-tasks";
 /** Passive team widget and the /agent-teams management console
- * (session teammates + persistent agent roles + board). */
+ * (session agents + persistent agent roles + tasks). */
 
 import { truncateToWidth, Key, matchesKey, fuzzyFilter } from "@earendil-works/pi-tui";
 import {
@@ -21,20 +22,20 @@ import { type ExtensionUIContext } from "@earendil-works/pi-coding-agent";
 import {
   clampConsoleScroll, consoleScrollRange, maxConsoleBody, scrollConsoleDetail, wrapConsoleDetail,
 } from "./console-viewport.ts";
-import { formatTeammateLabel, runningTeammateActivity } from "./activity.ts";
-import { MODEL_INHERIT_ALIAS, discoverAgents, resolveAgent, type AgentDefinition } from "./agents.ts";
-import { getPeerDeliveryState, getState, getTeammate, getTeamDefaultModel, listTasks, listTeammates, livingTeammates, setTeamDefaultModel } from "./state.ts";
+import { formatAgentLabel, runningTeammateActivity } from "./activity.ts";
+import { MODEL_INHERIT_ALIAS, discoverAgents, resolveAgent, type AgentDefinition } from "@fradser/pi-subagents";
+import { getPeerDeliveryState, getState, getAgent, getTeamDefaultModel, listTasks, listAgents, livingAgents, setTeamDefaultModel } from "./state.ts";
 import {
   currentLeaderModelRef,
   ensureLivePoll,
   formatSilenceDuration,
   resolveSpawnModel,
   runtimeDirPath,
-  shutdownTeammate,
+  shutdownAgent,
   stallSilenceMs,
   stallThresholdMs,
 } from "./team-machine.ts";
-import type { Teammate } from "./types.ts";
+import type { Agent } from "./types.ts";
 import { mapPickerKey } from "./picker-keys.ts";
 import { inboxPath } from "./statefile.ts";
 import * as fs from "node:fs";
@@ -44,14 +45,14 @@ let spinnerTimer: ReturnType<typeof setInterval> | undefined;
 let spinnerFrame = 0;
 
 const teamActivityWidget = createLiveActivityWidget({
-  key: "teammate",
+  key: "agent",
   placement: "aboveEditor",
   fit: truncateToWidth,
   activityFormat: "markdown",
 });
 
 function ensureSpinner(): void {
-  const working = livingTeammates().some(isWorking);
+  const working = livingAgents().some(isWorking);
   if (working && !spinnerTimer) {
     spinnerTimer = setInterval(() => {
       spinnerFrame = (spinnerFrame + 1) % PI_SPINNER_FRAMES.length;
@@ -71,20 +72,20 @@ export function stopUiTimers(): void {
 }
 
 export function ensureTeamWidget(ctx?: { ui?: ExtensionUIContext; mode?: string }): void {
-  const working = livingTeammates().filter(isWorking);
-  teamActivityWidget.update(ctx, working.map((teammate) => ({
-    id: teammate.name,
-    identity: teammate.name,
-    activity: runningTeammateActivity(teammate) + stallSuffix(teammate),
+  const working = livingAgents().filter(agent => !agent.standalone && isWorking(agent));
+  teamActivityWidget.update(ctx, working.map((agent) => ({
+    id: agent.name,
+    identity: agent.name,
+    activity: runningTeammateActivity(agent) + stallSuffix(agent),
   })));
 }
 
-function isWorking(teammate: { status: string }): boolean {
-  return teammate.status === "working" || teammate.status === "starting";
+function isWorking(agent: { status: string }): boolean {
+  return agent.status === "working" || agent.status === "starting";
 }
 
 /** Silence marker appended once a working teammate passes its stall threshold. */
-function stallSuffix(teammate: Teammate): string {
+function stallSuffix(teammate: Agent): string {
   if (!isWorking(teammate)) return "";
   const silence = stallSilenceMs(teammate);
   const threshold = stallThresholdMs(teammate);
@@ -166,18 +167,43 @@ function displaySource(sourcePath: string | undefined): string {
   return relative.startsWith("..") ? sourcePath : `./${relative}`;
 }
 
+/** Passive console telemetry for the spawn environment policy: names and counts
+ *  only, never a withheld value. Per ADR-0002 observation lives here rather than
+ *  in a leader notification, so a routine spawn never interrupts the leader.
+ *  child-env.ts already bounds the name list, so this renders it as given and
+ *  the console cannot drift from the diagnostic. */
+function buildEnvPolicyDetail(policy: Agent["envPolicy"]): string[] {
+  if (!policy || policy.withheldCount === 0) return [];
+  const extra = policy.withheldSecretCount - policy.withheldSecretNames.length;
+  const names = policy.withheldSecretNames.length > 0
+    ? ` (credential-shaped: ${policy.withheldSecretNames.join(", ")}${extra > 0 ? `, +${extra} more` : ""})`
+    : "";
+  const lines = [
+    `  Env: ${policy.withheldCount} leader variable${policy.withheldCount === 1 ? "" : "s"} withheld${names}`,
+  ];
+  if (policy.missingAllowed.length > 0) {
+    lines.push(`  Env allow: requested but absent from the leader: ${policy.missingAllowed.join(", ")}`);
+  }
+  if (policy.flaggedAllowOverrides.length > 0) {
+    lines.push(`  Env allow: operator passes credential-shaped variables: ${policy.flaggedAllowOverrides.join(", ")}`);
+  }
+  return lines;
+}
+
 function buildTeammateDetail(name: string): string[] {
-  const teammate = getTeammate(name);
+  const teammate = getAgent(name);
   if (!teammate) return ["(teammate removed from the roster)"];
   const reports = getState().leaderMailbox.filter((message) => message.from === name);
   const lines: string[] = [
-    `@${teammate.name} (${teammate.agent}) [${teammate.status}]`,
+    `@${teammate.name} (${teammate.role}) [${teammate.status}]`,
     "",
     "== teammate ==",
     `  Status: ${teammate.status}${teammate.currentTaskId ? ` | Task: ${teammate.currentTaskId}` : ""}`,
-    `  Spawn: ${teammate.pid > 0 ? `pid ${teammate.pid}` : "pid unknown"} | Isolation: ${teammate.isolation}`,
+    `  Spawn: ${teammate.pid > 0 ? `pid ${teammate.pid}` : "pid unknown"}`,
+    ...(teammate.cwd ? [`  Launch cwd: ${teammate.cwd}`] : []),
     ...(teammate.model ? [`  Launch model: ${teammate.model}`] : []),
     ...(teammate.tools?.length ? [`  Tools: ${teammate.tools.join(", ")}`] : []),
+    ...buildEnvPolicyDetail(teammate.envPolicy),
     `  Created: ${new Date(teammate.createdAt).toLocaleString()}`,
   ];
   if (teammate.stoppedAt) lines.push(`  Stopped: ${new Date(teammate.stoppedAt).toLocaleString()}`);
@@ -213,7 +239,7 @@ function buildTeammateDetail(name: string): string[] {
 function buildTaskDetail(taskId: string): string[] {
   const tasks = listTasks();
   const task = tasks.find((candidate) => candidate.id === taskId);
-  if (!task) return ["(task not on the board)"];
+  if (!task) return ["(task not found)"];
   const byId = new Map(tasks.map((candidate) => [candidate.id, candidate]));
   return [
     `[${task.id}] ${task.subject}`,
@@ -227,7 +253,6 @@ function buildTaskDetail(taskId: string): string[] {
       : []),
     `  Verify: ${task.verify ?? "(none)"}`,
     ...(task.result ? ["  Result:", ...indent(cap(task.result))] : []),
-    ...(task.errorMessage ? ["  Error:", ...indent(cap(task.errorMessage))] : []),
     `  Created: ${new Date(task.createdAt).toLocaleString()}`,
     ...(task.completedAt ? [`  Completed: ${new Date(task.completedAt).toLocaleString()}`] : []),
   ];
@@ -245,8 +270,8 @@ function buildRoleDetail(name: string): string[] {
     `  Tools: ${def.tools.join(", ") || "(role defaults)"}`,
     `  Model: ${describeSpawnModel(def.model)}`,
     `  Verify: ${def.verify ?? "(none)"}`,
-    `  Worktree: ${def.worktree ? "true" : "false"}`,
-    `  Living instances: ${livingTeammates().filter((teammate) => teammate.agent === def.name).length}`,
+    `  Data: ${def.scope === "session" ? "temporary; no-session, no Memory" : "durable; private Memory, scratch workspace and project history"}`,
+    `  Living instances: ${livingAgents().filter((teammate) => teammate.role === def.name).length}`,
     "",
     "== role prompt ==",
     ...indent(cap(def.prompt)),
@@ -266,21 +291,21 @@ function describeSpawnModel(pinned: string | undefined): string {
 
 // ── Full-screen console ───────────────────────────────────────────
 
-type ConsolePage = "roster" | "board";
+type ConsolePage = "roster" | "tasks";
 
 interface RosterRow {
   key: string;
-  kind: "teammate";
+  kind: "agent";
 }
 interface RoleRow {
   key: string;
   kind: "role";
 }
-interface BoardRow {
+interface TaskRow {
   key: string;
   kind: "task";
 }
-type ConsoleRow = RosterRow | RoleRow | BoardRow;
+type ConsoleRow = RosterRow | RoleRow | TaskRow;
 
 /** SGR mouse-wheel events carry a button code; return signed line delta. */
 function wheelDelta(data: string): number | undefined {
@@ -298,7 +323,7 @@ function wheelDelta(data: string): number | undefined {
 const LIST_CHROME_LINES = 5;
 
 /** Full-screen Team Console — owns input via ctx.ui.custom. Pages: roster /
- * board; each row opens a scrolling detail view; m opens the searchable
+ * tasks; each row opens a scrolling detail view; m opens the searchable
  * teammate-model picker. */
 export function openTeamConsole(ctx: {
   ui: ExtensionUIContext;
@@ -308,9 +333,9 @@ export function openTeamConsole(ctx: {
     let page: ConsolePage = "roster";
     let mode: "list" | "detail" | "picker" = "list";
     let selectedRoster = 0;
-    let selectedBoard = 0;
+    let selectedTasks = 0;
     let listOffset = 0;
-    let detailKind: ConsoleRow["kind"] = "teammate";
+    let detailKind: ConsoleRow["kind"] = "agent";
     let detailKey = "";
     let offset = 0;
     let confirmName: string | undefined;
@@ -338,7 +363,7 @@ export function openTeamConsole(ctx: {
       if (renderTimer) return;
       renderTimer = setInterval(() => {
         // Redraw only while something can animate (spinner/activity/stall).
-        if (livingTeammates().some(isWorking)) requestRender();
+        if (livingAgents().some(isWorking)) requestRender();
       }, PI_SPINNER_INTERVAL_MS);
       renderTimer.unref?.();
     };
@@ -351,7 +376,7 @@ export function openTeamConsole(ctx: {
 
     const style = createPiThemeStyle(theme);
 
-    // ── Teammate-model picker (type-to-filter) ──────────────────
+    // ── Agent-model picker (type-to-filter) ──────────────────
     let picker: SearchPicker<{ provider: string; id: string; name?: string }> | undefined;
     let pickerOffset = 0;
 
@@ -443,10 +468,10 @@ export function openTeamConsole(ctx: {
         if (!picked) return;
         if (isClearEntry(picked)) {
           setTeamDefaultModel(undefined);
-          notifyPi(ctx.ui, "Teammate model cleared — Pi picks its default", "info");
+          notifyPi(ctx.ui, "Agent model cleared — Pi picks its default", "info");
         } else {
           setTeamDefaultModel(modelLabel(picked));
-          notifyPi(ctx.ui, `Teammate model set to ${modelLabel(picked)} for this session`, "info");
+          notifyPi(ctx.ui, `Agent model set to ${modelLabel(picked)} for this session`, "info");
         }
         closeModelPicker();
         return;
@@ -463,7 +488,7 @@ export function openTeamConsole(ctx: {
         // The console is the management surface: idle and stopped stay
         // visible, and persistent agent roles are listed after the session.
         ? [
-            ...listTeammates().map((t) => ({ key: t.name, kind: "teammate" as const })),
+            ...listAgents().map((t) => ({ key: t.name, kind: "agent" as const })),
             ...getRoles().map((def) => ({ key: def.name, kind: "role" as const })),
           ]
         : listTasks().map((task) => ({ key: task.id, kind: "task" as const }));
@@ -479,9 +504,9 @@ export function openTeamConsole(ctx: {
     };
 
     const headerLine = (): string => {
-      const alive = livingTeammates();
+      const alive = livingAgents();
       const tasks = listTasks();
-      return `team  ${alive.length} alive · ${alive.filter(isWorking).length} working · ${getRoles().length} roles · board ${tasks.filter((task) => task.status === "pending").length}p/${tasks.filter((task) => task.status === "claimed").length}c/${tasks.filter((task) => task.status === "completed").length}d/${tasks.filter((task) => task.status === "superseded").length}s · model ${getTeamDefaultModel() ?? "auto"} · ${page}`;
+      return `team  ${alive.length} alive · ${alive.filter(isWorking).length} working · ${getRoles().length} roles · tasks ${tasks.filter((task) => !isTaskReplaced(task) && task.status === "pending").length}p/${tasks.filter((task) => !isTaskReplaced(task) && task.status === "in_progress").length}c/${tasks.filter((task) => !isTaskReplaced(task) && task.status === "blocked").length}b/${tasks.filter((task) => !isTaskReplaced(task) && task.status === "cancelled").length}x/${tasks.filter((task) => task.status === "completed").length}d/${tasks.filter((task) => isTaskReplaced(task)).length}s · model ${getTeamDefaultModel() ?? "auto"} · ${page}`;
     };
 
     interface ContentLine {
@@ -491,14 +516,14 @@ export function openTeamConsole(ctx: {
     }
 
     const teammateRowText = (key: string, selected: boolean): string => {
-      const teammate = getTeammate(key)!;
+      const teammate = getAgent(key)!;
       const marker = selected ? style.accent("❯ ") : "  ";
       const name = renderLiveActivityIdentity(teammate.name, theme, "@");
       if (isWorking(teammate)) {
         const prefix = `${marker}${name} `;
         const width = tui.terminal.columns;
         const available = Math.max(0, width - prefix.length - PI_SPINNER_FRAMES[spinnerFrame].length - 2);
-        const status = theme.fg("warning", formatTeammateLabel(PI_SPINNER_FRAMES[spinnerFrame], runningTeammateActivity(teammate) + stallSuffix(teammate), available));
+        const status = theme.fg("warning", formatAgentLabel(PI_SPINNER_FRAMES[spinnerFrame], runningTeammateActivity(teammate) + stallSuffix(teammate), available));
         return `${prefix}${status}`;
       }
       if (teammate.status === "idle") {
@@ -511,7 +536,7 @@ export function openTeamConsole(ctx: {
       const def = getRoles().find((candidate) => candidate.name === key)!;
       const marker = selected ? style.accent("❯ ") : "  ";
       const name = renderLiveActivityIdentity(key, theme, "@");
-      const live = livingTeammates().filter((teammate) => teammate.agent === key && teammate.status !== "stopped").length;
+      const live = livingAgents().filter((teammate) => teammate.role === key && teammate.status !== "stopped").length;
       const liveTag = live > 0 ? style.success(`[${live} live]`) : style.dim("[0 live]");
       const provenance = def.scope === "session" ? "in-memory" : displaySource(def.source);
       return `${marker}${name} ${style.dim(def.scope)} ${style.dim(provenance)} ${liveTag}`;
@@ -524,38 +549,39 @@ export function openTeamConsole(ctx: {
       const holder = task.claimedBy ? style.dim(` @${task.claimedBy}`) : "";
       const statusText = task.status === "completed"
         ? style.success("✓")
-        : task.status === "superseded"
-          ? style.dim("⊘ superseded")
-          : task.status === "claimed"
-            ? theme.fg("warning", "◐ claimed")
-            : style.dim("○ pending");
+        : isTaskReplaced(task)
+          ? style.dim("replaced")
+          : task.status === "in_progress"
+            ? theme.fg("warning", "in progress")
+            : task.status === "blocked" ? style.dim("blocked")
+              : task.status === "cancelled" ? style.dim("cancelled") : style.dim("pending");
       return `${marker}${label} ${statusText} ${theme.fg("customMessageText", task.subject)}${holder}`;
     };
 
     const buildContent = (): ContentLine[] => {
       const rows = currentRows();
       const lines: ContentLine[] = [];
-      if (page === "board") {
+      if (page === "tasks") {
         if (rows.length === 0) {
           lines.push({ text: style.dim("The Work list is empty. Create Work with work action=create."), select: -1 });
         }
         rows.forEach((row, index) => lines.push({ text: taskRowText(row.key, index === currentPageSelection(rows.length)), select: index }));
         return lines;
       }
-      const teammates = rows.filter((row): row is RosterRow => row.kind === "teammate");
+      const agents = rows.filter((row): row is RosterRow => row.kind === "agent");
       const roles = rows.filter((row): row is RoleRow => row.kind === "role");
       const selection = currentPageSelection(rows.length);
-      lines.push({ text: style.dim("== teammates (this session) =="), select: -1 });
-      if (teammates.length === 0) {
-        lines.push({ text: style.dim("No teammates this session. Ask the model to spawn one."), select: -1 });
+      lines.push({ text: style.dim("== agents (this session) =="), select: -1 });
+      if (agents.length === 0) {
+        lines.push({ text: style.dim("No agents this session. Ask the model to spawn one."), select: -1 });
       }
-      teammates.forEach((row, index) => lines.push({ text: teammateRowText(row.key, index === selection), select: index }));
+      agents.forEach((row, index) => lines.push({ text: teammateRowText(row.key, index === selection), select: index }));
       lines.push({ text: "", select: -1 });
       lines.push({ text: style.dim("== agent roles (persistent and session definitions) =="), select: -1 });
       if (roles.length === 0) {
         lines.push({ text: style.dim("No agent definitions discovered."), select: -1 });
       }
-      roles.forEach((row, index) => lines.push({ text: roleRowText(row.key, teammates.length + index === selection), select: teammates.length + index }));
+      roles.forEach((row, index) => lines.push({ text: roleRowText(row.key, agents.length + index === selection), select: agents.length + index }));
       return lines;
     };
 
@@ -572,9 +598,9 @@ export function openTeamConsole(ctx: {
       }
       listOffset = clampConsoleScroll(listOffset, content.length, viewport);
       const footer = confirmName
-        ? theme.fg("warning", `Shut down @${confirmName}? Its claimed task returns to the board · y yes / n no`)
+        ? theme.fg("warning", `Shut down @${confirmName}? Its claimed task returns to the tasks · y yes / n no`)
         : style.dim(page === "roster"
-            ? "↑↓ select · enter open · tab board · x shutdown · m model · esc/q close"
+            ? "↑↓ select · enter open · tab tasks · x shutdown · m model · esc/q close"
             : "↑↓ select · enter open · tab roster · esc/q close");
       return renderPiPanel({
         width,
@@ -587,7 +613,7 @@ export function openTeamConsole(ctx: {
     };
 
     const currentPageSelection = (rowCount: number): number => {
-      const selection = page === "roster" ? selectedRoster : selectedBoard;
+      const selection = page === "roster" ? selectedRoster : selectedTasks;
       return rowCount === 0 ? 0 : Math.min(selection, rowCount - 1);
     };
 
@@ -638,7 +664,7 @@ export function openTeamConsole(ctx: {
         }
         const rows = currentRows();
         if (matchesKey(data, Key.tab)) {
-          page = page === "roster" ? "board" : "roster";
+          page = page === "roster" ? "tasks" : "roster";
           listOffset = 0;
           return;
         }
@@ -658,7 +684,7 @@ export function openTeamConsole(ctx: {
         if (data === "x" || data === "X") {
           const selection = currentPageSelection(rows.length);
           const row = rows[selection];
-          if (page === "roster" && row?.kind === "teammate" && getTeammate(row.key)?.status !== "stopped") {
+          if (page === "roster" && row?.kind === "agent" && getAgent(row.key)?.status !== "stopped") {
             confirmName = row.key;
           }
           return;
@@ -701,7 +727,7 @@ export function openTeamConsole(ctx: {
     function bumpSelection(delta: number, rowCount: number): void {
       if (rowCount === 0) return;
       if (page === "roster") selectedRoster = clampIndex(selectedRoster + delta, rowCount);
-      else selectedBoard = clampIndex(selectedBoard + delta, rowCount);
+      else selectedTasks = clampIndex(selectedTasks + delta, rowCount);
     }
 
     function scrollList(delta: number): void {
@@ -737,7 +763,7 @@ export function openTeamConsole(ctx: {
 }
 
 async function shutdownFromConsole(ctx: { ui: ExtensionUIContext }, name: string): Promise<void> {
-  const result = await shutdownTeammate(name);
+  const result = await shutdownAgent(name);
   if (result.ok) notifyPi(ctx.ui, result.body, "info");
   else notifyPi(ctx.ui, result.error, "error");
 }