@mutmutco/cli 3.105.9 → 3.105.10

package/dist/main.cjs

@@ -20528,6 +20528,46 @@ async function cherryPickWithToleratedPaths(deps, sha, tolerated) {
     return unmerged;
   }
 }
+function parseCherryPickBlockingPaths(message) {
+  const m = /conflicted on untolerated path\(s\): ([^(]+)/.exec(message);
+  if (!m) return [];
+  return m[1].split(",").map((s) => s.trim()).filter(Boolean);
+}
+function formatHotfixBatchPreflightRefusal(failures, fromSpecs) {
+  const lines = failures.map((f) => `  - ${f.label}: ${f.blocking.join(", ")}`);
+  const batchFrom = fromSpecs.join(",");
+  return `hotfix start batch preflight refused: ${failures.length} pick(s) would hard-stop on origin/main:
+${lines.join("\n")}
+Land ONE main-clean synthesis development PR for the whole batch (cut from origin/main, resolve every listed conflict for cherry-pick onto current origin/main, land to development \u2014 pattern #4467), then rerun \`mmi-cli hotfix start --from ${batchFrom}\` with the port merge SHA(s) \u2014 never hand-resolve onto main; never N serial main-clean ports (#3167).`;
+}
+async function preflightHotfixBatchPicks(deps, sources, pickTolerated) {
+  if (sources.length === 0) return [];
+  const startBranch = clean3(await deps.run("git", ["rev-parse", "--abbrev-ref", "HEAD"]));
+  const preflightBranch = `__mmi_hotfix_preflight_${Date.now()}`;
+  const failures = [];
+  try {
+    await deps.run("git", ["checkout", "-B", preflightBranch, "origin/main"]);
+    for (const source of sources) {
+      try {
+        await cherryPickWithToleratedPaths(deps, source.sha, pickTolerated);
+      } catch (e) {
+        const message = e.message ?? String(e);
+        const blocking = parseCherryPickBlockingPaths(message);
+        failures.push({
+          label: source.label,
+          sha: source.sha,
+          blocking: blocking.length > 0 ? blocking : [message.split("\n")[0] ?? message]
+        });
+      }
+    }
+  } finally {
+    if (startBranch && startBranch !== "HEAD") {
+      await deps.run("git", ["checkout", startBranch]).catch(() => void 0);
+    }
+    await deps.run("git", ["branch", "-D", preflightBranch]).catch(() => void 0);
+  }
+  return failures;
+}
 async function restoreAfterFailedPort(deps, opts) {
   const { startBranch, branch, created } = opts;
   if (!startBranch || startBranch === "HEAD" || startBranch === branch) {
@@ -20667,7 +20707,7 @@ async function runHotfixStart(deps, options) {
   }
   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;
+  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"]);
   }
@@ -20677,6 +20717,10 @@ async function runHotfixStart(deps, options) {
     await deps.run("git", ["pull", "--ff-only", "origin", branch]);
     notes.push(`branch ${branch} already on origin \u2014 reused (cherry-pick/bump assumed present; PR step resumes)`);
   } else {
+    const preflightFailures = await preflightHotfixBatchPicks(deps, sources, pickTolerated);
+    if (preflightFailures.length > 0) {
+      throw new Error(formatHotfixBatchPreflightRefusal(preflightFailures, specs));
+    }
     const startBranch = clean3(await deps.run("git", ["rev-parse", "--abbrev-ref", "HEAD"]));
     const preexistingLocal = clean3(await deps.run("git", ["branch", "--list", branch]));
     await deps.run("git", ["checkout", "-B", branch, "origin/main"]);

package/package.json

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