@narumitw/pi-sync 0.31.0 → 0.35.0

package/src/file-selection.ts

@@ -2,86 +2,106 @@ 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 { agentDir, loadConfig, localConfigPath } from "./config.js";
+import { updateSyncSetup } from "./settings-management.js";
 import {
-	agentDir,
-	deprecatedPiSyncEnvironmentWarnings,
-	isExplicitlyEnabled,
-	loadPartialConfig,
-	localConfigPath,
-	updateLocalConfig,
-} from "./config.js";
-import {
-	DEFAULT_SYNC_FILES,
-	isSafeExtraFileName,
-	normalizeExtraFiles,
-	normalizeSyncFiles,
+	BUILT_IN_SYNC_ROOTS,
+	isSafeCustomIncludePath,
+	syncIncludeSelection,
 } from "./sync-policy.js";
 
 const INCLUDED = "included";
 const EXCLUDED = "excluded";
 const BUILT_IN_PREFIX = "builtin:";
-const EXTRA_PREFIX = "extra:";
+const CUSTOM_PREFIX = "custom:";
 const SESSIONS_ID = "sessions";
 
 interface SelectionDraft {
 	builtIns: Set<string>;
-	extras: Set<string>;
+	custom: Set<string>;
 	sessions: boolean;
 }
 
-export async function showFileSelection(ctx: ExtensionCommandContext, targetName?: string) {
-	const partial = await loadPartialConfig(targetName);
+export async function showFileSelection(
+	ctx: ExtensionCommandContext,
+	setupName?: string,
+	signal?: AbortSignal,
+) {
+	const config = await loadConfig(setupName);
+	if (signal?.aborted) return;
+	const selection = syncIncludeSelection(config.include);
 	const original: SelectionDraft = {
-		builtIns: new Set(normalizeSyncFiles(partial.syncFiles)),
-		extras: new Set(normalizeExtraFiles(partial.extraFiles)),
-		sessions: isExplicitlyEnabled(partial.syncSessions),
+		builtIns: new Set(selection.builtIns),
+		custom: new Set(selection.custom),
+		sessions: selection.sessions,
 	};
 	const draft = cloneDraft(original);
-	const sessionEnvironmentOverride = Object.hasOwn(process.env, "PI_SYNC_SESSIONS");
-	const extraCandidates = await listExtraFileCandidates(draft.extras);
+	const customCandidates = await listCustomCandidates(draft.custom);
 
 	if (ctx.mode !== "tui") {
 		ctx.ui.notify(
 			[
-				`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(),
+				`pi-sync included content for sync setup ${safeTerminalText(config.setupName)}:`,
+				`include: ${config.include.map(safeTerminalText).join(", ") || "none"}`,
+				`Edit sync.include in ${safeTerminalText(localConfigPath())}.`,
 			].join("\n"),
 			"info",
 		);
 		return;
 	}
 
-	while (true) {
-		await showDraftEditor(
-			ctx,
-			partial.target ?? "default",
-			draft,
-			extraCandidates,
-			sessionEnvironmentOverride,
+	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 },
 		);
-		if (sameDraft(original, draft)) return;
-		const choice = await ctx.ui.select(formatDraftPreview(original, draft), [
-			"Save changes",
-			"Discard changes",
-			"Continue editing",
-		]);
+		if (signal?.aborted) return;
 		if (choice === "Continue editing") continue;
 		if (choice !== "Save changes") {
-			ctx.ui.notify("Synced-content changes discarded.", "info");
+			ctx.ui.notify("Included-content changes discarded.", "info");
 			return;
 		}
 		try {
-			await persistSelectionDraft(draft, targetName, sessionEnvironmentOverride);
+			if (!original.sessions && draft.sessions) {
+				const acknowledged = await ctx.ui.confirm(
+					"Include session conversations?",
+					"Session JSONL may contain prompts, tool output, file paths, images, and secrets. Continue only with storage you trust.",
+					{ signal },
+				);
+				if (signal?.aborted) return;
+				if (!acknowledged) {
+					ctx.ui.notify("Session inclusion was not saved.", "info");
+					return;
+				}
+			}
+			const include = [
+				...BUILT_IN_SYNC_ROOTS.filter((candidate) => draft.builtIns.has(candidate)),
+				...draft.custom,
+				...(draft.sessions ? ["sessions"] : []),
+			];
+			if (signal?.aborted) return;
+			await updateSyncSetup(
+				config.setupName,
+				(setup) => ({
+					...setup,
+					sync: { ...setup.sync, include },
+				}),
+				{ expectedInclude: config.include, signal },
+			);
+			if (signal?.aborted) return;
 			ctx.ui.notify(
-				`Saved synced content for target “${safeTerminalText(partial.target ?? "default")}”. It applies to the next manual or automatic sync.`,
+				`Saved included content for sync setup “${safeTerminalText(config.setupName)}”. 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");
+			if (signal?.aborted) return;
+			ctx.ui.notify(
+				`Could not save pi-sync file selection: ${safeTerminalText(error instanceof Error ? error.message : String(error))}`,
+				"error",
+			);
 		}
 		return;
 	}
@@ -89,94 +109,86 @@ export async function showFileSelection(ctx: ExtensionCommandContext, targetName
 
 async function showDraftEditor(
 	ctx: ExtensionCommandContext,
-	targetName: string,
+	setupName: string,
 	draft: SelectionDraft,
-	extraCandidates: string[],
-	sessionEnvironmentOverride: boolean,
+	customCandidates: string[],
+	signal?: AbortSignal,
 ) {
 	const items: SettingItem[] = [
-		...DEFAULT_SYNC_FILES.map((fileName) => ({
-			id: `${BUILT_IN_PREFIX}${fileName}`,
-			label: fileName,
-			description: fileName.includes(".")
-				? `Sync the top-level ${fileName} file when present.`
-				: `Recursively sync every safe file under ${fileName}/.`,
-			currentValue: draft.builtIns.has(fileName) ? INCLUDED : EXCLUDED,
+		...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: sessionEnvironmentOverride
-				? "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
-				? `${draft.sessions ? INCLUDED : EXCLUDED} (environment, deprecated)`
-				: draft.sessions
-					? INCLUDED
-					: EXCLUDED,
-			...(sessionEnvironmentOverride ? {} : { values: [INCLUDED, EXCLUDED] }),
-		},
-		...extraCandidates.map((fileName) => ({
-			id: `${EXTRA_PREFIX}${fileName}`,
-			label: safeTerminalText(fileName),
 			description:
-				"Additional safe top-level file. It may be absent locally and pulled from another machine.",
-			currentValue: draft.extras.has(fileName) ? INCLUDED : EXCLUDED,
+				"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],
+		},
+		...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(`Synced Content · ${safeTerminalText(targetName)}`)),
+				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 settingsList = new SettingsList(
+		const list = new SettingsList(
 			items,
 			Math.min(items.length + 2, 15),
 			getSettingsListTheme(),
 			(id, newValue) => updateDraft(draft, id, newValue === INCLUDED),
 			() => done(undefined),
 		);
-		container.addChild(settingsList);
+		container.addChild(list);
 		container.addChild(hint);
 		return {
-			render(width: number) {
-				return container.render(width);
-			},
+			render: (width: number) => container.render(width),
 			invalidate() {
 				updateChrome();
 				container.invalidate();
 			},
 			handleInput(data: string) {
-				settingsList.handleInput(data);
+				if (disposed) return;
+				list.handleInput(data);
 				tui.requestRender();
 			},
+			dispose() {
+				disposed = true;
+				signal?.removeEventListener("abort", onAbort);
+			},
 		};
 	});
 }
 
 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.startsWith(BUILT_IN_PREFIX))
+		return updateSet(draft.builtIns, id.slice(BUILT_IN_PREFIX.length), included);
+	if (id.startsWith(CUSTOM_PREFIX))
+		return updateSet(draft.custom, id.slice(CUSTOM_PREFIX.length), included);
 	if (id === SESSIONS_ID) {
 		draft.sessions = included;
 		return;
@@ -184,58 +196,37 @@ function updateDraft(draft: SelectionDraft, id: string, included: boolean) {
 	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 updateSet(set: Set<string>, value: string, included: boolean) {
+	if (included) set.add(value);
+	else set.delete(value);
 }
 
 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}`);
+	const lines = ["Review included-content changes", ""];
+	for (const item of new Set([
+		...original.builtIns,
+		...draft.builtIns,
+		...original.custom,
+		...draft.custom,
+	])) {
+		const before = original.builtIns.has(item) || original.custom.has(item);
+		const after = draft.builtIns.has(item) || draft.custom.has(item);
+		if (before !== after) lines.push(`${after ? "Include" : "Exclude"}: ${safeTerminalText(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) {
+	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>) {
-	const candidates = new Map([...configured].map((fileName) => [fileName.toLowerCase(), fileName]));
+async function listCustomCandidates(configured: Set<string>) {
+	const candidates = new Map([...configured].map((item) => [item.toLowerCase(), item]));
 	try {
 		for (const entry of await fs.readdir(agentDir(), { withFileTypes: true })) {
-			if (!entry.isFile() || !isSafeExtraFileName(entry.name)) continue;
-			if (!candidates.has(entry.name.toLowerCase())) {
+			if ((!entry.isFile() && !entry.isDirectory()) || !isSafeCustomIncludePath(entry.name))
+				continue;
+			if (!candidates.has(entry.name.toLowerCase()))
 				candidates.set(entry.name.toLowerCase(), entry.name);
-			}
 		}
 	} catch (error) {
 		if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw error;
@@ -246,7 +237,7 @@ async function listExtraFileCandidates(configured: Set<string>) {
 function cloneDraft(value: SelectionDraft): SelectionDraft {
 	return {
 		builtIns: new Set(value.builtIns),
-		extras: new Set(value.extras),
+		custom: new Set(value.custom),
 		sessions: value.sessions,
 	};
 }
@@ -255,7 +246,7 @@ function sameDraft(left: SelectionDraft, right: SelectionDraft) {
 	return (
 		left.sessions === right.sessions &&
 		sameSet(left.builtIns, right.builtIns) &&
-		sameSet(left.extras, right.extras)
+		sameSet(left.custom, right.custom)
 	);
 }
 
@@ -263,17 +254,7 @@ 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) {
 	// biome-ignore lint/suspicious/noControlCharactersInRegex: Escape untrusted terminal controls.
 	return value.replace(/[\u0000-\u001f\u007f-\u009f]/gu, "?");
 }
-
-function errorMessage(error: unknown) {
-	return safeTerminalText(error instanceof Error ? error.message : String(error));
-}