@narumitw/pi-sync 0.35.0 → 0.38.0

package/README.md

@@ -52,7 +52,11 @@ Automatic sync: On
 Remote status: Not checked
 ```
 
-Primary actions include **Sync now**, **Switch sync setup**, **Status & changes**, **Settings**, and **More…**. Secondary screens provide **Back**; Escape closes the flow. Destructive and externally visible operations show exact previews and confirmations.
+Primary actions include **Sync now**, **Switch sync setup**, **Status & changes**, **Settings**, and
+**More…**. The standard manager also owns setup and connection lists/details plus history and
+recovery. Secondary screens provide **Back**; Escape goes back and Ctrl+C closes the flow.
+Destructive, credential-bearing, and externally visible operations retain exact specialized previews
+and confirmations.
 
 ## ⚙️ Settings
 
@@ -165,6 +169,12 @@ Safe agent-relative custom files or directories may also be included. Absolute p
 
 An empty array is valid. It means no useful transfer is selected: **Sync now** reports the condition and does not claim that the setup is up to date. Unselected content remains unmanaged locally and is preserved when republishing existing remote snapshots.
 
+The Included Content editor is a standard bounded multi-select backed by one in-memory draft. Toggles
+never write settings. Leaving the editor opens an exact Include/Exclude review with **Save changes**,
+**Discard changes**, and **Continue editing**; only reviewed Save publishes, while Continue preserves
+the draft and Discard/cancellation preserves the settings bytes. RPC remains a read-only summary with
+the manual `sync.include` path.
+
 Adding `sessions` requires a privacy acknowledgement in interactive flows. Session JSONL can contain prompts, tool output, file paths, images, and secrets. Automatic apply protects the currently open session file; restart Pi or resume a pulled session to use newly synchronized conversations.
 
 ### Unsupported old settings and recovery
@@ -209,7 +219,9 @@ The menu is preferred, while deterministic routes remain available:
 
 The former version 2 setup-addressing flag is rejected. Unknown flags, unknown commands, trailing values, and missing setup/snapshot values are rejected. Completion includes known setup names and preserves preceding command tokens.
 
-TUI mode provides custom components. RPC uses Pi's supported dialog/notification protocol. Print and JSON modes never enter TUI-only screens; unsupported interactive routes reject or remain protocol-safe rather than relying on no-op output.
+TUI mode uses standard manager, settings, resource, and included-content screens plus specialized
+secret, wizard, confirmation, and commit-aware loader components. RPC uses Pi's supported
+dialog/notification protocol and does not gain settings mutation. Print and JSON modes never enter TUI-only screens; unsupported interactive routes reject or remain protocol-safe rather than relying on no-op output.
 
 ## 🔄 Backend and recovery model
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@narumitw/pi-sync",
-	"version": "0.35.0",
+	"version": "0.38.0",
 	"description": "Pi extension that syncs Pi configuration through Git, WebDAV, Cloudflare R2, or S3-compatible storage.",
 	"type": "module",
 	"license": "MIT",
@@ -36,6 +36,7 @@
 		"typecheck": "tsc --noEmit"
 	},
 	"dependencies": {
+		"@narumitw/pi-tui-kit": "<1",
 		"fast-xml-parser": "^5.10.1",
 		"proper-lockfile": "^4.1.2"
 	},

package/src/file-selection.ts

@@ -1,7 +1,6 @@
 import fs from "node:fs/promises";
 import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
-import { getSettingsListTheme } from "@earendil-works/pi-coding-agent";
-import { Container, type SettingItem, SettingsList, Text } from "@earendil-works/pi-tui";
+import { defineMenu, runMenu } from "@narumitw/pi-tui-kit";
 import { agentDir, loadConfig, localConfigPath } from "./config.js";
 import { updateSyncSetup } from "./settings-management.js";
 import {
@@ -10,8 +9,6 @@ import {
 	syncIncludeSelection,
 } from "./sync-policy.js";
 
-const INCLUDED = "included";
-const EXCLUDED = "excluded";
 const BUILT_IN_PREFIX = "builtin:";
 const CUSTOM_PREFIX = "custom:";
 const SESSIONS_ID = "sessions";
@@ -53,11 +50,7 @@ export async function showFileSelection(
 	while (!signal?.aborted) {
 		await showDraftEditor(ctx, config.setupName, draft, customCandidates, signal);
 		if (signal?.aborted || sameDraft(original, draft)) return;
-		const choice = await ctx.ui.select(
-			formatDraftPreview(original, draft),
-			["Save changes", "Discard changes", "Continue editing"],
-			{ signal },
-		);
+		const choice = await showDraftReview(ctx, original, draft, signal);
 		if (signal?.aborted) return;
 		if (choice === "Continue editing") continue;
 		if (choice !== "Save changes") {
@@ -114,74 +107,96 @@ async function showDraftEditor(
 	customCandidates: string[],
 	signal?: AbortSignal,
 ) {
-	const items: SettingItem[] = [
-		...BUILT_IN_SYNC_ROOTS.map((relativePath) => ({
-			id: `${BUILT_IN_PREFIX}${relativePath}`,
-			label: relativePath,
-			description: relativePath.includes(".")
-				? `Sync the top-level ${relativePath} file when present.`
-				: `Recursively sync every safe file under ${relativePath}/.`,
-			currentValue: draft.builtIns.has(relativePath) ? INCLUDED : EXCLUDED,
-			values: [INCLUDED, EXCLUDED],
-		})),
-		{
-			id: SESSIONS_ID,
-			label: "sessions",
-			description:
-				"Session JSONL may contain prompts, tool output, paths, images, and secrets. Sync only to storage you trust.",
-			currentValue: draft.sessions ? INCLUDED : EXCLUDED,
-			values: [INCLUDED, EXCLUDED],
+	const menu = defineMenu<undefined, "editor", "toggle", ExtensionCommandContext>({
+		start: "editor",
+		screens: {
+			editor: () => ({
+				kind: "multiSelect",
+				title: `Included Content · ${safeTerminalText(setupName)}`,
+				lines: ["Draft only · leaving this screen opens Save, Discard, or Continue editing."],
+				viewportSize: 12,
+				items: [
+					...BUILT_IN_SYNC_ROOTS.map((relativePath) => ({
+						id: `${BUILT_IN_PREFIX}${relativePath}`,
+						label: relativePath,
+						description: relativePath.includes(".")
+							? `Sync the top-level ${relativePath} file when present.`
+							: `Recursively sync every safe file under ${relativePath}/.`,
+						selected: draft.builtIns.has(relativePath),
+					})),
+					...customCandidates.map((relativePath) => ({
+						id: `${CUSTOM_PREFIX}${relativePath}`,
+						label: safeTerminalText(relativePath),
+						description: "Additional safe agent-relative file or directory.",
+						selected: draft.custom.has(relativePath),
+					})),
+					{
+						id: SESSIONS_ID,
+						label: "sessions",
+						description:
+							"Session JSONL may contain prompts, tool output, paths, images, and secrets. Sync only to storage you trust.",
+						selected: draft.sessions,
+					},
+				],
+				action: "toggle",
+				hint: "close",
+				doneLabel: "Review changes",
+			}),
 		},
-		...customCandidates.map((relativePath) => ({
-			id: `${CUSTOM_PREFIX}${relativePath}`,
-			label: safeTerminalText(relativePath),
-			description: "Additional safe agent-relative file or directory.",
-			currentValue: draft.custom.has(relativePath) ? INCLUDED : EXCLUDED,
-			values: [INCLUDED, EXCLUDED],
-		})),
-	];
-
-	await ctx.ui.custom((tui, theme, _keybindings, done) => {
-		const container = new Container();
-		let disposed = false;
-		const onAbort = () => done(undefined);
-		signal?.addEventListener("abort", onAbort, { once: true });
-		const title = new Text("", 1, 0);
-		const hint = new Text("", 1, 0);
-		const updateChrome = () => {
-			title.setText(
-				theme.fg("accent", theme.bold(`Included Content · ${safeTerminalText(setupName)}`)),
-			);
-			hint.setText(theme.fg("dim", "Draft only · Esc reviews Save, Discard, or Continue editing."));
-		};
-		updateChrome();
-		container.addChild(title);
-		const list = new SettingsList(
-			items,
-			Math.min(items.length + 2, 15),
-			getSettingsListTheme(),
-			(id, newValue) => updateDraft(draft, id, newValue === INCLUDED),
-			() => done(undefined),
-		);
-		container.addChild(list);
-		container.addChild(hint);
-		return {
-			render: (width: number) => container.render(width),
-			invalidate() {
-				updateChrome();
-				container.invalidate();
-			},
-			handleInput(data: string) {
-				if (disposed) return;
-				list.handleInput(data);
-				tui.requestRender();
+		actions: {
+			toggle: async ({ itemId, selected }) => {
+				updateDraft(draft, itemId, selected === true);
+				return { kind: "stay" };
 			},
-			dispose() {
-				disposed = true;
-				signal?.removeEventListener("abort", onAbort);
+		},
+	});
+	await runMenu(ctx, menu, {
+		getState: () => undefined,
+		signal,
+		isCurrent: () => !signal?.aborted,
+	});
+}
+
+async function showDraftReview(
+	ctx: ExtensionCommandContext,
+	original: SelectionDraft,
+	draft: SelectionDraft,
+	signal?: AbortSignal,
+) {
+	let choice: "Save changes" | "Discard changes" | "Continue editing" | undefined;
+	const menu = defineMenu<undefined, "review", "choose", ExtensionCommandContext>({
+		start: "review",
+		screens: {
+			review: () => ({
+				kind: "actions",
+				title: "Review included-content changes",
+				lines: formatDraftPreview(original, draft).split("\n").slice(2),
+				items: [
+					{ id: "save", label: "Save changes", action: "choose" },
+					{ id: "discard", label: "Discard changes", action: "choose" },
+					{ id: "continue", label: "Continue editing", action: "choose" },
+				],
+				hint: "close",
+			}),
+		},
+		actions: {
+			choose: async ({ itemId }) => {
+				choice =
+					itemId === "save"
+						? "Save changes"
+						: itemId === "continue"
+							? "Continue editing"
+							: "Discard changes";
+				return { kind: "close" };
 			},
-		};
+		},
+	});
+	await runMenu(ctx, menu, {
+		getState: () => undefined,
+		signal,
+		isCurrent: () => !signal?.aborted,
 	});
+	return choice;
 }
 
 function updateDraft(draft: SelectionDraft, id: string, included: boolean) {

package/src/manager-state.ts

@@ -0,0 +1,155 @@
+import {
+	activeLocalConfigPath,
+	isCloudflareR2Endpoint,
+	loadConfig,
+	readLocalConfigObject,
+	readStateForConfig,
+} from "./config.js";
+import { inspectLock, isStaleLock } from "./lock.js";
+import { errorMessage, ownRecord, safeTerminalText } from "./manager-helpers.js";
+import { syncIncludeSelection } from "./sync-policy.js";
+import { countValidSyncSetups } from "./sync-setups-ui.js";
+import type { AnySyncConfig } from "./types.js";
+
+export const MAIN_MENU_ACTIONS = [
+	"Sync now (recommended)",
+	"Switch sync setup",
+	"Status & changes",
+	"Settings",
+	"More…",
+] as const;
+
+export async function describeManagerState(
+	signal?: AbortSignal,
+): Promise<{ title: string; actions: string[] }> {
+	let raw: Record<string, unknown> | undefined;
+	try {
+		raw = await readLocalConfigObject();
+	} catch (error) {
+		return {
+			title: [
+				"Manage sync",
+				"",
+				"Settings file needs repair. Automatic sync and settings writes are paused.",
+				`Error: ${safeTerminalText(errorMessage(error))}`,
+				`File: ${safeTerminalText(await activeLocalConfigPath())}`,
+				"",
+				"Repair the JSON file, then reopen /sync.",
+			].join("\n"),
+			actions: ["Help"],
+		};
+	}
+	if (!raw) {
+		return {
+			title: ["Manage sync", "", "Not set up.", "", "What do you want to do?"].join("\n"),
+			actions: ["Set up sync", "Help"],
+		};
+	}
+	const configuredTargets = ownRecord(raw.syncSetups);
+	if (raw.version === 3 && configuredTargets && Object.keys(configuredTargets).length === 0) {
+		return {
+			title: [
+				"Manage sync",
+				"",
+				"No sync setups are configured.",
+				"Add a sync setup using an existing storage connection.",
+				"",
+				"What do you want to do?",
+			].join("\n"),
+			actions: ["Sync setups…", "Storage connections…", "Help"],
+		};
+	}
+	try {
+		const config = await loadConfig();
+		const lock = await inspectLock();
+		const liveLock = lock.status === "valid" && !isStaleLock(lock.lock);
+		const recoverableLock =
+			lock.status === "unreadable" || (lock.status === "valid" && isStaleLock(lock.lock));
+		const selection = syncIncludeSelection(config.include);
+		const noSyncedContent = config.include.length === 0;
+		const syncState =
+			liveLock || recoverableLock
+				? undefined
+				: await readStateForConfig(config).catch(() => undefined);
+		const lastAppliedSnapshot =
+			liveLock || recoverableLock
+				? "Unavailable while operations are locked"
+				: syncState?.lastAppliedSnapshot
+					? safeTerminalText(syncState.lastAppliedSnapshot)
+					: syncState
+						? "Never synced"
+						: "Unavailable";
+		const canSwitch = (await countValidSyncSetups(configuredTargets, signal)) > 1;
+		const mainActions = MAIN_MENU_ACTIONS.filter(
+			(action) => action !== "Switch sync setup" || canSwitch,
+		);
+		return {
+			title: [
+				"Manage sync",
+				"",
+				`Current sync setup: ${safeTerminalText(config.setupName)}`,
+				`Storage: ${backendStorageDescription(config)}`,
+				`Included: ${selection.builtIns.length} built-in group${selection.builtIns.length === 1 ? "" : "s"} · ${selection.custom.length} extra path${selection.custom.length === 1 ? "" : "s"} · Sessions ${selection.sessions ? "on" : "off"}`,
+				`Automatic sync: ${config.automatic ? "On" : "Off"}`,
+				`Last applied: ${lastAppliedSnapshot}`,
+				"Remote status: Not checked",
+				...(noSyncedContent
+					? [
+							"",
+							"No included content is selected. Choose included content in Settings before syncing.",
+						]
+					: []),
+				...(liveLock
+					? [
+							"",
+							`Operation in progress: ${safeTerminalText(lock.lock.command)} (pid ${lock.lock.pid}). Sync and settings changes are disabled.`,
+						]
+					: []),
+				...(recoverableLock
+					? ["", "Recovery required: lock metadata is stale or unreadable."]
+					: []),
+				"",
+				"What do you want to do?",
+			].join("\n"),
+			actions:
+				liveLock || recoverableLock
+					? ["Status & changes", "History & recovery…", "Help"]
+					: noSyncedContent
+						? ["Settings", ...(canSwitch ? ["Switch sync setup"] : []), "Status & changes", "More…"]
+						: mainActions,
+		};
+	} catch (error) {
+		if (signal?.aborted) throw error;
+		return {
+			title: [
+				"Manage sync",
+				"",
+				"Settings need attention. Automatic sync is paused.",
+				`Current sync setup: ${safeTerminalText(typeof raw.activeSyncSetup === "string" ? raw.activeSyncSetup : "none")}`,
+				`Error: ${safeTerminalText(errorMessage(error))}`,
+				`File: ${safeTerminalText(await activeLocalConfigPath())}`,
+				"",
+				"What do you want to do?",
+			].join("\n"),
+			actions: ["Sync setups…", "Storage connections…", "History & recovery…", "Help"],
+		};
+	}
+}
+
+export function backendStorageDescription(config: AnySyncConfig) {
+	const connection = safeTerminalText(config.connectionName);
+	switch (config.backend.type) {
+		case "s3": {
+			const type =
+				config.backend.profile.kind === "r2" ||
+				isCloudflareR2Endpoint(config.backend.profile.endpoint)
+					? "Cloudflare R2"
+					: "S3-compatible";
+			return `${type} · ${connection} · ${safeTerminalText(config.backend.destination.bucket)}`;
+		}
+		case "webdav":
+			return `WebDAV · ${connection} · ${safeTerminalText(config.backend.destination.path)}`;
+		case "git":
+			return `Git · ${connection} · ${safeTerminalText(config.backend.destination.branch)}`;
+	}
+}