claude-nomad 0.62.3 → 0.62.4

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [0.62.4](https://github.com/funkadelic/claude-nomad/compare/v0.62.3...v0.62.4) (2026-07-21)
+
+
+### Fixed
+
+* **sync:** compute the dry-run pull preview after the fetch ([#451](https://github.com/funkadelic/claude-nomad/issues/451)) ([8118625](https://github.com/funkadelic/claude-nomad/commit/81186258896081a7b2a2585f40eed67bd3e5c6b6))
+
+
+### Changed
+
+* **pull:** split commands.pull.recovery.ts on the force-remote seam ([#456](https://github.com/funkadelic/claude-nomad/issues/456)) ([1c1875b](https://github.com/funkadelic/claude-nomad/commit/1c1875b40e67512329e9a2d1215afa7667c29d1c))
+* **push:** split redact-all batch from recovery actions ([#457](https://github.com/funkadelic/claude-nomad/issues/457)) ([b104472](https://github.com/funkadelic/claude-nomad/commit/b104472b87d3f847546ee938900bcaa4ea1abdd8))
+
+
+### Testing
+
+* precompile the CLI once per vitest run ([#453](https://github.com/funkadelic/claude-nomad/issues/453)) ([e0b043b](https://github.com/funkadelic/claude-nomad/commit/e0b043b851ae9bd89da026199f70d723e213aed9))
+* **pull:** reset process.exitCode in beforeEach as well as afterEach ([#450](https://github.com/funkadelic/claude-nomad/issues/450)) ([78943e7](https://github.com/funkadelic/claude-nomad/commit/78943e72a41d4a542a4d6528d995ae9f8a8452cc))
+
 ## [0.62.3](https://github.com/funkadelic/claude-nomad/compare/v0.62.2...v0.62.3) (2026-07-21)
 
 

package/dist/nomad.mjs

@@ -5668,6 +5668,10 @@ function dispatchActions(findings, actions, opts) {
     dispatchOne(f, ctx);
   }
 }
+
+// src/commands.push.recovery.redact-all.ts
+init_push_gitleaks_scan();
+init_utils();
 function redactAllDedupeKey(f) {
   const sid = sessionIdFromFinding(f);
   if (sid !== null) return sid;
@@ -7238,7 +7242,7 @@ function buildSettingsSectionForPreview(result) {
 function computePreview(ts, map, verb = "pull") {
   const repo = repoHome();
   const claude = claudeHome();
-  console.log(`would pull on host=${HOST} (dry-run; no mutation)`);
+  console.log(`would pull on host=${HOST} (preview; nothing applied)`);
   console.log("");
   const links = section("Symlinks");
   applySharedLinks(ts, map, {
@@ -7286,10 +7290,11 @@ init_commands_pull_wedge();
 
 // src/commands.pull.recovery.ts
 init_config();
-init_commands_pull_wedge();
-init_exit_codes();
 init_utils();
 init_utils_fs();
+
+// src/commands.pull.recovery.git.ts
+init_utils();
 import { execFileSync as execFileSync21 } from "node:child_process";
 function gitCapture(args, cwd) {
   return execFileSync21("git", args, {
@@ -7298,23 +7303,6 @@ function gitCapture(args, cwd) {
     maxBuffer: 64 * 1024 * 1024
   }).toString().trim();
 }
-function isSyncedConfig(path) {
-  return PUSH_ALLOWED_STATIC.some(
-    (entry) => entry.endsWith("/") ? path.startsWith(entry) : path === entry
-  );
-}
-function classifyTouched(touched) {
-  const synced = [];
-  const toolSource = [];
-  for (const p of touched) {
-    if (isSyncedConfig(p)) {
-      synced.push(p);
-    } else {
-      toolSource.push(p);
-    }
-  }
-  return { synced, toolSource };
-}
 function parsePorcelainZ(raw) {
   const tracked = [];
   const untracked = [];
@@ -7343,6 +7331,25 @@ function parsePorcelainZ(raw) {
 function parseDirtyPaths(repo, opts = {}) {
   return parsePorcelainZ(gitStatusPorcelainZ(repo, opts));
 }
+
+// src/commands.pull.recovery.ts
+function isSyncedConfig(path) {
+  return PUSH_ALLOWED_STATIC.some(
+    (entry) => entry.endsWith("/") ? path.startsWith(entry) : path === entry
+  );
+}
+function classifyTouched(touched) {
+  const synced = [];
+  const toolSource = [];
+  for (const p of touched) {
+    if (isSyncedConfig(p)) {
+      synced.push(p);
+    } else {
+      toolSource.push(p);
+    }
+  }
+  return { synced, toolSource };
+}
 function buildRecoverySummary(branchName, strandedLog, untracked) {
   const strandedLines = strandedLog.split("\n").filter(Boolean).map((l) => `  ${l}`).join("\n");
   const parts = [`parked stranded commits on ${branchName}`];
@@ -7367,26 +7374,6 @@ function freshStrandedBranch(repo) {
   while (exists(`${base}-${n}`)) n++;
   return `${base}-${n}`;
 }
-function recoverUnmergedIndex(repo) {
-  const conflicted = new Set(
-    gitCapture(["diff", "--diff-filter=U", "--name-only", "-z"], repo).split("\0").filter(Boolean)
-  );
-  gitOrFatal(["reset", "--mixed", "HEAD"], "git reset --mixed HEAD", repo);
-  const { tracked, untracked } = parseDirtyPaths(repo, { untrackedAll: true });
-  const present = /* @__PURE__ */ new Set([...tracked, ...untracked]);
-  const residual = [...conflicted].filter((p) => present.has(p));
-  if (orphanedAutostashPresent(repo)) {
-    log(
-      'orphaned autostash preserved in the stash list; run "git stash pop" to restore or "git stash drop" to discard it, then re-run "nomad pull"'
-    );
-  }
-  if (residual.length > 0) {
-    die(
-      "index cleared, but these files still carry unresolved conflict content from the torn-down rebase or merge:\n" + residual.map((p) => `  ${p}`).join("\n") + '\n\nThe repo is no longer wedged, so nothing else is blocked. Nothing was applied to ~/.claude/: pulling now would publish that content to your live config.\n\nResolve each file above (remove any <<<<<<< / ======= / >>>>>>> markers and keep the content you want; a file left untracked was deleted upstream, so keep or delete it deliberately), commit or checkout the result, then re-run "nomad pull".',
-      { code: EXIT.CONFLICT }
-    );
-  }
-}
 function recoverForceRemote(mode, repo) {
   if (mode === "merge") {
     gitOrFatal(["merge", "--abort"], "git merge --abort", repo);
@@ -7416,6 +7403,31 @@ function recoverForceRemote(mode, repo) {
   log(buildRecoverySummary(branchName, strandedLog, untracked));
 }
 
+// src/commands.pull.recovery.unmerged.ts
+init_exit_codes();
+init_commands_pull_wedge();
+init_utils();
+function recoverUnmergedIndex(repo) {
+  const conflicted = new Set(
+    gitCapture(["diff", "--diff-filter=U", "--name-only", "-z"], repo).split("\0").filter(Boolean)
+  );
+  gitOrFatal(["reset", "--mixed", "HEAD"], "git reset --mixed HEAD", repo);
+  const { tracked, untracked } = parseDirtyPaths(repo, { untrackedAll: true });
+  const present = /* @__PURE__ */ new Set([...tracked, ...untracked]);
+  const residual = [...conflicted].filter((p) => present.has(p));
+  if (orphanedAutostashPresent(repo)) {
+    log(
+      'orphaned autostash preserved in the stash list; run "git stash pop" to restore or "git stash drop" to discard it, then re-run "nomad pull"'
+    );
+  }
+  if (residual.length > 0) {
+    die(
+      "index cleared, but these files still carry unresolved conflict content from the torn-down rebase or merge:\n" + residual.map((p) => `  ${p}`).join("\n") + '\n\nThe repo is no longer wedged, so nothing else is blocked. Nothing was applied to ~/.claude/: pulling now would publish that content to your live config.\n\nResolve each file above (remove any <<<<<<< / ======= / >>>>>>> markers and keep the content you want; a file left untracked was deleted upstream, so keep or delete it deliberately), commit or checkout the result, then re-run "nomad pull".',
+      { code: EXIT.CONFLICT }
+    );
+  }
+}
+
 // src/commands.pull.ts
 init_exit_codes();
 init_utils();
@@ -7507,7 +7519,6 @@ function runPullCore(opts = {}) {
   const divergedKeptLocal = divergenceCheckExtras(ts, dryRun ? prePostHeads : void 0);
   if (dryRun) {
     computePreview(ts, map, "pull");
-    log("dry-run complete; no mutation");
     return { tag: "dry" };
   }
   const { sections, localOnly, settingsLabel, unmapped, extrasSkipped } = buildWetPullSections(
@@ -7538,6 +7549,7 @@ function cmdPull(opts = {}) {
   try {
     const result = runPullCore(opts);
     if (result.tag === "wet") renderTree(result.sections);
+    else log("dry-run complete; nothing applied to ~/.claude/");
   } catch (err) {
     if (err instanceof NomadFatal) {
       fail(err.message);
@@ -8134,8 +8146,6 @@ import { join as join59 } from "node:path";
 init_config();
 init_color();
 init_utils();
-init_utils_fs();
-init_utils_json();
 function isNoopSync(pull, pushOutcome) {
   if (!pushOutcome.ok) return false;
   if (pull.localOnly !== 0 || pull.divergedKeptLocal !== 0) return false;
@@ -8256,19 +8266,16 @@ async function runSyncWet(verbose) {
   const pushOutcome = await runSyncPushHalf();
   renderWetSync(pull, pushOutcome, verbose);
 }
-async function runSyncDryRun(repo, backup) {
-  const ts = freshBackupTs(backup);
-  const mapPath = join59(repo, "path-map.json");
-  const map = existsSync48(mapPath) ? readPathMap(mapPath) : { projects: {} };
-  computePreview(ts, map, "pull");
+async function runSyncDryRun() {
+  runPullCore({ dryRun: true });
   log("push preview below is computed against pre-pull state (a real sync pushes after pull)");
   await runPushCore({ dryRun: true });
+  log("dry-run complete; nothing applied to ~/.claude/, nothing pushed");
 }
 async function cmdSync(opts = {}) {
   const dryRun = opts.dryRun === true;
   const verbose = opts.verbose === true;
   const repo = repoHome();
-  const backup = backupBase();
   if (!existsSync48(repo)) die(`repo not cloned at ${repo}`);
   if (!existsSync48(join59(repo, "shared", "settings.base.json"))) {
     die("repo not initialized; run 'nomad init' to scaffold");
@@ -8277,7 +8284,7 @@ async function cmdSync(opts = {}) {
   if (handle === null) process.exit(0);
   try {
     if (dryRun) {
-      await runSyncDryRun(repo, backup);
+      await runSyncDryRun();
     } else {
       await runSyncWet(verbose);
     }
@@ -9089,7 +9096,7 @@ function parseSyncArgs(argv) {
 // package.json
 var package_default = {
   name: "claude-nomad",
-  version: "0.62.3",
+  version: "0.62.4",
   type: "module",
   description: "Sync Claude Code config (~/.claude/) across machines via a private Git repo, with path remapping and per-host settings overrides.",
   keywords: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-nomad",
-  "version": "0.62.3",
+  "version": "0.62.4",
   "type": "module",
   "description": "Sync Claude Code config (~/.claude/) across machines via a private Git repo, with path remapping and per-host settings overrides.",
   "keywords": [