claude-nomad 0.40.0 → 0.41.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.41.0](https://github.com/funkadelic/claude-nomad/compare/v0.40.0...v0.41.0) (2026-06-03)
+
+
+### Added
+
+* **diff:** render diff and pull --dry-run as a glyph-free tree ([#236](https://github.com/funkadelic/claude-nomad/issues/236)) ([6cf1aff](https://github.com/funkadelic/claude-nomad/commit/6cf1aff60f7ac5710c990fb303c6408c0b07ff66))
+* **spinner:** animate remap sync, fix stray frames ([#234](https://github.com/funkadelic/claude-nomad/issues/234)) ([5a71563](https://github.com/funkadelic/claude-nomad/commit/5a715637c8ab43ab2d536353f55512abe15cfdd3))
+
 ## [0.40.0](https://github.com/funkadelic/claude-nomad/compare/v0.39.0...v0.40.0) (2026-06-03)
 
 

package/dist/nomad.mjs

@@ -170,13 +170,12 @@ function gitOrFatal(args, context, cwd) {
     throw new NomadFatal(`${context} failed`);
   }
 }
-var log, ok, warn, fail, NomadFatal, die, gitStatusPorcelainZ;
+var log, warn, fail, NomadFatal, die, gitStatusPorcelainZ;
 var init_utils = __esm({
   "src/utils.ts"() {
     "use strict";
     init_color();
     log = (msg) => console.log(`${dim(infoGlyph)} ${msg}`);
-    ok = (msg) => console.log(`${green(okGlyph)} ${msg}`);
     warn = (msg) => {
       console.error(`${yellow(warnGlyph)} ${msg}`);
     };
@@ -1225,8 +1224,8 @@ init_color();
 // src/output-tree.ts
 init_color();
 var FAIL_GLYPH_BARE = "\u2717";
-function section(header) {
-  return { header, items: [] };
+function section(header, raw = false) {
+  return { header, items: [], raw };
 }
 function addItem(s, text) {
   s.items.push(text);
@@ -1234,7 +1233,17 @@ function addItem(s, text) {
 function sectionFailed(s) {
   return s.items.some((line) => line.includes(failGlyph));
 }
+function renderRawItems(items) {
+  for (const item of items) {
+    console.log(item === "" ? "" : `  ${item}`);
+  }
+}
 function renderSection(s) {
+  if (s.raw) {
+    console.log(s.header);
+    renderRawItems(s.items);
+    return;
+  }
   const header = sectionFailed(s) ? `${red(FAIL_GLYPH_BARE)} ${s.header}` : s.header;
   console.log(header);
   const lastContent = s.items.reduce((acc, item, j) => item === "" ? acc : j, -1);
@@ -1845,6 +1854,10 @@ function copyDirJsonlOnly(src, dst) {
     }
   });
 }
+function emitPreview(onPreview, event, fallback) {
+  if (onPreview) onPreview(event);
+  else log(fallback);
+}
 function remapPull(ts, opts = {}) {
   const dryRun = opts.dryRun === true;
   let unmapped = 0;
@@ -1853,7 +1866,8 @@ function remapPull(ts, opts = {}) {
   const mapPath = join17(REPO_HOME, "path-map.json");
   const repoProjects = join17(REPO_HOME, "shared", "projects");
   if (!existsSync13(mapPath) || !existsSync13(repoProjects)) {
-    log("no path-map or repo projects dir; skipping session remap");
+    const text = "no path-map or repo projects dir; skipping session remap";
+    emitPreview(opts.onPreview, { kind: "note", text }, text);
     return { unmapped: 0, pulled, wouldPull };
   }
   const map = readJson(mapPath);
@@ -1871,7 +1885,11 @@ function remapPull(ts, opts = {}) {
     const dst = join17(localProjects, encodePath(localPath));
     if (dryRun) {
       wouldPull.push(logical);
-      log(`would overwrite: ${dst} (from ${src})`);
+      emitPreview(
+        opts.onPreview,
+        { kind: "overwrite", dst, src },
+        `would overwrite: ${dst} (from ${src})`
+      );
       continue;
     }
     backupBeforeWrite(dst, ts);
@@ -2986,14 +3004,6 @@ function summaryRow(verb, unmapped, collisions = 0, extrasSkipped = 0) {
   const { text, clean } = summaryText(verb, unmapped, collisions, extrasSkipped);
   return clean ? `${green(okGlyph)} ${text}` : `${yellow(warnGlyph)} ${text}`;
 }
-function emitSummary(verb, unmapped, collisions = 0, extrasSkipped = 0) {
-  const { text, clean } = summaryText(verb, unmapped, collisions, extrasSkipped);
-  if (clean) {
-    ok(text);
-    return;
-  }
-  warn(text);
-}
 
 // src/commands.push.sections.ts
 function collapsedSkipRow(n, noun) {
@@ -3236,6 +3246,20 @@ init_utils_fs();
 init_utils_json();
 import { existsSync as existsSync26, lstatSync as lstatSync7, rmSync as rmSync8 } from "node:fs";
 import { join as join31 } from "node:path";
+function emitAutoMove(onPreview, linkPath, ts, name) {
+  if (onPreview) {
+    onPreview({ kind: "auto-move", from: linkPath, to: `backup/${ts}/${name}` });
+  } else {
+    log(`would auto-move non-symlink: ${linkPath} -> backup/${ts}/${name}`);
+  }
+}
+function emitCreate(onPreview, from, to) {
+  if (onPreview) {
+    onPreview({ kind: "create", from, to });
+  } else {
+    log(`would create symlink: ${from} -> ${to}`);
+  }
+}
 function applySharedLinks(ts, map, opts = {}) {
   const dryRun = opts.dryRun === true;
   const linkNames = allSharedLinks(map);
@@ -3246,7 +3270,7 @@ function applySharedLinks(ts, map, opts = {}) {
     if (lstatSync7(linkPath).isSymbolicLink()) continue;
     if (!existsSync26(target)) continue;
     if (dryRun) {
-      log(`would auto-move non-symlink: ${linkPath} -> backup/${ts}/${name}`);
+      emitAutoMove(opts.onPreview, linkPath, ts, name);
       continue;
     }
     backupBeforeWrite(linkPath, ts);
@@ -3256,7 +3280,7 @@ function applySharedLinks(ts, map, opts = {}) {
     const target = join31(REPO_HOME, "shared", name);
     if (!existsSync26(target)) continue;
     if (dryRun) {
-      log(`would create symlink: ${join31(CLAUDE_HOME, name)} -> ${target}`);
+      emitCreate(opts.onPreview, join31(CLAUDE_HOME, name), target);
       continue;
     }
     ensureSymlink(join31(CLAUDE_HOME, name), target);
@@ -3575,7 +3599,6 @@ function diffLinesToUnified(oldStr, newStr) {
 }
 
 // src/preview.ts
-init_utils();
 init_utils_json();
 function diffJsonStrings(currentJsonText, newJsonText) {
   if (currentJsonText === newJsonText) return "";
@@ -3597,39 +3620,64 @@ function readJsonOrNull(path) {
 function previewSettings(basePath, hostPath, settingsPath) {
   const base = readJsonOrNull(basePath);
   if (base === null) {
-    log("settings.json: section skipped (base or current missing)");
-    return;
+    return { diff: "", notes: ["section skipped (base or current missing)"] };
   }
+  const notes = [];
   const hostOverrides = readJsonOrNull(hostPath);
   if (hostOverrides === null && existsSync27(hostPath)) {
-    log(`settings.json: malformed hosts/${HOST}.json; ignoring overrides`);
+    notes.push(`malformed hosts/${HOST}.json; ignoring overrides`);
   }
   const merged = deepMerge(base, hostOverrides ?? {});
   const current = readJsonOrNull(settingsPath);
   if (current === null && existsSync27(settingsPath)) {
-    log("settings.json: malformed; skipping diff");
-    return;
+    return { diff: "", notes: [...notes, "malformed; skipping diff"] };
   }
   const diff = diffJsonStrings(
     JSON.stringify(current ?? {}, null, 2),
     JSON.stringify(merged, null, 2)
   );
-  if (diff === "") {
-    log("settings.json: no changes");
-  } else {
-    log("settings.json:");
-    for (const line of diff.split("\n")) log(line);
+  return { diff, notes };
+}
+function formatLinkRow(e) {
+  return `${e.kind}  ${e.from} -> ${e.to}`;
+}
+function formatSessionRow(e) {
+  return e.kind === "overwrite" ? `overwrite  ${e.dst} (from ${e.src})` : e.text;
+}
+function buildSettingsSectionForPreview(result) {
+  const s = section("settings.json", true);
+  if (result.diff !== "") {
+    for (const line of result.diff.split("\n")) {
+      addItem(s, line);
+    }
   }
+  for (const note of result.notes) {
+    addItem(s, `note: ${note}`);
+  }
+  return s;
 }
-function computePreview(ts, map) {
-  log(`would pull on host=${HOST} (dry-run; no mutation)`);
-  applySharedLinks(ts, map, { dryRun: true });
-  previewSettings(
+function computePreview(ts, map, verb = "pull") {
+  console.log(`would pull on host=${HOST} (dry-run; no mutation)`);
+  console.log("");
+  const links = section("Symlinks");
+  applySharedLinks(ts, map, {
+    dryRun: true,
+    onPreview: (e) => addItem(links, formatLinkRow(e))
+  });
+  const settingsResult = previewSettings(
     join32(REPO_HOME, "shared", "settings.base.json"),
     join32(REPO_HOME, "hosts", `${HOST}.json`),
     join32(CLAUDE_HOME, "settings.json")
   );
-  const remapResult = remapPull(ts, { dryRun: true });
+  const settingsSection = buildSettingsSectionForPreview(settingsResult);
+  const sessions = section("Sessions");
+  const remapResult = remapPull(ts, {
+    dryRun: true,
+    onPreview: (e) => addItem(sessions, formatSessionRow(e))
+  });
+  const summary = section("Summary");
+  addItem(summary, summaryRow(verb, remapResult.unmapped));
+  renderTree([links, settingsSection, sessions, summary]);
   return { unmapped: remapResult.unmapped, collisions: 0 };
 }
 
@@ -4009,10 +4057,10 @@ function startSpinner(label, deps = {}) {
     const elapsed = now() - startMs;
     if (animate && !degraded && worker !== null) {
       worker.postMessage({ type: "pause" });
-      if (success) writeAnimatedDone(out, dl, elapsed, ttyCheck());
-      else out.write("\r\x1B[K");
       worker.terminate();
       worker = null;
+      if (success) writeAnimatedDone(out, dl, elapsed, ttyCheck());
+      else out.write("\r\x1B[K");
     } else if (success) {
       writePlainDone(out, dl, elapsed);
     }
@@ -4022,6 +4070,16 @@ function startSpinner(label, deps = {}) {
     stop: () => finalize(false)
   };
 }
+function withSpinner(label, fn, deps) {
+  const sp = startSpinner(label, deps);
+  try {
+    const result = fn();
+    sp.succeed();
+    return result;
+  } finally {
+    sp.stop();
+  }
+}
 
 // src/commands.pull.ts
 init_utils();
@@ -4030,14 +4088,7 @@ init_utils_json();
 function applyWetPull(ts, map) {
   applySharedLinks(ts, map);
   const { label } = regenerateSettings(ts);
-  const syncSp = startSpinner("Syncing sessions");
-  let remapResult;
-  try {
-    remapResult = remapPull(ts);
-    syncSp.succeed();
-  } finally {
-    syncSp.stop();
-  }
+  const remapResult = withSpinner("Syncing sessions", () => remapPull(ts));
   const extrasResult = remapExtrasPull(ts);
   const summary = section("Summary");
   addItem(
@@ -4077,9 +4128,8 @@ function cmdPull(opts = {}) {
     const map = existsSync30(mapPath) ? readPathMap(mapPath) : { projects: {} };
     divergenceCheckExtras(ts);
     if (dryRun) {
-      const previewResult = computePreview(ts, map);
+      computePreview(ts, map, "pull");
       log("dry-run complete; no mutation");
-      emitSummary("pull", previewResult.unmapped);
     } else {
       applyWetPull(ts, map);
     }
@@ -4272,34 +4322,15 @@ function guardGitlinks() {
     `gitlink trap: ${gitlinks.length} nested .git ${noun} in shared/; remove before retry`
   );
 }
-function runScan() {
-  const sp = startSpinner("Scanning for secrets");
-  try {
-    const verdict = scanPushVerdict();
-    sp.succeed();
-    return verdict;
-  } finally {
-    sp.stop();
-  }
-}
-function runPush() {
-  const sp = startSpinner("Pushing");
-  try {
-    gitOrFatal(["push"], "git push", REPO_HOME);
-    sp.succeed();
-  } finally {
-    sp.stop();
-  }
-}
 async function commitAndPush(st, ts, map, redactAll, allowAll, allowRule) {
   gitOrFatal(["add", "-A"], "git add", REPO_HOME);
-  let verdict = runScan();
+  let verdict = withSpinner("Scanning for secrets", scanPushVerdict);
   if (verdict.leak) {
     renderPushTree(st, verdict);
     verdict = await resolveLeakFindings(verdict, ts, map, { redactAll, allowAll, allowRule });
   }
   gitOrFatal(["commit", "-m", `chore: sync from ${HOST}`], "git commit", REPO_HOME);
-  runPush();
+  withSpinner("Pushing", () => gitOrFatal(["push"], "git push", REPO_HOME));
   renderPushTree(st, verdict);
 }
 function runDryRunPreview(st, map) {
@@ -4338,16 +4369,10 @@ async function cmdPush(opts = {}) {
   try {
     console.log(dryRun ? `push on host=${HOST} (dry-run)` : `push on host=${HOST}`);
     probeGitleaks();
-    const rebaseSp = startSpinner("Rebasing onto origin");
-    try {
-      rebaseBeforePush();
-      rebaseSp.succeed();
-    } finally {
-      rebaseSp.stop();
-    }
+    withSpinner("Rebasing onto origin", rebaseBeforePush);
     const ts = freshBackupTs(BACKUP_BASE);
-    const remap = remapPush(ts, { dryRun });
-    const extras = remapExtrasPush(ts, { dryRun });
+    const remap = withSpinner("Syncing sessions", () => remapPush(ts, { dryRun }));
+    const extras = withSpinner("Syncing extras", () => remapExtrasPush(ts, { dryRun }));
     const st = { dryRun, remap, extras };
     guardGitlinks();
     const status = gitStatusPorcelainZ(REPO_HOME, { untrackedAll: true });
@@ -4408,8 +4433,7 @@ function cmdDiff() {
     const ts = freshBackupTs(BACKUP_BASE);
     const mapPath = join39(REPO_HOME, "path-map.json");
     const map = existsSync33(mapPath) ? readPathMap(mapPath) : { projects: {} };
-    const result = computePreview(ts, map);
-    emitSummary("diff", result.unmapped);
+    computePreview(ts, map, "diff");
   } catch (err) {
     if (err instanceof NomadFatal) {
       fail(err.message);
@@ -4841,7 +4865,7 @@ function parsePushArgs(argv) {
 // package.json
 var package_default = {
   name: "claude-nomad",
-  version: "0.40.0",
+  version: "0.41.0",
   type: "module",
   description: "Sync Claude Code config (~/.claude/) across machines via a private Git repo, with path remapping and per-host settings overrides.",
   keywords: [
@@ -4854,7 +4878,7 @@ var package_default = {
     type: "git",
     url: "git+https://github.com/funkadelic/claude-nomad.git"
   },
-  homepage: "https://github.com/funkadelic/claude-nomad#readme",
+  homepage: "https://funkadelic.github.io/claude-nomad/",
   bugs: {
     url: "https://github.com/funkadelic/claude-nomad/issues"
   },

package/dist/nomad.worker.mjs

@@ -1,7 +1,9 @@
 // src/spinner.worker.ts
+import { writeSync } from "node:fs";
 import { parentPort } from "node:worker_threads";
 var FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
 var INTERVAL_MS = 80;
+var STDERR_FD = 2;
 var frame = 0;
 var timer = null;
 if (parentPort !== null) {
@@ -11,7 +13,7 @@ if (parentPort !== null) {
       frame = 0;
       if (timer !== null) clearInterval(timer);
       timer = setInterval(() => {
-        process.stderr.write(`${FRAMES[frame % FRAMES.length]} ${label}\r`);
+        writeSync(STDERR_FD, `${FRAMES[frame % FRAMES.length]} ${label}\r`);
         frame++;
       }, INTERVAL_MS);
     } else if (msg.type === "pause") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-nomad",
-  "version": "0.40.0",
+  "version": "0.41.0",
   "type": "module",
   "description": "Sync Claude Code config (~/.claude/) across machines via a private Git repo, with path remapping and per-host settings overrides.",
   "keywords": [
@@ -13,7 +13,7 @@
     "type": "git",
     "url": "git+https://github.com/funkadelic/claude-nomad.git"
   },
-  "homepage": "https://github.com/funkadelic/claude-nomad#readme",
+  "homepage": "https://funkadelic.github.io/claude-nomad/",
   "bugs": {
     "url": "https://github.com/funkadelic/claude-nomad/issues"
   },