@biffo/cli 0.74.1 → 0.76.0

package/dist/index.js

@@ -1628,11 +1628,17 @@ ${issues}`);
   }
   return parsed.data;
 }
-function parseDivergenceTrailer(commitMessage) {
+function parseTrailer(commitMessage, key) {
   const body = commitMessage.split("\n").filter((line) => !line.startsWith("#")).join("\n");
-  const match = /^Core-Divergence:[ \t]*(\S.*?)[ \t]*$/m.exec(body);
+  const match = new RegExp(String.raw`^Core-${key}:[ \t]*(\S.*?)[ \t]*$`, "m").exec(body);
   return match?.[1] ?? null;
 }
+function parseDivergenceTrailer(commitMessage) {
+  return parseTrailer(commitMessage, "Divergence");
+}
+function parseConvergenceTrailer(commitMessage) {
+  return parseTrailer(commitMessage, "Convergence");
+}
 function resolveBranch(env, gitBranch) {
   return (env["GITHUB_HEAD_REF"] || env["GITHUB_REF_NAME"] || gitBranch).trim();
 }
@@ -1657,7 +1663,7 @@ function checkCoreOwnership({
   commitMessage = "",
   warnOnly = []
 }) {
-  const empty = { blocked: [], warned: [], divergenceReason: null };
+  const empty = { blocked: [], warned: [], divergenceReason: null, convergenceReason: null };
   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));
@@ -1673,10 +1679,34 @@ function checkCoreOwnership({
     else offending.push(path);
   }
   const divergenceReason = parseDivergenceTrailer(commitMessage);
-  if (offending.length > 0 && divergenceReason !== null) {
-    return { skipped: "divergence-trailer", blocked: [], warned, divergenceReason };
+  const convergenceReason = parseConvergenceTrailer(commitMessage);
+  if (offending.length > 0) {
+    if (divergenceReason !== null) {
+      return {
+        skipped: "divergence-trailer",
+        blocked: [],
+        warned,
+        divergenceReason,
+        convergenceReason: null
+      };
+    }
+    if (convergenceReason !== null) {
+      return {
+        skipped: "convergence-trailer",
+        blocked: [],
+        warned,
+        divergenceReason: null,
+        convergenceReason
+      };
+    }
   }
-  return { skipped: null, blocked: offending, warned, divergenceReason: null };
+  return {
+    skipped: null,
+    blocked: offending,
+    warned,
+    divergenceReason: null,
+    convergenceReason: null
+  };
 }
 
 // src/lib/core-upgrade.ts
@@ -7309,6 +7339,12 @@ async function runOwnershipCheck(argv) {
     );
     return;
   }
+  if (result.skipped === "convergence-trailer") {
+    console.log(
+      `\u2713 core ownership guard: allowed by Core-Convergence (reverting toward the template): ${result.convergenceReason ?? ""}`
+    );
+    return;
+  }
   if (result.blocked.length === 0) {
     console.log("\u2713 core ownership guard: no template-owned paths changed.");
     return;
@@ -7332,11 +7368,20 @@ ${BOLD}What to do instead${OFF}
   path \u2014 see core-manifest.json for the split.
 
 ${result.blocked.some((p) => deletedFiles.includes(p)) ? `${BOLD}Some of these are deletions${OFF}
-  Deleting a template-owned file is not a smaller change than editing one \u2014 a
-  core upgrade will not restore it (#395), so the instance loses it silently and
-  for ever. If the file genuinely should not exist, delete it in biffo-template.
+  Deleting a template-owned file is drift like any other: the next
+  \`biffo core upgrade\` will restore it (#395) unless you declare the path an
+  intentional divergence. If the file genuinely should not exist, delete it in
+  biffo-template so every instance drops it.
+
+` : ""}${BOLD}If this REMOVES divergence (reverting toward the template)${OFF}
+  Reverting a template-owned file to the template's own content, or deleting a
+  file the template no longer ships, leaves the instance strictly closer to the
+  template. Record that it converges \u2014 it is allowed, and kept distinct from a
+  divergence so it never reads as drift to chase later (#385):
+
+    ${DIM}Core-Convergence: <what this reverts toward the template>${OFF}
 
-` : ""}${BOLD}If the divergence is deliberate${OFF}
+${BOLD}If the divergence is deliberate${OFF}
   Record it in the commit message and it is allowed:
 
     ${DIM}Core-Divergence: <why this instance must differ from the template>${OFF}

package/package.json

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