Merge parity tooling and RA retail fixes

.clang-tidy

@@ -31,5 +31,4 @@ CheckOptions:
   bugprone-argument-comment.StrictMode: false
 
 HeaderFilterRegex: ''
-AnalyzeTemporaryDtors: false
 FormatStyle: none

.github/workflows/ci.yml

@@ -1,8 +1,6 @@
-# CI — thin wrapper around flake apps.
-# Local equivalent: nix run .#ci-build-native
-#                   nix run .#ci-vqa
-#                   nix run .#ci-build-wasm
-#                   nix run .#ci-clang-tidy
+# CI — thin wrapper around nix run .#test.
+# Primary testing happens locally; this confirms the deploy artifact.
+# Local equivalent: nix run .#test
 
 name: CI
 
@@ -21,10 +19,10 @@ env:
   EM_CACHE_DIR: ${{ github.workspace }}/.emscripten-cache
 
 jobs:
-  build:
-    name: Compile and link (clang)
+  test:
+    name: Test (build + lint + boot tests)
     runs-on: ubuntu-24.04
-    timeout-minutes: 30
+    timeout-minutes: 60
 
     steps:
       - uses: actions/checkout@v6.0.2
@@ -35,6 +33,9 @@ jobs:
           extra_nix_config: |
             experimental-features = nix-command flakes
 
+      - name: Install system deps
+        run: sudo apt-get update -qq && sudo apt-get install -y --no-install-recommends cppcheck ffmpeg
+
       - name: Cache ccache
         uses: actions/cache@v5.0.5
         with:
@@ -43,285 +44,37 @@ jobs:
           restore-keys: |
             ccache-
 
-      - name: Build native + smoke
-        run: |
-          nix develop --command bash -c "
-            export CCACHE_DIR=${{ env.CCACHE_DIR }}
-            ccache --zero-stats
-            ccache --max-size 500M
-            nix run .#ci-build-native
-            echo '### ccache hit rate' >> \"$GITHUB_STEP_SUMMARY\"
-            ccache --show-stats >> \"$GITHUB_STEP_SUMMARY\"
-            ccache --show-stats
-          "
-
-  vqa-pixel-diff:
-    name: VQA codec pixel-diff
-    runs-on: ubuntu-24.04
-    timeout-minutes: 10
-
-    steps:
-      - uses: actions/checkout@v6.0.2
-
-      - name: Install Nix
-        uses: cachix/install-nix-action@v31.10.6
-
-      - name: Install ffmpeg
-        run: sudo apt-get update -qq && sudo apt-get install -y --no-install-recommends ffmpeg
-
-      - name: Run VQA pixel-diff
-        run: nix develop --command nix run .#ci-vqa
-
-  wine-comparison:
-    name: Wine OG comparison
-    runs-on: ubuntu-24.04
-    timeout-minutes: 30
-
-    steps:
-      - uses: actions/checkout@v6.0.2
-
-      - name: Install Nix
-        uses: cachix/install-nix-action@v31.10.6
-        with:
-          extra_nix_config: |
-            experimental-features = nix-command flakes
-
-      - name: Install Wine32 + system tools
-        run: |
-          sudo dpkg --add-architecture i386
-          sudo apt-get update -qq
-          sudo apt-get install -y --no-install-recommends \
-            wine32:i386 xvfb xdotool imagemagick
-
-      - name: Cache RA95.EXE
-        uses: actions/cache@v5.0.5
-        with:
-          path: ${{ runner.temp }}/ra95-cache
-          key: ra95-exe-a95e2ac85c4cc3aaacb7795e3c07b8aec7c3e10efe679766fb2ee15b12aa2d55
-
-      - name: Prepare RA95.EXE
-        run: |
-          sudo mkdir -p /opt/redalert && sudo chmod 777 /opt/redalert
-          if [ -f "$RUNNER_TEMP/ra95-cache/RA95.EXE" ]; then
-            echo "::notice::RA95 cache hit — copying to /opt/redalert"
-            cp "$RUNNER_TEMP"/ra95-cache/* /opt/redalert/
-          else
-            echo "::notice::RA95 cache miss — downloading from archive.org"
-            bash scripts/wine-ra-setup.sh
-            mkdir -p "$RUNNER_TEMP/ra95-cache"
-            cp /opt/redalert/*.EXE /opt/redalert/*.DLL "$RUNNER_TEMP/ra95-cache/" 2>/dev/null || true
-          fi
-
-      - name: Run OG Red Alert under Wine
-        id: wine-run
-        run: |
-          bash scripts/wine-ra.sh \
-            && echo "wine_ok=true"  >> "$GITHUB_OUTPUT" \
-            || echo "wine_ok=false" >> "$GITHUB_OUTPUT"
-
-      - name: Set WINE_RA_READY when screenshots captured
-        if: steps.wine-run.outputs.wine_ok == 'true'
-        run: echo "WINE_RA_READY=1" >> "$GITHUB_ENV"
-
-      - name: Run Tier 1 + Tier 3 comparison tests
-        run: |
-          Xvfb :99 -screen 0 1280x1024x24 &
-          XVFB_PID=$!
-          for i in $(seq 1 10); do
-            if xdpyinfo -display :99 >/dev/null 2>&1; then break; fi
-            sleep 0.5
-          done
-          nix develop --command playwright test e2e/tim699-ra-compare.spec.ts \
-            --grep "Tier 1|Tier 3" --reporter=line
-          PW_EXIT=$?
-          kill "$XVFB_PID" 2>/dev/null || true
-          exit $PW_EXIT
-
-      - name: Upload comparison screenshots
-        if: always()
-        uses: actions/upload-artifact@v7.0.1
-        with:
-          name: wine-comparison-screenshots
-          path: e2e/screenshots/
-          if-no-files-found: ignore
-
-      - name: Upload Playwright test results on failure
-        if: failure()
-        uses: actions/upload-artifact@v7.0.1
-        with:
-          name: wine-comparison-test-results
-          path: |
-            e2e/test-results/
-            e2e/report/
-          if-no-files-found: ignore
-
-  build-wasm:
-    name: Build WASM + regression
-    runs-on: ubuntu-24.04
-    timeout-minutes: 45
-
-    steps:
-      - uses: actions/checkout@v6.0.2
-
-      - name: Install Nix
-        uses: cachix/install-nix-action@v31.10.6
-        with:
-          extra_nix_config: |
-            experimental-features = nix-command flakes
-
-      - name: Cache Emscripten system libraries
+      - name: Cache Emscripten
         uses: actions/cache@v5.0.5
         with:
           path: ${{ env.EM_CACHE_DIR }}
           key: emcc-cache-5.0.6-${{ hashFiles('CMakeLists.txt', 'CMakePresets.json') }}
           restore-keys: |
             emcc-cache-5.0.6-
 
-      - name: Build WASM + validate + smoke (T1/T2)
-        env:
-          EM_CACHE: ${{ env.EM_CACHE_DIR }}
-        run: nix develop --command nix run .#ci-build-wasm
-
-      - name: WASM regression — T3 TD menu click (asset-gated)
-        env:
-          TD_ASSETS_URL: ${{ secrets.TD_ASSETS_URL }}
-        run: |
-          if [ -z "$TD_ASSETS_URL" ]; then
-            echo "::notice::T3 skipped — TD_ASSETS_URL secret not set"
-            exit 0
-          fi
-          nix develop --command nix run .#ci-run-test -- e2e/regression/T3-td-wasm-menu.spec.ts
-
-      - name: Upload T3 artifacts on failure
-        if: failure()
-        uses: actions/upload-artifact@v7.0.1
-        with:
-          name: t3-td-wasm-menu-results
-          path: e2e/screenshots/t3-td-wasm-menu-*.png
-
-      - name: WASM regression — T6 TD mission start (asset-gated)
-        env:
-          TD_ASSETS_URL: ${{ secrets.TD_ASSETS_URL }}
-        run: |
-          if [ -z "$TD_ASSETS_URL" ]; then
-            echo "::notice::T6 skipped — TD_ASSETS_URL secret not set"
-            exit 0
-          fi
-          nix develop --command nix run .#ci-run-test -- e2e/regression/T6-td-wasm-mission-start.spec.ts
-
-      - name: Upload T6 artifacts on failure
-        if: failure()
-        uses: actions/upload-artifact@v7.0.1
-        with:
-          name: t6-td-wasm-mission-start-results
-          path: e2e/screenshots/t6-td-wasm-*.png
-
-      - name: WASM regression — T7 TD audio pitch (asset-gated)
-        env:
-          TD_ASSETS_URL: ${{ secrets.TD_ASSETS_URL }}
-        run: |
-          if [ -z "$TD_ASSETS_URL" ]; then
-            echo "::notice::T7 skipped — TD_ASSETS_URL secret not set"
-            exit 0
-          fi
-          nix develop --command nix run .#ci-run-test -- e2e/regression/T7-td-audio-pitch.spec.ts
-
-      - name: Upload T7 artifacts on failure
-        if: failure()
-        uses: actions/upload-artifact@v7.0.1
-        with:
-          name: t7-td-audio-pitch-results
-          path: e2e/screenshots/t7-td-*.png
-
-      - name: WASM regression — T8 RA audio pitch (asset-gated)
-        env:
-          RA_ASSETS_URL: ${{ vars.RA_ASSETS_URL || secrets.RA_ASSETS_URL || '' }}
-        run: |
-          if [ -z "$RA_ASSETS_URL" ]; then
-            echo "::notice::T8 skipped — RA_ASSETS_URL not set"
-            exit 0
-          fi
-          nix develop --command nix run .#ci-run-test -- e2e/regression/T8-ra-audio-pitch.spec.ts
-
-      - name: Upload T8 artifacts on failure
-        if: failure()
-        uses: actions/upload-artifact@v7.0.1
-        with:
-          name: t8-ra-audio-pitch-results
-          path: e2e/screenshots/t8-ra-*.png
-
-      - name: WASM regression — T9 RA mission start (asset-gated)
+      - name: Run test suite
         env:
           RA_ASSETS_URL: ${{ vars.RA_ASSETS_URL || secrets.RA_ASSETS_URL || '' }}
+          TD_ASSETS_URL: ${{ secrets.TD_ASSETS_URL || '' }}
+          EM_CACHE: ${{ env.EM_CACHE_DIR }}
         run: |
-          if [ -z "$RA_ASSETS_URL" ]; then
-            echo "::notice::T9 skipped — RA_ASSETS_URL not set"
-            exit 0
-          fi
-          nix develop --command nix run .#ci-run-test -- e2e/regression/T9-ra-wasm-mission-start.spec.ts
+          nix develop --command bash -c "
+            export CCACHE_DIR=${{ env.CCACHE_DIR }}
+            ccache --zero-stats
+            ccache --max-size 500M
+            nix run .#test -- --all
+            ccache --show-stats
+          "
 
-      - name: Upload T9 artifacts on failure
+      - name: Upload artifacts on failure
         if: failure()
         uses: actions/upload-artifact@v7.0.1
         with:
-          name: t9-ra-wasm-mission-start-results
-          path: e2e/screenshots/t9-ra-wasm-*.png
-
-  clang-tidy:
-    name: clang-tidy static analysis
-    runs-on: ubuntu-24.04
-    continue-on-error: true
-
-    steps:
-      - uses: actions/checkout@v6.0.2
-
-      - name: Install Nix
-        uses: cachix/install-nix-action@v31.10.6
-        with:
-          extra_nix_config: |
-            experimental-features = nix-command flakes
-
-      - name: Run clang-tidy
-        id: clang-tidy
-        continue-on-error: true
-        run: nix develop --command nix run .#ci-clang-tidy
-
-      - name: Upload clang-tidy report
-        if: always()
-        uses: actions/upload-artifact@v7.0.1
-        with:
-          name: clang-tidy-report
-          path: clang-tidy-report.txt
-          if-no-files-found: ignore
-
-  cppcheck:
-    name: cppcheck static analysis
-    runs-on: ubuntu-24.04
-    continue-on-error: true
-
-    steps:
-      - uses: actions/checkout@v6.0.2
-
-      - name: Install Nix
-        uses: cachix/install-nix-action@v31.10.6
-        with:
-          extra_nix_config: |
-            experimental-features = nix-command flakes
-
-      - name: Install cppcheck
-        run: |
-          sudo apt-get update -qq
-          sudo apt-get install -y --no-install-recommends cppcheck
-
-      - name: Run cppcheck
-        id: cppcheck
-        continue-on-error: true
-        run: nix develop --command nix run .#ci-cppcheck
-
-      - name: Upload cppcheck report
-        if: always()
-        uses: actions/upload-artifact@v7.0.1
-        with:
-          name: cppcheck-report
-          path: cppcheck-report.txt
+          name: test-results
+          path: |
+            e2e/screenshots/
+            e2e/test-results/
+            e2e/report/
+            /tmp/clang-tidy-report.txt
+            /tmp/cppcheck-report.txt
           if-no-files-found: ignore

.github/workflows/gh-pages.yml

@@ -1,6 +1,6 @@
 # GitHub Pages Deploy — manual trigger only.
 # Builds WASM targets, runs full regression suite, deploys to GitHub Pages.
-# Local equivalent: nix run .#ci-build-wasm && nix run .#ci-wasm-smoke
+# Local equivalent: nix run .#ra-wasm-build && nix run .#td-wasm-build
 
 name: GitHub Pages Deploy
 
@@ -56,20 +56,17 @@ jobs:
       - name: Configure ccache
         env:
           CCACHE_DIR: ${{ env.CCACHE_DIR }}
-        run: nix develop --command nix run .#ci-cc-setup
+        run: nix develop --command bash -c "ccache --zero-stats && ccache --max-size 500M"
 
       - name: Build ra.wasm
         env:
           EM_CACHE: ${{ env.EM_CACHE_DIR }}
-        run: nix develop --command nix run .#build-wasm ra
+        run: nix develop --command nix run .#ra-wasm-build
 
       - name: Build td.wasm
         env:
           EM_CACHE: ${{ env.EM_CACHE_DIR }}
-        run: nix develop --command nix run .#build-wasm td
-
-      - name: Validate and smoke test
-        run: nix develop --command bash -c "nix run .#validate-wasm && nix run .#ci-wasm-smoke"
+        run: nix develop --command nix run .#td-wasm-build
 
       - name: Start Xvfb and WASM server
         run: |