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

package/extensions/bytefly/panel/commands.ts

@@ -1,12 +1,14 @@
 /**
- * The `/bytefly` surface: one command, `/bytefly [doctor] [settings] [skills] [update] [extension] [refresh]`.
+ * The `/bytefly` surface: one command, `/bytefly [doctor] [settings] [skills] [update] [upgrade] [extension] [refresh]`.
  *
  * Without a section word it opens the extension screen: the dock in `tui`, the
  * grouped listing elsewhere. `settings` opens the Settings section, or prints
  * its grouped listing outside `tui` without resolving packages. `skills` opens
  * the Skills section and lists the resolved skills in text modes. `update`
  * re-runs the published-version check and reports what it found, which is the
- * one place a request is made on demand. With `doctor` it produces the doctor
+ * one place a request is made on demand; `upgrade` asks Pi's own package manager
+ * to install what that check found, behind a confirmation, so the two verbs stay
+ * one job each — ask, and act. With `doctor` it produces the doctor
  * report — the same text `run_doctor` returns — for the whole set or one named
  * extension; in `tui` the report is the dock screen. Discovery, the doctor
  * probe, and the dirty-to-reload confirm all live here. The doctor runtime and
@@ -63,14 +65,22 @@ function selectableNames(discovery: Discovery): Set<string> {
 }
 
 /** The values a bare `/bytefly <tab>` offers, in screen order. */
-const FIRST_TOKENS = ["doctor", "settings", "skills", "update", ...Object.keys(REQUIREMENTS), "refresh"] as const;
+const FIRST_TOKENS = [
+	"doctor",
+	"settings",
+	"skills",
+	"update",
+	"upgrade",
+	...Object.keys(REQUIREMENTS),
+	"refresh",
+] as const;
 
 /**
  * Argument completions. The host replaces the whole argument text with the
  * returned `value`, so a second token returns the full `doctor <name>` or
  * `<name> refresh` argument rather than just the word. `/bytefly settings`,
- * `/bytefly skills`, and `/bytefly update` take no name, and `refresh` is never
- * followed by another token.
+ * `/bytefly skills`, `/bytefly update`, and `/bytefly upgrade` take no name, and
+ * `refresh` is never followed by another token.
  */
 function completions(prefix: string): Array<{ value: string; label: string }> | null {
 	const [first = "", second, ...rest] = prefix.trimStart().split(/\s+/);
@@ -79,7 +89,8 @@ function completions(prefix: string): Array<{ value: string; label: string }> |
 		const options = FIRST_TOKENS.filter((option) => option.startsWith(first));
 		return options.length > 0 ? options.map((option) => ({ value: `${option} `, label: option })) : null;
 	}
-	if (first === "settings" || first === "skills" || first === "refresh" || first === "update") return null;
+	if (first === "settings" || first === "skills" || first === "refresh" || first === "update" || first === "upgrade")
+		return null;
 	const options = (first === "doctor" ? [...Object.keys(REQUIREMENTS), "refresh"] : ["refresh"]).filter((option) =>
 		option.startsWith(second),
 	);
@@ -87,7 +98,7 @@ function completions(prefix: string): Array<{ value: string; label: string }> |
 }
 
 /** Which bytefly surface the arguments select. */
-type PanelMode = "screen" | "doctor" | "update";
+type PanelMode = "screen" | "doctor" | "update" | "upgrade";
 
 /** `/bytefly [doctor] [settings] [extension] [refresh]`, parsed. */
 interface PanelArgs {
@@ -109,6 +120,10 @@ function parseArgs(args: string): PanelArgs {
 	// `update` is already a refresh of the published version, so a stray `refresh`
 	// beside it is accepted and ignored rather than refused.
 	if (rest[0] === "update") return { mode: "update", section: "extensions", refresh };
+	// `upgrade` is the same subject as `update`, one verb further: it installs what a
+	// check found. Refusing to fold them into one word is what keeps a command that
+	// writes behind a confirmation instead of behind an argument.
+	if (rest[0] === "upgrade") return { mode: "upgrade", section: "extensions", refresh };
 	if (rest[0] === "settings") return { mode: "screen", section: "settings", name: rest[1], refresh };
 	if (rest[0] === "skills") return { mode: "screen", section: "skills", name: rest[1], refresh };
 	return { mode: "screen", section: "extensions", name: rest[0], refresh };
@@ -190,6 +205,24 @@ export function registerPanel(pi: ExtensionAPI, deps: PanelCommandDeps): void {
 			return;
 		}
 
+		// `/bytefly upgrade` is the only path here that writes, and it writes outside
+		// the session: Pi's package manager replaces the installed files, so the
+		// confirmation and the reload line are part of the answer, not decoration.
+		if (mode === "upgrade") {
+			const confirmed = await ctx.ui.confirm(
+				"Update packages?",
+				`Run Pi's package manager for every configured package, then reload to use it.`,
+			);
+			if (!confirmed) {
+				ctx.ui.notify("bytefly: update cancelled.", "info");
+				return;
+			}
+			const outcome = await deps.update.apply();
+			const { text, severity } = updateOutcomeText(outcome, pkg.version);
+			ctx.ui.notify(text, severity);
+			return;
+		}
+
 		// Settings outside `tui` prints its grouped listing without resolving
 		// packages or probing the doctor.
 		if (section === "settings" && ctx.mode !== "tui") {

package/extensions/bytefly/panel/settings-runtime.ts

@@ -88,12 +88,6 @@ function applyAppSetting(store: SettingsStore, row: SettingDescriptor, raw: stri
 		case "byteflyUi":
 			store.setQuietStartup(value as QuietStartup);
 			return;
-		case "outputPad":
-			store.setOutputPad(value as 0 | 1);
-			return;
-		case "showHardwareCursor":
-			store.setShowHardwareCursor(value as boolean);
-			return;
 		case "theme":
 			store.setTheme(value as string);
 			return;

package/extensions/bytefly/panel/settings.ts

@@ -25,7 +25,6 @@
  */
 
 import { configSection, configValueAt } from "../../../lib/config.ts";
-import { SPLIT_KEY, SPLIT_SECTION, SPLIT_SETTING_ID, SPLIT_SETTING_LABEL } from "../../../lib/plans/setting.ts";
 import { DEFAULT_CONFIG as DEFAULT_DOCTOR_CONFIG, normalizeConfig as normalizeDoctorConfig } from "../doctor/config.ts";
 import {
 	CURRENCY_DEFAULTS,
@@ -39,7 +38,7 @@ import { DEFAULT_NOTIFY_CONFIG, normalizeNotifyConfig } from "../notify/config.t
 import type { Settings, WriteScope } from "../picker/types.ts";
 
 /** Where a preference is stored. */
-type SettingSource = "app" | "bytefly" | "plan";
+type SettingSource = "app" | "bytefly";
 
 /** The row control a preference uses. */
 type SettingKind = "boolean" | "enum" | "text";
@@ -62,7 +61,7 @@ interface TextRule {
 }
 
 /** The `bytefly.json` sections a row still reaches. */
-export type ConfigSectionName = "notify" | "doctor" | "price" | "rewind" | "job" | "plan";
+export type ConfigSectionName = "notify" | "doctor" | "price" | "rewind" | "job";
 
 /** Where a `bytefly.json` row lives: a section, and the path to its leaf. */
 interface SettingConfig {
@@ -125,8 +124,6 @@ const ON_OFF: readonly SettingOption[] = [
 	{ value: "true", label: "On" },
 ];
 
-/** The notify section's delivery methods, labeled by the surface each reaches. */
-
 /**
  * A text rule for a money amount inside an inclusive range: a whole number or a
  * decimal with up to four places, matching the loader's clamp for `price.budget`.
@@ -148,7 +145,7 @@ function amountRule(min: number, max: number): TextRule {
 /**
  * The catalogue, in screen order.
  *
- * Global scope lists all thirteen; Project lists the eleven `bytefly.json` rows,
+ * Global scope lists all twelve; Project lists the ten `bytefly.json` rows,
  * because Pi's setters write the personal `settings.json` only. The list is
  * capped so the screen keeps fitting a 24-row terminal.
  */
@@ -296,20 +293,6 @@ export const SETTING_ROWS: readonly SettingDescriptor[] = [
 		text: amountRule(0, MAX_BUDGET),
 		config: { section: "price", path: ["budget"] },
 	},
-	{
-		// The split's switch, with the label, id, and default taken from the module
-		// that reads it, so this row cannot describe a key nothing honours.
-		id: SPLIT_SETTING_ID,
-		label: SPLIT_SETTING_LABEL,
-		description:
-			"Let an approved plan carry a team of slices, which separate sessions join by name. Off keeps every plan one flow.",
-		source: "plan",
-		kind: "boolean",
-		fallback: "false",
-		json: "boolean",
-		options: ON_OFF,
-		config: { section: SPLIT_SECTION, path: [SPLIT_KEY] },
-	},
 ];
 
 /** The one refusal for a Project write while the project is untrusted. */

package/extensions/bytefly/panel/tui/settings-view.ts

@@ -129,7 +129,7 @@ export function settingDetail(options: {
 	if (budget === 0) return saved;
 
 	const lines = [headLine];
-	const descriptionWidth = Math.max(1, width - BODY_INDENT * 2);
+	const descriptionWidth = Math.max(1, width - BODY_INDENT);
 	const description = wrapTextWithAnsi(sanitizeLine(view.description), descriptionWidth).slice(
 		0,
 		Math.max(0, Math.min(2, budget - 2 - saved.length)),

package/extensions/bytefly/picker/discovery.ts

@@ -46,8 +46,6 @@ export function createSettingsStore(manager: SettingsManager): SettingsStore {
 		setProjectSkillPaths: (paths) => manager.setProjectSkillPaths(paths),
 		setProjectPackages: (packages) => manager.setProjectPackages(packages),
 		setQuietStartup: (quiet) => manager.setQuietStartup(quiet),
-		setOutputPad: (padding) => manager.setOutputPad(padding),
-		setShowHardwareCursor: (enabled) => manager.setShowHardwareCursor(enabled),
 		setTheme: (theme) => manager.setTheme(theme),
 		isProjectTrusted: () => manager.isProjectTrusted(),
 		flush: () => manager.flush(),

package/extensions/bytefly/picker/types.ts

@@ -47,8 +47,6 @@ export interface SettingsStore {
 	setProjectPackages(packages: PackageSource[]): void;
 	/** App preferences are written to the personal settings file. */
 	setQuietStartup(quiet: QuietStartup): void;
-	setOutputPad(padding: 0 | 1): void;
-	setShowHardwareCursor(enabled: boolean): void;
 	/** Pi's theme setting is a personal-file preference. */
 	setTheme(theme: string): void;
 	isProjectTrusted(): boolean;

package/extensions/bytefly/update/check.ts

@@ -11,6 +11,7 @@
  */
 
 import { DefaultPackageManager, getAgentDir, SettingsManager } from "@earendil-works/pi-coding-agent";
+import type { ProgressEvent } from "@earendil-works/pi-coding-agent";
 import type { PackageUpdate, PackageUpdateCheck } from "./types.ts";
 import { parseVersion } from "./version.ts";
 
@@ -51,6 +52,44 @@ export interface AvailableUpdatesDeps {
 	checkForAvailableUpdates?: PackageUpdateCheck;
 }
 
+/** What applying an update needs: the same manager the check builds, plus a source. */
+export interface ApplyUpdatesDeps {
+	/** Session working directory. */
+	cwd: string;
+	/** Pi agent directory; defaults to `getAgentDir()`. */
+	agentDir?: string;
+	/** Whether project-local packages may be read. */
+	projectTrusted: boolean;
+	/** One source to update; every configured package when omitted. */
+	source?: string;
+	/** Called as Pi's manager reports progress, so a surface can show one line. */
+	onProgress?: (message: string) => void;
+}
+
+/**
+ * Apply the update through Pi's own package manager.
+ *
+ * This is deliberately not a shell: `pi update --extensions` is a command a human
+ * types, while `update()` is the manager that owns the install root, the settings
+ * that name each package, and the npm command a project configured. It resolves
+ * nothing interactively, honors `PI_OFFLINE` by returning early, and skips a
+ * pinned npm version — so the caller's job is the confirmation and the report, not
+ * the mechanics. It throws when a named source matches no configured package or
+ * when the install command fails, and returns nothing on success.
+ */
+export async function applyUpdates(deps: ApplyUpdatesDeps): Promise<void> {
+	const agentDir = deps.agentDir ?? getAgentDir();
+	const settingsManager = SettingsManager.create(deps.cwd, agentDir, { projectTrusted: deps.projectTrusted });
+	const manager = new DefaultPackageManager({ cwd: deps.cwd, agentDir, settingsManager });
+	const report = deps.onProgress;
+	if (report) {
+		manager.setProgressCallback((event: ProgressEvent) => {
+			if (event.message) report(event.message);
+		});
+	}
+	await manager.update(deps.source);
+}
+
 /**
  * Every package Pi would update, or `undefined` when the check cannot run.
  *

package/extensions/bytefly/update/format.ts

@@ -174,6 +174,21 @@ export function updateOutcomeText(
 			};
 		case "current":
 			return { text: "bytefly: up to date — no configured package has an update.", severity: "info" };
+		case "update-failed":
+			return {
+				text: `bytefly: the update did not finish — ${sanitizeLine(outcome.reason)}`,
+				severity: "warning",
+			};
+		case "updated":
+			return outcome.pending
+				? {
+						text: `bytefly: the update ran, but a package is still behind — run ${UPDATE_COMMAND} or /bytefly update.`,
+						severity: "warning",
+					}
+				: {
+						text: "bytefly: every configured package is updated — reload to use the new version.",
+						severity: "info",
+					};
 		case "available": {
 			const own = outcome.updates.some(isOwnPackage);
 			const release = own ? ownRelease(outcome.ownLatest) : undefined;

package/extensions/bytefly/update/register.ts

@@ -17,6 +17,7 @@
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
 import pkg from "../../../package.json";
+import { messageOf } from "../../../lib/errors.ts";
 import { isOffline } from "../../../lib/env.ts";
 import {
 	isFresh,
@@ -26,7 +27,7 @@ import {
 	writeUpdateCache,
 	type UpdateCacheEntry,
 } from "./cache.ts";
-import { fetchAvailableUpdates, fetchLatestVersion } from "./check.ts";
+import { applyUpdates, fetchAvailableUpdates, fetchLatestVersion } from "./check.ts";
 import { isOwnPackage, updateNotice } from "./format.ts";
 import { paintLatest, type UpdateOutcome, type UpdateSource } from "./state.ts";
 import { suppressPiPackageUpdates, type UpdateSuppression } from "./suppress.ts";
@@ -45,6 +46,8 @@ export interface UpdateCache {
 export interface UpdateHandle {
 	/** Read the package list now, ignoring the cache window. Never throws. */
 	recheck(): Promise<UpdateOutcome>;
+	/** Apply the update, then re-read it. Never throws. */
+	apply(): Promise<UpdateOutcome>;
 }
 
 /** Test seams; production uses Pi's package manager, its cache, and the agent dir. */
@@ -53,6 +56,8 @@ export interface UpdateDeps {
 	readUpdates?: (ctx: ExtensionContext, check: PackageUpdateCheck) => Promise<PackageUpdate[] | undefined>;
 	/** Replace the registry read that names this package's new version. */
 	fetchLatest?: () => Promise<string | undefined>;
+	/** Replace the package-manager update; defaults to Pi's own manager. */
+	applyUpdates?: (ctx: ExtensionContext) => Promise<void>;
 	/** Replace the `PI_OFFLINE` check. */
 	isOffline?: () => boolean;
 	/** Replace the disk cache. */
@@ -94,6 +99,16 @@ export function registerUpdate(pi: ExtensionAPI, updates: UpdateSource, deps: Up
 				checkForAvailableUpdates: check,
 			}));
 	const readLatest = deps.fetchLatest ?? (() => fetchLatestVersion());
+	const applyUpdate =
+		deps.applyUpdates ??
+		((ctx: ExtensionContext) =>
+			applyUpdates({
+				cwd: ctx.cwd,
+				agentDir: getAgentDir(),
+				projectTrusted: ctx.isProjectTrusted(),
+				// Pi's manager reports one line per source; a slow install is otherwise silent.
+				onProgress: (message) => ctx.ui.notify(message, "info"),
+			}));
 	const offline = deps.isOffline ?? isOffline;
 	const cache = deps.cache ?? diskCache();
 	const now = deps.now ?? Date.now;
@@ -155,6 +170,22 @@ export function registerUpdate(pi: ExtensionAPI, updates: UpdateSource, deps: Up
 		return latest && isNewerVersion(latest, pkg.version) ? latest : undefined;
 	};
 
+	/**
+	 * One snapshot from a package list: this package's version label, the cache key,
+	 * and the clock. The background check and the panel's recheck differ only in what
+	 * they do with a snapshot, so the assembly lives here once instead of being
+	 * copied wherever something new needs to record a reading.
+	 */
+	const buildSnapshot = async (ctx: ExtensionContext, list: PackageUpdate[]): Promise<UpdateCacheEntry> => {
+		const latest = await resolveOwnLatest(list.find(isOwnPackage));
+		return {
+			key: keyFor(ctx),
+			checkedAt: now(),
+			updates: list,
+			...(latest ? { latest } : {}),
+		};
+	};
+
 	const check = async (ctx: ExtensionContext, token: number): Promise<void> => {
 		try {
 			const list = await readUpdates(ctx, activeCheck());
@@ -163,14 +194,8 @@ export function registerUpdate(pi: ExtensionAPI, updates: UpdateSource, deps: Up
 			// the next session "up to date" for a day and clear a marker that may still
 			// be right, so leave both alone and try again next time.
 			if (list === undefined) return;
-			const latest = await resolveOwnLatest(list.find(isOwnPackage));
+			const entry = await buildSnapshot(ctx, list);
 			if (token !== generation) return;
-			const entry: UpdateCacheEntry = {
-				key: keyFor(ctx),
-				checkedAt: now(),
-				updates: list,
-				...(latest ? { latest } : {}),
-			};
 			writeCache(entry);
 			record(entry);
 		} catch {
@@ -210,31 +235,45 @@ export function registerUpdate(pi: ExtensionAPI, updates: UpdateSource, deps: Up
 		context = undefined;
 	});
 
-	return {
-		async recheck() {
-			if (offline()) return { kind: "offline" };
-			if (!context) return { kind: "failed" };
-			let list: PackageUpdate[];
-			try {
-				const found = await readUpdates(context, activeCheck());
-				if (found === undefined) return { kind: "failed" };
-				list = found;
-			} catch {
-				return { kind: "failed" };
-			}
-			const latest = await resolveOwnLatest(list.find(isOwnPackage));
-			const entry: UpdateCacheEntry = {
-				key: keyFor(context),
-				checkedAt: now(),
-				updates: list,
-				...(latest ? { latest } : {}),
-			};
-			writeCache(entry);
-			// The caller prints the answer, so this path never posts a notice.
-			paintLatest(updates, latest, deps.onUpdate);
-			return list.length > 0
-				? { kind: "available", updates: list, ...(latest ? { ownLatest: latest } : {}) }
-				: { kind: "current" };
-		},
+	/** Re-read the published state on demand; `/bytefly update` prints the answer. */
+	const recheck = async (): Promise<UpdateOutcome> => {
+		if (offline()) return { kind: "offline" };
+		if (!context) return { kind: "failed" };
+		let list: PackageUpdate[];
+		try {
+			const found = await readUpdates(context, activeCheck());
+			if (found === undefined) return { kind: "failed" };
+			list = found;
+		} catch {
+			return { kind: "failed" };
+		}
+		const entry = await buildSnapshot(context, list);
+		writeCache(entry);
+		// The caller prints the answer, so this path never posts a notice.
+		const ownLatest = ownLatestOf(entry);
+		paintLatest(updates, ownLatest, deps.onUpdate);
+		return list.length > 0
+			? { kind: "available", updates: list, ...(ownLatest ? { ownLatest } : {}) }
+			: { kind: "current" };
 	};
+
+	/**
+	 * Apply the update through Pi's manager, then re-read it: the snapshot on disk and
+	 * on screen described the version that was just replaced, so leaving it would keep
+	 * a marker for code this session no longer runs. `pending` is the manager reporting
+	 * success over a package that is still behind, which is worth saying out loud.
+	 */
+	const apply = async (): Promise<UpdateOutcome> => {
+		if (offline()) return { kind: "offline" };
+		if (!context) return { kind: "failed" };
+		try {
+			await applyUpdate(context);
+		} catch (error) {
+			return { kind: "update-failed", reason: messageOf(error) };
+		}
+		const after = await recheck();
+		return { kind: "updated", pending: after.kind === "available" };
+	};
+
+	return { recheck, apply };
 }

package/extensions/bytefly/update/state.ts

@@ -20,13 +20,16 @@ export interface UpdateSource {
 }
 
 /**
- * What one explicit re-check found. The background check reports nothing — nobody
- * asked — so this vocabulary exists only for `/bytefly update`, where a failure or
- * a skip is an answer rather than silence.
+ * What one explicit update reported. The background check reports nothing — nobody
+ * asked — so this vocabulary exists only for `/bytefly update` and
+ * `/bytefly upgrade`, where a failure, a skip, or a refusal is an answer rather
+ * than silence.
  */
 export type UpdateOutcome =
 	| { kind: "offline" }
 	| { kind: "failed" }
+	| { kind: "update-failed"; reason: string }
+	| { kind: "updated"; pending: boolean }
 	| { kind: "current" }
 	| { kind: "available"; updates: readonly PackageUpdate[]; ownLatest?: string };
 

package/extensions/context/tui.ts

@@ -203,7 +203,7 @@ export class ContextComponent implements Component {
 			lines.push("", `  ${paint(this.theme, "label", "Largest messages")}`);
 			for (const block of report.largest) {
 				const tokens = formatTokens(block.tokens).padStart(6);
-				const role = padCell(block.role, 11);
+				const role = padCell(block.role, 12);
 				const candidate = `    ${paint(this.theme, "meta", tokens)}  ${paint(this.theme, "label", role)}${block.label}`;
 				lines.push(truncateToWidth(candidate, width));
 			}

package/extensions/file-browse/{config.ts → config/config.ts}

@@ -7,7 +7,7 @@
  */
 
 import { randomInt } from "node:crypto";
-import { asBoolean, clampInteger, loadConfigSection } from "../../lib/config.ts";
+import { asBoolean, clampInteger, loadConfigSection } from "../../../lib/config.ts";
 
 export interface ServeConfig {
 	/** TCP port on 127.0.0.1; `0` picks one random port fixed for the session, a positive value pins it. */

package/extensions/file-browse/{files.ts → files/files.ts}

@@ -8,7 +8,7 @@
 import type { Dirent, Stats } from "node:fs";
 import { readFile, readdir, stat, lstat } from "node:fs/promises";
 import { basename, extname, join } from "node:path";
-import { mapConcurrent } from "../../lib/pool.ts";
+import { mapConcurrent } from "../../../lib/pool.ts";
 import { HttpError } from "./paths.ts";
 
 export type EntryKind = "directory" | "text" | "image" | "binary";
@@ -166,19 +166,6 @@ export function isProbablyText(sample: Buffer): boolean {
 	return suspicious / sample.length < 0.3;
 }
 
-/** Compact byte size: `68 B`, `12.4 kB`, `1.5 MB`. */
-export function formatSize(bytes: number): string {
-	if (bytes < 1024) return `${bytes} B`;
-	const units = ["kB", "MB", "GB", "TB"];
-	let value = bytes;
-	let index = -1;
-	do {
-		value /= 1024;
-		index++;
-	} while (value >= 1024 && index < units.length - 1);
-	return `${value < 10 ? value.toFixed(1) : Math.round(value)} ${units[index]}`;
-}
-
 /** MIME type for a name; text is always served as plain text. */
 export function contentTypeFor(name: string): string {
 	const ext = extname(name).slice(1).toLowerCase();

package/extensions/file-browse/{paths.ts → files/paths.ts}

@@ -9,7 +9,7 @@
 
 import { realpathSync } from "node:fs";
 import { basename, dirname, isAbsolute, relative, resolve, sep } from "node:path";
-import { isInside } from "../../lib/path.ts";
+import { isInside } from "../../../lib/path.ts";
 
 /** An HTTP-shaped failure the router turns into a status page. */
 export class HttpError extends Error {

package/extensions/file-browse/{git.ts → git/git.ts}

@@ -9,7 +9,14 @@
  */
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { createExecRunner, currentBranch, hasCommits, repoRoot, revParse, type RunGit } from "../../lib/git/index.ts";
+import {
+	createExecRunner,
+	currentBranch,
+	hasCommits,
+	repoRoot,
+	revParse,
+	type RunGit,
+} from "../../../lib/git/index.ts";
 import {
 	diffArgs,
 	inMode,
@@ -18,8 +25,8 @@ import {
 	type ChangedFile,
 	type DiffLine,
 	type DiffMode,
-} from "./diff.ts";
-import { readFileView } from "./files.ts";
+} from "../text/diff.ts";
+import { readFileView } from "../files/files.ts";
 
 export interface GitStatus {
 	/** Checked-out branch, when HEAD is attached. */

package/extensions/file-browse/index.ts

@@ -16,11 +16,11 @@ import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-a
 import { isExtensionEnabled, resolveEffectiveCwd } from "../../lib/env.ts";
 import { GLYPHS, STATUS_KEYS } from "../../lib/tui/glyphs.ts";
 import { paint } from "../../lib/tui/tokens.ts";
-import { loadConfig, randomPort } from "./config.ts";
-import { createGitDiff, createGitStatus } from "./git.ts";
+import { loadConfig, randomPort } from "./config/config.ts";
+import { createGitDiff, createGitStatus } from "./git/git.ts";
 import { openInBrowser } from "../../lib/browser.ts";
-import { HttpError, resolveRequestPath } from "./paths.ts";
-import { createFileServer, type FileServer } from "./server.ts";
+import { HttpError, resolveRequestPath } from "./files/paths.ts";
+import { createFileServer, type FileServer } from "./transport/server.ts";
 
 export interface FileBrowserDeps {
 	/** Override the server factory (tests). */