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

package/extensions/worktree/status.ts

@@ -1,6 +1,11 @@
 /**
  * Worktree status and reporting: labels, summaries, refusal messages, and the
  * override/`list_worktrees` view.
+ *
+ * One snapshot feeds both surfaces: `formatWorktreeStatus` renders it as the text
+ * a tool result or a headless command prints, and `screen.ts` renders the same
+ * rows as the `/worktree` list screen. They read the same git calls, so they
+ * cannot disagree about a worktree.
  */
 
 import { basename } from "node:path";
@@ -8,7 +13,7 @@ import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-a
 import { realPathOfNearest } from "../../lib/path.ts";
 import { mapConcurrent } from "../../lib/pool.ts";
 import { loadConfig } from "./config.ts";
-import { gapLines, isolationGaps } from "./gaps.ts";
+import { gapLines, type IsolationGap, isolationGaps } from "./gaps.ts";
 import { type CheckoutCheck, defaultBranch, listManagedWorktrees, type ManagedWorktree, repoRoot } from "./git.ts";
 import { reconcileRegistry, statusOf, type CheckoutStatus } from "./registry.ts";
 import { configFor, getActive, getInactiveOverrides, getUnverifiableCommands } from "./runtime.ts";
@@ -62,7 +67,7 @@ export function refusalMessage(check: CheckoutCheck, path: string, cwd: string):
 }
 
 /** Compact marks for one managed worktree in the status list. */
-function statusMarks(status: CheckoutStatus, isCurrent: boolean): string[] {
+export function statusMarks(status: CheckoutStatus, isCurrent: boolean): string[] {
 	const marks: string[] = [];
 	if (isCurrent) marks.push("current");
 	if (status.state === "missing") marks.push("missing");
@@ -75,60 +80,101 @@ function statusMarks(status: CheckoutStatus, isCurrent: boolean): string[] {
 	return marks;
 }
 
-function relativeDay(at: number): string {
+export function relativeDay(at: number): string {
 	const days = Math.floor((Date.now() - at) / 86_400_000);
 	if (days <= 0) return "today";
 	if (days === 1) return "1d ago";
 	return `${days}d ago`;
 }
 
-/** Human-readable status: current worktree, override conflicts, gaps, managed worktrees. */
-export async function worktreeStatus(pi: ExtensionAPI, ctx: ExtensionContext): Promise<string> {
-	const current = getActive();
-	const lines: string[] = [];
-	if (current) {
-		lines.push(stateSummary(current));
-		if (current.borrowed) lines.push("  (inherited from the parent session)");
-	} else {
-		lines.push("Not in a worktree.");
-	}
-	const inactive = getInactiveOverrides();
-	if (inactive.length > 0) {
-		lines.push("", `Isolation not active for: ${inactive.join(", ")} (their default implementation is in use).`);
-	}
-	if (current) {
-		// What isolation does not cover, from the same rules `doctor` reports: a gap
-		// the user cannot see is a gap they cannot weigh.
-		const gaps = isolationGaps({
-			platform: process.platform,
-			activeTools: pi.getActiveTools(),
-			config: configFor(current.repoRoot),
-			unverifiableCommands: getUnverifiableCommands(),
-		});
-		const gapBlock = gapLines(gaps);
-		if (gapBlock.length > 0) lines.push("", "Not isolated:", ...gapBlock);
-	}
+/** One managed worktree and what git says about it. */
+export interface ManagedRow {
+	entry: ManagedWorktree;
+	status: CheckoutStatus;
+}
+
+/** Everything both status surfaces report, read once. */
+export interface WorktreeSnapshot {
+	active: WorktreeState | null;
+	/** What isolation does not cover, from the same rules `doctor` reports. */
+	gaps: IsolationGap[];
+	/** Built-in tools with an inactive override. */
+	inactiveOverrides: string[];
+	/** Managed worktrees with their checkout status, in git's order. */
+	managed: ManagedRow[];
+	/** The merge-target branch name, when the repository has a remote. */
+	baseBranch: string | undefined;
+}
 
-	const root = current?.repoRoot ?? (await repoRoot(pi, ctx.cwd));
+/** Read the session's worktree status once, for either surface to render. */
+export async function worktreeSnapshot(pi: ExtensionAPI, ctx: ExtensionContext): Promise<WorktreeSnapshot> {
+	const active = getActive();
+	// A gap the user cannot see is a gap they cannot weigh, so they are computed for
+	// every read rather than cached from session start.
+	const gaps = active
+		? isolationGaps({
+				platform: process.platform,
+				activeTools: pi.getActiveTools(),
+				config: configFor(active.repoRoot),
+				unverifiableCommands: getUnverifiableCommands(),
+			})
+		: [];
+
+	const managed: ManagedRow[] = [];
+	let baseBranch: string | undefined;
+	const root = active?.repoRoot ?? (await repoRoot(pi, ctx.cwd));
 	if (root) {
 		const config = loadConfig(root);
-		const managed = await listManagedWorktrees(pi, root, config);
-		const { registry } = reconcileRegistry(root, config, managed, { persist: false });
-		const baseBranch = await defaultBranch(pi, root);
+		const entries = await listManagedWorktrees(pi, root, config);
+		const { registry } = reconcileRegistry(root, config, entries, { persist: false });
+		baseBranch = await defaultBranch(pi, root);
 		const baseRef = baseBranch ? `origin/${baseBranch}` : undefined;
 		// Keyed by the canonical path the registry stores, so a row's record is one
 		// lookup instead of a scan of every record.
 		const records = new Map(registry.worktrees.map((record) => [record.path, record]));
-		const row = async (entry: ManagedWorktree): Promise<string> => {
+		const row = async (entry: ManagedWorktree): Promise<ManagedRow> => {
 			const path = realPathOfNearest(entry.path);
-			const status = await statusOf(pi, entry, { baseRef, record: records.get(path) });
-			const marks = statusMarks(status, current?.path === entry.path);
-			return `  ${entry.path}  ${entry.branch ?? ""}${marks.length > 0 ? `  [${marks.join(", ")}]` : ""}`.trimEnd();
+			return { entry, status: await statusOf(pi, entry, { baseRef, record: records.get(path) }) };
 		};
 		// Each row is up to four git reads; four at a time keeps the list in the order
 		// git reports while overlapping the waits. `statusOf` passes no `env`, which is
 		// what makes concurrent git calls safe here (see `RunGitOptions.env`).
-		lines.push("", `Managed worktrees (${managed.length}):`, ...(await mapConcurrent(managed, 4, row)));
+		managed.push(...(await mapConcurrent(entries, 4, row)));
+	}
+
+	return { active, gaps, inactiveOverrides: getInactiveOverrides(), managed, baseBranch };
+}
+
+/** Human-readable status: current worktree, override conflicts, gaps, managed worktrees. */
+export function formatWorktreeStatus(snapshot: WorktreeSnapshot): string {
+	const { active, gaps, inactiveOverrides, managed } = snapshot;
+	const lines: string[] = [];
+	if (active) {
+		lines.push(stateSummary(active));
+		if (active.borrowed) lines.push("  (inherited from the parent session)");
+	} else {
+		lines.push("Not in a worktree.");
+	}
+	if (inactiveOverrides.length > 0) {
+		lines.push(
+			"",
+			`Isolation not active for: ${inactiveOverrides.join(", ")} (their default implementation is in use).`,
+		);
+	}
+	const gapBlock = gapLines(gaps);
+	if (gapBlock.length > 0) lines.push("", "Not isolated:", ...gapBlock);
+
+	if (managed.length > 0) {
+		const row = (item: ManagedRow): string => {
+			const marks = statusMarks(item.status, active?.path === item.entry.path);
+			return `  ${item.entry.path}  ${item.entry.branch ?? ""}${marks.length > 0 ? `  [${marks.join(", ")}]` : ""}`.trimEnd();
+		};
+		lines.push("", `Managed worktrees (${managed.length}):`, ...managed.map(row));
 	}
 	return lines.join("\n");
 }
+
+/** Read the status and render it: what the `list_worktrees` tool and a headless `/worktree` print. */
+export async function worktreeStatus(pi: ExtensionAPI, ctx: ExtensionContext): Promise<string> {
+	return formatWorktreeStatus(await worktreeSnapshot(pi, ctx));
+}

package/lib/README.md

@@ -18,36 +18,39 @@ belongs in that extension instead — see `extensions/web-access/http.ts` and
 | Module | Responsibility |
 |---|---|
 | [`browser.ts`](./browser.ts) | Cross-platform default-browser opener shared by `file-browse` and `plan`: pure `browserCommand(url, platform)` plus best-effort `openInBrowser(url, { platform, spawn })` with an injectable spawn. |
-| [`config.ts`](./config.ts) | Config loading, two ways: `loadConfigFile` for a whole file, and the shared `bytefly.json` (`SHARED_CONFIG_FILE`) via `configSection` / `configValueAt` / `loadConfigSection` (global, then project), plus the atomic `writeConfigFile` / `writeConfigSection` / `writeConfigValue` / `writeConfigValueAt` / `writeConfigValuesAt` / `unsetConfigValueAt` (the leaf writers preserve siblings and metadata, `writeConfigValuesAt` applies several leaves in one document pass, and the last removes one and prunes what it emptied). Includes `clampInteger` / `clampNumber` / `cleanString` / `optionalString` / `asBoolean` / `stringList` / `asRecord` / `readJson` / `readJsonResult`. |
+| [`config.ts`](./config.ts) | Config loading, two ways: `loadConfigFile` for a whole file, and the shared `bytefly.json` (`SHARED_CONFIG_FILE`) via `configSection` / `configValueAt` / `loadConfigSection` (global, then project), plus the atomic `writeConfigFile` / `writeConfigSection` / `writeConfigValue` / `writeConfigValueAt` / `writeConfigValuesAt` / `unsetConfigValueAt` (the leaf writers preserve siblings and metadata, `writeConfigValuesAt` applies several leaves in one document pass, and the last removes one and prunes what it emptied). Includes `clampInteger` / `clampNumber` / `cleanString` / `optionalString` / `asBoolean` / `stringList` / `asRecord` / `asNumber` (the untrusted-JSON narrowing pair) / `readJson` / `readJsonResult`. |
 | [`env.ts`](./env.ts) | Env-var contracts shared across extensions: the worktree environment (`ENV_ROOT`, `worktreeRoot`, `resolveEffectiveCwd`) used by worktree, file-browse, job, and rewind, plus `isExtensionEnabled` / `ENV_DISABLED_EXTENSIONS` for the package-wide disable list. |
-| [`escape.ts`](./escape.ts) | `escapeHtml`: the single HTML text/attribute escape used by the browse page renderers and the Markdown and syntax highlighters. |
+| [`escape.ts`](./escape.ts) | `escapeHtml`: the single HTML text/attribute escape used by the browse page renderers and the Markdown and syntax highlighters, plus `decodeCodePoint`, the other half of the same boundary — one numeric character reference as text, with a surrogate or out-of-range value decoded to U+FFFD. |
 | [`events.ts`](./events.ts) | Inter-extension `pi.events` channels and payloads: `JOB_FINISHED_CHANNEL` / `JobFinishedEvent` (published by `job`, consumed by bytefly's notify capability), `SUBAGENT_FINISHED_CHANNEL` / `SubagentFinishedEvent` (published by `subagent`, consumed by bytefly's footer roll-up), and `WEB_SEARCH_PROVIDER_CHANNEL` / `WebSearchProviderEvent` (published by `web-access` at session start, consumed by bytefly's doctor so it can report the resolved provider without importing the extension — the key itself is never in the payload). |
 | [`notice.ts`](./notice.ts) | The shared transcript notice: `NOTICE_TYPE`, the `NoticeDetails` / `NoticeItem` shape, `noticeMessage` (the `display: true` message both send paths accept), `isNotice`, and `pruneStaleNotices` — posted by `job` and `watch`, rendered by bytefly. |
-| [`report.ts`](./report.ts) | The pending-report coordinator: `createPendingReporter` with `wake` / `pending` / `markReported` / `buildNotice` / `source` / `onWoke`, returning the lifecycle handlers that report at the next turn, raise at most one triggered turn per wake window, and prune only their own notices. Shared by `job` and `watch`. |
+| [`report.ts`](./report.ts) | The pending-report channel: `createPendingReporter` with `wake` / `pending` / `markReported` / `buildNotice` / `source` / `onWoke`, returning the handlers that report at the next turn, raise at most one triggered turn per wake window, and prune only their own notices; and `registerPendingChannel`, which binds those handlers to `session_start` / `session_tree` / `agent_start` / `agent_settled` / `before_agent_start` / `context` / `session_shutdown` around a `load` / `setStatus` / `shutdown` runtime, so the order a session starts and shuts down is written once. `job` and `watch` supply only their own arming in `onSessionStart` / `onSessionShutdown`. |
 | [`errors.ts`](./errors.ts) | `messageOf`: the one boundary that turns an unknown thrown value into a user-facing line (an `Error` yields its message, anything else is stringified). |
 | [`format.ts`](./format.ts) | Pure text/number formatting shared by renderers: `formatTokens`, `formatCount`, `formatDuration` (`450ms`, `3.2s`, `1m05s`, `2h03m`), `boundedTail` (the end of a joined tail with a `truncated` flag), `stripControlChars`, `sanitize`, `sanitizeLine` — the boundary for untrusted, single-line text — `lineOf` (a value read as one sanitized line), `sanitizeUntrustedLine` / `sanitizeUntrustedText` with `MAX_OUTPUT_LINE` for **program output** (OSC/CSI escapes removed whole, `\r` progress resolved, clipped), and `shortenPath`. |
+| [`timer.ts`](./timer.ts) | The three timer seams and their production defaults, each cancellable and each built so a pending timer never holds the process open: `ArmTimer` / `defaultTimer` (one shot), `RepeatTimer` / `defaultInterval` (repeating), and `abortableSleep` (resolve after a delay, reject `Error("aborted")` when a signal wins). Shared by `wechat`'s bridge and prompt channel, plan's review page, `job`'s and `watch`'s repaint clocks, `bytefly`'s working tick, the browse live channel, and the search throttle — so a test drives a deadline instead of waiting on one. |
 | [`lines.ts`](./lines.ts) | `LineSplitter`, the byte-safe splitter for a stream of program output: buffers bytes and decodes only at a newline, so a UTF-8 character split across two reads survives, and caps an over-long line instead of dropping it. Shared by `job`, `watch`, `check`, and `subagent`. |
 | [`pool.ts`](./pool.ts) | `mapConcurrent`: one async read per entry with at most `limit` calls in flight and results in input order, so a directory listing or a status sweep fans out without an unbounded burst or a per-entry round trip. Shared by `file-browse` and `worktree`. |
-| [`interaction.ts`](./interaction.ts) | Turn-affinity prompt contract: the channel a remote transport marks on the UI context it owns (`INTERACTION_TURN_KEY`), the `InteractionChannel` interface (`request` / `post` / `postFile`), and `remoteChannel` / `isRemoteTurn` / `supportsCustomUI` / `askHuman` (with an optional file, fallback text, and digest preface) plus the shared “Other” label. |
+| [`interaction.ts`](./interaction.ts) | Turn-affinity prompt contract: the channel a remote transport marks on the UI context it owns (`INTERACTION_TURN_KEY`), the `InteractionChannel` interface (`request` / `post` / `postFile`, plus an optional `setPromptTimeout` scope for a dialog the human must read something before answering), and `remoteChannel` / `isRemoteTurn` / `supportsCustomUI` / `askHuman` (with an optional file, fallback text, digest preface, and prompt `timeoutMs`) plus the shared “Other” label. |
 | [`git/`](./git/) | Shared git plumbing. [`git/runner.ts`](./git/runner.ts) is the `RunGit` seam (`createExecRunner` with timeout/env handling, `runGitOrThrow`, `GitError`); [`git/read.ts`](./git/read.ts) holds the read helpers (`repoRoot`, `repoRootFor`, `gitDir`, `gitCommonDir`, `revParse`, `revParseMany` for several revisions in one call, `hasCommits`, `currentBranch`); [`git/index.ts`](./git/index.ts) is the barrel. |
 | [`highlight.ts`](./highlight.ts) | First-party, escape-first syntax tokenizer (`detectLanguage`, `fenceLanguage`, `highlightLines`, `HighlightLanguage`, `TokenClass`) for js/ts, json, css, html, shell, python, java, yaml, and sql; shared by `file-browse` and plan's code blocks. |
 | [`http/`](./http/) | The loopback HTTP layer shared by `file-browse` and `plan`: [`http/headers.ts`](./http/headers.ts) (the page policy `PAGE_CSP` and the `pageHeaders` / `scriptHeaders` / `jsonHeaders` sets, plus `eventHeaders` for the one long-lived stream), [`http/response.ts`](./http/response.ts) (`ServeResponse` — a buffered body, a `filePath` stream, or an SSE `stream` — plus `htmlResponse` / `jsonResponse` / `jsonError` / `textResponse`), [`http/router.ts`](./http/router.ts) (`parseRequestUrl`, and `isLocalHostHeader` with the `required` mode each server chooses), [`http/server.ts`](./http/server.ts) (`bindLoopback` on `127.0.0.1` with the accept-error listener, `respond` for HEAD / streamed file / body, `openEventStream` for the head and reconnect hint of an SSE response, and the idempotent `createCloser`), and the [`http/index.ts`](./http/index.ts) barrel. |
-| [`tui/`](./tui/) | The Bytefly terminal design system shared by every interactive surface, whose conventions are its own doc, [`tui/README.md`](./tui/README.md). Modules: [`tui/tokens.ts`](./tui/tokens.ts) (semantic role -> theme color, `paint`), [`tui/glyphs.ts`](./tui/glyphs.ts) (`GLYPHS`, `SEPARATORS`, `STATUS_KEYS`, `EXPAND_KEYBINDING` with `expandKey` / `expandHint`, `GLYPH_GAP` — the vocabulary both sides of a status must agree on), [`tui/chrome.ts`](./tui/chrome.ts) (`screenHint`, `dockListFrame` (the docked-list frame) with `detailBlockRows` (the rows its detail block costs), `viewportRows`, `FULL_SCREEN_OVERLAY`, `reuseText`, `editorTheme`), [`tui/rules.ts`](./tui/rules.ts) (the rule glyph `RULE_GLYPH`, and `plainRule` / `titleRule` / `centeredRule`), [`tui/indent.ts`](./tui/indent.ts) (the transcript block indent: `BODY_INDENT`, an optional rail prefix that a wrapped call line is kept out of, and `bodyLines` / `indentBlockLines` / `indentedLines`), [`tui/rows.ts`](./tui/rows.ts) (`listRow`, `statusRow`, `checkbox`, `chip`, `keyValueRow`, `emptyState`, `byRunningFirst` for a live list's order), [`tui/columns.ts`](./tui/columns.ts) (`splitRow`, `fitCells`, `flowCells`, `padTo`, `clip`, `clipMiddle`, `labelLine` / `clipLabel` with `LABEL_WIDTH`), [`tui/gauge.ts`](./tui/gauge.ts) (`computeGauge`, `gaugeRole`, `gaugeBar`), [`tui/line-pane.ts`](./tui/line-pane.ts) (`LinePane`, the scrollable log/match pane), [`tui/status-controller.ts`](./tui/status-controller.ts) (`createStatusController`, the footer chips `job`, `watch`, and `subagent` share, with the attached-context `notify` and a `detach` that clears its keys), [`tui/dock-screen.ts`](./tui/dock-screen.ts) (`DockListScreen`, the two-mode docked list + detail-pane screen with navigation, wheel, range, and confirm), [`tui/confirm.ts`](./tui/confirm.ts) (`ConfirmState`, the y/N layer behind every destructive screen action), [`tui/tool.ts`](./tui/tool.ts) (`toolCallTitle`, the width-safe `ToolCallText` / `reuseCallText`, sanitized `errorLine` / `rejectionLine`, `moreHint` / `overflowHint` / `earlierHint`, the `TailResult` transcript block, `syncElapsedTimer`, `elapsedSuffix` — the tool-transcript kit), [`tui/render-cache.ts`](./tui/render-cache.ts) (`RenderCache`: the per-instance line memo a component that derives its lines from another component's output renders through, so a repeat frame is one comparison), and [`tui/cursor.ts`](./tui/cursor.ts) (scroll and navigation: `fitRows`, `keepVisible`, `clampScroll`, `navIntent`, `navigateList`, `navigateScroll`, `wheelDelta`, `scrollList`, `isCloseKey`, `selectionMarker`, `formatRange`, and the `ListCursor` (by index) and `IdCursor` (by stable id) state). |
+| [`tui/`](./tui/) | The Bytefly terminal design system shared by every interactive surface, whose conventions are its own doc, [`tui/README.md`](./tui/README.md). Modules: [`tui/tokens.ts`](./tui/tokens.ts) (semantic role -> theme color, `paint`), [`tui/glyphs.ts`](./tui/glyphs.ts) (`GLYPHS`, `SEPARATORS`, `STATUS_KEYS`, `EXPAND_KEYBINDING` with `expandKey` / `expandHint`, `GLYPH_GAP` — the vocabulary both sides of a status must agree on), [`tui/chrome.ts`](./tui/chrome.ts) (the docked-list frame `dockListFrame`, the `screenFooter` that closes a screen's own rows, `screenHint`, `detailBlockRows` (the rows its detail block costs), `viewportRows`, `FULL_SCREEN_OVERLAY`, `reuseText`, `editorTheme`), [`tui/rules.ts`](./tui/rules.ts) (the rule glyph `RULE_GLYPH`, and `plainRule` / `titleRule` / `centeredRule`), [`tui/indent.ts`](./tui/indent.ts) (the transcript block indent: `BODY_INDENT`, an optional rail prefix that a wrapped call line is kept out of, and `bodyLines` / `indentBlockLines` / `indentedLines`), [`tui/rows.ts`](./tui/rows.ts) (`listRow` with its `align` option for a value held beside its label, `statusRow`, `checkbox`, `chip`, `keyValueRow`, `emptyState`, `byRunningFirst` for a live list's order), [`tui/columns.ts`](./tui/columns.ts) (`splitRow` for two cells at the two edges, `inlineRow` for two cells held together, `fitCells`, `flowCells`, `padTo`, `clip`, `clipMiddle`, `labelLine` / `clipLabel` with `LABEL_WIDTH`), [`tui/gauge.ts`](./tui/gauge.ts) (`computeGauge`, `gaugeRole`, `gaugeBar`), [`tui/line-pane.ts`](./tui/line-pane.ts) (`LinePane`, the scrollable log/match pane), [`tui/status-controller.ts`](./tui/status-controller.ts) (`createStatusController`, the footer chips `job`, `watch`, and `subagent` share, with the attached-context `notify` and a `detach` that clears its keys), [`tui/dock-screen.ts`](./tui/dock-screen.ts) (`DockListScreen`, the two-mode docked list + detail-pane screen with navigation, wheel, range, and confirm), [`tui/confirm.ts`](./tui/confirm.ts) (`ConfirmState`, the y/N layer behind every destructive screen action), [`tui/tool.ts`](./tui/tool.ts) (`toolCallTitle`, the width-safe `ToolCallText` / `reuseCallText`, `callLine` — the one headline every renderer draws — `detailsOrLine` (a result's details, or the one `errorLine` / `rejectionLine` a failure shows), sanitized `errorLine` / `rejectionLine`, `moreHint` / `overflowHint` / `earlierHint`, the `TailResult` transcript block, `syncElapsedTimer`, `elapsedSuffix` — the tool-transcript kit), [`tui/render-cache.ts`](./tui/render-cache.ts) (`RenderCache`: the per-instance line memo a component that derives its lines from another component's output renders through, so a repeat frame is one comparison), and [`tui/cursor.ts`](./tui/cursor.ts) (scroll and navigation: `fitRows`, `keepVisible`, `clampScroll`, `navIntent`, `navigateList`, `navigateScroll`, `wheelDelta`, `scrollList`, `isCloseKey`, `selectionMarker`, `formatRange`, and the `ListCursor` (by index) and `IdCursor` (by stable id) state). |
 | [`path.ts`](./path.ts) | `isInside` (string containment) plus `realPathOfNearest` / `isInsideReal` (symlink-aware): the containment predicates the file-browse, worktree, doc, and plan guards share, and the canonical-path helper the worktree registry keys records by. |
-| [`pdf.ts`](./pdf.ts) | The optional `unpdf` seam shared by `web-access` and `document`: `pdfGuidance`, `PdfUnavailableError`, `pdfTextFromResult`, and the lazy `loadPdfExtractor` / `extractPdfText` (an injected extractor wins), so a missing package and a merged-pages result read the same way through either surface. |
+| [`pdf.ts`](./pdf.ts) | The optional `unpdf` seam shared by `web-access` and `file-read`: `pdfGuidance`, `PdfUnavailableError`, `pdfTextFromResult`, and the lazy `loadPdfExtractor` / `extractPdfText` (an injected extractor wins), so a missing package and a merged-pages result read the same way through either surface. |
 | [`pi-invocation.ts`](./pi-invocation.ts) | `getPiInvocation`: how to launch a nested `pi` process, shared by `subagent` and bytefly's doctor surface. |
 | [`policy.ts`](./policy.ts) | `createReadOnlyPolicy`: default-deny tool classification from `readOnlyHint` + explicit allow/deny. |
 | [`plan-state.ts`](./plan-state.ts) | The plan-mode flag replayed from the session branch: `PLAN_MODE_ENTRY_TYPE` and `isPlanModeEnabled(entries)`, so `rewind` can refuse a write while planning without importing the plan extension. |
 | [`plan-entry.ts`](./plan-entry.ts) | Plan-mode entry shared by the extension that owns the mode and the one that offers it: `READ_ONLY_SUMMARY` and `PLAN_CONSENT` (one wording for the read-only guarantee), the `PLAN_ENTER_REQUEST` channel with its `PlanEnterRequest` payload, and `requestPlanMode(pi, ctx)` — a request/response over `pi.events` that resolves `false` instead of hanging when `plan` is not loaded, so a command context (which has no `executeTool`) can still enter the mode after asking the user once. |
 | [`rails.ts`](./rails.ts) | Above-editor widget ordering (`goal` → `todo`) and dock-screen suppression, carried on `pi.events`. |
+| [`screen-session.ts`](./screen-session.ts) | `withPolledScreen`: mount one `ctx.ui.custom` dock screen — rails suppressed for its lifetime, an optional repaint tick through an injected `RepeatTimer`, and one teardown — handing the mount the host's `tui`, `theme`, `requestRender`, `close`, and `viewportRows`. Shared by `/jobs`, `/watch`, and `/memory`, whose rails window and timer window were the same one. |
 | [`requirements.ts`](./requirements.ts) | Per-extension runtime prerequisite table plus a pure `probeExtension(seams)` over injected seams (exec, config reads, optional imports, the published search provider, env, and a refresh-only reachability probe): bytefly's doctor surface reports on it and the extensions that own a dependency format their errors from it. A check kind is either a prerequisite (`binary`, `module`, `state`, `invocation`, `notify`, `provider`) or a `safety` switch whose off value trades a protection away, read from `bytefly.json` global-then-project. |
 | [`shell.ts`](./shell.ts) | Shell escape rule shared by the worktree isolation guard and plan mode's read-only git guard: `SHELL_ESCAPABLE`, `isShellEscapable`, `hasShellEscape`. |
 | [`spawn.ts`](./spawn.ts) | The process seam for extensions that run a shell command: `SpawnedProcess`, `SpawnFn`, `KillTreeFn`, the pure `spawnOptions` / `killPlan`, `applyKillPlan` over injected seams, `isPidAlive`, and the `defaultSpawn` / `defaultKillTree` that execute them (process group on POSIX, `taskkill /T` on Windows). Shared by `job`, `watch`, `check`, `worktree`, and `wechat`. |
 | [`goal-state.ts`](./goal-state.ts) | The published `goal` state replayed from the session branch: `PublishedGoal`, `PublishedGoalStatus` (`planning` / `active` / `achieved`), `GOAL_ENTRY_TYPE`, `MAX_GOAL_OBJECTIVE`, `isPursuedGoal(goal)` and `lastGoal(entries)` (the last valid goal, skipping a rejected call and honouring an explicit clear), so `plan` can restate a pursued goal while planning, promote a `planning` one at approval, and offer to record one when a plan is approved with none, and `goal` itself reads the branch through the same replay — with no extension importing another's modules. |
 | [`todo-state.ts`](./todo-state.ts) | The todo item contract, its parser, and the published state replayed from the session branch: `TODO_STATUSES` / `TodoStatus`, `ExistingTodo`, `MAX_TODOS` / `MAX_CONTENT`, `normalizeTodos`, and `lastTodos(entries)` (the last write that fully validates, skipping a rejected call; a malformed write leaves the previous list). `plan` merges steps into that list, `goal` counts the items still open, and `todo` itself replays through it — so one rule decides which writes are state writes, with no extension importing another's modules. |
 | [`tool-names.ts`](./tool-names.ts) | Tool names and one parameter name that more than one extension must agree on, so an orchestrating `ctx.executeTool()` call or schema probe breaks the build on a rename. |
-| [`tool-result.ts`](./tool-result.ts) | The rejected-tool-call shape: `toolError` builds the `isError: true` content plus the caller's `details`, and `errorResult` is the action-and-message form `job` and `watch` share. |
-| [`web/`](./web/) | The Bytefly web brand system shared by the browser surfaces: [`web/tokens.ts`](./web/tokens.ts) (palette derived from the Bytefly terminal themes, scales, and the `tok-*` map), [`web/base.ts`](./web/base.ts), [`web/components.ts`](./web/components.ts) (the `bf-*` kit, including the dialog, shortcut-sheet, and `bf-kbd` rules), [`web/layout.ts`](./web/layout.ts), [`web/runtime.ts`](./web/runtime.ts) (`WEB_THEME_STORAGE_KEY`, `THEME_JS`, `THEME_TOGGLE_JS`, and `keysDialogScript(triggerId)` — the shared shortcut-sheet wiring, whose contract is `window.bfKeys`), [`web/markup.ts`](./web/markup.ts) (the HTML atoms, including `keysSheet` and its `KeyHint` rows), and the [`web/index.ts`](./web/index.ts) barrel. |
+| [`tool-result.ts`](./tool-result.ts) | The tool-result envelope: `textResult` builds the one text block, the caller's `details`, and the optional `structuredContent` mirror; `failedResult` is the same shape marked `isError`, keeping the previous state for a retry; `toolError` builds the rejected-call content plus the caller's details, and `errorResult` is the action-and-message form `job` and `watch` share. |
+| [`usage.ts`](./usage.ts) | The usage counters an accumulator is measured in: `USAGE_COUNTERS`, `UsageCounter`, `UsageCounts`, and `zeroUsage` — shared by bytefly's session and `↳` roll-up accounting and by `subagent`'s fold of a child's `message_end` events, so two extensions cannot drift on which numbers a run is made of. `turns` and the context size are not counters and stay with each owner. |
+| [`web/`](./web/) | The Bytefly web brand system shared by the browser surfaces, whose conventions are its own doc, [`web/README.md`](./web/README.md). Modules: [`web/tokens.ts`](./web/tokens.ts) (palette derived from the Bytefly terminal themes, scales, the `tok-*` map, and the derived `--on-accent` / `--scrim` / `--shadow` overlays), [`web/base.ts`](./web/base.ts) (reset, one focus ring, the print and forced-colours layers), [`web/components.ts`](./web/components.ts) (the `bf-*` kit, including the dialog, shortcut-sheet, and `bf-kbd` rules), [`web/layout.ts`](./web/layout.ts) (the app shell and its one breakpoint), [`web/runtime.ts`](./web/runtime.ts) (theme storage and bootstrap, `THEME_JS_PATH`, `THEME_TOGGLE_JS`, `dialogScript`, and `keysDialogScript`), [`web/markup.ts`](./web/markup.ts) (the HTML atoms, including `keysSheet` and its `KeyHint` rows), and the [`web/index.ts`](./web/index.ts) barrel. |
 
 ## Conventions
 
@@ -62,9 +65,10 @@ belongs in that extension instead — see `extensions/web-access/http.ts` and
   one extension probes on another — live in `tool-names.ts`.
 - **A helper that exists here must be imported, not redefined.**
   `test/shared-helpers.test.ts` fails a top-level extension declaration whose
-  name is also exported by `lib/`, and a body copied from `lib/` or from another
-  extension. A deliberate wrapper goes on that test's reasoned exception list; a
-  copy belongs here with one co-located test.
+  name is also exported by `lib/`, and a body copied from `lib/` or from any
+  other file — a second extension, a sibling module, or `lib/` itself. A
+  deliberate wrapper goes on that test's reasoned exception list; a copy belongs
+  here with its declared capability suite.
 - **A color is a role, not a token.** The rules and the primitives are in
   [`tui/README.md`](./tui/README.md#color-is-a-role): draw through
   [`tui/tokens.ts`](./tui/tokens.ts) (`paint(theme, role, text)`) so a theme swap

package/lib/config.ts

@@ -85,6 +85,18 @@ export function asRecord(value: unknown): Record<string, unknown> | undefined {
 	return value as Record<string, unknown>;
 }
 
+/**
+ * A finite number from an untrusted JSON field, or `undefined`.
+ *
+ * The numeric companion to {@link asRecord}: a field a wire format, a child
+ * process, or a config file claims is a number is only a number when it is one —
+ * a string, `NaN`, or `null` reads as "not reported" so a caller can fall back
+ * instead of summing garbage into a total.
+ */
+export function asNumber(value: unknown): number | undefined {
+	return typeof value === "number" && Number.isFinite(value) ? value : undefined;
+}
+
 /** Parse a JSON object from disk, ignoring missing/malformed/non-object files. */
 export function readJson(path: string): Record<string, unknown> | undefined {
 	const result = readJsonResult(path);

package/lib/escape.ts

@@ -1,11 +1,14 @@
 /**
- * HTML text escaping for the browse pages.
+ * HTML text escaping, and the inverse for one character reference.
  *
  * The single escape used by every page renderer and by the Markdown renderer:
  * model- and file-authored text becomes safe text nodes and double-quoted
  * attributes. Keeping it here (rather than in `html.ts`) lets `markdown.ts`
  * escape without importing the page renderer, so the module graph stays
- * acyclic.
+ * acyclic. `decodeCodePoint` is the other half of the same boundary and lives
+ * beside it for the same reason: the Markdown inline scan and the raw-HTML
+ * attribute decoder both resolve `&#N;` and `&#xN;` references, and one copy
+ * cannot drift from the other.
  */
 
 /** Escape text for an HTML text node or double-quoted attribute. */
@@ -25,3 +28,13 @@ export function escapeHtml(value: string): string {
 		}
 	});
 }
+
+/**
+ * One numeric character reference as text: U+FFFD when it is a surrogate, zero,
+ * or out of range, so an entity cannot inject an unpaired half of a pair.
+ */
+export function decodeCodePoint(value: number): string {
+	if (!Number.isFinite(value) || value <= 0 || value > 0x10ffff || (value >= 0xd800 && value <= 0xdfff))
+		return "\uFFFD";
+	return String.fromCodePoint(value);
+}

package/lib/format.ts

@@ -7,12 +7,16 @@
 
 import { homedir } from "node:os";
 
-/** Compact token count: `999`, `1.0k`, `12k`, `1.5M`, `12M`. `?` when not a number. */
+/**
+ * Compact token count: `999`, `1.0k`, `12k`, `1.5M`, `12M`. `?` when not a
+ * number. The `k` → `M` switch sits below a million so a count that would round
+ * to `1000k` prints as `1.0M` instead.
+ */
 export function formatTokens(count: number): string {
 	if (!Number.isFinite(count)) return "?";
 	if (count < 1000) return count.toString();
 	if (count < 10000) return `${(count / 1000).toFixed(1)}k`;
-	if (count < 1000000) return `${Math.round(count / 1000)}k`;
+	if (count < 999500) return `${Math.round(count / 1000)}k`;
 	if (count < 10000000) return `${(count / 1000000).toFixed(1)}M`;
 	return `${Math.round(count / 1000000)}M`;
 }

package/lib/interaction.ts

@@ -59,6 +59,12 @@ export interface InteractionChannel {
 	post(text: string, signal?: AbortSignal): Promise<void>;
 	/** Send a local file to the human; resolves true when delivered. */
 	postFile(path: string, name: string, signal?: AbortSignal): Promise<boolean>;
+	/**
+	 * Widen the bound on the prompts asked inside the returned scope: use it for a
+	 * dialog the human must read something before answering. Returns the restore,
+	 * and a transport with no such policy omits the method.
+	 */
+	setPromptTimeout?(ms: number): () => void;
 }
 
 /** The slice of an extension context {@link remoteChannel} reads. */
@@ -105,6 +111,12 @@ export interface AskHumanOptions<T> {
 	 * attachment may never be opened (a phone client can hide a file bubble).
 	 */
 	note?: string;
+	/**
+	 * How long a remote channel may wait for the answer before dismissing the
+	 * dialog. Raise it when the human has to read an artifact first; the channel's
+	 * own bound applies when it is omitted or unsupported.
+	 */
+	timeoutMs?: number;
 }
 
 /**
@@ -138,5 +150,10 @@ export async function askHuman<T>(
 			// The preface is best-effort; the dialogs still run.
 		}
 	}
-	return options.dialogs();
+	const restore = options.timeoutMs === undefined ? undefined : channel?.setPromptTimeout?.(options.timeoutMs);
+	try {
+		return await options.dialogs();
+	} finally {
+		restore?.();
+	}
 }

package/lib/pdf.ts

@@ -1,11 +1,11 @@
 /**
  * The optional `unpdf` seam: lazy load, module-shape handling, and text
- * extraction, shared by `web-access` and `document`.
+ * extraction, shared by `web-access` and `file-read`.
  *
  * `unpdf` bundles a server-friendly build of PDF.js, so it is imported lazily:
  * an extension registers on every session, and a parser should load only when a
  * read actually needs it. `web-access` treats the package as optional and
- * reports {@link pdfGuidance} when it is absent; `document` ships it as a
+ * reports {@link pdfGuidance} when it is absent; `file-read` ships it as a
  * dependency. Both get the same loader, the same merged-pages call, and the same
  * result unwrapping, so a PDF reads the same way through either surface.
  *

package/lib/report.ts

@@ -14,11 +14,14 @@
  *
  * Delivery is one shared transcript notice per burst, and a burst is marked
  * reported only after the send succeeded, so a throw leaves it for the next
- * turn. Value-only: every flag lives in the returned closure, never in a module
- * variable, because each extension gets its own module instance.
+ * turn. `registerPendingChannel` is the other half: the seven host hooks that
+ * drive the machine, registered once for `job` and `watch` rather than copied
+ * into each factory. Value-only: every flag lives in the returned closure, never
+ * in a module variable, because each extension gets its own module instance.
  */
 
 import type { AgentMessage } from "@earendil-works/pi-agent-core";
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { pruneStaleNotices, type NoticeMessage } from "./notice.ts";
 
 export interface PendingReporterOptions<T> {
@@ -97,3 +100,73 @@ export function createPendingReporter<T>(options: PendingReporterOptions<T>): Pe
 		},
 	};
 }
+
+/** The session-scoped state a channel drives, narrowed to what its hooks need. */
+export interface PendingChannelRuntime {
+	/** Load this session's records; called on every session start. */
+	load(ctx: ExtensionContext): void;
+	/** Repaint the status chip. */
+	setStatus(ctx: ExtensionContext): void;
+	/** Release the session's resources; idempotent. */
+	shutdown(): Promise<void>;
+}
+
+export interface PendingChannelOptions {
+	/** The reporter that turns pending outcomes into notices. */
+	reporter: PendingReporter;
+	/** The runtime whose pending outcomes the notices describe. */
+	runtime: PendingChannelRuntime;
+	/** Runs on every session start, after the runtime loads: arm the report trigger. */
+	onSessionStart?(ctx: ExtensionContext): void;
+	/** Runs before the runtime releases: clear what `onSessionStart` armed. */
+	onSessionShutdown?(): void;
+}
+
+/**
+ * Wire a reporter to the host's session lifecycle.
+ *
+ * The order inside `session_start` is the contract: the reporter forgets the
+ * previous session's busy window, the runtime loads the records, and only then
+ * is the report trigger armed — a reload or a replaced session reuses the same
+ * runtime. A shutdown clears the trigger before the runtime releases the table it
+ * was calling into.
+ */
+export function registerPendingChannel(
+	pi: Pick<ExtensionAPI, "on">,
+	{ reporter, runtime, onSessionStart, onSessionShutdown }: PendingChannelOptions,
+): void {
+	pi.on("session_start", (_event, ctx) => {
+		reporter.sessionStart();
+		runtime.load(ctx);
+		onSessionStart?.(ctx);
+	});
+
+	// Tree navigation does not change the pending records; only repaint.
+	pi.on("session_tree", (_event, ctx) => {
+		runtime.setStatus(ctx);
+	});
+
+	pi.on("agent_start", () => {
+		reporter.agentStart();
+	});
+	pi.on("agent_settled", () => {
+		reporter.agentSettled();
+	});
+
+	// Report what is queued at the start of the next turn, without triggering one.
+	pi.on("before_agent_start", (_event, ctx) => {
+		const reported = reporter.beforeAgentStart();
+		if (!reported) return undefined;
+		runtime.setStatus(ctx);
+		return reported;
+	});
+
+	// Keep stale notices out of later turns. Only this source's notices are
+	// pruned; another source's are left for its own handler.
+	pi.on("context", (event) => reporter.filterContext(event.messages));
+
+	pi.on("session_shutdown", async () => {
+		onSessionShutdown?.();
+		await runtime.shutdown();
+	});
+}

package/lib/requirements.ts

@@ -255,7 +255,7 @@ export const REQUIREMENTS: Readonly<Record<string, ExtensionRequirements>> = {
 		optional: [gitCheck("the branch chip and the diff view")],
 		notes: ["The default-browser opener (`open` / `xdg-open` / `cmd`) is best-effort; the URL is printed either way."],
 	},
-	document: {},
+	"file-read": {},
 	"file-open": {
 		notes: [
 			"The `/open` command and its notification need an interactive UI; the `open_path` tool works without one.",
@@ -266,6 +266,7 @@ export const REQUIREMENTS: Readonly<Record<string, ExtensionRequirements>> = {
 	memory: {
 		optional: [gitCheck("project-scope memory under the repository root")],
 	},
+	context: {},
 	wechat: {
 		optional: [
 			{
@@ -301,7 +302,6 @@ export const REQUIREMENTS: Readonly<Record<string, ExtensionRequirements>> = {
 		],
 	},
 };
-
 // --- Probing ----------------------------------------------------------------
 
 /** Run a command and report its exit code; production backs this with `pi.exec`. */

package/lib/screen-session.ts

@@ -0,0 +1,85 @@
+/**
+ * Mounting a dock screen: rails suppressed, an optional repaint tick, and one
+ * teardown.
+ *
+ * Pi mounts a `ctx.ui.custom` screen in the editor slot the above-editor rails
+ * share, so every screen wraps itself in `withRailsSuppressed`. Three of them —
+ * `/jobs`, `/watch`, and `/memory` — also poll while they are open (a log pane,
+ * a line pane, a store another process can edit), and each re-derived the same
+ * `let timer` / `stopTimer` / `setInterval(...).unref?.()` / `finally` skeleton
+ * around its own component. The rails lifetime and the timer lifetime are the
+ * same window, so they are one helper rather than two wrappers each caller
+ * stacks and unwinds by hand.
+ *
+ * The timer is a seam (`RepeatTimer`), so a test drives the tick instead of
+ * waiting for one, and it is armed after the mount returns: a component whose
+ * constructor throws leaves no timer behind.
+ *
+ * Value-only: the timer handle lives in the caller's closure.
+ */
+
+import type { ExtensionAPI, ExtensionContext, Theme } from "@earendil-works/pi-coding-agent";
+import type { Component, TUI } from "@earendil-works/pi-tui";
+import { withRailsSuppressed } from "./rails.ts";
+import { defaultInterval, type RepeatTimer } from "./timer.ts";
+
+/** What the host accepts back from a screen's mount. */
+export type ScreenComponent = Component & { dispose?(): void };
+
+/** What a mounted screen is given: the host's mount parameters, narrowed. */
+export interface PolledScreen {
+	/** The host's component handle; a screen that needs an `Editor` builds it from this. */
+	readonly tui: TUI;
+	/** The theme the host handed the mount. */
+	readonly theme: Theme;
+	/** Ask the host to repaint. */
+	requestRender(): void;
+	/** Close the screen, as its own close key would. */
+	close(): void;
+	/** The terminal's height in rows, or `undefined` when the host cannot say. */
+	viewportRows(): number | undefined;
+}
+
+export interface PolledScreenOptions<Screen> {
+	/** How often `poll` runs while the screen is open, in ms. */
+	pollMs: number;
+	/** Run once per tick; `screen` is what `mount` returned. */
+	poll(screen: Screen, handles: PolledScreen): void;
+	/** Timer seam; defaults to an unref'd interval. */
+	timer?: RepeatTimer;
+}
+
+/**
+ * Show one polled dock screen and resolve when it closes.
+ *
+ * The caller still owns the `ctx.mode !== "tui"` branch, because the text
+ * fallback differs per command; everything from the mount to the teardown is
+ * here.
+ */
+export async function withPolledScreen<Screen extends ScreenComponent>(
+	pi: Pick<ExtensionAPI, "events">,
+	ctx: Pick<ExtensionContext, "ui">,
+	mount: (handles: PolledScreen) => Screen,
+	options: PolledScreenOptions<Screen>,
+): Promise<void> {
+	const { pollMs, poll, timer = defaultInterval } = options;
+	let stop: (() => void) | undefined;
+	try {
+		await withRailsSuppressed(pi, () =>
+			ctx.ui.custom<void>((tui, theme, _keybindings, done) => {
+				const handles: PolledScreen = {
+					tui,
+					theme,
+					requestRender: () => tui.requestRender(),
+					close: () => done(),
+					viewportRows: () => tui.terminal?.rows,
+				};
+				const screen = mount(handles);
+				stop = timer(pollMs, () => poll(screen, handles));
+				return screen;
+			}),
+		);
+	} finally {
+		stop?.();
+	}
+}