@ferris1225/pi-subagents 0.21.0 → 0.23.0

package/README.md

@@ -350,9 +350,11 @@ agent's default — its frontmatter `thinking`, else the global default). The gl
 When the config already exists, re-running `/subagents-setup` opens a menu whose
 **Configure an agent (model + thinking)** entry lets you pick one agent and set just its
 model and thinking strength — so changing a single agent no longer walks every enabled
-agent. **Change default thinking strength** sets only the global fallback. The rest of the
-menu toggles injection, scope, concurrency, fix rounds, and idle timeout; **Full re-setup**
-re-runs the whole first-time wizard.
+agent. After one agent's model + strength picks, the wizard returns to the agent picker
+so several agents can be configured in one pass; Esc at any step ends the pass and keeps
+every agent already configured. **Change default thinking strength** sets only the global
+fallback. The rest of the menu toggles injection, scope, concurrency, fix rounds, and
+idle timeout; **Full re-setup** re-runs the whole first-time wizard.
 
 ```json
 {

package/package.json

@@ -1,53 +1,53 @@
-{
-  "name": "@ferris1225/pi-subagents",
-  "version": "0.21.0",
-  "description": "Focused sub-agent delegation for pi: explore / worker / reviewer agents in isolated context, with proactive dispatch injection and per-agent model selection.",
-  "type": "module",
-  "license": "MIT",
-  "publishConfig": {
-    "access": "public"
-  },
-  "keywords": [
-    "pi-package",
-    "pi-extension",
-    "subagent",
-    "sub-agent",
-    "delegation"
-  ],
-  "files": [
-    "src",
-    "agents",
-    "README.md",
-    "LICENSE"
-  ],
-  "pi": {
-    "extensions": [
-      "./src/index.ts"
-    ]
-  },
-  "scripts": {
-    "check": "tsc --noEmit",
-    "test": "vitest run tests",
-    "prepack": "npm run check && npm test"
-  },
-  "peerDependencies": {
-    "@earendil-works/pi-agent-core": ">=0.80.6",
-    "@earendil-works/pi-ai": ">=0.80.6",
-    "@earendil-works/pi-coding-agent": ">=0.80.6",
-    "@earendil-works/pi-tui": ">=0.80.6",
-    "typebox": "*"
-  },
-  "devDependencies": {
-    "@earendil-works/pi-agent-core": "^0.83.0",
-    "@earendil-works/pi-ai": "^0.83.0",
-    "@earendil-works/pi-coding-agent": "^0.83.0",
-    "@earendil-works/pi-tui": "^0.83.0",
-    "@types/node": "^22.10.0",
-    "typebox": "^1.3.9",
-    "typescript": "^5.9.0",
-    "vitest": "^4.1.0"
-  },
-  "engines": {
-    "node": ">=22.19.0"
-  }
-}
+{
+  "name": "@ferris1225/pi-subagents",
+  "version": "0.23.0",
+  "description": "Focused sub-agent delegation for pi: explore / worker / reviewer agents in isolated context, with proactive dispatch injection and per-agent model selection.",
+  "type": "module",
+  "license": "MIT",
+  "publishConfig": {
+    "access": "public"
+  },
+  "keywords": [
+    "pi-package",
+    "pi-extension",
+    "subagent",
+    "sub-agent",
+    "delegation"
+  ],
+  "files": [
+    "src",
+    "agents",
+    "README.md",
+    "LICENSE"
+  ],
+  "pi": {
+    "extensions": [
+      "./src/index.ts"
+    ]
+  },
+  "scripts": {
+    "check": "tsc --noEmit",
+    "test": "vitest run tests",
+    "prepack": "npm run check && npm test"
+  },
+  "peerDependencies": {
+    "@earendil-works/pi-agent-core": ">=0.80.6",
+    "@earendil-works/pi-ai": ">=0.80.6",
+    "@earendil-works/pi-coding-agent": ">=0.80.6",
+    "@earendil-works/pi-tui": ">=0.80.6",
+    "typebox": "*"
+  },
+  "devDependencies": {
+    "@earendil-works/pi-agent-core": "^0.83.0",
+    "@earendil-works/pi-ai": "^0.83.0",
+    "@earendil-works/pi-coding-agent": "^0.83.0",
+    "@earendil-works/pi-tui": "^0.83.0",
+    "@types/node": "^22.10.0",
+    "typebox": "^1.3.9",
+    "typescript": "^5.9.0",
+    "vitest": "^4.1.0"
+  },
+  "engines": {
+    "node": ">=22.19.0"
+  }
+}

package/src/index.ts

@@ -776,54 +776,75 @@ export default function (pi: ExtensionAPI): void {
 					}
 				}, 1000);
 				return {
-					render(width: number): string[] {
-						const runs = monitor.getRuns();
-						if (runs.length === 0) return [];
-						const now = Date.now();
-						const lines: string[] = [];
-						for (const r of runs) {
-							const icon = statusIcon(r.status, theme);
-							// Chain-internal runs (auto-fix worker/reviewer) indent under their parent
-							// reviewer. For those, the relationLabel ("fix round 1") is more
-							// distinguishing than the repeated worker/reviewer name.
-							const head = r.groupId ? theme.fg("dim", "  ↳ ") : " ";
-							const name = r.groupId ? (r.relationLabel ?? r.agent) : r.agent;
-							// Header row stays short: icon, run id, agent name — the task summary
-							// (keys-only fragments: paths, symbols, quoted phrases) gets its own
-							// line below with a full width budget, so parallel runs of the SAME
-							// agent are still distinguishable at a glance.
-							const title = formatTaskSummary(r.task, Math.max(16, Math.floor(width * 0.65)), true);
-							const left = `${head}${icon} ${theme.fg("dim", `#${r.id}`)} ${theme.bold(name)}`;
-
-							// Right side: full model ref (provider/model), token usage (in/out +
-							// cache read/write), tool count, elapsed, and the soft activity-state
-							// annotation (idle / long-running). Trailing the header with a single
-							// " · " chain keeps the row compact (no center gap); compactLine
-							// clips on overflow, never the right side on its own.
-							const model = r.model ?? "?";
-							const usage = formatUsageCompact(r.usage);
-							const tools = r.toolCount ? `${r.toolCount} tool${r.toolCount === 1 ? "" : "s"}` : "";
-							const elapsed = formatElapsed(r, now);
-							const metaParts = [model, usage, tools, elapsed].filter(Boolean);
-							// Running is conveyed by the icon + elapsed; spell out the label only for
-							// the other states (ready / done / stopped) so they are unambiguous.
-							if (r.status !== "running") metaParts.push(statusLabel(r.status));
-							const state = deriveActivityState(r, now);
-							if (state) metaParts.push(activityStateLabel(state));
-							if (r.annotation) metaParts.push(r.annotation);
-							const right = metaParts.length ? theme.fg("dim", ` · ${metaParts.join(" · ")}`) : "";
-							lines.push(compactLine(left, right, width));
-
-							// Task summary sits one indent below the header, on its own line.
-							lines.push(rightAlign(`${head}  ${theme.fg("accent", title)}`, "", width));
-
-							// Current activity sits one indent below, only while the run is active.
-							if (r.activity && (r.status === "running" || r.status === "queued")) {
-								lines.push(rightAlign(`${head}  ${theme.fg("dim", r.activity)}`, "", width));
+						render(width: number): string[] {
+							const runs = monitor.getRuns();
+							if (runs.length === 0) return [];
+							const now = Date.now();
+							const lines: string[] = [];
+							// Tree layout: each top-level agent is a root whose title/activity hang
+							// off it as branches; auto-fix chain runs (groupId) become child nodes
+							// under their parent root, with a "│" continuation while more siblings
+							// follow. Blank lines separate agent blocks so parallel runs don't blur
+							// into one wall of text.
+							const dim = (t: string): string => theme.fg("dim", t);
+							for (let idx = 0; idx < runs.length; idx++) {
+								const r = runs[idx];
+								const isChain = Boolean(r.groupId);
+								const chainContinues = isChain && runs[idx + 1]?.groupId === r.groupId;
+								const activity =
+									r.activity && (r.status === "running" || r.status === "queued") ? r.activity : undefined;
+								const hasActivity = activity !== undefined;
+								const icon = statusIcon(r.status, theme);
+								// Chain-internal runs (auto-fix worker/reviewer) are child nodes under
+								// their parent reviewer. Their relationLabel ("fix round 1") is more
+								// distinguishing than the repeated worker/reviewer name.
+								const name = isChain ? (r.relationLabel ?? r.agent) : r.agent;
+								// Header row stays short: icon, run id, agent name — the task summary
+								// (keys-only fragments: paths, symbols, quoted phrases) gets its own
+								// line below with a full width budget, so parallel runs of the SAME
+								// agent are still distinguishable at a glance.
+								const title = formatTaskSummary(r.task, Math.max(16, Math.floor(width * 0.65)), true);
+								// Hierarchy: top-level agent names are the visual anchor (accent +
+								// bold); chain nodes and all metadata stay quiet, so the widget reads
+								// top-down: roots → their branches → the fine print.
+								if (!isChain && lines.length > 0) lines.push("");
+								const nodeBranch = isChain ? (chainContinues ? "├─ " : "└─ ") : "";
+								const left = `${dim(nodeBranch)}${icon} ${dim(`#${r.id}`)} ${isChain ? name : theme.fg("accent", theme.bold(name))}`;
+
+								// Right side: full model ref (provider/model), token usage (in/out +
+								// cache read/write), tool count, elapsed, and the soft activity-state
+								// annotation (idle / long-running). Trailing the header with a single
+								// " · " chain keeps the row compact (no center gap); compactLine
+								// clips on overflow, never the right side on its own.
+								const model = r.model ?? "?";
+								const usage = formatUsageCompact(r.usage);
+								const tools = r.toolCount ? `${r.toolCount} tool${r.toolCount === 1 ? "" : "s"}` : "";
+								const elapsed = formatElapsed(r, now);
+								const metaParts = [model, usage, tools, elapsed].filter(Boolean);
+								// Running is conveyed by the icon + elapsed; spell out the label only for
+								// the other states (ready / done / stopped) so they are unambiguous.
+								if (r.status !== "running") metaParts.push(statusLabel(r.status));
+								const state = deriveActivityState(r, now);
+								if (state) metaParts.push(activityStateLabel(state));
+								if (r.annotation) metaParts.push(r.annotation);
+								const right = metaParts.length ? dim(` · ${metaParts.join(" · ")}`) : "";
+								lines.push(compactLine(left, right, width));
+
+								// Branches hang off the node's content column; chain nodes that still
+								// have siblings carry a "│" continuation down to the last one.
+								const continuation = isChain ? (chainContinues ? "│  " : "   ") : "";
+								// Task summary is the first branch; the summary itself is plain text —
+								// no accent, so it never competes with the agent name or pi's own UI.
+								lines.push(
+									rightAlign(`${continuation}${dim(hasActivity ? "├─ " : "└─ ")}${dim("title: ")}${theme.fg("text", title)}`, "", width),
+								);
+								// Current activity is the last branch, only while the run is active.
+								if (hasActivity) {
+									lines.push(rightAlign(`${continuation}${dim("└─ ")}${dim(activity)}`, "", width));
+								}
 							}
-						}
-						return lines;
-					},
+							return lines;
+						},
 					invalidate() {},
 					dispose() {
 						unsub();

package/src/setup.ts

@@ -76,12 +76,15 @@ async function pickEnabledAgents(
 	);
 }
 
-/** Single-agent model pick; the inherit option drops any existing override. */
+/** Single-agent model pick; the inherit option drops any existing override.
+ * `escNote` describes what Esc does at this pick (whole-wizard cancel in the
+ * full setup vs. ending the per-agent loop in the menu). */
 async function pickAgentModel(
 	ctx: ExtensionCommandContext,
 	name: string,
 	currentRef: string | undefined,
 	refs: readonly string[],
+	escNote = "cancels setup",
 ): Promise<string | typeof INHERIT | undefined> {
 	const items = [
 		{
@@ -95,7 +98,7 @@ async function pickAgentModel(
 	return promptSelectOne(
 		ctx,
 		`Model for "${name}"`,
-		"Type to filter • ↑/↓ • PgUp/PgDn • Enter selects • Esc cancels setup",
+		`Type to filter • ↑/↓ • PgUp/PgDn • Enter selects • Esc ${escNote}`,
 		items,
 	);
 }
@@ -140,13 +143,16 @@ const THINKING_LEVEL_HINTS: Record<ThinkingLevel, string> = {
 	max: "strongest reasoning",
 };
 
-/** Single strength pick for one agent; the inherit option keeps the effective default. */
+/** Single strength pick for one agent; the inherit option keeps the effective default.
+ * `escNote` describes what Esc does at this pick (whole-wizard cancel in the
+ * full setup vs. ending the per-agent loop in the menu). */
 async function pickAgentStrength(
 	ctx: ExtensionCommandContext,
 	agentName: string,
 	current: ThinkingLevel | undefined,
 	defaultLevel: ThinkingLevel,
 	defaults: ReadonlyMap<string, ThinkingLevel>,
+	escNote = "cancels setup",
 ): Promise<ThinkingLevel | typeof INHERIT | undefined> {
 	const options = THINKING_LEVEL_VALUES.map((level) => ({
 		value: level,
@@ -159,7 +165,7 @@ async function pickAgentStrength(
 	const choice = await promptSelectOne(
 		ctx,
 		`Thinking strength for "${agentName}"?`,
-		"Type to filter • ↑/↓ • Enter selects • Esc cancels setup",
+		`Type to filter • ↑/↓ • Enter selects • Esc ${escNote}`,
 		[{ value: INHERIT, label: inheritLabel }, ...options],
 	);
 	if (choice === undefined) return undefined;
@@ -179,7 +185,7 @@ async function pickAgentToConfigure(
 	return promptSelectOne(
 		ctx,
 		"Configure which agent?",
-		"Type to filter • ↑/↓ • PgUp/PgDn • Enter selects • Esc cancels",
+		"Type to filter • ↑/↓ • PgUp/PgDn • Enter selects • Esc stops",
 		items,
 	);
 }
@@ -189,7 +195,8 @@ async function pickAgentToConfigure(
  * its thinking strength. Only that one agent is touched, so re-running the menu
  * to tweak one agent no longer walks every enabled agent. Both picks offer an
  * "inherit" option that drops any existing per-agent override for that field.
- * Resolves undefined when the user cancels (Esc) at any step.
+ * Resolves undefined when the user presses Esc at any step; the caller keeps
+ * changes from agents already configured earlier in the same pass.
  */
 async function configureOneAgent(
 	ctx: ExtensionCommandContext,
@@ -216,13 +223,13 @@ async function configureOneAgent(
 	if (!modelsAvailable) {
 		ctx.ui.notify("No Pi models are currently available; model override left unchanged.", "warning");
 	} else {
-		const modelChoice = await pickAgentModel(ctx, name, currentModels[name], refs);
-		if (modelChoice === undefined) return undefined; // Esc cancels setup
+		const modelChoice = await pickAgentModel(ctx, name, currentModels[name], refs, "stops — earlier agent picks are kept");
+		if (modelChoice === undefined) return undefined; // Esc ends the loop
 		model = modelChoice;
 	}
 
-	const strength = await pickAgentStrength(ctx, name, currentStrengths[name], defaultLevel, defaults);
-	if (strength === undefined) return undefined; // Esc cancels setup
+	const strength = await pickAgentStrength(ctx, name, currentStrengths[name], defaultLevel, defaults, "stops — earlier agent picks are kept");
+	if (strength === undefined) return undefined; // Esc ends the loop
 
 	return { name, model, modelsAvailable, strength };
 }
@@ -403,27 +410,33 @@ async function runMenu(ctx: ExtensionCommandContext, configPath: string, config:
 		if (enabled === undefined) return notifyCancelled(ctx);
 		next.enabledAgents = enabled;
 	} else if (choice.startsWith("Configure an agent")) {
-		// Per-agent: pick one agent, then its model and thinking strength. Only that
-		// agent is touched, so tweaking one no longer walks every enabled agent.
+		// Per-agent loop: pick one agent, then its model and thinking strength, then
+		// return to the agent picker so several agents can be configured in one
+		// pass. Esc at any step ends the loop; agents already configured in this
+		// pass are kept.
 		const defaults = builtinThinkingDefaults();
-		const picked = await configureOneAgent(
-			ctx,
-			config.enabledAgents,
-			config.agentModels,
-			config.agentThinkingLevels,
-			config.thinkingLevel,
-			defaults,
-		);
-		if (picked === undefined) return notifyCancelled(ctx);
-		next.agentModels = { ...config.agentModels };
+		let configuredAny = false;
 		next.agentThinkingLevels = { ...config.agentThinkingLevels };
-		if (picked.modelsAvailable) {
-			if (picked.model === INHERIT) delete next.agentModels[picked.name];
-			else next.agentModels[picked.name] = picked.model;
-			next.agentModels = repairStaleModels(ctx, next.agentModels);
+		while (true) {
+			const picked = await configureOneAgent(
+				ctx,
+				next.enabledAgents,
+				next.agentModels,
+				next.agentThinkingLevels,
+				next.thinkingLevel,
+				defaults,
+			);
+			if (picked === undefined) break; // Esc ends the loop
+			configuredAny = true;
+			if (picked.modelsAvailable) {
+				if (picked.model === INHERIT) delete next.agentModels[picked.name];
+				else next.agentModels[picked.name] = picked.model;
+			}
+			if (picked.strength === INHERIT) delete next.agentThinkingLevels[picked.name];
+			else next.agentThinkingLevels[picked.name] = picked.strength;
 		}
-		if (picked.strength === INHERIT) delete next.agentThinkingLevels[picked.name];
-		else next.agentThinkingLevels[picked.name] = picked.strength;
+		if (!configuredAny) return notifyCancelled(ctx);
+		next.agentModels = repairStaleModels(ctx, next.agentModels);
 	} else if (choice.startsWith("Change default thinking")) {
 		const thinkingLevel = await pickThinkingLevel(ctx, config.thinkingLevel);
 		if (thinkingLevel === undefined) return notifyCancelled(ctx);