@biffo/cli 0.213.0 → 0.214.1

package/_skeletons/plugin-template/scripts/verify.sh

@@ -567,6 +567,7 @@ fi
 if [ -f scripts/biffo.sh ]; then
   run_check plugin-tf sh scripts/biffo.sh check plugin-terraform
   run_check plugin-names sh scripts/biffo.sh check plugin-collisions
+  run_check adr-numbering sh scripts/biffo.sh check adr-numbering
 else
   skip biffo-guards "no scripts/biffo.sh in this repo"
 fi

package/_skeletons/sibling-template/scripts/verify.sh

@@ -567,6 +567,7 @@ fi
 if [ -f scripts/biffo.sh ]; then
   run_check plugin-tf sh scripts/biffo.sh check plugin-terraform
   run_check plugin-names sh scripts/biffo.sh check plugin-collisions
+  run_check adr-numbering sh scripts/biffo.sh check adr-numbering
 else
   skip biffo-guards "no scripts/biffo.sh in this repo"
 fi

package/dist/index.js

@@ -9124,9 +9124,94 @@ siblingCommand.addCommand(siblingCheckIdentityCommand);
 // src/commands/check.ts
 import { Command as Command23 } from "commander";
 
+// src/scripts/check-adr-numbering.ts
+import { existsSync as existsSync32 } from "fs";
+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, 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;
+  for (const entry of readdirSync13(adrDir).sort()) {
+    const match = ADR_FILENAME.exec(entry);
+    if (!match) continue;
+    const number = match[1];
+    claims.set(number, [...claims.get(number) ?? [], entry]);
+  }
+  return claims;
+}
+function findAdrNumberCollisions(adrDir) {
+  const allowlist = readAdrNumberingAllowlist(adrDir);
+  const collisions = [];
+  for (const [number, files] of [...adrNumbersIn(adrDir).entries()].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(", ")}
+    Pick a different number for the newer one \u2014 citing "ADR-${c.number}" is
+    ambiguous while both exist.`
+  ).join("\n");
+}
+
+// src/scripts/check-adr-numbering.ts
+async function runAdrNumberingCheck() {
+  const root = (await execa5("git", ["rev-parse", "--show-toplevel"])).stdout.trim();
+  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(
+      `
+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");
+}
+
 // src/scripts/check-branch-protection.ts
 import { Octokit as Octokit2 } from "@octokit/rest";
-import { execa as execa5 } from "execa";
+import { execa as execa6 } from "execa";
 
 // src/lib/branch-protection-apply.ts
 var CONTEXT_CONSISTENCY_THRESHOLD = 2 / 3;
@@ -9253,7 +9338,7 @@ async function resolveRepo(explicit) {
     }
     return { owner, repo };
   }
-  const { stdout } = await execa5("git", ["remote", "get-url", "origin"]);
+  const { stdout } = await execa6("git", ["remote", "get-url", "origin"]);
   const m = /github\.com[:/]([^/]+)\/(.+?)(?:\.git)?$/.exec(stdout.trim());
   if (!m?.[1] || !m[2]) {
     console.error(
@@ -9385,7 +9470,7 @@ async function runBranchProtectionCheck(explicitRepo, options = {}) {
 }
 
 // src/scripts/check-core-ownership.ts
-import { execa as execa6 } from "execa";
+import { execa as execa7 } from "execa";
 var BOLD = "\x1B[1m";
 var DIM = "\x1B[2m";
 var RED = "\x1B[31m";
@@ -9396,7 +9481,7 @@ async function runOwnershipCheck(argv) {
   const stagedFlag = args.indexOf("--staged");
   const staged = stagedFlag !== -1;
   const messageFile = staged ? args[stagedFlag + 1] : void 0;
-  const root = (await execa6("git", ["rev-parse", "--show-toplevel"])).stdout.trim();
+  const root = (await execa7("git", ["rev-parse", "--show-toplevel"])).stdout.trim();
   if (!isInstanceRepo(root)) {
     console.log("\u2713 core ownership guard: skipped \u2014 this is the template, which owns these paths.");
     return;
@@ -9405,11 +9490,11 @@ async function runOwnershipCheck(argv) {
   let deletedFiles = [];
   let commitMessage = "";
   if (staged) {
-    const { stdout } = await execa6("git", ["diff", "--cached", "--name-status"], { cwd: root });
+    const { stdout } = await execa7("git", ["diff", "--cached", "--name-status"], { cwd: root });
     ({ changed: changedFiles, deleted: deletedFiles } = parseNameStatus(stdout));
     if (messageFile) {
-      const { readFileSync: readFileSync26, existsSync: existsSync35 } = await import("fs");
-      if (existsSync35(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];
@@ -9417,18 +9502,18 @@ async function runOwnershipCheck(argv) {
       console.error("No base ref: set GITHUB_BASE_REF or pass a base branch as the first argument.");
       process.exit(2);
     }
-    await execa6("git", ["fetch", "--quiet", "origin", base], { cwd: root, reject: false });
-    const { stdout } = await execa6("git", ["diff", "--name-status", `origin/${base}...HEAD`], {
+    await execa7("git", ["fetch", "--quiet", "origin", base], { cwd: root, reject: false });
+    const { stdout } = await execa7("git", ["diff", "--name-status", `origin/${base}...HEAD`], {
       cwd: root
     });
     ({ changed: changedFiles, deleted: deletedFiles } = parseNameStatus(stdout));
-    const { stdout: log2 } = await execa6("git", ["log", "--format=%B", `origin/${base}..HEAD`], {
+    const { stdout: log2 } = await execa7("git", ["log", "--format=%B", `origin/${base}..HEAD`], {
       cwd: root,
       reject: false
     });
     commitMessage = log2;
   }
-  const { stdout: gitBranch } = await execa6("git", ["rev-parse", "--abbrev-ref", "HEAD"], {
+  const { stdout: gitBranch } = await execa7("git", ["rev-parse", "--abbrev-ref", "HEAD"], {
     cwd: root,
     reject: false
   });
@@ -9510,34 +9595,34 @@ ${BOLD}If the divergence is deliberate${OFF}
 }
 
 // src/scripts/check-plugin-collisions.ts
-import { existsSync as existsSync32 } from "fs";
-import { join as join32 } from "path";
-import { execa as execa7 } from "execa";
+import { existsSync as existsSync34 } from "fs";
+import { join as join34 } from "path";
+import { execa as execa8 } from "execa";
 
 // src/lib/plugin-collision-guard.ts
-import { existsSync as existsSync31, readdirSync as readdirSync13, statSync as statSync7 } from "fs";
-import { join as join31 } from "path";
+import { existsSync as existsSync33, readdirSync as readdirSync14, statSync as statSync7 } from "fs";
+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) {
-  if (!existsSync31(dir)) return [];
-  return readdirSync13(dir).filter((entry) => {
+  if (!existsSync33(dir)) return [];
+  return readdirSync14(dir).filter((entry) => {
     if (IGNORED_DIRS.has(entry) || entry.startsWith(".")) return false;
     try {
-      return statSync7(join31(dir, entry)).isDirectory();
+      return statSync7(join33(dir, entry)).isDirectory();
     } catch {
       return false;
     }
   });
 }
 function regularPackagesOf(pluginDir2) {
-  return subdirectories(pluginDir2).filter((name) => existsSync31(join31(pluginDir2, name, "__init__.py"))).sort();
+  return subdirectories(pluginDir2).filter((name) => existsSync33(join33(pluginDir2, name, "__init__.py"))).sort();
 }
 function bareTestModulesOf(pluginDir2) {
-  const testsDir = join31(pluginDir2, "tests");
-  if (!existsSync31(testsDir)) return [];
-  if (existsSync31(join31(testsDir, "__init__.py"))) return [];
-  return readdirSync13(testsDir).filter((f) => f.endsWith(".py") && !PYTEST_SPECIAL.has(f)).sort();
+  const testsDir = join33(pluginDir2, "tests");
+  if (!existsSync33(testsDir)) 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) {
   const plugins = (pluginDirs ?? subdirectories(servicesDir)).filter((name) => !name.startsWith("_")).filter((name) => name !== "api").sort();
@@ -9545,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(join31(servicesDir, plugin))) {
+      for (const name of namesOf(join33(servicesDir, plugin))) {
         claims.set(name, [...claims.get(name) ?? [], plugin]);
       }
     }
@@ -9582,9 +9667,9 @@ function formatCollisions(collisions) {
 
 // src/scripts/check-plugin-collisions.ts
 async function runPluginCollisionCheck() {
-  const root = (await execa7("git", ["rev-parse", "--show-toplevel"])).stdout.trim();
-  const servicesDir = join32(root, "services");
-  if (!existsSync32(servicesDir)) {
+  const root = (await execa8("git", ["rev-parse", "--show-toplevel"])).stdout.trim();
+  const servicesDir = join34(root, "services");
+  if (!existsSync34(servicesDir)) {
     console.log("\u2713 plugin collision guard: no services/ directory \u2014 nothing to compare");
     return;
   }
@@ -9601,11 +9686,11 @@ async function runPluginCollisionCheck() {
 }
 
 // src/scripts/check-plugin-terraform.ts
-import { execa as execa8 } from "execa";
+import { execa as execa9 } from "execa";
 
 // src/lib/plugin-terraform-guard.ts
-import { existsSync as existsSync33, readFileSync as readFileSync24, readdirSync as readdirSync14 } from "fs";
-import { dirname as dirname9, join as join33, 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) {
@@ -9613,16 +9698,16 @@ function findPluginManifests(root) {
   const walk = (dir) => {
     let entries;
     try {
-      entries = readdirSync14(dir, { withFileTypes: true });
+      entries = readdirSync15(dir, { withFileTypes: true });
     } catch {
       return;
     }
     for (const entry of entries) {
       if (entry.isDirectory()) {
         if (SKIP_DIRS.has(entry.name)) continue;
-        walk(join33(dir, entry.name));
+        walk(join35(dir, entry.name));
       } else if (entry.isFile() && entry.name === PLUGIN_MANIFEST_FILE2) {
-        found.push(relative6(root, join33(dir, entry.name)).split(sep3).join("/"));
+        found.push(relative6(root, join35(dir, entry.name)).split(sep3).join("/"));
       }
     }
   };
@@ -9632,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;
   }
@@ -9647,14 +9732,14 @@ function readSubscriptions(absManifestPath) {
 }
 function checkPluginTerraform(root) {
   const violations = [];
-  const coreManifest = existsSync33(join33(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 = join33(root, manifest);
+    const absManifest = join35(root, manifest);
     const subscriptions = readSubscriptions(absManifest);
     if (subscriptions === null) continue;
     const pluginDir2 = dirname9(absManifest);
-    if (existsSync33(join33(pluginDir2, "terraform"))) continue;
+    if (existsSync35(join35(pluginDir2, "terraform"))) continue;
     const relPluginDir = relative6(root, pluginDir2).split(sep3).join("/");
     violations.push({
       manifest,
@@ -9674,7 +9759,7 @@ function formatViolations(violations) {
 
 // src/scripts/check-plugin-terraform.ts
 async function runPluginTerraformCheck() {
-  const root = (await execa8("git", ["rev-parse", "--show-toplevel"])).stdout.trim();
+  const root = (await execa9("git", ["rev-parse", "--show-toplevel"])).stdout.trim();
   const violations = checkPluginTerraform(root);
   if (violations.length > 0) {
     console.error("\u2717 plugin Terraform guard: event subscriptions with no infrastructure\n");
@@ -9685,7 +9770,7 @@ async function runPluginTerraformCheck() {
 }
 
 // src/scripts/check-release-subject.ts
-import { execa as execa9 } from "execa";
+import { execa as execa10 } from "execa";
 
 // src/lib/release-version.ts
 var MINOR_TYPES = /* @__PURE__ */ new Set(["feat"]);
@@ -9723,13 +9808,13 @@ async function runReleaseSubjectCheck(argv) {
     console.error("No base ref: set GITHUB_BASE_REF or pass a base branch as the first argument.");
     process.exit(2);
   }
-  const root = (await execa9("git", ["rev-parse", "--show-toplevel"])).stdout.trim();
-  await execa9("git", ["fetch", "--quiet", "origin", base], { cwd: root, reject: false });
-  const { stdout } = await execa9("git", ["diff", "--name-only", `origin/${base}...HEAD`], {
+  const root = (await execa10("git", ["rev-parse", "--show-toplevel"])).stdout.trim();
+  await execa10("git", ["fetch", "--quiet", "origin", base], { cwd: root, reject: false });
+  const { stdout } = await execa10("git", ["diff", "--name-only", `origin/${base}...HEAD`], {
     cwd: root
   });
   const changedFiles = stdout.split("\n").map((s) => s.trim()).filter(Boolean);
-  const subject = process.env["PR_TITLE"]?.trim() || (await execa9("git", ["log", "-1", "--format=%s"], { cwd: root })).stdout.trim();
+  const subject = process.env["PR_TITLE"]?.trim() || (await execa10("git", ["log", "-1", "--format=%s"], { cwd: root })).stdout.trim();
   const manifest = readCoreManifest(root);
   const { unparseable, bump, templateOwnedChanges, skippedAsInstance } = checkReleaseSubject(
     changedFiles,
@@ -9788,6 +9873,11 @@ checkCommand.command("plugin-collisions").description("Refuse two vendored plugi
 checkCommand.command("plugin-terraform").description("Verify every template-owned plugin declaring infra ships a Terraform module").action(async () => {
   await runPluginTerraformCheck();
 });
+checkCommand.command("adr-numbering").description(
+  "Refuse two ADRs in this repo's own docs/ADR/ claiming the same number (tabsii-platform#449)"
+).action(async () => {
+  await runAdrNumberingCheck();
+});
 checkCommand.command("branch-protection").description(
   "Verify dev/staging/main are actually protected \u2014 scaffolding skips this on a 403 (#715)"
 ).option("--repo <owner/name>", "Repo to audit; defaults to this checkout's origin remote").option(
@@ -9802,8 +9892,8 @@ function rawArgsAfter(subcommand) {
 }
 
 // src/commands/doctor.ts
-import { existsSync as existsSync34, readFileSync as readFileSync25 } from "fs";
-import { join as join34, 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";
 
@@ -9978,10 +10068,10 @@ async function runDoctor(options, deps = { git: new GitAdapter() }) {
   return runDoctorChecks(facts);
 }
 function readLocalCoreVersion(cwd) {
-  const path = join34(cwd, INSTANCE_CORE_FILE);
-  if (!existsSync34(path)) return null;
+  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;
   }
@@ -9996,10 +10086,10 @@ function parseCoreRecord(contents) {
   }
 }
 function readFossil(cwd) {
-  const path = join34(cwd, CORE_VERSION_FILE);
-  if (!existsSync34(path)) return null;
+  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.213.0",
+  "version": "0.214.1",
   "description": "Biffo project scaffolding CLI",
   "license": "MIT",
   "type": "module",