@mutmutco/cli 3.105.3 → 3.105.5

package/dist/main.cjs

@@ -20341,6 +20341,51 @@ async function deriveHotfixVersion(deps) {
 function hotfixBranch(tag) {
   return `hotfix/${tag}`;
 }
+function pathIsTolerated(path2, tolerated) {
+  return tolerated.some((entry) => {
+    if (!entry) return false;
+    if (path2 === entry) return true;
+    const root = entry.endsWith("/") ? entry : `${entry}/`;
+    return path2.startsWith(root);
+  });
+}
+var HOTFIX_SKILL_TOLERATED_ROOTS = ["skills", ".kilo-plugin/skills"];
+async function cherryPickWithToleratedPaths(deps, sha, tolerated) {
+  try {
+    await deps.run("git", ["cherry-pick", "-x", sha]);
+    return [];
+  } catch (original) {
+    const unmerged = (await deps.run("git", ["diff", "--name-only", "--diff-filter=U"])).split("\n").map((s) => s.trim()).filter(Boolean);
+    const blocking = unmerged.filter((f) => !pathIsTolerated(f, tolerated));
+    if (unmerged.length === 0 || blocking.length > 0) {
+      try {
+        await deps.run("git", ["cherry-pick", "--abort"]);
+      } catch {
+      }
+      const detail = original.message ?? String(original);
+      if (unmerged.length === 0) {
+        throw new Error(`cherry-pick of ${sha.slice(0, 7)} failed without conflicted paths \u2014 ${detail}`);
+      }
+      throw new Error(
+        `cherry-pick of ${sha.slice(0, 7)} conflicted on untolerated path(s): ${blocking.join(", ")}` + (tolerated.length > 0 ? ` (regenerable paths are auto-resolved: ${tolerated.join(", ")})` : "") + ` \u2014 ${detail}`
+      );
+    }
+    await deps.run("git", ["checkout", "--theirs", "--", ...unmerged]);
+    await deps.run("git", ["add", "--", ...unmerged]);
+    try {
+      await deps.run("git", ["-c", "core.editor=true", "cherry-pick", "--continue"]);
+    } catch (contErr) {
+      try {
+        await deps.run("git", ["cherry-pick", "--abort"]);
+      } catch {
+      }
+      throw new Error(
+        `cherry-pick continue after regenerable-path resolve failed for ${unmerged.join(", ")} \u2014 ${contErr.message ?? contErr}`
+      );
+    }
+    return unmerged;
+  }
+}
 async function restoreAfterFailedPort(deps, opts) {
   const { startBranch, branch, created } = opts;
   if (!startBranch || startBranch === "HEAD" || startBranch === branch) {
@@ -20425,6 +20470,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 +20490,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,10 +20504,21 @@ 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);
+  const foldPaths = deployModel === "hub-serverless" || deployModel === "registry-publish" ? await resolveFoldPaths(deps, deployModel) : [];
+  const pickTolerated = deployModel === "hub-serverless" ? [...foldPaths, ...HOTFIX_SKILL_TOLERATED_ROOTS] : foldPaths;
   if (deployModel === "hub-serverless") {
     await deps.run("node", ["scripts/release-distribution.mjs", "verify-deps"]);
   }
@@ -20464,9 +20532,11 @@ async function runHotfixStart(deps, options) {
     const preexistingLocal = clean3(await deps.run("git", ["branch", "--list", branch]));
     await deps.run("git", ["checkout", "-B", branch, "origin/main"]);
     try {
-      await deps.run("git", ["cherry-pick", "-x", sha]);
+      const autoResolved = await cherryPickWithToleratedPaths(deps, sha, pickTolerated);
+      if (autoResolved.length > 0) {
+        notes.push(`auto-resolved regenerable cherry-pick conflict(s): ${autoResolved.join(", ")} (regenerated in bump step)`);
+      }
     } catch (e) {
-      await deps.run("git", ["cherry-pick", "--abort"]);
       const recovery = await restoreAfterFailedPort(deps, { startBranch, branch, created: !preexistingLocal });
       throw new Error(
         `cherry-pick of ${label} onto ${branch} conflicted \u2014 aborted; nothing was pushed. Land the conflict resolution on development through a normal PR, then rerun \`mmi-cli hotfix start --from <that PR's merge sha>\` \u2014 never hand-resolve the port onto main. ${recovery} (${e.message ?? e})`
@@ -20485,12 +20555,15 @@ async function runHotfixStart(deps, options) {
       } else {
         notes.push("distribution prepare produced no changes \u2014 nothing extra committed");
       }
+    } else if (deployModel === "registry-publish" && foldPaths.length > 0) {
+      const foldNote = await foldReleaseVersion(deps, deployModel, tag, foldPaths);
+      notes.push(foldNote);
     } else {
-      notes.push(`distribution bump skipped (deployModel=${deployModel}, Hub-only step)`);
+      notes.push(`distribution bump skipped (deployModel=${deployModel})`);
     }
     await deps.run("git", ["push", "-u", "origin", branch]);
   }
-  const bumpNote = deployModel === "hub-serverless" ? " with the locked distribution bump" : "";
+  const bumpNote = deployModel === "hub-serverless" ? " with the locked distribution bump" : deployModel === "registry-publish" ? " with the package version bump" : "";
   const prUrl = clean3(await deps.run("gh", [
     "pr",
     "create",

package/package.json

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