@yusukeshib/pi-babysit 0.6.6 → 0.6.7

package/README.md

@@ -80,11 +80,11 @@ 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, click
-any live row to toggle between its latest line and latest 20 available output
-lines. Finished sessions are behind a clickable `FINISHED` row; browse all
-retained sessions five at a time and click a row to expand it, including failed
-processes and agents. A session with no available output shows an explicit
+`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
 in the current state. Transcript details

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 } from "@earendil-works/pi-tui";
+import { Box, Markdown, Text, truncateToWidth, visibleWidth } 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";
@@ -1229,16 +1229,18 @@ async function selectedProcessOutput(
 	return tail ? `\n\nSelected tail (${lines} lines max):\n${clip(tail, maxBytes)}` : "";
 }
 
+function escapeCommandForDisplay(command: string): string {
+	return command
+		.replace(/\r/g, "\\r")
+		.replace(/\n/g, "\\n")
+		.replace(/\t/g, "\\t")
+		.replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x9F]/g, (char) =>
+			`\\x${char.charCodeAt(0).toString(16).toUpperCase().padStart(2, "0")}`,
+		);
+}
+
 export function summarizeNotificationCommand(command: string | undefined): string {
-	const preview =
-		(command ?? "?")
-			.trim()
-			.replace(/\r/g, "\\r")
-			.replace(/\n/g, "\\n")
-			.replace(/\t/g, "\\t")
-			.replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x9F]/g, (char) =>
-				`\\x${char.charCodeAt(0).toString(16).toUpperCase().padStart(2, "0")}`,
-			) || "?";
+	const preview = escapeCommandForDisplay((command ?? "?").trim()) || "?";
 	const bytes = Buffer.from(preview, "utf8");
 	if (bytes.length <= NOTIFY_COMMAND_MAX_BYTES) return preview;
 	if (NOTIFY_COMMAND_MAX_BYTES === 0) return "";
@@ -2287,16 +2289,16 @@ async function spawnSubagent(
 }
 
 // ---------------------------------------------------------------------------
-// widget (live counts and browsable finished sessions)
+// widget (live counts and browsable sessions)
 // ---------------------------------------------------------------------------
 
 export function widgetSessionGroups(sessions: BsSession[], startedAt: (id: string) => number) {
 	const active = sessions.filter((session) => session.state === "running");
-	// Default view stays compact; the finished section pages over every retained session.
-	const finished = sessions.filter((session) => session.state !== "running");
-	const started = new Map(finished.map((session) => [session.id, startedAt(session.id)]));
-	finished.sort((a, b) => (started.get(b.id) ?? 0) - (started.get(a.id) ?? 0) || b.id.localeCompare(a.id));
-	return { active, finished };
+	const started = new Map(sessions.map((session) => [session.id, startedAt(session.id)]));
+	const newestFirst = (a: BsSession, b: BsSession) =>
+		(started.get(b.id) ?? 0) - (started.get(a.id) ?? 0) || b.id.localeCompare(a.id);
+	const finished = sessions.filter((session) => session.state !== "running").sort(newestFirst);
+	return { active, finished, all: [...sessions].sort(newestFirst) };
 }
 
 // A subagent whose task is done stays alive as an idle RPC worker (for
@@ -2358,9 +2360,9 @@ function renderWidgetSessionHeader(
 const WIDGET_COLLAPSED_TAIL_LINES = 1;
 const WIDGET_EXPANDED_TAIL_LINES = 20;
 const WIDGET_TAIL_WIDTH = 100;
-const WIDGET_FINISHED_PAGE_SIZE = 5;
+const WIDGET_SESSION_PAGE_SIZE = 5;
 
-export interface WidgetFinishedState {
+export interface WidgetSessionListState {
 	open: boolean;
 	page: number;
 }
@@ -2376,6 +2378,7 @@ interface WidgetMouseEvent {
 	type: string;
 	button: string;
 	y: number;
+	x?: number;
 }
 
 /**
@@ -2387,9 +2390,9 @@ export function createWidgetComponent(
 	summaryLines: string[],
 	sessions: WidgetSessionDisplay[],
 	expandedSessionIds: Set<string>,
-	finished?: { sessions: WidgetSessionDisplay[]; state: WidgetFinishedState },
+	listState?: WidgetSessionListState,
 ) {
-	type Target = { type: "session"; id: string } | { type: "finished" | "prev" | "next" };
+	type Target = { type: "session"; id: string } | { type: "sessions"; endX: number; prevX?: number; nextX?: number };
 	let targetByLine: Array<Target | undefined> = [];
 
 	return {
@@ -2415,41 +2418,58 @@ export function createWidgetComponent(
 				}
 			};
 
-			for (const line of summaryLines) push(line);
-			if (finished?.sessions.length) {
-				const pageCount = Math.ceil(finished.sessions.length / WIDGET_FINISHED_PAGE_SIZE);
-				finished.state.page = Math.min(Math.max(0, finished.state.page), pageCount - 1);
-				push(
-					` FINISHED ${finished.sessions.length} — ${finished.state.open ? "hide" : "browse"} (click)`,
-					{ type: "finished" },
-				);
-				if (finished.state.open) {
-					if (pageCount > 1) {
-						if (finished.state.page > 0) push("  ← Previous", { type: "prev" });
-						push(`  ${finished.state.page === pageCount - 1 ? "↻ First" : "Next →"} (${finished.state.page + 1}/${pageCount})`, { type: "next" });
-					}
-					const start = finished.state.page * WIDGET_FINISHED_PAGE_SIZE;
-					for (const session of finished.sessions.slice(start, start + WIDGET_FINISHED_PAGE_SIZE)) {
+			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);
+				listState.page = Math.min(Math.max(0, listState.page), pageCount - 1);
+				const label = ` SESSIONS(${sessions.length})`;
+				const showArrows = listState.open && 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;
+				if (summary !== undefined && !inline) {
+					push(summary, { type: "sessions", endX: Math.min(visibleWidth(summary), Math.max(0, width)) });
+				}
+				const prefix = inline ? summary ?? "" : "";
+				const prefixWidth = visibleWidth(prefix);
+				push(`${prefix}${suffix}`, {
+					type: "sessions",
+					endX: Math.min(prefixWidth + visibleWidth(suffix), Math.max(0, width)),
+					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);
 					}
 				}
+			} else {
+				if (summary !== undefined) push(summary);
+				for (const session of sessions) pushSession(session);
 			}
-			for (const session of sessions) pushSession(session);
 			return lines;
 		},
 		handleMouse(event: WidgetMouseEvent) {
 			if (event.button !== "left") return undefined;
 			const target = targetByLine[event.y];
 			if (!target) return undefined;
+			if (target.type === "sessions" && (event.x === undefined || event.x < 0 || event.x >= target.endX)) return undefined;
 			// 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);
-				} else if (finished) {
-					if (target.type === "finished") finished.state.open = !finished.state.open;
-					else if (target.type === "prev") finished.state.page--;
-					else finished.state.page = (finished.state.page + 1) % Math.ceil(finished.sessions.length / WIDGET_FINISHED_PAGE_SIZE);
+				} else if (listState) {
+					const pageCount = Math.ceil(sessions.length / 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;
+					}
 				}
 				return { handled: true, render: true };
 			}
@@ -3417,12 +3437,12 @@ export default function (pi: ExtensionAPI) {
 	}
 
 	const expandedWidgetSessions = new Set<string>();
-	const finishedWidgetState: WidgetFinishedState = { open: false, page: 0 };
+	const widgetListState: WidgetSessionListState = { open: true, page: 0 };
 
 	const refreshWidget = async (ctx: ExtensionContext, snapshot?: BsSession[]) => {
 		if (!ctx.hasUI) return;
 		const all = snapshot ?? (await listSessions()).sessions;
-		const { active, finished } = widgetSessionGroups(all, (id) => readMeta(id)?.startedAt ?? 0);
+		const { active, all: ordered } = widgetSessionGroups(all, (id) => readMeta(id)?.startedAt ?? 0);
 		const subs = active.filter((session) => kindOf(session.id) === "subagent");
 		const procs = active.length - subs.length;
 		const progressById = new Map<string, Progress>();
@@ -3452,27 +3472,19 @@ export default function (pi: ExtensionAPI) {
 				);
 			}),
 		);
-		const displays = active.map((session, index): WidgetSessionDisplay => {
-			const isSubagent = kindOf(session.id) === "subagent";
-			const state: WidgetSessionState = isSubagent && progressById.get(session.id)?.done
-				? "idle"
-				: "running";
-			return {
-				id: session.id,
-				header: renderWidgetSessionHeader(
-					session.id,
-					isSubagent ? "agent" : "process",
-					state,
-					elapsedOf(session.id),
-					theme,
-				),
-				tail: tails[index],
-				expandable: true,
-			};
-		});
-		const finishedDisplays = finished.map((session): WidgetSessionDisplay => {
-			const isSubagent = kindOf(session.id) === "subagent";
+		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";
+			if (session.state === "running") {
+				const state: WidgetSessionState = isSubagent && progressById.get(id)?.done ? "idle" : "running";
+				return {
+					id,
+					header: renderWidgetSessionHeader(id, isSubagent ? "agent" : "process", state, elapsedOf(id), theme),
+					tail: activeTails.get(id) ?? [],
+					expandable: true,
+				};
+			}
 			return {
 				id,
 				header: renderWidgetSessionHeader(
@@ -3482,7 +3494,7 @@ export default function (pi: ExtensionAPI) {
 					"",
 					theme,
 				),
-				// Only read/parse the five visible finished sessions on demand.
+				// Only read/parse the five visible sessions on demand.
 				get tail() {
 					try {
 						return widgetTail(id, isSubagent, undefined, WIDGET_EXPANDED_TAIL_LINES);
@@ -3497,14 +3509,12 @@ export default function (pi: ExtensionAPI) {
 		if (ctx.mode === "tui") {
 			ctx.ui.setWidget(
 				"pi-babysit",
-				() => createWidgetComponent(summaryLines, displays, expandedWidgetSessions, {
-					sessions: finishedDisplays,
-					state: finishedWidgetState,
-				}),
+				() => createWidgetComponent(summaryLines, displays, expandedWidgetSessions, widgetListState),
 				{ placement: "belowEditor" },
 			);
 		} else {
-			const component = createWidgetComponent(summaryLines, displays, new Set());
+			const activeIds = new Set(active.map((session) => session.id));
+			const component = createWidgetComponent(summaryLines, displays.filter((session) => activeIds.has(session.id)), new Set());
 			ctx.ui.setWidget("pi-babysit", component.render(10_000), {
 				placement: "belowEditor",
 			});
@@ -4222,7 +4232,7 @@ export default function (pi: ExtensionAPI) {
 			const title = theme.bold(`babysit_run ${kind}`);
 			const detail =
 				typeof payload === "string" && payload.length > 0
-					? `  ${summarizeNotificationCommand(payload)}`
+					? `  ${escapeCommandForDisplay(payload)}`
 					: "";
 			return new Text(theme.fg("warning", `${title}${agent}${detail}`), 0, 0);
 		},

package/package.json

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