@biffo/cli 0.309.2 → 0.309.3

package/_skeletons/plugin-template/AGENTS.md

@@ -170,10 +170,18 @@ because `--auto` waits for ever on a check that cannot re-evaluate itself (a
 
 ## 6. Push honestly, and verify the remote has your commit
 
-- **Push with the exit status visible:** `git push origin HEAD; echo $?`. A pipe
-  (`git push | tail`) reports the pipe's status, not git's — a rejected push then
-  reads as success and the commit is silently lost. Never trust a "pushed"
-  message printed unconditionally after a pipe.
+- **Push with the exit status visible, and record the upstream:**
+  `git push -u origin HEAD; echo $?`. A pipe (`git push | tail`) reports the
+  pipe's status, not git's — a rejected push then reads as success and the
+  commit is silently lost. Never trust a "pushed" message printed
+  unconditionally after a pipe.
+- **The `-u` is not optional (biffo-template#1954).** `git worktree add -b
+<branch> <path> origin/dev` sets the new branch's upstream to `origin/dev`
+  by default — a plain `git push origin HEAD`, with no `-u`, never corrects
+  it. A branch left tracking `origin/dev` can be pushed, merged, and have its
+  own remote copy deleted, while `git branch -vv` never reports it `[gone]`
+  (the ref it is actually tracking never goes anywhere) — so `doctor --fix`
+  and every other tool reading that marker stays permanently blind to it.
 - **Confirm the remote actually has the commit before relying on it,** especially
   before merge: `git log origin/<branch> -1`. A green PR page is not proof your
   latest local commit reached it.

package/_skeletons/sibling-template/AGENTS.md

@@ -170,10 +170,18 @@ because `--auto` waits for ever on a check that cannot re-evaluate itself (a
 
 ## 6. Push honestly, and verify the remote has your commit
 
-- **Push with the exit status visible:** `git push origin HEAD; echo $?`. A pipe
-  (`git push | tail`) reports the pipe's status, not git's — a rejected push then
-  reads as success and the commit is silently lost. Never trust a "pushed"
-  message printed unconditionally after a pipe.
+- **Push with the exit status visible, and record the upstream:**
+  `git push -u origin HEAD; echo $?`. A pipe (`git push | tail`) reports the
+  pipe's status, not git's — a rejected push then reads as success and the
+  commit is silently lost. Never trust a "pushed" message printed
+  unconditionally after a pipe.
+- **The `-u` is not optional (biffo-template#1954).** `git worktree add -b
+<branch> <path> origin/dev` sets the new branch's upstream to `origin/dev`
+  by default — a plain `git push origin HEAD`, with no `-u`, never corrects
+  it. A branch left tracking `origin/dev` can be pushed, merged, and have its
+  own remote copy deleted, while `git branch -vv` never reports it `[gone]`
+  (the ref it is actually tracking never goes anywhere) — so `doctor --fix`
+  and every other tool reading that marker stays permanently blind to it.
 - **Confirm the remote actually has the commit before relying on it,** especially
   before merge: `git log origin/<branch> -1`. A green PR page is not proof your
   latest local commit reached it.

package/dist/index.js

@@ -1449,6 +1449,39 @@ var GitAdapter = class {
     const { stdout, exitCode } = await execa("git", ["rev-parse", "HEAD"], { cwd, reject: false });
     return exitCode === 0 ? stdout.trim() : null;
   }
+  /**
+   * Every local branch name that currently has a same-named remote-tracking
+   * ref under `refs/remotes/origin/` (biffo-template#1954) — i.e. `git
+   * for-each-ref refs/remotes/origin`, stripped of the `refs/remotes/origin/`
+   * prefix, with the `HEAD` symref excluded (it names no branch).
+   *
+   * This is the fact `doctor --fix`'s reap-candidate detection needs instead
+   * of trusting a branch's own *configured* upstream (`%(upstream:track)`,
+   * i.e. `git branch -vv`'s `[gone]` marker): `git worktree add -b <branch>
+   * <path> origin/dev` sets the new branch's upstream to `origin/dev` by
+   * default, and a plain `git push origin HEAD` (no `-u`) never corrects
+   * it — so a branch can be pushed, merged, and have its OWN remote copy
+   * deleted, while its `[gone]` marker never fires because the thing it is
+   * actually tracking (`origin/dev`) never goes anywhere. Checking for a
+   * same-named ref sidesteps whatever the branch happens to be configured to
+   * track entirely.
+   *
+   * Absence from this set does NOT by itself prove a branch's remote copy
+   * was deleted — a branch never pushed under its own name is equally
+   * absent. See `doctor-reaper.ts`'s `hasProvenGoneRemote` for why that
+   * distinction is safe to skip here (unlike in `upgrade-branch-reaper.ts`,
+   * which has no downstream verification and must not skip it).
+   */
+  async listRemoteBranchNames(cwd) {
+    const { stdout } = await execa(
+      "git",
+      ["for-each-ref", "--format=%(refname:lstrip=3)", "refs/remotes/origin"],
+      { cwd }
+    );
+    return new Set(
+      stdout.split("\n").map((line) => line.trim()).filter((name) => name !== "" && name !== "HEAD")
+    );
+  }
   /**
    * `branch`'s own tip SHA, without checking it out — the bare-branch
    * counterpart to `headSha` (#1682 milestone 2). A branch with no linked
@@ -16300,8 +16333,13 @@ function classifyReapCandidate(facts) {
       return { action: "keep", reason: "unknown-pr-verdict" };
   }
 }
-function findReapCandidates(branches, worktrees) {
-  const goneBranches = new Set(branches.filter((b) => b.track.includes("gone")).map((b) => b.name));
+function hasProvenGoneRemote(branch, remoteBranchNames) {
+  return !remoteBranchNames.has(branch.name);
+}
+function findReapCandidates(branches, worktrees, remoteBranchNames) {
+  const goneBranches = new Set(
+    branches.filter((b) => hasProvenGoneRemote(b, remoteBranchNames)).map((b) => b.name)
+  );
   return worktrees.filter((w) => goneBranches.has(w.branch)).map((w) => ({ branch: w.branch, worktreePath: w.path }));
 }
 async function reapCandidate(cwd, candidate, deps) {
@@ -16345,8 +16383,8 @@ async function reapCandidate(cwd, candidate, deps) {
   const worktreeRemoved = await git.removeWorktree(cwd, candidate.worktreePath);
   return { candidate, verdict, worktreeRemoved, staleClaimCleared };
 }
-async function reapAll(cwd, branches, worktrees, currentBranch, deps) {
-  const candidates = findReapCandidates(branches, worktrees).filter(
+async function reapAll(cwd, branches, worktrees, currentBranch, deps, remoteBranchNames) {
+  const candidates = findReapCandidates(branches, worktrees, remoteBranchNames).filter(
     (c) => c.branch !== currentBranch
   );
   const outcomes = [];
@@ -16355,9 +16393,9 @@ async function reapAll(cwd, branches, worktrees, currentBranch, deps) {
   }
   return outcomes;
 }
-function findBareBranchCandidates(branches, worktrees) {
+function findBareBranchCandidates(branches, worktrees, remoteBranchNames) {
   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 }));
+  return branches.filter((b) => hasProvenGoneRemote(b, remoteBranchNames) && !worktreeBranches.has(b.name)).map((b) => ({ branch: b.name }));
 }
 async function reapBareBranch(cwd, candidate, deps) {
   const { git, github } = deps;
@@ -16386,8 +16424,8 @@ async function reapBareBranch(cwd, candidate, deps) {
   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(
+async function reapAllBareBranches(cwd, branches, worktrees, currentBranch, deps, remoteBranchNames) {
+  const candidates = findBareBranchCandidates(branches, worktrees, remoteBranchNames).filter(
     (c) => c.branch !== currentBranch
   );
   const outcomes = [];
@@ -16464,10 +16502,19 @@ 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);
+  const remoteBranchNames = await deps.git.listRemoteBranchNames(cwd);
+  return reapAll(cwd, facts.branches, facts.worktrees, facts.currentBranch, deps, remoteBranchNames);
 }
 async function runDoctorFixBranches(cwd, facts, deps = { git: new GitAdapter(), github: new GithubCliAdapter() }) {
-  return reapAllBareBranches(cwd, facts.branches, facts.worktrees, facts.currentBranch, deps);
+  const remoteBranchNames = await deps.git.listRemoteBranchNames(cwd);
+  return reapAllBareBranches(
+    cwd,
+    facts.branches,
+    facts.worktrees,
+    facts.currentBranch,
+    deps,
+    remoteBranchNames
+  );
 }
 function readLocalCoreVersion(cwd) {
   const path = join69(cwd, INSTANCE_CORE_FILE);

package/package.json

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