@narumitw/pi-sync 0.54.3 → 0.57.0

package/dist/chunks/{chunk-35GM6XKM.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-26PMXY7E.ts";
+} from "./chunk-GNH73BJ5.ts";
 import {
   fileHashMap,
   hasLocalChanges,
@@ -18,69 +31,44 @@ import {
   sameHashes,
   syncPolicyChanged
 } from "./chunk-BDB4IDM3.ts";
-import {
-  formatRemoteSelectionStatus,
-  readSnapshotForHead,
-  requireCompatibleRemoteSelection
-} from "./chunk-A3TFXY4O.ts";
-import {
-  createSyncBackend
-} from "./chunk-2FETCGGT.ts";
 import {
   applySnapshotTransaction,
   recoverPendingSnapshotTransactions,
   syncMutationParents
-} from "./chunk-KGE47GCZ.ts";
+} from "./chunk-CRKTAPSL.ts";
 import {
   backupLocal,
   captureMutationOwner,
   protectedSessionPaths
-} from "./chunk-GC3QOL6J.ts";
-import {
-  createStartupTimings
-} from "./chunk-UZPMDLTL.ts";
+} from "./chunk-UOHR7LRO.ts";
 import {
   safeTerminalText,
   snapshotPathLabel
 } from "./chunk-AMJRUXFT.ts";
 import {
-  TEXT_MERGE_WORK_LIMIT,
-  hasCurrentMergeBaseline,
-  isMergeTextPath,
-  mergeSession,
-  mergeText,
-  pruneMergeBaselines,
-  readMergeAncestor,
-  readMergeAncestors,
-  stageMergeBaseline
-} from "./chunk-E6ONFG57.ts";
-import {
-  mergePathIdentity,
-  planFileMerge
-} from "./chunk-76NB4R7U.ts";
+  createStartupTimings
+} from "./chunk-UZPMDLTL.ts";
 import {
-  readStateForConfig,
-  statePathForConfig,
-  syncStateFingerprint,
-  writeStateForConfig
-} from "./chunk-VCL7TZYW.ts";
+  SyncDecisionRequiredError
+} from "./chunk-7D5SF7P3.ts";
 import {
   loadConfig,
   syncCheckConfigFingerprint,
   syncConfigReviewIdentity
-} from "./chunk-KATKRR3D.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,
@@ -100,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,
@@ -114,213 +118,8 @@ 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/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/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("Sync review failed; no transfer was performed.");
-    if (result.kind === "unsupported")
-      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;
-    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("Sync review failed; no transfer was performed.");
-    if (detail.kind !== "cancelled" || detail.reason !== "back") return false;
-  }
-  return false;
-}
-
 // src/ui/merged-sync-summary.ts
-import { truncateToWidth as truncateToWidth3 } from "@earendil-works/pi-tui";
+import { truncateToWidth } from "@earendil-works/pi-tui";
 
 // src/ui/transfer-changes.ts
 function transferChanges(before, after, protectedPaths = /* @__PURE__ */ new Set()) {
@@ -368,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`] : []
     ];
@@ -388,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
@@ -551,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]));
@@ -929,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.");
@@ -1099,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;
@@ -1277,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 = [];
@@ -1353,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")
       }
     };
   }
@@ -1536,7 +1231,11 @@ function safeList(values) {
 var MAX_ATTEMPTS = 3;
 async function mergeSync(ctx, options, factory = createSyncBackend, resolution) {
   const timings = options.startupTimings ?? createStartupTimings();
-  const validateOwner = captureMutationOwner(ctx, options.signal);
+  const sessionOwner = captureMutationOwner(ctx, options.signal);
+  const validateOwner = (config2) => {
+    sessionOwner();
+    options.background?.validate(config2);
+  };
   const isCurrent = () => {
     try {
       validateOwner();
@@ -1546,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 = {
@@ -1557,7 +1258,7 @@ async function mergeSync(ctx, options, factory = createSyncBackend, resolution)
   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) {
@@ -1566,23 +1267,30 @@ 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 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 timings.measure("transfer journal read", () => readMergeJournal(config));
   await validate();
   if (pending) {
     const recovered = await timings.measure(
       "transfer journal recovery",
-      () => completeJournal(ctx, config, backend, pending, validate, timings, options.signal, options.auto)
+      () => completeJournal(
+        ctx,
+        config,
+        backend,
+        pending,
+        validate,
+        timings,
+        options.signal,
+        options.auto,
+        options.background?.validate
+      )
     );
     if (!recovered) {
       if ((options.auto || !options.silent) && !options.signal?.aborted)
@@ -1596,6 +1304,11 @@ 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);
@@ -1729,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"
@@ -1878,7 +1614,7 @@ An explicit direction adopts this setup's included-content policy; no automatic
       await validate();
       if (!config.skipSecretScan && scanSnapshot(upload).length)
         throw new Error("Refusing to merge possible secrets. Review managed content before syncing.");
-      if (!options.yes) {
+      if (!options.yes && !config.agentMode) {
         const summary = mergedSyncSummary({
           setupName: config.setupName,
           destination: backend.destination,
@@ -1989,7 +1725,17 @@ An explicit direction adopts this setup's included-content policy; no automatic
       }
       const completed = await timings.measure(
         "transfer journal recovery",
-        () => completeJournal(ctx, config, backend, journal, validate, timings, options.signal, options.auto)
+        () => completeJournal(
+          ctx,
+          config,
+          backend,
+          journal,
+          validate,
+          timings,
+          options.signal,
+          options.auto,
+          options.background?.validate
+        )
       );
       if (!completed) {
         if (!options.signal?.aborted && (options.auto || !options.silent))
@@ -2016,7 +1762,7 @@ An explicit direction adopts this setup's included-content policy; no automatic
     await timings.measure("transfer cleanup", () => releaseConflictArtifacts(config, ownedStatePath, createdArtifacts));
   }
 }
-async function completeJournal(ctx, config, backend, journal, validate, timings, 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."
@@ -2103,6 +1849,7 @@ async function completeJournal(ctx, config, backend, journal, validate, timings,
   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 timings.measure(
@@ -2178,7 +1925,6 @@ async function writeAcceptedState(config, head, snapshot, validate, progress) {
 }
 
 export {
-  confirmMergeReview,
   applySnapshot,
   addTopLevelCaseVariantDeletes,
   formatDiff,
@@ -2191,4 +1937,4 @@ export {
   createSyncDecision,
   mergeSync
 };
-//# sourceMappingURL=chunk-35GM6XKM.ts.map
+//# sourceMappingURL=chunk-OTZRCKYP.ts.map