@yusukeshib/pi-babysit 0.6.12 → 0.6.14

package/README.md

@@ -88,8 +88,11 @@ ten per page; `< 1/4 >` shows the current/total page when needed. Click the
 arrows to page. Collapsed rows occupy one line, previewing the command for
 processes and the task for agents (with `…` when clipped). Click a row for the
 complete wrapped command or task; agent rows also show their RPC worker launch
-argv (bold, readable text rather than a copy-paste shell command), and up to 20
-output lines. Expanded output lines wrap without a 100-character cutoff.
+argv (bold, readable text rather than a copy-paste shell command), and up to 50
+output lines. Agent output retains recent RPC text, tool calls, and tool results
+in chronological order instead of showing only the latest message. Blank lines
+and surrounding whitespace are preserved. Expanded output lines wrap without a
+100-character cutoff.
 Opening another row closes the previous
 one. A session with no available output shows an explicit placeholder when
 expanded. Mouse clicks
@@ -207,8 +210,13 @@ because blindly rerunning an arbitrary command can duplicate side effects.
   incrementally, which keeps follow-up tasks efficient.
 
 Subagents load `self-reap.ts`, which exits an idle finished subagent after a
-grace window (`PI_BABYSIT_REAP_AFTER`, default 120s) using the same parked-turn
-rule, so a subagent waiting on a long build is never false-killed. Give bounded
+grace window using the same parked-turn rule, so a subagent waiting on a long
+build is never false-killed. Callers can set `reapAfter: "5m"` on
+`babysit_run { profile: "subagent", task, reapAfter: "5m" }`. Omission uses
+`PI_BABYSIT_REAP_AFTER`, then `PI_SUBAGENT_REAP_AFTER`, then 120s.
+`reapAfter: "none"` (also `"off"` or `"0"`) disables idle reaping; the absolute
+`timeout` still applies. Follow-up tasks cancel the idle timer. This differs
+from `idleTimeout`, which kills based on lack of output, even during work. Give bounded
 recon/review tasks at least one cost, turn, tool-call, or token budget; omit
 budgets only for intentionally open-ended work. Optional task budgets are
 observed by the parent poller. `maxUsageTokens` counts cumulative input, output,

package/index.ts

@@ -464,6 +464,7 @@ interface Meta {
 	// subagent
 	task?: string;
 	launchCommand?: string;
+	reapAfter?: string;
 	promptOffset?: number;
 	model?: string;
 	tools?: string[];
@@ -1065,9 +1066,11 @@ const SUBAGENT_BUDGET_GRACE_MS =
 	parseDurMs(process.env.PI_BABYSIT_BUDGET_GRACE ?? "90s") ?? 90_000;
 const SUBAGENT_REAP_AFTER =
 	process.env.PI_BABYSIT_REAP_AFTER ?? process.env.PI_SUBAGENT_REAP_AFTER ?? "120s";
-const SUBAGENT_REUSE_HINT = ["0", "off", "none"].includes(SUBAGENT_REAP_AFTER)
-	? "Session remains available until its absolute timeout."
-	: `Session remains available for follow-ups during the ${SUBAGENT_REAP_AFTER} idle grace.`;
+export function subagentReuseHint(reapAfter = SUBAGENT_REAP_AFTER): string {
+	return ["0", "off", "none"].includes(reapAfter)
+		? "Session remains available until its absolute timeout."
+		: `Session remains available for follow-ups during the ${reapAfter} idle grace.`;
+}
 
 export function clip(s: string, maxBytes = TAIL_MAX_BYTES): string {
 	if (maxBytes <= 0) return "";
@@ -1556,6 +1559,8 @@ export interface Progress {
 	finalText: string;
 	/** Best-effort text from the currently streaming assistant message. */
 	streamingText: string;
+	/** Recent readable RPC output, independent of the latest assistant message. */
+	logText: string;
 	/** Context size reported by the most recent assistant response. */
 	tokens?: number;
 	/** Cumulative model usage for the current subagent task. */
@@ -1616,6 +1621,7 @@ function emptyProgress(): Progress {
 		toolCallCount: 0,
 		finalText: "",
 		streamingText: "",
+		logText: "",
 		modelCalls: 0,
 		usageTokens: 0,
 		inputTokens: 0,
@@ -1713,6 +1719,12 @@ function updateProgressState(progress: Progress): Progress {
 	return progress;
 }
 
+function appendProgressLog(progress: Progress, text: string, separate = false): void {
+	if (!text) return;
+	const separator = separate && progress.logText && !progress.logText.endsWith("\n") ? "\n" : "";
+	progress.logText = (progress.logText + separator + text).split("\n").slice(-50).join("\n");
+}
+
 function parseEventLine(progress: Progress, raw: string): void {
 	const line = raw.replace(/\r$/, "").trim();
 	if (!line.startsWith("{")) return;
@@ -1732,12 +1744,14 @@ function parseEventLine(progress: Progress, raw: string): void {
 				| { type?: string; delta?: string }
 				| undefined;
 			if (update?.type === "text_delta" && typeof update.delta === "string") {
+				appendProgressLog(progress, update.delta, !progress.streamingText);
 				progress.streamingText = clip(progress.streamingText + update.delta, ANSWER_MAX_BYTES);
 			}
 			break;
 		}
 		case "tool_execution_start": {
 			const name = String(event.toolName ?? "tool");
+			appendProgressLog(progress, summarizeToolCall(name, (event.args as Record<string, unknown>) ?? {}), true);
 			progress.toolCallCount++;
 			progress.toolCalls.push({
 				name,
@@ -1771,12 +1785,22 @@ function parseEventLine(progress: Progress, raw: string): void {
 						};
 					}
 				| undefined;
+			// Compact RPC logs omit successful tool_execution_end payloads, but
+			// retain the corresponding toolResult message once.
+			if (message?.role === "toolResult") {
+				for (const block of message.content ?? []) {
+					if (block.type === "text" && block.text) appendProgressLog(progress, block.text, true);
+				}
+			}
 			if (message?.role === "assistant") {
 				const text = (message.content ?? [])
 					.filter((content) => content.type === "text" && content.text)
 					.map((content) => content.text)
 					.join("");
-				if (text.trim()) progress.finalText = clip(text, ANSWER_MAX_BYTES);
+				if (text.trim()) {
+					if (!progress.streamingText) appendProgressLog(progress, text, true);
+					progress.finalText = clip(text, ANSWER_MAX_BYTES);
+				}
 				if (message.stopReason === "error") {
 					progress.errorMsg = message.errorMessage || "subagent model request failed";
 				}
@@ -2080,6 +2104,7 @@ interface SubagentOpts {
 	depth: number;
 	maxDepth: number;
 	budget?: SubagentBudget;
+	reapAfter?: string;
 	// Idle-timeout is OFF by default: an RPC-mode pi is silent while it works,
 	// so idle detection would false-kill a busy subagent. The absolute timeout
 	// is the safety valve instead.
@@ -2090,6 +2115,11 @@ interface SubagentOpts {
 async function spawnSubagent(
 	opts: SubagentOpts,
 ): Promise<{ id: string; model?: string } | { error: string }> {
+	const reapAfter = opts.reapAfter?.trim() ?? SUBAGENT_REAP_AFTER;
+	if (opts.reapAfter !== undefined && !["0", "off", "none"].includes(reapAfter) &&
+		(!/^\d+(ms|s|m|h)?$/.test(reapAfter) || !Number.isFinite(parseDurMs(reapAfter)))) {
+		return { error: "Invalid reapAfter: use a duration such as 30s or 5m, or none/off/0 to disable." };
+	}
 	// 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.
@@ -2168,6 +2198,7 @@ async function spawnSubagent(
 		r = await bs(bsArgs, {
 			cwd: opts.cwd,
 			env: {
+				PI_BABYSIT_REAP_AFTER: reapAfter,
 				[SUBAGENT_DEPTH_ENV]: String(opts.depth),
 				[SUBAGENT_MAX_DEPTH_ENV]: String(opts.maxDepth),
 			},
@@ -2200,6 +2231,7 @@ async function spawnSubagent(
 		depth: opts.depth,
 		maxDepth: opts.maxDepth,
 		budget: opts.budget,
+		reapAfter,
 	});
 
 	// Wait for pi to boot (first JSON event in the log), then inject the task.
@@ -2293,6 +2325,7 @@ async function spawnSubagent(
 		depth: opts.depth,
 		maxDepth: opts.maxDepth,
 		budget: opts.budget,
+		reapAfter,
 		startedAt: Date.now(),
 	});
 	return { id, model: resolvedModel };
@@ -2368,7 +2401,7 @@ function renderWidgetSessionHeader(
 
 // How many trailing output lines to show per session in the widget.
 const WIDGET_COLLAPSED_TAIL_LINES = 1;
-const WIDGET_EXPANDED_TAIL_LINES = 20;
+const WIDGET_EXPANDED_TAIL_LINES = 50;
 const WIDGET_SESSION_PAGE_SIZE = 10;
 
 export interface WidgetSessionListState {
@@ -2565,10 +2598,12 @@ export function widgetTail(
 		raw = readTailLines(logPath(id), lines);
 	} else {
 		const progress = subagentProgress ?? taskProgressOf(id).progress;
-		if (progress.streamingText.trim()) {
-			raw = progress.streamingText.trim().split("\n");
+		if (progress.logText) {
+			raw = progress.logText.split("\n");
+		} else if (progress.streamingText.trim()) {
+			raw = progress.streamingText.split("\n");
 		} else if (progress.finalText.trim()) {
-			raw = progress.finalText.trim().split("\n");
+			raw = progress.finalText.split("\n");
 		} else if (progress.toolCalls.length > 0) {
 			raw = progress.toolCalls.map((tool) => tool.summary);
 		} else {
@@ -2577,7 +2612,6 @@ export function widgetTail(
 	}
 	return raw
 		.map(sanitizeTailLine)
-		.filter((line) => line.trim().length > 0)
 		.slice(-lines);
 }
 
@@ -2782,7 +2816,7 @@ async function waitForTask(
 				ok: completed.ok,
 				text:
 					`Subagent ${id} finished its task (${stats}).\n` +
-					`${SUBAGENT_REUSE_HINT} Follow-up: babysit_send { id: "${id}" }, ` +
+					`${subagentReuseHint(readMeta(id)?.reapAfter)} Follow-up: babysit_send { id: "${id}" }, ` +
 					`or babysit_kill when done.\n\n${completed.body}`,
 				status: st,
 				progress: prog,
@@ -3879,6 +3913,11 @@ export default function (pi: ExtensionAPI) {
 						"Absolute auto-kill after this long (e.g. 30m). Default: none for processes (dev servers may run forever), 15m for subagents. 'none' disables.",
 				}),
 			),
+			reapAfter: Type.Optional(
+				Type.String({
+					description: "Subagent only: stop the worker after this long in task-complete IDLE (e.g. 30s, 5m). Defaults to PI_BABYSIT_REAP_AFTER, then PI_SUBAGENT_REAP_AFTER, then 120s. none/off/0 disables; absolute timeout still applies. Follow-up tasks cancel the idle timer.",
+				}),
+			),
 			idleTimeout: Type.Optional(
 				Type.String({
 					description:
@@ -4199,6 +4238,7 @@ export default function (pi: ExtensionAPI) {
 							maxUsageTokens: params.maxUsageTokens,
 						}
 						: undefined,
+				reapAfter: params.reapAfter,
 				timeout: params.timeout ?? "15m",
 				idleTimeout: params.idleTimeout,
 			});

package/package.json

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