@afokapu/atdd-bun 0.10.14 → 0.10.16

package/detectors/bun_interlocking_binding/detect.mjs

@@ -18,9 +18,10 @@
 //
 // CONTRACT (atdd.workspace.bun v1.1): reads ATDD_SCAN_ROOTS, writes RAW
 // {rule_id,file,line,col,evidence,source_line} violations to ATDD_VIOLATIONS_REPORT, exits 0.
-// Zero third-party deps — node builtins only. The plan/_trains interlocking YAML route space is
+// Zero third-party deps: Node and Bun builtins only. The plan/_trains interlocking YAML route space is
 // stack-neutral planner data (snake_case, core #1248); the runtime + JOURNEY_MAP + trace are Bun/TS.
 
+import { parseInterlocking as parseInterlockingDoc } from "../../lib/interlocking.mjs";
 import { readFileSync, writeFileSync, statSync, readdirSync } from "node:fs";
 import { scanExecution } from "./checks/interlocking_runtime_executes.mjs";
 import { join, sep, resolve } from "node:path";
@@ -233,68 +234,10 @@ function rel(path, root) {
 // ── interlocking YAML parse (CONSUMES core #1248 fields; snake_case planner data) ─────────────
 
 function parseInterlocking(text) {
-  const lines = text.split(/\r?\n/);
-  const idM = text.match(/^interlocking_id:\s*["']?([^"'#\n]+?)["']?\s*(?:#.*)?$/m);
-  if (!idM) return null;
-  const interlockingId = idM[1].trim();
-
-  const routes = [];
-  const ri = lines.findIndex((l) => /^routes:\s*(?:#.*)?$/.test(l));
-  if (ri >= 0) {
-    for (let i = ri + 1; i < lines.length; i++) {
-      const l = lines[i];
-      if (/^\S/.test(l)) break; // dedent to a new top-level key ends the routes block
-      const rm = l.match(/^\s*-\s*route_id:\s*["']?([^"'#\n]+?)["']?\s*(?:#.*)?$/);
-      if (rm) {
-        routes.push({ routeId: rm[1].trim(), line: i + 1, sourceLine: l, trainId: null, trainPath: null });
-      } else if (routes.length) {
-        const cur = routes[routes.length - 1];
-        const tm = l.match(/^\s*train_id:\s*["']?([^"'#\n]+?)["']?\s*(?:#.*)?$/);
-        if (tm) cur.trainId = tm[1].trim();
-        const pm = l.match(/^\s*train_path:\s*["']?([^"'#\n]+?)["']?\s*(?:#.*)?$/);
-        if (pm) cur.trainPath = pm[1].trim();
-      }
-    }
-  }
-  if (!routes.length) return null;
-
-  let exposed = false;
-  const actions = [];
-  const ei = lines.findIndex((l) => /^entrypoint:\s*(?:#.*)?$/.test(l));
-  if (ei >= 0) {
-    for (let i = ei + 1; i < lines.length; i++) {
-      const l = lines[i];
-      if (/^\S/.test(l)) break; // dedent ends the entrypoint block
-      if (/^\s*exposed:\s*true\b/.test(l)) exposed = true;
-      // FLOW STYLE TOO: `actions: [resolve_match, other]`.
-      //
-      // The interlocking YAML is stack-neutral planner data and flow sequences are
-      // ordinary YAML. Python reads it with a real parser and accepts both; this
-      // hand-rolled line scanner accepted only block style, so the SAME plan file
-      // was judged differently depending on which stack read it — and the verdict
-      // was "exposed interlocking is not Station-Master-reachable", a strict
-      // blocking finding, against a consumer whose YAML was perfectly valid.
-      // Found by running this provider against a Bun consumer written from scratch.
-      const flow = l.match(/^\s*actions:\s*\[([^\]]*)\]\s*(?:#.*)?$/);
-      if (flow) {
-        for (const raw of flow[1].split(",")) {
-          const a = raw.trim().replace(/^["']|["']$/g, "");
-          if (a) actions.push(a);
-        }
-        continue;
-      }
-      if (/^\s*actions:\s*(?:#.*)?$/.test(l)) {
-        for (let j = i + 1; j < lines.length; j++) {
-          const am = lines[j].match(/^\s*-\s*["']?([^"'#\n]+?)["']?\s*(?:#.*)?$/);
-          if (am) actions.push(am[1].trim());
-          else break;
-        }
-      }
-    }
-  }
-
+  const rec = parseInterlockingDoc(text);
+  if (!rec) return null;
   const parallelFields = PARALLEL_FIELDS.filter((f) => new RegExp("^\\s*" + f + "\\s*:", "m").test(text));
-  return { interlockingId, routes, exposed, actions, parallelFields, rawText: text };
+  return { ...rec, parallelFields };
 }
 
 // ── Station Master JOURNEY_MAP parse (server.ts) ─────────────────────────

package/detectors/bun_interlocking_coverage/_shared/interlocking.mjs

@@ -270,78 +270,9 @@ export function e2eFiles(croot) {
   return [...walkFiles(join(croot, "e2e"), isTs)].sort();
 }
 
-// Interlocking YAML parse — declares interlocking_id + a non-empty routes list (core #1248,
-// snake_case planner data). Registry/projection docs with no routes yield null.
-export function parseInterlocking(text) {
-  const lines = text.split(/\r?\n/);
-  const idM = text.match(/^interlocking_id:\s*["']?([^"'#\n]+?)["']?\s*(?:#.*)?$/m);
-  if (!idM) return null;
-  const interlockingId = idM[1].trim();
-
-  const routes = [];
-  const ri = lines.findIndex((l) => /^routes:\s*(?:#.*)?$/.test(l));
-  if (ri >= 0) {
-    for (let i = ri + 1; i < lines.length; i++) {
-      const l = lines[i];
-      if (/^\S/.test(l)) break;
-      const rm = l.match(/^\s*-\s*route_id:\s*["']?([^"'#\n]+?)["']?\s*(?:#.*)?$/);
-      if (rm) {
-        routes.push({
-          routeId: rm[1].trim(),
-          line: i + 1,
-          sourceLine: l,
-          trainId: null,
-          category: null,
-        });
-      } else if (routes.length) {
-        const cur = routes[routes.length - 1];
-        const tm = l.match(/^\s*train_id:\s*["']?([^"'#\n]+?)["']?\s*(?:#.*)?$/);
-        if (tm) cur.trainId = tm[1].trim();
-        // `category:` only — `category_digit:` is retired (#1421 / #1440) and rejected by
-        // core's schema, so there is nothing left to read off a conforming artifact.
-        const cm = l.match(/^\s*category:\s*["']?([^"'#\n]+?)["']?\s*(?:#.*)?$/);
-        if (cm) cur.category = cm[1].trim();
-      }
-    }
-  }
-  if (!routes.length) return null;
-
-  let exposed = false;
-  const actions = [];
-  const ei = lines.findIndex((l) => /^entrypoint:\s*(?:#.*)?$/.test(l));
-  if (ei >= 0) {
-    for (let i = ei + 1; i < lines.length; i++) {
-      const l = lines[i];
-      if (/^\S/.test(l)) break;
-      if (/^\s*exposed:\s*true\b/.test(l)) exposed = true;
-      // FLOW STYLE TOO: `actions: [resolve_match, other]`.
-      //
-      // The interlocking YAML is stack-neutral planner data and flow sequences are
-      // ordinary YAML. Python reads it with a real parser and accepts both; this
-      // hand-rolled line scanner accepted only block style, so the SAME plan file
-      // was judged differently depending on which stack read it — and the verdict
-      // was "exposed interlocking is not Station-Master-reachable", a strict
-      // blocking finding, against a consumer whose YAML was perfectly valid.
-      // Found by running this provider against a Bun consumer written from scratch.
-      const flow = l.match(/^\s*actions:\s*\[([^\]]*)\]\s*(?:#.*)?$/);
-      if (flow) {
-        for (const raw of flow[1].split(",")) {
-          const a = raw.trim().replace(/^["']|["']$/g, "");
-          if (a) actions.push(a);
-        }
-        continue;
-      }
-      if (/^\s*actions:\s*(?:#.*)?$/.test(l)) {
-        for (let j = i + 1; j < lines.length; j++) {
-          const am = lines[j].match(/^\s*-\s*["']?([^"'#\n]+?)["']?\s*(?:#.*)?$/);
-          if (am) actions.push(am[1].trim());
-          else break;
-        }
-      }
-    }
-  }
-  return { interlockingId, routes, exposed, actions, rawText: text };
-}
+// Interlocking YAML parse: interlocking_id + a non-empty routes list (core #1248, snake_case planner data).
+// Registry/projection docs with no routes yield null. One parser for every detector, in lib/.
+export { parseInterlocking } from "../../../lib/interlocking.mjs";
 
 export function lineOf(text, pattern, def = 1) {
   const lines = text.split(/\r?\n/);

package/integrity.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.10.14",
+  "version": "0.10.16",
   "files": {
     "HOOK_AUDIT.md": "5329d840db37671b1918f688ead26865473b87db73dbc75f7c8b2a8bbe8d6d43",
     "PLANNER_PORT.md": "fb5935bac8b7ac18994de21e43ace3a5ef8cd55f85b0e3349fca261280054f11",
@@ -329,7 +329,7 @@
     "detectors/bun_green_traceability_detector/urn_header.mjs": "004b0ed1f71ec476fb57a959d302da4b5869ff91be049865a806bedca40f55b9",
     "detectors/bun_interlocking_binding/atdd.implementation.yaml": "8df233a7c337d38ab4fc92a309273b91fe713b27507a4b2cfa66ffc7a948d520",
     "detectors/bun_interlocking_binding/checks/interlocking_runtime_executes.mjs": "ea4c32914a007962012e9062cc64063fa939ff0a59c07960c34872d058720955",
-    "detectors/bun_interlocking_binding/detect.mjs": "b70be185c0d8323de42a25d17c363a7d9451fa92c3172a82a3b6b662582195c8",
+    "detectors/bun_interlocking_binding/detect.mjs": "ec48b90b14e9c8a4e15bb50cf196af2fc673532f449e884e3c454dc57a2b06b1",
     "detectors/bun_interlocking_binding/fixtures/clean/e2e/interlockings/match-resolution/trace.test.ts": "5dadc041ca9825f404340ca428e14bbff5e00824ca6c25464f21cd2ce56044d8",
     "detectors/bun_interlocking_binding/fixtures/clean/plan/_trains/_interlockings/match-resolution.yaml": "11884309beb9bcceccfeda7917ea73d51a530366db5eb60772b03cf5eeb239cd",
     "detectors/bun_interlocking_binding/fixtures/clean/plan/_trains/train:match:match-resolution-standard.yaml": "a7067661a723e02e0e844e6b90ad187f620dd328e1b9be45163c04db1919ce77",
@@ -379,7 +379,7 @@
     "detectors/bun_interlocking_binding/fixtures/dirty_transcribed_runtime/server.ts": "d5bc34c5b1b2b0a511e0c4604ce6f9c77491dca9aee994be720540f3052babc1",
     "detectors/bun_interlocking_binding/fixtures/dirty_transcribed_runtime/src/trains/interlocking.ts": "9bcfdb4ecff6efd1f658b9fd587342615179924e25468c75daa07c2626d4d8ab",
     "detectors/bun_interlocking_binding/fixtures/dirty_transcribed_runtime/src/trains/runner.ts": "0e4b885e50f12cc2a8c8f6740bf83e7b2e7137a28e1e143586e9a8550ea5bd45",
-    "detectors/bun_interlocking_coverage/_shared/interlocking.mjs": "dd484cec27919f342aa5a3ba631cf197acab4f359e7fe0ffd1123f968954fc52",
+    "detectors/bun_interlocking_coverage/_shared/interlocking.mjs": "6a3440e53ba13948edfbb1ef8de4c01e4fd022ad6f9d44739f814220cc583417",
     "detectors/bun_interlocking_coverage/atdd.implementation.yaml": "f160517a8138ba3ca05e3d130e6fbfb796e643376f25743fdef4fc210196525b",
     "detectors/bun_interlocking_coverage/checks/_map.json": "0a218ea319cc6258af7bd721c2154cb9561fe67e80d80ef32d08fc77bc9403c3",
     "detectors/bun_interlocking_coverage/checks/interlocking_production_runner.mjs": "136eb0955052f2485740adfb888f5ba6f1414dcdb53d505034b8db40420a611a",
@@ -968,6 +968,7 @@
     "detectors/planner_telemetry_plan/fixtures/dirty/telemetry/commons/response-invocation-accepted/notes.json": "ca3d163bab055381827226140568f3bef7eaac187cebd76878e0b63e9e442356",
     "lib/frontend.mjs": "d6d9b29c3d7f2d162cda03bb34b20a3224a82887b6be3db7cab375510913c9a3",
     "lib/imports.mjs": "3db4979269488fa26f6e7aefded6ece9c646be6587a10e249821a5a208109962",
+    "lib/interlocking.mjs": "d0803d080ac7d7477c51be70112df1e85213d339fd3c6b71f75f26145fa8accd",
     "lib/scan.mjs": "8aa21e400ec415e23d49e0cc90fba2744822b8855261c85614e89c7cf35c4700",
     "planner-nodes/ENFORCEMENT_SCOPE.yaml": "d8ec7039c219857f3d77af5d4d84612b533b69c1a5fcef935fbf46470adafed4",
     "planner-nodes/nodes/planner.acceptance.abstract-fields-required.convention.yaml": "bd565693f0ae861f0561ad2f7a91a8c55f9a209c3acd59c5750cfcffd96a85d8",
@@ -1196,7 +1197,7 @@
     "src/board.ts": "a3a8efe923858b9b5cf5ca3682dacfceb5557f8303d818687eb1325a15fa1782",
     "src/ci.ts": "67e54d2cbfc44a9e42837d5e750af526d6255c539d3c452a4d5fca3226c0d9ac",
     "src/cli.ts": "e45f2666334503a91eb65b1b5ee4dd8acab6b99f62d333e2ee2b65963db6358b",
-    "src/delivery.ts": "5688356e26bf5aa49ad940d1bcd42e41b9f3dc1c21dc833b328fcb38a3f04fb8",
+    "src/delivery.ts": "2765868a597261a38b44bb6490da4c17e059c7ef0cc45323ed8475085db46ffe",
     "src/docs-capability.ts": "115cf27049a5cf19c133bac5ec237072be6f969a59a2ef6767e054108a21dc5c",
     "src/enforce.ts": "41a6f8c058a2a034996c817f224191403cc66ccc4ed4e04bbefc430014c783d8",
     "src/hooks.ts": "2feeec2674c1462c94256de02ce59ccc6e3ff671ec4dca1bf9903c32888b600b",

package/lib/interlocking.mjs

@@ -0,0 +1,34 @@
+// The interlocking document (plan/_trains/_interlockings/<id>.yaml), read with a YAML parser. Detectors once scanned
+// it line by line and stopped at the first line in column 0 after `routes:`, so a compact list (`routes:` then
+// `- route_id:` at column 0, the same YAML) parsed to no routes and every route rule passed without judging anything
+// (FWS, atdd-maintainer #G3aXIPPW1Mz5). Line numbers, which findings cite, are looked up in the text afterwards.
+
+const scalar = (value) => (typeof value === "string" || typeof value === "number" ? String(value).trim() : null);
+const escape = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+
+/** { interlockingId, routes: [{ routeId, line, sourceLine, trainId, trainPath, category }], exposed, actions, rawText },
+ * or null for a document with no interlocking_id or no routes (registries and projections). */
+export function parseInterlocking(text) {
+  let doc;
+  try { doc = Bun.YAML.parse(text); } catch { return null; }
+  if (!doc || typeof doc !== "object" || Array.isArray(doc)) return null;
+  const interlockingId = scalar(doc.interlocking_id);
+  if (!interlockingId) return null;
+  const lines = text.split(/\r?\n/), taken = new Set();
+  const lineOf = (routeId) => {
+    const pattern = new RegExp(`^\\s*(?:-\\s*)?route_id:\\s*["']?${escape(routeId)}["']?\\s*(?:#.*)?$`);
+    const index = lines.findIndex((line, i) => !taken.has(i) && pattern.test(line));
+    if (index >= 0) taken.add(index);
+    return index;
+  };
+  const routes = (Array.isArray(doc.routes) ? doc.routes : []).flatMap((route) => {
+    const routeId = route && typeof route === "object" ? scalar(route.route_id) : null;
+    if (!routeId) return [];
+    const index = lineOf(routeId);
+    return [{ routeId, line: index >= 0 ? index + 1 : 1, sourceLine: index >= 0 ? lines[index] : "", trainId: scalar(route.train_id), trainPath: scalar(route.train_path), category: scalar(route.category) }];
+  });
+  if (!routes.length) return null;
+  const entrypoint = doc.entrypoint && typeof doc.entrypoint === "object" ? doc.entrypoint : {};
+  const actions = (Array.isArray(entrypoint.actions) ? entrypoint.actions : []).map(scalar).filter(Boolean);
+  return { interlockingId, routes, exposed: entrypoint.exposed === true, actions, rawText: text };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@afokapu/atdd-bun",
-  "version": "0.10.14",
+  "version": "0.10.16",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/afokapu/atdd-bun.git"

package/src/delivery.ts

@@ -234,14 +234,16 @@ export async function loadEvidence(root: string, policy: DeliveryPolicy): Promis
   return out;
 }
 
-/** A model must come from the stage's list; a model after the first needs a recorded fallback from each one before it. */
-function checkModel(file: string, at: string, stage: Stage, role: "writer" | "reviewer", actor: Actor, list: string[], fallbacks: Fallback[], defaultRole: "writer" | "reviewer", fallback: DeliveryPolicy["fallback"]): PlanFinding[] {
+/** A model must come from the stage's list; a model after the first needs a recorded fallback from each one before it,
+ * except one the stage could not use: under different-model independence a reviewer skips every model that wrote the
+ * work it reviews (delivery.reviewer-independent's fix hint). Ineligible is not unavailable, so no fallback records it. */
+function checkModel(file: string, at: string, stage: Stage, role: "writer" | "reviewer", actor: Actor, list: string[], fallbacks: Fallback[], defaultRole: "writer" | "reviewer", fallback: DeliveryPolicy["fallback"], ineligible: string[] = []): PlanFinding[] {
   const out: PlanFinding[] = [];
   const index = list.indexOf(actor.model);
   if (index < 0) return [finding("delivery.model-allowed", file, `${at}: ${role} model '${actor.model}' is not in ${stage}.${role} [${list.join(", ")}]`)];
   // `author` is the 0.9 spelling of `writer`.
   const recorded = fallbacks.filter(entry => ((entry.role === "author" ? "writer" : entry.role) ?? defaultRole) === role).map(entry => entry.from);
-  for (const skipped of list.slice(0, index)) if (!recorded.includes(skipped)) out.push(finding("delivery.model-allowed", file, `${at}: ${role} '${actor.model}' is a fallback, but no fallback from '${skipped}' records why it was unavailable`));
+  for (const skipped of list.slice(0, index)) if (!recorded.includes(skipped) && !ineligible.includes(skipped)) out.push(finding("delivery.model-allowed", file, `${at}: ${role} '${actor.model}' is a fallback, but no fallback from '${skipped}' records why it was unavailable`));
   for (const from of recorded) if (!list.slice(0, index).includes(from)) out.push(finding("delivery.model-allowed", file, `${at}: ${role} fallback from '${from}' does not precede '${actor.model}' in [${list.join(", ")}]`));
   return out;
 }
@@ -305,10 +307,11 @@ function checkEvidence(file: string, evidence: Evidence, policy: DeliveryPolicy)
     const at = `reviews[${index}] (${review.stage} @ ${review.sha})`, stage = policy.stages[review.stage];
     if (!stage?.reviewer.length) { out.push(finding("delivery.evidence-schema", file, `${at}: ${review.stage} has no reviewer in delivery.stages`)); return; }
     const fallbacks = review.fallback ?? [];
-    out.push(...checkFallbacks(file, at, fallbacks, policy.fallback), ...checkModel(file, at, review.stage, "reviewer", review.reviewer, stage.reviewer, fallbacks, "reviewer", policy.fallback));
-    if (review.author && stage.writer.length) out.push(...checkModel(file, at, review.stage, "writer", review.author, stage.writer, fallbacks, "reviewer", policy.fallback));
     // Independence is judged against everyone who wrote what this review answers for.
     const covered = coveredStages(review.stage, policy, work), writers = [...work.filter(entry => covered.includes(entry.stage)).map(entry => entry.writer), ...(review.author ? [review.author] : [])];
+    const ineligible = stage.independence === "different-model" ? writers.map(writer => writer.model) : [];
+    out.push(...checkFallbacks(file, at, fallbacks, policy.fallback), ...checkModel(file, at, review.stage, "reviewer", review.reviewer, stage.reviewer, fallbacks, "reviewer", policy.fallback, ineligible));
+    if (review.author && stage.writer.length) out.push(...checkModel(file, at, review.stage, "writer", review.author, stage.writer, fallbacks, "reviewer", policy.fallback));
     if (!writers.length) out.push(finding("delivery.evidence-schema", file, `${at}: names no writer of the work it reviews (${covered.join(", ")}); record each stage's work, or the review's author, so independence can be judged`));
     if (writerRuns.has(review.reviewer.run)) out.push(finding("delivery.reviewer-independent", file, `${at}: reviewer run '${review.reviewer.run}' also wrote in this tranche; a reviewer that edits becomes a writer`));
     if (reviewerRuns.has(review.reviewer.run)) out.push(finding("delivery.reviewer-independent", file, `${at}: reviewer run '${review.reviewer.run}' already reviewed reviews[${reviewerRuns.get(review.reviewer.run)}]; every review is a fresh process`));