@gavin-hu/my-pi-agent 0.18.0 → 0.20.0

package/extensions/plan/web.ts

@@ -6,39 +6,38 @@
  * for one plan, opens the default browser at a tokenized URL, and resolves
  * `done` when the user saves feedback, cancels, closes the tab (detected by the
  * event stream dropping), or aborts the turn. The route logic lives in the pure
- * `web-router.ts`; this module is the only part that owns a socket and timers,
- * and it takes injected seams so tests can run one on `127.0.0.1:0`.
+ * `web-router.ts`; this module owns the routes and the timers, `lib/http` owns
+ * the socket, and it takes injected seams so tests can run one on `127.0.0.1:0`.
  */
 
-import { createServer, type IncomingMessage, type ServerResponse } from "node:http";
 import { networkInterfaces } from "node:os";
 import { basename } from "node:path";
 import { openInBrowser } from "../../lib/browser.ts";
 import {
-	bindLoopback,
-	createCloser,
 	jsonHeaders,
-	openEventStream,
+	type LoopbackRequest,
+	type LoopbackReply,
+	type LoopbackServer,
 	parseRequestUrl,
-	respond,
+	serveLoopback,
 	type ServeResponse,
 } from "../../lib/http/index.ts";
 import { fenceLanguage, highlightLines } from "../../lib/highlight.ts";
 import { type ArmTimer, defaultInterval, defaultTimer, type RepeatTimer } from "../../lib/timer.ts";
-import { codeBody, fenceInfo, planBlocks } from "./blocks.ts";
+import { codeBody, fenceInfo } from "./blocks.ts";
 import {
 	claimAuthor,
 	MAX_ANNOTATIONS,
 	MAX_COMMENT_LENGTH,
 	MAX_QUOTE_LENGTH,
 	normalizeAuthor,
-	parseFeedback,
+	readFeedback,
 	stripFeedback,
 	type PlanAnnotation,
 } from "./feedback.ts";
 import { planTitle, type PlanStore, type StoredPlan } from "./plans.ts";
 import { changedSections, planDigest, type SectionDigest } from "./plan-text.ts";
-import { extractPlanSections, extractPlanSteps } from "./steps.ts";
+import { extractPlanSteps } from "./steps.ts";
 import type { ReviewCaller } from "./types.ts";
 import { handleReviewRequest, type ReviewContext, type SaveResult } from "./web-router.ts";
 import type { ReviewPageData } from "./web-page.ts";
@@ -71,8 +70,6 @@ export interface PlanReviewOptions {
 	signal?: AbortSignal;
 	/** Whether the browser may approve the plan (only the `exit_plan_mode` flow). */
 	canApprove?: boolean;
-	/** A line the page shows the owner, such as why approval belongs in the terminal. */
-	note?: string;
 	/** The section digests the previous review showed, so this page can mark changed sections. */
 	baseline?: SectionDigest[];
 	/**
@@ -143,40 +140,6 @@ const DROP_GRACE_MS = 1500;
  */
 const PLAN_POLL_MS = 1000;
 
-/** A request body, or the fact that it was too large to read. */
-type BodyResult = { ok: true; body: string } | { ok: false };
-
-/**
- * Read a request body, stopping at {@link MAX_BODY_BYTES}. An oversize body is
- * reported rather than destroyed here, so the handler can still answer 413 over
- * the open socket instead of the client seeing a dropped connection.
- */
-function readBody(request: IncomingMessage, limit: number): Promise<BodyResult> {
-	return new Promise((resolve) => {
-		const chunks: Buffer[] = [];
-		let size = 0;
-		let done = false;
-		const settle = (result: BodyResult): void => {
-			if (done) return;
-			done = true;
-			resolve(result);
-		};
-		request.on("data", (chunk: Buffer) => {
-			if (done) return;
-			size += chunk.length;
-			if (size > limit) {
-				chunks.length = 0;
-				request.pause();
-				settle({ ok: false });
-				return;
-			}
-			chunks.push(chunk);
-		});
-		request.on("end", () => settle({ ok: true, body: Buffer.concat(chunks).toString("utf-8") }));
-		request.on("error", () => settle({ ok: false }));
-	});
-}
-
 export function createPlanWebReview(store: PlanStore, deps: PlanWebReviewDeps = {}): PlanWebReview {
 	const sessions = new Set<PlanReviewSession>();
 	// What each running review can do about sharing; the session itself stays the
@@ -193,7 +156,9 @@ export function createPlanWebReview(store: PlanStore, deps: PlanWebReviewDeps =
 	): Promise<PlanReviewSession | undefined> => {
 		const { signal } = options;
 		const canApprove = options.canApprove === true;
-		const maxBody = deps.maxBodyBytes ?? MAX_BODY_BYTES;
+		// One cap for both listeners: a reviewer's page posts the same bodies as the
+		// owner's, so the shared one cannot be the stricter or the looser of the two.
+		const bodyLimit = deps.maxBodyBytes ?? MAX_BODY_BYTES;
 		// One token per holder: the owner's is minted here and never shared, and a
 		// reviewer token is minted by `share()`. The table owns the collision rule and
 		// the name each link has bound.
@@ -279,13 +244,16 @@ export function createPlanWebReview(store: PlanStore, deps: PlanWebReviewDeps =
 		const page = async (caller: ReviewCaller): Promise<ReviewPageData> => {
 			const { role } = caller;
 			const stored = await refreshPageText();
-			const current = pageText;
-			const blocks = planBlocks(current);
-			const sections = extractPlanSections(current);
-			// Per-occurrence change flags, aligned with the sections list: the same shape
-			// the terminal review renders, so duplicate headings cannot both light up.
-			const changed = changedSections(options.baseline, current);
-			const outline = sections.flatMap((section, index) =>
+			// The body, its blocks, and the comments out of one read of the file: an
+			// anchor names a block from this same parse, so the island cannot mark a
+			// comment onto a line the page never rendered.
+			const read = readFeedback(stored.content);
+			const current = read.body;
+			const blocks = read.blocks;
+			// Per-section change marks, each carrying its own section: the same shape the
+			// terminal review renders, so a heading and its mark cannot be paired wrongly.
+			const marks = changedSections(options.baseline, current);
+			const outline = marks.flatMap(({ section, changed }) =>
 				section.title === ""
 					? []
 					: [
@@ -294,7 +262,7 @@ export function createPlanWebReview(store: PlanStore, deps: PlanWebReviewDeps =
 								line: section.line,
 								level: section.level,
 								text: section.title,
-								...(changed[index] ? { changed: true } : {}),
+								...(changed ? { changed: true } : {}),
 							},
 						],
 			);
@@ -312,9 +280,9 @@ export function createPlanWebReview(store: PlanStore, deps: PlanWebReviewDeps =
 			return {
 				// The document's own H1 reads better than the file-name slug, and the
 				// slug is still the fallback for a plan that starts with something else.
-				title: sections.find((section) => section.level === 1)?.title || planTitle(basename(plan.path)),
+				title: marks.find((mark) => mark.section.level === 1)?.section.title || planTitle(basename(plan.path)),
 				blocks,
-				annotations: parseFeedback(stored.content),
+				annotations: read.annotations,
 				outline,
 				steps: {
 					done: stepList.filter((step) => step.status === "completed").length,
@@ -328,7 +296,6 @@ export function createPlanWebReview(store: PlanStore, deps: PlanWebReviewDeps =
 				rev: planDigest(current),
 				...(caller.name === undefined ? {} : { author: caller.name }),
 				canApprove: role === "owner" && canApprove,
-				...(role === "owner" && options.note !== undefined ? { note: options.note } : {}),
 				share: role === "owner" ? shareSession.state() : undefined,
 			};
 		};
@@ -376,6 +343,7 @@ export function createPlanWebReview(store: PlanStore, deps: PlanWebReviewDeps =
 		// frame hooks, so sharing stays one concern instead of five fields here.
 		const shareSession = createShareSession({
 			handleRequest,
+			maxBodyBytes: bodyLimit,
 			ownerPort: () => currentPort,
 			networkInterfaces: deps.networkInterfaces ?? networkInterfaces,
 			mintReviewer: () => tokens.mint("reviewer"),
@@ -410,78 +378,56 @@ export function createPlanWebReview(store: PlanStore, deps: PlanWebReviewDeps =
 		// Live event streams, used only to notice a closed owner tab: a reviewer's
 		// tab is not the review's lifetime. The explicit Cancel button and the abort
 		// signal are the deterministic paths.
-		const server = createServer(handleRequest);
 		/** One request, on either listener: the loopback page or a shared one. */
-		function handleRequest(request: IncomingMessage, response: ServerResponse): void {
-			void (async () => {
-				const method = request.method ?? "GET";
-				const read =
-					method.toUpperCase() === "POST" ? await readBody(request, maxBody) : { ok: true as const, body: "" };
-				if (!read.ok) {
-					response.writeHead(413, { ...jsonHeaders(), Connection: "close" });
-					response.end(JSON.stringify({ error: "The request body is too large." }));
-					return;
-				}
-				const body = read.body;
-				let result: ServeResponse;
-				try {
-					result = await handleReviewRequest(context, method, request.url ?? "/", request.headers, body);
-				} catch {
-					result = {
-						status: 500,
-						headers: jsonHeaders(),
-						body: JSON.stringify({ error: "Internal error" }),
-					};
-				}
-				if (result.stream) {
-					openEventStream(response, result);
-					// A page that walks away mid-frame must not take the session down.
-					response.on("error", () => {});
-					const token = parseRequestUrl(request.url ?? "/")?.search.get("token") ?? "";
-					const streamCaller = context.caller(token);
-					if (streamCaller !== undefined) streams.add(response, { role: streamCaller.role, token });
-					request.on("close", () => streams.remove(response));
-					return;
-				}
-				// A save or cancel only resolves the session after its response is on the
-				// wire; otherwise `close()` would force-close the socket mid-reply. The
-				// `close` path covers a client that walks away before the flush callback
-				// runs, so a settle cannot be lost with the socket.
-				const settlePending = (): void => {
-					const terminal = pendingResult;
-					if (!terminal) return;
-					pendingResult = undefined;
-					finish(terminal);
+		async function handleRequest(request: LoopbackRequest): Promise<LoopbackReply> {
+			let result: ServeResponse;
+			try {
+				result = await handleReviewRequest(context, request.method, request.url, request.headers, request.body);
+			} catch {
+				result = {
+					status: 500,
+					headers: jsonHeaders(),
+					body: JSON.stringify({ error: "Internal error" }),
 				};
-				respond(request, response, result, settlePending);
-				response.on("close", settlePending);
-			})();
+			}
+			// A save or cancel only resolves the session after its response is on the
+			// wire; otherwise `close()` would force-close the socket mid-reply. The same
+			// hook covers a client that walks away before the flush, so a settle cannot be
+			// lost with the socket.
+			const settlePending = (): void => {
+				const terminal = pendingResult;
+				if (!terminal) return;
+				pendingResult = undefined;
+				finish(terminal);
+			};
+			if (!result.stream) return { result, afterResponse: settlePending };
+			const token = parseRequestUrl(request.url)?.search.get("token") ?? "";
+			const streamCaller = context.caller(token);
+			return {
+				result,
+				openSink: (sink) => {
+					if (streamCaller !== undefined) streams.add(sink, { role: streamCaller.role, token });
+					return () => streams.remove(sink);
+				},
+			};
 		}
 
-		// The accept-level `error` listener lives in `bindHost`, so a transient
-		// failure cannot take the host down; the review still ends through its own
-		// paths: cancel, abort, drop, or shutdown.
 		const preferred = deps.port ?? ports.get(plan.path) ?? 0;
-		let port: number | undefined;
+		let server: LoopbackServer;
 		try {
-			port = await bindLoopback(server, preferred);
+			server = await serveLoopback({
+				ports: preferred === 0 ? [0] : [preferred, 0],
+				maxBodyBytes: bodyLimit,
+				handler: handleRequest,
+			});
 		} catch {
-			// The remembered port may have been taken between turns; fall back once.
-			if (preferred !== 0) {
-				try {
-					port = await bindLoopback(server, 0);
-				} catch {
-					port = undefined;
-				}
-			}
-		}
-		if (port === undefined) {
-			server.close();
+			// The remembered port may have been taken between turns; the fallback above
+			// covers that, so reaching here means neither port answered.
 			return undefined;
 		}
+		const port = server.port;
 		ports.set(plan.path, port);
 		currentPort = port;
-		const closeServer = createCloser(server);
 
 		const url = `http://127.0.0.1:${port}/?token=${token}`;
 		let closed = false;
@@ -498,7 +444,7 @@ export function createPlanWebReview(store: PlanStore, deps: PlanWebReviewDeps =
 			stopTicker();
 			streams.clear();
 			await shareSession.close();
-			await closeServer();
+			await server.close();
 		};
 
 		const session: PlanReviewSession = { url, port, done, close };

package/extensions/rewind/{commands.ts → commands/commands.ts}

@@ -8,13 +8,13 @@
  */
 
 import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
-import { withRailsSuppressed } from "../../lib/rails.ts";
-import { formatRewindListText, formatRewindRow } from "./format.ts";
+import { withRailsSuppressed } from "../../../lib/rails.ts";
+import { formatRewindListText, formatRewindRow } from "../text/format.ts";
 import { openReview } from "./review.ts";
 import { rewindTo } from "./rewind.ts";
-import type { RewindRuntime } from "./runtime.ts";
-import { RewindListComponent } from "./rewind-tui.ts";
-import { buildRewindPoints, type RewindPoint } from "./timeline.ts";
+import type { RewindRuntime } from "../state/runtime.ts";
+import { RewindListComponent } from "../view/rewind-tui.ts";
+import { buildRewindPoints, type RewindPoint } from "../state/timeline.ts";
 
 /** Pick a point from the timeline, or undefined when the user cancels. */
 async function choosePoint(ctx: ExtensionCommandContext, points: RewindPoint[]): Promise<RewindPoint | undefined> {

package/extensions/rewind/{review.ts → commands/review.ts}

@@ -10,10 +10,11 @@
  */
 
 import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
-import { messageOf } from "../../lib/errors.ts";
-import { sanitizeLine } from "../../lib/format.ts";
-import { isPlanModeEnabled } from "../../lib/plan-state.ts";
-import { withRailsSuppressed } from "../../lib/rails.ts";
+import { messageOf } from "../../../lib/errors.ts";
+import { sanitizeLine } from "../../../lib/format.ts";
+import { planModeRefusal } from "../../../lib/plan-entry.ts";
+import { isPlanModeEnabled } from "../../../lib/plan-state.ts";
+import { withRailsSuppressed } from "../../../lib/rails.ts";
 import {
 	boundDiff,
 	formatHunkRevertBody,
@@ -23,20 +24,20 @@ import {
 	formatRevertSelectedBody,
 	formatReviewListText,
 	formatReviewRevertText,
-} from "./format.ts";
-import { HunkPickerComponent } from "./hunk-picker.ts";
-import { buildHunkPatch, parseFilePatch } from "./patch.ts";
-import { entryPaths, toReviewEntries, type ReviewEntry } from "./paths.ts";
+} from "../text/format.ts";
+import { HunkPickerComponent } from "../view/hunk-picker.ts";
+import { buildHunkPatch, parseFilePatch } from "../text/patch.ts";
+import { entryPaths, toReviewEntries, type ReviewEntry } from "../text/paths.ts";
 import {
 	ReviewDiffComponent,
 	ReviewListComponent,
 	type ReviewDiffAction,
 	type ReviewListResult,
-} from "./review-tui.ts";
-import type { RestorePlan } from "./restore.ts";
-import type { RewindRuntime } from "./runtime.ts";
-import { buildRewindPoints, type RewindPoint } from "./timeline.ts";
-import type { Snapshot, RestoreSummary } from "./types.ts";
+} from "../view/review-tui.ts";
+import type { RestorePlan } from "../transport/restore.ts";
+import type { RewindRuntime } from "../state/runtime.ts";
+import { buildRewindPoints, type RewindPoint } from "../state/timeline.ts";
+import type { Snapshot, RestoreSummary } from "../types.ts";
 
 /** One reviewable view of the working tree. */
 interface ReviewView {
@@ -75,7 +76,7 @@ async function loadReview(runtime: RewindRuntime, ctx: ExtensionCommandContext):
 		return {
 			ok: false,
 			kind: "warning",
-			message: "Plan mode is read-only. Approve the plan before reviewing and reverting its changes.",
+			message: planModeRefusal("reviewing and reverting its changes"),
 		};
 	}
 

package/extensions/rewind/{rewind.ts → commands/rewind.ts}

@@ -9,13 +9,13 @@
  */
 
 import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
-import { withRailsSuppressed } from "../../lib/rails.ts";
+import { withRailsSuppressed } from "../../../lib/rails.ts";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { formatChangeSummary, formatRestoreText, previewDiffText } from "./format.ts";
-import { PathPickerComponent } from "./path-picker.ts";
-import type { ChangedPath } from "./paths.ts";
-import type { RewindRuntime } from "./runtime.ts";
-import { rewindScopes, type RewindPoint, type RewindScope } from "./timeline.ts";
+import { formatChangeSummary, formatRestoreText, previewDiffText } from "../text/format.ts";
+import { PathPickerComponent } from "../view/path-picker.ts";
+import type { ChangedPath } from "../text/paths.ts";
+import type { RewindRuntime } from "../state/runtime.ts";
+import { rewindScopes, type RewindPoint, type RewindScope } from "../state/timeline.ts";
 
 /** Human labels for the scope picker, in menu order. */
 const SCOPE_LABELS: Record<RewindScope, string> = {

package/extensions/rewind/{config.ts → config/config.ts}

@@ -6,7 +6,7 @@
  * malformed documents are ignored, and every value is clamped to a safe range.
  */
 
-import { clampInteger, cleanString, loadConfigSection, stringList } from "../../lib/config.ts";
+import { clampInteger, cleanString, loadConfigSection, stringList } from "../../../lib/config.ts";
 
 export interface RewindConfig {
 	/** Take one automatic snapshot per user prompt. Default: true. */

package/extensions/rewind/index.ts

@@ -16,9 +16,9 @@
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { isExtensionEnabled } from "../../lib/env.ts";
-import { registerCommands } from "./commands.ts";
-import { createRuntime } from "./runtime.ts";
-import { createSnapshotRun } from "./snapshot-run.ts";
+import { registerCommands } from "./commands/commands.ts";
+import { createRuntime } from "./state/runtime.ts";
+import { createSnapshotRun } from "./state/snapshot-run.ts";
 
 export function registerRewind(pi: ExtensionAPI): void {
 	const runtime = createRuntime(pi);

package/extensions/rewind/{policy.ts → state/policy.ts}

@@ -9,12 +9,12 @@
  */
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { createReadOnlyPolicy } from "../../lib/policy.ts";
-import { ASK_USER_QUESTION_TOOL, GOAL_TOOL, TODO_TOOL } from "../../lib/tool-names.ts";
-import type { RewindConfig } from "./config.ts";
+import { createReadOnlyPolicy, WORKSPACE_READERS } from "../../../lib/policy.ts";
+import { ASK_USER_QUESTION_TOOL, GOAL_TOOL, TODO_TOOL } from "../../../lib/tool-names.ts";
+import type { RewindConfig } from "../config/config.ts";
 
 /** Tools that only read files or track session state, so they never snapshot. */
-const READER_TOOLS = ["read", "grep", "find", "ls", TODO_TOOL, GOAL_TOOL];
+const READER_TOOLS = [...WORKSPACE_READERS, TODO_TOOL, GOAL_TOOL];
 
 /** The interactive tool: it prompts the user and never touches the working tree. */
 const SESSION_TOOLS = [ASK_USER_QUESTION_TOOL];

package/extensions/rewind/{runtime.ts → state/runtime.ts}

@@ -9,8 +9,8 @@
  */
 
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { resolveEffectiveCwd } from "../../lib/env.ts";
-import { loadConfig, type RewindConfig } from "./config.ts";
+import { resolveEffectiveCwd } from "../../../lib/env.ts";
+import { loadConfig, type RewindConfig } from "../config/config.ts";
 import {
 	applyPatchReverse,
 	createRewindRunner,
@@ -19,16 +19,16 @@ import {
 	repoRoot,
 	revParse,
 	type RunGit,
-} from "./git.ts";
-import { createOperationQueue } from "./queue.ts";
-import { applyRestore, planRestore, type PlanResult, type RestoreInput } from "./restore.ts";
-import type { PathStat } from "./paths.ts";
-import { createSnapshot } from "./snapshot.ts";
-import { createStatusChip } from "./status.ts";
-import { belongsToRoot, listSnapshots, pruneSnapshots } from "./store.ts";
-import { createTempIndexStore } from "./temp-index.ts";
+} from "../transport/git.ts";
+import { createOperationQueue } from "../transport/queue.ts";
+import { applyRestore, planRestore, type PlanResult, type RestoreInput } from "../transport/restore.ts";
+import type { PathStat } from "../text/paths.ts";
+import { createSnapshot } from "../transport/snapshot.ts";
+import { createStatusChip } from "../view/status.ts";
+import { belongsToRoot, listSnapshots, pruneSnapshots } from "../transport/store.ts";
+import { createTempIndexStore } from "../transport/temp-index.ts";
 import { lastUserEntryId } from "./timeline.ts";
-import type { Snapshot, SnapshotReason, RestoreSummary } from "./types.ts";
+import type { Snapshot, SnapshotReason, RestoreSummary } from "../types.ts";
 
 export interface SnapshotOptions {
 	reason: SnapshotReason;

package/extensions/rewind/{snapshot-run.ts → state/snapshot-run.ts}

@@ -10,7 +10,7 @@
  */
 
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { summarizePrompt } from "./format.ts";
+import { summarizePrompt } from "../text/format.ts";
 import { createSnapshotPolicy, type SnapshotPolicy } from "./policy.ts";
 import type { RewindRuntime } from "./runtime.ts";
 

package/extensions/rewind/{timeline.ts → state/timeline.ts}

@@ -9,8 +9,8 @@
  */
 
 import type { SessionEntry, SessionMessageEntry } from "@earendil-works/pi-coding-agent";
-import { summarizePrompt } from "./format.ts";
-import type { Snapshot } from "./types.ts";
+import { summarizePrompt } from "../text/format.ts";
+import type { Snapshot } from "../types.ts";
 
 /** What a rewind can restore for one point. */
 export type RewindScope = "both" | "conversation" | "code";

package/extensions/rewind/{format.ts → text/format.ts}

@@ -7,10 +7,10 @@
  */
 
 import { sliceByColumn, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
-import { sanitizeLine, stripControlChars } from "../../lib/format.ts";
-import { GLYPHS, SEPARATORS } from "../../lib/tui/glyphs.ts";
+import { sanitizeLine, stripControlChars } from "../../../lib/format.ts";
+import { GLYPHS, SEPARATORS } from "../../../lib/tui/glyphs.ts";
 import { SELECTION_MARKS, type ReviewEntry } from "./paths.ts";
-import type { RestoreSummary } from "./types.ts";
+import type { RestoreSummary } from "../types.ts";
 
 /** Longest prompt summary shown before truncation. */
 const LABEL_WIDTH = 48;

package/extensions/rewind/{git.ts → transport/git.ts}

@@ -23,8 +23,8 @@ import {
 	revParseMany,
 	runGitOrThrow as run,
 	type RunGit,
-} from "../../lib/git/index.ts";
-import { parseNameStatus, parseNumStat, type ChangedPath, type PathStat } from "./paths.ts";
+} from "../../../lib/git/index.ts";
+import { parseNameStatus, parseNumStat, type ChangedPath, type PathStat } from "../text/paths.ts";
 
 // Re-export exactly the shared helpers this extension consumes, so rewind code
 // has one git import surface instead of reaching into `lib/git` directly.

package/extensions/rewind/{restore.ts → transport/restore.ts}

@@ -26,8 +26,8 @@ import {
 	treeFromWorkingTree,
 	type RunGit,
 } from "./git.ts";
-import { entryPaths, summarize, type ChangedPath } from "./paths.ts";
-import type { Snapshot, RestoreSummary } from "./types.ts";
+import { entryPaths, summarize, type ChangedPath } from "../text/paths.ts";
+import type { Snapshot, RestoreSummary } from "../types.ts";
 
 export interface RestoreDeps {
 	runGit: RunGit;

package/extensions/rewind/{snapshot.ts → transport/snapshot.ts}

@@ -18,7 +18,7 @@ import {
 	type RunGit,
 } from "./git.ts";
 import { encodeMessage, refFor, META_VERSION, type SnapshotMeta } from "./store.ts";
-import type { Snapshot, SnapshotReason } from "./types.ts";
+import type { Snapshot, SnapshotReason } from "../types.ts";
 
 export interface SnapshotDeps {
 	runGit: RunGit;

package/extensions/rewind/{store.ts → transport/store.ts}

@@ -7,7 +7,7 @@
  */
 
 import { commitMessages, deleteRef, listRefs, type RunGit } from "./git.ts";
-import type { Snapshot, SnapshotReason } from "./types.ts";
+import type { Snapshot, SnapshotReason } from "../types.ts";
 
 /** Prefix of the metadata line in a snapshot commit body. */
 export const META_MARKER = "pi-rewind: ";

package/extensions/rewind/{checklist.ts → view/checklist.ts}

@@ -14,12 +14,12 @@
 
 import type { Theme } from "@earendil-works/pi-coding-agent";
 import { Key, matchesKey, type Component, type TuiMouseEvent, type TuiMouseEventResult } from "@earendil-works/pi-tui";
-import { detailBlockRows, dockListFrame, type ViewportRowsSource } from "../../lib/tui/chrome.ts";
-import { clip } from "../../lib/tui/columns.ts";
-import { fitRows, formatRange, isCloseKey, ListCursor, navigateList, scrollList } from "../../lib/tui/cursor.ts";
-import { emptyState } from "../../lib/tui/rows.ts";
-import { titleRule } from "../../lib/tui/rules.ts";
-import { paint } from "../../lib/tui/tokens.ts";
+import { detailBlockRows, dockListFrame, type ViewportRowsSource } from "../../../lib/tui/chrome.ts";
+import { clip } from "../../../lib/tui/columns.ts";
+import { fitRows, formatRange, isCloseKey, ListCursor, navigateList, scrollList } from "../../../lib/tui/cursor.ts";
+import { emptyState } from "../../../lib/tui/rows.ts";
+import { titleRule } from "../../../lib/tui/rules.ts";
+import { paint } from "../../../lib/tui/tokens.ts";
 
 /** Rows the checklist shows when the terminal height is unknown. */
 const SCREEN_DEFAULT_ITEMS = 12;

package/extensions/rewind/{hunk-picker.ts → view/hunk-picker.ts}

@@ -11,15 +11,15 @@
  */
 
 import type { Theme } from "@earendil-works/pi-coding-agent";
-import { sanitizeLine } from "../../lib/format.ts";
-import { screenHint, type ViewportRowsSource } from "../../lib/tui/chrome.ts";
-import { clip } from "../../lib/tui/columns.ts";
-import { SEPARATORS } from "../../lib/tui/glyphs.ts";
-import { checkbox, listRow } from "../../lib/tui/rows.ts";
-import { paint } from "../../lib/tui/tokens.ts";
+import { sanitizeLine } from "../../../lib/format.ts";
+import { screenHint, type ViewportRowsSource } from "../../../lib/tui/chrome.ts";
+import { clip } from "../../../lib/tui/columns.ts";
+import { SEPARATORS } from "../../../lib/tui/glyphs.ts";
+import { checkbox, listRow } from "../../../lib/tui/rows.ts";
+import { paint } from "../../../lib/tui/tokens.ts";
 import { ChecklistScreen } from "./checklist.ts";
-import { formatReviewEntryCounts } from "./format.ts";
-import type { Hunk } from "./patch.ts";
+import { formatReviewEntryCounts } from "../text/format.ts";
+import type { Hunk } from "../text/patch.ts";
 
 export interface HunkPickerOptions {
 	/** The file the hunks belong to. */

package/extensions/rewind/{path-picker.ts → view/path-picker.ts}

@@ -13,14 +13,14 @@
  */
 
 import type { Theme } from "@earendil-works/pi-coding-agent";
-import { sanitizeLine } from "../../lib/format.ts";
-import { screenHint, type ViewportRowsSource } from "../../lib/tui/chrome.ts";
-import { clip } from "../../lib/tui/columns.ts";
-import { SEPARATORS } from "../../lib/tui/glyphs.ts";
-import { checkbox, listRow } from "../../lib/tui/rows.ts";
-import { paint } from "../../lib/tui/tokens.ts";
+import { sanitizeLine } from "../../../lib/format.ts";
+import { screenHint, type ViewportRowsSource } from "../../../lib/tui/chrome.ts";
+import { clip } from "../../../lib/tui/columns.ts";
+import { SEPARATORS } from "../../../lib/tui/glyphs.ts";
+import { checkbox, listRow } from "../../../lib/tui/rows.ts";
+import { paint } from "../../../lib/tui/tokens.ts";
 import { ChecklistScreen } from "./checklist.ts";
-import { baseName, expandGroup, groupPaths, SELECTION_MARKS, type ChangedPath, type PathGroup } from "./paths.ts";
+import { baseName, expandGroup, groupPaths, SELECTION_MARKS, type ChangedPath, type PathGroup } from "../text/paths.ts";
 
 export interface PathPickerOptions {
 	/** The changed paths the snapshot differs on. */