@biffo/cli 0.313.0 → 0.313.1

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) {
@@ -12722,7 +12728,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 +12784,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 +12799,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 +12815,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 +12833,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.1",
   "description": "Biffo project scaffolding CLI",
   "license": "MIT",
   "type": "module",