@yusukeshib/pi-babysit 0.6.23 → 0.6.25

package/README.md

@@ -167,9 +167,13 @@ 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 tall **log viewer in the same widget area**, not an
-overlay or separate screen. `Esc` or the right-hand **Close** button restores
-the list, preserving its mode and page. The viewer uses Pi's `ScrollView` for
+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
 log without requiring any Pi core changes. Home/End and PageUp/PageDown remain

package/index.ts

@@ -2600,6 +2600,7 @@ function renderWidgetSessionHeader(
 // How many trailing output lines to show per session in the widget.
 const WIDGET_COLLAPSED_TAIL_LINES = 1;
 const WIDGET_SESSION_PAGE_SIZE = 10;
+const WIDGET_VIEWER_MAX_LINES = 10;
 
 export interface WidgetSessionListState {
 	mode: "running" | "all";
@@ -2624,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[],
@@ -2682,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];
@@ -2726,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);
@@ -2746,16 +2762,32 @@ 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, onClose: close });
+		viewer = createLogViewer({
+			...options,
+			getHeight: () => Math.max(3, Math.min(WIDGET_VIEWER_MAX_LINES, options.getHeight() - listHeight + 1)),
+			onClose: close,
+		});
 		refreshViewer();
 		options.requestRender();
 	}
@@ -2769,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(); },
@@ -4186,7 +4239,7 @@ export default function (pi: ExtensionAPI) {
 					: d.count && d.count > 1
 						? theme.fg("muted", `×${d.count}`)
 						: "";
-			const header = theme.fg("muted", theme.bold("babysit_run COMMAND")) + (payload ? `  ${payload}` : "");
+			const header = theme.fg("muted", theme.bold("babysit_run PROCESS")) + (payload ? `  ${payload}` : "");
 			const box = new Box(1, 1, (t) => theme.bg("toolSuccessBg", t));
 			box.addChild(new Text(header, 0, 0));
 			box.addChild(new Text(renderStatus(status, theme), 0, 0));
@@ -4854,7 +4907,7 @@ export default function (pi: ExtensionAPI) {
 		// Legacy calls without descriptions still render their original payload safely.
 		renderCall(args, theme) {
 			const isSubagent = args.profile === "subagent";
-			const kind = isSubagent ? "AGENT" : "COMMAND";
+			const kind = isSubagent ? "AGENT" : "PROCESS";
 			const payload = isSubagent ? args.task : args.command;
 			const agent = isSubagent && args.agent ? ` [${escapeCommandForDisplay(args.agent)}]` : "";
 			const title = theme.fg("muted", `${theme.bold(`babysit_run ${kind}`)}${agent}`);

package/log-viewer.ts

@@ -244,21 +244,18 @@ export function createLogViewer(options: LogViewerOptions) {
 	const heading = {
 		invalidate() {},
 		render(width: number) {
-			const close = truncateToWidth("[Close]", width);
-			const room = Math.max(0, width - visibleWidth(close) - 1);
-			const title = truncateToWidth(sanitize(header).replace(/\n/g, " "), room);
+			const title = truncateToWidth(sanitize(header).replace(/\n/g, " "), width);
 			return [
 				options.getTheme().fg("accent", title) +
 					" ".repeat(
-						Math.max(0, width - visibleWidth(title) - visibleWidth(close)),
-					) +
-					options.getTheme().fg("muted", close),
+						Math.max(0, width - visibleWidth(title)),
+					),
 			];
 		},
 		handleMouse(e: TuiMouseEvent) {
 			if (
 				e.button !== "left" ||
-				e.x < Math.max(0, e.width - 7) ||
+				e.x < 0 ||
 				e.x >= e.width
 			)
 				return;
@@ -272,7 +269,7 @@ export function createLogViewer(options: LogViewerOptions) {
 	const footer: Component = {
 		invalidate() {},
 		render: (width) => [
-			options.getTheme().fg("dim", truncateToWidth(source ? `↑↓ · bytes ${pages[0]?.start ?? 0}–${pages.at(-1)?.end ?? 0}/${source.size} (window) · Esc close` : "↑↓ · Esc close", width)),
+			options.getTheme().fg("dim", truncateToWidth(source ? `↑↓ · bytes ${pages[0]?.start ?? 0}–${pages.at(-1)?.end ?? 0}/${source.size} (window)` : "↑↓", width)),
 		],
 	};
 	let geometry = {
@@ -489,10 +486,6 @@ export function createLogViewer(options: LogViewerOptions) {
 			options.requestRender();
 		},
 		handleKey(data: string): boolean {
-			if (matchesKey(data, Key.escape)) {
-				options.onClose();
-				return true;
-			}
 			if (matchesKey(data, Key.up)) scrollView.scrollBy(-1);
 			else if (matchesKey(data, Key.down)) scrollView.scrollBy(1);
 			else return false;

package/package.json

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