@mutmutco/cli 3.0.0 → 3.0.1

package/dist/main.cjs

@@ -9684,6 +9684,12 @@ async function foldReleaseVersion(deps, model, tag, foldPaths) {
   for (const path2 of foldPaths) {
     await deps.run("git", ["add", "--", path2]).catch(() => void 0);
   }
+  const strayVersionEdits = (await deps.run("git", ["diff", "--name-only"])).split("\n").map((s) => s.trim()).filter(Boolean);
+  if (strayVersionEdits.length > 0) {
+    throw new Error(
+      `version fold left tracked changes outside the fold set uncommitted: ${strayVersionEdits.join(", ")}. The repo's \`version\` script modified paths the train does not stage (fold set: ${foldPaths.join(", ") || "(none)"}). Add them to that script's git-add list (or the fold set) so the release commit is complete \u2014 shipping now would tag a main whose version-lockstep check is red.`
+    );
+  }
   const staged = (await deps.run("git", ["diff", "--cached", "--name-only"])).trim();
   if (!staged) return `version fold: manifests already at ${version} \u2014 nothing committed`;
   await deps.run("git", ["commit", "-m", `chore(release): bump distribution to ${tag}`]);
@@ -10068,7 +10074,7 @@ async function rollDevelopmentForward(deps, ctx, tag) {
       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\``
+      note: `alignment PR already open: ${existing.url} \u2014 land it with \`mmi-cli pr merge ${existing.number} --auto --merge\``
     };
   }
   const ahead = clean(await deps.run("git", ["rev-list", "--count", "origin/development..main"]));
@@ -10077,14 +10083,14 @@ async function rollDevelopmentForward(deps, ctx, tag) {
   }
   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.`;
+\`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** \u2014 \`mmi-cli pr merge <n> --auto --merge\` (not squash) so the merge parentage survives and the misalignment guard stays satisfied. \`--auto\` waits out the checks this PR triggers, which otherwise block an immediate merge right after the release.`;
   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\``
+    note: `development requires checks (${required.join(", ")}); opened alignment PR ${url || "(url unavailable)"} \u2014 land it with \`mmi-cli pr merge ${number ?? "<number>"} --auto --merge\``
   };
 }
 function resolveContextState(context, checkRuns, statuses) {
@@ -19625,7 +19631,7 @@ function renderTrainApply(commandName, r) {
   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}`;
+    base = f.status === "pr-pending" ? `${base}; dev roll-forward: ALIGNMENT PR PENDING \u2014 land it with \`mmi-cli pr merge ${f.prNumber ?? "<number>"} --auto --merge\`${f.prUrl ? ` (${f.prUrl})` : ""}` : `${base}; dev roll-forward: ${f.note}`;
   }
   if (r.checkout) {
     base = `${base}; checkout: ${r.checkout.note}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/cli",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "MMI Future CLI — the org dev toolbox (board, registry, keyless secrets, release train, bootstrap, doctor) and the cross-IDE engine the plugin's session-start hook drives.",
   "type": "module",
   "license": "UNLICENSED",