@mutmutco/cli 3.64.0 → 3.65.0

package/dist/main.cjs

@@ -5165,16 +5165,20 @@ function validateDeadWorktreeDirContent(planned, inspected) {
   return { ok: false, reason: "unknown dead worktree cleanup kind" };
 }
 function validateBranchCleanupHead(planned, currentHeads) {
+  const currentHeadOid = currentHeads.find((h) => h.branch === planned.branch)?.oid;
+  if (planned.containedInBase && planned.plannedHeadOid) {
+    if (!currentHeadOid) return { ok: false, reason: "local branch head could not be read" };
+    return currentHeadOid === planned.plannedHeadOid ? { ok: true } : { ok: false, reason: `branch moved since planning (${currentHeadOid} != ${planned.plannedHeadOid})` };
+  }
   const reviewedHeadOids = planned.reviewedHeadOids?.filter(Boolean) ?? [];
   if (!reviewedHeadOids.length) {
     return { ok: false, reason: "planned branch head was not verified against a PR head" };
   }
-  const currentHead = currentHeads.find((h) => h.branch === planned.branch)?.oid;
-  if (!currentHead) {
+  if (!currentHeadOid) {
     return { ok: false, reason: "local branch head could not be verified against the PR head" };
   }
-  if (!reviewedHeadOids.includes(currentHead)) {
-    return { ok: false, reason: `${currentHead} != ${reviewedHeadOids.join("|")}` };
+  if (!reviewedHeadOids.includes(currentHeadOid)) {
+    return { ok: false, reason: `${currentHeadOid} != ${reviewedHeadOids.join("|")}` };
   }
   return { ok: true };
 }
@@ -5274,6 +5278,7 @@ function buildGcPlan(inputs) {
   const unpushedWorktrees = new Set((inputs.worktrees ?? []).filter((w) => w.unpushed).map((w) => w.branch));
   const preservedBranches2 = new Set(inputs.preservedBranches ?? []);
   const preservedWorktrees = new Set((inputs.worktrees ?? []).filter((w) => w.preserved).map((w) => w.branch));
+  const mergedIntoBase = new Set((inputs.mergedIntoBase ?? []).map((b) => b.trim()).filter(Boolean));
   const skipped = [];
   const branches = [];
   const skipTrackingBranches = /* @__PURE__ */ new Set();
@@ -5313,7 +5318,8 @@ function buildGcPlan(inputs) {
       continue;
     }
     const localHead = branchHeads?.get(branch);
-    if (worktree2?.unpushed || branchHeads && (!localHead || !state.headOids.length || !state.headOids.includes(localHead))) {
+    const containedInBase = mergedIntoBase.has(branch);
+    if (!containedInBase && (worktree2?.unpushed || branchHeads && (!localHead || !state.headOids.length || !state.headOids.includes(localHead)))) {
       const detail = worktree2?.unpushed ? worktree2.path : localHead && state.headOids.length ? `${localHead} != ${state.headOids.join("|")}` : "local branch head could not be verified against the PR head";
       skipped.push({ branch, reason: "unpushed-branch", detail });
       skipTrackingBranches.add(branch);
@@ -5324,7 +5330,8 @@ function buildGcPlan(inputs) {
       prState: state.state,
       prNumbers: state.numbers,
       worktreePath: worktree2?.path,
-      ...state.headOids.length ? { reviewedHeadOids: state.headOids } : {}
+      ...state.headOids.length ? { reviewedHeadOids: state.headOids } : {},
+      ...containedInBase ? { containedInBase: true, ...localHead ? { plannedHeadOid: localHead } : {} } : {}
     });
   }
   const trackingRefs = [...new Set(inputs.staleTrackingRefs ?? [])].map((ref) => {
@@ -10811,7 +10818,7 @@ function resolveExplicitScanRoot(explicitRoot, repoRoot2) {
   return explicitRepoWorktreesRoot(explicitRoot, repoRoot2, rootDirs);
 }
 async function gcPlan(remote, limit, opts = {}) {
-  const [branches, heads, current, stale, prs, worktrees, siblingDirs, preserved] = await Promise.all([
+  const [branches, heads, current, stale, prs, worktrees, siblingDirs, preserved, mergedIntoBase] = await Promise.all([
     gitOut(["branch", "--format=%(refname:short)"]),
     localBranchHeads(),
     gitOut(["rev-parse", "--abbrev-ref", "HEAD"]),
@@ -10821,7 +10828,8 @@ async function gcPlan(remote, limit, opts = {}) {
     ghPrs(limit),
     worktreeBranches(),
     siblingWorktreeDirs(opts.root),
-    preservedBranches()
+    preservedBranches(),
+    branchesMergedIntoBase(remote)
   ]);
   return buildGcPlan({
     localBranches: branches.split(/\r?\n/).map((b) => b.trim()).filter(Boolean),
@@ -10832,9 +10840,23 @@ async function gcPlan(remote, limit, opts = {}) {
     pullRequests: prs,
     worktrees,
     remote,
-    preservedBranches: preserved
+    preservedBranches: preserved,
+    mergedIntoBase
   });
 }
+async function branchesMergedIntoBase(remote) {
+  const out = /* @__PURE__ */ new Set();
+  for (const base of ["development", "main", "master"]) {
+    let listed;
+    try {
+      listed = await gitOut(["branch", "--merged", `${remote}/${base}`, "--format=%(refname:short)"]);
+    } catch {
+      continue;
+    }
+    for (const b of listed.split(/\r?\n/).map((x) => x.trim()).filter(Boolean)) out.add(b);
+  }
+  return [...out];
+}
 var STRAY_ROOT_WALK_BUDGET_MS = 4e3;
 function measureWorktreeRoot(root, deadline) {
   let dirs = 0;
@@ -16429,20 +16451,37 @@ function readFileOrNull2(path2) {
     return null;
   }
 }
-function classify(changed, policy) {
+function removedPaths(changed) {
+  return new Set(
+    changed.map((f) => f.status === "D" ? f.path : f.status === "R" || f.status === "C" ? f.from : void 0).filter((p) => typeof p === "string")
+  );
+}
+function classify(changed, policy, present = () => false) {
   const matchers = (policy.mandatory ?? []).map((m) => ({ ...m, re: globToRegExp(m.glob) }));
   const mandatoryHits = changed.filter((f) => matchers.some((m) => m.re.test(f.path)));
   const testChanges = changed.filter((f) => isTestPath(f.path));
   const addedTests = testChanges.filter((f) => f.status === "A");
+  const removed = removedPaths(changed);
+  const discharged = (m) => (m.satisfiedBy?.length ?? 0) > 0 && m.satisfiedBy.every((p) => present(p) && !removed.has(p));
+  const untestedHits = changed.filter((f) => matchers.some((m) => m.re.test(f.path) && !discharged(m)));
   const protectedBy = new Map((policy.protected ?? []).map((p) => [p.path, p.why ?? ""]));
-  const removedProtected = changed.map((f) => f.status === "D" ? f.path : f.status === "R" || f.status === "C" ? f.from : void 0).filter((p) => typeof p === "string" && protectedBy.has(p)).map((p) => ({ path: p, why: protectedBy.get(p) ?? "" }));
-  return { mandatoryHits, testChanges, addedTests, removedProtected };
+  for (const m of policy.mandatory ?? []) {
+    for (const p of m.satisfiedBy ?? []) {
+      if (!protectedBy.has(p)) protectedBy.set(p, `the standing coverage \`${m.glob}\` is discharged by. Removing it silently empties that glob.`);
+    }
+  }
+  const removedProtected = [...removed].filter((p) => protectedBy.has(p)).map((p) => ({ path: p, why: protectedBy.get(p) ?? "" }));
+  return { mandatoryHits, untestedHits, testChanges, addedTests, removedProtected };
 }
 function unresolvedProtectedEntries(policy, root, exists = (path2) => (0, import_node_fs19.existsSync)(path2)) {
   return (policy.protected ?? []).map((p) => p.path).filter((p) => !exists((0, import_node_path17.join)(root, p)));
 }
-function evaluate(changed, policy) {
-  const { mandatoryHits, testChanges, addedTests, removedProtected } = classify(changed, policy);
+function unresolvedSatisfiers(policy, root, exists = (path2) => (0, import_node_fs19.existsSync)(path2)) {
+  const declared = (policy.mandatory ?? []).flatMap((m) => m.satisfiedBy ?? []);
+  return [...new Set(declared)].filter((p) => !exists((0, import_node_path17.join)(root, p)));
+}
+function evaluate(changed, policy, present = () => false) {
+  const { mandatoryHits, untestedHits, testChanges, addedTests, removedProtected } = classify(changed, policy, present);
   const findings = [];
   if (removedProtected.length > 0) {
     findings.push({
@@ -16453,12 +16492,12 @@ function evaluate(changed, policy) {
       ${f.why}`).join("\n") + "\n  If you are removing one because it looked unrequired, read the reason above first \u2014 it is\n  the answer to exactly that question. If this removal was asked for, add a commit trailer:\n  Test-Policy-Override: <reason>"
     });
   }
-  if (mandatoryHits.length > 0 && testChanges.length === 0) {
+  if (untestedHits.length > 0 && testChanges.length === 0) {
     findings.push({
       kind: "mandatory-zone-untested",
-      paths: mandatoryHits.map((f) => f.path),
-      detail: `MANDATORY ZONE UNTESTED \u2014 this change touches ${mandatoryHits.length} path(s) in the mandatory zone but changes no test:
-` + mandatoryHits.map((f) => `    ${f.path}`).join("\n") + "\n  These are the paths where a silent failure costs real money, real data, a security breach,\n  or production. Add or update a test that would fail if the guarded property broke."
+      paths: untestedHits.map((f) => f.path),
+      detail: `MANDATORY ZONE UNTESTED \u2014 this change touches ${untestedHits.length} path(s) in the mandatory zone but changes no test:
+` + untestedHits.map((f) => `    ${f.path}`).join("\n") + "\n  These are the paths where a silent failure costs real money, real data, a security breach,\n  or production. Add or update a test that would fail if the guarded property broke."
     });
   }
   if (policy.declared !== false && addedTests.length > 0 && mandatoryHits.length === 0) {
@@ -16499,28 +16538,37 @@ function runTestPolicy(root, deps = {}) {
   const policy = deps.policy ?? loadPolicy(root);
   const exists = deps.exists ?? ((path2) => (0, import_node_fs19.existsSync)(path2));
   const counts = { mandatoryCount: (policy.mandatory ?? []).length, protectedCount: (policy.protected ?? []).length };
-  const unresolved = unresolvedProtectedEntries(policy, root, exists);
+  const base = deps.changed ? "(injected)" : resolveBase(root, deps.base);
+  const changed = deps.changed ?? (base ? changedFilesSince(base, root) : []);
+  const override = deps.overrideReason !== void 0 ? deps.overrideReason : !deps.changed && base ? OVERRIDE_RE.exec(git(["log", `${base}..HEAD`, "--format=%B"], root))?.[1]?.trim() ?? null : null;
+  if (override) return { ok: true, findings: [], changedCount: changed.length, base, overriddenBy: override, ...counts };
+  const present = (path2) => exists((0, import_node_path17.join)(root, path2));
+  const removedByThisDiff = removedPaths(changed);
+  const staleFindings = [];
+  const unresolved = unresolvedProtectedEntries(policy, root, exists).filter((p) => !removedByThisDiff.has(p));
   if (unresolved.length > 0) {
-    return {
-      ok: false,
-      base: null,
-      changedCount: 0,
-      ...counts,
-      findings: [{
-        kind: "stale-protected-entry",
-        paths: unresolved,
-        detail: `STALE PROTECTED ENTRY \u2014 test-policy.json protects ${unresolved.length} path(s) that do not exist:
+    staleFindings.push({
+      kind: "stale-protected-entry",
+      paths: unresolved,
+      detail: `STALE PROTECTED ENTRY \u2014 test-policy.json protects ${unresolved.length} path(s) that do not exist:
 ` + unresolved.map((p) => `    ${p}`).join("\n") + "\n  An entry naming a missing file reads as protection while protecting nothing.\n  Restore the file, or remove its entry."
-      }]
-    };
+    });
+  }
+  const staleSatisfiers = unresolvedSatisfiers(policy, root, exists).filter((p) => !removedByThisDiff.has(p));
+  if (staleSatisfiers.length > 0) {
+    staleFindings.push({
+      kind: "stale-satisfied-by",
+      paths: staleSatisfiers,
+      detail: `STALE STANDING COVERAGE \u2014 a mandatory glob claims ${staleSatisfiers.length} path(s) as satisfiedBy that do not exist:
+` + staleSatisfiers.map((p) => `    ${p}`).join("\n") + "\n  A glob discharged by coverage that is not there is a glob enforcing nothing, quietly.\n  Restore the file, or drop it from satisfiedBy so the glob asks for a test again."
+    });
+  }
+  if (staleFindings.length > 0) {
+    return { ok: false, base, changedCount: changed.length, ...counts, findings: staleFindings };
   }
-  const base = deps.changed ? "(injected)" : resolveBase(root, deps.base);
   if (!deps.changed && !base) return { ok: true, findings: [], changedCount: 0, base: null, ...counts };
-  const changed = deps.changed ?? changedFilesSince(base, root);
   if (changed.length === 0) return { ok: true, findings: [], changedCount: 0, base, ...counts };
-  const override = deps.overrideReason !== void 0 ? deps.overrideReason : OVERRIDE_RE.exec(git(["log", `${base}..HEAD`, "--format=%B"], root))?.[1]?.trim() ?? null;
-  if (override) return { ok: true, findings: [], changedCount: changed.length, base, overriddenBy: override, ...counts };
-  const findings = evaluate(changed, policy);
+  const findings = evaluate(changed, policy, present);
   return { ok: findings.length === 0, findings, changedCount: changed.length, base, ...counts };
 }
 
@@ -21875,7 +21923,18 @@ function recordGcWorktreeRemoval(primaryRoot, actor, owners, path2, branch) {
   });
   dropWorktreeOwner(primaryRoot, path2);
 }
-function renderGcApplyResult(result) {
+function renderPrLandCleanupLines(cleanup) {
+  const report = cleanup;
+  const wt = report?.worktree;
+  if (!wt?.path) return [];
+  const lines = [];
+  if (wt.status === "removed") lines.push(`pr land: removed worktree ${wt.path} \u2014 that directory is gone; cd elsewhere before your next command`);
+  else if (wt.status === "deferred") lines.push(`pr land: worktree ${wt.path} could not be removed yet and is registered for a later sweep`);
+  else lines.push(`pr land: worktree ${wt.path} \u2014 ${wt.status ?? "unknown"}${wt.reason ? ` (${wt.reason})` : ""}`);
+  if (wt.deferredNote) lines.push(`pr land: ${wt.deferredNote}`);
+  return lines;
+}
+function renderGcApplyResult(result, skipped = []) {
   const lines = ["worktree gc apply result:"];
   lines.push(`  branches removed: ${result.removedBranches.length ? result.removedBranches.join(", ") : "none"}`);
   lines.push(`  remote branches removed: ${result.removedRemoteBranches.length ? result.removedRemoteBranches.join(", ") : "none"}`);
@@ -21892,9 +21951,15 @@ function renderGcApplyResult(result) {
   }
   const removedNothing = result.removedBranches.length === 0 && result.removedRemoteBranches.length === 0 && result.removedTrackingRefs.length === 0 && result.removedWorktreeDirs.length === 0;
   if (removedNothing && !result.refused.length) {
-    lines.push("  NOTHING WAS REMOVED. A stale worktree whose directory still exists is not reachable by");
-    lines.push("  this verb \u2014 remove it from inside it with `mmi-cli worktree land --apply`, or delete the");
-    lines.push("  directory and re-run to clear its registration.");
+    const actionable = skipped.filter((s) => s.reason !== "protected" && s.reason !== "current-branch");
+    if (actionable.length) {
+      lines.push(`  NOTHING WAS REMOVED \u2014 every candidate was skipped for a stated reason (${actionable.length}):`);
+      for (const s of actionable) lines.push(`    - ${s.branch}: ${s.reason}${s.detail ? ` (${s.detail})` : ""}`);
+    } else {
+      lines.push("  NOTHING WAS REMOVED. A stale worktree whose directory still exists is not reachable by");
+      lines.push("  this verb \u2014 remove it from inside it with `mmi-cli worktree land --apply`, or delete the");
+      lines.push("  directory and re-run to clear its registration.");
+    }
   }
   return lines.join("\n");
 }
@@ -25848,7 +25913,7 @@ gcCmd.option("--dry-run", "show what would be deleted (default)").option("--appl
       console.log(formatGcPlan(plan, false));
     } else {
       if (applyResult) console.log(`
-${renderGcApplyResult(applyResult)}`);
+${renderGcApplyResult(applyResult, plan.skipped)}`);
     }
     if (applyResult?.failed.length) process.exitCode = 1;
   } catch (e) {
@@ -27268,6 +27333,7 @@ pr.command("land <number>").description("agent merge path (#1440): train probe \
   if (o.json) printLine(JSON.stringify(result));
   else {
     printLine(`pr land: ${result.status}${result.error ? ` \u2014 ${result.error}` : ""}`);
+    for (const line of renderPrLandCleanupLines(result.cleanup)) printLine(line);
     if (result.cleanupError) printLine(`pr land cleanup: ${result.cleanupError}`);
   }
   if (result.status === "failed" || result.cleanupError) process.exitCode = 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/cli",
-  "version": "3.64.0",
+  "version": "3.65.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",