@nomac/cli 0.11.7 → 0.11.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nomac/cli",
-  "version": "0.11.7",
+  "version": "0.11.8",
   "description": "Cloud Mac sessions over SSH and HTTPS, plus iOS builds and publishing — built for agents.",
   "license": "UNLICENSED",
   "type": "module",

package/src/session-transfer.mjs

@@ -245,11 +245,14 @@ function conflictError(paths, side) {
 }
 
 /** Sync's own refusal: what was sent, and the files left alone because they changed on the Mac. */
-function syncConflictError(paths, sent) {
-  const shown = paths.slice(0, 10).join(", ") + (paths.length > 10 ? ` and ${paths.length - 10} more` : "");
-  const error = new CliError("transfer conflict", `${sent ? `Sent ${sent} changed ${sent === 1 ? "file" : "files"}. ` : ""}Not sent, because ${paths.length === 1 ? "it" : "they"} changed on the Mac since this folder last synced: ${shown}. Keep the Mac's version: nomac pull ${paths[0]}. Replace it with yours: nomac sync . --overwrite`);
+const listed = paths => paths.slice(0, 10).join(", ") + (paths.length > 10 ? ` and ${paths.length - 10} more` : "");
+function syncConflictError(paths, sent, removal = {}) {
+  // What --delete did in the same run is said too: the refusal is the last word, not the only one.
+  const removed = removal.deleted?.length ? ` Deleted on the Mac, as here: ${listed(removal.deleted)}.` : "";
+  const kept = removal.kept_on_mac?.length ? ` Kept on the Mac, changed there since: ${listed(removal.kept_on_mac)}.` : "";
+  const error = new CliError("transfer conflict", `${sent ? `Sent ${sent} changed ${sent === 1 ? "file" : "files"}. ` : ""}Not sent, because ${paths.length === 1 ? "it" : "they"} changed on the Mac since this folder last synced: ${listed(paths)}. Keep the Mac's version: nomac pull ${paths[0]}. Replace it with yours: nomac sync . --overwrite${removed}${kept}`);
   error.code = "transfer_conflict";
-  error.details = { paths, side: "Remote", sent };
+  error.details = { paths, side: "Remote", sent, ...removal };
   return error;
 }
 
@@ -290,7 +293,7 @@ export async function syncProject(session, store, { overwrite = false, dryRun =
   for (const path of [...deleted, ...gone.filter(path => onMac[path] === "missing")]) delete baseline[path];
   store.saveBaseline(baseline);
   if (changedDuringTransfer.length) throw new CliError("transfer changed during verification", "Some files changed during transfer. Stop concurrent edits and rerun sync; verified files were recorded.");
-  if (conflicts.length) throw syncConflictError(conflicts, changed.length);
+  if (conflicts.length) throw syncConflictError(conflicts, changed.length, deleteMissing ? { deleted, kept_on_mac: keptOnMac } : {});
   return { files: paths.length, changed, ...(deleteMissing ? { deleted, kept_on_mac: keptOnMac } : {}), ...summary, output };
 }