@mutmutco/cli 3.105.3 → 3.105.4

package/dist/main.cjs

@@ -20425,6 +20425,14 @@ async function hotfixBaseTagForRelease(deps, tag) {
   const current = normalizeHotfixVersion(tag).tag;
   return tags.find((t) => compareHotfixVersions(t, current) < 0) ?? tags.find((t) => t !== current) ?? "origin/main^";
 }
+async function hotfixReleaseExists(deps, ctx, tag) {
+  try {
+    await deps.run("gh", ["release", "view", tag, "--repo", ctx.repo, "--json", "tagName"]);
+    return true;
+  } catch {
+    return false;
+  }
+}
 async function runHotfixStart(deps, options) {
   const ctx = await buildTrainApplyContext(deps);
   const deployModel = await resolveHotfixDeployModel(deps, ctx);
@@ -20437,7 +20445,11 @@ async function runHotfixStart(deps, options) {
   const branch = hotfixBranch(tag);
   const notes = [];
   const existingPr = await findHotfixPr(deps, ctx, tag);
-  if (existingPr) {
+  const existingState = (existingPr?.state ?? "").toUpperCase();
+  const releaseExists = existingState === "MERGED" ? await hotfixReleaseExists(deps, ctx, tag) : false;
+  const reusable = existingState === "OPEN" || existingState === "MERGED" && releaseExists;
+  if (existingPr && reusable) {
+    const next = existingState === "MERGED" ? `next: mmi-cli hotfix release ${tag}` : `next: merge it, then mmi-cli hotfix release ${tag}`;
     return {
       ...ctx,
       command: "hotfix-start",
@@ -20447,9 +20459,18 @@ async function runHotfixStart(deps, options) {
       source: options.from,
       prUrl: existingPr.url,
       reused: true,
-      notes: [`hotfix PR for ${tag} already exists (#${existingPr.number}, ${existingPr.state}) \u2014 reused; next: merge it, then mmi-cli hotfix release ${tag}`]
+      notes: [`hotfix PR for ${tag} already exists (#${existingPr.number}, ${existingPr.state}) \u2014 reused; ${next}`]
     };
   }
+  if (existingPr) {
+    const reason = existingState === "MERGED" && !releaseExists ? `MERGED with no GitHub Release for ${tag} \u2014 recreating ${branch} from origin/main (#4381/#4383)` : `${existingPr.state} \u2014 recreating ${branch} from origin/main (#4369)`;
+    notes.push(`prior hotfix PR #${existingPr.number} is ${reason}`);
+    const staleRemote = clean3(await deps.run("git", ["ls-remote", "origin", `refs/heads/${branch}`]));
+    if (staleRemote) {
+      await deps.run("git", ["push", "origin", "--delete", branch]);
+      notes.push(`deleted stale origin/${branch} left by the incomplete train`);
+    }
+  }
   const { sha, label } = await resolveHotfixSource(deps, ctx, options.from);
   if (deployModel === "hub-serverless") {
     await deps.run("node", ["scripts/release-distribution.mjs", "verify-deps"]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/cli",
-  "version": "3.105.3",
+  "version": "3.105.4",
   "description": "MMI Future CLI — the org dev toolbox and shared cross-IDE engine for every registry-declared MMI coding surface.",
   "type": "module",
   "license": "UNLICENSED",