@biffo/cli 0.313.0 → 0.313.2

package/dist/index.js

@@ -719,7 +719,8 @@ function checkCoreOwnership({
   branch = "",
   commitMessage = "",
   warnOnly = [],
-  templateShippedPaths = null
+  templateShippedPaths = null,
+  upgradeCommitFiles = null
 }) {
   const empty = {
     blocked: [],
@@ -729,8 +730,13 @@ function checkCoreOwnership({
     knownOrphans: []
   };
   if (!isInstance) return { skipped: "template", ...empty };
-  if (branch.startsWith(UPGRADE_BRANCH_PREFIX)) return { skipped: "upgrade-branch", ...empty };
-  const manifestTemplateOwned = changedFiles.filter((f) => isTemplateOwned(f, manifest));
+  let effectiveChangedFiles = changedFiles;
+  if (branch.startsWith(UPGRADE_BRANCH_PREFIX)) {
+    const exempt = new Set(upgradeCommitFiles ?? []);
+    effectiveChangedFiles = changedFiles.filter((f) => !exempt.has(f));
+    if (effectiveChangedFiles.length === 0) return { skipped: "upgrade-branch", ...empty };
+  }
+  const manifestTemplateOwned = effectiveChangedFiles.filter((f) => isTemplateOwned(f, manifest));
   const knownOrphans = [];
   const templateOwned = [];
   for (const path of manifestTemplateOwned) {
@@ -4455,7 +4461,35 @@ function buildPrBody(from, to, plan, migrations, base = GLOBAL_DISPATCH_REF, loc
   lines.push(
     "Automated core upgrade generated by `biffo core upgrade` (ADR-0006).",
     "",
-    `Bumps the Biffo template core from **${from}** to **${to}** and updates \`biffo.core.json\`. Only template-owned paths (see \`core-manifest.json\`) were touched \u2014 product, plugin, and infra files were left untouched.`,
+    // SCOPED TO THE COMMIT THIS TOOL WRITES, NOT TO THE BRANCH (#1999).
+    //
+    // The old wording was "Only template-owned paths were touched — product,
+    // plugin, and infra files were left untouched", stated flatly about the PR.
+    // It is true when this runs and routinely FALSE by the time the PR merges,
+    // because an instance carrying a divergence declaration cannot go green
+    // without a second, user-owned commit on this same branch:
+    // `test_known_divergence_derivation_matches_the_current_core_pin` asserts
+    // the derivation constant equals `biffo.core.json`'s pin in BOTH
+    // directions, so bumping the pin without re-deriving is red on a required
+    // check, and re-deriving without the bump turns `dev` red instead. Neither
+    // half can land alone.
+    //
+    // Live cost of the old wording, tabsii-com/tabsii-platform#1420: a
+    // prosecutor compared the branch head to this claim, correctly found the
+    // claim false, and rejected the PR. The remediation split the re-derivation
+    // into a stacked PR and deadlocked — the upgrade could not go green without
+    // it, and it could not merge before the upgrade. Three builder dispatches, a
+    // model escalation and a blocker filed at the owner, with nothing wrong in
+    // the code at any point. The tool asserted something it cannot keep true and
+    // a guard believed it.
+    //
+    // This says only what the tool actually knows: what ITS OWN commit did.
+    // #1994 made that distinction real on the guard side too, scoping the
+    // ownership exemption to the mechanical commit — so the body and the guard
+    // now mean the same thing by "the upgrade".
+    `Bumps the Biffo template core from **${from}** to **${to}** and updates \`biffo.core.json\`.`,
+    "",
+    `The commit generated by \`biffo core upgrade\` touches only template-owned paths (see \`core-manifest.json\`) \u2014 no product, plugin or infra files. **Any later commit on this branch is an ordinary reviewable change and is not covered by that statement.** A divergence-pin re-derivation belongs here, for example: the pin-equality test requires it to land together with the core bump, and it edits a user-owned path by design.`,
     ...carriedPrsSection(carriedPrs),
     "",
     `## Changes (${plan.changes.length})`,
@@ -12722,7 +12756,37 @@ async function fetchTemplateShippedPaths(repoRoot, runner = defaultRunner) {
   return paths.length > 0 ? new Set(paths) : null;
 }
 
+// src/lib/upgrade-commit-files.ts
+var defaultRunner2 = async (args, cwd) => {
+  const result = await execa("git", args, { cwd, reject: false, timeout: 15e3 });
+  return { stdout: String(result.stdout ?? ""), exitCode: result.exitCode ?? null };
+};
+var splitLines = (stdout) => stdout.split("\n").map((line) => line.trim()).filter(Boolean);
+async function resolveUpgradeCommitFiles(repoRoot, base, opts = {}, runner = defaultRunner2) {
+  let rev;
+  try {
+    rev = await runner(["rev-list", "--reverse", `${base}..HEAD`], repoRoot);
+  } catch {
+    return null;
+  }
+  if (rev.exitCode !== 0) return null;
+  const commits = splitLines(rev.stdout);
+  if (commits.length === 0) {
+    return opts.stagedFallbackFiles ?? null;
+  }
+  const first = commits[0];
+  let diff;
+  try {
+    diff = await runner(["diff-tree", "--no-commit-id", "--name-only", "-r", first], repoRoot);
+  } catch {
+    return null;
+  }
+  if (diff.exitCode !== 0) return null;
+  return splitLines(diff.stdout);
+}
+
 // src/scripts/check-core-ownership.ts
+var LOCAL_UPGRADE_BASE = "origin/dev";
 var BOLD = "\x1B[1m";
 var DIM = "\x1B[2m";
 var RED = "\x1B[31m";
@@ -12748,6 +12812,7 @@ async function runOwnershipCheck(argv) {
   let changedFiles;
   let deletedFiles = [];
   let commitMessage = "";
+  let ciBase = null;
   if (staged) {
     const { stdout } = await execa("git", ["diff", "--cached", "--name-status"], { cwd: root });
     ({ changed: changedFiles, deleted: deletedFiles } = parseNameStatus(stdout));
@@ -12762,11 +12827,12 @@ async function runOwnershipCheck(argv) {
       process.exit(2);
     }
     await execa("git", ["fetch", "--quiet", "origin", base], { cwd: root, reject: false });
-    const { stdout } = await execa("git", ["diff", "--name-status", `origin/${base}...HEAD`], {
+    ciBase = `origin/${base}`;
+    const { stdout } = await execa("git", ["diff", "--name-status", `${ciBase}...HEAD`], {
       cwd: root
     });
     ({ changed: changedFiles, deleted: deletedFiles } = parseNameStatus(stdout));
-    const { stdout: log2 } = await execa("git", ["log", "--format=%B", `origin/${base}..HEAD`], {
+    const { stdout: log2 } = await execa("git", ["log", "--format=%B", `${ciBase}..HEAD`], {
       cwd: root,
       reject: false
     });
@@ -12777,6 +12843,11 @@ async function runOwnershipCheck(argv) {
     reject: false
   });
   const branch = resolveBranch(process.env, gitBranch);
+  const upgradeCommitFiles = branch.startsWith(UPGRADE_BRANCH_PREFIX) ? await resolveUpgradeCommitFiles(
+    root,
+    ciBase ?? LOCAL_UPGRADE_BASE,
+    staged ? { stagedFallbackFiles: changedFiles } : {}
+  ) : null;
   const templateShippedPaths = staged ? null : await fetchTemplateShippedPaths(root);
   if (!staged && templateShippedPaths === null) {
     console.error(
@@ -12790,6 +12861,7 @@ async function runOwnershipCheck(argv) {
     branch,
     commitMessage,
     warnOnly: readDivergenceConfig(root).warnOnly,
+    upgradeCommitFiles,
     templateShippedPaths
   });
   if (result.knownOrphans.length > 0) {

package/package.json

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