@mutmutco/cli 2.20.0 → 2.21.0

package/dist/main.cjs

@@ -4826,6 +4826,13 @@ function parseManifestVersion(stdout) {
     return void 0;
   }
 }
+function npmReleasedVersionArgs() {
+  return ["view", "@mutmutco/cli", "version"];
+}
+function parseNpmVersion(stdout) {
+  const v = stdout.trim();
+  return /^\d+\.\d+\.\d+(-[0-9A-Za-z.-]+)?$/.test(v) ? v : void 0;
+}
 function versionAutoUpdateAction(report, hasPluginRoot) {
   if (report.ok || report.staleAgainst !== "released") return "none";
   return hasPluginRoot ? "plugin-pull" : "npm";
@@ -7183,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]);
@@ -7387,7 +7395,7 @@ function resolveContextState(context, checkRuns, statuses) {
     if (r.name !== context) continue;
     if (r.status === "completed") {
       if (r.conclusion === "success") return "success";
-      sawFailure = true;
+      if (r.conclusion !== "skipped" && r.conclusion !== "neutral") sawFailure = true;
     }
   }
   for (const s of statuses) {
@@ -7587,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.`
@@ -7599,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");
@@ -7643,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.`
@@ -7663,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);
@@ -7682,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,
@@ -7701,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
@@ -8014,19 +8032,18 @@ async function findHotfixPr(deps, ctx, tag) {
     "list",
     "--repo",
     ctx.repo,
-    "--head",
-    hotfixBranch(tag),
     "--base",
     "main",
     "--state",
     "all",
     "--limit",
-    "1",
+    "50",
     "--json",
-    "number,state,url,mergeCommit"
+    "number,state,url,mergeCommit,headRefName"
   ]);
   const rows = JSON.parse(out || "[]");
-  return rows[0] ?? null;
+  const branch = hotfixBranch(tag);
+  return rows.filter((r) => typeof r.headRefName === "string" && (r.headRefName === branch || r.headRefName.startsWith(`${branch}-`))).sort((a, b) => (b.number ?? 0) - (a.number ?? 0))[0] ?? null;
 }
 async function resolveHotfixSource(deps, ctx, from) {
   const prMatch = /^#?(\d+)$/.exec(from.trim());
@@ -8162,9 +8179,9 @@ async function runHotfixRelease(deps, versionInput, options = {}) {
   await deps.run("git", ["merge-base", "--is-ancestor", mergedSha, "origin/main"]).catch(() => {
     throw new Error(`merged hotfix SHA ${mergedSha.slice(0, 7)} is not on origin/main \u2014 refusing to tag`);
   });
+  const tagNote = await ensureTagPushed(deps, tag, mergedSha);
   const required = await discoverRequiredCheckContexts(deps, ctx, "main");
   const checks = await waitForRequiredTrainChecks(deps, ctx, mergedSha, required);
-  const tagNote = await ensureTagPushed(deps, tag, mergedSha);
   let releaseNote;
   let releaseExists = false;
   try {
@@ -11237,6 +11254,7 @@ async function fetchReleasedVersion() {
   }
 }
 var NPM_UPDATE_TIMEOUT_MS = 12e4;
+var NPM_VIEW_TIMEOUT_MS = 15e3;
 var PLUGIN_PULL_TIMEOUT_MS = 3e4;
 async function applyVersionAutoUpdate(report, log) {
   const action = versionAutoUpdateAction(report, Boolean(process.env.CLAUDE_PLUGIN_ROOT));
@@ -11260,10 +11278,18 @@ async function applyVersionAutoUpdate(report, log) {
     return report;
   }
 }
+async function fetchNpmReleasedVersion() {
+  try {
+    const { stdout } = await runHostBin("npm", npmReleasedVersionArgs(), { timeout: NPM_VIEW_TIMEOUT_MS });
+    return parseNpmVersion(stdout);
+  } catch {
+    return void 0;
+  }
+}
 async function requireFreshTrainCli(commandName) {
   const report = buildVersionLagReport({
     currentVersion: resolveClientVersion(),
-    releasedVersion: await fetchReleasedVersion()
+    releasedVersion: await fetchNpmReleasedVersion()
   });
   if (report.ok) return;
   throw new Error(`running mmi-cli ${report.currentVersion} is stale against released ${report.releasedVersion}; run doctor/update first so ${commandName} uses the current train path`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/cli",
-  "version": "2.20.0",
+  "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",