@narumitw/pi-sync 0.35.0 → 0.38.0

package/src/settings-ui.ts

@@ -1,8 +1,5 @@
-import {
-	type ExtensionCommandContext,
-	getSettingsListTheme,
-} from "@earendil-works/pi-coding-agent";
-import { Container, type SettingItem, SettingsList, Text } from "@earendil-works/pi-tui";
+import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
+import { defineMenu, runMenu } from "@narumitw/pi-tui-kit";
 import { loadConfig, localConfigPath } from "./config.js";
 import { updateSyncSetup } from "./settings-management.js";
 import {
@@ -30,149 +27,110 @@ export async function showSyncSettings(
 		ctx.ui.notify(`Edit pi-sync settings manually: ${safeTerminalText(localConfigPath())}`, "info");
 		return;
 	}
-	while (!signal?.aborted) {
-		const config = await loadConfig();
-		if (signal?.aborted) return;
-		const action = await showSettingsList(ctx, config, signal);
-		if (signal?.aborted || action !== "files") return;
-		await runRoute("files", signal, undefined, config.setupName);
-	}
-}
-
-async function showSettingsList(
-	ctx: ExtensionCommandContext,
-	config: Awaited<ReturnType<typeof loadConfig>>,
-	signal?: AbortSignal,
-) {
-	const automaticValue = config.automatic ? "On" : "Off";
-	const switchValue = setupSwitchActionLabel(config.onSwitch);
-	let saveQueue = Promise.resolve();
-	const latestRequested = new Map<string, string>();
-	const mutationController = new AbortController();
-	const mutationSignal = signal
-		? AbortSignal.any([signal, mutationController.signal])
-		: mutationController.signal;
-
-	return ctx.ui.custom<"files" | undefined>((tui, theme, _keybindings, done) => {
-		const items: SettingItem[] = [
-			{
-				id: "automatic",
-				label: "Automatic sync",
-				description: "Run conservative synchronization at session startup and shutdown.",
-				currentValue: automaticValue,
-				values: ["On", "Off"],
-			},
-			{
-				id: "onSwitch",
-				label: "After switching setup",
-				description:
-					"Ask before a reviewed pull, start a reviewed pull, or switch without checking remote files.",
-				currentValue: switchValue,
-				values: SETUP_SWITCH_ACTION_OPTIONS.map(({ label }) => label),
-			},
-			{
-				id: "include",
-				label: "Included content",
-				description: `${config.include.length} selected path${config.include.length === 1 ? "" : "s"}. Opens the reviewed content-selection draft.`,
-				currentValue: "Open editor",
-				values: ["Open editor"],
-			},
-		];
-		const container = new Container();
-		container.addChild(new Text(theme.fg("accent", theme.bold("Pi Sync Settings")), 1, 0));
-		container.addChild(
-			new Text(
-				theme.fg(
-					"muted",
-					`Sync setup: ${safeTerminalText(config.setupName)} · Storage connection: ${safeTerminalText(config.connectionName)}`,
-				),
-				1,
-				0,
-			),
-		);
-		let settingsList: SettingsList;
-		let closing = false;
-		let disposed = false;
-		const closeAfterSaves = (result: "files" | undefined) => {
-			if (closing || disposed) return;
-			closing = true;
-			void saveQueue.then(() => {
-				if (!disposed) done(signal?.aborted ? undefined : result);
-			});
-		};
-		const onAbort = () => {
-			if (!closing && !disposed) done(undefined);
-		};
-		signal?.addEventListener("abort", onAbort, { once: true });
-		settingsList = new SettingsList(
-			items,
-			Math.min(items.length + 2, 15),
-			getSettingsListTheme(),
-			(id, newValue) => {
-				if (id === "include") {
-					closeAfterSaves("files");
-					return;
+	const initial = await loadConfig();
+	if (signal?.aborted) return;
+	const setupName = initial.setupName;
+	type Action = "automatic" | "on-switch" | "include";
+	const menu = defineMenu<
+		Awaited<ReturnType<typeof loadConfig>>,
+		"settings",
+		Action,
+		ExtensionCommandContext
+	>({
+		start: "settings",
+		screens: {
+			settings: ({ state }) => ({
+				kind: "settings",
+				title: "Pi Sync Settings",
+				lines: [
+					`Sync setup: ${safeTerminalText(state.setupName)} · Storage connection: ${safeTerminalText(state.connectionName)}`,
+				],
+				items: [
+					{
+						id: "automatic",
+						label: "Automatic sync",
+						description: "Run conservative synchronization at session startup and shutdown.",
+						currentValue: state.automatic ? "On" : "Off",
+						values: ["On", "Off"],
+						action: "automatic",
+					},
+					{
+						id: "onSwitch",
+						label: "After switching setup",
+						description:
+							"Ask before a reviewed pull, start a reviewed pull, or switch without checking remote files.",
+						currentValue: setupSwitchActionLabel(state.onSwitch),
+						values: SETUP_SWITCH_ACTION_OPTIONS.map(({ label }) => label),
+						action: "on-switch",
+					},
+					{
+						id: "include",
+						label: "Included content",
+						description: `${state.include.length} selected path${state.include.length === 1 ? "" : "s"}. Opens the reviewed content-selection draft.`,
+						currentValue: "Open editor",
+						action: "include",
+					},
+				],
+			}),
+		},
+		actions: {
+			automatic: async ({ value, signal: actionSignal }) => {
+				const automatic = value === "On";
+				const mutationSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
+				try {
+					const latest = await loadConfig(setupName);
+					if (mutationSignal.aborted) return { kind: "rejected" };
+					if (latest.automatic === automatic) return { kind: "stay" };
+					await updateSyncSetup(
+						setupName,
+						(setup) => ({ ...setup, sync: { ...setup.sync, automatic } }),
+						{ signal: mutationSignal },
+					);
+					if (mutationSignal.aborted) return { kind: "rejected" };
+					ctx.ui.notify(
+						`Automatic sync ${automatic ? "enabled" : "disabled"} for “${safeTerminalText(setupName)}”.`,
+						"info",
+					);
+					return { kind: "stay" };
+				} catch (error) {
+					if (!mutationSignal.aborted) notifySaveFailure(ctx, error);
+					return { kind: "rejected" };
 				}
-				latestRequested.set(id, newValue);
-				const fallback = id === "automatic" ? automaticValue : switchValue;
-				const operation = saveQueue.then(async () => {
-					if (disposed || signal?.aborted) return;
-					let previousValue = fallback;
-					try {
-						const latest = await loadConfig(config.setupName);
-						if (disposed || signal?.aborted) return;
-						if (id === "automatic") {
-							previousValue = latest.automatic ? "On" : "Off";
-							const automatic = newValue === "On";
-							await updateSyncSetup(
-								config.setupName,
-								(setup) => ({
-									...setup,
-									sync: { ...setup.sync, automatic },
-								}),
-								{ signal: mutationSignal },
-							);
-							if (disposed || signal?.aborted) return;
-							ctx.ui.notify(
-								`Automatic sync ${automatic ? "enabled" : "disabled"} for “${safeTerminalText(config.setupName)}”.`,
-								"info",
-							);
-						} else {
-							previousValue = setupSwitchActionLabel(latest.onSwitch);
-							const action = setupSwitchActionFromLabel(newValue);
-							if (!action) throw new Error(`Invalid setup-switch action: ${newValue}`);
-							await saveOnSwitch(action, mutationSignal);
-							if (disposed || signal?.aborted) return;
-							ctx.ui.notify(`After switching setup: ${newValue}.`, "info");
-						}
-					} catch (error) {
-						if (disposed || signal?.aborted) return;
-						if (latestRequested.get(id) === newValue) settingsList.updateValue(id, previousValue);
-						ctx.ui.notify(
-							`Pi Sync settings save failed: ${error instanceof Error ? error.message : String(error)}`,
-							"error",
-						);
-						tui.requestRender();
-					}
-				});
-				saveQueue = operation.catch(() => undefined);
 			},
-			() => closeAfterSaves(undefined),
-		);
-		container.addChild(settingsList);
-		return {
-			render: (width: number) => container.render(width),
-			invalidate: () => container.invalidate(),
-			handleInput(data: string) {
-				if (disposed) return;
-				settingsList.handleInput?.(data);
-				tui.requestRender();
+			"on-switch": async ({ value, signal: actionSignal }) => {
+				const action = value ? setupSwitchActionFromLabel(value) : undefined;
+				if (!action) return { kind: "rejected" };
+				const mutationSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
+				try {
+					const latest = await loadConfig(setupName);
+					if (mutationSignal.aborted) return { kind: "rejected" };
+					if (latest.onSwitch === action) return { kind: "stay" };
+					await saveOnSwitch(action, mutationSignal);
+					if (mutationSignal.aborted) return { kind: "rejected" };
+					ctx.ui.notify(`After switching setup: ${value}.`, "info");
+					return { kind: "stay" };
+				} catch (error) {
+					if (!mutationSignal.aborted) notifySaveFailure(ctx, error);
+					return { kind: "rejected" };
+				}
 			},
-			dispose() {
-				disposed = true;
-				mutationController.abort(new DOMException("Settings UI disposed", "AbortError"));
-				signal?.removeEventListener("abort", onAbort);
+			include: async ({ signal: actionSignal }) => {
+				const editorSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
+				await runRoute("files", editorSignal, undefined, setupName);
+				return editorSignal.aborted ? { kind: "rejected" } : { kind: "stay" };
 			},
-		};
+		},
 	});
+	await runMenu(ctx, menu, {
+		getState: () => loadConfig(setupName),
+		signal,
+		isCurrent: () => !signal?.aborted,
+	});
+}
+
+function notifySaveFailure(ctx: ExtensionCommandContext, error: unknown) {
+	ctx.ui.notify(
+		`Pi Sync settings save failed: ${error instanceof Error ? error.message : String(error)}`,
+		"error",
+	);
 }

package/src/storage-connections-ui.ts

@@ -1,4 +1,5 @@
 import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
+import { defineMenu, runMenu } from "@narumitw/pi-tui-kit";
 import { isCloudflareR2Endpoint, readLocalConfigObject } from "./config.js";
 import { showAddGitStorageProfile, showEditGitStorageProfile } from "./git-ui.js";
 import { errorMessage, ownRecord, requiredInput, safeTerminalText } from "./manager-helpers.js";
@@ -14,64 +15,151 @@ import {
 } from "./settings-management.js";
 import { showAddWebDavStorageProfile, showEditWebDavStorageProfile } from "./webdav-ui.js";
 
-const BACK = "Back";
-
 export async function showStorageConnections(ctx: ExtensionCommandContext, signal?: AbortSignal) {
-	while (!signal?.aborted) {
-		const raw = await readLocalConfigObject();
-		if (signal?.aborted) return;
-		if (raw?.version !== 3) {
-			ctx.ui.notify("Create version 3 settings before managing storage connections.", "info");
-			return;
-		}
-		const profiles = ownRecord(raw.storageConnections) ?? {};
-		const labels = new Map(
-			Object.keys(profiles)
-				.sort((left, right) => left.localeCompare(right))
-				.map((name) => [safeTerminalText(name), name]),
-		);
-		const selected = await ctx.ui.select(
-			"Storage connections",
-			["Add storage connection", ...labels.keys(), BACK],
-			{ signal },
-		);
-		if (signal?.aborted || !selected || selected === BACK) return;
-		if (selected === "Add storage connection") {
-			try {
-				await showAddStorageConnection(ctx, signal);
-			} catch (error) {
-				if (signal?.aborted) return;
-				ctx.ui.notify(
-					`Storage connection was not added: ${safeTerminalText(errorMessage(error))} Retry from Add storage connection.`,
-					"error",
+	let selectedName: string | undefined;
+	const nameById = new Map<string, string>();
+	type Screen = "list" | "detail";
+	type Action = "add" | "select" | "edit" | "remove" | "back";
+	const menu = defineMenu<
+		Awaited<ReturnType<typeof loadStorageMenuState>>,
+		Screen,
+		Action,
+		ExtensionCommandContext
+	>({
+		start: "list",
+		screens: {
+			list: ({ state }) => {
+				nameById.clear();
+				const names = Object.keys(state.profiles).sort((left, right) => left.localeCompare(right));
+				return {
+					kind: "actions",
+					title: "Storage connections",
+					lines: state.version3
+						? []
+						: ["Create version 3 settings before managing storage connections."],
+					items: state.version3
+						? [
+								{ id: "add", label: "Add storage connection", action: "add" as const },
+								...names.map((name, index) => {
+									const id = `connection:${index}`;
+									nameById.set(id, name);
+									return {
+										id,
+										label: safeTerminalText(name),
+										action: "select" as const,
+									};
+								}),
+							]
+						: [],
+					hint: "back",
+				};
+			},
+			detail: ({ state }) => ({
+				kind: "actions",
+				title: state.selected
+					? `Storage connection “${safeTerminalText(state.selected.name)}”`
+					: "Storage connection",
+				lines: state.selected?.lines ?? ["This storage connection no longer exists."],
+				items: state.selected
+					? [
+							{ id: "edit", label: "Edit storage connection…", action: "edit" },
+							...(state.selected.usedBy.length === 0
+								? [
+										{
+											id: "remove",
+											label: "Remove storage connection…",
+											action: "remove" as const,
+										},
+									]
+								: []),
+							{ id: "back", label: "Back", action: "back" },
+						]
+					: [{ id: "back", label: "Back", action: "back" }],
+				hint: "back",
+			}),
+		},
+		actions: {
+			add: async () => {
+				try {
+					await showAddStorageConnection(ctx, signal);
+				} catch (error) {
+					if (!signal?.aborted) {
+						ctx.ui.notify(
+							`Storage connection was not added: ${safeTerminalText(errorMessage(error))} Retry from Add storage connection.`,
+							"error",
+						);
+					}
+				}
+				return { kind: "stay" };
+			},
+			select: async ({ itemId }) => {
+				selectedName = nameById.get(itemId);
+				return selectedName ? { kind: "to", screen: "detail" } : { kind: "rejected" };
+			},
+			edit: async ({ state }) => {
+				if (!state.selected || state.selected.name !== selectedName) return { kind: "rejected" };
+				try {
+					await editStorageConnection(
+						ctx,
+						state.selected.name,
+						state.selected.profile,
+						state.selected.usedBy,
+						signal,
+					);
+				} catch (error) {
+					notifyConnectionError(ctx, state.selected.name, error, signal);
+				}
+				return { kind: "stay" };
+			},
+			remove: async ({ state }) => {
+				if (!state.selected || state.selected.name !== selectedName) return { kind: "rejected" };
+				const name = state.selected.name;
+				const confirmed = await ctx.ui.confirm(
+					"Remove storage connection?",
+					`Remove local storage connection “${safeTerminalText(name)}”? Remote data and history are not deleted.`,
+					{ signal },
 				);
-			}
-			continue;
-		}
-		const name = labels.get(selected);
-		if (name) await showStorageConnectionDetail(ctx, name, signal);
-	}
+				if (!confirmed || signal?.aborted) return { kind: "rejected" };
+				try {
+					await removeStorageConnection(name, signal);
+					ctx.ui.notify(`Removed storage connection “${safeTerminalText(name)}”.`, "info");
+					selectedName = undefined;
+					return { kind: "back" };
+				} catch (error) {
+					notifyConnectionError(ctx, name, error, signal);
+					return { kind: "stay" };
+				}
+			},
+			back: async () => {
+				selectedName = undefined;
+				return { kind: "back" };
+			},
+		},
+	});
+	await runMenu(ctx, menu, {
+		getState: () => loadStorageMenuState(selectedName, signal),
+		signal,
+		isCurrent: () => !signal?.aborted,
+	});
 }
 
-async function showStorageConnectionDetail(
-	ctx: ExtensionCommandContext,
-	name: string,
-	signal?: AbortSignal,
-) {
-	while (!signal?.aborted) {
-		const raw = await readLocalConfigObject();
-		if (signal?.aborted) return;
-		const profiles = ownRecord(raw?.storageConnections) ?? {};
-		const profile = ownRecord(profiles[name]);
-		if (!profile) {
-			ctx.ui.notify(`Storage connection “${safeTerminalText(name)}” no longer exists.`, "warning");
-			return;
-		}
-		const usedBy = referencingSetups(raw, name);
-		const selected = await ctx.ui.select(
-			[
-				`Storage connection “${safeTerminalText(name)}”`,
-				"",
+async function loadStorageMenuState(selectedName: string | undefined, signal?: AbortSignal) {
+	const raw = await readLocalConfigObject();
+	if (signal?.aborted) throw signal.reason;
+	const profiles = ownRecord(raw?.storageConnections) ?? {};
+	const profile = selectedName ? ownRecord(profiles[selectedName]) : undefined;
+	if (!selectedName || !profile) {
+		return { version3: raw?.version === 3, profiles, selected: undefined };
+	}
+	const usedBy = referencingSetups(raw, selectedName);
+	return {
+		version3: raw?.version === 3,
+		profiles,
+		selected: {
+			name: selectedName,
+			profile,
+			usedBy,
+			lines: [
 				`Type: ${connectionType(profile)}`,
 				`Endpoint: ${connectionEndpoint(profile)}`,
 				`Credentials: ${credentialSource(profile)}`,
@@ -79,36 +167,22 @@ async function showStorageConnectionDetail(
 				...(usedBy.length > 0
 					? ["Remove unavailable: edit or remove the listed sync setups first."]
 					: []),
-			].join("\n"),
-			[
-				"Edit storage connection…",
-				...(usedBy.length === 0 ? ["Remove storage connection…"] : []),
-				BACK,
 			],
-			{ signal },
-		);
-		if (signal?.aborted || !selected || selected === BACK) return;
-		try {
-			if (selected === "Remove storage connection…") {
-				const confirmed = await ctx.ui.confirm(
-					"Remove storage connection?",
-					`Remove local storage connection “${safeTerminalText(name)}”? Remote data and history are not deleted.`,
-					{ signal },
-				);
-				if (!confirmed || signal?.aborted) continue;
-				await removeStorageConnection(name, signal);
-				ctx.ui.notify(`Removed storage connection “${safeTerminalText(name)}”.`, "info");
-				return;
-			}
-			await editStorageConnection(ctx, name, profile, usedBy, signal);
-		} catch (error) {
-			if (signal?.aborted) return;
-			ctx.ui.notify(
-				`Storage connection “${safeTerminalText(name)}” was not changed: ${safeTerminalText(errorMessage(error))} Reopen it and retry.`,
-				"error",
-			);
-		}
-	}
+		},
+	};
+}
+
+function notifyConnectionError(
+	ctx: ExtensionCommandContext,
+	name: string,
+	error: unknown,
+	signal?: AbortSignal,
+) {
+	if (signal?.aborted) return;
+	ctx.ui.notify(
+		`Storage connection “${safeTerminalText(name)}” was not changed: ${safeTerminalText(errorMessage(error))} Reopen it and retry.`,
+		"error",
+	);
 }
 
 async function editStorageConnection(