@mutmutco/cli 2.3.0 → 2.5.1

package/dist/index.cjs

@@ -4255,6 +4255,26 @@ function parseWorktreePorcelain(stdout) {
   }
   return out;
 }
+function samePath(a, b) {
+  return a.replace(/\\/g, "/").replace(/\/+$/, "").toLowerCase() === b.replace(/\\/g, "/").replace(/\/+$/, "").toLowerCase();
+}
+function selectPrMergeCleanupWorktree(branch, before, after, startingPath) {
+  if (!branch) return void 0;
+  const current = after.find((w) => w.branch === branch)?.path;
+  if (current) return current;
+  const previous = before.find((w) => w.branch === branch)?.path;
+  if (previous) return previous;
+  if (startingPath && before.some((w) => w.branch === branch && samePath(w.path, startingPath))) return startingPath;
+  return void 0;
+}
+function selectSafeWorktreeCwd(worktrees, targetPath) {
+  if (!targetPath) return void 0;
+  return worktrees.find((w) => !samePath(w.path, targetPath))?.path;
+}
+function branchMissingFromList(branch, stdout) {
+  const names = stdout.split(/\r?\n/).map((line) => line.replace(/^\*\s*/, "").trim()).filter(Boolean);
+  return !names.includes(branch);
+}
 function formatGcPlan(plan2, apply) {
   const lines = [`mmi-cli gc: ${apply ? "apply" : "dry-run"}`];
   if (!plan2.branches.length && !plan2.trackingRefs.length) lines.push("nothing to clean");
@@ -4705,9 +4725,9 @@ function requireValue(value, label) {
 function releaseTagFromRcTag(tag) {
   return tag.replace(/-rc\.\d+$/, "");
 }
-async function verifyHubDistributionIfChanged(deps, model, releaseTag) {
+async function verifyHubDistributionVersion(deps, model, releaseTag) {
   if (model !== "hub-serverless") return;
-  await deps.run("node", ["scripts/release-distribution.mjs", "verify-if-changed", releaseTag, "--skip-npm-view"]);
+  await deps.run("node", ["scripts/release-distribution.mjs", "verify", releaseTag, "--skip-npm-view"]);
 }
 function ensurePositiveCount(out, emptyMessage) {
   const count = Number.parseInt(out.trim(), 10);
@@ -4792,7 +4812,7 @@ async function runTrainApply(command, deps) {
     );
     const deployModel2 = await preflight(deps, ctx, "rc");
     const tag2 = requireValue(clean(await deps.run("node", ["scripts/next-version.mjs", "rc"])), "rc tag");
-    await verifyHubDistributionIfChanged(deps, deployModel2, releaseTagFromRcTag(tag2));
+    await verifyHubDistributionVersion(deps, deployModel2, releaseTagFromRcTag(tag2));
     await deps.run("git", ["checkout", "rc"]);
     await deps.run("git", ["pull", "--ff-only", "origin", "rc"]);
     await deps.run("git", ["merge", "development", "--no-edit"]);
@@ -4812,7 +4832,7 @@ async function runTrainApply(command, deps) {
   await deps.run("git", ["pull", "--ff-only", "origin", "main"]);
   await deps.run("git", ["merge", "rc", "--no-edit"]);
   const tag = requireValue(clean(await deps.run("node", ["scripts/next-version.mjs", "release"])), "release tag");
-  await verifyHubDistributionIfChanged(deps, deployModel, tag);
+  await verifyHubDistributionVersion(deps, deployModel, tag);
   await deps.run("git", ["tag", tag]);
   await deps.run("git", ["push", "origin", "main"]);
   await deps.run("git", ["push", "origin", tag]);
@@ -6312,24 +6332,31 @@ async function applyGcPlan(plan2, remote) {
     await execFileP3("git", ["worktree", "prune"], { timeout: GIT_TIMEOUT_MS });
   }
 }
-async function cleanupLocalBranch(branch) {
+async function cleanupLocalBranch(branch, before = {}) {
   const result = { branchDeleted: false };
   if (!branch) return result;
   const { stdout } = await execFileP3("git", ["worktree", "list", "--porcelain"], { timeout: GIT_TIMEOUT_MS });
-  const wt = parseWorktreePorcelain(stdout).find((w) => w.branch === branch);
-  if (wt) {
-    await execFileP3("git", ["worktree", "remove", "--force", wt.path], { timeout: GIT_TIMEOUT_MS }).catch(() => {
+  const afterWorktrees = parseWorktreePorcelain(stdout);
+  const wtPath = selectPrMergeCleanupWorktree(branch, before.worktrees ?? [], afterWorktrees, before.startingPath);
+  const safeCwd = selectSafeWorktreeCwd([...afterWorktrees, ...before.worktrees ?? []], wtPath);
+  const git = (args) => safeCwd ? execFileP3("git", ["-C", safeCwd, ...args], { timeout: GIT_TIMEOUT_MS }) : execFileP3("git", args, { timeout: GIT_TIMEOUT_MS });
+  if (wtPath) {
+    await git(["worktree", "remove", "--force", wtPath]).catch(() => {
     });
-    result.worktreeRemoved = wt.path;
+    result.worktreeRemoved = wtPath;
   }
-  const current = await gitOut(["rev-parse", "--abbrev-ref", "HEAD"]) || "";
+  const current = safeCwd ? ((await git(["rev-parse", "--abbrev-ref", "HEAD"]).catch(() => ({ stdout: "" }))).stdout || "").trim() : await gitOut(["rev-parse", "--abbrev-ref", "HEAD"]) || "";
   if (branch !== current) {
-    await execFileP3("git", ["branch", "-D", branch], { timeout: GIT_TIMEOUT_MS }).then(() => {
+    await git(["branch", "-D", branch]).then(() => {
       result.branchDeleted = true;
     }).catch(() => {
     });
+    if (!result.branchDeleted) {
+      const remaining = await git(["branch", "--list", branch]).catch(() => ({ stdout: "" }));
+      result.branchDeleted = branchMissingFromList(branch, remaining.stdout || "");
+    }
   }
-  if (wt) await execFileP3("git", ["worktree", "prune"], { timeout: GIT_TIMEOUT_MS }).catch(() => {
+  if (wtPath) await git(["worktree", "prune"]).catch(() => {
   });
   return result;
 }
@@ -7015,10 +7042,14 @@ pr.command("merge <number>").description("merge a PR (squash by default) and cle
   const method = o.rebase ? "--rebase" : o.merge ? "--merge" : "--squash";
   const repoArgs = o.repo ? ["--repo", o.repo] : [];
   const headRef = (await execFileP3("gh", ["pr", "view", number, ...repoArgs, "--json", "headRefName", "--jq", ".headRefName"], { timeout: GC_GH_TIMEOUT_MS })).stdout.trim();
+  const startingPath = (await execFileP3("git", ["rev-parse", "--show-toplevel"], { timeout: GIT_TIMEOUT_MS }).catch(() => ({ stdout: "" }))).stdout.trim();
+  const beforeWorktrees = parseWorktreePorcelain(
+    (await execFileP3("git", ["worktree", "list", "--porcelain"], { timeout: GIT_TIMEOUT_MS }).catch(() => ({ stdout: "" }))).stdout
+  );
   await execFileP3("gh", ["pr", "merge", number, ...repoArgs, method, "--delete-branch"], { timeout: GC_GH_TIMEOUT_MS }).catch((e) => {
     if (!/used by worktree|cannot delete branch|already been merged/i.test(String(e.message || ""))) throw e;
   });
-  const cleaned = repoArgs.length ? { branchDeleted: false } : await cleanupLocalBranch(headRef);
+  const cleaned = repoArgs.length ? { branchDeleted: false } : await cleanupLocalBranch(headRef, { worktrees: beforeWorktrees, startingPath });
   console.log(JSON.stringify({ merged: number, branch: headRef, method: method.slice(2), ...cleaned }));
 });
 async function runBoardRead(o) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/cli",
-  "version": "2.3.0",
+  "version": "2.5.1",
   "description": "MMI Future CLI — delivers the org rules (whole-file), plus saga and KB access. The cross-IDE engine the plugin's SessionStart hook drives.",
   "type": "module",
   "license": "UNLICENSED",