@narumitw/pi-sync 0.49.5 → 0.49.8

package/src/sync-format.ts

@@ -1,4 +1,7 @@
 import { agentDir } from "./config.js";
+
+export { errorMessage } from "./sync-errors.js";
+
 import type { PublicationCapability, RemoteHead } from "./sync-backend.js";
 import { inspectRemoteSelection } from "./sync-policy.js";
 import { fileHashMap } from "./sync-state.js";
@@ -166,7 +169,3 @@ export function safeTerminalText(value: string) {
 export function redact(value: string) {
 	return value.length <= 8 ? "configured" : `${value.slice(0, 4)}…${value.slice(-4)}`;
 }
-
-export function errorMessage(error: unknown) {
-	return safeTerminalText(error instanceof Error ? error.message : String(error));
-}

package/src/sync-operations.ts

@@ -7,6 +7,7 @@ import {
 	readStateForConfig,
 	sessionDirForApply,
 	stateDir,
+	syncConfigReviewFingerprint,
 	syncSessionsWarnings,
 	writeStateForConfig,
 } from "./config.js";
@@ -46,7 +47,7 @@ import {
 	publicationCapabilityDescription,
 	safeTerminalText,
 } from "./sync-format.js";
-import { inspectRemoteSelection, RemoteSelectionMismatchError } from "./sync-policy.js";
+import { inspectRemoteSelection, remoteSelectionMismatch } from "./sync-policy.js";
 import {
 	canPullRemoteSessionsOnFirstSync,
 	canPullRemoteSettingsOnFirstSync,
@@ -923,7 +924,8 @@ async function readRemoteSnapshot(
 	const snapshot = await readSnapshotForHead(backend, head, signal);
 	const selectionState = inspectRemoteSelection(config.include, snapshot);
 	if (!options.allowSelectionDifference && selectionState.kind === "different") {
-		throw new RemoteSelectionMismatchError(config.include, selectionState.include);
+		const configIdentity = syncConfigReviewFingerprint(config);
+		throw remoteSelectionMismatch(config, selectionState.include, configIdentity);
 	}
 	return {
 		head,

package/src/sync-policy.ts

@@ -206,22 +206,81 @@ export function inspectRemoteSelection(
 		: { kind: "different", include: remoteInclude, ...comparison };
 }
 
+export interface RemoteSelectionDecision {
+	setupName: string;
+	configIdentity: string;
+	localInclude: readonly string[];
+	remoteInclude: readonly string[];
+}
+
 export class RemoteSelectionMismatchError extends Error {
+	readonly decision: RemoteSelectionDecision;
+	readonly setupName: string;
 	readonly localInclude: string[];
 	readonly remoteInclude: string[];
 
-	constructor(localInclude: unknown, remoteInclude: unknown) {
+	constructor(
+		setupName: string,
+		localInclude: unknown,
+		remoteInclude: unknown,
+		configIdentity = JSON.stringify([setupName, normalizeSyncInclude(localInclude)]),
+	) {
 		const local = normalizeSyncInclude(localInclude);
 		const remote = normalizeSyncInclude(remoteInclude);
-		super(
-			"Remote included content differs from this sync setup. Review Remote included content in /sync Settings, or use a reviewed force push to keep local selection.",
-		);
+		super(formatRemoteSelectionMismatch(setupName, local, remote));
 		this.name = "RemoteSelectionMismatchError";
+		this.setupName = setupName;
 		this.localInclude = local;
 		this.remoteInclude = remote;
+		this.decision = {
+			setupName,
+			configIdentity,
+			localInclude: [...local],
+			remoteInclude: [...remote],
+		};
 	}
 }
 
+export function remoteSelectionMismatch(
+	config: { setupName: string; include: unknown },
+	remoteInclude: unknown,
+	configIdentity?: string,
+) {
+	return new RemoteSelectionMismatchError(
+		config.setupName,
+		config.include,
+		remoteInclude,
+		configIdentity,
+	);
+}
+
+export function formatRemoteSelectionMismatch(
+	setupName: string,
+	localInclude: readonly string[],
+	remoteInclude: readonly string[],
+) {
+	const comparison = compareSyncInclude(localInclude, remoteInclude);
+	const lines = [
+		`Synced content differs for sync setup “${stripTerminalControls(setupName)}”.`,
+		`Remote-only: ${comparison.remoteOnly.join(", ") || "none"}`,
+		`This-device-only: ${comparison.localOnly.join(", ") || "none"}`,
+	];
+	if (comparison.remoteOnly.length === 0 && comparison.localOnly.length === 0) {
+		lines.push(
+			"Only ordering differs.",
+			`Remote order: ${remoteInclude.join(", ") || "none"}`,
+			`This device order: ${localInclude.join(", ") || "none"}`,
+		);
+	}
+	lines.push("Run /sync in TUI to review both content lists and choose what happens next.");
+	return lines.join("\n");
+}
+
+function stripTerminalControls(value: string) {
+	// biome-ignore lint/suspicious/noControlCharactersInRegex: Escape untrusted terminal controls.
+	return value.replace(/[\u0000-\u001f\u007f-\u009f]/gu, "?");
+}
+
 export function discoverLegacySnapshotInclude(snapshot: Pick<Snapshot, "files">) {
 	const builtIns = new Set<BuiltInSyncFile>();
 	const custom = new Set<string>();

package/src/sync-resolution-ui.ts

@@ -1,18 +1,27 @@
-import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { defineMenu, runMenu } from "@narumitw/pi-tui-kit";
-import { type RunRoute, runCancellableOperation } from "./cancellable-operation.js";
+import {
+	type RunRoute,
+	type RunRouteResult,
+	runCancellableOperation,
+} from "./cancellable-operation.js";
 import { loadConfig, syncConfigReviewIdentity } from "./config.js";
 import type { SyncDecision, SyncResolutionDirection } from "./sync-decision.js";
 import { errorMessage, safeTerminalText } from "./sync-format.js";
 
 export type SyncResolutionResult =
 	| { kind: "resolved"; direction: SyncResolutionDirection }
+	| {
+			kind: "route-result";
+			result: RunRouteResult;
+			route: SyncResolutionDirection;
+	  }
 	| { kind: "back" }
 	| { kind: "closed" }
 	| { kind: "stale" };
 
 export async function showSyncResolution(
-	ctx: ExtensionCommandContext,
+	ctx: ExtensionContext,
 	initialDecision: SyncDecision,
 	runRoute: RunRoute,
 	sessionSignal?: AbortSignal,
@@ -21,7 +30,8 @@ export async function showSyncResolution(
 	type Action = "push" | "pull" | "back";
 	let currentDecision = initialDecision;
 	let resolvedDirection: SyncResolutionDirection | undefined;
-	const menu = defineMenu<SyncDecision, Screen, Action, ExtensionCommandContext>({
+	let chainedResult: { result: RunRouteResult; route: SyncResolutionDirection } | undefined;
+	const menu = defineMenu<SyncDecision, Screen, Action, ExtensionContext>({
 		start: "resolve",
 		screens: {
 			resolve: ({ state }) => ({
@@ -104,6 +114,10 @@ export async function showSyncResolution(
 			currentDecision = result.decision;
 			return { kind: "stay" as const };
 		}
+		if (result.kind === "remote-selection-required") {
+			chainedResult = { result, route: direction };
+			return { kind: "close" as const };
+		}
 		if (result.kind === "completed") {
 			if (result.outcome === "cancelled") return { kind: "stay" as const };
 			resolvedDirection = direction;
@@ -119,6 +133,7 @@ export async function showSyncResolution(
 		onError: (_menuCtx, error) => ctx.ui.notify(errorMessage(error), "error"),
 	});
 	if (sessionSignal?.aborted || result.kind === "stale") return { kind: "stale" };
+	if (chainedResult) return { kind: "route-result", ...chainedResult };
 	if (resolvedDirection) return { kind: "resolved", direction: resolvedDirection };
 	if (result.kind === "closed") {
 		return result.reason === "back" ? { kind: "back" } : { kind: "closed" };