@mutmutco/cli 3.107.2 → 3.107.3

package/dist/main.cjs

@@ -22495,7 +22495,7 @@ async function runHotfixStart(deps, options) {
     if (!sources.some((s) => s.sha === resolved.sha)) sources.push(resolved);
   }
   const label = sources.map((s) => s.label).join(", ");
-  const foldPaths = deployModel === "hub-serverless" || deployModel === "registry-publish" ? await resolveFoldPaths(deps, deployModel) : [];
+  const foldPaths = await resolveFoldPaths(deps, deployModel);
   const pickTolerated = deployModel === "hub-serverless" || deployModel === "registry-publish" ? [...foldPaths, ...HOTFIX_SKILL_TOLERATED_ROOTS] : foldPaths;
   if (deployModel === "hub-serverless") {
     await deps.run("node", ["scripts/release-distribution.mjs", "verify-deps"]);
@@ -22539,15 +22539,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) {
+    } else if (foldPaths.length > 0) {
       const foldNote = await foldReleaseVersion(deps, deployModel, tag, foldPaths);
       notes.push(foldNote);
     } else {
-      notes.push(`distribution bump skipped (deployModel=${deployModel})`);
+      notes.push(`version fold skipped (deployModel=${deployModel} carries no version manifest \u2014 the tag is the version)`);
     }
     await deps.run("git", ["push", "-u", "origin", branch]);
   }
-  const bumpNote = deployModel === "hub-serverless" ? " with the locked distribution bump" : deployModel === "registry-publish" ? " with the package version bump" : "";
+  const bumpNote = deployModel === "hub-serverless" ? " with the locked distribution bump" : foldPaths.length > 0 ? " with the package version bump" : "";
   const prUrl = clean3(await deps.run("gh", [
     "pr",
     "create",
@@ -22610,6 +22610,15 @@ async function watchReleaseRun(deps, ctx, workflow, sha) {
 function devFoldBranch(tag) {
   return `hotfix-fold/${tag}`;
 }
+function devFoldScratchBranch(tag, deps) {
+  return `${devFoldBranch(tag)}--port-${(deps.now ?? Date.now)().toString(36)}`;
+}
+async function reapFoldScratchBranches(deps) {
+  const listed = await deps.run("git", ["branch", "--list", "hotfix-fold/*--port-*", "--format=%(refname:short)"]).catch(() => "");
+  for (const name of listed.split("\n").map((s) => s.trim()).filter(Boolean)) {
+    await deps.run("git", ["branch", "-D", name]).catch(() => void 0);
+  }
+}
 async function portFoldToDevelopment(deps, ctx, deployModel, tag) {
   const foldPaths = deployModel === "hub-serverless" || deployModel === "registry-publish" ? await resolveFoldPaths(deps, deployModel) : [];
   if (foldPaths.length === 0) return `fold port skipped (deployModel=${deployModel} folds no version manifest)`;
@@ -22633,14 +22642,16 @@ async function portFoldToDevelopment(deps, ctx, deployModel, tag) {
   const existing = JSON.parse(listed || "[]").filter((r) => r.state === "OPEN" || r.state === "MERGED").sort((a, b) => (b.number ?? 0) - (a.number ?? 0))[0];
   if (existing) return `development fold PR #${existing.number} for ${tag} is ${existing.state} \u2014 reused`;
   const previousRef = clean3(await deps.run("git", ["rev-parse", "--abbrev-ref", "HEAD"]));
+  await reapFoldScratchBranches(deps);
+  const scratch = devFoldScratchBranch(tag, deps);
   try {
     await deps.run("git", ["fetch", "origin", "development"]);
-    await deps.run("git", ["checkout", "-B", branch, "origin/development"]);
+    await deps.run("git", ["checkout", "-B", scratch, "origin/development"]);
     const durableSource = clean3(await deps.run("git", ["merge-base", "HEAD", "origin/development"]));
     const foldNote = await foldReleaseVersion(deps, deployModel, tag, foldPaths, durableSource, false);
     const committed = clean3(await deps.run("git", ["rev-list", "--count", "origin/development..HEAD"]));
     if (committed === "0") return `development already carries ${tag} \u2014 no fold PR needed (${foldNote})`;
-    await deps.run("git", ["push", "-u", "origin", branch]);
+    await deps.run("git", ["push", "origin", `${scratch}:refs/heads/${branch}`]);
     const prUrl = clean3(await deps.run("gh", [
       "pr",
       "create",
@@ -22660,6 +22671,7 @@ Generated by \`mmi-cli hotfix release\` \u2014 no main-parented commit is merged
     return `opened development fold PR ${prUrl} (${foldNote})`;
   } finally {
     if (previousRef && previousRef !== "HEAD") await deps.run("git", ["checkout", previousRef]).catch(() => void 0);
+    await deps.run("git", ["branch", "-D", scratch]).catch(() => void 0);
   }
 }
 async function runHotfixRelease(deps, versionInput, options = {}) {
@@ -22791,7 +22803,7 @@ async function runHotfixRelease(deps, versionInput, options = {}) {
   try {
     foldNote = await portFoldToDevelopment(deps, ctx, deployModel, tag);
   } catch (e) {
-    foldNote = `development fold port FAILED: ${e.message ?? e} \u2014 the release stands; port it by hand: git checkout -B ${devFoldBranch(tag)} origin/development && node scripts/release-distribution.mjs prepare ${version}, then open a development-base PR`;
+    foldNote = `development fold port FAILED: ${e.message ?? e} \u2014 the release stands; port it by hand on a fresh branch: git checkout -B ${devFoldBranch(tag)}-manual origin/development && node scripts/release-distribution.mjs prepare ${version}, then push it as the canonical head (git push origin ${devFoldBranch(tag)}-manual:refs/heads/${devFoldBranch(tag)}) and open a development-base PR`;
   }
   return {
     ...ctx,

package/package.json

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