@gavin-hu/my-pi-agent 0.14.0 → 0.15.0

package/extensions/watch/runtime.ts

@@ -12,17 +12,18 @@ import { closeSync, openSync, readSync, statSync } from "node:fs";
 import { isAbsolute, resolve } from "node:path";
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { resolveEffectiveCwd } from "../../lib/env.ts";
+import { LineSplitter } from "../../lib/lines.ts";
+import type { KillTreeFn, SpawnFn, SpawnedProcess } from "../../lib/spawn.ts";
+import { createChildSupervisor } from "./child.ts";
 import { DEFAULT_CONFIG, loadConfig, type WatchConfig } from "./config.ts";
-import { compileRegex, sanitizeWatchLine, sourceLabel } from "./format.ts";
-import { defaultKillTree, defaultSpawn, type KillTreeFn, type SpawnFn, type SpawnedProcess } from "./process.ts";
+import { sanitizeUntrustedLine } from "../../lib/format.ts";
+import { compileRegex, sourceLabel } from "./format.ts";
 import { createUiController, type UiController } from "./ui.ts";
 import type { PendingMatch, WatchMatch, WatchRecord, WatchSource } from "./types.ts";
 
 /** Largest slice read from a file per tick. */
 const MAX_CHUNK = 1024 * 1024;
-/** A line without a newline is flushed once it grows past this. */
-const MAX_LINE_BYTES = 1024 * 1024;
-/** Grace period before a stopped command is escalated to SIGKILL. */
+/** Grace before a stopped command escalates to SIGKILL; `child.ts` defaults the same. */
 const KILL_GRACE_MS = 2000;
 
 /** Internal watcher state: the public record plus non-serializable fields. */
@@ -48,7 +49,7 @@ interface Internal {
 	regex: RegExp;
 	excludes: RegExp[];
 	offset: number;
-	pending: Buffer;
+	lines: LineSplitter;
 	rawLines: string[];
 	matches: WatchMatch[];
 	child?: SpawnedProcess;
@@ -103,8 +104,11 @@ export interface WatchRuntimeOptions {
 }
 
 export function createWatchRuntime(options: WatchRuntimeOptions = {}): WatchRuntime {
-	const spawnFn = options.spawn ?? defaultSpawn;
-	const killTree = options.killTree ?? defaultKillTree;
+	const children = createChildSupervisor({
+		spawn: options.spawn,
+		killTree: options.killTree,
+		graceMs: options.killGraceMs,
+	});
 	const now = options.now ?? (() => Date.now());
 	const fixedConfig = options.config;
 	const autoClock = options.autoClock ?? true;
@@ -208,7 +212,7 @@ export function createWatchRuntime(options: WatchRuntimeOptions = {}): WatchRunt
 		for (const exclude of w.excludes) if (exclude.test(line)) return false;
 		if (!w.regex.test(line)) return false;
 
-		const clean = sanitizeWatchLine(line);
+		const clean = sanitizeUntrustedLine(line);
 		w.matches.push({ seq: ++w.seq, line: clean, at: time, seen: false });
 		if (w.matches.length > config.maxMatches) {
 			w.matches.splice(0, w.matches.length - config.maxMatches);
@@ -224,85 +228,16 @@ export function createWatchRuntime(options: WatchRuntimeOptions = {}): WatchRunt
 	};
 
 	const consume = (w: Internal, chunk: Buffer, time: number): void => {
-		const combined = w.pending.length > 0 ? Buffer.concat([w.pending, chunk]) : chunk;
-		let start = 0;
 		let matched = false;
-		while (true) {
-			const newline = combined.indexOf(0x0a, start);
-			if (newline < 0) break;
-			if (emit(w, combined.subarray(start, newline).toString("utf-8"), time)) matched = true;
-			start = newline + 1;
-		}
-		let rest = combined.subarray(start);
-		if (rest.length > MAX_LINE_BYTES) {
-			if (emit(w, rest.toString("utf-8"), time)) matched = true;
-			rest = Buffer.alloc(0);
+		for (const line of w.lines.push(chunk)) {
+			if (emit(w, line, time)) matched = true;
 		}
-		w.pending = Buffer.from(rest);
 		if (matched && w.wake) fireOnMatch();
 	};
 
+	/** A source that ended mid-line still reports that line. */
 	const flushPending = (w: Internal, time: number): void => {
-		if (w.pending.length === 0) return;
-		const rest = w.pending.toString("utf-8");
-		w.pending = Buffer.alloc(0);
-		emit(w, rest, time);
-	};
-
-	const clearKillTimer = (w: Internal): void => {
-		if (w.killTimer) {
-			clearTimeout(w.killTimer);
-			w.killTimer = undefined;
-		}
-	};
-
-	const killChild = (w: Internal, signal: "SIGTERM" | "SIGKILL"): void => {
-		const pid = w.pid;
-		try {
-			if (pid !== undefined) killTree(pid, signal, signal === "SIGKILL");
-			else w.child?.kill(signal);
-		} catch {
-			// Best-effort: the child may already be gone.
-		}
-	};
-
-	/** SIGTERM a command, escalating to SIGKILL when it has not closed in time. */
-	const terminateChild = (w: Internal): void => {
-		clearKillTimer(w);
-		killChild(w, "SIGTERM");
-		if (w.pid === undefined && !w.child) return;
-		w.killTimer = setTimeout(() => {
-			w.killTimer = undefined;
-			if (w.child) killChild(w, "SIGKILL");
-		}, killGraceMs);
-		w.killTimer.unref?.();
-	};
-
-	/** Resolve when every command has closed, or after `ms`, whichever comes first. */
-	const waitForChildren = (watches: Internal[], ms: number): Promise<void> => {
-		const alive = watches.filter((w) => w.child !== undefined);
-		if (alive.length === 0) return Promise.resolve();
-		return new Promise((resolve) => {
-			let remaining = alive.length;
-			let timer: ReturnType<typeof setTimeout> | undefined;
-			const settle = (): void => {
-				if (--remaining > 0) return;
-				if (timer !== undefined) clearTimeout(timer);
-				resolve();
-			};
-			for (const w of alive) {
-				let done = false;
-				const once = (): void => {
-					if (done) return;
-					done = true;
-					settle();
-				};
-				w.child?.on("close", once);
-				w.child?.on("error", once);
-			}
-			timer = setTimeout(resolve, ms);
-			timer.unref?.();
-		});
+		for (const line of w.lines.flush()) emit(w, line, time);
 	};
 
 	const pollFile = (w: Internal, time: number): void => {
@@ -317,7 +252,7 @@ export function createWatchRuntime(options: WatchRuntimeOptions = {}): WatchRunt
 		}
 		if (size < w.offset) {
 			w.offset = 0;
-			w.pending = Buffer.alloc(0);
+			w.lines.reset();
 		}
 		if (w.offset >= size) return;
 
@@ -344,42 +279,28 @@ export function createWatchRuntime(options: WatchRuntimeOptions = {}): WatchRunt
 	};
 
 	const startCommand = (w: Internal): void => {
-		let child: SpawnedProcess;
-		try {
-			child = spawnFn(w.source.command ?? "", { cwd: w.source.cwd ?? process.cwd() });
-		} catch (error) {
-			w.status = "error";
-			w.error = (error as Error).message;
-			w.endedAt = now();
-			return;
-		}
-		w.child = child;
-		w.pid = child.pid;
-		const onData = (chunk: Buffer): void => consume(w, chunk, now());
-		child.stdout?.on("data", onData);
-		child.stderr?.on("data", onData);
-		child.on("close", (code, signal) => {
-			clearKillTimer(w);
-			w.child = undefined;
-			if (w.status !== "running") return;
-			flushPending(w, now());
-			w.status = "exited";
-			w.exitCode = code;
-			w.signal = signal;
-			w.endedAt = now();
-			ui.paint();
-			if (runningCount() === 0) stopClock();
-		});
-		child.on("error", (error) => {
-			clearKillTimer(w);
-			w.child = undefined;
-			if (w.status !== "running") return;
-			w.status = "error";
-			w.error = error.message;
-			w.endedAt = now();
-			ui.paint();
-			if (runningCount() === 0) stopClock();
+		const error = children.start(w, w.source.command ?? "", w.source.cwd ?? process.cwd(), {
+			onData: (chunk) => consume(w, chunk, now()),
+			onSettled: (outcome) => {
+				if (w.status !== "running") return;
+				if (outcome.kind === "closed") {
+					flushPending(w, now());
+					w.status = "exited";
+					w.exitCode = outcome.code;
+					w.signal = outcome.signal;
+				} else {
+					w.status = "error";
+					w.error = outcome.message;
+				}
+				w.endedAt = now();
+				ui.paint();
+				if (runningCount() === 0) stopClock();
+			},
 		});
+		if (error === undefined) return;
+		w.status = "error";
+		w.error = error;
+		w.endedAt = now();
 	};
 
 	const tick = (): void => {
@@ -443,7 +364,7 @@ export function createWatchRuntime(options: WatchRuntimeOptions = {}): WatchRunt
 			regex,
 			excludes,
 			offset,
-			pending: Buffer.alloc(0),
+			lines: new LineSplitter(),
 			rawLines: [],
 			matches: [],
 			notified: false,
@@ -476,13 +397,13 @@ export function createWatchRuntime(options: WatchRuntimeOptions = {}): WatchRunt
 
 	const matches = (id: string, lines?: number) => tail(id, lines, (w) => w.matches.map((m) => m.line));
 	const logs = (id: string, lines?: number) =>
-		tail(id, lines, (w) => w.rawLines.map((line) => sanitizeWatchLine(line)));
+		tail(id, lines, (w) => w.rawLines.map((line) => sanitizeUntrustedLine(line)));
 
 	const stop = (id: string): boolean => {
 		const w = watches.get(id);
 		if (!w || w.status !== "running") return false;
 		flushPending(w, now());
-		terminateChild(w);
+		children.terminate(w);
 		w.status = "stopped";
 		w.endedAt = now();
 		ui.paint();
@@ -535,8 +456,8 @@ export function createWatchRuntime(options: WatchRuntimeOptions = {}): WatchRunt
 		for (const w of watches.values()) {
 			if (w.status !== "running") continue;
 			w.status = "stopped";
-			clearKillTimer(w);
-			killChild(w, "SIGKILL");
+			children.clearTimer(w);
+			children.kill(w, "SIGKILL");
 			w.child = undefined;
 		}
 		watches.clear();
@@ -554,13 +475,13 @@ export function createWatchRuntime(options: WatchRuntimeOptions = {}): WatchRunt
 			flushPending(w, now());
 			w.status = "stopped";
 			w.endedAt = now();
-			clearKillTimer(w);
-			killChild(w, "SIGTERM");
+			children.clearTimer(w);
+			children.kill(w, "SIGTERM");
 		}
-		await waitForChildren(running, killGraceMs);
+		await children.wait(running, killGraceMs);
 		for (const w of running) {
-			clearKillTimer(w);
-			if (w.child) killChild(w, "SIGKILL");
+			children.clearTimer(w);
+			if (w.child) children.kill(w, "SIGKILL");
 		}
 		watches.clear();
 		ui.detach();

package/extensions/watch/schema.ts

@@ -9,6 +9,7 @@
 
 import { StringEnum } from "@earendil-works/pi-ai";
 import { Type, type Static } from "typebox";
+import { optionalString } from "../../lib/config.ts";
 import { WATCH_ACTIONS, type WatchAction } from "./types.ts";
 
 /** Longest accepted label. */
@@ -79,10 +80,6 @@ export type WatchCall =
 	| { action: "stop"; id: string }
 	| { action: "clear"; id?: string; all?: boolean };
 
-function optionalString(value: unknown): string | undefined {
-	return typeof value === "string" && value.trim() ? value.trim() : undefined;
-}
-
 function assertRegex(value: string, field: string): void {
 	if (value.length > MAX_PATTERN) throw new Error(`${field} is longer than ${MAX_PATTERN} characters.`);
 	try {

package/extensions/watch/tools.ts

@@ -9,6 +9,7 @@
 
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { sanitizeLine } from "../../lib/format.ts";
+import { errorResult } from "../../lib/tool-result.ts";
 import { reuseText, toolDetails } from "../../lib/tui/chrome.ts";
 import { rejectionLine, reuseCallText, toolCallTitle } from "../../lib/tui/tool.ts";
 import { SEPARATORS } from "../../lib/tui/glyphs.ts";
@@ -32,17 +33,6 @@ export const TOOL_NAME = "watch";
 /** Collapsed transcript rows before the result is truncated. */
 const RESULT_ROWS = 8;
 
-function errorResult(
-	action: WatchDetails["action"],
-	message: string,
-): { content: Array<{ type: "text"; text: string }>; details: WatchDetails; isError: true } {
-	return {
-		content: [{ type: "text", text: `Error: ${message}` }],
-		details: { action, error: message },
-		isError: true,
-	};
-}
-
 const GUIDELINES = [
 	"Use `watch add` to tail a log file or a long-running command and surface lines matching a pattern.",
 	"Read matches with `watch matches <id>`; use `watch logs <id>` for the raw output tail.",