@biffo/cli 0.301.2 → 0.301.5

package/dist/index.js

@@ -1115,6 +1115,25 @@ var GitAdapter = class {
     const { stdout } = await execa("git", ["status", "--porcelain"], { cwd });
     return stdout.trim().length > 0;
   }
+  /**
+   * True if `worktreePath` is currently held by biffo-fleet's own
+   * `.fleet-worktree-claim` lock (#1833, replaces #1825) — a live session
+   * may hold a worktree open for follow-up work after its PR has already
+   * merged, which is invisible to every other check `doctor --fix` applies
+   * (clean, attached, merged, HEAD contained in what shipped all pass while
+   * this is true).
+   *
+   * Deliberately a plain filesystem existence check, not a shell-out to
+   * `bin/fleet.sh worktree-claim --check` — that verb is not read-only (it
+   * `mkdir`s the lock and only reports "held" on failure), so calling it from
+   * here to merely ask would risk *creating* a claim on a free worktree
+   * rather than answering the question. The lock directory's existence is a
+   * filesystem fact this repo is allowed to read without touching
+   * biffo-fleet's own source (#1833's own routing note).
+   */
+  async hasFleetWorktreeClaim(worktreePath) {
+    return existsSync6(join6(worktreePath, ".fleet-worktree-claim"));
+  }
   /** Best-effort fetch of the tracking remote, so the ahead/behind check below
    * compares against reality rather than a stale local ref (#394). Never throws:
    * offline or a missing remote must not block an upgrade on its own — the
@@ -14992,6 +15011,7 @@ function runDoctorChecks(facts) {
 
 // src/lib/doctor-reaper.ts
 function classifyReapCandidate(facts) {
+  if (facts.hasFleetClaim) return { action: "keep", reason: "fleet-worktree-claimed" };
   if (facts.isDetached) return { action: "keep", reason: "detached-head" };
   if (facts.isDirty) return { action: "keep", reason: "uncommitted-changes" };
   switch (facts.prVerdict) {
@@ -15017,12 +15037,13 @@ function findReapCandidates(branches, worktrees) {
 }
 async function reapCandidate(cwd, candidate, deps) {
   const { git, github } = deps;
-  const [current, isDirty] = await Promise.all([
+  const [current, isDirty, hasFleetClaim] = await Promise.all([
     git.currentBranch(candidate.worktreePath),
-    git.hasUncommittedChanges(candidate.worktreePath)
+    git.hasUncommittedChanges(candidate.worktreePath),
+    git.hasFleetWorktreeClaim(candidate.worktreePath)
   ]);
   const isDetached = current === "HEAD" || current === "";
-  const prVerdict = isDetached || isDirty ? "unknown" : await github.prVerdictForBranch(cwd, candidate.branch);
+  const prVerdict = isDetached || isDirty || hasFleetClaim ? "unknown" : await github.prVerdictForBranch(cwd, candidate.branch);
   let mergeContainsHead = true;
   if (prVerdict === "merged") {
     const [headSha, mergedHeadSha] = await Promise.all([
@@ -15031,7 +15052,13 @@ async function reapCandidate(cwd, candidate, deps) {
     ]);
     mergeContainsHead = headSha === null || mergedHeadSha === null ? null : await git.isAncestor(cwd, headSha, mergedHeadSha);
   }
-  const verdict = classifyReapCandidate({ isDetached, isDirty, prVerdict, mergeContainsHead });
+  const verdict = classifyReapCandidate({
+    isDetached,
+    isDirty,
+    hasFleetClaim,
+    prVerdict,
+    mergeContainsHead
+  });
   if (verdict.action === "keep") {
     return { candidate, verdict, worktreeRemoved: null };
   }
@@ -15066,6 +15093,10 @@ async function reapBareBranch(cwd, candidate, deps) {
   const verdict = classifyReapCandidate({
     isDetached: false,
     isDirty: false,
+    // A bare branch has no worktree, so there is no `.fleet-worktree-claim`
+    // directory that could exist — trivially false, same reasoning as the
+    // two fields above (#1833).
+    hasFleetClaim: false,
     prVerdict,
     mergeContainsHead
   });
@@ -15216,6 +15247,7 @@ function printFindings(findings) {
 var KEEP_REASON_TEXT = {
   "detached-head": "worktree HEAD is detached",
   "uncommitted-changes": "worktree has uncommitted changes",
+  "fleet-worktree-claimed": "worktree is held by a live biffo-fleet worktree-claim lock",
   "pr-open": "PR is still open",
   "pr-closed": "PR closed unmerged",
   "no-pr": "no PR was ever opened from this branch",

package/package.json

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