diff --git a/docs/eve-migration-roadmap.md b/docs/eve-migration-roadmap.md index 0826116..5cbac82 100644 --- a/docs/eve-migration-roadmap.md +++ b/docs/eve-migration-roadmap.md @@ -276,12 +276,14 @@ Exit criteria: 1. Add a real Unity plugin-host proof for either Sai or Norn, or keep `EveUnity` blocked on explicit unsupported-plugin declarations. -2. Use the exported conformance packs from one non-Eve repo or runtime smoke so - the consumer path proves a real split candidate, not only a copied-layout - local check. Recently cut: +- Aetheria now consumes the exported conformance pack from its own working + directory through `scripts/run-aetheria-conformance-consumer-smoke.ps1`. The + smoke asserts the provider pack, `aetheria-world` fixture, `aetheria` + provider entry, and `aetheria-world-command-replay` scenario without reading + Eve's parity manifest or dirtying the Aetheria worktree. - The parity harness now runs a conformance consumer smoke against a copied `artifacts/conformance/latest` layout, proving the export can be consumed through `index.json` and `packs/*.json` without reading Eve's parity manifest. diff --git a/docs/parity-testing-harness.md b/docs/parity-testing-harness.md index ff8c6c7..3effd94 100644 --- a/docs/parity-testing-harness.md +++ b/docs/parity-testing-harness.md @@ -71,6 +71,18 @@ After generating the parity report, `run-parity-harness.ps1` copies proves the conformance export can be consumed through its own index and pack files without reading `tools/parity/parity-manifest.json`. +Provider-owned consumer smoke: + +```powershell +powershell -ExecutionPolicy Bypass -File .\scripts\run-aetheria-conformance-consumer-smoke.ps1 +``` + +That script runs the same export consumer from `E:\Projects\Aetheria` and +asserts the provider pack, `aetheria-world` fixture, `aetheria` provider entry, +and `aetheria-world-command-replay` scenario. Generated copies remain under +Eve's `artifacts/aetheria-conformance-consumer-smoke` so the provider worktree +does not become dirty merely by proving the boundary. + The smoke runner writes: - `artifacts/parity-smoke//parity-smoke.md` diff --git a/scripts/run-aetheria-conformance-consumer-smoke.ps1 b/scripts/run-aetheria-conformance-consumer-smoke.ps1 new file mode 100644 index 0000000..c971589 --- /dev/null +++ b/scripts/run-aetheria-conformance-consumer-smoke.ps1 @@ -0,0 +1,46 @@ +param( + [string] $ExportDirectory = "artifacts\conformance\latest", + [string] $AetheriaRoot = "E:\Projects\Aetheria", + [string] $ConsumerDirectory = "artifacts\aetheria-conformance-consumer-smoke" +) + +$ErrorActionPreference = "Stop" + +$projectRoot = Split-Path -Parent $PSScriptRoot +$sourceExport = if ([System.IO.Path]::IsPathRooted($ExportDirectory)) { + $ExportDirectory +} else { + Join-Path $projectRoot $ExportDirectory +} +$consumerRoot = if ([System.IO.Path]::IsPathRooted($ConsumerDirectory)) { + $ConsumerDirectory +} else { + Join-Path $projectRoot $ConsumerDirectory +} +$consumerExport = Join-Path $consumerRoot "export" + +if (-not (Test-Path $sourceExport)) { + throw "Conformance export not found: $sourceExport" +} +if (-not (Test-Path $AetheriaRoot)) { + throw "Aetheria repo not found: $AetheriaRoot" +} + +if (Test-Path $consumerExport) { + Remove-Item -LiteralPath $consumerExport -Recurse -Force +} +New-Item -ItemType Directory -Force -Path $consumerRoot | Out-Null +Copy-Item -LiteralPath $sourceExport -Destination $consumerExport -Recurse + +$consumerScript = Join-Path $projectRoot "tools\conformance\consume-export.mjs" + +Push-Location $AetheriaRoot +try { + node $consumerScript $consumerExport ` + --expect-pack provider ` + --expect-fixture aetheria-world ` + --expect-provider aetheria ` + --expect-scenario aetheria-world-command-replay +} finally { + Pop-Location +} diff --git a/tools/conformance/consume-export.mjs b/tools/conformance/consume-export.mjs index 478f6a2..6ec0b33 100644 --- a/tools/conformance/consume-export.mjs +++ b/tools/conformance/consume-export.mjs @@ -3,9 +3,20 @@ import { existsSync } from "node:fs"; import { readFileSync } from "node:fs"; import path from "node:path"; -const exportDirectory = process.argv[2] ? path.resolve(process.argv[2]) : ""; +const { exportDirectory, expectations } = parseArguments(process.argv.slice(2)); if (!exportDirectory) { - console.error("Usage: node tools/conformance/consume-export.mjs "); + console.error([ + "Usage: node tools/conformance/consume-export.mjs [expectations]", + "", + "Expectations:", + " --expect-pack ", + " --expect-fixture ", + " --expect-plugin ", + " --expect-provider ", + " --expect-runtime ", + " --expect-scenario ", + " --expect-split-target ", + ].join("\n")); process.exit(2); } @@ -16,7 +27,7 @@ if (!existsSync(indexPath)) { errors.push(`index.json:missing:${indexPath}`); } else { const index = JSON.parse(await readFile(indexPath, "utf8")); - validateIndex(index, exportDirectory, errors); + validateIndex(index, exportDirectory, expectations, errors); } for (const error of errors) console.error(`Conformance consumer error: ${error}`); @@ -24,16 +35,20 @@ if (errors.length) process.exit(1); console.log(`Conformance consumer smoke passed: ${exportDirectory}`); -function validateIndex(index, directory, errors) { +function validateIndex(index, directory, expectations, errors) { if (index.schema !== "gamecult.eve.conformance_export.v1") { errors.push(`schema:expected gamecult.eve.conformance_export.v1 got ${index.schema || ""}`); } const packs = Array.isArray(index.packs) ? index.packs : []; const packIds = new Set(packs.map(pack => pack.id)); + const fixtureIds = new Set(); for (const requiredPack of ["core", "plugin", "provider", "runtime"]) { if (!packIds.has(requiredPack)) errors.push(`pack:${requiredPack}:missing`); } + for (const expectedPack of expectations.packs) { + if (!packIds.has(expectedPack)) errors.push(`pack:${expectedPack}:missing`); + } for (const pack of packs) { const packPath = path.join(directory, "packs", `${pack.id}.json`); @@ -51,6 +66,7 @@ function validateIndex(index, directory, errors) { } for (const fixture of packDocument.fixtures || []) { + if (fixture.fixtureId) fixtureIds.add(fixture.fixtureId); if (!fixture.fixtureId) errors.push(`pack-file:${pack.id}:fixture:fixtureId:missing`); if (!fixture.status) errors.push(`pack-file:${pack.id}:fixture:${fixture.fixtureId || "unknown"}:status:missing`); if (!fixture.surface?.path) errors.push(`pack-file:${pack.id}:fixture:${fixture.fixtureId || "unknown"}:surface.path:missing`); @@ -58,16 +74,40 @@ function validateIndex(index, directory, errors) { } } - if (!Array.isArray(index.plugins) || !index.plugins.some(plugin => plugin.pluginId === "sai.vn" && plugin.abiFixturePath)) { + const plugins = Array.isArray(index.plugins) ? index.plugins : []; + const providers = Array.isArray(index.providers) ? index.providers : []; + const runtimes = Array.isArray(index.runtimes) ? index.runtimes : []; + const splitTargets = Array.isArray(index.splitTargets) ? index.splitTargets : []; + + for (const expectedFixture of expectations.fixtures) { + if (!fixtureIds.has(expectedFixture)) errors.push(`fixture:${expectedFixture}:missing`); + } + for (const expectedPlugin of expectations.plugins) { + if (!plugins.some(plugin => plugin.pluginId === expectedPlugin)) errors.push(`plugins:${expectedPlugin}:missing`); + } + for (const expectedProvider of expectations.providers) { + if (!providers.some(provider => provider.providerId === expectedProvider)) errors.push(`providers:${expectedProvider}:missing`); + } + for (const expectedRuntime of expectations.runtimes) { + if (!runtimes.some(runtime => runtime.runtimeId === expectedRuntime)) errors.push(`runtimes:${expectedRuntime}:missing`); + } + for (const expectedScenario of expectations.scenarios) { + if (!providers.some(provider => provider.scenarioId === expectedScenario)) errors.push(`providers:scenario:${expectedScenario}:missing`); + } + for (const expectedSplitTarget of expectations.splitTargets) { + if (!splitTargets.some(target => target.id === expectedSplitTarget)) errors.push(`splitTargets:${expectedSplitTarget}:missing`); + } + + if (!plugins.some(plugin => plugin.pluginId === "sai.vn" && plugin.abiFixturePath)) { errors.push("plugins:sai.vn:abiFixturePath:missing"); } - if (!Array.isArray(index.providers) || !index.providers.some(provider => provider.providerId === "aetheria" && provider.scenarioPath)) { + if (!providers.some(provider => provider.providerId === "aetheria" && provider.scenarioPath)) { errors.push("providers:aetheria:scenarioPath:missing"); } - if (!Array.isArray(index.runtimes) || !index.runtimes.some(runtime => runtime.runtimeId === "unity-uitoolkit" && runtime.commandTransportSchema === "gamecult.eve.command.v1")) { + if (!runtimes.some(runtime => runtime.runtimeId === "unity-uitoolkit" && runtime.commandTransportSchema === "gamecult.eve.command.v1")) { errors.push("runtimes:unity-uitoolkit:commandTransportSchema:missing"); } - if (!Array.isArray(index.splitTargets) || !index.splitTargets.some(target => target.id === "EveUnity")) { + if (!splitTargets.some(target => target.id === "EveUnity")) { errors.push("splitTargets:EveUnity:missing"); } } @@ -75,3 +115,43 @@ function validateIndex(index, directory, errors) { function readFileSyncUtf8(filePath) { return readFileSync(filePath, "utf8"); } + +function parseArguments(args) { + const exportPath = args[0] ? path.resolve(args[0]) : ""; + const expectations = { + packs: [], + fixtures: [], + plugins: [], + providers: [], + runtimes: [], + scenarios: [], + splitTargets: [], + }; + const optionTargets = new Map([ + ["--expect-pack", expectations.packs], + ["--expect-fixture", expectations.fixtures], + ["--expect-plugin", expectations.plugins], + ["--expect-provider", expectations.providers], + ["--expect-runtime", expectations.runtimes], + ["--expect-scenario", expectations.scenarios], + ["--expect-split-target", expectations.splitTargets], + ]); + + for (let index = 1; index < args.length; index += 1) { + const option = args[index]; + const target = optionTargets.get(option); + if (!target) { + console.error(`Unknown option: ${option}`); + process.exit(2); + } + const value = args[index + 1]; + if (!value || value.startsWith("--")) { + console.error(`Missing value for option: ${option}`); + process.exit(2); + } + target.push(value); + index += 1; + } + + return { exportDirectory: exportPath, expectations }; +}