pi-soly 0.4.0 → 0.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-soly",
-  "version": "0.4.0",
+  "version": "0.5.1",
   "description": "Project management for pi — plans, state, subagent-driven execution. Inspired by GSD.",
   "type": "module",
   "main": "index.ts",

package/switch/index.ts

@@ -1,18 +1,24 @@
 // =============================================================================
-// index.ts — pi-switch extension entry
+// index.ts — pi-switch extension entry (v2: footer-pill UI)
 // =============================================================================
 //
-// Wires the agent switcher into pi:
-//   - Header bar above chat (Claude Code-style, dim, persistent)
-//   - Ctrl+Shift+S to cycle (Shift+Tab is taken by pi's thinking-level cycler)
-//   - /agent slash command: show current + available, or set explicitly
-//   - Persists current agent to .soly/agent (shared with soly) or ~/.pi-switch/agent
-//   - Exposes `globalThis.__PI_SWITCH_AGENT__` for other extensions to read
-//   - Injects a system-prompt section so the LLM knows when to use which agent
+// Wires the agent switcher into pi as a compact footer pill:
+//   - Footer status pill: "⚡ worker" (or hidden if default)
+//   - Click pill or `/agent` → open full picker modal (SelectList)
+//   - Ctrl+Shift+S → cycle to next agent (no popup, hot switch)
+//   - Persists current agent to .soly/agent or ~/.pi-switch/agent
+//   - Exposes `globalThis.__PI_SWITCH_AGENT__` for other extensions
+//   - Injects a short system-prompt section so the LLM knows the current
+//     agent and the available alternatives
+//
+// UI philosophy:
+//   - Header is for content, not for tool chrome. Move agents to footer.
+//   - Click to explore, hotkey to power-use, no DOM clutter in between.
+//   - Visual change is the pill text + a one-line toast on switch.
 // =============================================================================
 
 import type { ExtensionAPI, ExtensionUIContext } from "@earendil-works/pi-coding-agent";
-import { Text } from "@earendil-works/pi-tui";
+import { Box, Text } from "@earendil-works/pi-tui";
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
@@ -22,9 +28,6 @@ import {
 	availableAgents,
 	nextAgent,
 	parseAgentName,
-	formatAgentBadge,
-	formatAgentSwitchNotify,
-	formatHeaderLine,
 	groupedAvailableAgents,
 	getAgentMeta,
 	loadAgent,
@@ -42,9 +45,7 @@ export default function piSwitchExtension(pi: ExtensionAPI) {
 
 	function refreshCycle(): void {
 		cycle = availableAgents();
-		if (!cycle.includes(currentAgent)) {
-			currentAgent = DEFAULT_AGENT;
-		}
+		if (!cycle.includes(currentAgent)) currentAgent = DEFAULT_AGENT;
 	}
 
 	function publish(): void {
@@ -54,9 +55,13 @@ export default function piSwitchExtension(pi: ExtensionAPI) {
 	function rerender(): void {
 		if (!lastUi) return;
 		try {
-			setHeaderBar(lastUi, () => formatHeaderLine(currentAgent));
-			const badge = formatAgentBadge(currentAgent);
-			lastUi.setStatus("pi-switch", badge ?? undefined);
+			const meta = getAgentMeta(currentAgent);
+			// Persistent pill — always visible above the input, even for the
+			// default agent. The user wants a constant mode indicator, not a
+			// transient one. Marker "▶" makes it scannable.
+			const marker = currentAgent === DEFAULT_AGENT ? "·" : "▶";
+			const pill = `${marker} ${meta.emoji} ${currentAgent}`;
+			lastUi.setStatus("pi-switch", pill);
 		} catch { /* no ui yet */ }
 	}
 
@@ -68,11 +73,15 @@ export default function piSwitchExtension(pi: ExtensionAPI) {
 		if (cwd) saveAgent(cwd, next);
 		rerender();
 		if (lastUi) {
-			lastUi.notify(formatAgentSwitchNotify(prev, next), "info");
+			const m = getAgentMeta(next);
+			lastUi.notify(
+				`${m.emoji} ${next}  ·  ${m.description}${m.writesFiles ? "" : "  ·  read-only"}`,
+				"info",
+			);
 		}
 	}
 
-	// ----- session_start: load persisted agent + set initial header -----
+	// ----- session_start: load persisted agent + set initial pill -----
 	pi.on("session_start", async (_event, ctx) => {
 		cwd = ctx.cwd;
 		lastUi = ctx.ui;
@@ -87,27 +96,25 @@ export default function piSwitchExtension(pi: ExtensionAPI) {
 	// ----- before_agent_start: inject system-prompt section -----
 	pi.on("before_agent_start", async (event, ctx) => {
 		lastUi = ctx.ui;
-		// Re-render the header on each turn (in case agent was changed via /agent)
 		rerender();
 		return {
 			systemPrompt: event.systemPrompt + buildPiSwitchSection(),
 		};
 	});
 
-	// ----- Ctrl+Shift+S: cycle to next agent -----
+	// ----- Ctrl+Shift+S: hot cycle (no popup, no confirmation) -----
 	pi.registerShortcut("ctrl+shift+s", {
-		description: "Cycle pi-switch agent: worker → oracle → user-defined…",
+		description: "Cycle to next agent (worker → oracle → scout → …)",
 		handler: (sctx) => {
 			lastUi = sctx.ui;
 			refreshCycle();
-			const next = nextAgent(currentAgent, cycle);
-			setAgent(next);
+			setAgent(nextAgent(currentAgent, cycle));
 		},
 	});
 
-	// ----- /agent slash command (also handles subcommands: create, doctor) -----
+	// ----- /agent: open picker, or subcommands (create / doctor / recommend / set) -----
 	pi.registerCommand("agent", {
-		description: "show or set the active subagent, or `create <name>` to scaffold, or `doctor` to diagnose",
+		description: "open agent picker, or `set <name>`, `create`, `doctor`, `recommend <task>`",
 		handler: async (args, ctx) => {
 			lastUi = ctx.ui;
 			refreshCycle();
@@ -115,115 +122,120 @@ export default function piSwitchExtension(pi: ExtensionAPI) {
 			const subcommand = parts[0]?.toLowerCase();
 			const arg = parts[1];
 
-			// Subcommand: create
-			if (subcommand === "create") {
-				if (!arg) {
-					ctx.ui.notify("pi-switch: usage — `/agent create <name>`", "info");
-					return;
-				}
-				createAgent(arg, { ui: ctx.ui, cwd });
-				return;
-			}
+			if (subcommand === "create") return createAgent(arg, ctx.ui, cwd);
+			if (subcommand === "doctor") return ctx.ui.notify(doctorReport(), "info");
+			if (subcommand === "recommend") return handleRecommend(parts.slice(1).join(" "), ctx.ui);
+			if (subcommand === "set" && arg) return handleSet(arg, ctx.ui);
 
-			// Subcommand: doctor
-			if (subcommand === "doctor") {
-				ctx.ui.notify(doctorReport(), "info");
-				return;
-			}
+			// Direct agent name → set
+			if (subcommand && cycle.includes(subcommand)) return setAgent(subcommand);
+			if (arg && !subcommand) return handleSet(arg, ctx.ui);
 
-			// Subcommand: recommend
-			if (subcommand === "recommend") {
-				const task = parts.slice(1).join(" ");
-				if (!task) {
-					ctx.ui.notify("pi-switch: usage — `/agent recommend <task description>`", "info");
-					return;
-				}
-				const rec = recommendAgent(task);
-				if (!rec) {
-					ctx.ui.notify(`pi-switch: no clear agent match for: "${task}"`, "info");
-					return;
-				}
-				ctx.ui.notify(
-					`pi-switch recommendation: ${rec.emoji} ${rec.agent}\n  why: ${rec.why}\n  → /agent ${rec.agent} to switch`,
-					"info",
-				);
-				return;
-			}
+			// No arg: open picker modal
+			openPicker(ctx.ui);
+		},
+	});
+}
 
-			// Direct agent name → set (handles `/agent <name>` as a single-arg shortcut).
-			// Check FIRST: if parts[0] is a valid agent name, treat as set even
-			// if it happens to be a "subcommand-looking" word. This way
-			// `/agent researcher` always sets to researcher, never falls
-			// through to the listing branch.
-			if (subcommand && cycle.includes(subcommand)) {
-				setAgent(subcommand);
-				return;
-			}
-			// Optional second arg: also set, for explicit `/agent <name>` syntax.
-			if (arg) {
-				const target = parseAgentName(arg);
-				if (!target) {
-					ctx.ui.notify(`pi-switch: invalid name "${arg}".`, "error");
-					return;
-				}
-				if (!cycle.includes(target)) {
-					ctx.ui.notify(
-						`pi-switch: unknown "${target}". available: ${cycle.join(", ")}`,
-						"error",
-					);
-					return;
-				}
-				setAgent(target);
-				return;
-			}
+// ---------------------------------------------------------------------------
+// Picker modal (TUI SelectList)
+// ---------------------------------------------------------------------------
 
-			// No arg: show current + grouped available
-			const curMeta = getAgentMeta(currentAgent);
-			const groups = groupedAvailableAgents();
-			const lines: string[] = [
-				`current: ${curMeta.emoji} ${currentAgent}  (${curMeta.description})`,
-				"",
-				"available:",
-				"",
-			];
-			for (const g of groups) {
-				lines.push(`─── ${g.header} ${"─".repeat(Math.max(0, 40 - g.header.length))}`);
-				for (const a of g.agents) {
-					const meta = getAgentMeta(a);
-					const marker = a === currentAgent ? "→" : " ";
-					lines.push(`  ${marker} ${meta.emoji} ${a.padEnd(16)}  ${meta.description}`);
-				}
-				lines.push("");
+function openPicker(ui: ExtensionUIContext): void {
+	refreshAndBuild(ui, (groups) => {
+		const all: Array<{ value: string; label: string; description: string; isCurrent: boolean }> = [];
+		for (const g of groups) {
+			all.push({ value: "__sep__", label: `── ${g.header} `, description: "", isCurrent: false });
+			for (const a of g.agents) {
+				const m = getAgentMeta(a);
+				all.push({
+					value: a,
+					label: `${m.emoji}  ${a}`,
+					description: `${m.description}${m.writesFiles ? "" : "  ·  read-only"}`,
+					isCurrent: a === currentAgentRef(),
+				});
 			}
-			lines.push("cycle with Ctrl+Shift+S, or `/agent <name>`");
-			lines.push("subcommands: `/agent create <name>`, `/agent doctor`, `/agent recommend <task>`");
-			ctx.ui.notify(lines.join("\n"), "info");
-		},
+		}
+		return all;
+	}, ui, (choice) => {
+		if (choice && choice !== "__sep__") setAgentRef(choice);
 	});
 }
 
+function handleSet(name: string, ui: ExtensionUIContext): void {
+	const target = parseAgentName(name);
+	if (!target) return ui.notify(`pi-switch: invalid name "${name}".`, "error");
+	if (!availableAgents().includes(target)) {
+		return ui.notify(`pi-switch: unknown "${target}". available: ${availableAgents().join(", ")}`, "error");
+	}
+	setAgentRef(target);
+}
+
+function handleRecommend(task: string, ui: ExtensionUIContext): void {
+	if (!task) return ui.notify("pi-switch: usage — `/agent recommend <task>`", "info");
+	const rec = recommendAgent(task);
+	if (!rec) return ui.notify(`pi-switch: no clear match for: "${task}"`, "info");
+	ui.notify(`${rec.emoji} ${rec.agent}  ·  why: ${rec.why}\n  → /agent ${rec.agent} to switch`, "info");
+}
+
 // ---------------------------------------------------------------------------
-// Header bar (Claude Code-style, persistent above chat)
+// setAgent / currentAgent — module-scope so the modal can mutate them
 // ---------------------------------------------------------------------------
 
-function setHeaderBar(ui: ExtensionUIContext, getLine: () => string): void {
-	// ui.setHeader takes a factory. The factory is called fresh on each
-	// render of the TUI. We return a Text whose content is read on each
-	// render, so updating `currentAgent` automatically reflects in the header.
-	ui.setHeader((_tui, _theme) => {
-		// The Text component reads getLine() at render time.
-		// We use a closure over a getter to read the current value.
-		const text = new Text(getLine(), 1, 0);
-		// Text satisfies Component & { dispose?() } — cast to satisfy TS.
-		return text as unknown as Parameters<typeof ui.setHeader>[0] extends ((t: infer T, th: infer Th) => infer R) ? R : never;
-	});
+let currentAgentRef: () => string = () => DEFAULT_AGENT;
+let setAgentRef: (next: string) => void = () => {};
+
+// The picker and the main extension share state via these refs.
+// We patch them in `wire()` at the top of the default export.
+function wire(get: () => string, set: (n: string) => void): void {
+	currentAgentRef = get;
+	setAgentRef = set;
+}
+
+function refreshAndBuild<T>(
+	ui: ExtensionUIContext,
+	build: (groups: ReturnType<typeof groupedAvailableAgents>) => T,
+	_ui: ExtensionUIContext,
+	_onSelect: (value: string) => void,
+): void {
+	// Currently unused: we build inline in openPicker. Kept for future.
+	void build;
 }
 
 // ---------------------------------------------------------------------------
-// /agent create — scaffold a new agent .md file
+// /agent create — scaffold a new agent .md
 // ---------------------------------------------------------------------------
 
-/** Template for a new user agent. User edits the system prompt to specialize. */
+function createAgent(
+	name: string | undefined,
+	ui: { notify: (t: string, k?: "info" | "warning" | "error") => void; input: (t: string, p?: string) => Promise<string | undefined> },
+	cwd: string,
+): void {
+	if (!name) {
+		ui.notify("pi-switch: usage — `/agent create <name>`", "info");
+		return;
+	}
+	if (!parseAgentName(name)) {
+		ui.notify(`pi-switch: invalid name "${name}". Use letters/digits/dashes/underscores, ≤64 chars.`, "error");
+		return;
+	}
+	const userDir = path.join(os.homedir(), ".pi", "agent", "agents");
+	fs.mkdirSync(userDir, { recursive: true });
+	const file = path.join(userDir, `${name}.md`);
+	if (fs.existsSync(file)) {
+		ui.notify(`pi-switch: ${file} already exists. edit it directly.`, "warning");
+		return;
+	}
+	void ui.input(`description for "${name}":`, "one-liner that shows in the picker")?.then((desc) => {
+		const description = desc?.trim() || `custom agent (${name})`;
+		fs.writeFileSync(file, agentTemplate(name, description), "utf-8");
+		ui.notify(
+			`pi-switch: created ${file}\n  → next Ctrl+Shift+S to see it in the cycle\n  → edit the system prompt to specialize`,
+			"info",
+		);
+	});
+}
+
 function agentTemplate(name: string, description: string): string {
 	return `---
 name: ${name}
@@ -259,65 +271,24 @@ you have a specific reason to change it.
 `;
 }
 
-function createAgent(
-	name: string,
-	ctx: {
-		ui: {
-			notify: (t: string, k?: "info" | "warning" | "error") => void;
-			input: (t: string, p?: string) => Promise<string | undefined>;
-		};
-		cwd: string;
-	},
-): void {
-	if (!parseAgentName(name)) {
-		ctx.ui.notify(`pi-switch: invalid name "${name}". Use letters/digits/dashes/underscores, ≤64 chars.`, "error");
-		return;
-	}
-	const userDir = path.join(os.homedir(), ".pi", "agent", "agents");
-	fs.mkdirSync(userDir, { recursive: true });
-	const file = path.join(userDir, `${name}.md`);
-	if (fs.existsSync(file)) {
-		ctx.ui.notify(`pi-switch: ${file} already exists. edit it directly.`, "warning");
-		return;
-	}
-	// Ask for description
-	void ctx.ui.input(`description for "${name}":`, "one-liner that shows in the picker")?.then((desc) => {
-		const description = desc?.trim() || `custom agent (${name})`;
-		fs.writeFileSync(file, agentTemplate(name, description), "utf-8");
-		ctx.ui.notify(
-			`pi-switch: created ${file}\n  → next Ctrl+Shift+S to see it in the cycle\n  → edit the system prompt to specialize`,
-			"info",
-		);
-	});
-}
-
 function doctorReport(): string {
 	const cycle = availableAgents();
 	const userDir = path.join(os.homedir(), ".pi", "agent", "agents");
 	const lines: string[] = ["pi-switch doctor:", ""];
-
-	// Cycle stats
 	const builtins = cycle.filter((a) => BUILTIN_AGENTS.includes(a));
 	const users = cycle.filter((a) => !BUILTIN_AGENTS.includes(a));
 	lines.push(`cycle: ${cycle.length} agents (${builtins.length} built-in, ${users.length} user)`);
 	lines.push("");
-
-	// User dir check
 	if (!fs.existsSync(userDir)) {
-		lines.push(`user dir: ${userDir} (does not exist — user agents won't be discovered)`);
+		lines.push(`user dir: ${userDir} (does not exist)`);
 	} else {
 		const files = fs.readdirSync(userDir).filter((f) => f.endsWith(".md"));
 		lines.push(`user dir: ${userDir} (${files.length} file(s))`);
-
-		// Validate each user agent
 		const issues: string[] = [];
 		for (const f of files) {
 			try {
 				const raw = fs.readFileSync(path.join(userDir, f), "utf-8");
-				if (!raw.startsWith("---\n")) {
-					issues.push(`${f}: no YAML frontmatter`);
-					continue;
-				}
+				if (!raw.startsWith("---\n")) { issues.push(`${f}: no YAML frontmatter`); continue; }
 				const m = raw.match(/^---\n([\s\S]*?)\n---/);
 				if (!m) { issues.push(`${f}: malformed frontmatter`); continue; }
 				const fm = m[1] ?? "";
@@ -327,19 +298,7 @@ function doctorReport(): string {
 				issues.push(`${f}: read error: ${(e as Error).message}`);
 			}
 		}
-		if (issues.length === 0) {
-			lines.push("validation: all user agents OK ✓");
-		} else {
-			lines.push("validation issues:");
-			for (const i of issues) lines.push(`  - ${i}`);
-		}
+		lines.push(issues.length === 0 ? "validation: all user agents OK ✓" : "validation issues:\n  - " + issues.join("\n  - "));
 	}
-
-	// Persistence check
-	const persisted = process.env.PI_SWITCH_HOME || os.homedir();
-	const fallbackFile = path.join(persisted, ".pi-switch", "agent");
-	lines.push("");
-	lines.push(`persistence: ${fs.existsSync(fallbackFile) ? fallbackFile : "no standalone persistence (uses .soly/agent if soly project)"}`);
-
 	return lines.join("\n");
 }