@narumitw/pi-sync 0.54.2 → 0.54.3

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

@@ -10,7 +10,7 @@ import {
   readMergeJournal,
   saveConflictArtifact,
   writeMergeJournal
-} from "./chunk-ORQRHEEO.ts";
+} from "./chunk-26PMXY7E.ts";
 import {
   fileHashMap,
   hasLocalChanges,
@@ -22,26 +22,30 @@ import {
   formatRemoteSelectionStatus,
   readSnapshotForHead,
   requireCompatibleRemoteSelection
-} from "./chunk-V6VZ5TLG.ts";
+} from "./chunk-A3TFXY4O.ts";
 import {
   createSyncBackend
-} from "./chunk-SDZCTCYQ.ts";
+} from "./chunk-2FETCGGT.ts";
 import {
   applySnapshotTransaction,
   recoverPendingSnapshotTransactions,
   syncMutationParents
-} from "./chunk-CL7BZRRQ.ts";
+} from "./chunk-KGE47GCZ.ts";
 import {
   backupLocal,
   captureMutationOwner,
   protectedSessionPaths
-} from "./chunk-IJ6VV6FN.ts";
+} from "./chunk-GC3QOL6J.ts";
+import {
+  createStartupTimings
+} from "./chunk-UZPMDLTL.ts";
 import {
   safeTerminalText,
   snapshotPathLabel
 } from "./chunk-AMJRUXFT.ts";
 import {
   TEXT_MERGE_WORK_LIMIT,
+  hasCurrentMergeBaseline,
   isMergeTextPath,
   mergeSession,
   mergeText,
@@ -49,7 +53,7 @@ import {
   readMergeAncestor,
   readMergeAncestors,
   stageMergeBaseline
-} from "./chunk-QE7NZZWT.ts";
+} from "./chunk-E6ONFG57.ts";
 import {
   mergePathIdentity,
   planFileMerge
@@ -59,12 +63,12 @@ import {
   statePathForConfig,
   syncStateFingerprint,
   writeStateForConfig
-} from "./chunk-4QVPTIZB.ts";
+} from "./chunk-VCL7TZYW.ts";
 import {
   loadConfig,
   syncCheckConfigFingerprint,
   syncConfigReviewIdentity
-} from "./chunk-3B4Z2SKV.ts";
+} from "./chunk-KATKRR3D.ts";
 import {
   SyncBackendConflictError,
   expectedRemoteHead
@@ -290,9 +294,9 @@ async function confirmMergeReview(ctx, title, content, signal, isCurrent, confir
     }) : 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 === "error") throw new Error("Sync 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.");
+      throw new Error("Sync 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;
@@ -309,7 +313,7 @@ async function confirmMergeReview(ctx, title, content, signal, isCurrent, confir
       }
     });
     if (!isCurrent() || signal?.aborted) return false;
-    if (detail.kind === "error") throw new Error("Merge review failed; no transfer was performed.");
+    if (detail.kind === "error") throw new Error("Sync review failed; no transfer was performed.");
     if (detail.kind !== "cancelled" || detail.reason !== "back") return false;
   }
   return false;
@@ -317,9 +321,30 @@ async function confirmMergeReview(ctx, title, content, signal, isCurrent, confir
 
 // src/ui/merged-sync-summary.ts
 import { truncateToWidth as truncateToWidth3 } from "@earendil-works/pi-tui";
+
+// src/ui/transfer-changes.ts
+function transferChanges(before, after, protectedPaths = /* @__PURE__ */ new Set()) {
+  const beforeMap = before ? fileHashMap(before) : {};
+  const afterMap = fileHashMap(after);
+  return [.../* @__PURE__ */ new Set([...Object.keys(beforeMap), ...Object.keys(afterMap)])].sort().flatMap((filePath) => {
+    if (protectedPaths.has(filePath)) return [];
+    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" }] : [];
+  });
+}
+function transferCounts(changes) {
+  return {
+    add: changes.filter((change) => change.action === "Add").length,
+    update: changes.filter((change) => change.action === "Update").length,
+    remove: changes.filter((change) => change.action === "Delete").length
+  };
+}
+
+// src/ui/merged-sync-summary.ts
 function mergedSyncSummary(input) {
-  const local = changes(input.localBefore, input.localAfter);
-  const remote = changes(input.remoteBefore, input.remoteAfter);
+  const local = transferChanges(input.localBefore, input.localAfter);
+  const remote = transferChanges(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";
@@ -351,6 +376,7 @@ function mergedSyncSummary(input) {
   const context = [`Setup: ${safeTerminalText(input.setupName)}`, `Remote: ${safeTerminalText(input.destination)}`];
   const safety = [
     `Remote snapshot publication: ${input.publish ? "yes" : "no"}`,
+    "Remote removals affect the active snapshot; retained history is not erased.",
     `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."] : [],
@@ -381,15 +407,6 @@ function mergedSyncSummary(input) {
     ].join("\n")
   };
 }
-function changes(before, after) {
-  const beforeMap = fileHashMap(before);
-  const afterMap = fileHashMap(after);
-  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
 import fs from "node:fs/promises";
@@ -1351,7 +1368,11 @@ 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)`, ""];
+  const lines = [
+    `local: ${local.files.length} files`,
+    `remote: ${safeTerminalText(remote.id)} (${remote.files.length} files)`,
+    ""
+  ];
   let changed = 0;
   for (const filePath of allPaths) {
     if (!Object.hasOwn(localMap, filePath)) {
@@ -1369,76 +1390,87 @@ function formatDiff(local, remote) {
   return lines.join("\n");
 }
 function formatSnapshotOnlyDiff(title, snapshot) {
-  return [`${title}: ${snapshot.id}`, ...snapshot.files.map((file) => `Add: ${snapshotPathLabel(file.path)}`)].join(
-    "\n"
-  );
+  return [
+    `${safeTerminalText(title)}: ${safeTerminalText(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())}.`,
+    `Direction: Local \u2192 Remote. Source: ${safeTerminalText(agentDir())}.`,
+    `Publish a snapshot containing ${upload.files.length} files; unchanged and preserved files are not counted as changes.`,
     `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.",
+    head ? `Remote latest: ${safeTerminalText(head.snapshotId)}` : "Remote latest: empty",
+    "Publication effect: the backend's active head will reference the new immutable snapshot. Removed paths leave the active snapshot; retained history is not erased.",
     ...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."
+    config.skipSecretScan ? "Warning: possible-secret scanning is disabled for this push." : 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 formatApplyPreview(local, remote, protectedPaths = /* @__PURE__ */ new Set(), additionalRemovals = []) {
+  return formatDirectionalChanges(
+    local,
+    remote,
+    {
+      add: "Add locally",
+      update: "Update locally",
+      remove: "Remove locally"
+    },
+    protectedPaths,
+    additionalRemovals
+  );
 }
-function formatPullSummary(config, destination, local, remote, protectedSessionCount) {
+function formatPullSummary(config, destination, local, remote, protectedPaths, additionalRemovals = []) {
   return [
     `Sync setup: ${safeTerminalText(config.setupName)}`,
     `Storage location: ${safeTerminalText(destination)}`,
+    "Direction: Remote \u2192 Local.",
     `Snapshot: ${safeTerminalText(remote.id)}`,
     `Sessions: ${remote.syncSessions ? "included \u2014 may contain private conversations" : "not included"}`,
-    `Protected live sessions: ${protectedSessionCount || "none"}`,
-    formatApplyPreview(local, remote),
+    `Protected live sessions: ${protectedPaths.size || "none"}`,
+    formatApplyPreview(local, remote, protectedPaths, additionalRemovals),
+    ...additionalRemovals.length ? ["Case-variant aliases listed above are removed before writing canonical paths."] : [],
     "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) {
+function formatRollbackSummary(config, destination, local, remote, requestedSnapshot, protectedPaths, additionalRemovals = []) {
   return [
     `Sync setup: ${safeTerminalText(config.setupName)}`,
     `Storage location: ${safeTerminalText(destination)}`,
+    "Direction: Historical snapshot \u2192 Local and remote active head.",
     `Snapshot: ${safeTerminalText(requestedSnapshot)}`,
     `Sessions: ${remote.syncSessions ? "included \u2014 may contain private conversations" : "not included"}`,
-    `Protected live sessions: ${protectedSessionCount || "none"}`,
-    formatApplyPreview(local, remote),
+    `Protected live sessions: ${protectedPaths.size || "none"}`,
+    formatApplyPreview(local, remote, protectedPaths, additionalRemovals),
+    ...additionalRemovals.length ? ["Case-variant aliases listed above are removed before writing canonical paths."] : [],
     "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)}`);
+function formatDirectionalChanges(before, after, labels, protectedPaths = /* @__PURE__ */ new Set(), additionalRemovals = []) {
+  const changes = transferChanges(before, after, protectedPaths);
+  const known = new Set(changes.map((change) => change.path));
+  for (const filePath of additionalRemovals) {
+    if (!known.has(filePath) && !protectedPaths.has(filePath)) {
+      changes.push({ path: filePath, action: "Delete" });
+      known.add(filePath);
+    }
   }
-  if (lines.length === 0) lines.push("No file changes.");
-  return lines.join("\n");
+  const counts = transferCounts(changes);
+  const label = { Add: labels.add, Update: labels.update, Delete: labels.remove };
+  return [
+    `Changes: ${counts.add} add \xB7 ${counts.update} update \xB7 ${counts.remove} remove`,
+    ...changes.map((change) => `${label[change.action]}: ${snapshotPathLabel(change.path)}`),
+    ...changes.length ? [] : ["No file changes."]
+  ].join("\n");
 }
 function countPreservedRemoteFiles(local, upload) {
   const localPaths = new Set(local.files.map((file) => file.path));
@@ -1503,6 +1535,7 @@ function safeList(values) {
 // src/sync/merged-sync.ts
 var MAX_ATTEMPTS = 3;
 async function mergeSync(ctx, options, factory = createSyncBackend, resolution) {
+  const timings = options.startupTimings ?? createStartupTimings();
   const validateOwner = captureMutationOwner(ctx, options.signal);
   const isCurrent = () => {
     try {
@@ -1521,7 +1554,7 @@ async function mergeSync(ctx, options, factory = createSyncBackend, resolution)
     sessionDir: sessionRoot,
     signal: options.signal
   };
-  const validate = async () => {
+  const validate = () => timings.measure("transfer authorization", async () => {
     validateOwner();
     const latest = await loadConfig(options.setup);
     validateOwner();
@@ -1535,19 +1568,22 @@ async function mergeSync(ctx, options, factory = createSyncBackend, resolution)
     }
     if (options.auto && (!latest.automaticTransfer || !ctx.isIdle()))
       throw new Error("Automatic transfer is no longer authorized at this idle boundary.");
-  };
+  });
   await validate();
-  const backend = await factory(config);
+  const backend = await timings.measure("transfer backend initialization", () => factory(config));
   await validate();
   if (options.auto && backend.capability === "read-check-write-verify") {
     throw new Error(
       "Automatic transfer requires conditional publication or a lease; this backend supports only read/check/write/verify. Use manual sync."
     );
   }
-  const pending = await readMergeJournal(config);
+  const pending = await timings.measure("transfer journal read", () => readMergeJournal(config));
   await validate();
   if (pending) {
-    const recovered = await completeJournal(ctx, config, backend, pending, validate, options.signal, options.auto);
+    const recovered = await timings.measure(
+      "transfer journal recovery",
+      () => completeJournal(ctx, config, backend, pending, validate, timings, options.signal, options.auto)
+    );
     if (!recovered) {
       if ((options.auto || !options.silent) && !options.signal?.aborted)
         ctx.ui.notify(
@@ -1566,18 +1602,40 @@ async function mergeSync(ctx, options, factory = createSyncBackend, resolution)
   try {
     for (let attempt = 0; attempt < MAX_ATTEMPTS; attempt++) {
       await validate();
-      const state = await readStateForConfig(config);
+      const state = await timings.measure("transfer state read", () => readStateForConfig(config));
       if (state.unresolved?.length && !config.partialSync)
         throw new Error(
           "Partial progress remains unresolved; re-enable partial sync or review an explicit force direction."
         );
-      const localRaw = await createSnapshot(config.snapshotIdentity, snapshotOptions);
+      const localRaw = await timings.measure(
+        "transfer local snapshot",
+        () => createSnapshot(config.snapshotIdentity, snapshotOptions)
+      );
       const local = portableSnapshot(localRaw, config.localFields);
       if (!sameLocalFields(state.localFields, config.localFields))
         throw new Error("Local-field rules changed; review and confirm a directional migration first.");
-      const head = await backend.readHead(options.signal);
+      const head = await timings.measure("transfer remote head", () => backend.readHead(options.signal));
       await validate();
-      const rawRemote = head ? await readSnapshotForHead(backend, head, options.signal) : void 0;
+      if (options.auto && !resolution && !config.partialSync && head && state.lastAppliedSnapshot && state.lastRemoteRevision && !state.unresolved?.length && head.snapshotId === state.lastAppliedSnapshot && backend.sameRevision(head.revision, state.lastRemoteRevision) && inspectRemoteSelection(config.include, { selection: head.selection, files: [] }).kind === "same" && matchesAcceptedState(state, config, head, local)) {
+        const unchanged = await timings.measure("transfer unchanged verification", async () => {
+          if (!await hasCurrentMergeBaseline(config, local, state)) return false;
+          await validate();
+          const currentLocal = await timings.measure(
+            "transfer local snapshot",
+            () => createSnapshot(config.snapshotIdentity, snapshotOptions)
+          );
+          await validate();
+          const currentState = await timings.measure("transfer state read", () => readStateForConfig(config));
+          await validate();
+          return sameHashes(fileHashMap(currentLocal), fileHashMap(localRaw)) && syncStateFingerprint(currentState) === syncStateFingerprint(state);
+        });
+        await validate();
+        if (unchanged) {
+          timings.markUnchanged();
+          return "applied";
+        }
+      }
+      const rawRemote = head ? await timings.measure("transfer snapshot download", () => readSnapshotForHead(backend, head, options.signal)) : void 0;
       await validate();
       if (rawRemote) {
         const files = [...local.files, ...rawRemote.files];
@@ -1590,12 +1648,16 @@ async function mergeSync(ctx, options, factory = createSyncBackend, resolution)
       const remote = rawRemote ? portableSnapshot(filterSnapshotForConfigPolicy(rawRemote, config), rawRemote.localFields) : void 0;
       if (rawRemote) {
         requireCompatibleRemoteSelection(config, rawRemote);
-        const validation = planFileMerge({
-          baseline: state.lastFileHashes,
-          local: local.files,
-          remote: rawRemote.files,
-          selectionCompatible: true
-        });
+        const validation = await timings.measure(
+          "transfer merge planning",
+          () => planFileMerge({
+            baseline: state.lastFileHashes,
+            local: local.files,
+            remote: rawRemote.files,
+            selectionCompatible: true
+          })
+        );
+        await validate();
         const managedPaths = /* @__PURE__ */ new Set([
           ...Object.keys(state.lastFileHashes),
           ...[...local.files, ...remote?.files ?? []].map((file) => file.path)
@@ -1622,30 +1684,35 @@ async function mergeSync(ctx, options, factory = createSyncBackend, resolution)
         throw review("The established remote is missing; choose an explicit recovery direction.", "remote-empty");
       const selectionState = inspectRemoteSelection(config.include, rawRemote);
       const selectionCompatible = selectionState.kind === "same";
-      let plan = planFileMerge({
-        baseline: state.lastFileHashes,
-        local: local.files,
-        remote: remote.files,
-        selectionCompatible,
-        protectedPaths: protectedSessionPaths(ctx, sessionRoot)
-      });
+      let plan = await timings.measure(
+        "transfer merge planning",
+        () => planFileMerge({
+          baseline: state.lastFileHashes,
+          local: local.files,
+          remote: remote.files,
+          selectionCompatible,
+          protectedPaths: protectedSessionPaths(ctx, sessionRoot)
+        })
+      );
+      await validate();
       let resolved = { plan, fields: [] };
       if (config.mergeSettings) {
         try {
-          resolved = await resolveSettingsConflicts(config, state, local, remote, plan);
+          resolved = await timings.measure(
+            "transfer settings merge",
+            () => resolveSettingsConflicts(config, state, local, remote, plan)
+          );
         } catch (error) {
           if (!config.partialSync) throw error;
         }
       }
       await validate();
-      plan = await resolveContentConflicts(
-        config,
-        state,
-        local,
-        remote,
-        resolved.plan,
-        protectedSessionPaths(ctx, sessionRoot),
-        { textBudget, signal: options.signal }
+      plan = await timings.measure(
+        "transfer content merge",
+        () => resolveContentConflicts(config, state, local, remote, resolved.plan, protectedSessionPaths(ctx, sessionRoot), {
+          textBudget,
+          signal: options.signal
+        })
       );
       await validate();
       if (resolution) {
@@ -1752,37 +1819,49 @@ An explicit direction adopts this setup's included-content policy; no automatic
       const publish = !sameHashes(fileHashMap(publication), fileHashMap(remote)) || Boolean(config.partialSync && rawRemote.version !== 3);
       const apply = !sameHashes(fileHashMap(localRaw), fileHashMap(after));
       if (!publish && !apply) {
-        const beforeEvidence = await backend.readHead(options.signal);
+        const beforeEvidence = await timings.measure("transfer remote head", () => backend.readHead(options.signal));
         await validate();
         if (!beforeEvidence || !backend.sameRevision(beforeEvidence.revision, head.revision))
           throw new Error("Remote changed before baseline acceptance; retry from a fresh observation.");
         progress = await persistProgress();
         await validate();
-        const currentLocal = await createSnapshot(config.snapshotIdentity, snapshotOptions);
+        const currentLocal = await timings.measure(
+          "transfer local snapshot",
+          () => createSnapshot(config.snapshotIdentity, snapshotOptions)
+        );
         await validate();
-        if (!sameHashes(fileHashMap(currentLocal), fileHashMap(localRaw)) || syncStateFingerprint(await readStateForConfig(config)) !== syncStateFingerprint(state))
+        if (!sameHashes(fileHashMap(currentLocal), fileHashMap(localRaw)) || syncStateFingerprint(await timings.measure("transfer state read", () => readStateForConfig(config))) !== syncStateFingerprint(state))
           throw new Error(
             "Local content or baseline changed before baseline acceptance; retry from a fresh observation."
           );
         await validate();
-        const currentHead = await backend.readHead(options.signal);
+        const currentHead = await timings.measure("transfer remote head", () => backend.readHead(options.signal));
         await validate();
         if (!currentHead || !backend.sameRevision(currentHead.revision, head.revision))
           throw new Error("Remote changed before baseline acceptance; retry from a fresh observation.");
-        await writeAcceptedState(config, head, accepted, validate, progress);
-        await pruneMergeBaselines(
-          config,
-          acceptedState(config, head, accepted, progress),
-          captureMutationOwner(ctx, options.signal)
+        await timings.measure(
+          "transfer baseline write",
+          () => writeAcceptedState(config, head, accepted, validate, progress)
+        );
+        await timings.measure(
+          "transfer cleanup",
+          () => pruneMergeBaselines(
+            config,
+            acceptedState(config, head, accepted, progress),
+            captureMutationOwner(ctx, options.signal)
+          )
         );
         await validate();
-        await pruneCompletedConflicts(
-          config,
-          backend.identity,
-          acceptedState(config, head, accepted, progress),
-          accepted,
-          remote,
-          captureMutationOwner(ctx, options.signal)
+        await timings.measure(
+          "transfer cleanup",
+          () => pruneCompletedConflicts(
+            config,
+            backend.identity,
+            acceptedState(config, head, accepted, progress),
+            accepted,
+            remote,
+            captureMutationOwner(ctx, options.signal)
+          )
         );
         await validate();
         if (!options.silent)
@@ -1792,7 +1871,10 @@ An explicit direction adopts this setup's included-content policy; no automatic
           );
         return "applied";
       }
-      await preflightMergedTargets(localRaw, after, snapshotOptions, ctx.sessionManager.getSessionFile?.());
+      await timings.measure(
+        "transfer preflight",
+        () => preflightMergedTargets(localRaw, after, snapshotOptions, ctx.sessionManager.getSessionFile?.())
+      );
       await validate();
       if (!config.skipSecretScan && scanSnapshot(upload).length)
         throw new Error("Refusing to merge possible secrets. Review managed content before syncing.");
@@ -1822,19 +1904,25 @@ An explicit direction adopts this setup's included-content policy; no automatic
           return "cancelled";
       }
       await validate();
-      const refreshed = await createSnapshot(config.snapshotIdentity, snapshotOptions);
+      const refreshed = await timings.measure(
+        "transfer local snapshot",
+        () => createSnapshot(config.snapshotIdentity, snapshotOptions)
+      );
       if (!sameHashes(fileHashMap(refreshed), fileHashMap(localRaw)))
         throw new Error("Local content changed during review; no merged transfer was performed.");
-      if (syncStateFingerprint(await readStateForConfig(config)) !== syncStateFingerprint(state))
+      if (syncStateFingerprint(await timings.measure("transfer state read", () => readStateForConfig(config))) !== syncStateFingerprint(state))
         throw new Error("Sync baseline changed during review; retry from a fresh observation.");
       await validate();
-      const refreshedHead = await backend.readHead(options.signal);
+      const refreshedHead = await timings.measure("transfer remote head", () => backend.readHead(options.signal));
       await validate();
       if (!refreshedHead || !backend.sameRevision(refreshedHead.revision, head.revision))
         throw new Error("Remote changed during review; no merged transfer was performed.");
       progress = await persistProgress();
       await validate();
-      const backup = await backupLocal(config.snapshotIdentity, snapshotOptions, options.signal);
+      const backup = await timings.measure(
+        "transfer backup",
+        () => backupLocal(config.snapshotIdentity, snapshotOptions, options.signal)
+      );
       await validate();
       const journal = {
         version: 1,
@@ -1850,10 +1938,15 @@ An explicit direction adopts this setup's included-content policy; no automatic
         ...sessionRoot !== void 0 ? { sessionRoot } : {},
         ...!publish ? { committedHead: head, applyOnly: true } : {}
       };
-      await writeMergeJournal(config, journal);
-      const atCommitState = syncStateFingerprint(await readStateForConfig(config));
+      await timings.measure("transfer journal write", () => writeMergeJournal(config, journal));
+      const atCommitState = syncStateFingerprint(
+        await timings.measure("transfer state read", () => readStateForConfig(config))
+      );
       await validate();
-      const atCommit = await createSnapshot(config.snapshotIdentity, snapshotOptions);
+      const atCommit = await timings.measure(
+        "transfer local snapshot",
+        () => createSnapshot(config.snapshotIdentity, snapshotOptions)
+      );
       await validate();
       if (!sameHashes(fileHashMap(atCommit), fileHashMap(localRaw)) || atCommitState !== journal.stateIdentity) {
         await validate();
@@ -1863,7 +1956,10 @@ An explicit direction adopts this setup's included-content policy; no automatic
         );
       }
       try {
-        await preflightMergedTargets(atCommit, after, snapshotOptions, ctx.sessionManager.getSessionFile?.());
+        await timings.measure(
+          "transfer preflight",
+          () => preflightMergedTargets(atCommit, after, snapshotOptions, ctx.sessionManager.getSessionFile?.())
+        );
         await validate();
       } catch (error) {
         await validate();
@@ -1872,13 +1968,16 @@ An explicit direction adopts this setup's included-content policy; no automatic
       }
       try {
         if (publish) {
-          const result = await backend.publishSnapshot(upload, expectedRemoteHead(head), {
-            signal: options.signal,
-            onCommit: options.onCommit
-          });
+          const result = await timings.measure(
+            "transfer remote publication",
+            () => backend.publishSnapshot(upload, expectedRemoteHead(head), {
+              signal: options.signal,
+              onCommit: options.onCommit
+            })
+          );
           journal.committedHead = result.head;
           journal.warnings = result.warnings;
-          await writeMergeJournal(config, journal);
+          await timings.measure("transfer journal write", () => writeMergeJournal(config, journal));
         } else options.onCommit?.();
       } catch (error) {
         if (error instanceof SyncBackendConflictError && error.phase === "before-commit" && !error.candidateMayHaveBeenActive) {
@@ -1888,7 +1987,10 @@ An explicit direction adopts this setup's included-content policy; no automatic
         }
         throw mergeTransferError(error, config.backend);
       }
-      const completed = await completeJournal(ctx, config, backend, journal, validate, options.signal, options.auto);
+      const completed = await timings.measure(
+        "transfer journal recovery",
+        () => completeJournal(ctx, config, backend, journal, validate, timings, options.signal, options.auto)
+      );
       if (!completed) {
         if (!options.signal?.aborted && (options.auto || !options.silent))
           ctx.ui.notify(
@@ -1911,10 +2013,10 @@ An explicit direction adopts this setup's included-content policy; no automatic
       return "applied";
     }
   } finally {
-    await releaseConflictArtifacts(config, ownedStatePath, createdArtifacts);
+    await timings.measure("transfer cleanup", () => releaseConflictArtifacts(config, ownedStatePath, createdArtifacts));
   }
 }
-async function completeJournal(ctx, config, backend, journal, validate, signal, auto = false) {
+async function completeJournal(ctx, config, backend, journal, validate, timings, signal, auto = false) {
   if (journal.identity !== mergeJournalIdentity(config, backend.identity) || !sameLocalFields(journal.upload.localFields, config.localFields))
     throw new Error(
       "Merge journal belongs to a different setup, selection or local-field policy; preserve it for reviewed recovery."
@@ -1928,11 +2030,14 @@ async function completeJournal(ctx, config, backend, journal, validate, signal,
     );
   }
   const snapshotOptions = { ...snapshotOptionsForContext(ctx, config), sessionDir: sessionRoot, signal };
-  const head = await backend.readHead(signal);
+  const head = await timings.measure("transfer remote head", () => backend.readHead(signal));
   if (!journal.committedHead && head && (backend.sameRevision(head.revision, journal.expectedHead.revision) || backend.matchesUncommittedRecoveryHead?.(head, journal.expectedHead))) {
     await validate();
-    const local = await createSnapshot(config.snapshotIdentity, snapshotOptions);
-    if (!sameHashes(fileHashMap(local), fileHashMap(journal.before)) || syncStateFingerprint(await readStateForConfig(config)) !== journal.stateIdentity) {
+    const local = await timings.measure(
+      "transfer local snapshot",
+      () => createSnapshot(config.snapshotIdentity, snapshotOptions)
+    );
+    if (!sameHashes(fileHashMap(local), fileHashMap(journal.before)) || syncStateFingerprint(await timings.measure("transfer state read", () => readStateForConfig(config))) !== journal.stateIdentity) {
       throw new Error(
         "Uncertain publication is not active, but local content or baseline changed; keep the journal for reviewed recovery."
       );
@@ -1942,7 +2047,7 @@ async function completeJournal(ctx, config, backend, journal, validate, signal,
   }
   await validate();
   if (journal.committedHead && (!head || !backend.sameRevision(head.revision, journal.committedHead.revision))) {
-    const state2 = await readStateForConfig(config);
+    const state2 = await timings.measure("transfer state read", () => readStateForConfig(config));
     await validate();
     if (matchesAcceptedState(state2, config, journal.committedHead, journal.accepted ?? journal.after, journal.progress)) {
       await clearMergeJournal(config);
@@ -1953,8 +2058,11 @@ async function completeJournal(ctx, config, backend, journal, validate, signal,
     }
   }
   if (journal.applyOnly && (!head || !backend.sameRevision(head.revision, journal.expectedHead.revision))) {
-    const local = await createSnapshot(config.snapshotIdentity, snapshotOptions);
-    const state2 = await readStateForConfig(config);
+    const local = await timings.measure(
+      "transfer local snapshot",
+      () => createSnapshot(config.snapshotIdentity, snapshotOptions)
+    );
+    const state2 = await timings.measure("transfer state read", () => readStateForConfig(config));
     await validate();
     if (sameHashes(fileHashMap(local), fileHashMap(journal.before)) && syncStateFingerprint(state2) === journal.stateIdentity) {
       await clearMergeJournal(config);
@@ -1967,11 +2075,14 @@ async function completeJournal(ctx, config, backend, journal, validate, signal,
       "Publication outcome cannot be reconciled with the current remote head. Journal and backup retained; do not retry publication or restore old bytes blindly."
     );
   }
-  const observed = await readSnapshotForHead(backend, head, signal);
+  const observed = await timings.measure(
+    "transfer snapshot download",
+    () => readSnapshotForHead(backend, head, signal)
+  );
   requireCompatibleRemoteSelection(config, observed);
   if (!sameHashes(fileHashMap(observed), fileHashMap(journal.upload)) || JSON.stringify(observed.selection) !== JSON.stringify(journal.upload.selection))
     throw new Error("Remote snapshot does not match the recorded merge publication.");
-  const state = await readStateForConfig(config);
+  const state = await timings.measure("transfer state read", () => readStateForConfig(config));
   if (matchesAcceptedState(state, config, head, journal.accepted ?? journal.after, journal.progress)) {
     await validate();
     await clearMergeJournal(config);
@@ -1994,36 +2105,48 @@ async function completeJournal(ctx, config, backend, journal, validate, signal,
     validateOwner();
     if (auto && !ctx.isIdle()) throw new Error("Automatic file apply is no longer idle; evidence retained.");
   };
-  await applyMergedSnapshot(
-    journal.before,
-    journal.after,
-    protectedSessionPaths(ctx, sessionRoot),
-    { ...snapshotOptions, validateMutation },
-    validate,
-    ctx.sessionManager.getSessionFile?.()
+  await timings.measure(
+    "transfer local apply",
+    () => applyMergedSnapshot(
+      journal.before,
+      journal.after,
+      protectedSessionPaths(ctx, sessionRoot),
+      { ...snapshotOptions, validateMutation },
+      validate,
+      ctx.sessionManager.getSessionFile?.()
+    )
   );
   await validate();
-  const headAtAcceptance = await backend.readHead(signal);
+  const headAtAcceptance = await timings.measure("transfer remote head", () => backend.readHead(signal));
   await validate();
   if (!headAtAcceptance || !backend.sameRevision(headAtAcceptance.revision, head.revision))
     throw new Error("Remote changed during merged apply; journal and backup retained for review.");
-  await writeAcceptedState(config, head, journal.accepted ?? journal.after, validate, journal.progress);
+  await timings.measure(
+    "transfer baseline write",
+    () => writeAcceptedState(config, head, journal.accepted ?? journal.after, validate, journal.progress)
+  );
   await validate();
   await clearMergeJournal(config);
   await validate();
-  await pruneMergeBaselines(
-    config,
-    acceptedState(config, head, journal.accepted ?? journal.after, journal.progress),
-    captureMutationOwner(ctx, signal)
+  await timings.measure(
+    "transfer cleanup",
+    () => pruneMergeBaselines(
+      config,
+      acceptedState(config, head, journal.accepted ?? journal.after, journal.progress),
+      captureMutationOwner(ctx, signal)
+    )
   );
   await validate();
-  await pruneCompletedConflicts(
-    config,
-    backend.identity,
-    acceptedState(config, head, journal.accepted ?? journal.after, journal.progress),
-    journal.accepted ?? journal.after,
-    journal.upload,
-    captureMutationOwner(ctx, signal)
+  await timings.measure(
+    "transfer cleanup",
+    () => pruneCompletedConflicts(
+      config,
+      backend.identity,
+      acceptedState(config, head, journal.accepted ?? journal.after, journal.progress),
+      journal.accepted ?? journal.after,
+      journal.upload,
+      captureMutationOwner(ctx, signal)
+    )
   );
   await validate();
   return true;
@@ -2057,6 +2180,7 @@ async function writeAcceptedState(config, head, snapshot, validate, progress) {
 export {
   confirmMergeReview,
   applySnapshot,
+  addTopLevelCaseVariantDeletes,
   formatDiff,
   formatSnapshotOnlyDiff,
   formatPushSummary,
@@ -2067,4 +2191,4 @@ export {
   createSyncDecision,
   mergeSync
 };
-//# sourceMappingURL=chunk-MYPSMJHJ.ts.map
+//# sourceMappingURL=chunk-35GM6XKM.ts.map