@biffo/cli 0.167.0 → 0.167.1

package/dist/index.js

@@ -948,6 +948,27 @@ var GitAdapter = class {
   async fetchPrune(cwd, remote = "origin") {
     await execa2("git", ["fetch", "--quiet", "--prune", remote], { cwd, reject: false });
   }
+  /**
+   * Is `cwd` the primary checkout, rather than a linked worktree?
+   *
+   * The distinction decides whether being off the integration branch is a
+   * defect or the mandated state: AGENTS.md §1 requires all work to happen in a
+   * worktree on its own branch, while §2 requires the primary to stay on `dev`.
+   * Reporting the former as a problem is a false positive in the one place
+   * everybody works.
+   *
+   * A linked worktree's git dir points inside `.git/worktrees/<name>`, while the
+   * common dir is the shared `.git`. They are equal only in the primary.
+   */
+  async isPrimaryWorktree(cwd) {
+    const opts = { cwd, reject: false };
+    const [dir, common] = await Promise.all([
+      execa2("git", ["rev-parse", "--absolute-git-dir"], opts),
+      execa2("git", ["rev-parse", "--path-format=absolute", "--git-common-dir"], opts)
+    ]);
+    if (dir.exitCode !== 0 || common.exitCode !== 0) return true;
+    return dir.stdout.trim() === common.stdout.trim();
+  }
   /**
    * Worktrees other than the primary, with the branch each is on (#797).
    *
@@ -9131,7 +9152,7 @@ function checkCheckoutCurrency(facts) {
     });
     return findings;
   }
-  if (facts.currentBranch !== facts.integrationBranch) {
+  if (facts.isPrimary && facts.currentBranch !== facts.integrationBranch) {
     findings.push({
       check: "checkout-off-integration",
       severity: "error",
@@ -9139,12 +9160,24 @@ function checkCheckoutCurrency(facts) {
       remedy: `git switch ${facts.integrationBranch} && git pull  (do the work in a worktree instead)`
     });
   }
+  if (facts.isPrimary && facts.isDirty) {
+    findings.push({
+      check: "checkout-dirty",
+      severity: "warn",
+      detail: "The primary checkout has uncommitted changes, so what it contains is neither the integration branch nor anything reviewed. Editing the primary directly is what AGENTS.md \xA71 exists to prevent; work belongs in a worktree.",
+      remedy: 'git stash push -m "<what this is>" or commit it on a branch, then work in a worktree'
+    });
+  }
   if (facts.hasUpstream && facts.behind > 0) {
     const diverged = facts.ahead > 0 ? `, and ${String(facts.ahead)} ahead (diverged)` : "";
+    const where = facts.isPrimary ? "The primary checkout" : "This worktree";
     findings.push({
       check: "checkout-behind",
-      severity: "error",
-      detail: `The primary checkout is ${String(facts.behind)} commit(s) behind its upstream${diverged}. Every file read from it may be stale, including the ones that look like authoritative state.`,
+      // In a worktree, behind-its-own-upstream means someone else pushed to the
+      // branch — worth knowing, but not a reason to distrust everything read
+      // from it the way a stale primary is.
+      severity: facts.isPrimary ? "error" : "warn",
+      detail: `${where} is ${String(facts.behind)} commit(s) behind its upstream${diverged}. Every file read from it may be stale, including the ones that look like authoritative state.`,
       remedy: "git pull --ff-only"
     });
   }
@@ -9153,6 +9186,7 @@ function checkCheckoutCurrency(facts) {
 function checkCoreVersionCurrency(facts) {
   if (facts.localCoreVersion === null || facts.remoteCoreVersion === null) return [];
   if (facts.localCoreVersion === facts.remoteCoreVersion) return [];
+  if (!facts.isPrimary) return [];
   return [
     {
       check: "core-version-stale",
@@ -9247,6 +9281,8 @@ async function runDoctor(options, deps = { git: new GitAdapter() }) {
   }
   if (options.fetch) await git.fetchPrune(options.cwd);
   const currentBranch = await git.currentBranch(options.cwd);
+  const isPrimary = await git.isPrimaryWorktree(options.cwd);
+  const isDirty = await git.hasUncommittedChanges(options.cwd);
   const { ahead, behind, hasUpstream } = await git.aheadBehind(options.cwd);
   const branches = await git.listBranchRefs(options.cwd);
   const worktreePaths = await git.listWorktrees(options.cwd);
@@ -9258,10 +9294,12 @@ async function runDoctor(options, deps = { git: new GitAdapter() }) {
   );
   const facts = {
     currentBranch,
+    isPrimary,
     integrationBranch: INTEGRATION_BRANCH,
     ahead,
     behind,
     hasUpstream,
+    isDirty,
     localCoreVersion: readLocalCoreVersion(options.cwd),
     remoteCoreVersion: parseCoreRecord(
       await git.showFileAtRef(options.cwd, `origin/${INTEGRATION_BRANCH}`, INSTANCE_CORE_FILE)

package/package.json

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