@narumitw/pi-sync 0.50.3 → 0.51.1

package/src/ui/manager-attention.ts

@@ -7,79 +7,67 @@ import type { ManagerDescription } from "./manager-state.js";
 import type { SyncAttentionState } from "./sync-attention.js";
 
 export interface SyncManagerAttentionOptions {
-	getObservation?: () => StartupObservation | undefined;
-	onObservationInvalidated?: () => void;
-	getAttention?: () => SyncAttentionState | undefined;
-	onSelectionResolved?: (expected: SyncAttentionState) => void;
+  getObservation?: () => StartupObservation | undefined;
+  onObservationInvalidated?: () => void;
+  getAttention?: () => SyncAttentionState | undefined;
+  onSelectionResolved?: (expected: SyncAttentionState) => void;
 }
 
 export function attentionMainMenuItems(
-	manager: ManagerDescription,
+  manager: ManagerDescription,
 ): ActionMenuItem<"main" | "more" | "recovery", "review-attention">[] {
-	if (!manager.attention && manager.observation?.inspection.selectionState?.kind !== "different")
-		return [];
-	const disabled = manager.attentionReviewDisabled === true;
-	return [
-		{
-			id: "review-attention",
-			label: "Review synced content (recommended)",
-			action: "review-attention",
-			...(disabled
-				? {
-						disabled: true,
-						disabledReason: "Finish or recover the active operation first.",
-					}
-				: {}),
-		},
-	];
+  if (!manager.attention && manager.observation?.inspection.selectionState?.kind !== "different") return [];
+  const disabled = manager.attentionReviewDisabled === true;
+  return [
+    {
+      id: "review-attention",
+      label: "Review synced content (recommended)",
+      action: "review-attention",
+      ...(disabled
+        ? {
+            disabled: true,
+            disabledReason: "Finish or recover the active operation first.",
+          }
+        : {}),
+    },
+  ];
 }
 
 export function blockedSyncMenuItem(
-	label: string,
-	manager: ManagerDescription,
+  label: string,
+  manager: ManagerDescription,
 ): ActionMenuItem<"main" | "more" | "recovery", "sync"> | undefined {
-	if (label !== "Sync now (recommended)" || !manager.attentionBlocksSync) return undefined;
-	return {
-		id: "sync",
-		label,
-		description: "Review first.",
-		action: "sync",
-		disabled: true,
-		disabledReason: "Review synced content first.",
-	};
+  if (label !== "Sync now (recommended)" || !manager.attentionBlocksSync) return undefined;
+  return {
+    id: "sync",
+    label,
+    description: "Review first.",
+    action: "sync",
+    disabled: true,
+    disabledReason: "Review synced content first.",
+  };
 }
 
 export async function showManagerAttention(
-	ctx: ExtensionCommandContext,
-	attention: SyncAttentionState,
-	runRoute: RunRoute,
-	signal: AbortSignal | undefined,
-	onSelectionResolved: (() => void) | undefined,
+  ctx: ExtensionCommandContext,
+  attention: SyncAttentionState,
+  runRoute: RunRoute,
+  signal: AbortSignal | undefined,
+  onSelectionResolved: (() => void) | undefined,
 ): Promise<"close" | "stay"> {
-	const { showRemoteSelectionReview } = await import("./remote-selection-ui.js");
-	if (signal?.aborted) return "close";
-	const review = await showRemoteSelectionReview(
-		ctx,
-		attention.decision.setupName,
-		signal,
-		undefined,
-		{
-			decision: attention.decision,
-			origin: attention.origin,
-			runRoute,
-			onSelectionResolved,
-		},
-	);
-	if (review.kind === "route-result") {
-		const disposition = await dispatchManagerResult(
-			ctx,
-			review.result,
-			review.route,
-			runRoute,
-			signal,
-			{ onSelectionResolved },
-		);
-		return disposition.kind;
-	}
-	return review.kind === "closed" || review.kind === "stale" ? "close" : "stay";
+  const { showRemoteSelectionReview } = await import("./remote-selection-ui.js");
+  if (signal?.aborted) return "close";
+  const review = await showRemoteSelectionReview(ctx, attention.decision.setupName, signal, undefined, {
+    decision: attention.decision,
+    origin: attention.origin,
+    runRoute,
+    onSelectionResolved,
+  });
+  if (review.kind === "route-result") {
+    const disposition = await dispatchManagerResult(ctx, review.result, review.route, runRoute, signal, {
+      onSelectionResolved,
+    });
+    return disposition.kind;
+  }
+  return review.kind === "closed" || review.kind === "stale" ? "close" : "stay";
 }

package/src/ui/manager-recovery.ts

@@ -1,9 +1,6 @@
 import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { runConfirmation } from "@narumitw/pi-tui-kit";
-import {
-	inspectOperationAvailability,
-	operationCanRecover,
-} from "../state/operation-availability.js";
+import { inspectOperationAvailability, operationCanRecover } from "../state/operation-availability.js";
 import { errorMessage } from "../sync/sync-errors.js";
 import type { RunRoute } from "./cancellable-operation.js";
 import type { ManagerDescription } from "./manager-state.js";
@@ -12,58 +9,52 @@ import { safeTerminalText } from "./terminal-text.js";
 export type RecoveryDisposition = "restored" | "stay" | "close";
 
 export async function recoverSyncAccess(
-	ctx: ExtensionCommandContext,
-	manager: ManagerDescription,
-	runRoute: RunRoute,
-	sessionSignal: AbortSignal | undefined,
-	actionSignal: AbortSignal,
+  ctx: ExtensionCommandContext,
+  manager: ManagerDescription,
+  runRoute: RunRoute,
+  sessionSignal: AbortSignal | undefined,
+  actionSignal: AbortSignal,
 ): Promise<RecoveryDisposition> {
-	const operation = manager.operation;
-	if (!operation || !operationCanRecover(operation)) {
-		ctx.ui.notify(
-			"Operation status changed. Refresh the manager before retrying recovery.",
-			"warning",
-		);
-		return "stay";
-	}
-	const signal = sessionSignal ? AbortSignal.any([sessionSignal, actionSignal]) : actionSignal;
-	if (signal.aborted) return "close";
-	const unreadable = operation.kind === "recoverable-unreadable";
-	const details = unreadable
-		? "Pi-sync cannot verify who owns the unreadable lock. Close other Pi sessions that may be syncing before continuing."
-		: `The recorded ${safeTerminalText(operation.lock.command)} operation (pid ${operation.lock.pid}) appears to have stopped. Close other Pi sessions that may still be syncing before continuing.`;
-	const confirmation = await runConfirmation(ctx, {
-		title: "Restore sync access?",
-		message: [
-			details,
-			"",
-			"This removes only the local operation lock.",
-			"It does not change settings, local files, sync state, or remote data.",
-		].join("\n"),
-		confirmLabel: "Remove local lock and continue",
-		cancelLabel: "Cancel",
-		signal,
-		isCurrent: () => !signal.aborted,
-		onError: (_currentCtx, error) => {
-			ctx.ui.notify(
-				`Recovery confirmation failed: ${safeTerminalText(errorMessage(error))}`,
-				"error",
-			);
-		},
-	});
-	if (confirmation.kind === "stale") return "close";
-	if (confirmation.kind === "closed") {
-		if (confirmation.reason === "close") return "close";
-		if (!signal.aborted) {
-			ctx.ui.notify("Recovery cancelled; the local operation lock was not changed.", "info");
-		}
-		return "stay";
-	}
-	if (confirmation.kind !== "confirmed") return "stay";
-	if (signal.aborted) return "close";
-	await runRoute(unreadable ? "unlock --stale" : "unlock", signal);
-	if (signal.aborted) return "close";
-	const latest = await inspectOperationAvailability();
-	if (signal.aborted) return "close";
-	return latest.kind === "free" ? "restored" : "stay";
+  const operation = manager.operation;
+  if (!operation || !operationCanRecover(operation)) {
+    ctx.ui.notify("Operation status changed. Refresh the manager before retrying recovery.", "warning");
+    return "stay";
+  }
+  const signal = sessionSignal ? AbortSignal.any([sessionSignal, actionSignal]) : actionSignal;
+  if (signal.aborted) return "close";
+  const unreadable = operation.kind === "recoverable-unreadable";
+  const details = unreadable
+    ? "Pi-sync cannot verify who owns the unreadable lock. Close other Pi sessions that may be syncing before continuing."
+    : `The recorded ${safeTerminalText(operation.lock.command)} operation (pid ${operation.lock.pid}) appears to have stopped. Close other Pi sessions that may still be syncing before continuing.`;
+  const confirmation = await runConfirmation(ctx, {
+    title: "Restore sync access?",
+    message: [
+      details,
+      "",
+      "This removes only the local operation lock.",
+      "It does not change settings, local files, sync state, or remote data.",
+    ].join("\n"),
+    confirmLabel: "Remove local lock and continue",
+    cancelLabel: "Cancel",
+    signal,
+    isCurrent: () => !signal.aborted,
+    onError: (_currentCtx, error) => {
+      ctx.ui.notify(`Recovery confirmation failed: ${safeTerminalText(errorMessage(error))}`, "error");
+    },
+  });
+  if (confirmation.kind === "stale") return "close";
+  if (confirmation.kind === "closed") {
+    if (confirmation.reason === "close") return "close";
+    if (!signal.aborted) {
+      ctx.ui.notify("Recovery cancelled; the local operation lock was not changed.", "info");
+    }
+    return "stay";
+  }
+  if (confirmation.kind !== "confirmed") return "stay";
+  if (signal.aborted) return "close";
+  await runRoute(unreadable ? "unlock --stale" : "unlock", signal);
+  if (signal.aborted) return "close";
+  const latest = await inspectOperationAvailability();
+  if (signal.aborted) return "close";
+  return latest.kind === "free" ? "restored" : "stay";
 }

package/src/ui/manager-result-dispatcher.ts

@@ -1,93 +1,79 @@
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
-import type {
-	CancellableOperationResult,
-	RunRoute,
-	RunRouteResult,
-} from "./cancellable-operation.js";
+import type { CancellableOperationResult, RunRoute, RunRouteResult } from "./cancellable-operation.js";
 import { type RemoteSelectionOrigin, showRemoteSelectionReview } from "./remote-selection-ui.js";
 import { showSyncResolution } from "./sync-resolution-ui.js";
 
 const MAX_DECISION_TRANSITIONS = 32;
 
 export interface ManagerResultDisposition {
-	kind: "close" | "stay";
-	appliedRoute?: "sync" | "pull" | "push";
+  kind: "close" | "stay";
+  appliedRoute?: "sync" | "pull" | "push";
 }
 
 export interface ManagerResultOptions {
-	cancelLabel?: string;
-	onSelectionResolved?: () => void;
-	withStateAccess?: <T>(task: () => Promise<T>) => Promise<T>;
+  cancelLabel?: string;
+  onSelectionResolved?: () => void;
+  withStateAccess?: <T>(task: () => Promise<T>) => Promise<T>;
 }
 
 export async function dispatchManagerResult(
-	ctx: ExtensionContext,
-	initialResult: CancellableOperationResult,
-	origin: Exclude<RemoteSelectionOrigin, "settings">,
-	runRoute: RunRoute,
-	signal?: AbortSignal,
-	options: ManagerResultOptions = {},
+  ctx: ExtensionContext,
+  initialResult: CancellableOperationResult,
+  origin: Exclude<RemoteSelectionOrigin, "settings">,
+  runRoute: RunRoute,
+  signal?: AbortSignal,
+  options: ManagerResultOptions = {},
 ): Promise<ManagerResultDisposition> {
-	let result: CancellableOperationResult | RunRouteResult = initialResult;
-	let currentRoute: "sync" | "pull" | "push" = origin;
-	let resolving = false;
+  let result: CancellableOperationResult | RunRouteResult = initialResult;
+  let currentRoute: "sync" | "pull" | "push" = origin;
+  let resolving = false;
 
-	for (let transition = 0; transition < MAX_DECISION_TRANSITIONS; transition += 1) {
-		if (signal?.aborted) return { kind: "close" };
-		if (result.kind === "remote-selection-required") {
-			resolving = true;
-			const resolution = await showRemoteSelectionReview(
-				ctx,
-				result.decision.setupName,
-				signal,
-				undefined,
-				{
-					decision: result.decision,
-					origin: currentRoute,
-					runRoute,
-					cancelLabel: options.cancelLabel,
-					onSelectionResolved: options.onSelectionResolved,
-					withStateAccess: options.withStateAccess,
-				},
-			);
-			if (resolution.kind === "route-result") {
-				result = resolution.result;
-				currentRoute = resolution.route;
-				continue;
-			}
-			return resolution.kind === "closed" || resolution.kind === "stale"
-				? { kind: "close" }
-				: { kind: "stay" };
-		}
-		if (result.kind === "decision-required") {
-			resolving = true;
-			const resolution = await showSyncResolution(ctx, result.decision, runRoute, signal);
-			if (resolution.kind === "route-result") {
-				result = resolution.result;
-				currentRoute = resolution.route;
-				continue;
-			}
-			if (resolution.kind === "resolved") {
-				return { kind: "close", appliedRoute: resolution.direction };
-			}
-			return resolution.kind === "closed" || resolution.kind === "stale"
-				? { kind: "close" }
-				: { kind: "stay" };
-		}
-		if (result.kind === "closed") return { kind: "close" };
-		if (result.kind === "completed") {
-			const appliedRoute = result.outcome === "applied" ? currentRoute : undefined;
-			if (resolving || (origin === "pull" && result.outcome === "applied")) {
-				return { kind: "close", ...(appliedRoute ? { appliedRoute } : {}) };
-			}
-			return { kind: "stay", ...(appliedRoute ? { appliedRoute } : {}) };
-		}
-		return { kind: "stay" };
-	}
+  for (let transition = 0; transition < MAX_DECISION_TRANSITIONS; transition += 1) {
+    if (signal?.aborted) return { kind: "close" };
+    if (result.kind === "remote-selection-required") {
+      resolving = true;
+      const resolution = await showRemoteSelectionReview(ctx, result.decision.setupName, signal, undefined, {
+        decision: result.decision,
+        origin: currentRoute,
+        runRoute,
+        cancelLabel: options.cancelLabel,
+        onSelectionResolved: options.onSelectionResolved,
+        withStateAccess: options.withStateAccess,
+      });
+      if (resolution.kind === "route-result") {
+        result = resolution.result;
+        currentRoute = resolution.route;
+        continue;
+      }
+      return resolution.kind === "closed" || resolution.kind === "stale" ? { kind: "close" } : { kind: "stay" };
+    }
+    if (result.kind === "decision-required") {
+      resolving = true;
+      const resolution = await showSyncResolution(ctx, result.decision, runRoute, signal);
+      if (resolution.kind === "route-result") {
+        result = resolution.result;
+        currentRoute = resolution.route;
+        continue;
+      }
+      if (resolution.kind === "resolved") {
+        return { kind: "close", appliedRoute: resolution.direction };
+      }
+      return resolution.kind === "closed" || resolution.kind === "stale" ? { kind: "close" } : { kind: "stay" };
+    }
+    if (result.kind === "closed") return { kind: "close" };
+    if (result.kind === "completed") {
+      const appliedRoute = result.outcome === "applied" ? currentRoute : undefined;
+      if (resolving || (origin === "pull" && result.outcome === "applied")) {
+        return { kind: "close", ...(appliedRoute ? { appliedRoute } : {}) };
+      }
+      return { kind: "stay", ...(appliedRoute ? { appliedRoute } : {}) };
+    }
+    return { kind: "stay" };
+  }
 
-	ctx.ui.notify(
-		"Sync resolution stopped after too many state changes. Start /sync again to review fresh state.",
-		"warning",
-	);
-	return { kind: "stay" };
+  ctx.ui.notify(
+    "Sync resolution stopped after too many state changes. Start /sync again to review fresh state.",
+    "warning",
+  );
+  return { kind: "stay" };
 }