@gavin-hu/my-pi-agent 0.15.1 → 0.16.0

package/extensions/memory/tools.ts

@@ -10,10 +10,8 @@
 
 import type { JsonValue } from "@earendil-works/pi-ai";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { sanitizeLine } from "../../lib/format.ts";
+import { callLine, detailsOrLine } from "../../lib/tui/tool.ts";
 import { reuseText, toolDetails } from "../../lib/tui/chrome.ts";
-import { rejectionLine, reuseCallText, toolCallTitle } from "../../lib/tui/tool.ts";
-import { paint } from "../../lib/tui/tokens.ts";
 import { messageOf } from "./errors.ts";
 import { formatCallText, formatResultText, scopeLabel } from "./format.ts";
 import type { MemoryRuntime } from "./runtime.ts";
@@ -139,27 +137,21 @@ export function registerTools(pi: ExtensionAPI, runtime: MemoryRuntime): void {
 		},
 
 		renderCall(args, theme, context) {
-			const text = reuseCallText(context.lastComponent);
 			const body = formatCallText(
 				args as { action?: unknown; text?: unknown; to?: unknown; scope?: unknown },
 				context.argsComplete,
 			);
-			text.setText(toolCallTitle(theme, `${TOOL_NAME} `) + paint(theme, "meta", body));
-			return text;
+			return callLine(theme, context.lastComponent, TOOL_NAME, body);
 		},
 
 		renderResult(result, { expanded }, theme, context) {
 			const text = reuseText(context.lastComponent);
-			const details = toolDetails<MemoryDetails>(result.details);
-			if (!details) {
-				text.setText(rejectionLine(theme, result, expanded));
-				return text;
-			}
-			if (details.error) {
-				text.setText(paint(theme, "bad", `Error: ${sanitizeLine(details.error)}`));
+			const outcome = detailsOrLine(theme, result, expanded, toolDetails<MemoryDetails>(result.details));
+			if ("line" in outcome) {
+				text.setText(outcome.line);
 				return text;
 			}
-			text.setText(formatResultText(details, expanded));
+			text.setText(formatResultText(outcome.details, expanded));
 			return text;
 		},
 	});

package/extensions/plan/tools/enter.ts

@@ -10,7 +10,7 @@ import { Type } from "typebox";
 import { reuseText, toolDetails } from "../../../lib/tui/chrome.ts";
 import { GLYPHS } from "../../../lib/tui/glyphs.ts";
 import { paint } from "../../../lib/tui/tokens.ts";
-import { rejectionLine, reuseCallText, toolCallTitle } from "../../../lib/tui/tool.ts";
+import { callLine, detailsOrLine } from "../../../lib/tui/tool.ts";
 import { PLAN_CONSENT, READ_ONLY_SUMMARY } from "../../../lib/plan-entry.ts";
 import { ENTER_TOOL, type PlanRuntime } from "../runtime.ts";
 import type { EnterPlanModeDetails } from "../types.ts";
@@ -72,18 +72,17 @@ export function registerEnterTool(pi: ExtensionAPI, runtime: PlanRuntime): void
 		},
 
 		renderCall(_args, theme, context) {
-			const text = reuseCallText(context?.lastComponent);
-			text.setText(toolCallTitle(theme, `${ENTER_TOOL} `) + paint(theme, "meta", "requested plan mode"));
-			return text;
+			return callLine(theme, context?.lastComponent, ENTER_TOOL, "requested plan mode");
 		},
 
 		renderResult(result, options, theme, context) {
 			const text = reuseText(context?.lastComponent);
-			const details = toolDetails<EnterPlanModeDetails>(result.details);
-			if (!details) {
-				text.setText(rejectionLine(theme, result, options.expanded));
+			const outcome = detailsOrLine(theme, result, options.expanded, toolDetails<EnterPlanModeDetails>(result.details));
+			if ("line" in outcome) {
+				text.setText(outcome.line);
 				return text;
 			}
+			const details = outcome.details;
 			if (details.unavailable) text.setText(paint(theme, "warn", "No UI to confirm plan mode"));
 			else if (details.already) text.setText(paint(theme, "meta", "Already in plan mode"));
 			else if (details.entered) text.setText(paint(theme, "ok", `${GLYPHS.check} Plan mode enabled`));

package/extensions/plan/tools/exit.ts

@@ -17,7 +17,7 @@ import { GOAL_TOOL } from "../../../lib/tool-names.ts";
 import { reuseText, toolDetails } from "../../../lib/tui/chrome.ts";
 import { GLYPHS } from "../../../lib/tui/glyphs.ts";
 import { paint } from "../../../lib/tui/tokens.ts";
-import { moreHint, rejectionLine, reuseCallText, toolCallTitle } from "../../../lib/tui/tool.ts";
+import { callLine, detailsOrLine, moreHint } from "../../../lib/tui/tool.ts";
 import { feedbackSummary } from "../feedback.ts";
 import { mergeSummary, overCap, preview, verificationNote } from "../format.ts";
 import { sanitizePlanText } from "../plan-text.ts";
@@ -256,18 +256,17 @@ export function registerExitTool(pi: ExtensionAPI, runtime: PlanRuntime, web: Pl
 		},
 
 		renderCall(_args, theme, context) {
-			const text = reuseCallText(context?.lastComponent);
-			text.setText(toolCallTitle(theme, `${EXIT_TOOL} `) + paint(theme, "meta", "submitted a plan"));
-			return text;
+			return callLine(theme, context?.lastComponent, EXIT_TOOL, "submitted a plan");
 		},
 
 		renderResult(result, { expanded }, theme, context) {
 			const text = reuseText(context?.lastComponent);
-			const details = toolDetails<ExitPlanModeDetails>(result.details);
-			if (!details) {
-				text.setText(rejectionLine(theme, result, expanded));
+			const outcome = detailsOrLine(theme, result, expanded, toolDetails<ExitPlanModeDetails>(result.details));
+			if ("line" in outcome) {
+				text.setText(outcome.line);
 				return text;
 			}
+			const details = outcome.details;
 			const heading = details.unavailable
 				? paint(theme, "warn", "No UI to approve the plan")
 				: details.approved

package/extensions/plan/tools/steps.ts

@@ -12,7 +12,7 @@ import { Type, type Static } from "typebox";
 import { reuseText, toolDetails } from "../../../lib/tui/chrome.ts";
 import { GLYPHS } from "../../../lib/tui/glyphs.ts";
 import { paint } from "../../../lib/tui/tokens.ts";
-import { rejectionLine, reuseCallText, toolCallTitle } from "../../../lib/tui/tool.ts";
+import { callLine, detailsOrLine } from "../../../lib/tui/tool.ts";
 import { describeUpdates, stepLabel } from "../format.ts";
 import { SET_PLAN_STEPS_TOOL, type PlanRuntime } from "../runtime.ts";
 import { extractPlanSteps } from "../steps.ts";
@@ -103,7 +103,6 @@ export function registerSetPlanStepsTool(pi: ExtensionAPI, runtime: PlanRuntime)
 		},
 
 		renderCall(args, theme, context) {
-			const text = reuseCallText(context?.lastComponent);
 			const updates = (args as Partial<SetPlanStepsArgs>).updates;
 			const label =
 				updates && updates.length === 1 && updates[0]?.step !== undefined
@@ -111,17 +110,17 @@ export function registerSetPlanStepsTool(pi: ExtensionAPI, runtime: PlanRuntime)
 					: updates && updates.length > 1
 						? `${updates.length} steps`
 						: "steps";
-			text.setText(toolCallTitle(theme, `${SET_PLAN_STEPS_TOOL} `) + paint(theme, "meta", label));
-			return text;
+			return callLine(theme, context?.lastComponent, SET_PLAN_STEPS_TOOL, label);
 		},
 
 		renderResult(result, options, theme, context) {
 			const text = reuseText(context?.lastComponent);
-			const details = toolDetails<SetPlanStepsDetails>(result.details);
-			if (!details) {
-				text.setText(rejectionLine(theme, result, options.expanded));
+			const outcome = detailsOrLine(theme, result, options.expanded, toolDetails<SetPlanStepsDetails>(result.details));
+			if ("line" in outcome) {
+				text.setText(outcome.line);
 				return text;
 			}
+			const details = outcome.details;
 			const completed = details.updates.filter((update) => update.status === "completed").map((u) => u.step);
 			const pending = details.updates.filter((update) => update.status === "pending").map((u) => u.step);
 			const heading =

package/extensions/plan/tools/write.ts

@@ -11,7 +11,7 @@ import { sanitizeLine } from "../../../lib/format.ts";
 import { reuseText, toolDetails } from "../../../lib/tui/chrome.ts";
 import { GLYPHS } from "../../../lib/tui/glyphs.ts";
 import { paint } from "../../../lib/tui/tokens.ts";
-import { rejectionLine, reuseCallText, toolCallTitle } from "../../../lib/tui/tool.ts";
+import { callLine, detailsOrLine } from "../../../lib/tui/tool.ts";
 import { overCap, stepElisionNote } from "../format.ts";
 import { WRITE_PLAN_TOOL, type PlanRuntime } from "../runtime.ts";
 import { MAX_STEPS, PLAN_OUTLINE, planStepSummary } from "../steps.ts";
@@ -106,21 +106,20 @@ export function registerWriteTool(pi: ExtensionAPI, runtime: PlanRuntime): void
 		},
 
 		renderCall(args, theme, context) {
-			const text = reuseCallText(context?.lastComponent);
 			const title = (args as Partial<WritePlanArgs>).title;
-			const suffix = title ? paint(theme, "meta", sanitizeLine(title)) : paint(theme, "meta", "plan");
-			text.setText(toolCallTitle(theme, `${WRITE_PLAN_TOOL} `) + suffix);
-			return text;
+			return callLine(theme, context?.lastComponent, WRITE_PLAN_TOOL, title ? sanitizeLine(title) : "plan");
 		},
 
 		renderResult(result, options, theme, context) {
 			const text = reuseText(context?.lastComponent);
-			const details = toolDetails<WritePlanDetails>(result.details);
-			if (!details) {
-				text.setText(rejectionLine(theme, result, options.expanded));
+			const outcome = detailsOrLine(theme, result, options.expanded, toolDetails<WritePlanDetails>(result.details));
+			if ("line" in outcome) {
+				text.setText(outcome.line);
 				return text;
 			}
-			text.setText(paint(theme, "ok", `${GLYPHS.check} Saved plan `) + paint(theme, "meta", details.relativePath));
+			text.setText(
+				paint(theme, "ok", `${GLYPHS.check} Saved plan `) + paint(theme, "meta", outcome.details.relativePath),
+			);
 			return text;
 		},
 	});

package/extensions/plan/web.ts

@@ -23,6 +23,7 @@ import {
 	type ServeResponse,
 } from "../../lib/http/index.ts";
 import { fenceLanguage, highlightLines } from "../../lib/highlight.ts";
+import { type ArmTimer, defaultTimer } from "../../lib/timer.ts";
 import { codeBody, fenceInfo, planBlocks } from "./blocks.ts";
 import {
 	MAX_ANNOTATIONS,
@@ -82,6 +83,14 @@ export interface PlanWebReviewDeps {
 	port?: number;
 	/** Override the closed-tab grace; the default leaves a reload time to reconnect. */
 	dropGraceMs?: number;
+	/**
+	 * Override the timer that arms the closed-tab grace.
+	 *
+	 * The grace is a race against the browser's reload, so a test drives it by
+	 * hand: a few tens of milliseconds of deadline makes the test fail when the
+	 * machine is busy, which is a fact about the runner and not about the code.
+	 */
+	schedule?: ArmTimer;
 	/** Override the accepted body size; a test keeps it small. */
 	maxBodyBytes?: number;
 }
@@ -145,12 +154,15 @@ export function createPlanWebReview(store: PlanStore, deps: PlanWebReviewDeps =
 		const done = new Promise<PlanReviewResult>((resolve) => {
 			resolveDone = resolve;
 		});
-		let dropTimer: NodeJS.Timeout | undefined;
+		let cancelDrop: (() => void) | undefined;
+		const clearDrop = (): void => {
+			cancelDrop?.();
+			cancelDrop = undefined;
+		};
 		const finish = (result: PlanReviewResult): void => {
 			if (settled) return;
 			settled = true;
-			clearTimeout(dropTimer);
-			dropTimer = undefined;
+			clearDrop();
 			resolveDone(result);
 		};
 
@@ -258,13 +270,13 @@ export function createPlanWebReview(store: PlanStore, deps: PlanWebReviewDeps =
 		const clients = new Set<ServerResponse>();
 		let hadClient = false;
 		const dropGrace = deps.dropGraceMs ?? DROP_GRACE_MS;
+		const schedule = deps.schedule ?? defaultTimer;
 		const scheduleDrop = (): void => {
-			if (clients.size > 0 || !hadClient || settled || dropTimer) return;
-			dropTimer = setTimeout(() => {
-				dropTimer = undefined;
+			if (clients.size > 0 || !hadClient || settled || cancelDrop) return;
+			cancelDrop = schedule(dropGrace, () => {
+				cancelDrop = undefined;
 				if (clients.size === 0) finish({ status: "cancelled" });
-			}, dropGrace);
-			(dropTimer as { unref?: () => void }).unref?.();
+			});
 		};
 
 		const server = createServer((request, response) => {
@@ -292,10 +304,7 @@ export function createPlanWebReview(store: PlanStore, deps: PlanWebReviewDeps =
 					openEventStream(response, result);
 					hadClient = true;
 					clients.add(response);
-					if (dropTimer) {
-						clearTimeout(dropTimer);
-						dropTimer = undefined;
-					}
+					clearDrop();
 					request.on("close", () => {
 						clients.delete(response);
 						scheduleDrop();

package/extensions/question/tools.ts

@@ -7,7 +7,7 @@ import { askHuman } from "../../lib/interaction.ts";
 import { sanitizeLine } from "../../lib/format.ts";
 import { withRailsSuppressed } from "../../lib/rails.ts";
 import { reuseText, toolDetails } from "../../lib/tui/chrome.ts";
-import { rejectionLine, reuseCallText, toolCallTitle } from "../../lib/tui/tool.ts";
+import { detailsOrLine, reuseCallText, toolCallTitle } from "../../lib/tui/tool.ts";
 import { paint } from "../../lib/tui/tokens.ts";
 import { GLYPHS } from "../../lib/tui/glyphs.ts";
 import { ASK_USER_QUESTION_TOOL } from "../../lib/tool-names.ts";
@@ -94,11 +94,12 @@ export function registerTools(pi: ExtensionAPI): void {
 
 		renderResult(result, options, theme, context) {
 			const component = reuseText(context?.lastComponent);
-			const details = toolDetails<AskResult>(result.details);
-			if (!details) {
-				component.setText(rejectionLine(theme, result, options.expanded));
+			const outcome = detailsOrLine(theme, result, options.expanded, toolDetails<AskResult>(result.details));
+			if ("line" in outcome) {
+				component.setText(outcome.line);
 				return component;
 			}
+			const details = outcome.details;
 			if (details.unavailable) {
 				component.setText(paint(theme, "bad", UNAVAILABLE_TEXT));
 				return component;

package/extensions/subagent/background.ts

@@ -9,7 +9,7 @@
  */
 
 import { resolve } from "node:path";
-import { formatDuration, sanitizeLine, stripControlChars } from "../../lib/format.ts";
+import { sanitizeLine, stripControlChars } from "../../lib/format.ts";
 import type { AgentConfig } from "./agents.ts";
 import { formatUsageStats } from "./format.ts";
 import type { RunOptions } from "./run.ts";
@@ -458,12 +458,6 @@ export function createBackgroundRuntime(deps: BackgroundDeps): BackgroundRuntime
 	return { start, list, collect, cancel, shutdown, reset, subscribe };
 }
 
-/** A human duration for a run; kept here so the board and collect agree. */
-export function backgroundDuration(run: BackgroundRun, now = Date.now()): string {
-	const end = run.finishedAt ?? now;
-	return formatDuration(Math.max(0, end - run.startedAt));
-}
-
 /** Whether a run can be collected. */
 export function canCollect(run: BackgroundRun): boolean {
 	return run.status !== "running" && run.status !== "interrupted";

package/extensions/todo/tools.ts

@@ -12,12 +12,11 @@
 
 import type { JsonValue } from "@earendil-works/pi-ai";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { sanitizeLine } from "../../lib/format.ts";
 import { TODO_TOOL } from "../../lib/tool-names.ts";
 import { GLYPHS } from "../../lib/tui/glyphs.ts";
 import { normalizeTodos } from "../../lib/todo-state.ts";
+import { callLine, detailsOrLine, rejectionLine } from "../../lib/tui/tool.ts";
 import { reuseText, toolDetails } from "../../lib/tui/chrome.ts";
-import { rejectionLine, reuseCallText, toolCallTitle } from "../../lib/tui/tool.ts";
 import { paint } from "../../lib/tui/tokens.ts";
 import { compareByActivity, formatCallText, formatTodoText, type TodoRailInput } from "./format.ts";
 import type { TodoRuntime } from "./runtime.ts";
@@ -98,24 +97,21 @@ export function registerTools(pi: ExtensionAPI, runtime: TodoRuntime): void {
 		},
 
 		renderCall(args, theme, context) {
-			const text = reuseCallText(context.lastComponent);
-			text.setText(
-				toolCallTitle(theme, `${TOOL_NAME} `) +
-					paint(theme, "meta", formatCallText(args.todos as Todo[] | undefined, context.argsComplete)),
-			);
-			return text;
+			const body = formatCallText(args.todos as Todo[] | undefined, context.argsComplete);
+			return callLine(theme, context.lastComponent, TOOL_NAME, body);
 		},
 
 		renderResult(result, { expanded }, theme, context) {
 			const text = reuseText(context.lastComponent);
-			const details = toolDetails<TodoDetails>(result.details);
-			if (details?.error) {
-				text.setText(paint(theme, "bad", `Error: ${sanitizeLine(details.error)}`));
+			const outcome = detailsOrLine(theme, result, expanded, toolDetails<TodoDetails>(result.details));
+			if ("line" in outcome) {
+				text.setText(outcome.line);
 				return text;
 			}
-			// A call rejected before `execute` (argument validation or a permission
-			// block) carries `details: {}` with no list, so fall back to its message.
-			if (!details || !Array.isArray(details.todos)) {
+			const details = outcome.details;
+			// A details block can still arrive without the list: the host rejected the
+			// arguments, so its message is the whole result.
+			if (!Array.isArray(details.todos)) {
 				text.setText(rejectionLine(theme, result, expanded));
 				return text;
 			}

package/extensions/watch/README.md

@@ -236,8 +236,8 @@ outlive the session.
 
 ## Testing
 
-Pure-module tests cover `config`, `schema`, `format`, and `tui`; `runtime.test.ts`
-drives the tailer with a fake clock and fake children; `tools.test.ts`,
-`commands.test.ts`, and `extension.test.ts` exercise the tool, command, and
-lifecycle through the shared `createFakePi`/`fakeCtx` doubles. The test harness
-is `test/helpers/fixtures/watch.ts`.
+`runtime.test.ts` covers config, schema, the child supervisor, and the tailer
+with a fake clock and fake children; `tools.test.ts` covers the tool and command;
+`ui.test.ts` covers registration, formatting, the status chips, and the screen
+through the shared `createFakePi`/`fakeCtx` doubles. The test harness is
+`test/helpers/fixtures/watch.ts`.

package/extensions/watch/commands.ts

@@ -8,7 +8,7 @@
  */
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { withRailsSuppressed } from "../../lib/rails.ts";
+import { withPolledScreen } from "../../lib/screen-session.ts";
 import { formatWatchList, shortLabel } from "./format.ts";
 import type { WatchRuntime } from "./runtime.ts";
 import { WatchListComponent } from "./tui.ts";
@@ -92,54 +92,40 @@ export function registerCommands(pi: ExtensionAPI, runtime: WatchRuntime): void
 				return;
 			}
 
-			let timer: ReturnType<typeof setInterval> | undefined;
-			const stopTimer = (): void => {
-				if (timer) clearInterval(timer);
-				timer = undefined;
-			};
-
-			// The dock screen owns the editor slot; hide the rails for its lifetime.
-			try {
-				await withRailsSuppressed(pi, () =>
-					ctx.ui.custom<void>((tui, theme, _keybindings, done) => {
-						const component = new WatchListComponent(
-							() => runtime.list(),
-							theme,
-							{
-								lines: (watchId) => runtime.matches(watchId, 500),
-								stop: (watchId) => {
-									runtime.stop(watchId);
-								},
-								clear: () => {
-									const result = runtime.clear(undefined, false);
-									if (result.cleared > 0) {
-										ctx.ui.notify(`Cleared ${result.cleared} watcher${result.cleared === 1 ? "" : "s"}.`, "info");
-									}
-								},
+			await withPolledScreen(
+				pi,
+				ctx,
+				(screen) =>
+					new WatchListComponent(
+						() => runtime.list(),
+						screen.theme,
+						{
+							lines: (watchId) => runtime.matches(watchId, 500),
+							stop: (watchId) => {
+								runtime.stop(watchId);
 							},
-							() => {
-								stopTimer();
-								done();
+							clear: () => {
+								const result = runtime.clear(undefined, false);
+								if (result.cleared > 0) {
+									ctx.ui.notify(`Cleared ${result.cleared} watcher${result.cleared === 1 ? "" : "s"}.`, "info");
+								}
 							},
-							() => tui.requestRender(),
-							() => tui.terminal?.rows,
-						);
-
-						// The runtime's own clock owns file polling; this only refreshes
-						// what the screen shows, so opening it cannot change the poll cadence.
-						timer = setInterval(() => {
-							const open = component.currentLineId();
-							if (open) component.refreshLines(open);
-							tui.requestRender();
-						}, REFRESH_MS);
-						timer.unref?.();
-
-						return component;
-					}),
-				);
-			} finally {
-				stopTimer();
-			}
+						},
+						screen.close,
+						screen.requestRender,
+						screen.viewportRows,
+					),
+				{
+					pollMs: REFRESH_MS,
+					// The runtime's own clock owns file polling; this only refreshes what
+					// the screen shows, so opening it cannot change the poll cadence.
+					poll: (component, handles) => {
+						const open = component.currentLineId();
+						if (open) component.refreshLines(open);
+						handles.requestRender();
+					},
+				},
+			);
 		},
 	});
 }

package/extensions/watch/runtime.ts

@@ -17,6 +17,7 @@ import type { KillTreeFn, SpawnFn, SpawnedProcess } from "../../lib/spawn.ts";
 import { createChildSupervisor } from "./child.ts";
 import { DEFAULT_CONFIG, loadConfig, type WatchConfig } from "./config.ts";
 import { sanitizeUntrustedLine } from "../../lib/format.ts";
+import { defaultInterval } from "../../lib/timer.ts";
 import { compileRegex, sourceLabel } from "./format.ts";
 import { createUiController, type UiController } from "./ui.ts";
 import type { PendingMatch, WatchMatch, WatchRecord, WatchSource } from "./types.ts";
@@ -118,7 +119,7 @@ export function createWatchRuntime(options: WatchRuntimeOptions = {}): WatchRunt
 	const watches = new Map<string, Internal>();
 	let counter = 0;
 	let disposed = false;
-	let clock: ReturnType<typeof setInterval> | undefined;
+	let clock: (() => void) | undefined;
 	let onMatchHandler: ((matches: PendingMatch[]) => void) | undefined;
 
 	const record = (w: Internal): WatchRecord => ({
@@ -163,16 +164,13 @@ export function createWatchRuntime(options: WatchRuntimeOptions = {}): WatchRunt
 	});
 
 	const stopClock = (): void => {
-		if (clock) {
-			clearInterval(clock);
-			clock = undefined;
-		}
+		clock?.();
+		clock = undefined;
 	};
 
 	const ensureClock = (): void => {
 		if (disposed || !autoClock || clock) return;
-		clock = setInterval(() => tick(), config.pollMs);
-		clock.unref?.();
+		clock = defaultInterval(config.pollMs, () => tick());
 	};
 
 	const pendingMatches = (): PendingMatch[] => {

package/extensions/watch/tools.ts

@@ -11,7 +11,7 @@ import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-a
 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 { callLine, detailsOrLine, rejectionLine } from "../../lib/tui/tool.ts";
 import { SEPARATORS } from "../../lib/tui/glyphs.ts";
 import { paint } from "../../lib/tui/tokens.ts";
 import {
@@ -182,29 +182,18 @@ export function registerTools(pi: ExtensionAPI, runtime: WatchRuntime): void {
 
 		renderCall(args, theme, context) {
 			const action = typeof args.action === "string" ? args.action : "watch";
-			const text = reuseCallText(context.lastComponent, "", "middle");
-			text.setText(
-				toolCallTitle(theme, `${TOOL_NAME} `) +
-					paint(
-						theme,
-						"meta",
-						sanitizeLine(formatCallText(action, args as Record<string, unknown>, context.argsComplete)),
-					),
-			);
-			return text;
+			const subject = formatCallText(action, args as Record<string, unknown>, context.argsComplete);
+			return callLine(theme, context.lastComponent, TOOL_NAME, subject, "middle");
 		},
 
 		renderResult(result, options, theme, context) {
 			const text = reuseText(context.lastComponent);
-			const details = toolDetails<WatchDetails>(result.details);
-			if (!details) {
-				text.setText(rejectionLine(theme, result, options.expanded));
-				return text;
-			}
-			if (details.error) {
-				text.setText(paint(theme, "bad", `Error: ${sanitizeLine(details.error)}`));
+			const outcome = detailsOrLine(theme, result, options.expanded, toolDetails<WatchDetails>(result.details));
+			if ("line" in outcome) {
+				text.setText(outcome.line);
 				return text;
 			}
+			const details = outcome.details;
 
 			if (details.action === "list" && details.watches) {
 				if (details.watches.length === 0) {

package/extensions/web-access/README.md

@@ -378,9 +378,9 @@ the content type and size.
 
 ## Testing
 
-`extensions/web-access/` mirrors the halves (`search/`, `fetch/`) plus top-level
-`config.test.ts` and `index.test.ts`. It covers the shared runner (via injected
-`fetch`), the provider registry and resolution, each provider's URL builder and
+`extensions/web-access/` mirrors the halves (`search/`, `fetch/`) plus the
+`http.test.ts` suite for the shared runner, charset, config, and registration.
+It covers the injected `fetch` runner, the provider registry and resolution, each provider's URL builder and
 parser (DuckDuckGo, SearXNG, Brave), the orchestration pipeline and throttle,
 charset decoding (declared, `<meta>`, and BOM precedence), a streamed body over
 the byte cap, redirect re-validation (per-hop SSRF with literal IPs),

package/extensions/web-access/search/search.ts

@@ -8,6 +8,7 @@
  */
 
 import { messageOf } from "../../../lib/errors.ts";
+import { abortableSleep } from "../../../lib/timer.ts";
 import { createFetchRunner, type HttpRunner } from "../http.ts";
 import { resolveSearchApiKey, type WebSearchConfig } from "./config.ts";
 import { resolveProvider } from "./registry.ts";
@@ -40,24 +41,14 @@ export interface SearchDeps {
 /** A sleeper, injectable so throttle scheduling is testable without wall time. */
 type ThrottleSleep = (ms: number, signal?: AbortSignal) => Promise<void>;
 
-function delay(ms: number, signal: AbortSignal | undefined): Promise<void> {
-	return new Promise((resolve, reject) => {
-		const finish = () => {
-			clearTimeout(timer);
-			signal?.removeEventListener("abort", onAbort);
-		};
-		const onAbort = () => {
-			finish();
-			reject(new WebSearchError("Search aborted."));
-		};
-		const timer = setTimeout(() => {
-			finish();
-			resolve();
-		}, ms);
-		if (signal?.aborted) return onAbort();
-		signal?.addEventListener("abort", onAbort, { once: true });
-	});
-}
+/** The shared abortable sleep, mapped to the one error this extension throws. */
+const delay: ThrottleSleep = async (ms, signal) => {
+	try {
+		await abortableSleep(ms, signal);
+	} catch {
+		throw new WebSearchError("Search aborted.");
+	}
+};
 
 /**
  * A stateful throttle that spaces requests by `minIntervalMs`. `now` and `sleep`