@narumitw/pi-sync 0.28.0 → 0.29.1

package/src/file-selection.ts

@@ -4,6 +4,7 @@ import { getSettingsListTheme } from "@earendil-works/pi-coding-agent";
 import { Container, type SettingItem, SettingsList, Text } from "@earendil-works/pi-tui";
 import {
 	agentDir,
+	deprecatedPiSyncEnvironmentWarnings,
 	isExplicitlyEnabled,
 	loadPartialConfig,
 	localConfigPath,
@@ -22,28 +23,77 @@ const BUILT_IN_PREFIX = "builtin:";
 const EXTRA_PREFIX = "extra:";
 const SESSIONS_ID = "sessions";
 
-export async function showFileSelection(ctx: ExtensionCommandContext) {
-	const partial = await loadPartialConfig();
-	const selectedBuiltIns = new Set(normalizeSyncFiles(partial.syncFiles));
-	const selectedExtras = new Set(normalizeExtraFiles(partial.extraFiles));
+interface SelectionDraft {
+	builtIns: Set<string>;
+	extras: Set<string>;
+	sessions: boolean;
+}
+
+export async function showFileSelection(ctx: ExtensionCommandContext, targetName?: string) {
+	const partial = await loadPartialConfig(targetName);
+	const original: SelectionDraft = {
+		builtIns: new Set(normalizeSyncFiles(partial.syncFiles)),
+		extras: new Set(normalizeExtraFiles(partial.extraFiles)),
+		sessions: isExplicitlyEnabled(partial.syncSessions),
+	};
+	const draft = cloneDraft(original);
 	const sessionEnvironmentOverride = Object.hasOwn(process.env, "PI_SYNC_SESSIONS");
-	const sessionsIncluded = isExplicitlyEnabled(partial.syncSessions);
-	const extraCandidates = await listExtraFileCandidates(selectedExtras);
+	const extraCandidates = await listExtraFileCandidates(draft.extras);
 
 	if (ctx.mode !== "tui") {
 		ctx.ui.notify(
 			[
-				"pi-sync selected files:",
-				`built-ins: ${[...selectedBuiltIns].join(", ") || "none"}`,
-				`sessions: ${sessionsIncluded ? "included" : "excluded"}${sessionEnvironmentOverride ? " (PI_SYNC_SESSIONS)" : ""}`,
-				`extra files: ${[...selectedExtras].map(safeTerminalText).join(", ") || "none"}`,
+				`pi-sync selected files for target ${safeTerminalText(partial.target ?? "default")}:`,
+				`built-ins: ${[...draft.builtIns].join(", ") || "none"}`,
+				`sessions: ${draft.sessions ? INCLUDED : EXCLUDED}${sessionEnvironmentOverride ? " (PI_SYNC_SESSIONS, deprecated)" : ""}`,
+				`extra files: ${[...draft.extras].map(safeTerminalText).join(", ") || "none"}`,
 				`Edit syncFiles, syncSessions, and extraFiles in ${safeTerminalText(localConfigPath())}.`,
+				...deprecatedPiSyncEnvironmentWarnings(),
 			].join("\n"),
 			"info",
 		);
 		return;
 	}
 
+	while (true) {
+		await showDraftEditor(
+			ctx,
+			partial.target ?? "default",
+			draft,
+			extraCandidates,
+			sessionEnvironmentOverride,
+		);
+		if (sameDraft(original, draft)) return;
+		const choice = await ctx.ui.select(formatDraftPreview(original, draft), [
+			"Save changes",
+			"Discard changes",
+			"Continue editing",
+		]);
+		if (choice === "Continue editing") continue;
+		if (choice !== "Save changes") {
+			ctx.ui.notify("Synced-content changes discarded.", "info");
+			return;
+		}
+		try {
+			await persistSelectionDraft(draft, targetName, sessionEnvironmentOverride);
+			ctx.ui.notify(
+				`Saved synced content for target “${safeTerminalText(partial.target ?? "default")}”. It applies to the next manual or automatic sync.`,
+				"info",
+			);
+		} catch (error) {
+			ctx.ui.notify(`Could not save pi-sync file selection: ${errorMessage(error)}`, "error");
+		}
+		return;
+	}
+}
+
+async function showDraftEditor(
+	ctx: ExtensionCommandContext,
+	targetName: string,
+	draft: SelectionDraft,
+	extraCandidates: string[],
+	sessionEnvironmentOverride: boolean,
+) {
 	const items: SettingItem[] = [
 		...DEFAULT_SYNC_FILES.map((fileName) => ({
 			id: `${BUILT_IN_PREFIX}${fileName}`,
@@ -51,18 +101,18 @@ export async function showFileSelection(ctx: ExtensionCommandContext) {
 			description: fileName.includes(".")
 				? `Sync the top-level ${fileName} file when present.`
 				: `Recursively sync every safe file under ${fileName}/.`,
-			currentValue: selectedBuiltIns.has(fileName) ? INCLUDED : EXCLUDED,
+			currentValue: draft.builtIns.has(fileName) ? INCLUDED : EXCLUDED,
 			values: [INCLUDED, EXCLUDED],
 		})),
 		{
 			id: SESSIONS_ID,
 			label: "sessions",
 			description: sessionEnvironmentOverride
-				? "Read-only here because PI_SYNC_SESSIONS overrides the local setting. Session JSONL may contain prompts, tool output, paths, images, and secrets."
+				? "Read-only because deprecated PI_SYNC_SESSIONS currently overrides this target. Move it into target settings before the future major removal."
 				: "Session JSONL may contain prompts, tool output, paths, images, and secrets. Sync only to storage you trust.",
 			currentValue: sessionEnvironmentOverride
-				? `${sessionsIncluded ? INCLUDED : EXCLUDED} (environment)`
-				: sessionsIncluded
+				? `${draft.sessions ? INCLUDED : EXCLUDED} (environment, deprecated)`
+				: draft.sessions
 					? INCLUDED
 					: EXCLUDED,
 			...(sessionEnvironmentOverride ? {} : { values: [INCLUDED, EXCLUDED] }),
@@ -72,59 +122,33 @@ export async function showFileSelection(ctx: ExtensionCommandContext) {
 			label: safeTerminalText(fileName),
 			description:
 				"Additional safe top-level file. It may be absent locally and pulled from another machine.",
-			currentValue: selectedExtras.has(fileName) ? INCLUDED : EXCLUDED,
+			currentValue: draft.extras.has(fileName) ? INCLUDED : EXCLUDED,
 			values: [INCLUDED, EXCLUDED],
 		})),
 	];
 
-	let saveQueue = Promise.resolve();
-	let nextOwner = 0;
-	const owners = new Map<string, number>();
-	let closed = false;
-
 	await ctx.ui.custom((tui, theme, _keybindings, done) => {
 		const container = new Container();
 		const title = new Text("", 1, 0);
 		const hint = new Text("", 1, 0);
 		const updateChrome = () => {
-			title.setText(theme.fg("accent", theme.bold("pi-sync Files")));
-			hint.setText(
-				theme.fg("dim", "Changes save immediately and apply to the next manual or automatic sync."),
+			title.setText(
+				theme.fg("accent", theme.bold(`Synced Content · ${safeTerminalText(targetName)}`)),
 			);
+			hint.setText(theme.fg("dim", "Draft only · Esc reviews Save, Discard, or Continue editing."));
 		};
 		updateChrome();
 		container.addChild(title);
-
-		let settingsList: SettingsList;
-		const queueChange = (id: string, newValue: string) => {
-			const previousValue = newValue === INCLUDED ? EXCLUDED : INCLUDED;
-			const owner = ++nextOwner;
-			owners.set(id, owner);
-			const save = async () => {
-				try {
-					await persistSelectionChange(id, newValue === INCLUDED);
-				} catch (error) {
-					if (owners.get(id) === owner && !closed) {
-						settingsList.updateValue(id, previousValue);
-						tui.requestRender();
-					}
-					ctx.ui.notify(`Could not save pi-sync file selection: ${errorMessage(error)}`, "error");
-				}
-			};
-			saveQueue = saveQueue.then(save, save);
-		};
-
-		settingsList = new SettingsList(
+		const settingsList = new SettingsList(
 			items,
 			Math.min(items.length + 2, 15),
 			getSettingsListTheme(),
-			queueChange,
+			(id, newValue) => updateDraft(draft, id, newValue === INCLUDED),
 			() => done(undefined),
 			{ enableSearch: true },
 		);
 		container.addChild(settingsList);
 		container.addChild(hint);
-
 		return {
 			render(width: number) {
 				return container.render(width);
@@ -139,8 +163,70 @@ export async function showFileSelection(ctx: ExtensionCommandContext) {
 			},
 		};
 	});
-	closed = true;
-	await saveQueue;
+}
+
+function updateDraft(draft: SelectionDraft, id: string, included: boolean) {
+	if (id.startsWith(BUILT_IN_PREFIX)) {
+		const fileName = id.slice(BUILT_IN_PREFIX.length);
+		if (included) draft.builtIns.add(fileName);
+		else draft.builtIns.delete(fileName);
+		return;
+	}
+	if (id.startsWith(EXTRA_PREFIX)) {
+		const fileName = id.slice(EXTRA_PREFIX.length);
+		if (included) draft.extras.add(fileName);
+		else draft.extras.delete(fileName);
+		return;
+	}
+	if (id === SESSIONS_ID) {
+		draft.sessions = included;
+		return;
+	}
+	throw new Error(`Unknown file selection: ${id}`);
+}
+
+async function persistSelectionDraft(
+	draft: SelectionDraft,
+	targetName: string | undefined,
+	sessionEnvironmentOverride: boolean,
+) {
+	await updateLocalConfig((current) => {
+		const selection = {
+			syncFiles: DEFAULT_SYNC_FILES.filter((candidate) => draft.builtIns.has(candidate)),
+			...(!sessionEnvironmentOverride ? { syncSessions: draft.sessions } : {}),
+			extraFiles: [...draft.extras],
+		};
+		if (current.version !== 2) return { ...current, ...selection };
+		const targets = asObject(current.targets);
+		const selectedTarget =
+			targetName ?? (typeof current.activeTarget === "string" ? current.activeTarget : undefined);
+		if (!targets || !selectedTarget) throw new Error("Current sync target is not configured.");
+		const target = asObject(targets[selectedTarget]);
+		if (!target) throw new Error(`Sync target not found: ${selectedTarget}`);
+		return {
+			...current,
+			targets: { ...targets, [selectedTarget]: { ...target, ...selection } },
+		};
+	});
+}
+
+function formatDraftPreview(original: SelectionDraft, draft: SelectionDraft) {
+	const lines = ["Review synced-content changes", ""];
+	for (const item of DEFAULT_SYNC_FILES) {
+		if (original.builtIns.has(item) === draft.builtIns.has(item)) continue;
+		lines.push(`${draft.builtIns.has(item) ? "Include" : "Exclude"}: ${item}`);
+	}
+	for (const item of new Set([...original.extras, ...draft.extras])) {
+		if (original.extras.has(item) === draft.extras.has(item)) continue;
+		lines.push(`${draft.extras.has(item) ? "Include" : "Exclude"}: ${safeTerminalText(item)}`);
+	}
+	if (original.sessions !== draft.sessions) {
+		lines.push(`${draft.sessions ? "Include" : "Exclude"}: sessions`);
+		if (draft.sessions)
+			lines.push("Warning: sessions may contain prompts, tool output, images, and secrets.");
+	}
+	lines.push("", "Saving does not start a network sync.");
+	return lines.join("\n");
 }
 
 async function listExtraFileCandidates(configured: Set<string>) {
@@ -158,28 +244,30 @@ async function listExtraFileCandidates(configured: Set<string>) {
 	return [...candidates.values()].sort((left, right) => left.localeCompare(right));
 }
 
-async function persistSelectionChange(id: string, included: boolean) {
-	await updateLocalConfig((current) => {
-		if (id.startsWith(BUILT_IN_PREFIX)) {
-			const fileName = id.slice(BUILT_IN_PREFIX.length);
-			const selected = new Set(normalizeSyncFiles(current.syncFiles));
-			if (included) selected.add(fileName as (typeof DEFAULT_SYNC_FILES)[number]);
-			else selected.delete(fileName as (typeof DEFAULT_SYNC_FILES)[number]);
-			return {
-				...current,
-				syncFiles: DEFAULT_SYNC_FILES.filter((candidate) => selected.has(candidate)),
-			};
-		}
-		if (id.startsWith(EXTRA_PREFIX)) {
-			const fileName = id.slice(EXTRA_PREFIX.length);
-			const selected = new Set(normalizeExtraFiles(current.extraFiles));
-			if (included) selected.add(fileName);
-			else selected.delete(fileName);
-			return { ...current, extraFiles: [...selected] };
-		}
-		if (id === SESSIONS_ID) return { ...current, syncSessions: included };
-		throw new Error(`Unknown file selection: ${id}`);
-	});
+function cloneDraft(value: SelectionDraft): SelectionDraft {
+	return {
+		builtIns: new Set(value.builtIns),
+		extras: new Set(value.extras),
+		sessions: value.sessions,
+	};
+}
+
+function sameDraft(left: SelectionDraft, right: SelectionDraft) {
+	return (
+		left.sessions === right.sessions &&
+		sameSet(left.builtIns, right.builtIns) &&
+		sameSet(left.extras, right.extras)
+	);
+}
+
+function sameSet(left: Set<string>, right: Set<string>) {
+	return left.size === right.size && [...left].every((item) => right.has(item));
+}
+
+function asObject(value: unknown): Record<string, unknown> | undefined {
+	return value && typeof value === "object" && !Array.isArray(value)
+		? (value as Record<string, unknown>)
+		: undefined;
 }
 
 function safeTerminalText(value: string) {

package/src/lock.ts

@@ -59,7 +59,11 @@ export type LockInspection =
 	| { status: "unreadable" }
 	| { status: "valid"; lock: LockFile };
 
-export async function withLock<T>(command: string, fn: () => Promise<T>): Promise<T> {
+export async function withLock<T>(
+	command: string,
+	fn: () => Promise<T>,
+	options: { reclaimStale?: boolean } = {},
+): Promise<T> {
 	await ensureStateDir();
 	const lock: LockFile = {
 		id: randomUUID(),
@@ -79,11 +83,24 @@ export async function withLock<T>(command: string, fn: () => Promise<T>): Promis
 			throw await describeHeldLock();
 		}
 
-		const inspection = await inspectLock();
+		let inspection = await inspectLock();
 		if (inspection.status === "valid" && isStaleLock(inspection.lock)) {
-			throw new Error(
-				`pi-sync lock is stale (pid ${inspection.lock.pid}). Run /sync unlock --stale, then retry.`,
-			);
+			if (!options.reclaimStale) {
+				throw new Error(
+					`pi-sync lock is stale (pid ${inspection.lock.pid}). Run /sync unlock --stale, then retry.`,
+				);
+			}
+			guard.throwIfCompromised();
+			const rechecked = await inspectLock();
+			if (
+				rechecked.status !== "valid" ||
+				rechecked.lock.id !== inspection.lock.id ||
+				!isStaleLock(rechecked.lock)
+			) {
+				throw new Error("pi-sync lock changed while preparing transaction recovery; retry.");
+			}
+			await fs.rm(lockPath(), { force: true });
+			inspection = { status: "missing" };
 		}
 		if (inspection.status === "valid") {
 			throw new Error(