@mutmutco/cli 2.28.0 → 2.28.1

package/dist/main.cjs

@@ -7597,6 +7597,51 @@ async function discoverRequiredCheckContexts(deps, ctx, branch) {
   }
   return [...contexts];
 }
+async function findOpenAlignmentPr(deps, ctx) {
+  const out = clean(await deps.run("gh", ["pr", "list", "--repo", ctx.repo, "--base", "development", "--head", "main", "--state", "open", "--json", "number,url"]));
+  if (!out) return void 0;
+  const rows = JSON.parse(out);
+  const row = rows.find((r) => typeof r.number === "number" && typeof r.url === "string");
+  return row ? { number: row.number, url: row.url } : void 0;
+}
+function parsePrNumber(url) {
+  const n = Number.parseInt(url.split("/").pop() ?? "", 10);
+  return Number.isFinite(n) ? n : void 0;
+}
+async function rollDevelopmentForward(deps, ctx, tag) {
+  const required = await discoverRequiredCheckContexts(deps, ctx, "development");
+  if (required.length === 0) {
+    await deps.run("git", ["checkout", "development"]);
+    await deps.run("git", ["pull", "--ff-only", "origin", "development"]);
+    await deps.run("git", ["merge", "main", "--no-edit"]);
+    await deps.run("git", ["push", "origin", "development"]);
+    return { status: "pushed", note: "development rolled forward to the released main (development has no required checks)" };
+  }
+  const existing = await findOpenAlignmentPr(deps, ctx);
+  if (existing) {
+    return {
+      status: "pr-pending",
+      prNumber: existing.number,
+      prUrl: existing.url,
+      note: `alignment PR already open: ${existing.url} \u2014 land it with \`gh pr merge ${existing.number} --merge\``
+    };
+  }
+  const ahead = clean(await deps.run("git", ["rev-list", "--count", "origin/development..main"]));
+  if (ahead === "0") {
+    return { status: "aligned", note: "development already contains the released main; nothing to roll forward" };
+  }
+  const body = `Carries the ${tag} release (including the version fold) from \`main\` back to \`development\`.
+
+\`development\` requires status checks, so the release train opens this alignment PR instead of a direct push of the un-checked merge commit (#1143). Land it with a **true merge** (\`gh pr merge --merge\`, not squash) so the merge parentage survives and the misalignment guard stays satisfied.`;
+  const url = clean(await deps.run("gh", ["pr", "create", "--repo", ctx.repo, "--base", "development", "--head", "main", "--title", `chore(release): align development to ${tag}`, "--body", body]));
+  const number = parsePrNumber(url);
+  return {
+    status: "pr-pending",
+    prNumber: number,
+    prUrl: url || void 0,
+    note: `development requires checks (${required.join(", ")}); opened alignment PR ${url || "(url unavailable)"} \u2014 land it with \`gh pr merge ${number ?? "<number>"} --merge\``
+  };
+}
 function resolveContextState(context, checkRuns, statuses) {
   let sawFailure = false;
   for (const r of checkRuns) {
@@ -7855,10 +7900,7 @@ async function runTrainApply(command, deps, options = {}) {
     const announceNote2 = deps.announce ? (await deps.announce({ repo: ctx.repo, tag: tag2, summaryFile: options.announceSummaryFile })).note : void 0;
     const autoRunSince2 = (deps.now ?? Date.now)();
     const d2 = await dispatchDeploy(deps, ctx, "main", "main", deployModel2, watch, autoRunSince2, releaseSha2, "report");
-    await deps.run("git", ["checkout", "development"]);
-    await deps.run("git", ["pull", "--ff-only", "origin", "development"]);
-    await deps.run("git", ["merge", "main", "--no-edit"]);
-    await deps.run("git", ["push", "origin", "development"]);
+    const devRollForward2 = await rollDevelopmentForward(deps, ctx, tag2);
     return {
       ...ctx,
       command,
@@ -7876,6 +7918,7 @@ async function runTrainApply(command, deps, options = {}) {
       deployStatus: d2.deployStatus,
       rcRetirement: "not-applicable",
       rcRetirementNote: "direct-track release skips rc; no rc runtime to retire",
+      devRollForward: devRollForward2,
       announceNote: announceNote2,
       // #1062: --dev on a direct-track repo is a friendly no-op — it already releases from development.
       devNote: options.dev ? "--dev is a no-op on a direct-track repo \u2014 it already releases development -> main" : void 0,
@@ -7927,10 +7970,7 @@ async function runTrainApply(command, deps, options = {}) {
     const autoRunSince2 = (deps.now ?? Date.now)();
     const d2 = await dispatchDeploy(deps, ctx, "main", "main", deployModel2, watch, autoRunSince2, releaseSha2, "report");
     const retirement2 = await retireRcRuntime(deps, ctx, deployModel2, d2.deployStatus, rcShaAtRelease);
-    await deps.run("git", ["checkout", "development"]);
-    await deps.run("git", ["pull", "--ff-only", "origin", "development"]);
-    await deps.run("git", ["merge", "main", "--no-edit"]);
-    await deps.run("git", ["push", "origin", "development"]);
+    const devRollForward2 = await rollDevelopmentForward(deps, ctx, tag2);
     let rcAlignment2;
     try {
       await deps.run("git", ["push", "origin", "main:rc"]);
@@ -7958,6 +7998,7 @@ async function runTrainApply(command, deps, options = {}) {
       rcRetirementNote: retirement2.note,
       rcRetirementCategory: retirement2.category,
       rcAlignment: rcAlignment2,
+      devRollForward: devRollForward2,
       announceNote: announceNote2,
       devNote: "released development -> main (--dev), skipping the rc candidate",
       release: { tag: tag2, url: releaseUrl2, targetSha: releaseSha2 },
@@ -8007,10 +8048,7 @@ async function runTrainApply(command, deps, options = {}) {
   const announceNote = deps.announce ? (await deps.announce({ repo: ctx.repo, tag, summaryFile: options.announceSummaryFile })).note : void 0;
   const d = await dispatchDeploy(deps, ctx, "main", "main", deployModel, watch, autoRunSince, releaseSha, "report");
   const retirement = await retireRcRuntime(deps, ctx, deployModel, d.deployStatus, releasedRcSha);
-  await deps.run("git", ["checkout", "development"]);
-  await deps.run("git", ["pull", "--ff-only", "origin", "development"]);
-  await deps.run("git", ["merge", "main", "--no-edit"]);
-  await deps.run("git", ["push", "origin", "development"]);
+  const devRollForward = await rollDevelopmentForward(deps, ctx, tag);
   let rcAlignment;
   try {
     await deps.run("git", ["push", "origin", "main:rc"]);
@@ -8038,6 +8076,7 @@ async function runTrainApply(command, deps, options = {}) {
     rcRetirementNote: retirement.note,
     rcRetirementCategory: retirement.category,
     rcAlignment,
+    devRollForward,
     announceNote,
     release: { tag, url: releaseUrl, targetSha: releaseSha },
     environments
@@ -13212,6 +13251,10 @@ function renderTrainApply(commandName, r) {
   if (r.resumeNote) base = `${base}; ${r.resumeNote}`;
   if (r.devNote) base = `${base}; ${r.devNote}`;
   if (r.rcRetirement) base = `${base}; rc retirement: ${r.rcRetirement.toUpperCase()} (${r.rcRetirementNote ?? ""})`;
+  if (r.devRollForward) {
+    const f = r.devRollForward;
+    base = f.status === "pr-pending" ? `${base}; dev roll-forward: ALIGNMENT PR PENDING \u2014 land it with \`gh pr merge ${f.prNumber ?? "<number>"} --merge\`${f.prUrl ? ` (${f.prUrl})` : ""}` : `${base}; dev roll-forward: ${f.note}`;
+  }
   return r.announceNote ? `${base}; announce: ${r.announceNote}` : base;
 }
 function renderTenantRedeploy(r) {

package/package.json

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