@narumitw/pi-sync 0.53.1 → 0.54.1

package/src/ui/cancellable-operation.ts

@@ -1,5 +1,5 @@
 import { BorderedLoader, type ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { Key, matchesKey, truncateToWidth } from "@earendil-works/pi-tui";
+import { isKeyRelease, Key, matchesKey, truncateToWidth } from "@earendil-works/pi-tui";
 import { formatInteractionHints, runCustomInteraction } from "@narumitw/pi-tui-kit";
 import type { SetupPullOutcome } from "../sync/setup-switch.js";
 import type { SyncDecision } from "../sync/sync-decision.js";
@@ -16,12 +16,14 @@ export type RunRoute = (
   signal?: AbortSignal,
   onCommit?: () => void,
   target?: string,
+  onDialog?: (active: boolean) => void,
 ) => Promise<RunRouteResult | undefined>;
 
 export type CancellableOperationResult = RunRouteResult | { kind: "closed" } | { kind: "cancelled" };
 
 interface CancellableOperationOptions {
   commitAware?: boolean;
+  cancelAcrossDialogs?: boolean;
   cancelledMessage?: string | null;
   target?: string;
   signal?: AbortSignal;
@@ -36,6 +38,7 @@ export async function runCancellableOperation(
 ): Promise<CancellableOperationResult> {
   const {
     commitAware = false,
+    cancelAcrossDialogs = false,
     cancelledMessage = "Check cancelled; no settings or files were changed.",
     target,
     signal,
@@ -56,12 +59,45 @@ export async function runCancellableOperation(
           label: "cancel",
         },
       ]);
-      const operation = runRoute(
-        route,
-        interactionSignal,
-        commitAware ? () => (commitStarted = true) : undefined,
-        target,
-      ).then(
+      const cancel = (data: string) => {
+        // Raw terminal listeners run before Pi filters Kitty key releases.
+        if (isKeyRelease(data)) return false;
+        if (!matchesKey(data, Key.ctrl("c")) && !keybindings.matches(data, "tui.select.cancel")) return false;
+        if (commitStarted) {
+          ctx.ui.notify("Applying or publishing has started and cannot be cancelled safely.", "warning");
+        } else complete({ cancelled: true });
+        return true;
+      };
+      // Pi dialogs replace this loader and restore the normal editor. Defer
+      // ordinary keys while they are open; retain raw cancellation afterward.
+      // Ctrl+C remains the root flow's hard-cancel path regardless of focus.
+      let activeDialogs = 0;
+      const unsubscribe = cancelAcrossDialogs
+        ? ctx.ui.onTerminalInput((data) => {
+            if (isKeyRelease(data)) return;
+            if (activeDialogs > 0 && !matchesKey(data, Key.ctrl("c"))) return;
+            return cancel(data) ? { consume: true } : undefined;
+          })
+        : undefined;
+      let pendingRoute: ReturnType<RunRoute>;
+      try {
+        pendingRoute = runRoute(
+          route,
+          interactionSignal,
+          commitAware ? () => (commitStarted = true) : undefined,
+          target,
+          cancelAcrossDialogs
+            ? (active) => {
+                activeDialogs += active ? 1 : -1;
+              }
+            : undefined,
+        );
+      } catch (error) {
+        unsubscribe?.();
+        loader.dispose();
+        throw error;
+      }
+      const operation = pendingRoute.then(
         (result) => {
           routeResult = result;
           complete({});
@@ -80,17 +116,11 @@ export async function runCancellableOperation(
           ];
         },
         invalidate: () => loader.invalidate(),
-        handleInput(data: string) {
-          if (!matchesKey(data, Key.ctrl("c")) && !keybindings.matches(data, "tui.select.cancel")) {
-            return;
-          }
-          if (commitStarted) {
-            ctx.ui.notify("Applying or publishing has started and cannot be cancelled safely.", "warning");
-            return;
-          }
-          complete({ cancelled: true });
+        handleInput: cancel,
+        dispose() {
+          unsubscribe?.();
+          loader.dispose();
         },
-        dispose: () => loader.dispose(),
         waitForPending: () => operation,
       };
     },

package/src/ui/manager-attention.ts

@@ -13,9 +13,7 @@ export interface SyncManagerAttentionOptions {
   onSelectionResolved?: (expected: SyncAttentionState) => void;
 }
 
-export function attentionMainMenuItems(
-  manager: ManagerDescription,
-): ActionMenuItem<"main" | "more" | "recovery", "review-attention">[] {
+export function attentionMainMenuItems(manager: ManagerDescription): ActionMenuItem<"main", "review-attention">[] {
   if (!manager.attention && manager.observation?.inspection.selectionState?.kind !== "different") return [];
   const disabled = manager.attentionReviewDisabled === true;
   return [
@@ -36,8 +34,8 @@ export function attentionMainMenuItems(
 export function blockedSyncMenuItem(
   label: string,
   manager: ManagerDescription,
-): ActionMenuItem<"main" | "more" | "recovery", "sync"> | undefined {
-  if (label !== "Sync now (recommended)" || !manager.attentionBlocksSync) return undefined;
+): ActionMenuItem<"main", "sync"> | undefined {
+  if (label !== "Sync now" || !manager.attentionBlocksSync) return undefined;
   return {
     id: "sync",
     label,

package/src/ui/manager-state.ts

@@ -25,11 +25,12 @@ import { countValidSyncSetups } from "./sync-setups-ui.js";
 import { safeTerminalText } from "./terminal-text.js";
 
 export const MAIN_MENU_ACTIONS = [
-  "Sync now (recommended)",
-  "Switch sync setup",
-  "Status & changes",
+  "Sync now",
+  "Pull from remote…",
+  "Push to remote…",
   "Settings",
-  "More…",
+  "History",
+  "Diagnostics",
 ] as const;
 
 export interface ManagerDescription {
@@ -125,7 +126,9 @@ export async function describeManagerState(
           ? "Never synced"
           : "Unavailable";
     const canSwitch = (await countValidSyncSetups(configuredTargets, signal)) > 1;
-    const mainActions = MAIN_MENU_ACTIONS.filter((action) => action !== "Switch sync setup" || canSwitch);
+    const mainActions: string[] = [...MAIN_MENU_ACTIONS];
+    if (canSwitch) mainActions.push("Switch sync setup");
+    if (syncState?.unresolved?.length) mainActions.unshift("Review unresolved conflicts");
     const ordinaryTitle = [
       "Manage sync",
       "",
@@ -137,7 +140,7 @@ export async function describeManagerState(
       `Last applied: ${lastAppliedSnapshot}`,
       ...(syncState?.unresolved?.length
         ? [
-            `Unresolved: ${syncState.unresolved.length} dependency groups · review History & recovery`,
+            `Unresolved: ${syncState.unresolved.length} dependency groups · choose Review unresolved conflicts`,
             `Last observed: ${safeTerminalText(syncState.lastObservedSnapshot ?? "unknown")}`,
           ]
         : []),
@@ -189,7 +192,7 @@ export async function describeManagerState(
         "",
         "What do you want to do?",
       ].join("\n"),
-      actions: ["Sync setups…", "Storage connections…", "History & recovery…", "Help"],
+      actions: ["Sync setups…", "Storage connections…", "History", "Help"],
     };
   }
 }
@@ -201,13 +204,19 @@ function operationActions(
   mainActions: string[],
 ) {
   if (operationCanRecover(operation)) {
-    return ["Restore sync access… (recommended)", "Status & changes", "History & recovery…", "Help"];
+    return ["Restore sync access… (recommended)", "History", "Help"];
   }
   if (operation.kind !== "free") {
-    return ["Refresh operation status", "Status & changes", "History & recovery…", "Help"];
+    return ["Refresh operation status", "History", "Help"];
   }
   return noSyncedContent
-    ? ["Settings", ...(canSwitch ? ["Switch sync setup"] : []), "Status & changes", "More…"]
+    ? [
+        ...(mainActions.includes("Review unresolved conflicts") ? ["Review unresolved conflicts"] : []),
+        "Settings",
+        ...(canSwitch ? ["Switch sync setup"] : []),
+        "History",
+        "Diagnostics",
+      ]
     : mainActions;
 }
 
@@ -217,16 +226,24 @@ function operationStatusLines(operation: OperationAvailability): string[] {
       return [];
     case "live": {
       const command = truncateToWidth(safeTerminalText(operation.lock.command), 16, "…");
-      return [`Running: ${command} (pid ${operation.lock.pid}). Wait, then refresh; Settings and More return.`];
+      return [
+        `Running: ${command} (pid ${operation.lock.pid}). Wait, then refresh; Transfer actions and Settings return.`,
+      ];
     }
     case "busy":
-      return ["Pi-sync may be starting or finishing. Wait, then refresh; Settings and More remain unavailable."];
+      return [
+        "Pi-sync may be starting or finishing. Wait, then refresh; Transfer actions and Settings remain unavailable.",
+      ];
     case "recoverable-stale":
-      return ["Sync paused: old lock remains. Close other Pi sessions then restore; Settings and More return."];
+      return [
+        "Sync paused: old lock remains. Close other Pi sessions then restore; Transfer actions and Settings return.",
+      ];
     case "recoverable-unreadable":
-      return ["Sync paused: owner unknown. Close other Pi sessions then restore; Settings and More return."];
+      return [
+        "Sync paused: owner unknown. Close other Pi sessions then restore; Transfer actions and Settings return.",
+      ];
     case "inspection-error":
-      return ["Lock check failed. Fix path access, then refresh; Settings and More remain unavailable."];
+      return ["Lock check failed. Fix path access, then refresh; Transfer actions and Settings remain unavailable."];
   }
 }
 

package/src/ui/manager-ui.ts

@@ -1,7 +1,7 @@
 import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { type ActionMenuItem, defineMenu, runMenu } from "@narumitw/pi-tui-kit";
 import { loadConfig } from "../settings/config.js";
-import { operationBlocksChanges, operationCanRecover } from "../state/operation-availability.js";
+import { operationBlocksChanges } from "../state/operation-availability.js";
 import { type RunRoute, runCancellableOperation } from "./cancellable-operation.js";
 import {
   attentionMainMenuItems,
@@ -28,12 +28,11 @@ export async function showSyncManager(
     await runRoute("help");
     return;
   }
-  type Screen = "main" | "more" | "recovery";
+  type Screen = "main";
   type Action =
     | "review-attention"
     | "sync"
     | "switch"
-    | "diff"
     | "settings"
     | "pull"
     | "push"
@@ -42,12 +41,10 @@ export async function showSyncManager(
     | "history"
     | "conflicts"
     | "doctor"
-    | "unlock"
     | "recover"
     | "refresh"
     | "help"
-    | "init"
-    | "back";
+    | "init";
   interface State {
     manager: Awaited<ReturnType<typeof describeManagerState>>;
   }
@@ -63,54 +60,15 @@ export async function showSyncManager(
         return {
           kind: "actions",
           title: "Manage sync",
-          lines: state.manager.title.split("\n").slice(1),
+          // Frequent transfers stay visible; status is advisory and Help remains a direct route.
+          lines: [
+            ...state.manager.title.split("\n").slice(1),
+            "Help: /sync help · Fresh status: /sync status · Differences: /sync diff",
+          ],
           items: operationFirst ? [...managerItems, ...attentionItems] : [...attentionItems, ...managerItems],
           hint: "close",
         };
       },
-      more: () => ({
-        kind: "actions",
-        title: "More options",
-        items: [
-          { id: "pull", label: "Pull from remote…", action: "pull" },
-          { id: "push", label: "Push to remote…", action: "push" },
-          { id: "setups", label: "Sync setups…", action: "setups" },
-          {
-            id: "connections",
-            label: "Storage connections…",
-            action: "connections",
-          },
-          {
-            id: "doctor",
-            label: "Check setup",
-            description: "Check current setup access. WebDAV also probes writes and repairs history.",
-            action: "doctor",
-          },
-          { id: "recovery", label: "History & recovery…", to: "recovery" },
-          { id: "help", label: "Help", action: "help" },
-          { id: "back", label: "Back", action: "back" },
-        ],
-        hint: "back",
-      }),
-      recovery: ({ state }) => ({
-        kind: "actions",
-        title: "History & recovery",
-        items: [
-          { id: "history", label: "Browse history", action: "history" },
-          { id: "conflicts", label: "Review unresolved conflicts", action: "conflicts" },
-          {
-            id: "doctor",
-            label: "Check setup",
-            description: "WebDAV also probes writes and repairs history.",
-            action: "doctor",
-          },
-          ...(state.manager.operation && operationCanRecover(state.manager.operation)
-            ? [{ id: "unlock", label: "Recover stale operation", action: "unlock" as const }]
-            : []),
-          { id: "back", label: "Back", action: "back" },
-        ],
-        hint: "back",
-      }),
     },
     actions: {
       "review-attention": async () => {
@@ -170,15 +128,9 @@ export async function showSyncManager(
         const result = await showSetupSwitcher(ctx, runRoute, undefined, sessionSignal);
         return result === "pull-attempted" || result === "closed" ? { kind: "close" } : { kind: "stay" };
       },
-      diff: async () => {
-        const result = await runCancellableOperation(ctx, "Checking current sync setup…", "diff", runRoute, {
-          signal: sessionSignal,
-        });
-        return result.kind === "closed" ? { kind: "close" } : { kind: "stay" };
-      },
       settings: async () => {
-        await showSyncSettings(ctx, runRoute, sessionSignal);
-        return { kind: "stay" };
+        const result = await showSyncSettings(ctx, runRoute, sessionSignal);
+        return { kind: result === "exit" ? "close" : "stay" };
       },
       pull: async () => {
         const result = await runCancellableOperation(ctx, "Checking remote changes…", "pull", runRoute, {
@@ -207,8 +159,13 @@ export async function showSyncManager(
         return { kind: "stay" };
       },
       history: async () => {
-        await runRoute("history");
-        return { kind: "stay" };
+        const result = await runCancellableOperation(ctx, "Loading sync history…", "history", runRoute, {
+          signal: sessionSignal,
+          commitAware: true,
+          cancelAcrossDialogs: true,
+          cancelledMessage: "History review cancelled; no files were changed.",
+        });
+        return { kind: result.kind === "closed" ? "close" : "stay" };
       },
       doctor: async () => {
         const result = await runCancellableOperation(ctx, "Checking setup access…", "doctor", runRoute, {
@@ -216,11 +173,6 @@ export async function showSyncManager(
         });
         return { kind: result.kind === "closed" ? "close" : "stay" };
       },
-      unlock: async ({ state, signal: actionSignal }) => {
-        const result = await recoverSyncAccess(ctx, state.manager, runRoute, sessionSignal, actionSignal);
-        if (result === "close") return { kind: "close" };
-        return result === "restored" ? { kind: "to", screen: "main" } : { kind: "stay" };
-      },
       recover: async ({ state, signal: actionSignal }) => {
         const result = await recoverSyncAccess(ctx, state.manager, runRoute, sessionSignal, actionSignal);
         return { kind: result === "close" ? "close" : "stay" };
@@ -242,7 +194,6 @@ export async function showSyncManager(
         const disposition = await dispatchManagerResult(ctx, result, "sync", runRoute, sessionSignal);
         return disposition.kind === "close" ? { kind: "close" } : { kind: "stay" };
       },
-      back: async () => ({ kind: "back" }),
     },
   });
   await runMenu(ctx, menu, {
@@ -273,26 +224,47 @@ export async function showSyncManager(
 function syncMainMenuItem(
   label: string,
 ): ActionMenuItem<
-  "main" | "more" | "recovery",
-  "sync" | "switch" | "diff" | "settings" | "setups" | "connections" | "recover" | "refresh" | "help" | "init"
+  "main",
+  | "sync"
+  | "pull"
+  | "push"
+  | "switch"
+  | "settings"
+  | "setups"
+  | "connections"
+  | "history"
+  | "conflicts"
+  | "doctor"
+  | "recover"
+  | "refresh"
+  | "help"
+  | "init"
 > {
-  if (label === "More…") return { id: "more", label, to: "more" };
-  if (label === "History & recovery…") return { id: "recovery", label, to: "recovery" };
-  const actions = new Map<
-    string,
-    "sync" | "switch" | "diff" | "settings" | "setups" | "connections" | "recover" | "refresh" | "help" | "init"
-  >([
-    ["Sync now (recommended)", "sync"],
-    ["Switch sync setup", "switch"],
-    ["Status & changes", "diff"],
-    ["Settings", "settings"],
-    ["Restore sync access… (recommended)", "recover"],
-    ["Refresh operation status", "refresh"],
-    ["Sync setups…", "setups"],
-    ["Storage connections…", "connections"],
-    ["Help", "help"],
-    ["Set up sync", "init"],
-    ["Use existing settings", "init"],
-  ]);
-  return { id: actions.get(label) ?? "help", label, action: actions.get(label) ?? "help" };
+  const actions = {
+    "Sync now": "sync",
+    "Pull from remote…": "pull",
+    "Push to remote…": "push",
+    "Switch sync setup": "switch",
+    Settings: "settings",
+    History: "history",
+    Diagnostics: "doctor",
+    "Review unresolved conflicts": "conflicts",
+    "Restore sync access… (recommended)": "recover",
+    "Refresh operation status": "refresh",
+    "Sync setups…": "setups",
+    "Storage connections…": "connections",
+    Help: "help",
+    "Set up sync": "init",
+    "Use existing settings": "init",
+  } as const;
+  const action = actions[label as keyof typeof actions];
+  if (!action) throw new Error(`Unknown sync manager action: ${label}`);
+  return {
+    id: action,
+    label,
+    action,
+    ...(action === "doctor"
+      ? { description: "Check setup access; WebDAV also probes writes and repairs history." }
+      : {}),
+  };
 }

package/src/ui/merge-review.ts

@@ -1,28 +1,88 @@
 import type { ExtensionCommandContext, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { runDocumentReview } from "@narumitw/pi-tui-kit";
+import { truncateToWidth } from "@earendil-works/pi-tui";
+import { defineMenu, runCustomInteraction, runDocumentReview, runMenu } from "@narumitw/pi-tui-kit";
+import { createSyncConfirmation, type SyncConfirmationChoice } from "./sync-confirmation.js";
+import { safeTerminalText } from "./terminal-text.js";
 
-/** Cell-exact scrolling in TUI and paginated observable confirmation in RPC. */
+type ReviewContext = ExtensionCommandContext | ExtensionContext;
+
+/** One approval screen; full details are optional and never authorize a transfer. */
 export async function confirmMergeReview(
-  ctx: ExtensionCommandContext | ExtensionContext,
+  ctx: ReviewContext,
   title: string,
   content: string,
   signal: AbortSignal | undefined,
   isCurrent: () => boolean,
-  confirmationLabel = "Apply merged transfer",
+  confirmationLabel = "apply changes",
+  summaryLines?: readonly string[],
 ) {
-  const result = await runDocumentReview(ctx, {
-    title,
-    content,
-    format: { kind: "text" },
-    viewportSize: "adaptive",
-    confirmation: { label: confirmationLabel },
-    hint: "close",
-    signal,
-    isCurrent,
-    onError: () => {},
-  });
-  if (result.kind === "error") throw new Error("Merge review failed; no transfer was performed.");
-  if (result.kind === "unsupported")
-    throw new Error("Merge review requires observable TUI or RPC; review the plan before using --yes.");
-  return result.kind === "confirmed";
+  const lines = summaryLines ?? [
+    ...content
+      .split("\n")
+      .slice(0, 6)
+      .map((line) => truncateToWidth(safeTerminalText(line), 100)),
+    "View details for the complete review.",
+  ];
+  while (isCurrent() && !signal?.aborted) {
+    const choice: { value: "cancel" | "approve" | "details" } = { value: "cancel" };
+    const menu = defineMenu<undefined, "confirm", "choose", ReviewContext>({
+      start: "confirm",
+      screens: {
+        confirm: () => ({
+          kind: "choice",
+          title,
+          lines,
+          initialItemId: "cancel",
+          items: [
+            { id: "cancel", label: "No, cancel" },
+            { id: "approve", label: `Yes, ${confirmationLabel}` },
+            { id: "details", label: "View details" },
+          ],
+          action: "choose",
+          hint: "close",
+        }),
+      },
+      actions: {
+        choose: ({ itemId }) => {
+          if (itemId === "approve" || itemId === "details") choice.value = itemId;
+          return { kind: "close" };
+        },
+      },
+    });
+    const result =
+      ctx.mode === "tui" && ctx.hasUI
+        ? await runCustomInteraction<SyncConfirmationChoice, ReviewContext>(ctx, {
+            create: ({ tui, theme, keybindings, complete }) =>
+              createSyncConfirmation({ title, lines, confirmationLabel, tui, theme, keybindings, complete }),
+            signal,
+            isCurrent,
+            onError: () => {},
+          })
+        : await runMenu(ctx, menu, { getState: () => undefined, signal, isCurrent, onError: () => {} });
+    if (!isCurrent() || signal?.aborted) return false;
+    if (result.kind === "error") throw new Error("Merge review failed; no transfer was performed.");
+    if (result.kind === "unsupported")
+      throw new Error("Merge review requires observable TUI or RPC; review the plan before using --yes.");
+    if (result.kind === "completed") choice.value = result.value;
+    else if (result.kind !== "closed") return false;
+    // Keep authorization separate from UI termination in both adapters.
+    if (choice.value === "approve") return true;
+    if (choice.value !== "details") return false;
+    const detail = await runDocumentReview(ctx, {
+      title: "Sync change details",
+      content,
+      format: { kind: "text" },
+      viewportSize: "adaptive",
+      hint: "back",
+      signal,
+      isCurrent,
+      onError: () => {},
+    });
+    if (!isCurrent() || signal?.aborted) return false;
+    if (detail.kind === "error") throw new Error("Merge review failed; no transfer was performed.");
+    if (detail.kind !== "cancelled" || detail.reason !== "back") return false;
+    // A fresh menu discards remembered selection: returning from details always selects No.
+    // Unlike Pi's native Yes-first dialog, approval requires moving off the safe default.
+  }
+  return false;
 }