@gotgenes/pi-subagents 6.3.1 → 6.5.0

package/src/settings.ts

@@ -16,16 +16,104 @@ export interface SubagentsSettings {
   graceTurns?: number;
 }
 
-/** Setter hooks used by applySettings to wire persisted values into in-memory state. */
-export interface SettingsAppliers {
-  setMaxConcurrent: (n: number) => void;
-  setDefaultMaxTurns: (n: number) => void;
-  setGraceTurns: (n: number) => void;
-}
 
 /** Emit callback — a subset of `pi.events.emit` to keep helpers testable. */
 export type SettingsEmit = (event: string, payload: unknown) => void;
 
+const DEFAULT_MAX_CONCURRENT = 4;
+const DEFAULT_GRACE_TURNS = 5;
+
+/**
+ * Owns all three in-memory settings values and their load/save/persist cycle.
+ * Replaces the scattered free-function + SettingsAppliers callback pattern.
+ */
+export class SettingsManager {
+  private _defaultMaxTurns: number | undefined = undefined;
+  private _graceTurns: number = DEFAULT_GRACE_TURNS;
+  private _maxConcurrent: number = DEFAULT_MAX_CONCURRENT;
+
+  private readonly emit: SettingsEmit;
+  private readonly cwd: string;
+
+  constructor(deps: { emit: SettingsEmit; cwd: string }) {
+    this.emit = deps.emit;
+    this.cwd = deps.cwd;
+  }
+
+  // ── defaultMaxTurns: 0 or undefined → unlimited (undefined); else max(1, n) ──
+
+  get defaultMaxTurns(): number | undefined {
+    return this._defaultMaxTurns;
+  }
+
+  set defaultMaxTurns(n: number | undefined) {
+    if (n == null || n === 0) {
+      this._defaultMaxTurns = undefined;
+    } else {
+      this._defaultMaxTurns = Math.max(1, n);
+    }
+  }
+
+  // ── graceTurns: minimum 1 ──
+
+  get graceTurns(): number {
+    return this._graceTurns;
+  }
+
+  set graceTurns(n: number) {
+    this._graceTurns = Math.max(1, n);
+  }
+
+  // ── maxConcurrent: minimum 1 ──
+
+  get maxConcurrent(): number {
+    return this._maxConcurrent;
+  }
+
+  set maxConcurrent(n: number) {
+    this._maxConcurrent = Math.max(1, n);
+  }
+
+  // ── Lifecycle methods ──
+
+  /**
+   * Load merged settings (global + project), apply to in-memory values,
+   * and emit the `subagents:settings_loaded` lifecycle event.
+   * Returns the raw loaded settings object.
+   */
+  load(): SubagentsSettings {
+    const settings = loadSettings(this.cwd);
+    if (typeof settings.maxConcurrent === "number") this.maxConcurrent = settings.maxConcurrent;
+    if (typeof settings.defaultMaxTurns === "number") this.defaultMaxTurns = settings.defaultMaxTurns;
+    if (typeof settings.graceTurns === "number") this.graceTurns = settings.graceTurns;
+    this.emit("subagents:settings_loaded", { settings });
+    return settings;
+  }
+
+  /**
+   * Snapshot current in-memory values for persistence.
+   * `defaultMaxTurns` uses 0 as the on-disk marker for unlimited (undefined).
+   */
+  snapshot(): { maxConcurrent: number; defaultMaxTurns: number; graceTurns: number } {
+    return {
+      maxConcurrent: this._maxConcurrent,
+      defaultMaxTurns: this._defaultMaxTurns ?? 0,
+      graceTurns: this._graceTurns,
+    };
+  }
+
+  /**
+   * Persist the current snapshot, emit `subagents:settings_changed`,
+   * and return the toast the UI should display.
+   */
+  saveAndNotify(successMsg: string): { message: string; level: "info" | "warning" } {
+    const snap = this.snapshot();
+    const persisted = saveSettings(snap, this.cwd);
+    this.emit("subagents:settings_changed", { settings: snap, persisted });
+    return persistToastFor(successMsg, persisted);
+  }
+}
+
 // Sanity ceilings — prevent hand-edited configs from asking for values that
 // make no operational sense (e.g. 1e6 concurrent subagents). Permissive enough
 // that any realistic power-user setting passes through.
@@ -107,13 +195,6 @@ export function saveSettings(s: SubagentsSettings, cwd: string = process.cwd()):
   }
 }
 
-/** Apply persisted settings to the in-memory state via caller-supplied setters. */
-export function applySettings(s: SubagentsSettings, appliers: SettingsAppliers): void {
-  if (typeof s.maxConcurrent === "number") appliers.setMaxConcurrent(s.maxConcurrent);
-  if (typeof s.defaultMaxTurns === "number") appliers.setDefaultMaxTurns(s.defaultMaxTurns);
-  if (typeof s.graceTurns === "number") appliers.setGraceTurns(s.graceTurns);
-}
-
 /**
  * Format the user-facing toast for a settings mutation. Pure function —
  * routes the success/failure of `saveSettings` into the right message + level
@@ -127,36 +208,3 @@ export function persistToastFor(
     ? { message: successMsg, level: "info" }
     : { message: `${successMsg} (session only; failed to persist)`, level: "warning" };
 }
-
-/**
- * Load merged settings, apply them to in-memory state, and emit the
- * `subagents:settings_loaded` lifecycle event. Returns the loaded settings so
- * callers can log/inspect. Extension init wires this once.
- */
-export function applyAndEmitLoaded(
-  appliers: SettingsAppliers,
-  emit: SettingsEmit,
-  cwd: string = process.cwd(),
-): SubagentsSettings {
-  const settings = loadSettings(cwd);
-  applySettings(settings, appliers);
-  emit("subagents:settings_loaded", { settings });
-  return settings;
-}
-
-/**
- * Persist a settings snapshot, emit the `subagents:settings_changed` event
- * (regardless of persist outcome so listeners see the in-memory change), and
- * return the toast the UI should display. Event payload carries the `persisted`
- * flag so listeners can react to write failures.
- */
-export function saveAndEmitChanged(
-  snapshot: SubagentsSettings,
-  successMsg: string,
-  emit: SettingsEmit,
-  cwd: string = process.cwd(),
-): { message: string; level: "info" | "warning" } {
-  const persisted = saveSettings(snapshot, cwd);
-  emit("subagents:settings_changed", { settings: snapshot, persisted });
-  return persistToastFor(successMsg, persisted);
-}

package/src/tools/agent-tool.ts

@@ -3,7 +3,7 @@ import { Text } from "@earendil-works/pi-tui";
 import { Type } from "@sinclair/typebox";
 import type { SpawnOptions } from "../agent-manager.js";
 import { normalizeMaxTurns } from "../agent-runner.js";
-import { resolveAgentConfig, resolveType } from "../agent-types.js";
+import { AgentTypeRegistry } from "../agent-types.js";
 import { resolveAgentInvocationConfig } from "../invocation-config.js";
 import { resolveInvocationModel } from "../model-resolver.js";
 
@@ -108,12 +108,12 @@ export interface AgentToolDeps {
   widget: AgentToolWidget;
   agentActivity: Map<string, AgentActivity>;
   emitEvent: (name: string, data: unknown) => void;
-  reloadCustomAgents: () => void;
+  registry: AgentTypeRegistry;
   typeListText: string;
   availableTypesText: string;
   agentDir: string;
-  /** Returns the runtime default max turns (undefined = unlimited). */
-  getDefaultMaxTurns: () => number | undefined;
+  /** Narrow settings accessor — only the default max turns is needed here. */
+  settings: { readonly defaultMaxTurns: number | undefined };
 }
 
 // ---- Factory ----
@@ -207,7 +207,7 @@ Guidelines:
 
     renderCall(args: Record<string, unknown>, theme: any) {
       const displayName = args.subagent_type
-        ? getDisplayName(args.subagent_type as string)
+        ? getDisplayName(args.subagent_type as string, deps.registry)
         : "Agent";
       const desc = (args.description as string) ?? "";
       return new Text(
@@ -327,17 +327,17 @@ Guidelines:
       deps.widget.setUICtx(ctx.ui as UICtx);
 
       // Reload custom agents so new .pi/agents/*.md files are picked up without restart
-      deps.reloadCustomAgents();
+      deps.registry.reload();
 
       const rawType = params.subagent_type as SubagentType;
-      const resolved = resolveType(rawType);
+      const resolved = deps.registry.resolveType(rawType);
       const subagentType = resolved ?? "general-purpose";
       const fellBack = resolved === undefined;
 
-      const displayName = getDisplayName(subagentType);
+      const displayName = getDisplayName(subagentType, deps.registry);
 
       // Get agent config for invocation resolution
-      const customConfig = resolveAgentConfig(subagentType);
+      const customConfig = deps.registry.resolveAgentConfig(subagentType);
 
       const resolvedConfig = resolveAgentInvocationConfig(customConfig, params);
 
@@ -364,7 +364,7 @@ Guidelines:
           ? (model?.name ?? effectiveModelId).replace(/^Claude\s+/i, "").toLowerCase()
           : undefined;
       const effectiveMaxTurns = normalizeMaxTurns(
-        resolvedConfig.maxTurns ?? deps.getDefaultMaxTurns(),
+        resolvedConfig.maxTurns ?? deps.settings.defaultMaxTurns,
       );
       const agentInvocation: AgentInvocation = {
         modelName,
@@ -375,7 +375,7 @@ Guidelines:
         runInBackground,
         isolation,
       };
-      const modeLabel = getPromptModeLabel(subagentType);
+      const modeLabel = getPromptModeLabel(subagentType, deps.registry);
       const { tags: invocationTags } = buildInvocationTags(agentInvocation);
       const agentTags = modeLabel ? [modeLabel, ...invocationTags] : invocationTags;
       const detailBase = {

package/src/tools/get-result-tool.ts

@@ -1,5 +1,6 @@
 import type { AgentSession } from "@earendil-works/pi-coding-agent";
 import { Type } from "@sinclair/typebox";
+import type { AgentConfigLookup } from "../agent-types.js";
 import type { AgentRecord } from "../types.js";
 import { formatDuration, getDisplayName } from "../ui/agent-widget.js";
 import { getSessionContextPercent } from "../usage.js";
@@ -10,6 +11,7 @@ export interface GetResultDeps {
   getRecord: (id: string) => AgentRecord | undefined;
   cancelNudge: (key: string) => void;
   getConversation: (session: AgentSession) => string | undefined;
+  registry: AgentConfigLookup;
 }
 
 /** Create the get_subagent_result tool definition (without Pi SDK wrapper). */
@@ -57,7 +59,7 @@ export function createGetResultTool(deps: GetResultDeps) {
         await record.promise;
       }
 
-      const displayName = getDisplayName(record.type);
+      const displayName = getDisplayName(record.type, deps.registry);
       const duration = formatDuration(record.startedAt, record.completedAt);
       const tokens = formatLifetimeTokens(record);
       const contextPercent = getSessionContextPercent(record.session);

package/src/types.ts

@@ -12,9 +12,6 @@ export type { ThinkingLevel };
 /** Agent type: any string name (built-in defaults or user-defined). */
 export type SubagentType = string;
 
-/** Names of the three embedded default agents. */
-export const DEFAULT_AGENT_NAMES = ["general-purpose", "Explore", "Plan"] as const;
-
 /** Memory scope for persistent agent memory. */
 export type MemoryScope = "user" | "project" | "local";
 

package/src/ui/agent-menu.ts

@@ -4,10 +4,8 @@ import { join } from "node:path";
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import type { SpawnOptions } from "../agent-manager.js";
 import {
+  AgentTypeRegistry,
   BUILTIN_TOOL_NAMES,
-  getAllTypes,
-  resolveAgentConfig,
-  resolveType,
 } from "../agent-types.js";
 import type { ModelRegistry } from "../model-resolver.js";
 import type { AgentConfig, AgentRecord } from "../types.js";
@@ -22,34 +20,29 @@ export interface AgentMenuManager {
   getRecord: (id: string) => AgentRecord | undefined;
   /** Used by generate wizard to spawn an agent that writes the .md file. */
   spawnAndWait: (ctx: ExtensionContext, type: string, prompt: string, opts: Omit<SpawnOptions, "isBackground">) => Promise<AgentRecord>;
-  getMaxConcurrent: () => number;
-  setMaxConcurrent: (n: number) => void;
+  /** Drain the concurrency queue after maxConcurrent has been updated on SettingsManager. */
+  notifyConcurrencyChanged: () => void;
+}
+
+/** Narrow settings interface required by the agent menu. */
+export interface AgentMenuSettings {
+  maxConcurrent: number;
+  defaultMaxTurns: number | undefined;
+  graceTurns: number;
+  saveAndNotify(msg: string): { message: string; level: "info" | "warning" };
 }
 
 export interface AgentMenuDeps {
   manager: AgentMenuManager;
-  reloadCustomAgents: () => void;
+  registry: AgentTypeRegistry;
   agentActivity: Map<string, AgentActivity>;
   /** Resolve model label for a given agent type + registry. */
   getModelLabel: (type: string, registry?: ModelRegistry) => string;
-  /** Snapshot current settings for persistence. */
-  snapshotSettings: () => { maxConcurrent: number; defaultMaxTurns: number; graceTurns: number };
-  /** Save settings and return a notification result. */
-  saveSettings: (
-    settings: { maxConcurrent: number; defaultMaxTurns: number; graceTurns: number },
-    successMsg: string,
-  ) => { message: string; level: string };
+  /** Settings manager — owns in-memory values and persistence. */
+  settings: AgentMenuSettings;
   emitEvent: (name: string, data: unknown) => void;
   personalAgentsDir: string;
   projectAgentsDir: string;
-  /** Returns the runtime default max turns (undefined = unlimited). */
-  getDefaultMaxTurns: () => number | undefined;
-  /** Returns the runtime grace turns value. */
-  getGraceTurns: () => number;
-  /** Updates the runtime default max turns (undefined = unlimited). */
-  setDefaultMaxTurns: (n: number | undefined) => void;
-  /** Updates the runtime grace turns value (minimum 1). */
-  setGraceTurns: (n: number) => void;
 }
 
 // ---- Narrow UI context types ----
@@ -72,8 +65,8 @@ export function createAgentsMenuHandler(deps: AgentMenuDeps) {
   }
 
   async function showAgentsMenu(ctx: ExtensionContext) {
-    deps.reloadCustomAgents();
-    const allNames = getAllTypes();
+    deps.registry.reload();
+    const allNames = deps.registry.getAllTypes();
 
     const options: string[] = [];
 
@@ -126,7 +119,7 @@ export function createAgentsMenuHandler(deps: AgentMenuDeps) {
   }
 
   async function showAllAgentsList(ctx: ExtensionContext) {
-    const allNames = getAllTypes();
+    const allNames = deps.registry.getAllTypes();
     if (allNames.length === 0) {
       ctx.ui.notify("No agents.", "info");
       return;
@@ -141,7 +134,7 @@ export function createAgentsMenuHandler(deps: AgentMenuDeps) {
     };
 
     const entries = allNames.map((name) => {
-      const cfg = resolveAgentConfig(name);
+      const cfg = deps.registry.resolveAgentConfig(name);
       const disabled = cfg.enabled === false;
       const model = deps.getModelLabel(name, ctx.modelRegistry);
       const indicator = sourceIndicator(cfg);
@@ -152,10 +145,10 @@ export function createAgentsMenuHandler(deps: AgentMenuDeps) {
     const maxPrefix = Math.max(...entries.map((e) => e.prefix.length));
 
     const hasCustom = allNames.some((n) => {
-      const c = resolveAgentConfig(n);
+      const c = deps.registry.resolveAgentConfig(n);
       return !c.isDefault && c.enabled !== false;
     });
-    const hasDisabled = allNames.some((n) => resolveAgentConfig(n).enabled === false);
+    const hasDisabled = allNames.some((n) => deps.registry.resolveAgentConfig(n).enabled === false);
     const legendParts: string[] = [];
     if (hasCustom) legendParts.push("• = project  ◦ = global");
     if (hasDisabled) legendParts.push("✕ = disabled");
@@ -173,7 +166,7 @@ export function createAgentsMenuHandler(deps: AgentMenuDeps) {
       .split(" · ")[0]
       .replace(/^[•◦✕\s]+/, "")
       .trim();
-    if (resolveType(agentName) != null) {
+    if (deps.registry.resolveType(agentName) != null) {
       await showAgentDetail(ctx, agentName);
       await showAllAgentsList(ctx);
     }
@@ -187,7 +180,7 @@ export function createAgentsMenuHandler(deps: AgentMenuDeps) {
     }
 
     const options = agents.map((a) => {
-      const dn = getDisplayName(a.type);
+      const dn = getDisplayName(a.type, deps.registry);
       const dur = formatDuration(a.startedAt, a.completedAt);
       return `${dn} (${a.description}) · ${a.toolUses} tools · ${a.status} · ${dur}`;
     });
@@ -220,7 +213,7 @@ export function createAgentsMenuHandler(deps: AgentMenuDeps) {
 
     await ctx.ui.custom<undefined>(
       (tui: any, theme: any, _keybindings: any, done: any) => {
-        return new ConversationViewer(tui, session, record, activity, theme, done);
+        return new ConversationViewer(tui, session, record, activity, theme, done, deps.registry);
       },
       {
         overlay: true,
@@ -234,11 +227,11 @@ export function createAgentsMenuHandler(deps: AgentMenuDeps) {
   }
 
   async function showAgentDetail(ctx: ExtensionContext, name: string) {
-    if (resolveType(name) == null) {
+    if (deps.registry.resolveType(name) == null) {
       ctx.ui.notify(`Agent config not found for "${name}".`, "warning");
       return;
     }
-    const cfg = resolveAgentConfig(name);
+    const cfg = deps.registry.resolveAgentConfig(name);
 
     const file = findAgentFile(name);
     const isDefault = cfg.isDefault === true;
@@ -266,7 +259,7 @@ export function createAgentsMenuHandler(deps: AgentMenuDeps) {
       if (edited !== undefined && edited !== content) {
         const { writeFileSync } = await import("node:fs");
         writeFileSync(file.path, edited, "utf-8");
-        deps.reloadCustomAgents();
+        deps.registry.reload();
         ctx.ui.notify(`Updated ${file.path}`, "info");
       }
     } else if (choice === "Delete") {
@@ -277,7 +270,7 @@ export function createAgentsMenuHandler(deps: AgentMenuDeps) {
         );
         if (confirmed) {
           unlinkSync(file.path);
-          deps.reloadCustomAgents();
+          deps.registry.reload();
           ctx.ui.notify(`Deleted ${file.path}`, "info");
         }
       }
@@ -288,7 +281,7 @@ export function createAgentsMenuHandler(deps: AgentMenuDeps) {
       );
       if (confirmed) {
         unlinkSync(file.path);
-        deps.reloadCustomAgents();
+        deps.registry.reload();
         ctx.ui.notify(`Restored default ${name}`, "info");
       }
     } else if (choice.startsWith("Eject")) {
@@ -347,7 +340,7 @@ export function createAgentsMenuHandler(deps: AgentMenuDeps) {
 
     const { writeFileSync } = await import("node:fs");
     writeFileSync(targetPath, content, "utf-8");
-    deps.reloadCustomAgents();
+    deps.registry.reload();
     ctx.ui.notify(`Ejected ${name} to ${targetPath}`, "info");
   }
 
@@ -362,7 +355,7 @@ export function createAgentsMenuHandler(deps: AgentMenuDeps) {
       const updated = content.replace(/^---\n/, "---\nenabled: false\n");
       const { writeFileSync } = await import("node:fs");
       writeFileSync(file.path, updated, "utf-8");
-      deps.reloadCustomAgents();
+      deps.registry.reload();
       ctx.ui.notify(`Disabled ${name} (${file.path})`, "info");
       return;
     }
@@ -381,7 +374,7 @@ export function createAgentsMenuHandler(deps: AgentMenuDeps) {
     const targetPath = join(targetDir, `${name}.md`);
     const { writeFileSync } = await import("node:fs");
     writeFileSync(targetPath, "---\nenabled: false\n---\n", "utf-8");
-    deps.reloadCustomAgents();
+    deps.registry.reload();
     ctx.ui.notify(`Disabled ${name} (${targetPath})`, "info");
   }
 
@@ -395,11 +388,11 @@ export function createAgentsMenuHandler(deps: AgentMenuDeps) {
 
     if (updated.trim() === "---\n---" || updated.trim() === "---\n---\n") {
       unlinkSync(file.path);
-      deps.reloadCustomAgents();
+      deps.registry.reload();
       ctx.ui.notify(`Enabled ${name} (removed ${file.path})`, "info");
     } else {
       writeFileSync(file.path, updated, "utf-8");
-      deps.reloadCustomAgents();
+      deps.registry.reload();
       ctx.ui.notify(`Enabled ${name} (${file.path})`, "info");
     }
   }
@@ -501,7 +494,7 @@ Write the file using the write tool. Only write the file, nothing else.`;
       return;
     }
 
-    deps.reloadCustomAgents();
+    deps.registry.reload();
 
     if (existsSync(targetPath)) {
       ctx.ui.notify(`Created ${targetPath}`, "info");
@@ -604,27 +597,28 @@ ${systemPrompt}
 
     const { writeFileSync } = await import("node:fs");
     writeFileSync(targetPath, content, "utf-8");
-    deps.reloadCustomAgents();
+    deps.registry.reload();
     ctx.ui.notify(`Created ${targetPath}`, "info");
   }
 
   async function showSettings(ctx: ExtensionContext) {
     const choice = await ctx.ui.select("Settings", [
-      `Max concurrency (current: ${deps.manager.getMaxConcurrent()})`,
-      `Default max turns (current: ${deps.getDefaultMaxTurns() ?? "unlimited"})`,
-      `Grace turns (current: ${deps.getGraceTurns()})`,
+      `Max concurrency (current: ${deps.settings.maxConcurrent})`,
+      `Default max turns (current: ${deps.settings.defaultMaxTurns ?? "unlimited"})`,
+      `Grace turns (current: ${deps.settings.graceTurns})`,
     ]);
     if (!choice) return;
 
     if (choice.startsWith("Max concurrency")) {
       const val = await ctx.ui.input(
         "Max concurrent background agents",
-        String(deps.manager.getMaxConcurrent()),
+        String(deps.settings.maxConcurrent),
       );
       if (val) {
         const n = parseInt(val, 10);
         if (n >= 1) {
-          deps.manager.setMaxConcurrent(n);
+          deps.settings.maxConcurrent = n;
+          deps.manager.notifyConcurrencyChanged();
           notifyApplied(ctx, `Max concurrency set to ${n}`);
         } else {
           ctx.ui.notify("Must be a positive integer.", "warning");
@@ -633,15 +627,15 @@ ${systemPrompt}
     } else if (choice.startsWith("Default max turns")) {
       const val = await ctx.ui.input(
         "Default max turns before wrap-up (0 = unlimited)",
-        String(deps.getDefaultMaxTurns() ?? 0),
+        String(deps.settings.defaultMaxTurns ?? 0),
       );
       if (val) {
         const n = parseInt(val, 10);
         if (n === 0) {
-          deps.setDefaultMaxTurns(undefined);
+          deps.settings.defaultMaxTurns = undefined;
           notifyApplied(ctx, "Default max turns set to unlimited");
         } else if (n >= 1) {
-          deps.setDefaultMaxTurns(n);
+          deps.settings.defaultMaxTurns = n;
           notifyApplied(ctx, `Default max turns set to ${n}`);
         } else {
           ctx.ui.notify("Must be 0 (unlimited) or a positive integer.", "warning");
@@ -650,12 +644,12 @@ ${systemPrompt}
     } else if (choice.startsWith("Grace turns")) {
       const val = await ctx.ui.input(
         "Grace turns after wrap-up steer",
-        String(deps.getGraceTurns()),
+        String(deps.settings.graceTurns),
       );
       if (val) {
         const n = parseInt(val, 10);
         if (n >= 1) {
-          deps.setGraceTurns(n);
+          deps.settings.graceTurns = n;
           notifyApplied(ctx, `Grace turns set to ${n}`);
         } else {
           ctx.ui.notify("Must be a positive integer.", "warning");
@@ -665,7 +659,7 @@ ${systemPrompt}
   }
 
   function notifyApplied(ctx: ExtensionContext, successMsg: string) {
-    const { message, level } = deps.saveSettings(deps.snapshotSettings(), successMsg);
+    const { message, level } = deps.settings.saveAndNotify(successMsg);
     ctx.ui.notify(message, level as "info" | "warning" | "error");
   }
 

package/src/ui/agent-widget.ts

@@ -7,7 +7,7 @@
 
 import { truncateToWidth } from "@earendil-works/pi-tui";
 import type { AgentManager } from "../agent-manager.js";
-import { resolveAgentConfig } from "../agent-types.js";
+import { type AgentConfigLookup, AgentTypeRegistry } from "../agent-types.js";
 import type { AgentInvocation, SubagentType } from "../types.js";
 import { getLifetimeTotal, getSessionContextPercent, type LifetimeUsage, type SessionLike } from "../usage.js";
 
@@ -143,14 +143,14 @@ export function formatDuration(startedAt: number, completedAt?: number): string
 }
 
 /** Get display name for any agent type (built-in or custom). */
-export function getDisplayName(type: SubagentType): string {
-  const config = resolveAgentConfig(type);
+export function getDisplayName(type: SubagentType, registry: AgentConfigLookup): string {
+  const config = registry.resolveAgentConfig(type);
   return config.displayName ?? config.name;
 }
 
 /** Short label for prompt mode: "twin" for append, nothing for replace (the default). */
-export function getPromptModeLabel(type: SubagentType): string | undefined {
-  const config = resolveAgentConfig(type);
+export function getPromptModeLabel(type: SubagentType, registry: AgentConfigLookup): string | undefined {
+  const config = registry.resolveAgentConfig(type);
   return config.promptMode === "append" ? "twin" : undefined;
 }
 
@@ -225,6 +225,7 @@ export class AgentWidget {
   constructor(
     private manager: AgentManager,
     private agentActivity: Map<string, AgentActivity>,
+    private registry: AgentTypeRegistry,
   ) {}
 
   /** Set the UI context (grabbed from first tool execution). */
@@ -275,8 +276,8 @@ export class AgentWidget {
 
   /** Render a finished agent line. */
   private renderFinishedLine(a: { id: string; type: SubagentType; status: string; description: string; toolUses: number; startedAt: number; completedAt?: number; error?: string }, theme: Theme): string {
-    const name = getDisplayName(a.type);
-    const modeLabel = getPromptModeLabel(a.type);
+    const name = getDisplayName(a.type, this.registry);
+    const modeLabel = getPromptModeLabel(a.type, this.registry);
     const duration = formatMs((a.completedAt ?? Date.now()) - a.startedAt);
 
     let icon: string;
@@ -345,8 +346,8 @@ export class AgentWidget {
 
     const runningLines: string[][] = []; // each entry is [header, activity]
     for (const a of running) {
-      const name = getDisplayName(a.type);
-      const modeLabel = getPromptModeLabel(a.type);
+      const name = getDisplayName(a.type, this.registry);
+      const modeLabel = getPromptModeLabel(a.type, this.registry);
       const modeTag = modeLabel ? ` ${theme.fg("dim", `(${modeLabel})`)}` : "";
       const elapsed = formatMs(Date.now() - a.startedAt);
 

package/src/ui/conversation-viewer.ts

@@ -7,6 +7,7 @@
 
 import type { AgentSession } from "@earendil-works/pi-coding-agent";
 import { type Component, matchesKey, type TUI, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
+import type { AgentConfigLookup } from "../agent-types.js";
 import { extractText } from "../context.js";
 import type { AgentRecord } from "../types.js";
 import { getLifetimeTotal, getSessionContextPercent } from "../usage.js";
@@ -33,6 +34,7 @@ export class ConversationViewer implements Component {
     private activity: AgentActivity | undefined,
     private theme: Theme,
     private done: (result: undefined) => void,
+    private registry: AgentConfigLookup,
   ) {
     this.unsubscribe = session.subscribe(() => {
       if (this.closed) return;
@@ -91,8 +93,8 @@ export class ConversationViewer implements Component {
 
     // Header
     lines.push(hrTop);
-    const name = getDisplayName(this.record.type);
-    const modeLabel = getPromptModeLabel(this.record.type);
+    const name = getDisplayName(this.record.type, this.registry);
+    const modeLabel = getPromptModeLabel(this.record.type, this.registry);
     const modeTag = modeLabel ? ` ${th.fg("dim", `(${modeLabel})`)}` : "";
     const statusIcon = this.record.status === "running"
       ? th.fg("accent", "●")