@mutmutco/cli 3.105.7 → 3.105.8

package/dist/main.cjs

@@ -11392,11 +11392,11 @@ async function installAppFoldDeps(deps) {
   const hasLock = await deps.run("git", ["cat-file", "-e", "HEAD:package-lock.json"]).then(() => true).catch(() => false);
   await deps.run("npm", hasLock ? ["ci"] : ["install"]);
 }
-async function foldReleaseVersion(deps, model, tag, foldPaths) {
+async function foldReleaseVersion(deps, model, tag, foldPaths, sourceCommit = "HEAD") {
   if (foldPaths.length === 0) return "no version manifest to fold \u2014 the tag is the version";
   const version = tag.replace(/^v/, "");
   if (model === "hub-serverless") {
-    await deps.run("node", ["scripts/release-distribution.mjs", "prepare", version, "--source-commit", "HEAD"]);
+    await deps.run("node", ["scripts/release-distribution.mjs", "prepare", version, "--source-commit", sourceCommit]);
   } else {
     await installAppFoldDeps(deps);
     await deps.run("npm", ["version", version, "--no-git-tag-version", "--allow-same-version"]);
@@ -20516,7 +20516,14 @@ async function runHotfixStart(deps, options) {
       notes.push(`deleted stale origin/${branch} left by the incomplete train`);
     }
   }
-  const { sha, label } = await resolveHotfixSource(deps, ctx, options.from);
+  const specs = splitCarrySpecs([options.from]);
+  if (specs.length === 0) throw new Error("hotfix start: --from named no PR or SHA");
+  const sources = [];
+  for (const spec of specs) {
+    const resolved = await resolveHotfixSource(deps, ctx, spec);
+    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 pickTolerated = deployModel === "hub-serverless" ? [...foldPaths, ...HOTFIX_SKILL_TOLERATED_ROOTS] : foldPaths;
   if (deployModel === "hub-serverless") {
@@ -20532,9 +20539,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 {
-      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)`);
+      for (const source of sources) {
+        const autoResolved = await cherryPickWithToleratedPaths(deps, source.sha, pickTolerated);
+        if (autoResolved.length > 0) {
+          notes.push(`auto-resolved regenerable cherry-pick conflict(s) for ${source.label}: ${autoResolved.join(", ")} (regenerated in bump step)`);
+        }
       }
     } catch (e) {
       const recovery = await restoreAfterFailedPort(deps, { startBranch, branch, created: !preexistingLocal });
@@ -20575,10 +20584,12 @@ async function runHotfixStart(deps, options) {
     branch,
     "--title",
     `[hotfix] ${tag}`,
+    // Every picked sha goes in the marker (#4411) — `hotfix release` reads it when --carries is omitted,
+    // so a multi-fix cycle proves ALL of its targets present before tagging, not just the first.
     "--body",
     `Hotfix ${tag}: cherry-pick of ${label} onto origin/main${bumpNote}.
 
-<!-- mmi-hotfix-carries: ${sha} -->
+<!-- mmi-hotfix-carries: ${sources.map((s) => s.sha).join(",")} -->
 
 Merge this PR (human-initiated), then run \`mmi-cli hotfix release ${tag}\`.`
   ]));
@@ -20621,6 +20632,61 @@ async function watchReleaseRun(deps, ctx, workflow, sha) {
   }
   return { workflow, conclusion: "not-found" };
 }
+function devFoldBranch(tag) {
+  return `hotfix-fold/${tag}`;
+}
+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)`;
+  const branch = devFoldBranch(tag);
+  const listed = await deps.run("gh", [
+    "pr",
+    "list",
+    "--repo",
+    ctx.repo,
+    "--head",
+    branch,
+    "--base",
+    "development",
+    "--state",
+    "all",
+    "--limit",
+    "10",
+    "--json",
+    "number,state,url"
+  ]);
+  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"]));
+  try {
+    await deps.run("git", ["fetch", "origin", "development"]);
+    await deps.run("git", ["checkout", "-B", branch, "origin/development"]);
+    const durableSource = clean3(await deps.run("git", ["merge-base", "HEAD", "origin/development"]));
+    const foldNote = await foldReleaseVersion(deps, deployModel, tag, foldPaths, durableSource);
+    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]);
+    const prUrl = clean3(await deps.run("gh", [
+      "pr",
+      "create",
+      "--repo",
+      ctx.repo,
+      "--base",
+      "development",
+      "--head",
+      branch,
+      "--title",
+      `chore(release): port the ${tag} version fold to development`,
+      "--body",
+      `Regenerated version fold for ${tag} (#4410). \`main\` carries the released version; without this development declares the previous one and every PR into it fails catalog-lockstep.
+
+Generated by \`mmi-cli hotfix release\` \u2014 no main-parented commit is merged in, so the squash parents stay clean (#4365/#4371).`
+    ]));
+    return `opened development fold PR ${prUrl} (${foldNote})`;
+  } finally {
+    if (previousRef && previousRef !== "HEAD") await deps.run("git", ["checkout", previousRef]).catch(() => void 0);
+  }
+}
 async function runHotfixRelease(deps, versionInput, options = {}) {
   const ctx = await buildTrainApplyContext(deps);
   const deployModel = await resolveHotfixDeployModel(deps, ctx);
@@ -20746,6 +20812,12 @@ async function runHotfixRelease(deps, versionInput, options = {}) {
   } else {
     verifyNote = `distribution verify skipped (deployModel=${deployModel}, Hub-only step)`;
   }
+  let foldNote;
+  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`;
+  }
   return {
     ...ctx,
     command: "hotfix-release",
@@ -20758,6 +20830,7 @@ async function runHotfixRelease(deps, versionInput, options = {}) {
     runs,
     deployNote,
     verifyNote,
+    foldNote,
     announceNote
   };
 }
@@ -31099,8 +31172,8 @@ var LOOP_PLAYBOOKS = {
       { label: "Read the next board item", command: "mmi-cli board read" },
       { label: "Claim it and create an isolated worktree", command: "mmi-cli worktree create <issue-number> --claim --from origin/development" },
       { label: "Build and test in the touched package", command: "npm test && npm run build" },
-      { label: "Publish the branch", command: "git push -u origin HEAD" },
-      { label: "Open the development-base PR", command: 'mmi-cli pr create --title "<title>" --body-file PR_BODY.md --base development' },
+      { label: "Publish the branch", command: "git push origin <branch>:<branch>" },
+      { label: "Open the development-base PR", command: 'mmi-cli pr create --title "<title>" --body-file .jerv/PR_BODY.md --base development' },
       { label: "Wait for checks and land to development", command: "mmi-cli pr checks-wait <PR-number> && mmi-cli pr land <PR-number>" },
       { label: "Release only after the gated train is authorized", command: "mmi-cli release --apply" }
     ]
@@ -31117,8 +31190,8 @@ var LOOP_PLAYBOOKS = {
   "ship-pr": {
     title: "Ship PR",
     steps: [
-      { label: "Publish the branch", command: "git push -u origin HEAD" },
-      { label: "Open the development-base PR", command: 'mmi-cli pr create --title "<title>" --body-file PR_BODY.md --base development' },
+      { label: "Publish the branch", command: "git push origin <branch>:<branch>" },
+      { label: "Open the development-base PR", command: 'mmi-cli pr create --title "<title>" --body-file .jerv/PR_BODY.md --base development' },
       { label: "Wait for CI checks", command: "mmi-cli pr checks-wait <PR-number>" },
       { label: "Land the PR (merge to development)", command: "mmi-cli pr land <PR-number>" }
     ]
@@ -31126,9 +31199,9 @@ var LOOP_PLAYBOOKS = {
   "hotfix": {
     title: "Hotfix",
     steps: [
-      { label: "Create the main-base hotfix PR from an already-merged fix", command: "mmi-cli hotfix start --from <pr#|sha>" },
+      { label: "Create the main-base hotfix PR from every already-merged fix this cycle carries", command: "mmi-cli hotfix start --from <pr#|sha>[,<pr#|sha>...]" },
       { label: "Wait for the hotfix PR checks", command: "mmi-cli pr checks-wait <PR-number>" },
-      { label: "After the PR is merged, run the gated release", command: "mmi-cli hotfix release <vX.Y.Z> --carries <pr#|sha>" }
+      { label: "After the PR is merged, run the gated release", command: "mmi-cli hotfix release <vX.Y.Z> --carries <pr#|sha>[,<pr#|sha>...]" }
     ]
   }
 };
@@ -36747,10 +36820,11 @@ withExamples(pr.command("create").description("create a PR and print {number,url
   console.log(JSON.stringify(created));
 }), [
   'mmi-cli pr create --title "Add the schema" --body "Closes #2680"',
-  'mmi-cli pr create --title "Add the schema" --body-file PR_BODY.md --draft'
+  'mmi-cli pr create --title "Add the schema" --body-file .jerv/PR_BODY.md --draft'
 ], [
   "--head and --base default to the current branch and the repo default; only pass them to override.",
-  "Use --body-file for multiline PR bodies instead of shell-escaped inline markdown."
+  "Use --body-file for multiline PR bodies instead of shell-escaped inline markdown.",
+  "Write that file under .jerv/ inside a worktree (#4405): any other untracked path makes `worktree land` refuse cleanup as untracked-files."
 ]);
 pr.command("view <number>").description("read a PR as structured JSON (merged state, head/base, URL, merge commit) ? the mmi-cli read path (#2347). --comments folds in every comment; --context also adds linkedIssues (the issues it closes/references, #2894)").option("--repo <owner/repo>", "target repo (defaults to the current repo)").option("--json [fields...]", 'gh --json field list (overrides the default field set). Accepts commas, spaces, or repeated --json flags ? in PowerShell an unquoted comma list is an array literal, so QUOTE it: --json "state,baseRefName,mergeCommit"').option("--comments", "include every comment (body + comments in one call) ? read the whole PR before landing it (#2894)").option("--context", "full working context in one call: implies --comments and also adds linkedIssues (the issues the PR closes/references) (#2894)").action(async (number, o) => {
   const n = Number(number);
@@ -37515,7 +37589,8 @@ function renderHotfixRelease(r) {
     ...r.runs.map((run) => `  - ${run.workflow}: ${run.conclusion}${run.url ? ` (${run.url})` : ""}`),
     `  - ${r.verifyNote}`,
     ...r.announceNote ? [`  - announce: ${r.announceNote}`] : [],
-    `  - next: mmi-cli hotfix status ${r.tag} (no back-merge ? development already has the fix; the next /release back-merge aligns the version manifests)`
+    `  - fold: ${r.foldNote}`,
+    `  - next: mmi-cli hotfix status ${r.tag} (no back-merge of the FIX ? development already has it; the version fold above is ported for you, #4410)`
   ].join("\n");
 }
 function renderHotfixStatus(r) {
@@ -37547,7 +37622,7 @@ var hotfixCmd = program2.command("hotfix").description("stepwise hotfix orchestr
   const steps = trainPlan("hotfix");
   console.log(o.json ? JSON.stringify({ command: "hotfix", steps }, null, 2) : renderSteps("mmi-cli hotfix: dry-run plan", steps));
 });
-hotfixCmd.command("start").description("cherry-pick a merged development PR (or SHA) onto hotfix/vX.Y.Z from origin/main, bump the distribution, open the main-base PR").requiredOption("--from <pr#|sha>", "merged development PR number or commit SHA to cherry-pick").option("--json", "machine-readable output").action(async (o) => runHotfixSub("start", () => runHotfixStart(trainApplyDeps(), { from: o.from }), o.json, renderHotfixStart));
+hotfixCmd.command("start").description("cherry-pick one or more merged development PRs (or SHAs) onto hotfix/vX.Y.Z from origin/main, bump the distribution, open the main-base PR").requiredOption("--from <pr#|sha[,pr#|sha...]>", "merged development PR number(s) or commit SHA(s) to cherry-pick, in pick order \u2014 one hotfix cycle carries as many fixes as you name (#4411)").option("--json", "machine-readable output").action(async (o) => runHotfixSub("start", () => runHotfixStart(trainApplyDeps(), { from: o.from }), o.json, renderHotfixStart));
 hotfixCmd.command("release <version>").description("after the hotfix PR is merged + checks green: tag, GitHub Release, watch deploy/publish, verify distribution (idempotent)").option("--json", "machine-readable output").option("--announce-summary-file <path>", "agent-curated summary lines for the Hub Slack announcement (#883)").option("--carries <pr#|sha[,pr#|sha...]>", "declared fix target(s) this hotfix must carry; each must be proven present before tagging (#3056)").action(async (version, o) => runHotfixSub("release", () => runHotfixRelease(trainApplyDeps(), version, { announceSummaryFile: o.announceSummaryFile, carries: o.carries ? [o.carries] : [] }), o.json, renderHotfixRelease));
 hotfixCmd.command("status [version]").description("derive the full hotfix pipeline state from live git/gh reads and name the exact next subcommand").option("--json", "machine-readable output").action(async (version, o) => runHotfixSub("status", () => runHotfixStatus(trainApplyDeps(), version), o.json, renderHotfixStatus));
 var ci = program2.command("ci").description("org CI + merge-readiness audit and reconcile");

package/package.json

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