@afokapu/atdd-bun 0.10.81 → 0.10.83

package/detectors/bun_interlocking_infrastructure/checks/wagon_contract_honoured.mjs

@@ -70,24 +70,36 @@ function consumerRoots(root, excludes) {
   return roots;
 }
 
-// Artifact names under `produce:` / `consume:` in a wagon document. Read line-wise
+// Items under `produce:` / `consume:` in a wagon document: each artifact `name` with its
+// declared consume source (`from:`) or produce destination (`to:`). Read line-wise
 // rather than with a YAML parser so this check carries no dependency the rest of the
 // family does not already have; the shape it reads is the one core's schema requires.
 export function wagonContract(text) {
   if (!/^wagon:\s*\S/m.test(text)) return null;
   const out = { produce: [], consume: [] };
-  let section = null;
+  let section = null, item = null, itemIndent = -1;
   for (const line of text.split(/\r?\n/)) {
     const top = line.match(/^(\w+):\s*$/);
-    if (top) { section = top[1] === "produce" || top[1] === "consume" ? top[1] : null; continue; }
-    if (/^\S/.test(line)) { section = null; continue; }
+    if (top) { section = top[1] === "produce" || top[1] === "consume" ? top[1] : null; item = null; itemIndent = -1; continue; }
+    if (/^\S/.test(line)) { section = null; item = null; continue; }
     if (!section) continue;
-    const name = line.match(/^\s*-?\s*name:\s*["']?([^"'#\s]+)["']?/);
-    if (name) out[section].push(name[1]);
+    const dash = line.match(/^(\s*)-(?:\s|$)/);
+    if (dash && (itemIndent < 0 || dash[1].length === itemIndent)) {
+      itemIndent = dash[1].length;
+      item = { name: null, from: null, to: null };
+      out[section].push(item);
+    }
+    const field = line.match(/^\s*(?:-\s*)?(name|from|to):\s*["']?([^"'#\s]+)["']?/);
+    if (field && item && item[field[1]] === null) item[field[1]] = field[2];
   }
+  for (const kind of ["produce", "consume"]) out[kind] = out[kind].filter((entry) => entry.name);
   return out.produce.length || out.consume.length ? out : null;
 }
 
+// A declared platform-service side: a consume `from: system:<service>` or a produce
+// `to: system:<service>`. That side is storage, not Cargo, so it carries no Cargo move.
+const systemSide = (end) => typeof end === "string" && /^system:[a-z][a-z0-9-]*$/.test(end);
+
 // Blank out COMMENTS, keeping string literals intact.
 //
 // The artifact name legitimately appears as a literal — `cargo.put("orders:confirmed-order")`
@@ -213,6 +225,14 @@ for (const root of parseJsonEnv("ATDD_SCAN_ROOTS", [])) {
         for (const step of doc.sequence) for (const end of [step?.from, step?.to]) if (typeof end === "string" && end.startsWith("wagon:")) carried.add(end.slice(6).trim());
     }
     if (!contracts.length) continue;                     // no declared contract
+    // Wagons that put an artifact into Cargo (any produce not written to system:) or take one
+    // from Cargo (any consume not read from system:). A system: label on the other side of such
+    // an artifact cannot relabel it: that artifact travels as Cargo.
+    const cargoProducers = new Map(), cargoConsumers = new Map();
+    for (const c of contracts) {
+      for (const p of c.produce) if (!systemSide(p.to)) cargoProducers.set(p.name, [...(cargoProducers.get(p.name) ?? []), c.wagon]);
+      for (const q of c.consume) if (!systemSide(q.from)) cargoConsumers.set(q.name, [...(cargoConsumers.get(q.name) ?? []), c.wagon]);
+    }
 
     const sources = walk(croot, (p) => TS.test(p) && !TEST.test(p), excludes)
       .map((file) => ({ file, text: maskComments(read(file)) }));
@@ -234,11 +254,30 @@ for (const root of parseJsonEnv("ATDD_SCAN_ROOTS", [])) {
         for (const artifact of moves.reads) reads.add(artifact);
         for (const artifact of moves.writes) writes.add(artifact);
       }
-      for (const [kind, names] of [["produce", c.produce], ["consume", c.consume]]) {
-        for (const name of names) {
+      const rel = c.file.startsWith(croot + sep) ? c.file.slice(croot.length + 1) : c.file;
+      for (const [kind, items] of [["produce", c.produce], ["consume", c.consume]]) {
+        for (const { name, from, to } of items) {
+          const side = kind === "produce" ? to : from;
+          if (systemSide(side)) {
+            const others = ((kind === "consume" ? cargoProducers : cargoConsumers).get(name) ?? []).filter((w) => w !== c.wagon);
+            if (others.length) {
+              const wagons = others.map((w) => `wagon:${w}`).join(", ");
+              violations.push({
+                rule_id: RULE, file: rel, line: 1, col: 0,
+                evidence: kind === "consume"
+                  ? `the wagon declares it consumes "${name}" from ${side}, but ${wagons} produces it into Cargo; ` +
+                    `a system: source cannot relabel Cargo traffic, so declare its wagon: source and read it through Cargo`
+                  : `the wagon declares it produces "${name}" to ${side}, but ${wagons} consumes it through Cargo; ` +
+                    `a system: destination cannot relabel Cargo traffic, so drop the system: destination and write it through Cargo`,
+                source_line: "",
+              });
+              continue;
+            }
+            // Storage, not Cargo: no Cargo move is owed, but the wagon must still be bound to its train step.
+            if (handlers.length) continue;
+          }
           const moved = kind === "produce" ? writes : reads;
           if (moved.has(name)) continue;
-          const rel = c.file.startsWith(croot + sep) ? c.file.slice(croot.length + 1) : c.file;
           violations.push({
             rule_id: RULE, file: rel, line: 1, col: 0,
             evidence:

package/integrity.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.10.81",
+  "version": "0.10.83",
   "files": {
     "HOOK_AUDIT.md": "5329d840db37671b1918f688ead26865473b87db73dbc75f7c8b2a8bbe8d6d43",
     "PLANNER_PORT.md": "fb5935bac8b7ac18994de21e43ace3a5ef8cd55f85b0e3349fca261280054f11",
@@ -492,7 +492,7 @@
     "detectors/bun_interlocking_infrastructure/checks/interlocking_station_routing.mjs": "f3870fb3bacee46a6c3e10238284ef4d359182030d40d4f33b0f0ad465f7a284",
     "detectors/bun_interlocking_infrastructure/checks/journey_runner_boundary.mjs": "6284a8532722e5a6bff7e5184e24c7f273c1e63f1331204502e0e3704db5c86b",
     "detectors/bun_interlocking_infrastructure/checks/journey_station_routing.mjs": "66c09cdc17b099a55fa0ca894bd85a44706742bdd29caa5347f10e6487b4e724",
-    "detectors/bun_interlocking_infrastructure/checks/wagon_contract_honoured.mjs": "79b5f824e7510f50e4925a98c01ef263290025748f64a27a11555f608d8001dc",
+    "detectors/bun_interlocking_infrastructure/checks/wagon_contract_honoured.mjs": "f6a7f8ef2e1d403934253b0491d3cb15451156ad7fa2b5b6ba313c0522a359b2",
     "detectors/bun_interlocking_infrastructure/detect.mjs": "6494579ec7b9d4680099401346337d73f4a52368ffb6b9d3b0fbca5dce2cde15",
     "detectors/bun_interlocking_infrastructure/fixtures/clean/interlocking_delegates/server.ts": "36913357fdd3c5e375829a0554c605d70f5c05e2e83349f47505741598f6eb15",
     "detectors/bun_interlocking_infrastructure/fixtures/clean/interlocking_delegates/src/match/wagon.ts": "ea202fa15fdf9d1391b1ae23343c9d1b09fcf8ef14f1dccfb8114ffaedea97c1",
@@ -1253,7 +1253,7 @@
     "planner-schemas/train-interlocking-registry.schema.json": "fd741b5a3909d54cef225fffde80b04359416690a26aca5718b7d91027f3934b",
     "planner-schemas/train-interlocking.schema.json": "67914979977f23652298b5272adf3df298576ecafbff3e5084574848be8c33d8",
     "planner-schemas/train.schema.json": "d6fbac9067c1bffeb84eb79a71228441055af6e6e7ba141dd4e0bcb079345ec0",
-    "planner-schemas/wagon.schema.json": "57b98f1ade998d745538eb3d72fb3014a50042006870f90bce47028eea336eb4",
+    "planner-schemas/wagon.schema.json": "12353e46d2216d2deef754615b629a696bd8a7bb35326379e7ef2b221a5ece3a",
     "planner-schemas/wmbt.schema.json": "7a3a5693bfcf01340667c2be4a3c48e74f34b1af7e8dc13372c0de06b7f4fe12",
     "relationships.yaml": "5860a308ebc3ee7fa8172fc2c6633984000ab3003f0ae4b6fa28db48879eda22",
     "src/agent.ts": "6d6c6e75908af8fbab13432f0001b0374bb25cf3dee46ba218dfd67e0090cb56",
@@ -1267,7 +1267,7 @@
     "src/journey-docs.ts": "994d229376244c84212cff951032823068a76565dd2fd427b9d44e341bd14853",
     "src/planner-kernel.ts": "5d3f5305fb59becb2cc97d8a03aca6b104f385805d91cc0410856e289dd6fbb1",
     "src/planner-schema-validator.ts": "ce529c0936171075e93c7539b3655fe895a98dd2973ebda5775958e6ebc316d9",
-    "src/planner-validators.ts": "99adeb65f579af923c11f21a8f55cfb9993b007fd8df59c5f764696b55379cfc",
+    "src/planner-validators.ts": "bb300a5ca6ed6487359d680f9512359aa75c48205110dd46c33067db7b5a18a2",
     "src/profile-registry.ts": "5a7761d324181ae27deb51f198d63648a4c99e858b4de98b54d35e6cf8a39fe7",
     "src/ratchet.ts": "909b47124863287cbf6b02237b70fd50d82522d5029b2ae900c371d2ea2287a2",
     "src/register.ts": "6a2f1c6b8df0dc9c8f45df8ec9fac2be29044e048b08c8ffe423410e94dadedd",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@afokapu/atdd-bun",
-  "version": "0.10.81",
+  "version": "0.10.83",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/afokapu/atdd-bun.git"
@@ -35,7 +35,7 @@
     "bun": ">=1.3.0"
   },
   "dependencies": {
-    "@afokapu/atdd-flow": "^0.3.37",
+    "@afokapu/atdd-flow": "^0.3.38",
     "ajv": "^8.17.1",
     "ajv-formats": "^3.0.1",
     "typescript": "6.0.3"

package/planner-schemas/wagon.schema.json

@@ -85,9 +85,9 @@
           },
           "to": {
             "type": "string",
-            "enum": ["internal", "external"],
+            "pattern": "^(internal|external|system:[a-z][a-z0-9-]*)$",
             "default": "external",
-            "description": "Optional visibility: internal (private to this wagon), external (public to all wagons including self). Defaults to external when omitted."
+            "description": "Optional destination: internal (private to this wagon), external (public to all wagons including self), or system:service (written to a platform service, symmetric with consume from: system:service). Defaults to external when omitted."
           },
           "version": {
             "type": "string",

package/src/planner-validators.ts

@@ -116,7 +116,8 @@ function contractRegistryFindings(root: string, wagons: PlanArtifact[], registry
     const name = text(produced.name), contract = text(produced.contract), producer = text(wagon.data.wagon);
     const consumers = (byName.get(name) ?? []).filter(consumer => consumer && consumer !== producer);
     if (consumers.length && !contract) findings.push(finding("planner.contract.registry-coherence", wagon.file, `produce ${name} has contract null but is consumed cross-wagon by ${consumers.sort().join(", ")}`));
-    if (contract && !consumers.length && text(produced.to || "external") !== "external") findings.push(finding("planner.contract.registry-coherence", wagon.file, `produce ${name} declares ${contract} but has no cross-wagon consumer and is not marked to: external`));
+    const to = text(produced.to || "external");
+    if (contract && !consumers.length && to !== "external" && !/^system:[a-z][a-z0-9-]*$/.test(to)) findings.push(finding("planner.contract.registry-coherence", wagon.file, `produce ${name} declares ${contract} but has no cross-wagon consumer and is not marked to: external`));
   }
   return findings;
 }
@@ -297,7 +298,7 @@ export async function validateStaticPlannerConventions(root = process.cwd()): Pr
     for (const item of produced) {
       const contract = text(item.contract), telemetry = item.telemetry; if (contract) contractOwners.set(contract, [...(contractOwners.get(contract) ?? []), slug]);
       for (const value of Array.isArray(telemetry) ? telemetry.map(text) : [text(telemetry)]) if (value) telemetryOwners.set(value, [...(telemetryOwners.get(value) ?? []), slug]);
-      const to = text(item.to || "external"); if (to !== "external" && to !== "internal" && (!to.startsWith("wagon:") || !wagonSlugs.has(to.slice(6)))) findings.push(finding("planner.wagon.produce-consume-artifacts", wagon.file, `${expected} produces to invalid destination ${to}`));
+      const to = text(item.to || "external"); if (to !== "external" && to !== "internal" && !/^system:[a-z][a-z0-9-]*$/.test(to) && (!to.startsWith("wagon:") || !wagonSlugs.has(to.slice(6)))) findings.push(finding("planner.wagon.produce-consume-artifacts", wagon.file, `${expected} produces to invalid destination ${to}`));
     }
     for (const item of consumed) {
       const from = text(item.from); if (!from) continue;