@gotgenes/pi-subagents 6.3.1 → 6.4.0

package/src/index.ts

@@ -14,7 +14,7 @@ import { join } from "node:path";
 import { defineTool, type ExtensionAPI, getAgentDir } from "@earendil-works/pi-coding-agent";
 import { AgentManager } from "./agent-manager.js";
 import { getAgentConversation, normalizeMaxTurns, resumeAgent, runAgent, steerAgent } from "./agent-runner.js";
-import { getAvailableTypes, getDefaultAgentNames, getUserAgentNames, registerAgents, resolveAgentConfig, } from "./agent-types.js";
+import { AgentTypeRegistry } from "./agent-types.js";
 import { loadCustomAgents } from "./custom-agents.js";
 import { SessionLifecycleHandler, ToolStartHandler } from "./handlers/index.js";
 import { type ModelRegistry, resolveModel } from "./model-resolver.js";
@@ -40,14 +40,7 @@ export default function (pi: ExtensionAPI) {
   // ---- Register custom notification renderer ----
   pi.registerMessageRenderer<NotificationDetails>("subagent-notification", createNotificationRenderer());
 
-  /** Reload agents from .pi/agents/*.md and merge with defaults (called on init and each Agent invocation). */
-  const reloadCustomAgents = () => {
-    const userAgents = loadCustomAgents(process.cwd());
-    registerAgents(userAgents);
-  };
-
-  // Initial load
-  reloadCustomAgents();
+  const registry = new AgentTypeRegistry(() => loadCustomAgents(process.cwd()));
 
   // ---- Runtime: all mutable extension state in one place ----
   const runtime = createSubagentRuntime();
@@ -67,6 +60,7 @@ export default function (pi: ExtensionAPI) {
     runner: { run: runAgent, resume: resumeAgent },
     worktrees: new GitWorktreeManager(process.cwd()),
     exec: (cmd, args, opts) => pi.exec(cmd, args, opts),
+    registry,
     onComplete: (record) => {
       // Emit lifecycle event based on terminal status
       const isError = record.status === "error" || record.status === "stopped" || record.status === "aborted";
@@ -137,7 +131,7 @@ export default function (pi: ExtensionAPI) {
   pi.on("session_shutdown", () => lifecycle.handleSessionShutdown());
 
   // Live widget: show running agents above editor
-  runtime.widget = new AgentWidget(manager, runtime.agentActivity);
+  runtime.widget = new AgentWidget(manager, runtime.agentActivity, registry);
 
   // Grab UI context from first tool execution + clear lingering widget on new turn
   const toolStart = new ToolStartHandler(runtime);
@@ -145,17 +139,17 @@ export default function (pi: ExtensionAPI) {
 
   /** Build the full type list text dynamically from the unified registry. */
   const buildTypeListText = () => {
-    const defaultNames = getDefaultAgentNames();
-    const userNames = getUserAgentNames();
+    const defaultNames = registry.getDefaultAgentNames();
+    const userNames = registry.getUserAgentNames();
 
     const defaultDescs = defaultNames.map((name) => {
-      const cfg = resolveAgentConfig(name);
+      const cfg = registry.resolveAgentConfig(name);
       const modelSuffix = cfg.model ? ` (${getModelLabelFromConfig(cfg.model)})` : "";
       return `- ${name}: ${cfg.description}${modelSuffix}`;
     });
 
     const customDescs = userNames.map((name) => {
-      const cfg = resolveAgentConfig(name);
+      const cfg = registry.resolveAgentConfig(name);
       return `- ${name}: ${cfg.description}`;
     });
 
@@ -201,9 +195,9 @@ export default function (pi: ExtensionAPI) {
     },
     agentActivity: runtime.agentActivity,
     emitEvent: (name, data) => pi.events.emit(name, data),
-    reloadCustomAgents,
+    registry,
     typeListText,
-    availableTypesText: getAvailableTypes().join(", "),
+    availableTypesText: registry.getAvailableTypes().join(", "),
     agentDir: getAgentDir(),
     getDefaultMaxTurns: () => runtime.defaultMaxTurns,
   })));
@@ -214,6 +208,7 @@ export default function (pi: ExtensionAPI) {
     getRecord: (id) => manager.getRecord(id),
     cancelNudge: (key) => notifications.cancelNudge(key),
     getConversation: (session) => getAgentConversation(session),
+    registry,
   })));
 
   // ---- steer_subagent tool ----
@@ -234,13 +229,13 @@ export default function (pi: ExtensionAPI) {
       getMaxConcurrent: () => manager.getMaxConcurrent(),
       setMaxConcurrent: (n) => manager.setMaxConcurrent(n),
     },
-    reloadCustomAgents,
+    registry,
     agentActivity: runtime.agentActivity,
-    getModelLabel: (type, registry) => {
-      const cfg = resolveAgentConfig(type);
+    getModelLabel: (type, modelRegistry) => {
+      const cfg = registry.resolveAgentConfig(type);
       if (!cfg.model) return 'inherit';
-      if (registry) {
-        const resolved = resolveModel(cfg.model, registry);
+      if (modelRegistry) {
+        const resolved = resolveModel(cfg.model, modelRegistry);
         if (typeof resolved === 'string') return 'inherit';
       }
       return getModelLabelFromConfig(cfg.model);

package/src/session-config.ts

@@ -11,10 +11,9 @@
  */
 
 import {
+  type AgentConfigLookup,
   getMemoryToolNames,
   getReadOnlyMemoryToolNames,
-  getToolNamesForType,
-  resolveAgentConfig,
 } from "./agent-types.js";
 import { buildMemoryBlock, buildReadOnlyMemoryBlock } from "./memory.js";
 import { buildAgentPrompt, type PromptExtras } from "./prompts.js";
@@ -140,14 +139,16 @@ function resolveDefaultModel(
  * @param ctx        Narrow context from the parent session.
  * @param options    Per-call overrides (cwd, isolated, model, thinkingLevel).
  * @param env        Pre-resolved environment info from `detectEnv()`.
+ * @param registry   Agent config lookup — provides resolveAgentConfig and getToolNamesForType.
  */
 export function assembleSessionConfig(
   type: SubagentType,
   ctx: AssemblerContext,
   options: AssemblerOptions,
   env: EnvInfo,
+  registry: AgentConfigLookup,
 ): SessionConfig {
-  const agentConfig = resolveAgentConfig(type);
+  const agentConfig = registry.resolveAgentConfig(type);
 
   const effectiveCwd = options.cwd ?? ctx.cwd;
 
@@ -166,7 +167,7 @@ export function assembleSessionConfig(
     }
   }
 
-  let toolNames = getToolNamesForType(type);
+  let toolNames = registry.getToolNamesForType(type);
 
   // Persistent memory: detect write capability and branch accordingly.
   // Account for disallowedTools — a tool in the base set but on the denylist

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,7 +108,7 @@ 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;
@@ -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);
 
@@ -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";
@@ -28,7 +26,7 @@ export interface AgentMenuManager {
 
 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;
@@ -72,8 +70,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 +124,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 +139,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 +150,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 +171,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 +185,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 +218,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 +232,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 +264,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 +275,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 +286,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 +345,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 +360,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 +379,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 +393,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 +499,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,7 +602,7 @@ ${systemPrompt}
 
     const { writeFileSync } = await import("node:fs");
     writeFileSync(targetPath, content, "utf-8");
-    deps.reloadCustomAgents();
+    deps.registry.reload();
     ctx.ui.notify(`Created ${targetPath}`, "info");
   }
 

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", "●")