@narumitw/pi-sync 0.49.6 → 0.49.8

package/src/manager-ui.ts

@@ -1,10 +1,6 @@
 import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { type ActionMenuItem, defineMenu, runMenu } from "@narumitw/pi-tui-kit";
-import {
-	type CancellableOperationResult,
-	type RunRoute,
-	runCancellableOperation,
-} from "./cancellable-operation.js";
+import { type RunRoute, runCancellableOperation } from "./cancellable-operation.js";
 import { setSyncSetupCompletions } from "./command.js";
 import {
 	configuredSyncSetupNames,
@@ -18,6 +14,12 @@ import {
 } from "./config.js";
 import { showAddGitTarget, showEditGitTarget, showGitSetup } from "./git-ui.js";
 import { inspectLock, isStaleLock } from "./lock.js";
+import {
+	attentionMainMenuItems,
+	blockedSyncMenuItem,
+	type SyncManagerAttentionOptions,
+	showManagerAttention,
+} from "./manager-attention.js";
 import {
 	errorMessage,
 	ownRecord,
@@ -25,6 +27,7 @@ import {
 	requiredInput,
 	safeTerminalText,
 } from "./manager-helpers.js";
+import { dispatchManagerResult } from "./manager-result-dispatcher.js";
 import { backendStorageDescription, describeManagerState } from "./manager-state.js";
 import { chooseS3Credentials } from "./s3-credentials-ui.js";
 import {
@@ -37,7 +40,6 @@ import { showSyncSettings } from "./settings-ui.js";
 import { useSyncSetup } from "./setup-switch.js";
 import { showAddStorageConnection, showStorageConnections } from "./storage-connections-ui.js";
 import { DEFAULT_SYNC_INCLUDE, syncIncludeSelection } from "./sync-policy.js";
-import { showSyncResolution } from "./sync-resolution-ui.js";
 import { showSyncSetups } from "./sync-setups-ui.js";
 import type { AnySyncConfig } from "./types.js";
 import { showAddWebDavTarget, showEditWebDavTarget, showWebDavSetup } from "./webdav-ui.js";
@@ -46,6 +48,7 @@ export async function showSyncManager(
 	ctx: ExtensionCommandContext,
 	runRoute: RunRoute,
 	sessionSignal?: AbortSignal,
+	options: SyncManagerAttentionOptions = {},
 ): Promise<void> {
 	if (!ctx.hasUI) {
 		await runRoute("help");
@@ -53,6 +56,7 @@ export async function showSyncManager(
 	}
 	type Screen = "main" | "more" | "recovery";
 	type Action =
+		| "review-attention"
 		| "sync"
 		| "switch"
 		| "diff"
@@ -78,7 +82,12 @@ export async function showSyncManager(
 				kind: "actions",
 				title: "Manage sync",
 				lines: state.manager.title.split("\n").slice(1),
-				items: state.manager.actions.map(syncMainMenuItem),
+				items: [
+					...attentionMainMenuItems(state.manager),
+					...state.manager.actions.map(
+						(label) => blockedSyncMenuItem(label, state.manager) ?? syncMainMenuItem(label),
+					),
+				],
 				hint: "close",
 			}),
 			more: () => ({
@@ -114,7 +123,28 @@ export async function showSyncManager(
 			}),
 		},
 		actions: {
+			"review-attention": async () => {
+				const attention = options.getAttention?.();
+				if (!attention) return { kind: "stay" };
+				const disposition = await showManagerAttention(
+					ctx,
+					attention,
+					runRoute,
+					sessionSignal,
+					() => options.onSelectionResolved?.(attention),
+				);
+				return { kind: disposition };
+			},
 			sync: async () => {
+				const pendingAttention = options.getAttention?.();
+				if (pendingAttention) {
+					const activeConfig = await loadConfig();
+					if (sessionSignal?.aborted) return { kind: "close" };
+					if (pendingAttention.decision.setupName === activeConfig.setupName) {
+						ctx.ui.notify("Review synced content before starting Sync now.", "warning");
+						return { kind: "stay" };
+					}
+				}
 				const result = await runCancellableOperation(
 					ctx,
 					"Checking current sync setup…",
@@ -125,10 +155,14 @@ export async function showSyncManager(
 						signal: sessionSignal,
 					},
 				);
-				const resolution = await resolveManagerDecision(ctx, result, runRoute, sessionSignal);
-				return result.kind === "closed" || resolution === "close"
-					? { kind: "close" }
-					: { kind: "stay" };
+				const disposition = await dispatchManagerResult(
+					ctx,
+					result,
+					"sync",
+					runRoute,
+					sessionSignal,
+				);
+				return disposition.kind === "close" ? { kind: "close" } : { kind: "stay" };
 			},
 			switch: async () => {
 				const result = await showSetupSwitcher(ctx, runRoute, undefined, sessionSignal);
@@ -162,12 +196,14 @@ export async function showSyncManager(
 						signal: sessionSignal,
 					},
 				);
-				const resolution = await resolveManagerDecision(ctx, result, runRoute, sessionSignal);
-				return result.kind === "closed" ||
-					(result.kind === "completed" && result.outcome === "applied") ||
-					resolution === "close"
-					? { kind: "close" }
-					: { kind: "stay" };
+				const disposition = await dispatchManagerResult(
+					ctx,
+					result,
+					"pull",
+					runRoute,
+					sessionSignal,
+				);
+				return disposition.kind === "close" ? { kind: "close" } : { kind: "stay" };
 			},
 			push: async () => {
 				const result = await runCancellableOperation(
@@ -181,10 +217,14 @@ export async function showSyncManager(
 						signal: sessionSignal,
 					},
 				);
-				const resolution = await resolveManagerDecision(ctx, result, runRoute, sessionSignal);
-				return result.kind === "closed" || resolution === "close"
-					? { kind: "close" }
-					: { kind: "stay" };
+				const disposition = await dispatchManagerResult(
+					ctx,
+					result,
+					"push",
+					runRoute,
+					sessionSignal,
+				);
+				return disposition.kind === "close" ? { kind: "close" } : { kind: "stay" };
 			},
 			setups: async () => {
 				const result = await showSyncSetupManager(ctx, runRoute, sessionSignal);
@@ -219,10 +259,14 @@ export async function showSyncManager(
 	});
 	await runMenu(ctx, menu, {
 		getState: async () => {
+			const pendingAttention = options.getAttention?.();
 			const [manager, lock] = await Promise.all([
-				describeManagerState(sessionSignal),
+				describeManagerState(sessionSignal, pendingAttention),
 				inspectLock(),
 			]);
+			if (pendingAttention && options.getAttention?.() === pendingAttention && !manager.attention) {
+				options.onSelectionResolved?.(pendingAttention);
+			}
 			return {
 				manager,
 				canRecover:
@@ -234,21 +278,6 @@ export async function showSyncManager(
 	});
 }
 
-async function resolveManagerDecision(
-	ctx: ExtensionCommandContext,
-	result: CancellableOperationResult,
-	runRoute: RunRoute,
-	signal?: AbortSignal,
-) {
-	if (result.kind !== "decision-required") return undefined;
-	const resolution = await showSyncResolution(ctx, result.decision, runRoute, signal);
-	return resolution.kind === "resolved" ||
-		resolution.kind === "closed" ||
-		resolution.kind === "stale"
-		? "close"
-		: "stay";
-}
-
 function syncMainMenuItem(
 	label: string,
 ): ActionMenuItem<
@@ -553,23 +582,11 @@ async function showSetupSwitcher(
 						signal,
 					},
 				);
-				if (pullResult.kind === "closed") {
-					pullClosed = true;
-					return undefined;
-				}
-				if (pullResult.kind === "decision-required") {
-					const resolution = await showSyncResolution(ctx, pullResult.decision, runRoute, signal);
-					if (
-						resolution.kind === "resolved" ||
-						resolution.kind === "closed" ||
-						resolution.kind === "stale"
-					) {
-						pullClosed = true;
-					}
-					return resolution.kind === "resolved" && resolution.direction === "pull"
-						? "applied"
-						: undefined;
+				const disposition = await dispatchManagerResult(ctx, pullResult, "pull", runRoute, signal);
+				if (pullResult.kind === "closed" || pullResult.kind.endsWith("required")) {
+					pullClosed = disposition.kind === "close";
 				}
+				if (disposition.appliedRoute === "pull") return "applied";
 				if (pullResult.kind === "completed") return pullResult.outcome;
 				return pullResult.kind === "cancelled" ? "cancelled" : undefined;
 			},