@biffo/cli 0.300.1 → 0.301.1

package/dist/index.js

@@ -1281,6 +1281,17 @@ var GitAdapter = class {
     const { stdout, exitCode } = await execa("git", ["rev-parse", "HEAD"], { cwd, reject: false });
     return exitCode === 0 ? stdout.trim() : null;
   }
+  /**
+   * `branch`'s own tip SHA, without checking it out — the bare-branch
+   * counterpart to `headSha` (#1682 milestone 2). A branch with no linked
+   * worktree has no `cwd` of its own to run `rev-parse HEAD` against, so this
+   * resolves the ref by name instead; `cwd` only needs to be *any* worktree of
+   * the same clone; local refs are shared across all of them.
+   */
+  async branchSha(cwd, branch) {
+    const { stdout, exitCode } = await execa("git", ["rev-parse", branch], { cwd, reject: false });
+    return exitCode === 0 ? stdout.trim() : null;
+  }
   /**
    * Is `ancestor` reachable from `descendant` (including `ancestor ===
    * descendant`)? Three-valued, not boolean: `git merge-base --is-ancestor`
@@ -15037,6 +15048,43 @@ async function reapAll(cwd, branches, worktrees, currentBranch, deps) {
   }
   return outcomes;
 }
+function findBareBranchCandidates(branches, worktrees) {
+  const worktreeBranches = new Set(worktrees.map((w) => w.branch));
+  return branches.filter((b) => b.track.includes("gone") && !worktreeBranches.has(b.name)).map((b) => ({ branch: b.name }));
+}
+async function reapBareBranch(cwd, candidate, deps) {
+  const { git, github } = deps;
+  const prVerdict = await github.prVerdictForBranch(cwd, candidate.branch);
+  let mergeContainsHead = true;
+  if (prVerdict === "merged") {
+    const [branchTip, mergedHeadSha] = await Promise.all([
+      git.branchSha(cwd, candidate.branch),
+      github.mergedHeadSha(cwd, candidate.branch)
+    ]);
+    mergeContainsHead = branchTip === null || mergedHeadSha === null ? null : await git.isAncestor(cwd, branchTip, mergedHeadSha);
+  }
+  const verdict = classifyReapCandidate({
+    isDetached: false,
+    isDirty: false,
+    prVerdict,
+    mergeContainsHead
+  });
+  if (verdict.action === "keep") {
+    return { candidate, verdict, branchDeleted: null };
+  }
+  const branchDeleted = await git.deleteBranch(cwd, candidate.branch);
+  return { candidate, verdict, branchDeleted };
+}
+async function reapAllBareBranches(cwd, branches, worktrees, currentBranch, deps) {
+  const candidates = findBareBranchCandidates(branches, worktrees).filter(
+    (c) => c.branch !== currentBranch
+  );
+  const outcomes = [];
+  for (const candidate of candidates) {
+    outcomes.push(await reapBareBranch(cwd, candidate, deps));
+  }
+  return outcomes;
+}
 
 // src/commands/doctor.ts
 var INTEGRATION_BRANCH = "dev";
@@ -15044,7 +15092,7 @@ var doctorCommand = new Command25("doctor").description(
   "Report repo-state conditions that make everything read from this checkout unreliable"
 ).option("--cwd <path>", "Repo root to inspect (defaults to the current directory)").option("--no-fetch", "Skip the fetch; report against refs as they already are locally").option(
   "--fix",
-  "Also remove any worktree PROVEN safe: one whose branch's PR merged, verified via GitHub (never local commit reachability \u2014 a squash merge rewrites every SHA), AND whose current HEAD is confirmed contained in what that PR actually shipped \u2014 not merely on a branch of the same name (#1810). Everything else (no PR, PR open, PR closed unmerged, detached HEAD, uncommitted changes, commits ahead of what merged, or that containment could not be confirmed) is reported, never touched. Branch deletion is not yet automated here \u2014 that is #1682 milestone 2."
+  "Also remove any worktree, and delete any bare local branch, PROVEN safe: one whose branch's PR merged, verified via GitHub (never local commit reachability \u2014 a squash merge rewrites every SHA), AND whose current tip is confirmed contained in what that PR actually shipped \u2014 not merely on a branch of the same name (#1810). Everything else (no PR, PR open, PR closed unmerged, detached HEAD, uncommitted changes, commits ahead of what merged, or that containment could not be confirmed) is reported, never touched."
 ).action(async (options) => {
   const cwd = options.cwd ? resolve20(options.cwd) : process.cwd();
   const git = new GitAdapter();
@@ -15053,8 +15101,11 @@ var doctorCommand = new Command25("doctor").description(
     const findings = runDoctorChecks(facts);
     printFindings(findings);
     if (options.fix === true) {
-      const outcomes = await runDoctorFix(cwd, facts, { git, github: new GithubCliAdapter() });
+      const github = new GithubCliAdapter();
+      const outcomes = await runDoctorFix(cwd, facts, { git, github });
       printReapOutcomes(outcomes);
+      const branchOutcomes = await runDoctorFixBranches(cwd, facts, { git, github });
+      printBranchReapOutcomes(branchOutcomes);
     }
     if (findings.some((f) => f.severity === "error")) process.exit(1);
   } catch (err) {
@@ -15104,6 +15155,9 @@ async function gatherRepoFacts(options, deps) {
 async function runDoctorFix(cwd, facts, deps = { git: new GitAdapter(), github: new GithubCliAdapter() }) {
   return reapAll(cwd, facts.branches, facts.worktrees, facts.currentBranch, deps);
 }
+async function runDoctorFixBranches(cwd, facts, deps = { git: new GitAdapter(), github: new GithubCliAdapter() }) {
+  return reapAllBareBranches(cwd, facts.branches, facts.worktrees, facts.currentBranch, deps);
+}
 function readLocalCoreVersion(cwd) {
   const path = join61(cwd, INSTANCE_CORE_FILE);
   if (!existsSync53(path)) return null;
@@ -15204,6 +15258,39 @@ function printReapOutcomes(outcomes) {
     )
   );
 }
+function printBranchReapOutcomes(outcomes) {
+  if (outcomes.length === 0) {
+    console.log(chalk21.dim("  --fix (branches): no bare branch with a gone upstream to consider.\n"));
+    return;
+  }
+  const attempted = outcomes.filter((o) => o.verdict.action === "reap");
+  const kept = outcomes.filter((o) => o.verdict.action === "keep");
+  const deleted = attempted.filter((o) => o.branchDeleted === true);
+  const failed = attempted.filter((o) => o.branchDeleted !== true);
+  console.log("");
+  for (const o of attempted) {
+    if (o.branchDeleted === true) {
+      console.log(chalk21.green(`  deleted  ${o.candidate.branch}`));
+    } else {
+      console.log(
+        chalk21.red(
+          `  FAILED   ${o.candidate.branch} \u2014 judged safe to delete but 'git branch -D' did not succeed; left as-is`
+        )
+      );
+    }
+  }
+  for (const o of kept) {
+    const reason = o.verdict.reason === void 0 ? "unknown" : KEEP_REASON_TEXT[o.verdict.reason];
+    console.log(chalk21.dim(`  kept     ${o.candidate.branch} \u2014 ${reason}`));
+  }
+  console.log(
+    chalk21.dim(
+      `
+  --fix (branches): ${String(deleted.length)} deleted, ${String(failed.length)} failed, ${String(kept.length)} kept, of ${String(outcomes.length)} branch(es) considered.
+`
+    )
+  );
+}
 
 // src/commands/teardown.ts
 import { execSync as execSync7 } from "child_process";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@biffo/cli",
-  "version": "0.300.1",
+  "version": "0.301.1",
   "description": "Biffo project scaffolding CLI",
   "license": "MIT",
   "type": "module",