@narumitw/pi-sync 0.54.0 → 0.54.2

package/dist/chunks/{chunk-QDPED3XJ.ts → chunk-MYPSMJHJ.ts}

@@ -30,7 +30,7 @@ import {
   applySnapshotTransaction,
   recoverPendingSnapshotTransactions,
   syncMutationParents
-} from "./chunk-ANWNQIR7.ts";
+} from "./chunk-CL7BZRRQ.ts";
 import {
   backupLocal,
   captureMutationOwner,
@@ -111,135 +111,284 @@ import {
 } from "./chunk-HUZ5CR4W.ts";
 
 // src/ui/merge-review.ts
-import { runDocumentReview } from "@narumitw/pi-tui-kit";
-async function confirmMergeReview(ctx, title, content, signal, isCurrent, confirmationLabel = "Apply merged transfer") {
-  const result = await runDocumentReview(ctx, {
-    title,
-    content,
-    format: { kind: "text" },
-    viewportSize: "adaptive",
-    confirmation: { label: confirmationLabel },
-    hint: "close",
-    signal,
-    isCurrent,
-    onError: () => {
+import { truncateToWidth as truncateToWidth2 } from "@earendil-works/pi-tui";
+import { defineMenu, runCustomInteraction, runDocumentReview, runMenu } from "@narumitw/pi-tui-kit";
+
+// src/ui/sync-confirmation.ts
+import { Key, matchesKey, SelectList, truncateToWidth } from "@earendil-works/pi-tui";
+import { HorizontalRule, hardWrapTerminalDocument, sanitizeTerminalText } from "@narumitw/pi-tui-kit";
+function createSyncConfirmation(options) {
+  const { tui, theme, keybindings } = options;
+  const choices = ["cancel", "approve", "details"];
+  const list = new SelectList(
+    [
+      { value: "cancel", label: "No, cancel" },
+      { value: "approve", label: `Yes, ${sanitizeTerminalText(options.confirmationLabel)}` },
+      { value: "details", label: "View details" }
+    ],
+    3,
+    {
+      selectedPrefix: (text) => theme.fg("accent", text),
+      selectedText: (text) => theme.fg("accent", text),
+      description: (text) => theme.fg("muted", text),
+      scrollInfo: (text) => theme.fg("dim", text),
+      noMatch: (text) => theme.fg("muted", text)
     }
-  });
-  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 rule = new HorizontalRule({ ruleStyle: (text) => theme.fg("border", text) });
+  let selected = 0;
+  let offset = 0;
+  let maximumOffset = 0;
+  let lastWidth = 0;
+  let lastRows = 0;
+  let seen = /* @__PURE__ */ new Set();
+  let summary = [];
+  let reviewed = false;
+  let disposed = false;
+  let finished = false;
+  let summaryStart = 0;
+  let summaryEnd = 0;
+  let actionsStart = 0;
+  const finish = (choice) => {
+    if (disposed || finished) return;
+    finished = true;
+    options.complete(choice);
+  };
+  const select = (index) => {
+    selected = (index + choices.length) % choices.length;
+    list.setSelectedIndex(selected);
+  };
+  list.onSelectionChange = (item) => {
+    selected = Math.max(0, choices.indexOf(item.value));
+  };
+  list.onSelect = (item) => {
+    const choice = choices[selected] ?? "cancel";
+    if (item.value === choice && (choice !== "approve" || reviewed)) finish(choice);
+  };
+  const component = {
+    render(width, expose = true) {
+      if (!Number.isFinite(width) || width <= 0) {
+        reviewed = false;
+        return [];
+      }
+      const cells = Math.floor(width);
+      const rows = Math.max(1, Math.floor(tui.terminal.rows) - 3);
+      if (cells !== lastWidth || rows !== lastRows) {
+        summary = options.lines.flatMap((line) => hardWrapTerminalDocument(line, cells));
+        seen = /* @__PURE__ */ new Set();
+        offset = 0;
+        select(0);
+        lastWidth = cells;
+        lastRows = rows;
+      }
+      const framed = rows >= 9;
+      const actions = list.render(cells);
+      const viewport = Math.max(0, rows - actions.length - 3 - (framed ? 2 : 0));
+      maximumOffset = Math.max(0, summary.length - viewport);
+      offset = Math.min(offset, maximumOffset);
+      const visible = summary.slice(offset, offset + viewport);
+      if (expose) for (let index = offset; index < offset + visible.length; index++) seen.add(index);
+      reviewed = viewport > 0 && seen.size === summary.length;
+      const hint = reviewed ? "Select an action." : "Navigation keys scroll the summary before selecting Yes.";
+      const body = [
+        theme.fg("accent", theme.bold(hardWrapTerminalDocument(options.title, cells).join(" "))),
+        ...visible.map((line) => theme.fg("text", line)),
+        theme.fg(
+          "muted",
+          `Summary ${visible.length ? offset + 1 : 0}-${offset + visible.length}/${summary.length}${reviewed ? "" : " \u2014 review before Yes"}`
+        ),
+        ...actions,
+        theme.fg("dim", hint)
+      ];
+      summaryStart = Number(framed) + 1;
+      summaryEnd = summaryStart + visible.length;
+      actionsStart = summaryEnd + 1;
+      const frame = framed ? [...rule.render(cells), ...body, ...rule.render(cells)] : body;
+      return frame.slice(0, rows).map((line) => truncateToWidth(line, cells, ""));
+    },
+    invalidate() {
+      list.invalidate();
+      rule.invalidate();
+    },
+    handleInput(data) {
+      if (disposed || finished) return;
+      if (matchesKey(data, Key.ctrl("c")) || keybindings.matches(data, "tui.select.cancel")) {
+        finish("cancel");
+        return;
+      }
+      component.render(tui.terminal.columns ?? lastWidth, false);
+      if (keybindings.matches(data, "tui.select.up")) {
+        if (!reviewed || selected === 0 && offset > 0) offset = Math.max(0, offset - 1);
+        else select(selected - 1);
+      } else if (keybindings.matches(data, "tui.select.down")) {
+        if (!reviewed || selected === 0 && offset < maximumOffset) offset = Math.min(maximumOffset, offset + 1);
+        else select(selected + 1);
+      } else if (keybindings.matches(data, "tui.select.confirm")) {
+        const choice = choices[selected] ?? "cancel";
+        if (choice !== "approve" || reviewed) finish(choice);
+      }
+      tui.requestRender();
+    },
+    handleMouse(event) {
+      if (disposed || finished || event.width !== lastWidth) return void 0;
+      component.render(event.width, false);
+      if (event.y >= summaryStart && event.y < summaryEnd && event.type === "wheel" && event.wheelDelta) {
+        offset = Math.max(0, Math.min(maximumOffset, offset + (event.wheelDelta < 0 ? -1 : 1)));
+        select(0);
+        tui.requestRender();
+        return { handled: true, render: true };
+      }
+      if (event.y < actionsStart || event.y >= actionsStart + choices.length || event.y >= lastRows) return void 0;
+      return list.handleMouse({ ...event, y: event.y - actionsStart, height: choices.length });
+    },
+    dispose() {
+      disposed = true;
+      seen.clear();
+    }
+  };
+  return component;
 }
 
-// src/ui/sync-format.ts
-function formatDiff(local, remote) {
-  const localMap = fileHashMap(local);
-  const remoteMap = fileHashMap(remote);
-  const allPaths = [.../* @__PURE__ */ new Set([...Object.keys(localMap), ...Object.keys(remoteMap)])].sort();
-  const lines = [`local: ${local.files.length} files`, `remote: ${remote.id} (${remote.files.length} files)`, ""];
-  let changed = 0;
-  for (const filePath of allPaths) {
-    if (!Object.hasOwn(localMap, filePath)) {
-      lines.push(`Remote only: ${snapshotPathLabel(filePath)}`);
-      changed += 1;
-    } else if (!Object.hasOwn(remoteMap, filePath)) {
-      lines.push(`Local only: ${snapshotPathLabel(filePath)}`);
-      changed += 1;
-    } else if (localMap[filePath] !== remoteMap[filePath]) {
-      lines.push(`Different: ${snapshotPathLabel(filePath)}`);
-      changed += 1;
-    }
+// src/ui/merge-review.ts
+async function confirmMergeReview(ctx, title, content, signal, isCurrent, confirmationLabel = "apply changes", summaryLines) {
+  const lines = summaryLines ?? [
+    ...content.split("\n").slice(0, 6).map((line) => truncateToWidth2(safeTerminalText(line), 100)),
+    "View details for the complete review."
+  ];
+  while (isCurrent() && !signal?.aborted) {
+    const choice = { value: "cancel" };
+    const menu = defineMenu({
+      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(ctx, {
+      create: ({ tui, theme, keybindings, complete }) => createSyncConfirmation({ title, lines, confirmationLabel, tui, theme, keybindings, complete }),
+      signal,
+      isCurrent,
+      onError: () => {
+      }
+    }) : await runMenu(ctx, menu, { getState: () => void 0, 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;
+    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;
   }
-  if (changed === 0) lines.push("No file differences.");
-  return lines.join("\n");
+  return false;
 }
-function formatSnapshotOnlyDiff(title, snapshot) {
-  return [`${title}: ${snapshot.id}`, ...snapshot.files.map((file) => `Add: ${snapshotPathLabel(file.path)}`)].join(
-    "\n"
+
+// src/ui/merged-sync-summary.ts
+import { truncateToWidth as truncateToWidth3 } from "@earendil-works/pi-tui";
+function mergedSyncSummary(input) {
+  const local = changes(input.localBefore, input.localAfter);
+  const remote = changes(input.remoteBefore, input.remoteAfter);
+  const all = [...local, ...remote];
+  const updatesOnly = all.length > 0 && all.every((change) => change.action === "Update");
+  const verb = updatesOnly ? "Update" : "Apply changes to";
+  const title = local.length && remote.length ? "Apply local and remote changes?" : all.length ? `${verb} ${all.length} ${local.length ? "local" : "remote"} ${all.length === 1 ? "file" : "files"}?` : input.publish ? "Publish a new remote snapshot?" : "Pi Sync is already up to date.";
+  const confirmationLabel = local.length && remote.length ? "apply local and remote changes" : all.length ? `${updatesOnly ? "update" : "apply changes to"} ${local.length ? "local" : "remote"} ${all.length === 1 ? "file" : "files"}` : "publish remote snapshot";
+  const sources = new Map(
+    input.decisions.filter((item) => item.kind === "accepted").map((item) => [item.path, item.source])
   );
+  const label = (change, side) => {
+    const source = sources.get(change.path);
+    const suffix = source === "merged" ? " (merged content)" : side === "local" && source === "remote" ? change.action === "Delete" ? " (deleted remotely)" : " from remote" : "";
+    return `${change.action} ${snapshotPathLabel(change.path)}${suffix}`;
+  };
+  const section = (items, side, compact) => {
+    const heading = side === "local" ? "Local changes" : "Remote file changes";
+    if (!items.length) return [`${heading}: none`];
+    const counts = ["Add", "Update", "Delete"].flatMap((action) => {
+      const count = items.filter((item) => item.action === action).length;
+      return count ? [`${count} ${action.toLowerCase()}`] : [];
+    });
+    return [
+      `${heading}: ${counts.join(", ")}`,
+      ...(compact ? items.slice(0, 3) : items).map(
+        (item) => `  ${compact ? truncateToWidth3(label(item, side), 80) : label(item, side)}`
+      ),
+      ...compact && items.length > 3 ? [`  ${items.length - 3} more files \u2014 View details`] : []
+    ];
+  };
+  const context = [`Setup: ${safeTerminalText(input.setupName)}`, `Remote: ${safeTerminalText(input.destination)}`];
+  const safety = [
+    `Remote snapshot publication: ${input.publish ? "yes" : "no"}`,
+    `Sessions: ${input.sessions ? "included \u2014 may contain private conversations" : "not included"}`,
+    input.groups.length ? `Unresolved groups: ${input.groups.length} \u2014 these paths stay unchanged on each side` : "Conflicts: none",
+    ...input.publish && input.capability === "read-check-write-verify" ? ["Warning: simultaneous remote writes can still race; visible changes are rejected."] : [],
+    ...input.publish && input.capability === "conditional-required" ? ["Remote publication requires verified conditional writes; verification failure stops the transfer."] : [],
+    "The current session is protected. A backup and recovery journal will be saved.",
+    "Resources will not reload automatically."
+  ];
+  return {
+    title,
+    confirmationLabel,
+    lines: [
+      ...context.map((line) => truncateToWidth3(line, 100)),
+      ...section(local, "local", true),
+      ...section(remote, "remote", true),
+      ...safety
+    ],
+    content: [
+      ...context,
+      "",
+      ...section(local, "local", false),
+      "",
+      ...section(remote, "remote", false),
+      "",
+      ...safety,
+      ...input.groups.flatMap(
+        (group) => group.paths.map((filePath) => `Unchanged (unresolved): ${snapshotPathLabel(filePath)}`)
+      )
+    ].join("\n")
+  };
 }
-function formatPushSummary(config, destination, upload, head, preservedRemoteFileCount = 0, remote) {
-  return [
-    `Sync setup: ${safeTerminalText(config.setupName)}`,
-    `Storage location: ${safeTerminalText(destination)}`,
-    `Upload ${upload.files.length} files from ${safeTerminalText(agentDir())}.`,
-    `Sessions: ${upload.syncSessions ? "included \u2014 may contain private conversations" : "not included"}`,
-    head ? `Remote latest: ${head.snapshotId}` : "Remote latest: empty",
-    "Publication effect: the backend's active head will reference the new immutable snapshot.",
-    ...remote && inspectRemoteSelection(config.include, remote).kind === "different" ? ["Included-content policy effect: replace the differing remote selection with this setup's local selection."] : [],
-    formatPublicationPreview(remote, upload),
-    preservedRemoteFileCount > 0 ? `Possible secrets in locally managed files were scanned before this prompt; ${preservedRemoteFileCount} preserved remote file(s) were not rescanned.` : "Possible secrets were scanned before this prompt."
-  ].join("\n");
-}
-function formatApplyPreview(local, remote) {
-  return formatDirectionalChanges(local, remote, {
-    add: "Add locally",
-    update: "Update locally",
-    remove: "Remove locally"
-  });
-}
-function formatPullSummary(config, destination, local, remote, protectedSessionCount) {
-  return [
-    `Sync setup: ${safeTerminalText(config.setupName)}`,
-    `Storage location: ${safeTerminalText(destination)}`,
-    `Snapshot: ${safeTerminalText(remote.id)}`,
-    `Sessions: ${remote.syncSessions ? "included \u2014 may contain private conversations" : "not included"}`,
-    `Protected live sessions: ${protectedSessionCount || "none"}`,
-    formatApplyPreview(local, remote),
-    "A local backup is created before these writes/deletes. The remote active snapshot is unchanged."
-  ].join("\n");
-}
-function formatRollbackSummary(config, destination, local, remote, requestedSnapshot, protectedSessionCount) {
-  return [
-    `Sync setup: ${safeTerminalText(config.setupName)}`,
-    `Storage location: ${safeTerminalText(destination)}`,
-    `Snapshot: ${safeTerminalText(requestedSnapshot)}`,
-    `Sessions: ${remote.syncSessions ? "included \u2014 may contain private conversations" : "not included"}`,
-    `Protected live sessions: ${protectedSessionCount || "none"}`,
-    formatApplyPreview(local, remote),
-    "A local backup is created before applying; the backend's active head will change."
-  ].join("\n");
-}
-function formatPublicationPreview(remote, upload) {
-  if (!remote) {
-    return ["Remote is empty.", ...upload.files.map((file) => `Add remotely: ${snapshotPathLabel(file.path)}`)].join(
-      "\n"
-    );
-  }
-  return formatDirectionalChanges(remote, upload, {
-    add: "Add remotely",
-    update: "Update remotely",
-    remove: "Remove remotely"
-  });
-}
-function formatDirectionalChanges(before, after, labels) {
+function changes(before, after) {
   const beforeMap = fileHashMap(before);
   const afterMap = fileHashMap(after);
-  const paths = [.../* @__PURE__ */ new Set([...Object.keys(beforeMap), ...Object.keys(afterMap)])].sort();
-  const lines = [];
-  for (const filePath of paths) {
-    if (!Object.hasOwn(beforeMap, filePath)) lines.push(`${labels.add}: ${snapshotPathLabel(filePath)}`);
-    else if (!Object.hasOwn(afterMap, filePath)) lines.push(`${labels.remove}: ${snapshotPathLabel(filePath)}`);
-    else if (beforeMap[filePath] !== afterMap[filePath]) lines.push(`${labels.update}: ${snapshotPathLabel(filePath)}`);
-  }
-  if (lines.length === 0) lines.push("No file changes.");
-  return lines.join("\n");
-}
-function countPreservedRemoteFiles(local, upload) {
-  const localPaths = new Set(local.files.map((file) => file.path));
-  return upload.files.filter((file) => !localPaths.has(file.path)).length;
-}
-function publicationCapabilityDescription(capability) {
-  switch (capability) {
-    case "lease-protected":
-      return "lease-protected (exact expected-ref update)";
-    case "atomic-conditional":
-      return "atomic-conditional (verified atomic precondition)";
-    case "conditional-required":
-      return "conditional-required (read-only until atomic preconditions are verified)";
-    case "read-check-write-verify":
-      return "read-check-write-verify (visible races rejected; simultaneous unseen races remain possible)";
-  }
+  return [.../* @__PURE__ */ new Set([...Object.keys(beforeMap), ...Object.keys(afterMap)])].sort().flatMap((filePath) => {
+    if (!Object.hasOwn(beforeMap, filePath)) return [{ path: filePath, action: "Add" }];
+    if (!Object.hasOwn(afterMap, filePath)) return [{ path: filePath, action: "Delete" }];
+    return beforeMap[filePath] !== afterMap[filePath] ? [{ path: filePath, action: "Update" }] : [];
+  });
 }
 
 // src/sync/conflict-artifact-ownership.ts
@@ -1197,6 +1346,117 @@ async function resolveSettingsConflicts(config, state, local, remote, plan) {
   };
 }
 
+// src/ui/sync-format.ts
+function formatDiff(local, remote) {
+  const localMap = fileHashMap(local);
+  const remoteMap = fileHashMap(remote);
+  const allPaths = [.../* @__PURE__ */ new Set([...Object.keys(localMap), ...Object.keys(remoteMap)])].sort();
+  const lines = [`local: ${local.files.length} files`, `remote: ${remote.id} (${remote.files.length} files)`, ""];
+  let changed = 0;
+  for (const filePath of allPaths) {
+    if (!Object.hasOwn(localMap, filePath)) {
+      lines.push(`Remote only: ${snapshotPathLabel(filePath)}`);
+      changed += 1;
+    } else if (!Object.hasOwn(remoteMap, filePath)) {
+      lines.push(`Local only: ${snapshotPathLabel(filePath)}`);
+      changed += 1;
+    } else if (localMap[filePath] !== remoteMap[filePath]) {
+      lines.push(`Different: ${snapshotPathLabel(filePath)}`);
+      changed += 1;
+    }
+  }
+  if (changed === 0) lines.push("No file differences.");
+  return lines.join("\n");
+}
+function formatSnapshotOnlyDiff(title, snapshot) {
+  return [`${title}: ${snapshot.id}`, ...snapshot.files.map((file) => `Add: ${snapshotPathLabel(file.path)}`)].join(
+    "\n"
+  );
+}
+function formatPushSummary(config, destination, upload, head, preservedRemoteFileCount = 0, remote) {
+  return [
+    `Sync setup: ${safeTerminalText(config.setupName)}`,
+    `Storage location: ${safeTerminalText(destination)}`,
+    `Upload ${upload.files.length} files from ${safeTerminalText(agentDir())}.`,
+    `Sessions: ${upload.syncSessions ? "included \u2014 may contain private conversations" : "not included"}`,
+    head ? `Remote latest: ${head.snapshotId}` : "Remote latest: empty",
+    "Publication effect: the backend's active head will reference the new immutable snapshot.",
+    ...remote && inspectRemoteSelection(config.include, remote).kind === "different" ? ["Included-content policy effect: replace the differing remote selection with this setup's local selection."] : [],
+    formatPublicationPreview(remote, upload),
+    preservedRemoteFileCount > 0 ? `Possible secrets in locally managed files were scanned before this prompt; ${preservedRemoteFileCount} preserved remote file(s) were not rescanned.` : "Possible secrets were scanned before this prompt."
+  ].join("\n");
+}
+function formatApplyPreview(local, remote) {
+  return formatDirectionalChanges(local, remote, {
+    add: "Add locally",
+    update: "Update locally",
+    remove: "Remove locally"
+  });
+}
+function formatPullSummary(config, destination, local, remote, protectedSessionCount) {
+  return [
+    `Sync setup: ${safeTerminalText(config.setupName)}`,
+    `Storage location: ${safeTerminalText(destination)}`,
+    `Snapshot: ${safeTerminalText(remote.id)}`,
+    `Sessions: ${remote.syncSessions ? "included \u2014 may contain private conversations" : "not included"}`,
+    `Protected live sessions: ${protectedSessionCount || "none"}`,
+    formatApplyPreview(local, remote),
+    "A local backup is created before these writes/deletes. The remote active snapshot is unchanged."
+  ].join("\n");
+}
+function formatRollbackSummary(config, destination, local, remote, requestedSnapshot, protectedSessionCount) {
+  return [
+    `Sync setup: ${safeTerminalText(config.setupName)}`,
+    `Storage location: ${safeTerminalText(destination)}`,
+    `Snapshot: ${safeTerminalText(requestedSnapshot)}`,
+    `Sessions: ${remote.syncSessions ? "included \u2014 may contain private conversations" : "not included"}`,
+    `Protected live sessions: ${protectedSessionCount || "none"}`,
+    formatApplyPreview(local, remote),
+    "A local backup is created before applying; the backend's active head will change."
+  ].join("\n");
+}
+function formatPublicationPreview(remote, upload) {
+  if (!remote) {
+    return ["Remote is empty.", ...upload.files.map((file) => `Add remotely: ${snapshotPathLabel(file.path)}`)].join(
+      "\n"
+    );
+  }
+  return formatDirectionalChanges(remote, upload, {
+    add: "Add remotely",
+    update: "Update remotely",
+    remove: "Remove remotely"
+  });
+}
+function formatDirectionalChanges(before, after, labels) {
+  const beforeMap = fileHashMap(before);
+  const afterMap = fileHashMap(after);
+  const paths = [.../* @__PURE__ */ new Set([...Object.keys(beforeMap), ...Object.keys(afterMap)])].sort();
+  const lines = [];
+  for (const filePath of paths) {
+    if (!Object.hasOwn(beforeMap, filePath)) lines.push(`${labels.add}: ${snapshotPathLabel(filePath)}`);
+    else if (!Object.hasOwn(afterMap, filePath)) lines.push(`${labels.remove}: ${snapshotPathLabel(filePath)}`);
+    else if (beforeMap[filePath] !== afterMap[filePath]) lines.push(`${labels.update}: ${snapshotPathLabel(filePath)}`);
+  }
+  if (lines.length === 0) lines.push("No file changes.");
+  return lines.join("\n");
+}
+function countPreservedRemoteFiles(local, upload) {
+  const localPaths = new Set(local.files.map((file) => file.path));
+  return upload.files.filter((file) => !localPaths.has(file.path)).length;
+}
+function publicationCapabilityDescription(capability) {
+  switch (capability) {
+    case "lease-protected":
+      return "lease-protected (exact expected-ref update)";
+    case "atomic-conditional":
+      return "atomic-conditional (verified atomic precondition)";
+    case "conditional-required":
+      return "conditional-required (read-only until atomic preconditions are verified)";
+    case "read-check-write-verify":
+      return "read-check-write-verify (visible races rejected; simultaneous unseen races remain possible)";
+  }
+}
+
 // src/sync/sync-decision.ts
 function createSyncDecision(options) {
   const { config, state, local, remote, kind } = options;
@@ -1536,26 +1796,31 @@ An explicit direction adopts this setup's included-content policy; no automatic
       await validate();
       if (!config.skipSecretScan && scanSnapshot(upload).length)
         throw new Error("Refusing to merge possible secrets. Review managed content before syncing.");
-      if (!options.yes && !await confirmMergeReview(
-        ctx,
-        "Merge independent Pi changes?",
-        [
-          `Sync setup: ${safeTerminalText(config.setupName)}`,
-          `Storage location: ${safeTerminalText(backend.destination)}`,
-          `Sessions: ${config.include.includes("sessions") ? "included \u2014 may contain private conversations" : "not included"}`,
-          `Local writes/deletions: ${plan.decisions.filter((item) => item.kind === "accepted" && (item.source === "remote" || item.source === "merged")).length}`,
-          formatApplyPreview(localRaw, after).split("\n").map(safeTerminalText).join("\n"),
-          `Unresolved dependency groups: ${groups.length} (withheld versions stay on each side; baselines do not advance)`,
-          ...groups.flatMap((group) => group.paths.map((filePath) => `Withheld: ${safeTerminalText(filePath)}`)),
-          `Remote publication: ${publish ? "yes" : "no"}`,
-          formatPublicationPreview(rawRemote, upload).split("\n").map(safeTerminalText).join("\n"),
-          `Backend publication: ${backend.capability}`,
-          "The current session is protected. A backup and recovery journal are retained. Resources are not reloaded."
-        ].join("\n"),
-        options.signal,
-        isCurrent
-      ))
-        return "cancelled";
+      if (!options.yes) {
+        const summary = mergedSyncSummary({
+          setupName: config.setupName,
+          destination: backend.destination,
+          localBefore: localRaw,
+          localAfter: after,
+          remoteBefore: rawRemote,
+          remoteAfter: upload,
+          publish,
+          sessions: config.include.includes("sessions"),
+          groups,
+          decisions: plan.decisions,
+          capability: backend.capability
+        });
+        if (!await confirmMergeReview(
+          ctx,
+          summary.title,
+          summary.content,
+          options.signal,
+          isCurrent,
+          summary.confirmationLabel,
+          summary.lines
+        ))
+          return "cancelled";
+      }
       await validate();
       const refreshed = await createSnapshot(config.snapshotIdentity, snapshotOptions);
       if (!sameHashes(fileHashMap(refreshed), fileHashMap(localRaw)))
@@ -1791,6 +2056,7 @@ async function writeAcceptedState(config, head, snapshot, validate, progress) {
 
 export {
   confirmMergeReview,
+  applySnapshot,
   formatDiff,
   formatSnapshotOnlyDiff,
   formatPushSummary,
@@ -1798,8 +2064,7 @@ export {
   formatRollbackSummary,
   countPreservedRemoteFiles,
   publicationCapabilityDescription,
-  applySnapshot,
   createSyncDecision,
   mergeSync
 };
-//# sourceMappingURL=chunk-QDPED3XJ.ts.map
+//# sourceMappingURL=chunk-MYPSMJHJ.ts.map