@biffo/cli 0.304.1 → 0.304.2

package/dist/index.js

@@ -717,12 +717,28 @@ function checkCoreOwnership({
   isInstance,
   branch = "",
   commitMessage = "",
-  warnOnly = []
+  warnOnly = [],
+  templateShippedPaths = null
 }) {
-  const empty = { blocked: [], warned: [], divergenceReason: null, convergenceReason: null };
+  const empty = {
+    blocked: [],
+    warned: [],
+    divergenceReason: null,
+    convergenceReason: null,
+    knownOrphans: []
+  };
   if (!isInstance) return { skipped: "template", ...empty };
   if (branch.startsWith(UPGRADE_BRANCH_PREFIX)) return { skipped: "upgrade-branch", ...empty };
-  const templateOwned = changedFiles.filter((f) => isTemplateOwned(f, manifest));
+  const manifestTemplateOwned = changedFiles.filter((f) => isTemplateOwned(f, manifest));
+  const knownOrphans = [];
+  const templateOwned = [];
+  for (const path of manifestTemplateOwned) {
+    if (templateShippedPaths != null && !templateShippedPaths.has(path)) {
+      knownOrphans.push(path);
+    } else {
+      templateOwned.push(path);
+    }
+  }
   const acknowledged = (path) => warnOnly.filter((entry) => path.startsWith(entry.prefix)).reduce(
     (best, entry) => !best || entry.prefix.length > best.prefix.length ? entry : best,
     void 0
@@ -743,7 +759,8 @@ function checkCoreOwnership({
         blocked: [],
         warned,
         divergenceReason,
-        convergenceReason: null
+        convergenceReason: null,
+        knownOrphans
       };
     }
     if (convergenceReason !== null) {
@@ -752,7 +769,8 @@ function checkCoreOwnership({
         blocked: [],
         warned,
         divergenceReason: null,
-        convergenceReason
+        convergenceReason,
+        knownOrphans
       };
     }
   }
@@ -761,7 +779,8 @@ function checkCoreOwnership({
     blocked: offending,
     warned,
     divergenceReason: null,
-    convergenceReason: null
+    convergenceReason: null,
+    knownOrphans
   };
 }
 
@@ -12255,6 +12274,37 @@ async function runCoreDirectPathsCheck(opts = {}) {
   console.log(`\u2713 core-direct-paths guard: ${report.summary}`);
 }
 
+// src/lib/template-shipped-paths.ts
+var TEMPLATE_UPSTREAM_OWNER = "keiranholloway";
+var TEMPLATE_UPSTREAM_REPO = "biffo-template";
+var TEMPLATE_UPSTREAM_BRANCH = "dev";
+var defaultRunner = async (args, cwd) => {
+  const result = await execa("git", args, { cwd, reject: false, timeout: 15e3 });
+  return { stdout: String(result.stdout ?? ""), exitCode: result.exitCode ?? null };
+};
+async function fetchTemplateShippedPaths(repoRoot, runner = defaultRunner) {
+  const url = `https://github.com/${TEMPLATE_UPSTREAM_OWNER}/${TEMPLATE_UPSTREAM_REPO}.git`;
+  let fetched;
+  try {
+    fetched = await runner(
+      ["fetch", "--depth", "1", "--quiet", url, TEMPLATE_UPSTREAM_BRANCH],
+      repoRoot
+    );
+  } catch {
+    return null;
+  }
+  if (fetched.exitCode !== 0) return null;
+  let tree;
+  try {
+    tree = await runner(["ls-tree", "-r", "--name-only", "FETCH_HEAD"], repoRoot);
+  } catch {
+    return null;
+  }
+  if (tree.exitCode !== 0) return null;
+  const paths = tree.stdout.split("\n").map((line) => line.trim()).filter(Boolean);
+  return paths.length > 0 ? new Set(paths) : null;
+}
+
 // src/scripts/check-core-ownership.ts
 var BOLD = "\x1B[1m";
 var DIM = "\x1B[2m";
@@ -12310,14 +12360,29 @@ async function runOwnershipCheck(argv) {
     reject: false
   });
   const branch = resolveBranch(process.env, gitBranch);
+  const templateShippedPaths = staged ? null : await fetchTemplateShippedPaths(root);
+  if (!staged && templateShippedPaths === null) {
+    console.error(
+      `${YELLOW}\u26A0 core ownership guard: could not fetch biffo-template's dev tree (offline, network failure, or timeout) \u2014 falling back to the manifest prefix list alone, which cannot tell an instance-only file from a real template file under the same prefix (#1912).${OFF}`
+    );
+  }
   const result = checkCoreOwnership({
     changedFiles,
     manifest: readCoreManifest(root),
     isInstance: true,
     branch,
     commitMessage,
-    warnOnly: readDivergenceConfig(root).warnOnly
+    warnOnly: readDivergenceConfig(root).warnOnly,
+    templateShippedPaths
   });
+  if (result.knownOrphans.length > 0) {
+    console.log(
+      `${DIM}\u2139 ${result.knownOrphans.length} path(s) matched a template-owned prefix, but biffo-template's dev branch does not ship them \u2014 treated as instance-owned, no Core-Divergence trailer needed (#1912):${OFF}`
+    );
+    for (const path of result.knownOrphans) {
+      console.log(`    ${DIM}${path}${OFF}`);
+    }
+  }
   for (const { path, entry } of result.warned) {
     console.error(
       `${YELLOW}\u26A0 ${path}${OFF} ${DIM}\u2014 known divergence in ${entry.prefix} (${entry.upstream}); still conflicts at the next core upgrade.${OFF}`

package/package.json

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