@mutmutco/cli 3.56.0 → 3.57.0

package/dist/main.cjs

@@ -9605,6 +9605,23 @@ function describePrMergeEnqueuedReason(checks) {
       };
   }
 }
+function decidePrMergeCleanupGate(input) {
+  const state = (input.state ?? "").trim().toUpperCase();
+  if (state === "MERGED") return { action: "cleanup" };
+  if (!state) {
+    return {
+      action: "refuse",
+      reason: "state-unreadable",
+      message: `could not read the PR's state after the merge attempt${input.stateError ? `: ${input.stateError}` : ""} \u2014 cleanup skipped because the merge is unproven`
+    };
+  }
+  if (input.autoRequested) return { action: "enqueued" };
+  return {
+    action: "refuse",
+    reason: "not-merged",
+    message: `the PR is ${state}, not MERGED \u2014 the merge did not happen, so the branch and worktree were left untouched`
+  };
+}
 function parseGhPrChecksOutput(stdout) {
   const text = stdout.trim();
   if (!text) return "no-checks-reported";
@@ -21808,6 +21825,54 @@ function formatStaleLeaks(leaks) {
 async function repoRootOf() {
   return (await execFileP2("git", ["rev-parse", "--show-toplevel"], { timeout: GIT_TIMEOUT_MS }).catch(() => ({ stdout: "" }))).stdout.trim() || process.cwd();
 }
+function decideWorktreeLandRefCleanup(input) {
+  if (input.keepRemote) return { action: "proceed" };
+  if (!input.prs) {
+    return {
+      action: "keep-remote",
+      reason: "pr-state-unreadable",
+      message: `could not read the pull-request state for '${input.branch}' \u2014 keeping the remote branch so an unmerged head ref cannot be deleted on a guess`
+    };
+  }
+  const open2 = input.prs.filter((pr2) => pr2.state.toUpperCase() === "OPEN");
+  if (open2.length) {
+    return {
+      action: "refuse",
+      reason: "open-pr",
+      message: `'${input.branch}' still has an OPEN pull request (#${open2.map((pr2) => pr2.number).join(", #")}). Deleting its head ref would auto-close the PR and leave the work on no branch. Merge it first, or re-run with --keep-remote for a local-only clean`
+    };
+  }
+  if (input.prs.length && !input.prs.some((pr2) => pr2.state.toUpperCase() === "MERGED")) {
+    return {
+      action: "refuse",
+      reason: "unmerged-pr",
+      message: `'${input.branch}' has a pull request that never merged (#${input.prs.map((pr2) => pr2.number).join(", #")}). The remote branch is the only thing still holding that work. Re-run with --keep-remote for a local-only clean`
+    };
+  }
+  return { action: "proceed" };
+}
+async function fetchLandBranchPrs(branch, repo) {
+  try {
+    const { stdout } = await execFileP2("gh", [
+      "pr",
+      "list",
+      "--head",
+      branch,
+      "--state",
+      "all",
+      "--limit",
+      "20",
+      ...repo ? ["--repo", repo] : [],
+      "--json",
+      "number,state"
+    ], { timeout: GH_TIMEOUT_MS });
+    const parsed = JSON.parse(stdout.trim() || "null");
+    if (!Array.isArray(parsed)) return void 0;
+    return parsed.filter((pr2) => Boolean(pr2) && typeof pr2 === "object" && typeof pr2.number === "number" && typeof pr2.state === "string").map((pr2) => ({ number: pr2.number, state: pr2.state }));
+  } catch {
+    return void 0;
+  }
+}
 async function fetchIssueTitle(repo, number) {
   try {
     const { stdout } = await execFileP2("gh", ["issue", "view", String(number), "--repo", repo, "--json", "title", "--jq", ".title"], { timeout: GH_TIMEOUT_MS });
@@ -21869,6 +21934,16 @@ function registerWorktreeCommands(program3) {
       if (landDirty) {
         return fail(`worktree land: refusing to land '${branch}' \u2014 uncommitted changes in ${wtPath}; commit, stash, or remove the worktree manually`, { code: ERROR_CODES.ERR_BAD_ENUM });
       }
+      const landRefs = decideWorktreeLandRefCleanup({
+        branch,
+        prs: await fetchLandBranchPrs(branch),
+        keepRemote: Boolean(o.keepRemote)
+      });
+      if (landRefs.action === "refuse") {
+        return fail(`worktree land: ${landRefs.message}`, { code: ERROR_CODES.ERR_BAD_ENUM });
+      }
+      const keepRemoteBranch = Boolean(o.keepRemote) || landRefs.action === "keep-remote";
+      if (landRefs.action === "keep-remote") console.warn(`worktree land: ${landRefs.message}.`);
       const report = [];
       if (hasStage) {
         try {
@@ -21888,8 +21963,10 @@ function registerWorktreeCommands(program3) {
         status: removeOutcome.status === "removed" ? removeOutcome.recovery ? `done (${removeOutcome.recovery})` : "done" : `failed: ${removeOutcome.error ?? "lock held"} \u2014 run: git -C "${primaryCheckout}" worktree remove --force "${wtPath}"`
       });
       report.push(await bestEffortGit(["branch", "-D", branch], primaryCheckout, `delete local branch ${branch}`));
-      if (!o.keepRemote) {
+      if (!keepRemoteBranch) {
         report.push(await bestEffortGit(["push", o.remote, "--delete", branch], void 0, `delete remote branch ${branch}`, GH_MUTATION_TIMEOUT_MS));
+      } else if (!o.keepRemote) {
+        report.push({ step: `delete remote branch ${branch}`, status: `skipped: ${landRefs.action === "keep-remote" ? landRefs.reason : "kept"}` });
       }
       report.push(await bestEffortGit(["worktree", "prune"], primaryCheckout, "prune worktree metadata"));
       const result = { dryRun: false, ...plan, ...o.keepRemote ? { keepRemote: true } : {}, report };
@@ -26514,6 +26591,7 @@ pr.command("land <number>").description("agent merge path (#1440): train probe \
 jsonParity(pr.command("merge <number>").description("merge a PR (squash by default) and clean up its branch + worktree \u2014 no leftover local branch; on no-ci repos run pr ci-policy / checks-wait first (#1432)").option("--squash", "squash merge (default)").option("--merge", "create a merge commit").option("--rebase", "rebase merge").option("--repo <owner/repo>", "target repo (defaults to the current repo)").option("--auto", "enable auto-merge \u2014 merge once the base-branch policy is satisfied (use for policy-gated repos)").option("--wait", `wait for checks to reach a terminal passing verdict before merging (default budget ${PR_CHECKS_TIMEOUT_MS / 6e4}m)`).option("--preserve-worktree", "keep the local PR worktree/stage/branch for an active multi-issue batch (#1888)").option("--force", "acknowledge and merge past a remaining prunable/severe scratch housekeeping block (advisory kept plans/ never blocks, #3012)")).action(async (number, o) => {
   const method = o.rebase ? "--rebase" : o.merge ? "--merge" : "--squash";
   const repoArgs = o.repo ? ["--repo", o.repo] : [];
+  const repoForPostCleanup = await resolveRepo(o.repo) ?? o.repo;
   const [headRef, baseRef, headRefOid] = (await execFileP2("gh", ["pr", "view", number, ...repoArgs, "--json", "headRefName,baseRefName,headRefOid", "--jq", '.headRefName + " " + .baseRefName + " " + (.headRefOid // "")'], { timeout: GC_GH_TIMEOUT_MS2 })).stdout.trim().split(/\s+/);
   const headIsProtected = isProtectedBranch(headRef);
   const startingPath = (await execFileP2("git", ["rev-parse", "--show-toplevel"], { timeout: GIT_TIMEOUT_MS }).catch(() => ({ stdout: "" }))).stdout.trim();
@@ -26589,18 +26667,37 @@ jsonParity(pr.command("merge <number>").description("merge a PR (squash by defau
     }
     if (!ghPrMergeLocalBranchDeleteWarning(message)) throw e;
   });
-  if (o.auto || upgradedToAuto) {
-    const state = (await execFileP2("gh", ["pr", "view", number, ...repoArgs, "--json", "state", "--jq", ".state"], { timeout: GC_GH_TIMEOUT_MS2 }).catch(() => ({ stdout: "" }))).stdout.trim();
-    if (state !== "MERGED") {
-      const enqueued = describePrMergeEnqueuedReason(await pollGhPrChecks(number, repoArgs).catch(() => void 0));
-      console.log(JSON.stringify({ mergeStatus: "auto-merge-enqueued", enqueuedReason: enqueued.reason, pr: number, branch: headRef, state: state || "unknown", upgradedToAuto: upgradedToAuto || void 0 }));
-      console.warn(`pr merge: PR #${number} is ENQUEUED, not merged \u2014 ${enqueued.message}.`);
-      if (upgradedToAuto && !o.auto) {
-        console.warn(`pr merge: exiting ${PR_MERGE_ENQUEUED_EXIT_CODE} so a chained command does not treat this as a completed merge.`);
-        process.exitCode = PR_MERGE_ENQUEUED_EXIT_CODE;
-      }
-      return;
+  const stateRead = await readGhPrStateWithRetry(
+    () => execFileP2("gh", ["pr", "view", number, ...repoArgs, "--json", "state", "--jq", ".state"], { timeout: GC_GH_TIMEOUT_MS2 }).then((r) => r.stdout)
+  );
+  const gate = decidePrMergeCleanupGate({
+    state: stateRead.ok ? stateRead.state : void 0,
+    stateError: stateRead.ok ? void 0 : stateRead.error,
+    autoRequested: Boolean(o.auto || upgradedToAuto)
+  });
+  if (gate.action === "enqueued") {
+    const state = stateRead.ok ? stateRead.state : "";
+    const enqueued = describePrMergeEnqueuedReason(await pollGhPrChecks(number, repoArgs).catch(() => void 0));
+    console.log(JSON.stringify({ mergeStatus: "auto-merge-enqueued", enqueuedReason: enqueued.reason, pr: number, branch: headRef, state: state || "unknown", upgradedToAuto: upgradedToAuto || void 0 }));
+    console.warn(`pr merge: PR #${number} is ENQUEUED, not merged \u2014 ${enqueued.message}.`);
+    if (upgradedToAuto && !o.auto) {
+      console.warn(`pr merge: exiting ${PR_MERGE_ENQUEUED_EXIT_CODE} so a chained command does not treat this as a completed merge.`);
+      process.exitCode = PR_MERGE_ENQUEUED_EXIT_CODE;
     }
+    return;
+  }
+  if (gate.action === "refuse") {
+    console.log(JSON.stringify({
+      mergeStatus: "not-merged",
+      reason: gate.reason,
+      pr: number,
+      branch: headRef,
+      state: stateRead.ok ? stateRead.state : "unknown",
+      cleanupStatus: "skipped"
+    }));
+    console.error(`pr merge: ${gate.message}. Nothing was deleted \u2014 re-check the PR and retry.`);
+    process.exitCode = 1;
+    return;
   }
   if (!remoteNotAttemptedReason) remoteDeleteAttempted = true;
   const remoteBranch = await buildPrMergeRemoteBranchCleanupReport(headRef, {
@@ -26641,7 +26738,7 @@ jsonParity(pr.command("merge <number>").description("merge a PR (squash by defau
       }
     };
   }
-  const boardAdvance = await advanceClosedIssuesToDone2(number, o.repo);
+  const boardAdvance = await advanceClosedIssuesToDone2(number, repoForPostCleanup);
   console.log(JSON.stringify({
     ...buildPrMergeResultPayload({
       number,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/cli",
-  "version": "3.56.0",
+  "version": "3.57.0",
   "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",
@@ -31,7 +31,7 @@
   },
   "scripts": {
     "build": "node build.mjs",
-    "test": "vitest run --reporter=default --reporter=../scripts/test-budget-reporter.mjs",
+    "test": "vitest run",
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {