@narumitw/pi-sync 0.49.5 → 0.49.8

package/src/remote-snapshot.ts

@@ -1,9 +1,10 @@
+import { syncConfigReviewFingerprint } from "./config.js";
 import type { RemoteHead, SyncBackend } from "./sync-backend.js";
 import { safeTerminalText } from "./sync-format.js";
 import {
 	inspectRemoteSelection,
-	RemoteSelectionMismatchError,
 	type RemoteSelectionState,
+	remoteSelectionMismatch,
 	sameSyncInclude,
 	snapshotSelectionInclude,
 } from "./sync-policy.js";
@@ -37,7 +38,7 @@ export async function readSnapshotForHead(
 export function requireCompatibleRemoteSelection(config: AnySyncConfig, snapshot: Snapshot) {
 	const state = inspectRemoteSelection(config.include, snapshot);
 	if (state.kind === "different") {
-		throw new RemoteSelectionMismatchError(config.include, state.include);
+		throw remoteSelectionMismatch(config, state.include, syncConfigReviewFingerprint(config));
 	}
 }
 

package/src/settings-management.ts

@@ -9,6 +9,13 @@ import {
 } from "./config.js";
 import type { PiSyncSettingsV3, StorageConnectionSettings, SyncSetupSettings } from "./types.js";
 
+export class SyncSetupReviewChangedError extends Error {
+	constructor(message: string) {
+		super(message);
+		this.name = "SyncSetupReviewChangedError";
+	}
+}
+
 export async function saveNewV3Settings(
 	input: {
 		setupName: string;
@@ -119,7 +126,7 @@ export async function updateSyncSetup(
 			options.expectedInclude &&
 			!sameNames(normalizeSyncInclude(setup.sync.include), options.expectedInclude)
 		) {
-			throw new Error(
+			throw new SyncSetupReviewChangedError(
 				`Sync setup “${name}” included content changed while it was open; reopen it and review the current selection.`,
 			);
 		}
@@ -133,7 +140,7 @@ export async function updateSyncSetup(
 					options.expectedStorage,
 				)
 			) {
-				throw new Error(
+				throw new SyncSetupReviewChangedError(
 					`Sync setup “${name}” storage changed while it was open; reopen it and review the current storage location.`,
 				);
 			}

package/src/settings-ui.ts

@@ -2,6 +2,7 @@ import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { defineMenu, runMenu } from "@narumitw/pi-tui-kit";
 import type { RunRoute } from "./cancellable-operation.js";
 import { loadConfig, localConfigPath } from "./config.js";
+import { dispatchManagerResult } from "./manager-result-dispatcher.js";
 import { updateSyncSetup } from "./settings-management.js";
 import {
 	SETUP_SWITCH_ACTION_OPTIONS,
@@ -67,9 +68,8 @@ export async function showSyncSettings(
 					},
 					{
 						id: "remoteInclude",
-						label: "Remote included content",
-						description:
-							"Compare portable remote selection, then adopt it or keep local settings without pulling files.",
+						label: "Compare synced content",
+						description: "Review this device and remote content lists before choosing either one.",
 						currentValue: "Review",
 						action: "remote-include",
 					},
@@ -126,8 +126,24 @@ export async function showSyncSettings(
 				const reviewSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
 				const { showRemoteSelectionReview } = await import("./remote-selection-ui.js");
 				if (reviewSignal.aborted) return { kind: "rejected" };
-				await showRemoteSelectionReview(ctx, setupName, reviewSignal);
-				return reviewSignal.aborted ? { kind: "rejected" } : { kind: "stay" };
+				const review = await showRemoteSelectionReview(ctx, setupName, reviewSignal, undefined, {
+					origin: "settings",
+					runRoute,
+				});
+				if (reviewSignal.aborted) return { kind: "rejected" };
+				if (review.kind === "route-result") {
+					const disposition = await dispatchManagerResult(
+						ctx,
+						review.result,
+						review.route,
+						runRoute,
+						reviewSignal,
+					);
+					return disposition.kind === "close" ? { kind: "close" } : { kind: "stay" };
+				}
+				return review.kind === "closed" || review.kind === "stale"
+					? { kind: "close" }
+					: { kind: "stay" };
 			},
 		},
 	});

package/src/setup-switch.ts

@@ -8,9 +8,12 @@ import {
 	syncSetupReviewIdentity,
 	updateLocalConfig,
 } from "./config.js";
+import { SetupPullRequiresUiError } from "./sync-errors.js";
 import { safeTerminalText } from "./sync-format.js";
 import type { OnSwitchAction } from "./types.js";
 
+export { SetupPullRequiresUiError } from "./sync-errors.js";
+
 export const SETUP_SWITCH_ACTION_OPTIONS: ReadonlyArray<{
 	label: string;
 	value: OnSwitchAction;
@@ -34,8 +37,6 @@ export async function saveOnSwitch(action: OnSwitchAction, signal?: AbortSignal)
 
 export type SetupPullOutcome = "applied" | "cancelled";
 
-export class SetupPullRequiresUiError extends Error {}
-
 export interface SetupSwitchResult {
 	pullApplied: boolean;
 }

package/src/snapshot-paths.ts

@@ -0,0 +1,13 @@
+import path from "node:path";
+
+function expandHome(value: string) {
+	if (value === "~") return process.env.HOME ?? value;
+	if (value.startsWith("~/")) return path.join(process.env.HOME ?? "~", value.slice(2));
+	return value;
+}
+
+export function sessionStorageRoot(root: string, configuredSessionDir?: string) {
+	return configuredSessionDir
+		? path.resolve(expandHome(configuredSessionDir))
+		: path.resolve(root, "sessions");
+}

package/src/snapshot-transaction.ts

@@ -4,7 +4,7 @@ import path from "node:path";
 import { agentDir, stateDir } from "./config.js";
 import { withLock } from "./lock.js";
 import { assertWithinRoot, isPathInside } from "./paths.js";
-import { sessionStorageRoot } from "./snapshot.js";
+import { sessionStorageRoot } from "./snapshot-paths.js";
 import type { SnapshotApplyPlan } from "./types.js";
 
 const JOURNAL_VERSION = 1;

package/src/snapshot.ts

@@ -5,8 +5,10 @@ import os from "node:os";
 import path from "node:path";
 import { agentDir, configuredSessionDir } from "./config.js";
 import { isDeniedPath, posixJoin, safeJoin, toPosix } from "./paths.js";
+import { sessionStorageRoot } from "./snapshot-paths.js";
 
 export { isDeniedPath } from "./paths.js";
+export { sessionStorageRoot } from "./snapshot-paths.js";
 
 import {
 	canonicalSnapshotPathForConfig,
@@ -39,12 +41,6 @@ const SECRET_PATTERNS = [
 	/gh[pousr]_[A-Za-z0-9_]{20,}/,
 ];
 
-function expandHome(value: string) {
-	if (value === "~") return process.env.HOME ?? value;
-	if (value.startsWith("~/")) return path.join(process.env.HOME ?? "~", value.slice(2));
-	return value;
-}
-
 function selectTopLevelFileEntry(entries: Dirent[], fileName: string) {
 	const exact = entries.find((entry) => entry.isFile() && entry.name === fileName);
 	if (exact) return exact;
@@ -223,12 +219,6 @@ export function isSessionFilePath(relativePath: string) {
 	return isSessionPath(normalized) && normalized.endsWith(".jsonl");
 }
 
-export function sessionStorageRoot(root: string, configuredSessionDir?: string) {
-	return configuredSessionDir
-		? path.resolve(expandHome(configuredSessionDir))
-		: path.resolve(root, "sessions");
-}
-
 export function sessionSnapshotPathFromAbsolute(
 	sessionFile: string,
 	configuredSessionDir?: string,

package/src/sync-attention.ts

@@ -0,0 +1,100 @@
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { truncateToWidth } from "@earendil-works/pi-tui";
+import { syncConfigReviewFingerprint } from "./config.js";
+import { safeTerminalText } from "./sync-format.js";
+import {
+	compareSyncInclude,
+	type RemoteSelectionDecision,
+	sameSyncInclude,
+} from "./sync-policy.js";
+import type { AnySyncConfig } from "./types.js";
+
+const STATUS_KEY = "sync";
+const WIDGET_KEY = "sync:attention";
+
+export type SyncAttentionOrigin = "sync" | "pull" | "push";
+
+export interface SyncAttentionState {
+	decision: RemoteSelectionDecision;
+	origin: SyncAttentionOrigin;
+	offered: boolean;
+}
+
+export function syncAttentionMatchesConfig(attention: SyncAttentionState, config: AnySyncConfig) {
+	return (
+		attention.decision.setupName === config.setupName &&
+		attention.decision.configIdentity === syncConfigReviewFingerprint(config) &&
+		sameSyncInclude(attention.decision.localInclude, config.include)
+	);
+}
+
+export interface SyncAttentionController {
+	set(decision: RemoteSelectionDecision, origin: SyncAttentionOrigin): void;
+	current(): SyncAttentionState | undefined;
+	markOffered(): boolean;
+	clear(ctx: ExtensionContext): void;
+	reset(ctx: ExtensionContext): void;
+	publish(ctx: ExtensionContext): void;
+}
+
+export function createSyncAttentionController(): SyncAttentionController {
+	let state: SyncAttentionState | undefined;
+
+	return {
+		set(decision, origin) {
+			state = { decision, origin, offered: false };
+		},
+		current() {
+			return state;
+		},
+		markOffered() {
+			if (!state || state.offered) return false;
+			state = { ...state, offered: true };
+			return true;
+		},
+		clear(ctx) {
+			state = undefined;
+			clearAttentionPresentation(ctx);
+		},
+		reset(ctx) {
+			state = undefined;
+			clearAttentionPresentation(ctx);
+		},
+		publish(ctx) {
+			if (!state) {
+				clearAttentionPresentation(ctx);
+				return;
+			}
+			const presentation = attentionPresentation(state.decision);
+			ctx.ui.setStatus(STATUS_KEY, presentation.status);
+			if (ctx.mode !== "tui") return;
+			ctx.ui.setWidget(WIDGET_KEY, (_tui, theme) => ({
+				render(width: number) {
+					const safeWidth = Math.max(1, width);
+					return presentation.lines.map((line, index) =>
+						truncateToWidth(theme.fg(index === 0 ? "warning" : "muted", line), safeWidth, "…"),
+					);
+				},
+				invalidate() {},
+			}));
+		},
+	};
+}
+
+function attentionPresentation(decision: RemoteSelectionDecision) {
+	const setupName = safeTerminalText(decision.setupName);
+	const comparison = compareSyncInclude(decision.localInclude, decision.remoteInclude);
+	const difference =
+		comparison.remoteOnly.length === 0 && comparison.localOnly.length === 0
+			? "Only list order differs"
+			: `Remote ${comparison.remoteOnly.length} · Device ${comparison.localOnly.length}`;
+	return {
+		status: "review needed",
+		lines: [`Pi Sync needs review · ${setupName}`, difference, "No changes · Run /sync to review"],
+	};
+}
+
+function clearAttentionPresentation(ctx: ExtensionContext) {
+	ctx.ui.setStatus(STATUS_KEY, undefined);
+	ctx.ui.setWidget(WIDGET_KEY, undefined);
+}

package/src/sync-decision.ts

@@ -1,4 +1,5 @@
 import { syncConfigReviewIdentity } from "./config.js";
+import { SyncDecisionRequiredError } from "./sync-errors.js";
 import { formatDiff, formatSnapshotOnlyDiff, safeTerminalText } from "./sync-format.js";
 import { includeFromSelectionConfig } from "./sync-policy.js";
 import { syncPolicyChanged } from "./sync-state.js";
@@ -29,15 +30,10 @@ export interface SyncDecision {
 	directMessage: string;
 }
 
-export class SyncDecisionRequiredError extends Error {
-	readonly decision: SyncDecision;
-
-	constructor(decision: SyncDecision) {
-		super(decision.directMessage);
-		this.name = "SyncDecisionRequiredError";
-		this.decision = decision;
-	}
-}
+export {
+	isSyncDecisionRequiredError,
+	SyncDecisionRequiredError,
+} from "./sync-errors.js";
 
 interface CreateSyncDecisionOptions {
 	kind: SyncDecisionKind;
@@ -104,10 +100,6 @@ export function createSyncDecision(options: CreateSyncDecisionOptions) {
 	});
 }
 
-export function isSyncDecisionRequiredError(error: unknown): error is SyncDecisionRequiredError {
-	return error instanceof SyncDecisionRequiredError;
-}
-
 function safeList(values: readonly string[]) {
 	return values.length > 0 ? values.map(safeTerminalText).join(", ") : "none";
 }

package/src/sync-errors.ts

@@ -0,0 +1,23 @@
+import type { SyncDecision } from "./sync-decision.js";
+
+export class SetupPullRequiresUiError extends Error {}
+
+export class SyncDecisionRequiredError extends Error {
+	readonly decision: SyncDecision;
+
+	constructor(decision: SyncDecision) {
+		super(decision.directMessage);
+		this.name = "SyncDecisionRequiredError";
+		this.decision = decision;
+	}
+}
+
+export function isSyncDecisionRequiredError(error: unknown): error is SyncDecisionRequiredError {
+	return error instanceof SyncDecisionRequiredError;
+}
+
+export function errorMessage(error: unknown) {
+	const message = error instanceof Error ? error.message : String(error);
+	// biome-ignore lint/suspicious/noControlCharactersInRegex: Escape untrusted terminal controls.
+	return message.replace(/[\u0000-\u001f\u007f-\u009f]/gu, "?");
+}