@ferris1225/pi-subagents 0.20.0 → 0.22.0

package/README.md

@@ -347,6 +347,15 @@ agent's default — its frontmatter `thinking`, else the global default). The gl
 `thinkingLevel` is set first and applies as the final fallback. `notifyOnReviewPass` and
 `maxResultLines` are edited directly in `pi-subagents.json`.
 
+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. 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
 {
   "enabledAgents": ["explore", "worker", "reviewer"],

package/package.json

@@ -1,53 +1,53 @@
-{
-  "name": "@ferris1225/pi-subagents",
-  "version": "0.20.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.22.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

@@ -45,7 +45,7 @@ import {
 import { buildFixTaskBrief, buildReReviewBrief, shouldTriggerFixLoop } from "./fixloop.ts";
 import {
 	activityStateLabel,
-	compactModelRef,
+	compactLine,
 	deriveActivityState,
 	formatElapsed,
 	formatTaskSummary,
@@ -795,11 +795,12 @@ export default function (pi: ExtensionAPI): void {
 							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: compact model (no provider prefix), token usage (in/out +
+							// 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). Always visible — rightAlign clips
-							// the title on overflow, never this.
-							const model = compactModelRef(r.model);
+							// 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);
@@ -808,10 +809,10 @@ export default function (pi: ExtensionAPI): void {
 							// the other states (ready / done / stopped) so they are unambiguous.
 							if (r.status !== "running") metaParts.push(statusLabel(r.status));
 							const state = deriveActivityState(r, now);
-							const stateNote = state ? ` · ${activityStateLabel(state)}` : "";
-							const note = r.annotation ? ` · ${r.annotation}` : "";
-							const right = theme.fg("dim", `${metaParts.join(" · ")}${stateNote}${note}`);
-							lines.push(rightAlign(left, right, width));
+							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));

package/src/monitor.ts

@@ -297,6 +297,16 @@ export function rightAlign(left: string, right: string, width: number): string {
 	return truncateToWidth(`${leftClipped}${" ".repeat(gap)}${right}`, width);
 }
 
+/** Concatenate `left` and `right` (no center padding) and clip the combined line
+ * to `width`. Unlike {@link rightAlign}, the right side trails the left side
+ * instead of being pinned to the far edge, so a short header leaves no gap in
+ * the middle. `right` should carry its own leading separator (e.g. ` \u00b7 `);
+ * pass an empty string when there is nothing to append. Styled strings are
+ * measured by display width. */
+export function compactLine(left: string, right: string, width: number): string {
+	return truncateToWidth(`${left}${right}`, width);
+}
+
 /** Max length of the argument target inside a formatted activity line. */
 export const ACTIVITY_TARGET_MAX = 60;
 

package/src/setup.ts

@@ -76,6 +76,33 @@ async function pickEnabledAgents(
 	);
 }
 
+/** 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 = [
+		{
+			value: INHERIT,
+			label: currentRef
+				? `(use main session's model — drop override "${currentRef}")`
+				: "(use main session's current model — no override)",
+		},
+		...refs.map((ref) => ({ value: ref, label: ref === currentRef ? `${ref} (current)` : ref })),
+	];
+	return promptSelectOne(
+		ctx,
+		`Model for "${name}"`,
+		`Type to filter • ↑/↓ • PgUp/PgDn • Enter selects • Esc ${escNote}`,
+		items,
+	);
+}
+
 async function pickAgentModelsAndStrength(
 	ctx: ExtensionCommandContext,
 	enabledAgents: readonly string[],
@@ -93,24 +120,9 @@ async function pickAgentModelsAndStrength(
 	const models: Record<string, string> = {};
 	const strengths: Record<string, ThinkingLevel> = {};
 	for (const name of enabledAgents) {
-		const currentRef = currentModels[name];
-		const items = [
-			{
-				value: INHERIT,
-				label: currentRef
-					? `(use main session's model — drop override "${currentRef}")`
-					: "(use main session's current model — no override)",
-			},
-			...refs.map((ref) => ({ value: ref, label: ref === currentRef ? `${ref} (current)` : ref })),
-		];
-		const choice = await promptSelectOne(
-			ctx,
-			`Model for "${name}"`,
-			"Type to filter • ↑/↓ • PgUp/PgDn • Enter selects • Esc cancels setup",
-			items,
-		);
-		if (choice === undefined) return undefined; // Esc aborts the whole wizard
-		if (choice !== INHERIT) models[name] = choice;
+		const modelChoice = await pickAgentModel(ctx, name, currentModels[name], refs);
+		if (modelChoice === undefined) return undefined; // Esc aborts the whole wizard
+		if (modelChoice !== INHERIT) models[name] = modelChoice;
 
 		// Convenience: the model pick is immediately followed by the strength pick,
 		// so per-agent model + strength are configured in one pass.
@@ -131,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,
@@ -150,28 +165,73 @@ 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;
 	return choice === INHERIT ? INHERIT : (choice as ThinkingLevel);
 }
 
-/** Strength picks for every enabled agent (inherit keeps the effective default). */
-async function pickAgentStrengths(
+/** Pick one enabled agent to reconfigure. Resolves undefined on Esc. */
+async function pickAgentToConfigure(
 	ctx: ExtensionCommandContext,
 	enabledAgents: readonly string[],
+): Promise<string | undefined> {
+	if (enabledAgents.length === 0) {
+		ctx.ui.notify("No agents are enabled. Enable agents first.", "warning");
+		return undefined;
+	}
+	const items = enabledAgents.map((name) => ({ value: name, label: moduleLabel(name) }));
+	return promptSelectOne(
+		ctx,
+		"Configure which agent?",
+		"Type to filter • ↑/↓ • PgUp/PgDn • Enter selects • Esc stops",
+		items,
+	);
+}
+
+/**
+ * Configure a single agent picked from the enabled set: choose its model, then
+ * 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 presses Esc at any step; the caller keeps
+ * changes from agents already configured earlier in the same pass.
+ */
+async function configureOneAgent(
+	ctx: ExtensionCommandContext,
+	enabledAgents: readonly string[],
+	currentModels: Record<string, string>,
 	currentStrengths: Record<string, ThinkingLevel>,
 	defaultLevel: ThinkingLevel,
 	defaults: ReadonlyMap<string, ThinkingLevel>,
-): Promise<Record<string, ThinkingLevel> | undefined> {
-	const strengths: Record<string, ThinkingLevel> = {};
-	for (const name of enabledAgents) {
-		const strength = await pickAgentStrength(ctx, name, currentStrengths[name], defaultLevel, defaults);
-		if (strength === undefined) return undefined; // Esc aborts
-		if (strength !== INHERIT) strengths[name] = strength;
+): Promise<
+	| {
+			name: string;
+			model: string | typeof INHERIT;
+			modelsAvailable: boolean;
+			strength: ThinkingLevel | typeof INHERIT;
+	  }
+	| undefined
+> {
+	const name = await pickAgentToConfigure(ctx, enabledAgents);
+	if (name === undefined) return undefined; // Esc cancels
+
+	const refs = availableModelRefs(ctx);
+	const modelsAvailable = refs.length > 0;
+	let model: string | typeof INHERIT = INHERIT;
+	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, "stops — earlier agent picks are kept");
+		if (modelChoice === undefined) return undefined; // Esc ends the loop
+		model = modelChoice;
 	}
-	return strengths;
+
+	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 };
 }
 
 async function pickThinkingLevel(
@@ -330,8 +390,8 @@ async function runFullSetup(ctx: ExtensionCommandContext, configPath: string, ba
 async function runMenu(ctx: ExtensionCommandContext, configPath: string, config: SubagentsConfig): Promise<void> {
 	const choice = await ctx.ui.select("pi-subagents is already configured. What would you like to change?", [
 		"Enable/disable agents",
-		"Change agent models",
-		"Change thinking strength",
+		"Configure an agent (model + thinking)",
+		"Change default thinking strength",
 		"Toggle proactive injection",
 		"Change agent scope",
 		"Change max concurrent sub-agents",
@@ -349,27 +409,38 @@ async function runMenu(ctx: ExtensionCommandContext, configPath: string, config:
 		const enabled = await pickEnabledAgents(ctx, config.enabledAgents);
 		if (enabled === undefined) return notifyCancelled(ctx);
 		next.enabledAgents = enabled;
-	} else if (choice.startsWith("Change agent models")) {
+	} else if (choice.startsWith("Configure an 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 pickAgentModelsAndStrength(
-			ctx,
-			config.enabledAgents,
-			config.agentModels,
-			config.agentThinkingLevels,
-			config.thinkingLevel,
-			defaults,
-		);
-		if (picked === undefined) return notifyCancelled(ctx);
-		next.agentModels = repairStaleModels(ctx, picked.models);
-		next.agentThinkingLevels = picked.strengths;
-	} else if (choice.startsWith("Change thinking")) {
-		// Global first so per-agent "inherit" labels reflect the value that will be stored.
+		let configuredAny = false;
+		next.agentThinkingLevels = { ...config.agentThinkingLevels };
+		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 (!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);
 		next.thinkingLevel = thinkingLevel;
-		const strengths = await pickAgentStrengths(ctx, config.enabledAgents, config.agentThinkingLevels, thinkingLevel, builtinThinkingDefaults());
-		if (strengths === undefined) return notifyCancelled(ctx);
-		next.agentThinkingLevels = strengths;
 	} else if (choice.startsWith("Toggle")) {
 		const injection = await pickInjection(ctx, config.proactiveInjection);
 		if (injection === undefined) return notifyCancelled(ctx);