@narumitw/pi-sync 0.54.2 → 0.56.0

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

@@ -1,16 +1,29 @@
 // @generated by scripts/build-runtime.mjs; do not edit.
 // @ts-nocheck -- generated JavaScript uses a .ts extension for Pi's Jiti loader.
 import {
-  clearMergeJournal,
+  confirmMergeReview
+} from "./chunk-5XZOC7FD.ts";
+import {
+  formatRemoteSelectionStatus,
+  readSnapshotForHead,
+  requireCompatibleRemoteSelection
+} from "./chunk-YK52VDXG.ts";
+import {
+  createSyncBackend
+} from "./chunk-OEWQVWLC.ts";
+import {
   conflictArtifactFingerprint,
   conflictDirectory,
   conflictGroups,
-  mergeJournalIdentity,
   readConflictArtifact,
+  saveConflictArtifact
+} from "./chunk-ED3TYIVW.ts";
+import {
+  clearMergeJournal,
+  mergeJournalIdentity,
   readMergeJournal,
-  saveConflictArtifact,
   writeMergeJournal
-} from "./chunk-ORQRHEEO.ts";
+} from "./chunk-GNH73BJ5.ts";
 import {
   fileHashMap,
   hasLocalChanges,
@@ -18,65 +31,44 @@ import {
   sameHashes,
   syncPolicyChanged
 } from "./chunk-BDB4IDM3.ts";
-import {
-  formatRemoteSelectionStatus,
-  readSnapshotForHead,
-  requireCompatibleRemoteSelection
-} from "./chunk-V6VZ5TLG.ts";
-import {
-  createSyncBackend
-} from "./chunk-SDZCTCYQ.ts";
 import {
   applySnapshotTransaction,
   recoverPendingSnapshotTransactions,
   syncMutationParents
-} from "./chunk-CL7BZRRQ.ts";
+} from "./chunk-CRKTAPSL.ts";
 import {
   backupLocal,
   captureMutationOwner,
   protectedSessionPaths
-} from "./chunk-IJ6VV6FN.ts";
+} from "./chunk-UOHR7LRO.ts";
 import {
   safeTerminalText,
   snapshotPathLabel
 } from "./chunk-AMJRUXFT.ts";
 import {
-  TEXT_MERGE_WORK_LIMIT,
-  isMergeTextPath,
-  mergeSession,
-  mergeText,
-  pruneMergeBaselines,
-  readMergeAncestor,
-  readMergeAncestors,
-  stageMergeBaseline
-} from "./chunk-QE7NZZWT.ts";
+  createStartupTimings
+} from "./chunk-UZPMDLTL.ts";
 import {
-  mergePathIdentity,
-  planFileMerge
-} from "./chunk-76NB4R7U.ts";
-import {
-  readStateForConfig,
-  statePathForConfig,
-  syncStateFingerprint,
-  writeStateForConfig
-} from "./chunk-4QVPTIZB.ts";
+  SyncDecisionRequiredError
+} from "./chunk-7D5SF7P3.ts";
 import {
   loadConfig,
   syncCheckConfigFingerprint,
   syncConfigReviewIdentity
-} from "./chunk-3B4Z2SKV.ts";
-import {
-  SyncBackendConflictError,
-  expectedRemoteHead
-} from "./chunk-YDVQYUHE.ts";
-import {
-  SyncDecisionRequiredError
-} from "./chunk-7D5SF7P3.ts";
+} from "./chunk-QO333NM4.ts";
 import {
   overlayLocalFields,
   portableSnapshot,
   sameLocalFields
 } from "./chunk-A6HU4ERM.ts";
+import {
+  SyncBackendConflictError,
+  expectedRemoteHead
+} from "./chunk-YDVQYUHE.ts";
+import {
+  mergeSettingsJson,
+  resolveContentConflicts
+} from "./chunk-5Q5SSKNG.ts";
 import {
   agentDir,
   createSnapshot,
@@ -96,10 +88,26 @@ import {
   snapshotTarget
 } from "./chunk-QOFMXPM5.ts";
 import {
-  jsonEqual,
-  parseSettingsDocument,
-  renderSettingsMembers
-} from "./chunk-ZW5ZLGBI.ts";
+  TEXT_MERGE_WORK_LIMIT,
+  hasCurrentMergeBaseline,
+  pruneMergeBaselines,
+  readMergeAncestor,
+  readMergeAncestors,
+  stageMergeBaseline
+} from "./chunk-IWZH5KYS.ts";
+import {
+  mergePathIdentity,
+  planFileMerge
+} from "./chunk-76NB4R7U.ts";
+import {
+  startupTransferEnabled
+} from "./chunk-PRUEIIK7.ts";
+import {
+  readStateForConfig,
+  statePathForConfig,
+  syncStateFingerprint,
+  writeStateForConfig
+} from "./chunk-UPNVIUBN.ts";
 import {
   assertWithinRoot,
   isDeniedPath,
@@ -110,216 +118,32 @@ import {
   toPosix
 } from "./chunk-HUZ5CR4W.ts";
 
-// src/ui/merge-review.ts
-import { truncateToWidth as truncateToWidth2 } from "@earendil-works/pi-tui";
-import { defineMenu, runCustomInteraction, runDocumentReview, runMenu } from "@narumitw/pi-tui-kit";
+// src/ui/merged-sync-summary.ts
+import { truncateToWidth } from "@earendil-works/pi-tui";
 
-// 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)
-    }
-  );
-  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/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" }] : [];
+  });
 }
-
-// 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;
-  }
-  return false;
+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
-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 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";
@@ -343,7 +167,7 @@ function mergedSyncSummary(input) {
     return [
       `${heading}: ${counts.join(", ")}`,
       ...(compact ? items.slice(0, 3) : items).map(
-        (item) => `  ${compact ? truncateToWidth3(label(item, side), 80) : label(item, side)}`
+        (item) => `  ${compact ? truncateToWidth(label(item, side), 80) : label(item, side)}`
       ),
       ...compact && items.length > 3 ? [`  ${items.length - 3} more files \u2014 View details`] : []
     ];
@@ -351,6 +175,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."] : [],
@@ -362,7 +187,7 @@ function mergedSyncSummary(input) {
     title,
     confirmationLabel,
     lines: [
-      ...context.map((line) => truncateToWidth3(line, 100)),
+      ...context.map((line) => truncateToWidth(line, 100)),
       ...section(local, "local", true),
       ...section(remote, "remote", true),
       ...safety
@@ -381,15 +206,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";
@@ -534,76 +350,18 @@ async function pruneCompletedConflicts(config, backend, state, local, remote, va
   }
 }
 
-// src/sync/content-conflicts.ts
-import { createHash } from "node:crypto";
-function snapshotFile(filePath, bytes) {
-  return {
-    path: filePath,
-    contentBase64: bytes.toString("base64"),
-    sha256: createHash("sha256").update(bytes).digest("hex")
-  };
-}
-async function resolveContentConflicts(config, state, local, remote, plan, protectedPaths, options = {}) {
-  if (plan.kind !== "planned" || !config.mergeContent) return plan;
-  options.signal?.throwIfAborted();
-  const budget = options.textBudget ?? { remaining: TEXT_MERGE_WORK_LIMIT };
-  const decisions = [...plan.decisions];
-  let ancestors = [];
-  try {
-    ancestors = await readMergeAncestors(config, state) ?? [];
-  } catch {
-    options.signal?.throwIfAborted();
-    return plan;
-  }
-  options.signal?.throwIfAborted();
-  const oursByPath = new Map(local.files.map((file) => [file.path, file]));
-  const theirsByPath = new Map(remote.files.map((file) => [file.path, file]));
-  const ancestorsByPath = new Map(ancestors.map((file) => [file.path, file]));
-  const decisionIndex = new Map(decisions.map((decision, index) => [decision.path, index]));
-  const protectedKeys = new Set([...protectedPaths].map(mergePathIdentity));
-  for (const conflict of plan.conflicts) {
-    options.signal?.throwIfAborted();
-    if (conflict.reason !== "both-changed" || protectedKeys.has(mergePathIdentity(conflict.path))) continue;
-    const session = conflict.path.startsWith("sessions/") && conflict.path.endsWith(".jsonl");
-    if (!session && (!isMergeTextPath(conflict.path) || budget.remaining === 0)) continue;
-    const ours = oursByPath.get(conflict.path);
-    const theirs = theirsByPath.get(conflict.path);
-    if (!ours || !theirs) continue;
-    const ancestor = ancestorsByPath.get(conflict.path);
-    const base = ancestor ? Buffer.from(ancestor.contentBase64, "base64") : void 0;
-    if (!base) continue;
-    const localBytes = Buffer.from(ours.contentBase64, "base64");
-    const remoteBytes = Buffer.from(theirs.contentBase64, "base64");
-    const bytes = session ? mergeSession(base, localBytes, remoteBytes) : mergeText(base, localBytes, remoteBytes, { budget, signal: options.signal });
-    if (!bytes) continue;
-    const index = decisionIndex.get(conflict.path);
-    if (index === void 0) continue;
-    decisions[index] = {
-      kind: "accepted",
-      path: conflict.path,
-      source: "merged",
-      file: snapshotFile(conflict.path, bytes)
-    };
-  }
-  return {
-    kind: "planned",
-    decisions,
-    conflicts: decisions.filter((item) => item.kind === "conflict")
-  };
-}
-
 // src/sync/merge-apply.ts
-import { createHash as createHash3, randomUUID } from "node:crypto";
+import { createHash as createHash2, randomUUID } from "node:crypto";
 import fs4 from "node:fs/promises";
 import path4 from "node:path";
 import { withFileMutationQueue } from "@earendil-works/pi-coding-agent";
 
 // src/snapshot/snapshot-apply.ts
-import { createHash as createHash2 } from "node:crypto";
+import { createHash } from "node:crypto";
 import fs3 from "node:fs/promises";
 import path3 from "node:path";
 function sha256(value) {
-  return createHash2("sha256").update(value).digest("hex");
+  return createHash("sha256").update(value).digest("hex");
 }
 function fileHashMap2(snapshot) {
   return Object.fromEntries(snapshot.files.map((file) => [file.path, file.sha256]));
@@ -912,7 +670,7 @@ async function assertReviewedTree(directory, relative, beforeHashes) {
     const stat = await fs4.lstat(child);
     if (stat.isDirectory()) {
       await assertReviewedTree(child, childRelative, beforeHashes);
-    } else if (stat.isFile() && stat.nlink === 1 && beforeHashes[childRelative] === createHash3("sha256").update(await fs4.readFile(child)).digest("hex")) {
+    } else if (stat.isFile() && stat.nlink === 1 && beforeHashes[childRelative] === createHash2("sha256").update(await fs4.readFile(child)).digest("hex")) {
       continue;
     } else {
       throw new Error("Reviewed directory contains unknown or changed files; publication refused.");
@@ -1082,7 +840,7 @@ async function applyMergedSnapshot(before, after, protectedPaths, options, valid
         } else {
           if (!stat.isFile() || stat.nlink > 1)
             throw new Error("Merged transfer target is no longer an independent regular file.");
-          hash = createHash3("sha256").update(await fs4.readFile(target2)).digest("hex");
+          hash = createHash2("sha256").update(await fs4.readFile(target2)).digest("hex");
         }
       } catch (error) {
         if (error.code !== "ENOENT") throw error;
@@ -1260,53 +1018,7 @@ function progressState(config, head, snapshot, progress) {
 }
 
 // src/sync/settings-conflicts.ts
-import { createHash as createHash4 } from "node:crypto";
-
-// src/sync/settings-merge.ts
-var COUPLED_FIELDS = [
-  ["defaultProvider", "defaultModel"],
-  ["queueMode", "steeringMode"],
-  ["websockets", "transport"],
-  ["skills", "enableSkillCommands"],
-  ["enableAnalytics", "trackingId"]
-];
-function mergeSettingsJson(ancestor, local, remote) {
-  let documents;
-  try {
-    documents = [ancestor, local, remote].map(parseSettingsDocument);
-  } catch {
-    return { kind: "review", reason: "unsupported-format", fields: [] };
-  }
-  const [base, left, right] = documents;
-  const selected = /* @__PURE__ */ new Map();
-  const fields = new Set(documents.flatMap((document) => [...document.root.members.keys()]));
-  const units = COUPLED_FIELDS.map((group) => [...group]);
-  const coupled = new Set(units.flat());
-  units.push(...[...fields].filter((field) => !coupled.has(field)).map((field) => [field]));
-  const conflicts = [];
-  for (const unit of units) {
-    const equal = (first, second) => unit.every(
-      (field) => jsonEqual(first.root.members.get(field)?.node.value, second.root.members.get(field)?.node.value)
-    );
-    const source = equal(left, right) ? left : equal(left, base) ? right : equal(right, base) ? left : void 0;
-    if (!source) {
-      conflicts.push(...unit.filter((field) => fields.has(field)));
-      continue;
-    }
-    for (const field of unit) {
-      const member = source.root.members.get(field);
-      if (member) selected.set(field, { document: source, node: member.node });
-    }
-  }
-  if (conflicts.length) return { kind: "review", reason: "field-conflict", fields: conflicts };
-  try {
-    return { kind: "merged", content: renderSettingsMembers(left, selected) };
-  } catch {
-    return { kind: "review", reason: "unsupported-format", fields: [] };
-  }
-}
-
-// src/sync/settings-conflicts.ts
+import { createHash as createHash3 } from "node:crypto";
 async function resolveSettingsConflicts(config, state, local, remote, plan) {
   if (plan.kind !== "planned") return { plan, fields: [] };
   const fields = [];
@@ -1336,7 +1048,7 @@ async function resolveSettingsConflicts(config, state, local, remote, plan) {
       file: {
         path: decision.path,
         contentBase64: merged.content.toString("base64"),
-        sha256: createHash4("sha256").update(merged.content).digest("hex")
+        sha256: createHash3("sha256").update(merged.content).digest("hex")
       }
     };
   }
@@ -1351,7 +1063,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 +1085,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,7 +1230,12 @@ function safeList(values) {
 // src/sync/merged-sync.ts
 var MAX_ATTEMPTS = 3;
 async function mergeSync(ctx, options, factory = createSyncBackend, resolution) {
-  const validateOwner = captureMutationOwner(ctx, options.signal);
+  const timings = options.startupTimings ?? createStartupTimings();
+  const sessionOwner = captureMutationOwner(ctx, options.signal);
+  const validateOwner = (config2) => {
+    sessionOwner();
+    options.background?.validate(config2);
+  };
   const isCurrent = () => {
     try {
       validateOwner();
@@ -1513,7 +1245,9 @@ async function mergeSync(ctx, options, factory = createSyncBackend, resolution)
     }
   };
   const config = await loadConfig(options.setup);
+  validateOwner(config);
   const configToken = syncCheckConfigFingerprint(config);
+  const modelToken = JSON.stringify(ctx.model);
   const sessionRoot = config.include.includes("sessions") ? await effectiveSessionRoot(ctx) : void 0;
   validateOwner();
   const snapshotOptions = {
@@ -1521,10 +1255,10 @@ 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();
+    validateOwner(latest);
     if (configToken !== syncCheckConfigFingerprint(latest))
       throw new Error("Sync setup or settings changed during transfer; reopen sync.");
     if (sessionRoot !== void 0) {
@@ -1533,21 +1267,31 @@ async function mergeSync(ctx, options, factory = createSyncBackend, resolution)
       if (currentRoot !== sessionRoot)
         throw new Error("Session storage root changed during transfer; evidence retained for review.");
     }
-    if (options.auto && (!latest.automaticTransfer || !ctx.isIdle()))
+    if (config.agentMode && JSON.stringify(ctx.model) !== modelToken)
+      throw new Error("Agent mode paused: selected model changed during transfer.");
+    if (options.auto && (!startupTransferEnabled(latest) || !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,
+        options.background?.validate
+      )
+    );
     if (!recovered) {
       if ((options.auto || !options.silent) && !options.signal?.aborted)
         ctx.ui.notify(
@@ -1560,24 +1304,51 @@ async function mergeSync(ctx, options, factory = createSyncBackend, resolution)
       ctx.ui.notify("Recovered the committed merged transfer. Run sync again to inspect newer changes.", "info");
     return "applied";
   }
+  if ((options.auto || config.agentMode) && 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. Disable Agent mode and use manual sync."
+    );
+  }
   const textBudget = { remaining: TEXT_MERGE_WORK_LIMIT };
   const createdArtifacts = [];
   const ownedStatePath = statePathForConfig(config);
   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 +1361,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 +1397,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) {
@@ -1662,7 +1442,30 @@ async function mergeSync(ctx, options, factory = createSyncBackend, resolution)
         );
         await validate();
       }
-      if (plan.kind !== "planned" || plan.conflicts.length && (!config.partialSync || options.auto)) {
+      if (config.agentMode && !resolution) {
+        const { resolveAgentPlan } = await import("./agent-plan-QCUJWBP4.ts");
+        await validate();
+        plan = await resolveAgentPlan(
+          ctx,
+          options,
+          config,
+          backend,
+          state,
+          local,
+          localRaw,
+          remote,
+          head,
+          plan,
+          snapshotOptions,
+          validate
+        );
+        await validate();
+        if (plan.kind !== "planned" || plan.conflicts.length && !config.partialSync)
+          throw new Error(
+            "Agent mode paused: unsupported or refused conflict groups remain; no transfer was performed."
+          );
+      }
+      if (plan.kind !== "planned" || plan.conflicts.length && (!config.partialSync || options.auto && !config.agentMode)) {
         const decision = review(
           selectionCompatible ? `Conflicting or protected paths require review; no merged transfer was performed. Use /sync diff and an explicit direction.${resolved.fields.length ? ` Settings fields: ${resolved.fields.map(safeTerminalText).join(", ")}` : ""}` : "Remote selection metadata is unavailable; review the included content and choose an explicit direction before merging.",
           selectionCompatible ? "both-changed" : "remote-or-policy-changed"
@@ -1752,37 +1555,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,11 +1607,14 @@ 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.");
-      if (!options.yes) {
+      if (!options.yes && !config.agentMode) {
         const summary = mergedSyncSummary({
           setupName: config.setupName,
           destination: backend.destination,
@@ -1822,19 +1640,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 +1674,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 +1692,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 +1704,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 +1723,20 @@ 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,
+          options.background?.validate
+        )
+      );
       if (!completed) {
         if (!options.signal?.aborted && (options.auto || !options.silent))
           ctx.ui.notify(
@@ -1911,10 +1759,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, validateBackground) {
   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 +1776,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 +1793,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 +1804,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 +1821,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);
@@ -1992,38 +1849,51 @@ async function completeJournal(ctx, config, backend, journal, validate, signal,
   const validateOwner = captureMutationOwner(ctx, signal);
   const validateMutation = () => {
     validateOwner();
+    validateBackground?.();
     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;
@@ -2055,8 +1925,8 @@ async function writeAcceptedState(config, head, snapshot, validate, progress) {
 }
 
 export {
-  confirmMergeReview,
   applySnapshot,
+  addTopLevelCaseVariantDeletes,
   formatDiff,
   formatSnapshotOnlyDiff,
   formatPushSummary,
@@ -2067,4 +1937,4 @@ export {
   createSyncDecision,
   mergeSync
 };
-//# sourceMappingURL=chunk-MYPSMJHJ.ts.map
+//# sourceMappingURL=chunk-OTZRCKYP.ts.map