claude-nomad 0.39.0 → 0.41.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # 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)
+
+
+### Added
+
+* **spinner:** animate long-running operations ([#233](https://github.com/funkadelic/claude-nomad/issues/233)) ([e6755c3](https://github.com/funkadelic/claude-nomad/commit/e6755c3e5e86b52cbc5f996e9c5aee9d79da4574))
+
+
+### Changed
+
+* **docs-site:** build gate, link validation, and page metadata ([#231](https://github.com/funkadelic/claude-nomad/issues/231)) ([d4ad8ec](https://github.com/funkadelic/claude-nomad/commit/d4ad8ec0c414a91153a584156ccee2b32d824360))
+
 ## [0.39.0](https://github.com/funkadelic/claude-nomad/compare/v0.38.1...v0.39.0) (2026-06-02)
 
 

package/README.md

@@ -57,6 +57,11 @@ $ nomad pull     # apply config to ~/.claude/
 $ nomad push     # publish local changes (sessions, settings)
 ```
 
+During `nomad push` and `nomad pull`, long-running steps (rebase, secret scan, git push, session
+sync) show an animated progress indicator on an interactive terminal so the CLI does not look hung.
+In CI and when output is piped, only plain text lines are printed, with no ANSI control codes, so
+log output remains grep-stable.
+
 When `nomad push` detects a potential secret, it drops into an interactive menu (TTY) or aborts with
 a recovery hint (non-TTY/CI). Three non-interactive recovery paths are available without the menu:
 

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);
@@ -2956,8 +2974,8 @@ ${lines}`);
 }
 
 // src/commands.pull.ts
-import { existsSync as existsSync28, mkdirSync as mkdirSync7 } from "node:fs";
-import { join as join33 } from "node:path";
+import { existsSync as existsSync30, mkdirSync as mkdirSync8 } from "node:fs";
+import { join as join36 } from "node:path";
 
 // src/commands.push.sections.ts
 init_color();
@@ -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,192 +3620,84 @@ 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 });
-  return { unmapped: remapResult.unmapped, collisions: 0 };
-}
-
-// src/commands.pull.ts
-init_utils();
-init_utils_fs();
-init_utils_json();
-function applyWetPull(ts, map) {
-  applySharedLinks(ts, map);
-  const { label } = regenerateSettings(ts);
-  const remapResult = remapPull(ts);
-  const extrasResult = remapExtrasPull(ts);
+  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("pull", remapResult.unmapped + extrasResult.unmapped, 0, extrasResult.skipped)
-  );
-  renderTree([
-    buildSettingsSection(label),
-    buildSessionsSection(remapResult.pulled, remapResult.unmapped),
-    buildExtrasSection(extrasResult.pulled, extrasResult.skipped),
-    summary
-  ]);
-}
-function cmdPull(opts = {}) {
-  const dryRun = opts.dryRun === true;
-  if (!existsSync28(REPO_HOME)) die(`repo not cloned at ${REPO_HOME}`);
-  if (!existsSync28(join33(REPO_HOME, "shared", "settings.base.json"))) {
-    die("repo not initialized; run 'nomad init' to scaffold");
-  }
-  const handle = acquireLock("pull");
-  if (handle === null) process.exit(0);
-  try {
-    const ts = freshBackupTs(BACKUP_BASE);
-    if (!dryRun) {
-      const backupRoot = join33(BACKUP_BASE, ts);
-      try {
-        mkdirSync7(backupRoot, { recursive: true });
-      } catch (err) {
-        die(`could not create backup dir: ${err.message}`);
-      }
-    }
-    log(
-      dryRun ? `pulling on host=${HOST} (backup=${ts}; dry-run)` : `pull on host=${HOST} (backup=${ts})`
-    );
-    gitOrFatal(["pull", "--rebase", "--autostash"], "git pull --rebase", REPO_HOME);
-    const mapPath = join33(REPO_HOME, "path-map.json");
-    const map = existsSync28(mapPath) ? readPathMap(mapPath) : { projects: {} };
-    divergenceCheckExtras(ts);
-    if (dryRun) {
-      const previewResult = computePreview(ts, map);
-      log("dry-run complete; no mutation");
-      emitSummary("pull", previewResult.unmapped);
-    } else {
-      applyWetPull(ts, map);
-    }
-  } catch (err) {
-    if (err instanceof NomadFatal) {
-      fail(err.message);
-      process.exitCode = 1;
-    } else {
-      throw err;
-    }
-  } finally {
-    releaseLock(handle);
-  }
+  addItem(summary, summaryRow(verb, remapResult.unmapped));
+  renderTree([links, settingsSection, sessions, summary]);
+  return { unmapped: remapResult.unmapped, collisions: 0 };
 }
 
-// src/commands.push.ts
-init_config();
-import { existsSync as existsSync31 } from "node:fs";
-import { join as join38, relative as relative5 } from "node:path";
-
-// src/commands.push.allowlist.ts
-init_config();
-init_config_sharedDirs_guard();
-init_utils();
-function isAllowed(path, allowed) {
-  for (const entry of allowed) {
-    if (path === entry) return true;
-    if (entry === "hosts/") {
-      if (/^hosts\/[^/]+\.json$/.test(path)) return true;
-      continue;
-    }
-    if (entry.endsWith("/") && path.startsWith(entry)) return true;
-  }
-  return false;
-}
-function isNeverSync(path) {
-  const blockSet = path.startsWith("shared/extras/") ? ALWAYS_NEVER_SYNC : NEVER_SYNC;
-  for (const segment of path.split("/")) {
-    if (blockSet.has(segment)) return true;
-  }
-  return false;
-}
-function parsePorcelainZ(statusPorcelain) {
-  const records = statusPorcelain.split("\0");
-  const paths = [];
-  for (let i = 0; i < records.length; i++) {
-    const rec = records[i];
-    if (rec === void 0 || rec === "") continue;
-    if (rec.length < 4) continue;
-    const xy = rec.slice(0, 2);
-    const newPath = rec.slice(3);
-    paths.push(newPath);
-    if (/[RC]/.test(xy)) {
-      const oldPath = records[i + 1];
-      if (oldPath !== void 0 && oldPath !== "") paths.push(oldPath);
-      i++;
-    }
-  }
-  return paths;
-}
-function enforceAllowList(statusPorcelain, map) {
-  const extrasWhitelist = SUPPORTED_EXTRAS;
-  const allowed = [
-    ...PUSH_ALLOWED_STATIC,
-    ...Object.keys(map.projects).map((l) => `shared/projects/${l}/`),
-    ...Object.entries(map.extras ?? {}).flatMap(
-      ([l, names]) => names.filter((n) => extrasWhitelist.includes(n)).flatMap((n) => [`shared/extras/${l}/${n}`, `shared/extras/${l}/${n}/`])
-    ),
-    ...(map.sharedDirs ?? []).filter((d) => isValidSharedDir(d)).map((d) => `shared/${d}/`)
-  ];
-  const neverSyncHits = [];
-  const violations = [];
-  for (const path of parsePorcelainZ(statusPorcelain)) {
-    if (isNeverSync(path)) {
-      neverSyncHits.push(path);
-    } else if (!isAllowed(path, allowed)) {
-      violations.push(path);
-    }
-  }
-  if (neverSyncHits.length === 0 && violations.length === 0) return;
-  for (const p of neverSyncHits) {
-    fail(`${p} is in NEVER_SYNC and must never be pushed`);
-  }
-  for (const p of violations) {
-    fail(`to sync ${p}, add to PUSH_ALLOWED in src/config.ts`);
-  }
-  throw new NomadFatal("push allow-list violations");
-}
+// src/spinner.ts
+init_color();
+import { existsSync as existsSync29 } from "node:fs";
+import { fileURLToPath as fileURLToPath4 } from "node:url";
+import { Worker } from "node:worker_threads";
 
 // src/commands.push.recovery.ts
 init_config();
 import { readFileSync as readFileSync10, rmSync as rmSync10, writeFileSync as writeFileSync5 } from "node:fs";
-import { join as join36 } from "node:path";
+import { join as join35 } from "node:path";
 import { createInterface } from "node:readline/promises";
 
 // src/commands.push.recovery.redact.ts
 init_config();
 init_config_sharedDirs_guard();
-import { cpSync as cpSync5, existsSync as existsSync29, mkdirSync as mkdirSync8, statSync as statSync8 } from "node:fs";
-import { dirname as dirname5, join as join34, sep as sep2 } from "node:path";
+import { cpSync as cpSync5, existsSync as existsSync28, mkdirSync as mkdirSync7, statSync as statSync8 } from "node:fs";
+import { dirname as dirname5, join as join33, sep as sep2 } from "node:path";
 init_push_gitleaks_scan();
 init_utils_json();
 init_utils();
@@ -3813,8 +3728,8 @@ function resolveStagedDir(localPath, map) {
     assertSafeLogical(logical);
     const abs = hostMap[HOST];
     if (abs === void 0) continue;
-    if (localPath.startsWith(join34(CLAUDE_HOME, "projects", encodePath(abs)) + sep2)) {
-      return join34(REPO_HOME, "shared", "projects", logical);
+    if (localPath.startsWith(join33(CLAUDE_HOME, "projects", encodePath(abs)) + sep2)) {
+      return join33(REPO_HOME, "shared", "projects", logical);
     }
   }
   return null;
@@ -3836,7 +3751,7 @@ function applyRedact(f, ts, map, nowMs, scan = scanFile) {
       `could not locate the local transcript for session ${sid}; choose Skip or Drop session.`
     );
   }
-  const sessionDir = join34(dirname5(localPath), sid);
+  const sessionDir = join33(dirname5(localPath), sid);
   const subtreeFiles = listSubtreeFiles(sessionDir);
   const subtreeMtime = newestSubtreeMtimeMs(localPath, subtreeFiles, (p) => statSync8(p).mtimeMs);
   if (isRecentlyModified(subtreeMtime, nowMs())) {
@@ -3869,10 +3784,10 @@ function applyRedact(f, ts, map, nowMs, scan = scanFile) {
       `nothing to redact in the local transcript for session ${sid}; choose Skip or Drop session.`
     );
   }
-  mkdirSync8(stagedProjectDir, { recursive: true });
-  cpSync5(localPath, join34(stagedProjectDir, `${sid}.jsonl`), { force: true });
-  if (existsSync29(sessionDir)) {
-    cpSync5(sessionDir, join34(stagedProjectDir, sid), { force: true, recursive: true });
+  mkdirSync7(stagedProjectDir, { recursive: true });
+  cpSync5(localPath, join33(stagedProjectDir, `${sid}.jsonl`), { force: true });
+  if (existsSync28(sessionDir)) {
+    cpSync5(sessionDir, join33(stagedProjectDir, sid), { force: true, recursive: true });
   }
   return true;
 }
@@ -3880,13 +3795,13 @@ function applyRedact(f, ts, map, nowMs, scan = scanFile) {
 // src/commands.push.recovery.drop.ts
 init_config();
 import { rmSync as rmSync9 } from "node:fs";
-import { join as join35 } from "node:path";
+import { join as join34 } from "node:path";
 function dropSessionFromStaged(sid, map) {
   const logicals = Object.keys(map.projects);
   if (logicals.length === 0) return false;
   for (const logical of logicals) {
-    const jsonl = join35(REPO_HOME, "shared", "projects", logical, `${sid}.jsonl`);
-    const dir = join35(REPO_HOME, "shared", "projects", logical, sid);
+    const jsonl = join34(REPO_HOME, "shared", "projects", logical, `${sid}.jsonl`);
+    const dir = join34(REPO_HOME, "shared", "projects", logical, sid);
     rmSync9(jsonl, { force: true });
     rmSync9(dir, { recursive: true, force: true });
   }
@@ -4004,7 +3919,7 @@ function applyThenRescan(scanVerdict, repoHome) {
   return next;
 }
 function allowThenRescan(append, scanVerdict, repoHome) {
-  const ignPath = join36(repoHome, ".gitleaksignore");
+  const ignPath = join35(repoHome, ".gitleaksignore");
   let before;
   try {
     before = readFileSync10(ignPath, "utf8");
@@ -4083,6 +3998,227 @@ async function resolveLeakFindings(verdict, ts, map, deps = {}) {
   return current;
 }
 
+// src/spinner.ts
+function formatElapsed(ms) {
+  return `${(ms / 1e3).toFixed(1)}s`;
+}
+function writePlainStart(out, label) {
+  out.write(`${label}...
+`);
+}
+function writePlainDone(out, label, ms) {
+  out.write(`${label} done (${formatElapsed(ms)})
+`);
+}
+function writeAnimatedDone(out, label, ms, useTTY) {
+  out.write("\r\x1B[K");
+  const glyph = useTTY ? green(okGlyph) : okGlyph;
+  out.write(`${glyph} ${label} (${formatElapsed(ms)})
+`);
+}
+function resolveWorkerPath(deps = {}) {
+  const check = deps.existsSyncFn ?? existsSync29;
+  const base = deps.baseUrl ?? import.meta.url;
+  const mjs = fileURLToPath4(new URL("./nomad.worker.mjs", base));
+  if (check(mjs)) return mjs;
+  return fileURLToPath4(new URL("./spinner.worker.ts", base));
+}
+function makeRealWorker() {
+  return new Worker(resolveWorkerPath());
+}
+function startSpinner(label, deps = {}) {
+  const ttyCheck = deps.isTTYCheck ?? (() => isTTY());
+  const env = deps.env ?? process.env;
+  const out = deps.out ?? process.stderr;
+  const now = deps.now ?? Date.now;
+  const startMs = now();
+  const animate = ttyCheck() && !env.CI;
+  let worker = null;
+  let degraded = false;
+  let finalized = false;
+  if (animate) {
+    const factory = deps.makeWorker ?? makeRealWorker;
+    try {
+      worker = factory();
+      worker.unref?.();
+      worker.postMessage({ type: "start", label });
+    } catch {
+      degraded = true;
+      worker = null;
+      writePlainStart(out, label);
+    }
+  } else {
+    writePlainStart(out, label);
+  }
+  function finalize(success, doneLabel) {
+    if (finalized) return;
+    finalized = true;
+    const dl = doneLabel ?? label;
+    const elapsed = now() - startMs;
+    if (animate && !degraded && worker !== null) {
+      worker.postMessage({ type: "pause" });
+      worker.terminate();
+      worker = null;
+      if (success) writeAnimatedDone(out, dl, elapsed, ttyCheck());
+      else out.write("\r\x1B[K");
+    } else if (success) {
+      writePlainDone(out, dl, elapsed);
+    }
+  }
+  return {
+    succeed: (doneLabel) => finalize(true, doneLabel),
+    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();
+init_utils_fs();
+init_utils_json();
+function applyWetPull(ts, map) {
+  applySharedLinks(ts, map);
+  const { label } = regenerateSettings(ts);
+  const remapResult = withSpinner("Syncing sessions", () => remapPull(ts));
+  const extrasResult = remapExtrasPull(ts);
+  const summary = section("Summary");
+  addItem(
+    summary,
+    summaryRow("pull", remapResult.unmapped + extrasResult.unmapped, 0, extrasResult.skipped)
+  );
+  renderTree([
+    buildSettingsSection(label),
+    buildSessionsSection(remapResult.pulled, remapResult.unmapped),
+    buildExtrasSection(extrasResult.pulled, extrasResult.skipped),
+    summary
+  ]);
+}
+function cmdPull(opts = {}) {
+  const dryRun = opts.dryRun === true;
+  if (!existsSync30(REPO_HOME)) die(`repo not cloned at ${REPO_HOME}`);
+  if (!existsSync30(join36(REPO_HOME, "shared", "settings.base.json"))) {
+    die("repo not initialized; run 'nomad init' to scaffold");
+  }
+  const handle = acquireLock("pull");
+  if (handle === null) process.exit(0);
+  try {
+    const ts = freshBackupTs(BACKUP_BASE);
+    if (!dryRun) {
+      const backupRoot = join36(BACKUP_BASE, ts);
+      try {
+        mkdirSync8(backupRoot, { recursive: true });
+      } catch (err) {
+        die(`could not create backup dir: ${err.message}`);
+      }
+    }
+    log(
+      dryRun ? `pulling on host=${HOST} (backup=${ts}; dry-run)` : `pull on host=${HOST} (backup=${ts})`
+    );
+    gitOrFatal(["pull", "--rebase", "--autostash"], "git pull --rebase", REPO_HOME);
+    const mapPath = join36(REPO_HOME, "path-map.json");
+    const map = existsSync30(mapPath) ? readPathMap(mapPath) : { projects: {} };
+    divergenceCheckExtras(ts);
+    if (dryRun) {
+      computePreview(ts, map, "pull");
+      log("dry-run complete; no mutation");
+    } else {
+      applyWetPull(ts, map);
+    }
+  } catch (err) {
+    if (err instanceof NomadFatal) {
+      fail(err.message);
+      process.exitCode = 1;
+    } else {
+      throw err;
+    }
+  } finally {
+    releaseLock(handle);
+  }
+}
+
+// src/commands.push.ts
+init_config();
+import { existsSync as existsSync32 } from "node:fs";
+import { join as join38, relative as relative5 } from "node:path";
+
+// src/commands.push.allowlist.ts
+init_config();
+init_config_sharedDirs_guard();
+init_utils();
+function isAllowed(path, allowed) {
+  for (const entry of allowed) {
+    if (path === entry) return true;
+    if (entry === "hosts/") {
+      if (/^hosts\/[^/]+\.json$/.test(path)) return true;
+      continue;
+    }
+    if (entry.endsWith("/") && path.startsWith(entry)) return true;
+  }
+  return false;
+}
+function isNeverSync(path) {
+  const blockSet = path.startsWith("shared/extras/") ? ALWAYS_NEVER_SYNC : NEVER_SYNC;
+  for (const segment of path.split("/")) {
+    if (blockSet.has(segment)) return true;
+  }
+  return false;
+}
+function parsePorcelainZ(statusPorcelain) {
+  const records = statusPorcelain.split("\0");
+  const paths = [];
+  for (let i = 0; i < records.length; i++) {
+    const rec = records[i];
+    if (rec === void 0 || rec === "") continue;
+    if (rec.length < 4) continue;
+    const xy = rec.slice(0, 2);
+    const newPath = rec.slice(3);
+    paths.push(newPath);
+    if (/[RC]/.test(xy)) {
+      const oldPath = records[i + 1];
+      if (oldPath !== void 0 && oldPath !== "") paths.push(oldPath);
+      i++;
+    }
+  }
+  return paths;
+}
+function enforceAllowList(statusPorcelain, map) {
+  const extrasWhitelist = SUPPORTED_EXTRAS;
+  const allowed = [
+    ...PUSH_ALLOWED_STATIC,
+    ...Object.keys(map.projects).map((l) => `shared/projects/${l}/`),
+    ...Object.entries(map.extras ?? {}).flatMap(
+      ([l, names]) => names.filter((n) => extrasWhitelist.includes(n)).flatMap((n) => [`shared/extras/${l}/${n}`, `shared/extras/${l}/${n}/`])
+    ),
+    ...(map.sharedDirs ?? []).filter((d) => isValidSharedDir(d)).map((d) => `shared/${d}/`)
+  ];
+  const neverSyncHits = [];
+  const violations = [];
+  for (const path of parsePorcelainZ(statusPorcelain)) {
+    if (isNeverSync(path)) {
+      neverSyncHits.push(path);
+    } else if (!isAllowed(path, allowed)) {
+      violations.push(path);
+    }
+  }
+  if (neverSyncHits.length === 0 && violations.length === 0) return;
+  for (const p of neverSyncHits) {
+    fail(`${p} is in NEVER_SYNC and must never be pushed`);
+  }
+  for (const p of violations) {
+    fail(`to sync ${p}, add to PUSH_ALLOWED in src/config.ts`);
+  }
+  throw new NomadFatal("push allow-list violations");
+}
+
 // src/commands.push.ts
 init_push_leak_verdict();
 init_push_checks();
@@ -4092,7 +4228,7 @@ init_color();
 init_config();
 init_config_sharedDirs_guard();
 import { randomBytes as randomBytes2 } from "node:crypto";
-import { copyFileSync, existsSync as existsSync30, mkdirSync as mkdirSync9, readdirSync as readdirSync10, rmSync as rmSync11 } from "node:fs";
+import { copyFileSync, existsSync as existsSync31, mkdirSync as mkdirSync9, readdirSync as readdirSync10, rmSync as rmSync11 } from "node:fs";
 import { homedir as homedir5 } from "node:os";
 import { join as join37 } from "node:path";
 init_push_leak_verdict();
@@ -4110,7 +4246,7 @@ function stageSessions(tmpRoot, map) {
     reverse.set(encodePath(p), logical);
   }
   const localProjects = join37(CLAUDE_HOME, "projects");
-  if (!existsSync30(localProjects)) return 0;
+  if (!existsSync31(localProjects)) return 0;
   let staged = 0;
   for (const dir of readdirSync10(localProjects)) {
     const logical = reverse.get(dir);
@@ -4132,7 +4268,7 @@ function stageExtras(tmpRoot, map) {
     for (const dirname6 of dirnames) {
       if (!whitelist.includes(dirname6)) continue;
       const src = join37(localRoot, dirname6);
-      if (!existsSync30(src)) continue;
+      if (!existsSync31(src)) continue;
       const dst = join37(tmpRoot, "shared", "extras", logical, dirname6);
       copyExtras(src, dst);
       staged++;
@@ -4152,7 +4288,7 @@ function previewPushLeaks(map) {
       return { leak: false, verdictRow: NOTHING_TO_SCAN_ROW, recovery: null, findings: [] };
     }
     const ignoreFile = join37(REPO_HOME, ".gitleaksignore");
-    if (existsSync30(ignoreFile)) {
+    if (existsSync31(ignoreFile)) {
       copyFileSync(ignoreFile, join37(tmpRoot, ".gitleaksignore"));
     }
     let findings;
@@ -4188,13 +4324,13 @@ function guardGitlinks() {
 }
 async function commitAndPush(st, ts, map, redactAll, allowAll, allowRule) {
   gitOrFatal(["add", "-A"], "git add", REPO_HOME);
-  let verdict = scanPushVerdict();
+  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);
-  gitOrFatal(["push"], "git push", REPO_HOME);
+  withSpinner("Pushing", () => gitOrFatal(["push"], "git push", REPO_HOME));
   renderPushTree(st, verdict);
 }
 function runDryRunPreview(st, map) {
@@ -4227,16 +4363,16 @@ async function cmdPush(opts = {}) {
   const allowAll = opts.allowAll === true;
   const allowRule = opts.allowRule;
   guardResolutionModeConflicts(dryRun, redactAll, allowAll, allowRule);
-  if (!existsSync31(REPO_HOME)) die(`repo not cloned at ${REPO_HOME}`);
+  if (!existsSync32(REPO_HOME)) die(`repo not cloned at ${REPO_HOME}`);
   const handle = acquireLock("push");
   if (handle === null) process.exit(0);
   try {
     console.log(dryRun ? `push on host=${HOST} (dry-run)` : `push on host=${HOST}`);
     probeGitleaks();
-    rebaseBeforePush();
+    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 });
@@ -4246,7 +4382,7 @@ async function cmdPush(opts = {}) {
       return;
     }
     const mapPath = join38(REPO_HOME, "path-map.json");
-    if (!existsSync31(mapPath)) {
+    if (!existsSync32(mapPath)) {
       if (dryRun) return runDryRunPreview(st, null);
       die("path-map.json missing, cannot enforce push allow-list");
     }
@@ -4286,19 +4422,18 @@ init_config();
 
 // src/diff.ts
 init_config();
-import { existsSync as existsSync32 } from "node:fs";
+import { existsSync as existsSync33 } from "node:fs";
 import { join as join39 } from "node:path";
 init_utils();
 init_utils_fs();
 init_utils_json();
 function cmdDiff() {
   try {
-    if (!existsSync32(REPO_HOME)) die(`repo not cloned at ${REPO_HOME}`);
+    if (!existsSync33(REPO_HOME)) die(`repo not cloned at ${REPO_HOME}`);
     const ts = freshBackupTs(BACKUP_BASE);
     const mapPath = join39(REPO_HOME, "path-map.json");
-    const map = existsSync32(mapPath) ? readPathMap(mapPath) : { projects: {} };
-    const result = computePreview(ts, map);
-    emitSummary("diff", result.unmapped);
+    const map = existsSync33(mapPath) ? readPathMap(mapPath) : { projects: {} };
+    computePreview(ts, map, "diff");
   } catch (err) {
     if (err instanceof NomadFatal) {
       fail(err.message);
@@ -4311,7 +4446,7 @@ function cmdDiff() {
 
 // src/init.ts
 init_config();
-import { existsSync as existsSync34, mkdirSync as mkdirSync10, writeFileSync as writeFileSync6 } from "node:fs";
+import { existsSync as existsSync35, mkdirSync as mkdirSync10, writeFileSync as writeFileSync6 } from "node:fs";
 import { join as join41 } from "node:path";
 
 // src/init.gh-onboard.ts
@@ -4393,16 +4528,16 @@ init_config();
 init_utils();
 init_utils_fs();
 init_utils_json();
-import { copyFileSync as copyFileSync2, cpSync as cpSync6, existsSync as existsSync33, rmSync as rmSync12, statSync as statSync9 } from "node:fs";
+import { copyFileSync as copyFileSync2, cpSync as cpSync6, existsSync as existsSync34, rmSync as rmSync12, statSync as statSync9 } from "node:fs";
 import { join as join40 } from "node:path";
 function snapshotIntoShared(map) {
   for (const name of allSharedLinks(map)) {
     const src = join40(CLAUDE_HOME, name);
-    if (!existsSync33(src)) continue;
+    if (!existsSync34(src)) continue;
     const dst = join40(REPO_HOME, "shared", name);
     if (statSync9(src).isDirectory()) {
       const gk = join40(dst, ".gitkeep");
-      if (existsSync33(gk)) rmSync12(gk);
+      if (existsSync34(gk)) rmSync12(gk);
       cpSync6(src, dst, { recursive: true, force: false, errorOnExist: true });
     } else {
       copyFileSync2(src, dst);
@@ -4410,7 +4545,7 @@ function snapshotIntoShared(map) {
     log(`snapshotted shared/${name} from ${src}`);
   }
   const userSettings = join40(CLAUDE_HOME, "settings.json");
-  if (existsSync33(userSettings)) {
+  if (existsSync34(userSettings)) {
     let parsed;
     try {
       parsed = readJson(userSettings);
@@ -4437,7 +4572,7 @@ function preflightConflict(repoHome) {
     join41(repoHome, "shared")
   ];
   for (const c of candidates) {
-    if (existsSync34(c)) return c;
+    if (existsSync35(c)) return c;
   }
   return null;
 }
@@ -4456,7 +4591,7 @@ function cmdInit(opts = {}) {
     mkdirSync10(join41(REPO_HOME, "shared", name), { recursive: true });
   }
   const userClaudeMd = join41(CLAUDE_HOME, "CLAUDE.md");
-  if (!snapshot || !existsSync34(userClaudeMd)) {
+  if (!snapshot || !existsSync35(userClaudeMd)) {
     writeFileSync6(join41(REPO_HOME, "shared", "CLAUDE.md"), SHARED_CLAUDE_MD);
     log("created shared/CLAUDE.md");
   }
@@ -4730,7 +4865,7 @@ function parsePushArgs(argv) {
 // package.json
 var package_default = {
   name: "claude-nomad",
-  version: "0.39.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: [
@@ -4743,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"
   },
@@ -4920,7 +5055,7 @@ var DEFAULT_HELP = [
 init_config();
 init_utils();
 init_utils_json();
-import { existsSync as existsSync35, readFileSync as readFileSync11, readdirSync as readdirSync11 } from "node:fs";
+import { existsSync as existsSync36, readFileSync as readFileSync11, readdirSync as readdirSync11 } from "node:fs";
 import { join as join42 } from "node:path";
 function resumeCmd(sessionId) {
   if (!/^[A-Za-z0-9_-]+$/.test(sessionId) || sessionId.length > 128) {
@@ -4928,7 +5063,7 @@ function resumeCmd(sessionId) {
     process.exit(1);
   }
   const projectsRoot = join42(CLAUDE_HOME, "projects");
-  if (!existsSync35(projectsRoot)) {
+  if (!existsSync36(projectsRoot)) {
     fail(`${projectsRoot} does not exist`);
     process.exit(1);
   }
@@ -4943,7 +5078,7 @@ function resumeCmd(sessionId) {
     process.exit(1);
   }
   const mapPath = join42(REPO_HOME, "path-map.json");
-  if (!existsSync35(mapPath)) {
+  if (!existsSync36(mapPath)) {
     fail("path-map.json missing");
     process.exit(1);
   }
@@ -4967,7 +5102,7 @@ function resumeCmd(sessionId) {
 function findTranscriptPath(projectsRoot, sessionId) {
   for (const dir of readdirSync11(projectsRoot)) {
     const candidate = join42(projectsRoot, dir, `${sessionId}.jsonl`);
-    if (existsSync35(candidate)) return candidate;
+    if (existsSync36(candidate)) return candidate;
   }
   return null;
 }

package/dist/nomad.worker.mjs

@@ -0,0 +1,26 @@
+// 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) {
+  parentPort.on("message", (msg) => {
+    if (msg.type === "start" && msg.label !== void 0) {
+      const label = msg.label;
+      frame = 0;
+      if (timer !== null) clearInterval(timer);
+      timer = setInterval(() => {
+        writeSync(STDERR_FD, `${FRAMES[frame % FRAMES.length]} ${label}\r`);
+        frame++;
+      }, INTERVAL_MS);
+    } else if (msg.type === "pause") {
+      if (timer !== null) {
+        clearInterval(timer);
+        timer = null;
+      }
+    }
+  });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-nomad",
-  "version": "0.39.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"
   },