@mutmutco/cli 3.101.0 → 3.102.0

package/dist/main.cjs

@@ -7536,6 +7536,39 @@ function missingPlaceholders(rendered) {
   for (const m of rendered.matchAll(PLACEHOLDER_RE)) out.add(m[1]);
   return [...out];
 }
+async function resolveHubSeedSource(execGit, defaultBranch = "development") {
+  let status;
+  try {
+    status = (await execGit(["status", "--porcelain"])).trim();
+  } catch (e) {
+    return { ok: false, reason: `could not read git status of this checkout (${e.message}) \u2014 refusing to treat an unknown working tree as the fleet's desired state` };
+  }
+  if (status) {
+    return {
+      ok: false,
+      reason: `this checkout has uncommitted changes \u2014 refusing to read seeds from a working tree that has not been reviewed or merged:
+${status}`
+    };
+  }
+  let head;
+  let remoteSha;
+  try {
+    head = (await execGit(["rev-parse", "HEAD"])).trim();
+    remoteSha = (await execGit(["ls-remote", "origin", `refs/heads/${defaultBranch}`])).trim().split(/\s+/)[0] ?? "";
+  } catch (e) {
+    return { ok: false, reason: `could not resolve this checkout's HEAD against origin/${defaultBranch} (${e.message}) \u2014 refusing to read seeds without a known upstream revision` };
+  }
+  if (!remoteSha) {
+    return { ok: false, reason: `\`git ls-remote origin refs/heads/${defaultBranch}\` returned nothing \u2014 refusing to read seeds without a known upstream revision` };
+  }
+  if (head !== remoteSha) {
+    return {
+      ok: false,
+      reason: `this checkout (${head}) is not origin/${defaultBranch} (${remoteSha}) \u2014 fast-forward to origin/${defaultBranch} first; a stale or ahead checkout must not seed the fleet`
+    };
+  }
+  return { ok: true, sha: head };
+}
 var GITIGNORE_MANAGED_BEGIN = "# >>> mmi-managed >>>";
 var GITIGNORE_MANAGED_END = "# <<< mmi-managed <<<";
 var MANAGED_GITIGNORE_LINES = [
@@ -23943,6 +23976,16 @@ var import_node_crypto6 = require("node:crypto");
 function byteComparableSeeds(manifest, cls) {
   return manifest.seeds.filter((s) => s.ownership === "org" && s.source === "self" && s.classes.includes(cls));
 }
+function declaredRenderWaivers(manifest, repo) {
+  const slug = repo.includes("/") ? repo.slice(repo.indexOf("/") + 1).toLowerCase() : repo.toLowerCase();
+  const findings = [];
+  for (const seed of manifest.seeds) {
+    if (seed.ownership !== "org" || seed.source === "self") continue;
+    const why = seed.waivers?.[slug];
+    if (why) findings.push({ repo, target: seed.target, state: "waived", detail: `hand-authored, not rendered \u2014 waived: ${why}` });
+  }
+  return findings;
+}
 function compareSeedBytes(hubContent, repoContent) {
   if (repoContent === null) return "absent";
   const normalize = (s) => s.replace(/\r\n/g, "\n");
@@ -24020,18 +24063,21 @@ function assignWaves(repos, canarySlug) {
   rest.forEach((r, i) => waves.set(r.repo, i < wave1Count ? 1 : 2));
   return waves;
 }
-function statusFor(read) {
+function statusFor(read, currentSha) {
   if (!read) return { status: "pending", record: {} };
   if (read.drift === "match") return { status: "match", record: { mergeSha: read.pr?.mergeSha } };
   const pr2 = read.pr;
   if (!pr2) return { status: "pending", record: {} };
   if (pr2.state === "closed") return { status: "closed-unmerged", record: { prNumber: pr2.number, prUrl: pr2.url } };
+  if (pr2.state === "merged" && pr2.sourceSha && pr2.sourceSha !== currentSha) {
+    return { status: "pending", record: {} };
+  }
   if (pr2.checks === "red") return { status: "red", record: { prNumber: pr2.number, prUrl: pr2.url } };
   return { status: "open-pending", record: { prNumber: pr2.number, prUrl: pr2.url, mergeSha: pr2.mergeSha } };
 }
 var HALTING_STATUSES = /* @__PURE__ */ new Set(["red", "closed-unmerged"]);
 function planPropagationTick(input) {
-  const { target, repos, canarySlug, reads, isWorkflowSeed, functionGateSatisfied } = input;
+  const { target, repos, canarySlug, reads, isWorkflowSeed, functionGateSatisfied, currentSha } = input;
   const readByRepo = new Map(reads.map((r) => [r.repo, r]));
   const records = [];
   const opened = [];
@@ -24065,7 +24111,7 @@ function planPropagationTick(input) {
     let waveAllMatch = true;
     let waveHasRed = false;
     for (const r of waveRepos) {
-      const { status, record } = statusFor(readByRepo.get(r.repo));
+      const { status, record } = statusFor(readByRepo.get(r.repo), currentSha);
       const shouldOpen = status === "pending";
       if (shouldOpen) opened.push(r.repo);
       records.push({
@@ -24807,6 +24853,7 @@ async function reconcileOrgNoAgentFilesRuleset(plan, client, org = ORG_LOGIN) {
 }
 
 // src/bootstrap-commands.ts
+var execGitForSeedSource = async (args) => (await execFileP2("git", args, { timeout: GIT_TIMEOUT_MS })).stdout;
 function registerBootstrapCommands(program3) {
   const bootstrap = program3.command("bootstrap").description("plan repo bootstrap operations; mutations require master-admin approval").option("--repo <owner/repo>", "target repo").addOption(new Option("--class <class>", "deployable | content").default("deployable").choices(["deployable", "content"])).option("--json", "machine-readable output").action((o) => {
     if (!o.repo) return fail("bootstrap: required option --repo <owner/repo> not specified");
@@ -24886,6 +24933,8 @@ function registerBootstrapCommands(program3) {
     const o = { repo: rawValue("--repo", ""), json: rawFlag("--json") };
     const manifestPath = "skills/bootstrap/seeds/manifest.json";
     if (!(0, import_node_fs31.existsSync)(manifestPath)) return fail(`bootstrap drift: ${manifestPath} not found; run from the MMI-Hub repo root \u2014 the Hub's copies ARE the reference this compares against`);
+    const seedSource = await resolveHubSeedSource(execGitForSeedSource);
+    if (!seedSource.ok) return fail(`bootstrap drift: ${seedSource.reason}`);
     const manifest = loadBootstrapSeeds((0, import_node_fs31.readFileSync)(manifestPath, "utf8"));
     const hubContents = /* @__PURE__ */ new Map();
     for (const s of manifest.seeds) {
@@ -24928,12 +24977,14 @@ function registerBootstrapCommands(program3) {
         reads.push({ target: seed.target, content });
       }
       findings.push(...auditRepoSeedDrift(repo, seeds, hubContents, reads));
+      findings.push(...declaredRenderWaivers(manifest, repo));
     }
     if (o.json) {
       console.log(JSON.stringify({
         // #3842: `ok` reflects real findings; waivers ride the payload so a consumer can see every
         // standing exception without them counting as drift.
         ok: findings.every((f) => f.state === "waived"),
+        sourceSha: seedSource.sha,
         scope: o.repo ? "single-repo" : "fleet",
         reposAudited: targets.length,
         seedsPerRepo,
@@ -24968,6 +25019,8 @@ function registerBootstrapCommands(program3) {
     }
     const manifestPath = "skills/bootstrap/seeds/manifest.json";
     if (!(0, import_node_fs31.existsSync)(manifestPath)) return fail(`bootstrap apply: ${manifestPath} not found; bootstrap runs from the MMI-Hub repo root by design \u2014 it stamps org-level resources (Project, Ruleset, secrets, access) through the GitHub App, which is only authorized from the Hub checkout`);
+    const seedSource = await resolveHubSeedSource(execGitForSeedSource);
+    if (!seedSource.ok) return fail(`bootstrap apply: ${seedSource.reason}`);
     const manifest = loadBootstrapSeeds((0, import_node_fs31.readFileSync)(manifestPath, "utf8"));
     const baseBranch = o.class === "content" ? "main" : "development";
     const slug = parsedRepo.slug;
@@ -25144,9 +25197,9 @@ function registerBootstrapCommands(program3) {
           "--body",
           onlyTarget ? `Auto-opened by \`mmi-cli bootstrap apply ${repo} --only ${onlyTarget} --execute\` (#3818).
 
-\`${onlyTarget}\` is an org-owned seed declared in MMI-Hub's \`skills/bootstrap/seeds/manifest.json\`; this PR brings this repo's copy to the Hub's. It carries that file and nothing else \u2014 no labels, ruleset, merge settings or registry META were touched.
+\`${onlyTarget}\` is an org-owned seed declared in MMI-Hub's \`skills/bootstrap/seeds/manifest.json\` at MMI-Hub@${seedSource.sha}; this PR brings this repo's copy to the Hub's. It carries that file and nothing else \u2014 no labels, ruleset, merge settings or registry META were touched.
 
-\`${baseBranch}\` is protected (${seedPlan.reason}), so delivery goes via this branch + PR \u2014 a direct contents PUT 409s on a protected base.` : `Auto-opened by \`mmi-cli bootstrap apply --execute ${repo}\` (#2286): \`${baseBranch}\` is protected (${seedPlan.reason}), so the org-managed seed files are delivered via this branch + PR \u2014 a direct contents PUT 409s on a protected base ("N of N required status checks are expected").`
+\`${baseBranch}\` is protected (${seedPlan.reason}), so delivery goes via this branch + PR \u2014 a direct contents PUT 409s on a protected base.` : `Auto-opened by \`mmi-cli bootstrap apply --execute ${repo}\` (#2286): \`${baseBranch}\` is protected (${seedPlan.reason}), so the org-managed seed files are delivered via this branch + PR \u2014 a direct contents PUT 409s on a protected base ("N of N required status checks are expected"). Seeds are from MMI-Hub@${seedSource.sha}.`
         ]);
         seedPrUrl = created.url;
       }
@@ -25242,7 +25295,7 @@ function registerBootstrapCommands(program3) {
         applied.push(`ddb register ${registerPayload.slug} (failed: ${why})`);
       }
     }
-    if (o.json) console.log(JSON.stringify({ repo, class: o.class, only: onlyTarget || null, execute: o.execute, seedDelivery: seedPlan.mode, seedPrUrl, actions, applied, ddbWrites }, null, 2));
+    if (o.json) console.log(JSON.stringify({ repo, class: o.class, sourceSha: seedSource.sha, only: onlyTarget || null, execute: o.execute, seedDelivery: seedPlan.mode, seedPrUrl, actions, applied, ddbWrites }, null, 2));
     else {
       console.log(renderSeedPlan(actions));
       if (o.execute) console.log(`
@@ -25254,6 +25307,8 @@ LIVE apply to ${repo}:
     const o = { target: rawValue("--target", ""), execute: rawFlag("--execute"), json: rawFlag("--json") };
     const manifestPath = "skills/bootstrap/seeds/manifest.json";
     if (!(0, import_node_fs31.existsSync)(manifestPath)) return fail(`bootstrap propagate: ${manifestPath} not found; run from the MMI-Hub repo root \u2014 the Hub's copies ARE the desired state this tick propagates`);
+    const seedSource = await resolveHubSeedSource(execGitForSeedSource);
+    if (!seedSource.ok) return fail(`bootstrap propagate: ${seedSource.reason}`);
     const manifest = loadBootstrapSeeds((0, import_node_fs31.readFileSync)(manifestPath, "utf8"));
     const propagatable = manifest.seeds.filter((s) => s.ownership === "org" && s.source === "self");
     if (!o.target) {
@@ -25337,13 +25392,14 @@ LIVE apply to ${repo}:
       let pr2;
       try {
         const branch = `${branchPrefix}-${r.slug}`;
-        const listed = await gh(["pr", "list", "--repo", r.repo, "--head", branch, "--base", baseBranch, "--state", "all", "--json", "number,url,state,statusCheckRollup,mergeCommit", "--limit", "1"]);
+        const listed = await gh(["pr", "list", "--repo", r.repo, "--head", branch, "--base", baseBranch, "--state", "all", "--json", "number,url,state,statusCheckRollup,mergeCommit,body", "--limit", "1"]);
         const arr = JSON.parse(listed.stdout || "[]");
         const p = arr[0];
         if (p) {
           const rollup = p.statusCheckRollup ?? [];
           const checks = rollup.length === 0 ? "none" : rollup.some((c) => c.conclusion === "FAILURE" || c.state === "FAILURE") ? "red" : rollup.every((c) => c.conclusion === "SUCCESS" || c.state === "SUCCESS") ? "success" : "pending";
-          pr2 = { number: p.number, url: p.url, state: p.state === "MERGED" ? "merged" : p.state === "CLOSED" ? "closed" : "open", checks, mergeSha: p.mergeCommit?.oid };
+          const sourceSha = p.body?.match(/Propagates MMI-Hub@([0-9a-fA-F]{7,40})/)?.[1];
+          pr2 = { number: p.number, url: p.url, state: p.state === "MERGED" ? "merged" : p.state === "CLOSED" ? "closed" : "open", checks, mergeSha: p.mergeCommit?.oid, sourceSha };
         }
       } catch {
         pr2 = void 0;
@@ -25365,10 +25421,10 @@ LIVE apply to ${repo}:
         }
       }
     }
-    const plan = planPropagationTick({ target: seed.target, repos, canarySlug, reads, isWorkflowSeed, functionGateSatisfied });
+    const plan = planPropagationTick({ target: seed.target, repos, canarySlug, reads, isWorkflowSeed, functionGateSatisfied, currentSha: seedSource.sha });
     if (o.execute) {
       if (plan.refusedNoCanary) return fail("bootstrap propagate --execute: no canary declared for this target \u2014 refusing to write (set seedCanary:true on exactly one registry repo)");
-      const headSha = (await gh(["api", "repos/mutmutco/MMI-Hub/commits/development", "--jq", ".sha"])).stdout.trim();
+      const headSha = seedSource.sha;
       for (const rec of plan.records) {
         if (rec.action !== "open-pr") continue;
         const repoEntry = repos.find((r) => r.repo === rec.repo);
@@ -25433,8 +25489,9 @@ Rollback: \`mmi-cli bootstrap rollback ${rec.repo} --target ${seed.target} --exe
         rec.prUrl = prUrl;
       }
     }
-    if (o.json) console.log(JSON.stringify(plan, null, 2));
-    else console.log(renderPropagationReport(plan));
+    if (o.json) console.log(JSON.stringify({ ...plan, sourceSha: seedSource.sha }, null, 2));
+    else console.log(`${renderPropagationReport(plan)}
+  source: MMI-Hub@${seedSource.sha}`);
     if (plan.halted) process.exitCode = 1;
   });
   bootstrap.command("rollback <repo>").description("#4240: open a per-repo revert PR of the recorded seed-propagate merge \u2014 never a fleet-wide overwrite; dry-run unless --execute").addOption(new Option("--class <class>", "deployable | content").default("deployable").choices(["deployable", "content"])).option("--target <path>", "the manifest target to roll back (an ownership:org + source:self seed, e.g. .github/workflows/agent-pr.yml)").option("--record <path>", "read propagation candidates from a persisted `bootstrap propagate --json` report instead of the live seed-propagate PR history").option("--execute", "LIVE revert via gh (master-gated) \u2014 opens/reuses the seed-rollback PR; dry-run prints the plan only").option("--json", "machine-readable output").action(async (repo) => {
@@ -25454,6 +25511,8 @@ Rollback: \`mmi-cli bootstrap rollback ${rec.repo} --target ${seed.target} --exe
     }
     const manifestPath = "skills/bootstrap/seeds/manifest.json";
     if (!(0, import_node_fs31.existsSync)(manifestPath)) return fail(`bootstrap rollback: ${manifestPath} not found; run from the MMI-Hub repo root \u2014 the manifest names which targets are org-owned and therefore propagated (and rollback-able)`);
+    const seedSource = await resolveHubSeedSource(execGitForSeedSource);
+    if (!seedSource.ok) return fail(`bootstrap rollback: ${seedSource.reason}`);
     const manifest = loadBootstrapSeeds((0, import_node_fs31.readFileSync)(manifestPath, "utf8"));
     const propagatable = manifest.seeds.filter((s) => s.ownership === "org" && s.source === "self");
     if (!o.target) {
@@ -25509,7 +25568,7 @@ Rollback: \`mmi-cli bootstrap rollback ${rec.repo} --target ${seed.target} --exe
     }
     const plan = planRollback(repo, seed.target, slug, candidates);
     if (!plan.resolution.found) {
-      if (o.json) console.log(JSON.stringify(plan, null, 2));
+      if (o.json) console.log(JSON.stringify({ ...plan, sourceSha: seedSource.sha }, null, 2));
       else console.log(renderRollbackReport(plan));
       return fail(`bootstrap rollback: ${plan.resolution.reason}`);
     }
@@ -25564,8 +25623,9 @@ Rollback: \`mmi-cli bootstrap rollback ${rec.repo} --target ${seed.target} --exe
       }
       plan.prUrl = prUrl;
     }
-    if (o.json) console.log(JSON.stringify(plan, null, 2));
-    else console.log(renderRollbackReport(plan));
+    if (o.json) console.log(JSON.stringify({ ...plan, sourceSha: seedSource.sha }, null, 2));
+    else console.log(`${renderRollbackReport(plan)}
+  manifest verified against: MMI-Hub@${seedSource.sha}`);
   });
 }
 
@@ -29582,6 +29642,25 @@ function findNegatedClosings(text, closingNumbers) {
     return forIssue.length > 0 && forIssue.every((m) => m.negated);
   });
 }
+var CROSS_REPO_TOKEN_RE = /\b([\w.-]+\/[\w.-]+)#(\d+)\b/g;
+function findCrossRepoAmbiguousClosings(text, closingNumbers, repo) {
+  if (!closingNumbers.length) return [];
+  const closing = new Set(closingNumbers);
+  const flagged = /* @__PURE__ */ new Set();
+  const repoLower = repo.toLowerCase();
+  for (const match of text.matchAll(CROSS_REPO_TOKEN_RE)) {
+    const n = Number(match[2]);
+    if (!closing.has(n)) continue;
+    if ((match[1] ?? "").toLowerCase() === repoLower) continue;
+    flagged.add(n);
+  }
+  return [...flagged];
+}
+function crossRepoAmbiguousRefusalMessage(ambiguous, repo, context = "pr merge") {
+  const named = ambiguous.map((n) => `${repo}#${n}`).join(", ");
+  const first = `#${ambiguous[0] ?? "N"}`;
+  return `${context}: REFUSED \u2014 GitHub will close ${named} on merge (a bare \`#N\` after a closing keyword always means the repo the PR lives in), but this body also mentions ${first} qualified against a DIFFERENT repo elsewhere \u2014 check whether that closing keyword was meant to carry an explicit owner/repo#N qualifier instead. Reword the closing reference with the full owner/repo#N form, or re-run with --force to merge anyway and let ${named} close.`;
+}
 function commitMessagesText(commits) {
   if (!Array.isArray(commits)) return "";
   return commits.map((commit) => {
@@ -29590,7 +29669,7 @@ function commitMessagesText(commits) {
 ${typeof messageBody === "string" ? messageBody : ""}`;
   }).join("\n");
 }
-function parseClosingGuardInput(raw) {
+function parseClosingGuardInput(raw, repo) {
   if (!raw || typeof raw !== "object") return void 0;
   const { title, body, state, closingIssuesReferences, commits } = raw;
   if (typeof state !== "string" || !Array.isArray(closingIssuesReferences)) return void 0;
@@ -29603,7 +29682,7 @@ function parseClosingGuardInput(raw) {
   const commitClosing = [...new Set(findClosingMentions(commitMessagesText(commits)).map((m) => m.issue))];
   const text = `${typeof title === "string" ? title : ""}
 ${typeof body === "string" ? body : ""}`;
-  return { state, text, closing, commitClosing };
+  return { state, text, closing, commitClosing, repo };
 }
 function negatedClosingRefusalMessage(negated, context = "pr merge") {
   const named = negated.map((n) => `#${n}`).join(", ");
@@ -29632,12 +29711,24 @@ function evaluateClosingGuard(input, opts) {
   }
   if (input.closing.length === 0) return { blocked: false };
   const negated = findNegatedClosings(input.text, input.closing);
-  if (!negated.length) return { blocked: false };
-  if (!opts.force) return { blocked: true, message: negatedClosingRefusalMessage(negated, opts.context) };
-  return {
-    blocked: false,
-    message: `${opts.context}: --force past the negated-closing guard \u2014 GitHub will still close ${negated.map((n) => `#${n}`).join(", ")} on merge although the PR body says it does not.`
-  };
+  if (negated.length) {
+    if (!opts.force) return { blocked: true, message: negatedClosingRefusalMessage(negated, opts.context) };
+    return {
+      blocked: false,
+      message: `${opts.context}: --force past the negated-closing guard \u2014 GitHub will still close ${negated.map((n) => `#${n}`).join(", ")} on merge although the PR body says it does not.`
+    };
+  }
+  if (input.repo) {
+    const ambiguous = findCrossRepoAmbiguousClosings(input.text, input.closing, input.repo);
+    if (ambiguous.length) {
+      if (!opts.force) return { blocked: true, message: crossRepoAmbiguousRefusalMessage(ambiguous, input.repo, opts.context) };
+      return {
+        blocked: false,
+        message: `${opts.context}: --force past the cross-repo-ambiguous closing guard \u2014 GitHub will still close ${ambiguous.map((n) => `${input.repo}#${n}`).join(", ")} on merge.`
+      };
+    }
+  }
+  return { blocked: false };
 }
 
 // src/session-report.ts
@@ -34556,12 +34647,13 @@ pr.command("checks-wait <number>").description(`bounded wait for PR checks; skip
   if (result.status === "failure" || result.status === "conflicting") process.exitCode = 1;
   if (result.status === "timeout" || result.status === "rate-limited") process.exitCode = PR_CHECKS_TIMEOUT_EXIT_CODE;
 });
-pr.command("land <number>").description("agent merge path (#1440): train probe ? checks-wait ? merge --auto ? poll enqueued ? development PRs only").option("--json", "machine-readable output").option("--repo <owner/repo>", "target repo (defaults to the PR repo)").option("--no-require-train", "skip train-authority preflight (not recommended for autonomous agents)").option("--preserve-worktree", "after merge, keep the local PR worktree/stage/branch for an active batch (#1888)").option("--force", "acknowledge and land past a remaining prunable/severe scratch housekeeping block (advisory kept plans/ never blocks, #3012) or a negated-closing-keyword refusal (#3718)").action(async (number, o) => {
+pr.command("land <number>").description("agent merge path (#1440): train probe ? checks-wait ? merge --auto ? poll enqueued ? development PRs only").option("--json", "machine-readable output").option("--repo <owner/repo>", "target repo (defaults to the PR repo)").option("--no-require-train", "skip train-authority preflight (not recommended for autonomous agents)").option("--preserve-worktree", "after merge, keep the local PR worktree/stage/branch for an active batch (#1888)").option("--force", "acknowledge and land past a remaining prunable/severe scratch housekeeping block (advisory kept plans/ never blocks, #3012) or a negated-closing-keyword (#3718) or ambiguous-cross-repo-closing (#4279) refusal").action(async (number, o) => {
   const repoArgs = o.repo ? ["--repo", o.repo] : [];
   const startingPath = (await execFileP2("git", ["rev-parse", "--show-toplevel"], { timeout: GIT_TIMEOUT_MS }).catch(() => ({ stdout: "" }))).stdout.trim();
   assertPrMergeHousekeepingClean(startingPath || process.cwd(), "pr land", { force: o.force });
   const landClosingGuardRaw = await execFileP2("gh", ["pr", "view", number, ...repoArgs, "--json", "title,body,state,closingIssuesReferences,commits"], { timeout: GC_GH_TIMEOUT_MS2 }).then((r) => JSON.parse(r.stdout)).catch(() => void 0);
-  const landClosingGuardVerdict = evaluateClosingGuard(parseClosingGuardInput(landClosingGuardRaw), { force: o.force, context: "pr land" });
+  const landRepoForGuard = await resolveRepo(o.repo).catch(() => void 0) ?? o.repo;
+  const landClosingGuardVerdict = evaluateClosingGuard(parseClosingGuardInput(landClosingGuardRaw, landRepoForGuard), { force: o.force, context: "pr land" });
   if (landClosingGuardVerdict.blocked) {
     console.error(landClosingGuardVerdict.message);
     process.exitCode = 1;
@@ -34672,14 +34764,14 @@ pr.command("land <number>").description("agent merge path (#1440): train probe ?
   }
   if (result.status === "failed" || result.cleanupError) process.exitCode = 1;
 });
-jsonParity(pr.command("merge <number>").description("merge a PR (squash by default) and clean up its branch + worktree ? 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 ? 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) or a negated-closing-keyword refusal (#3718)")).action(async (number, o) => {
+jsonParity(pr.command("merge <number>").description("merge a PR (squash by default) and clean up its branch + worktree ? 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 ? 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) or a negated-closing-keyword (#3718) or ambiguous-cross-repo-closing (#4279) refusal")).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 closingGuardRaw = await execFileP2("gh", ["pr", "view", number, ...repoArgs, "--json", "title,body,state,closingIssuesReferences,commits"], { timeout: GC_GH_TIMEOUT_MS2 }).then((r) => JSON.parse(r.stdout)).catch(() => void 0);
-  const closingGuardVerdict = evaluateClosingGuard(parseClosingGuardInput(closingGuardRaw), { force: o.force, context: "pr merge" });
+  const closingGuardVerdict = evaluateClosingGuard(parseClosingGuardInput(closingGuardRaw, repoForPostCleanup), { force: o.force, context: "pr merge" });
   if (closingGuardVerdict.blocked) {
     console.error(closingGuardVerdict.message);
     process.exitCode = 1;

package/package.json

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