@narumitw/pi-sync 0.49.3 → 0.49.5

package/src/sync.ts

@@ -9,6 +9,7 @@ import {
 	parseOptions,
 	resolveSyncCommand,
 	setSyncSetupCompletions,
+	splitArgs,
 	usage,
 	validateCommandOptions,
 } from "./command.js";
@@ -32,6 +33,11 @@ import { unlock, withLock } from "./lock.js";
 import { SetupPullRequiresUiError, useSyncSetup } from "./setup-switch.js";
 import { createSnapshot } from "./snapshot.js";
 import { recoverSnapshotTransactionsOnStartup } from "./snapshot-transaction.js";
+import {
+	migrateLegacyStateDirectory,
+	stateDirectoryMigrationNotice,
+	withStateDirectoryAccess,
+} from "./state-directory.js";
 import { isSyncDecisionRequiredError } from "./sync-decision.js";
 import { errorMessage } from "./sync-format.js";
 import { hasLocalChanges } from "./sync-state.js";
@@ -74,7 +80,9 @@ export default function sync(pi: ExtensionAPI) {
 					"/sync requires TUI or RPC mode so results and safety prompts are observable.",
 				);
 			}
-			await handleCommand(args, ctx, sessionAbort.signal);
+			const run = () => handleCommand(args, ctx, sessionAbort.signal);
+			if (splitArgs(args)[0] === "migrate-state") await run();
+			else await withStateDirectoryAccess(run);
 		},
 	});
 
@@ -86,24 +94,11 @@ export default function sync(pi: ExtensionAPI) {
 		const signal = sessionAbort.signal;
 		ctx.ui.setStatus(STATUS_KEY, undefined);
 		try {
-			await recoverSnapshotTransactionsOnStartup();
-			if (signal.aborted) return;
+			await withStateDirectoryAccess(() => startSession(ctx, signal));
 		} catch (error) {
 			if (signal.aborted) return;
-			ctx.ui.notify(`pi-sync recovery required: ${errorMessage(error)}`, "error");
-			return;
-		}
-		try {
-			setSyncSetupCompletions(await configuredSyncSetupNames());
-			if (signal.aborted) return;
-		} catch {
-			if (signal.aborted) return;
-			setSyncSetupCompletions([]);
+			ctx.ui.notify(`pi-sync state access failed: ${errorMessage(error)}`, "error");
 		}
-		const migrationNotice = consumeLocalConfigMigrationNotice();
-		if (migrationNotice) ctx.ui.notify(migrationNotice, "warning");
-		if (signal.aborted) return;
-		await autoSync(ctx, signal);
 	});
 
 	pi.on("session_shutdown", async (event, ctx) => {
@@ -115,7 +110,16 @@ export default function sync(pi: ExtensionAPI) {
 		const reason =
 			typeof event === "object" && event ? (event as { reason?: string }).reason : undefined;
 		try {
-			if (reason !== "reload") await autoPushSessions(ctx, signal);
+			if (reason !== "reload") {
+				await withStateDirectoryAccess(async () => {
+					if (signal.aborted) return;
+					await autoPushSessions(ctx, signal);
+				});
+			}
+		} catch (error) {
+			if (!signal.aborted) {
+				ctx.ui.notify(`pi-sync session push skipped: ${errorMessage(error)}`, "warning");
+			}
 		} finally {
 			if (shutdownAbort === controller) shutdownAbort = undefined;
 		}
@@ -124,6 +128,36 @@ export default function sync(pi: ExtensionAPI) {
 	});
 }
 
+async function startSession(ctx: ExtensionContext, signal: AbortSignal) {
+	if (signal.aborted) return;
+	try {
+		const migrationNotice = stateDirectoryMigrationNotice();
+		if (migrationNotice) ctx.ui.notify(migrationNotice, "warning");
+	} catch (error) {
+		ctx.ui.notify(`pi-sync state directory requires attention: ${errorMessage(error)}`, "error");
+		return;
+	}
+	try {
+		await recoverSnapshotTransactionsOnStartup();
+		if (signal.aborted) return;
+	} catch (error) {
+		if (signal.aborted) return;
+		ctx.ui.notify(`pi-sync recovery required: ${errorMessage(error)}`, "error");
+		return;
+	}
+	try {
+		setSyncSetupCompletions(await configuredSyncSetupNames());
+		if (signal.aborted) return;
+	} catch {
+		if (signal.aborted) return;
+		setSyncSetupCompletions([]);
+	}
+	const migrationNotice = consumeLocalConfigMigrationNotice();
+	if (migrationNotice) ctx.ui.notify(migrationNotice, "warning");
+	if (signal.aborted) return;
+	await autoSync(ctx, signal);
+}
+
 async function handleCommand(
 	rawArgs: string,
 	ctx: ExtensionCommandContext,
@@ -237,6 +271,9 @@ async function executeCommand(
 				await withLock("rollback", () => operations.rollback(ctx, options));
 				return { kind: "completed" };
 			}
+			case "migrate-state":
+				await migrateStateDirectory(ctx, options);
+				return { kind: "completed" };
 			case "unlock":
 				await unlock(ctx, options);
 				return { kind: "completed" };
@@ -256,6 +293,33 @@ async function executeCommand(
 	}
 }
 
+async function migrateStateDirectory(ctx: ExtensionCommandContext, options: CommandOptions) {
+	const notice = stateDirectoryMigrationNotice();
+	if (!notice) {
+		ctx.ui.notify("pi-sync already uses the canonical pi-sync/ state directory.", "info");
+		return;
+	}
+	if (
+		!options.yes &&
+		!(await ctx.ui.confirm(
+			"Migrate pi-sync state directory",
+			"Confirm that every other Pi process is closed. pi-sync will atomically rename .pisync/ to pi-sync/ without merging or deleting either root.",
+			{ signal: options.signal },
+		))
+	) {
+		ctx.ui.notify("pi-sync state migration cancelled.", "info");
+		return;
+	}
+	throwIfAborted(options.signal);
+	const result = await migrateLegacyStateDirectory();
+	throwIfAborted(options.signal);
+	if (result.status === "ready") {
+		ctx.ui.notify("pi-sync already uses the canonical pi-sync/ state directory.", "info");
+		return;
+	}
+	ctx.ui.notify(result.message, result.status === "migrated" ? "info" : "warning");
+}
+
 async function autoSync(ctx: ExtensionContext, signal: AbortSignal) {
 	try {
 		const partial = await loadPartialConfig();

package/src/types.ts

@@ -193,6 +193,11 @@ export interface SnapshotFile {
 	sha256: string;
 }
 
+export interface SnapshotSelection {
+	version: 1;
+	include: string[];
+}
+
 export interface Snapshot {
 	version: number;
 	id: string;
@@ -201,6 +206,8 @@ export interface Snapshot {
 	/** Backend-scoped remote identity retained in the snapshot wire format. */
 	profile: string;
 	syncSessions?: boolean;
+	/** Portable, credential-free included-content intent. Absent on legacy snapshots. */
+	selection?: SnapshotSelection;
 	files: SnapshotFile[];
 }
 
@@ -212,6 +219,8 @@ export interface LatestPointer {
 	createdAt: string;
 	machine: string;
 	syncSessions?: boolean;
+	/** Lightweight projection; the immutable snapshot remains authoritative. */
+	selection?: SnapshotSelection;
 }
 
 export interface RemoteObject<T> {

package/src/webdav-backend.ts

@@ -11,6 +11,7 @@ import {
 	SyncBackendConflictError,
 	SyncBackendPublicationOutcomeUnknownError,
 } from "./sync-backend.js";
+import { portableSnapshotSelection } from "./sync-policy.js";
 import type { LatestPointer, RemoteObject, ResolvedWebDavBackend, Snapshot } from "./types.js";
 import { WebDavClient, WebDavHttpError, WebDavPreconditionError } from "./webdav-client.js";
 
@@ -427,6 +428,7 @@ function pointerFor(
 		syncSessions:
 			snapshot.syncSessions === true ||
 			snapshot.files.some((file) => file.path.startsWith("sessions/")),
+		...(snapshot.selection === undefined ? {} : { selection: snapshot.selection }),
 	};
 }
 
@@ -438,6 +440,7 @@ function remoteHead(pointer: LatestPointer, identity: string, etag?: string): Re
 		createdAt: pointer.createdAt,
 		machine: pointer.machine,
 		syncSessions: pointer.syncSessions === true,
+		...(pointer.selection === undefined ? {} : { selection: pointer.selection }),
 	};
 }
 
@@ -503,6 +506,7 @@ function requirePointer(value: LatestPointer | undefined, expectedProfile: strin
 	) {
 		throw new Error("Remote latest pointer is malformed.");
 	}
+	if (value.selection !== undefined) portableSnapshotSelection(value.selection);
 	return value;
 }