claude-nomad 0.18.0 → 0.20.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.20.0](https://github.com/funkadelic/claude-nomad/compare/v0.19.0...v0.20.0) (2026-05-22)
+
+
+### Added
+
+* **update:** prompted auto-resolve for release-please artifact conflicts ([#98](https://github.com/funkadelic/claude-nomad/issues/98)) ([958cbf1](https://github.com/funkadelic/claude-nomad/commit/958cbf19839f1bda8ad0e25db0bb8495a88c2ee9))
+
+## [0.19.0](https://github.com/funkadelic/claude-nomad/compare/v0.18.0...v0.19.0) (2026-05-22)
+
+
+### Added
+
+* **update:** auto-resolve sole package-lock.json merge conflict ([#96](https://github.com/funkadelic/claude-nomad/issues/96)) ([8d76be9](https://github.com/funkadelic/claude-nomad/commit/8d76be9791b427484d709d97a5d077539c0f9f1a))
+
 ## [0.18.0](https://github.com/funkadelic/claude-nomad/compare/v0.17.2...v0.18.0) (2026-05-22)
 
 

package/package.json

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

package/src/commands.update.ts

@@ -160,13 +160,109 @@ function reinstallIfNeeded(beforeSha: string): void {
  * today.
  *
  * @param opts - Update options; only `dryRun` is observed for this topology.
+ * @returns `true` when this path already ran `npm install` and committed the merged lockfile (so the caller should skip `reinstallIfNeeded`). Vanilla `--ff-only` pulls never conflict, so this is always `false`.
  */
-function runVanilla(opts: CmdUpdateOpts): void {
+function runVanilla(opts: CmdUpdateOpts): boolean {
   if (opts.dryRun === true) {
     log('DRY-RUN: would run `git pull --ff-only origin main`');
-    return;
+    return false;
   }
   gitOrFatal(['pull', '--ff-only', 'origin', 'main'], 'git pull', REPO_HOME);
+  return false;
+}
+
+/**
+ * Files release-please touches as a set on every release commit. Multi-file
+ * merge conflicts in `nomad update` that consist entirely of paths from this
+ * set are diagnostic for a release landing upstream while the mirror has its
+ * own local commits on these artifacts. Taking upstream is the canonical
+ * resolution (these are all generated artifacts the user has no business
+ * editing on a mirror), but multi-file is more aggressive than the lone
+ * lockfile case so we prompt before mutating.
+ */
+const RELEASE_PLEASE_ARTIFACTS: ReadonlySet<string> = new Set([
+  'package.json',
+  'package-lock.json',
+  'CHANGELOG.md',
+  '.release-please-manifest.json',
+]);
+
+/**
+ * Resolve a merge conflict by taking upstream's version of every listed path,
+ * regenerating the lockfile via `npm install`, and committing the merge.
+ * Shared body for the lone-lockfile auto-resolve and the release-please
+ * multi-file prompted auto-resolve.
+ *
+ * @param paths - Unmerged paths to resolve via `git checkout --theirs`.
+ */
+function resolveByTakingTheirs(paths: readonly string[]): void {
+  for (const p of paths) {
+    gitOrFatal(['checkout', '--theirs', '--', p], `git checkout --theirs ${p}`, REPO_HOME);
+  }
+  gitOrFatal(['add', ...paths], `git add ${paths.join(' ')}`, REPO_HOME);
+  execFileSync('npm', ['install'], { cwd: REPO_HOME, stdio: 'inherit' });
+  gitOrFatal(['add', 'package-lock.json'], 'git add package-lock.json', REPO_HOME);
+  gitOrFatal(['commit', '--no-edit'], 'git commit --no-edit', REPO_HOME);
+  log(`auto-resolved merge conflict (took upstream for ${paths.join(', ')}, reinstalled)`);
+}
+
+/**
+ * Auto-resolve a merge conflict in the two scenarios both caused by
+ * release-please landing upstream while the mirror has local commits:
+ *
+ * 1. **Sole `package-lock.json`** (silent): the lone-lockfile case from PR
+ *    #96. Any host that has run `npm install` against the mirror will hit
+ *    this on the next `nomad update`; take upstream + reinstall is the
+ *    semantically-correct fix and surprise-free for a generated artifact.
+ *
+ * 2. **All paths in `RELEASE_PLEASE_ARTIFACTS` and more than one path**
+ *    (prompted): a release commit conflicting on `package.json`,
+ *    `CHANGELOG.md`, `.release-please-manifest.json` together with the
+ *    lockfile. Same semantic resolution, but more files are touched so we
+ *    require explicit y/N consent before mutating.
+ *
+ * Returns `false` for any other conflict shape (including probe failure);
+ * the caller re-throws the original merge `NomadFatal` unchanged.
+ *
+ * @param opts - Update options; only `prompt` is consulted (used for the multi-file release-please consent prompt).
+ * @returns `true` when the conflict was auto-resolved and the merge committed; `false` when the conflict shape does not match either auto-resolve case (caller should re-throw the original failure).
+ */
+function tryAutoResolveMergeConflict(opts: CmdUpdateOpts): boolean {
+  let unmerged: string[];
+  try {
+    unmerged = execFileSync('git', ['diff', '--name-only', '--diff-filter=U'], {
+      cwd: REPO_HOME,
+      stdio: ['ignore', 'pipe', 'pipe'],
+    })
+      .toString()
+      .split('\n')
+      .filter((line) => line !== '');
+  } catch {
+    // Probe failure must not mask the original merge NomadFatal. Returning
+    // false lets the caller re-throw the merge error unchanged.
+    return false;
+  }
+
+  if (unmerged.length === 1 && unmerged[0] === 'package-lock.json') {
+    resolveByTakingTheirs(['package-lock.json']);
+    return true;
+  }
+
+  if (unmerged.length > 1 && unmerged.every((p) => RELEASE_PLEASE_ARTIFACTS.has(p))) {
+    const promptFn = opts.prompt ?? defaultPrompt;
+    log(`merge conflict in release-please artifacts: ${unmerged.join(', ')}`);
+    const answer = promptFn(
+      'Auto-resolve by taking upstream + `npm install` + commit? [y/N] ',
+    ).toLowerCase();
+    if (answer !== 'y' && answer !== 'yes') {
+      log('skipping auto-resolve (resolve manually then re-run `nomad update`)');
+      return false;
+    }
+    resolveByTakingTheirs(unmerged);
+    return true;
+  }
+
+  return false;
 }
 
 /**
@@ -186,7 +282,7 @@ function runVanilla(opts: CmdUpdateOpts): void {
  *   - `pushOrigin`: when true, push to `origin/main` without prompting
  *   - `prompt`: optional prompt function used for interactive confirmation
  */
-function runFork(opts: CmdUpdateOpts): void {
+function runFork(opts: CmdUpdateOpts): boolean {
   const promptFn = opts.prompt ?? defaultPrompt;
   if (opts.dryRun === true) {
     log('DRY-RUN: would run `git fetch upstream`');
@@ -196,13 +292,19 @@ function runFork(opts: CmdUpdateOpts): void {
     } else {
       log('DRY-RUN: would prompt before pushing to origin/main');
     }
-    return;
+    return false;
   }
   gitOrFatal(['fetch', 'upstream'], 'git fetch upstream', REPO_HOME);
-  gitOrFatal(['merge', 'upstream/main'], 'git merge upstream/main', REPO_HOME);
+  let autoResolved = false;
+  try {
+    gitOrFatal(['merge', 'upstream/main'], 'git merge upstream/main', REPO_HOME);
+  } catch (err) {
+    if (!tryAutoResolveMergeConflict(opts)) throw err;
+    autoResolved = true;
+  }
   if (opts.pushOrigin === true) {
     gitOrFatal(['push', 'origin', 'main'], 'git push origin main', REPO_HOME);
-    return;
+    return autoResolved;
   }
   const answer = promptFn(
     'Push merge to origin/main? (y publishes to your private mirror so other hosts see it; N keeps it local) [y/N] ',
@@ -212,6 +314,7 @@ function runFork(opts: CmdUpdateOpts): void {
   } else {
     log('skipping push to origin (run `git push origin main` later)');
   }
+  return autoResolved;
 }
 
 /**
@@ -273,9 +376,8 @@ export function cmdUpdate(opts: CmdUpdateOpts = {}): void {
   }
 
   const beforeSha = headSha();
-  if (topology === 'vanilla') runVanilla(opts);
-  else runFork(opts);
+  const installAlreadyRan = topology === 'vanilla' ? runVanilla(opts) : runFork(opts);
 
-  reinstallIfNeeded(beforeSha);
+  if (!installAlreadyRan) reinstallIfNeeded(beforeSha);
   cmdDoctor();
 }