@mutmutco/cli 2.20.1 → 2.21.0

package/dist/main.cjs

@@ -7190,6 +7190,7 @@ var ORG_SPINE_FILES = [
 function isSpinePath(path2) {
   return ORG_SPINE_FILES.includes(path2);
 }
+var RELEASE_TOLERATED_PATHS = [".gitignore"];
 async function predictMergeConflicts(deps, ours, theirs) {
   try {
     await deps.run("git", ["merge-tree", "--write-tree", "--name-only", "--no-messages", ours, theirs]);
@@ -7594,8 +7595,9 @@ async function runTrainApply(command, deps, options = {}) {
     const deployModel2 = await preflight(deps, ctx, "main", meta);
     const tag2 = requireValue(clean(await deps.run("node", ["scripts/next-version.mjs", "cycle"])), "release tag");
     const foldPaths2 = await resolveFoldPaths(deps, deployModel2);
+    const tolerated2 = [...foldPaths2, ...RELEASE_TOLERATED_PATHS];
     const predicted2 = await predictMergeConflicts(deps, "origin/main", "origin/development");
-    const predictedBlocking2 = predicted2.filter((f) => !isSpinePath(f) && !foldPaths2.includes(f));
+    const predictedBlocking2 = predicted2.filter((f) => !isSpinePath(f) && !tolerated2.includes(f));
     if (predictedBlocking2.length > 0) {
       throw new Error(
         `development -> main merge would conflict on non-spine path(s): ${predictedBlocking2.join(", ")} \u2014 no merge was started. The train is misaligned: reconcile main and development via an approved alignment PR, then rerun release.`
@@ -7606,7 +7608,7 @@ async function runTrainApply(command, deps, options = {}) {
     if (predicted2.length === 0) {
       await deps.run("git", ["merge", "development", "--no-edit"]);
     } else {
-      await mergeWithSpineResolution(deps, "development", "development -> main", "theirs", foldPaths2);
+      await mergeWithSpineResolution(deps, "development", "development -> main", "theirs", tolerated2);
     }
     const versionFold2 = await foldReleaseVersion(deps, deployModel2, tag2, foldPaths2);
     const releaseSha2 = requireValue(clean(await deps.run("git", ["rev-parse", "main"])), "release sha");
@@ -7650,8 +7652,9 @@ async function runTrainApply(command, deps, options = {}) {
   );
   const deployModel = await preflight(deps, ctx, "main", meta);
   const foldPaths = await resolveFoldPaths(deps, deployModel);
+  const tolerated = [...foldPaths, ...RELEASE_TOLERATED_PATHS];
   const predicted = await predictMergeConflicts(deps, "origin/main", "origin/rc");
-  const predictedBlocking = predicted.filter((f) => !isSpinePath(f) && !foldPaths.includes(f));
+  const predictedBlocking = predicted.filter((f) => !isSpinePath(f) && !tolerated.includes(f));
   if (predictedBlocking.length > 0) {
     throw new Error(
       `rc -> main merge would conflict on non-spine path(s): ${predictedBlocking.join(", ")} \u2014 no merge was started. The train is misaligned: reconcile main and rc via an approved alignment PR (do not hand-resolve on main), then rerun release.`
@@ -7670,7 +7673,7 @@ async function runTrainApply(command, deps, options = {}) {
   if (predicted.length === 0) {
     await deps.run("git", ["merge", "rc", "--no-edit"]);
   } else {
-    await mergeWithSpineResolution(deps, "rc", "rc -> main", "theirs", foldPaths);
+    await mergeWithSpineResolution(deps, "rc", "rc -> main", "theirs", tolerated);
   }
   const tag = requireValue(clean(await deps.run("node", ["scripts/next-version.mjs", "release"])), "release tag");
   const versionFold = await foldReleaseVersion(deps, deployModel, tag, foldPaths);
@@ -7689,6 +7692,13 @@ async function runTrainApply(command, deps, options = {}) {
   await deps.run("git", ["pull", "--ff-only", "origin", "development"]);
   await deps.run("git", ["merge", "main", "--no-edit"]);
   await deps.run("git", ["push", "origin", "development"]);
+  let rcAlignment;
+  try {
+    await deps.run("git", ["push", "origin", "main:rc"]);
+    rcAlignment = "origin/rc aligned to the released main";
+  } catch (e) {
+    rcAlignment = `rc alignment push failed \u2014 align manually with \`git push origin main:rc\`: ${e instanceof Error ? e.message : String(e)}`;
+  }
   const environments = await buildEnvironments(deps, ctx, deployModel, d.deployStatus, retirement);
   return {
     ...ctx,
@@ -7708,6 +7718,7 @@ async function runTrainApply(command, deps, options = {}) {
     rcRetirement: retirement.status,
     rcRetirementNote: retirement.note,
     rcRetirementCategory: retirement.category,
+    rcAlignment,
     announceNote,
     release: { tag, url: releaseUrl, targetSha: releaseSha },
     environments

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/cli",
-  "version": "2.20.1",
+  "version": "2.21.0",
   "description": "MMI Future CLI — delivers the org rules (whole-file), plus saga and KB access. The cross-IDE engine the plugin's SessionStart hook drives.",
   "type": "module",
   "license": "UNLICENSED",