@narumitw/pi-sync 0.49.15 → 0.50.0

package/dist/chunks/{sync-operations-3LLIHWZO.ts → sync-operations-ONJ27QRL.ts}

@@ -1,33 +1,8 @@
 // @generated by scripts/build-runtime.mjs; do not edit.
 // @ts-nocheck -- generated JavaScript uses a .ts extension for Pi's Jiti loader.
 import {
-  createSyncBackend,
-  formatRemoteSelectionStatus,
-  readSnapshotForHead,
-  requireCompatibleRemoteSelection
-} from "./chunk-5LZALPCD.ts";
-import {
-  applySnapshotTransaction,
-  recoverPendingSnapshotTransactions
-} from "./chunk-X7SQ2EQM.ts";
-import {
-  inspectLock,
-  isLockGuardHeld,
-  isStaleLock,
-  withLock
-} from "./chunk-WSOBYHIZ.ts";
-import {
-  SyncDecisionRequiredError,
-  countPreservedRemoteFiles,
-  errorMessage,
-  formatDiff,
-  formatPullSummary,
-  formatPushSummary,
-  formatRollbackSummary,
-  formatSnapshotOnlyDiff,
-  publicationCapabilityDescription,
-  safeTerminalText
-} from "./chunk-C7LXZ3UH.ts";
+  inspectSync
+} from "./chunk-XBX4HBLG.ts";
 import {
   canPullRemoteSessionsOnFirstSync,
   canPullRemoteSettingsOnFirstSync,
@@ -40,7 +15,56 @@ import {
   snapshotHashesMatchState,
   snapshotsMatch,
   syncPolicyChanged
-} from "./chunk-JF6MZCT4.ts";
+} from "./chunk-AUSDLD6F.ts";
+import {
+  applySnapshotTransaction,
+  recoverPendingSnapshotTransactions
+} from "./chunk-AXXS2BPA.ts";
+import {
+  inspectLock,
+  isLockGuardHeld,
+  isStaleLock,
+  withLock
+} from "./chunk-GWMHAQG4.ts";
+import {
+  throwIfAborted
+} from "./chunk-NJFUIVYL.ts";
+import {
+  readStateForConfig,
+  writeStateForConfig
+} from "./chunk-JSYMGJQQ.ts";
+import {
+  encodeSnapshot
+} from "./chunk-Q2TUM5X6.ts";
+import {
+  stateDir
+} from "./chunk-ZI5MXMEX.ts";
+import {
+  expectedRemoteHead
+} from "./chunk-D5X27LCA.ts";
+import {
+  formatRemoteSelectionStatus,
+  readRemoteSnapshot,
+  readSnapshotForHead,
+  requireCompatibleRemoteSelection
+} from "./chunk-HUDQATCL.ts";
+import {
+  createSyncBackend
+} from "./chunk-L7TBO32M.ts";
+import {
+  safeTerminalText
+} from "./chunk-LTBWGSBV.ts";
+import {
+  loadConfig,
+  syncConfigReviewIdentity,
+  syncSessionsWarnings
+} from "./chunk-C7XY5NF5.ts";
+import "./chunk-6LP3MCR2.ts";
+import "./chunk-TEN2ZBJV.ts";
+import {
+  SyncDecisionRequiredError,
+  errorMessage
+} from "./chunk-2B2ELUF5.ts";
 import {
   createSnapshot,
   filterSnapshotForConfigPolicy,
@@ -50,30 +74,19 @@ import {
   regenerateSnapshotIdentity,
   scanSnapshot,
   sessionSnapshotPathFromAbsolute,
-  sessionStorageRoot,
   snapshotIncludesSessions,
   snapshotTarget,
   snapshotWithoutSessions
-} from "./chunk-HVUSHMVL.ts";
+} from "./chunk-OEX4ABY6.ts";
+import {
+  sessionStorageRoot
+} from "./chunk-THMF4BVL.ts";
 import {
   agentDir,
-  loadConfig,
-  readStateForConfig,
   sessionDirForApply,
-  syncConfigReviewFingerprint,
-  syncConfigReviewIdentity,
-  syncSessionsWarnings,
-  writeStateForConfig
-} from "./chunk-5T442OP3.ts";
-import {
-  encodeSnapshot
-} from "./chunk-HGV24P4T.ts";
-import {
-  stateDir
-} from "./chunk-F5QL2GPY.ts";
-import {
-  expectedRemoteHead
-} from "./chunk-5MQ76BK5.ts";
+  sessionDirFromContext,
+  snapshotOptionsForContext
+} from "./chunk-T3HH3UEJ.ts";
 import {
   assertWithinRoot,
   includeFromSelectionConfig,
@@ -81,16 +94,15 @@ import {
   isDeniedPath,
   isPathInside,
   parentPaths,
-  remoteSelectionMismatch,
   safeJoin,
   toPosix
-} from "./chunk-YQ6UW7IF.ts";
+} from "./chunk-JAAKLL6M.ts";
 
-// src/sync-operations.ts
+// src/sync/sync-mutations.ts
 import fs2 from "node:fs/promises";
 import path2 from "node:path";
 
-// src/snapshot-apply.ts
+// src/snapshot/snapshot-apply.ts
 import { createHash } from "node:crypto";
 import fs from "node:fs/promises";
 import path from "node:path";
@@ -297,7 +309,125 @@ async function assertNoSymlinkParents(root, target) {
   }
 }
 
-// src/sync-decision.ts
+// src/ui/sync-format.ts
+function formatDiff(local, remote) {
+  const localMap = fileHashMap(local);
+  const remoteMap = fileHashMap(remote);
+  const allPaths = [.../* @__PURE__ */ new Set([...Object.keys(localMap), ...Object.keys(remoteMap)])].sort();
+  const lines = [
+    `local: ${local.files.length} files`,
+    `remote: ${remote.id} (${remote.files.length} files)`,
+    ""
+  ];
+  let changed = 0;
+  for (const filePath of allPaths) {
+    if (!localMap[filePath]) {
+      lines.push(`Remote only: ${filePath}`);
+      changed += 1;
+    } else if (!remoteMap[filePath]) {
+      lines.push(`Local only: ${filePath}`);
+      changed += 1;
+    } else if (localMap[filePath] !== remoteMap[filePath]) {
+      lines.push(`Different: ${filePath}`);
+      changed += 1;
+    }
+  }
+  if (changed === 0) lines.push("No file differences.");
+  return lines.join("\n");
+}
+function formatSnapshotOnlyDiff(title, snapshot) {
+  return [`${title}: ${snapshot.id}`, ...snapshot.files.map((file) => `Add: ${file.path}`)].join(
+    "\n"
+  );
+}
+function formatPushSummary(config, destination, upload, head, preservedRemoteFileCount = 0, remote) {
+  return [
+    `Sync setup: ${safeTerminalText(config.setupName)}`,
+    `Storage location: ${safeTerminalText(destination)}`,
+    `Upload ${upload.files.length} files from ${safeTerminalText(agentDir())}.`,
+    `Sessions: ${upload.syncSessions ? "included \u2014 may contain private conversations" : "not included"}`,
+    head ? `Remote latest: ${head.snapshotId}` : "Remote latest: empty",
+    "Publication effect: the backend's active head will reference the new immutable snapshot.",
+    ...remote && inspectRemoteSelection(config.include, remote).kind === "different" ? [
+      "Included-content policy effect: replace the differing remote selection with this setup's local selection."
+    ] : [],
+    formatPublicationPreview(remote, upload),
+    preservedRemoteFileCount > 0 ? `Possible secrets in locally managed files were scanned before this prompt; ${preservedRemoteFileCount} preserved remote file(s) were not rescanned.` : "Possible secrets were scanned before this prompt."
+  ].join("\n");
+}
+function formatApplyPreview(local, remote) {
+  return formatDirectionalChanges(local, remote, {
+    add: "Add locally",
+    update: "Update locally",
+    remove: "Remove locally"
+  });
+}
+function formatPullSummary(config, destination, local, remote, protectedSessionCount) {
+  return [
+    `Sync setup: ${safeTerminalText(config.setupName)}`,
+    `Storage location: ${safeTerminalText(destination)}`,
+    `Snapshot: ${safeTerminalText(remote.id)}`,
+    `Sessions: ${remote.syncSessions ? "included \u2014 may contain private conversations" : "not included"}`,
+    `Protected live sessions: ${protectedSessionCount || "none"}`,
+    formatApplyPreview(local, remote),
+    "A local backup is created before these writes/deletes. The remote active snapshot is unchanged."
+  ].join("\n");
+}
+function formatRollbackSummary(config, destination, local, remote, requestedSnapshot, protectedSessionCount) {
+  return [
+    `Sync setup: ${safeTerminalText(config.setupName)}`,
+    `Storage location: ${safeTerminalText(destination)}`,
+    `Snapshot: ${safeTerminalText(requestedSnapshot)}`,
+    `Sessions: ${remote.syncSessions ? "included \u2014 may contain private conversations" : "not included"}`,
+    `Protected live sessions: ${protectedSessionCount || "none"}`,
+    formatApplyPreview(local, remote),
+    "A local backup is created before applying; the backend's active head will change."
+  ].join("\n");
+}
+function formatPublicationPreview(remote, upload) {
+  if (!remote) {
+    return ["Remote is empty.", ...upload.files.map((file) => `Add remotely: ${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 (!beforeMap[filePath]) lines.push(`${labels.add}: ${filePath}`);
+    else if (!afterMap[filePath]) lines.push(`${labels.remove}: ${filePath}`);
+    else if (beforeMap[filePath] !== afterMap[filePath])
+      lines.push(`${labels.update}: ${filePath}`);
+  }
+  if (lines.length === 0) lines.push("No file changes.");
+  return lines.join("\n");
+}
+function countPreservedRemoteFiles(local, upload) {
+  const localPaths = new Set(local.files.map((file) => file.path));
+  return upload.files.filter((file) => !localPaths.has(file.path)).length;
+}
+function publicationCapabilityDescription(capability) {
+  switch (capability) {
+    case "lease-protected":
+      return "lease-protected (exact expected-ref update)";
+    case "atomic-conditional":
+      return "atomic-conditional (verified atomic precondition)";
+    case "conditional-required":
+      return "conditional-required (read-only until atomic preconditions are verified)";
+    case "read-check-write-verify":
+      return "read-check-write-verify (visible races rejected; simultaneous unseen races remain possible)";
+  }
+}
+
+// src/sync/sync-decision.ts
 function createSyncDecision(options) {
   const { config, state, local, remote, kind } = options;
   const policyChanged = Boolean(state.lastAppliedSnapshot) && syncPolicyChanged(state, config);
@@ -344,10 +474,9 @@ function safeList(values) {
   return values.length > 0 ? values.map(safeTerminalText).join(", ") : "none";
 }
 
-// src/sync-operations.ts
+// src/sync/sync-mutations.ts
 var STATUS_KEY = "sync";
 var VERSION = 1;
-var DEFAULT_PROFILE = "default";
 var POST_LOCAL_COMMIT_TIMEOUT_MS = 3e4;
 var PublicationStatePersistenceError = class extends Error {
   head;
@@ -373,173 +502,11 @@ var RollbackPublicationError = class extends Error {
     this.backupPath = backupPath;
   }
 };
-function backendFor(config, factory) {
-  return factory(config);
-}
-async function status(ctx, options, factory = createSyncBackend) {
-  const config = await loadConfig(options.setup);
-  throwIfAborted(options.signal);
-  ctx.ui.setStatus(STATUS_KEY, `checking ${config.setupName}`);
-  const backend = await backendFor(config, factory);
-  const local = await createSnapshot(
-    config.snapshotIdentity,
-    snapshotOptionsForContext(ctx, config)
-  );
-  throwIfAborted(options.signal);
-  const state = await readStateForConfig(config);
-  throwIfAborted(options.signal);
-  const head = await backend.readHead(options.signal);
-  throwIfAborted(options.signal);
-  const selectionState = head ? inspectRemoteSelection(config.include, { selection: head.selection, files: [] }) : void 0;
-  const localChanged = hasLocalChanges(local, state, config);
-  const remoteText = head ? `remote: ${head.snapshotId} from ${head.machine} at ${head.createdAt}` : "remote: empty";
-  const remoteChanged = remoteChangedSinceState(
-    head,
-    state,
-    config,
-    (left, right) => backend.sameRevision(left, right)
-  );
-  const warnings = syncSessionsWarnings(config);
-  ctx.ui.setStatus(STATUS_KEY, void 0);
-  ctx.ui.notify(
-    [
-      `sync setup: ${config.setupName}`,
-      `storage connection: ${config.connectionName}`,
-      `storage location: ${safeTerminalText(backend.destination)}`,
-      `publication safety: ${publicationCapabilityDescription(backend.capability)}`,
-      `included content: ${config.include.join(", ") || "none"}`,
-      `sessions: ${config.include.includes("sessions") ? "included" : "excluded"}`,
-      remoteText,
-      formatRemoteSelectionStatus(selectionState),
-      `local files: ${local.files.length}`,
-      `local changed since last sync: ${localChanged ? "yes" : "no"}`,
-      `remote changed since last sync: ${remoteChanged ? "yes" : "no"}`,
-      ...warnings
-    ].join("\n"),
-    localChanged || remoteChanged || selectionState?.kind === "different" || warnings.length > 0 ? "warning" : "info"
-  );
-}
-async function diff(ctx, options, factory = createSyncBackend) {
-  const config = await loadConfig(options.setup);
-  throwIfAborted(options.signal);
-  ctx.ui.setStatus(STATUS_KEY, `checking ${config.setupName}`);
-  const backend = await backendFor(config, factory);
-  const local = await createSnapshot(
-    config.snapshotIdentity,
-    snapshotOptionsForContext(ctx, config)
-  );
-  throwIfAborted(options.signal);
-  const { snapshot: remote, selectionState } = await readRemoteSnapshot(
-    backend,
-    config,
-    options.signal,
-    { allowSelectionDifference: true }
-  );
-  throwIfAborted(options.signal);
-  ctx.ui.setStatus(STATUS_KEY, void 0);
-  const warnings = syncSessionsWarnings(config);
-  const header = [
-    `sync setup: ${config.setupName}`,
-    `storage connection: ${config.connectionName}`,
-    `storage location: ${safeTerminalText(backend.destination)}`,
-    `included content: ${config.include.join(", ") || "none"}`,
-    `sessions: ${config.include.includes("sessions") ? "included" : "excluded"}`,
-    formatRemoteSelectionStatus(selectionState),
-    ...warnings
-  ].join("\n");
-  const level = warnings.length > 0 || selectionState?.kind === "different" ? "warning" : "info";
-  if (!remote) {
-    ctx.ui.notify(
-      `${header}
-
-${formatSnapshotOnlyDiff("Remote is empty. Local push would upload", local)}`,
-      level
-    );
-    return;
-  }
-  ctx.ui.notify(`${header}
-
-${formatDiff(local, remote)}`, level);
-}
-async function doctor(ctx, options, factory = createSyncBackend) {
-  const messages = [];
-  let level = "info";
-  let snapshotOptions = {};
-  let profile = DEFAULT_PROFILE;
-  let backend;
-  let backendSummary = [];
-  try {
-    const config = await loadConfig(options.setup);
-    throwIfAborted(options.signal);
-    backend = await backendFor(config, factory);
-    profile = config.snapshotIdentity;
-    snapshotOptions = snapshotOptionsForContext(ctx, config);
-    messages.push(
-      `config: ok (sync setup ${config.setupName})`,
-      `included content: ${config.include.join(", ") || "none"}`,
-      `sessions: ${config.include.includes("sessions") ? "included" : "excluded"}`
-    );
-    backendSummary = [
-      `storage location: ${safeTerminalText(backend.destination)}`,
-      `publication safety: ${publicationCapabilityDescription(backend.capability)}`
-    ];
-    const warnings = syncSessionsWarnings(config);
-    if (warnings.length > 0) {
-      level = "warning";
-      messages.push(...warnings);
-    }
-  } catch (error) {
-    throwIfAborted(options.signal);
-    level = "warning";
-    messages.push(`config: ${errorMessage(error)}`);
-  }
-  const local = await createSnapshot(profile, snapshotOptions);
-  throwIfAborted(options.signal);
-  const secrets = scanSnapshot(local);
-  if (secrets.length > 0) {
-    level = "warning";
-    messages.push("secret scan: possible secrets found:");
-    messages.push(...secrets.map((secret) => `- ${secret}`));
-  } else {
-    messages.push(`secret scan: ok (${local.files.length} files checked)`);
-  }
-  const lock = await inspectLock();
-  throwIfAborted(options.signal);
-  if (lock.status === "valid" && isStaleLock(lock.lock)) {
-    level = "warning";
-    messages.push(
-      `lock: stale (pid ${lock.lock.pid}); run /sync unlock after verifying no sync is running`
-    );
-  } else if (lock.status === "valid") {
-    messages.push(`lock: held by pid ${lock.lock.pid} since ${lock.lock.startedAt}`);
-  } else if (lock.status === "unreadable") {
-    level = "warning";
-    messages.push(
-      "lock: unreadable; use /sync unlock --stale only after verifying no sync is running"
-    );
-  } else if (await isLockGuardHeld()) {
-    throwIfAborted(options.signal);
-    level = "warning";
-    messages.push("lock: guard active while metadata is missing or still being initialized");
-  } else {
-    messages.push("lock: free");
-  }
-  if (backend) {
-    messages.push(...backendSummary);
-    const diagnostics = await backend.diagnose(options.signal);
-    throwIfAborted(options.signal);
-    for (const diagnostic of diagnostics) {
-      messages.push(diagnostic.message);
-      if (diagnostic.level !== "info") level = "warning";
-    }
-  }
-  ctx.ui.notify(messages.join("\n"), level);
-}
 async function push(ctx, options, input, factory = createSyncBackend) {
   const config = input?.config ?? await loadConfig(options.setup);
   throwIfAborted(options.signal);
   ctx.ui.setStatus(STATUS_KEY, `pushing ${config.setupName}`);
-  const backend = input?.backend ?? await backendFor(config, factory);
+  const backend = input?.backend ?? await factory(config);
   const state = input?.state ?? await readStateForConfig(config);
   throwIfAborted(options.signal);
   const local = input?.local ?? await createSnapshot(config.snapshotIdentity, snapshotOptionsForContext(ctx, config));
@@ -659,7 +626,7 @@ async function pull(ctx, options, factory = createSyncBackend) {
   const config = await loadConfig(options.setup);
   throwIfAborted(options.signal);
   ctx.ui.setStatus(STATUS_KEY, `pulling ${config.setupName}`);
-  const backend = await backendFor(config, factory);
+  const backend = await factory(config);
   const state = await readStateForConfig(config);
   throwIfAborted(options.signal);
   const local = await createSnapshot(
@@ -748,7 +715,7 @@ async function pull(ctx, options, factory = createSyncBackend) {
 async function syncBoth(ctx, options, factory = createSyncBackend) {
   const config = await loadConfig(options.setup);
   throwIfAborted(options.signal);
-  const backend = await backendFor(config, factory);
+  const backend = await factory(config);
   const state = await readStateForConfig(config);
   throwIfAborted(options.signal);
   const local = await createSnapshot(
@@ -861,52 +828,12 @@ async function syncBoth(ctx, options, factory = createSyncBackend) {
   }
   if (!options.silent) ctx.ui.notify("pi-sync is already up to date.", "info");
 }
-async function history(ctx, options, factory = createSyncBackend) {
-  const config = await loadConfig(options.setup);
-  throwIfAborted(options.signal);
-  const backend = await backendFor(config, factory);
-  const snapshots = (await backend.listHistory(options.signal)).slice(-20).reverse();
-  throwIfAborted(options.signal);
-  if (snapshots.length === 0) {
-    ctx.ui.notify("No remote pi-sync history found.", "info");
-    return;
-  }
-  const currentSnapshot = snapshots[0]?.snapshotId;
-  if (ctx.mode === "tui") {
-    const labels = snapshots.map(
-      (item, index2) => `${index2 + 1}. ${item.createdAt} \xB7 ${safeTerminalText(item.machine)} \xB7 ${item.snapshotId}${item.snapshotId === currentSnapshot ? " (current)" : ""}${item.syncSessions ? " \xB7 sessions" : ""}`
-    );
-    const selected = await ctx.ui.select(
-      `History for sync setup \u201C${safeTerminalText(config.setupName)}\u201D
-
-Choose a snapshot to preview rollback.`,
-      [...labels, "Back"]
-    );
-    if (!selected || selected === "Back") return;
-    throwIfAborted(options.signal);
-    const index = labels.indexOf(selected);
-    const snapshot = snapshots[index];
-    if (!snapshot) return;
-    await withLock(
-      "rollback",
-      () => rollback(ctx, { ...options, args: [snapshot.snapshotRef], yes: false }, factory, {
-        backendIdentity: backend.identity,
-        setup: config.setupName
-      })
-    );
-    return;
-  }
-  ctx.ui.notify(
-    snapshots.map((item) => `${item.snapshotRef} ${item.createdAt} ${safeTerminalText(item.machine)}`).join("\n"),
-    "info"
-  );
-}
 async function rollback(ctx, options, factory = createSyncBackend, expectedSelection) {
   const target = options.args[0];
   if (!target) throw new Error("Usage: /sync rollback <snapshot-id> [--yes]");
   const config = await loadConfig(options.setup);
   throwIfAborted(options.signal);
-  const backend = await backendFor(config, factory);
+  const backend = await factory(config);
   if (expectedSelection && (backend.identity !== expectedSelection.backendIdentity || config.setupName !== expectedSelection.setup)) {
     throw new Error(
       "Sync setup or storage location changed while history was open; reopen history and retry."
@@ -998,21 +925,6 @@ function protectedSessionPaths(ctx) {
   const snapshotPath = sessionFile ? sessionSnapshotPathFromAbsolute(sessionFile, sessionDirFromContext(ctx)) : void 0;
   return snapshotPath ? /* @__PURE__ */ new Set([snapshotPath]) : /* @__PURE__ */ new Set();
 }
-function snapshotOptionsForContext(ctx, config) {
-  return {
-    include: config.include,
-    sessionDir: sessionDirFromContext(ctx)
-  };
-}
-function sessionDirFromContext(ctx) {
-  const manager = ctx.sessionManager;
-  const usesDefaultSessionDir = manager.usesDefaultSessionDir;
-  if (typeof usesDefaultSessionDir === "function" && usesDefaultSessionDir.call(manager)) {
-    return void 0;
-  }
-  const getSessionDir = manager.getSessionDir;
-  return typeof getSessionDir === "function" ? getSessionDir.call(manager) : void 0;
-}
 async function maybeReload(ctx, signal) {
   if (signal?.aborted || !("reload" in ctx)) return;
   if (ctx.hasUI && await ctx.ui.confirm(
@@ -1042,21 +954,6 @@ async function snapshotForUpload(backend, config, local, head, remote, signal, o
   }
   return mergeRemotePreservedFiles(local, snapshot, config);
 }
-async function readRemoteSnapshot(backend, config, signal, options = {}) {
-  const head = await backend.readHead(signal);
-  if (!head) return { head: void 0, snapshot: void 0, selectionState: void 0 };
-  const snapshot = await readSnapshotForHead(backend, head, signal);
-  const selectionState = inspectRemoteSelection(config.include, snapshot);
-  if (!options.allowSelectionDifference && selectionState.kind === "different") {
-    const configIdentity = syncConfigReviewFingerprint(config);
-    throw remoteSelectionMismatch(config, selectionState.include, configIdentity);
-  }
-  return {
-    head,
-    snapshot: filterSnapshotForConfigPolicy(snapshot, config),
-    selectionState
-  };
-}
 async function confirmPush(ctx, options, config, backend, local, upload, head, remote, title = snapshotIncludesSessions(upload) ? "Push pi settings and sessions?" : "Push pi settings?") {
   throwIfAborted(options.signal);
   if (options.yes) return true;
@@ -1077,10 +974,6 @@ async function confirmPush(ctx, options, config, backend, local, upload, head, r
   ctx.ui.notify("Push cancelled.", "info");
   return false;
 }
-function throwIfAborted(signal) {
-  if (!signal?.aborted) return;
-  throw signal.reason instanceof Error ? signal.reason : new DOMException("The operation was aborted", "AbortError");
-}
 function sameRemoteHead(backend, left, right) {
   if (!left || !right) return left === right;
   return backend.sameRevision(left.revision, right.revision);
@@ -1098,6 +991,193 @@ async function backupLocal(profile, options = {}, signal) {
   await fs2.writeFile(backupPath, encoded, { signal });
   return backupPath;
 }
+
+// src/sync/sync-queries.ts
+var STATUS_KEY2 = "sync";
+var DEFAULT_PROFILE = "default";
+async function status(ctx, options, factory = createSyncBackend) {
+  const config = await loadConfig(options.setup);
+  throwIfAborted(options.signal);
+  ctx.ui.setStatus(STATUS_KEY2, `checking ${config.setupName}`);
+  const { head, selectionState, localChanged, remoteChanged, localFiles, destination, capability } = await inspectSync(config, snapshotOptionsForContext(ctx, config), options.signal, factory);
+  throwIfAborted(options.signal);
+  const remoteText = head ? `remote: ${head.snapshotId} from ${head.machine} at ${head.createdAt}` : "remote: empty";
+  const warnings = syncSessionsWarnings(config);
+  ctx.ui.setStatus(STATUS_KEY2, void 0);
+  ctx.ui.notify(
+    [
+      `sync setup: ${config.setupName}`,
+      `storage connection: ${config.connectionName}`,
+      `storage location: ${safeTerminalText(destination)}`,
+      `publication safety: ${publicationCapabilityDescription(capability)}`,
+      `included content: ${config.include.join(", ") || "none"}`,
+      `sessions: ${config.include.includes("sessions") ? "included" : "excluded"}`,
+      remoteText,
+      formatRemoteSelectionStatus(selectionState),
+      `local files: ${localFiles}`,
+      `local changed since last sync: ${localChanged ? "yes" : "no"}`,
+      `remote changed since last sync: ${remoteChanged ? "yes" : "no"}`,
+      ...warnings
+    ].join("\n"),
+    localChanged || remoteChanged || selectionState?.kind === "different" || warnings.length > 0 ? "warning" : "info"
+  );
+}
+async function diff(ctx, options, factory = createSyncBackend) {
+  const config = await loadConfig(options.setup);
+  throwIfAborted(options.signal);
+  ctx.ui.setStatus(STATUS_KEY2, `checking ${config.setupName}`);
+  const backend = await factory(config);
+  const local = await createSnapshot(
+    config.snapshotIdentity,
+    snapshotOptionsForContext(ctx, config)
+  );
+  throwIfAborted(options.signal);
+  const { snapshot: remote, selectionState } = await readRemoteSnapshot(
+    backend,
+    config,
+    options.signal,
+    { allowSelectionDifference: true }
+  );
+  throwIfAborted(options.signal);
+  ctx.ui.setStatus(STATUS_KEY2, void 0);
+  const warnings = syncSessionsWarnings(config);
+  const header = [
+    `sync setup: ${config.setupName}`,
+    `storage connection: ${config.connectionName}`,
+    `storage location: ${safeTerminalText(backend.destination)}`,
+    `included content: ${config.include.join(", ") || "none"}`,
+    `sessions: ${config.include.includes("sessions") ? "included" : "excluded"}`,
+    formatRemoteSelectionStatus(selectionState),
+    ...warnings
+  ].join("\n");
+  const level = warnings.length > 0 || selectionState?.kind === "different" ? "warning" : "info";
+  if (!remote) {
+    ctx.ui.notify(
+      `${header}
+
+${formatSnapshotOnlyDiff("Remote is empty. Local push would upload", local)}`,
+      level
+    );
+    return;
+  }
+  ctx.ui.notify(`${header}
+
+${formatDiff(local, remote)}`, level);
+}
+async function doctor(ctx, options, factory = createSyncBackend) {
+  const messages = [];
+  let level = "info";
+  let snapshotOptions = {};
+  let profile = DEFAULT_PROFILE;
+  let backend;
+  let backendSummary = [];
+  try {
+    const config = await loadConfig(options.setup);
+    throwIfAborted(options.signal);
+    backend = await factory(config);
+    profile = config.snapshotIdentity;
+    snapshotOptions = snapshotOptionsForContext(ctx, config);
+    messages.push(
+      `config: ok (sync setup ${config.setupName})`,
+      `included content: ${config.include.join(", ") || "none"}`,
+      `sessions: ${config.include.includes("sessions") ? "included" : "excluded"}`
+    );
+    backendSummary = [
+      `storage location: ${safeTerminalText(backend.destination)}`,
+      `publication safety: ${publicationCapabilityDescription(backend.capability)}`
+    ];
+    const warnings = syncSessionsWarnings(config);
+    if (warnings.length > 0) {
+      level = "warning";
+      messages.push(...warnings);
+    }
+  } catch (error) {
+    throwIfAborted(options.signal);
+    level = "warning";
+    messages.push(`config: ${errorMessage(error)}`);
+  }
+  const local = await createSnapshot(profile, snapshotOptions);
+  throwIfAborted(options.signal);
+  const secrets = scanSnapshot(local);
+  if (secrets.length > 0) {
+    level = "warning";
+    messages.push("secret scan: possible secrets found:");
+    messages.push(...secrets.map((secret) => `- ${secret}`));
+  } else {
+    messages.push(`secret scan: ok (${local.files.length} files checked)`);
+  }
+  const lock = await inspectLock();
+  throwIfAborted(options.signal);
+  if (lock.status === "valid" && isStaleLock(lock.lock)) {
+    level = "warning";
+    messages.push(
+      `lock: stale (pid ${lock.lock.pid}); run /sync unlock --stale after verifying no sync is running`
+    );
+  } else if (lock.status === "valid") {
+    messages.push(`lock: held by pid ${lock.lock.pid} since ${lock.lock.startedAt}`);
+  } else if (lock.status === "unreadable") {
+    level = "warning";
+    messages.push(
+      "lock: unreadable; use /sync unlock --stale only after verifying no sync is running"
+    );
+  } else if (await isLockGuardHeld()) {
+    throwIfAborted(options.signal);
+    level = "warning";
+    messages.push("lock: guard active while metadata is missing or still being initialized");
+  } else {
+    messages.push("lock: free");
+  }
+  if (backend) {
+    messages.push(...backendSummary);
+    const diagnostics = await backend.diagnose(options.signal);
+    throwIfAborted(options.signal);
+    for (const diagnostic of diagnostics) {
+      messages.push(diagnostic.message);
+      if (diagnostic.level !== "info") level = "warning";
+    }
+  }
+  ctx.ui.notify(messages.join("\n"), level);
+}
+async function history(ctx, options, factory = createSyncBackend) {
+  const config = await loadConfig(options.setup);
+  throwIfAborted(options.signal);
+  const backend = await factory(config);
+  const snapshots = (await backend.listHistory(options.signal)).slice(-20).reverse();
+  throwIfAborted(options.signal);
+  if (snapshots.length === 0) {
+    ctx.ui.notify("No remote pi-sync history found.", "info");
+    return;
+  }
+  const currentSnapshot = snapshots[0]?.snapshotId;
+  if (ctx.mode === "tui") {
+    const labels = snapshots.map(
+      (item, index2) => `${index2 + 1}. ${item.createdAt} \xB7 ${safeTerminalText(item.machine)} \xB7 ${item.snapshotId}${item.snapshotId === currentSnapshot ? " (current)" : ""}${item.syncSessions ? " \xB7 sessions" : ""}`
+    );
+    const selected = await ctx.ui.select(
+      `History for sync setup \u201C${safeTerminalText(config.setupName)}\u201D
+
+Choose a snapshot to preview rollback.`,
+      [...labels, "Back"]
+    );
+    if (!selected || selected === "Back") return;
+    throwIfAborted(options.signal);
+    const index = labels.indexOf(selected);
+    const snapshot = snapshots[index];
+    if (!snapshot) return;
+    await withLock(
+      "rollback",
+      () => rollback(ctx, { ...options, args: [snapshot.snapshotRef], yes: false }, factory, {
+        backendIdentity: backend.identity,
+        setup: config.setupName
+      })
+    );
+    return;
+  }
+  ctx.ui.notify(
+    snapshots.map((item) => `${item.snapshotRef} ${item.createdAt} ${safeTerminalText(item.machine)}`).join("\n"),
+    "info"
+  );
+}
 export {
   PublicationStatePersistenceError,
   RollbackPublicationError,
@@ -1111,4 +1191,4 @@ export {
   status,
   syncBoth
 };
-//# sourceMappingURL=sync-operations-3LLIHWZO.ts.map
+//# sourceMappingURL=sync-operations-ONJ27QRL.ts.map