@mutmutco/cli 3.107.1 → 3.107.3

package/dist/main.cjs

@@ -11982,6 +11982,7 @@ async function runPluginHeal(surface = detectSurface(process.env)) {
 }
 
 // src/train-apply.ts
+var TRAIN_BUMP_INTENTS = ["major", "minor", "patch"];
 function isCentralDispatchModel(model) {
   return model === "tenant-container" || model === "solo-container" || model === "static-cdn";
 }
@@ -13981,15 +13982,62 @@ async function runTrainApplyPipeline(mode, input) {
     environments
   };
 }
+async function latestLocalReleaseTag(deps) {
+  const tags = clean2(await deps.run("git", ["tag", "--list", "v*"])).split("\n");
+  let latest = { major: 0, minor: 0, patch: 0 };
+  for (const tag of tags) {
+    const m = /^v(\d+)\.(\d+)\.(\d+)$/.exec(tag.trim());
+    if (!m) continue;
+    const v = { major: +m[1], minor: +m[2], patch: +m[3] };
+    const delta = v.major - latest.major || v.minor - latest.minor || v.patch - latest.patch;
+    if (delta > 0) latest = v;
+  }
+  return latest;
+}
+async function resolveTrainBumpIntent(deps, env = process.env) {
+  const explicitIntent = (env.MMI_BUMP_INTENT ?? "").trim();
+  if (explicitIntent) {
+    if (!TRAIN_BUMP_INTENTS.includes(explicitIntent)) {
+      throw new Error("MMI_BUMP_INTENT must be one of major|minor|patch");
+    }
+    return explicitIntent;
+  }
+  const explicitVersion = (env.MMI_RELEASE_VERSION ?? "").trim();
+  if (explicitVersion) {
+    const m = /^v?(\d+)\.(\d+)\.(\d+)$/.exec(explicitVersion);
+    if (!m) throw new Error(`MMI_RELEASE_VERSION must be X.Y.Z (got ${explicitVersion})`);
+    const explicit = { major: +m[1], minor: +m[2], patch: +m[3] };
+    const latest = await latestLocalReleaseTag(deps);
+    const delta = explicit.major - latest.major || explicit.minor - latest.minor || explicit.patch - latest.patch;
+    if (delta <= 0) {
+      throw new Error(
+        `MMI_RELEASE_VERSION ${explicitVersion} must be ahead of the latest release v${latest.major}.${latest.minor}.${latest.patch}`
+      );
+    }
+    return explicit.major > latest.major ? "major" : explicit.minor > latest.minor ? "minor" : "patch";
+  }
+  try {
+    return requireValue(
+      clean2(await deps.run("node", ["scripts/next-version.mjs", "intent"])),
+      "release bump intent"
+    );
+  } catch (e) {
+    const message = e instanceof Error ? e.message : String(e);
+    const usage = /usage: next-version\.mjs <([^>]+)>/.exec(message);
+    if (usage && !usage[1].split("|").includes("intent")) {
+      throw new Error(
+        `release bump intent: this repo's seeded scripts/next-version.mjs predates the \`intent\` verb (its usage lists <${usage[1]}>), so unset-intent derivation cannot run here. Declare the intent explicitly and rerun \u2014 MMI_BUMP_INTENT=major|minor|patch (or MMI_RELEASE_VERSION=X.Y.Z for an exact target); the train then resolves it in the CLI without shelling this script. The durable fix is refreshing the seeded script from the Hub via seed propagation.`
+      );
+    }
+    throw e;
+  }
+}
 async function runTrainApply(command, deps, options = {}) {
   const watch = options.watch ?? false;
   const ctx = await buildTrainApplyContext(deps);
   await requireCleanTree(deps);
   await runGitRemoteRead(deps, ["fetch", "origin"]);
-  const bumpIntent = requireValue(
-    clean2(await deps.run("node", ["scripts/next-version.mjs", "intent"])),
-    "release bump intent"
-  );
+  const bumpIntent = await resolveTrainBumpIntent(deps);
   const meta = requireProjectMetaForTrain(await loadProjectMeta(deps, ctx), ctx.repo);
   const branchHints = await loadReleaseTrackBranchHints(deps);
   const directTrack = isHubControlRepo(ctx.repo) || resolveReleaseTrack(meta, branchHints) === "direct";
@@ -22447,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"]);
@@ -22491,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",
@@ -22562,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)`;
@@ -22585,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",
@@ -22612,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 = {}) {
@@ -22743,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.1",
+  "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",