@gotgenes/pi-subagents 7.3.1 → 7.4.0

package/src/ui/agent-creation-wizard.ts

@@ -30,33 +30,27 @@ export interface WizardRegistry {
   reload(): void;
 }
 
-export interface AgentCreationWizardDeps {
-  fileOps: AgentFileOps;
-  manager: WizardManager;
-  registry: WizardRegistry;
-  personalAgentsDir: string;
-  projectAgentsDir: string;
-}
-
-// ---- Factory ----
-
-export function createAgentCreationWizard({
-  fileOps,
-  manager,
-  registry,
-  personalAgentsDir,
-  projectAgentsDir,
-}: AgentCreationWizardDeps) {
-  async function showCreateWizard(ui: MenuUI, parentSnapshot: ParentSnapshot) {
+// ---- Class ----
+
+export class AgentCreationWizard {
+  constructor(
+    private readonly fileOps: AgentFileOps,
+    private readonly manager: WizardManager,
+    private readonly registry: WizardRegistry,
+    private readonly personalAgentsDir: string,
+    private readonly projectAgentsDir: string,
+  ) {}
+
+  async showCreateWizard(ui: MenuUI, parentSnapshot: ParentSnapshot): Promise<void> {
     const location = await ui.select("Choose location", [
       "Project (.pi/agents/)",
-      `Personal (${personalAgentsDir})`,
+      `Personal (${this.personalAgentsDir})`,
     ]);
     if (!location) return;
 
     const targetDir = location.startsWith("Project")
-      ? projectAgentsDir
-      : personalAgentsDir;
+      ? this.projectAgentsDir
+      : this.personalAgentsDir;
 
     const method = await ui.select("Creation method", [
       "Generate with Claude (recommended)",
@@ -65,27 +59,27 @@ export function createAgentCreationWizard({
     if (!method) return;
 
     if (method.startsWith("Generate")) {
-      await showGenerateWizard(ui, parentSnapshot, targetDir);
+      await this.showGenerateWizard(ui, parentSnapshot, targetDir);
     } else {
-      await showManualWizard(ui, targetDir);
+      await this.showManualWizard(ui, targetDir);
     }
   }
 
-  async function showGenerateWizard(
+  private async showGenerateWizard(
     ui: MenuUI,
     parentSnapshot: ParentSnapshot,
     targetDir: string,
-  ) {
+  ): Promise<void> {
     const description = await ui.input("Describe what this agent should do");
     if (!description) return;
 
     const name = await ui.input("Agent name (filename, no spaces)");
     if (!name) return;
 
-    fileOps.ensureDir(targetDir);
+    this.fileOps.ensureDir(targetDir);
 
     const targetPath = join(targetDir, `${name}.md`);
-    if (fileOps.exists(targetPath)) {
+    if (this.fileOps.exists(targetPath)) {
       const overwrite = await ui.confirm(
         "Overwrite",
         `${targetPath} already exists. Overwrite?`,
@@ -132,7 +126,7 @@ Guidelines for choosing settings:
 
 Write the file using the write tool. Only write the file, nothing else.`;
 
-    const record = await manager.spawnAndWait(
+    const record = await this.manager.spawnAndWait(
       parentSnapshot,
       "general-purpose",
       generatePrompt,
@@ -147,9 +141,9 @@ Write the file using the write tool. Only write the file, nothing else.`;
       return;
     }
 
-    registry.reload();
+    this.registry.reload();
 
-    if (fileOps.exists(targetPath)) {
+    if (this.fileOps.exists(targetPath)) {
       ui.notify(`Created ${targetPath}`, "info");
     } else {
       ui.notify(
@@ -159,7 +153,7 @@ Write the file using the write tool. Only write the file, nothing else.`;
     }
   }
 
-  async function showManualWizard(ui: MenuUI, targetDir: string) {
+  private async showManualWizard(ui: MenuUI, targetDir: string): Promise<void> {
     const name = await ui.input("Agent name (filename, no spaces)");
     if (!name) return;
 
@@ -239,7 +233,7 @@ ${systemPrompt}
 
     const targetPath = join(targetDir, `${name}.md`);
 
-    if (fileOps.exists(targetPath)) {
+    if (this.fileOps.exists(targetPath)) {
       const overwrite = await ui.confirm(
         "Overwrite",
         `${targetPath} already exists. Overwrite?`,
@@ -247,10 +241,8 @@ ${systemPrompt}
       if (!overwrite) return;
     }
 
-    fileOps.write(targetPath, content);
-    registry.reload();
+    this.fileOps.write(targetPath, content);
+    this.registry.reload();
     ui.notify(`Created ${targetPath}`, "info");
   }
-
-  return { showCreateWizard };
 }

package/src/ui/agent-menu.ts

@@ -6,8 +6,8 @@ import { type ModelRegistry, resolveModel } from "#src/session/model-resolver";
 import { getModelLabelFromConfig } from "#src/tools/helpers";
 import type { AgentConfig, AgentRecord } from "#src/types";
 import type { AgentActivityTracker } from "#src/ui/agent-activity-tracker";
-import { createAgentConfigEditor } from "#src/ui/agent-config-editor";
-import { createAgentCreationWizard } from "#src/ui/agent-creation-wizard";
+import { AgentConfigEditor } from "#src/ui/agent-config-editor";
+import { AgentCreationWizard } from "#src/ui/agent-creation-wizard";
 import type { AgentFileOps } from "#src/ui/agent-file-ops";
 import { formatDuration, getDisplayName } from "#src/ui/display";
 
@@ -64,8 +64,8 @@ export interface MenuUI {
  * Call `handle(ctx)` from the Pi command registration to open the interactive menu.
  */
 export class AgentsMenuHandler {
-  private readonly editor: ReturnType<typeof createAgentConfigEditor>;
-  private readonly wizard: ReturnType<typeof createAgentCreationWizard>;
+  private readonly editor: AgentConfigEditor;
+  private readonly wizard: AgentCreationWizard;
 
   constructor(
     private readonly manager: AgentMenuManager,
@@ -76,19 +76,19 @@ export class AgentsMenuHandler {
     private readonly personalAgentsDir: string,
     private readonly projectAgentsDir: string,
   ) {
-    this.editor = createAgentConfigEditor(
+    this.editor = new AgentConfigEditor(
       fileOps,
       registry,
       personalAgentsDir,
       projectAgentsDir,
     );
-    this.wizard = createAgentCreationWizard({
+    this.wizard = new AgentCreationWizard(
       fileOps,
       manager,
       registry,
       personalAgentsDir,
       projectAgentsDir,
-    });
+    );
   }
 
   async handle({

package/src/ui/message-formatters.ts

@@ -116,20 +116,31 @@ export function formatToolResult(
   ];
 }
 
+// ── Types ─────────────────────────────────────────────────────────────────────
+
+/** Model/provider attribution for assistant messages. */
+export interface MessageAttribution {
+  provider?: string;
+  model?: string;
+}
+
 // ── formatAssistantMessage ───────────────────────────────────────────────────
 
 /**
  * Format an assistant message into display lines.
  * Always returns at least the [Assistant] header line.
+ * When attribution is provided, renders as `[Assistant (provider/model)]`.
  */
 export function formatAssistantMessage(
   content: { type: string; [key: string]: unknown }[],
   width: number,
   ctx: FormatterContext,
+  attribution?: MessageAttribution,
 ): string[] {
   const { theme, wrapText } = ctx;
   const { textParts, toolNames } = extractAssistantContent(content);
-  const lines: string[] = [theme.bold("[Assistant]")];
+  const label = formatAttributionLabel(attribution);
+  const lines: string[] = [theme.bold(`[Assistant${label}]`)];
   if (textParts.length > 0) {
     lines.push(...wrapText(textParts.join("\n").trim(), width));
   }
@@ -154,10 +165,15 @@ export function formatMessage(
     return formatUserMessage(msg.content as string | unknown[], width, ctx);
   }
   if (msg.role === "assistant") {
+    const attribution: MessageAttribution = {
+      provider: msg.provider as string | undefined,
+      model: msg.model as string | undefined,
+    };
     return formatAssistantMessage(
       msg.content as { type: string; [key: string]: unknown }[],
       width,
       ctx,
+      attribution,
     );
   }
   if (msg.role === "toolResult") {
@@ -168,3 +184,12 @@ export function formatMessage(
   }
   return null;
 }
+
+// ── Helpers ──────────────────────────────────────────────────────────────────
+
+/** Build a `(provider/model)` attribution suffix, or empty string when absent. */
+function formatAttributionLabel(attr?: MessageAttribution): string {
+  if (!attr?.provider && !attr?.model) return "";
+  if (attr.provider && attr.model) return ` (${attr.provider}/${attr.model})`;
+  return ` (${attr.provider ?? attr.model})`;
+}