@openwop/openwop-conformance 1.163.0 → 2.0.0-rc.1

package/dist/lib/requirement-ids.js

@@ -24,6 +24,20 @@
  * `~3`, … (vitest allows duplicate titles; the ledger does not allow duplicate
  * ids). A scenario MAY override the derived id for the current test with
  * `req()` when it wants a hand-authored, registry-listed id.
+ *
+ * requireExplicitIds (suite 2.0.0, RFC 0168 §A.1): from 2.0.0 `req(id, section,
+ * requirement)` is the ONLY assertion-message form in `src/scenarios` and
+ * `src/coherence` — `driver.describe(section, requirement)` is gone from every
+ * scenario, and `scripts/check-req-only.mjs` (root) fails the gate when a
+ * scenario reintroduces it, when an `expect` carries a bare string message,
+ * when an `it` body returns without `softSkip` / `seamAbsent`, or when two
+ * `it`s in one file share an explicit id. Every `it` therefore names the
+ * requirement it witnesses on the wire; the title-derived allocator below is
+ * the fallback for an `it` that makes no cited assertion at all. The ids the
+ * 2.0.0 sweep wrote are exactly the ids the allocator derived in 1.x (same
+ * stem + slug + `~n` order), so no bundle id changed at the cut-over; an `it`
+ * with an interpolated title carries a hand-minted id from the static parts of
+ * its title, unique within the file.
  */
 export const IT_ID_PREFIX = 'openwop.it.';
 export const IT_ID_GRAMMAR = /^openwop\.it\.[a-z0-9]+(?:-[a-z0-9]+)*\.[a-z0-9]+(?:-[a-z0-9]+)*(?:~[2-9][0-9]*)?$/;
@@ -55,6 +69,29 @@ export function scenarioFileOfItId(requirementId) {
         return null;
     return `${rest.slice(0, dot)}.test.ts`;
 }
+/**
+ * Every FILE-derived id back to its file: the per-test `openwop.it.<stem>.<title>`
+ * plus the per-file rows the ledger also carries, `openwop.scenario.<stem>` and
+ * `openwop.floor.<stem>`. Gate rows (`openwop.profile.*`, `openwop.family.*`),
+ * explicit `req()` ids and the `openwop.floor.any.<prefix>` GROUP name no single
+ * file and return null. A caller that understood only `it` ids read a per-file
+ * row as an un-cited requirement and demanded a `req()` literal that, by
+ * construction, never exists.
+ */
+export function scenarioFileOfId(requirementId) {
+    const it = scenarioFileOfItId(requirementId);
+    if (it !== null)
+        return it;
+    for (const prefix of ['openwop.scenario.', 'openwop.floor.']) {
+        if (!requirementId.startsWith(prefix))
+            continue;
+        const rest = requirementId.slice(prefix.length);
+        if (rest.length === 0 || rest.startsWith('any.'))
+            return null;
+        return `${rest}.test.ts`;
+    }
+    return null;
+}
 /**
  * Collision suffixing: the first occurrence keeps the bare id, later ones get
  * `~2`, `~3`, … Keyed per file so a worker running many files never crosses
@@ -64,7 +101,12 @@ export class ItIdAllocator {
     seen = new Map();
     allocate(scenarioFile, title) {
         const base = itRequirementId(scenarioFile, title);
-        const n = (this.seen.get(base) ?? 0) + 1;
+        let n = (this.seen.get(base) ?? 0) + 1;
+        // An id a sibling `it` already claimed through `req()` never reached this
+        // allocator, so a same-titled `it` that cites nothing must skip past it —
+        // otherwise the first explicit `exists` and the derived `exists` collide.
+        while (claimedExplicit.has(n === 1 ? base : `${base}~${n}`))
+            n++;
         this.seen.set(base, n);
         return n === 1 ? base : `${base}~${n}`;
     }
@@ -76,21 +118,32 @@ export class ItIdAllocator {
 // Explicit override for the current test.
 // ---------------------------------------------------------------------------
 let explicitId = null;
+/** Every id handed to `req()` in this worker — consulted by `ItIdAllocator`. */
+const claimedExplicit = new Set();
 /**
  * Attach a hand-authored requirement id to the CURRENT test. The per-`it`
  * ledger row for this test is recorded under `id` instead of the derived
- * title id. Returns the usual `driver.describe`-style message so the call
- * doubles as the assertion message:
+ * title id. Returns the SAME message shape `driver.describe` returns —
+ * `[<impl>@<version>] <section>: <requirement>` — so a failure still names
+ * the implementation under test:
  *
  *   expect(x, req('openwop.auth.subject-link.leaver-deny', 'auth-profiles.md §Subject linking', 'deactivation MUST deny')).toBe(true)
  *
+ * The implementation label is read straight from `OPENWOP_IMPLEMENTATION_NAME`
+ * / `OPENWOP_IMPLEMENTATION_VERSION` with the defaults `env.ts` uses (`unknown`)
+ * rather than through `loadEnv()`, so a suite self-test can call `req()`
+ * without `OPENWOP_BASE_URL` set.
+ *
  * The id MUST be listed in `conformance/requirements.json` (the generator
  * collects `req(` first-argument literals); an unlisted id fails the registry
  * check, so a hand id cannot drift from the registry silently.
  */
 export function req(id, specSection, requirement) {
     explicitId = id;
-    return `${specSection}: ${requirement}`;
+    claimedExplicit.add(id);
+    const impl = process.env['OPENWOP_IMPLEMENTATION_NAME']?.trim() ?? 'unknown';
+    const version = process.env['OPENWOP_IMPLEMENTATION_VERSION']?.trim() ?? 'unknown';
+    return `[${impl}@${version}] ${specSection}: ${requirement}`;
 }
 /** setup.ts reads and clears the override after each test. */
 export function takeExplicitRequirementId() {

package/dist/lib/requirement-ledger.js

@@ -63,6 +63,7 @@ export function recordRequirement(requirementId, disposition, detail, extras) {
         disposition,
         ...(detail === undefined ? {} : { detail }),
         ...(extras?.assertionCount === undefined ? {} : { assertionCount: extras.assertionCount }),
+        ...(extras?.scenarioFile === undefined ? {} : { scenarioFile: extras.scenarioFile }),
     };
     ledger.set(requirementId, entry);
     journal.push(entry);

package/dist/lib/scenario-disposition.js

@@ -110,6 +110,7 @@ export function resolveFileRecord(states, gateReason, assertionCount, noted, spe
     // CERTIFIABLE, so these rows stop counting against a host that cannot affect
     // them. See lib/spec-coherence.ts for why not a new disposition value.
     if (specCoherenceFile !== undefined
+        && process.env.OPENWOP_CORPUS_GATE !== '1' // suite 2.0.0: under the corpus gate the coherence scenario IS the subject
         && SPEC_COHERENCE_SCENARIOS.has(specCoherenceFile)
         && !states.includes('fail')
         && assertionCount === 0) {
@@ -240,7 +241,11 @@ document) {
     // them. This is the granularity RFC 0148 §A describes and the G8 fix.
     const emitted = new Set(rows.map((r) => r.requirementId));
     for (const e of [...ledger].sort((a, b) => a.requirementId.localeCompare(b.requirementId))) {
-        const file = scenarioFileOfItId(e.requirementId);
+        // Prefer the file the entry recorded: an explicit `req()` id
+        // (`openwop.requirement.…`) is authored, not file-derived, so deriving a
+        // file from the id alone returned null and the row was dropped — every
+        // explicit requirement id was missing from bundle v3 for that reason.
+        const file = e.scenarioFile ?? scenarioFileOfItId(e.requirementId);
         // Attribute only to files this run reported on: a worker's ledger can carry
         // rows from files outside the certified set (the suite's own lib tests, or
         // a filtered run), and those are not evidence about the host.

package/dist/lib/spec-coherence.js

@@ -79,38 +79,19 @@
  * disjoint and jointly exhaustive over the `V1_DIR`-gated files, and a comment
  * is no longer the only place the exclusion reason lives.
  */
-/** Scenarios whose subject is the corpus. Kept honest by `spec-coherence-registry.test.ts`. */
-export const SPEC_COHERENCE_SCENARIOS = new Set([
-    'artifact-schema-compile-bounded.test.ts',
-    'artifact-type-legacy-ids.test.ts',
-    'capability-example-root-layout.test.ts',
-    'certification-floor-enforcement.test.ts',
-    'chain-subchain-unsupported-refused.test.ts',
-    'compensation-profile.test.ts',
-    'core-manifest-and-extension-registry.test.ts',
-    'discovery-canonical-family-no-shadow.test.ts',
-    'edge-condition-truthy-falsy.test.ts',
-    'effect-identity-composition.test.ts',
-    'effect-identity-cross-scope.test.ts',
-    'error-envelope-canonical-shape.test.ts',
-    'event-codemap-complete.test.ts',
-    'form-content-packs.test.ts',
-    'multi-region-effect-vocabulary.test.ts',
-    'normative-example-extraction.test.ts',
-    'openapi-asyncapi-sdk-parity.test.ts',
-    'pack-manifest-extensions.test.ts',
-    'protocol-version-grammar.test.ts',
-    'registry-declarative-kinds.test.ts',
-    'rfc-0147-self-audit.test.ts',
-    'rfc-lifecycle-coherence.test.ts',
-    'semantic-digest-v2.test.ts',
-    'spec-corpus-validity.test.ts',
-    'spec-section-citations.test.ts',
-    'tool-result-trust-monotone.test.ts',
-    'versioned-composition-profiles.test.ts',
-    'workflow-chain-internal-flag.test.ts',
-    'workload-identity-profile.test.ts',
-]);
+/**
+ * Scenarios whose subject is the corpus. Suite 2.0.0 (RFC 0168 §D.1): they
+ * live in `src/coherence/`, not `src/scenarios/`, and the set is the DIRECTORY
+ * LISTING — one source of truth instead of four (this list, the package.json
+ * negations, spec-coherence-scenarios.json and the registry self-test used to
+ * each carry a copy). They run in the spec repo's CI (scripts/check-spec-coherence.mjs)
+ * and never enter a host bundle; the published tarball excludes the directory.
+ */
+import { existsSync, readdirSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
+import { dirname, join } from 'node:path';
+const COHERENCE_DIR = join(dirname(fileURLToPath(import.meta.url)), '..', 'coherence');
+export const SPEC_COHERENCE_SCENARIOS = new Set(existsSync(COHERENCE_DIR) ? readdirSync(COHERENCE_DIR).filter((f) => f.endsWith('.test.ts')).sort() : []);
 /**
  * Scenarios that gate on `V1_DIR` **and** drive the host, so their `blocked` is
  * honest: advertised behaviour a missing dependency prevented exercising.

package/dist/spec-artifacts.lock.json

@@ -0,0 +1,5 @@
+{
+  "package": "@openwop/spec-artifacts",
+  "version": "2.0.0-rc.1",
+  "stampSha256": "c588b39fdcedb05d753c738cfe8e335093cdd2e9431f789d9d2085df4629e794"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openwop/openwop-conformance",
-  "version": "1.163.0",
+  "version": "2.0.0-rc.1",
   "description": "Production-ready black-box conformance suite for OpenWOP v1.0 compliant servers.",
   "repository": {
     "type": "git",
@@ -20,7 +20,7 @@
     "coverage.md",
     "requirements.json",
     "requirement-aliases.json",
-    "api",
+    "scenario-majors.json",
     "schemas",
     "vectors",
     "vitest.config.ts",
@@ -28,35 +28,7 @@
     "CHANGELOG.md",
     "LICENSE",
     "!src/lib/*.test.ts",
-    "!src/scenarios/artifact-schema-compile-bounded.test.ts",
-    "!src/scenarios/artifact-type-legacy-ids.test.ts",
-    "!src/scenarios/capability-example-root-layout.test.ts",
-    "!src/scenarios/certification-floor-enforcement.test.ts",
-    "!src/scenarios/chain-subchain-unsupported-refused.test.ts",
-    "!src/scenarios/compensation-profile.test.ts",
-    "!src/scenarios/core-manifest-and-extension-registry.test.ts",
-    "!src/scenarios/discovery-canonical-family-no-shadow.test.ts",
-    "!src/scenarios/edge-condition-truthy-falsy.test.ts",
-    "!src/scenarios/effect-identity-composition.test.ts",
-    "!src/scenarios/effect-identity-cross-scope.test.ts",
-    "!src/scenarios/error-envelope-canonical-shape.test.ts",
-    "!src/scenarios/event-codemap-complete.test.ts",
-    "!src/scenarios/form-content-packs.test.ts",
-    "!src/scenarios/multi-region-effect-vocabulary.test.ts",
-    "!src/scenarios/normative-example-extraction.test.ts",
-    "!src/scenarios/openapi-asyncapi-sdk-parity.test.ts",
-    "!src/scenarios/pack-manifest-extensions.test.ts",
-    "!src/scenarios/protocol-version-grammar.test.ts",
-    "!src/scenarios/registry-declarative-kinds.test.ts",
-    "!src/scenarios/rfc-0147-self-audit.test.ts",
-    "!src/scenarios/rfc-lifecycle-coherence.test.ts",
-    "!src/scenarios/semantic-digest-v2.test.ts",
-    "!src/scenarios/spec-corpus-validity.test.ts",
-    "!src/scenarios/spec-section-citations.test.ts",
-    "!src/scenarios/tool-result-trust-monotone.test.ts",
-    "!src/scenarios/versioned-composition-profiles.test.ts",
-    "!src/scenarios/workflow-chain-internal-flag.test.ts",
-    "!src/scenarios/workload-identity-profile.test.ts"
+    "!src/coherence"
   ],
   "scripts": {
     "test": "vitest run",
@@ -66,7 +38,9 @@
     "build:cli": "tsc -p tsconfig.build.json && chmod +x dist/cli.js",
     "cli": "tsx src/cli.ts",
     "prepack": "bash scripts/pack-vendor.sh",
-    "postpack": "rm -rf api schemas"
+    "postpack": "rm -rf schemas",
+    "test:coherence": "vitest run --config vitest.coherence.config.ts",
+    "test:self": "vitest run --config vitest.selftest.config.ts"
   },
   "engines": {
     "node": ">=20"
@@ -78,6 +52,10 @@
   },
   "devDependencies": {
     "typescript": "^5.6.0",
-    "@types/node": "^22.0.0"
+    "@types/node": "^22.0.0",
+    "@openwop/spec-artifacts": "file:../spec-artifacts"
+  },
+  "peerDependencies": {
+    "@openwop/spec-artifacts": "2.0.0-rc.1"
   }
 }