@gotgenes/pi-subagents 6.16.1 → 6.16.3

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

@@ -6,16 +6,13 @@ import { formatDuration, getDisplayName } from "../ui/display.js";
 import { getSessionContextPercent } from "../usage.js";
 import { formatLifetimeTokens, textResult } from "./helpers.js";
 
-/** Narrow deps — only the methods this tool's execute callback calls. */
-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). */
-export function createGetResultTool(deps: GetResultDeps) {
+export function createGetResultTool(
+  getRecord: (id: string) => AgentRecord | undefined,
+  cancelNudge: (key: string) => void,
+  getConversation: (session: AgentSession) => string | undefined,
+  registry: AgentConfigLookup,
+) {
   return {
     name: "get_subagent_result" as const,
     label: "Get Agent Result",
@@ -45,7 +42,7 @@ export function createGetResultTool(deps: GetResultDeps) {
       _onUpdate: unknown,
       _ctx: unknown,
     ) => {
-      const record = deps.getRecord(params.agent_id);
+      const record = getRecord(params.agent_id);
       if (!record) {
         return textResult(`Agent not found: "${params.agent_id}". It may have been cleaned up.`);
       }
@@ -58,11 +55,11 @@ export function createGetResultTool(deps: GetResultDeps) {
         // Pre-mark consumed BEFORE awaiting — onComplete fires inside .then() and
         // always runs before this await resumes. Prevents a redundant notification.
         record.notification?.markConsumed();
-        deps.cancelNudge(params.agent_id);
+        cancelNudge(params.agent_id);
         await record.promise;
       }
 
-      const displayName = getDisplayName(record.type, deps.registry);
+      const displayName = getDisplayName(record.type, registry);
       const duration = formatDuration(record.startedAt, record.completedAt);
       const tokens = formatLifetimeTokens(record);
       const contextPercent = getSessionContextPercent(record.session);
@@ -88,12 +85,12 @@ export function createGetResultTool(deps: GetResultDeps) {
       // Mark result as consumed — suppresses the completion notification
       if (record.status !== "running" && record.status !== "queued") {
         record.notification?.markConsumed();
-        deps.cancelNudge(params.agent_id);
+        cancelNudge(params.agent_id);
       }
 
       // Verbose: include full conversation
       if (params.verbose && record.session) {
-        const conversation = deps.getConversation(record.session);
+        const conversation = getConversation(record.session);
         if (conversation) {
           output += `\n\n--- Agent Conversation ---\n${conversation}`;
         }

package/src/tools/steer-tool.ts

@@ -4,17 +4,14 @@ import type { AgentRecord } from "../types.js";
 import { getSessionContextPercent } from "../usage.js";
 import { formatLifetimeTokens, textResult } from "./helpers.js";
 
-/** Narrow deps — only the methods this tool's execute callback calls. */
-export interface SteerToolDeps {
-  getRecord: (id: string) => AgentRecord | undefined;
-  emitEvent: (name: string, data: unknown) => void;
-  steerAgent: (session: AgentSession, message: string) => Promise<void>;
-  /** Buffer a steer for an agent whose session isn't ready yet. */
-  queueSteer: (id: string, message: string) => boolean;
-}
-
 /** Create the steer_subagent tool definition (without Pi SDK wrapper). */
-export function createSteerTool(deps: SteerToolDeps) {
+export function createSteerTool(
+  getRecord: (id: string) => AgentRecord | undefined,
+  emitEvent: (name: string, data: unknown) => void,
+  steerAgent: (session: AgentSession, message: string) => Promise<void>,
+  /** Buffer a steer for an agent whose session isn't ready yet. */
+  queueSteer: (id: string, message: string) => boolean,
+) {
   return {
     name: "steer_subagent" as const,
     label: "Steer Agent",
@@ -38,7 +35,7 @@ export function createSteerTool(deps: SteerToolDeps) {
       _onUpdate: unknown,
       _ctx: unknown,
     ) => {
-      const record = deps.getRecord(params.agent_id);
+      const record = getRecord(params.agent_id);
       if (!record) {
         return textResult(
           `Agent not found: "${params.agent_id}". It may have been cleaned up.`,
@@ -52,16 +49,16 @@ export function createSteerTool(deps: SteerToolDeps) {
       const session = record.session;
       if (!session) {
         // Session not ready yet — queue via manager for delivery once initialized
-        deps.queueSteer(record.id, params.message);
-        deps.emitEvent("subagents:steered", { id: record.id, message: params.message });
+        queueSteer(record.id, params.message);
+        emitEvent("subagents:steered", { id: record.id, message: params.message });
         return textResult(
           `Steering message queued for agent ${record.id}. It will be delivered once the session initializes.`,
         );
       }
 
       try {
-        await deps.steerAgent(session, params.message);
-        deps.emitEvent("subagents:steered", { id: record.id, message: params.message });
+        await steerAgent(session, params.message);
+        emitEvent("subagents:steered", { id: record.id, message: params.message });
         const tokens = formatLifetimeTokens(record);
         const contextPercent = getSessionContextPercent(session);
         const stateParts: string[] = [];

package/src/ui/agent-config-editor.ts

@@ -7,35 +7,31 @@
 
 import { join } from "node:path";
 
-import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import type { AgentTypeRegistry } from "../agent-types.js";
 import type { AgentConfig } from "../types.js";
 import type { AgentFileOps } from "./agent-file-ops.js";
-
-// ---- Deps interface ----
-
-export interface AgentConfigEditorDeps {
-  fileOps: AgentFileOps;
-  registry: AgentTypeRegistry;
-  personalAgentsDir: string;
-  projectAgentsDir: string;
-}
+import type { MenuUI } from "./agent-menu.js";
 
 // ---- Factory ----
 
-export function createAgentConfigEditor(deps: AgentConfigEditorDeps) {
+export function createAgentConfigEditor(
+  fileOps: AgentFileOps,
+  registry: AgentTypeRegistry,
+  personalAgentsDir: string,
+  projectAgentsDir: string,
+) {
   function agentDirs(): string[] {
-    return [deps.projectAgentsDir, deps.personalAgentsDir];
+    return [projectAgentsDir, personalAgentsDir];
   }
 
-  async function showAgentDetail(ctx: ExtensionContext, name: string) {
-    if (deps.registry.resolveType(name) == null) {
-      ctx.ui.notify(`Agent config not found for "${name}".`, "warning");
+  async function showAgentDetail(ui: MenuUI, name: string) {
+    if (registry.resolveType(name) == null) {
+      ui.notify(`Agent config not found for "${name}".`, "warning");
       return;
     }
-    const cfg = deps.registry.resolveAgentConfig(name);
+    const cfg = registry.resolveAgentConfig(name);
 
-    const file = deps.fileOps.findAgentFile(name, agentDirs());
+    const file = fileOps.findAgentFile(name, agentDirs());
     const isDefault = cfg.isDefault === true;
     const disabled = cfg.enabled === false;
 
@@ -52,64 +48,64 @@ export function createAgentConfigEditor(deps: AgentConfigEditorDeps) {
       menuOptions = ["Edit", "Disable", "Delete", "Back"];
     }
 
-    const choice = await ctx.ui.select(name, menuOptions);
+    const choice = await ui.select(name, menuOptions);
     if (!choice || choice === "Back") return;
 
     if (choice === "Edit" && file) {
-      const content = deps.fileOps.read(file);
+      const content = fileOps.read(file);
       if (content !== undefined) {
-        const edited = await ctx.ui.editor(`Edit ${name}`, content);
+        const edited = await ui.editor(`Edit ${name}`, content);
         if (edited !== undefined && edited !== content) {
-          deps.fileOps.write(file, edited);
-          deps.registry.reload();
-          ctx.ui.notify(`Updated ${file}`, "info");
+          fileOps.write(file, edited);
+          registry.reload();
+          ui.notify(`Updated ${file}`, "info");
         }
       }
     } else if (choice === "Delete") {
       if (file) {
-        const confirmed = await ctx.ui.confirm(
+        const confirmed = await ui.confirm(
           "Delete agent",
           `Delete ${name} (${file})?`,
         );
         if (confirmed) {
-          deps.fileOps.remove(file);
-          deps.registry.reload();
-          ctx.ui.notify(`Deleted ${file}`, "info");
+          fileOps.remove(file);
+          registry.reload();
+          ui.notify(`Deleted ${file}`, "info");
         }
       }
     } else if (choice === "Reset to default" && file) {
-      const confirmed = await ctx.ui.confirm(
+      const confirmed = await ui.confirm(
         "Reset to default",
         `Delete override ${file} and restore embedded default?`,
       );
       if (confirmed) {
-        deps.fileOps.remove(file);
-        deps.registry.reload();
-        ctx.ui.notify(`Restored default ${name}`, "info");
+        fileOps.remove(file);
+        registry.reload();
+        ui.notify(`Restored default ${name}`, "info");
       }
     } else if (choice.startsWith("Eject")) {
-      await ejectAgent(ctx, name, cfg);
+      await ejectAgent(ui, name, cfg);
     } else if (choice === "Disable") {
-      await disableAgent(ctx, name);
+      await disableAgent(ui, name);
     } else if (choice === "Enable") {
-      await enableAgent(ctx, name);
+      await enableAgent(ui, name);
     }
   }
 
-  async function ejectAgent(ctx: ExtensionContext, name: string, cfg: AgentConfig) {
-    const location = await ctx.ui.select("Choose location", [
+  async function ejectAgent(ui: MenuUI, name: string, cfg: AgentConfig) {
+    const location = await ui.select("Choose location", [
       "Project (.pi/agents/)",
-      `Personal (${deps.personalAgentsDir})`,
+      `Personal (${personalAgentsDir})`,
     ]);
     if (!location) return;
 
     const targetDir = location.startsWith("Project")
-      ? deps.projectAgentsDir
-      : deps.personalAgentsDir;
+      ? projectAgentsDir
+      : personalAgentsDir;
 
     const targetPath = join(targetDir, `${name}.md`);
-    if (deps.fileOps.exists(targetPath)) {
-      const overwrite = await ctx.ui.confirm(
+    if (fileOps.exists(targetPath)) {
+      const overwrite = await ui.confirm(
         "Overwrite",
         `${targetPath} already exists. Overwrite?`,
       );
@@ -140,61 +136,61 @@ export function createAgentConfigEditor(deps: AgentConfigEditorDeps) {
 
     const content = `---\n${fmFields.join("\n")}\n---\n\n${cfg.systemPrompt}\n`;
 
-    deps.fileOps.write(targetPath, content);
-    deps.registry.reload();
-    ctx.ui.notify(`Ejected ${name} to ${targetPath}`, "info");
+    fileOps.write(targetPath, content);
+    registry.reload();
+    ui.notify(`Ejected ${name} to ${targetPath}`, "info");
   }
 
-  async function disableAgent(ctx: ExtensionContext, name: string) {
-    const file = deps.fileOps.findAgentFile(name, agentDirs());
+  async function disableAgent(ui: MenuUI, name: string) {
+    const file = fileOps.findAgentFile(name, agentDirs());
     if (file) {
-      const content = deps.fileOps.read(file);
+      const content = fileOps.read(file);
       if (content?.includes("\nenabled: false\n")) {
-        ctx.ui.notify(`${name} is already disabled.`, "info");
+        ui.notify(`${name} is already disabled.`, "info");
         return;
       }
       if (content) {
         const updated = content.replace(/^---\n/, "---\nenabled: false\n");
-        deps.fileOps.write(file, updated);
-        deps.registry.reload();
-        ctx.ui.notify(`Disabled ${name} (${file})`, "info");
+        fileOps.write(file, updated);
+        registry.reload();
+        ui.notify(`Disabled ${name} (${file})`, "info");
       }
       return;
     }
 
-    const location = await ctx.ui.select("Choose location", [
+    const location = await ui.select("Choose location", [
       "Project (.pi/agents/)",
-      `Personal (${deps.personalAgentsDir})`,
+      `Personal (${personalAgentsDir})`,
     ]);
     if (!location) return;
 
     const targetDir = location.startsWith("Project")
-      ? deps.projectAgentsDir
-      : deps.personalAgentsDir;
+      ? projectAgentsDir
+      : personalAgentsDir;
 
     const targetPath = join(targetDir, `${name}.md`);
-    deps.fileOps.write(targetPath, "---\nenabled: false\n---\n");
-    deps.registry.reload();
-    ctx.ui.notify(`Disabled ${name} (${targetPath})`, "info");
+    fileOps.write(targetPath, "---\nenabled: false\n---\n");
+    registry.reload();
+    ui.notify(`Disabled ${name} (${targetPath})`, "info");
   }
 
-  async function enableAgent(ctx: ExtensionContext, name: string) {
-    const file = deps.fileOps.findAgentFile(name, agentDirs());
+  async function enableAgent(ui: MenuUI, name: string) {
+    const file = fileOps.findAgentFile(name, agentDirs());
     if (!file) return;
 
-    const content = deps.fileOps.read(file);
+    const content = fileOps.read(file);
     if (!content) return;
 
     const updated = content.replace(/^(---\n)enabled: false\n/, "$1");
 
     if (updated.trim() === "---\n---" || updated.trim() === "---\n---\n") {
-      deps.fileOps.remove(file);
-      deps.registry.reload();
-      ctx.ui.notify(`Enabled ${name} (removed ${file})`, "info");
+      fileOps.remove(file);
+      registry.reload();
+      ui.notify(`Enabled ${name} (removed ${file})`, "info");
     } else {
-      deps.fileOps.write(file, updated);
-      deps.registry.reload();
-      ctx.ui.notify(`Enabled ${name} (${file})`, "info");
+      fileOps.write(file, updated);
+      registry.reload();
+      ui.notify(`Enabled ${name} (${file})`, "info");
     }
   }
 

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

@@ -7,17 +7,18 @@
 
 import { join } from "node:path";
 
-import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { BUILTIN_TOOL_NAMES } from "../agent-types.js";
+import type { ParentSnapshot } from "../parent-snapshot.js";
 import type { AgentRecord } from "../types.js";
 import type { AgentFileOps } from "./agent-file-ops.js";
+import type { MenuUI } from "./agent-menu.js";
 
 // ---- Deps interface ----
 
 /** Narrow manager interface for agent spawning (generate wizard). */
 export interface WizardManager {
   spawnAndWait: (
-    ctx: ExtensionContext,
+    parentSnapshot: ParentSnapshot,
     type: string,
     prompt: string,
     opts: { description: string; maxTurns: number },
@@ -39,50 +40,60 @@ export interface AgentCreationWizardDeps {
 
 // ---- Factory ----
 
-export function createAgentCreationWizard(deps: AgentCreationWizardDeps) {
-  async function showCreateWizard(ctx: ExtensionContext) {
-    const location = await ctx.ui.select("Choose location", [
+export function createAgentCreationWizard({
+  fileOps,
+  manager,
+  registry,
+  personalAgentsDir,
+  projectAgentsDir,
+}: AgentCreationWizardDeps) {
+  async function showCreateWizard(ui: MenuUI, parentSnapshot: ParentSnapshot) {
+    const location = await ui.select("Choose location", [
       "Project (.pi/agents/)",
-      `Personal (${deps.personalAgentsDir})`,
+      `Personal (${personalAgentsDir})`,
     ]);
     if (!location) return;
 
     const targetDir = location.startsWith("Project")
-      ? deps.projectAgentsDir
-      : deps.personalAgentsDir;
+      ? projectAgentsDir
+      : personalAgentsDir;
 
-    const method = await ctx.ui.select("Creation method", [
+    const method = await ui.select("Creation method", [
       "Generate with Claude (recommended)",
       "Manual configuration",
     ]);
     if (!method) return;
 
     if (method.startsWith("Generate")) {
-      await showGenerateWizard(ctx, targetDir);
+      await showGenerateWizard(ui, parentSnapshot, targetDir);
     } else {
-      await showManualWizard(ctx, targetDir);
+      await showManualWizard(ui, targetDir);
     }
   }
 
-  async function showGenerateWizard(ctx: ExtensionContext, targetDir: string) {
-    const description = await ctx.ui.input("Describe what this agent should do");
+  async function showGenerateWizard(
+    ui: MenuUI,
+    parentSnapshot: ParentSnapshot,
+    targetDir: string,
+  ) {
+    const description = await ui.input("Describe what this agent should do");
     if (!description) return;
 
-    const name = await ctx.ui.input("Agent name (filename, no spaces)");
+    const name = await ui.input("Agent name (filename, no spaces)");
     if (!name) return;
 
-    deps.fileOps.ensureDir(targetDir);
+    fileOps.ensureDir(targetDir);
 
     const targetPath = join(targetDir, `${name}.md`);
-    if (deps.fileOps.exists(targetPath)) {
-      const overwrite = await ctx.ui.confirm(
+    if (fileOps.exists(targetPath)) {
+      const overwrite = await ui.confirm(
         "Overwrite",
         `${targetPath} already exists. Overwrite?`,
       );
       if (!overwrite) return;
     }
 
-    ctx.ui.notify("Generating agent definition...", "info");
+    ui.notify("Generating agent definition...", "info");
 
     const generatePrompt = `Create a custom pi sub-agent definition file based on this description: "${description}"
 
@@ -122,8 +133,8 @@ Guidelines for choosing settings:
 
 Write the file using the write tool. Only write the file, nothing else.`;
 
-    const record = await deps.manager.spawnAndWait(
-      ctx,
+    const record = await manager.spawnAndWait(
+      parentSnapshot,
       "general-purpose",
       generatePrompt,
       {
@@ -133,30 +144,30 @@ Write the file using the write tool. Only write the file, nothing else.`;
     );
 
     if (record.status === "error") {
-      ctx.ui.notify(`Generation failed: ${record.error}`, "warning");
+      ui.notify(`Generation failed: ${record.error}`, "warning");
       return;
     }
 
-    deps.registry.reload();
+    registry.reload();
 
-    if (deps.fileOps.exists(targetPath)) {
-      ctx.ui.notify(`Created ${targetPath}`, "info");
+    if (fileOps.exists(targetPath)) {
+      ui.notify(`Created ${targetPath}`, "info");
     } else {
-      ctx.ui.notify(
+      ui.notify(
         "Agent generation completed but file was not created. Check the agent output.",
         "warning",
       );
     }
   }
 
-  async function showManualWizard(ctx: ExtensionContext, targetDir: string) {
-    const name = await ctx.ui.input("Agent name (filename, no spaces)");
+  async function showManualWizard(ui: MenuUI, targetDir: string) {
+    const name = await ui.input("Agent name (filename, no spaces)");
     if (!name) return;
 
-    const description = await ctx.ui.input("Description (one line)");
+    const description = await ui.input("Description (one line)");
     if (!description) return;
 
-    const toolChoice = await ctx.ui.select("Tools", [
+    const toolChoice = await ui.select("Tools", [
       "all",
       "none",
       "read-only (read, bash, grep, find, ls)",
@@ -172,7 +183,7 @@ Write the file using the write tool. Only write the file, nothing else.`;
     } else if (toolChoice.startsWith("read-only")) {
       tools = "read, bash, grep, find, ls";
     } else {
-      const customTools = await ctx.ui.input(
+      const customTools = await ui.input(
         "Tools (comma-separated)",
         BUILTIN_TOOL_NAMES.join(", "),
       );
@@ -180,7 +191,7 @@ Write the file using the write tool. Only write the file, nothing else.`;
       tools = customTools;
     }
 
-    const modelChoice = await ctx.ui.select("Model", [
+    const modelChoice = await ui.select("Model", [
       "inherit (parent model)",
       "haiku",
       "sonnet",
@@ -197,11 +208,11 @@ Write the file using the write tool. Only write the file, nothing else.`;
     else if (modelChoice === "opus")
       modelLine = "\nmodel: anthropic/claude-opus-4-6";
     else if (modelChoice === "custom...") {
-      const customModel = await ctx.ui.input("Model (provider/modelId)");
+      const customModel = await ui.input("Model (provider/modelId)");
       if (customModel) modelLine = `\nmodel: ${customModel}`;
     }
 
-    const thinkingChoice = await ctx.ui.select("Thinking level", [
+    const thinkingChoice = await ui.select("Thinking level", [
       "inherit",
       "off",
       "minimal",
@@ -215,7 +226,7 @@ Write the file using the write tool. Only write the file, nothing else.`;
     let thinkingLine = "";
     if (thinkingChoice !== "inherit") thinkingLine = `\nthinking: ${thinkingChoice}`;
 
-    const systemPrompt = await ctx.ui.editor("System prompt", "");
+    const systemPrompt = await ui.editor("System prompt", "");
     if (systemPrompt === undefined) return;
 
     const content = `---
@@ -229,17 +240,17 @@ ${systemPrompt}
 
     const targetPath = join(targetDir, `${name}.md`);
 
-    if (deps.fileOps.exists(targetPath)) {
-      const overwrite = await ctx.ui.confirm(
+    if (fileOps.exists(targetPath)) {
+      const overwrite = await ui.confirm(
         "Overwrite",
         `${targetPath} already exists. Overwrite?`,
       );
       if (!overwrite) return;
     }
 
-    deps.fileOps.write(targetPath, content);
-    deps.registry.reload();
-    ctx.ui.notify(`Created ${targetPath}`, "info");
+    fileOps.write(targetPath, content);
+    registry.reload();
+    ui.notify(`Created ${targetPath}`, "info");
   }
 
   return { showCreateWizard };