@yusukeshib/pi-babysit 0.6.7 → 0.6.9

package/README.md

@@ -81,12 +81,19 @@ backgrounding (`… &`, `nohup`, `setsid`, `disown`). Set
 A widget below the editor separates session **kind** from task **state** at a glance:
 summary counts use `RUNNING` / `IDLE`, and every row is labeled
 `PROCESS RUNNING`, `AGENT RUNNING`, or `AGENT IDLE`. In fullscreen mode, the
-`SESSIONS(n) < 1/4 >` list combines running, idle, finished, and failed sessions
-(newest first, five per page); the fraction shows the current/total page. Click the arrows to page or anywhere else on the header to collapse
-and expand the list. Click a row to toggle between its latest line and latest 20
-available output lines. A session with no available output shows an explicit
-placeholder when expanded. Mouse clicks require fullscreen mode; `/babysit`
-works in regular mode. The displayed `age` is total session age, not time spent
+`babysits(n running)` list shows live sessions (including idle agents) by default.
+Click the header to toggle to `babysits(n all)`, which also shows finished and failed
+sessions, and click again to return to running-only. Both modes show newest first,
+ten per page; `< 1/4 >` shows the current/total page when needed. Click the
+arrows to page. Collapsed rows show the complete command for processes and the
+complete task for agents, wrapping long text across lines rather than abbreviating
+it. Click an agent row for the task,
+its RPC worker launch argv (bold, readable text rather than a copy-paste shell
+command), and up to 20 output lines. Opening another row closes the previous
+one. A session with no available output shows an explicit placeholder when
+expanded. Mouse clicks
+require fullscreen mode; `/babysit` works in regular mode. The displayed `age`
+is total session age, not time spent
 in the current state. Transcript details
 from tool results, snapshots, and completion notifications collapse or expand
 with Pi's tool-output toggle (`Ctrl+O` by default).

package/index.ts

@@ -43,7 +43,7 @@ import type {
 	ToolDefinition,
 } from "@earendil-works/pi-coding-agent";
 import { getMarkdownTheme } from "@earendil-works/pi-coding-agent";
-import { Box, Markdown, Text, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+import { Box, Markdown, Text, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
 import { Type, type TSchema } from "typebox";
 import { StringEnum } from "@earendil-works/pi-ai";
 import { type AgentConfig, type AgentScope, discoverAgents } from "./agents";
@@ -463,6 +463,7 @@ interface Meta {
 	startedAt?: number;
 	// subagent
 	task?: string;
+	launchCommand?: string;
 	promptOffset?: number;
 	model?: string;
 	tools?: string[];
@@ -1239,6 +1240,12 @@ function escapeCommandForDisplay(command: string): string {
 		);
 }
 
+export function readableLaunchCommand(command: string): string {
+	// Older sessions quoted every argv element, including safe paths and flags.
+	if (!command.startsWith("'") || !command.endsWith("'") || !command.includes("' '")) return command;
+	return command.slice(1, -1).split("' '").map((arg) => arg.replace(/'\\''/g, "'")).join(" ");
+}
+
 export function summarizeNotificationCommand(command: string | undefined): string {
 	const preview = escapeCommandForDisplay((command ?? "?").trim()) || "?";
 	const bytes = Buffer.from(preview, "utf8");
@@ -2154,6 +2161,7 @@ async function spawnSubagent(
 		PI_BIN,
 		...piArgs,
 	);
+	const launchCommand = bsArgs.slice(bsArgs.indexOf("--") + 1).join(" ");
 
 	let r: Awaited<ReturnType<typeof bs>>;
 	try {
@@ -2187,6 +2195,7 @@ async function spawnSubagent(
 		kind: "subagent",
 		name: opts.name ?? id,
 		task: opts.task,
+		launchCommand,
 		notified: true,
 		depth: opts.depth,
 		maxDepth: opts.maxDepth,
@@ -2274,6 +2283,7 @@ async function spawnSubagent(
 		kind: "subagent",
 		name: opts.name ?? id,
 		task: opts.task,
+		launchCommand,
 		promptOffset: resp.offset,
 		model: resolvedModel,
 		tools,
@@ -2360,10 +2370,10 @@ function renderWidgetSessionHeader(
 const WIDGET_COLLAPSED_TAIL_LINES = 1;
 const WIDGET_EXPANDED_TAIL_LINES = 20;
 const WIDGET_TAIL_WIDTH = 100;
-const WIDGET_SESSION_PAGE_SIZE = 5;
+const WIDGET_SESSION_PAGE_SIZE = 10;
 
 export interface WidgetSessionListState {
-	open: boolean;
+	mode: "running" | "all";
 	page: number;
 }
 
@@ -2372,6 +2382,8 @@ export interface WidgetSessionDisplay {
 	header: string;
 	tail: string[];
 	expandable: boolean;
+	active?: boolean;
+	details?: string[];
 }
 
 interface WidgetMouseEvent {
@@ -2403,16 +2415,34 @@ export function createWidgetComponent(
 				lines.push(truncateToWidth(text, Math.max(0, width), ""));
 				targetByLine.push(target);
 			};
+			const pushWrapped = (text: string, target?: Target) => {
+				for (const line of wrapTextWithAnsi(text, Math.max(1, width))) push(line, target);
+			};
 			const pushSession = (session: WidgetSessionDisplay) => {
 				const expanded = session.expandable && expandedSessionIds.has(session.id);
 				const tail = session.tail.slice(
 					expanded ? -WIDGET_EXPANDED_TAIL_LINES : -WIDGET_COLLAPSED_TAIL_LINES,
 				);
 				const target = session.expandable ? { type: "session" as const, id: session.id } : undefined;
-				if (!expanded && tail.length === 1) {
+				const details = session.details ?? [];
+				const pushDetail = (detail: string) => {
+					const text = detail.startsWith("task: ") ? detail.slice(6) : detail;
+					if (width > 6) {
+						for (const line of wrapTextWithAnsi(text, width - 6)) push(`      ${line}`, target);
+					} else {
+						push(`      ${text}`, target);
+					}
+				};
+				if (!expanded && details[0]?.startsWith("task: ")) {
+					pushWrapped(`${session.header} ${details[0].slice(6)}`, target);
+				} else if (!expanded && details.length) {
+					pushWrapped(`${session.header} ${details[0]}`, target);
+					for (const detail of details.slice(1)) pushDetail(detail);
+				} else if (!expanded && tail.length === 1) {
 					push(`${session.header} ${tail[0]}`, target);
 				} else {
 					push(session.header, target);
+					for (const detail of details) pushDetail(detail);
 					for (const line of tail) push(`      ${line}`, target);
 					if (expanded && tail.length === 0) push("      (no output available)", target);
 				}
@@ -2421,10 +2451,11 @@ export function createWidgetComponent(
 			for (const line of summaryLines.slice(0, -1)) push(line);
 			const summary = summaryLines.at(-1);
 			if (listState && sessions.length) {
-				const pageCount = Math.ceil(sessions.length / WIDGET_SESSION_PAGE_SIZE);
+				const visible = listState.mode === "running" ? sessions.filter((session) => session.active) : sessions;
+				const pageCount = Math.max(1, Math.ceil(visible.length / WIDGET_SESSION_PAGE_SIZE));
 				listState.page = Math.min(Math.max(0, listState.page), pageCount - 1);
-				const label = ` SESSIONS(${sessions.length})`;
-				const showArrows = listState.open && pageCount > 1;
+				const label = ` babysits(${visible.length} ${listState.mode})`;
+				const showArrows = pageCount > 1;
 				const suffix = `${label}${showArrows ? ` < ${listState.page + 1}/${pageCount} >` : ""}`;
 				// Keep the count clickable on narrow terminals by moving it to its own row.
 				const inline = summary !== undefined && visibleWidth(summary) + visibleWidth(suffix) <= width;
@@ -2439,11 +2470,9 @@ export function createWidgetComponent(
 					prevX: showArrows ? prefixWidth + suffix.indexOf("<") : undefined,
 					nextX: showArrows ? prefixWidth + suffix.indexOf(">") : undefined,
 				});
-				if (listState.open) {
-					const start = listState.page * WIDGET_SESSION_PAGE_SIZE;
-					for (const session of sessions.slice(start, start + WIDGET_SESSION_PAGE_SIZE)) {
-						pushSession(session);
-					}
+				const start = listState.page * WIDGET_SESSION_PAGE_SIZE;
+				for (const session of visible.slice(start, start + WIDGET_SESSION_PAGE_SIZE)) {
+					pushSession(session);
 				}
 			} else {
 				if (summary !== undefined) push(summary);
@@ -2459,16 +2488,21 @@ export function createWidgetComponent(
 			// Toggle on press so a terminal that omits release still works.
 			if (event.type === "press") {
 				if (target.type === "session") {
-					if (expandedSessionIds.has(target.id)) expandedSessionIds.delete(target.id);
-					else expandedSessionIds.add(target.id);
+					if (expandedSessionIds.has(target.id)) expandedSessionIds.clear();
+					else {
+						expandedSessionIds.clear();
+						expandedSessionIds.add(target.id);
+					}
 				} else if (listState) {
-					const pageCount = Math.ceil(sessions.length / WIDGET_SESSION_PAGE_SIZE);
+					const count = listState.mode === "running" ? sessions.filter((session) => session.active).length : sessions.length;
+					const pageCount = Math.max(1, Math.ceil(count / WIDGET_SESSION_PAGE_SIZE));
 					if (event.x === target.prevX && target.prevX !== undefined) {
 						listState.page = (listState.page - 1 + pageCount) % pageCount;
 					} else if (event.x === target.nextX && target.nextX !== undefined) {
 						listState.page = (listState.page + 1) % pageCount;
 					} else {
-						listState.open = !listState.open;
+						listState.mode = listState.mode === "running" ? "all" : "running";
+						listState.page = 0;
 					}
 				}
 				return { handled: true, render: true };
@@ -3437,7 +3471,7 @@ export default function (pi: ExtensionAPI) {
 	}
 
 	const expandedWidgetSessions = new Set<string>();
-	const widgetListState: WidgetSessionListState = { open: true, page: 0 };
+	const widgetListState: WidgetSessionListState = { mode: "running", page: 0 };
 
 	const refreshWidget = async (ctx: ExtensionContext, snapshot?: BsSession[]) => {
 		if (!ctx.hasUI) return;
@@ -3475,7 +3509,14 @@ export default function (pi: ExtensionAPI) {
 		const activeTails = new Map(active.map((session, index) => [session.id, tails[index]]));
 		const displays = ordered.map((session): WidgetSessionDisplay => {
 			const id = session.id;
-			const isSubagent = kindOf(id) === "subagent";
+			const meta = readMeta(id);
+			const isSubagent = meta?.kind === "subagent";
+			const details = isSubagent
+				? [
+					...(meta?.task ? [`task: ${escapeCommandForDisplay(meta.task)}`] : []),
+					...(meta?.launchCommand ? [theme.bold(escapeCommandForDisplay(readableLaunchCommand(meta.launchCommand)))] : []),
+				]
+				: meta?.command ? [theme.bold(escapeCommandForDisplay(meta.command))] : [];
 			if (session.state === "running") {
 				const state: WidgetSessionState = isSubagent && progressById.get(id)?.done ? "idle" : "running";
 				return {
@@ -3483,6 +3524,8 @@ export default function (pi: ExtensionAPI) {
 					header: renderWidgetSessionHeader(id, isSubagent ? "agent" : "process", state, elapsedOf(id), theme),
 					tail: activeTails.get(id) ?? [],
 					expandable: true,
+					active: true,
+					details,
 				};
 			}
 			return {
@@ -3494,6 +3537,7 @@ export default function (pi: ExtensionAPI) {
 					"",
 					theme,
 				),
+				details,
 				// Only read/parse the five visible sessions on demand.
 				get tail() {
 					try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yusukeshib/pi-babysit",
-  "version": "0.6.7",
+  "version": "0.6.9",
   "description": "Run any shell command and pi subagents under babysit, with context-safe captured output.",
   "keywords": [
     "pi-package",