@yusukeshib/pi-babysit 0.6.24 → 0.6.26

package/README.md

@@ -167,10 +167,12 @@ sessions, and click again to return to running-only. Both modes show newest firs
 ten per page; `< 1/4 >` shows the current/total page when needed. Click the
 arrows to page. Rows occupy one line, previewing the description (or the command
 for older processes and task for older agents), with `…` when clipped. Click an
-AGENT or PROCESS row to replace the list with a **log viewer in the same widget area**, not an
-overlay or separate screen. The viewer is capped at ten lines including its header
-and footer; all saved history remains available by scrolling. Click anywhere on
-the viewer's header row to restore the list, preserving its mode and page.
+AGENT or PROCESS row to expand a **log viewer directly below that row**. The summary
+title, list header, and all other rows remain visible with their original colors.
+Only one row is expanded at a time; selecting another closes the previous one.
+The viewer is capped at ten lines including its existing row header and footer;
+all saved history remains available by scrolling. Click the same row again to
+collapse it, preserving the list's mode and page.
 There is no separate Close button or Esc binding. The viewer uses Pi's `ScrollView` for
 scroll position and follow behavior, with a widget-local scrollbar styled using
 Pi's scrollbar theme. Wheel, scrollbar drag/track clicks, and ↑/↓ navigate the
@@ -233,6 +235,10 @@ targeted pattern over a broad tail, and do not read a potentially large log file
 in full. Subagent crashes return structured errors plus the full log path, never
 a raw RPC JSON tail.
 
+Subagents run in RPC mode with normal Pi session persistence enabled, using
+Pi's configured session storage (by default `~/.pi/agent/sessions/`). Each worker
+has its own Pi session, separate from the parent and from babysit's output log.
+
 Subagent logs compact Pi's streaming `message_update` events before they are
 recorded. Pi repeats the complete growing assistant message and partial snapshot
 on every token; pi-babysit retains only the incremental delta. Compact RPC

package/index.ts

@@ -2319,7 +2319,7 @@ async function spawnSubagent(
 	// Long-lived RPC worker: the task is NOT passed as argv — it is injected
 	// below as an RPC `prompt` command, whose response we validate so spawn
 	// failures (bad model, missing API key) are loud instead of a silent exit=1.
-	const piArgs: string[] = ["--mode", "rpc", "--no-session"];
+	const piArgs: string[] = ["--mode", "rpc"];
 	const model = opts.model ?? opts.agent?.model;
 	if (model) piArgs.push("--model", model);
 	const tools = opts.tools ?? opts.agent?.tools;
@@ -2625,7 +2625,7 @@ interface WidgetMouseEvent {
 }
 
 /**
- * Compact session list. Item presses open a viewer; rows never expand inline.
+ * Compact session list. Item presses toggle the session's inline viewer.
  */
 export function createWidgetComponent(
 	summaryLines: string[],
@@ -2683,6 +2683,9 @@ export function createWidgetComponent(
 			}
 			return lines;
 		},
+		getSessionLine(id: string) {
+			return targetByLine.findIndex((target) => target?.type === "session" && target.id === id);
+		},
 		handleMouse(event: WidgetMouseEvent) {
 			if (event.button !== "left") return undefined;
 			const target = targetByLine[event.y];
@@ -2727,7 +2730,19 @@ export function createSessionWidget(options: {
 	let displays: WidgetSessionDisplay[] = [];
 	let viewer: ReturnType<typeof createLogViewer> | undefined;
 	let source: FileLogSource | undefined;
-	let list = createWidgetComponent([], [], open, listState);
+	let summaryLines: string[] = [];
+	let listHeight = 0;
+	let viewerRow = -1;
+	let viewerLines = 0;
+	let dragging = false;
+	let list = createWidgetComponent([], [], toggle, listState);
+	function rebuildList() {
+		list = createWidgetComponent(summaryLines, displays, toggle, listState);
+	}
+	function toggle(id: string) {
+		if (selectedId === id) close();
+		else open(id);
+	}
 	function refreshViewer() {
 		if (!selectedId || !viewer) return;
 		const log = options.readLog(selectedId);
@@ -2747,18 +2762,30 @@ export function createSessionWidget(options: {
 	}
 	function close() {
 		selectedId = undefined;
+		viewerRow = -1;
+		viewerLines = 0;
+		dragging = false;
 		viewer?.dispose();
 		viewer = undefined;
 		source = undefined;
 		options.requestRender();
 	}
 	function open(id: string) {
+		if (!displays.some((session) => session.id === id)) {
+			displays = [...displays, { id, header: id, tail: [], viewable: true, active: true }];
+		}
+		if (listState.mode === "running" && !displays.find((session) => session.id === id)?.active)
+			listState.mode = "all";
+		const visible = listState.mode === "running" ? displays.filter((session) => session.active) : displays;
+		listState.page = Math.floor(visible.findIndex((session) => session.id === id) / WIDGET_SESSION_PAGE_SIZE);
+		rebuildList();
+		dragging = false;
 		viewer?.dispose();
 		source = undefined;
 		selectedId = id;
 		viewer = createLogViewer({
 			...options,
-			getHeight: () => Math.min(WIDGET_VIEWER_MAX_LINES, options.getHeight()),
+			getHeight: () => Math.max(3, Math.min(WIDGET_VIEWER_MAX_LINES, options.getHeight() - listHeight + 1)),
 			onClose: close,
 		});
 		refreshViewer();
@@ -2774,15 +2801,36 @@ export function createSessionWidget(options: {
 		},
 		update(summary: string[], sessions: WidgetSessionDisplay[]) {
 			displays = sessions;
-			list = createWidgetComponent(summary, sessions, open, listState);
+			summaryLines = summary;
+			rebuildList();
+			if (selectedId && !sessions.some((session) => session.id === selectedId && (listState.mode === "all" || session.active))) close();
 			refreshViewer();
 			options.requestRender();
 		},
-		render(width: number) { return (viewer ?? list).render(width); },
+		render(width: number) {
+			const lines = list.render(width);
+			listHeight = lines.length;
+			viewerRow = selectedId ? list.getSessionLine(selectedId) : -1;
+			viewerLines = 0;
+			if (viewer && viewerRow >= 0) {
+				// Keep the original styled row as the toggle header.
+				const body = viewer.render(width).slice(1);
+				viewerLines = body.length;
+				lines.splice(viewerRow + 1, 0, ...body);
+			}
+			return lines;
+		},
 		handleMouse(event: TuiMouseEvent) {
-			// Stock Pi widget hosts forward mouse input to this component, not
-			// to a nested native layout tree. Keep the full wheel/drag event.
-			return (viewer ?? list).handleMouse(event);
+			if (viewer && viewerRow >= 0 && (dragging || (event.y > viewerRow && event.y <= viewerRow + viewerLines))) {
+				const result = viewer.handleMouse({ ...event, y: event.y - viewerRow });
+				if (result && "capture" in result && result.capture) dragging = true;
+				if (event.type === "release") dragging = false;
+				return result;
+			}
+			const mode = listState.mode, page = listState.page;
+			const result = list.handleMouse({ ...event, y: event.y > viewerRow && viewerRow >= 0 ? event.y - viewerLines : event.y });
+			if (mode !== listState.mode || page !== listState.page) close();
+			return result;
 		},
 		handleKey(data: string) { return viewer?.handleKey(data) ?? false; },
 		invalidate() { list.invalidate(); viewer?.invalidate(); },

package/package.json

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