@mutmutco/cli 3.48.0 → 3.48.1

package/dist/main.cjs

@@ -14506,6 +14506,24 @@ async function deriveHotfixVersion(deps) {
 function hotfixBranch(tag) {
   return `hotfix/${tag}`;
 }
+async function restoreAfterFailedPort(deps, opts) {
+  const { startBranch, branch, created } = opts;
+  if (!startBranch || startBranch === "HEAD" || startBranch === branch) {
+    return `Local state left as-is (could not determine the branch to return to).`;
+  }
+  try {
+    await deps.run("git", ["checkout", startBranch]);
+  } catch {
+    return `Could NOT return to ${startBranch} \u2014 the checkout is still on ${branch} (origin/main content); switch back before editing anything.`;
+  }
+  if (!created) return `Returned to ${startBranch}; the pre-existing local ${branch} was left in place.`;
+  try {
+    await deps.run("git", ["branch", "-D", branch]);
+    return `Returned to ${startBranch} and removed the local ${branch}.`;
+  } catch {
+    return `Returned to ${startBranch}; the local ${branch} could not be removed \u2014 delete it by hand.`;
+  }
+}
 async function resolveHotfixDeployModel(deps, ctx) {
   const load = await loadProjectMeta(deps, ctx);
   const meta = requireProjectMetaForTrain(load, ctx.repo);
@@ -14604,12 +14622,17 @@ 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 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"]);
     try {
       await deps.run("git", ["cherry-pick", "-x", sha]);
     } catch (e) {
       await deps.run("git", ["cherry-pick", "--abort"]);
-      throw new Error(`cherry-pick of ${label} onto ${branch} conflicted \u2014 aborted; resolve by hand on a manual hotfix branch, keeping the -x trailer (${e.message ?? e})`);
+      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})`
+      );
     }
     notes.push(`cherry-picked ${label} onto ${branch} (from origin/main, -x trailer recorded)`);
     if (deployModel === "hub-serverless") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/cli",
-  "version": "3.48.0",
+  "version": "3.48.1",
   "description": "MMI Future CLI — the org dev toolbox (board, registry, keyless secrets, release train, bootstrap, doctor) and the cross-IDE engine the plugin's session-start hook drives.",
   "type": "module",
   "license": "UNLICENSED",