@biffo/cli 0.214.0 → 0.214.1

package/dist/index.js

@@ -9126,12 +9126,24 @@ import { Command as Command23 } from "commander";
 
 // src/scripts/check-adr-numbering.ts
 import { existsSync as existsSync32 } from "fs";
-import { join as join31 } from "path";
+import { join as join32 } from "path";
 import { execa as execa5 } from "execa";
 
 // src/lib/adr-numbering-guard.ts
-import { existsSync as existsSync31, readdirSync as readdirSync13 } from "fs";
+import { existsSync as existsSync31, readdirSync as readdirSync13, readFileSync as readFileSync24 } from "fs";
+import { join as join31 } from "path";
 var ADR_FILENAME = /^(\d{4})-.+\.md$/;
+var ALLOWLIST_FILENAME = ".numbering-allowlist";
+function readAdrNumberingAllowlist(adrDir) {
+  const path = join31(adrDir, ALLOWLIST_FILENAME);
+  if (!existsSync31(path)) return /* @__PURE__ */ new Set();
+  const numbers = /* @__PURE__ */ new Set();
+  for (const rawLine of readFileSync24(path, "utf8").split("\n")) {
+    const line = rawLine.split("#")[0].trim();
+    if (line) numbers.add(line);
+  }
+  return numbers;
+}
 function adrNumbersIn(adrDir) {
   const claims = /* @__PURE__ */ new Map();
   if (!existsSync31(adrDir)) return claims;
@@ -9144,12 +9156,20 @@ function adrNumbersIn(adrDir) {
   return claims;
 }
 function findAdrNumberCollisions(adrDir) {
+  const allowlist = readAdrNumberingAllowlist(adrDir);
   const collisions = [];
   for (const [number, files] of [...adrNumbersIn(adrDir).entries()].sort()) {
-    if (files.length > 1) collisions.push({ number, files: [...files].sort() });
+    if (files.length > 1 && !allowlist.has(number)) {
+      collisions.push({ number, files: [...files].sort() });
+    }
   }
   return collisions;
 }
+function findStaleAdrNumberingAllowlistEntries(adrDir) {
+  const allowlist = readAdrNumberingAllowlist(adrDir);
+  const claims = adrNumbersIn(adrDir);
+  return [...allowlist].filter((number) => (claims.get(number)?.length ?? 0) < 2).sort();
+}
 function formatAdrNumberCollisions(collisions) {
   return collisions.map(
     (c) => `  ADR-${c.number} is claimed by: ${c.files.join(", ")}
@@ -9161,18 +9181,31 @@ function formatAdrNumberCollisions(collisions) {
 // src/scripts/check-adr-numbering.ts
 async function runAdrNumberingCheck() {
   const root = (await execa5("git", ["rev-parse", "--show-toplevel"])).stdout.trim();
-  const adrDir = join31(root, "docs", "ADR");
+  const adrDir = join32(root, "docs", "ADR");
   if (!existsSync32(adrDir)) {
     console.log("\u2713 ADR numbering guard: no docs/ADR/ directory \u2014 nothing to compare");
     return;
   }
   const collisions = findAdrNumberCollisions(adrDir);
+  const stale = findStaleAdrNumberingAllowlistEntries(adrDir);
+  let failed = false;
   if (collisions.length > 0) {
+    failed = true;
     console.error("\u2717 ADR numbering guard: two ADRs in docs/ADR/ share a number\n");
     console.error(formatAdrNumberCollisions(collisions));
-    console.error("\nSee tabsii-platform#449 for how this class of collision happens.");
-    process.exit(1);
+    console.error(
+      `
+Already accepted? List it in docs/ADR/${ALLOWLIST_FILENAME} instead of leaving this red forever. See tabsii-platform#449 for how this class of collision happens.`
+    );
+  }
+  if (stale.length > 0) {
+    failed = true;
+    console.error(
+      `\u2717 ADR numbering guard: docs/ADR/${ALLOWLIST_FILENAME} names a number that no longer collides: ${stale.join(", ")}
+  Remove the stale entry \u2014 an allowlist nothing checks against just hides the next real one.`
+    );
   }
+  if (failed) process.exit(1);
   console.log("\u2713 ADR numbering guard: OK");
 }
 
@@ -9460,8 +9493,8 @@ async function runOwnershipCheck(argv) {
     const { stdout } = await execa7("git", ["diff", "--cached", "--name-status"], { cwd: root });
     ({ changed: changedFiles, deleted: deletedFiles } = parseNameStatus(stdout));
     if (messageFile) {
-      const { readFileSync: readFileSync26, existsSync: existsSync37 } = await import("fs");
-      if (existsSync37(messageFile)) commitMessage = readFileSync26(messageFile, "utf8");
+      const { readFileSync: readFileSync27, existsSync: existsSync37 } = await import("fs");
+      if (existsSync37(messageFile)) commitMessage = readFileSync27(messageFile, "utf8");
     }
   } else {
     const base = process.env["GITHUB_BASE_REF"] ?? args[0];
@@ -9563,12 +9596,12 @@ ${BOLD}If the divergence is deliberate${OFF}
 
 // src/scripts/check-plugin-collisions.ts
 import { existsSync as existsSync34 } from "fs";
-import { join as join33 } from "path";
+import { join as join34 } from "path";
 import { execa as execa8 } from "execa";
 
 // src/lib/plugin-collision-guard.ts
 import { existsSync as existsSync33, readdirSync as readdirSync14, statSync as statSync7 } from "fs";
-import { join as join32 } from "path";
+import { join as join33 } from "path";
 var PYTEST_SPECIAL = /* @__PURE__ */ new Set(["conftest.py"]);
 var IGNORED_DIRS = /* @__PURE__ */ new Set([".venv", "node_modules", "__pycache__", ".git", "dist", "build"]);
 function subdirectories(dir) {
@@ -9576,19 +9609,19 @@ function subdirectories(dir) {
   return readdirSync14(dir).filter((entry) => {
     if (IGNORED_DIRS.has(entry) || entry.startsWith(".")) return false;
     try {
-      return statSync7(join32(dir, entry)).isDirectory();
+      return statSync7(join33(dir, entry)).isDirectory();
     } catch {
       return false;
     }
   });
 }
 function regularPackagesOf(pluginDir2) {
-  return subdirectories(pluginDir2).filter((name) => existsSync33(join32(pluginDir2, name, "__init__.py"))).sort();
+  return subdirectories(pluginDir2).filter((name) => existsSync33(join33(pluginDir2, name, "__init__.py"))).sort();
 }
 function bareTestModulesOf(pluginDir2) {
-  const testsDir = join32(pluginDir2, "tests");
+  const testsDir = join33(pluginDir2, "tests");
   if (!existsSync33(testsDir)) return [];
-  if (existsSync33(join32(testsDir, "__init__.py"))) return [];
+  if (existsSync33(join33(testsDir, "__init__.py"))) return [];
   return readdirSync14(testsDir).filter((f) => f.endsWith(".py") && !PYTEST_SPECIAL.has(f)).sort();
 }
 function findCollisions(servicesDir, pluginDirs) {
@@ -9597,7 +9630,7 @@ function findCollisions(servicesDir, pluginDirs) {
   const gather = (kind, namesOf) => {
     const claims = /* @__PURE__ */ new Map();
     for (const plugin of plugins) {
-      for (const name of namesOf(join32(servicesDir, plugin))) {
+      for (const name of namesOf(join33(servicesDir, plugin))) {
         claims.set(name, [...claims.get(name) ?? [], plugin]);
       }
     }
@@ -9635,7 +9668,7 @@ function formatCollisions(collisions) {
 // src/scripts/check-plugin-collisions.ts
 async function runPluginCollisionCheck() {
   const root = (await execa8("git", ["rev-parse", "--show-toplevel"])).stdout.trim();
-  const servicesDir = join33(root, "services");
+  const servicesDir = join34(root, "services");
   if (!existsSync34(servicesDir)) {
     console.log("\u2713 plugin collision guard: no services/ directory \u2014 nothing to compare");
     return;
@@ -9656,8 +9689,8 @@ async function runPluginCollisionCheck() {
 import { execa as execa9 } from "execa";
 
 // src/lib/plugin-terraform-guard.ts
-import { existsSync as existsSync35, readFileSync as readFileSync24, readdirSync as readdirSync15 } from "fs";
-import { dirname as dirname9, join as join34, relative as relative6, sep as sep3 } from "path";
+import { existsSync as existsSync35, readFileSync as readFileSync25, readdirSync as readdirSync15 } from "fs";
+import { dirname as dirname9, join as join35, relative as relative6, sep as sep3 } from "path";
 var SKIP_DIRS = /* @__PURE__ */ new Set(["node_modules", ".git", ".worktrees", "dist", ".venv", "__pycache__"]);
 var PLUGIN_MANIFEST_FILE2 = "biffo.plugin.json";
 function findPluginManifests(root) {
@@ -9672,9 +9705,9 @@ function findPluginManifests(root) {
     for (const entry of entries) {
       if (entry.isDirectory()) {
         if (SKIP_DIRS.has(entry.name)) continue;
-        walk(join34(dir, entry.name));
+        walk(join35(dir, entry.name));
       } else if (entry.isFile() && entry.name === PLUGIN_MANIFEST_FILE2) {
-        found.push(relative6(root, join34(dir, entry.name)).split(sep3).join("/"));
+        found.push(relative6(root, join35(dir, entry.name)).split(sep3).join("/"));
       }
     }
   };
@@ -9684,7 +9717,7 @@ function findPluginManifests(root) {
 function readSubscriptions(absManifestPath) {
   let parsed;
   try {
-    parsed = JSON.parse(readFileSync24(absManifestPath, "utf8"));
+    parsed = JSON.parse(readFileSync25(absManifestPath, "utf8"));
   } catch {
     return null;
   }
@@ -9699,14 +9732,14 @@ function readSubscriptions(absManifestPath) {
 }
 function checkPluginTerraform(root) {
   const violations = [];
-  const coreManifest = existsSync35(join34(root, CORE_MANIFEST_FILE)) ? readCoreManifest(root) : null;
+  const coreManifest = existsSync35(join35(root, CORE_MANIFEST_FILE)) ? readCoreManifest(root) : null;
   for (const manifest of findPluginManifests(root)) {
     if (coreManifest && !isTemplateOwned(manifest, coreManifest)) continue;
-    const absManifest = join34(root, manifest);
+    const absManifest = join35(root, manifest);
     const subscriptions = readSubscriptions(absManifest);
     if (subscriptions === null) continue;
     const pluginDir2 = dirname9(absManifest);
-    if (existsSync35(join34(pluginDir2, "terraform"))) continue;
+    if (existsSync35(join35(pluginDir2, "terraform"))) continue;
     const relPluginDir = relative6(root, pluginDir2).split(sep3).join("/");
     violations.push({
       manifest,
@@ -9859,8 +9892,8 @@ function rawArgsAfter(subcommand) {
 }
 
 // src/commands/doctor.ts
-import { existsSync as existsSync36, readFileSync as readFileSync25 } from "fs";
-import { join as join35, resolve as resolve18 } from "path";
+import { existsSync as existsSync36, readFileSync as readFileSync26 } from "fs";
+import { join as join36, resolve as resolve18 } from "path";
 import chalk21 from "chalk";
 import { Command as Command24 } from "commander";
 
@@ -10035,10 +10068,10 @@ async function runDoctor(options, deps = { git: new GitAdapter() }) {
   return runDoctorChecks(facts);
 }
 function readLocalCoreVersion(cwd) {
-  const path = join35(cwd, INSTANCE_CORE_FILE);
+  const path = join36(cwd, INSTANCE_CORE_FILE);
   if (!existsSync36(path)) return null;
   try {
-    return parseCoreRecord(readFileSync25(path, "utf8"));
+    return parseCoreRecord(readFileSync26(path, "utf8"));
   } catch {
     return null;
   }
@@ -10053,10 +10086,10 @@ function parseCoreRecord(contents) {
   }
 }
 function readFossil(cwd) {
-  const path = join35(cwd, CORE_VERSION_FILE);
+  const path = join36(cwd, CORE_VERSION_FILE);
   if (!existsSync36(path)) return null;
   try {
-    const value = readFileSync25(path, "utf8").trim();
+    const value = readFileSync26(path, "utf8").trim();
     return value === "" ? null : value;
   } catch {
     return null;

package/package.json

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