@yusukeshib/pi-babysit 0.3.3 → 0.3.6

package/README.md

@@ -13,8 +13,8 @@ It retires both `@mjakl/pi-processes` (the `process` tool) and the old
 pi install npm:@yusukeshib/pi-babysit
 ```
 
-Then install the [`babysit`](https://github.com/yusukeshib/babysit) binary
-(the extension does **not** auto-install it):
+Then install [`babysit`](https://github.com/yusukeshib/babysit) **0.13.0 or
+newer** (the extension does **not** auto-install it):
 
 ```sh
 cargo install --git https://github.com/yusukeshib/babysit
@@ -22,8 +22,8 @@ cargo install --git https://github.com/yusukeshib/babysit
 
 or grab a prebuilt binary from the
 [releases](https://github.com/yusukeshib/babysit/releases) and put it on your
-`PATH`. If it's missing, every tool and the `/babysit` command fail with these
-instructions.
+`PATH`. If it is missing or older than 0.13.0, every tool and the `/babysit`
+command fail with upgrade instructions.
 
 ## The model
 
@@ -50,14 +50,13 @@ programs** (installers, wizards, REPLs): type with `babysit_send`
 | Tool | What it does |
 | ---- | ------------ |
 | `babysit_run` | Run any command (`command`, optional `name`/`pty`/`timeout`/`idleTimeout`/`retryOnWorkerDeath`) or start a subagent (`profile: "subagent"`, `task`, optional `agent`/`model`/`tools`). Quick commands return inline; longer ones continue in the background |
-| `babysit_check` | List all sessions, or inspect one: process → state + log tail (or `screen: true` for TUIs); subagent → live progress (turns, recent tool calls, partial answer) |
+| `babysit_check` | List all sessions, inspect one, tail its bounded recent output, or search its raw log with `pattern`; `screen: true` captures TUIs and subagents otherwise show structured live progress |
 | `babysit_send` | Process: type `text` / press `keys` into the PTY. Subagent: steer mid-run, or send a follow-up task when idle (`mode: auto/steer/task`) |
 | `babysit_wait` | Block until done: process exit (or `expect: "regex"` readiness marker), subagent task completion. Multi-wait: `ids` + `mode: "any"\|"all"` |
 | `babysit_kill` | Terminate a session (suppresses the exit notification) |
 
-A `tool_call` hook also blocks bash commands that background themselves
-(`… &`, `nohup`, `setsid`, `disown`) and points the agent at `babysit_run`
-(carried over from pi-processes' `blockBackgroundCommands`).
+A `tool_call` hook blocks shell backgrounding (`… &`, `nohup`, `setsid`,
+`disown`) and redirects all direct `bash` commands to `babysit_run`.
 
 ## Commands (human)
 
@@ -73,32 +72,29 @@ A minimal widget above the editor shows live counts
 `babysit_run`, `babysit_wait`, and automatic completion notifications always
 return lifecycle metadata and the absolute path to the complete `output.log`.
 When the complete output is at most 8 KB it is returned inline; larger output
-stays out of model context. Inspect large logs on demand with bounded shell
-commands such as:
+stays out of model context. Inspect it through the session id without creating
+another shell session:
 
-```sh
-tail -n 50 /path/to/output.log
-rg -n 'FAIL|ERROR' /path/to/output.log
+```text
+babysit_check { id: "cargo-test", lines: 50 }
+babysit_check { id: "cargo-test", pattern: "FAIL|ERROR", lines: 50 }
 ```
 
-`babysit_check { id, lines }` remains available as a convenient bounded tail.
-Do not read a potentially large log file in full.
+Tail and search results are capped at 200 lines and clipped to 8 KB. Pattern
+search returns the latest matching lines with line numbers. Do not read a
+potentially large log file in full.
 
-To enforce this policy, the extension blocks direct `bash` except for `pwd`,
-short Git status/branch checks, and `head`/`tail`/`rg` reads of `.log` files that
-are explicitly bounded to at most 100 lines. Broad searches, diffs, API calls,
-multiple commands, redirects, and shell wrappers are redirected to
-`babysit_run`. Set `PI_BABYSIT_ALLOW_BASH=1` only as an emergency escape hatch
-to disable this gate.
+All shell commands, including `pwd` and Git, are redirected to `babysit_run`.
+Set `PI_BABYSIT_ALLOW_BASH=1` only as an explicit emergency escape hatch.
 
-## External worker death
+## Unexpected worker loss
 
-If endpoint security or another external actor kills the babysit supervisor,
-pi-babysit normalizes the stale `running` state to `worker-dead`, returns
-immediately instead of hanging, and explains that the command may have started.
-For commands known to be safe and idempotent, set `retryOnWorkerDeath: true` to
-retry once with a new session id. It is opt-in because blindly rerunning an
-arbitrary command can duplicate side effects.
+If the babysit supervisor disappears without recording an exit, pi-babysit
+normalizes the stale `running` state to `worker-dead` and returns immediately
+instead of hanging. Possible causes include host process cleanup, endpoint
+security, or a supervisor crash. For commands known to be safe and idempotent,
+set `retryOnWorkerDeath: true` to retry once with a new session id. It is opt-in
+because blindly rerunning an arbitrary command can duplicate side effects.
 
 ## How completion detection works
 
@@ -127,12 +123,14 @@ rule, so a subagent waiting on a long build is never false-killed.
 | `PI_BABYSIT_CLI` | `babysit` | babysit binary |
 | `PI_BABYSIT_VIEW_CMD` | bundled `format-stream.mjs` | live-attach pretty printer for subagent JSONL (`""` disables) |
 | `PI_BABYSIT_REAP_AFTER` | `120s` | idle grace before a finished subagent self-exits (`off`/`none`/`0` disables) |
-
-Requires `babysit` and `pi` on `PATH`. The extension does **not** auto-install
-`babysit`: if the binary is missing, every tool and the `/babysit` command fail
-with install instructions (`cargo install --git https://github.com/yusukeshib/babysit`
-or a prebuilt release), and a warning is shown at session start. Point
-`$PI_BABYSIT_CLI` at a custom binary path if needed.
+| `PI_BABYSIT_ALLOW_BASH` | unset | set to `1` to bypass direct-Bash redirection (emergency escape hatch) |
+
+Requires `babysit` 0.13.0 or newer and `pi` on `PATH`. The extension does **not**
+auto-install `babysit`: if the binary is missing or too old, every tool and the
+`/babysit` command fail with install instructions (`cargo install --git
+https://github.com/yusukeshib/babysit` or a prebuilt release), and a warning is
+shown at session start. Point `$PI_BABYSIT_CLI` at a custom binary path if
+needed.
 
 (No tmux dependency — `/babysit` renders inline; take over a live process
 manually with the `babysit attach` command it shows.)

package/index.ts

@@ -36,9 +36,9 @@ import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import { fileURLToPath } from "node:url";
-import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext, Theme } from "@earendil-works/pi-coding-agent";
 import { getMarkdownTheme } from "@earendil-works/pi-coding-agent";
-import { Box, Markdown, Text } from "@earendil-works/pi-tui";
+import { Box, Container, Markdown, Text } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
 import { StringEnum } from "@earendil-works/pi-ai";
 import { type AgentConfig, type AgentScope, discoverAgents } from "./agents";
@@ -154,27 +154,49 @@ function bs(
 // Every session shells out to `babysit`; without it the extension can do
 // nothing. We don't auto-install (that's the user's job) — we fail loudly with
 // install instructions the moment a tool or command is used.
-const INSTALL_HINT =
-	`The \`babysit\` binary was not found (tried "${BABYSIT_BIN}").\n` +
-	`Install it, then retry:\n` +
+const INSTALL_STEPS =
+	`Install babysit 0.13.0 or newer, then retry:\n` +
 	`  cargo install --git https://github.com/yusukeshib/babysit\n` +
 	`or download a prebuilt binary from https://github.com/yusukeshib/babysit/releases and put it on your PATH.\n` +
 	`(Override the binary path with $PI_BABYSIT_CLI.)`;
+const INSTALL_HINT =
+	`The \`babysit\` binary was not found (tried "${BABYSIT_BIN}").\n` + INSTALL_STEPS;
+const MIN_BABYSIT_VERSION = [0, 13, 0] as const;
+
+export function isSupportedBabysitVersion(output: string): boolean {
+	const match = /\b(\d+)\.(\d+)\.(\d+)(-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?\b/.exec(output);
+	if (!match) return false;
+	const actual = [Number(match[1]), Number(match[2]), Number(match[3])] as const;
+	for (let i = 0; i < MIN_BABYSIT_VERSION.length; i++) {
+		if (actual[i] !== MIN_BABYSIT_VERSION[i]) return actual[i] > MIN_BABYSIT_VERSION[i];
+	}
+	return match[4] === undefined;
+}
 
 // Cached preflight — probe `babysit --version` exactly once per process.
-let babysitOk: boolean | undefined;
+// undefined = not probed, null = supported, string = actionable error.
+let babysitPreflightError: string | null | undefined;
 async function babysitAvailable(): Promise<boolean> {
-	if (babysitOk === undefined) {
-		const r = await bs(["--version"]);
-		babysitOk = r.code === 0;
+	// Cache only success. A missing or outdated binary may be installed while pi
+	// stays open, so subsequent tool calls must be able to recover without a restart.
+	if (babysitPreflightError === null) return true;
+	const r = await bs(["--version"]);
+	if (r.code !== 0) {
+		babysitPreflightError = INSTALL_HINT;
+	} else if (!isSupportedBabysitVersion(r.stdout)) {
+		babysitPreflightError =
+			`pi-babysit requires babysit 0.13.0 or newer; found ${r.stdout.trim() || "an unknown version"}.\n` +
+			INSTALL_STEPS;
+	} else {
+		babysitPreflightError = null;
 	}
-	return babysitOk;
+	return babysitPreflightError === null;
 }
 
 // Throwing form for tool `execute` handlers: a thrown error marks the tool
-// result isError and reports the install hint to the model.
+// result isError and reports the preflight error to the model.
 async function requireBabysit(): Promise<void> {
-	if (!(await babysitAvailable())) throw new Error(INSTALL_HINT);
+	if (!(await babysitAvailable())) throw new Error(babysitPreflightError ?? INSTALL_HINT);
 }
 
 // Error-aware: `babysit list` failing is NOT the same as "no sessions" —
@@ -381,6 +403,68 @@ function clip(s: string, maxBytes = TAIL_MAX_BYTES): string {
 	return `${head}\n… [${buf.length - maxBytes} bytes elided] …\n${tail}`;
 }
 
+async function searchLog(
+	id: string,
+	pattern: string,
+	maxLines: number,
+	signal?: AbortSignal,
+): Promise<{ text: string; error?: string }> {
+	const file = logPath(id);
+	if (!fs.existsSync(file)) return { text: "", error: `Log file is missing: ${file}` };
+	if (signal?.aborted) return { text: "", error: "Log search was interrupted." };
+
+	// Run regex evaluation out of process so catastrophic backtracking or a huge
+	// no-newline log cannot freeze or exhaust pi's main Node process. The helper
+	// clips each retained line; this parent also enforces a hard wall-clock limit.
+	return new Promise((resolve) => {
+		const helper = path.join(EXT_DIR, "search-log.mjs");
+		const nodeOptions = [process.env.NODE_OPTIONS, "--max-old-space-size=32"]
+			.filter(Boolean)
+			.join(" ");
+		const child = spawn(process.execPath, [helper, file, pattern, String(maxLines)], {
+			env: { ...process.env, NODE_OPTIONS: nodeOptions },
+		});
+		let stdout = "";
+		let stderr = "";
+		let finished = false;
+		let timedOut = false;
+		const finish = (result: { text: string; error?: string }) => {
+			if (finished) return;
+			finished = true;
+			clearTimeout(timer);
+			signal?.removeEventListener("abort", onAbort);
+			resolve(result);
+		};
+		const onAbort = () => {
+			child.kill("SIGTERM");
+			finish({ text: "", error: "Log search was interrupted." });
+		};
+		const timer = setTimeout(() => {
+			timedOut = true;
+			child.kill("SIGTERM");
+		}, 3_000);
+		signal?.addEventListener("abort", onAbort, { once: true });
+		child.stdout?.on("data", (data) => {
+			stdout += data.toString();
+		});
+		child.stderr?.on("data", (data) => {
+			stderr = clip(stderr + data.toString());
+		});
+		child.on("error", (error) => {
+			finish({ text: "", error: `Could not start log search: ${String(error)}` });
+		});
+		child.on("close", (code) => {
+			if (timedOut) {
+				finish({ text: "", error: "Log search timed out after 3s; narrow the pattern or log." });
+			} else if (code !== 0) {
+				finish({ text: "", error: stderr.trim() || `Log search failed (exit ${code ?? "?"}).` });
+			} else {
+				finish({ text: clip(stdout.trimEnd()) });
+			}
+		});
+	});
+}
+
 async function inlineOutput(id: string, status: BsSession): Promise<string> {
 	let bytes = status.output_bytes;
 	if (bytes == null) {
@@ -1061,7 +1145,7 @@ async function waitForExit(
 				: ok ? "completed successfully" : `exited with code ${st.exit_code ?? "?"}`) +
 			`${expectPattern ? ` before /${expectPattern}/ appeared` : ""}.` +
 			(workerDead
-				? " This commonly indicates an external kill (for example endpoint security). The command may have started, so retry only if it is safe and idempotent."
+				? " The supervisor disappeared without recording an exit; possible causes include host process cleanup, endpoint security, or a supervisor crash. The command may have started, so retry only if it is safe and idempotent."
 				: "") +
 			`\nLog: ${logPath(id)}` + output,
 		status: st,
@@ -1079,7 +1163,7 @@ const waitFor = (
 		: waitForExit(id, limitMs, signal, expectPattern);
 
 // ---------------------------------------------------------------------------
-// bash background-command blocker (carried over from pi-processes)
+// direct bash policy
 // ---------------------------------------------------------------------------
 
 // Heuristic (no shell AST): catch `... &` backgrounding (not `&&`), nohup,
@@ -1092,28 +1176,9 @@ function backgroundsItself(command: string): boolean {
 	return false;
 }
 
-function boundedLineCount(command: string): number | null {
-	const matches = [...command.matchAll(/(?:^|\|)\s*(?:head|tail)\s+(?:-n\s+|--lines(?:=|\s+)|-)(\d+)\b/g)];
-	if (matches.length === 0) return null;
-	return Math.max(...matches.map((m) => Number(m[1])));
-}
-
-/** Commands allowed to bypass babysit: tiny scalar observations and strictly
- * bounded reads of captured log files. This is deliberately conservative;
- * uncertain shell syntax belongs in babysit_run where output is capped. */
-export function isAllowedDirectBash(command: string): boolean {
-	if (process.env.PI_BABYSIT_ALLOW_BASH === "1") return true;
-	const s = command.trim();
-	if (/^(pwd|git status --short|git branch --show-current)$/.test(s)) return true;
-	if (!s || /[;&`\n\r]|\$\(|>|\b(?:bash|sh|zsh)\s+-c\b/.test(s)) return false;
-	if (!/(?:output\.log|\/(?:tmp|var\/tmp)\/[^\s'\"]*\.log)\b/.test(s)) return false;
-	if (/^wc\s+-(?:l|c)\s+/.test(s) && !s.includes("|")) return true;
-	if (!/^(?:tail|head|rg)\b/.test(s)) return false;
-	const limit = boundedLineCount(s);
-	if (limit == null || limit > 100) return false;
-	// rg must feed a bounded head/tail; direct head/tail is already bounded.
-	if (/^rg\b/.test(s) && !/\|\s*(?:head|tail)\b/.test(s)) return false;
-	return true;
+/** Emergency escape hatch only. All ordinary shell commands go through babysit_run. */
+export function isAllowedDirectBash(_command: string): boolean {
+	return process.env.PI_BABYSIT_ALLOW_BASH === "1";
 }
 
 // ---------------------------------------------------------------------------
@@ -1146,6 +1211,11 @@ export default function (pi: ExtensionAPI) {
 			meta.notified = true;
 			writeMeta(s.id, meta);
 			const ok = s.exit_code === 0;
+			const status: DisplayStatus = ok
+				? "success"
+				: s.state === "dead" || s.exit_code == null
+					? "terminated"
+					: "failed";
 			const output = await inlineOutput(s.id, s);
 			const runtime = meta.startedAt
 				? `${Math.round((Date.now() - meta.startedAt) / 1000)}s`
@@ -1160,9 +1230,16 @@ export default function (pi: ExtensionAPI) {
 					customType: "pi-babysit-process-end",
 					content:
 						`${summary}\nCommand: ${meta.command ?? "?"}\nLog: ${logPath(s.id)}${output}` +
-						`\n\nThis is the automatic process-end notification. Do not call babysit_check just to re-verify. Inspect the log only when needed, using bounded commands such as tail or rg; never read it in full.`,
+						`\n\nThis is the automatic process-end notification. Do not call babysit_check just to re-verify. Inspect the log only when needed with babysit_check { id: ${JSON.stringify(s.id)}, lines, pattern? }; never read it in full.`,
 					display: true,
-					details: { id: s.id, exitCode: s.exit_code, success: ok, runtime, logPath: logPath(s.id) },
+					details: {
+						id: s.id,
+						exitCode: s.exit_code,
+						success: ok,
+						status,
+						runtime,
+						logPath: logPath(s.id),
+					},
 				},
 				{ triggerTurn: true, deliverAs: "steer" },
 			);
@@ -1198,23 +1275,63 @@ export default function (pi: ExtensionAPI) {
 		ctx.ui.setWidget("pi-babysit", lines, { placement: "belowEditor" });
 	};
 
-	// Render a subagent's final answer INLINE in the transcript as formatted
-	// markdown (agent output is markdown). Fed via pi.sendMessage below.
+	type DisplayStatus = "started" | "running" | "idle" | "success" | "failed" | "terminated";
+	const renderStatus = (status: DisplayStatus, theme: Theme, prefix?: string): string => {
+		const labels: Record<
+			DisplayStatus,
+			{ icon: string; text: string; color: "accent" | "warning" | "success" | "error" }
+		> = {
+			started: { icon: "", text: "STARTED", color: "accent" },
+			running: { icon: "", text: "RUNNING", color: "accent" },
+			idle: { icon: "", text: "IDLE", color: "warning" },
+			success: { icon: "", text: "SUCCESS", color: "success" },
+			failed: { icon: "", text: "FAILED", color: "error" },
+			terminated: { icon: "", text: "TERMINATED", color: "error" },
+		};
+		const label = labels[status];
+		const text = prefix ? `${prefix} ${label.text}` : label.text;
+		const decorated = label.icon ? `${label.icon} ${text}` : text;
+		return theme.fg(label.color, theme.bold(decorated));
+	};
+	const outcomeStatus = (outcome: WaitOutcome): DisplayStatus =>
+		outcome.ok
+			? "success"
+			: outcome.status &&
+					(outcome.status.state === "dead" || outcome.status.exit_code == null)
+				? "terminated"
+				: "failed";
+
+	// Render snapshots and subagent answers INLINE in the transcript as formatted
+	// markdown, with a semantic status label that remains readable on any theme.
 	pi.registerMessageRenderer("pi-babysit-result", (message, _opts, theme) => {
-		const d = (message.details ?? {}) as { title?: string; body?: string };
+		const d = (message.details ?? {}) as {
+			title?: string;
+			body?: string;
+			status?: DisplayStatus;
+		};
 		const body =
 			d.body ?? (typeof message.content === "string" ? message.content : "");
-		const box = new Box(1, 0, (t) => theme.bg("customMessageBg", t));
+		const box = new Box(1, 0, (t) => theme.bg("toolSuccessBg", t));
+		if (d.status) box.addChild(new Text(renderStatus(d.status, theme), 0, 0));
 		if (d.title) box.addChild(new Text(theme.fg("accent", d.title), 0, 0));
 		box.addChild(new Markdown(body, 0, 0, getMarkdownTheme()));
 		return box;
 	});
 
-	// Process-end notification rendering (plain text in a subtle box).
+	// Process-end notification rendering with a colored lifecycle label. Keep the
+	// box background subtle: coloring a potentially large log excerpt is noisy.
 	pi.registerMessageRenderer("pi-babysit-process-end", (message, _opts, theme) => {
 		const content = typeof message.content === "string" ? message.content : "";
-		const box = new Box(1, 0, (t) => theme.bg("customMessageBg", t));
-		box.addChild(new Text(content, 0, 0));
+		const d = (message.details ?? {}) as {
+			status?: DisplayStatus;
+			success?: boolean;
+			exitCode?: number | null;
+		};
+		const status =
+			d.status ?? (d.success ? "success" : d.exitCode == null ? "terminated" : "failed");
+		const box = new Box(1, 1, (t) => theme.bg("toolSuccessBg", t));
+		box.addChild(new Text(renderStatus(status, theme, "babysit_run"), 0, 0));
+		box.addChild(new Text(theme.fg("toolOutput", content), 0, 0));
 		return box;
 	});
 
@@ -1230,7 +1347,9 @@ export default function (pi: ExtensionAPI) {
 		}
 		// Warn early if the binary is missing so the user isn't surprised only when
 		// a tool later fails. Tools/commands still enforce it via requireBabysit.
-		if (ctx.hasUI && !(await babysitAvailable())) ctx.ui.notify(INSTALL_HINT, "warn");
+		if (ctx.hasUI && !(await babysitAvailable())) {
+			ctx.ui.notify(babysitPreflightError ?? INSTALL_HINT, "warn");
+		}
 		if (pollTimer) clearInterval(pollTimer);
 		pollTimer = setInterval(() => {
 			// Skip if the previous (async) poll hasn't finished, so slow babysit
@@ -1252,9 +1371,6 @@ export default function (pi: ExtensionAPI) {
 		pollTimer = undefined;
 	});
 
-	// Keep unpredictable command output out of model context. Direct bash is
-	// reserved for tiny scalar observations and tightly bounded log inspection;
-	// everything else belongs in babysit_run.
 	pi.on("tool_call", async (event) => {
 		if (event.toolName !== "bash") return;
 		const command = String((event.input as { command?: unknown }).command ?? "");
@@ -1270,8 +1386,8 @@ export default function (pi: ExtensionAPI) {
 		return {
 			block: true,
 			reason:
-				"Use babysit_run for this command so potentially large output is captured outside model context. " +
-				"Direct bash is allowed only for pwd, short git status/branch checks, or log-file tail/rg commands explicitly bounded to at most 100 lines. " +
+				"Use babysit_run for shell commands so output is supervised and captured outside model context. " +
+				"Inspect an existing session log with babysit_check { id, lines, pattern? }. " +
 				`Retry as babysit_run({ command: ${JSON.stringify(command)} }).`,
 		};
 	});
@@ -1284,11 +1400,11 @@ export default function (pi: ExtensionAPI) {
 			"Run any shell command in a supervised babysit session. Commands that finish within a short " +
 			"grace period return completion metadata immediately; longer commands continue in the background " +
 			"and trigger an automatic notification on exit. Complete output is returned inline only when it is " +
-			"small; larger output stays in the log path for bounded inspection with tail or rg. " +
+			"small; larger output stays in the log path for bounded inspection with babysit_check. " +
 			"In non-interactive mode (`pi -p`, no UI), process mode blocks until exit because there is no " +
 			"notification loop. Two modes: (1) `command` — run any shell command, including builds, tests, " +
 			"dev servers, watchers, and interactive TUIs; you can type into it with babysit_send and read " +
-			"its screen with babysit_check. If endpoint security kills a worker at startup, " +
+			"its screen with babysit_check. If a worker disappears during startup without recording an exit, " +
 			"`retryOnWorkerDeath` can retry one idempotent command once. " +
 			"(2) `profile: \"subagent\"` + `task` — spawn a pi subagent that works on the task in the " +
 			"background; poll with babysit_check, steer with babysit_send, block with babysit_wait, " +
@@ -1297,7 +1413,7 @@ export default function (pi: ExtensionAPI) {
 			"Run any shell command with context-safe captured output; quick commands return metadata, longer ones continue in background",
 		promptGuidelines: [
 			"Use babysit_run as the default for shell commands, not only long-running work. Small output is returned directly; large stdout/stderr stays out of model context in the returned log path. Give meaningful commands a clear stable `name`.",
-			"Inspect a babysit log only with explicitly bounded commands such as `tail -n N` or focused `rg`; never read or cat a potentially large log in full. Those small inspection commands may use bash directly to avoid recursively creating babysit sessions.",
+			"Inspect a babysit log with babysit_check { id, lines, pattern? }; never read or cat a potentially large log file in full.",
 			"After babysit_run { command } starts a process, end your response immediately so the automatic process-end notification can resume you; NEVER poll with babysit_check or sleep. Set continueAfterStart: true only when you have immediate, specific, non-polling work to do next. Call babysit_wait when you must consume the result inside the current turn (optionally with `expect` to wait for a readiness line like 'listening on').",
 			"If a babysit worker is killed externally, babysit_run reports it as worker-dead rather than hanging. Set retryOnWorkerDeath: true only for safe, idempotent commands; it retries at most once and may otherwise duplicate side effects.",
 			"babysit_run gives full PTY control: drive interactive programs (installers, wizards, REPLs) with babysit_send (text or named keys) and read the rendered screen with babysit_check { screen: true }.",
@@ -1433,7 +1549,14 @@ export default function (pi: ExtensionAPI) {
 					return {
 						content: [{ type: "text", text: `${retried ? "Retried once after external worker death.\n" : ""}${outcome.text}` }],
 						isError: !outcome.ok,
-						details: { id: res.id, kind: "process", command: params.command, logPath: logPath(res.id), retried },
+						details: {
+							id: res.id,
+							kind: "process",
+							command: params.command,
+							logPath: logPath(res.id),
+							retried,
+							status: outcomeStatus(outcome),
+						},
 					};
 				}
 
@@ -1462,7 +1585,14 @@ export default function (pi: ExtensionAPI) {
 					return {
 						content: [{ type: "text", text: `${retried ? "Retried once after external worker death.\n" : ""}${outcome.text}` }],
 						isError: !outcome.ok,
-						details: { id: res.id, kind: "process", command: params.command, logPath: logPath(res.id), retried },
+						details: {
+							id: res.id,
+							kind: "process",
+							command: params.command,
+							logPath: logPath(res.id),
+							retried,
+							status: outcomeStatus(outcome),
+						},
 					};
 				}
 
@@ -1482,7 +1612,14 @@ export default function (pi: ExtensionAPI) {
 								`Human can watch/take over: /babysit`,
 						},
 					],
-					details: { id: res.id, kind: "process", command: params.command, logPath: logPath(res.id), retried },
+					details: {
+						id: res.id,
+						kind: "process",
+						command: params.command,
+						logPath: logPath(res.id),
+						retried,
+						status: "started" satisfies DisplayStatus,
+					},
 					// Do not return `terminate: true` here. In RPC/subagent hosts that hint
 					// can shut down the hosting pi worker, whose process-tree cleanup then
 					// kills the otherwise detached babysit supervisor and closes its PTY
@@ -1542,8 +1679,49 @@ export default function (pi: ExtensionAPI) {
 							`Human can watch/steer: /babysit (pick ${res.id})`,
 					},
 				],
-				details: { id: res.id, kind: "subagent", agent: agent?.name, model: res.model, task: params.task },
+				details: {
+					id: res.id,
+					kind: "subagent",
+					agent: agent?.name,
+					model: res.model,
+					task: params.task,
+					status: "started" satisfies DisplayStatus,
+				},
+			};
+		},
+		// The result label already includes "babysit_run"; suppress the default
+		// call header so the tool name is not shown twice in adjacent lines.
+		renderCall() {
+			return new Container();
+		},
+		renderResult(result, { isPartial }, theme, context) {
+			const details = (result.details ?? {}) as {
+				kind?: "process" | "subagent";
+				status?: DisplayStatus;
 			};
+			const content = result.content
+				.filter((item): item is { type: "text"; text: string } => item.type === "text")
+				.map((item) => item.text)
+				.join("\n");
+			// A vanished supervisor must never be presented as success, even if an
+			// older/stale result omitted status details or the host did not preserve
+			// the custom isError field. The textual diagnosis is part of our stable
+			// tool contract, so give it precedence over all fallback classification.
+			const workerDead =
+				content.includes("worker-dead") ||
+				content.includes("babysit supervisor disappeared");
+			const status: DisplayStatus = isPartial
+				? "running"
+				: workerDead
+					? "terminated"
+					: details.status ??
+						(context.isError
+							? "failed"
+							: details.kind === "subagent" || content.includes(NOTIFY_MARKER)
+								? "started"
+								: "success");
+			const label = renderStatus(status, theme, "babysit_run");
+			return new Text(content ? `${label}\n${theme.fg("toolOutput", content)}` : label, 0, 0);
 		},
 	});
 
@@ -1553,10 +1731,10 @@ export default function (pi: ExtensionAPI) {
 		label: "Babysit: check",
 		description:
 			"Inspect babysit session(s). Without an id: lists all sessions (processes + subagents). " +
-			"With an id: a process shows state + recent output (or the rendered screen with " +
-			"`screen: true` — use for TUIs that redraw in place); a subagent shows live progress " +
-			"(turns, recent tool calls, partial answer). Do NOT poll this while merely waiting for " +
-			"a process to end — the exit notification is automatic.",
+			"With an id: a process shows state + recent output, searches its log with `pattern`, " +
+			"or captures the rendered screen with `screen: true`; a subagent shows live progress " +
+			"(or raw log matches with `pattern`). Results are bounded by `lines` and clipped. " +
+			"Do NOT poll this while merely waiting for a process to end — the exit notification is automatic.",
 		promptSnippet: "Check status/progress of babysit sessions (processes and subagents)",
 		parameters: Type.Object({
 			id: Type.Optional(Type.String({ description: "Session id. Omit to list all sessions." })),
@@ -1564,7 +1742,13 @@ export default function (pi: ExtensionAPI) {
 				Type.Number({ description: "Subagent: how many recent tool calls to show (default 8, max 50)." }),
 			),
 			lines: Type.Optional(
-				Type.Number({ description: "Process: how many log lines to show (default 30, max 200)." }),
+				Type.Number({ description: "How many tail lines or latest matches to show (default 30, max 200)." }),
+			),
+			pattern: Type.Optional(
+				Type.String({
+					description:
+						"Search this session's raw log with a regular expression; returns the latest bounded matches.",
+				}),
 			),
 			screen: Type.Optional(
 				Type.Boolean({
@@ -1573,7 +1757,7 @@ export default function (pi: ExtensionAPI) {
 				}),
 			),
 		}),
-		async execute(_id, params) {
+		async execute(_id, params, signal) {
 			await requireBabysit();
 			if (!params.id) {
 				const { sessions, error } = await listSessions();
@@ -1608,6 +1792,40 @@ export default function (pi: ExtensionAPI) {
 				};
 			}
 			const meta = readMeta(params.id);
+			const nLines = Math.min(Math.max(1, Math.floor(params.lines ?? 30)), 200);
+			if (params.pattern !== undefined) {
+				if (params.screen) {
+					return {
+						content: [{ type: "text", text: "`pattern` and `screen` are mutually exclusive." }],
+						isError: true,
+						details: {},
+					};
+				}
+				if (params.pattern.length === 0) {
+					return {
+						content: [{ type: "text", text: "`pattern` must not be empty." }],
+						isError: true,
+						details: {},
+					};
+				}
+				const result = await searchLog(params.id, params.pattern, nLines, signal);
+				if (result.error) {
+					return {
+						content: [{ type: "text", text: result.error }],
+						isError: true,
+						details: {},
+					};
+				}
+				const kind = meta?.kind ?? "process";
+				const header = `[${kind}] state=${st.state}\nlog: ${logPath(params.id)}`;
+				const body = result.text
+					? `--- latest matches /${params.pattern}/ ---\n${result.text}`
+					: `(no output matching /${params.pattern}/)`;
+				return {
+					content: [{ type: "text", text: `${header}\n${body}` }],
+					details: { status: st, kind, logPath: logPath(params.id), pattern: params.pattern },
+				};
+			}
 
 			// --- process ---
 			if (meta?.kind !== "subagent") {
@@ -1626,7 +1844,6 @@ export default function (pi: ExtensionAPI) {
 					const sc = await bs(["screenshot", "-s", params.id, "--trim"]);
 					parts.push(`--- screen ---\n${clip(sc.stdout.trimEnd()) || "(blank screen)"}`);
 				} else {
-					const nLines = Math.min(Math.max(1, params.lines ?? 30), 200);
 					const tail = clip(
 						(await bs(["log", "-s", params.id, "--tail", String(nLines)])).stdout.trimEnd(),
 					);
@@ -1987,7 +2204,7 @@ export default function (pi: ExtensionAPI) {
 		description: "Pick a babysit session (↑/↓) to snapshot/inspect",
 		handler: async (_args, ctx) => {
 			if (!(await babysitAvailable())) {
-				ctx.ui.notify(INSTALL_HINT, "error");
+				ctx.ui.notify(babysitPreflightError ?? INSTALL_HINT, "error");
 				return;
 			}
 			const sessions = (await listSessions()).sessions.sort((a, b) =>
@@ -2044,12 +2261,21 @@ export default function (pi: ExtensionAPI) {
 					`${picked.id} ${picked.state}${elapsedSuffix}` +
 					(picked.exit_code != null ? ` (exit=${picked.exit_code})` : "") +
 					`  ${stats}`;
+				const status: DisplayStatus = prog.errorMsg
+					? "failed"
+					: prog.running || prog.waitingOnProcess
+						? "running"
+						: prog.done
+							? "idle"
+							: picked.exit_code === 0
+								? "success"
+								: "terminated";
 				if (ctx.hasUI) {
 					pi.sendMessage({
 						customType: "pi-babysit-result",
 						content: title,
 						display: true,
-						details: { title, body },
+						details: { title, body, status },
 					});
 				} else {
 					ctx.ui.notify(`${title}\n\n${body}`, "info");
@@ -2078,12 +2304,19 @@ export default function (pi: ExtensionAPI) {
 					(running
 						? `\n\n_Take over in your own terminal:_ \`${attachCmd(picked.id)}\` _(detach: Ctrl-\\ Ctrl-\\)._ Re-run \`/babysit\` to refresh this snapshot.`
 						: "");
+				const status: DisplayStatus = running
+					? "running"
+					: picked.exit_code === 0
+						? "success"
+						: picked.state === "dead" || picked.exit_code == null
+							? "terminated"
+							: "failed";
 				if (ctx.hasUI) {
 					pi.sendMessage({
 						customType: "pi-babysit-result",
 						content: title,
 						display: true,
-						details: { title, body },
+						details: { title, body, status },
 					});
 				} else {
 					ctx.ui.notify(`${title}\n\n${body}`, "info");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yusukeshib/pi-babysit",
-  "version": "0.3.3",
+  "version": "0.3.6",
   "description": "Run any shell command and pi subagents under babysit, with context-safe captured output.",
   "keywords": [
     "pi-package",
@@ -23,6 +23,7 @@
     "agents.ts",
     "self-reap.ts",
     "format-stream.mjs",
+    "search-log.mjs",
     "README.md",
     "LICENSE"
   ],

package/search-log.mjs

@@ -0,0 +1,42 @@
+import fs from "node:fs";
+import { createInterface } from "node:readline";
+
+const [file, source, maxLinesRaw] = process.argv.slice(2);
+const maxLines = Math.min(Math.max(1, Number.parseInt(maxLinesRaw ?? "30", 10) || 30), 200);
+const MAX_LINE_BYTES = 4_000;
+
+let pattern;
+try {
+	pattern = new RegExp(source);
+} catch (error) {
+	console.error(`Invalid pattern: ${String(error)}`);
+	process.exit(2);
+}
+
+function clipLine(line) {
+	const bytes = Buffer.from(line, "utf8");
+	if (bytes.length <= MAX_LINE_BYTES) return line;
+	const half = Math.floor(MAX_LINE_BYTES / 2);
+	const head = bytes.subarray(0, half).toString("utf8").replace(/\uFFFD+$/, "");
+	const tail = bytes.subarray(bytes.length - half).toString("utf8").replace(/^\uFFFD+/, "");
+	return `${head}… [line clipped] …${tail}`;
+}
+
+const matches = [];
+let lineNumber = 0;
+try {
+	const input = fs.createReadStream(file, { encoding: "utf8" });
+	const lines = createInterface({ input, crlfDelay: Infinity });
+	for await (const line of lines) {
+		lineNumber++;
+		pattern.lastIndex = 0;
+		if (!pattern.test(line)) continue;
+		matches.push(`${lineNumber}:${clipLine(line)}`);
+		if (matches.length > maxLines) matches.shift();
+	}
+} catch (error) {
+	console.error(`Could not search log: ${String(error)}`);
+	process.exit(1);
+}
+
+process.stdout.write(matches.join("\n"));