diff --git a/.github/test-base-metals-pin.sh b/.github/test-base-metals-pin.sh
index 8d5da556..240854aa 100644
--- a/.github/test-base-metals-pin.sh
+++ b/.github/test-base-metals-pin.sh
@@ -24,7 +24,7 @@ chmod +x "$scratch/bin/gh"
 export PATH="$scratch/bin:$PATH"
 commit=1111111111111111111111111111111111111111
 cd "$scratch/project"
-for minecraft in 1.20.6 1.21.1 1.21.11; do
+for minecraft in 1.20.6 1.21.1 1.21.11 26.1.2; do
   printf 'minecraft_version=%s\nbasemetals_source_commit=%s\n' "$minecraft" "$commit" > gradle.properties
   export EXPECTED_COMPARE="repos/MinecraftModDevelopmentMods/BaseMetals/compare/$commit...master-$minecraft"
   export GITHUB_OUTPUT="$scratch/output"
@@ -44,9 +44,11 @@ for minecraft in 1.20.6 1.21.1 1.21.11; do
     test ! -s "$GITHUB_OUTPUT"
   done
 done
-printf 'minecraft_version=invalid\nbasemetals_source_commit=%s\n' "$commit" > gradle.properties
-if bash "$verify" > "$scratch/invalid.log" 2>&1; then
-  echo 'Incorrectly accepted an invalid target' >&2
-  exit 1
-fi
+for minecraft in invalid 26.1 26.1.2/evil master-26.1.2 0.1.2; do
+  printf 'minecraft_version=%s\nbasemetals_source_commit=%s\n' "$minecraft" "$commit" > gradle.properties
+  if bash "$verify" > "$scratch/invalid.log" 2>&1; then
+    echo "Incorrectly accepted an invalid target: $minecraft" >&2
+    exit 1
+  fi
+done
 echo 'PASS: target-derived Base Metals ancestry guards and rejection controls'
diff --git a/.github/verify-base-metals-pin.sh b/.github/verify-base-metals-pin.sh
index e526e396..f8bc2bb2 100644
--- a/.github/verify-base-metals-pin.sh
+++ b/.github/verify-base-metals-pin.sh
@@ -8,7 +8,7 @@ if [[ ! "$commit" =~ ^[0-9a-f]{40}$ ]]; then
 fi
 
 minecraft="$(sed -n 's/^minecraft_version=//p' gradle.properties)"
-if [[ ! "$minecraft" =~ ^1\.[0-9]+\.[0-9]+$ ]]; then
+if [[ ! "$minecraft" =~ ^(1|[2-9][0-9])\.[0-9]+\.[0-9]+$ ]]; then
   echo "::error::Expected a complete Minecraft target version in gradle.properties"
   exit 1
 fi
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a97454a8..8f6a6a1b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,16 +1,16 @@
-name: basePower 1.21.11 CI
+name: basePower 26.1.2 CI
 
 on:
   push:
-    branches: [master-1.21.11, 'feature/**']
+    branches: [master-26.1.2, 'feature/**']
   pull_request:
-    branches: [master-1.21.11]
+    branches: [master-26.1.2]
 
 permissions:
   contents: read
 
 concurrency:
-  group: basepower-1.21.11-${{ github.workflow }}-${{ github.ref }}
+  group: basepower-26.1.2-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -23,7 +23,7 @@ jobs:
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
       - name: Test target-derived dependency guards
         run: bash .github/test-base-metals-pin.sh
-      - name: Require the Base Metals pin on upstream master-1.21.11
+      - name: Require the Base Metals pin on upstream master-26.1.2
         id: base-metals-pin
         env:
           GH_TOKEN: ${{ github.token }}
@@ -34,34 +34,24 @@ jobs:
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
         with:
           repository: MinecraftModDevelopmentMods/OreSpawn
-          ref: ecad75b24309a344f712d898d717c6a8823fc9f2
+          ref: 101fd12b598934c353e417c57edc5c2bbefd5f53
           path: .ci-dependencies/OreSpawn
       - name: Check out pinned Base Metals
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
         with:
           repository: MinecraftModDevelopmentMods/BaseMetals
-          ref: 616d527e50e4bf0137eeb9c44fa586e34a0452a0
+          ref: 331fa46914f854db71a8c33500cc559a8878b7d3
           path: .ci-dependencies/BaseMetals
-      - name: Install pinned Java 25 Mavenizer runtime
+      - name: Install Java 25 for Gradle, tools and Minecraft
         uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
         with:
           distribution: temurin
           java-version: '25.0.3+9.0.LTS'
-      - name: Install Java 8 launcher helper
-        uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
-        with:
-          distribution: temurin
-          java-version: '8.0.502+7'
-      - name: Install Java 21 for Gradle and production
-        uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
-        with:
-          distribution: temurin
-          java-version: '21.0.7+6.0.LTS'
       - name: Use pinned build toolchains
         # These are Gradle project properties, not JVM system properties.
         shell: bash
         run: >-
-          echo "MMD_GRADLE_TOOLCHAINS=-Porg.gradle.java.installations.paths=$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64
+          echo "MMD_GRADLE_TOOLCHAINS=-Porg.gradle.java.installations.paths=$JAVA_HOME
           -Porg.gradle.java.installations.auto-detect=false
           -Porg.gradle.java.installations.auto-download=false" >> "$GITHUB_ENV"
       - name: Set up Gradle
@@ -78,8 +68,8 @@ jobs:
           (cd "$basemetals" && bash gradle/stage-orespawn-release.sh "$mirror")
           (cd "$orespawn" && bash gradlew $MMD_GRADLE_TOOLCHAINS jar --no-daemon --stacktrace)
           (cd "$basemetals" && bash gradlew $MMD_GRADLE_TOOLCHAINS jar -PorespawnVerificationRepository="$mirror" --no-daemon --stacktrace)
-          osjar="$orespawn/build/libs/OreSpawn-4.1.0.121111.jar"
-          bmjar="$basemetals/build/libs/BaseMetals-3.1.2.121111.jar"
+          osjar="$orespawn/build/libs/OreSpawn-4.1.1.2601021.jar"
+          bmjar="$basemetals/build/libs/BaseMetals-3.1.2.2601021.jar"
           test -f "$osjar" && test -f "$bmjar"
           echo "orespawn=$osjar" >> "$GITHUB_OUTPUT"
           echo "basemetals=$bmjar" >> "$GITHUB_OUTPUT"
@@ -90,12 +80,12 @@ jobs:
           writeReleaseChecksums verifyEclipseProductionClasspath
           -PbaseMetalsDeobfJar=${{ steps.dependencies.outputs.basemetals }}
           -PoreSpawnDeobfJar=${{ steps.dependencies.outputs.orespawn }}
-          -Pforge61MavenizerJar=${{ steps.dependencies.outputs.mavenizer }}
+          -Pforge64MavenizerJar=${{ steps.dependencies.outputs.mavenizer }}
           --no-daemon --stacktrace
       - name: Upload audited release candidate
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         with:
-          name: basePower-1.21.11-${{ github.sha }}
+          name: basePower-26.1.2-${{ github.sha }}
           if-no-files-found: error
           retention-days: 30
           path: |
@@ -106,7 +96,7 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         with:
-          name: basePower-1.21.11-diagnostics-${{ github.sha }}
+          name: basePower-26.1.2-diagnostics-${{ github.sha }}
           if-no-files-found: ignore
           retention-days: 14
           path: |
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 3d24428e..218a77b0 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -2,9 +2,9 @@ name: CodeQL
 
 on:
   push:
-    branches: [master-1.21.11, 'feature/**']
+    branches: [master-26.1.2, 'feature/**']
   pull_request:
-    branches: [master-1.21.11]
+    branches: [master-26.1.2]
   schedule:
     - cron: '47 7 * * 4'
 
@@ -23,7 +23,7 @@ jobs:
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
       - name: Test target-derived dependency guards
         run: bash .github/test-base-metals-pin.sh
-      - name: Require the Base Metals pin on upstream master-1.21.11
+      - name: Require the Base Metals pin on upstream master-26.1.2
         id: base-metals-pin
         env:
           GH_TOKEN: ${{ github.token }}
@@ -34,34 +34,24 @@ jobs:
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
         with:
           repository: MinecraftModDevelopmentMods/OreSpawn
-          ref: ecad75b24309a344f712d898d717c6a8823fc9f2
+          ref: 101fd12b598934c353e417c57edc5c2bbefd5f53
           path: .ci-dependencies/OreSpawn
       - name: Check out pinned Base Metals
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
         with:
           repository: MinecraftModDevelopmentMods/BaseMetals
-          ref: 616d527e50e4bf0137eeb9c44fa586e34a0452a0
+          ref: 331fa46914f854db71a8c33500cc559a8878b7d3
           path: .ci-dependencies/BaseMetals
-      - name: Install pinned Java 25 Mavenizer runtime
+      - name: Install Java 25 for Gradle, tools and Minecraft
         uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
         with:
           distribution: temurin
           java-version: '25.0.3+9.0.LTS'
-      - name: Install Java 8 launcher helper
-        uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
-        with:
-          distribution: temurin
-          java-version: '8.0.502+7'
-      - name: Install Java 21 for Gradle and production
-        uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
-        with:
-          distribution: temurin
-          java-version: '21.0.7+6.0.LTS'
       - name: Use pinned build toolchains
         # These are Gradle project properties, not JVM system properties.
         shell: bash
         run: >-
-          echo "MMD_GRADLE_TOOLCHAINS=-Porg.gradle.java.installations.paths=$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64
+          echo "MMD_GRADLE_TOOLCHAINS=-Porg.gradle.java.installations.paths=$JAVA_HOME
           -Porg.gradle.java.installations.auto-detect=false
           -Porg.gradle.java.installations.auto-download=false" >> "$GITHUB_ENV"
       - name: Set up Gradle
@@ -79,8 +69,8 @@ jobs:
           chmod +x "$orespawn/gradlew" "$basemetals/gradlew"
           (cd "$orespawn" && ./gradlew $MMD_GRADLE_TOOLCHAINS jar --no-daemon --stacktrace)
           (cd "$basemetals" && ./gradlew $MMD_GRADLE_TOOLCHAINS jar -PorespawnVerificationRepository="$mirror" --no-daemon --stacktrace)
-          echo "orespawn=$orespawn/build/libs/OreSpawn-4.1.0.121111.jar" >> "$GITHUB_OUTPUT"
-          echo "basemetals=$basemetals/build/libs/BaseMetals-3.1.2.121111.jar" >> "$GITHUB_OUTPUT"
+          echo "orespawn=$orespawn/build/libs/OreSpawn-4.1.1.2601021.jar" >> "$GITHUB_OUTPUT"
+          echo "basemetals=$basemetals/build/libs/BaseMetals-3.1.2.2601021.jar" >> "$GITHUB_OUTPUT"
           echo "mavenizer=$mavenizer" >> "$GITHUB_OUTPUT"
       - name: Initialize CodeQL
         uses: github/codeql-action/init@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4
@@ -93,6 +83,6 @@ jobs:
           ./gradlew $MMD_GRADLE_TOOLCHAINS clean classes verifyReleaseDependencies --rerun-tasks --no-build-cache --no-daemon --stacktrace \
             -PbaseMetalsDeobfJar=${{ steps.dependencies.outputs.basemetals }} \
             -PoreSpawnDeobfJar=${{ steps.dependencies.outputs.orespawn }} \
-            -Pforge61MavenizerJar=${{ steps.dependencies.outputs.mavenizer }}
+            -Pforge64MavenizerJar=${{ steps.dependencies.outputs.mavenizer }}
       - name: Analyze
         uses: github/codeql-action/analyze@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4
diff --git a/.github/workflows/validate-gradle-build.yml b/.github/workflows/validate-gradle-build.yml
index b37dfc94..531f53fe 100644
--- a/.github/workflows/validate-gradle-build.yml
+++ b/.github/workflows/validate-gradle-build.yml
@@ -3,11 +3,11 @@ name: Validate Gradle Wrapper
 on:
   push:
     branches:
-      - master-1.21.11
+      - master-26.1.2
       - 'feature/**'
   pull_request:
     branches:
-      - master-1.21.11
+      - master-26.1.2
 
 permissions:
   contents: read
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b163f18f..300f634a 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,19 @@
+basePower 2.4.16.2601021 (Minecraft 26.1.2)
+
+- Require OreSpawn 4.1.1 so old generation rules keep their saved settings without enabling duplicate modern ore rules.
+- Bring basePower to Forge 64 and Java 25 without renaming machines, items or saved data.
+- Use the new screen extraction API and native sprite clipping for fluid gauges.
+- Keep oil models tied to the current animated atlas, including after resource reloads.
+- Register only our own block textures in the atlas, so another mod's small entity textures cannot break client startup.
+- Use Minecraft's native container lock check and keep conveyors out of either locked half of a double chest.
+- Keep the returned container when the fuel helper consumes the last item in a stack.
+- Keep the saved enchantments on old dropped items and chest-minecart contents when Base Metals upgrades the world first.
+- Update old OreSpawn output block names without replacing saved generation settings. Keep backups and reports, and stop for review rather than guess when saved rules conflict.
+- Finish imported generation settings before opening the first world, including the old vanilla quartz name.
+- Move the existing farmer and toolsmith trades to Minecraft's native trade data and tags, keeping their prices and quantities.
+- Prepare selected, locked worlds before Minecraft relocates old world and player files. Keep world previews and fallback files read-only.
+- Keep the shared Base Metals migration hook and add new test evidence for this target. Machine, upgrade, restart, graphical and two-world endurance checks pass, and manual testing is accepted.
+
 basePower 2.4.15.121111 (Minecraft 1.21.11)
 
 - Bring basePower to Forge 61 and Java 21, keeping the existing machine and world identities.
diff --git a/README.md b/README.md
index 6dcd0d22..8b74b4ec 100644
--- a/README.md
+++ b/README.md
@@ -1,44 +1,35 @@
 # basePower
 
-**Minecraft 1.21.11 (Forge), version 2.4.15.121111.**
-
-This release has passed automated qualification and manual testing. It is
-available on [CurseForge](https://www.curseforge.com/minecraft/mc-mods/basepower/files/9566998),
-[MMD Maven](https://maven.moddev.zone/releases/zone/moddev/mc/basepower/basePower/2.4.15.121111/)
-and [GitHub](https://github.com/MinecraftModDevelopmentMods/basePower/releases/tag/2.4.15.121111).
-The [1.21.11 port record](docs/1.21.11/PORT-STATUS.md) records the checks and
-remaining coverage limits; earlier versions do not qualify this release.
-
-The current Base Metals-installed test set has passed its automated machine,
-upgrade, graphical and two-world 30-minute endurance checks. Manual testing has
-also been accepted. See the [qualification record](docs/1.21.11/QUALIFICATION.md)
-for the exact jars, results and remaining human checks.
-The [release-pin recheck](docs/1.21.11/QUALIFICATION.md#release-pin-recheck)
-also covers the final expansion manifests, a fresh old-world upgrade and
-another two-world endurance run with exact saved-state replay.
-
-For the combined Eclipse test, use `runClientAllAdvantage.launch` in this
-project. It loads the matching baseSteam and baseElectric candidates. The
-[port record](docs/1.21.11/PORT-STATUS.md) separates the automated checks from
-the remaining manual gameplay and visual checks.
+**Minecraft 26.1.2 (Forge), version 2.4.16.2601021.**
+
+This branch has passed its
+[26.1.2 automated qualification](docs/26.1.2/QUALIFICATION.md) and manual
+playtesting. Publication is being prepared separately. The
+[port record](docs/26.1.2/PORT-STATUS.md) keeps the earlier findings separate.
+The [1.21.11 qualification](docs/1.21.11/QUALIFICATION.md) remains historical
+evidence, not proof of this port.
+
+Use the generated `runClientAllAdvantage.launch` in Eclipse to load the
+matching baseSteam and baseElectric candidates with basePower.
 
 basePower continues DrCyano's Power Advantage. It provides shared power,
 fluids and item transport for baseSteam and baseElectric.
 
-## Playing On 1.21.11
+## Testing On 26.1.2
 
-- Install [MMD OreSpawn 4.1.0.121111](https://www.curseforge.com/minecraft/mc-mods/mmd-orespawn/files/9268464) on both client and server.
-- Install [Base Metals 3.1.2.121111](https://www.curseforge.com/minecraft/mc-mods/base-metals/files/9566738)
-  on both client and server. Older Base Metals builds do not have the shared
-  upgrade hook required by this release.
+- Use MMD OreSpawn `4.1.1.2601021` on both client and server. This includes
+  the fix that keeps saved ore settings when providers rename their rules.
+- This candidate requires the local Base Metals `3.1.2.2601021` migration-hook
+  build on both client and server. It has not been published; the public
+  `3.1.1` jar is not a substitute for the upgrade tests.
 - baseSteam and baseElectric are separate mods. Use only their matching
-  1.21.11 builds. Additional Loot Tables is not needed for the built-in loot.
+  26.1.2 builds. Additional Loot Tables is not needed for the built-in loot.
 
 **Back up the entire world before upgrading. Test only disposable copies.**
 The port keeps existing registry names and machine data. The upgrade checks
-use disposable copies of original Advantage and released base* saves, including
-connected machines, and check them again after a full restart. Check that the
-other mods in your world support 1.21.11 before you upgrade.
+used disposable copies of original Advantage and released base* saves,
+including connected machines, and check them after a full restart. Check that
+the other mods in your world support 26.1.2 before attempting an upgrade.
 The accepted [1.14 results](docs/1.14/BROADER-QUALIFICATION.md) are historical
 evidence, not qualification of this port or a whole modpack.
 
@@ -46,22 +37,21 @@ Recipe-book discovery now follows relevant ingredients. See the [all-Advantage m
 
 The [manufacturing progression audit](docs/1.13/MANUFACTURING-PROGRESSION.md) traces survival parts from raw resources, including configured material aliases, processing, loot-only parts and automated restart checks.
 
-## Building Minecraft 1.21.11
+## Building Minecraft 26.1.2
 
-The build uses Forge 61.1.0, official `1.21.11` mappings,
-MCP `20251223.124241`, ForgeGradle 7.0.34 and Gradle 9.6.1.
-Use Java 21 for Gradle, compilation and Minecraft. Mavenizer also
-needs Java 25; the development launcher helper uses Java 8. Pass the installed homes using
-`-Porg.gradle.java.installations.paths=<java8>,<java21>,<java25>` and disable
+The build uses Forge 64.1.5, official `26.1.2` names,
+MCP `20260409.101008`, ForgeGradle 7.0.34 and Gradle 9.6.1.
+Use Java `25.0.3+9` for Gradle, compilation, Mavenizer and Minecraft. Pass its home using
+`-Porg.gradle.java.installations.paths=<java25>` and disable
 automatic discovery and downloads for a reproducibility check.
 
-Use the pinned Base Metals `3.1.2.121111` and OreSpawn `4.1.0.121111` jars.
+Use the pinned Base Metals `3.1.2.2601021` and OreSpawn `4.1.1.2601021` jars.
 The source pins and checksums are in `gradle.properties`.
-Forge 61 also needs the Mavenizer compatibility jar in the pinned OreSpawn
+Forge 64 also needs the Mavenizer compatibility jar in the pinned OreSpawn
 checkout's `ci-fixtures/tools/` directory. This is the same checksum-verified
 source preparation tool used by OreSpawn; its manifest makes no source changes
-for Forge 61.1.0. It uses Java 25 and is not part of the mod or game runtime.
-Set `-Pforge61MavenizerJar=<path>` when that checkout is in another location.
+for this target. It is not part of the mod or game runtime.
+Set `-Pforge64MavenizerJar=<path>` when that checkout is in another location.
 Use the pinned Base Metals 3.1.2 build for both new worlds and upgrades. It lets
 both mods preserve old items and machines before Minecraft converts the
 chunk. An older Base Metals jar is not a substitute for this upgrade path.
@@ -75,8 +65,8 @@ gradlew.bat clean check build javadoc genEclipseRuns eclipse isolateEclipseProdu
 The default dependency jars are:
 
 ```text
-D:\BaseMetals\.verification-basemetals12111\Advantage shared hook\build\libs\BaseMetals-3.1.2.121111.jar
-D:\MinecraftMineralogy\OS12111\OreSpawn\build\libs\OreSpawn-4.1.0.121111.jar
+D:\BaseMetals\BaseMetals 2612\BaseMetals\build\libs\BaseMetals-3.1.2.2601021.jar
+D:\MinecraftMineralogy\OS2612\OreSpawn\build\libs\OreSpawn-4.1.1.2601021.jar
 ```
 
 Other layouts can pass `-PbaseMetalsDeobfJar=<path>` and `-PoreSpawnDeobfJar=<path>`.
@@ -85,10 +75,10 @@ Dependencies are never embedded in PowerAdvantage artifacts.
 Dependency checksums and source commits are recorded in `gradle.properties`.
 Unknown artifacts fail the dependency audit. The release audit also rejects a
 player jar that differs from the frozen test kit. Hosted CI requires the Base
-Metals pin to be on its upstream `master-1.21.11` branch; a locally tested pin
+Metals pin to be on its upstream `master-26.1.2` branch; a locally tested pin
 does not qualify a hosted build.
 
-Release jars are written to `build/libs`. Forge 61 uses the same mod jar for play
+Release jars are written to `build/libs`. Forge 64 uses the same mod jar for play
 and development; `deobfJar` is kept as a task alias for older build scripts.
 
 For Eclipse, import this repository as an existing Gradle project and run:
@@ -101,10 +91,10 @@ Refresh the project in Eclipse, allow its Java build to finish, and launch the g
 
 Eclipse copies production resources from `build/resources/main`, not directly from `src/main/resources`. This prevents its builder from overwriting the expanded `mods.toml` with raw `${version}` placeholders. After updating this setup, use **Gradle > Refresh Gradle Project**, then **Project > Clean** before relaunching. After editing resources or version properties, run `processResources` or refresh the Gradle project before the Eclipse build. See the [metadata regression notes](docs/1.13/ECLIPSE-METADATA.md).
 
-To prepare a combined client, build the baseSteam and baseElectric `2.2.16.121111` jars,
+To prepare a combined client, build the baseSteam and baseElectric `2.2.17.2601021` jars,
 run `gradlew.bat prepareCombinedEclipseLaunch`, refresh Eclipse, then launch
 `runClientAllAdvantage.launch`. Inputs must match
-`test-rig/profiles/native12111/dev-core.json`; alternative layouts can pass
+`test-rig/profiles/native2612/dev-core.json`; alternative layouts can pass
 `-PsteamAdvantageDeobfJar=<path>` and `-PelectricAdvantageDeobfJar=<path>`.
 The ordinary `runClient.launch` remains Power-only. Both use the `run` directory;
 preparing a launch does not copy, open or qualify a save.
@@ -113,7 +103,7 @@ preparing a launch does not copy, open or qualify a save.
 matching their packages. They also read every development runtime jar entry
 and check its size and CRC to catch damaged cached dependencies.
 
-Keep Eclipse's access-restriction checks enabled and use Java 21 for its project
+Keep Eclipse's access-restriction checks enabled and use Java 25 for its project
 JRE and Minecraft launches. Check visuals, menus and recipe discovery against the
 same jars used for the automated machine tests.
 
@@ -140,6 +130,6 @@ its presence is not proof that an upgrade is safe.
 
 The [legacy migration guide](docs/1.13/MIGRATION.md) describes the earlier protocols.
 The [Advantage Works 1.20.1 guide](test-rig/NATIVE1201.md) describes the prior
-qualification and the checks carried into 1.21.11.
+qualification and the checks carried forward into later ports.
 
 The historical 1.10 handbook remains on the [1.10.2 branch](https://github.com/MinecraftModDevelopmentMods/PowerAdvantage/blob/master-1.10.2/docs/1.10/README.md).
diff --git a/build.gradle b/build.gradle
index 572a2254..aadc5d4e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ plugins {
     id 'net.minecraftforge.gradle' version '7.0.34'
 }
 
-apply from: 'gradle/forge61-mavenizer.gradle'
+apply from: 'gradle/forge64-mavenizer.gradle'
 
 group = project.mod_group
 version = project.mod_version
@@ -46,7 +46,7 @@ ext.release_tag = project.mod_version
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(21)
+        languageVersion = JavaLanguageVersion.of(25)
         vendor = JvmVendorSpec.ADOPTIUM
     }
     withSourcesJar()
@@ -55,11 +55,11 @@ java {
 
 tasks.withType(JavaCompile).configureEach {
     javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(21)
+        languageVersion = JavaLanguageVersion.of(25)
         vendor = JvmVendorSpec.ADOPTIUM
     }
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
+    sourceCompatibility = JavaVersion.VERSION_25
+    targetCompatibility = JavaVersion.VERSION_25
     options.encoding = 'UTF-8'
     options.compilerArgs.addAll(['-Xmaxerrs', '1000'])
 }
@@ -134,7 +134,7 @@ sourceSets.main.resources {
 def forgeRunModClassesDirectory = layout.buildDirectory.dir('forge-run-mod-classes/main')
 def prepareForgeRunModClasses = tasks.register('prepareForgeRunModClasses', Sync) {
     group = 'ide'
-    description = 'Merges classes and processed resources for Forge 1.21.11 launches.'
+    description = 'Merges classes and processed resources for Forge 26.1.2 launches.'
     dependsOn tasks.named('classes')
     from sourceSets.main.output
     into forgeRunModClassesDirectory
@@ -170,11 +170,11 @@ repositories {
 // build to a drive letter. CI and other layouts can override either path.
 def baseMetalsDeobfJar = file(providers.gradleProperty('baseMetalsJar')
         .orElse(providers.gradleProperty('baseMetalsDeobfJar'))
-        .getOrElse('../../../BaseMetals/.verification-basemetals12111/Advantage shared hook/build/libs/'
+        .getOrElse('../../../BaseMetals/BaseMetals 2612/BaseMetals/build/libs/'
                 + "BaseMetals-${project.basemetals_version}.jar"))
 def oreSpawnDeobfJar = file(providers.gradleProperty('oreSpawnJar')
         .orElse(providers.gradleProperty('oreSpawnDeobfJar'))
-        .getOrElse('../../../MinecraftMineralogy/OS12111/OreSpawn/build/libs/'
+        .getOrElse('../../../MinecraftMineralogy/OS2612/OreSpawn/build/libs/'
                 + "OreSpawn-${project.orespawn_version}.jar"))
 
 dependencies {
@@ -183,6 +183,8 @@ dependencies {
 
     compileOnly files(baseMetalsDeobfJar, oreSpawnDeobfJar)
     runtimeOnly files(baseMetalsDeobfJar, oreSpawnDeobfJar)
+    // Exercise the real migration callback and typed OreSpawn provider boundary.
+    testCompileOnly files(baseMetalsDeobfJar, oreSpawnDeobfJar)
     testImplementation 'junit:junit:4.13.2'
 }
 
@@ -257,7 +259,7 @@ tasks.named('jar', Jar) {
     }
 }
 
-// Forge 61 uses the official names at runtime, so the same jar serves both uses.
+// Forge 64 uses the official names at runtime, so the same jar serves both uses.
 def releaseJar = tasks.named('jar', Jar)
 
 tasks.register('deobfJar') {
@@ -310,24 +312,24 @@ tasks.register('verifyReleaseConfiguration') {
     description = 'Validates release identity, target metadata, and required dependencies.'
     doLast {
         def pack = new JsonSlurper().parse(file('src/main/resources/pack.mcmeta')).pack
-        if (pack.min_format != [94, 1] || pack.max_format != [94, 1]
+        if (pack.min_format != [101, 1] || pack.max_format != [101, 1]
                 || !file('src/main/resources/META-INF/mods.toml').text.contains('showAsResourcePack=false')) {
-            throw new GradleException('Forge 61 requires data format 94.1 and its native hidden-client resource pack')
+            throw new GradleException('Forge 64 requires data format 101.1 and its native hidden-client resource pack')
         }
-        if (project.mod_version != '2.4.15.121111') {
+        if (project.mod_version != '2.4.16.2601021') {
             throw new GradleException("Unexpected PowerAdvantage release version: ${project.mod_version}")
         }
-        if (project.minecraft_version != '1.21.11'
-                || project.forge_version != '61.1.0'
+        if (project.minecraft_version != '26.1.2'
+                || project.forge_version != '64.1.5'
                 || project.mapping_channel != 'official'
-                || project.mapping_version != '1.21.11'
-                || project.mcp_version != '20251223.124241') {
+                || project.mapping_version != '26.1.2'
+                || project.mcp_version != '20260409.101008') {
             throw new GradleException('Unexpected Minecraft, Forge, or mappings target')
         }
         if (project.loader_name != 'forge' || project.loader_code != '1'
-                || project.java_version != '21'
-                || project.java_toolchain_version != '21.0.7+6'
-                || project.gradle_java_version != '21') {
+                || project.java_version != '25'
+                || project.java_toolchain_version != '25.0.3+9'
+                || project.gradle_java_version != '25') {
             throw new GradleException('Unexpected release dispatcher target metadata')
         }
         if (project.mod_id != 'basepower'
@@ -338,19 +340,19 @@ tasks.register('verifyReleaseConfiguration') {
         }
         if (project.cf_requirements != 'base-metals,mmd-orespawn'
                 || project.cf_optionals != 'additional-loot-tables'
-                || project.cf_versions != '1.21.11') {
+                || project.cf_versions != '26.1.2') {
             throw new GradleException('Unexpected CurseForge dependency or game-version metadata')
         }
-        if (project.basemetals_version != '3.1.2.121111'
-                || project.orespawn_version != '4.1.0.121111'
+        if (project.basemetals_version != '3.1.2.2601021'
+                || project.orespawn_version != '4.1.1.2601021'
                 || !(project.basemetals_source_commit ==~ /[a-f0-9]{40}/)
-                || project.orespawn_source_commit != 'ecad75b24309a344f712d898d717c6a8823fc9f2') {
+                || project.orespawn_source_commit != '101fd12b598934c353e417c57edc5c2bbefd5f53') {
             throw new GradleException('Unexpected Base Metals or OreSpawn dependency identity')
         }
         String mainSource = file(
                 'src/main/java/zone/moddev/mc/basepower/PowerAdvantage.java').getText('UTF-8')
         if (!mainSource.contains('MODID = "basepower"')
-                || !mainSource.contains('VERSION = "2.4.15.121111"')
+                || !mainSource.contains('VERSION = "2.4.16.2601021"')
                 || !mainSource.contains('@Mod(PowerAdvantage.MODID)')) {
             throw new GradleException('PowerAdvantage source identity changed')
         }
@@ -597,8 +599,8 @@ tasks.register('verifyReleaseArtifacts') {
                     }
                 }
                 int major = ((header[6] & 0xff) << 8) | (header[7] & 0xff)
-                if (major != 65) {
-                    throw new GradleException("${entry.name} uses Java class major ${major}, expected 65")
+                if (major != 69) {
+                    throw new GradleException("${entry.name} uses Java class major ${major}, expected 69")
                 }
             }
         }
@@ -800,6 +802,8 @@ tasks.register('configureEclipseBuildship') {
         [
                 'eclipse.preferences.version'    : '1',
                 'connection.gradle.distribution': 'GRADLE_DISTRIBUTION(WRAPPER)',
+                'connection.java.home'          : javaToolchains.compilerFor(java.toolchain).get()
+                        .metadata.installationPath.asFile.canonicalPath,
                 'connection.gradle.user.home'   : gradle.gradleUserHomeDir.canonicalPath,
                 'connection.project.dir'        : '',
                 'gradle.user.home'               : gradle.gradleUserHomeDir.canonicalPath,
@@ -909,7 +913,8 @@ tasks.register('isolateEclipseProductionRuns') {
             classpath.children().addAll(runtimeIndex, runtimeEntries)
             contents = groovy.xml.XmlUtil.serialize(launchXml)
 
-            ['--cache', '--metadata', '--to-srg', '--to-obf'].each { option ->
+            // Official runtime names no longer need Slime's old remapping files.
+            ['--cache', '--metadata'].each { option ->
                 String prefix = option + ' '
                 int valueStart = contents.indexOf(prefix)
                 if (valueStart < 0) {
@@ -926,6 +931,34 @@ tasks.register('isolateEclipseProductionRuns') {
                             + '&quot;' + value + '&quot;' + contents.substring(valueEnd))
                 }
             }
+            def resolvedLaunch = parser.parseText(contents)
+            def programAttribute = resolvedLaunch.stringAttribute.find {
+                it.@key == 'org.eclipse.jdt.launching.PROGRAM_ARGUMENTS'
+            }
+            String program = programAttribute.@value
+            if (program.contains('--to-srg') || program.contains('--to-obf')) {
+                throw new GradleException("${name} must not remap the official Forge 64 runtime")
+            }
+            if (name == 'runClient.launch') {
+                File nativeJar = productionRuntime.find {
+                    it.name == "forge-${project.minecraft_version}-${project.forge_version}.jar"
+                }
+                if (nativeJar == null) throw new GradleException('Missing native client metadata input')
+                File metadata = new File(nativeJar.parentFile,
+                        "forge-${project.minecraft_version}-${project.forge_version}-metadata.zip")
+                def assetIndex
+                new ZipFile(metadata).withCloseable { zip ->
+                    assetIndex = new JsonSlurper().parse(zip.getInputStream(
+                            zip.getEntry('minecraft/version.json'))).assetIndex
+                }
+                File assets = file(providers.gradleProperty('minecraftAssetsDir').getOrElse(
+                        new File(System.getenv('APPDATA') ?: System.getProperty('user.home'),
+                                '.minecraft/assets').path))
+                // Metadata generation needs no asset download. The client gate verifies the actual files.
+                programAttribute.@value = program.replace('{asset_index}', assetIndex.id.toString())
+                        .replace('{assets_root}', '"' + assets.canonicalPath + '"')
+            }
+            contents = groovy.xml.XmlUtil.serialize(resolvedLaunch)
             launch.setText(contents.replace('\r\n', '\n'), 'UTF-8')
         }
     }
@@ -968,6 +1001,10 @@ tasks.register('verifyEclipseProductionClasspath') {
                 != gradle.gradleUserHomeDir.canonicalFile) {
             throw new GradleException('Eclipse Buildship does not use this wrapper and Gradle home')
         }
+        File javaHome = javaToolchains.compilerFor(java.toolchain).get().metadata.installationPath.asFile
+        if (file(preferences.getProperty('connection.java.home', '')).canonicalFile != javaHome.canonicalFile) {
+            throw new GradleException('Eclipse Buildship must use the pinned Java 25 installation')
+        }
         String projectMetadata = file('.project').getText('UTF-8')
         if (!projectMetadata.contains('org.eclipse.buildship.core.gradleprojectnature')
                 || !projectMetadata.contains('org.eclipse.buildship.core.gradleprojectbuilder')) {
@@ -1017,12 +1054,19 @@ tasks.register('verifyEclipseProductionClasspath') {
                 it.@key.text() == 'org.eclipse.jdt.launching.PROGRAM_ARGUMENTS'
             }.@value.text()
             String target = name == 'runClient.launch' ? 'forge_userdev_client' : 'forge_userdev_server'
+            String nativeArguments = program.contains(' -- ') ? program.split(' -- ', 2)[1] : ''
+            def launchTargets = nativeArguments =~ /(?:^|\s)--launchTarget\s+([^\s]+)(?=\s|$)/
             if (main != 'net.minecraftforge.launcher.Main'
                     || !program.startsWith('--main net.minecraftforge.bootstrap.ForgeBootstrap ')
-                    || !program.contains(" -- --launchTarget ${target} ")) {
-                throw new GradleException("${name} does not start the Forge 52 bootstrap")
+                    || launchTargets.count != 1 || launchTargets[0][1] != target) {
+                throw new GradleException("${name} does not start the Forge 64 bootstrap")
+            }
+            if (program.contains('--to-srg') || program.contains('--to-obf')
+                    || program.contains('{asset_index}') || program.contains('{assets_root}')
+                    || !contents.contains('StandardVMType/JavaSE-25')) {
+                throw new GradleException("${name} has obsolete mappings, unresolved assets or the wrong Java runtime")
             }
-            ['--cache', '--metadata', '--to-srg', '--to-obf'].each { option ->
+            ['--cache', '--metadata'].each { option ->
                 def argument = program =~ /(?:^|\s)${option}\s+(?:"([^"]+)"|([^"\s]+))(?=\s+--|$)/
                 if (!argument.find()) {
                     throw new GradleException("${name} must keep ${option} as one Slime Launcher argument")
@@ -1057,9 +1101,11 @@ tasks.register('verifyEclipseProductionClasspath') {
             }
             List<String> bootstrapArtifacts = [
                     "forge-${project.minecraft_version}-${project.forge_version}",
-                    "client-extra-${project.minecraft_version}",
-                    "mappings_${project.mapping_channel}-${project.minecraft_version}"
+                    "client-extra-${project.minecraft_version}"
             ]
+            if (contents.contains('mappings_')) {
+                throw new GradleException("${name} includes a mapping archive in an official-name runtime")
+            }
             List<Integer> bootstrapPositions = bootstrapArtifacts.collect { artifact ->
                 contents.indexOf(artifact)
             }
@@ -1085,6 +1131,8 @@ tasks.register('verifyModelAssets') {
     File blockstateRoot = new File(resourceRoot, "assets/${project.mod_id}/blockstates")
     inputs.dir(modelRoot)
     inputs.dir(blockstateRoot)
+    inputs.files('src/main/resources/assets/minecraft/atlases/blocks.json',
+            'src/main/resources/assets/minecraft/atlases/items.json')
 
     doLast {
         Set<String> vanillaAssets = [] as Set<String>
@@ -1095,7 +1143,29 @@ tasks.register('verifyModelAssets') {
                 zip.entries().each { entry -> vanillaAssets.add(entry.name) }
             }
         }
-        def atlas = new JsonSlurper().parse(new File(resourceRoot, 'assets/minecraft/atlases/blocks.json'))
+        Set<String> registeredSprites = [] as Set<String>
+        ['blocks', 'items'].each { String atlasName ->
+            File atlasFile = new File(resourceRoot, "assets/minecraft/atlases/${atlasName}.json")
+            def atlas = new JsonSlurper().parse(atlasFile)
+            if (atlas.keySet() != ['sources'] as Set || !(atlas.sources instanceof List) || atlas.sources.isEmpty()) {
+                throw new GradleException("${atlasFile} must declare nonempty explicit sprite sources")
+            }
+            atlas.sources.each { source ->
+                if (!(source instanceof Map) || source.keySet() != ['type', 'resource'] as Set
+                        || source.type != 'minecraft:single' || !(source.resource instanceof String)
+                        || !source.resource.startsWith("${project.mod_id}:")) {
+                    throw new GradleException("${atlasFile} must only register this mod's native single sprites")
+                }
+                String sprite = source.resource
+                if (!registeredSprites.add(sprite)) {
+                    throw new GradleException("Duplicate sprite across native atlases: ${sprite}")
+                }
+                String spritePath = sprite.substring(sprite.indexOf(':') + 1)
+                if (!new File(resourceRoot, "assets/${project.mod_id}/textures/${spritePath}.png").isFile()) {
+                    throw new GradleException("${atlasFile} registers missing sprite ${sprite}")
+                }
+            }
+        }
         def verifyReference = { String reference, String assetType, String sourcePath ->
             if (reference.startsWith('#')) return
             int separator = reference.indexOf(':')
@@ -1115,9 +1185,9 @@ tasks.register('verifyModelAssets') {
                     "assets/${namespace}/${assetType}/${path}.json")
             if (assetType == 'textures') {
                 target = new File(resourceRoot, "assets/${namespace}/textures/${path}.png")
-                if (!atlas.sources.any { it.type == 'directory' && it.prefix == it.source + '/'
-                        && path.startsWith(it.prefix as String) }) {
-                    throw new GradleException("${sourcePath} references texture ${reference} outside the block atlas")
+                // Native 26 materials identify a sprite, not a fixed block/item atlas.
+                if (!registeredSprites.contains("${namespace}:${path}".toString())) {
+                    throw new GradleException("${sourcePath} references unregistered native sprite ${reference}")
                 }
             }
             if (!target.isFile()) {
@@ -1263,7 +1333,7 @@ tasks.register('prepareCombinedEclipseLaunch') {
     dependsOn tasks.named('deobfJar')
     doLast {
         File inputProfile = file(providers.gradleProperty('advantageDevelopmentProfile').getOrElse(
-                'test-rig/profiles/native12111/dev-core.json'))
+                'test-rig/profiles/native2612/dev-core.json'))
         def profile = new JsonSlurper().parse(inputProfile)
         if (profile.mode != 'development' || profile.minecraftVersion != project.minecraft_version
                 || profile.forgeVersion != project.forge_version) {
diff --git a/docs/26.1.2/PORT-STATUS.md b/docs/26.1.2/PORT-STATUS.md
new file mode 100644
index 00000000..da43cb41
--- /dev/null
+++ b/docs/26.1.2/PORT-STATUS.md
@@ -0,0 +1,111 @@
+# Minecraft 26.1.2 Port
+
+The current candidates have completed their
+[automated qualification](QUALIFICATION.md), and manual playtesting was accepted
+on 12 November 2026. Publication remains a separate step. Earlier findings below retain their
+original scope and candidate bindings.
+
+## Target
+- basePower `2.4.16.2601021`, Forge `64.1.5` and Java `25.0.3+9`.
+- baseSteam and baseElectric `2.2.17.2601021`.
+- Base Metals `3.1.2.2601021`, with the local shared migration hook, and
+  OreSpawn `4.1.1.2601021`. Exact source commits and hashes are in
+  `gradle.properties`. The Base Metals patch is not public yet.
+
+## Checks So Far
+The current Power code passes all 357 unit tests under both Gradle and a fresh
+Eclipse compiler build. The earlier candidate06 figures below are retained
+history, not qualification of the current jars.
+
+The broader checks found two more world-generation migration cases. A new
+world can have a pack-supplied OreSpawn profile before it has a `level.dat`;
+that bypassed the existing-world hook until the next start. Power now prepares
+that profile synchronously before OreSpawn's server-start listener. The early
+hook used for existing worlds remains in place. The regression failed before
+the repair and passes afterwards. Fresh server runs using the released 1.10
+and 1.12 profiles now both pass first start and a full process restart. These
+are scoped Power-hook checks, not final combined qualification.
+
+The retained-profile checks also found ten new Base Metals ore rules eligible
+alongside their saved legacy equivalents. This is not a harmless warning or a
+reason to change the expected results. A local Base Metals repair needs
+separate approval. Its failing regression tests are retained; no production
+repair has been made yet. Final combined qualification and endurance are on
+hold until this is resolved. Nothing here is a manual-testing-ready claim.
+
+Candidate06 passes the full build and release audits with the new Forge API
+and exact local dependency pins. All 311 unit tests pass under both Gradle and Eclipse's
+compiler. The Eclipse check also rejects an incomplete test inventory: a
+filtered run cannot count as the full suite. Another 37 focused resource,
+trade and GUI extraction checks pass. Earlier failed runs are retained.
+
+The first combined machine run found an old obfuscated field lookup in
+container-lock handling. The fix uses the native lock API for single chests
+and checks both halves of double chests. Six new regression tests include
+locked, unlocked, wrapped and nested inventories; five failed before the fix.
+The subsequent packaged machine and restart checks pass for candidate06.
+
+A fuel-helper regression also showed that consuming the last lava bucket
+lost its empty bucket. The helper now captures the native remainder before
+emptying the stack. Ordinary fuels, larger stacks, empty and legacy null
+inputs, and explicit post-burn rules keep their existing behaviour. The
+failing bucket test and its passing rerun are retained separately.
+
+The wider old-world tests also caught lost musket enchantments in dropped
+items and chest minecarts. Base Metals could convert them before Power had
+loaded the saved enchantment index. The shared hook now supplies an isolated
+registry snapshot before conversion, regardless of hook order, and clears
+old context when another world is selected. Both new Power tests and both
+Base Metals callback tests failed before the repair and pass afterwards.
+The rebuilt family passes the live migration and both actual hook-order checks
+for candidate06, including stopped entity data and saved enchantments.
+
+An actual client run exposed a separate atlas-registration problem: broad
+legacy texture directories also pull in another mod's directly rendered
+laser texture. Native 26 rejects its mip allocation before the title screen.
+Each mod now registers only its own atlas sprites; candidate06 gets past the
+native mip4 upload without lowering the mipmap setting. Rendered-client
+qualification remains open. The test client must first enter its copied world
+through Minecraft's experimental-world warning, then prove its offscreen
+projection with actual GPU pixels before the GUI comparisons can count.
+
+Candidate06 also passes 132 machine jobs, the walkable rigs, fluids and survival
+bucket handling, all three recipe modes, network unloading, extended moving
+drills, original/released-world machine upgrades, and two 30-minute endurance
+worlds followed by full restarts and an independent saved-state replay.
+Visual and interactive checks are separate from those server results.
+
+The broader log review caught another real upgrade problem: retained OreSpawn
+profiles still name old Advantage output blocks. Finding ore from a new default
+does not prove those saved rules work. An output-only migration is being added
+before OreSpawn loads global and selected-world profiles. It keeps rule IDs,
+rates, heights, selectors and enabled choices, with backups and migration
+reports. Its new regression checks reject lost settings, invalid outputs and
+duplicate defaults. This requires a new frozen candidate and full rerun; the
+earlier passing results are not being relabelled for the new jars.
+
+Vanilla itself changes wolf health during some older-world upgrades. The raw
+comparison retains that difference, with a separate native-only control; the
+other actor fields, ownership and UUIDs remain strict checks. Optional
+Mineralogy-only lanes are marked skipped, not passed without that mod.
+
+The port keeps registry and NBT identities. It replaces the removed villager
+trade event with native trade data and uses the current GUI and fluid-model
+APIs. Saved world and player paths change in Minecraft 26, so the migration
+suite must prove the converted files and machine state after a full restart.
+
+## Remaining Gates
+- Freeze and qualify the repaired OreSpawn-profile candidate.
+- Repeat the complete release and Eclipse compiler checks, reproducibility,
+  fresh-cache and path-with-spaces builds against that candidate.
+- Connected-machine operation, recipe progression, fluids, networks, moving drills,
+  chunk unloading and restart checks against the same candidate jars.
+- Original Advantage and released base* world, player and entity upgrades,
+  additional dimensions, later chunks and both actual migration-hook orders.
+- Rendered models, all machine GUIs, captions, gauges, recipe discovery and login.
+- Two pre-sealed 30-minute endurance worlds, cold restart and independent exact
+  saved-state replay.
+- Manual testing, followed by separately authorised publication.
+
+Earlier [1.21.11 qualification](../1.21.11/QUALIFICATION.md) is retained unchanged
+as historical evidence. It does not qualify this build.
diff --git a/docs/26.1.2/QUALIFICATION.md b/docs/26.1.2/QUALIFICATION.md
new file mode 100644
index 00000000..3610fd77
--- /dev/null
+++ b/docs/26.1.2/QUALIFICATION.md
@@ -0,0 +1,71 @@
+# Minecraft 26.1.2 Test Results
+
+The current basePower, baseSteam and baseElectric candidates have completed
+their automated checks and manual playtesting. Publication is being prepared
+separately; a passing test record does not mean a release is already public.
+
+## Tested Versions
+
+| Mod | Version | Player Jar SHA-256 |
+| --- | --- | --- |
+| basePower | 2.4.16.2601021 | `23ABCC1FEFDAA6988BF709437EB165C8948C757E773ADAB738092EB93CA8D2B0` |
+| baseSteam | 2.2.17.2601021 | `4A4E7D8C3704DCF17F46EBB55A7A908A6E1B547FCAB93E3B6782EE32E49301CB` |
+| baseElectric | 2.2.17.2601021 | `E2929ED56B4CEE1AD50B6B0D2BF1AF000AA15F2C9D66E5DFB3679B53FBDED9FC` |
+
+These checks used Forge 64.1.5, Temurin 25.0.3+9, the local Base Metals
+3.1.2.2601021 migration-hook build, and published OreSpawn 4.1.1.2601021
+(CurseForge file 9572926). Base Metals and OreSpawn were installed throughout.
+The Base Metals hook build is still local; an older public jar is not a
+substitute for this test kit.
+
+OreSpawn's player jar was downloaded anonymously and verified as
+`810284ECB32D5249381F246498CEFA57E70FFF7CCC40110F799FC276CBC42BF7`,
+from source commit `101fd12b598934c353e417c57edc5c2bbefd5f53`.
+
+## Completed Checks
+
+- Release, dependency, Java bytecode, resource, checksum and Eclipse classpath audits for all three mods.
+- Independent clean-cache builds in paths containing spaces, with matching distributable jars.
+- Power's 357 unit tests and fresh Eclipse compiler run; Steam's 276 tests and Eclipse run; Electric's 117 unit tests, 28 native checks and Eclipse run.
+- The 384-test harness, 267 Python adapter tests and 24 worldless client-probe tests.
+- All 21 walkable works bays, 12 drill witnesses, capability/automation checks and 132 finite machine jobs, including full process restarts and stopped-save comparisons.
+- Harvesting, chunk lifecycle, physical partial-network unloading, bridge reconnection and extended moving-drill scenarios.
+- Recipe discovery and manufacturing progression in all three recipe modes, with rubber enabled and disabled; six oil lanes across two cold restarts.
+- Fresh generation, legacy imports, and original 1.10 plus released 1.10/1.12 generation profiles in new chunks. Saved choices remain authoritative, and replacement rules do not become duplicate active placements.
+- Eight operating machine-upgrade routes: original Cyano 1.10, released base* 1.10 and 1.12, and retained 1.19.4, 1.20.1, 1.20.6, 1.21.1 and 1.21.11 saves.
+- Nine actor/dimension routes, including Nether, End and chained upgrades, with stopped entity/player data checks. Both actual Power-first and Base-Metals-first migration-hook orders were exercised separately.
+- A real graphical client: 39 machine screens, 351 caption checks, fluid gauges, recipe-book cells, model/resource checks, reloads and 1,247 fenced GPU frames, including negative controls.
+- Two measured 30-minute endurance worlds: one fresh and one upgraded from the original 1.10 fixture. Both saved, stopped, restarted and resumed processing. Independent replay checked all 66 checkpoints and raw stopped saves; minimum interval throughput remained above 19.5 ticks per second.
+
+The resumed run did not require another Advantage gameplay repair. The changes
+were dependency pins, the required OreSpawn minimum, and test/setup corrections.
+Failed attempts remain separate from the new passing results.
+
+## Limits And Manual Checks
+
+Six dimension fixtures retain `PASS_WITH_NATIVE_DIFFERENCE`, not a rewritten
+strict pass. Their only differences are independently controlled native
+Minecraft wolf health/max-health scaling. Original strict comparisons remain
+available; all other fields match.
+
+Three Mineralogy-only oil assertions are explicitly skipped because that
+optional mod is not in the six-jar test kit. This does not qualify an entire
+modpack or unrelated mods' saved data.
+
+Check the normal play experience, particularly turbine orientation/spin,
+weapon handling, and machines in a copy of a real world. Automated geometry
+checks do not replace the remaining world-dependent turbine visual check.
+
+## Local Evidence
+
+The immutable family profile is `native2612-local-candidate-12.json`, SHA-256
+`C42AAE0ED4B1E56854991E45FD67B495E1CA16AC1C639E894FD190414D2E3CC8`.
+The local evidence pack is under
+`D:/PowerAdvantage/_verification/base-2612-port-20261112/resume-orespawn411-20261112/`.
+It contains original logs, failed setup attempts, source/input hashes, raw
+save comparisons, client frames, the genuine pre-run endurance seal and
+independent stopped-save replay. Older candidate results were not relabelled.
+
+Manual testing was accepted on 12 November 2026. Source delivery and publication
+follow the dependency order: Base Metals, basePower, baseSteam, then baseElectric.
+The exact test jars and original automated evidence remain unchanged.
diff --git a/gradle.properties b/gradle.properties
index 5ba1ec41..54e4f74b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,45 +5,47 @@ org.gradle.caching=true
 org.gradle.parallel=false
 net.minecraftforge.gradle.merge-source-sets=false
 
-minecraft_version=1.21.11
-minecraft_version_range=[1.21.11]
-forge_version=61.1.0
-forge_installer_sha256=8BD1724EAEAF26F51DACFB7FDC46D79E9B640705B70D5F0019ED38907145EB48
-forge_version_range=[61.1.0,62)
-loader_version_range=[61,)
+minecraft_version=26.1.2
+minecraft_version_range=[26.1.2]
+forge_version=64.1.5
+forge_installer_sha256=6E01323837051176762BD466340A601DA122F179FE6A00AC616E05429AE07648
+forge_version_range=[64.1.5,65)
+loader_version_range=[64,65)
 mapping_channel=official
-mapping_version=1.21.11
-mcp_version=20251223.124241
+mapping_version=26.1.2
+mcp_version=20260409.101008
 
 loader_name=forge
 loader_code=1
-java_version=21
-java_toolchain_version=21.0.7+6
-java_setup_version=21.0.7+6.0.LTS
-gradle_java_version=21
+java_version=25
+java_toolchain_version=25.0.3+9
+java_setup_version=25.0.3+9.0.LTS
+gradle_java_version=25
 curseforge_project_id=1780140
 
 mod_id=basepower
 mod_name=basePower
 mod_license=LGPL-3.0-only
-mod_version=2.4.15.121111
-release_player_sha256=C98D2CF163BE2480D9AFB0023BBD2D92D401AE0D50BEF73191235BF3F83774A7
-basesteam_version=2.2.16.121111
-baseelectric_version=2.2.16.121111
+mod_version=2.4.16.2601021
+# Frozen build candidate, not a claim of completed gameplay qualification or publication.
+release_player_sha256=23ABCC1FEFDAA6988BF709437EB165C8948C757E773ADAB738092EB93CA8D2B0
+basesteam_version=2.2.17.2601021
+baseelectric_version=2.2.17.2601021
 mod_group=zone.moddev.mc.basepower
 mod_authors=DrCyano (aka Cyanobacterium)
 mod_description=API and shared machines for pressure, electricity, quantum power, fluids, and item transport.
 
 cf_requirements=base-metals,mmd-orespawn
 cf_optionals=additional-loot-tables
-cf_versions=1.21.11
+cf_versions=26.1.2
 
-basemetals_version=3.1.2.121111
-basemetals_source_commit=616d527e50e4bf0137eeb9c44fa586e34a0452a0
+basemetals_version=3.1.2.2601021
+basemetals_source_commit=331fa46914f854db71a8c33500cc559a8878b7d3
 basemetals_curse_project_id=240967
-basemetals_deobf_sha256=598D3FB0FF956EBCC67FE477A01CE393C75D0013AF0CE00A79E2072B63E9F2BA
+basemetals_deobf_sha256=6786238835D4D8A653C769F3B0E61D226959146300E17523799CFDF17540FD19
 
-orespawn_version=4.1.0.121111
-orespawn_source_commit=ecad75b24309a344f712d898d717c6a8823fc9f2
+orespawn_version=4.1.1.2601021
+orespawn_source_commit=101fd12b598934c353e417c57edc5c2bbefd5f53
 orespawn_curse_project_id=245586
-orespawn_deobf_sha256=DE39929057288CEA110196C9E9D708E129B80BC360A2E53976337FFA6A84A67B
+orespawn_public_file_id=9572926
+orespawn_deobf_sha256=810284ECB32D5249381F246498CEFA57E70FFF7CCC40110F799FC276CBC42BF7
diff --git a/gradle/forge61-mavenizer.gradle b/gradle/forge61-mavenizer.gradle
deleted file mode 100644
index 072e418f..00000000
--- a/gradle/forge61-mavenizer.gradle
+++ /dev/null
@@ -1,29 +0,0 @@
-import java.security.MessageDigest
-import org.gradle.jvm.toolchain.JvmVendorSpec
-
-// Use the same checksum-sealed source preparation tool as OreSpawn on Forge 61.
-def tool = 'ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.jar'
-def defaultJar = project.extensions.extraProperties.has('forge61MavenizerDefault')
-        ? project.forge61MavenizerDefault
-        : "../../../MinecraftMineralogy/OS12111/OreSpawn/${tool}"
-def fixture = file(providers.gradleProperty('forge61MavenizerJar').getOrElse(defaultJar))
-def expected = 'B36CA046DB72E30F27BD38E02B4AE34274ADB51AE1D65BAF9E1D07763755682E'
-if (!fixture.isFile() || MessageDigest.getInstance('SHA-256').digest(fixture.bytes)
-        .encodeHex().toString().toUpperCase(Locale.ROOT) != expected) {
-    throw new GradleException("Missing or altered Forge 61 Mavenizer fixture: ${fixture}")
-}
-def rules = new File(fixture.parentFile, 'minecraft-source-compatibility.json')
-if (!rules.isFile() || MessageDigest.getInstance('SHA-256').digest(rules.bytes)
-        .encodeHex().toString().toUpperCase(Locale.ROOT) !=
-        '88F2EE4C6B7C903EB1C7D693C0BEEFC0EFC601C1023FB197F7CBA187B1142DB7') {
-    throw new GradleException("Missing or altered Forge 61 source-rule manifest: ${rules}")
-}
-
-fgtools.configure('mavenizer') {
-    classpath.from(fixture)
-    mainClass.set('net.minecraftforge.mcmaven.cli.Main')
-    javaLauncher.set(javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(25)
-        vendor = JvmVendorSpec.ADOPTIUM
-    })
-}
diff --git a/gradle/forge64-mavenizer.gradle b/gradle/forge64-mavenizer.gradle
new file mode 100644
index 00000000..375f853c
--- /dev/null
+++ b/gradle/forge64-mavenizer.gradle
@@ -0,0 +1,40 @@
+import java.security.MessageDigest
+import org.gradle.jvm.toolchain.JvmVendorSpec
+
+// Keep the preparation tool and its source-rule/license evidence together.
+// A different checkout layout can override the jar path without editing this file.
+def tool = 'ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.jar'
+def defaultJar = project.extensions.extraProperties.has('forge64MavenizerDefault')
+        ? project.forge64MavenizerDefault
+        : "../../../MinecraftMineralogy/OS2612/OreSpawn/${tool}"
+def fixture = file(providers.gradleProperty('forge64MavenizerJar').getOrElse(defaultJar))
+def checksums = [
+        (fixture.name): 'BB0DACB3DEB2A711CA67DD402D5FDAB5A9847C37C7B9B596DEC7CF37378FA085',
+        'minecraft-source-compatibility.json': '21D1F5984E735BCEA1B1EFB9F965655796B39538FC91AAED1C3474004710423D',
+        'minecraft-mavenizer-0.5.21-orespawn-compat.patch': '7C8EC895E79DF31AFD2CA3B505B43573C7052718A24050832189AAA2D3CC6137',
+        'LICENSE-MAVENIZER.txt': '20C17D8B8C48A600800DFD14F95D5CB9FF47066A9641DDEAB48DC54AEC96E331',
+        'README.md': '7686880D2B0F6BD6ACAFA4F0AB7585189767813174BC36DB675FEC0142440A77'
+]
+checksums.each { name, expected ->
+    File input = new File(fixture.parentFile, name)
+    if (!input.isFile() || MessageDigest.getInstance('SHA-256').digest(input.bytes)
+            .encodeHex().toString().toUpperCase(Locale.ROOT) != expected) {
+        throw new GradleException("Missing or altered Forge 64 Mavenizer fixture: ${input}")
+    }
+}
+
+fgtools.configure('mavenizer') {
+    classpath.from(fixture)
+    mainClass.set('net.minecraftforge.mcmaven.cli.Main')
+    javaLauncher.set(javaToolchains.launcherFor {
+        languageVersion = JavaLanguageVersion.of(25)
+        vendor = JvmVendorSpec.ADOPTIUM
+    })
+}
+
+fgtools.configure('slimelauncher') {
+    javaLauncher.set(javaToolchains.launcherFor {
+        languageVersion = JavaLanguageVersion.of(25)
+        vendor = JvmVendorSpec.ADOPTIUM
+    })
+}
diff --git a/src/main/java/cyano/poweradvantage/api/migration/LegacyOreSpawnProfileMigration.java b/src/main/java/cyano/poweradvantage/api/migration/LegacyOreSpawnProfileMigration.java
new file mode 100644
index 00000000..19bb186d
--- /dev/null
+++ b/src/main/java/cyano/poweradvantage/api/migration/LegacyOreSpawnProfileMigration.java
@@ -0,0 +1,491 @@
+package cyano.poweradvantage.api.migration;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.Strictness;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import java.io.IOException;
+import java.io.StringReader;
+import java.math.BigDecimal;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.file.Files;
+import java.nio.file.LinkOption;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.StandardOpenOption;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HexFormat;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Predicate;
+
+/** Output-only migration; never renames rule IDs, provider manifests or policy references. */
+public final class LegacyOreSpawnProfileMigration {
+    private static final Gson GSON = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create();
+    private static final String FORMAT = "advantage-orespawn-profile-outputs-v1";
+    private static final String ORDINARY = "orespawn:all_except_nether_end";
+    private static final int MAX_BYTES = 16 * 1024 * 1024;
+    private static final List<String> WRAPPERS = List.of("profile", "geology", "worldgen", "geology_profile", "worldgen_profile");
+
+    private LegacyOreSpawnProfileMigration() {}
+
+    /** Pure result. A refused plan exposes the original JSON, not a partially rewritten profile. */
+    public static final class Plan {
+        private final JsonObject json;
+        private final List<String> changes;
+        private final List<String> problems;
+        private final List<String> warnings;
+
+        private Plan(JsonObject json, List<String> changes, List<String> problems, List<String> warnings) {
+            this.json = json.deepCopy();
+            this.changes = List.copyOf(changes);
+            this.problems = List.copyOf(problems);
+            this.warnings = List.copyOf(warnings);
+        }
+
+        public JsonObject getJson() { return json.deepCopy(); }
+        public List<String> getChanges() { return changes; }
+        public List<String> getProblems() { return problems; }
+        public List<String> getWarnings() { return warnings; }
+        public boolean isRefused() { return !problems.isEmpty(); }
+        public boolean isChanged() { return !isRefused() && !changes.isEmpty(); }
+    }
+
+    public enum Status { MISSING, UNCHANGED, REFUSED, MIGRATED }
+
+    public record Result(Status status, Path backupFile, Path reportFile, Plan plan) {
+        public boolean wasMigrated() { return status == Status.MIGRATED; }
+    }
+
+    /**
+     * Accepts flat global/world profiles (including native schemas 8/7), provider overrides,
+     * and explicit profile wrappers. Defaults are one full owned provider JSON declaration.
+     * The caller supplies constructor-safe target validation; this class loads no registries.
+     */
+    public static Plan plan(JsonObject source, JsonObject ownedDefaults, Predicate<String> targetExists) {
+        Objects.requireNonNull(source, "source");
+        Objects.requireNonNull(ownedDefaults, "ownedDefaults");
+        Objects.requireNonNull(targetExists, "targetExists");
+        JsonObject copy = source.deepCopy();
+        List<String> changes = new ArrayList<>(), problems = new ArrayList<>(), warnings = new ArrayList<>();
+        String owner = text(ownedDefaults.get("provider_modid"));
+        if (!"basepower".equals(owner) && !"baseelectric".equals(owner)) {
+            problems.add("Defaults must belong to basepower or baseelectric");
+        }
+        visit(copy, "$", ownedDefaults, owner, targetExists, changes, problems, warnings, 0);
+        return new Plan(problems.isEmpty() ? copy : source, changes, problems, warnings);
+    }
+
+    private record Rule(String section, String id, JsonObject json, Set<String> outputs,
+                        Set<String> domains, boolean legacy, boolean retained) {}
+
+    private static void visit(JsonObject root, String path, JsonObject defaults, String owner,
+            Predicate<String> exists, List<String> changes, List<String> problems, List<String> warnings, int depth) {
+        if (depth > 8) { problems.add(path + ": too many profile wrappers"); return; }
+        List<Rule> rules = new ArrayList<>();
+        for (String section : List.of("ores", "fluid_deposits")) {
+            JsonObject table = object(root, section, path, problems);
+            if (table == null) continue;
+            for (Map.Entry<String, JsonElement> entry : table.entrySet()) {
+                if (!entry.getValue().isJsonObject()) { problems.add(path + "/" + section + "/" + entry.getKey() + ": expected rule object"); continue; }
+                JsonObject rule = entry.getValue().getAsJsonObject();
+                String at = path + "/" + section + "/" + entry.getKey();
+                boolean legacy = legacyId(entry.getKey()) || legacyId(text(rule.get("block")))
+                        || "poweradvantage".equals(text(rule.get("source_provider")))
+                        || "electricadvantage".equals(text(rule.get("source_provider")));
+                JsonElement declared = defaults.get(section);
+                boolean currentDefault = declared != null && declared.isJsonObject()
+                        && declared.getAsJsonObject().has(entry.getKey());
+                Set<String> outputs = outputs(rule, entry.getKey(), at, owner, exists, changes, problems);
+                rules.add(new Rule(section, entry.getKey(), rule, outputs, domains(root, rule, section, outputs, at, problems),
+                        legacy && !currentDefault, legacy));
+            }
+        }
+        JsonObject oil = object(root, "oil", path, problems);
+        if (oil != null) {
+            boolean legacy = legacyId(text(oil.get("block")));
+            Set<String> outputs = outputs(oil, "", path + "/oil", owner, exists, changes, problems);
+            Set<String> domains = enabled(root, "place_crude_oil", true, path, problems)
+                    && enabled(root, "place_fluid_deposits", true, path, problems)
+                    && enabled(oil, "enabled", true, path + "/oil", problems) && positive(oil, path + "/oil", problems)
+                    ? Set.of("minecraft:overworld") : Set.of();
+            rules.add(new Rule("oil", "oil", oil, outputs, domains, legacy, legacy));
+        }
+        JsonObject policies = object(root, "ore_source_policies", path, problems);
+        if (policies != null) {
+            for (Map.Entry<String, JsonElement> entry : policies.entrySet()) {
+                if (!entry.getValue().isJsonObject()) continue;
+                JsonElement candidates = entry.getValue().getAsJsonObject().get("candidates");
+                if (candidates != null && candidates.isJsonArray()) {
+                    int index = 0;
+                    for (JsonElement candidate : candidates.getAsJsonArray()) {
+                        if (candidate.isJsonObject()) rewrite(candidate.getAsJsonObject(), "registry_id",
+                                path + "/ore_source_policies/" + entry.getKey() + "/candidates/" + index, owner, exists, changes, problems);
+                        index++;
+                    }
+                }
+            }
+        }
+        for (Rule legacy : rules) {
+            if (!legacy.legacy || legacy.domains.isEmpty()) continue;
+            for (Rule current : rules) {
+                if (current.legacy || current.domains.isEmpty() || !overlap(legacy.domains, current.domains)
+                        || legacy.outputs.stream().noneMatch(current.outputs::contains)) continue;
+                String comparison = legacy.section.equals(current.section) && legacy.json.equals(current.json)
+                        ? "equivalent" : "conflicting";
+                problems.add(path + ": ambiguous " + comparison + " active output collision: "
+                        + legacy.section + "/" + legacy.id + " and " + current.section + "/" + current.id);
+            }
+        }
+        String provider = text(root.get("provider_modid"));
+        if (owner != null && (provider == null || provider.equals(owner))) {
+            seed(root, path, defaults, owner, rules, exists, changes, problems);
+        } else if (owner != null && provider != null && !provider.equals(owner) && !rules.isEmpty()) {
+            warnings.add(path + ": provider identity retained; no foreign-namespace default guards inserted into " + provider);
+        }
+        for (String wrapper : WRAPPERS) {
+            JsonElement nested = root.get(wrapper);
+            if (nested != null && nested.isJsonObject() && profileShape(nested.getAsJsonObject())) {
+                visit(nested.getAsJsonObject(), path + "/" + wrapper, defaults, owner, exists, changes, problems, warnings, depth + 1);
+            }
+        }
+    }
+
+    private static boolean profileShape(JsonObject value) {
+        return value.has("schema_version") && (value.has("ores") || value.has("fluid_deposits") || value.has("oil"));
+    }
+
+    private static Set<String> outputs(JsonObject rule, String id, String path, String owner, Predicate<String> exists,
+            List<String> changes, List<String> problems) {
+        if (!rule.has("block")) {
+            String mapped = mapped(id, owner);
+            if (!mapped.equals(id) && validTarget(mapped, path, exists, problems)) {
+                rule.addProperty("block", mapped);
+                changes.add(path + "/block: implicit " + id + " -> " + mapped);
+            }
+        } else rewrite(rule, "block", path, owner, exists, changes, problems);
+        rewrite(rule, "deep_output", path, owner, exists, changes, problems);
+        Set<String> result = new LinkedHashSet<>();
+        String primary = text(rule.get("block"));
+        if (primary != null) result.add(primary);
+        else if (!id.isEmpty()) result.add(id);
+        String deep = text(rule.get("deep_output"));
+        if (deep != null) result.add(deep);
+        JsonElement outputs = rule.get("outputs");
+        if (outputs != null) {
+            if (!outputs.isJsonArray()) problems.add(path + "/outputs: expected array");
+            else {
+                int index = 0;
+                for (JsonElement value : outputs.getAsJsonArray()) {
+                    if (!value.isJsonObject()) problems.add(path + "/outputs/" + index + ": expected output object");
+                    else {
+                        JsonObject output = value.getAsJsonObject();
+                        rewrite(output, "block", path + "/outputs/" + index, owner, exists, changes, problems);
+                        String block = text(output.get("block"));
+                        if (block != null) result.add(block);
+                    }
+                    index++;
+                }
+            }
+        }
+        return result;
+    }
+
+    private static void rewrite(JsonObject object, String key, String path, String owner, Predicate<String> exists,
+            List<String> changes, List<String> problems) {
+        if (!object.has(key)) return;
+        String before = text(object.get(key));
+        if (before == null) { problems.add(path + "/" + key + ": expected output identifier string"); return; }
+        String after = mapped(before, owner);
+        if (!after.equals(before) && validTarget(after, path + "/" + key, exists, problems)) {
+            object.addProperty(key, after);
+            changes.add(path + "/" + key + ": " + before + " -> " + after);
+        }
+    }
+
+    private static String mapped(String value, String owner) {
+        if ("basepower".equals(owner) && value.startsWith("poweradvantage:")) return "basepower:" + value.substring("poweradvantage:".length());
+        if ("baseelectric".equals(owner) && value.startsWith("electricadvantage:")) return "baseelectric:" + value.substring("electricadvantage:".length());
+        return value.equals("minecraft:quartz_ore") ? "minecraft:nether_quartz_ore" : value;
+    }
+
+    private static boolean legacyId(String value) {
+        return value != null && (value.startsWith("poweradvantage:") || value.startsWith("electricadvantage:")
+                || value.startsWith("basepower:legacy/") || value.startsWith("baseelectric:legacy/")
+                || value.equals("minecraft:quartz_ore") || value.equals("orespawn:legacy/orespawn/quartz_ore"));
+    }
+
+    private static Set<String> domains(JsonObject root, JsonObject rule, String section, Set<String> outputs,
+            String path, List<String> problems) {
+        if (!enabled(rule, "enabled", true, path, problems)) return Set.of();
+        if (section.equals("fluid_deposits") && !enabled(root, "place_fluid_deposits", true, path, problems)) return Set.of();
+        if (section.equals("ores") && (outputs.contains("minecraft:nether_quartz_ore")
+                || enabled(rule, "native_generation", false, path, problems))
+                && !enabled(root, "manage_vanilla_ores", false, path, problems)) return Set.of();
+        Set<String> result = new LinkedHashSet<>();
+        for (String key : List.of("dimensions", "dimension_selectors")) {
+            JsonObject table = object(rule, key, path, problems);
+            if (table == null) continue;
+            for (Map.Entry<String, JsonElement> entry : table.entrySet()) {
+                if (!entry.getValue().isJsonObject()) { problems.add(path + "/" + key + ": expected placement object"); continue; }
+                JsonObject placement = entry.getValue().getAsJsonObject();
+                if (enabled(placement, "enabled", true, path, problems) && positive(placement, path, problems)) result.add(entry.getKey());
+            }
+        }
+        return result;
+    }
+
+    private static boolean positive(JsonObject rule, String path, List<String> problems) {
+        if (!rule.has("frequency")) return true;
+        JsonElement value = rule.get("frequency");
+        if (!value.isJsonPrimitive() || !value.getAsJsonPrimitive().isNumber()) {
+            problems.add(path + "/frequency: expected number"); return false;
+        }
+        return value.getAsBigDecimal().signum() > 0;
+    }
+
+    private static boolean enabled(JsonObject object, String key, boolean fallback, String path, List<String> problems) {
+        if (!object.has(key)) return fallback;
+        JsonElement value = object.get(key);
+        if (!value.isJsonPrimitive() || !value.getAsJsonPrimitive().isBoolean()) {
+            problems.add(path + "/" + key + ": expected boolean"); return false;
+        }
+        return value.getAsBoolean();
+    }
+
+    private static boolean overlap(Set<String> first, Set<String> second) {
+        for (String a : first) for (String b : second) {
+            if (a.equals(b) || a.equals(ORDINARY) && ordinary(b) || b.equals(ORDINARY) && ordinary(a)) return true;
+        }
+        return false;
+    }
+
+    private static boolean ordinary(String dimension) {
+        return !dimension.equals("minecraft:the_nether") && !dimension.equals("minecraft:the_end");
+    }
+
+    private static void seed(JsonObject root, String path, JsonObject defaults, String owner, List<Rule> rules,
+            Predicate<String> exists, List<String> changes, List<String> problems) {
+        Set<String> retained = new LinkedHashSet<>();
+        for (Rule rule : rules) if (rule.retained) {
+            for (String output : rule.outputs) if (output.startsWith(owner + ":")) retained.add(output);
+        }
+        if (retained.isEmpty()) return;
+        if (!root.has("provider_modid") && defaults.has("profile_defaults")
+                && defaults.get("profile_defaults").isJsonObject() && !defaults.getAsJsonObject("profile_defaults").isEmpty()) {
+            JsonObject manifests = object(root, "providers", path, problems);
+            if (manifests == null && !root.has("providers")) {
+                manifests = new JsonObject(); root.add("providers", manifests);
+            }
+            if (manifests != null) {
+                JsonObject manifest = object(manifests, owner, path + "/providers", problems);
+                if (manifest == null && !manifests.has(owner)) {
+                    manifest = new JsonObject(); manifests.add(owner, manifest);
+                }
+                if (manifest != null && !manifest.has("profile_defaults_applied")) {
+                    manifest.addProperty("profile_defaults_applied", true);
+                    changes.add(path + "/providers/" + owner + "/profile_defaults_applied: retained legacy root choices are authoritative");
+                } else if (manifest != null && !enabled(manifest, "profile_defaults_applied", false, path, problems)) {
+                    for (Map.Entry<String, JsonElement> entry : defaults.getAsJsonObject("profile_defaults").entrySet()) {
+                        if (root.has(entry.getKey()) && !root.get(entry.getKey()).equals(entry.getValue())) {
+                            problems.add(path + ": explicit provider default overlay conflicts with saved " + entry.getKey());
+                        }
+                    }
+                }
+            }
+        }
+        for (String section : List.of("ores", "fluid_deposits")) {
+            JsonObject source = object(defaults, section, "defaults", problems);
+            if (source == null) continue;
+            JsonObject destination = object(root, section, path, problems);
+            for (Map.Entry<String, JsonElement> entry : source.entrySet()) {
+                if (destination != null && destination.has(entry.getKey())) continue;
+                if (!entry.getKey().startsWith(owner + ":") || !entry.getValue().isJsonObject()) {
+                    problems.add("Unowned/malformed default rule: " + entry.getKey()); continue;
+                }
+                JsonObject rule = entry.getValue().getAsJsonObject();
+                String block = text(rule.get("block"));
+                if (block == null || !retained.contains(block)) continue;
+                if (!validTarget(block, "defaults/" + entry.getKey(), exists, problems)) continue;
+                if (destination == null) { destination = new JsonObject(); root.add(section, destination); }
+                JsonObject guard = rule.deepCopy();
+                guard.addProperty("enabled", false);
+                guard.addProperty("source_provider", owner);
+                destination.add(entry.getKey(), guard);
+                changes.add(path + "/" + section + "/" + entry.getKey() + ": seeded disabled owned default; legacy placement retained");
+                if (owner.equals(text(root.get("provider_modid")))
+                        && new JsonPrimitive(4).equals(root.get("schema_version"))
+                        && section.equals("ores") && requiresProviderSchemaFive(guard)) {
+                    root.addProperty("schema_version", 5);
+                    changes.add(path + "/schema_version: 4 -> 5; seeded ore fields require provider schema 5");
+                }
+            }
+        }
+    }
+
+    private static boolean requiresProviderSchemaFive(JsonObject ore) {
+        if (ore.has("material")) return true;
+        for (String section : List.of("dimensions", "dimension_selectors")) {
+            JsonElement placements = ore.get(section);
+            if (placements == null || !placements.isJsonObject()) continue;
+            for (JsonElement placement : placements.getAsJsonObject().asMap().values()) {
+                if (placement.isJsonObject() && placement.getAsJsonObject().has("placement_channel")) return true;
+            }
+        }
+        return false;
+    }
+
+    private static boolean validTarget(String value, String path, Predicate<String> exists, List<String> problems) {
+        boolean valid = value.matches("[a-z0-9_.-]+:[a-z0-9_./-]+") && !value.equals("minecraft:air");
+        try { valid = valid && exists.test(value); }
+        catch (RuntimeException error) { valid = false; }
+        if (!valid) problems.add(path + ": invalid/unavailable target " + value);
+        return valid;
+    }
+
+    private static JsonObject object(JsonObject root, String key, String path, List<String> problems) {
+        if (!root.has(key)) return null;
+        if (root.get(key).isJsonObject()) return root.getAsJsonObject(key);
+        problems.add(path + "/" + key + ": expected object");
+        return null;
+    }
+
+    private static String text(JsonElement value) {
+        return value != null && value.isJsonPrimitive() && value.getAsJsonPrimitive().isString() ? value.getAsString() : null;
+    }
+
+    /**
+     * Migrates one caller-selected file. Atomic moves are mandatory; unsupported filesystems
+     * fail rather than falling back to non-atomic replacement. Content-addressed backups and
+     * reports never replace different pre-existing evidence. PREPARED is not a success receipt.
+     */
+    public static synchronized Result migrate(Path file, JsonObject ownedDefaults, Predicate<String> targetExists) throws IOException {
+        Path path = file.toAbsolutePath().normalize();
+        if (!Files.exists(path, LinkOption.NOFOLLOW_LINKS)) return new Result(Status.MISSING, null, null, null);
+        requireRegular(path);
+        if (Files.size(path) > MAX_BYTES) throw new IOException("Oversized OreSpawn profile: " + path);
+        byte[] before = Files.readAllBytes(path);
+        if (before.length > MAX_BYTES) throw new IOException("Oversized OreSpawn profile: " + path);
+        String beforeHash = hash(before);
+        Plan plan;
+        try { plan = plan(parse(before), ownedDefaults, targetExists); }
+        catch (RuntimeException error) { throw new IOException("Invalid OreSpawn profile: " + path, error); }
+        if (!plan.isRefused() && !plan.isChanged()) return new Result(Status.UNCHANGED, null, null, plan);
+        Path backup = path.resolveSibling(path.getFileName() + ".advantage-output-" + beforeHash + ".bak");
+        byte[] after = bytes(plan.getJson());
+        JsonObject receipt = new JsonObject();
+        receipt.addProperty("format", FORMAT);
+        receipt.addProperty("file", path.toString());
+        receipt.addProperty("source_sha256", beforeHash);
+        receipt.addProperty("result_sha256", plan.isRefused() ? beforeHash : hash(after));
+        receipt.addProperty("backup", plan.isRefused() ? null : backup.toString());
+        receipt.add("changes", GSON.toJsonTree(plan.getChanges()));
+        receipt.add("problems", GSON.toJsonTree(plan.getProblems()));
+        receipt.add("warnings", GSON.toJsonTree(plan.getWarnings()));
+        receipt.addProperty("status", plan.isRefused() ? "REFUSED" : "PREPARED");
+        Path report = path.resolveSibling(path.getFileName() + ".advantage-output-" + beforeHash
+                + "-" + hash(bytes(receipt)).substring(0, 16) + ".json");
+        if (Files.exists(report, LinkOption.NOFOLLOW_LINKS)) {
+            requireRegular(report);
+            JsonObject previous = parse(Files.readAllBytes(report));
+            JsonObject previousBody = previous.deepCopy(), currentBody = receipt.deepCopy();
+            String previousStatus = text(previousBody.remove("status"));
+            currentBody.remove("status");
+            if (previousStatus == null || !List.of("PREPARED", "MIGRATED", "REFUSED").contains(previousStatus)
+                    || !previousBody.equals(currentBody)) {
+                throw new IOException("Conflicting migration report: " + report);
+            }
+        }
+        if (plan.isRefused()) {
+            if (!Files.exists(report)) atomicWrite(report, bytes(receipt));
+            return new Result(Status.REFUSED, null, report, plan);
+        }
+        if (Files.exists(backup, LinkOption.NOFOLLOW_LINKS)) {
+            requireRegular(backup);
+            if (!Arrays.equals(Files.readAllBytes(backup), before)) throw new IOException("Conflicting migration backup: " + backup);
+        } else atomicWrite(backup, before);
+        atomicWrite(report, bytes(receipt));
+        requireRegular(path);
+        if (!Arrays.equals(before, Files.readAllBytes(path))) throw new IOException("Profile changed during migration: " + path);
+        atomicWrite(path, after);
+        receipt.addProperty("status", "MIGRATED");
+        atomicWrite(report, bytes(receipt));
+        return new Result(Status.MIGRATED, backup, report, plan);
+    }
+
+    private static void requireRegular(Path path) throws IOException {
+        if (!Files.isRegularFile(path, LinkOption.NOFOLLOW_LINKS) || !path.toRealPath().equals(path)) {
+            throw new IOException("Aliased/non-regular migration file: " + path);
+        }
+        for (Path part = path; part != null; part = part.getParent()) {
+            if (Files.isSymbolicLink(part)) throw new IOException("Aliased migration path: " + path);
+        }
+    }
+
+    private static void atomicWrite(Path path, byte[] content) throws IOException {
+        Path temporary = Files.createTempFile(path.getParent(), ".advantage-output-", ".tmp");
+        try {
+            try (FileChannel channel = FileChannel.open(temporary, StandardOpenOption.WRITE)) {
+                ByteBuffer buffer = ByteBuffer.wrap(content);
+                while (buffer.hasRemaining()) channel.write(buffer);
+                channel.force(true);
+            }
+            Files.move(temporary, path, StandardCopyOption.ATOMIC_MOVE, StandardCopyOption.REPLACE_EXISTING);
+        } finally { Files.deleteIfExists(temporary); }
+    }
+
+    private static byte[] bytes(JsonObject object) { return (GSON.toJson(object) + "\n").getBytes(java.nio.charset.StandardCharsets.UTF_8); }
+
+    private static String hash(byte[] bytes) {
+        try { return HexFormat.of().withUpperCase().formatHex(MessageDigest.getInstance("SHA-256").digest(bytes)); }
+        catch (NoSuchAlgorithmException impossible) { throw new IllegalStateException(impossible); }
+    }
+
+    private static JsonObject parse(byte[] bytes) throws IOException {
+        String utf8 = java.nio.charset.StandardCharsets.UTF_8.newDecoder()
+                .onMalformedInput(java.nio.charset.CodingErrorAction.REPORT)
+                .onUnmappableCharacter(java.nio.charset.CodingErrorAction.REPORT).decode(ByteBuffer.wrap(bytes)).toString();
+        try (JsonReader reader = new JsonReader(new StringReader(utf8))) {
+            reader.setStrictness(Strictness.STRICT);
+            JsonElement value = read(reader, 0);
+            if (!value.isJsonObject() || reader.peek() != JsonToken.END_DOCUMENT) throw new IOException("Expected one profile object");
+            return value.getAsJsonObject();
+        }
+    }
+
+    private static JsonElement read(JsonReader reader, int depth) throws IOException {
+        if (depth > 64) throw new IOException("Profile nesting limit exceeded");
+        switch (reader.peek()) {
+            case BEGIN_OBJECT:
+                JsonObject object = new JsonObject(); reader.beginObject();
+                while (reader.hasNext()) {
+                    String name = reader.nextName();
+                    if (object.has(name)) throw new IOException("Duplicate profile key: " + name);
+                    object.add(name, read(reader, depth + 1));
+                }
+                reader.endObject(); return object;
+            case BEGIN_ARRAY:
+                JsonArray array = new JsonArray(); reader.beginArray();
+                while (reader.hasNext()) array.add(read(reader, depth + 1));
+                reader.endArray(); return array;
+            case STRING: return new JsonPrimitive(reader.nextString());
+            case NUMBER: return new JsonPrimitive(new BigDecimal(reader.nextString()));
+            case BOOLEAN: return new JsonPrimitive(reader.nextBoolean());
+            case NULL: reader.nextNull(); return JsonNull.INSTANCE;
+            default: throw new IOException("Invalid profile token: " + reader.peek());
+        }
+    }
+}
diff --git a/src/main/java/cyano/poweradvantage/api/simple/SimpleMachineGUI.java b/src/main/java/cyano/poweradvantage/api/simple/SimpleMachineGUI.java
index 464c6f56..f5d271b4 100644
--- a/src/main/java/cyano/poweradvantage/api/simple/SimpleMachineGUI.java
+++ b/src/main/java/cyano/poweradvantage/api/simple/SimpleMachineGUI.java
@@ -4,7 +4,7 @@
 import zone.moddev.mc.basepower.PowerAdvantage;
 import zone.moddev.mc.basepower.math.Integer2D;
 import zone.moddev.mc.basepower.registry.ITileEntityGUI;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.entity.player.Inventory;
@@ -13,8 +13,6 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.resources.Identifier;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraft.client.renderer.RenderPipelines;
 import org.joml.Matrix3x2fStack;
 import net.minecraft.network.chat.Component;
@@ -115,7 +113,6 @@ public SimpleMachineGUI(String guiImage, Integer2D... inventorySlotCoordinates){
 	 * the GUI
 	 * @param z This is the z coordinate (no units) into the depth of the screen
 	 */
-	@OnlyIn(Dist.CLIENT)
 	public void drawGUIDecorations(Object srcEntity, GUIContainer guiContainer, int x, int y, float z){}
 
 	/**
@@ -147,12 +144,10 @@ public Container createMenu(int windowId, Inventory player, net.minecraft.world.
 	 * @return An instance of net.minecraft.client.gui.screen.inventory.ContainerScreen
 	 */
 	@Override
-	@OnlyIn(Dist.CLIENT)
 	public AbstractContainerScreen getContainerGUI(BlockEntity e, Player player) {
 		return ClientScreens.legacy(this, e, player);
 	}
 
-	@OnlyIn(Dist.CLIENT)
 	private static final class ClientScreens {
 		private static AbstractContainerScreen legacy(SimpleMachineGUI gui, BlockEntity tile, Player player) {
 			return gui.new GUIContainer(player.getInventory(), (net.minecraft.world.Container) tile);
@@ -188,7 +183,6 @@ public Container(int windowId, Inventory playerItems, net.minecraft.world.Contai
 			bindPlayerInventory(playerItems, PLAYER_SLOTS_TOP);
 		}
 
-        @OnlyIn(Dist.CLIENT)
         public GUIContainer createScreen(Inventory inventory, Component title) {
             return new GUIContainer(this, inventory, title);
         }
@@ -252,11 +246,10 @@ else if (!this.moveItemStackTo(stackInSlot, 0, hostSize, false)) {
 	 * requirements of the interface ITileEntityGUI.
 	 */
 
-	@OnlyIn(Dist.CLIENT)
 	public class GUIContainer extends net.minecraft.client.gui.screens.inventory.AbstractContainerScreen<Container>{
 		private final Object entity;
 		private final Component playerInventoryLabel;
-		private GuiGraphics graphics;
+		private GuiGraphicsExtractor graphics;
 
         public net.minecraft.client.Minecraft getMinecraft() { return minecraft; }
 		public GUIContainer(Inventory playerItems, net.minecraft.world.Container entity) {
@@ -264,19 +257,15 @@ public GUIContainer(Inventory playerItems, net.minecraft.world.Container entity)
         }
 
         public GUIContainer(Container container, Inventory playerItems, Component title) {
-            super(container, playerItems, title);
+            super(container, playerItems, title, guiWidth, guiHeight);
             this.playerInventoryLabel = playerItems.getDisplayName();
 //System.out.println("Size: "+this.xSize+"x"+this.ySize+" at coordinate ("+this.guiLeft+","+this.guiTop+")");
-			this.imageWidth = guiWidth;
-			this.imageHeight = guiHeight;
 			this.entity = container.entity;
 		}
 
 		@Override
-		public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
-			this.renderBackground(graphics, mouseX, mouseY, partialTicks);
-			super.render(graphics, mouseX, mouseY, partialTicks);
-			this.renderTooltip(graphics, mouseX, mouseY);
+		public void extractRenderState(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float partialTicks) {
+			super.extractRenderState(graphics, mouseX, mouseY, partialTicks);
 			if (font.width(title.getString()) > width - 8
 					&& mouseY >= topPos + 1 && mouseY < topPos + MACHINE_TOP) {
 				graphics.setTooltipForNextFrame(font, title, mouseX, mouseY);
@@ -284,10 +273,10 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTi
 		}
 
 		@Override
-		protected void renderLabels(GuiGraphics graphics, int mouseX, int mouseY) {
+		protected void extractLabels(GuiGraphicsExtractor graphics, int mouseX, int mouseY) {
 			String machineName = fitLabel(title.getString(), width - 8);
-			graphics.drawString(font, machineName, (imageWidth - font.width(machineName)) / 2, 1, 0xFFFFFFFF);
-			graphics.drawString(font, fitLabel(playerInventoryLabel.getString(), imageWidth - 16),
+			graphics.text(font, machineName, (imageWidth - font.width(machineName)) / 2, 1, 0xFFFFFFFF);
+			graphics.text(font, fitLabel(playerInventoryLabel.getString(), imageWidth - 16),
 					8, MACHINE_TOP + MACHINE_HEIGHT, 0xFFFFFFFF);
 		}
 
@@ -297,7 +286,8 @@ private String fitLabel(String text, int availableWidth) {
 		}
 
 		@Override
-		protected void renderBg(GuiGraphics graphics, float partialTicks, int mouseX, int mouseY) {
+		public void extractBackground(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float partialTicks) {
+			super.extractBackground(graphics, mouseX, mouseY, partialTicks);
 			this.graphics = graphics;
 			int x = (width - imageWidth) / 2;
 			int y = (height - imageHeight) / 2;
@@ -322,7 +312,7 @@ public void blit(Identifier texture, int x, int y, int u, int v, int width, int
 		}
 
 		/** The active render context, available while drawing decorations. */
-		public GuiGraphics getGraphics() { return graphics; }
+		public GuiGraphicsExtractor getGraphics() { return graphics; }
 
         /** Native GUI transforms are two-dimensional; rotations use radians. */
 		public Matrix3x2fStack getMatrices() { return getGraphics().pose(); }
diff --git a/src/main/java/zone/moddev/mc/basepower/PowerAdvantage.java b/src/main/java/zone/moddev/mc/basepower/PowerAdvantage.java
index 17717ad1..8dd1ce38 100644
--- a/src/main/java/zone/moddev/mc/basepower/PowerAdvantage.java
+++ b/src/main/java/zone/moddev/mc/basepower/PowerAdvantage.java
@@ -14,13 +14,14 @@
 import cyano.poweradvantage.api.migration.LegacyOreSpawnConfigBridge;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.DistExecutor;
+import net.minecraftforge.fml.loading.FMLEnvironment;
 
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.eventbus.api.bus.BusGroup;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.config.ModConfig;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
+import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.minecraftforge.fml.loading.FMLPaths;
 import zone.moddev.mc.basepower.config.PowerAdvantageConfig;
@@ -42,7 +43,7 @@
 public final class PowerAdvantage {
     public static final String MODID = "basepower";
     public static final String NAME = "basePower";
-    public static final String VERSION = "2.4.15.121111";
+    public static final String VERSION = "2.4.16.2601021";
     public static final Logger LOGGER = LogManager.getLogger(MODID);
 
     private static PowerAdvantage instance;
@@ -77,13 +78,15 @@ public PowerAdvantage(FMLJavaModLoadingContext context) {
 
         AdvantageLegacyMigrations.registerPowerAdvantage();
         zone.moddev.mc.basepower.migration.VanillaRegistryRemaps.register();
+        zone.moddev.mc.basepower.migration.OreSpawnProfileMigration.registerServerHook();
         net.minecraftforge.event.level.ChunkEvent.Load.BUS.addListener(ConduitRegistry.getInstance()::onChunkLoad);
         net.minecraftforge.event.level.ChunkEvent.Unload.BUS.addListener(ConduitRegistry.getInstance()::onChunkUnload);
         net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedInEvent.BUS.addListener(RecipeDiscovery::onPlayerLogin);
-        net.minecraftforge.event.village.VillagerTradesEvent.BUS.addListener(zone.moddev.mc.basepower.init.Villages::onTrades);
         net.minecraftforge.event.AddPackFindersEvent.BUS.addListener(
                 zone.moddev.mc.basepower.recipe.MaterialTags::registerPack);
         net.minecraftforge.registries.RegisterEvent.getBus(modBus).addListener(zone.moddev.mc.basepower.init.Blocks::registerBlocks);
+        net.minecraftforge.registries.RegisterEvent.getBus(modBus).addListener(
+                zone.moddev.mc.basepower.migration.LegacyOreSpawnRegistryAliases::register);
         net.minecraftforge.registries.RegisterEvent.getBus(modBus).addListener(zone.moddev.mc.basepower.init.Blocks::registerBlockItems);
         net.minecraftforge.registries.RegisterEvent.getBus(modBus).addListener(zone.moddev.mc.basepower.init.Items::register);
         net.minecraftforge.registries.RegisterEvent.getBus(modBus).addListener(zone.moddev.mc.basepower.init.Fluids::registerFluids);
@@ -101,15 +104,15 @@ public PowerAdvantage(FMLJavaModLoadingContext context) {
         net.minecraftforge.fml.event.config.ModConfigEvent.Loading.getBus(modBus).addListener(PowerAdvantageConfig::onConfigLoading);
         net.minecraftforge.fml.event.config.ModConfigEvent.Reloading.getBus(modBus).addListener(PowerAdvantageConfig::onConfigLoading);
         FMLCommonSetupEvent.getBus(modBus).addListener(this::commonSetup);
+        FMLLoadCompleteEvent.getBus(modBus).addListener(this::finishOreSpawnMigration);
 
-        DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> {
+        if (FMLEnvironment.dist == Dist.CLIENT) {
             net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent.getBus(modBus).addListener(
                     (net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent event) ->
                             event.enqueueWork(() -> {
                                 MachineGUIRegistry.registerScreens();
-                                zone.moddev.mc.basepower.client.ClientOilRenderer.configureRenderLayers();
                             }));
-        });
+        }
     }
 
     private static void migrateLegacyOreSpawnConfiguration() {
@@ -120,8 +123,9 @@ private static void migrateLegacyOreSpawnConfiguration() {
                 LOGGER.info("Imported {} legacy Power Advantage OreSpawn rule(s) from '{}' into '{}'",
                         result.getRuleCount(), result.getSource(), result.getTarget());
             }
+            zone.moddev.mc.basepower.migration.OreSpawnProfileMigration.registerPowerProvider(FMLPaths.CONFIGDIR.get());
         } catch (IOException exception) {
-            LOGGER.error("Could not migrate legacy Power Advantage OreSpawn configuration", exception);
+            throw new IllegalStateException("Could not safely migrate legacy Power Advantage OreSpawn configuration", exception);
         }
     }
 
@@ -148,7 +152,7 @@ private static void migrateLegacyConfiguration() {
     private void commonSetup(FMLCommonSetupEvent event) {
         Fuels.init();
         GUI.init();
-        if (ModList.get().isLoaded("basemetals")) {
+        if (ModList.isLoaded("basemetals")) {
             event.enqueueWork(() -> BaseMetalsLegacyMigration.register());
         }
         // Forge's shared hook list is not safe to mutate during parallel mod construction.
@@ -158,6 +162,22 @@ private void commonSetup(FMLCommonSetupEvent event) {
         LOGGER.info("Power Advantage {} common setup complete", VERSION);
     }
 
+    private void finishOreSpawnMigration(FMLLoadCompleteEvent event) {
+        event.enqueueWork(() -> {
+            try {
+                // Both queued bake orders read the repaired file, before any world is opened.
+                if (zone.moddev.mc.basepower.migration.OreSpawnProfileMigration
+                        .migrateLateProfiles(FMLPaths.CONFIGDIR.get())) {
+                    zone.moddev.mc.orespawn.worldgen.GeomeConfig.bake();
+                    zone.moddev.mc.orespawn.worldgen.OreSpawnOreGeneration.refreshWorldConfig();
+                    zone.moddev.mc.orespawn.worldgen.FluidDepositFeature.refreshWorldConfig();
+                }
+            } catch (IOException exception) {
+                throw new IllegalStateException("Could not safely finish OreSpawn profile migration", exception);
+            }
+        });
+    }
+
     /** Legacy API retained for add-ons that pass the mod owner to GUIBlock. */
     public static PowerAdvantage getInstance() {
         return instance;
diff --git a/src/main/java/zone/moddev/mc/basepower/client/ClientOilRenderer.java b/src/main/java/zone/moddev/mc/basepower/client/ClientOilRenderer.java
index c7d78df3..69efca33 100644
--- a/src/main/java/zone/moddev/mc/basepower/client/ClientOilRenderer.java
+++ b/src/main/java/zone/moddev/mc/basepower/client/ClientOilRenderer.java
@@ -1,22 +1,53 @@
 package zone.moddev.mc.basepower.client;
 
 import net.minecraft.client.renderer.chunk.ChunkSectionLayer;
-import net.minecraft.client.renderer.ItemBlockRenderTypes;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.block.BlockAndTintGetter;
+import net.minecraft.client.renderer.block.FluidModel;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.resources.model.sprite.Material;
+import net.minecraft.core.BlockPos;
+import net.minecraft.data.AtlasIds;
+import net.minecraft.resources.Identifier;
+import net.minecraft.world.level.material.FluidState;
+import net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions;
+import zone.moddev.mc.basepower.PowerAdvantage;
 
-/** Configure the translucent render layer for the registered oils. */
-@OnlyIn(Dist.CLIENT)
+/** Client-only oil models, resolved against the current animated block atlas. */
 public final class ClientOilRenderer {
     private ClientOilRenderer() {}
 
-    public static void configureRenderLayers() {
-        for (net.minecraft.world.level.material.Fluid fluid : new net.minecraft.world.level.material.Fluid[] {
-                zone.moddev.mc.basepower.init.Fluids.crude_oil,
-                zone.moddev.mc.basepower.init.Fluids.flowing_crude_oil,
-                zone.moddev.mc.basepower.init.Fluids.refined_oil,
-                zone.moddev.mc.basepower.init.Fluids.flowing_refined_oil}) {
-            ItemBlockRenderTypes.setRenderLayer(fluid, ChunkSectionLayer.TRANSLUCENT);
+    public static IClientFluidTypeExtensions extensions(String name) {
+        return new OilModel(name);
+    }
+
+    private static final class OilModel implements IClientFluidTypeExtensions {
+        private final Identifier still;
+        private final Identifier flowing;
+        private volatile FluidModel cached;
+
+        private OilModel(String name) {
+            still = Identifier.fromNamespaceAndPath(PowerAdvantage.MODID, "blocks/" + name + "_still");
+            flowing = Identifier.fromNamespaceAndPath(PowerAdvantage.MODID, "blocks/" + name + "_flow");
+        }
+
+        @Override public Identifier getStillTexture() { return still; }
+        @Override public Identifier getFlowingTexture() { return flowing; }
+
+        @Override
+        public FluidModel getModel(FluidState state, BlockAndTintGetter level, BlockPos pos, FluidModel vanilla) {
+            var atlas = Minecraft.getInstance().getAtlasManager().getAtlasOrThrow(AtlasIds.BLOCKS);
+            TextureAtlasSprite stillSprite = atlas.getSprite(still);
+            TextureAtlasSprite flowingSprite = atlas.getSprite(flowing);
+            FluidModel model = cached;
+            // A resource reload replaces sprites, so never retain a model from the old atlas.
+            if (model == null || model.stillMaterial().sprite() != stillSprite
+                    || model.flowingMaterial().sprite() != flowingSprite) {
+                model = new FluidModel(ChunkSectionLayer.TRANSLUCENT,
+                        new Material.Baked(stillSprite, true), new Material.Baked(flowingSprite, true), null, null);
+                cached = model;
+            }
+            return model;
         }
     }
 
diff --git a/src/main/java/zone/moddev/mc/basepower/client/FluidGaugeRenderer.java b/src/main/java/zone/moddev/mc/basepower/client/FluidGaugeRenderer.java
new file mode 100644
index 00000000..d88164c7
--- /dev/null
+++ b/src/main/java/zone/moddev/mc/basepower/client/FluidGaugeRenderer.java
@@ -0,0 +1,51 @@
+package zone.moddev.mc.basepower.client;
+
+import cyano.poweradvantage.api.fluid.FluidStack;
+import cyano.poweradvantage.api.simple.SimpleMachineGUI.GUIContainer;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.renderer.BiomeColors;
+import net.minecraft.client.renderer.RenderPipelines;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.data.AtlasIds;
+import net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions;
+import zone.moddev.mc.basepower.util.ForgeFluidAdapter;
+
+/** Keeps native client-only types out of common machine GUI definitions. */
+public final class FluidGaugeRenderer {
+    private FluidGaugeRenderer() {}
+
+    public static void draw(GUIContainer gui, FluidStack stack, int x, int y, int width, int height) {
+        if (stack == null || stack.getFluid() == null || width <= 0 || height <= 0) return;
+        var fluid = ForgeFluidAdapter.toForge(stack);
+        var rendering = IClientFluidTypeExtensions.of(stack.getFluid());
+        var still = rendering.getStillTexture(fluid);
+        if (still == null) return;
+        var minecraft = gui.getMinecraft();
+        var atlas = minecraft.getAtlasManager().getAtlasOrThrow(AtlasIds.BLOCKS);
+        int color = rendering.getTintColor(fluid);
+        if (stack.getFluid().isSame(net.minecraft.world.level.material.Fluids.WATER)) {
+            color = minecraft.level != null && minecraft.player != null
+                    ? BiomeColors.getAverageWaterColor(minecraft.level, minecraft.player.blockPosition()) : 0x3F76E4;
+        }
+        extractFluidTiles(gui.getGraphics(), atlas.getSprite(still), x, y, width, height, color);
+    }
+
+    public static void extractFluidTiles(GuiGraphicsExtractor graphics, TextureAtlasSprite sprite,
+            int x, int y, int width, int height, int color) {
+        if (width <= 0 || height <= 0) return;
+        // Legacy gauges use the RGB tint and texture alpha, not the tint's alpha.
+        color = 0xFF000000 | (color & 0xFFFFFF);
+        // Clip full-size native tiles so partial rows do not stretch the texture.
+        graphics.enableScissor(x, y, x + width, y + height);
+        try {
+            for (int dy = 0; dy < height; dy += 16) {
+                for (int dx = 0; dx < width; dx += 16) {
+                    graphics.blitSprite(RenderPipelines.GUI_TEXTURED, sprite,
+                            x + dx, y + dy, 16, 16, color);
+                }
+            }
+        } finally {
+            graphics.disableScissor();
+        }
+    }
+}
diff --git a/src/main/java/zone/moddev/mc/basepower/compat/BaseMetalsCompat.java b/src/main/java/zone/moddev/mc/basepower/compat/BaseMetalsCompat.java
index 9e03b597..17c769d9 100644
--- a/src/main/java/zone/moddev/mc/basepower/compat/BaseMetalsCompat.java
+++ b/src/main/java/zone/moddev/mc/basepower/compat/BaseMetalsCompat.java
@@ -15,7 +15,7 @@
 public final class BaseMetalsCompat {
     private BaseMetalsCompat() {}
 
-    public static boolean isLoaded() { return ModList.get().isLoaded("basemetals"); }
+    public static boolean isLoaded() { return ModList.isLoaded("basemetals"); }
 
     public static void setStrongHammers(boolean enabled) {
         PowerAdvantage.LOGGER.debug("Ignoring legacy strong-hammers setting on Base Metals 1.13");
diff --git a/src/main/java/zone/moddev/mc/basepower/conduitnetwork/ConduitNetworkManager.java b/src/main/java/zone/moddev/mc/basepower/conduitnetwork/ConduitNetworkManager.java
index c77ddb7a..e62b8605 100644
--- a/src/main/java/zone/moddev/mc/basepower/conduitnetwork/ConduitNetworkManager.java
+++ b/src/main/java/zone/moddev/mc/basepower/conduitnetwork/ConduitNetworkManager.java
@@ -134,8 +134,8 @@ public void invalidateAll() {
 	public void invalidateChunk(net.minecraft.resources.ResourceKey<Level> dimension, ChunkPos chunk) {
 		lock.writeLock().lock();
 		try {
-			int minX = (chunk.x << 4) - 1;
-			int minZ = (chunk.z << 4) - 1;
+			int minX = (chunk.x() << 4) - 1;
+			int minZ = (chunk.z() << 4) - 1;
 			for (BlockPos4D coord : new ArrayList<>(networkCache.keySet())) {
 				if (coord.dimension.equals(dimension) && coord.pos.getX() >= minX
 						&& coord.pos.getX() <= minX + 17 && coord.pos.getZ() >= minZ
diff --git a/src/main/java/zone/moddev/mc/basepower/gui/FilteredFluidTankGUI.java b/src/main/java/zone/moddev/mc/basepower/gui/FilteredFluidTankGUI.java
index e50225ac..7d745805 100644
--- a/src/main/java/zone/moddev/mc/basepower/gui/FilteredFluidTankGUI.java
+++ b/src/main/java/zone/moddev/mc/basepower/gui/FilteredFluidTankGUI.java
@@ -1,7 +1,5 @@
 package zone.moddev.mc.basepower.gui;
 
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
 import cyano.poweradvantage.api.fluid.FluidPoweredEntity;
 import cyano.poweradvantage.api.simple.SimpleMachineGUI;
@@ -18,7 +16,6 @@ public FilteredFluidTankGUI(Identifier image) {
 	}
 
 	@Override
-	@OnlyIn(Dist.CLIENT)
 	public void drawGUIDecorations(Object srcEntity, GUIContainer guiContainer, int x, int y, float z) {
 		// draw indicator
 		if (srcEntity instanceof FluidPoweredEntity) {
@@ -34,7 +31,6 @@ public void drawGUIDecorations(Object srcEntity, GUIContainer guiContainer, int
 	}
 
 
-	@OnlyIn(Dist.CLIENT)
 	public static void drawFluidBar(
 			FluidStack fs, float barHeight, int xPos, int yPos,
 			Identifier displayImage, GUIContainer guiContainer, int x, int y, float zLevel
diff --git a/src/main/java/zone/moddev/mc/basepower/gui/FluidTankGUI.java b/src/main/java/zone/moddev/mc/basepower/gui/FluidTankGUI.java
index 5dee7214..b97fa9f7 100644
--- a/src/main/java/zone/moddev/mc/basepower/gui/FluidTankGUI.java
+++ b/src/main/java/zone/moddev/mc/basepower/gui/FluidTankGUI.java
@@ -3,18 +3,7 @@
 import cyano.poweradvantage.api.fluid.FluidPoweredEntity;
 import cyano.poweradvantage.api.simple.SimpleMachineGUI;
 import zone.moddev.mc.basepower.math.Integer2D;
-import net.minecraft.client.gui.render.TextureSetup;
-import net.minecraft.client.gui.render.state.BlitRenderState;
-import net.minecraft.client.gui.render.state.GuiRenderState;
-import net.minecraft.client.gui.navigation.ScreenRectangle;
-import net.minecraft.client.renderer.RenderPipelines;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.data.AtlasIds;
 import net.minecraft.resources.Identifier;
-import net.minecraft.client.renderer.BiomeColors;
-import org.joml.Matrix3x2f;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import cyano.poweradvantage.api.fluid.FluidStack;
 
 
@@ -28,7 +17,6 @@ public FluidTankGUI(Identifier image) {
 	}
 
 	@Override
-	@OnlyIn(Dist.CLIENT)
 	public void drawGUIDecorations(Object srcEntity, GUIContainer guiContainer, int x, int y, float z) {
 		// draw indicator
 		if (srcEntity instanceof FluidPoweredEntity) {
@@ -44,7 +32,6 @@ public void drawGUIDecorations(Object srcEntity, GUIContainer guiContainer, int
 	}
 
 
-	@OnlyIn(Dist.CLIENT)
 	public static void drawFluidBar(
 			FluidStack fs, float barHeight, int xPos, int yPos,
 			Identifier displayImage, GUIContainer guiContainer, int x, int y, float zLevel
@@ -58,57 +45,16 @@ public static void drawFluidBar(
 	}
 
 
-	@OnlyIn(Dist.CLIENT)
 	public static void drawFluidFilledRectangle(
 			GUIContainer guiContainer, FluidStack fs,
 			int x, int y, int width, int height,
 			float zLevel
 	) {
-		if (fs == null || fs.getFluid() == null || width <= 0 || height <= 0) return;
-		// The atlas supplies the current animation frame; water's sprite is grayscale.
-		var fluidStack = zone.moddev.mc.basepower.util.ForgeFluidAdapter.toForge(fs);
-		var rendering = net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions.of(fs.getFluid());
-		var stillTexture = rendering.getStillTexture(fluidStack);
-		if (stillTexture == null) return;
-        var atlas = guiContainer.getMinecraft().getAtlasManager().getAtlasOrThrow(AtlasIds.BLOCKS);
-        TextureAtlasSprite sprite = atlas.getSprite(stillTexture);
-		int color = rendering.getTintColor(fluidStack);
-		if (fs.getFluid().isSame(net.minecraft.world.level.material.Fluids.WATER)) {
-			color = guiContainer.getMinecraft().level != null && guiContainer.getMinecraft().player != null
-					? BiomeColors.getAverageWaterColor(guiContainer.getMinecraft().level, guiContainer.getMinecraft().player.blockPosition()) : 0x3F76E4;
-		}
-        var graphics = guiContainer.getGraphics();
-        var texture = TextureSetup.singleTexture(atlas.getTextureView(), atlas.getSampler());
-        extractFluidTiles(graphics.getRenderState(), texture, new Matrix3x2f(graphics.pose()),
-                graphics.getScissorStack().peek(), x, y, width, height,
-                sprite.getU0(), sprite.getU1(), sprite.getV0(), sprite.getV1(), color);
+        zone.moddev.mc.basepower.client.FluidGaugeRenderer.draw(guiContainer, fs, x, y, width, height);
     }
 
     static int gaugeHeight(float level) {
         return (int) (60 * (Float.isFinite(level) ? Math.max(0F, Math.min(1F, level)) : 0F));
     }
 
-    @OnlyIn(Dist.CLIENT)
-    static void extractFluidTiles(GuiRenderState target, TextureSetup texture, Matrix3x2f pose,
-            ScreenRectangle scissor, int x, int y, int width, int height,
-            float spriteU0, float spriteU1, float spriteV0, float spriteV1, int color) {
-        if (width <= 0 || height <= 0) return;
-        // Legacy gauges use the fluid's RGB tint and texture alpha, not its tint alpha.
-        color = 0xFF000000 | (color & 0xFFFFFF);
-		final int tileSize = 16;
-		for (int dy = 0; dy < height; dy += tileSize) {
-			int tileHeight = Math.min(tileSize, height - dy);
-			for (int dx = 0; dx < width; dx += tileSize) {
-				int tileWidth = Math.min(tileSize, width - dx);
-				// Sprite coordinates are fractions of the tile, even when drawing only part of it.
-                float u1 = spriteU0 + (spriteU1 - spriteU0) * tileWidth / tileSize;
-                float v1 = spriteV0 + (spriteV1 - spriteV0) * tileHeight / tileSize;
-                target.submitGuiElement(new BlitRenderState(
-                        RenderPipelines.GUI_TEXTURED, texture, new Matrix3x2f(pose),
-                        x + dx, y + dy, x + dx + tileWidth, y + dy + tileHeight,
-                        spriteU0, u1, spriteV0, v1, color, scissor));
-			}
-		}
-	}
-
 }
diff --git a/src/main/java/zone/moddev/mc/basepower/gui/StillGUI.java b/src/main/java/zone/moddev/mc/basepower/gui/StillGUI.java
index 572ea016..cab1804c 100644
--- a/src/main/java/zone/moddev/mc/basepower/gui/StillGUI.java
+++ b/src/main/java/zone/moddev/mc/basepower/gui/StillGUI.java
@@ -1,7 +1,5 @@
 package zone.moddev.mc.basepower.gui;
 
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
 import cyano.poweradvantage.api.simple.SimpleMachineGUI;
 import zone.moddev.mc.basepower.machines.fluidmachines.StillTileEntity;
@@ -18,7 +16,6 @@ public StillGUI(Identifier image) {
 	}
 
 	@Override
-	@OnlyIn(Dist.CLIENT)
 	public void drawGUIDecorations(Object srcEntity, GUIContainer guiContainer, int x, int y, float z) {
 		// draw indicator
 		if (srcEntity instanceof StillTileEntity) {
diff --git a/src/main/java/zone/moddev/mc/basepower/init/Fluids.java b/src/main/java/zone/moddev/mc/basepower/init/Fluids.java
index 4b2d8504..740688f7 100644
--- a/src/main/java/zone/moddev/mc/basepower/init/Fluids.java
+++ b/src/main/java/zone/moddev/mc/basepower/init/Fluids.java
@@ -18,8 +18,6 @@
 import net.minecraft.core.Registry;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.LevelReader;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions;
 
 import net.minecraftforge.fluids.FluidType;
@@ -89,10 +87,7 @@ private static FluidType oilType(String name, int density, int viscosity) {
         return new FluidType(FluidType.Properties.create().descriptionId("fluid.basepower." + name)
                 .density(density).viscosity(viscosity).temperature(300)) {
             @Override public void initializeClient(Consumer<IClientFluidTypeExtensions> consumer) {
-                consumer.accept(new IClientFluidTypeExtensions() {
-                    @Override public Identifier getStillTexture() { return id("blocks/" + name + "_still"); }
-                    @Override public Identifier getFlowingTexture() { return id("blocks/" + name + "_flow"); }
-                });
+                consumer.accept(zone.moddev.mc.basepower.client.ClientOilRenderer.extensions(name));
             }
         };
     }
diff --git a/src/main/java/zone/moddev/mc/basepower/init/Villages.java b/src/main/java/zone/moddev/mc/basepower/init/Villages.java
deleted file mode 100644
index f6040b3a..00000000
--- a/src/main/java/zone/moddev/mc/basepower/init/Villages.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package zone.moddev.mc.basepower.init;
-
-import net.minecraft.world.entity.npc.villager.VillagerProfession;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.trading.MerchantOffer;
-import net.minecraft.world.item.trading.ItemCost;
-import net.minecraftforge.event.village.VillagerTradesEvent;
-
-/** The old farmer and toolsmith careers now have their own vanilla professions. */
-public final class Villages {
-    private Villages() {}
-
-    public static void onTrades(VillagerTradesEvent event) {
-        if (event.getType() == VillagerProfession.TOOLSMITH) {
-            event.getTrades().get(1).add((level, villager, random) -> new MerchantOffer(
-                    new ItemCost(net.minecraft.world.item.Items.EMERALD),
-                    new ItemStack(Items.sprocket, 1 + random.nextInt(4)), 7, 1, 0.0F));
-        } else if (event.getType() == VillagerProfession.FARMER) {
-            event.getTrades().get(1).add((level, villager, random) -> new MerchantOffer(
-                    new ItemCost(net.minecraft.world.item.Items.EMERALD),
-                    new ItemStack(Items.bioplastic_ingot, 4 + random.nextInt(5)), 7, 1, 0.0F));
-        }
-    }
-}
diff --git a/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/FluidDischargeTileEntity.java b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/FluidDischargeTileEntity.java
index 0bc4990f..532e4033 100644
--- a/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/FluidDischargeTileEntity.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/FluidDischargeTileEntity.java
@@ -66,7 +66,7 @@ private static BlockPos findPlacement(Level world, BlockPos initial, Fluid fluid
                 }
             }
             if (candidates.isEmpty()) return null;
-            position = candidates.get(candidates.size() == 1 ? 0 : world.random.nextInt(candidates.size()));
+            position = candidates.get(candidates.size() == 1 ? 0 : world.getRandom().nextInt(candidates.size()));
         }
         return null;
     }
diff --git a/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/FluidDrainTileEntity.java b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/FluidDrainTileEntity.java
index 4b6a9554..3a42918d 100644
--- a/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/FluidDrainTileEntity.java
+++ b/src/main/java/zone/moddev/mc/basepower/machines/fluidmachines/FluidDrainTileEntity.java
@@ -104,7 +104,7 @@ public static BlockPos scanFluidSpaceForSourceBlock(Level world, BlockPos initia
                         || candidateState.getType().isSame(state.getType()))) candidates.add(candidate);
             }
             if (candidates.isEmpty()) return null;
-            position = candidates.get(candidates.size() == 1 ? 0 : world.random.nextInt(candidates.size()));
+            position = candidates.get(candidates.size() == 1 ? 0 : world.getRandom().nextInt(candidates.size()));
         }
         return null;
     }
diff --git a/src/main/java/zone/moddev/mc/basepower/migration/BaseMetalsLegacyMigration.java b/src/main/java/zone/moddev/mc/basepower/migration/BaseMetalsLegacyMigration.java
index 95715db1..df31c951 100644
--- a/src/main/java/zone/moddev/mc/basepower/migration/BaseMetalsLegacyMigration.java
+++ b/src/main/java/zone/moddev/mc/basepower/migration/BaseMetalsLegacyMigration.java
@@ -16,6 +16,11 @@ public static void register() {
                 new BaseMetalsLegacyMigration());
     }
 
+    @Override
+    public void prepareWorld(CompoundTag levelSnapshot) {
+        LegacyWorldDataHook.prepareLegacyEnchantmentContext(levelSnapshot);
+    }
+
     @Override
     public boolean prepareData(CompoundTag payload, int dataVersion, Payload kind) {
         return LegacyWorldDataHook.prepareExternalPayload(payload, kind == Payload.PLAYER);
diff --git a/src/main/java/zone/moddev/mc/basepower/migration/LegacyOreSpawnRegistryAliases.java b/src/main/java/zone/moddev/mc/basepower/migration/LegacyOreSpawnRegistryAliases.java
new file mode 100644
index 00000000..10a3e2a7
--- /dev/null
+++ b/src/main/java/zone/moddev/mc/basepower/migration/LegacyOreSpawnRegistryAliases.java
@@ -0,0 +1,49 @@
+package zone.moddev.mc.basepower.migration;
+
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.Identifier;
+import net.minecraftforge.registries.ForgeRegistry;
+import net.minecraftforge.registries.RegisterEvent;
+
+/** Keeps OreSpawn's initial legacy import valid until its profile is canonicalised. */
+public final class LegacyOreSpawnRegistryAliases {
+    private static final Identifier OLD_QUARTZ = Identifier.parse("minecraft:quartz_ore");
+    private static final Identifier QUARTZ = Identifier.parse("minecraft:nether_quartz_ore");
+
+    private LegacyOreSpawnRegistryAliases() {}
+
+    public static void register(RegisterEvent event) {
+        if (!event.getRegistryKey().equals(Registries.BLOCK)) return;
+        if (!(event.getForgeRegistry() instanceof ForgeRegistry<?> registry)) {
+            throw new IllegalStateException("Legacy ore aliases require Forge's block registry");
+        }
+        install(registry, OLD_QUARTZ, QUARTZ);
+    }
+
+    static <T> void install(ForgeRegistry<T> registry, Identifier oldId, Identifier currentId) {
+        if (!registry.getKeys().contains(currentId)) {
+            throw new IllegalStateException("Missing canonical legacy ore target: " + currentId);
+        }
+        T target = registry.getRaw(currentId);
+        if (target == null || !currentId.equals(registry.getKey(target))) {
+            throw new IllegalStateException("Missing canonical legacy ore target: " + currentId);
+        }
+        var aliases = registry.makeSnapshot().aliases;
+        var seen = new java.util.HashSet<Identifier>();
+        Identifier resolved = oldId;
+        while (!registry.getKeys().contains(resolved) && aliases.containsKey(resolved)) {
+            if (!seen.add(resolved)) throw new IllegalStateException("Conflicting legacy ore alias cycle: " + oldId);
+            resolved = aliases.get(resolved);
+        }
+        if (aliases.containsKey(oldId) && !registry.getKeys().contains(resolved)) {
+            throw new IllegalStateException("Conflicting dangling legacy ore alias: " + oldId);
+        }
+        T existing = registry.getRaw(oldId);
+        if (existing != null) {
+            if (existing != target) throw new IllegalStateException("Conflicting legacy ore alias: " + oldId);
+            return;
+        }
+        // Forge aliases change lookup only, without adding a block, item or numeric ID.
+        registry.addAlias(oldId, currentId);
+    }
+}
diff --git a/src/main/java/zone/moddev/mc/basepower/migration/LegacyWorldDataHook.java b/src/main/java/zone/moddev/mc/basepower/migration/LegacyWorldDataHook.java
index 62f9e239..4d132400 100644
--- a/src/main/java/zone/moddev/mc/basepower/migration/LegacyWorldDataHook.java
+++ b/src/main/java/zone/moddev/mc/basepower/migration/LegacyWorldDataHook.java
@@ -36,7 +36,6 @@
 import net.minecraft.nbt.NbtUtils;
 import net.minecraft.resources.Identifier;
 import net.minecraft.util.datafix.fixes.BlockStateData;
-import net.minecraftforge.fml.util.ObfuscationReflectionHelper;
 import net.minecraftforge.registries.ForgeRegistries;
 import zone.moddev.mc.basepower.PowerAdvantage;
 
@@ -65,9 +64,10 @@ public static synchronized void prepareLegacyWorld(File levelDat) {
         LEGACY_ENCHANTMENTS.clear();
         LEGACY_CHUNKS.clear();
         LEGACY_BLOCK_COUNTS.clear();
-        prepareForgeRegistryMetadata(levelDat);
-        File source = legacyRegistrySource(levelDat);
         try {
+            OreSpawnProfileMigration.migrateWorld(levelDat.toPath().toAbsolutePath().getParent());
+            prepareForgeRegistryMetadata(levelDat);
+            File source = legacyRegistrySource(levelDat);
             if (source != null) {
                 try (FileInputStream input = new FileInputStream(source)) {
                     CompoundTag registryArchive = NbtIo.readCompressed(input, NbtAccounter.unlimitedHeap());
@@ -394,6 +394,12 @@ private static int installLegacyBlockStates(CompoundTag snapshot) {
         return mapped;
     }
 
+    static synchronized void prepareLegacyEnchantmentContext(CompoundTag levelSnapshot) {
+        // Base Metals can flatten entity inventories before our selected-world hook.
+        // Resolve their numeric enchantments from this world's index, never a previous load.
+        installLegacyEnchantments(levelSnapshot.getCompoundOrEmpty("FML").getCompoundOrEmpty("Registries"));
+    }
+
     private static void installLegacyEnchantments(CompoundTag registries) {
         LEGACY_ENCHANTMENTS.clear();
         ListTag entries = registries.getCompoundOrEmpty("minecraft:enchantments").getListOrEmpty("ids");
@@ -450,14 +456,17 @@ private static boolean migrateEnchantmentList(CompoundTag compound, String key,
     private static void migrateLoosePlayerData(File levelDat, CompoundTag root) throws IOException {
         boolean changed = migrateLegacyNbt(root) > 0;
         if (changed && levelDat.isFile()) writeWithBackup(levelDat, root);
-        File playerData = new File(levelDat.getParentFile(), "playerdata");
-        File[] files = playerData.listFiles((directory, name) -> name.endsWith(".dat"));
-        if (files == null) return;
-        Arrays.sort(files);
-        for (File file : files) {
-            try (FileInputStream input = new FileInputStream(file)) {
-                CompoundTag player = NbtIo.readCompressed(input, NbtAccounter.unlimitedHeap());
-                if (migrateLegacyNbt(player) > 0) writeWithBackup(file, player);
+        // Native file fixing moves playerdata to players/data; reopen must handle the new location too.
+        for (String directory : List.of("playerdata", "players/data")) {
+            File[] files = new File(levelDat.getParentFile(), directory)
+                    .listFiles((parent, name) -> name.endsWith(".dat"));
+            if (files == null) continue;
+            Arrays.sort(files);
+            for (File file : files) {
+                try (FileInputStream input = new FileInputStream(file)) {
+                    CompoundTag player = NbtIo.readCompressed(input, NbtAccounter.unlimitedHeap());
+                    if (migrateLegacyNbt(player) > 0) writeWithBackup(file, player);
+                }
             }
         }
     }
@@ -602,15 +611,32 @@ public static Map<Long, Integer> legacyPreparedBlockCounts() {
 
     static int indexLegacyChunks(File worldDirectory) {
         LEGACY_CHUNKS.clear();
-        return indexLegacyChunks(Identifier.parse("overworld"), new File(worldDirectory, "region"))
+        int indexed = indexLegacyChunks(Identifier.parse("overworld"), new File(worldDirectory, "region"))
                 + indexLegacyChunks(Identifier.parse("the_nether"), new File(worldDirectory, "DIM-1/region"))
                 + indexLegacyChunks(Identifier.parse("the_end"), new File(worldDirectory, "DIM1/region"));
+        Path dimensions = worldDirectory.toPath().resolve("dimensions");
+        if (Files.isDirectory(dimensions)) {
+            try (var directories = Files.walk(dimensions)) {
+                for (Path directory : directories.filter(Files::isDirectory)
+                        .filter(path -> path.getFileName().toString().equals("region")).toList()) {
+                    Path relative = dimensions.relativize(directory.getParent());
+                    if (relative.getNameCount() < 2) continue;
+                    Identifier dimension = Identifier.tryParse(relative.getName(0) + ":"
+                            + relative.subpath(1, relative.getNameCount()).toString().replace(File.separatorChar, '/'));
+                    if (dimension != null) indexed += indexLegacyChunks(dimension, directory.toFile());
+                }
+            } catch (IOException exception) {
+                throw new IllegalStateException("Could not inspect saved dimension paths in " + dimensions, exception);
+            }
+        }
+        return indexed;
     }
 
     private static int indexLegacyChunks(Identifier dimension, File regionDirectory) {
         File[] regions = regionDirectory.listFiles((directory, name) -> name.matches("r\\.-?\\d+\\.-?\\d+\\.mc[ar]"));
         if (regions == null) return 0;
-        Set<Long> chunks = ConcurrentHashMap.newKeySet();
+        Set<Long> chunks = LEGACY_CHUNKS.computeIfAbsent(dimension, ignored -> ConcurrentHashMap.newKeySet());
+        int previous = chunks.size();
         byte[] locations = new byte[4096];
         for (File region : regions) {
             String[] parts = region.getName().split("\\.");
@@ -636,7 +662,7 @@ private static int indexLegacyChunks(Identifier dimension, File regionDirectory)
             }
         }
         LEGACY_CHUNKS.put(dimension, chunks);
-        return chunks.size();
+        return chunks.size() - previous;
     }
 
     @SuppressWarnings("unchecked")
diff --git a/src/main/java/zone/moddev/mc/basepower/migration/LegacyWorldMetadata.java b/src/main/java/zone/moddev/mc/basepower/migration/LegacyWorldMetadata.java
index f89744a7..fee0eed2 100644
--- a/src/main/java/zone/moddev/mc/basepower/migration/LegacyWorldMetadata.java
+++ b/src/main/java/zone/moddev/mc/basepower/migration/LegacyWorldMetadata.java
@@ -23,17 +23,17 @@ private LegacyWorldMetadata() {}
     public static CompoundTag read(File levelDat) throws IOException {
         LegacyWorldDataHook.prepareForgeRegistryMetadata(levelDat);
         CompoundTag root = NbtIo.readCompressed(levelDat.toPath(), NbtAccounter.unlimitedHeap());
-        remap(root, ModList.get()::isLoaded);
+        remap(root, ModList::isLoaded);
         return root;
     }
 
     public static Tag remapLightweight(Tag root) {
-        if (root instanceof CompoundTag compound) remap(compound, ModList.get()::isLoaded);
+        if (root instanceof CompoundTag compound) remap(compound, ModList::isLoaded);
         return root;
     }
 
     public static CompoundTag remapRaw(CompoundTag root) {
-        remap(root, ModList.get()::isLoaded);
+        remap(root, ModList::isLoaded);
         return root;
     }
 
diff --git a/src/main/java/zone/moddev/mc/basepower/migration/OreSpawnProfileMigration.java b/src/main/java/zone/moddev/mc/basepower/migration/OreSpawnProfileMigration.java
new file mode 100644
index 00000000..f56563d7
--- /dev/null
+++ b/src/main/java/zone/moddev/mc/basepower/migration/OreSpawnProfileMigration.java
@@ -0,0 +1,98 @@
+package zone.moddev.mc.basepower.migration;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import cyano.poweradvantage.api.migration.LegacyMigrationApi;
+import cyano.poweradvantage.api.migration.LegacyOreSpawnProfileMigration;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import net.minecraft.resources.Identifier;
+import net.minecraft.world.level.storage.LevelResource;
+import net.minecraftforge.event.server.ServerAboutToStartEvent;
+import net.minecraftforge.eventbus.api.listener.Priority;
+import zone.moddev.mc.basepower.PowerAdvantage;
+
+/** Runs output migrations before OreSpawn reads global or selected-world profiles. */
+public final class OreSpawnProfileMigration {
+    private static final Map<String, JsonObject> DEFAULTS = new LinkedHashMap<>();
+
+    private OreSpawnProfileMigration() {}
+
+    public static void registerServerHook() {
+        ServerAboutToStartEvent.BUS.addListener(Priority.HIGHEST, OreSpawnProfileMigration::prepareServerProfile);
+    }
+
+    private static void prepareServerProfile(ServerAboutToStartEvent event) {
+        try {
+            // New worlds can have a pack-supplied profile without any level.dat to datafix.
+            migrateWorld(event.getServer().getWorldPath(LevelResource.ROOT).normalize());
+        } catch (IOException exception) {
+            throw new IllegalStateException("Could not safely prepare the selected OreSpawn world profile", exception);
+        }
+    }
+
+    public static void registerPowerProvider(Path configDirectory) throws IOException {
+        String resource = "/data/basepower/orespawn/provider.json";
+        try (InputStream input = OreSpawnProfileMigration.class.getResourceAsStream(resource)) {
+            if (input == null) throw new IOException("Missing owned OreSpawn defaults: " + resource);
+            try (InputStreamReader reader = new InputStreamReader(input, StandardCharsets.UTF_8)) {
+                registerProvider(configDirectory, JsonParser.parseReader(reader).getAsJsonObject());
+            }
+        }
+    }
+
+    /** Called during mod construction, using pure JSON rather than unbound block holders. */
+    public static synchronized void registerProvider(Path configDirectory, JsonObject defaults) throws IOException {
+        String owner = defaults.get("provider_modid").getAsString();
+        if (!owner.equals("basepower") && !owner.equals("baseelectric")) {
+            throw new IllegalArgumentException("Not an Advantage generation provider: " + owner);
+        }
+        JsonObject previous = DEFAULTS.putIfAbsent(owner, defaults.deepCopy());
+        if (previous != null && !previous.equals(defaults)) {
+            throw new IllegalStateException("Conflicting OreSpawn migration defaults for " + owner);
+        }
+        migrate(configDirectory.resolve("orespawn-worldgen.json"), defaults);
+        migrate(configDirectory.resolve(owner + "-orespawn.json"), defaults);
+    }
+
+    /** The caller already owns the selected world's storage lock; no preview path calls this. */
+    public static synchronized void migrateWorld(Path worldDirectory) throws IOException {
+        Path profile = worldDirectory.resolve("serverconfig").resolve("orespawn-worldgen.json");
+        for (JsonObject defaults : DEFAULTS.values()) migrate(profile, defaults);
+    }
+
+    /** OreSpawn can import old vanilla rules during common setup, after our constructors. */
+    public static synchronized boolean migrateLateProfiles(Path configDirectory) throws IOException {
+        boolean changed = false;
+        for (Map.Entry<String, JsonObject> entry : DEFAULTS.entrySet()) {
+            changed |= migrate(configDirectory.resolve("orespawn-worldgen.json"), entry.getValue());
+            changed |= migrate(configDirectory.resolve(entry.getKey() + "-orespawn.json"), entry.getValue());
+        }
+        return changed;
+    }
+
+    private static boolean migrate(Path path, JsonObject defaults) throws IOException {
+        LegacyOreSpawnProfileMigration.Result result = LegacyOreSpawnProfileMigration.migrate(
+                path, defaults, OreSpawnProfileMigration::declaredTarget);
+        if (result.status() == LegacyOreSpawnProfileMigration.Status.REFUSED) {
+            throw new IOException("OreSpawn profile needs review before terrain generation: " + path
+                    + "; " + result.plan().getProblems() + "; report: " + result.reportFile());
+        }
+        if (result.wasMigrated()) {
+            PowerAdvantage.LOGGER.info("Preserved OreSpawn placement settings while migrating {} profile entries in '{}'; report: {}",
+                    result.plan().getChanges().size(), path, result.reportFile());
+        }
+        return result.wasMigrated();
+    }
+
+    static boolean declaredTarget(String name) {
+        if (name.equals("minecraft:nether_quartz_ore")) return true;
+        Identifier id = Identifier.tryParse(name);
+        return id != null && LegacyMigrationApi.blockStateCodecs().containsKey(id);
+    }
+}
diff --git a/src/main/java/zone/moddev/mc/basepower/mixin/LevelStorageSourceMixin.java b/src/main/java/zone/moddev/mc/basepower/mixin/LevelStorageSourceMixin.java
index 1ee41ac0..bfb95ca4 100644
--- a/src/main/java/zone/moddev/mc/basepower/mixin/LevelStorageSourceMixin.java
+++ b/src/main/java/zone/moddev/mc/basepower/mixin/LevelStorageSourceMixin.java
@@ -1,32 +1,18 @@
 package zone.moddev.mc.basepower.mixin;
 
 import java.nio.file.Path;
-import com.mojang.datafixers.DataFixer;
-import com.mojang.serialization.Dynamic;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.Tag;
-import net.minecraft.util.datafix.DataFixTypes;
 import net.minecraft.world.level.storage.LevelStorageSource;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-import zone.moddev.mc.basepower.migration.LegacyPlayerDataFixes;
-import zone.moddev.mc.basepower.migration.LegacyWorldDataHook;
 import zone.moddev.mc.basepower.migration.LegacyWorldMetadata;
 
-/** Captures original registry identities before native level and player conversion. */
+/** Applies saved registry aliases to raw level data and read-only world summaries. */
 @Mixin(LevelStorageSource.class)
 abstract class LevelStorageSourceMixin {
-    @Inject(method = "readLevelDataTagFixed", at = @At("HEAD"))
-    private static void basepower$prepareWorld(Path file, DataFixer fixer,
-            CallbackInfoReturnable<Dynamic<?>> callback) {
-        if (file.getFileName().toString().equals("level.dat")) {
-            LegacyWorldDataHook.prepareLegacyWorld(file.toFile());
-        }
-    }
-
     @Inject(method = "readLevelDataTagRaw", at = @At("RETURN"), cancellable = true)
     private static void basepower$remapRaw(Path file, CallbackInfoReturnable<CompoundTag> callback) {
         callback.setReturnValue(LegacyWorldMetadata.remapRaw(callback.getReturnValue()));
@@ -37,12 +23,4 @@ abstract class LevelStorageSourceMixin {
         callback.setReturnValue(LegacyWorldMetadata.remapLightweight(callback.getReturnValue()));
     }
 
-    @Redirect(method = "*", at = @At(value = "INVOKE", target =
-            "Lnet/minecraft/util/datafix/DataFixTypes;updateToCurrentVersion(Lcom/mojang/datafixers/DataFixer;Lcom/mojang/serialization/Dynamic;I)Lcom/mojang/serialization/Dynamic;"))
-    private static <T> Dynamic<T> basepower$preserveEmbeddedPlayer(DataFixTypes type, DataFixer fixer,
-            Dynamic<T> source, int version) {
-        return type == DataFixTypes.PLAYER
-                ? LegacyPlayerDataFixes.updateNativeEmbeddedPlayer(type, fixer, source, version)
-                : type.updateToCurrentVersion(fixer, source, version);
-    }
 }
diff --git a/src/main/java/zone/moddev/mc/basepower/mixin/SelectedWorldStorageMixin.java b/src/main/java/zone/moddev/mc/basepower/mixin/SelectedWorldStorageMixin.java
new file mode 100644
index 00000000..8076a2ed
--- /dev/null
+++ b/src/main/java/zone/moddev/mc/basepower/mixin/SelectedWorldStorageMixin.java
@@ -0,0 +1,27 @@
+package zone.moddev.mc.basepower.mixin;
+
+import java.nio.file.Path;
+import com.mojang.serialization.Dynamic;
+import net.minecraft.world.level.storage.LevelResource;
+import net.minecraft.world.level.storage.LevelStorageSource;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import zone.moddev.mc.basepower.migration.LegacyWorldDataHook;
+
+/** Captures the locked, selected world before native file relocation and data fixing. */
+@Mixin(LevelStorageSource.LevelStorageAccess.class)
+abstract class SelectedWorldStorageMixin {
+    @Shadow public abstract Path getLevelPath(LevelResource resource);
+
+    @Inject(method = "getUnfixedDataTag", at = @At(value = "INVOKE", target =
+            "Lnet/minecraft/world/level/storage/LevelStorageSource;readLevelDataTagRaw(Ljava/nio/file/Path;)Lnet/minecraft/nbt/CompoundTag;"))
+    private void basepower$prepareWorld(boolean useFallback, CallbackInfoReturnable<Dynamic<?>> callback) {
+        // The native method has checked its session lock. Never mutate previews or fallback files.
+        if (!useFallback) {
+            LegacyWorldDataHook.prepareLegacyWorld(getLevelPath(LevelResource.LEVEL_DATA_FILE).toFile());
+        }
+    }
+}
diff --git a/src/main/java/zone/moddev/mc/basepower/mixin/SimpleRegionStorageMixin.java b/src/main/java/zone/moddev/mc/basepower/mixin/SimpleRegionStorageMixin.java
index 38f390cc..863d3e41 100644
--- a/src/main/java/zone/moddev/mc/basepower/mixin/SimpleRegionStorageMixin.java
+++ b/src/main/java/zone/moddev/mc/basepower/mixin/SimpleRegionStorageMixin.java
@@ -20,24 +20,24 @@ abstract class SimpleRegionStorageMixin {
         callback.setReturnValue(LegacyWorldDataHook.copyChunkReadForMigration(callback.getReturnValue()));
     }
 
-    @Inject(method = "upgradeChunkTag(Lnet/minecraft/nbt/CompoundTag;ILnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/nbt/CompoundTag;",
+    @Inject(method = "upgradeChunkTag(Lnet/minecraft/nbt/CompoundTag;ILnet/minecraft/nbt/CompoundTag;I)Lnet/minecraft/nbt/CompoundTag;",
             at = @At("HEAD"))
-    private void basepower$prepareChunk(CompoundTag chunk, int fallback, CompoundTag context,
+    private void basepower$prepareChunk(CompoundTag chunk, int fallback, CompoundTag context, int targetVersion,
             CallbackInfoReturnable<CompoundTag> callback) {
         LegacyWorldDataHook.prepareLegacyChunk(chunk);
     }
 
-    @Inject(method = "upgradeChunkTag(Lnet/minecraft/nbt/CompoundTag;ILnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/nbt/CompoundTag;",
+    @Inject(method = "upgradeChunkTag(Lnet/minecraft/nbt/CompoundTag;ILnet/minecraft/nbt/CompoundTag;I)Lnet/minecraft/nbt/CompoundTag;",
             at = @At(value = "INVOKE", target = "Lnet/minecraft/nbt/NbtUtils;getDataVersion(Lnet/minecraft/nbt/CompoundTag;I)I"))
-    private void basepower$prepareInventories(CompoundTag chunk, int fallback, CompoundTag context,
+    private void basepower$prepareInventories(CompoundTag chunk, int fallback, CompoundTag context, int targetVersion,
             CallbackInfoReturnable<CompoundTag> callback) {
         // Both mods' HEAD hooks have run before machine/entity payloads are staged.
         LegacyWorldDataHook.prepareLegacyEntities(chunk);
     }
 
-    @Inject(method = "upgradeChunkTag(Lnet/minecraft/nbt/CompoundTag;ILnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/nbt/CompoundTag;",
+    @Inject(method = "upgradeChunkTag(Lnet/minecraft/nbt/CompoundTag;ILnet/minecraft/nbt/CompoundTag;I)Lnet/minecraft/nbt/CompoundTag;",
             at = @At("RETURN"))
-    private void basepower$finishChunk(CompoundTag chunk, int fallback, CompoundTag context,
+    private void basepower$finishChunk(CompoundTag chunk, int fallback, CompoundTag context, int targetVersion,
             CallbackInfoReturnable<CompoundTag> callback) {
         // Mutate the native result without cancelling other mods' return hooks.
         LegacyWorldDataHook.finalizeLegacyChunk(callback.getReturnValue());
diff --git a/src/main/java/zone/moddev/mc/basepower/recipe/MaterialPolicyPack.java b/src/main/java/zone/moddev/mc/basepower/recipe/MaterialPolicyPack.java
index e2d84d0a..f2dd97bc 100644
--- a/src/main/java/zone/moddev/mc/basepower/recipe/MaterialPolicyPack.java
+++ b/src/main/java/zone/moddev/mc/basepower/recipe/MaterialPolicyPack.java
@@ -34,7 +34,7 @@ final class MaterialPolicyPack implements PackResources {
     MaterialPolicyPack() {
         // Pack instances are created for each reload, after common config loading.
         this(PowerAdvantage.plasticIsAlsoRubber,
-                PowerAdvantage.recipeMode == RecipeMode.NORMAL && ModList.get().isLoaded("baseelectric"));
+                PowerAdvantage.recipeMode == RecipeMode.NORMAL && ModList.isLoaded("baseelectric"));
     }
 
     MaterialPolicyPack(boolean plasticIsRubber, boolean normalSolder) {
diff --git a/src/main/java/zone/moddev/mc/basepower/recipe/PartsLoot.java b/src/main/java/zone/moddev/mc/basepower/recipe/PartsLoot.java
index 5b2211a8..0ff51427 100644
--- a/src/main/java/zone/moddev/mc/basepower/recipe/PartsLoot.java
+++ b/src/main/java/zone/moddev/mc/basepower/recipe/PartsLoot.java
@@ -49,7 +49,7 @@ protected ObjectArrayList<ItemStack> doApply(net.minecraft.world.level.storage.l
         var resourceManager = context.getLevel().getServer().getResourceManager();
         String source = resourceManager.getResource(table.withPath(path -> "loot_table/" + path + ".json"))
                 .map(Resource::sourcePackId).orElse("");
-        for (Identifier extra : partTables(table, source, ModList.get()::isLoaded)) {
+        for (Identifier extra : partTables(table, source, ModList::isLoaded)) {
             var key = ResourceKey.create(Registries.LOOT_TABLE, extra);
             context.getResolver().lookupOrThrow(Registries.LOOT_TABLE).get(key)
                     .ifPresent(holder -> holder.value().getRandomItemsRaw(context, loot::add));
@@ -70,7 +70,7 @@ private static boolean isChest(Identifier table) {
     }
 
     private static boolean hasAdditionalLootTables() {
-        return ModList.get().getMods().stream().anyMatch(mod -> mod.getModId().replace("_", "").replace("-", "")
+        return ModList.getMods().stream().anyMatch(mod -> mod.getModId().replace("_", "").replace("-", "")
                 .equals("additionalloottables"));
     }
 }
diff --git a/src/main/java/zone/moddev/mc/basepower/registry/FuelRegistry.java b/src/main/java/zone/moddev/mc/basepower/registry/FuelRegistry.java
index 607050f4..d1aef72c 100644
--- a/src/main/java/zone/moddev/mc/basepower/registry/FuelRegistry.java
+++ b/src/main/java/zone/moddev/mc/basepower/registry/FuelRegistry.java
@@ -161,9 +161,10 @@ public static ItemStack decrementFuelItem(ItemStack fuelItem){
 		if(fuelItem == null) return null;
 		List<Function<ItemStack, ItemStack>> list = FuelRegistry.getInstance().getPostBurnAlgorithmsForItem(fuelItem.getItem());
 		if(list.isEmpty()){
+			var remainder = fuelItem.getCount() == 1 ? fuelItem.getCraftingRemainder() : null;
 			fuelItem.shrink(1);
 			if(fuelItem.isEmpty()){
-				fuelItem = fuelItem.getCraftingRemainder();
+				fuelItem = remainder == null ? ItemStack.EMPTY : remainder.create();
 			}
 		} else {
 			for (Function<ItemStack, ItemStack> algorithm : list) {
diff --git a/src/main/java/zone/moddev/mc/basepower/registry/ITileEntityGUI.java b/src/main/java/zone/moddev/mc/basepower/registry/ITileEntityGUI.java
index ab581433..47ef913f 100644
--- a/src/main/java/zone/moddev/mc/basepower/registry/ITileEntityGUI.java
+++ b/src/main/java/zone/moddev/mc/basepower/registry/ITileEntityGUI.java
@@ -2,8 +2,6 @@
 
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
 /**
  * This interface is used to combine the two different classes of a block GUI 
@@ -30,6 +28,5 @@ public interface ITileEntityGUI {
 	 * @param player The player that is going to use the GUI
 	 * @return An instance of net.minecraft.client.gui.screen.inventory.ContainerScreen
 	 */
-	@OnlyIn(Dist.CLIENT)
 	public abstract net.minecraft.client.gui.screens.inventory.AbstractContainerScreen getContainerGUI(BlockEntity e, Player player);
-}
\ No newline at end of file
+}
diff --git a/src/main/java/zone/moddev/mc/basepower/registry/MachineGUIRegistry.java b/src/main/java/zone/moddev/mc/basepower/registry/MachineGUIRegistry.java
index 126906a6..27184038 100644
--- a/src/main/java/zone/moddev/mc/basepower/registry/MachineGUIRegistry.java
+++ b/src/main/java/zone/moddev/mc/basepower/registry/MachineGUIRegistry.java
@@ -16,8 +16,6 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.level.Level;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.common.extensions.IForgeMenuType;
 import net.minecraft.resources.Identifier;
 import net.minecraftforge.registries.ForgeRegistries;
@@ -74,7 +72,6 @@ private static SimpleMachineGUI definition(int id) {
         return (SimpleMachineGUI) gui;
     }
 
-    @OnlyIn(Dist.CLIENT)
     public static void registerScreens() {
         MenuScreens.<SimpleMachineGUI.Container, SimpleMachineGUI.GUIContainer>register(TYPE,
                 (container, inventory, title) -> container.createScreen(inventory, title));
@@ -108,7 +105,6 @@ public Object getServerGuiElement(int id, Player player, Level world, int x, int
         return gui == null || tile == null ? null : gui.getContainer(tile, player);
     }
 
-    @OnlyIn(Dist.CLIENT)
     public Object getClientGuiElement(int id, Player player, Level world, int x, int y, int z) {
         ITileEntityGUI gui = DEFINITIONS.get(id);
         BlockEntity tile = world.getBlockEntity(new BlockPos(x, y, z));
diff --git a/src/main/java/zone/moddev/mc/basepower/util/InventoryLocks.java b/src/main/java/zone/moddev/mc/basepower/util/InventoryLocks.java
index 081a5be8..38876b25 100644
--- a/src/main/java/zone/moddev/mc/basepower/util/InventoryLocks.java
+++ b/src/main/java/zone/moddev/mc/basepower/util/InventoryLocks.java
@@ -1,20 +1,28 @@
 package zone.moddev.mc.basepower.util;
 
 import java.lang.reflect.Field;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.CompoundContainer;
+import net.minecraft.world.Container;
 import net.minecraft.world.level.block.entity.BaseContainerBlockEntity;
-import net.minecraft.world.LockCode;
-import net.minecraftforge.fml.util.ObfuscationReflectionHelper;
 
 /** Keeps automation from bypassing vanilla container locks. */
 public final class InventoryLocks {
-    // Ordinary inventories need no vanilla field access or Forge name remapper.
+    // CompoundContainer exposes no child getters; single containers use the native API.
     private static final class Fields {
-        static final Field CODE = ObfuscationReflectionHelper.findField(BaseContainerBlockEntity.class, "f_58621_");
-        static final Field FIRST = ObfuscationReflectionHelper.findField(
-                net.minecraft.world.CompoundContainer.class, "f_18910_");
-        static final Field SECOND = ObfuscationReflectionHelper.findField(
-                net.minecraft.world.CompoundContainer.class, "f_18911_");
+        static final Field FIRST = child("container1");
+        static final Field SECOND = child("container2");
+
+        private static Field child(String name) {
+            try {
+                Field field = CompoundContainer.class.getDeclaredField(name);
+                if (field.getType() != Container.class || !field.trySetAccessible()) {
+                    throw new IllegalStateException("Cannot inspect vanilla compound inventory: " + name);
+                }
+                return field;
+            } catch (NoSuchFieldException failure) {
+                throw new ExceptionInInitializerError(failure);
+            }
+        }
     }
 
     private InventoryLocks() {}
@@ -22,10 +30,9 @@ private InventoryLocks() {}
     public static boolean isLocked(Object inventory) {
         if (inventory instanceof InventoryWrapper) return ((InventoryWrapper) inventory).isLocked();
         try {
-            if (inventory instanceof net.minecraft.world.CompoundContainer)
+            if (inventory instanceof CompoundContainer)
                 return isLocked(Fields.FIRST.get(inventory)) || isLocked(Fields.SECOND.get(inventory));
-            return inventory instanceof BaseContainerBlockEntity
-                    && !((LockCode) Fields.CODE.get(inventory)) .unlocksWith(ItemStack.EMPTY);
+            return inventory instanceof BaseContainerBlockEntity container && container.isLocked();
         } catch (IllegalAccessException failure) {
             throw new IllegalStateException("Cannot inspect vanilla inventory lock", failure);
         }
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
index f16efe70..1e49bd18 100644
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -15,14 +15,14 @@ description='''API and shared machines for pressure, electricity, quantum power,
 [[dependencies.basepower]]
 modId="basemetals"
 mandatory=true
-versionRange="[3.1.2.121111,4.0.0)"
+versionRange="[3.1.2.2601021,4.0.0)"
 ordering="AFTER"
 side="BOTH"
 
 [[dependencies.basepower]]
 modId="orespawn"
 mandatory=true
-versionRange="[4.1.0.121111,5.0.0)"
+versionRange="[4.1.1.2601021,5.0.0)"
 ordering="AFTER"
 side="BOTH"
 
diff --git a/src/main/resources/assets/minecraft/atlases/blocks.json b/src/main/resources/assets/minecraft/atlases/blocks.json
index 2f13b278..ebe2a2a7 100644
--- a/src/main/resources/assets/minecraft/atlases/blocks.json
+++ b/src/main/resources/assets/minecraft/atlases/blocks.json
@@ -1,7 +1,140 @@
 {
   "sources": [
-    { "type": "directory", "source": "blocks", "prefix": "blocks/" },
-    { "type": "directory", "source": "items", "prefix": "items/" },
-    { "type": "directory", "source": "materials", "prefix": "materials/" }
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:blocks/crude_oil_flow"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:blocks/crude_oil_still"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:blocks/filter_bottom"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:blocks/filter_side_block"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:blocks/filter_side_food"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:blocks/filter_side_fuel"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:blocks/filter_side_inventory"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:blocks/filter_side_ore"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:blocks/filter_side_overflow"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:blocks/filter_side_plantable"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:blocks/filter_side_smeltable"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:blocks/fluid_discharge_face"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:blocks/fluid_discharge_side"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:blocks/fluid_drain_face"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:blocks/fluid_drain_side"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:blocks/fluid_metal_tank_side"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:blocks/fluid_metal_tank_top"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:blocks/fluid_pipe"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:blocks/fluid_switch_off"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:blocks/fluid_switch_on"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:blocks/item_conveyor_end"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:blocks/item_conveyor_side"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:blocks/item_conveyor_top"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:blocks/refined_oil_flow"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:blocks/refined_oil_still"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:blocks/steel_frame"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:blocks/techreborn_converter"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:materials/brass"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:materials/iron"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:materials/metal_panel"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:materials/plastic"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:materials/steel"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:materials/steel_dark"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:materials/wood"
+    }
   ]
 }
diff --git a/src/main/resources/assets/minecraft/atlases/items.json b/src/main/resources/assets/minecraft/atlases/items.json
index c2643eee..b2d8b2f3 100644
--- a/src/main/resources/assets/minecraft/atlases/items.json
+++ b/src/main/resources/assets/minecraft/atlases/items.json
@@ -1,5 +1,28 @@
 {
   "sources": [
-    { "type": "directory", "source": "items", "prefix": "items/" }
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:items/bioplastic_ingot"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:items/bucket_crude_oil"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:items/bucket_refined_oil"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:items/rotator_tool"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:items/sprocket"
+    },
+    {
+      "type": "minecraft:single",
+      "resource": "basepower:items/starch"
+    }
   ]
 }
diff --git a/src/main/resources/basepower.mixins.json b/src/main/resources/basepower.mixins.json
index e84dc9e1..861e5799 100644
--- a/src/main/resources/basepower.mixins.json
+++ b/src/main/resources/basepower.mixins.json
@@ -6,6 +6,7 @@
   "mixins": [
     "BlockStateDataMixin",
     "LevelStorageSourceMixin",
+    "SelectedWorldStorageMixin",
     "PlayerDataStorageMixin",
     "SimpleRegionStorageMixin",
     "WorldGenRegionMixin"
diff --git a/src/main/resources/data/basepower/villager_trade/emerald_bioplastic.json b/src/main/resources/data/basepower/villager_trade/emerald_bioplastic.json
new file mode 100644
index 00000000..ef9b1cc5
--- /dev/null
+++ b/src/main/resources/data/basepower/villager_trade/emerald_bioplastic.json
@@ -0,0 +1,13 @@
+{
+  "wants": { "id": "minecraft:emerald", "count": 1 },
+  "gives": { "id": "basepower:bioplastic_ingot" },
+  "max_uses": 7,
+  "xp": 1,
+  "reputation_discount": 0,
+  "given_item_modifiers": [
+    {
+      "function": "minecraft:set_count",
+      "count": { "type": "minecraft:uniform", "min": 4, "max": 8 }
+    }
+  ]
+}
diff --git a/src/main/resources/data/basepower/villager_trade/emerald_sprockets.json b/src/main/resources/data/basepower/villager_trade/emerald_sprockets.json
new file mode 100644
index 00000000..5a58d546
--- /dev/null
+++ b/src/main/resources/data/basepower/villager_trade/emerald_sprockets.json
@@ -0,0 +1,13 @@
+{
+  "wants": { "id": "minecraft:emerald", "count": 1 },
+  "gives": { "id": "basepower:sprocket" },
+  "max_uses": 7,
+  "xp": 1,
+  "reputation_discount": 0,
+  "given_item_modifiers": [
+    {
+      "function": "minecraft:set_count",
+      "count": { "type": "minecraft:uniform", "min": 1, "max": 4 }
+    }
+  ]
+}
diff --git a/src/main/resources/data/minecraft/tags/villager_trade/farmer/level_1.json b/src/main/resources/data/minecraft/tags/villager_trade/farmer/level_1.json
new file mode 100644
index 00000000..1de0be83
--- /dev/null
+++ b/src/main/resources/data/minecraft/tags/villager_trade/farmer/level_1.json
@@ -0,0 +1,4 @@
+{
+  "replace": false,
+  "values": ["basepower:emerald_bioplastic"]
+}
diff --git a/src/main/resources/data/minecraft/tags/villager_trade/toolsmith/level_1.json b/src/main/resources/data/minecraft/tags/villager_trade/toolsmith/level_1.json
new file mode 100644
index 00000000..a690cddd
--- /dev/null
+++ b/src/main/resources/data/minecraft/tags/villager_trade/toolsmith/level_1.json
@@ -0,0 +1,4 @@
+{
+  "replace": false,
+  "values": ["basepower:emerald_sprockets"]
+}
diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta
index 7a8d04dd..e48b0364 100644
--- a/src/main/resources/pack.mcmeta
+++ b/src/main/resources/pack.mcmeta
@@ -1,7 +1,7 @@
 {
     "pack": {
         "description": "basePower resources",
-        "min_format": [94, 1],
-        "max_format": [94, 1]
+        "min_format": [101, 1],
+        "max_format": [101, 1]
     }
 }
diff --git a/src/test/java/cyano/poweradvantage/api/migration/LegacyOreSpawnProfileMigrationTest.java b/src/test/java/cyano/poweradvantage/api/migration/LegacyOreSpawnProfileMigrationTest.java
new file mode 100644
index 00000000..b6a920ce
--- /dev/null
+++ b/src/test/java/cyano/poweradvantage/api/migration/LegacyOreSpawnProfileMigrationTest.java
@@ -0,0 +1,435 @@
+package cyano.poweradvantage.api.migration;
+
+import static org.junit.Assert.*;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.security.MessageDigest;
+import java.util.HexFormat;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Predicate;
+import net.minecraft.resources.Identifier;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import zone.moddev.mc.orespawn.api.OreDimensionSelector;
+import zone.moddev.mc.orespawn.api.OrePattern;
+import zone.moddev.mc.orespawn.api.WorldgenProvider;
+
+public class LegacyOreSpawnProfileMigrationTest {
+    @Rule public final TemporaryFolder temporary = new TemporaryFolder();
+    private static final String OLD = "poweradvantage:legacy/custom_oil";
+    private static final String CURRENT = "basepower:fluid_deposit/desert_crude_oil";
+    private static final Predicate<String> TARGETS = Set.of("basepower:crude_oil", "basepower:refined_oil",
+            "baseelectric:li_ore", "baseelectric:sulfur_ore", "minecraft:nether_quartz_ore")::contains;
+
+    private static JsonObject json(String value) { return JsonParser.parseString(value).getAsJsonObject(); }
+
+    private static JsonObject profile() {
+        return json("""
+                {"schema_version":7,"place_fluid_deposits":false,"manage_vanilla_ores":false,
+                 "ores":{"poweradvantage:legacy/custom_oil":{"block":"poweradvantage:crude_oil",
+                  "enabled":true,"retrogen":false,"source_provider":"poweradvantage",
+                  "dimension_selectors":{"orespawn:all_except_nether_end":{"enabled":true,
+                    "min_y":16,"max_y":63,"frequency":0.375,"min_quantity":14,"max_quantity":64,
+                    "node_size":32,"vertical_spread":50,"host_blocks":["minecraft:stone"],
+                    "biome_ids":["other:custom_biome"],"private":{"x":-987654321}}}}},
+                 "fluid_deposits":{},"history":"poweradvantage:crude_oil",
+                 "providers":{"poweradvantage":{"known_ores":["poweradvantage:legacy/custom_oil"]}},
+                 "ore_source_policies":{"retained-group":{"outputs":{"poweradvantage:legacy/custom_oil":1},
+                   "placement_sources":{"orespawn:standard":"poweradvantage:legacy/custom_oil"},
+                   "candidates":[{"source_id":"poweradvantage:legacy/custom_oil","owner":"poweradvantage",
+                     "registry_id":"poweradvantage:crude_oil"}]}}}
+                """);
+    }
+
+    private static JsonObject powerDefaults() throws Exception {
+        try (var stream = LegacyOreSpawnProfileMigrationTest.class.getResourceAsStream("/data/basepower/orespawn/provider.json")) {
+            assertNotNull(stream);
+            return json(new String(stream.readAllBytes(), StandardCharsets.UTF_8));
+        }
+    }
+
+    private static JsonObject electricDefaults() {
+        return typedElectricDefaults("dimensions");
+    }
+
+    private static JsonObject typedElectricDefaults(String field) {
+        return WorldgenProvider.builder("baseelectric", 1)
+                .ore(Identifier.parse("baseelectric:ore/lithium"), Identifier.parse("baseelectric:li_ore"), ore -> {
+                    ore.retrogen(false);
+                    if (field.equals("material")) ore.material(Identifier.parse("orespawn:lithium"));
+                    if (field.equals("dimension_selectors")) {
+                        ore.dimensionSelector(OreDimensionSelector.ALL_EXCEPT_NETHER_AND_END,
+                                LegacyOreSpawnProfileMigrationTest::lithiumDimension);
+                    } else {
+                        ore.dimension(Identifier.parse("minecraft:overworld"),
+                                LegacyOreSpawnProfileMigrationTest::lithiumDimension);
+                    }
+                })
+                .ore(Identifier.parse("baseelectric:ore/sulfur"), Identifier.parse("baseelectric:sulfur_ore"), ore -> ore
+                        .retrogen(false).dimension(Identifier.parse("minecraft:overworld"), dimension -> dimension
+                                .yRange(1, 31).attempts(1).quantityRange(8, 23).pattern(OrePattern.DEFAULT)
+                                .hostBlock(Identifier.parse("minecraft:stone"))))
+                .build().toJson();
+    }
+
+    private static void lithiumDimension(WorldgenProvider.OreDimensionDefinition.Builder dimension) {
+        dimension.yRange(1, 31).attempts(0.125).quantityRange(6, 9).pattern(OrePattern.DEFAULT)
+                .hostBlock(Identifier.parse("minecraft:stone"));
+    }
+
+    private static JsonObject schemaFourCompatibleElectricDefaults() {
+        JsonObject defaults = electricDefaults();
+        for (var entry : defaults.getAsJsonObject("ores").entrySet()) {
+            for (var placement : entry.getValue().getAsJsonObject().getAsJsonObject("dimensions").entrySet()) {
+                placement.getValue().getAsJsonObject().remove("placement_channel");
+            }
+        }
+        return defaults;
+    }
+
+    private static JsonObject legacyRule(JsonObject root) { return root.getAsJsonObject("ores").getAsJsonObject(OLD); }
+    private static JsonObject placement(JsonObject root) {
+        return legacyRule(root).getAsJsonObject("dimension_selectors").getAsJsonObject("orespawn:all_except_nether_end");
+    }
+
+    @Test public void preservesEveryNonOutputValueAndRulePolicyReference() throws Exception {
+        JsonObject source = profile(), original = source.deepCopy(), defaults = powerDefaults(), originalDefaults = defaults.deepCopy();
+        var plan = LegacyOreSpawnProfileMigration.plan(source, defaults, TARGETS);
+        assertFalse(plan.getProblems().toString(), plan.isRefused());
+        assertTrue(plan.isChanged());
+        JsonObject result = plan.getJson(), expected = original.deepCopy();
+        legacyRule(expected).addProperty("block", "basepower:crude_oil");
+        expected.getAsJsonObject("ore_source_policies").getAsJsonObject("retained-group").getAsJsonArray("candidates")
+                .get(0).getAsJsonObject().addProperty("registry_id", "basepower:crude_oil");
+        JsonObject guard = defaults.getAsJsonObject("fluid_deposits").getAsJsonObject(CURRENT).deepCopy();
+        guard.addProperty("enabled", false); guard.addProperty("source_provider", "basepower");
+        expected.getAsJsonObject("fluid_deposits").add(CURRENT, guard);
+        expected.getAsJsonObject("providers").add("basepower", json("{\"profile_defaults_applied\":true}"));
+        assertEquals(expected, result);
+        assertEquals(original, source); assertEquals(originalDefaults, defaults);
+        result.addProperty("history", "caller mutation");
+        assertEquals(expected, plan.getJson());
+        assertEquals("poweradvantage:legacy/custom_oil", plan.getJson().getAsJsonObject("ore_source_policies")
+                .getAsJsonObject("retained-group").getAsJsonObject("placement_sources").get("orespawn:standard").getAsString());
+    }
+
+    @Test public void sequentialOwnersDoNotConsumeEachOthersLegacyEvidenceOrWhitelist() throws Exception {
+        JsonObject source = profile();
+        source.getAsJsonObject("ores").add("pack:arbitrary_rule", json("""
+                {"block":"electricadvantage:li_ore","enabled":true,
+                 "dimension_selectors":{"orespawn:all_except_nether_end":{"frequency":0.125,"node_size":8}}}
+                """));
+        var power = LegacyOreSpawnProfileMigration.plan(source, powerDefaults(),
+                Set.of("basepower:crude_oil", "minecraft:nether_quartz_ore")::contains);
+        assertFalse(power.getProblems().toString(), power.isRefused());
+        assertEquals("electricadvantage:li_ore", power.getJson().getAsJsonObject("ores").getAsJsonObject("pack:arbitrary_rule").get("block").getAsString());
+        var electric = LegacyOreSpawnProfileMigration.plan(power.getJson(), electricDefaults(), TARGETS);
+        assertFalse(electric.getProblems().toString(), electric.isRefused());
+        assertEquals("baseelectric:li_ore", electric.getJson().getAsJsonObject("ores").getAsJsonObject("pack:arbitrary_rule").get("block").getAsString());
+        assertFalse(electric.getJson().getAsJsonObject("ores").getAsJsonObject("baseelectric:ore/lithium").get("enabled").getAsBoolean());
+        assertFalse(LegacyOreSpawnProfileMigration.plan(electric.getJson(), powerDefaults(), TARGETS).isChanged());
+        assertFalse(LegacyOreSpawnProfileMigration.plan(electric.getJson(), electricDefaults(), TARGETS).isChanged());
+    }
+
+    @Test public void disabledZeroRateAndDisabledDimensionStillSuppressMissingModernDefaults() throws Exception {
+        for (String mode : List.of("disabled", "zero", "dimension-disabled")) {
+            JsonObject source = profile();
+            if (mode.equals("disabled")) legacyRule(source).addProperty("enabled", false);
+            if (mode.equals("zero")) placement(source).addProperty("frequency", 0);
+            if (mode.equals("dimension-disabled")) placement(source).addProperty("enabled", false);
+            var plan = LegacyOreSpawnProfileMigration.plan(source, powerDefaults(), TARGETS);
+            assertFalse(mode + plan.getProblems(), plan.isRefused());
+            assertFalse(plan.getJson().getAsJsonObject("fluid_deposits").getAsJsonObject(CURRENT).get("enabled").getAsBoolean());
+            assertEquals(placement(source), placement(plan.getJson()));
+            assertEquals(legacyRule(source).get("enabled"), legacyRule(plan.getJson()).get("enabled"));
+        }
+    }
+
+    @Test public void activeOldAndCurrentOverlappingRulesRefuseEvenWhenEquivalent() throws Exception {
+        for (boolean equivalent : List.of(true, false)) {
+            JsonObject source = profile();
+            JsonObject current = legacyRule(source).deepCopy();
+            current.addProperty("block", "basepower:crude_oil");
+            if (!equivalent) current.getAsJsonObject("dimension_selectors").getAsJsonObject("orespawn:all_except_nether_end").addProperty("frequency", 0.7);
+            source.getAsJsonObject("ores").add("pack:current_oil", current);
+            // Provenance stays literal; use non-legacy provenance for the independent current rule.
+            current.remove("source_provider"); legacyRule(source).remove("source_provider");
+            var plan = LegacyOreSpawnProfileMigration.plan(source, powerDefaults(), TARGETS);
+            assertTrue(plan.isRefused());
+            assertEquals(source, plan.getJson());
+            assertTrue(plan.getProblems().toString().contains(equivalent ? "equivalent" : "conflicting"));
+        }
+    }
+
+    @Test public void activeOreVersusActiveFluidDepositCollisionRefuses() throws Exception {
+        JsonObject source = profile(); source.addProperty("place_fluid_deposits", true);
+        source.getAsJsonObject("fluid_deposits").add(CURRENT, powerDefaults().getAsJsonObject("fluid_deposits").get(CURRENT).deepCopy());
+        assertTrue(LegacyOreSpawnProfileMigration.plan(source, powerDefaults(), TARGETS).isRefused());
+    }
+
+    @Test public void currentDefaultIdWithStaleProviderCannotEvadeCollision() throws Exception {
+        JsonObject source = profile(); source.addProperty("place_fluid_deposits", true);
+        JsonObject current = powerDefaults().getAsJsonObject("fluid_deposits").getAsJsonObject(CURRENT).deepCopy();
+        current.addProperty("source_provider", "poweradvantage");
+        source.getAsJsonObject("fluid_deposits").add(CURRENT, current);
+        var plan = LegacyOreSpawnProfileMigration.plan(source, powerDefaults(), TARGETS);
+        assertTrue(plan.isRefused()); assertEquals(source, plan.getJson());
+        assertTrue(plan.getProblems().toString().contains("active output collision"));
+    }
+
+    @Test public void legacyOilSingletonRetainsDisabledMasterAndCoordinates() throws Exception {
+        JsonObject source = json("""
+                {"schema_version":3,"place_crude_oil":false,"oil":{"block":"poweradvantage:crude_oil",
+                 "min_y":-48,"max_y":36,"frequency":0.625,"min_radius":3,"max_radius":9}}
+                """);
+        var plan = LegacyOreSpawnProfileMigration.plan(source, powerDefaults(), TARGETS);
+        assertFalse(plan.getProblems().toString(), plan.isRefused());
+        JsonObject result = plan.getJson(), expected = source.getAsJsonObject("oil").deepCopy();
+        expected.addProperty("block", "basepower:crude_oil");
+        assertEquals(expected, result.get("oil")); assertFalse(result.get("place_crude_oil").getAsBoolean());
+        assertFalse(result.getAsJsonObject("fluid_deposits").getAsJsonObject(CURRENT).get("enabled").getAsBoolean());
+    }
+
+    @Test public void existingDisabledCurrentEntryAndItsEntirePayloadRemainUntouched() throws Exception {
+        JsonObject source = profile(), current = powerDefaults().getAsJsonObject("fluid_deposits").getAsJsonObject(CURRENT).deepCopy();
+        current.addProperty("enabled", false); current.addProperty("user-note", "poweradvantage:crude_oil");
+        source.getAsJsonObject("fluid_deposits").add(CURRENT, current);
+        var plan = LegacyOreSpawnProfileMigration.plan(source, powerDefaults(), TARGETS);
+        assertFalse(plan.isRefused()); assertEquals(current, plan.getJson().getAsJsonObject("fluid_deposits").get(CURRENT));
+    }
+
+    @Test public void disjointDimensionsAreNotTreatedAsDuplicatePlacements() throws Exception {
+        JsonObject source = profile();
+        source.getAsJsonObject("ores").add("pack:nether_oil", json("""
+                {"block":"basepower:crude_oil","enabled":true,"dimensions":{"minecraft:the_nether":{"frequency":1}}}
+                """));
+        assertFalse(LegacyOreSpawnProfileMigration.plan(source, powerDefaults(), TARGETS).isRefused());
+    }
+
+    @Test public void knownWeightedDeepAndCachedOutputFieldsMigrateButOtherStringsDoNot() throws Exception {
+        JsonObject source = profile(), rule = legacyRule(source);
+        rule.addProperty("deep_output", "poweradvantage:refined_oil");
+        rule.add("outputs", JsonParser.parseString("[{\"block\":\"poweradvantage:crude_oil\",\"weight\":0.3125,\"min_y\":-64,\"private\":\"poweradvantage:crude_oil\"}]"));
+        source.add("private", json("{\"block\":\"poweradvantage:crude_oil\",\"outputs\":[\"electricadvantage:li_ore\"]}"));
+        var plan = LegacyOreSpawnProfileMigration.plan(source, powerDefaults(), TARGETS);
+        assertFalse(plan.isRefused()); JsonObject after = legacyRule(plan.getJson());
+        assertEquals("basepower:refined_oil", after.get("deep_output").getAsString());
+        assertEquals("basepower:crude_oil", after.getAsJsonArray("outputs").get(0).getAsJsonObject().get("block").getAsString());
+        assertEquals(rule.getAsJsonArray("outputs").get(0).getAsJsonObject().get("weight"), after.getAsJsonArray("outputs").get(0).getAsJsonObject().get("weight"));
+        assertEquals(source.get("private"), plan.getJson().get("private"));
+        assertEquals("poweradvantage:crude_oil", after.getAsJsonArray("outputs").get(0).getAsJsonObject().get("private").getAsString());
+    }
+
+    @Test public void schemasSevenEightAndExplicitWrappersPreserveMarkers() throws Exception {
+        for (int schema : List.of(7, 8)) for (String wrapper : List.of("flat", "profile", "worldgen", "geology", "geology_profile", "worldgen_profile")) {
+            JsonObject profile = profile(); profile.addProperty("schema_version", schema);
+            JsonObject source = wrapper.equals("flat") ? profile : new JsonObject();
+            if (!wrapper.equals("flat")) source.add(wrapper, profile);
+            var plan = LegacyOreSpawnProfileMigration.plan(source, powerDefaults(), TARGETS);
+            assertFalse(plan.getProblems().toString(), plan.isRefused());
+            JsonObject result = wrapper.equals("flat") ? plan.getJson() : plan.getJson().getAsJsonObject(wrapper);
+            assertEquals(schema, result.get("schema_version").getAsInt());
+            assertEquals("basepower:crude_oil", legacyRule(result).get("block").getAsString());
+        }
+    }
+
+    @Test public void legacyProviderOverrideKeepsProviderAndRuleIdsWithoutForeignSeeds() throws Exception {
+        JsonObject source = profile(); source.addProperty("schema_version", 4); source.addProperty("provider_modid", "poweradvantage");
+        var plan = LegacyOreSpawnProfileMigration.plan(source, powerDefaults(), TARGETS);
+        assertFalse(plan.isRefused()); assertEquals("poweradvantage", plan.getJson().get("provider_modid").getAsString());
+        assertEquals(Set.of(OLD), plan.getJson().getAsJsonObject("ores").keySet());
+        assertFalse(plan.getJson().getAsJsonObject("fluid_deposits").has(CURRENT));
+        assertFalse(plan.getWarnings().isEmpty());
+    }
+
+    private static JsonObject electricOverride() {
+        return json("""
+                {"schema_version":4,"provider_modid":"baseelectric","provider_revision":7,
+                 "user":{"schema_version":4,"placement_channel":"leave:user_data"},
+                 "profile_defaults":{"manage_vanilla_ores":false},"rocks":{},
+                 "ores":{"baseelectric:legacy/saved_lithium":{"block":"electricadvantage:li_ore",
+                  "enabled":false,"source_provider":"electricadvantage","private":{"keep":42},
+                  "dimension_selectors":{"orespawn:all_except_nether_end":{"enabled":true,
+                   "frequency":0.25,"min_y":3,"max_y":27,"node_size":8}}}}}
+                """);
+    }
+
+    @Test public void ownedSchemaFourPromotesOnlyWhenSeedAddsSchemaFiveOreFields() {
+        for (String field : List.of("material", "dimensions", "dimension_selectors")) {
+            JsonObject source = electricOverride(), original = source.deepCopy();
+            JsonObject defaults = typedElectricDefaults(field), originalDefaults = defaults.deepCopy();
+            assertEquals(5, defaults.get("schema_version").getAsInt());
+            JsonObject typedRule = defaults.getAsJsonObject("ores").getAsJsonObject("baseelectric:ore/lithium");
+            String placementSection = field.equals("dimension_selectors") ? field : "dimensions";
+            assertTrue(typedRule.getAsJsonObject(placementSection).entrySet().iterator().next().getValue()
+                    .getAsJsonObject().has("placement_channel"));
+            var plan = LegacyOreSpawnProfileMigration.plan(source, defaults, TARGETS);
+            assertFalse(field + plan.getProblems(), plan.isRefused());
+            JsonObject expected = source.deepCopy();
+            expected.addProperty("schema_version", 5);
+            expected.getAsJsonObject("ores").getAsJsonObject("baseelectric:legacy/saved_lithium")
+                    .addProperty("block", "baseelectric:li_ore");
+            JsonObject guard = defaults.getAsJsonObject("ores").getAsJsonObject("baseelectric:ore/lithium").deepCopy();
+            guard.addProperty("enabled", false); guard.addProperty("source_provider", "baseelectric");
+            expected.getAsJsonObject("ores").add("baseelectric:ore/lithium", guard);
+            assertEquals(field, expected, plan.getJson());
+            assertTrue(plan.getChanges().toString(), plan.getChanges().stream()
+                    .anyMatch(change -> change.contains("schema_version: 4 -> 5")));
+            assertEquals(original, source); assertEquals(originalDefaults, defaults);
+            assertFalse(LegacyOreSpawnProfileMigration.plan(plan.getJson(), defaults, TARGETS).isChanged());
+        }
+    }
+
+    @Test public void schemaFiveDefaultsAloneDoNotPromoteSchemaFourOrUnownedProviders() {
+        JsonObject source = electricOverride();
+        var plain = LegacyOreSpawnProfileMigration.plan(source, schemaFourCompatibleElectricDefaults(), TARGETS);
+        assertFalse(plain.isRefused()); assertEquals(4, plain.getJson().get("schema_version").getAsInt());
+        JsonObject defaults = electricDefaults();
+        source.getAsJsonObject("ores").add("baseelectric:ore/lithium",
+                schemaFourCompatibleElectricDefaults().getAsJsonObject("ores").get("baseelectric:ore/lithium").deepCopy());
+        var existing = LegacyOreSpawnProfileMigration.plan(source, defaults, TARGETS);
+        assertFalse(existing.isRefused()); assertEquals(4, existing.getJson().get("schema_version").getAsInt());
+        source = electricOverride(); source.addProperty("provider_modid", "electricadvantage");
+        var foreign = LegacyOreSpawnProfileMigration.plan(source, defaults, TARGETS);
+        assertFalse(foreign.isRefused()); assertEquals(4, foreign.getJson().get("schema_version").getAsInt());
+        assertFalse(foreign.getJson().getAsJsonObject("ores").has("baseelectric:ore/lithium"));
+    }
+
+    @Test public void typedSchemaFiveSeedsKeepGlobalWorldAndWrapperVersionsUnchanged() {
+        for (int schema : List.of(5, 7, 8)) for (String wrapper : List.of("flat", "profile", "worldgen")) {
+            JsonObject profile = electricOverride(); profile.addProperty("schema_version", schema);
+            if (schema != 5) profile.remove("provider_modid");
+            JsonObject source = wrapper.equals("flat") ? profile : new JsonObject();
+            if (!wrapper.equals("flat")) source.add(wrapper, profile);
+            JsonObject defaults = electricDefaults();
+            var plan = LegacyOreSpawnProfileMigration.plan(source, defaults, TARGETS);
+            assertFalse(plan.getProblems().toString(), plan.isRefused());
+            JsonObject result = wrapper.equals("flat") ? plan.getJson() : plan.getJson().getAsJsonObject(wrapper);
+            assertEquals(schema, result.get("schema_version").getAsInt());
+            JsonObject guard = defaults.getAsJsonObject("ores").getAsJsonObject("baseelectric:ore/lithium").deepCopy();
+            guard.addProperty("enabled", false); guard.addProperty("source_provider", "baseelectric");
+            assertEquals(guard, result.getAsJsonObject("ores").get("baseelectric:ore/lithium"));
+        }
+    }
+
+    @Test public void schemaPromotionUsesExistingAtomicBackupReportAndIdempotence() throws Exception {
+        Path file = temporary.newFile("baseelectric-orespawn.json").toPath();
+        Files.writeString(file, "\n" + electricOverride() + "\n");
+        byte[] before = Files.readAllBytes(file);
+        JsonObject defaults = electricDefaults();
+        var result = LegacyOreSpawnProfileMigration.migrate(file, defaults, TARGETS);
+        assertTrue(result.wasMigrated()); assertArrayEquals(before, Files.readAllBytes(result.backupFile()));
+        assertEquals(5, json(Files.readString(file)).get("schema_version").getAsInt());
+        JsonObject report = json(Files.readString(result.reportFile()));
+        assertEquals("MIGRATED", report.get("status").getAsString());
+        assertEquals(hash(before), report.get("source_sha256").getAsString());
+        assertEquals(hash(Files.readAllBytes(file)), report.get("result_sha256").getAsString());
+        byte[] after = Files.readAllBytes(file), receipt = Files.readAllBytes(result.reportFile());
+        assertEquals(LegacyOreSpawnProfileMigration.Status.UNCHANGED,
+                LegacyOreSpawnProfileMigration.migrate(file, defaults, TARGETS).status());
+        assertArrayEquals(after, Files.readAllBytes(file)); assertArrayEquals(receipt, Files.readAllBytes(result.reportFile()));
+    }
+
+    @Test public void quartzImplicitRuleAndWeightedOutputUseVerifiedNativeNameOnly() throws Exception {
+        JsonObject source = json("""
+                {"schema_version":8,"manage_vanilla_ores":false,"ores":{
+                 "minecraft:quartz_ore":{"enabled":true,"dimensions":{"minecraft:the_nether":{"frequency":7}},
+                   "outputs":[{"block":"minecraft:quartz_ore","weight":100}]},
+                 "minecraft:nether_quartz_ore":{"native_generation":true,"enabled":true,"dimensions":{"minecraft:the_nether":{"frequency":11.2}}}}}
+                """);
+        var plan = LegacyOreSpawnProfileMigration.plan(source, powerDefaults(), TARGETS);
+        assertFalse(plan.isRefused()); assertEquals(source.getAsJsonObject("ores").keySet(), plan.getJson().getAsJsonObject("ores").keySet());
+        assertEquals("minecraft:nether_quartz_ore", plan.getJson().getAsJsonObject("ores").getAsJsonObject("minecraft:quartz_ore").get("block").getAsString());
+        source.addProperty("manage_vanilla_ores", true);
+        assertTrue(LegacyOreSpawnProfileMigration.plan(source, powerDefaults(), TARGETS).isRefused());
+    }
+
+    @Test public void rootFlagsSurviveAndAbsentCurrentManifestOnlyGetsApplicationGuard() throws Exception {
+        JsonObject source = profile();
+        var plan = LegacyOreSpawnProfileMigration.plan(source, powerDefaults(), TARGETS);
+        assertFalse(plan.getJson().get("place_fluid_deposits").getAsBoolean());
+        assertFalse(plan.getJson().get("manage_vanilla_ores").getAsBoolean());
+        assertEquals(source.getAsJsonObject("providers").get("poweradvantage"), plan.getJson().getAsJsonObject("providers").get("poweradvantage"));
+        source.getAsJsonObject("providers").add("basepower", json("{\"profile_defaults_applied\":false,\"user\":1}"));
+        var refused = LegacyOreSpawnProfileMigration.plan(source, powerDefaults(), TARGETS);
+        assertTrue(refused.isRefused()); assertEquals(source, refused.getJson());
+    }
+
+    @Test public void unavailableTargetsAndMalformedKnownFieldsRefuseWithoutPartialJson() throws Exception {
+        JsonObject source = profile();
+        for (Predicate<String> exists : List.<Predicate<String>>of(id -> false, id -> { throw new IllegalStateException("unbound"); })) {
+            var plan = LegacyOreSpawnProfileMigration.plan(source, powerDefaults(), exists);
+            assertTrue(plan.isRefused()); assertEquals(source, plan.getJson());
+        }
+        legacyRule(source).add("block", json("{}"));
+        assertTrue(LegacyOreSpawnProfileMigration.plan(source, powerDefaults(), TARGETS).isRefused());
+    }
+
+    @Test public void absentAndAlreadyCurrentDocumentsCreateNoEvidenceOrDirectories() throws Exception {
+        Path absent = temporary.getRoot().toPath().resolve("missing/serverconfig/orespawn-worldgen.json");
+        assertEquals(LegacyOreSpawnProfileMigration.Status.MISSING, LegacyOreSpawnProfileMigration.migrate(absent, powerDefaults(), TARGETS).status());
+        assertFalse(Files.exists(absent.getParent()));
+        Path file = temporary.newFile("current.json").toPath(); Files.writeString(file, "{ \"history\": \"poweradvantage:crude_oil\" }\n");
+        byte[] original = Files.readAllBytes(file);
+        assertEquals(LegacyOreSpawnProfileMigration.Status.UNCHANGED, LegacyOreSpawnProfileMigration.migrate(file, powerDefaults(), TARGETS).status());
+        assertArrayEquals(original, Files.readAllBytes(file)); assertEquals(1, temporary.getRoot().list().length);
+    }
+
+    @Test public void diskMigrationBacksUpExactBytesReportsHashesAndRepeatsWithoutWrites() throws Exception {
+        Path file = temporary.newFile("world.json").toPath(); Files.writeString(file, "\n" + profile() + "\n");
+        byte[] before = Files.readAllBytes(file);
+        var result = LegacyOreSpawnProfileMigration.migrate(file, powerDefaults(), TARGETS);
+        assertTrue(result.wasMigrated()); assertArrayEquals(before, Files.readAllBytes(result.backupFile()));
+        JsonObject report = json(Files.readString(result.reportFile()));
+        assertEquals("MIGRATED", report.get("status").getAsString());
+        assertEquals(hash(before), report.get("source_sha256").getAsString());
+        assertEquals(hash(Files.readAllBytes(file)), report.get("result_sha256").getAsString());
+        byte[] migrated = Files.readAllBytes(file), receipt = Files.readAllBytes(result.reportFile());
+        assertEquals(LegacyOreSpawnProfileMigration.Status.UNCHANGED, LegacyOreSpawnProfileMigration.migrate(file, powerDefaults(), TARGETS).status());
+        assertArrayEquals(migrated, Files.readAllBytes(file)); assertArrayEquals(receipt, Files.readAllBytes(result.reportFile()));
+        assertEquals(3, temporary.getRoot().list().length);
+    }
+
+    @Test public void refusedAttemptIsRetainedAndDoesNotBlockLaterValidAttempt() throws Exception {
+        Path file = temporary.newFile("profile.json").toPath(); Files.writeString(file, profile().toString());
+        byte[] before = Files.readAllBytes(file);
+        var refused = LegacyOreSpawnProfileMigration.migrate(file, powerDefaults(), id -> false);
+        assertEquals(LegacyOreSpawnProfileMigration.Status.REFUSED, refused.status());
+        byte[] refusal = Files.readAllBytes(refused.reportFile()); assertNull(refused.backupFile());
+        assertArrayEquals(before, Files.readAllBytes(file));
+        var green = LegacyOreSpawnProfileMigration.migrate(file, powerDefaults(), TARGETS);
+        assertTrue(green.wasMigrated()); assertNotEquals(refused.reportFile(), green.reportFile());
+        assertArrayEquals(refusal, Files.readAllBytes(refused.reportFile()));
+    }
+
+    @Test public void malformedDuplicateAndInvalidUtf8InputsNeverChangeSource() throws Exception {
+        for (String raw : List.of("{\"ores\":{},\"ores\":{}}", "{\"ores\":{}} trailing", "{\"x\":NaN}", "[]")) {
+            Path file = temporary.newFile().toPath(); Files.writeString(file, raw);
+            try { LegacyOreSpawnProfileMigration.migrate(file, powerDefaults(), TARGETS); fail(raw); }
+            catch (java.io.IOException expected) { assertEquals(raw, Files.readString(file)); }
+        }
+        Path bad = temporary.newFile().toPath(); byte[] invalid = {(byte) 0xC3, (byte) 0x28}; Files.write(bad, invalid);
+        try { LegacyOreSpawnProfileMigration.migrate(bad, powerDefaults(), TARGETS); fail(); }
+        catch (java.io.IOException expected) { assertArrayEquals(invalid, Files.readAllBytes(bad)); }
+    }
+
+    @Test public void conflictingBackupNeverGetsOverwritten() throws Exception {
+        Path file = temporary.newFile("profile.json").toPath(); Files.writeString(file, profile().toString());
+        byte[] source = Files.readAllBytes(file);
+        Path backup = file.resolveSibling(file.getFileName() + ".advantage-output-" + hash(source) + ".bak");
+        Files.writeString(backup, "protected evidence");
+        try { LegacyOreSpawnProfileMigration.migrate(file, powerDefaults(), TARGETS); fail(); }
+        catch (java.io.IOException expected) { assertTrue(expected.getMessage().contains("Conflicting migration backup")); }
+        assertEquals("protected evidence", Files.readString(backup)); assertArrayEquals(source, Files.readAllBytes(file));
+    }
+
+    private static String hash(byte[] bytes) throws Exception {
+        return HexFormat.of().withUpperCase().formatHex(MessageDigest.getInstance("SHA-256").digest(bytes));
+    }
+}
diff --git a/src/test/java/cyano/poweradvantage/api/simple/SimpleMachineGuiNativeTest.java b/src/test/java/cyano/poweradvantage/api/simple/SimpleMachineGuiNativeTest.java
index 84c4a29e..b0c57770 100644
--- a/src/test/java/cyano/poweradvantage/api/simple/SimpleMachineGuiNativeTest.java
+++ b/src/test/java/cyano/poweradvantage/api/simple/SimpleMachineGuiNativeTest.java
@@ -1,15 +1,13 @@
 package cyano.poweradvantage.api.simple;
 
-import java.lang.reflect.Field;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import net.minecraft.SharedConstants;
 import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.render.state.GuiRenderState;
-import net.minecraft.client.gui.render.state.GuiTextRenderState;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.renderer.state.gui.BlitRenderState;
+import net.minecraft.client.renderer.state.gui.GuiRenderState;
+import net.minecraft.client.renderer.state.gui.GuiTextRenderState;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.Identifier;
 import net.minecraft.server.Bootstrap;
@@ -22,7 +20,9 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 import zone.moddev.mc.basepower.math.Integer2D;
+import zone.moddev.mc.basepower.resources.NativeGuiExtractionFixture;
 import static org.junit.Assert.*;
+import static zone.moddev.mc.basepower.resources.NativeGuiExtractionFixture.*;
 
 /** Native extraction/layout contracts, not GPU glyph or whole-panel screenshot proof. */
 public class SimpleMachineGuiNativeTest {
@@ -65,7 +65,7 @@ public class SimpleMachineGuiNativeTest {
         assertSame(fixture.graphics, fixture.screen.getGraphics());
         assertSame(fixture.pose, fixture.screen.getMatrices());
         assertEquals(Matrix3x2fStack.class, SimpleMachineGUI.GUIContainer.class.getMethod("getMatrices").getReturnType());
-        assertEquals(GuiGraphics.class, SimpleMachineGUI.GUIContainer.class.getMethod("getGraphics").getReturnType());
+        assertEquals(GuiGraphicsExtractor.class, SimpleMachineGUI.GUIContainer.class.getMethod("getGraphics").getReturnType());
         for (float value : new float[] {0, 0.5F, 1}) {
             var pose = fixture.screen.getMatrices();
             var before = new Matrix3x2f(pose);
@@ -88,7 +88,7 @@ public class SimpleMachineGuiNativeTest {
     @Test public void captionsReachNativeTextExtractionWithOpaqueWhiteAndSeparateRows() throws Exception {
         var fixture = screen("Machine", "Inventory", 854);
         fixture.pose.translate(13, 29);
-        fixture.screen.renderLabels(fixture.graphics, 0, 0);
+        fixture.screen.extractLabels(fixture.graphics, 0, 0);
         assertEquals(2, fixture.target.texts.size());
         var title = fixture.target.texts.get(0);
         var inventory = fixture.target.texts.get(1);
@@ -111,7 +111,7 @@ public class SimpleMachineGuiNativeTest {
 
     @Test public void longCaptionsKeepTheirAcceptedWidthLimitsAndEllipsis() throws Exception {
         var fixture = screen("M".repeat(100), "I".repeat(100), 200);
-        fixture.screen.renderLabels(fixture.graphics, 0, 0);
+        fixture.screen.extractLabels(fixture.graphics, 0, 0);
         assertEquals(2, fixture.target.texts.size());
         assertEquals("M".repeat(29) + "...", text(fixture.target.texts.get(0)));
         assertEquals("I".repeat(23) + "...", text(fixture.target.texts.get(1)));
@@ -119,40 +119,115 @@ public class SimpleMachineGuiNativeTest {
         assertEquals(8, fixture.target.texts.get(1).x);
     }
 
-    @Test public void backgroundAndTooltipUseNativeExtractionWithoutGlobalRenderState() throws Exception {
-        String source = Files.readString(Path.of("src/main/java/cyano/poweradvantage/api/simple/SimpleMachineGUI.java"));
-        assertTrue(source.contains("graphics.setTooltipForNextFrame(font, title, mouseX, mouseY)"));
-        assertTrue(source.contains("graphics.blit(RenderPipelines.GUI_TEXTURED, texture, x, y, u, v, width, height, 256, 256)"));
-        assertTrue(source.contains("blit(playerInventoryBox, x, y + PLAYER_PANEL_TOP, 0, 132, playerInventoryWidth, playerInventoryHeight)"));
-        assertTrue(source.contains("blit(x, y + MACHINE_TOP, 0, 0, guiWidth, MACHINE_HEIGHT)"));
-        assertTrue(source.contains("drawGUIDecorations(entity, this, x, y + MACHINE_TOP, getZLevel())"));
-        assertTrue(source.contains("this.graphics = null"));
-        assertFalse(source.contains("RenderSystem"));
-        assertFalse(source.contains("graphics.renderTooltip(font, title"));
-        SimpleMachineGUI.GUIContainer.class.getMethod("blit", int.class, int.class, int.class, int.class, int.class, int.class);
-        SimpleMachineGUI.GUIContainer.class.getMethod("blit", Identifier.class, int.class, int.class, int.class, int.class, int.class, int.class);
+    @Test public void nativeScreenWrapperExtractsBackgroundOnceAndReleasesDecorationContext() throws Exception {
+        var fixture = screen("Machine", "Inventory", 854);
+        set(fixture.screen, "graphics", null);
+        int[] decorations = {0};
+        fixture.gui.decoration = (screen, x, y) -> {
+            decorations[0]++;
+            assertSame(fixture.graphics, screen.getGraphics());
+            assertSame(fixture.pose, screen.getMatrices());
+            assertEquals(339, x);
+            assertEquals(132, y);
+        };
+        fixture.screen.extractRenderStateWithTooltipAndSubtitles(fixture.graphics, -100, -100, 0F);
+        assertEquals(1, fixture.screen.backgroundCalls);
+        assertEquals(1, decorations[0]);
+        assertNull(fixture.screen.getGraphics());
+        var blits = new ArrayList<BlitRenderState>();
+        fixture.target.forEachElement(state -> {
+            if (state instanceof BlitRenderState blit) blits.add(blit);
+        }, GuiRenderState.TraverseRange.ALL);
+        assertEquals(2, blits.size());
+        var panel = blits.stream().filter(state -> state.y0() == 270).findFirst().orElseThrow();
+        var machine = blits.stream().filter(state -> state.y0() == 132).findFirst().orElseThrow();
+        assertEquals(339, panel.x0());
+        assertEquals(515, panel.x1());
+        assertEquals(360, panel.y1());
+        assertEquals(132F / 256F, panel.v0(), 0F);
+        assertEquals(222F / 256F, panel.v1(), 0F);
+        assertEquals(339, machine.x0());
+        assertEquals(515, machine.x1());
+        assertEquals(260, machine.y1());
+        assertEquals(0F, machine.v0(), 0F);
+        assertEquals(0.5F, machine.v1(), 0F);
+        assertNotSame(panel.textureSetup().texure0(), machine.textureSetup().texure0());
+        assertEquals(2, fixture.target.texts.size());
+    }
+
+    @Test public void failedDecorationCannotLeakActiveExtractor() throws Exception {
+        var fixture = screen("Machine", "Inventory", 854);
+        var failure = new IllegalStateException("deliberate decoration failure");
+        fixture.gui.decoration = (screen, x, y) -> { throw failure; };
+        assertSame(failure, assertThrows(IllegalStateException.class,
+                () -> fixture.screen.extractBackground(fixture.graphics, -100, -100, 0F)));
+        assertNull(fixture.screen.getGraphics());
+    }
+
+    @Test public void longTitleSchedulesNativeDeferredTooltipOnlyInTheTitleRow() throws Exception {
+        var fixture = screen("M".repeat(100), "Inventory", 200);
+        fixture.screen.extractRenderState(fixture.graphics, 50, 121, 0F);
+        assertNotNull(get(fixture.graphics, "deferredTooltip"));
+        set(fixture.graphics, "deferredTooltip", null);
+        fixture.screen.extractRenderState(fixture.graphics, 50, 132, 0F);
+        assertNull(get(fixture.graphics, "deferredTooltip"));
+        set(fixture.screen, "title", Component.literal("Machine"));
+        fixture.screen.extractRenderState(fixture.graphics, 50, 121, 0F);
+        assertNull(get(fixture.graphics, "deferredTooltip"));
     }
 
     private static Fixture screen(String title, String inventory, int width) throws Exception {
         var target = new TextQueue();
-        var pose = new Matrix3x2fStack(16);
-        var graphics = allocate(GuiGraphics.class);
-        set(graphics, "pose", pose);
-        set(graphics, "guiRenderState", target);
-        set(graphics, "scissorStack", new GuiGraphics.ScissorStack());
-        var screen = allocate(SimpleMachineGUI.GUIContainer.class);
+        var extraction = new NativeGuiExtractionFixture(target);
+        var graphics = extraction.graphics;
+        var gui = new RecordingGui();
+        extraction.texture(gui.guiDisplayImage);
+        extraction.texture(SimpleMachineGUI.playerInventoryBox);
+        var screen = allocate(RecordingScreen.class);
         var font = new MetricsFont();
+        set(screen, "this$0", gui);
         set(screen, "graphics", graphics);
+        set(screen, "minecraft", extraction.minecraft);
+        var inventoryItems = new Inventory(null, new EntityEquipment());
+        set(screen, "menu", gui.createMenu(1, inventoryItems, new SimpleContainer(0)));
+        set(screen, "draggingItem", net.minecraft.world.item.ItemStack.EMPTY);
+        set(screen, "renderables", List.of());
         set(screen, "playerInventoryLabel", Component.literal(inventory));
         set(screen, "title", Component.literal(title));
         set(screen, "font", font);
         set(screen, "width", width);
+        set(screen, "height", 480);
         set(screen, "imageWidth", 176);
-        return new Fixture(screen, graphics, target, pose, font);
+        set(screen, "imageHeight", 240);
+        set(screen, "topPos", 120);
+        return new Fixture(screen, graphics, target, extraction.pose, font, gui);
     }
 
-    private record Fixture(SimpleMachineGUI.GUIContainer screen, GuiGraphics graphics,
-            TextQueue target, Matrix3x2fStack pose, MetricsFont font) {}
+    private record Fixture(RecordingScreen screen, GuiGraphicsExtractor graphics,
+            TextQueue target, Matrix3x2fStack pose, MetricsFont font, RecordingGui gui) {}
+
+    @FunctionalInterface private interface Decoration {
+        void extract(SimpleMachineGUI.GUIContainer screen, int x, int y);
+    }
+
+    private static final class RecordingGui extends SimpleMachineGUI {
+        Decoration decoration = (screen, x, y) -> {};
+        RecordingGui() { super(Identifier.parse("basepower:textures/gui/container/fluid_tank_gui.png")); }
+        @Override public void drawGUIDecorations(Object entity, GUIContainer screen, int x, int y, float z) {
+            decoration.extract(screen, x, y);
+        }
+    }
+
+    private static final class RecordingScreen extends SimpleMachineGUI.GUIContainer {
+        int backgroundCalls;
+        RecordingScreen(SimpleMachineGUI gui, SimpleMachineGUI.Container menu, Inventory items) {
+            gui.super(menu, items, Component.literal("Machine"));
+        }
+        @Override public void extractBackground(GuiGraphicsExtractor graphics, int x, int y, float delta) {
+            backgroundCalls++;
+            super.extractBackground(graphics, x, y, delta);
+        }
+    }
 
     private static final class MetricsFont extends Font {
         MetricsFont() { super(null); }
@@ -165,7 +240,7 @@ private static final class MetricsFont extends Font {
     // Capture real native text states before GPU glyph preparation; no font assets are fabricated.
     private static final class TextQueue extends GuiRenderState {
         final List<GuiTextRenderState> texts = new ArrayList<>();
-        @Override public void submitText(GuiTextRenderState text) { texts.add(text); }
+        @Override public void addText(GuiTextRenderState text) { texts.add(text); }
     }
 
     private static String text(GuiTextRenderState state) {
@@ -174,22 +249,4 @@ private static String text(GuiTextRenderState state) {
         return text.toString();
     }
 
-    private static <T> T allocate(Class<T> type) throws Exception {
-        Class<?> allocator = Class.forName("sun.misc.Unsafe");
-        Field instance = allocator.getDeclaredField("theUnsafe");
-        instance.setAccessible(true);
-        return type.cast(allocator.getMethod("allocateInstance", Class.class).invoke(instance.get(null), type));
-    }
-
-    private static void set(Object instance, String name, Object value) throws Exception {
-        for (Class<?> type = instance.getClass(); type != null; type = type.getSuperclass()) {
-            try {
-                Field field = type.getDeclaredField(name);
-                field.setAccessible(true);
-                field.set(instance, value);
-                return;
-            } catch (NoSuchFieldException ignored) {}
-        }
-        throw new NoSuchFieldException(name);
-    }
 }
diff --git a/src/test/java/net/minecraftforge/registries/LegacyOreSpawnRegistryAliasesTest.java b/src/test/java/net/minecraftforge/registries/LegacyOreSpawnRegistryAliasesTest.java
new file mode 100644
index 00000000..e6d91907
--- /dev/null
+++ b/src/test/java/net/minecraftforge/registries/LegacyOreSpawnRegistryAliasesTest.java
@@ -0,0 +1,178 @@
+package net.minecraftforge.registries;
+
+import static org.junit.Assert.*;
+
+import java.util.Set;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.resources.Identifier;
+import org.junit.Test;
+import zone.moddev.mc.basepower.migration.LegacyOreSpawnRegistryAliases;
+
+/** Package access creates isolated native registries without reflection or global ACTIVE changes. */
+public class LegacyOreSpawnRegistryAliasesTest {
+    private static final Identifier OLD = Identifier.parse("minecraft:quartz_ore");
+    private static final Identifier CURRENT = Identifier.parse("minecraft:nether_quartz_ore");
+    private static final Identifier OTHER = Identifier.parse("test:other_block");
+
+    private static ForgeRegistry<Object> registry() {
+        Identifier name = Identifier.parse("test:legacy_ore_aliases");
+        return new RegistryManager("LEGACY_ORE_ALIAS_TEST").createRegistry(name,
+                new RegistryBuilder<Object>().setName(name));
+    }
+
+    private static void install(ForgeRegistry<Object> registry) {
+        LegacyOreSpawnRegistryAliases.register(new RegisterEvent(Registries.BLOCK, registry, null));
+    }
+
+    private static void assertSnapshotUnchanged(ForgeRegistry<Object> registry, CompoundTag before) {
+        assertEquals(before, registry.makeSnapshot().write());
+    }
+
+    @Test public void oldLookupKeepsCanonicalNameNumericIdAndEntryCount() {
+        ForgeRegistry<Object> registry = registry();
+        Object quartz = new Object(), other = new Object();
+        registry.register(17, CURRENT, quartz);
+        registry.register(29, OTHER, other);
+        Set<Identifier> keys = Set.copyOf(registry.getKeys());
+        var ids = registry.makeSnapshot().ids;
+        int count = registry.getValues().size();
+        assertNull(registry.getRaw(OLD));
+        install(registry);
+        assertSame(quartz, registry.getValue(OLD));
+        assertSame(quartz, registry.getRaw(OLD));
+        assertEquals(CURRENT, registry.getKey(registry.getValue(OLD)));
+        assertEquals(17, registry.getID(quartz));
+        assertEquals(17, registry.getID(CURRENT));
+        assertEquals(-1, registry.getID(OLD));
+        assertEquals(keys, registry.getKeys());
+        assertFalse(registry.getKeys().contains(OLD));
+        assertEquals(count, registry.getValues().size());
+        assertEquals(ids, registry.makeSnapshot().ids);
+        assertEquals(CURRENT, registry.makeSnapshot().aliases.get(OLD));
+    }
+
+    @Test public void repeatedInstallIsIdempotentEvenAfterRegistryFreeze() {
+        ForgeRegistry<Object> registry = registry();
+        registry.register(17, CURRENT, new Object());
+        install(registry);
+        CompoundTag first = registry.makeSnapshot().write();
+        install(registry);
+        assertSnapshotUnchanged(registry, first);
+        registry.freeze();
+        install(registry);
+        assertSnapshotUnchanged(registry, first);
+    }
+
+    @Test public void nativeSnapshotRoundTripPersistsAliasWithoutAddingAnId() {
+        ForgeRegistry<Object> registry = registry();
+        Object quartz = new Object();
+        registry.register(17, CURRENT, quartz);
+        install(registry);
+        var snapshot = registry.makeSnapshot();
+        var decoded = ForgeRegistry.Snapshot.read(snapshot.write());
+        assertEquals(snapshot.ids, decoded.ids);
+        assertEquals(snapshot.aliases, decoded.aliases);
+        assertEquals(snapshot.overrides, decoded.overrides);
+        assertEquals(snapshot.blocked, decoded.blocked);
+        assertFalse(decoded.ids.containsKey(OLD));
+        ForgeRegistry<Object> restored = registry();
+        for (var entry : decoded.ids.object2IntEntrySet()) restored.register(entry.getIntValue(), entry.getKey(), quartz);
+        decoded.aliases.forEach(restored::addAlias);
+        assertSame(quartz, restored.getValue(OLD));
+        assertEquals(CURRENT, restored.getKey(restored.getValue(OLD)));
+        assertEquals(17, restored.getID(quartz));
+        assertEquals(1, restored.getValues().size());
+    }
+
+    @Test public void conflictingCanonicalEntryIsRefusedWithoutChangingRegistry() {
+        ForgeRegistry<Object> registry = registry();
+        registry.register(17, CURRENT, new Object());
+        registry.register(29, OLD, new Object());
+        assertRefused(registry, "Conflicting");
+    }
+
+    @Test public void conflictingExistingAliasIsRefusedWithoutChangingRegistry() {
+        ForgeRegistry<Object> registry = registry();
+        registry.register(17, CURRENT, new Object());
+        registry.register(29, OTHER, new Object());
+        registry.addAlias(OLD, OTHER);
+        assertRefused(registry, "Conflicting");
+    }
+
+    @Test public void danglingExistingAliasIsNotSilentlyOverwritten() {
+        ForgeRegistry<Object> registry = registry();
+        registry.register(17, CURRENT, new Object());
+        registry.addAlias(OLD, OTHER);
+        assertNull(registry.getRaw(OLD));
+        assertRefused(registry, "Conflicting");
+    }
+
+    @Test(timeout = 5000) public void cyclicOldAliasesRefuseWithoutLookupHangOrMutation() {
+        for (boolean longerCycle : new boolean[] {false, true}) {
+            ForgeRegistry<Object> registry = registry();
+            registry.register(17, CURRENT, new Object());
+            registry.addAlias(OLD, OTHER);
+            if (longerCycle) {
+                Identifier third = Identifier.parse("test:third");
+                registry.addAlias(OTHER, third);
+                registry.addAlias(third, OLD);
+                assertEquals(OLD, registry.makeSnapshot().aliases.get(third));
+            } else registry.addAlias(OTHER, OLD);
+            assertEquals(OTHER, registry.makeSnapshot().aliases.get(OLD));
+            assertRefused(registry, "cycle");
+        }
+    }
+
+    @Test public void validAliasChainIsAcceptedWithoutRewritingOrAllocatingEntries() {
+        ForgeRegistry<Object> registry = registry();
+        Object quartz = new Object();
+        registry.register(17, CURRENT, quartz);
+        registry.addAlias(OLD, OTHER);
+        registry.addAlias(OTHER, CURRENT);
+        CompoundTag before = registry.makeSnapshot().write();
+        install(registry);
+        registry.freeze();
+        install(registry);
+        assertSnapshotUnchanged(registry, before);
+        assertSame(quartz, registry.getValue(OLD));
+        assertEquals(CURRENT, registry.getKey(registry.getValue(OLD)));
+        assertEquals(17, registry.getID(quartz));
+        assertEquals(Set.of(CURRENT), registry.getKeys());
+        assertEquals(1, registry.getValues().size());
+    }
+
+    @Test(timeout = 5000) public void missingOrNoncanonicalTargetIsRefusedWithoutAddingAlias() {
+        ForgeRegistry<Object> empty = registry();
+        assertRefused(empty, "Missing canonical");
+        ForgeRegistry<Object> aliasTarget = registry();
+        aliasTarget.register(29, OTHER, new Object());
+        aliasTarget.addAlias(CURRENT, OTHER);
+        assertRefused(aliasTarget, "Missing canonical");
+        ForgeRegistry<Object> cyclicTarget = registry();
+        cyclicTarget.addAlias(CURRENT, OTHER);
+        cyclicTarget.addAlias(OTHER, CURRENT);
+        assertRefused(cyclicTarget, "Missing canonical");
+    }
+
+    @Test public void wrongRegistryEventIsIgnoredAndFrozenFreshInstallRefuses() {
+        ForgeRegistry<Object> registry = registry();
+        registry.register(17, CURRENT, new Object());
+        CompoundTag before = registry.makeSnapshot().write();
+        LegacyOreSpawnRegistryAliases.register(new RegisterEvent(Registries.ITEM, registry, null));
+        assertSnapshotUnchanged(registry, before);
+        registry.freeze();
+        assertRefused(registry, "too late");
+    }
+
+    private static void assertRefused(ForgeRegistry<Object> registry, String message) {
+        CompoundTag before = registry.makeSnapshot().write();
+        try {
+            install(registry);
+            fail("Expected registry alias refusal: " + message);
+        } catch (IllegalStateException expected) {
+            assertTrue(expected.getMessage(), expected.getMessage().contains(message));
+        }
+        assertSnapshotUnchanged(registry, before);
+    }
+}
diff --git a/src/test/java/zone/moddev/mc/basepower/gui/FluidTankGuiNativeTest.java b/src/test/java/zone/moddev/mc/basepower/gui/FluidTankGuiNativeTest.java
index 83455884..5a201952 100644
--- a/src/test/java/zone/moddev/mc/basepower/gui/FluidTankGuiNativeTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/gui/FluidTankGuiNativeTest.java
@@ -3,12 +3,15 @@
 import java.util.ArrayList;
 import java.util.List;
 import net.minecraft.client.gui.navigation.ScreenRectangle;
-import net.minecraft.client.gui.render.TextureSetup;
-import net.minecraft.client.gui.render.state.BlitRenderState;
-import net.minecraft.client.gui.render.state.GuiRenderState;
+import net.minecraft.client.renderer.state.gui.BlitRenderState;
+import net.minecraft.client.renderer.state.gui.GuiElementRenderState;
+import net.minecraft.client.renderer.state.gui.GuiRenderState;
 import net.minecraft.client.renderer.RenderPipelines;
+import net.minecraft.resources.Identifier;
 import org.joml.Matrix3x2f;
 import org.junit.Test;
+import zone.moddev.mc.basepower.client.FluidGaugeRenderer;
+import zone.moddev.mc.basepower.resources.NativeGuiExtractionFixture;
 import static org.junit.Assert.*;
 
 /** Real native extraction state geometry, not texture upload or screenshot qualification. */
@@ -27,34 +30,38 @@ public class FluidTankGuiNativeTest {
         assertTrue(source.contains("guiContainer.blit(displayImage, x + xPos - 3, y + yPos - 3, 176, 0, 22, 66)"));
     }
 
-    @Test public void fullGaugeQueuesFourNativeQuadsAndCropsTheLastTileUv() {
+    @Test public void fullGaugeQueuesFullNativeTilesAndScissorCropsTheLastRow() throws Exception {
         var states = extract(new Matrix3x2f(), null, 80, 9, 16, 60, 0x22123456);
         assertEquals(4, states.size());
         for (int row = 0; row < 4; row++) {
             var tile = at(states, 80, 9 + row * 16);
             assertEquals(96, tile.x1());
-            assertEquals(9 + Math.min(60, (row + 1) * 16), tile.y1());
+            assertEquals(9 + (row + 1) * 16, tile.y1());
             assertEquals(0.25F, tile.u0(), 0F);
             assertEquals(0.5F, tile.u1(), 0F);
             assertEquals(0.5F, tile.v0(), 0F);
-            assertEquals(row == 3 ? 0.6875F : 0.75F, tile.v1(), 0F);
+            assertEquals(0.75F, tile.v1(), 0F);
+            assertEquals(new ScreenRectangle(80, 9, 16, 60), tile.scissorArea());
+            assertEquals(new ScreenRectangle(80, 9 + row * 16, 16, row == 3 ? 12 : 16), tile.bounds());
             assertSame(RenderPipelines.GUI_TEXTURED, tile.pipeline());
             assertEquals(0xFF123456, tile.color());
         }
     }
 
-    @Test public void widePartialRectanglePreservesTileGeometryAndBothUvFractions() {
+    @Test public void widePartialRectangleClipsFullTilesWithoutStretchingEitherAxis() throws Exception {
         var states = extract(new Matrix3x2f(), null, 3, 7, 19, 17, 0x3F76E4);
         assertEquals(4, states.size());
         var corner = at(states, 19, 23);
-        assertEquals(22, corner.x1());
-        assertEquals(24, corner.y1());
-        assertEquals(0.25F + 0.25F * 3 / 16, corner.u1(), 0F);
-        assertEquals(0.5F + 0.25F / 16, corner.v1(), 0F);
+        assertEquals(35, corner.x1());
+        assertEquals(39, corner.y1());
+        assertEquals(0.5F, corner.u1(), 0F);
+        assertEquals(0.75F, corner.v1(), 0F);
+        assertEquals(new ScreenRectangle(3, 7, 19, 17), corner.scissorArea());
+        assertEquals(new ScreenRectangle(19, 23, 3, 1), corner.bounds());
         assertEquals(0xFF3F76E4, corner.color());
     }
 
-    @Test public void extractionSnapshotsTransformsAndUsesNativeScissorBounds() {
+    @Test public void extractionSnapshotsTransformsAndIntersectsParentScissorBounds() throws Exception {
         var pose = new Matrix3x2f().translation(10, 20);
         var scissor = new ScreenRectangle(11, 22, 5, 6);
         var states = extract(pose, scissor, 0, 0, 16, 16, 0xFFFFFFFF);
@@ -66,18 +73,41 @@ public class FluidTankGuiNativeTest {
         assertEquals(scissor, state.bounds());
     }
 
-    @Test public void emptyAndInvalidRectanglesSubmitNothing() {
+    @Test public void emptyAndInvalidRectanglesSubmitNothing() throws Exception {
         assertTrue(extract(new Matrix3x2f(), null, 0, 0, 0, 60, -1).isEmpty());
         assertTrue(extract(new Matrix3x2f(), null, 0, 0, 16, 0, -1).isEmpty());
         assertTrue(extract(new Matrix3x2f(), null, 0, 0, -1, 60, -1).isEmpty());
         assertTrue(extract(new Matrix3x2f(), null, 0, 0, 16, -1, -1).isEmpty());
     }
 
+    @Test public void nativeScissorIsRestoredEvenWhenQueuingThrows() throws Exception {
+        var failure = new IllegalStateException("deliberate queue failure");
+        var target = new GuiRenderState() {
+            @Override public void addGuiElement(GuiElementRenderState state) { throw failure; }
+        };
+        var fixture = new NativeGuiExtractionFixture(target);
+        var sprite = fixture.sprite(Identifier.parse("basepower:cpu_geometry_atlas"));
+        fixture.graphics.enableScissor(1, 2, 21, 22);
+        assertSame(failure, assertThrows(IllegalStateException.class,
+                () -> FluidGaugeRenderer.extractFluidTiles(fixture.graphics, sprite, 3, 4, 5, 6, -1)));
+        assertTrue(fixture.graphics.containsPointInScissor(2, 3));
+        assertFalse(fixture.graphics.containsPointInScissor(0, 3));
+        fixture.graphics.disableScissor();
+        assertTrue(fixture.graphics.containsPointInScissor(0, 3));
+        assertThrows(IllegalStateException.class, fixture.graphics::disableScissor);
+    }
+
     private static List<BlitRenderState> extract(Matrix3x2f pose, ScreenRectangle scissor,
-            int x, int y, int width, int height, int color) {
+            int x, int y, int width, int height, int color) throws Exception {
         var target = new GuiRenderState();
-        FluidTankGUI.extractFluidTiles(target, TextureSetup.noTexture(), pose, scissor,
-                x, y, width, height, 0.25F, 0.5F, 0.5F, 0.75F, color);
+        var fixture = new NativeGuiExtractionFixture(target);
+        if (scissor != null) fixture.graphics.enableScissor(scissor.left(), scissor.top(), scissor.right(), scissor.bottom());
+        fixture.pose.set(pose);
+        var sprite = fixture.sprite(Identifier.parse("basepower:cpu_geometry_atlas"));
+        FluidGaugeRenderer.extractFluidTiles(fixture.graphics, sprite, x, y, width, height, color);
+        fixture.pose.translate(100, 100);
+        if (scissor != null) fixture.graphics.disableScissor();
+        assertThrows(IllegalStateException.class, fixture.graphics::disableScissor);
         var states = new ArrayList<BlitRenderState>();
         target.forEachElement(state -> states.add((BlitRenderState) state), GuiRenderState.TraverseRange.ALL);
         return states;
diff --git a/src/test/java/zone/moddev/mc/basepower/migration/CooperativeChunkReturnHooksTest.java b/src/test/java/zone/moddev/mc/basepower/migration/CooperativeChunkReturnHooksTest.java
index 07de1ac9..5e9270c0 100644
--- a/src/test/java/zone/moddev/mc/basepower/migration/CooperativeChunkReturnHooksTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/migration/CooperativeChunkReturnHooksTest.java
@@ -72,8 +72,12 @@ class FixtureLoader extends ClassLoader {
         Constructor<?> constructor = type.getDeclaredConstructor();
         constructor.setAccessible(true);
         Method handler = type.getDeclaredMethod(mod + "$finishChunk", CompoundTag.class, int.class,
-                CompoundTag.class, CallbackInfoReturnable.class);
+                CompoundTag.class, int.class, CallbackInfoReturnable.class);
+        assertThrows("The removed three-argument chunk ABI must not satisfy this test", NoSuchMethodException.class,
+                () -> type.getDeclaredMethod(mod + "$finishChunk", CompoundTag.class, int.class,
+                        CompoundTag.class, CallbackInfoReturnable.class));
         handler.setAccessible(true);
-        handler.invoke(constructor.newInstance(), root, 0, null, callback);
+        handler.invoke(constructor.newInstance(), root, 0, null,
+                net.minecraft.SharedConstants.getCurrentVersion().dataVersion().version(), callback);
     }
 }
diff --git a/src/test/java/zone/moddev/mc/basepower/migration/LateOreSpawnProfileMigrationTest.java b/src/test/java/zone/moddev/mc/basepower/migration/LateOreSpawnProfileMigrationTest.java
new file mode 100644
index 00000000..4df6aee8
--- /dev/null
+++ b/src/test/java/zone/moddev/mc/basepower/migration/LateOreSpawnProfileMigrationTest.java
@@ -0,0 +1,214 @@
+package zone.moddev.mc.basepower.migration;
+
+import static org.junit.Assert.*;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.InvokeDynamicInsnNode;
+import org.objectweb.asm.tree.JumpInsnNode;
+import org.objectweb.asm.tree.MethodInsnNode;
+import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.tree.analysis.Analyzer;
+import org.objectweb.asm.tree.analysis.Frame;
+import org.objectweb.asm.tree.analysis.SourceInterpreter;
+import org.objectweb.asm.tree.analysis.SourceValue;
+
+public class LateOreSpawnProfileMigrationTest {
+    @Rule public final TemporaryFolder temporary = new TemporaryFolder();
+
+    private Path registerBeforeImport(String name) throws Exception {
+        AdvantageLegacyMigrations.registerPowerAdvantage();
+        Path config = temporary.newFolder(name).toPath();
+        OreSpawnProfileMigration.registerPowerProvider(config);
+        try (var files = Files.list(config)) { assertEquals(0, files.count()); }
+        return config;
+    }
+
+    private static JsonObject quartzProfile(int schema) {
+        return JsonParser.parseString("""
+                {"schema_version":%d,"manage_vanilla_ores":false,"place_fluid_deposits":false,
+                 "ores":{"minecraft:quartz_ore":{"enabled":true,"suppress_vanilla":false,
+                   "dimensions":{"minecraft:the_nether":{"enabled":true,"frequency":0.375,
+                     "min_y":12,"max_y":117,"node_size":9,"private":{"keep":42}}}}},
+                 "providers":{"retained":{"known_ores":["minecraft:quartz_ore"]}},
+                 "history":"minecraft:quartz_ore is a literal note"}
+                """.formatted(schema)).getAsJsonObject();
+    }
+
+    private static JsonObject read(Path file) throws IOException {
+        return JsonParser.parseString(Files.readString(file)).getAsJsonObject();
+    }
+
+    @Test public void lateCreatedGlobalAndOwnedOverrideAreBothMigrated() throws Exception {
+        Path config = registerBeforeImport("late-import");
+        Path global = config.resolve("orespawn-worldgen.json");
+        JsonObject before = quartzProfile(8), expected = before.deepCopy();
+        expected.getAsJsonObject("ores").getAsJsonObject("minecraft:quartz_ore")
+                .addProperty("block", "minecraft:nether_quartz_ore");
+        Files.writeString(global, before.toString());
+        Path override = config.resolve("basepower-orespawn.json");
+        JsonObject provider = JsonParser.parseString("""
+                {"schema_version":4,"provider_modid":"basepower","provider_revision":3,
+                 "ores":{"basepower:legacy/saved_oil":{"block":"poweradvantage:crude_oil",
+                   "enabled":false,"dimensions":{"minecraft:overworld":{"enabled":false,
+                     "frequency":0.625,"min_y":19,"max_y":47,"private":{"keep":7}}}}},
+                 "fluid_deposits":{},"user":{"setting":"poweradvantage:crude_oil"}}
+                """).getAsJsonObject();
+        Files.writeString(override, provider.toString());
+        assertTrue(OreSpawnProfileMigration.migrateLateProfiles(config));
+        assertEquals(expected, read(global));
+        JsonObject migrated = read(override), retained = provider.getAsJsonObject("ores")
+                .getAsJsonObject("basepower:legacy/saved_oil").deepCopy();
+        retained.addProperty("block", "basepower:crude_oil");
+        assertEquals(retained, migrated.getAsJsonObject("ores").get("basepower:legacy/saved_oil"));
+        assertEquals(4, migrated.get("schema_version").getAsInt());
+        assertEquals(provider.get("provider_revision"), migrated.get("provider_revision"));
+        assertEquals(provider.get("user"), migrated.get("user"));
+        assertFalse(migrated.getAsJsonObject("fluid_deposits")
+                .getAsJsonObject("basepower:fluid_deposit/desert_crude_oil").get("enabled").getAsBoolean());
+    }
+
+    @Test public void lateRepairPreservesRootSevenEightAndEveryNonOutputValue() throws Exception {
+        for (int schema : new int[] {7, 8}) {
+            Path config = registerBeforeImport("schema-" + schema);
+            Path file = config.resolve("orespawn-worldgen.json");
+            JsonObject source = quartzProfile(schema), expected = source.deepCopy();
+            expected.getAsJsonObject("ores").getAsJsonObject("minecraft:quartz_ore")
+                    .addProperty("block", "minecraft:nether_quartz_ore");
+            Files.writeString(file, source.toString());
+            assertTrue(OreSpawnProfileMigration.migrateLateProfiles(config));
+            assertEquals(expected, read(file));
+        }
+    }
+
+    @Test public void absentAndAlreadyRepairedLateFilesAreIdempotentIncludingEvidence() throws Exception {
+        Path config = registerBeforeImport("idempotent");
+        assertFalse(OreSpawnProfileMigration.migrateLateProfiles(config));
+        try (var files = Files.list(config)) { assertEquals(0, files.count()); }
+        Path file = config.resolve("orespawn-worldgen.json");
+        byte[] original = ("\n" + quartzProfile(8) + "\n").getBytes(java.nio.charset.StandardCharsets.UTF_8);
+        Files.write(file, original);
+        assertTrue(OreSpawnProfileMigration.migrateLateProfiles(config));
+        Map<Path, byte[]> first = new LinkedHashMap<>();
+        try (var files = Files.list(config)) {
+            for (Path path : files.toList()) first.put(path, Files.readAllBytes(path));
+        }
+        assertEquals(3, first.size());
+        Path backup = first.keySet().stream().filter(path -> path.toString().endsWith(".bak")).findFirst().orElseThrow();
+        assertArrayEquals(original, first.get(backup));
+        assertFalse(OreSpawnProfileMigration.migrateLateProfiles(config));
+        try (var files = Files.list(config)) { assertEquals(first.keySet(), new java.util.HashSet<>(files.toList())); }
+        for (var entry : first.entrySet()) assertArrayEquals(entry.getValue(), Files.readAllBytes(entry.getKey()));
+    }
+
+    @Test public void lateActiveCollisionRefusesWithoutChangingTheImportedFile() throws Exception {
+        Path config = registerBeforeImport("refused");
+        JsonObject source = quartzProfile(8);
+        source.addProperty("manage_vanilla_ores", true);
+        JsonObject current = source.getAsJsonObject("ores").getAsJsonObject("minecraft:quartz_ore").deepCopy();
+        current.addProperty("block", "minecraft:nether_quartz_ore");
+        source.getAsJsonObject("ores").add("minecraft:nether_quartz_ore", current);
+        Path file = config.resolve("orespawn-worldgen.json");
+        Files.writeString(file, source.toString());
+        byte[] before = Files.readAllBytes(file);
+        try {
+            OreSpawnProfileMigration.migrateLateProfiles(config);
+            fail("Ambiguous active imported rules must not be silently accepted");
+        } catch (IOException expected) {
+            assertTrue(expected.getMessage().contains("needs review"));
+        }
+        assertArrayEquals(before, Files.readAllBytes(file));
+    }
+
+    @Test public void loadCompleteEnqueuesRepairThenConditionallyRebakesAndRefreshes() throws Exception {
+        var power = NativeMigrationMixinContract.read("zone/moddev/mc/basepower/PowerAdvantage");
+        var listener = NativeMigrationMixinContract.method(power, "finishOreSpawnMigration");
+        var enqueues = NativeMigrationMixinContract.calls(listener).stream().filter(call ->
+                call.owner.equals("net/minecraftforge/fml/event/lifecycle/FMLLoadCompleteEvent")
+                        && call.name.equals("enqueueWork")
+                        && call.desc.equals("(Ljava/lang/Runnable;)Ljava/util/concurrent/CompletableFuture;")).toList();
+        assertEquals("One actual load-complete work submission", 1, enqueues.size());
+        var enqueueFrame = sources(power.name, listener)[listener.instructions.indexOf(enqueues.getFirst())];
+        var runnable = enqueueFrame.getStack(enqueueFrame.getStackSize() - 1);
+        assertEquals("The submitted Runnable has one producer", 1, runnable.insns.size());
+        assertTrue("The submitted Runnable is a lambda", runnable.insns.iterator().next() instanceof InvokeDynamicInsnNode);
+        var lambda = (InvokeDynamicInsnNode) runnable.insns.iterator().next();
+        assertEquals("java/lang/invoke/LambdaMetafactory", lambda.bsm.getOwner());
+        assertTrue(Set.of("metafactory", "altMetafactory").contains(lambda.bsm.getName()));
+        var implementations = Arrays.stream(lambda.bsmArgs).filter(Handle.class::isInstance).map(Handle.class::cast)
+                .filter(handle -> handle.getOwner().equals(power.name)).toList();
+        assertEquals("One exact Power callback implementation", 1, implementations.size());
+        var implementation = implementations.getFirst();
+        var callback = NativeMigrationMixinContract.method(power, implementation.getName() + implementation.getDesc());
+        var calls = NativeMigrationMixinContract.calls(callback);
+        var repairs = calls.stream().filter(call -> call.owner.equals("zone/moddev/mc/basepower/migration/OreSpawnProfileMigration")
+                && call.name.equals("migrateLateProfiles")).toList();
+        assertEquals("One repair in the submitted callback", 1, repairs.size());
+        var repair = repairs.getFirst();
+        assertEquals("(Ljava/nio/file/Path;)Z", repair.desc);
+        var frames = sources(power.name, callback);
+        var gates = new ArrayList<JumpInsnNode>();
+        for (var insn : callback.instructions) {
+            if (!(insn instanceof JumpInsnNode jump) || (jump.getOpcode() != Opcodes.IFEQ && jump.getOpcode() != Opcodes.IFNE)) continue;
+            var frame = frames[callback.instructions.indexOf(jump)];
+            if (frame != null && frame.getStack(frame.getStackSize() - 1).insns.equals(Set.of(repair))) gates.add(jump);
+        }
+        assertEquals("One gate consumes the actual repair result", 1, gates.size());
+        var gate = gates.getFirst();
+        var changedCalls = normalCalls(gate.getOpcode() == Opcodes.IFEQ ? gate.getNext() : gate.label);
+        var unchangedCalls = normalCalls(gate.getOpcode() == Opcodes.IFEQ ? gate.label : gate.getNext());
+        var expected = new ArrayList<MethodInsnNode>();
+        int previous = callback.instructions.indexOf(repair);
+        for (String owner : List.of("GeomeConfig", "OreSpawnOreGeneration", "FluidDepositFeature")) {
+            String methodName = owner.equals("GeomeConfig") ? "bake" : "refreshWorldConfig";
+            var matches = calls.stream().filter(value -> value.owner.equals("zone/moddev/mc/orespawn/worldgen/" + owner)
+                    && value.name.equals(methodName)).toList();
+            assertEquals("One " + owner + " refresh", 1, matches.size());
+            var call = matches.getFirst();
+            int index = callback.instructions.indexOf(call);
+            assertTrue(owner + " follows repair in the required order", index > previous);
+            expected.add(call);
+            previous = index;
+        }
+        assertEquals("Changed files execute all three refresh calls in order", expected, changedCalls);
+        assertTrue("Unchanged files execute no refresh calls", unchangedCalls.isEmpty());
+    }
+
+    private static Frame<SourceValue>[] sources(String owner, MethodNode method) throws Exception {
+        return new Analyzer<>(new SourceInterpreter(Opcodes.ASM9) {
+            @Override public SourceValue copyOperation(AbstractInsnNode insn, SourceValue value) { return value; }
+        }).analyze(owner, method);
+    }
+
+    private static List<MethodInsnNode> normalCalls(AbstractInsnNode start) {
+        var calls = new ArrayList<MethodInsnNode>();
+        var visited = new HashSet<AbstractInsnNode>();
+        for (var insn = start; insn != null; insn = insn.getNext()) {
+            assertTrue("The callback's normal path terminates", visited.add(insn));
+            if (insn instanceof MethodInsnNode call) calls.add(call);
+            if (insn.getOpcode() == Opcodes.RETURN) return calls;
+            if (insn instanceof JumpInsnNode jump) {
+                assertEquals("No unreviewed conditional inside the refresh path", Opcodes.GOTO, jump.getOpcode());
+                insn = jump.label;
+            }
+            assertNotEquals("The normal path must not throw", Opcodes.ATHROW, insn.getOpcode());
+        }
+        throw new AssertionError("The callback's normal path has no return");
+    }
+}
diff --git a/src/test/java/zone/moddev/mc/basepower/migration/LegacyEnchantmentContextTest.java b/src/test/java/zone/moddev/mc/basepower/migration/LegacyEnchantmentContextTest.java
new file mode 100644
index 00000000..4460f409
--- /dev/null
+++ b/src/test/java/zone/moddev/mc/basepower/migration/LegacyEnchantmentContextTest.java
@@ -0,0 +1,143 @@
+package zone.moddev.mc.basepower.migration;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.nio.file.Path;
+import java.util.Map;
+import net.minecraft.SharedConstants;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.ListTag;
+import net.minecraft.resources.Identifier;
+import net.minecraft.util.datafix.DataFixTypes;
+import net.minecraft.util.datafix.DataFixers;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import zone.moddev.mc.basemetals.api.migration.Legacy112MigrationExtension;
+import zone.moddev.mc.basemetals.migration.Legacy112WorldMigrator;
+
+import static org.junit.Assert.*;
+
+public class LegacyEnchantmentContextTest {
+    @BeforeClass public static void registerCompanion() throws Exception {
+        SharedConstants.tryDetectVersion();
+        net.minecraft.server.Bootstrap.bootStrap();
+        Constructor<BaseMetalsLegacyMigration> constructor = BaseMetalsLegacyMigration.class.getDeclaredConstructor();
+        constructor.setAccessible(true);
+        Legacy112MigrationExtension.register(Identifier.fromNamespaceAndPath("basepower", "test_enchantment_context"),
+                constructor.newInstance());
+    }
+
+    @Test public void baseMetalsFirstUsesSavedEnchantmentsForDroppedItemsAndCartContents() throws Exception {
+        Map<Integer, String> map = savedIds();
+        Map<Integer, String> previous = Map.copyOf(map);
+        try {
+            for (int version : new int[] {512, 1343}) {
+                for (boolean cart : new boolean[] {false, true}) {
+                    map.clear();
+                    CompoundTag snapshot = registrySnapshot(version), before = snapshot.copy();
+                    prepareWorld(snapshot);
+                    assertEquals("The extension must not edit the saved registry snapshot", before, snapshot);
+                    CompoundTag chunk = chunk(version, cart);
+                    LegacyWorldDataHook.prepareLegacyChunk(chunk);
+                    LegacyWorldDataHook.prepareLegacyEntities(chunk);
+                    CompoundTag converted = DataFixTypes.CHUNK.update(DataFixers.getDataFixer(), chunk,
+                            version, SharedConstants.getCurrentVersion().dataVersion().version());
+                    converted = LegacyWorldDataHook.finalizeLegacyChunk(converted);
+                    CompoundTag entity = converted.getListOrEmpty("entities").getCompoundOrEmpty(0);
+                    CompoundTag item = cart ? entity.getListOrEmpty("Items").getCompoundOrEmpty(0)
+                            : entity.getCompoundOrEmpty("Item");
+                    CompoundTag enchantments = item.getCompoundOrEmpty("components")
+                            .getCompoundOrEmpty("minecraft:enchantments");
+                    assertEquals("Saved Forge IDs must not become vanilla curses: " + item, 4, enchantments.size());
+                    for (int index = 0; index < 4; index++) {
+                        assertEquals(item.toString(), index + 1, enchantments.getIntOr("example:musket_" + index, 0));
+                    }
+                }
+            }
+        } finally {
+            map.clear();
+            map.putAll(previous);
+        }
+    }
+
+    @Test public void selectingAnotherWorldCannotReuseThePreviousEnchantmentIndex() throws Exception {
+        Map<Integer, String> map = savedIds();
+        Map<Integer, String> previous = Map.copyOf(map);
+        try {
+            prepareWorld(registrySnapshot(512));
+            assertEquals("example:musket_0", map.get(10));
+            CompoundTag modern = new CompoundTag(), data = new CompoundTag();
+            data.putInt("DataVersion", SharedConstants.getCurrentVersion().dataVersion().version());
+            modern.put("Data", data);
+            prepareWorld(modern);
+            assertTrue("A world with no legacy index must clear the previous world's IDs", map.isEmpty());
+        } finally {
+            map.clear();
+            map.putAll(previous);
+        }
+    }
+
+    private static void prepareWorld(CompoundTag snapshot) throws Exception {
+        Method method = Legacy112WorldMigrator.class.getDeclaredMethod("prepareWorld", Path.class, CompoundTag.class);
+        method.setAccessible(true);
+        method.invoke(null, Path.of("build", "enchantment-context-fixture", "level.dat"), snapshot);
+    }
+
+    @SuppressWarnings("unchecked") private static Map<Integer, String> savedIds() throws Exception {
+        Field field = LegacyWorldDataHook.class.getDeclaredField("LEGACY_ENCHANTMENTS");
+        field.setAccessible(true);
+        return (Map<Integer, String>) field.get(null);
+    }
+
+    private static CompoundTag registrySnapshot(int version) {
+        CompoundTag root = new CompoundTag(), data = new CompoundTag(), fml = new CompoundTag();
+        CompoundTag registries = new CompoundTag(), enchantments = new CompoundTag();
+        ListTag entries = new ListTag();
+        data.putInt("DataVersion", version);
+        for (int index = 0; index < 4; index++) {
+            CompoundTag entry = new CompoundTag();
+            entry.putInt("V", 10 + index);
+            entry.putString("K", "example:musket_" + index);
+            entries.add(entry);
+        }
+        enchantments.put("ids", entries);
+        registries.put("minecraft:enchantments", enchantments);
+        fml.put("Registries", registries);
+        root.put("FML", fml);
+        root.put("Data", data);
+        return root;
+    }
+
+    private static CompoundTag chunk(int version, boolean cart) {
+        CompoundTag root = new CompoundTag(), level = new CompoundTag(), entity = new CompoundTag();
+        CompoundTag item = new CompoundTag(), tag = new CompoundTag();
+        ListTag entities = new ListTag(), enchantments = new ListTag();
+        for (int index = 0; index < 4; index++) {
+            CompoundTag enchantment = new CompoundTag();
+            enchantment.putShort("id", (short) (10 + index));
+            enchantment.putShort("lvl", (short) (index + 1));
+            enchantments.add(enchantment);
+        }
+        tag.put("ench", enchantments);
+        item.putString("id", "minecraft:diamond_sword");
+        item.putByte("Count", (byte) 1);
+        item.putShort("Damage", (short) 5);
+        item.put("tag", tag);
+        entity.putString("id", cart ? (version < 704 ? "MinecartChest" : "minecraft:chest_minecart")
+                : (version < 704 ? "Item" : "minecraft:item"));
+        if (cart) {
+            item.putByte("Slot", (byte) 0);
+            ListTag items = new ListTag();
+            items.add(item);
+            entity.put("Items", items);
+        } else entity.put("Item", item);
+        entities.add(entity);
+        level.put("Entities", entities);
+        level.putInt("xPos", 0);
+        level.putInt("zPos", 0);
+        root.put("Level", level);
+        root.putInt("DataVersion", version);
+        return root;
+    }
+}
diff --git a/src/test/java/zone/moddev/mc/basepower/migration/LegacyMachineItemsTest.java b/src/test/java/zone/moddev/mc/basepower/migration/LegacyMachineItemsTest.java
index f71087e9..bfbb89e9 100644
--- a/src/test/java/zone/moddev/mc/basepower/migration/LegacyMachineItemsTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/migration/LegacyMachineItemsTest.java
@@ -240,13 +240,15 @@ private static net.minecraft.core.HolderLookup.Provider registries() {
         assertEquals(before.getCompoundOrEmpty("tag"), actual.getCompoundOrEmpty("components").getCompoundOrEmpty("minecraft:custom_data"));
     }
 
-    @Test public void registeredForeignToolKeepsWearInDirectAndNestedMachineSlots() {
+    @Test public void registeredForeignToolKeepsWearInDirectAndNestedMachineSlots() throws Exception {
         String id = "advantageworks_unit:legacy_foreign_tool";
         net.minecraftforge.registries.GameData.unfreezeData();
         var tool = new net.minecraft.world.item.Item(new net.minecraft.world.item.Item.Properties().durability(250)
                 .setId(net.minecraft.resources.ResourceKey.create(net.minecraft.core.registries.Registries.ITEM,
                         net.minecraft.resources.Identifier.parse(id))));
         net.minecraftforge.registries.ForgeRegistries.ITEMS.register(net.minecraft.resources.Identifier.parse(id), tool);
+        bindNativeFixtureComponents(id);
+        assertEquals(Integer.valueOf(250), tool.components().get(net.minecraft.core.component.DataComponents.MAX_DAMAGE));
         CompoundTag foreign = stack(id, 9, 1);
         CompoundTag payload = new CompoundTag();
         payload.putInt("Fixture", 31);
@@ -256,7 +258,7 @@ private static net.minecraft.core.HolderLookup.Provider registries() {
         var direct = zone.moddev.mc.basepower.util.ItemData.readStack(registries(), foreign);
         CompoundTag chest = convertedTile(carrier(foreign)).getListOrEmpty("Items").getCompoundOrEmpty(0);
         var carried = parseStack(chest)
-                .get(net.minecraft.core.component.DataComponents.CONTAINER).nonEmptyItems().iterator().next();
+                .get(net.minecraft.core.component.DataComponents.CONTAINER).nonEmptyItems().iterator().next().create();
         for (var loaded : List.of(direct, carried)) {
             assertSame(tool, loaded.getItem());
             assertEquals(1, loaded.getCount());
@@ -274,6 +276,35 @@ private static ItemStack parseStack(CompoundTag saved) {
                 saved).getOrThrow();
     }
 
+    private static void bindNativeFixtureComponents(String id) throws Exception {
+        // Other unit tests may construct unregistered items. Bake only this item's
+        // real constructor initializer, without applying empty maps to other holders.
+        var nativeInitializers = net.minecraft.core.registries.BuiltInRegistries.DATA_COMPONENT_INITIALIZERS;
+        var field = nativeInitializers.getClass().getDeclaredField("initializers");
+        field.setAccessible(true);
+        var isolated = new net.minecraft.core.component.DataComponentInitializers();
+        int found = 0;
+        for (Object entry : (List<?>) field.get(nativeInitializers)) {
+            var keyAccessor = entry.getClass().getDeclaredMethod("key");
+            var initializerAccessor = entry.getClass().getDeclaredMethod("initializer");
+            keyAccessor.setAccessible(true);
+            initializerAccessor.setAccessible(true);
+            var key = (net.minecraft.resources.ResourceKey<?>) keyAccessor.invoke(entry);
+            if (!key.identifier().toString().equals(id)) continue;
+            @SuppressWarnings("unchecked")
+            var initializer = (net.minecraft.core.component.DataComponentInitializers.Initializer<Object>)
+                    initializerAccessor.invoke(entry);
+            @SuppressWarnings("unchecked")
+            var itemKey = (net.minecraft.resources.ResourceKey<Object>) key;
+            isolated.add(itemKey, initializer);
+            found++;
+        }
+        assertEquals("Exactly one native constructor initializer is required", 1, found);
+        isolated.build(registries()).forEach(pending -> pending.forEach((holder, components) -> {
+            if (holder.key().identifier().toString().equals(id)) holder.bindComponents(components);
+        }));
+    }
+
     @Test public void positiveNativeContainerConversionsDoNotEmitErrors() {
         try (ErrorCapture capture = new ErrorCapture()) {
             nativeNestedContainerItemsAreFixedExactlyOnce();
diff --git a/src/test/java/zone/moddev/mc/basepower/migration/LegacyPlayerTransformerTest.java b/src/test/java/zone/moddev/mc/basepower/migration/LegacyPlayerTransformerTest.java
index bcb5eb1d..ba45ebed 100644
--- a/src/test/java/zone/moddev/mc/basepower/migration/LegacyPlayerTransformerTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/migration/LegacyPlayerTransformerTest.java
@@ -34,7 +34,7 @@
 import static org.junit.Assert.*;
 import static zone.moddev.mc.basepower.migration.NativeMigrationMixinContract.*;
 
-/** Native redirect contracts and real handler execution; packaged tests prove live Mixin application. */
+/** Native redirect/callback contracts and real player DFU; packaged tests prove live Mixin application. */
 public class LegacyPlayerTransformerTest {
     @Rule public final TemporaryFolder temp = new TemporaryFolder();
 
@@ -42,34 +42,46 @@ private static Binding loose() throws Exception {
         return binding("basepower", "PlayerDataStorageMixin", "preservePlayer");
     }
 
-    private static Binding embedded() throws Exception {
-        return binding("basepower", "LevelStorageSourceMixin", "preserveEmbeddedPlayer");
+    private static PlayerBoundary embedded() throws Exception {
+        return new PlayerBoundary(read("zone/moddev/mc/basemetals/migration/Legacy112WorldMigrator"),
+                "L" + FIX_TYPES + ";updateToCurrentVersion(" + FIXER + TAG + "I)" + TAG);
     }
 
-    private static List<Binding> targets() throws Exception { return List.of(loose(), embedded()); }
+    private static List<PlayerBoundary> targets() throws Exception {
+        Binding loose = loose();
+        return List.of(new PlayerBoundary(loose.target(), loose.invocation()), embedded());
+    }
 
-    @Test public void exactNativeLoosePlayerLoadAndEmbeddedUpdateAreRedirected() throws Exception {
-        for (Binding target : targets()) {
+    @Test public void nativeLooseRedirectAndSharedEmbeddedCallbackBindExactTargets() throws Exception {
+        for (Binding target : List.of(loose())) {
             assertEquals("*", target.selector());
             assertTrue(target.injector().desc.endsWith("/Redirect;"));
             target.assertAt("INVOKE");
-            String payload = target.target().name.endsWith("PlayerDataStorage") ? TAG : DYNAMIC;
+            String payload = TAG;
             assertEquals("L" + FIX_TYPES + ";updateToCurrentVersion(" + FIXER + payload + "I)" + payload,
                     target.invocation());
             assertEquals("(L" + FIX_TYPES + ";" + FIXER + payload + "I)" + payload, target.handler().desc);
             target.assertOnePlayerSite(target.target());
-            String wrapper = payload.equals(TAG) ? "updateNativePlayer" : "updateNativeEmbeddedPlayer";
+            String wrapper = "updateNativePlayer";
             assertEquals(1, calls(target.handler()).stream().filter(call -> call.owner.equals(
                     "zone/moddev/mc/basepower/migration/LegacyPlayerDataFixes") && call.name.equals(wrapper)).count());
         }
         assertEquals(1, value(loose().injector(), "require", -1));
         assertEquals(1, value(loose().injector(), "allow", -1));
-        // Other embedded data-fix types are deliberately redirected too, then forwarded unchanged.
-        assertEquals(4, embedded().invokeSites(embedded().target()));
         assertEquals(1, loose().invokeSites(loose().target()));
+        PlayerBoundary shared = embedded();
+        MethodNode flatten = shared.assertOnePlayerSite(shared.target());
+        assertEquals("flattenEmbeddedPlayer", flatten.name);
+        assertEquals("(" + TAG + "ILjava/util/List;)" + TAG, flatten.desc);
+        var callbacks = calls(flatten).stream().filter(call -> call.owner.equals(
+                "zone/moddev/mc/basemetals/api/migration/Legacy112MigrationExtension")
+                && call.name.equals("afterPlayerFlattening") && call.desc.equals("(" + TAG + TAG + ")V")).toList();
+        assertEquals(1, callbacks.size());
+        assertTrue("The companion callback must precede componentization", flatten.instructions.indexOf(callbacks.getFirst())
+                < flatten.instructions.indexOf(playerCall(shared, shared.target())));
     }
 
-    @Test public void nativeEmbeddedRedirectExecutesAndDoesNotReconvertCurrentPlayer() throws Exception {
+    @Test public void nativeLooseRedirectExecutesAndDoesNotReconvertCurrentPlayer() throws Exception {
         SharedConstants.tryDetectVersion();
         Bootstrap.bootStrap();
         RecordingFixer fixer = new RecordingFixer(DataFixers.getDataFixer());
@@ -97,14 +109,56 @@ private static Binding embedded() throws Exception {
         CompoundTag unrelated = new CompoundTag();
         unrelated.putString("witness", "native-forwarding");
         fixer.playerCalls.clear();
-        CompoundTag expected = DataFixTypes.LEVEL.updateToCurrentVersion(DataFixers.getDataFixer(),
-                unrelated.copy(), current);
-        assertEquals(expected, invoke(redirect, DataFixTypes.LEVEL, fixer, unrelated, current));
+        var rejected = assertThrows(java.lang.reflect.InvocationTargetException.class,
+                () -> invoke(redirect, DataFixTypes.LEVEL, fixer, unrelated, current));
+        assertTrue(rejected.getCause() instanceof IllegalArgumentException);
+        assertEquals("native-forwarding", unrelated.getStringOr("witness", ""));
         assertTrue("Unrelated types cannot enter the player wrapper", fixer.playerCalls.isEmpty());
     }
 
-    @Test public void renamedNativeLambdaNamesDoNotAffectWildcardMatching() throws Exception {
-        for (Binding target : targets()) {
+    @Test public void sharedEmbeddedExtensionExecutesInBothOrdersWithoutRewritingTheSourceLevel() throws Exception {
+        SharedConstants.tryDetectVersion();
+        Bootstrap.bootStrap();
+        Class<?> owner = Class.forName("zone.moddev.mc.basemetals.migration.Legacy112WorldMigrator");
+        Method flatten = owner.getDeclaredMethod("flattenEmbeddedPlayer", CompoundTag.class, int.class, List.class);
+        flatten.setAccessible(true);
+        var constructor = BaseMetalsLegacyMigration.class.getDeclaredConstructor();
+        constructor.setAccessible(true);
+        var power = constructor.newInstance();
+        for (int old : new int[] {512, 1343}) for (boolean reverse : new boolean[] {false, true}) {
+            Path file = temp.newFolder("shared-" + old + "-" + reverse).toPath().resolve("level.dat");
+            CompoundTag original = levelData(old, legacyPlayer());
+            NbtIo.writeCompressed(original, file);
+            CompoundTag source = original.getCompoundOrEmpty("Data").getCompoundOrEmpty("Player").copy();
+            power.prepareData(source, old, zone.moddev.mc.basemetals.api.migration.Legacy112MigrationExtension.Payload.PLAYER);
+            CompoundTag prepared = source.copy();
+            List<String> calls = new ArrayList<>();
+            var observer = new zone.moddev.mc.basemetals.api.migration.Legacy112MigrationExtension() {
+                @Override public void afterPlayerFlattening(CompoundTag before, CompoundTag result) {
+                    assertEquals(prepared, before);
+                    assertEquals(1, result.getListOrEmpty("Inventory").getCompoundOrEmpty(0).getByteOr("Count", (byte) 0));
+                    assertFalse(result.getListOrEmpty("Inventory").getCompoundOrEmpty(0).contains("components"));
+                    calls.add("before-components");
+                }
+            };
+            var extensions = reverse ? List.of(observer, power) : List.of(power, observer);
+            CompoundTag migrated = (CompoundTag) flatten.invoke(null, source.copy(), old, extensions);
+            assertEquals(prepared, source);
+            assertEquals(List.of("before-components"), calls);
+            assertPlayerContents(migrated);
+            int current = SharedConstants.getCurrentVersion().dataVersion().version();
+            assertEquals(4790, current);
+            assertEquals(current, migrated.getIntOr("DataVersion", 0));
+            assertEquals(original, NbtIo.readCompressed(file, NbtAccounter.unlimitedHeap()));
+            calls.clear();
+            assertEquals(migrated, flatten.invoke(null, migrated.copy(), current, extensions));
+            assertTrue("Current host player cannot re-enter the shared legacy callback", calls.isEmpty());
+            assertEquals(original, NbtIo.readCompressed(file, NbtAccounter.unlimitedHeap()));
+        }
+    }
+
+    @Test public void renamedNativePlayerMethodNamesDoNotAffectBoundaryMatching() throws Exception {
+        for (PlayerBoundary target : targets()) {
             ClassNode nativeClass = read(target.target().name);
             target.assertOnePlayerSite(nativeClass).name = "renamedPlayerLambda";
             assertEquals("renamedPlayerLambda", target.assertOnePlayerSite(nativeClass).name);
@@ -112,7 +166,7 @@ private static Binding embedded() throws Exception {
     }
 
     @Test public void absentCallFailsClosedWithoutAcceptingOtherOwnersOrNames() throws Exception {
-        for (Binding target : targets()) for (boolean owner : new boolean[] {true, false}) {
+        for (PlayerBoundary target : targets()) for (boolean owner : new boolean[] {true, false}) {
             ClassNode nativeClass = read(target.target().name);
             MethodInsnNode call = playerCall(target, nativeClass);
             if (owner) call.owner = "other/UnrelatedNBTUtil";
@@ -122,7 +176,7 @@ private static Binding embedded() throws Exception {
     }
 
     @Test public void duplicateCallsInOneReaderFailClosed() throws Exception {
-        for (Binding target : targets()) {
+        for (PlayerBoundary target : targets()) {
             ClassNode nativeClass = read(target.target().name);
             MethodNode method = target.assertOnePlayerSite(nativeClass);
             MethodNode copy = copy(method, method.name);
@@ -136,14 +190,14 @@ private static Binding embedded() throws Exception {
     }
 
     @Test public void duplicateEmbeddedPlayerReadersFailClosed() throws Exception {
-        Binding target = embedded();
+        PlayerBoundary target = embedded();
         ClassNode nativeClass = read(target.target().name);
         nativeClass.methods.add(copy(target.assertOnePlayerSite(nativeClass), "anotherPlayerReader"));
         rejectedUnchanged(target, nativeClass);
     }
 
     @Test public void wrongOverloadIsNotMistakenForTheThreeArgumentCall() throws Exception {
-        for (Binding target : targets()) {
+        for (PlayerBoundary target : targets()) {
             ClassNode nativeClass = read(target.target().name);
             MethodInsnNode call = playerCall(target, nativeClass);
             call.desc = call.desc.replace(";I)", ";II)");
@@ -152,11 +206,11 @@ private static Binding embedded() throws Exception {
     }
 
     @Test public void embeddedReceiverCannotBorrowANearbyPlayerConstant() throws Exception {
-        Binding target = embedded();
+        PlayerBoundary target = embedded();
         ClassNode nativeClass = read(target.target().name);
         MethodNode method = target.assertOnePlayerSite(nativeClass);
-        var player = Arrays.stream(method.instructions.toArray()).filter(insn -> insn instanceof FieldInsnNode f
-                && f.owner.equals(FIX_TYPES) && f.name.equals("PLAYER")).findFirst().orElseThrow();
+        var player = playerReceiver(nativeClass, method, playerCall(target, nativeClass));
+        assertNotNull(player);
         InsnList change = new InsnList();
         change.add(new InsnNode(Opcodes.POP));
         change.add(new FieldInsnNode(Opcodes.GETSTATIC, FIX_TYPES, "LEVEL", "L" + FIX_TYPES + ";"));
@@ -164,44 +218,37 @@ private static Binding embedded() throws Exception {
         rejectedUnchanged(target, nativeClass);
     }
 
-    @Test public void publicEmbeddedReadStillDelegatesToTheRedirectedNativeReader() throws Exception {
-        Binding target = embedded();
-        ClassNode access = read(STORAGE + "LevelStorageSource$LevelStorageAccess");
-        assertEquals(1, calls(access).stream().filter(call -> call.owner.equals(target.target().name)
-                && call.name.equals("readLevelDataTagFixed")
-                && call.desc.equals("(Ljava/nio/file/Path;" + FIXER + ")" + DYNAMIC)).count());
-        MethodNode nativeReader = method(target.target(), "readLevelDataTagFixed");
-        var updates = calls(nativeReader).stream().filter(call -> call.owner.equals("com/mojang/serialization/Dynamic")
-                && call.name.equals("update") && call.desc.equals(
-                        "(Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/serialization/Dynamic;")).toList();
-        assertEquals("Player and WorldGenSettings are separate native updates", 2, updates.size());
-        var frames = new org.objectweb.asm.tree.analysis.Analyzer<>(
-                new org.objectweb.asm.tree.analysis.SourceInterpreter()).analyze(target.target().name, nativeReader);
-        var keys = new java.util.HashSet<String>();
-        for (var call : updates) {
-            var frame = frames[nativeReader.instructions.indexOf(call)];
-            var key = frame.getStack(frame.getStackSize() - 2);
-            assertEquals(1, key.insns.size());
-            String name = (String) ((org.objectweb.asm.tree.LdcInsnNode) key.insns.iterator().next()).cst;
-            keys.add(name);
-            if (!name.equals("Player")) continue;
-            var function = frame.getStack(frame.getStackSize() - 1);
-            assertEquals(1, function.insns.size());
-            var lambda = (org.objectweb.asm.tree.InvokeDynamicInsnNode) function.insns.iterator().next();
-            MethodNode reader = target.assertOnePlayerSite(target.target());
-            assertTrue("The Player key must use the exact PLAYER lambda", Arrays.stream(lambda.bsmArgs)
-                    .anyMatch(arg -> arg instanceof org.objectweb.asm.Handle handle
-                            && handle.getOwner().equals(target.target().name) && handle.getName().equals(reader.name)
-                            && handle.getDesc().equals(reader.desc)));
-        }
-        assertEquals(Set.of("Player", "WorldGenSettings"), keys);
-        assertTrue(target.assertOnePlayerSite(target.target()).name.startsWith("lambda$readLevelDataTagFixed$"));
+    @Test public void selectedWorldHostSeedDelegatesToSharedFlatteningBeforeFileFixing() throws Exception {
+        Binding capture = binding("basemetals", "LevelStorageSourceMixin", "prepareWorld");
+        assertSelectedWorld(capture);
+        ClassNode legacyStorage = read(STORAGE + "LevelStorageSource");
+        assertFalse(legacyStorage.methods.stream().anyMatch(method -> method.name.equals("readLevelDataTagFixed")));
+        ClassNode powerStorage = read("zone/moddev/mc/basepower/mixin/LevelStorageSourceMixin");
+        assertFalse("Removed embedded redirect must not survive as an unbound handler", powerStorage.methods.stream()
+                .anyMatch(method -> method.name.equals("basepower$preserveEmbeddedPlayer")));
+        String hooks = "zone/moddev/mc/basemetals/migration/LegacyWorldDataHook";
+        String migrator = embedded().target().name;
+        MethodNode prepare = method(read(hooks), "prepareSelectedWorld");
+        var seedCall = calls(prepare).stream().filter(call -> call.owner.equals(hooks)
+                && call.name.equals("preserveEmbeddedPlayer") && call.desc.equals("(Ljava/nio/file/Path;)V")).findFirst().orElseThrow();
+        var migrateCall = calls(prepare).stream().filter(call -> call.owner.equals(migrator)
+                && call.name.equals("migrateIfNeeded") && call.desc.equals("(Ljava/nio/file/Path;)V")).findFirst().orElseThrow();
+        assertTrue("Legacy preparation precedes host componentization", prepare.instructions.indexOf(migrateCall)
+                < prepare.instructions.indexOf(seedCall));
+        MethodNode seed = method(read(hooks), "preserveEmbeddedPlayer");
+        assertEquals(1, calls(seed).stream().filter(call -> call.owner.equals(migrator)
+                && call.name.equals("flattenEmbeddedPlayer") && call.desc.equals("(" + TAG + "I)" + TAG)).count());
+        assertEquals("Both old and relocated loose-player paths have authority", 2, calls(seed).stream()
+                .filter(call -> call.owner.equals("java/nio/file/Files") && call.name.equals("exists")).count());
+        ClassNode companion = read("zone/moddev/mc/basepower/migration/BaseMetalsLegacyMigration");
+        assertEquals(1, calls(method(companion, "afterPlayerFlattening")).stream().filter(call -> call.owner.equals(
+                "zone/moddev/mc/basepower/migration/LegacyPlayerDataFixes") && call.name.equals("preserveNames")
+                && call.desc.equals("(Lnet/minecraft/nbt/Tag;Lnet/minecraft/nbt/Tag;)V")).count());
     }
 
     private static Method redirect() throws Exception {
-        Class<?> mixin = Class.forName("zone.moddev.mc.basepower.mixin.LevelStorageSourceMixin");
-        Method method = mixin.getDeclaredMethod("basepower$preserveEmbeddedPlayer",
-                DataFixTypes.class, DataFixer.class, Dynamic.class, int.class);
+        Method method = LegacyPlayerDataFixes.class.getDeclaredMethod("updateNativePlayer",
+                DataFixTypes.class, DataFixer.class, CompoundTag.class, int.class);
         method.setAccessible(true);
         return method;
     }
@@ -209,12 +256,12 @@ private static Method redirect() throws Exception {
     private static CompoundTag invoke(Method redirect, DataFixTypes type, DataFixer fixer,
             CompoundTag input, int version) throws Exception {
         CompoundTag before = input.copy();
-        Dynamic<?> result = (Dynamic<?>) redirect.invoke(null, type, fixer, new Dynamic<>(NbtOps.INSTANCE, input), version);
+        CompoundTag result = (CompoundTag) redirect.invoke(null, type, fixer, input, version);
         assertEquals("Native boundary cannot mutate its caller", before, input);
-        return (CompoundTag) result.getValue();
+        return result;
     }
 
-    private static MethodInsnNode playerCall(Binding binding, ClassNode nativeClass) throws Exception {
+    private static MethodInsnNode playerCall(PlayerBoundary binding, ClassNode nativeClass) throws Exception {
         return calls(binding.assertOnePlayerSite(nativeClass)).stream().filter(binding::matches).findFirst().orElseThrow();
     }
 
@@ -224,7 +271,7 @@ private static MethodNode copy(MethodNode source, String name) {
         return result;
     }
 
-    private static void rejectedUnchanged(Binding target, ClassNode nativeClass) throws Exception {
+    private static void rejectedUnchanged(PlayerBoundary target, ClassNode nativeClass) throws Exception {
         byte[] before = bytes(nativeClass);
         assertThrows("Unsupported native PLAYER ABI must fail the contract", AssertionError.class,
                 () -> target.assertOnePlayerSite(nativeClass));
diff --git a/src/test/java/zone/moddev/mc/basepower/migration/LegacyRegistryArchiveTest.java b/src/test/java/zone/moddev/mc/basepower/migration/LegacyRegistryArchiveTest.java
index 3ab15ce1..2e137879 100644
--- a/src/test/java/zone/moddev/mc/basepower/migration/LegacyRegistryArchiveTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/migration/LegacyRegistryArchiveTest.java
@@ -61,6 +61,43 @@ public class LegacyRegistryArchiveTest {
         }
     }
 
+    @Test public void relocatedAndCustomDimensionChunksRetainExactTerrainGuards() throws Exception {
+        Path world = temporary.newFolder().toPath();
+        writeChunkIndex(world, "dimensions/minecraft/overworld/region/r.-1.0.mca", 31, 0);
+        writeChunkIndex(world, "dimensions/minecraft/the_nether/region/r.0.-1.mca", 0, 31);
+        writeChunkIndex(world, "dimensions/other/deep/cavern/region/r.1.-1.mca", 2, 3);
+        // A retained old directory may overlap a native directory during recovery.
+        writeChunkIndex(world, "region/r.-1.0.mca", 31, 0);
+        try {
+            assertEquals("Duplicate paths must not invent an extra saved chunk", 3,
+                    LegacyWorldDataHook.indexLegacyChunks(world.toFile()));
+            assertTrue(LegacyWorldDataHook.isProtectedChunk(Identifier.parse("minecraft:overworld"),
+                    new BlockPos(-16, 64, 0)));
+            assertTrue(LegacyWorldDataHook.isProtectedChunk(Identifier.parse("minecraft:the_nether"),
+                    new BlockPos(0, 64, -16)));
+            assertTrue(LegacyWorldDataHook.isProtectedChunk(Identifier.parse("other:deep/cavern"),
+                    new BlockPos(34 * 16, 64, -29 * 16)));
+            assertFalse(LegacyWorldDataHook.isProtectedChunk(Identifier.parse("minecraft:the_end"),
+                    new BlockPos(-16, 64, 0)));
+            assertFalse(LegacyWorldDataHook.isProtectedChunk(Identifier.parse("other:deep/cavern"),
+                    new BlockPos(35 * 16, 64, -29 * 16)));
+            assertEquals("Repeated indexing must remain idempotent", 3,
+                    LegacyWorldDataHook.indexLegacyChunks(world.toFile()));
+        } finally {
+            LegacyWorldDataHook.indexLegacyChunks(temporary.newFolder());
+        }
+    }
+
+    private static void writeChunkIndex(Path world, String relative, int localX, int localZ) throws Exception {
+        Path region = world.resolve(relative);
+        Files.createDirectories(region.getParent());
+        byte[] header = new byte[4096];
+        int offset = (localX + localZ * 32) * 4;
+        header[offset + 2] = 2;
+        header[offset + 3] = 1;
+        Files.write(region, header);
+    }
+
     private static CompoundTag registrySnapshot() {
         CompoundTag source = new CompoundTag();
         CompoundTag fml = new CompoundTag();
diff --git a/src/test/java/zone/moddev/mc/basepower/migration/LegacyTransformerOrderTest.java b/src/test/java/zone/moddev/mc/basepower/migration/LegacyTransformerOrderTest.java
index 5decf0b4..8f88b829 100644
--- a/src/test/java/zone/moddev/mc/basepower/migration/LegacyTransformerOrderTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/migration/LegacyTransformerOrderTest.java
@@ -44,6 +44,27 @@ public class LegacyTransformerOrderTest {
         fresh.at().values.set(fresh.at().values.indexOf("value") + 1, "HEAD");
         assertThrows("Inventory staging at HEAD would race the other mod", AssertionError.class,
                 () -> fresh.assertAt("INVOKE"));
+        Binding overload = binding("basepower", "SimpleRegionStorageMixin", "prepareChunk");
+        overload.nativeMethod().desc = "(" + TAG + "I" + TAG + ")" + TAG;
+        assertThrows("Forge61's three-argument overload cannot satisfy Forge64", AssertionError.class, overload::nativeMethod);
+    }
+
+    @Test public void selectedWorldCaptureRejectsNativeLockReadAndFallbackDrift() throws Exception {
+        for (String mod : List.of("basepower", "basemetals")) {
+            String mixin = mod.equals("basepower") ? "SelectedWorldStorageMixin" : "LevelStorageSourceMixin";
+            Binding read = binding(mod, mixin, "prepareWorld");
+            assertSelectedWorld(read);
+            calls(read.nativeMethod()).stream().filter(read::matches).findFirst().orElseThrow().name = "renamedRawRead";
+            assertThrows(AssertionError.class, () -> assertSelectedWorld(read));
+            Binding lock = binding(mod, mixin, "prepareWorld");
+            calls(lock.nativeMethod()).stream().filter(call -> call.name.equals("checkLock"))
+                    .findFirst().orElseThrow().name = "unrelatedLock";
+            assertThrows(AssertionError.class, () -> assertSelectedWorld(lock));
+            Binding fallback = binding(mod, mixin, "prepareWorld");
+            Arrays.stream(fallback.handler().instructions.toArray()).filter(insn -> insn instanceof JumpInsnNode
+                    && insn.getOpcode() == Opcodes.IFNE).map(JumpInsnNode.class::cast).findFirst().orElseThrow().setOpcode(Opcodes.IFEQ);
+            assertThrows("Fallback preparation must fail closed", AssertionError.class, () -> assertSelectedWorld(fallback));
+        }
     }
 
     @Test public void separateEntityStorageStillUsesTheNativeRegionConverterThroughThePowerHook() throws Exception {
@@ -71,12 +92,17 @@ public class LegacyTransformerOrderTest {
                 config = JsonParser.parseReader(reader).getAsJsonObject();
             }
             assertTrue(config.get("required").getAsBoolean());
-            assertEquals("JAVA_21", config.get("compatibilityLevel").getAsString());
+            String compatibility = config.get("compatibilityLevel").getAsString();
+            assertEquals("JAVA_21", compatibility);
+            assertEquals(org.spongepowered.asm.mixin.MixinEnvironment.CompatibilityLevel.JAVA_21,
+                    org.spongepowered.asm.mixin.MixinEnvironment.CompatibilityLevel.valueOf(compatibility));
+            assertEquals("Mixin compatibility does not lower Java25 production bytecode", 69,
+                    read("zone/moddev/mc/" + mod + "/" + (mod.equals("basepower") ? "PowerAdvantage" : "BaseMetals")).version & 0xffff);
             assertEquals(1, config.getAsJsonObject("injectors").get("defaultRequire").getAsInt());
             assertTrue(config.getAsJsonArray("mixins").asList().stream().map(value -> value.getAsString())
                     .toList().containsAll(List.of("BlockStateDataMixin", "LevelStorageSourceMixin",
                             "SimpleRegionStorageMixin", "WorldGenRegionMixin")));
-            if (mod.equals("basepower")) assertEquals(Set.of("BlockStateDataMixin", "LevelStorageSourceMixin",
+            if (mod.equals("basepower")) assertEquals(Set.of("BlockStateDataMixin", "LevelStorageSourceMixin", "SelectedWorldStorageMixin",
                     "PlayerDataStorageMixin", "SimpleRegionStorageMixin", "WorldGenRegionMixin"),
                     config.getAsJsonArray("mixins").asList().stream().map(value -> value.getAsString())
                             .collect(java.util.stream.Collectors.toSet()));
@@ -108,18 +134,13 @@ public class LegacyTransformerOrderTest {
     private static void check(List<String> mods) throws Exception {
         for (String mod : mods) {
             String hook = mod.equals("basepower") ? POWER : METALS;
-            Binding world = binding(mod, "LevelStorageSourceMixin", "prepareWorld");
-            world.assertAt("HEAD");
-            assertEquals(STORAGE + "LevelStorageSource", world.target().name);
-            assertEquals("readLevelDataTagFixed", world.selector());
-            assertFalse(world.cancellable());
-            assertCalls(world.handler(), hook, "prepareLegacyWorld", "(Ljava/io/File;)V");
-            assertTrue("Only primary level.dat may initialize a migration snapshot",
-                    Arrays.stream(world.handler().instructions.toArray()).anyMatch(insn ->
-                            insn instanceof LdcInsnNode constant && "level.dat".equals(constant.cst)));
-            var prepare = calls(world.handler()).stream().filter(call -> call.name.equals("prepareLegacyWorld")).findFirst().orElseThrow();
-            assertTrue("Primary-file guard must precede snapshot preparation", Arrays.stream(world.handler().instructions.toArray())
-                    .takeWhile(insn -> insn != prepare).anyMatch(JumpInsnNode.class::isInstance));
+            Binding world = binding(mod, mod.equals("basepower") ? "SelectedWorldStorageMixin" : "LevelStorageSourceMixin", "prepareWorld");
+            assertSelectedWorld(world);
+            assertCalls(world.handler(), hook, mod.equals("basepower") ? "prepareLegacyWorld" : "prepareSelectedWorld",
+                    mod.equals("basepower") ? "(Ljava/io/File;)V" : "(Ljava/nio/file/Path;)V");
+            assertTrue("Capture must select the primary level-data resource", Arrays.stream(world.handler().instructions.toArray())
+                    .anyMatch(insn -> insn instanceof org.objectweb.asm.tree.FieldInsnNode field
+                            && field.owner.equals(STORAGE + "LevelResource") && field.name.equals("LEVEL_DATA_FILE")));
 
             Binding before = binding(mod, "SimpleRegionStorageMixin", "prepareChunk");
             before.assertAt("HEAD");
diff --git a/src/test/java/zone/moddev/mc/basepower/migration/Native12111BiomeRegistryMappingTest.java b/src/test/java/zone/moddev/mc/basepower/migration/Native12111BiomeRegistryMappingTest.java
index f9d15c6f..6b3ae515 100644
--- a/src/test/java/zone/moddev/mc/basepower/migration/Native12111BiomeRegistryMappingTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/migration/Native12111BiomeRegistryMappingTest.java
@@ -109,7 +109,8 @@ private static Set<Identifier> nativeBiomeKeys() throws Exception {
 
     private static String fixName(String name) {
         var original = new Dynamic<>(NbtOps.INSTANCE, StringTag.valueOf(name));
-        var fixed = DataFixers.getDataFixer().update(References.BIOME, original, 1631, 4671);
+        var fixed = DataFixers.getDataFixer().update(References.BIOME, original, 1631,
+                SharedConstants.getCurrentVersion().dataVersion().version());
         assertEquals("DFU must not mutate the original saved name", name, original.asString().result().orElseThrow());
         return fixed.asString().result().orElseThrow();
     }
diff --git a/src/test/java/zone/moddev/mc/basepower/migration/Native12111RegistryMigrationTest.java b/src/test/java/zone/moddev/mc/basepower/migration/Native12111RegistryMigrationTest.java
index 3ebc0b4c..eb4860a0 100644
--- a/src/test/java/zone/moddev/mc/basepower/migration/Native12111RegistryMigrationTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/migration/Native12111RegistryMigrationTest.java
@@ -35,11 +35,11 @@ public class Native12111RegistryMigrationTest {
         properties.putString("waterlogged", "true");
         block.put("Properties", properties);
         var fixed = DataFixers.getDataFixer().update(References.BLOCK_STATE,
-                new Dynamic<>(NbtOps.INSTANCE, block), 3839, 4671);
+                new Dynamic<>(NbtOps.INSTANCE, block), 3839, currentVersion());
         assertEquals("minecraft:iron_chain", fixed.get("Name").asString().result().orElseThrow());
         assertEquals(new Dynamic<>(NbtOps.INSTANCE, properties), fixed.get("Properties").result().orElseThrow());
         var stack = DataFixers.getDataFixer().update(References.ITEM_STACK,
-                new Dynamic<>(NbtOps.INSTANCE, item("chain", 7)), 3839, 4671);
+                new Dynamic<>(NbtOps.INSTANCE, item("chain", 7)), 3839, currentVersion());
         assertEquals("minecraft:iron_chain", stack.get("id").asString().result().orElseThrow());
         assertEquals(7, stack.get("count").asInt(-1));
         assertNull(VanillaRegistryRemaps.replacement(id("entity_type"), id("chain")));
@@ -111,12 +111,16 @@ private static CompoundTag witness(String name) {
 
     private static void assertFixedEntity(CompoundTag entity, String target) {
         var fixed = DataFixers.getDataFixer().update(References.ENTITY,
-                new Dynamic<>(NbtOps.INSTANCE, entity), 3839, 4671);
+                new Dynamic<>(NbtOps.INSTANCE, entity), 3839, currentVersion());
         assertEquals(id(target).toString(), fixed.get("id").asString().result().orElseThrow());
         assertEquals(121111, fixed.get("AdvWorksOpaqueWitness").asInt(-1));
         assertTrue(ForgeRegistries.ENTITY_TYPES.containsKey(id(target)));
     }
 
+    private static int currentVersion() {
+        return SharedConstants.getCurrentVersion().dataVersion().version();
+    }
+
     @SuppressWarnings("unchecked")
     private static void assertAction(String registry, String name, MissingMappingsEvent.Action expected) {
         var key = ResourceKey.<Object>createRegistryKey(id(registry));
diff --git a/src/test/java/zone/moddev/mc/basepower/migration/NativeMigrationMixinContract.java b/src/test/java/zone/moddev/mc/basepower/migration/NativeMigrationMixinContract.java
index ca732b4e..2ef84c3c 100644
--- a/src/test/java/zone/moddev/mc/basepower/migration/NativeMigrationMixinContract.java
+++ b/src/test/java/zone/moddev/mc/basepower/migration/NativeMigrationMixinContract.java
@@ -14,6 +14,8 @@
 import org.objectweb.asm.tree.FieldInsnNode;
 import org.objectweb.asm.tree.MethodInsnNode;
 import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.tree.JumpInsnNode;
+import org.objectweb.asm.tree.VarInsnNode;
 import org.objectweb.asm.tree.analysis.Analyzer;
 import org.objectweb.asm.tree.analysis.SourceInterpreter;
 import org.objectweb.asm.tree.analysis.SourceValue;
@@ -27,7 +29,7 @@ final class NativeMigrationMixinContract {
     static final String TAG = "Lnet/minecraft/nbt/CompoundTag;";
     static final String DYNAMIC = "Lcom/mojang/serialization/Dynamic;";
     static final String FIXER = "Lcom/mojang/datafixers/DataFixer;";
-    static final String UPGRADE = "upgradeChunkTag(" + TAG + "I" + TAG + ")" + TAG;
+    static final String UPGRADE = "upgradeChunkTag(" + TAG + "I" + TAG + "I)" + TAG;
 
     private NativeMigrationMixinContract() {}
 
@@ -98,6 +100,75 @@ static Binding binding(String mod, String mixin, String handler) throws IOExcept
         return new Binding(owner, callback, injector, at, read(targets.getFirst().getInternalName()), selectors.getFirst());
     }
 
+    static List<MethodNode> playerMethods(ClassNode nativeClass, String invocation) throws Exception {
+        List<MethodNode> result = new ArrayList<>();
+        for (MethodNode method : nativeClass.methods) {
+            for (MethodInsnNode call : calls(method)) {
+                if (invocation.equals("L" + call.owner + ";" + call.name + call.desc)
+                        && playerReceiver(nativeClass, method, call) != null) result.add(method);
+            }
+        }
+        return result;
+    }
+
+    static FieldInsnNode playerReceiver(ClassNode owner, MethodNode method, MethodInsnNode call) throws Exception {
+        var analyzer = new Analyzer<SourceValue>(new SourceInterpreter(Opcodes.ASM9) {
+            @Override public SourceValue copyOperation(AbstractInsnNode insn, SourceValue input) { return input; }
+        });
+        var frame = analyzer.analyze(owner.name, method)[method.instructions.indexOf(call)];
+        var receiver = frame.getStack(frame.getStackSize() - Type.getArgumentTypes(call.desc).length - 1);
+        if (receiver.insns.size() == 1 && receiver.insns.iterator().next() instanceof FieldInsnNode field
+                && field.getOpcode() == Opcodes.GETSTATIC && field.owner.equals(FIX_TYPES)
+                && field.name.equals("PLAYER")) return field;
+        return null;
+    }
+
+    record PlayerBoundary(ClassNode target, String invocation) {
+        boolean matches(MethodInsnNode call) {
+            return invocation.equals("L" + call.owner + ";" + call.name + call.desc);
+        }
+        List<MethodNode> playerMethods(ClassNode owner) throws Exception {
+            return NativeMigrationMixinContract.playerMethods(owner, invocation);
+        }
+        MethodNode assertOnePlayerSite(ClassNode owner) throws Exception {
+            List<MethodNode> methods = playerMethods(owner);
+            assertEquals("Exactly one PLAYER componentization boundary: " + owner.name, 1, methods.size());
+            return methods.getFirst();
+        }
+    }
+
+    static void assertSelectedWorld(Binding world) throws Exception {
+        world.assertAt("INVOKE");
+        assertEquals(STORAGE + "LevelStorageSource$LevelStorageAccess", world.target.name);
+        assertEquals("getUnfixedDataTag", world.selector);
+        assertEquals("(Z)" + DYNAMIC, world.nativeMethod().desc);
+        assertFalse(world.cancellable());
+        assertEquals("L" + STORAGE + "LevelStorageSource;readLevelDataTagRaw(Ljava/nio/file/Path;)" + TAG,
+                world.invocation());
+        var nativeMethod = world.nativeMethod();
+        var reads = calls(nativeMethod).stream().filter(world::matches).toList();
+        var locks = calls(nativeMethod).stream().filter(call -> call.owner.equals(world.target.name)
+                && call.name.equals("checkLock") && call.desc.equals("()V")).toList();
+        assertEquals("Exactly one selected raw read", 1, reads.size());
+        assertEquals("Exactly one native session-lock check", 1, locks.size());
+        assertTrue("Capture must follow native session locking", nativeMethod.instructions.indexOf(locks.getFirst())
+                < nativeMethod.instructions.indexOf(reads.getFirst()));
+        var prepares = calls(world.handler).stream().filter(call -> call.name.equals("prepareLegacyWorld")
+                || call.name.equals("prepareSelectedWorld")).toList();
+        assertEquals(1, prepares.size());
+        int preparation = world.handler.instructions.indexOf(prepares.getFirst());
+        var frames = new Analyzer<>(new SourceInterpreter()).analyze(world.mixin.name, world.handler);
+        boolean guarded = false;
+        for (int i = 0; i < preparation; i++) {
+            if (!(world.handler.instructions.get(i) instanceof JumpInsnNode jump)
+                    || jump.getOpcode() != Opcodes.IFNE || world.handler.instructions.indexOf(jump.label) <= preparation) continue;
+            var condition = frames[i].getStack(frames[i].getStackSize() - 1);
+            guarded |= condition.insns.size() == 1 && condition.insns.iterator().next() instanceof VarInsnNode load
+                    && load.getOpcode() == Opcodes.ILOAD && load.var == 1;
+        }
+        assertTrue("Only !useFallback may prepare the selected world", guarded);
+    }
+
     record Binding(ClassNode mixin, MethodNode handler, AnnotationNode injector, AnnotationNode at,
             ClassNode target, String selector) {
         String point() { return (String) value(at, "value", ""); }
@@ -135,24 +206,7 @@ boolean matches(MethodInsnNode call) {
         }
 
         List<MethodNode> playerMethods(ClassNode nativeClass) throws Exception {
-            List<MethodNode> result = new ArrayList<>();
-            for (MethodNode method : nativeClass.methods) {
-                if (calls(method).stream().noneMatch(this::matches)) continue;
-                // Track the actual receiver through locals; a nearby PLAYER constant is not sufficient.
-                var analyzer = new Analyzer<SourceValue>(new SourceInterpreter(Opcodes.ASM9) {
-                    @Override public SourceValue copyOperation(AbstractInsnNode insn, SourceValue input) { return input; }
-                });
-                var frames = analyzer.analyze(nativeClass.name, method);
-                for (int index = 0; index < method.instructions.size(); index++) {
-                    if (!(method.instructions.get(index) instanceof MethodInsnNode call) || !matches(call)) continue;
-                    var frame = frames[index];
-                    var receiver = frame.getStack(frame.getStackSize() - Type.getArgumentTypes(call.desc).length - 1);
-                    if (receiver.insns.size() == 1 && receiver.insns.iterator().next() instanceof FieldInsnNode field
-                            && field.getOpcode() == Opcodes.GETSTATIC && field.owner.equals(FIX_TYPES)
-                            && field.name.equals("PLAYER")) result.add(method);
-                }
-            }
-            return result;
+            return NativeMigrationMixinContract.playerMethods(nativeClass, invocation());
         }
 
         MethodNode assertOnePlayerSite(ClassNode nativeClass) throws Exception {
diff --git a/src/test/java/zone/moddev/mc/basepower/migration/OreSpawnProfileMigrationTest.java b/src/test/java/zone/moddev/mc/basepower/migration/OreSpawnProfileMigrationTest.java
new file mode 100644
index 00000000..5a5078ed
--- /dev/null
+++ b/src/test/java/zone/moddev/mc/basepower/migration/OreSpawnProfileMigrationTest.java
@@ -0,0 +1,172 @@
+package zone.moddev.mc.basepower.migration;
+
+import static org.junit.Assert.*;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+public class OreSpawnProfileMigrationTest {
+    @Rule public final TemporaryFolder temporary = new TemporaryFolder();
+
+    private static JsonObject legacyProfile() {
+        return JsonParser.parseString("""
+                {"schema_version":7,"ores":{
+                  "poweradvantage:legacy/custom_oil":{"block":"poweradvantage:crude_oil",
+                    "enabled":true,"dimension_selectors":{"orespawn:all_except_nether_end":{
+                      "enabled":true,"frequency":0.375,"min_y":16,"max_y":63}}}},
+                 "fluid_deposits":{},"history":"poweradvantage:crude_oil is a literal note"}
+                """).getAsJsonObject();
+    }
+
+    @Test public void migratesGlobalOverrideAndLockedWorldBeforeOreSpawnReadsThem() throws Exception {
+        AdvantageLegacyMigrations.registerPowerAdvantage();
+        Path config = temporary.newFolder("config").toPath();
+        Path global = config.resolve("orespawn-worldgen.json");
+        Path override = config.resolve("basepower-orespawn.json");
+        String original = legacyProfile().toString();
+        Files.writeString(global, original);
+        Files.writeString(override, original);
+        OreSpawnProfileMigration.registerPowerProvider(config);
+        assertMigrated(global);
+        assertMigrated(override);
+
+        Path world = temporary.newFolder("world").toPath();
+        Path profile = Files.createDirectories(world.resolve("serverconfig")).resolve("orespawn-worldgen.json");
+        Files.writeString(profile, original);
+        OreSpawnProfileMigration.migrateWorld(world);
+        assertMigrated(profile);
+        byte[] first = Files.readAllBytes(profile);
+        OreSpawnProfileMigration.migrateWorld(world);
+        assertArrayEquals(first, Files.readAllBytes(profile));
+        try (var files = Files.list(profile.getParent())) {
+            assertEquals(1, files.filter(path -> path.getFileName().toString().endsWith(".bak")).count());
+        }
+    }
+
+    @Test public void absentProfileDoesNotCreateOrPopulateAWorld() throws Exception {
+        Path config = temporary.newFolder("empty-config").toPath();
+        OreSpawnProfileMigration.registerPowerProvider(config);
+        Path absent = temporary.getRoot().toPath().resolve("absent-world");
+        OreSpawnProfileMigration.migrateWorld(absent);
+        assertFalse(Files.exists(absent));
+        try (var files = Files.list(config)) { assertEquals(0, files.count()); }
+    }
+
+    @Test public void newWorldWithPreplacedProfileDoesNotNeedLevelDat() throws Exception {
+        AdvantageLegacyMigrations.registerPowerAdvantage();
+        OreSpawnProfileMigration.registerPowerProvider(temporary.newFolder("new-world-config").toPath());
+        Path world = temporary.newFolder("new-world").toPath();
+        Path file = Files.createDirectories(world.resolve("serverconfig")).resolve("orespawn-worldgen.json");
+        JsonObject source = JsonParser.parseString("""
+                {"schema_version":7,"manage_vanilla_ores":false,"ores":{
+                  "minecraft:quartz_ore":{"enabled":true,"dimensions":{
+                    "minecraft:the_nether":{"enabled":true,"frequency":0.375}}}}}
+                """).getAsJsonObject();
+        Files.writeString(file, source.toString());
+        assertFalse(Files.exists(world.resolve("level.dat")));
+        OreSpawnProfileMigration.migrateWorld(world);
+        JsonObject expected = source.deepCopy();
+        expected.getAsJsonObject("ores").getAsJsonObject("minecraft:quartz_ore")
+                .addProperty("block", "minecraft:nether_quartz_ore");
+        assertEquals(expected, JsonParser.parseString(Files.readString(file)));
+        assertFalse("Profile preparation must not manufacture world data", Files.exists(world.resolve("level.dat")));
+    }
+
+    @Test public void serverHookRunsAtHighestPriorityBeforeOreSpawnNormalListener() throws Exception {
+        var power = NativeMigrationMixinContract.read("zone/moddev/mc/basepower/PowerAdvantage");
+        var constructor = NativeMigrationMixinContract.method(power, "<init>");
+        assertTrue("New worlds bypass the existing-level.dat datafix hook", NativeMigrationMixinContract.calls(constructor)
+                .stream().anyMatch(call -> call.owner.equals("zone/moddev/mc/basepower/migration/OreSpawnProfileMigration")
+                        && call.name.equals("registerServerHook")));
+        var coordinator = NativeMigrationMixinContract.read("zone/moddev/mc/basepower/migration/OreSpawnProfileMigration");
+        var register = NativeMigrationMixinContract.method(coordinator, "registerServerHook");
+        var analyzer = new org.objectweb.asm.tree.analysis.Analyzer<>(new org.objectweb.asm.tree.analysis.SourceInterpreter());
+        var frames = analyzer.analyze(coordinator.name, register);
+        var registrations = NativeMigrationMixinContract.calls(register).stream()
+                .filter(call -> call.name.equals("addListener")).toList();
+        assertEquals(1, registrations.size());
+        var registration = registrations.getFirst();
+        assertEquals("(BLjava/util/function/Consumer;)Lnet/minecraftforge/eventbus/api/listener/EventListener;", registration.desc);
+        var frame = frames[register.instructions.indexOf(registration)];
+        int base = frame.getStackSize() - 3;
+        assertTrue(frame.getStack(base).insns.stream().anyMatch(node ->
+                node instanceof org.objectweb.asm.tree.FieldInsnNode field
+                        && field.owner.equals("net/minecraftforge/event/server/ServerAboutToStartEvent") && field.name.equals("BUS")));
+        assertTrue(frame.getStack(base + 1).insns.stream().anyMatch(node ->
+                node instanceof org.objectweb.asm.tree.IntInsnNode constant
+                        && constant.operand == net.minecraftforge.eventbus.api.listener.Priority.HIGHEST));
+        assertTrue(frame.getStack(base + 2).insns.stream().anyMatch(node -> {
+            if (!(node instanceof org.objectweb.asm.tree.InvokeDynamicInsnNode dynamic)) return false;
+            return java.util.Arrays.stream(dynamic.bsmArgs).anyMatch(argument -> argument instanceof org.objectweb.asm.Handle handle
+                    && handle.getOwner().equals(coordinator.name) && handle.getName().equals("prepareServerProfile"));
+        }));
+        var prepare = NativeMigrationMixinContract.method(coordinator, "prepareServerProfile");
+        var calls = NativeMigrationMixinContract.calls(prepare);
+        assertTrue(calls.stream().anyMatch(call -> call.owner.equals("net/minecraft/server/MinecraftServer") && call.name.equals("getWorldPath")));
+        assertTrue(calls.stream().anyMatch(call -> call.owner.equals(coordinator.name) && call.name.equals("migrateWorld")));
+        assertTrue("No cache reload or server tick may precede profile repair", calls.stream().noneMatch(call ->
+                call.name.equals("reloadActiveProfile") || call.name.equals("tickServer")));
+    }
+
+    @Test public void targetValidationUsesDeclaredCodecsWithoutConstructingModBlocks() {
+        AdvantageLegacyMigrations.registerPowerAdvantage();
+        assertTrue(OreSpawnProfileMigration.declaredTarget("basepower:crude_oil"));
+        assertTrue(OreSpawnProfileMigration.declaredTarget("basepower:refined_oil"));
+        assertTrue(OreSpawnProfileMigration.declaredTarget("minecraft:nether_quartz_ore"));
+        assertFalse(OreSpawnProfileMigration.declaredTarget("basepower:no_such_block"));
+        assertFalse(OreSpawnProfileMigration.declaredTarget("minecraft:air"));
+        assertFalse(OreSpawnProfileMigration.declaredTarget("bad identifier"));
+    }
+
+    @Test public void selectedWorldProfileIsPreparedBeforeWorldRegistryMutation() throws Exception {
+        var hook = NativeMigrationMixinContract.read("zone/moddev/mc/basepower/migration/LegacyWorldDataHook");
+        var method = NativeMigrationMixinContract.method(hook, "prepareLegacyWorld");
+        var calls = NativeMigrationMixinContract.calls(method);
+        int profile = -1, registry = -1;
+        for (int index = 0; index < calls.size(); index++) {
+            var call = calls.get(index);
+            if (call.owner.equals("zone/moddev/mc/basepower/migration/OreSpawnProfileMigration")
+                    && call.name.equals("migrateWorld")) profile = index;
+            if (call.owner.equals(hook.name) && call.name.equals("prepareForgeRegistryMetadata")) registry = index;
+        }
+        assertTrue("Saved generation choices must be checked before world data is changed",
+                profile >= 0 && registry > profile);
+    }
+
+    @Test public void ambiguousActiveDefaultStopsBeforeReplacingAProfile() throws Exception {
+        AdvantageLegacyMigrations.registerPowerAdvantage();
+        Path config = temporary.newFolder("collision").toPath();
+        JsonObject source = legacyProfile();
+        JsonObject current = JsonParser.parseString("""
+                {"block":"basepower:crude_oil","enabled":true,
+                 "dimensions":{"minecraft:overworld":{"enabled":true,"frequency":0.08}}}
+                """).getAsJsonObject();
+        source.getAsJsonObject("fluid_deposits").add("basepower:fluid_deposit/desert_crude_oil", current);
+        Path file = config.resolve("orespawn-worldgen.json");
+        Files.writeString(file, source.toString());
+        byte[] before = Files.readAllBytes(file);
+        try {
+            OreSpawnProfileMigration.registerPowerProvider(config);
+            fail("A colliding saved choice requires review, not a silent terrain change");
+        } catch (java.io.IOException expected) {
+            assertTrue(expected.getMessage().contains("needs review"));
+        }
+        assertArrayEquals(before, Files.readAllBytes(file));
+    }
+
+    private static void assertMigrated(Path path) throws Exception {
+        JsonObject result = JsonParser.parseString(Files.readString(path)).getAsJsonObject();
+        JsonObject legacy = result.getAsJsonObject("ores").getAsJsonObject("poweradvantage:legacy/custom_oil");
+        assertEquals("basepower:crude_oil", legacy.get("block").getAsString());
+        assertEquals(0.375, legacy.getAsJsonObject("dimension_selectors")
+                .getAsJsonObject("orespawn:all_except_nether_end").get("frequency").getAsDouble(), 0.0);
+        assertEquals("poweradvantage:crude_oil is a literal note", result.get("history").getAsString());
+        assertFalse(result.getAsJsonObject("fluid_deposits")
+                .getAsJsonObject("basepower:fluid_deposit/desert_crude_oil").get("enabled").getAsBoolean());
+    }
+}
diff --git a/src/test/java/zone/moddev/mc/basepower/registry/FuelRegistryTest.java b/src/test/java/zone/moddev/mc/basepower/registry/FuelRegistryTest.java
new file mode 100644
index 00000000..9e0314b7
--- /dev/null
+++ b/src/test/java/zone/moddev/mc/basepower/registry/FuelRegistryTest.java
@@ -0,0 +1,55 @@
+package zone.moddev.mc.basepower.registry;
+
+import java.util.function.Function;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class FuelRegistryTest {
+    @BeforeClass public static void bootstrap() {
+        net.minecraft.SharedConstants.tryDetectVersion();
+        net.minecraft.server.Bootstrap.bootStrap();
+    }
+
+    @Test public void lastOrdinaryFuelItemLeavesAnEmptySlot() {
+        assertTrue(FuelRegistry.decrementFuelItem(new ItemStack(Items.COAL)).isEmpty());
+    }
+
+    @Test public void largerFuelStackConsumesExactlyOneItem() {
+        ItemStack stack = new ItemStack(Items.COAL, 3);
+        assertSame(stack, FuelRegistry.decrementFuelItem(stack));
+        assertEquals(Items.COAL, stack.getItem());
+        assertEquals(2, stack.getCount());
+    }
+
+    @Test public void lastLavaBucketReturnsExactlyOneEmptyBucket() {
+        ItemStack stack = new ItemStack(Items.LAVA_BUCKET);
+        assertNotNull("Native crafting remainder must exist before consumption", stack.getCraftingRemainder());
+        ItemStack result = FuelRegistry.decrementFuelItem(stack);
+        assertEquals(Items.BUCKET, result.getItem());
+        assertEquals(1, result.getCount());
+    }
+
+    @Test public void nativeEmptyAndLegacyNullInputsKeepTheirMeaning() {
+        assertSame(ItemStack.EMPTY, FuelRegistry.decrementFuelItem(ItemStack.EMPTY));
+        assertNull(FuelRegistry.decrementFuelItem(null));
+    }
+
+    @Test public void explicitPostBurnAlgorithmsStillOverrideNativeRemainders() {
+        Function<ItemStack, ItemStack> algorithm = stack -> {
+            assertEquals(3, stack.getCount());
+            return new ItemStack(Items.CHARCOAL, 2);
+        };
+        FuelRegistry registry = FuelRegistry.getInstance();
+        registry.registerPostBurnItem(Items.STICK, algorithm);
+        try {
+            ItemStack result = FuelRegistry.decrementFuelItem(new ItemStack(Items.STICK, 3));
+            assertEquals(Items.CHARCOAL, result.getItem());
+            assertEquals(2, result.getCount());
+        } finally {
+            assertTrue(registry.getPostBurnAlgorithmsForItem(Items.STICK).remove(algorithm));
+        }
+    }
+}
diff --git a/src/test/java/zone/moddev/mc/basepower/resources/BuildWorkflowContractTest.java b/src/test/java/zone/moddev/mc/basepower/resources/BuildWorkflowContractTest.java
index 6c5c0790..0d5723d7 100644
--- a/src/test/java/zone/moddev/mc/basepower/resources/BuildWorkflowContractTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/resources/BuildWorkflowContractTest.java
@@ -96,7 +96,9 @@ private static void requireWorkflowTargets(String workflow, String branch) {
             assertTrue(name, workflow.contains("master-" + pins.getProperty("minecraft_version")));
             assertTrue(name, workflow.contains("java-version: '25.0.3+9.0.LTS'"));
             assertTrue(name, workflow.contains("java-version: '" + pins.getProperty("java_setup_version") + "'"));
-            assertTrue(name, workflow.contains("java-version: '8.0.502+7'"));
+            assertFalse(name, workflow.contains("java-version: '8.0.502+7'"));
+            assertTrue(name, workflow.contains("-Porg.gradle.java.installations.paths=$JAVA_HOME"));
+            assertFalse(name, workflow.contains("JAVA_HOME_8_X64"));
             assertFalse(name, workflow.contains("JAVA_HOME_16_X64"));
             assertTrue(name, workflow.contains("-Porg.gradle.java.installations.paths="));
             assertTrue(name, workflow.contains("-Porg.gradle.java.installations.auto-detect=false"));
diff --git a/src/test/java/zone/moddev/mc/basepower/resources/ClientResourceContractTest.java b/src/test/java/zone/moddev/mc/basepower/resources/ClientResourceContractTest.java
index d6934523..a2443e31 100644
--- a/src/test/java/zone/moddev/mc/basepower/resources/ClientResourceContractTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/resources/ClientResourceContractTest.java
@@ -13,6 +13,8 @@
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.HashSet;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -70,22 +72,28 @@ public class ClientResourceContractTest {
             assertEquals(file.toString(), "basepower:item/" + name.replace(".json", ""), node.get("model").getAsString());
             verifyReference(node.get("model").getAsString(), "models", ".json", file);
         }
-        JsonObject atlas = read(ROOT.resolve("assets/minecraft/atlases/items.json"));
-        assertEquals("The item atlas must not shadow block or material sprites", 1,
-                atlas.getAsJsonArray("sources").size());
-        JsonObject source = atlas.getAsJsonArray("sources").get(0).getAsJsonObject();
-        assertEquals("directory", source.get("type").getAsString());
-        assertEquals("items", source.get("source").getAsString());
-        assertEquals("items/", source.get("prefix").getAsString());
+        Set<String> blocks = atlasResources("blocks"), items = atlasResources("items");
+        assertTrue("The item atlas must not shadow block or material sprites",
+                java.util.Collections.disjoint(blocks, items));
+        for (String item : items) assertTrue("Only item artwork belongs in the item atlas: " + item,
+                item.startsWith("basepower:items/"));
+        for (String fluid : new String[] {"crude_oil_still", "crude_oil_flow", "refined_oil_still", "refined_oil_flow"}) {
+            assertTrue("Missing manually requested fluid sprite " + fluid, blocks.contains("basepower:blocks/" + fluid));
+        }
+    }
+
+    @Test public void developmentProfilePinsTheActualNative2612Family() throws IOException {
         String build = Files.readString(Paths.get("build.gradle"), StandardCharsets.UTF_8);
-        assertTrue("Combined Eclipse defaults must select the native 1.21.11 profile",
+        assertTrue("Combined Eclipse defaults must select the native 26.1.2 profile",
+                build.contains("'test-rig/profiles/native2612/dev-core.json'"));
+        assertFalse("A CLI override must not hide a stale 1.21.11 default",
                 build.contains("'test-rig/profiles/native12111/dev-core.json'"));
         assertFalse("A CLI override must not hide a stale 1.21.1 default",
                 build.contains("'test-rig/profiles/native1211/dev-core.json'"));
-        JsonObject profile = read(Paths.get("test-rig/profiles/native12111/dev-core.json"));
+        JsonObject profile = read(Paths.get("test-rig/profiles/native2612/dev-core.json"));
         assertEquals("development", profile.get("mode").getAsString());
-        assertEquals("1.21.11", profile.get("minecraftVersion").getAsString());
-        assertEquals("61.1.0", profile.get("forgeVersion").getAsString());
+        assertEquals("26.1.2", profile.get("minecraftVersion").getAsString());
+        assertEquals("64.1.5", profile.get("forgeVersion").getAsString());
         java.util.Properties pins = new java.util.Properties();
         try (Reader reader = Files.newBufferedReader(Paths.get("gradle.properties"), StandardCharsets.UTF_8)) {
             pins.load(reader);
@@ -151,6 +159,25 @@ private static void verifyReference(String reference, String directory, String s
         assertTrue(file + " references missing resource " + resource, found);
     }
 
+    private static Set<String> atlasResources(String name) throws IOException {
+        Path file = ROOT.resolve("assets/minecraft/atlases/" + name + ".json");
+        JsonObject atlas = read(file);
+        assertEquals(file.toString(), Set.of("sources"), atlas.keySet());
+        Set<String> resources = new HashSet<>();
+        for (JsonElement value : atlas.getAsJsonArray("sources")) {
+            JsonObject source = value.getAsJsonObject();
+            assertEquals("No global imports, aliases or hidden selectors in " + file,
+                    Set.of("type", "resource"), source.keySet());
+            assertEquals(file.toString(), "minecraft:single", source.get("type").getAsString());
+            String resource = source.get("resource").getAsString();
+            assertTrue("Foreign sprite in " + file + ": " + resource, resource.startsWith("basepower:"));
+            assertTrue("Duplicate sprite in " + file + ": " + resource, resources.add(resource));
+            verifyReference(resource, "textures", ".png", file);
+        }
+        assertFalse("An empty atlas would hide the registration failure", resources.isEmpty());
+        return resources;
+    }
+
     private static JsonObject read(Path file) throws IOException {
         try (Reader reader = Files.newBufferedReader(file, StandardCharsets.UTF_8)) {
             return JsonParser.parseReader(reader).getAsJsonObject();
diff --git a/src/test/java/zone/moddev/mc/basepower/resources/Native2612PackFormatTest.java b/src/test/java/zone/moddev/mc/basepower/resources/Native2612PackFormatTest.java
new file mode 100644
index 00000000..c0574ef1
--- /dev/null
+++ b/src/test/java/zone/moddev/mc/basepower/resources/Native2612PackFormatTest.java
@@ -0,0 +1,56 @@
+package zone.moddev.mc.basepower.resources;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.mojang.serialization.JsonOps;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import net.minecraft.SharedConstants;
+import net.minecraft.server.packs.PackType;
+import net.minecraft.server.packs.metadata.pack.PackFormat;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class Native2612PackFormatTest {
+    @BeforeClass public static void detectActualEngine() {
+        SharedConstants.tryDetectVersion();
+    }
+
+    @Test public void actualEngineDeclaresTheExactTargetFormats() {
+        var version = SharedConstants.getCurrentVersion();
+        assertEquals("26.1.2", version.name());
+        assertEquals(4790, version.dataVersion().version());
+        assertEquals(PackFormat.of(84, 0), version.packVersion(PackType.CLIENT_RESOURCES));
+        assertEquals(PackFormat.of(101, 1), version.packVersion(PackType.SERVER_DATA));
+        assertEquals(25, Runtime.version().feature());
+    }
+
+    @Test public void rootMetadataUsesExactlyTheNativeDataVersion() throws Exception {
+        JsonObject metadata = JsonParser.parseString(Files.readString(Path.of("src/main/resources/pack.mcmeta")))
+                .getAsJsonObject().getAsJsonObject("pack");
+        var range = PackFormat.packCodec(PackType.SERVER_DATA).codec().parse(JsonOps.INSTANCE, metadata).getOrThrow();
+        assertEquals(PackFormat.of(101, 1), range.minInclusive());
+        assertEquals(PackFormat.of(101, 1), range.maxInclusive());
+        assertFalse(metadata.has("pack_format"));
+        assertFalse(metadata.has("supported_formats"));
+        assertTrue(range.isValueInRange(SharedConstants.getCurrentVersion().packVersion(PackType.SERVER_DATA)));
+        assertFalse(range.isValueInRange(SharedConstants.getCurrentVersion().packVersion(PackType.CLIENT_RESOURCES)));
+    }
+
+    @Test public void nativeCodecRejectsAnInvertedRange() {
+        var malformed = JsonParser.parseString("{\"min_format\":[101,2],\"max_format\":[101,1]}");
+        assertTrue(PackFormat.packCodec(PackType.SERVER_DATA).codec().parse(JsonOps.INSTANCE, malformed).error().isPresent());
+    }
+
+    @Test public void serverOnlyRangeCannotQualifyTheClientOrOlderTargets() {
+        var dataOnly = JsonParser.parseString("{\"min_format\":[101,1],\"max_format\":[101,1]}");
+        var range = PackFormat.packCodec(PackType.CLIENT_RESOURCES).codec().parse(JsonOps.INSTANCE, dataOnly).getOrThrow();
+        assertFalse(range.isValueInRange(PackFormat.of(84, 0)));
+        assertFalse(range.isValueInRange(PackFormat.of(75, 0)));
+        assertFalse(range.isValueInRange(PackFormat.of(94, 1)));
+        assertFalse(range.isValueInRange(PackFormat.of(101, 0)));
+        assertFalse(range.isValueInRange(PackFormat.of(101, 2)));
+        assertTrue(range.isValueInRange(PackFormat.of(101, 1)));
+    }
+}
diff --git a/src/test/java/zone/moddev/mc/basepower/resources/Native2612VillagerTradeResourceTest.java b/src/test/java/zone/moddev/mc/basepower/resources/Native2612VillagerTradeResourceTest.java
new file mode 100644
index 00000000..0c511c1b
--- /dev/null
+++ b/src/test/java/zone/moddev/mc/basepower/resources/Native2612VillagerTradeResourceTest.java
@@ -0,0 +1,147 @@
+package zone.moddev.mc.basepower.resources;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.mojang.serialization.JsonOps;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Set;
+import net.minecraft.SharedConstants;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.server.Bootstrap;
+import net.minecraft.tags.TagFile;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.item.trading.TradeCost;
+import net.minecraft.world.level.storage.loot.functions.LootItemFunctions;
+import net.minecraft.world.level.storage.loot.functions.SetItemCountFunction;
+import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
+import net.minecraft.world.level.storage.loot.providers.number.NumberProviders;
+import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/** Native resource/field codecs only. Full Power-item trade decoding and offers need the packaged server. */
+public class Native2612VillagerTradeResourceTest {
+    private static final Path DATA = Path.of("src/main/resources/data");
+
+    @BeforeClass public static void bootstrap() {
+        SharedConstants.tryDetectVersion();
+        Bootstrap.bootStrap();
+        assertEquals("26.1.2", SharedConstants.getCurrentVersion().name());
+    }
+
+    @Test public void nativeTradeFieldsRetainBothHistoricalExchangeRates() throws Exception {
+        verify(readTrade("emerald_sprockets"), "basepower:sprocket", 1, 4);
+        verify(readTrade("emerald_bioplastic"), "basepower:bioplastic_ingot", 4, 8);
+    }
+
+    @Test public void nativeProfessionTagsAppendExactlyTheTwoRequiredTrades() throws Exception {
+        verifyTag(readTag("toolsmith"), "basepower:emerald_sprockets");
+        verifyTag(readTag("farmer"), "basepower:emerald_bioplastic");
+    }
+
+    @Test public void changedItemsRatesLimitsAndDiscountCannotPassTheResourceContract() throws Exception {
+        JsonObject original = readTrade("emerald_sprockets");
+        var wrongItem = original.deepCopy();
+        wrongItem.getAsJsonObject("gives").addProperty("id", "minecraft:dirt");
+        rejected(wrongItem);
+        for (String field : new String[]{"max_uses", "xp", "reputation_discount"}) {
+            var changed = original.deepCopy();
+            changed.addProperty(field, original.get(field).getAsInt() + 1);
+            rejected(changed);
+        }
+        var wrongCost = original.deepCopy();
+        wrongCost.getAsJsonObject("wants").addProperty("count", 2);
+        rejected(wrongCost);
+        var wrongRange = original.deepCopy();
+        wrongRange.getAsJsonArray("given_item_modifiers").get(0).getAsJsonObject()
+                .getAsJsonObject("count").addProperty("max", 5);
+        rejected(wrongRange);
+        var additive = original.deepCopy();
+        additive.getAsJsonArray("given_item_modifiers").get(0).getAsJsonObject().addProperty("add", true);
+        rejected(additive);
+        var unknown = original.deepCopy();
+        unknown.addProperty("unreviewed_field", true);
+        rejected(unknown);
+    }
+
+    @Test public void replacementAndWrongProfessionMembershipCannotPass() throws Exception {
+        var replacement = readTag("toolsmith");
+        replacement.addProperty("replace", true);
+        assertThrows(AssertionError.class, () -> verifyTag(replacement, "basepower:emerald_sprockets"));
+        assertThrows(AssertionError.class, () -> verifyTag(readTag("farmer"), "basepower:emerald_sprockets"));
+    }
+
+    @Test public void strictProviderIdentityRejectsNativeFallbackForUnknownTypes() throws Exception {
+        var trade = readTrade("emerald_sprockets");
+        var modifier = trade.getAsJsonArray("given_item_modifiers").get(0);
+        modifier.getAsJsonObject().getAsJsonObject("count").addProperty("type", "basepower:missing_count_provider");
+        // NumberProviders.CODEC explicitly falls back to an untyped UniformGenerator.
+        assertTrue(LootItemFunctions.ROOT_CODEC.parse(JsonOps.INSTANCE, modifier).isSuccess());
+        rejected(trade);
+        modifier.getAsJsonObject().addProperty("function", "basepower:missing_item_function");
+        assertTrue(LootItemFunctions.ROOT_CODEC.parse(JsonOps.INSTANCE, modifier).isError());
+    }
+
+    private static void verify(JsonObject trade, String item, int min, int max) {
+        assertEquals(Set.of("wants", "gives", "max_uses", "xp", "reputation_discount", "given_item_modifiers"), trade.keySet());
+        assertEquals(Set.of("id", "count"), trade.getAsJsonObject("wants").keySet());
+        assertEquals(Set.of("id"), trade.getAsJsonObject("gives").keySet());
+        assertEquals(item, trade.getAsJsonObject("gives").get("id").getAsString());
+        var ops = RegistryAccess.fromRegistryOfRegistries(BuiltInRegistries.REGISTRY).createSerializationContext(JsonOps.INSTANCE);
+        var cost = TradeCost.CODEC.parse(ops, trade.get("wants")).getOrThrow();
+        assertSame(Items.EMERALD, cost.item().value());
+        assertEquals(1, constant(cost.count()));
+        assertEquals(7, constant(NumberProviders.CODEC.parse(ops, trade.get("max_uses")).getOrThrow()));
+        assertEquals(1, constant(NumberProviders.CODEC.parse(ops, trade.get("xp")).getOrThrow()));
+        assertEquals(0, constant(NumberProviders.CODEC.parse(ops, trade.get("reputation_discount")).getOrThrow()));
+        var modifiers = trade.getAsJsonArray("given_item_modifiers");
+        assertEquals(1, modifiers.size());
+        var modifier = modifiers.get(0).getAsJsonObject();
+        assertEquals(Set.of("function", "count"), modifier.keySet());
+        assertEquals("minecraft:set_count", modifier.get("function").getAsString());
+        var sourceCount = modifier.getAsJsonObject("count");
+        assertEquals(Set.of("type", "min", "max"), sourceCount.keySet());
+        assertEquals("minecraft:uniform", sourceCount.get("type").getAsString());
+        var function = LootItemFunctions.ROOT_CODEC.parse(ops, modifier).getOrThrow();
+        assertTrue(function instanceof SetItemCountFunction);
+        var encoded = LootItemFunctions.ROOT_CODEC.encodeStart(ops, function).getOrThrow().getAsJsonObject();
+        assertFalse(encoded.get("add").getAsBoolean());
+        var count = NumberProviders.CODEC.parse(ops, encoded.get("count")).getOrThrow();
+        assertTrue(count instanceof UniformGenerator);
+        var uniform = (UniformGenerator) count;
+        assertEquals(min, constant(uniform.min()));
+        assertEquals(max, constant(uniform.max()));
+    }
+
+    private static int constant(net.minecraft.world.level.storage.loot.providers.number.NumberProvider value) {
+        assertTrue(value instanceof ConstantValue);
+        float number = ((ConstantValue) value).value();
+        assertEquals((int) number, number, 0F);
+        return (int) number;
+    }
+
+    private static void verifyTag(JsonObject source, String id) {
+        assertEquals(Set.of("replace", "values"), source.keySet());
+        TagFile decoded = TagFile.CODEC.parse(JsonOps.INSTANCE, source).getOrThrow();
+        assertFalse(decoded.replace());
+        assertTrue(decoded.remove().isEmpty());
+        assertEquals(1, decoded.entries().size());
+        var encoded = TagFile.CODEC.encodeStart(JsonOps.INSTANCE, decoded).getOrThrow().getAsJsonObject();
+        assertEquals(id, encoded.getAsJsonArray("values").get(0).getAsString());
+    }
+
+    private static void rejected(JsonObject value) {
+        assertThrows(AssertionError.class, () -> verify(value, "basepower:sprocket", 1, 4));
+    }
+
+    private static JsonObject readTrade(String name) throws Exception {
+        return JsonParser.parseString(Files.readString(DATA.resolve("basepower/villager_trade/" + name + ".json"))).getAsJsonObject();
+    }
+
+    private static JsonObject readTag(String profession) throws Exception {
+        return JsonParser.parseString(Files.readString(DATA.resolve("minecraft/tags/villager_trade/" + profession + "/level_1.json"))).getAsJsonObject();
+    }
+}
diff --git a/src/test/java/zone/moddev/mc/basepower/resources/NativeGuiExtractionFixture.java b/src/test/java/zone/moddev/mc/basepower/resources/NativeGuiExtractionFixture.java
new file mode 100644
index 00000000..177aa39c
--- /dev/null
+++ b/src/test/java/zone/moddev/mc/basepower/resources/NativeGuiExtractionFixture.java
@@ -0,0 +1,86 @@
+package zone.moddev.mc.basepower.resources;
+
+import com.mojang.blaze3d.textures.GpuTextureView;
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.renderer.state.gui.GuiRenderState;
+import net.minecraft.client.renderer.texture.SimpleTexture;
+import net.minecraft.client.renderer.texture.SpriteContents;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.resources.Identifier;
+import org.joml.Matrix3x2fStack;
+
+/** CPU extraction only: real native queues/scissors, but no texture upload or GPU rendering. */
+public final class NativeGuiExtractionFixture {
+    public final Minecraft minecraft;
+    public final GuiGraphicsExtractor graphics;
+    public final Matrix3x2fStack pose = new Matrix3x2fStack(16);
+    private final Map<Identifier, SimpleTexture> textures = new HashMap<>();
+
+    public NativeGuiExtractionFixture(GuiRenderState target) throws Exception {
+        // Skip GPU startup only; every extraction/scissor operation runs the native implementation.
+        minecraft = allocate(Minecraft.class);
+        var manager = allocate(TextureManager.class);
+        set(manager, "byPath", textures);
+        set(minecraft, "textureManager", manager);
+        set(minecraft, "gui", allocate(Gui.class));
+        graphics = allocate(GuiGraphicsExtractor.class);
+        set(graphics, "minecraft", minecraft);
+        set(graphics, "pose", pose);
+        set(graphics, "guiRenderState", target);
+        var constructor = Class.forName(GuiGraphicsExtractor.class.getName() + "$ScissorStack")
+                .getDeclaredConstructor();
+        constructor.setAccessible(true);
+        set(graphics, "scissorStack", constructor.newInstance());
+    }
+
+    public GpuTextureView texture(Identifier id) throws Exception {
+        var texture = allocate(SimpleTexture.class);
+        var view = new GpuTextureView(null, 0, 1) {
+            @Override public void close() { throw new UnsupportedOperationException("CPU fixture"); }
+            @Override public boolean isClosed() { return false; }
+        };
+        set(texture, "textureView", view);
+        textures.put(id, texture);
+        return view;
+    }
+
+    public TextureAtlasSprite sprite(Identifier atlas) throws Exception {
+        texture(atlas);
+        var contents = allocate(SpriteContents.class);
+        set(contents, "width", 16);
+        set(contents, "height", 16);
+        return new TextureAtlasSprite(atlas, contents, 64, 64, 16, 32, 0);
+    }
+
+    public static <T> T allocate(Class<T> type) throws Exception {
+        Class<?> allocator = Class.forName("sun.misc.Unsafe");
+        Field instance = allocator.getDeclaredField("theUnsafe");
+        instance.setAccessible(true);
+        return type.cast(allocator.getMethod("allocateInstance", Class.class).invoke(instance.get(null), type));
+    }
+
+    public static Object get(Object instance, String name) throws Exception {
+        return field(instance, name).get(instance);
+    }
+
+    public static void set(Object instance, String name, Object value) throws Exception {
+        field(instance, name).set(instance, value);
+    }
+
+    private static Field field(Object instance, String name) throws Exception {
+        for (Class<?> type = instance.getClass(); type != null; type = type.getSuperclass()) {
+            try {
+                Field field = type.getDeclaredField(name);
+                field.setAccessible(true);
+                return field;
+            } catch (NoSuchFieldException ignored) {}
+        }
+        throw new NoSuchFieldException(name);
+    }
+}
diff --git a/src/test/java/zone/moddev/mc/basepower/resources/NativePackFormatContractTest.java b/src/test/java/zone/moddev/mc/basepower/resources/NativePackFormatContractTest.java
index 6d1cb3cd..c5f6fa8a 100644
--- a/src/test/java/zone/moddev/mc/basepower/resources/NativePackFormatContractTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/resources/NativePackFormatContractTest.java
@@ -44,8 +44,14 @@ public class NativePackFormatContractTest {
                 SharedConstants.RESOURCE_PACK_FORMAT_MAJOR, SharedConstants.RESOURCE_PACK_FORMAT_MINOR)));
         assertTrue(server.supportedFormats().isValueInRange(PackFormat.of(
                 SharedConstants.DATA_PACK_FORMAT_MAJOR, SharedConstants.DATA_PACK_FORMAT_MINOR)));
-        assertFalse(client.supportedFormats().isValueInRange(PackFormat.of(74)));
-        assertFalse(server.supportedFormats().isValueInRange(PackFormat.of(95)));
+        assertEquals(PackFormat.of(84, 0).minorRange(), client.supportedFormats());
+        assertEquals(PackFormat.of(101, 1), server.supportedFormats().minInclusive());
+        assertEquals(PackFormat.of(101, 1), server.supportedFormats().maxInclusive());
+        assertFalse(client.supportedFormats().isValueInRange(PackFormat.of(83)));
+        assertFalse(client.supportedFormats().isValueInRange(PackFormat.of(85)));
+        assertFalse(server.supportedFormats().isValueInRange(PackFormat.of(101, 0)));
+        assertFalse(server.supportedFormats().isValueInRange(PackFormat.of(101, 2)));
+        assertFalse(server.supportedFormats().isValueInRange(PackFormat.of(102)));
         assertFalse(client.supportedFormats().isValueInRange(PackFormat.of(94, 1)));
         assertFalse(server.supportedFormats().isValueInRange(PackFormat.of(75, 0)));
     }
diff --git a/src/test/java/zone/moddev/mc/basepower/resources/NativePackRangeContractTest.java b/src/test/java/zone/moddev/mc/basepower/resources/NativePackRangeContractTest.java
index 0883853b..a780615d 100644
--- a/src/test/java/zone/moddev/mc/basepower/resources/NativePackRangeContractTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/resources/NativePackRangeContractTest.java
@@ -20,11 +20,13 @@ public class NativePackRangeContractTest {
             JsonObject pack = side.getAsJsonObject("nativeMetadata");
             var range = PackFormat.packCodec(type).codec().parse(JsonOps.INSTANCE, pack).getOrThrow();
             assertEquals(type.toString(), type == PackType.CLIENT_RESOURCES,
-                    range.isValueInRange(PackFormat.of(75, 0)));
+                    range.isValueInRange(PackFormat.of(84, 0)));
             assertEquals(type.toString(), type == PackType.SERVER_DATA,
-                    range.isValueInRange(PackFormat.of(94, 1)));
-            assertFalse(range.isValueInRange(PackFormat.of(74)));
-            assertFalse(range.isValueInRange(PackFormat.of(95)));
+                    range.isValueInRange(PackFormat.of(101, 1)));
+            assertFalse(range.isValueInRange(PackFormat.of(83)));
+            assertFalse(range.isValueInRange(PackFormat.of(102)));
+            assertFalse(range.isValueInRange(PackFormat.of(75, 0)));
+            assertFalse(range.isValueInRange(PackFormat.of(94, 1)));
         }
     }
 
@@ -46,11 +48,12 @@ public class NativePackRangeContractTest {
     }
 
     @Test public void dataOnlyRangeDoesNotQualifyClientResources() {
-        JsonObject dataOnly = JsonParser.parseString("{\"min_format\":[94,1],\"max_format\":[94,1]}")
+        JsonObject dataOnly = JsonParser.parseString("{\"min_format\":[101,1],\"max_format\":[101,1]}")
                 .getAsJsonObject();
         var range = PackFormat.packCodec(PackType.CLIENT_RESOURCES).codec()
                 .parse(JsonOps.INSTANCE, dataOnly).getOrThrow();
-        assertFalse(range.isValueInRange(PackFormat.of(75, 0)));
-        assertTrue(range.isValueInRange(PackFormat.of(94, 1)));
+        assertFalse(range.isValueInRange(PackFormat.of(84, 0)));
+        assertFalse(range.isValueInRange(PackFormat.of(94, 1)));
+        assertTrue(range.isValueInRange(PackFormat.of(101, 1)));
     }
 }
diff --git a/src/test/java/zone/moddev/mc/basepower/resources/NativePlatformContractTest.java b/src/test/java/zone/moddev/mc/basepower/resources/NativePlatformContractTest.java
index bd869611..bfeda6cc 100644
--- a/src/test/java/zone/moddev/mc/basepower/resources/NativePlatformContractTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/resources/NativePlatformContractTest.java
@@ -24,11 +24,20 @@ public class NativePlatformContractTest {
         assertEquals(1, config.getAsJsonObject("injectors").get("defaultRequire").getAsInt());
         java.util.Set<String> hooks = new java.util.HashSet<>();
         config.getAsJsonArray("mixins").forEach(value -> hooks.add(value.getAsString()));
-        assertEquals(java.util.Set.of("BlockStateDataMixin", "LevelStorageSourceMixin", "PlayerDataStorageMixin",
+        assertEquals(java.util.Set.of("BlockStateDataMixin", "LevelStorageSourceMixin", "SelectedWorldStorageMixin", "PlayerDataStorageMixin",
                 "SimpleRegionStorageMixin", "WorldGenRegionMixin"), hooks);
         for (String name : hooks) assertNotNull(read("zone/moddev/mc/basepower/mixin/" + name));
     }
 
+    @Test public void java25BytecodeIsIndependentOfNativeMixinCompatibilityLevel() throws Exception {
+        assertEquals(25, Runtime.version().feature());
+        assertEquals(69, read("cyano/poweradvantage/api/simple/SimpleMachineGUI").version & 0xFFFF);
+        assertEquals(69, read("zone/moddev/mc/basepower/mixin/SelectedWorldStorageMixin").version & 0xFFFF);
+        var levels = org.spongepowered.asm.mixin.MixinEnvironment.CompatibilityLevel.values();
+        assertTrue(java.util.Arrays.stream(levels).anyMatch(level -> level.name().equals("JAVA_21")));
+        assertFalse(java.util.Arrays.stream(levels).anyMatch(level -> level.name().equals("JAVA_25")));
+    }
+
     @Test public void nativeRecipeAndAdvancementLoadingShareThePostponedTagContext() throws Exception {
         ClassNode node = read("net/minecraft/server/ReloadableServerResources");
         MethodNode constructor = node.methods.stream().filter(method -> method.name.equals("<init>"))
diff --git a/src/test/java/zone/moddev/mc/basepower/testing/NativePackProcessContractTest.java b/src/test/java/zone/moddev/mc/basepower/testing/NativePackProcessContractTest.java
index 6aa6b453..6574d62f 100644
--- a/src/test/java/zone/moddev/mc/basepower/testing/NativePackProcessContractTest.java
+++ b/src/test/java/zone/moddev/mc/basepower/testing/NativePackProcessContractTest.java
@@ -27,6 +27,10 @@ public class NativePackProcessContractTest {
 
     @Test public void nativeProofActuallyRunsWithTerminalDisabled() throws Exception {
         var proof = NativePackResourceProof.read();
+        assertEquals("26.1.2", proof.get("minecraft").getAsString());
+        assertEquals("RESOURCE_PACK_ONLY", proof.get("discoveryScope").getAsString());
+        assertEquals("64.1.5", proof.get("forge").getAsString());
+        assertEquals(25, proof.get("javaFeature").getAsInt());
         assertTrue(proof.get("interactiveTerminalDisabled").getAsBoolean());
         assertEquals(0, proof.getAsJsonArray("warningsAndErrors").size());
         assertTrue(proof.getAsJsonObject("CLIENT_RESOURCES").get("resourcesVerified").getAsInt() > 0);
diff --git a/src/test/java/zone/moddev/mc/basepower/testing/NativePackResourceProof.java b/src/test/java/zone/moddev/mc/basepower/testing/NativePackResourceProof.java
index 6aafd5cd..d07fb9ce 100644
--- a/src/test/java/zone/moddev/mc/basepower/testing/NativePackResourceProof.java
+++ b/src/test/java/zone/moddev/mc/basepower/testing/NativePackResourceProof.java
@@ -37,7 +37,7 @@
 import org.apache.logging.log4j.core.config.Property;
 import org.apache.logging.log4j.core.layout.PatternLayout;
 
-/** Runs real Forge discovery in a child VM so ModList and native registry state cannot leak into other tests. */
+/** Runs native Forge resource loading in an isolated VM, not dependency or gameplay qualification. */
 public final class NativePackResourceProof {
     private static JsonObject receipt;
 
@@ -47,7 +47,7 @@ public static synchronized JsonObject read() throws Exception {
         if (receipt != null) return receipt.deepCopy();
         Path evidenceRoot = Path.of("build/native-pack-resources").toAbsolutePath();
         Files.createDirectories(evidenceRoot);
-        Path evidence = Files.createTempDirectory(evidenceRoot, "forge61-");
+        Path evidence = Files.createTempDirectory(evidenceRoot, "forge64-");
         String classpath = Arrays.stream(System.getProperty("basepower.nativePackClasspath",
                 System.getProperty("java.class.path")).split(java.util.regex.Pattern.quote(java.io.File.pathSeparator)))
                 .map(entry -> new java.io.File(entry).getAbsolutePath())
@@ -90,6 +90,15 @@ public static void main(String[] args) throws Exception {
             throw new AssertionError("The redirected proof child must not initialise an interactive terminal");
         }
         SharedConstants.tryDetectVersion();
+        if (Runtime.version().feature() != 25
+                || !"26.1.2".equals(SharedConstants.getCurrentVersion().name())
+                || !"64.1.5".equals(net.minecraftforge.versions.forge.ForgeVersion.getVersion())
+                || !net.minecraft.server.packs.metadata.pack.PackFormat.of(84, 0).equals(
+                        SharedConstants.getCurrentVersion().packVersion(PackType.CLIENT_RESOURCES))
+                || !net.minecraft.server.packs.metadata.pack.PackFormat.of(101, 1).equals(
+                        SharedConstants.getCurrentVersion().packVersion(PackType.SERVER_DATA))) {
+            throw new AssertionError("Resource proof requires actual Forge 64.1.5 / Minecraft 26.1.2 on Java 25");
+        }
         Bootstrap.bootStrap();
         Path resources = Path.of(args[0]);
         Path evidence = Path.of(args[1]);
@@ -107,7 +116,7 @@ public static void main(String[] args) throws Exception {
         }
         ModFile mod = new ModFile(SecureJar.from(jar), new ForgeDevLocator(), ModFileParser::modsTomlParser);
         if (mod.getModFileInfo().showAsResourcePack()) throw new AssertionError("Power must use Forge's hidden client pack");
-        ModList.of(List.of(mod), mod.getModInfos().stream().map(ModInfo.class::cast).toList());
+        initializeResourceDiscovery(mod);
         List<String> diagnostics = new ArrayList<>();
         AbstractAppender appender = new AbstractAppender("PowerPackContract", null,
                 PatternLayout.createDefaultLayout(), false, Property.EMPTY_ARRAY) {
@@ -120,6 +129,10 @@ public static void main(String[] args) throws Exception {
         logger.addAppender(appender);
         JsonObject result = new JsonObject();
         result.addProperty("interactiveTerminalDisabled", true);
+        result.addProperty("discoveryScope", "RESOURCE_PACK_ONLY");
+        result.addProperty("minecraft", SharedConstants.getCurrentVersion().name());
+        result.addProperty("forge", net.minecraftforge.versions.forge.ForgeVersion.getVersion());
+        result.addProperty("javaFeature", Runtime.version().feature());
         JsonArray dependencies = new JsonArray();
         for (var dependency : mod.getModInfos().getFirst().getDependencies()) {
             JsonObject entry = new JsonObject();
@@ -160,8 +173,10 @@ public static void main(String[] args) throws Exception {
                     side.addProperty("resourcesClass", opened.getClass().getName());
                     side.addProperty("acceptsClient", formats.isValueInRange(SharedConstants.getCurrentVersion().packVersion(PackType.CLIENT_RESOURCES)));
                     side.addProperty("acceptsServer", formats.isValueInRange(SharedConstants.getCurrentVersion().packVersion(PackType.SERVER_DATA)));
-                    side.addProperty("accepts74", formats.isValueInRange(net.minecraft.server.packs.metadata.pack.PackFormat.of(74)));
-                    side.addProperty("accepts95", formats.isValueInRange(net.minecraft.server.packs.metadata.pack.PackFormat.of(95)));
+                    side.addProperty("accepts83", formats.isValueInRange(net.minecraft.server.packs.metadata.pack.PackFormat.of(83)));
+                    side.addProperty("accepts102", formats.isValueInRange(net.minecraft.server.packs.metadata.pack.PackFormat.of(102)));
+                    side.addProperty("acceptsPreviousClient", formats.isValueInRange(net.minecraft.server.packs.metadata.pack.PackFormat.of(75, 0)));
+                    side.addProperty("acceptsPreviousServer", formats.isValueInRange(net.minecraft.server.packs.metadata.pack.PackFormat.of(94, 1)));
                     side.add("nativeMetadata", encoded);
                     if (type == PackType.CLIENT_RESOURCES) {
                         if (opened.getChildren() == null || opened.getChildren().size() != 1) {
@@ -208,4 +223,33 @@ public static void main(String[] args) throws Exception {
         if (!diagnostics.isEmpty()) throw new AssertionError("Native Forge resource diagnostics: " + diagnostics);
         System.out.println("BASEPOWER_NATIVE_PACK_RESOURCES_PASS " + result);
     }
+
+    private static void initializeResourceDiscovery(ModFile mod) throws Exception {
+        if (net.minecraftforge.fml.loading.FMLLoader.getGamePath() != null) {
+            throw new AssertionError("Resource-only discovery must not run inside Forge");
+        }
+        // Forge64 removed ModList.of. Seed its native lazy discovery record without claiming
+        // dependency sorting, access-transformer application, or loading production mod classes.
+        Class<?> stateType = Class.forName("net.minecraftforge.fml.loading.ModSorter$State");
+        var constructor = stateType.getDeclaredConstructor(List.class, List.class);
+        constructor.setAccessible(true);
+        Object state = constructor.newInstance(List.of(mod),
+                mod.getModInfos().stream().map(ModInfo.class::cast).toList());
+        Class<?> discovery = Class.forName("net.minecraftforge.fml.loading.LoadingModListImpl");
+        var temporaryState = discovery.getDeclaredField("temp");
+        temporaryState.setAccessible(true);
+        if (temporaryState.get(null) != null) throw new AssertionError("Discovery is already initializing");
+        temporaryState.set(null, state);
+        try {
+            ModList.init();
+        } finally {
+            temporaryState.set(null, null);
+        }
+        if (ModList.getMods().size() != 1 || !ModList.getModFiles().equals(List.of(mod.getModFileInfo()))
+                || !ModList.getMods().equals(mod.getModInfos())
+                || !net.minecraftforge.fml.loading.LoadingModList.getErrors().isEmpty()
+                || !net.minecraftforge.fml.loading.LoadingModList.getBrokenFiles().isEmpty()) {
+            throw new AssertionError("Native resource-only discovery did not retain the exact parsed mod");
+        }
+    }
 }
diff --git a/src/test/java/zone/moddev/mc/basepower/util/InventoryLocksTest.java b/src/test/java/zone/moddev/mc/basepower/util/InventoryLocksTest.java
new file mode 100644
index 00000000..c3f89b8e
--- /dev/null
+++ b/src/test/java/zone/moddev/mc/basepower/util/InventoryLocksTest.java
@@ -0,0 +1,67 @@
+package zone.moddev.mc.basepower.util;
+
+import net.minecraft.advancements.criterion.ItemPredicate;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.component.DataComponentMap;
+import net.minecraft.core.component.DataComponentPatch;
+import net.minecraft.core.component.DataComponents;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.world.CompoundContainer;
+import net.minecraft.world.LockCode;
+import net.minecraft.world.SimpleContainer;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.entity.ChestBlockEntity;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class InventoryLocksTest {
+    @BeforeClass public static void bootstrap() {
+        net.minecraft.SharedConstants.tryDetectVersion();
+        net.minecraft.server.Bootstrap.bootStrap();
+    }
+
+    @Test public void ordinaryInventoryNeedsNoVanillaLockAccess() {
+        assertFalse(InventoryLocks.isLocked(new SimpleContainer(1)));
+        assertFalse(InventoryLocks.isLocked(null));
+    }
+
+    @Test public void unlockedVanillaChestIsAccessible() {
+        assertFalse(InventoryLocks.isLocked(chest(false)));
+    }
+
+    @Test public void lockedVanillaChestAndItsWrapperStayLocked() {
+        ChestBlockEntity chest = chest(true);
+        assertTrue(chest.isLocked());
+        assertTrue(InventoryLocks.isLocked(chest));
+        assertTrue(InventoryLocks.isLocked(InventoryWrapper.wrap(chest)));
+    }
+
+    @Test public void bothUnlockedDoubleChestHalvesAreAccessible() {
+        assertFalse(InventoryLocks.isLocked(new CompoundContainer(chest(false), chest(false))));
+    }
+
+    @Test public void eitherLockedDoubleChestHalfBlocksAutomation() {
+        assertTrue(InventoryLocks.isLocked(new CompoundContainer(chest(true), chest(false))));
+        assertTrue(InventoryLocks.isLocked(new CompoundContainer(chest(false), chest(true))));
+    }
+
+    @Test public void nestedContainersCannotHideALockedChest() {
+        CompoundContainer nested = new CompoundContainer(new SimpleContainer(1),
+                new CompoundContainer(chest(false), chest(true)));
+        assertTrue(InventoryLocks.isLocked(nested));
+        assertTrue(InventoryLocks.isLocked(InventoryWrapper.wrap(nested)));
+    }
+
+    private static ChestBlockEntity chest(boolean locked) {
+        ChestBlockEntity chest = new ChestBlockEntity(BlockPos.ZERO, Blocks.CHEST.defaultBlockState());
+        if (locked) {
+            LockCode code = new LockCode(ItemPredicate.Builder.item()
+                    .of(BuiltInRegistries.ITEM, Items.TRIPWIRE_HOOK).build());
+            chest.applyComponents(DataComponentMap.EMPTY,
+                    DataComponentPatch.builder().set(DataComponents.LOCK, code).build());
+        }
+        return chest;
+    }
+}
diff --git a/test-rig/README.md b/test-rig/README.md
index 5a562498..eb3045c2 100644
--- a/test-rig/README.md
+++ b/test-rig/README.md
@@ -1,6 +1,231 @@
-# Advantage Works 1.21.1 Test Rig
+# Advantage Works Test Rig
 
-The current target is Minecraft 1.21.1, Forge 52.1.0 and Java 21. Start with
+## Native 26.1.2: Local And Unqualified
+
+> **Current-instruction boundary:** Only this native26 section describes the
+> current port. Every section from **Retained 1.21.1 Reference** onward is
+> historical, not current native26 launch or qualification instructions.
+> In particular, the Java8/17 commands and decoupled-without-BaseMetals profiles
+> below must not be used for native26. **Base Metals is mandatory for native26**;
+> there is no supported native26 decoupled qualification profile.
+
+The native26 adapters target Minecraft **26.1.2**, Forge **64.1.5**, MCP
+**20260409.101008**, and the hash-pinned **Temurin 25.0.3+9** runtime. They are
+additive: do not replace historical `native*` drivers, profiles, source readers,
+or expectations with a global version substitution.
+
+**Final qualification profile: PENDING.** Candidate07 is awaiting the retained
+OreSpawn profile-migration and client gates. Earlier candidate05/06 machine
+and endurance receipts are historical, scoped evidence, not a final family
+pass. No filename or hash in this section stands in for the future final
+profile. Never retarget an old receipt after rebuilding any input.
+
+### Strict Inputs And Build
+
+The server core accepts only an explicitly materialized JSON profile with
+`mode: packaged`, `minecraftVersion: 26.1.2`, `forge.version: 26.1.2-64.1.5`,
+and `qualificationStatus: EXPLORATORY_UNQUALIFIED`. A future "final" profile
+still needs this supported input status; individual `PASS` receipts do not
+authorize publication or imply overall acceptance.
+
+All six ordinary inputs are mandatory. Every `mods` row must provide the exact
+`id`, `version`, `file`, `path`, and full SHA-256 of the actual frozen jar:
+
+| Mod ID | Required version |
+| --- | --- |
+| `basepower` | `2.4.16.2601021` |
+| `basesteam` | `2.2.17.2601021` |
+| `baseelectric` | `2.2.17.2601021` |
+| `basemetals` | `3.1.2.2601021` |
+| `orespawn` | `4.1.1.2601021` |
+| `advantageworkstest` | `1.1.6.2601021` |
+
+Missing, duplicate, unexpected, wrong-version or changed inputs fail closed.
+Relative mod paths resolve from `test-rig/`, not the shell's working directory.
+Freeze independent, read-only copies outside compiler outputs and caches; do not
+point a qualification profile at jars another build can overwrite.
+The harness manifest must pin the exact staged ordinary Power jar through
+`Power-Input-SHA256`, with the selected `Built-On` and unqualified status.
+Build the harness against that actual Power artifact, not a stale deobf jar
+or an invented hash. `test-rig/gradle.properties` owns `works_power_sha256`.
+
+From the repository root, with the selected Java25 installation:
+
+```powershell
+$env:JAVA_HOME = '<Temurin-25.0.3+9-home>'
+./gradlew.bat -p test-rig check build
+if ($LASTEXITCODE -ne 0) { throw 'Harness build/check failed' }
+```
+
+Compiler outputs remain in `test-rig/build/gradle/`; `clean` is restricted to
+that directory. Do not run concurrent Gradle builds against the same project
+cache. A build, worldless unit bootstrap, or preflight is not a real-server
+qualification.
+
+Use a separately sealed, fresh **code-only** Forge64 SDK seed: only the selected
+shim jar and `libraries/`, with no worlds or user configuration. The core checks
+the Java executable, shim, native binary, official launch arguments and full
+code inventory. It does not reuse an older-version seed. `native2612.py seal`
+creates this SDK inventory; it is **not** the endurance pre-run seal.
+
+Ordinary qualification launches require a free loopback TCP port, disabled empty-server pausing,
+and no inherited `JAVA_TOOL_OPTIONS`, `JDK_JAVA_OPTIONS`, `_JAVA_OPTIONS` or
+`CLASSPATH` overrides. An occupied port is an error, never permission to kill
+another process. Use an explicit Python executable with `nbtlib` and a reviewed
+dependency closure. Endurance custody also pins the interpreter, base executable,
+imported NumPy code and native libraries. Keep the same Python/PYTHONPATH closure
+for seal, producer, freeze and replay; do not bypass alias or hard-link guards.
+
+### Native26 CLI
+
+Run these examples from `test-rig/migration/`. Replace every angle-bracket
+placeholder with a verified input or a **new**, disjoint output path. The port
+numbers are examples: check ownership and availability immediately before launch.
+Stop on any failure and retain its original output.
+
+```powershell
+$Python = '<explicit-reviewed-python-executable>'
+$Profile = '<PENDING-final-native2612-profile.json>'
+$ProfileSha = '<actual-profile-SHA256>'
+$Seed = '<sealed-Forge64-code-only-seed>'
+$Inventory = '<native2612-code-inventory.json>'
+$InventorySha = '<actual-inventory-SHA256>'
+$Java = '<Temurin-25.0.3+9-home>/bin/java.exe'
+$Inputs = @('--profile', $Profile, '--seed', $Seed,
+    '--inventory', $Inventory, '--inventory-sha256', $InventorySha, '--java', $Java)
+
+if ($ProfileSha -notmatch '^[A-Fa-f0-9]{64}$' -or
+    (Get-FileHash -LiteralPath $Profile -Algorithm SHA256).Hash -ne $ProfileSha) {
+    throw 'Frozen profile hash differs; do not launch'
+}
+& $Python -B native2612.py verify @Inputs
+if ($LASTEXITCODE -ne 0) { throw 'Native input preflight failed' }
+& $Python -B native2612_operations.py @Inputs --group all `
+    --output '<new-finite132-runtime>' --port 25620
+if ($LASTEXITCODE -ne 0) { throw 'Finite operation/restart/raw audit failed' }
+```
+
+Preflight opens no world. `--group all` requires all 132 finite cases, an actual
+cold restart, both stopped raw-storage audits and unchanged seed custody.
+Smaller groups are focused checks, not the full finite-operation gate.
+
+Other native26 entry points have their own required inputs; inspect their
+`--help` rather than copying historical runner defaults:
+
+| Entry point under `migration/` | Separate scope |
+| --- | --- |
+| `native2612_broad.py`, `native2612_interop.py` | Walkable Works/lifecycle and real cross-mod interoperability |
+| `native2612_machines.py`, `native2612_networks.py` | Harvest, movement, physical unload/reload orders and extended drill/network controls |
+| `native2612_upgrade.py` | Explicit historical source route, native conversion, operation, restart and raw saved witnesses |
+| `native2612_actors.py`, `native2612_actor_transformer_order.py` | Player/entity/dimension authority and actor-inclusive real transformer orders; not replaced by machine-only migration |
+| `native2612_resources.py` | Real ingredient acquisition, recipe unlock and manufacturing progression |
+| `native2612_worldgen.py`, `native2612_retained_worldgen.py`, `native2612_oil.py` | Normal/retained generation semantics and bounded oil processing/transport, not superflat station coverage |
+| `native2612_client.py` | Separate real-client rendering evidence; server or unit results do not replace it |
+
+Native destination readers use DataVersion 4790, explicit
+`dimensions/<namespace>/<path>/` terrain/entity storage, `players/data/`, and
+the separate worldgen SavedData. Historical source layouts remain version-specific.
+Do not infer destination dimensions from a legacy `DIM*` basename or discard
+unknown NBT to make a comparison pass.
+
+### Genuine Endurance, Freeze And Replay
+
+Before **any** endurance setup, finish the full finite gate and a new full
+`original110` machine migration against the same frozen profile. A hook-only,
+provisional, old-candidate or machine-only result cannot stand in for a separately
+required actor/player campaign. The retained endurance input must be the stopped
+runtime and exact successful full `original110` receipt, including operation.
+
+The reviewed engine receipt is a separate required input. It binds the actual
+core/classifier and primary native source/binary proof; `seal` does not manufacture
+that review. Keep the complete transitive oracle/runtime closure unchanged.
+
+```powershell
+$EngineReceipt = '<reviewed-engine-proof.json>'
+$EngineSha = '<actual-engine-receipt-SHA256>'
+$Retained = '<stopped-current-profile-original110-runtime>'
+$RetainedReceipt = '<current-profile-original110-upgrade-results.json>'
+$RetainedSha = '<actual-retained-receipt-SHA256>'
+$Seal = '<new-pre-run-seal.json>'
+$Run = '<new-two-world-endurance-output>'
+$Frozen = '<new-stopped-freeze-directory>'
+
+& $Python -B native2612_endurance_replay.py seal --profile $Profile `
+    --profile-sha256 $ProfileSha --specification '../src/main/resources/assets/advantageworkstest/works/works-1.13.2.json' `
+    --inventory $Inventory --inventory-sha256 $InventorySha --java $Java `
+    --engine-receipt $EngineReceipt --engine-receipt-sha256 $EngineSha `
+    --retained-receipt $RetainedReceipt --retained-receipt-sha256 $RetainedSha --output $Seal
+if ($LASTEXITCODE -ne 0) { throw 'Preseal failed; do not begin setup' }
+$SealSha = (Get-FileHash -LiteralPath $Seal -Algorithm SHA256).Hash
+
+& $Python -B native2612_endurance.py @Inputs --seal $Seal --seal-sha256 $SealSha `
+    --retained $Retained --retained-receipt $RetainedReceipt `
+    --retained-receipt-sha256 $RetainedSha --seconds 1800 --port 25621 --output $Run
+if ($LASTEXITCODE -ne 0) { throw 'Endurance incomplete; retain failure or hold receipt' }
+
+$Receipt = Join-Path $Run 'native2612-endurance-results.json'
+$ReceiptSha = (Get-FileHash -LiteralPath $Receipt -Algorithm SHA256).Hash
+& $Python -B native2612_endurance_replay.py freeze --run $Run --seal $Seal `
+    --seal-sha256 $SealSha --receipt-sha256 $ReceiptSha --output $Frozen
+if ($LASTEXITCODE -ne 0) { throw 'Stopped freeze failed' }
+$FreezeSha = (Get-FileHash -LiteralPath (Join-Path $Frozen 'freeze.json') -Algorithm SHA256).Hash
+& $Python -B native2612_endurance_replay.py replay --frozen $Frozen `
+    --freeze-sha256 $FreezeSha --seal-sha256 $SealSha --output '<new-independent-replay.json>'
+if ($LASTEXITCODE -ne 0) { throw 'Independent stopped replay failed' }
+```
+
+The producer requires two adjacent free ports and runs separate fresh and retained
+worlds with independent native clocks. Each needs at least 1,800 measured seconds,
+30 natural-tick batches, at least 18 TPS in every measured interval, a full process
+restart, and at least 60 seconds of resumed processing. A below-threshold resource
+throughput failure remains a failure, not a waived gameplay pass. A
+`hold-endurance.request` produces `HELD`, never qualification.
+
+After final tick-frozen observations and owned save/stop, `freeze` requires stopped
+worlds and exact source/copy inventories. Independent replay checks all 66 ledger
+checkpoints, every batch, interval clocks, feed conservation and exact typed raw
+native4790 machine state/NBT. It launches no Minecraft process and does not prove
+client appearance, player conversion, every worldgen rule or manual gameplay.
+`--retrospective` is diagnostic only: its replay is explicitly
+`PASS_RETROSPECTIVE_REPLAY_NOT_PRE_RUN_CUSTODY`, not a genuine presealed pass.
+Record the full profile, seal, producer, freeze and replay hashes plus process/port
+closure. Never overwrite a failed attempt or substitute later jars into its proof.
+
+### Retained Failures And Negative Controls
+
+Known historical failures are evidence, not runtime ignore rules:
+
+| Retained observation | Required distinction |
+| --- | --- |
+| Obsolete InventoryLocks SRG field lookup; nullable Steam fuel remainder; last-fuel container loss | Real production failures with retained RED evidence; new jars need new full input pins and campaigns |
+| Saved Steam enchantment IDs flattened as vanilla curses before selected-world context preparation | Machine-only migration/endurance could pass while actor preservation failed; require the independent actor/order scope |
+| Global atlas directories importing foreign low-resolution sprites | A dedicated-server pass does not qualify native mip-level client startup or geometry |
+| Active legacy OreSpawn profiles retaining obsolete Power/Electric output IDs | Preserved JSON and valid new defaults do not establish equivalent retained generation; final profile-migration qualification remains pending |
+
+Focused controls reject wrong Java or shim bytes, modified launch arguments,
+missing/duplicate mods, harness/Power pin mismatch, inherited JVM overrides,
+occupied ports, empty-server pausing, incomplete cold stop and tampered evidence.
+A crash can exit 0: exit code alone is insufficient. Native identity and `Done`
+must precede an owned stop and the final post-stop dimension-save witness; an
+earlier startup/autosave cannot replace the final flush.
+
+The Forge64 logging adapter changes exactly two source-hash-bound `%xEx` tokens
+to `%ex`; it does not disable DEBUG, filters or diagnostics. The strict Netty
+classifier recognizes only the reviewed, source/binary-bound Java25 capability
+probe sequence followed by successful Java25 cleaner availability. Raw logs are
+retained. Changed counts, levels, messages, frames or missing success are errors,
+not a blanket exception whitelist or a reason to re-enable Unsafe.
+
+---
+
+> **Historical references below, not native26 instructions.** Their Java versions,
+> profiles, optional-mod rules and example commands belong to their stated older
+> targets. Native26 requires all six pinned inputs, including Base Metals; use
+> only the native26 section above for the current port.
+
+## Retained 1.21.1 Reference
+
+The retained target is Minecraft 1.21.1, Forge 52.1.0 and Java 21. Start with
 the [native test instructions](profiles/native1211/README.md) and the
 [port record](../docs/1.21.1/PORT-STATUS.md). Use only the current hash-pinned
 inputs in disposable worlds. Earlier results do not qualify a rebuilt jar.
diff --git a/test-rig/build.gradle b/test-rig/build.gradle
index 52814e7b..664313f9 100644
--- a/test-rig/build.gradle
+++ b/test-rig/build.gradle
@@ -5,8 +5,8 @@ plugins {
     id 'net.minecraftforge.gradle' version '7.0.34'
 }
 
-ext.forge61MavenizerDefault = '../../../../MinecraftMineralogy/OS12111/OreSpawn/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.jar'
-apply from: '../gradle/forge61-mavenizer.gradle'
+ext.forge64MavenizerDefault = '../../../../MinecraftMineralogy/OS2612/OreSpawn/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.jar'
+apply from: '../gradle/forge64-mavenizer.gradle'
 
 // Saves, pinned inputs and evidence are siblings, never Gradle cleanup targets.
 layout.buildDirectory = layout.projectDirectory.dir('build/gradle')
@@ -25,15 +25,15 @@ version = project.harness_version
 base.archivesName = 'AdvantageWorksTestHarness'
 
 java {
-    toolchain.languageVersion = JavaLanguageVersion.of(21)
+    toolchain.languageVersion = JavaLanguageVersion.of(25)
 }
 
 tasks.withType(JavaCompile).configureEach {
     javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(21)
+        languageVersion = JavaLanguageVersion.of(25)
     }
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
+    sourceCompatibility = JavaVersion.VERSION_25
+    targetCompatibility = JavaVersion.VERSION_25
     options.encoding = 'UTF-8'
     options.compilerArgs.addAll(['-Xmaxerrs', '1000'])
 }
@@ -70,7 +70,7 @@ repositories {
 }
 
 def powerCompileJar = file(project.findProperty('powerAdvantageReleaseJar')
-        ?: '../build/libs/basePower-2.4.15.121111.jar')
+        ?: '../build/libs/basePower-2.4.16.2601021.jar')
 def exploratoryPowerSha = providers.gradleProperty('worksExploratoryPowerSha256')
 def powerCompileSha = exploratoryPowerSha.orElse(providers.gradleProperty('works_power_sha256'))
 
@@ -107,7 +107,7 @@ tasks.register('verifyWorksCompileInputPin') {
     inputs.file(powerCompileJar)
     inputs.property('powerSha256', powerCompileSha.orElse(''))
     doLast {
-        if (!powerCompileJar.isFile()) throw new GradleException("Missing 1.21.11 Power compile input: ${powerCompileJar}")
+        if (!powerCompileJar.isFile()) throw new GradleException("Missing 26.1.2 Power compile input: ${powerCompileJar}")
         if (!(powerCompileSha.getOrElse('') ==~ /[A-Fa-f0-9]{64}/)) {
             throw new GradleException('Missing or invalid Power SHA-256 pin')
         }
@@ -257,6 +257,20 @@ tasks.register('verifyWorksNative12111Inputs', JavaExec) {
     }
 }
 
+tasks.register('verifyWorksNative2612Inputs', JavaExec) {
+    group = 'verification'
+    description = 'Checks actual 26.1.2 candidate/Java/seed identities without opening a world.'
+    dependsOn tasks.named('runnerClasses'), tasks.named('jar')
+    classpath = sourceSets.runner.runtimeClasspath
+    mainClass = 'zone.moddev.mc.advantageworks.runner.WorksRunner'
+    doFirst { JavaExec task ->
+        String pin = providers.gradleProperty('worksProfileFile').orNull
+        if (!pin) throw new GradleException('Set -PworksProfileFile to a generated Forge 64 profile')
+        args '--profile', file(pin).absolutePath, '--validate-only'
+        configurePreparedSeedArgs(task)
+    }
+}
+
 tasks.register('verifyHarnessIsolation') {
     group = 'verification'
     description = 'Confirms the PowerAdvantage release contains no test-harness content.'
@@ -293,7 +307,7 @@ tasks.register('verifyForge61UnitBootstrap', JavaExec) {
     dependsOn compileUnitSupport, unitBootstrapJar
     classpath = files(compileUnitSupport.flatMap { it.destinationDirectory }) + nativeControlClasspath
     mainClass = 'zone.moddev.mc.advantageworks.unit.Forge61UnitControl'
-    javaLauncher = javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(21) }
+    javaLauncher = javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(25) }
     doFirst { jvmArgs "-javaagent:${unitBootstrapJar.get().archiveFile.get().asFile}" }
 }
 def compilePlatformControls = tasks.register('compilePlatformControls', JavaCompile) {
@@ -308,7 +322,7 @@ tasks.register('verifyNativeWolfPlatform', JavaExec) {
     classpath = files(compilePlatformControls.flatMap { it.destinationDirectory },
             compileUnitSupport.flatMap { it.destinationDirectory }) + nativeControlClasspath
     mainClass = 'NativeWolfPlatformControl'
-    javaLauncher = javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(21) }
+    javaLauncher = javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(25) }
     doFirst {
         def output = providers.gradleProperty('nativeControlOutput').orNull
         if (!output || file(output).exists()) throw new GradleException('Supply a new -PnativeControlOutput directory')
@@ -323,7 +337,7 @@ tasks.register('verifyNativeLeashKnotPlatform', JavaExec) {
     classpath = files(compilePlatformControls.flatMap { it.destinationDirectory },
             compileUnitSupport.flatMap { it.destinationDirectory }) + nativeControlClasspath
     mainClass = 'NativeLeashKnotPlatformControl'
-    javaLauncher = javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(21) }
+    javaLauncher = javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(25) }
     doFirst {
         def output = providers.gradleProperty('nativeControlOutput').orNull
         if (!output || file(output).exists()) throw new GradleException('Supply a new -PnativeControlOutput directory')
diff --git a/test-rig/client-resources/atlas_graph.py b/test-rig/client-resources/atlas_graph.py
new file mode 100644
index 00000000..0d1add58
--- /dev/null
+++ b/test-rig/client-resources/atlas_graph.py
@@ -0,0 +1,87 @@
+"""Deterministic native26 atlas singles, derived from model materials and explicit client sprites."""
+
+import argparse
+import json
+from pathlib import Path
+import struct
+
+
+POWER = Path(__file__).resolve().parents[2]
+ROOTS = {
+    "basepower": POWER / "src/main/resources",
+    "basesteam": POWER.parent / "SteamAdvantage/SteamAdvantage/src/main/resources",
+    "baseelectric": POWER.parent / "ElectricAdvantage/ElectricAdvantage/src/main/resources",
+}
+MANUAL = {
+    "basepower": {"blocks/crude_oil_still", "blocks/crude_oil_flow", "blocks/refined_oil_still", "blocks/refined_oil_flow"},
+    "basesteam": {"entity/drill_bit"},
+    "baseelectric": {"entity/laser_turret"},
+}
+
+
+def graph(roots=ROOTS):
+    textures = {owner: set() for owner in roots}
+    for root in roots.values():
+        for path in sorted((root / "assets").glob("*/models/**/*.json")):
+            model = json.loads(path.read_text(encoding="utf-8"))
+            for material in model.get("textures", {}).values():
+                if isinstance(material, dict):
+                    material = material["sprite"]
+                if not isinstance(material, str) or not material:
+                    raise ValueError("Invalid model material: " + str(path))
+                if material.startswith("#"):
+                    continue
+                namespace, name = material.split(":", 1) if ":" in material else ("minecraft", material)
+                if namespace in textures:
+                    textures[namespace].add(name)
+    result = {}
+    for owner, root in roots.items():
+        selected = textures[owner] | MANUAL[owner]
+        result[owner] = {"blocks": [], "items": []}
+        for name in sorted(selected):
+            texture_root = (root / "assets" / owner / "textures").resolve()
+            path = (texture_root / (name + ".png")).resolve()
+            if not path.is_relative_to(texture_root) or not path.is_file():
+                raise ValueError("Referenced owned texture missing: " + owner + ":" + name)
+            data = path.read_bytes()
+            if data[:8] != b"\x89PNG\r\n\x1a\n" or data[12:16] != b"IHDR":
+                raise ValueError("Invalid source PNG: " + str(path))
+            width, height = struct.unpack(">II", data[16:24])
+            atlas = "items" if name.startswith(("items/", "item/")) else "blocks"
+            if atlas == "blocks" and (width < 16 or height < 16):
+                raise ValueError("Native default mip4 is incompatible with referenced block sprite: " + owner + ":" + name)
+            result[owner][atlas].append(owner + ":" + name)
+    return result
+
+
+def document(resources):
+    return {"sources": [{"type": "minecraft:single", "resource": resource} for resource in resources]}
+
+
+def check(documents, expected):
+    for owner, atlases in expected.items():
+        for atlas, resources in atlases.items():
+            actual = documents[owner, atlas]
+            if actual != document(resources):
+                raise ValueError("Atlas differs from exact owned material graph: " + owner + "/" + atlas)
+
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("--write", action="store_true")
+    args = parser.parse_args()
+    expected = graph()
+    documents = {}
+    for owner, root in ROOTS.items():
+        for atlas, resources in expected[owner].items():
+            path = root / "assets/minecraft/atlases" / (atlas + ".json")
+            if args.write:
+                path.parent.mkdir(parents=True, exist_ok=True)
+                path.write_text(json.dumps(document(resources), indent=2) + "\n", encoding="utf-8")
+            documents[owner, atlas] = json.loads(path.read_text(encoding="utf-8"))
+            print(owner, atlas, len(resources))
+    check(documents, expected)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/ChildRendererGeometryProbe.java b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/ChildRendererGeometryProbe.java
index 6621fa2b..91018e81 100644
--- a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/ChildRendererGeometryProbe.java
+++ b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/ChildRendererGeometryProbe.java
@@ -51,7 +51,8 @@ static void verify(Minecraft minecraft, JsonObject result) {
         result.add("child_renderer_geometry", report);
         try {
             require(Boolean.getBoolean("advantageworks.requireExtensions"), "Child renderer geometry requires the combined profile");
-            require(minecraft.level == null && minecraft.player == null && !minecraft.hasSingleplayerServer(), "Geometry probe must remain worldless");
+            require(minecraft.level == null && minecraft.player == null && minecraft.getSingleplayerServer() == null
+                    && !minecraft.hasSingleplayerServer(), "Geometry probe must remain genuinely worldless");
             steam(minecraft, cases);
             drill(minecraft, cases);
             turret(minecraft, cases);
@@ -206,7 +207,7 @@ private static List<float[]> render(Minecraft minecraft, BlockEntity tile, Strin
                         geometry.render(submitted.last(), buffers.getBuffer(pipeline));
                         return null;
                     });
-            renderer.submit(state, matrices, collector, new net.minecraft.client.renderer.state.CameraRenderState());
+            renderer.submit(state, matrices, collector, new net.minecraft.client.renderer.state.level.CameraRenderState());
         } catch (RuntimeException | LinkageError | AssertionError failure) {
             renderFailure = failure;
             row.addProperty("render_error", failure.toString());
@@ -243,7 +244,7 @@ private static final class Capture implements MultiBufferSource {
         }
 
         @Override public VertexConsumer getBuffer(RenderType type) {
-            require(type.mode() == com.mojang.blaze3d.vertex.VertexFormat.Mode.QUADS && type.format().equals(DefaultVertexFormat.NEW_ENTITY), "Unexpected production renderer vertex format/mode");
+            require(type.mode() == com.mojang.blaze3d.vertex.VertexFormat.Mode.QUADS && type.format().equals(DefaultVertexFormat.ENTITY), "Unexpected production renderer vertex format/mode");
             BufferBuilder buffer = buffers.get(type);
             if (buffer == null) {
                 require(buffers.size() < 8, "Renderer requested too many buffers");
@@ -270,10 +271,10 @@ void finish() throws Exception {
                 require(count <= 4096, "Renderer exceeded the bounded geometry fixture");
                 VertexFormat format = built.drawState().format();
                 ByteBuffer data = built.vertexBuffer();
-                int p = offset(format, VertexFormatElement.Usage.POSITION, 0);
-                int uv = offset(format, VertexFormatElement.Usage.UV, 0);
-                int n = offset(format, VertexFormatElement.Usage.NORMAL, 0);
-                int c = offset(format, VertexFormatElement.Usage.COLOR, 0);
+                int p = offset(format, VertexFormatElement.POSITION);
+                int uv = offset(format, VertexFormatElement.UV0);
+                int n = offset(format, VertexFormatElement.NORMAL);
+                int c = offset(format, VertexFormatElement.COLOR);
                 for (int i = 0; i < count; i++) {
                     int base = i * format.getVertexSize();
                     float[] vertex = {data.getFloat(base + p), data.getFloat(base + p + 4), data.getFloat(base + p + 8),
@@ -369,12 +370,12 @@ private static void set(Object object, String name, Object value) throws Reflect
         throw new NoSuchFieldException(object.getClass().getName() + "." + name);
     }
 
-    private static int offset(VertexFormat format, VertexFormatElement.Usage usage, int index) {
+    private static int offset(VertexFormat format, VertexFormatElement required) {
         for (int i = 0; i < format.getElements().size(); i++) {
             VertexFormatElement element = format.getElements().get(i);
-            if (element.usage() == usage && element.index() == index) return format.getOffset(i);
+            if (element.equals(required)) return format.getOffset(i);
         }
-        throw new IllegalStateException("Native vertex format lacks " + usage + " " + index);
+        throw new IllegalStateException("Native vertex format lacks " + required);
     }
 
     private static boolean different(List<float[]> a, List<float[]> b) {
diff --git a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/ClientResourceProbe.java b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/ClientResourceProbe.java
index a496e253..bfe83387 100644
--- a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/ClientResourceProbe.java
+++ b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/ClientResourceProbe.java
@@ -4,8 +4,9 @@
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.block.model.BakedQuad;
-import net.minecraft.client.renderer.block.model.BlockStateModel;
+import net.minecraft.client.resources.model.geometry.BakedQuad;
+import net.minecraft.client.renderer.block.dispatch.BlockStateModel;
+import net.minecraft.client.renderer.block.dispatch.BlockStateModelPart;
 import net.minecraft.client.renderer.item.ItemStackRenderState;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.world.item.Item;
@@ -25,42 +26,120 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import net.minecraft.util.RandomSource;
 
-/** Runs after native resource baking, without opening or generating a world. */
+/** Runs after real native login and resource baking in a disposable copied world. */
 @Mod(ClientResourceProbe.MODID)
 public final class ClientResourceProbe {
     static final String MODID = "advantageclientresources";
     private static boolean finished;
     private static int ticks;
+    private static String lastReadiness = "";
+    private static JsonObject lastReadinessState;
+    private static final NativeExperimentalFixtureGate FIXTURE_GATE = new NativeExperimentalFixtureGate();
+    private static JsonObject preLoginGeometry;
+    private static net.minecraft.client.gui.screens.Screen disconnectedScreen;
+    private static int disconnectedTick;
+    private static NativeWorldOilProbe worldOil;
+    private static JsonObject worldOilReport;
+    private static boolean worldOilComplete;
+    private static net.minecraft.network.Connection loggedInConnection;
 
     public ClientResourceProbe() {
+        NativeVanillaResourceProbe.register();
+        net.minecraftforge.client.event.ClientPlayerNetworkEvent.LoggingIn.BUS.addListener(
+                event -> loggedInConnection = event.getConnection());
         TickEvent.ClientTickEvent.Post.BUS.addListener(ClientResourceProbe::tick);
     }
 
     public static void tick(TickEvent.ClientTickEvent.Post event) {
         if (!Boolean.getBoolean("advantageworks.clientResources") || finished) return;
         Minecraft minecraft = Minecraft.getInstance();
-        if (++ticks < 5 || ((minecraft.getOverlay() != null || minecraft.getModelManager().getMissingBlockStateModel() == null) && ticks < 1200)) return;
+        boolean loggedIn = minecraft.level != null && minecraft.player != null
+                && minecraft.getConnection() != null && minecraft.hasSingleplayerServer()
+                && minecraft.getConnection().getConnection() == loggedInConnection
+                && loggedInConnection != null && loggedInConnection.isConnected()
+                && minecraft.getConnection().hasClientLoaded();
+        boolean componentsBound = loggedIn && net.minecraft.core.registries.BuiltInRegistries.ITEM.listElements()
+                .allMatch(net.minecraft.core.Holder.Reference::areComponentsBound);
+        ++ticks;
+        Throwable readinessFailure = null;
+        try {
+            recordReadiness(minecraft, loggedIn, componentsBound);
+            failDisconnected(minecraft);
+            if (Boolean.getBoolean("advantageworks.childRendererGeometry") && preLoginGeometry == null
+                    && minecraft.level == null && minecraft.player == null && minecraft.getSingleplayerServer() == null
+                    && minecraft.getOverlay() == null && minecraft.getModelManager().getBlockStateModelSet() != null) {
+                preLoginGeometry = new JsonObject();
+                inspect("child_geometry", preLoginGeometry, () -> ChildRendererGeometryProbe.verify(minecraft, preLoginGeometry));
+                JsonObject context = new JsonObject();
+                context.addProperty("stage", "GENUINELY_WORLDLESS_BEFORE_LOGIN");
+                context.addProperty("tick", ticks);
+                context.addProperty("levelPresent", minecraft.level != null);
+                context.addProperty("playerPresent", minecraft.player != null);
+                context.addProperty("singleplayerServerPresent", minecraft.getSingleplayerServer() != null);
+                preLoginGeometry.add("child_geometry_context", context);
+            }
+            FIXTURE_GATE.tick(minecraft, ticks, lastReadinessState);
+        } catch (RuntimeException | LinkageError | AssertionError failure) { readinessFailure = failure; }
+        if (readinessFailure == null && (ticks < 5 || ((!componentsBound || minecraft.getOverlay() != null
+                || minecraft.getModelManager().getBlockStateModelSet() == null) && ticks < 2400))) return;
+        if (readinessFailure == null && loggedIn && componentsBound && !worldOilComplete) {
+            if (worldOil == null) worldOil = new NativeWorldOilProbe();
+            try {
+                worldOilReport = worldOil.tick(minecraft, ticks);
+                if (worldOilReport == null) return;
+            } catch (RuntimeException | LinkageError | AssertionError failure) {
+                worldOilReport = worldOil.report();
+                LogManager.getLogger(MODID).error("ADVANTAGE_CLIENT_WORLD_OIL FAIL", failure);
+            }
+            worldOilComplete = true;
+        }
         finished = true;
         JsonObject result = new JsonObject();
         try {
             result.addProperty("minecraft", net.minecraftforge.versions.mcp.MCPVersion.getMCVersion());
             result.addProperty("forge", net.minecraftforge.versions.forge.ForgeVersion.getVersion());
-            require("1.21.11".equals(result.get("minecraft").getAsString())
-                    && "61.1.0".equals(result.get("forge").getAsString()), "Wrong native client target");
-            require(minecraft.level == null && minecraft.player == null && !minecraft.hasSingleplayerServer(),
-                    "Resource probe must not open a world or connect to a server");
+            if (lastReadinessState != null) result.add("loginReadiness", lastReadinessState.deepCopy());
+            result.add("experimentalFixtureGate", FIXTURE_GATE.report());
+            if (preLoginGeometry != null) for (var row : preLoginGeometry.entrySet()) result.add(row.getKey(), row.getValue().deepCopy());
+            if (worldOilReport != null) result.add("world_oil_visual", worldOilReport.deepCopy());
+            if (readinessFailure != null) throw new IllegalStateException("Native login/fixture gate failed", readinessFailure);
+            require("26.1.2".equals(result.get("minecraft").getAsString())
+                    && "64.1.5".equals(result.get("forge").getAsString())
+                    && Runtime.version().feature() == 25, "Wrong native client target");
+            require(loggedIn && componentsBound, "Native real-world login/component binding did not complete");
+            var expectedWorld = Path.of("saves/AdvantageClientResources").toRealPath();
+            var actualWorld = minecraft.getSingleplayerServer()
+                    .getWorldPath(net.minecraft.world.level.storage.LevelResource.ROOT).toRealPath();
+            require(actualWorld.equals(expectedWorld), "Integrated server opened a world other than the disposable copy");
+            JsonObject login = new JsonObject();
+            login.addProperty("status", "PASS");
+            login.addProperty("realWorld", true);
+            login.addProperty("integratedServer", true);
+            login.addProperty("nativeComponentsBound", true);
+            login.addProperty("syntheticComponentBinding", false);
+            login.addProperty("loggingInEventObserved", true);
+            login.addProperty("connectionConnected", true);
+            login.addProperty("clientLoaded", true);
+            login.addProperty("copiedWorldPath", actualWorld.toString());
+            login.addProperty("itemHolders", net.minecraft.core.registries.BuiltInRegistries.ITEM.listElements().count());
+            login.addProperty("dimension", minecraft.level.dimension().identifier().toString());
+            result.add("login", login);
+            JsonObject calibration = NativeGuiProjection.calibrate(minecraft);
+            require("PASS".equals(calibration.get("status").getAsString()), "Native projection calibration failed");
+            result.add("projectionCalibration", calibration);
             verifyNetworkBootstrap(result);
             com.google.gson.JsonArray mods = new com.google.gson.JsonArray();
             JsonObject versions = new JsonObject();
             for (String id : new String[]{"basepower", "basesteam", "baseelectric"}) {
-                boolean loaded = net.minecraftforge.fml.ModList.get().isLoaded(id);
+                boolean loaded = net.minecraftforge.fml.ModList.isLoaded(id);
                 if (loaded) {
                     mods.add(id);
-                    versions.addProperty(id, net.minecraftforge.fml.ModList.get().getModContainerById(id).get()
+                    versions.addProperty(id, net.minecraftforge.fml.ModList.getModContainerById(id).orElseThrow()
                             .getModInfo().getVersion().toString());
                 }
                 if (Boolean.getBoolean("advantageworks.requireExtensions")) require(loaded, "Combined launch omitted " + id);
@@ -69,11 +148,11 @@ public static void tick(TickEvent.ClientTickEvent.Post event) {
             result.add("mod_versions", versions);
             require(versions.has("basepower") && zone.moddev.mc.basepower.PowerAdvantage.VERSION
                     .equals(versions.get("basepower").getAsString()), "Power metadata does not match the compiled version");
-            require("2.4.15.121111".equals(versions.get("basepower").getAsString()), "Wrong native Power candidate");
+            require("2.4.16.2601021".equals(versions.get("basepower").getAsString()), "Wrong native Power candidate");
             for (String id : new String[]{"basesteam", "baseelectric"}) {
-                if (versions.has(id)) require("2.2.16.121111".equals(versions.get(id).getAsString()), "Wrong native expansion candidate: " + id);
+                if (versions.has(id)) require("2.2.17.2601021".equals(versions.get(id).getAsString()), "Wrong native expansion candidate: " + id);
             }
-            require(minecraft.getModelManager().getMissingBlockStateModel() != null, "Timed out before model baking");
+            require(minecraft.getModelManager().getBlockStateModelSet() != null, "Timed out before model baking");
             require(minecraft.getOverlay() == null, "Timed out before native resource loading completed");
             verifyVanillaParticleControl(minecraft, result);
             boolean primary = inspect("registered_resources", result, () -> {
@@ -84,7 +163,7 @@ public static void tick(TickEvent.ClientTickEvent.Post event) {
             var hidden = java.util.Set.of("basepower:fluid_pipe_terminal", "basepower:crude_oil", "basepower:refined_oil",
                     "basesteam:pump_pipe_steam", "basesteam:drillbit",
                     "baseelectric:pump_pipe_electric", "baseelectric:laser_turret_evil");
-            BlockStateModel missing = minecraft.getModelManager().getMissingBlockStateModel();
+            BlockStateModel missing = minecraft.getModelManager().getBlockStateModelSet().missingModel();
             for (Item item : ForgeRegistries.ITEMS) {
                 Identifier id = ForgeRegistries.ITEMS.getKey(item);
                 if (id == null || !included(id.getNamespace())) continue;
@@ -100,7 +179,7 @@ public static void tick(TickEvent.ClientTickEvent.Post event) {
                 Identifier id = ForgeRegistries.BLOCKS.getKey(block);
                 if (id == null || !included(id.getNamespace())) continue;
                 for (BlockState state : block.getStateDefinition().getPossibleStates()) {
-                    BlockStateModel model = minecraft.getModelManager().getBlockModelShaper().getBlockModel(state);
+                    BlockStateModel model = minecraft.getModelManager().getBlockStateModelSet().get(state);
                     capture("block-model/" + state, resourceFailures,
                             () -> verifyModel(model, missing, state, state.toString(), !(block instanceof net.minecraft.world.level.block.LiquidBlock)));
                     states++;
@@ -108,8 +187,8 @@ public static void tick(TickEvent.ClientTickEvent.Post event) {
             }
             CreativeModeTab tab = ItemGroups.tab_powerAdvantage;
             require(tab != null, "The shared creative tab was not registered");
-            tab.buildContents(new CreativeModeTab.ItemDisplayParameters(FeatureFlags.DEFAULT_FLAGS, false,
-                    RegistryAccess.EMPTY));
+            tab.buildContents(new CreativeModeTab.ItemDisplayParameters(minecraft.level.enabledFeatures(), false,
+                    minecraft.level.registryAccess()));
             var contents = tab.getDisplayItems();
             require(items > 0 && states > 0, "Power Advantage content is not registered");
             require(!contents.isEmpty(), "Power Advantage creative tab is empty");
@@ -145,13 +224,17 @@ public static void tick(TickEvent.ClientTickEvent.Post event) {
             result.addProperty("primary_resource_status", primary ? "PASS" : "FAIL");
             boolean geometry = true;
             if (Boolean.getBoolean("advantageworks.childRendererGeometry"))
-                geometry = inspect("child_geometry", result, () -> ChildRendererGeometryProbe.verify(minecraft, result));
-            require(primary && geometry, "One or more native client probe scopes failed; inspect scope_results");
+                geometry = preLoginGeometry != null && "PASS".equals(preLoginGeometry.getAsJsonObject("scope_results")
+                        .getAsJsonObject("child_geometry").get("status").getAsString());
+            require(primary && geometry && worldOilComplete && worldOilReport != null
+                    && "PASS".equals(worldOilReport.get("status").getAsString()),
+                    "One or more native client probe scopes failed; inspect scope_results/world_oil_visual");
             result.addProperty("status", "PASS");
             result.addProperty("screen", minecraft.screen == null ? "none" : minecraft.screen.getClass().getName());
-        } catch (RuntimeException | LinkageError | AssertionError failure) {
+        } catch (IOException | RuntimeException | LinkageError | AssertionError failure) {
             result.addProperty("status", "FAIL");
             result.addProperty("error", failure.toString());
+            if (failure.getCause() != null) result.addProperty("cause", failure.getCause().toString());
             LogManager.getLogger(MODID).error("ADVANTAGE_CLIENT_RESOURCES FAIL", failure);
         } finally {
             try { Files.write(Paths.get("client-resources.json"), result.toString().getBytes(StandardCharsets.UTF_8)); }
@@ -160,6 +243,72 @@ public static void tick(TickEvent.ClientTickEvent.Post event) {
         }
     }
 
+    private static void failDisconnected(Minecraft minecraft) {
+        if (minecraft.screen == null || minecraft.screen.getClass() != net.minecraft.client.gui.screens.DisconnectedScreen.class
+                || minecraft.getOverlay() != null) return;
+        if (minecraft.screen != disconnectedScreen) { disconnectedScreen = minecraft.screen; disconnectedTick = ticks; return; }
+        if (ticks - disconnectedTick < 20) return;
+        try {
+            lastReadinessState.addProperty("nativeDisconnectNarration", minecraft.screen.getNarrationMessage().getString());
+            captureReadinessScreen(minecraft, lastReadinessState, Path.of("login-readiness/disconnected.png"));
+            Files.writeString(Path.of("login-readiness/disconnected.json"), lastReadinessState.toString(), java.nio.file.StandardOpenOption.CREATE_NEW);
+        } catch (IOException failure) { throw new IllegalStateException("Could not retain native disconnect failure", failure); }
+        throw new IllegalStateException("Native client disconnected: " + minecraft.screen.getNarrationMessage().getString());
+    }
+
+    private static void captureReadinessScreen(Minecraft minecraft, JsonObject state, Path screenshot) throws IOException {
+        var image = NativeGuiProjection.read(minecraft.getMainRenderTarget());
+        try (var output = Files.newOutputStream(screenshot, java.nio.file.StandardOpenOption.CREATE_NEW)) {
+            require(javax.imageio.ImageIO.write(image, "png", output), "No diagnostic PNG writer");
+        }
+        JsonObject proof = new JsonObject();
+        proof.addProperty("file", screenshot.toString().replace('\\', '/'));
+        try {
+            proof.addProperty("sha256", java.util.HexFormat.of().withUpperCase().formatHex(
+                    java.security.MessageDigest.getInstance("SHA-256").digest(Files.readAllBytes(screenshot))));
+        } catch (java.security.NoSuchAlgorithmException failure) { throw new IllegalStateException(failure); }
+        proof.addProperty("width", image.getWidth()); proof.addProperty("height", image.getHeight());
+        proof.addProperty("fenceCompleted", true);
+        proof.addProperty("scope", "NATIVE_LOAD_SCREEN_DIAGNOSTIC_NOT_GUI_QUALIFICATION");
+        state.add("screenshot", proof);
+    }
+
+    private static void recordReadiness(Minecraft minecraft, boolean loggedIn, boolean componentsBound) {
+        JsonObject state = new JsonObject();
+        state.addProperty("screenClass", minecraft.screen == null ? "none" : minecraft.screen.getClass().getName());
+        state.addProperty("screenTitle", minecraft.screen == null ? "" : minecraft.screen.getTitle().getString());
+        state.addProperty("screenTitleComponent", minecraft.screen == null ? "" : minecraft.screen.getTitle().toString());
+        state.addProperty("overlayClass", minecraft.getOverlay() == null ? "none" : minecraft.getOverlay().getClass().getName());
+        state.addProperty("levelPresent", minecraft.level != null);
+        state.addProperty("playerPresent", minecraft.player != null);
+        state.addProperty("integratedServer", minecraft.hasSingleplayerServer());
+        state.addProperty("singleplayerServerPresent", minecraft.getSingleplayerServer() != null);
+        state.addProperty("connectionPresent", minecraft.getConnection() != null);
+        state.addProperty("loggingInEventObserved", loggedInConnection != null);
+        state.addProperty("connectionConnected", minecraft.getConnection() != null && minecraft.getConnection().getConnection().isConnected());
+        state.addProperty("clientLoaded", minecraft.getConnection() != null && minecraft.getConnection().hasClientLoaded());
+        state.addProperty("nativeComponentsBound", componentsBound);
+        state.addProperty("stage", !minecraft.hasSingleplayerServer() ? "BEFORE_INTEGRATED_SERVER"
+                : !loggedIn ? "WAITING_NATIVE_LOGIN" : !componentsBound ? "WAITING_COMPONENT_BINDING" : "NATIVE_LOGIN_READY");
+        String signature = state.toString();
+        lastReadinessState = state;
+        if (signature.equals(lastReadiness) && ticks % 300 != 0) return;
+        lastReadiness = signature;
+        state.addProperty("tick", ticks);
+        try {
+            Path folder = Path.of("login-readiness");
+            Files.createDirectories(folder);
+            if (!loggedIn && ticks >= 300 && ticks % 300 == 0) {
+                Path screenshot = folder.resolve("screen-" + ticks + ".png");
+                captureReadinessScreen(minecraft, state, screenshot);
+            }
+            Files.writeString(folder.resolve("state-" + ticks + ".json"), state.toString(), java.nio.file.StandardOpenOption.CREATE_NEW);
+            LogManager.getLogger(MODID).info("ADVANTAGE_CLIENT_READINESS {}", state);
+        } catch (IOException failure) {
+            throw new IllegalStateException("Could not retain actual native login readiness", failure);
+        }
+    }
+
     private static boolean inspect(String name, JsonObject report, Runnable check) {
         if (!report.has("scope_results")) report.add("scope_results", new JsonObject());
         JsonObject result = new JsonObject();
@@ -205,9 +354,11 @@ private static void verifyItem(Minecraft minecraft, ItemStack stack, String id)
         Identifier modelId = stack.get(net.minecraft.core.component.DataComponents.ITEM_MODEL);
         require(modelId != null && minecraft.getModelManager().getItemModels().containsKey(modelId), "Missing native item definition: " + id);
         ItemStackRenderState state = new ItemStackRenderState();
-        minecraft.getItemModelResolver().updateForTopItem(state, stack, net.minecraft.world.item.ItemDisplayContext.GUI, null, null, 0);
+        minecraft.getItemModelResolver().updateForTopItem(state, stack, net.minecraft.world.item.ItemDisplayContext.GUI,
+                minecraft.level, minecraft.player, 0);
         require(!state.isEmpty(), "Empty native item model: " + id);
-        require(!"missingno".equals(state.pickParticleIcon(RandomSource.create(42L)).contents().name().getPath()), "Missing particle texture: " + id);
+        var particle = state.pickParticleMaterial(RandomSource.create(42L));
+        require(particle != null && !"missingno".equals(particle.sprite().contents().name().getPath()), "Missing particle texture: " + id);
         try {
             var countField = ItemStackRenderState.class.getDeclaredField("activeLayerCount");
             var layersField = ItemStackRenderState.class.getDeclaredField("layers");
@@ -217,7 +368,7 @@ private static void verifyItem(Minecraft minecraft, ItemStack stack, String id)
             int quads = 0;
             for (int i = 0; i < countField.getInt(state); i++) {
                 for (BakedQuad quad : layers[i].prepareQuadList()) {
-                    require(!"missingno".equals(quad.sprite().contents().name().getPath()), "Missing face texture: " + id);
+                    require(!"missingno".equals(quad.materialInfo().sprite().contents().name().getPath()), "Missing face texture: " + id);
                     quads++;
                 }
             }
@@ -229,26 +380,28 @@ private static void verifyItem(Minecraft minecraft, ItemStack stack, String id)
 
     private static void verifyModel(BlockStateModel model, BlockStateModel missing, BlockState state, String id, boolean requireQuads) {
         require(model != missing, "Missing baked model: " + id);
-        require(!"missingno".equals(model.particleIcon(net.minecraftforge.client.model.data.ModelData.EMPTY)
-                .contents().name().getPath()), "Missing particle texture: " + id);
+        require(!"missingno".equals(model.particleMaterial(net.minecraftforge.client.model.data.ModelData.EMPTY)
+                .sprite().contents().name().getPath()), "Missing particle texture: " + id);
         RandomSource random = RandomSource.create(42L);
         List<BakedQuad> quads = new ArrayList<>();
-        for (var part : model.collectParts(random, net.minecraftforge.client.model.data.ModelData.EMPTY, null)) {
-            require(!"missingno".equals(part.particleIcon().contents().name().getPath()), "Missing part texture: " + id);
+        List<BlockStateModelPart> parts = new ArrayList<>();
+        model.collectParts(random, parts, net.minecraftforge.client.model.data.ModelData.EMPTY);
+        for (var part : parts) {
+            require(!"missingno".equals(part.particleMaterial().sprite().contents().name().getPath()), "Missing part texture: " + id);
             quads.addAll(part.getQuads(null));
             for (Direction side : Direction.values()) quads.addAll(part.getQuads(side));
         }
         require(!requireQuads || !quads.isEmpty(), "Empty baked model: " + id);
-        for (BakedQuad quad : quads) require(!"missingno".equals(quad.sprite().contents().name().getPath()), "Missing face texture: " + id);
+        for (BakedQuad quad : quads) require(!"missingno".equals(quad.materialInfo().sprite().contents().name().getPath()), "Missing face texture: " + id);
     }
 
     private static void verifyVanillaParticleControl(Minecraft minecraft, JsonObject report) {
         var state = net.minecraft.world.level.block.Blocks.STONE.defaultBlockState();
-        var shaper = minecraft.getModelManager().getBlockModelShaper();
-        var model = shaper.getBlockModel(state);
-        var legacy = model.particleIcon();
-        var nativeIcon = model.particleIcon(net.minecraftforge.client.model.data.ModelData.EMPTY);
-        var shaperIcon = shaper.getParticleIcon(state);
+        var models = minecraft.getModelManager().getBlockStateModelSet();
+        var model = models.get(state);
+        var legacy = model.particleMaterial().sprite();
+        var nativeIcon = model.particleMaterial(net.minecraftforge.client.model.data.ModelData.EMPTY).sprite();
+        var shaperIcon = models.getParticleMaterial(state).sprite();
         JsonObject control = new JsonObject();
         report.add("vanilla_stone_particle_control", control);
         control.addProperty("model_class", model.getClass().getName());
@@ -258,7 +411,7 @@ private static void verifyVanillaParticleControl(Minecraft minecraft, JsonObject
         Identifier expected = Identifier.parse("minecraft:block/stone");
         require(nativeIcon.contents().name().equals(expected) && shaperIcon.contents().name().equals(expected),
                 "Native vanilla STONE particle control failed: " + control);
-        verifyModel(model, minecraft.getModelManager().getMissingBlockStateModel(), state, "vanilla STONE control", true);
+        verifyModel(model, models.missingModel(), state, "vanilla STONE control", true);
         control.addProperty("status", "PASS");
     }
 
diff --git a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/MachineGuiLayoutProbe.java b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/MachineGuiLayoutProbe.java
index 9e958f09..a3bf99a7 100644
--- a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/MachineGuiLayoutProbe.java
+++ b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/MachineGuiLayoutProbe.java
@@ -22,7 +22,7 @@
 import javax.imageio.ImageIO;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.Font;
 import net.minecraft.world.inventory.tooltip.TooltipComponent;
 import net.minecraft.client.player.LocalPlayer;
@@ -45,6 +45,7 @@ static void verify(Minecraft minecraft, JsonObject result) {
         JsonArray screens = new JsonArray();
         result.add("machine_gui_layouts", screens);
         result.addProperty("machine_gui_text_spec", 2);
+        result.addProperty("machine_gui_framebuffer_spec", 3);
         int textChecks = 0, negativeControls = 0;
         List<String> problems = new ArrayList<>();
         LocalPlayer originalPlayer = minecraft.player;
@@ -55,20 +56,13 @@ static void verify(Minecraft minecraft, JsonObject result) {
                 expectations = new JsonParser().parse(new InputStreamReader(stream, StandardCharsets.UTF_8)).getAsJsonObject();
             }
             require("Inventory".equals(net.minecraft.client.resources.language.I18n.get("container.inventory")), "GUI label audit requires en_us");
-            // ContainerScreen needs a carried-item inventory, but no world or connection.
+            require(originalPlayer != null && minecraft.level != null, "Machine GUI requires actual native login");
+            // Inventory contents are isolated; the owner retains its real connection and registry context.
             Class<?> allocator = Class.forName("sun.misc.Unsafe");
             Field singleton = allocator.getDeclaredField("theUnsafe");
             singleton.setAccessible(true);
-            LocalPlayer player = (LocalPlayer) allocator.getMethod("allocateInstance", Class.class)
-                    .invoke(singleton.get(null), LocalPlayer.class);
+            LocalPlayer player = originalPlayer;
             Inventory inventory = new Inventory(player, new net.minecraft.world.entity.EntityEquipment());
-            Field inventoryField = Player.class.getDeclaredField("inventory");
-            inventoryField.setAccessible(true);
-            inventoryField.set(player, inventory);
-            Field cooldowns = Player.class.getDeclaredField("cooldowns");
-            cooldowns.setAccessible(true);
-            cooldowns.set(player, new net.minecraft.world.item.ItemCooldowns());
-            minecraft.player = player;
             Field definitionsField = MachineGUIRegistry.class.getDeclaredField("DEFINITIONS");
             definitionsField.setAccessible(true);
             Map<?, ?> definitions = (Map<?, ?>) definitionsField.get(null);
@@ -102,12 +96,10 @@ static void verify(Minecraft minecraft, JsonObject result) {
                     GuiWorld world = (GuiWorld) allocator.getMethod("allocateInstance", Class.class)
                             .invoke(singleton.get(null), GuiWorld.class);
                     world.state = block.defaultBlockState();
+                    world.registries = minecraft.level.registryAccess();
                     Field clientSide = net.minecraft.world.level.Level.class.getDeclaredField("isClientSide");
                     clientSide.setAccessible(true);
                     clientSide.setBoolean(world, true);
-                    Field playerLevel = net.minecraft.world.entity.Entity.class.getDeclaredField("level");
-                    playerLevel.setAccessible(true);
-                    playerLevel.set(player, world);
                     tile.setLevel(world);
                     SimpleMachineGUI.Container menu = ((SimpleMachineGUI) definition).createMenu(1, inventory, (Container) tile);
                     require(expectations.getAsJsonObject("machines").has(id), "No human-facing label expectation for " + id);
@@ -121,6 +113,8 @@ static void verify(Minecraft minecraft, JsonObject result) {
                     row.addProperty("expected_title", expectedTitle);
                     row.addProperty("menu_title", title.getString());
                     row.addProperty("slots", menu.slots.size());
+                    JsonArray frameProofs = new JsonArray();
+                    row.add("framebuffer_cases", frameProofs);
                     int renders = 0;
                     for (int[] viewport : VIEWPORTS) {
                         screen.init(viewport[0], viewport[1]);
@@ -147,6 +141,17 @@ static void verify(Minecraft minecraft, JsonObject result) {
                             screen.labels = LabelMode.PRODUCTION;
                             String labelError = labelError(actual, expected, background, screen, viewport[2]);
                             require(labelError == null, labelError);
+                            JsonObject proof = new JsonObject();
+                            proof.add("actual", NativeGuiEvidence.frame(actual));
+                            proof.add("expected", NativeGuiEvidence.frame(expected));
+                            proof.add("background", NativeGuiEvidence.frame(background));
+                            JsonArray viewportProof = new JsonArray();
+                            for (int value : viewport) viewportProof.add(value);
+                            proof.add("viewport", viewportProof);
+                            proof.addProperty("fill", fill);
+                            proof.addProperty("left", screen.getLeft()); proof.addProperty("top", screen.getTop());
+                            proof.add("slot_pixels", verifySlotPixels(minecraft, actual, screen, viewport, texture));
+                            frameProofs.add(proof);
                             textChecks++;
                             if (fill == 0 && viewport == VIEWPORTS[0]) verifyNoTextOverArtwork(actual, background, screen);
                             require(title.getString().equals(expectedTitle), "Menu title differs from the equipment name: " + title.getString());
@@ -157,6 +162,7 @@ static void verify(Minecraft minecraft, JsonObject result) {
                             negativeControls++;
                         }
                     }
+                    row.add("garbled_background_control", verifyGarbledBackgroundControl(minecraft, screen, texture));
                     inventory.setItem(0, new net.minecraft.world.item.ItemStack(net.minecraft.world.item.Items.DIAMOND, 2));
                     screen.init(320, 240);
                     BufferedImage tooltip = render(minecraft, screen, VIEWPORTS[0], false, true);
@@ -170,9 +176,11 @@ static void verify(Minecraft minecraft, JsonObject result) {
                     }
                     if (block == zone.moddev.mc.basepower.init.Blocks.metal_storage_tank) {
                         verifyHelperLimits(minecraft, screen);
+                        negativeControls += verifyBackgroundControl(minecraft, screen);
                     }
                     row.addProperty("renders", renders);
                     row.addProperty("tooltip_and_inventory_hitbox", "PASS");
+                    row.addProperty("background_extraction_calls", 1);
                     row.addProperty("required_text", "PASS");
                     row.addProperty("blank_label_controls_rejected", 9);
                     row.addProperty("status", "PASS");
@@ -201,11 +209,17 @@ static void verify(Minecraft minecraft, JsonObject result) {
         }
     }
 
-    private static void verifySlots(SimpleMachineGUI.GUIContainer screen, SimpleMachineGUI.Container menu) {
+    private static void verifySlots(RecordingScreen screen, SimpleMachineGUI.Container menu) {
         require(screen.getLeft() >= 0 && screen.getTop() >= 0
                 && screen.getLeft() + screen.getXSize() <= screen.width
                 && screen.getTop() + screen.getYSize() <= screen.height, "Screen is clipped at a supported GUI size");
         require(menu.slots.size() >= 36, "Missing player inventory");
+        require(menu.slots.size() == screen.expectedMachineSlots.size() + 36, "Machine slot count differs from GUI declaration");
+        for (int i = 0; i < screen.expectedMachineSlots.size(); i++) {
+            int[] expected = screen.expectedMachineSlots.get(i);
+            require(menu.slots.get(i).x == expected[0] && menu.slots.get(i).y == expected[1],
+                    "Machine slot differs from independent GUI declaration: " + i);
+        }
         for (int i = 0; i < menu.slots.size(); i++) {
             Slot slot = menu.slots.get(i);
             require(slot.x >= 0 && slot.y >= 0 && slot.x + 16 <= screen.getXSize()
@@ -244,19 +258,120 @@ private static BufferedImage render(Minecraft minecraft, RecordingScreen screen,
     private static BufferedImage render(Minecraft minecraft, RecordingScreen screen,
             int[] viewport, boolean backgroundOnly, boolean hover) throws Exception {
         int width = viewport[0] * viewport[2], height = viewport[1] * viewport[2];
-        return NativeGuiProjection.render(minecraft, width, height, viewport[2], 0xFF1E2D3A,
+        BufferedImage image = NativeGuiProjection.render(minecraft, width, height, viewport[2], 0xFF1E2D3A,
                 state -> screen.recordingGraphics(minecraft, state), graphics -> {
+            screen.beginFrame();
+            if (screen.duplicateBackground) screen.extractBackground(graphics, -100, -100, 0F);
             if (backgroundOnly) {
                 LabelMode original = screen.labels;
                 screen.labels = LabelMode.HIDDEN;
-                try { screen.render(graphics, -100, -100, 0F); }
+                try { screen.extractRenderStateWithTooltipAndSubtitles(graphics, -100, -100, 0F); }
                 finally { screen.labels = original; }
             } else {
                 Slot hotbar = screen.getMenu().slots.get(screen.getMenu().slots.size() - 9);
-                screen.render(graphics, screen.hoverTitle ? screen.width / 2 : hover ? screen.getLeft() + hotbar.x + 1 : -100,
+                screen.extractRenderStateWithTooltipAndSubtitles(graphics, screen.hoverTitle ? screen.width / 2 : hover ? screen.getLeft() + hotbar.x + 1 : -100,
                         screen.hoverTitle ? screen.getTop() + 4 : hover ? screen.getTop() + hotbar.y + 1 : -100, 0F);
             }
         });
+        if (screen.duplicateBackground) ImageIO.write(image, "png", new File("machine-gui-layouts/double-background-control.png"));
+        require(screen.backgroundCalls == 1, "Native screen background must be extracted exactly once, got " + screen.backgroundCalls);
+        return image;
+    }
+
+    private static int verifyBackgroundControl(Minecraft minecraft, RecordingScreen screen) throws Exception {
+        screen.duplicateBackground = true;
+        try {
+            boolean rejected = false;
+            try { render(minecraft, screen, VIEWPORTS[0], false); }
+            catch (IllegalStateException expected) {
+                if (!expected.getMessage().startsWith("Native screen background must be extracted exactly once")) throw expected;
+                rejected = true;
+            }
+            require(rejected, "Duplicate native background extraction was not rejected");
+            return 1;
+        } finally {
+            screen.duplicateBackground = false;
+        }
+    }
+
+    private static JsonObject verifyGarbledBackgroundControl(Minecraft minecraft, RecordingScreen screen,
+            net.minecraft.resources.Identifier texture) throws Exception {
+        screen.init(VIEWPORTS[0][0], VIEWPORTS[0][1]);
+        screen.garbleBackground = true;
+        try {
+            BufferedImage broken = render(minecraft, screen, VIEWPORTS[0], false);
+            boolean rejected = false;
+            try { verifySlotPixels(minecraft, broken, screen, VIEWPORTS[0], texture); }
+            catch (IllegalStateException expected) {
+                if (!expected.getMessage().startsWith("Slot framebuffer pixels differ")) throw expected;
+                rejected = true;
+            }
+            require(rejected, "Garbled native background was accepted by slot pixel checks");
+            return NativeGuiEvidence.frame(broken);
+        } finally {
+            screen.garbleBackground = false;
+        }
+    }
+
+    private static JsonObject verifySlotPixels(Minecraft minecraft, BufferedImage actual, RecordingScreen screen,
+            int[] viewport, net.minecraft.resources.Identifier texture) {
+        var inventory = NativeGuiEvidence.source(minecraft, SimpleMachineGUI.playerInventoryBox);
+        var machine = NativeGuiEvidence.source(minecraft, texture);
+        JsonObject proof = new JsonObject();
+        proof.add("inventory_source", inventory.proof().deepCopy());
+        proof.add("machine_source", machine.proof().deepCopy());
+        JsonArray points = new JsonArray(), slots = new JsonArray(), slotColors = new JsonArray(), expectedPositions = new JsonArray();
+        for (int[] pos : screen.expectedMachineSlots) {
+            JsonArray row = new JsonArray(); row.add(pos[0] - 1); row.add(pos[1] - 1); expectedPositions.add(row);
+        }
+        for (int y = 0; y < 18; y++) for (int x = 0; x < 18; x++) if (x == 0 || x == 17 || y == 0 || y == 17) {
+            JsonArray point = new JsonArray(); point.add(x); point.add(y);
+            point.add(texel(inventory.image(), 7 + x, 139 + y)); points.add(point);
+        }
+        int firstPlayer = screen.getMenu().slots.size() - 36;
+        int checked = 0;
+        for (int index = 0; index < screen.getMenu().slots.size(); index++) {
+            Slot slot = screen.getMenu().slots.get(index);
+            JsonArray position = new JsonArray(); position.add(slot.x - 1); position.add(slot.y - 1); slots.add(position);
+            boolean player = index >= firstPlayer;
+            BufferedImage source = player ? inventory.image() : machine.image();
+            int u = slot.x - 1, v = player ? 132 + slot.y - 150 - 1 : slot.y - 12 - 1;
+            JsonArray colors = new JsonArray();
+            java.util.Set<Integer> contrast = new java.util.HashSet<>();
+            for (int y = 0; y < 18; y++) for (int x = 0; x < 18; x++) {
+                if (x != 0 && x != 17 && y != 0 && y != 17) continue;
+                int reference = texel(source, u + x, v + y);
+                if (player) require(reference == texel(inventory.image(), 7 + x, 139 + y), "Player inventory border changed");
+                for (int dy = 0; dy < viewport[2]; dy++) for (int dx = 0; dx < viewport[2]; dx++) {
+                    int physicalReference = texel(source, u + x, v + y, dx, dy, viewport[2]);
+                    colors.add(physicalReference); contrast.add(physicalReference);
+                    int pixelX = (screen.getLeft() + slot.x - 1 + x) * viewport[2] + dx;
+                    int pixelY = (screen.getTop() + slot.y - 1 + y) * viewport[2] + dy;
+                    require(actual.getRGB(pixelX, pixelY) == physicalReference,
+                            "Slot framebuffer pixels differ from independent artwork: " + index + " at " + pixelX + "," + pixelY);
+                    checked++;
+                }
+            }
+            require(contrast.size() >= 2, "Slot source crop has no border contrast: " + index + "/" + texture);
+            slotColors.add(colors);
+        }
+        proof.add("border_points", points); proof.add("slots", slots);
+        proof.add("slot_border_colors", slotColors); proof.add("expected_machine_slots", expectedPositions);
+        proof.addProperty("logical_texture_size", 256);
+        proof.addProperty("source_sampling", "PHYSICAL_PIXEL_CENTERS_ON_256_LOGICAL_UV_V1");
+        proof.addProperty("checked_pixels", checked);
+        return proof;
+    }
+
+    private static int texel(BufferedImage source, int u, int v) {
+        return texel(source, u, v, 0, 0, 1);
+    }
+
+    static int texel(BufferedImage source, int u, int v, int dx, int dy, int scale) {
+        require(u >= 0 && v >= 0 && u < 256 && v < 256, "Slot source UV escaped the logical GUI atlas");
+        require(scale >= 1 && dx >= 0 && dx < scale && dy >= 0 && dy < scale, "Invalid physical source texel sample");
+        return source.getRGB((int) ((u + (dx + 0.5F) / scale) * source.getWidth() / 256F),
+                (int) ((v + (dy + 0.5F) / scale) * source.getHeight() / 256F));
     }
 
     private static String labelError(BufferedImage actual, BufferedImage expected, BufferedImage background,
@@ -335,7 +450,7 @@ private static void require(boolean value, String message) {
     private static void verifyHelperLimits(Minecraft minecraft, RecordingScreen screen) throws Exception {
         for (String name : new String[]{"zone.moddev.mc.baseelectric.gui.GUIHelper",
                 "zone.moddev.mc.basesteam.gui.GUIHelper"}) {
-            if (!net.minecraftforge.fml.ModList.get().isLoaded(name.contains("baseelectric") ? "baseelectric" : "basesteam")) continue;
+            if (!net.minecraftforge.fml.ModList.isLoaded(name.contains("baseelectric") ? "baseelectric" : "basesteam")) continue;
             String[] methods = name.contains("baseelectric") ? new String[]{"drawProgressBar"}
                     : new String[]{"drawDownArrowProgress", "drawFlameProgress"};
             for (String method : methods) {
@@ -361,11 +476,13 @@ private static void verifyHelperLimits(Minecraft minecraft, RecordingScreen scre
 
     private static final class GuiWorld extends ClientLevel {
         private net.minecraft.world.level.block.state.BlockState state;
+        private net.minecraft.core.RegistryAccess registries;
         private GuiWorld() {
             super(null, null, net.minecraft.world.level.Level.OVERWORLD, null, 0, 0, null, false, 0, 0);
             throw new AssertionError("Allocate the read-only GUI fixture without a world constructor");
         }
         @Override public net.minecraft.world.level.block.state.BlockState getBlockState(BlockPos pos) { return state; }
+        @Override public net.minecraft.core.RegistryAccess registryAccess() { return registries; }
         @Override public net.minecraft.world.flag.FeatureFlagSet enabledFeatures() {
             return net.minecraft.world.flag.FeatureFlags.DEFAULT_FLAGS;
         }
@@ -380,6 +497,7 @@ private record DrawBounds(float left, float top, float right, float bottom, int
         private int itemTooltipCalls;
         private LabelMode labels = LabelMode.PRODUCTION;
         private final String expectedTitle, expectedInventory;
+        private final List<int[]> expectedMachineSlots = new ArrayList<>();
         private boolean hoverTitle;
         private String titleTooltip;
         RecordingScreen(SimpleMachineGUI definition, SimpleMachineGUI.Container menu, Inventory inventory,
@@ -387,9 +505,21 @@ private record DrawBounds(float left, float top, float right, float bottom, int
             definition.super(menu, inventory, title);
             this.expectedTitle = expectedTitle;
             this.expectedInventory = expectedInventory;
+            try {
+                Field coordinates = SimpleMachineGUI.class.getDeclaredField("inventorySlotCoordinates");
+                coordinates.setAccessible(true);
+                for (var point : (zone.moddev.mc.basepower.math.Integer2D[]) coordinates.get(definition))
+                    expectedMachineSlots.add(new int[]{point.X, point.Y + 12});
+            } catch (ReflectiveOperationException failure) {
+                throw new IllegalStateException("Cannot read the independent GUI slot declaration", failure);
+            }
         }
-        @Override protected void renderLabels(GuiGraphics graphics, int x, int y) {
-            if (labels == LabelMode.PRODUCTION) { super.renderLabels(graphics, x, y); return; }
+        private int backgroundCalls;
+        private boolean duplicateBackground;
+        private boolean garbleBackground;
+
+        @Override protected void extractLabels(GuiGraphicsExtractor graphics, int x, int y) {
+            if (labels == LabelMode.PRODUCTION) { super.extractLabels(graphics, x, y); return; }
             if (labels == LabelMode.HIDDEN) return;
             if (labels != LabelMode.INVENTORY_ONLY) {
                 String text = labels == LabelMode.WRONG_TEXT ? "Untranslated machine.name" : expectedTitle;
@@ -398,20 +528,24 @@ private record DrawBounds(float left, float top, float right, float bottom, int
                     text += "...";
                 }
                 int textX = (176 - font.width(text)) / 2;
-                graphics.drawString(font, text, textX, labels == LabelMode.OVER_GAUGE ? 20 : 1, 0xFFFFFFFF);
+                graphics.text(font, text, textX, labels == LabelMode.OVER_GAUGE ? 20 : 1, 0xFFFFFFFF);
             }
-            if (labels != LabelMode.TITLE_ONLY) graphics.drawString(font, expectedInventory, 8, 140, 0xFFFFFFFF);
+            if (labels != LabelMode.TITLE_ONLY) graphics.text(font, expectedInventory, 8, 140, 0xFFFFFFFF);
         }
-        @Override public void render(GuiGraphics graphics, int x, int y, float ticks) {
+        void beginFrame() {
             draws.clear(); tooltipCalls = 0; itemTooltipCalls = 0; titleTooltip = null;
-            super.render(graphics, x, y, ticks);
+            backgroundCalls = 0;
+        }
+        @Override public void extractBackground(GuiGraphicsExtractor graphics, int x, int y, float ticks) {
+            backgroundCalls++;
+            super.extractBackground(graphics, x, y, ticks);
         }
-        @Override protected void renderTooltip(GuiGraphics graphics, int x, int y) {
+        @Override protected void extractTooltip(GuiGraphicsExtractor graphics, int x, int y) {
             tooltipCalls++;
-            super.renderTooltip(graphics, x, y);
+            super.extractTooltip(graphics, x, y);
         }
-        GuiGraphics recordingGraphics(Minecraft minecraft, net.minecraft.client.gui.render.state.GuiRenderState state) {
-            return new GuiGraphics(minecraft, state, -100, -100) {
+        GuiGraphicsExtractor recordingGraphics(Minecraft minecraft, net.minecraft.client.renderer.state.gui.GuiRenderState state) {
+            return new GuiGraphicsExtractor(minecraft, state, -100, -100) {
                 @Override public void setTooltipForNextFrame(Font font, List<net.minecraft.network.chat.Component> lines,
                         java.util.Optional<TooltipComponent> component, net.minecraft.world.item.ItemStack item,
                         int x, int y) {
@@ -440,7 +574,7 @@ GuiGraphics recordingGraphics(Minecraft minecraft, net.minecraft.client.gui.rend
                 bottom = Math.max(bottom, relativeY);
             }
             draws.add(new DrawBounds(left, top, right, bottom, u, v, width, height));
-            super.blit(texture, x, y, u, v, width, height);
+            super.blit(texture, x, y, garbleBackground ? u + 1 : u, v, width, height);
             if (helperCheck != null) {
                 Runnable check = helperCheck;
                 helperCheck = null;
diff --git a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/NativeExperimentalFixtureGate.java b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/NativeExperimentalFixtureGate.java
new file mode 100644
index 00000000..09a244ad
--- /dev/null
+++ b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/NativeExperimentalFixtureGate.java
@@ -0,0 +1,214 @@
+package zone.moddev.mc.advantageworks.client;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.mojang.blaze3d.platform.InputConstants;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.HexFormat;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import javax.imageio.ImageIO;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.screens.BackupConfirmScreen;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.input.KeyEvent;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.contents.TranslatableContents;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.IntArrayTag;
+import net.minecraft.nbt.ListTag;
+import net.minecraft.nbt.NbtAccounter;
+import net.minecraft.nbt.NbtIo;
+
+/** One approved native warning action for an authenticated, completed native broad fixture copy. */
+final class NativeExperimentalFixtureGate {
+    static final String PROTOCOL = "NATIVE64_SEALED_EXPERIMENTAL_FIXTURE_SKIP_V2";
+    static final String SCOPE = "COMPLETED_NATIVE64_BROAD_PACKAGED_CURRENT_COPY";
+    static final String TITLE = "selectWorld.backupQuestion.experimental";
+    static final String SKIP = "selectWorld.backupJoinSkipButton";
+    private Screen observed;
+    private int firstTick;
+    private boolean used;
+    private JsonObject action;
+
+    static boolean exactTranslation(Component component, String key) {
+        return component.getContents() instanceof TranslatableContents contents && key.equals(contents.getKey())
+                && contents.getArgs().length == 0 && contents.getFallback() == null && component.getSiblings().isEmpty();
+    }
+
+    static Button select(Class<?> screenClass, Component title, List<?> children) {
+        if (screenClass != BackupConfirmScreen.class || !exactTranslation(title, TITLE)) return null;
+        List<Button> matches = children.stream().filter(Button.class::isInstance).map(Button.class::cast)
+                .filter(button -> button.visible && button.active && exactTranslation(button.getMessage(), SKIP)).toList();
+        require(matches.size() == 1, "Experimental fixture warning must have one visible active native skip button");
+        return matches.getFirst();
+    }
+
+    void tick(Minecraft minecraft, int tick, JsonObject readiness) {
+        Screen screen = minecraft.screen;
+        if (screen == null || screen.getClass() != BackupConfirmScreen.class || !exactTranslation(screen.getTitle(), TITLE)) return;
+        if (used) {
+            require(screen == observed, "Repeated experimental warning after the once-only fixture action");
+            return;
+        }
+        if (minecraft.getOverlay() != null) { observed = screen; firstTick = tick; return; }
+        if (screen != observed) { observed = screen; firstTick = tick; return; }
+        if (tick - firstTick < 20) return;
+        try {
+            Path folder = Path.of("login-readiness");
+            Files.createDirectories(folder);
+            Path screenshot = folder.resolve("experimental-before-action.png");
+            var image = NativeGuiProjection.read(minecraft.getMainRenderTarget());
+            try (var output = Files.newOutputStream(screenshot, StandardOpenOption.CREATE_NEW)) {
+                require(ImageIO.write(image, "png", output), "Missing native warning PNG writer");
+            }
+            action = new JsonObject();
+            action.addProperty("protocol", PROTOCOL);
+            action.addProperty("status", "SCREEN_RECORDED_ACTION_NOT_TAKEN");
+            action.addProperty("screenClass", screen.getClass().getName());
+            action.addProperty("titleKey", TITLE);
+            action.addProperty("buttonKey", SKIP);
+            action.addProperty("actionCount", 0);
+            action.addProperty("key", InputConstants.KEY_RETURN);
+            action.addProperty("scancode", 0); action.addProperty("modifiers", 0);
+            action.addProperty("screenshot", screenshot.toString().replace('\\', '/'));
+            action.addProperty("screenshotSha256", sha(screenshot));
+            action.addProperty("width", image.getWidth()); action.addProperty("height", image.getHeight());
+            action.addProperty("fenceCompleted", true);
+            action.add("readinessBeforeAction", readiness.deepCopy());
+            Files.writeString(folder.resolve("experimental-screen.json"), action.toString(), StandardOpenOption.CREATE_NEW);
+            Button skip = select(screen.getClass(), screen.getTitle(), screen.children());
+            require(minecraft.level == null && minecraft.player == null && minecraft.getConnection() == null
+                    && minecraft.getSingleplayerServer() == null && !minecraft.hasSingleplayerServer() && minecraft.getOverlay() == null,
+                    "Experimental fixture action is only allowed before native server/login");
+            JsonObject policy = verifyPolicy(Path.of(""));
+            action.addProperty("status", "RECORDED_BEFORE_NATIVE_ACTION");
+            action.add("profileSha256", policy.get("profileSha256"));
+            action.addProperty("policySha256", sha(Path.of("client-fixture-policy.json")));
+            action.add("sourceReceiptSha256", policy.get("sourceReceiptSha256"));
+            action.addProperty("copiedWorld", policy.get("copiedWorld").getAsString());
+            action.add("copiedLevelCustody", policy.getAsJsonObject("copiedLevelCustody"));
+            Files.writeString(folder.resolve("experimental-before-action.json"), action.toString(), StandardOpenOption.CREATE_NEW);
+            used = true;
+            action.addProperty("actionCount", 1);
+            skip.onPress(new KeyEvent(InputConstants.KEY_RETURN, 0, 0));
+            action.addProperty("status", "NATIVE_SKIP_BUTTON_RETURNED");
+            action.addProperty("onPressReturned", true);
+            Files.writeString(folder.resolve("experimental-action.json"), action.toString(), StandardOpenOption.CREATE_NEW);
+        } catch (IOException failure) {
+            throw new IllegalStateException("Cannot authenticate or retain the sealed fixture warning action", failure);
+        }
+    }
+
+    JsonObject report() {
+        if (action != null) return action.deepCopy();
+        JsonObject result = new JsonObject();
+        result.addProperty("protocol", PROTOCOL); result.addProperty("status", "NOT_OBSERVED");
+        result.addProperty("actionCount", 0);
+        return result;
+    }
+
+    static JsonObject verifyPolicy(Path directory) throws IOException {
+        Path runtime = directory.toRealPath();
+        Path policyFile = runtime.resolve("client-fixture-policy.json");
+        JsonObject policy = read(policyFile), input = read(runtime.resolve("client-input.json"));
+        require(PROTOCOL.equals(policy.get("protocol").getAsString()) && "RUNNING".equals(input.get("status").getAsString()), "Unsealed fixture policy");
+        require(SCOPE.equals(policy.get("eligibility").getAsString()), "Unapproved fixture scope");
+        String profileSha = policy.get("profileSha256").getAsString();
+        require(profileSha.matches("[0-9A-F]{64}") && profileSha.equals(input.get("profileSha256").getAsString()), "Unapproved fixture profile");
+        JsonObject binding = input.getAsJsonObject("experimentalFixturePolicy");
+        require("client-fixture-policy.json".equals(binding.get("file").getAsString())
+                && sha(policyFile).equals(binding.get("sha256").getAsString()), "Fixture policy hash changed");
+        Path profile = Path.of(policy.get("profilePath").getAsString());
+        require(profileSha.equals(sha(profile)), "Frozen fixture profile changed");
+        Path sourceReceipt = Path.of(input.get("sourceWorldReceipt").getAsString());
+        require(sha(sourceReceipt).equals(policy.get("sourceReceiptSha256").getAsString()), "Unapproved source receipt");
+        JsonObject receipt = read(sourceReceipt), profileData = read(profile);
+        require("26.1.2".equals(profileData.get("minecraftVersion").getAsString())
+                && "26.1.2-64.1.5".equals(profileData.getAsJsonObject("forge").get("version").getAsString())
+                && "26.1.2".equals(receipt.get("minecraft").getAsString()) && "64.1.5".equals(receipt.get("forge").getAsString())
+                && "PASS".equals(receipt.get("status").getAsString()) && receipt.get("inputsUnchanged").getAsBoolean()
+                && receipt.get("seedUnchanged").getAsBoolean() && profileSha.equals(receipt.get("profileSha256").getAsString())
+                && "PACKAGED_WALKABLE_WORKS_AND_TWELVE_DRILL_WITNESSES".equals(receipt.get("scope").getAsString()), "Source receipt is not an eligible completed native broad run");
+        JsonObject completed = receipt.getAsJsonObject("profiles").getAsJsonObject("packaged-current");
+        require("PASS".equals(completed.get("status").getAsString()) && "packaged-current".equals(completed.get("profile").getAsString()), "Incomplete broad fixture source");
+        for (String phase : List.of("first", "initial", "operation", "persistence", "restarted"))
+            require("PASS".equals(completed.getAsJsonObject("phases").getAsJsonObject(phase).get("status").getAsString()), "Unfinished broad source phase");
+        Path source = Path.of(input.get("sourceWorld").getAsString()).toRealPath();
+        require(source.equals(sourceReceipt.toAbsolutePath().getParent().resolve("packaged-current/AdvantageWorksMigration").normalize()), "Unapproved broad source-world route");
+        Path copy = runtime.resolve("saves/AdvantageClientResources").toRealPath();
+        require(copy.startsWith(runtime) && copy.equals(runtime.resolve("saves/AdvantageClientResources").normalize())
+                && copy.equals(Path.of(policy.get("copiedWorld").getAsString()).toAbsolutePath().normalize()) && !copy.startsWith(source)
+                && !source.startsWith(runtime) && !runtime.startsWith(source), "Fixture is not an independent disposable copied world");
+        String levelSha = policy.get("copiedLevelSha256").getAsString();
+        require(levelSha.matches("[0-9A-F]{64}") && levelSha.equals(sha(source.resolve("level.dat"))), "Unapproved source/copied level bytes");
+        // Pinned BM6786 removes only this empty obsolete Forge index during getUnfixedDataTag.
+        CompoundTag sourceLevel = NbtIo.readCompressed(source.resolve("level.dat"), NbtAccounter.unlimitedHeap());
+        require(sourceLevel.getCompound("Data").orElseThrow().getInt("DataVersion").orElseThrow() == 4790
+                && "26.1.2".equals(sourceLevel.getCompound("Data").orElseThrow().getCompound("Version").orElseThrow().getString("Name").orElseThrow()), "Not a stopped native world");
+        String copyTransform = verifyCopiedLevel(sourceLevel,
+                NbtIo.readCompressed(copy.resolve("level.dat"), NbtAccounter.unlimitedHeap()));
+        JsonObject copyCustody = new JsonObject();
+        copyCustody.addProperty("initialSha256", levelSha);
+        copyCustody.addProperty("observedSha256", sha(copy.resolve("level.dat")));
+        copyCustody.addProperty("exactTypedNbtTransform", copyTransform);
+        policy.add("copiedLevelCustody", copyCustody);
+        Path ledgerFile = runtime.resolve("client-world-source-files.json");
+        require(sha(ledgerFile).equals(input.get("worldSourceLedgerSha256").getAsString())
+                && sha(ledgerFile).equals(policy.get("sourceLedgerSha256").getAsString()), "Source custody ledger changed");
+        for (var row : read(ledgerFile).entrySet()) {
+            Path path = source.resolve(row.getKey()).normalize();
+            require(path.startsWith(source) && sha(path).equals(row.getValue().getAsString()), "Protected source world changed");
+        }
+        JsonObject expected = input.getAsJsonObject("runtimeJars");
+        require(expected.size() == 7 && expected.has("advantageclientresources.jar"), "Fixture needs exactly six family jars plus the probe");
+        require(profileData.getAsJsonArray("mods").size() == 6, "Wrong fixture family cardinality");
+        Set<String> ids = new java.util.HashSet<>();
+        for (var value : profileData.getAsJsonArray("mods")) {
+            JsonObject mod = value.getAsJsonObject();
+            String id = mod.get("id").getAsString();
+            require(ids.add(id) && receipt.getAsJsonObject("jars").get(id).equals(mod.get("sha256"))
+                    && completed.getAsJsonObject("expectedMods").get(id).equals(mod.get("version")), "Source broad family differs from profile");
+            require(expected.has(mod.get("file").getAsString()) && expected.get(mod.get("file").getAsString()).equals(mod.get("sha256")), "Fixture family differs from the pinned profile");
+        }
+        require(ids.equals(Set.of("basepower", "basesteam", "baseelectric", "basemetals", "orespawn", "advantageworkstest"))
+                && receipt.getAsJsonObject("jars").keySet().equals(ids), "Not the ordinary six-jar source family");
+        try (var files = Files.list(runtime.resolve("mods"))) {
+            Set<String> names = files.map(path -> path.getFileName().toString()).collect(Collectors.toSet());
+            require(names.equals(expected.keySet()), "Unexpected installed fixture code");
+        }
+        for (var row : expected.entrySet()) require(sha(runtime.resolve("mods").resolve(row.getKey())).equals(row.getValue().getAsString()), "Installed fixture jar hash changed");
+        return policy;
+    }
+
+    static String verifyCopiedLevel(CompoundTag source, CompoundTag observed) {
+        if (source.equals(observed)) return "UNCHANGED_TYPED_ROOT";
+        CompoundTag expected = source.copy();
+        CompoundTag registries = expected.getCompound("fml").orElseThrow().getCompound("Registries").orElseThrow();
+        CompoundTag index = registries.getCompound("minecraft:worldgen/biome").orElseThrow();
+        require(index.keySet().equals(Set.of("aliases", "blocked", "ids", "overrides"))
+                && index.get("aliases") instanceof ListTag aliases && aliases.isEmpty()
+                && index.get("ids") instanceof ListTag ids && ids.isEmpty()
+                && index.get("overrides") instanceof ListTag overrides && overrides.isEmpty()
+                && index.get("blocked") instanceof IntArrayTag blocked && blocked.getAsIntArray().length == 0,
+                "Fixture source does not have the exact approved empty obsolete biome index");
+        registries.remove("minecraft:worldgen/biome");
+        require(expected.equals(observed), "Copied world differs beyond the exact empty obsolete biome-index removal");
+        return "ONLY_FML_LOWERCASE_EMPTY_BIOME_INDEX_REMOVED";
+    }
+
+    private static JsonObject read(Path path) throws IOException { return JsonParser.parseString(Files.readString(path)).getAsJsonObject(); }
+    private static String sha(Path path) throws IOException {
+        require(Files.isRegularFile(path) && !Files.isSymbolicLink(path), "Missing or aliased fixture input");
+        try { return HexFormat.of().withUpperCase().formatHex(MessageDigest.getInstance("SHA-256").digest(Files.readAllBytes(path))); }
+        catch (NoSuchAlgorithmException failure) { throw new IllegalStateException(failure); }
+    }
+    private static void require(boolean condition, String message) { if (!condition) throw new IllegalStateException(message); }
+}
diff --git a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/NativeGuiEvidence.java b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/NativeGuiEvidence.java
new file mode 100644
index 00000000..18ef3023
--- /dev/null
+++ b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/NativeGuiEvidence.java
@@ -0,0 +1,172 @@
+package zone.moddev.mc.advantageworks.client;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.security.MessageDigest;
+import java.util.HexFormat;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.WeakHashMap;
+import javax.imageio.ImageIO;
+import net.minecraft.client.renderer.state.gui.BlitRenderState;
+import net.minecraft.client.renderer.state.gui.ColoredRectangleRenderState;
+import net.minecraft.client.renderer.state.gui.GuiElementRenderState;
+import net.minecraft.client.renderer.state.gui.GuiRenderState;
+import net.minecraft.client.renderer.state.gui.GuiTextRenderState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.resources.Identifier;
+
+/** Retains the native queue and fenced framebuffer bytes, including deliberately broken frames. */
+final class NativeGuiEvidence {
+    private static final Map<BufferedImage, JsonObject> FRAMES = new WeakHashMap<>();
+    private static final Map<Identifier, Source> SOURCES = new HashMap<>();
+    private static int sequence;
+
+    private NativeGuiEvidence() {}
+
+    record Source(BufferedImage image, JsonObject proof) {}
+
+    static Source source(Minecraft minecraft, Identifier id) {
+        return SOURCES.computeIfAbsent(id, key -> {
+            try (var input = minecraft.getResourceManager().open(id)) {
+                byte[] bytes = input.readAllBytes();
+                BufferedImage image = ImageIO.read(new java.io.ByteArrayInputStream(bytes));
+                if (image == null) throw new IOException("Invalid reference artwork " + id);
+                JsonObject proof = new JsonObject();
+                proof.addProperty("resource", id.toString());
+                proof.addProperty("sha256", sha256(bytes));
+                proof.addProperty("width", image.getWidth()); proof.addProperty("height", image.getHeight());
+                return new Source(image, proof);
+            } catch (IOException failure) {
+                throw new IllegalStateException("Cannot load independent source artwork " + id, failure);
+            }
+        });
+    }
+
+    static final class State extends GuiRenderState {
+        private final JsonArray texts = new JsonArray();
+        private final JsonArray blits = new JsonArray();
+        private final JsonArray fills = new JsonArray();
+
+        @Override public void addText(GuiTextRenderState text) {
+            JsonObject row = new JsonObject();
+            StringBuilder value = new StringBuilder();
+            text.text.accept((index, style, codepoint) -> { value.appendCodePoint(codepoint); return true; });
+            row.addProperty("text", value.toString());
+            row.addProperty("x", text.x);
+            row.addProperty("y", text.y);
+            row.addProperty("color", text.color);
+            row.addProperty("dropShadow", text.dropShadow);
+            row.add("pose", matrix(text.pose));
+            texts.add(row);
+            super.addText(text);
+        }
+
+        @Override public void addGuiElement(GuiElementRenderState state) {
+            if (state instanceof ColoredRectangleRenderState fill) {
+                if (fills.size() >= 10000) throw new IllegalStateException("Unbounded native color extraction");
+                JsonObject row = new JsonObject();
+                row.addProperty("x0", fill.x0()); row.addProperty("y0", fill.y0());
+                row.addProperty("x1", fill.x1()); row.addProperty("y1", fill.y1());
+                row.addProperty("col1", fill.col1()); row.addProperty("col2", fill.col2());
+                row.addProperty("pipeline", fill.pipeline().getLocation().toString());
+                row.add("pose", matrix(fill.pose()));
+                fills.add(row);
+            }
+            if (state instanceof BlitRenderState blit) {
+                if (blits.size() >= 10000) throw new IllegalStateException("Unbounded native GUI extraction");
+                JsonObject row = new JsonObject();
+                row.addProperty("x0", blit.x0()); row.addProperty("y0", blit.y0());
+                row.addProperty("x1", blit.x1()); row.addProperty("y1", blit.y1());
+                row.addProperty("u0", blit.u0()); row.addProperty("v0", blit.v0());
+                row.addProperty("u1", blit.u1()); row.addProperty("v1", blit.v1());
+                row.addProperty("color", blit.color());
+                row.addProperty("pipeline", blit.pipeline().getLocation().toString());
+                row.addProperty("textureViewIdentity", System.identityHashCode(blit.textureSetup().texure0()));
+                row.add("pose", matrix(blit.pose()));
+                if (blit.scissorArea() != null) {
+                    JsonArray clip = new JsonArray();
+                    clip.add(blit.scissorArea().left()); clip.add(blit.scissorArea().top());
+                    clip.add(blit.scissorArea().width()); clip.add(blit.scissorArea().height());
+                    row.add("scissor", clip);
+                }
+                blits.add(row);
+            }
+            super.addGuiElement(state);
+        }
+
+        JsonObject extracted() {
+            JsonObject result = new JsonObject();
+            result.add("texts", texts.deepCopy());
+            result.add("blits", blits.deepCopy());
+            result.add("fills", fills.deepCopy());
+            return result;
+        }
+    }
+
+    private static JsonArray matrix(org.joml.Matrix3x2fc pose) {
+        JsonArray result = new JsonArray();
+        result.add(pose.m00()); result.add(pose.m01()); result.add(pose.m10());
+        result.add(pose.m11()); result.add(pose.m20()); result.add(pose.m21());
+        return result;
+    }
+
+    static void retain(BufferedImage image, JsonObject extraction) {
+        if (++sequence > 2000) throw new IllegalStateException("Unbounded native framebuffer capture");
+        String stem = "native-gui-evidence/frame-" + String.format(java.util.Locale.ROOT, "%04d", sequence);
+        try {
+            Path png = Path.of(stem + ".png"), rgba = Path.of(stem + ".rgba"), nativeState = Path.of(stem + "-native.json");
+            Files.createDirectories(png.getParent());
+            try (var output = Files.newOutputStream(png, StandardOpenOption.CREATE_NEW)) {
+                if (!ImageIO.write(image, "png", output)) throw new IOException("No PNG writer");
+            }
+            try (var output = new java.io.BufferedOutputStream(Files.newOutputStream(rgba, StandardOpenOption.CREATE_NEW))) {
+                for (int y = 0; y < image.getHeight(); y++) for (int x = 0; x < image.getWidth(); x++) {
+                    int color = image.getRGB(x, y);
+                    output.write(color >>> 16 & 255); output.write(color >>> 8 & 255);
+                    output.write(color & 255); output.write(color >>> 24 & 255);
+                }
+            }
+            extraction.addProperty("protocol", "NATIVE64_GUI_FRAMEBUFFER_FENCED_V1");
+            extraction.addProperty("width", image.getWidth());
+            extraction.addProperty("height", image.getHeight());
+            Files.writeString(nativeState, extraction.toString(), StandardOpenOption.CREATE_NEW);
+            JsonObject frame = new JsonObject();
+            frame.addProperty("width", image.getWidth()); frame.addProperty("height", image.getHeight());
+            frame.add("png", artifact(png)); frame.add("rgba", artifact(rgba)); frame.add("native", artifact(nativeState));
+            FRAMES.put(image, frame);
+        } catch (IOException failure) {
+            throw new IllegalStateException("Cannot freeze native GUI framebuffer evidence", failure);
+        }
+    }
+
+    static JsonObject frame(BufferedImage image) {
+        JsonObject result = FRAMES.get(image);
+        if (result == null) throw new IllegalStateException("Image lacks native fenced extraction/framebuffer custody");
+        return result.deepCopy();
+    }
+
+    private static JsonObject artifact(Path path) throws IOException {
+        try {
+            JsonObject result = new JsonObject();
+            result.addProperty("file", path.toString().replace('\\', '/'));
+            result.addProperty("sha256", sha256(Files.readAllBytes(path)));
+            return result;
+        } catch (RuntimeException failure) {
+            throw failure;
+        }
+    }
+
+    private static String sha256(byte[] bytes) {
+        try {
+            return HexFormat.of().withUpperCase().formatHex(MessageDigest.getInstance("SHA-256").digest(bytes));
+        } catch (java.security.NoSuchAlgorithmException failure) {
+            throw new IllegalStateException(failure);
+        }
+    }
+}
diff --git a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/NativeGuiProjection.java b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/NativeGuiProjection.java
index c61ea95b..2ec96405 100644
--- a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/NativeGuiProjection.java
+++ b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/NativeGuiProjection.java
@@ -14,10 +14,12 @@
 import java.util.function.Function;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.Screenshot;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.render.GuiRenderer;
-import net.minecraft.client.gui.render.state.GuiRenderState;
+import net.minecraft.client.renderer.state.gui.GuiRenderState;
 import net.minecraft.client.renderer.fog.FogRenderer;
+import net.minecraft.client.renderer.RenderPipelines;
+import net.minecraft.client.renderer.state.WindowRenderState;
 
 /** Scoped native GUI extraction, GPU submission and fenced framebuffer readback. */
 final class NativeGuiProjection implements AutoCloseable {
@@ -27,6 +29,8 @@ final class NativeGuiProjection implements AutoCloseable {
     private final Field targetField;
     private final Field widthField, heightField;
     private final int width, height, scale;
+    private final WindowRenderState windowState;
+    private final int stateWidth, stateHeight, stateScale;
     private final GpuBufferSlice projection = RenderSystem.getProjectionMatrixBuffer();
     private final ProjectionType projectionType = RenderSystem.getProjectionType();
 
@@ -37,6 +41,10 @@ private NativeGuiProjection(Minecraft minecraft, int width, int height, int scal
         this.width = window.getWidth();
         this.height = window.getHeight();
         this.scale = window.getGuiScale();
+        windowState = minecraft.gameRenderer.getGameRenderState().windowRenderState;
+        stateWidth = windowState.width;
+        stateHeight = windowState.height;
+        stateScale = windowState.guiScale;
         targetField = Minecraft.class.getDeclaredField("mainRenderTarget");
         targetField.setAccessible(true);
         widthField = window.getClass().getDeclaredField("framebufferWidth");
@@ -48,37 +56,96 @@ private NativeGuiProjection(Minecraft minecraft, int width, int height, int scal
         widthField.setInt(window, width);
         heightField.setInt(window, height);
         window.setGuiScale(scale);
+        // Native 26 projects GUI geometry from the extracted frame, not the live window.
+        windowState.width = width;
+        windowState.height = height;
+        windowState.guiScale = scale;
+    }
+
+    static com.google.gson.JsonObject calibrate(Minecraft minecraft) {
+        final int width = 64, height = 48, background = 0xFF101820;
+        com.google.gson.JsonArray cases = new com.google.gson.JsonArray();
+        for (int scale : new int[] {1, 2}) {
+            BufferedImage actual = render(minecraft, width * scale, height * scale, scale, background,
+                    graphics -> drawRuler(graphics, width, height, 0));
+            String error = rulerError(actual, width, height, scale, background);
+            if (error != null) throw new IllegalStateException("Native GUI projection calibration failed: " + error);
+            BufferedImage shifted = render(minecraft, width * scale, height * scale, scale, background,
+                    graphics -> drawRuler(graphics, width, height, 1));
+            if (rulerError(shifted, width, height, scale, background) == null) {
+                throw new IllegalStateException("Native GUI projection accepted a shifted calibration rectangle");
+            }
+            com.google.gson.JsonObject row = new com.google.gson.JsonObject();
+            row.addProperty("scale", scale);
+            row.addProperty("logicalWidth", width);
+            row.addProperty("logicalHeight", height);
+            row.addProperty("exactPixelsChecked", width * height * scale * scale);
+            row.add("actual", NativeGuiEvidence.frame(actual));
+            row.add("shiftedRejected", NativeGuiEvidence.frame(shifted));
+            cases.add(row);
+        }
+        com.google.gson.JsonObject result = new com.google.gson.JsonObject();
+        result.addProperty("protocol", "NATIVE64_GUI_PROJECTION_PIXEL_RULER_V1");
+        result.addProperty("status", "PASS");
+        result.add("cases", cases);
+        return result;
+    }
+
+    private static void drawRuler(GuiGraphicsExtractor graphics, int width, int height, int shift) {
+        graphics.fill(RenderPipelines.GUI, 7 + shift, 9, 23 + shift, 25, 0xFF37A95C);
+        graphics.fill(RenderPipelines.GUI, 2, 2, 3, 3, 0xFF3158D5);
+        graphics.fill(RenderPipelines.GUI, width - 1, height - 1, width, height, 0xFFDD7341);
+    }
+
+    private static String rulerError(BufferedImage image, int width, int height, int scale, int background) {
+        if (image.getWidth() != width * scale || image.getHeight() != height * scale) return "Wrong framebuffer dimensions";
+        for (int y = 0; y < image.getHeight(); y++) for (int x = 0; x < image.getWidth(); x++) {
+            int u = x / scale, v = y / scale;
+            int expected = u >= 7 && u < 23 && v >= 9 && v < 25 ? 0xFF37A95C
+                    : u == 2 && v == 2 ? 0xFF3158D5
+                    : u == width - 1 && v == height - 1 ? 0xFFDD7341 : background;
+            if (image.getRGB(x, y) != expected) return "Wrong pixel at " + x + "," + y;
+        }
+        return null;
     }
 
     static BufferedImage render(Minecraft minecraft, int width, int height, int scale, int background,
-            Consumer<GuiGraphics> draw) {
+            Consumer<GuiGraphicsExtractor> draw) {
         return render(minecraft, width, height, scale, background,
-                state -> new GuiGraphics(minecraft, state, -100, -100), draw);
+                state -> new GuiGraphicsExtractor(minecraft, state, -100, -100), draw);
     }
 
     static BufferedImage render(Minecraft minecraft, int width, int height, int scale, int background,
-            Function<GuiRenderState, GuiGraphics> graphicsFactory, Consumer<GuiGraphics> draw) {
-        GuiRenderState state = new GuiRenderState();
+            Function<GuiRenderState, GuiGraphicsExtractor> graphicsFactory, Consumer<GuiGraphicsExtractor> draw) {
+        NativeGuiEvidence.State state = new NativeGuiEvidence.State();
         try (NativeGuiProjection scope = new NativeGuiProjection(minecraft, width, height, scale);
                 GuiRenderer renderer = new GuiRenderer(state, minecraft.renderBuffers().bufferSource(),
                         minecraft.gameRenderer.getSubmitNodeStorage(),
                         minecraft.gameRenderer.getFeatureRenderDispatcher(), List.of())) {
             RenderSystem.getDevice().createCommandEncoder().clearColorAndDepthTextures(
                     scope.target.getColorTexture(), background, scope.target.getDepthTexture(), 1.0);
-            GuiGraphics graphics = graphicsFactory.apply(state);
+            GuiGraphicsExtractor graphics = graphicsFactory.apply(state);
             draw.accept(graphics);
-            graphics.renderDeferredElements();
+            graphics.extractDeferredElements(-100, -100, 0F);
             Field fogField = minecraft.gameRenderer.getClass().getDeclaredField("fogRenderer");
             fogField.setAccessible(true);
             FogRenderer fog = (FogRenderer) fogField.get(minecraft.gameRenderer);
             renderer.render(fog.getBuffer(FogRenderer.FogMode.NONE));
-            return read(scope.target);
+            BufferedImage image = read(scope.target);
+            var extraction = state.extracted();
+            extraction.addProperty("extractor", graphics.getClass().getName());
+            extraction.addProperty("renderer", GuiRenderer.class.getName());
+            extraction.addProperty("renderSubmitted", true);
+            extraction.addProperty("fenceCompleted", true);
+            extraction.addProperty("screenshotCallbackCompleted", true);
+            NativeGuiEvidence.retain(image, extraction);
+            return image;
         } catch (ReflectiveOperationException failure) {
             throw new IllegalStateException("Cannot scope the actual native GUI target", failure);
         }
     }
 
-    private static BufferedImage read(RenderTarget target) {
+    static BufferedImage read(RenderTarget target) {
         AtomicReference<NativeImage> captured = new AtomicReference<>();
         Screenshot.takeScreenshot(target, captured::set);
         try (var fence = RenderSystem.getDevice().createCommandEncoder().createFence()) {
@@ -101,6 +168,9 @@ private static BufferedImage read(RenderTarget target) {
             widthField.setInt(minecraft.getWindow(), width);
             heightField.setInt(minecraft.getWindow(), height);
             minecraft.getWindow().setGuiScale(scale);
+            windowState.width = stateWidth;
+            windowState.height = stateHeight;
+            windowState.guiScale = stateScale;
             RenderSystem.setProjectionMatrix(projection, projectionType);
         } finally {
             minecraft.gameRenderer.getSubmitNodeStorage().endFrame();
diff --git a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/NativeVanillaResourceProbe.java b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/NativeVanillaResourceProbe.java
new file mode 100644
index 00000000..0f8fd673
--- /dev/null
+++ b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/NativeVanillaResourceProbe.java
@@ -0,0 +1,91 @@
+package zone.moddev.mc.advantageworks.client;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.HexFormat;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
+import java.util.concurrent.atomic.AtomicInteger;
+import net.minecraft.client.Minecraft;
+import net.minecraft.resources.Identifier;
+import net.minecraft.server.packs.PackType;
+import net.minecraft.server.packs.resources.PreparableReloadListener;
+import net.minecraft.server.packs.resources.ResourceManager;
+import net.minecraftforge.client.event.RegisterClientReloadListenersEvent;
+
+/** Reads actual vanilla pack roots during preparation, before any atlas upload. */
+final class NativeVanillaResourceProbe implements PreparableReloadListener {
+    private static final AtomicInteger RELOADS = new AtomicInteger();
+
+    static void register() {
+        RegisterClientReloadListenersEvent.BUS.addListener(event ->
+                event.registerReloadListener(new NativeVanillaResourceProbe()));
+    }
+
+    @Override
+    public CompletableFuture<Void> reload(SharedState reload, Executor prepare,
+            PreparationBarrier barrier, Executor apply) {
+        return CompletableFuture.supplyAsync(() -> capture(reload.resourceManager()), prepare)
+                .thenCompose(barrier::wait).thenAcceptAsync(unused -> {}, apply);
+    }
+
+    private static JsonObject capture(ResourceManager resources) {
+        JsonObject result = new JsonObject();
+        result.addProperty("protocol", "NATIVE64_VANILLA_RESOURCE_ROOTS_V1");
+        result.addProperty("phase", "reload-preparation-before-atlas-upload");
+        JsonArray rows = new JsonArray();
+        result.add("resources", rows);
+        boolean present = true;
+        try {
+            for (String name : new String[]{"minecraft:textures/block/stone.png", "minecraft:atlases/blocks.json"}) {
+                Identifier id = Identifier.parse(name);
+                JsonObject row = new JsonObject();
+                row.addProperty("resource", name);
+                rows.add(row);
+                var vanilla = Minecraft.getInstance().getVanillaPackResources()
+                        .getResource(PackType.CLIENT_RESOURCES, id);
+                JsonObject direct = new JsonObject();
+                direct.addProperty("present", vanilla != null);
+                row.add("vanilla", direct);
+                if (vanilla != null) {
+                    try (InputStream stream = vanilla.get()) { describe(direct, stream.readAllBytes()); }
+                }
+                JsonArray merged = new JsonArray();
+                row.add("merged", merged);
+                for (var resource : resources.getResourceStack(id)) {
+                    JsonObject entry = new JsonObject();
+                    entry.addProperty("pack", resource.sourcePackId());
+                    try (InputStream stream = resource.open()) { describe(entry, stream.readAllBytes()); }
+                    merged.add(entry);
+                }
+                present &= vanilla != null && !merged.isEmpty();
+            }
+            result.addProperty("status", present ? "PASS" : "FAIL");
+            Path folder = Path.of("vanilla-resource-controls");
+            Files.createDirectories(folder);
+            Files.writeString(folder.resolve(String.format("control-%02d.json", RELOADS.incrementAndGet())),
+                    result.toString(), StandardCharsets.UTF_8, StandardOpenOption.CREATE_NEW);
+            if (!present) throw new IllegalStateException("Actual vanilla resource roots are missing stone or blocks atlas");
+            return result;
+        } catch (IOException failure) {
+            throw new IllegalStateException("Cannot retain actual vanilla resource-root control", failure);
+        }
+    }
+
+    private static void describe(JsonObject target, byte[] bytes) {
+        try {
+            target.addProperty("bytes", bytes.length);
+            target.addProperty("sha256", HexFormat.of().withUpperCase().formatHex(MessageDigest.getInstance("SHA-256").digest(bytes)));
+        } catch (NoSuchAlgorithmException failure) {
+            throw new IllegalStateException(failure);
+        }
+    }
+}
diff --git a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/NativeWorldOilProbe.java b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/NativeWorldOilProbe.java
new file mode 100644
index 00000000..ad98a707
--- /dev/null
+++ b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/NativeWorldOilProbe.java
@@ -0,0 +1,240 @@
+package zone.moddev.mc.advantageworks.client;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.HexFormat;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import javax.imageio.ImageIO;
+import net.minecraft.client.Minecraft;
+import net.minecraft.core.BlockPos;
+import net.minecraft.resources.Identifier;
+import net.minecraft.world.level.GameType;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.world.level.material.Fluids;
+import net.minecraft.world.phys.Vec3;
+
+/** Native LevelRenderer frames in the disposable copied world, including deliberately wrong world states. */
+final class NativeWorldOilProbe {
+    private static final int Y = 6, Z = 510;
+    private static final int[] X = {504, 510, 516};
+    private static final String[] NAMES = {"crude-oil", "refined-oil", "water-control"};
+    private static final Fluid[] OILS = {zone.moddev.mc.basepower.init.Fluids.crude_oil,
+            zone.moddev.mc.basepower.init.Fluids.refined_oil, Fluids.WATER};
+    private final JsonObject report = new JsonObject();
+    private final Map<String, BufferedImage> images = new LinkedHashMap<>();
+    private final JsonObject frames = new JsonObject();
+    private final Map<String, Integer> spriteIdentities = new LinkedHashMap<>();
+    private CompletableFuture<Void> serverWork;
+    private CompletableFuture<Void> reload;
+    private String phase = "NEW";
+    private int deadline, stableSince = -1;
+    private boolean originalHideGui;
+
+    JsonObject report() { return report.deepCopy(); }
+
+    JsonObject tick(Minecraft minecraft, int tick) {
+        try {
+            if (phase.equals("DONE")) return report();
+            require(minecraft.level != null && minecraft.player != null && minecraft.getSingleplayerServer() != null,
+                    "Actual oil scene requires a connected integrated world");
+            require(minecraft.getSingleplayerServer().getWorldPath(net.minecraft.world.level.storage.LevelResource.ROOT).toRealPath()
+                    .equals(Path.of("saves/AdvantageClientResources").toRealPath()), "Oil scene cannot write outside the disposable copy");
+            if (phase.equals("NEW")) {
+                report.addProperty("protocol", "NATIVE64_LEVEL_RENDERER_OIL_RELOAD_V1");
+                report.addProperty("status", "RUNNING"); report.add("frames", frames);
+                report.addProperty("scope", "ACTUAL_LEVEL_RENDERER_NOT_GUI_OR_SYNTHETIC_WORLD");
+                originalHideGui = minecraft.options.hideGui; minecraft.options.hideGui = true;
+                require(minecraft.options.mipmapLevels().get() == 4, "World oil proof requires default mipmap level4");
+                report.addProperty("mipmapLevel", 4);
+                serverWork = scene(minecraft, "oil", true);
+                phase = "ORIGINAL"; deadline = tick + 1200;
+            }
+            require(tick < deadline, "Native world oil scene timed out during " + phase);
+            if (reload != null) { if (!reload.isDone()) return null; reload.join(); }
+            if (!serverWork.isDone()) return null;
+            serverWork.join();
+            String expected = phase.equals("EMPTY") ? "empty" : phase.equals("WRONG_WATER") ? "water" : "oil";
+            if (!ready(minecraft, expected)) { stableSince = -1; return null; }
+            if (stableSince < 0) { stableSince = tick; return null; }
+            if (tick - stableSince < 30) return null;
+            stableSince = -1;
+            capture(minecraft, phase.toLowerCase(java.util.Locale.ROOT));
+            switch (phase) {
+                case "ORIGINAL" -> {
+                    report.add("modelsBeforeReload", models(minecraft, true));
+                    serverWork = scene(minecraft, "empty", false); phase = "EMPTY";
+                }
+                case "EMPTY" -> { serverWork = scene(minecraft, "water", false); phase = "WRONG_WATER"; }
+                case "WRONG_WATER" -> { serverWork = scene(minecraft, "oil", false); phase = "RESTORED"; }
+                case "RESTORED" -> { reload = minecraft.reloadResourcePacks(); phase = "AFTER_RELOAD"; }
+                case "AFTER_RELOAD" -> {
+                    report.add("modelsAfterReload", models(minecraft, false));
+                    JsonObject geometry = new JsonObject(); OilRenderProbe.verify(minecraft, geometry);
+                    report.add("nativeGeometryAfterReload", geometry);
+                    JsonArray controls = compareControls(); report.add("pixelControls", controls);
+                    report.addProperty("status", "PASS"); phase = "DONE";
+                    minecraft.options.hideGui = originalHideGui;
+                    Files.writeString(Path.of("world-oil-evidence/result.json"), report.toString(), StandardOpenOption.CREATE_NEW);
+                    return report();
+                }
+                default -> throw new IllegalStateException("Unknown native world oil phase " + phase);
+            }
+            return null;
+        } catch (IOException | RuntimeException | LinkageError | AssertionError failure) {
+            minecraft.options.hideGui = originalHideGui;
+            report.addProperty("status", "FAIL"); report.addProperty("phase", phase); report.addProperty("error", failure.toString());
+            throw new IllegalStateException("Native world oil proof failed in " + phase, failure);
+        }
+    }
+
+    private CompletableFuture<Void> scene(Minecraft minecraft, String mode, boolean initialize) {
+        CompletableFuture<Void> result = new CompletableFuture<>();
+        var server = minecraft.getSingleplayerServer();
+        server.execute(() -> {
+            try {
+                var level = server.getLevel(Level.OVERWORLD);
+                require(level != null, "Missing actual Overworld");
+                if (initialize) {
+                    for (int x = 502; x <= 521; x++) for (int z = 508; z <= 515; z++) {
+                        level.setBlock(new BlockPos(x, Y - 1, z), Blocks.WHITE_CONCRETE.defaultBlockState(), 3);
+                        level.setBlock(new BlockPos(x, Y, z), Blocks.WHITE_CONCRETE.defaultBlockState(), 3);
+                    }
+                    server.getCommands().performPrefixedCommand(server.createCommandSourceStack(), "time set noon");
+                    server.getCommands().performPrefixedCommand(server.createCommandSourceStack(), "weather clear");
+                    var player = server.getPlayerList().getPlayerByName("AdvantageProbe");
+                    require(player != null, "Missing actual logged-in probe player");
+                    player.setGameMode(GameType.SPECTATOR);
+                    require(player.teleportTo(level, 512.5, 14.0, 527.0, Set.of(), 180F, 35F, true), "Native scene teleport failed");
+                }
+                for (int pool = 0; pool < 3; pool++) for (int x = 0; x < 4; x++) for (int z = 0; z < 4; z++) {
+                    var state = pool == 2 || mode.equals("water") ? Fluids.WATER.defaultFluidState().createLegacyBlock()
+                            : mode.equals("empty") ? Blocks.AIR.defaultBlockState() : OILS[pool].defaultFluidState().createLegacyBlock();
+                    level.setBlock(new BlockPos(X[pool] + x, Y, Z + z), state, 3);
+                }
+                result.complete(null);
+            } catch (Throwable failure) { result.completeExceptionally(failure); }
+        });
+        return result;
+    }
+
+    private boolean ready(Minecraft minecraft, String mode) {
+        if (minecraft.getOverlay() != null || minecraft.screen != null || !minecraft.level.dimension().equals(Level.OVERWORLD)) return false;
+        if (minecraft.player.position().distanceToSqr(512.5, 14, 527) > 0.0001) return false;
+        for (int pool = 0; pool < 3; pool++) for (int x = 0; x < 4; x++) for (int z = 0; z < 4; z++) {
+            BlockPos pos = new BlockPos(X[pool] + x, Y, Z + z);
+            Fluid expected = pool == 2 || mode.equals("water") ? Fluids.WATER : mode.equals("empty") ? Fluids.EMPTY : OILS[pool];
+            if (minecraft.level.getFluidState(pos).getType() != expected || !minecraft.levelRenderer.isSectionCompiledAndVisible(pos)) return false;
+        }
+        return minecraft.levelRenderer.countRenderedSections() > 0;
+    }
+
+    private JsonArray models(Minecraft minecraft, boolean before) {
+        JsonArray models = new JsonArray();
+        var states = minecraft.getModelManager().getFluidStateModelSet();
+        for (int pool = 0; pool < 2; pool++) {
+            BlockPos pos = new BlockPos(X[pool] + 1, Y, Z + 1);
+            var state = minecraft.level.getFluidState(pos);
+            var model = net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions.of(state).getModel(state, minecraft.level, pos, states.get(state));
+            String name = pool == 0 ? "crude_oil" : "refined_oil";
+            JsonObject row = new JsonObject(); row.addProperty("fluid", "basepower:" + name);
+            require(model.layer() == net.minecraft.client.renderer.chunk.ChunkSectionLayer.TRANSLUCENT, "Actual-world oil model is not translucent");
+            for (boolean flow : new boolean[]{false, true}) {
+                String key = flow ? "flowing" : "still";
+                var sprite = (flow ? model.flowingMaterial() : model.stillMaterial()).sprite();
+                Identifier expected = Identifier.parse("basepower:blocks/" + name + (flow ? "_flow" : "_still"));
+                var current = minecraft.getAtlasManager().getAtlasOrThrow(net.minecraft.data.AtlasIds.BLOCKS).getSprite(expected);
+                require(sprite == current && sprite.contents().name().equals(expected), "Actual-world oil model retained a stale/missing sprite");
+                int identity = System.identityHashCode(sprite);
+                String identityKey = name + "/" + key;
+                if (before) spriteIdentities.put(identityKey, identity);
+                else require(spriteIdentities.get(identityKey) != identity, "Resource reload did not replace the oil atlas sprite");
+                row.addProperty(key + "Sprite", expected.toString()); row.addProperty(key + "Identity", identity);
+            }
+            row.addProperty("layer", "TRANSLUCENT"); models.add(row);
+        }
+        return models;
+    }
+
+    private void capture(Minecraft minecraft, String name) throws IOException {
+        BufferedImage image = NativeGuiProjection.read(minecraft.getMainRenderTarget());
+        Path folder = Path.of("world-oil-evidence"); Files.createDirectories(folder);
+        Path png = folder.resolve(name + ".png"), raw = folder.resolve(name + ".rgba");
+        try (var output = Files.newOutputStream(png, StandardOpenOption.CREATE_NEW)) { require(ImageIO.write(image, "png", output), "No world PNG encoder"); }
+        try (var output = new java.io.BufferedOutputStream(Files.newOutputStream(raw, StandardOpenOption.CREATE_NEW))) {
+            for (int y = 0; y < image.getHeight(); y++) for (int x = 0; x < image.getWidth(); x++) {
+                int color = image.getRGB(x, y); output.write(color >> 16 & 255); output.write(color >> 8 & 255); output.write(color & 255); output.write(255);
+            }
+        }
+        images.put(name, image);
+        JsonObject frame = new JsonObject(); frame.addProperty("width", image.getWidth()); frame.addProperty("height", image.getHeight());
+        frame.add("png", artifact(png)); frame.add("rgba", artifact(raw)); frame.addProperty("fenceCompleted", true);
+        frame.addProperty("renderer", minecraft.levelRenderer.getClass().getName());
+        frame.addProperty("dimension", minecraft.level.dimension().identifier().toString());
+        frame.addProperty("hudHidden", minecraft.options.hideGui);
+        frame.addProperty("renderedSections", minecraft.levelRenderer.countRenderedSections());
+        JsonArray camera = new JsonArray(); Vec3 position = minecraft.gameRenderer.getMainCamera().position();
+        camera.add(position.x); camera.add(position.y); camera.add(position.z); frame.add("camera", camera);
+        JsonArray matrix = new JsonArray(); float[] values = new float[16];
+        minecraft.gameRenderer.getMainCamera().getViewRotationProjectionMatrix(new org.joml.Matrix4f()).get(values);
+        for (float value : values) matrix.add(value); frame.add("viewRotationProjection", matrix);
+        JsonArray pools = new JsonArray();
+        for (int pool = 0; pool < 3; pool++) {
+            JsonObject row = new JsonObject(); row.addProperty("pool", NAMES[pool]); JsonArray samples = new JsonArray();
+            row.addProperty("fluid", net.minecraftforge.registries.ForgeRegistries.FLUIDS.getKey(
+                    minecraft.level.getFluidState(new BlockPos(X[pool] + 1, Y, Z + 1)).getType()).toString());
+            row.addProperty("compiledAndVisible", minecraft.levelRenderer.isSectionCompiledAndVisible(new BlockPos(X[pool] + 1, Y, Z + 1)));
+            for (int x = 0; x < 4; x++) for (int z = 0; z < 4; z++) {
+                Vec3 point = new Vec3(X[pool] + .75 + x * .75, Y + 8D / 9D, Z + .75 + z * .75);
+                Vec3 projected = minecraft.gameRenderer.projectPointToScreen(point);
+                int px = (int) ((projected.x * .5 + .5) * image.getWidth());
+                int py = (int) ((.5 - projected.y * .5) * image.getHeight());
+                require(px >= 2 && py >= 2 && px < image.getWidth() - 2 && py < image.getHeight() - 2 && projected.z > -1 && projected.z < 1, "Oil pool projected outside the actual world framebuffer");
+                JsonArray sample = new JsonArray(); sample.add(point.x); sample.add(point.y); sample.add(point.z); sample.add(px); sample.add(py); samples.add(sample);
+            }
+            row.add("samples", samples); pools.add(row);
+        }
+        frame.add("pools", pools); frames.add(name, frame);
+    }
+
+    private JsonArray compareControls() {
+        JsonArray rows = new JsonArray();
+        for (String actual : new String[]{"original", "after_reload"}) for (int pool = 0; pool < 3; pool++) {
+            JsonObject row = new JsonObject(); row.addProperty("actual", actual); row.addProperty("pool", NAMES[pool]);
+            for (String control : new String[]{"empty", "wrong_water"}) {
+                int different = 0, checked = 0;
+                for (var item : frames.getAsJsonObject(actual).getAsJsonArray("pools").get(pool).getAsJsonObject().getAsJsonArray("samples")) {
+                    JsonArray sample = item.getAsJsonArray(); int x = sample.get(3).getAsInt(), y = sample.get(4).getAsInt();
+                    for (int dy = -1; dy <= 1; dy++) for (int dx = -1; dx <= 1; dx++) {
+                        int a = images.get(actual).getRGB(x + dx, y + dy), b = images.get(control).getRGB(x + dx, y + dy);
+                        int distance = Math.abs((a >> 16 & 255) - (b >> 16 & 255)) + Math.abs((a >> 8 & 255) - (b >> 8 & 255)) + Math.abs((a & 255) - (b & 255));
+                        if (distance > (pool == 2 ? 32 : 64)) different++; checked++;
+                    }
+                }
+                require(pool == 2 ? different <= checked / 10 : different >= checked / 2, "Native world oil empty/wrong-fluid control failed: " + actual + "/" + NAMES[pool] + "/" + control);
+                row.addProperty(control + "Different", different); row.addProperty("samples", checked);
+            }
+            rows.add(row);
+        }
+        return rows;
+    }
+
+    private static JsonObject artifact(Path path) throws IOException {
+        JsonObject row = new JsonObject(); row.addProperty("file", path.toString().replace('\\', '/'));
+        try { row.addProperty("sha256", HexFormat.of().withUpperCase().formatHex(MessageDigest.getInstance("SHA-256").digest(Files.readAllBytes(path)))); }
+        catch (NoSuchAlgorithmException failure) { throw new IllegalStateException(failure); }
+        return row;
+    }
+    private static void require(boolean value, String message) { if (!value) throw new IllegalStateException(message); }
+}
diff --git a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/OilRenderProbe.java b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/OilRenderProbe.java
index da44dfe4..255d6391 100644
--- a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/OilRenderProbe.java
+++ b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/OilRenderProbe.java
@@ -21,7 +21,9 @@
 import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.tags.TagKey;
-import net.minecraft.world.level.BlockAndTintGetter;
+import net.minecraft.client.renderer.block.BlockAndTintGetter;
+import net.minecraft.client.renderer.block.FluidRenderer;
+import net.minecraft.world.level.CardinalLighting;
 import net.minecraft.world.level.LightLayer;
 import net.minecraft.world.level.ColorResolver;
 import net.minecraft.world.level.lighting.LevelLightEngine;
@@ -39,16 +41,12 @@ final class OilRenderProbe {
     private OilRenderProbe() {}
 
     static void verify(Minecraft minecraft, JsonObject result) {
-        // Before a world/server is opened, vanilla's fluid tags have not been synchronized.
+        require(minecraft.level != null && minecraft.player != null, "Fluid models require actual native login");
         Map<TagKey<Fluid>, List<Holder<Fluid>>> previous = fluidTags();
-        Map<TagKey<Fluid>, List<Holder<Fluid>>> synthetic = new HashMap<>(previous);
-        synthetic.put(FluidTags.WATER, List.of(net.minecraft.world.level.material.Fluids.WATER.builtInRegistryHolder(),
-                net.minecraft.world.level.material.Fluids.FLOWING_WATER.builtInRegistryHolder()));
-        synthetic.put(FluidTags.LAVA, List.of(net.minecraft.world.level.material.Fluids.LAVA.builtInRegistryHolder(),
-                net.minecraft.world.level.material.Fluids.FLOWING_LAVA.builtInRegistryHolder()));
-        BuiltInRegistries.FLUID.prepareTagReload(new net.minecraft.tags.TagLoader.LoadResult<>(
-                net.minecraft.core.registries.Registries.FLUID, synthetic)).apply();
-        try {
+        require(previous.containsKey(FluidTags.WATER) && previous.containsKey(FluidTags.LAVA)
+                && previous.get(FluidTags.WATER).contains(net.minecraft.world.level.material.Fluids.WATER.builtInRegistryHolder())
+                && previous.get(FluidTags.LAVA).contains(net.minecraft.world.level.material.Fluids.LAVA.builtInRegistryHolder()),
+                "Actual login did not bind native fluid tags");
         requireBucket(Items.crude_oil_bucket, Fluids.crude_oil);
         requireBucket(Items.refined_oil_bucket, Fluids.refined_oil);
         result.addProperty("oil_bucket_identities", true);
@@ -63,11 +61,8 @@ static void verify(Minecraft minecraft, JsonObject result) {
         valid &= check(minecraft, net.minecraft.world.level.material.Fluids.WATER.defaultFluidState(), "minecraft:block/water_still", false, cases);
         valid &= check(minecraft, net.minecraft.world.level.material.Fluids.LAVA.defaultFluidState(), "minecraft:block/lava_still", false, cases);
         if (!valid) throw new IllegalStateException("Native fluid renderer used the wrong sprite or tint: " + cases);
-        } finally {
-            BuiltInRegistries.FLUID.prepareTagReload(new net.minecraft.tags.TagLoader.LoadResult<>(
-                    net.minecraft.core.registries.Registries.FLUID, previous)).apply();
-            require(fluidTags().equals(previous), "Synthetic fluid tag membership was not restored");
-        }
+        require(fluidTags().equals(previous), "Fluid geometry probe changed actual native tags");
+        result.addProperty("fluid_tag_context", "ACTUAL_LOGIN_UNMODIFIED_NATIVE_TAGS");
     }
 
     private static Map<TagKey<Fluid>, List<Holder<Fluid>>> fluidTags() {
@@ -94,7 +89,7 @@ private static boolean check(Minecraft minecraft, FluidState state, String textu
         BlockAndTintGetter world = new BlockAndTintGetter() {
             @Override public int getHeight() { return 256; }
             @Override public int getMinY() { return 0; }
-            @Override public float getShade(Direction side, boolean shade) { return 1.0F; }
+            @Override public CardinalLighting cardinalLighting() { return new CardinalLighting(1, 1, 1, 1, 1, 1); }
             @Override public BlockEntity getBlockEntity(BlockPos pos) { return null; }
             @Override public BlockState getBlockState(BlockPos pos) { return blockAt(state, flowing, pos); }
             @Override public FluidState getFluidState(BlockPos pos) { return getBlockState(pos).getFluidState(); }
@@ -106,18 +101,28 @@ private static boolean check(Minecraft minecraft, FluidState state, String textu
         };
         try (var storage = new com.mojang.blaze3d.vertex.ByteBufferBuilder(4096)) {
         BufferBuilder buffer = new BufferBuilder(storage, com.mojang.blaze3d.vertex.VertexFormat.Mode.QUADS, DefaultVertexFormat.BLOCK);
-        minecraft.getBlockRenderer().renderLiquid(
-                BlockPos.ZERO, world, buffer, world.getBlockState(BlockPos.ZERO), state);
+        var models = minecraft.getModelManager().getFluidStateModelSet();
+        var nativeModel = net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions.of(state)
+                .getModel(state, world, BlockPos.ZERO, models.get(state));
+        require(nativeModel != null, "Native fluid extensions returned no model: " + state);
+        if (state.getType() instanceof Fluids.PowerFluid) {
+            require(nativeModel.layer() == net.minecraft.client.renderer.chunk.ChunkSectionLayer.TRANSLUCENT,
+                    "Oil selected a non-translucent chunk layer");
+        }
+        new FluidRenderer(models).tesselate(world, BlockPos.ZERO, layer -> {
+            require(layer == nativeModel.layer(), "Native fluid renderer selected the wrong model layer");
+            return buffer;
+        }, world.getBlockState(BlockPos.ZERO), state);
         try (var built = buffer.buildOrThrow()) {
         int vertices = built.drawState().vertexCount();
         TextureAtlasSprite sprite = minecraft.getAtlasManager().getAtlasOrThrow(net.minecraft.data.AtlasIds.BLOCKS)
                 .getSprite(Identifier.parse(texture));
         require(vertices >= 4, "Native fluid renderer emitted no top face for " + state);
         ByteBuffer data = built.vertexBuffer();
-        int uvOffset = elementOffset(VertexFormatElement.Usage.UV, 0);
+        int uvOffset = elementOffset(VertexFormatElement.UV0);
         float u = data.getFloat(uvOffset);
         float v = data.getFloat(uvOffset + 4);
-        int colorOffset = elementOffset(VertexFormatElement.Usage.COLOR, 0);
+        int colorOffset = elementOffset(VertexFormatElement.COLOR);
         int rgb = (data.get(colorOffset) & 255) << 16 | (data.get(colorOffset + 1) & 255) << 8 | data.get(colorOffset + 2) & 255;
         boolean correctSprite = !"missingno".equals(sprite.contents().name().getPath())
                 && u >= sprite.getU0() && u <= sprite.getU1() && v >= sprite.getV0() && v <= sprite.getV1();
@@ -135,12 +140,12 @@ private static boolean check(Minecraft minecraft, FluidState state, String textu
         }
     }
 
-    private static int elementOffset(VertexFormatElement.Usage usage, int index) {
+    private static int elementOffset(VertexFormatElement required) {
         for (int i = 0; i < DefaultVertexFormat.BLOCK.getElements().size(); i++) {
             VertexFormatElement element = DefaultVertexFormat.BLOCK.getElements().get(i);
-            if (element.usage() == usage && element.index() == index) return DefaultVertexFormat.BLOCK.getOffset(i);
+            if (element.equals(required)) return DefaultVertexFormat.BLOCK.getOffset(i);
         }
-        throw new IllegalStateException("Native block vertex format lacks " + usage + " " + index);
+        throw new IllegalStateException("Native block vertex format lacks " + required);
     }
 
     private static BlockState blockAt(FluidState state, boolean flowing, BlockPos pos) {
diff --git a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/RecipeBookGroupingProbe.java b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/RecipeBookGroupingProbe.java
index e0b79625..df387d0e 100644
--- a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/RecipeBookGroupingProbe.java
+++ b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/RecipeBookGroupingProbe.java
@@ -60,24 +60,30 @@ static void verify(Minecraft minecraft, JsonObject report) {
         try (Stream<Path> files = Files.list(root)) {
             Map<Identifier, ForgeRegistry.Snapshot> registry = RegistryManager.ACTIVE.takeSnapshot(false);
             CompoundTag level = NbtIo.readCompressed(root.resolve("server-registries.dat"), NbtAccounter.unlimitedHeap());
-            require("1.21.11".equals(compound(compound(level, "Data"), "Version").getString("Name").orElseThrow()),
-                    "Recipe fixture is not a native 1.21.11 server export");
+            require("26.1.2".equals(compound(compound(level, "Data"), "Version").getString("Name").orElseThrow())
+                    && compound(level, "Data").getInt("DataVersion").orElseThrow() == 4790,
+                    "Recipe fixture is not a native 26.1.2 server export");
             boolean nativeForge = false;
             for (var entry : compound(level, "fml").getList("LoadingModList").orElseThrow()) {
                 require(entry instanceof CompoundTag, "Malformed native loading-mod entry");
                 CompoundTag mod = (CompoundTag) entry;
                 if ("forge".equals(mod.getString("ModId").orElseThrow()))
-                    nativeForge = "61.1.0".equals(mod.getString("ModVersion").orElseThrow());
+                    nativeForge = "64.1.5".equals(mod.getString("ModVersion").orElseThrow());
             }
-            require(nativeForge, "Recipe fixture was not saved by Forge 61.1.0");
+            require(nativeForge, "Recipe fixture was not saved by Forge 64.1.5");
             CompoundTag saved = compound(compound(level, "fml"), "Registries");
             for (String key : List.of(ForgeRegistries.ITEMS.getRegistryName().toString(),
                     ForgeRegistries.BLOCKS.getRegistryName().toString())) {
                 require(!compound(saved, key).getList("ids").orElseThrow().isEmpty(), "Missing native server registry snapshot: " + key);
+                var expected = ForgeRegistry.Snapshot.read(compound(saved, key));
+                var active = registry.get(Identifier.parse(key));
+                require(active != null && active.ids.equals(expected.ids) && active.aliases.equals(expected.aliases)
+                        && active.blocked.equals(expected.blocked) && active.overrides.equals(expected.overrides),
+                        "Actual logged-in registry differs from native recipe export: " + key);
             }
-            for (String key : saved.keySet()) registry.put(Identifier.parse(key), ForgeRegistry.Snapshot.read(compound(saved, key)));
-            require(GameData.injectSnapshot(registry, false, false).isEmpty(), "Client lacks a server registry entry");
-            RegistryAccess registries = RegistryAccess.fromRegistryOfRegistries(BuiltInRegistries.REGISTRY);
+            require(minecraft.level != null && minecraft.getConnection() != null, "Recipe decoding requires actual native login");
+            report.addProperty("recipe_registry_ids_match_actual_login", true);
+            RegistryAccess registries = minecraft.level.registryAccess();
             List<Path> packets = files.filter(file -> file.getFileName().toString()
                     .matches("recipes-(normal|tech|apocalyptic)-sweep\\.bin")).sorted().toList();
             Set<String> packetNames = packets.stream().map(file -> file.getFileName().toString()).collect(Collectors.toSet());
@@ -260,8 +266,8 @@ private static void render(Minecraft minecraft, ClientRecipeBook book, ContextMa
                 RecipeButton button = new RecipeButton(() -> 0);
                 button.init(shown.get(i), false, page, context);
                 button.setPosition(x, y);
-                button.render(graphics, -1, -1, 1F);
-                graphics.drawString(minecraft.font, result(shown.get(i).getRecipes().getFirst(), context).getHoverName(),
+                button.extractRenderState(graphics, -1, -1, 1F);
+                graphics.text(minecraft.font, result(shown.get(i).getRecipes().getFirst(), context).getHoverName(),
                         x + 30, y + 8, 0xFFFFFFFF, false);
             }
         });
diff --git a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/TankVisualProbe.java b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/TankVisualProbe.java
index 2bbf1cab..f6621fdb 100644
--- a/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/TankVisualProbe.java
+++ b/test-rig/client-resources/java/zone/moddev/mc/advantageworks/client/TankVisualProbe.java
@@ -6,7 +6,7 @@
 import cyano.poweradvantage.api.simple.SimpleMachineGUI;
 import cyano.poweradvantage.api.simple.TileEntitySimpleFluidMachine;
 import io.netty.buffer.Unpooled;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.client.Minecraft;
@@ -78,15 +78,16 @@ private static void checkTank(Minecraft minecraft, GUIBlock block, String name,
         require(container.getType() == MachineGUIRegistry.TYPE && MachineGUIRegistry.TYPE != null,
                 "Tank GUI is not backed by the registered native container type");
         var screen = definition.new GUIContainer(container, inventory, net.minecraft.network.chat.Component.literal(name)) {
-            void renderTank(GuiGraphics graphics) { renderBg(graphics, 0F, -100, -100); }
+            void renderTank(GuiGraphicsExtractor graphics) { extractBackground(graphics, -100, -100, 0F); }
         };
         screen.init(WIDTH, HEIGHT);
         Identifier texture = Identifier.fromNamespaceAndPath("basepower", "textures/gui/container/" + art);
         BufferedImage empty = render(minecraft, screen::renderTank);
         BufferedImage emptyReference = reference(minecraft, texture, null, 0);
-        compare(name, "empty", 0, 0, empty, emptyReference, emptyReference, cases);
+        compareEvidence(name, "empty", 0, 0, empty, emptyReference, emptyReference, null, texture, cases);
         for (Sample sample : new Sample[] {
-                new Sample("water", net.minecraft.world.level.material.Fluids.WATER, "minecraft:block/water_still", 0x3F76E4),
+                new Sample("water", net.minecraft.world.level.material.Fluids.WATER, "minecraft:block/water_still",
+                        net.minecraft.client.renderer.BiomeColors.getAverageWaterColor(minecraft.level, minecraft.player.blockPosition())),
                 new Sample("lava", net.minecraft.world.level.material.Fluids.LAVA, "minecraft:block/lava_still", 0xFFFFFF),
                 new Sample("crude-oil", zone.moddev.mc.basepower.init.Fluids.crude_oil, "basepower:blocks/crude_oil_still", 0xFFFFFF),
                 new Sample("refined-oil", zone.moddev.mc.basepower.init.Fluids.refined_oil, "basepower:blocks/refined_oil_still", 0xFFFFFF) }) {
@@ -100,8 +101,11 @@ private static void checkTank(Minecraft minecraft, GUIBlock block, String name,
                 syncTank(server, client, packetLevel, registries);
                 require(client.getTank().getFluidAmount() == amount && client.getTank().getFluid().getFluid() == sample.fluid(),
                         name + " tank update lost fluid identity or amount");
-                compare(name, sample.name(), amount, rows, render(minecraft, screen::renderTank),
-                        reference(minecraft, texture, sample, rows), emptyReference, cases);
+                Sample wrong = new Sample(sample.name(), sample.fluid(), sample.name().equals("water")
+                        ? "minecraft:block/lava_still" : "minecraft:block/water_still", sample.tint());
+                compareEvidence(name, sample.name(), amount, rows, render(minecraft, screen::renderTank),
+                        reference(minecraft, texture, sample, rows), emptyReference,
+                        reference(minecraft, texture, wrong, rows), texture, cases);
                 require(handler.drain(amount, FluidAction.EXECUTE).getAmount() == amount, name + " tank did not drain");
                 syncTank(server, client, packetLevel, registries);
                 require(client.getTank().getFluidAmount() == 0, name + " tank update retained old fluid");
@@ -180,6 +184,9 @@ private static boolean floorVisible(final BlockState tank) {
 
     private static BufferedImage reference(Minecraft minecraft, Identifier texture, Sample sample, int rows) {
         return render(minecraft, graphics -> {
+            graphics.fillGradient(0, 0, WIDTH, HEIGHT, -1072689136, -804253680);
+            graphics.blit(net.minecraft.client.renderer.RenderPipelines.GUI_TEXTURED,
+                    SimpleMachineGUI.playerInventoryBox, 0, 150, 0, 132, 176, 90, 256, 256);
             graphics.blit(net.minecraft.client.renderer.RenderPipelines.GUI_TEXTURED,
                     texture, 0, PANEL_TOP, 0, 0, WIDTH, 128, 256, 256);
             if (sample != null) {
@@ -188,9 +195,14 @@ private static BufferedImage reference(Minecraft minecraft, Identifier texture,
                 require(sprite.contents().name().equals(Identifier.parse(sample.sprite())), "Missing reference sprite: " + sample.sprite());
                 int tint = sample.tint();
                 // Use Minecraft's full-sprite blit, not the production UV or clipped-tile calculations.
-                for (int y = GAUGE_Y + GAUGE_HEIGHT - rows; y < GAUGE_Y + GAUGE_HEIGHT; y += TILE) {
-                    graphics.blitSprite(net.minecraft.client.renderer.RenderPipelines.GUI_TEXTURED,
-                            sprite, GAUGE_X, y, TILE, TILE, tint | 0xFF000000);
+                graphics.enableScissor(GAUGE_X, GAUGE_Y + GAUGE_HEIGHT - rows, GAUGE_X + TILE, GAUGE_Y + GAUGE_HEIGHT);
+                try {
+                    for (int y = GAUGE_Y + GAUGE_HEIGHT - rows; y < GAUGE_Y + GAUGE_HEIGHT; y += TILE) {
+                        graphics.blitSprite(net.minecraft.client.renderer.RenderPipelines.GUI_TEXTURED,
+                                sprite, GAUGE_X, y, TILE, TILE, tint | 0xFF000000);
+                    }
+                } finally {
+                    graphics.disableScissor();
                 }
             }
             graphics.blit(net.minecraft.client.renderer.RenderPipelines.GUI_TEXTURED,
@@ -198,23 +210,53 @@ private static BufferedImage reference(Minecraft minecraft, Identifier texture,
         });
     }
 
+    private static void compareEvidence(String tank, String fluid, int amount, int rows, BufferedImage actual,
+            BufferedImage expected, BufferedImage empty, BufferedImage garbled, Identifier artwork, JsonArray cases) {
+        compare(tank, fluid, amount, rows, actual, expected, empty, cases);
+        JsonObject result = cases.get(cases.size() - 1).getAsJsonObject();
+        result.add("actual_frame", NativeGuiEvidence.frame(actual));
+        result.add("expected_frame", NativeGuiEvidence.frame(expected));
+        result.add("empty_frame", NativeGuiEvidence.frame(empty));
+        result.add("source_artwork", NativeGuiEvidence.source(Minecraft.getInstance(), artwork).proof().deepCopy());
+        int different = differences(actual, expected);
+        result.addProperty("whole_panel_different_pixels", different);
+        if (garbled != null) {
+            result.add("garbled_frame", NativeGuiEvidence.frame(garbled));
+            result.addProperty("blank_control_different_pixels", differences(empty, expected));
+            result.addProperty("garbled_control_different_pixels", differences(garbled, expected));
+            require(differences(empty, expected) > 0 && differences(garbled, expected) > 0,
+                    "Blank/garbled fluid control was accepted: " + tank + "/" + fluid + "/" + amount);
+        }
+        require(different == 0, "Whole tank background/frame/player panel differs, not just its gauge: " + tank + "/" + fluid);
+    }
+
+    private static int differences(BufferedImage actual, BufferedImage expected) {
+        require(actual.getWidth() == expected.getWidth() && actual.getHeight() == expected.getHeight(), "Mismatched framebuffer size");
+        int count = 0;
+        for (int y = 0; y < actual.getHeight(); y++) for (int x = 0; x < actual.getWidth(); x++)
+            if (actual.getRGB(x, y) != expected.getRGB(x, y)) count++;
+        return count;
+    }
+
     private static void compare(String tank, String fluid, int amount, int rows, BufferedImage actual,
             BufferedImage expected, BufferedImage empty, JsonArray cases) {
+        int scale = 2;
         int different = 0, visible = 0;
         int bottom = GAUGE_Y + GAUGE_HEIGHT;
-        for (int y = GAUGE_Y; y < bottom + 3; y++) {
-            for (int x = GAUGE_X; x < GAUGE_X + TILE; x++) {
-                int expectedPixel = y < bottom ? expected.getRGB(x, y) : empty.getRGB(x, y);
+        for (int y = GAUGE_Y * scale; y < (bottom + 3) * scale; y++) {
+            for (int x = GAUGE_X * scale; x < (GAUGE_X + TILE) * scale; x++) {
+                int expectedPixel = y < bottom * scale ? expected.getRGB(x, y) : empty.getRGB(x, y);
                 if (actual.getRGB(x, y) != expectedPixel) different++;
                 if (expectedPixel != empty.getRGB(x, y)) visible++;
             }
         }
-        require(visible >= rows * TILE / 2, "Fluid reference is blank or obscured: " + tank + " " + fluid);
+        require(visible >= rows * TILE * scale * scale / 2, "Fluid reference is blank or obscured: " + tank + " " + fluid);
         var result = new JsonObject();
         result.addProperty("tank", tank);
         result.addProperty("fluid", fluid);
         result.addProperty("amount_mb", amount);
         result.addProperty("fill_rows", rows);
+        result.addProperty("render_scale", scale);
         result.addProperty("different_pixels", different);
         cases.add(result);
         try {
@@ -226,8 +268,8 @@ private static void compare(String tank, String fluid, int amount, int rows, Buf
         }
     }
 
-    private static BufferedImage render(Minecraft minecraft, Consumer<GuiGraphics> draw) {
-        return NativeGuiProjection.render(minecraft, WIDTH, HEIGHT, 1, 0xFF000000, draw);
+    private static BufferedImage render(Minecraft minecraft, Consumer<GuiGraphicsExtractor> draw) {
+        return NativeGuiProjection.render(minecraft, WIDTH * 2, HEIGHT * 2, 2, 0xFF000000, draw);
     }
 
     private static void require(boolean condition, String message) {
diff --git a/test-rig/client-resources/resources/META-INF/mods.toml b/test-rig/client-resources/resources/META-INF/mods.toml
index 5ccf1790..0e49b981 100644
--- a/test-rig/client-resources/resources/META-INF/mods.toml
+++ b/test-rig/client-resources/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader="javafml"
-loaderVersion="[61,62)"
+loaderVersion="[64,65)"
 license="GPL-3.0-only"
 showAsResourcePack=false
 
@@ -12,20 +12,20 @@ description='''Build-only model, texture and translation checks. Never distribut
 [[dependencies.advantageclientresources]]
 modId="basepower"
 mandatory=true
-versionRange="[2.4.15.121111]"
+versionRange="[2.4.16.2601021]"
 ordering="AFTER"
 side="CLIENT"
 
 [[dependencies.advantageclientresources]]
 modId="forge"
 mandatory=true
-versionRange="[61.1.0]"
+versionRange="[64.1.5]"
 ordering="NONE"
 side="CLIENT"
 
 [[dependencies.advantageclientresources]]
 modId="minecraft"
 mandatory=true
-versionRange="[1.21.11]"
+versionRange="[26.1.2]"
 ordering="NONE"
 side="CLIENT"
diff --git a/test-rig/client-resources/resources/pack.mcmeta b/test-rig/client-resources/resources/pack.mcmeta
index c41e457a..ea24dda9 100644
--- a/test-rig/client-resources/resources/pack.mcmeta
+++ b/test-rig/client-resources/resources/pack.mcmeta
@@ -1,7 +1,7 @@
 {
   "pack": {
     "description": "Build-only Advantage client resource checks",
-    "min_format": [94,1],
-    "max_format": [94,1]
+    "min_format": [101,1],
+    "max_format": [101,1]
   }
 }
diff --git a/test-rig/client-resources/test/zone/moddev/mc/advantageworks/client/NativeExperimentalFixtureGateTest.java b/test-rig/client-resources/test/zone/moddev/mc/advantageworks/client/NativeExperimentalFixtureGateTest.java
new file mode 100644
index 00000000..8d451538
--- /dev/null
+++ b/test-rig/client-resources/test/zone/moddev/mc/advantageworks/client/NativeExperimentalFixtureGateTest.java
@@ -0,0 +1,97 @@
+package zone.moddev.mc.advantageworks.client;
+
+import com.mojang.blaze3d.platform.InputConstants;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.screens.BackupConfirmScreen;
+import net.minecraft.client.gui.screens.ConfirmScreen;
+import net.minecraft.client.gui.screens.DatapackLoadFailureScreen;
+import net.minecraft.client.input.KeyEvent;
+import net.minecraft.network.chat.Component;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.ListTag;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/** Real native components and button callbacks; no confirmation-screen or gameplay pass claim. */
+public class NativeExperimentalFixtureGateTest {
+    @Test public void actualNativeLoginCodecAcceptsTheBoundedProbeNameAndRejectsTheOldName() {
+        var buffer = new net.minecraft.network.FriendlyByteBuf(io.netty.buffer.Unpooled.buffer());
+        try {
+            var packet = new net.minecraft.network.protocol.login.ServerboundHelloPacket("AdvantageProbe", new java.util.UUID(1L, 2L));
+            var codec = net.minecraft.network.protocol.login.ServerboundHelloPacket.STREAM_CODEC;
+            codec.encode(buffer, packet);
+            assertEquals(packet, codec.decode(buffer));
+            assertFalse(buffer.isReadable());
+            buffer.clear();
+            try {
+                codec.encode(buffer, new net.minecraft.network.protocol.login.ServerboundHelloPacket("AdvantageClientProbe", new java.util.UUID(1L, 2L)));
+                fail("Oversize login name accepted");
+            } catch (io.netty.handler.codec.EncoderException expected) { assertTrue(expected.getMessage().contains("max 16")); }
+        } finally { buffer.release(); }
+    }
+
+    private static Button skip(AtomicInteger calls) {
+        return Button.builder(Component.translatable(NativeExperimentalFixtureGate.SKIP), button -> calls.incrementAndGet()).build();
+    }
+
+    @Test public void exactNativeSkipButtonReceivesTheApprovedKeyEvent() {
+        AtomicInteger calls = new AtomicInteger();
+        Button button = skip(calls);
+        Button chosen = NativeExperimentalFixtureGate.select(BackupConfirmScreen.class,
+                Component.translatable(NativeExperimentalFixtureGate.TITLE), List.of(button));
+        assertSame(button, chosen);
+        assertEquals(257, InputConstants.KEY_RETURN);
+        chosen.onPress(new KeyEvent(InputConstants.KEY_RETURN, 0, 0));
+        assertEquals(1, calls.get());
+    }
+
+    @Test public void otherScreensAndLookalikeTitlesAreNeverSelected() {
+        Button button = skip(new AtomicInteger());
+        for (Class<?> type : List.of(ConfirmScreen.class, DatapackLoadFailureScreen.class, Object.class))
+            assertNull(NativeExperimentalFixtureGate.select(type, Component.translatable(NativeExperimentalFixtureGate.TITLE), List.of(button)));
+        for (Component title : List.of(Component.literal("These worlds use Experimental Settings"),
+                Component.translatable("selectWorld.backupQuestion.customized"),
+                Component.translatable("selectWorld.backupQuestion.snapshot"),
+                Component.translatable(NativeExperimentalFixtureGate.TITLE, "extra"),
+                Component.translatable(NativeExperimentalFixtureGate.TITLE).append("extra")))
+            assertNull(NativeExperimentalFixtureGate.select(BackupConfirmScreen.class, title, List.of(button)));
+    }
+
+    @Test public void missingDuplicateHiddenAndDisabledSkipButtonsFailClosed() {
+        for (int mode = 0; mode < 4; mode++) {
+            Button button = skip(new AtomicInteger());
+            if (mode == 2) button.visible = false;
+            if (mode == 3) button.active = false;
+            List<Button> buttons = mode == 0 ? List.of() : mode == 1 ? List.of(button, skip(new AtomicInteger())) : List.of(button);
+            try {
+                NativeExperimentalFixtureGate.select(BackupConfirmScreen.class,
+                        Component.translatable(NativeExperimentalFixtureGate.TITLE), buttons);
+                fail("Unusable/ambiguous skip button accepted");
+            } catch (IllegalStateException expected) { assertTrue(expected.getMessage().contains("one visible active")); }
+        }
+    }
+
+    @Test public void copiedRootPermitsOnlyTheExactEmptyObsoleteBiomeIndexRemoval() {
+        CompoundTag source = new CompoundTag(), fml = new CompoundTag(), registries = new CompoundTag(), index = new CompoundTag();
+        index.put("aliases", new ListTag()); index.put("ids", new ListTag()); index.put("overrides", new ListTag());
+        index.putIntArray("blocked", new int[0]);
+        registries.put("minecraft:worldgen/biome", index); fml.put("Registries", registries); source.put("fml", fml);
+        CompoundTag data = new CompoundTag(); data.putInt("DataVersion", 4790); source.put("Data", data);
+        CompoundTag original = source.copy(), observed = source.copy();
+        assertEquals("UNCHANGED_TYPED_ROOT", NativeExperimentalFixtureGate.verifyCopiedLevel(source, observed));
+        observed.getCompound("fml").orElseThrow().getCompound("Registries").orElseThrow().remove("minecraft:worldgen/biome");
+        assertEquals("ONLY_FML_LOWERCASE_EMPTY_BIOME_INDEX_REMOVED", NativeExperimentalFixtureGate.verifyCopiedLevel(source, observed));
+        for (int mode = 0; mode < 4; mode++) {
+            CompoundTag wrong = observed.copy();
+            if (mode == 0) wrong.getCompound("Data").orElseThrow().putLong("DataVersion", 4790L);
+            if (mode == 1) wrong.getCompound("Data").orElseThrow().putInt("SpawnX", 1);
+            if (mode == 2) wrong.getCompound("fml").orElseThrow().putString("unknown", "change");
+            if (mode == 3) wrong.getCompound("fml").orElseThrow().getCompound("Registries").orElseThrow().put("other:index", new CompoundTag());
+            try { NativeExperimentalFixtureGate.verifyCopiedLevel(source, wrong); fail("Unproven typed NBT change accepted"); }
+            catch (IllegalStateException expected) { assertTrue(expected.getMessage().contains("differs beyond")); }
+        }
+        assertEquals(original, source);
+    }
+}
diff --git a/test-rig/client-resources/test/zone/moddev/mc/advantageworks/client/NativeFamilyAtlasRegistrationTest.java b/test-rig/client-resources/test/zone/moddev/mc/advantageworks/client/NativeFamilyAtlasRegistrationTest.java
new file mode 100644
index 00000000..b20d3520
--- /dev/null
+++ b/test-rig/client-resources/test/zone/moddev/mc/advantageworks/client/NativeFamilyAtlasRegistrationTest.java
@@ -0,0 +1,195 @@
+package zone.moddev.mc.advantageworks.client;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.mojang.serialization.JsonOps;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.security.MessageDigest;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.HexFormat;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Predicate;
+import javax.imageio.ImageIO;
+import net.minecraft.SharedConstants;
+import net.minecraft.client.renderer.texture.atlas.SpriteSource;
+import net.minecraft.client.renderer.texture.atlas.SpriteSources;
+import net.minecraft.client.renderer.texture.atlas.sources.DirectoryLister;
+import net.minecraft.client.renderer.texture.atlas.sources.SingleFile;
+import net.minecraft.client.resources.metadata.animation.AnimationMetadataSection;
+import net.minecraft.client.resources.metadata.animation.FrameSize;
+import net.minecraft.client.resources.model.sprite.TextureSlots;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.Identifier;
+import net.minecraft.server.Bootstrap;
+import net.minecraft.server.packs.PackLocationInfo;
+import net.minecraft.server.packs.PackResources;
+import net.minecraft.server.packs.PackType;
+import net.minecraft.server.packs.PathPackResources;
+import net.minecraft.server.packs.repository.PackSource;
+import net.minecraft.server.packs.resources.MultiPackResourceManager;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/** Native codec/source execution without a GPU; actual rendering remains a separate gate. */
+public class NativeFamilyAtlasRegistrationTest {
+    private static final List<String> OWNERS = List.of("basepower", "basesteam", "baseelectric");
+    private static final Map<String, Path> ROOTS = Map.of(
+            "basepower", Path.of("src/main/resources"),
+            "basesteam", Path.of("../SteamAdvantage/SteamAdvantage/src/main/resources"),
+            "baseelectric", Path.of("../ElectricAdvantage/ElectricAdvantage/src/main/resources"));
+    private static final Map<String, List<Integer>> COUNTS = Map.of(
+            "basepower", List.of(34, 6), "basesteam", List.of(24, 3), "baseelectric", List.of(49, 17));
+
+    @BeforeClass public static void nativeBootstrap() {
+        SharedConstants.tryDetectVersion();
+        Bootstrap.bootStrap();
+        assertEquals("26.1.2", SharedConstants.getCurrentVersion().name());
+        var sample = JsonParser.parseString("{\"type\":\"minecraft:single\",\"resource\":\"minecraft:block/stone\"}");
+        if (SpriteSources.CODEC.parse(JsonOps.INSTANCE, sample).error().isPresent()) SpriteSources.bootstrap();
+        assertTrue(SpriteSources.CODEC.parse(JsonOps.INSTANCE, sample).result().isPresent());
+    }
+
+    @Test public void allSixFilesDecodeAsExactOwnedNativeSinglesWithCompatibleFrameSizes() throws Exception {
+        Set<Identifier> all = new HashSet<>();
+        for (String owner : OWNERS) for (String atlas : List.of("blocks", "items")) {
+            List<SpriteSource> sources = validate(owner, atlas, document(owner, atlas));
+            assertEquals(COUNTS.get(owner).get(atlas.equals("blocks") ? 0 : 1).intValue(), sources.size());
+            for (SpriteSource source : sources) assertTrue("Duplicate cross-atlas sprite", all.add(((SingleFile) source).resourceId()));
+        }
+    }
+
+    @Test public void everyModelMaterialAndManualFluidOrRendererSpriteIsPresent() throws Exception {
+        Set<Identifier> registered = registrations();
+        for (Path root : ROOTS.values()) try (var paths = Files.walk(root.resolve("assets"))) {
+            for (Path path : paths.filter(p -> p.toString().contains("models") && p.toString().endsWith(".json")).toList()) {
+                JsonObject model = JsonParser.parseString(Files.readString(path)).getAsJsonObject();
+                if (!model.has("textures")) continue;
+                JsonObject textures = model.getAsJsonObject("textures");
+                TextureSlots.parseTextureMap(textures);
+                for (JsonElement value : textures.asMap().values()) {
+                    if (value.isJsonPrimitive() && value.getAsString().startsWith("#")) continue;
+                    Identifier id = Identifier.parse(value.isJsonObject() ? value.getAsJsonObject().get("sprite").getAsString() : value.getAsString());
+                    if (ROOTS.containsKey(id.getNamespace())) assertTrue("Missing model material " + id + " in " + path, registered.contains(id));
+                }
+            }
+        }
+        for (String id : List.of("basepower:blocks/crude_oil_still", "basepower:blocks/crude_oil_flow",
+                "basepower:blocks/refined_oil_still", "basepower:blocks/refined_oil_flow",
+                "basesteam:entity/drill_bit", "baseelectric:entity/laser_turret")) assertTrue(id, registered.contains(Identifier.parse(id)));
+    }
+
+    @Test public void effectiveNativeSourceExecutionIsIndependentOfModPackOrder() throws Exception {
+        try (var resources = resources()) {
+            for (String atlas : List.of("blocks", "items")) {
+                Set<Identifier> expected = new HashSet<>();
+                for (String owner : OWNERS) for (SpriteSource source : validate(owner, atlas, document(owner, atlas))) expected.add(((SingleFile) source).resourceId());
+                for (List<String> order : List.of(OWNERS, List.of("baseelectric", "basesteam", "basepower"),
+                        List.of("basesteam", "basepower", "baseelectric"), List.of("basepower", "baseelectric", "basesteam"),
+                        List.of("baseelectric", "basepower", "basesteam"), List.of("basesteam", "baseelectric", "basepower"))) {
+                    try (Collector output = new Collector()) {
+                        for (String owner : order) for (SpriteSource source : validate(owner, atlas, document(owner, atlas))) source.run(resources, output);
+                        assertEquals(expected, output.loaders.keySet());
+                    }
+                }
+            }
+        }
+    }
+
+    @Test public void nativeDirectoryCodecIgnoresInventedNamespaceAndReallyImportsForeignBeam() throws Exception {
+        var unsafe = JsonParser.parseString("{\"source\":\"materials\",\"prefix\":\"materials/\",\"namespace\":\"basepower\"}");
+        var directory = DirectoryLister.MAP_CODEC.codec().parse(JsonOps.INSTANCE, unsafe).getOrThrow();
+        try (var resources = resources(); Collector output = new Collector()) {
+            directory.run(resources, output);
+            assertTrue(output.loaders.containsKey(Identifier.parse("baseelectric:materials/laser_beam")));
+        }
+        JsonObject mutated = document("basepower", "blocks").deepCopy();
+        var source = unsafe.getAsJsonObject(); source.addProperty("type", "minecraft:directory");
+        mutated.getAsJsonArray("sources").add(source);
+        assertThrows(IllegalArgumentException.class, () -> validate("basepower", "blocks", mutated));
+    }
+
+    @Test public void foreignMissingTinyAndAliasedSpriteMutationsCannotPass() throws Exception {
+        for (String value : List.of("baseelectric:materials/laser_beam", "basepower:blocks/definitely_missing_control")) {
+            JsonObject mutated = document("basepower", "blocks").deepCopy();
+            mutated.getAsJsonArray("sources").get(0).getAsJsonObject().addProperty("resource", value);
+            assertThrows(IllegalArgumentException.class, () -> validate("basepower", "blocks", mutated));
+        }
+        JsonObject tiny = document("baseelectric", "blocks").deepCopy();
+        tiny.getAsJsonArray("sources").get(0).getAsJsonObject().addProperty("resource", "baseelectric:materials/laser_beam");
+        assertThrows(IllegalArgumentException.class, () -> validate("baseelectric", "blocks", tiny));
+        JsonObject renamed = document("basepower", "blocks").deepCopy();
+        renamed.getAsJsonArray("sources").get(0).getAsJsonObject().addProperty("sprite", "basepower:renamed_control");
+        assertThrows(IllegalArgumentException.class, () -> validate("basepower", "blocks", renamed));
+        assertTrue(SpriteSources.CODEC.parse(JsonOps.INSTANCE, JsonParser.parseString("{\"type\":\"minecraft:unknown_control\"}")).error().isPresent());
+    }
+
+    @Test public void directBeamKeepsItsOriginalPixelsButIsNotAnAtlasSprite() throws Exception {
+        var beam = ROOTS.get("baseelectric").resolve("assets/baseelectric/textures/materials/laser_beam.png");
+        assertEquals("6730B89B451F837718F9D9FE6BEC99EB415F6BC9EA7106E9C7F166A6C2D7AA12",
+                HexFormat.of().withUpperCase().formatHex(MessageDigest.getInstance("SHA-256").digest(Files.readAllBytes(beam))));
+        assertFalse(registrations().contains(Identifier.parse("baseelectric:materials/laser_beam")));
+    }
+
+    private static JsonObject document(String owner, String atlas) throws Exception {
+        return JsonParser.parseString(Files.readString(ROOTS.get(owner).resolve("assets/minecraft/atlases/" + atlas + ".json"))).getAsJsonObject();
+    }
+
+    private static List<SpriteSource> validate(String owner, String atlas, JsonObject document) throws Exception {
+        check(document.keySet().equals(Set.of("sources")), "Unexpected atlas fields");
+        List<SpriteSource> sources = SpriteSources.FILE_CODEC.parse(JsonOps.INSTANCE, document).getOrThrow();
+        Set<Identifier> seen = new HashSet<>();
+        for (int index = 0; index < sources.size(); index++) {
+            var raw = document.getAsJsonArray("sources").get(index).getAsJsonObject();
+            check(raw.keySet().equals(Set.of("type", "resource")) && raw.get("type").getAsString().equals("minecraft:single"), "Only explicit native singles are allowed");
+            check(sources.get(index) instanceof SingleFile, "Global source type is forbidden");
+            SingleFile single = (SingleFile) sources.get(index);
+            Identifier id = single.resourceId();
+            check(id.getNamespace().equals(owner) && single.spriteId().isEmpty() && seen.add(id), "Foreign/renamed/duplicate sprite");
+            Path texture = ROOTS.get(owner).resolve("assets/" + owner + "/textures/" + id.getPath() + ".png");
+            check(Files.isRegularFile(texture), "Missing sprite " + id);
+            var image = ImageIO.read(texture.toFile());
+            check(image != null, "Invalid PNG " + id);
+            FrameSize size = new FrameSize(image.getWidth(), image.getHeight());
+            Path metadata = Path.of(texture + ".mcmeta");
+            if (Files.isRegularFile(metadata)) {
+                JsonObject data = JsonParser.parseString(Files.readString(metadata)).getAsJsonObject();
+                if (data.has("animation")) size = AnimationMetadataSection.CODEC.parse(JsonOps.INSTANCE, data.get("animation")).getOrThrow().calculateFrameSize(image.getWidth(), image.getHeight());
+            }
+            check(!atlas.equals("blocks") || Math.max(size.width(), size.height()) >= 16, "Default native mip4 incompatible with " + id);
+        }
+        return sources;
+    }
+
+    private static Set<Identifier> registrations() throws Exception {
+        Set<Identifier> result = new HashSet<>();
+        for (String owner : OWNERS) for (String atlas : List.of("blocks", "items")) for (SpriteSource source : validate(owner, atlas, document(owner, atlas))) result.add(((SingleFile) source).resourceId());
+        return result;
+    }
+
+    private static MultiPackResourceManager resources() {
+        List<PackResources> packs = new ArrayList<>();
+        for (String owner : OWNERS) packs.add(new PathPackResources(new PackLocationInfo(owner, Component.literal(owner), PackSource.BUILT_IN, Optional.empty()), ROOTS.get(owner)));
+        return new MultiPackResourceManager(PackType.CLIENT_RESOURCES, packs);
+    }
+
+    private static void check(boolean condition, String message) {
+        if (!condition) throw new IllegalArgumentException(message);
+    }
+
+    private static final class Collector implements SpriteSource.Output, AutoCloseable {
+        private final Map<Identifier, SpriteSource.DiscardableLoader> loaders = new LinkedHashMap<>();
+        @Override public void add(Identifier id, SpriteSource.DiscardableLoader loader) {
+            check(loaders.putIfAbsent(id, loader) == null, "Duplicate effective sprite " + id);
+        }
+        @Override public void removeAll(Predicate<Identifier> predicate) { loaders.keySet().removeIf(predicate); }
+        @Override public void close() { loaders.values().forEach(SpriteSource.DiscardableLoader::discard); }
+    }
+}
diff --git a/test-rig/client-resources/test/zone/moddev/mc/advantageworks/client/NativeGuiSourceSamplingTest.java b/test-rig/client-resources/test/zone/moddev/mc/advantageworks/client/NativeGuiSourceSamplingTest.java
new file mode 100644
index 00000000..19dc359a
--- /dev/null
+++ b/test-rig/client-resources/test/zone/moddev/mc/advantageworks/client/NativeGuiSourceSamplingTest.java
@@ -0,0 +1,28 @@
+package zone.moddev.mc.advantageworks.client;
+
+import java.awt.image.BufferedImage;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/** Independent device-pixel centers for the native blit's fixed 256-logical UV denominator. */
+public class NativeGuiSourceSamplingTest {
+    private static BufferedImage source(int size) {
+        BufferedImage image = new BufferedImage(size, size, BufferedImage.TYPE_INT_RGB);
+        for (int y = 0; y < size; y++) for (int x = 0; x < size; x++) image.setRGB(x, y, 0xFF000000 | x << 9 | y);
+        return image;
+    }
+
+    @Test public void source512AtScale2PreservesFourDistinctNativePhysicalTexels() {
+        BufferedImage image = source(512);
+        for (int dy = 0; dy < 2; dy++) for (int dx = 0; dx < 2; dx++)
+            assertEquals(image.getRGB(142 + dx, 86 + dy), MachineGuiLayoutProbe.texel(image, 71, 43, dx, dy, 2));
+        assertNotEquals(MachineGuiLayoutProbe.texel(image, 71, 43, 0, 0, 2), MachineGuiLayoutProbe.texel(image, 71, 43, 1, 1, 2));
+        assertEquals(image.getRGB(143, 87), MachineGuiLayoutProbe.texel(image, 71, 43, 0, 0, 1));
+    }
+
+    @Test public void source256AtScale2RepeatsTheSameTexelWithoutChangingLogicalUvs() {
+        BufferedImage image = source(256);
+        for (int dy = 0; dy < 2; dy++) for (int dx = 0; dx < 2; dx++)
+            assertEquals(image.getRGB(71, 43), MachineGuiLayoutProbe.texel(image, 71, 43, dx, dy, 2));
+    }
+}
diff --git a/test-rig/client-resources/test/zone/moddev/mc/advantageworks/client/NativeRecipeBookGroupingTest.java b/test-rig/client-resources/test/zone/moddev/mc/advantageworks/client/NativeRecipeBookGroupingTest.java
index 70e0bbe9..2785db90 100644
--- a/test-rig/client-resources/test/zone/moddev/mc/advantageworks/client/NativeRecipeBookGroupingTest.java
+++ b/test-rig/client-resources/test/zone/moddev/mc/advantageworks/client/NativeRecipeBookGroupingTest.java
@@ -146,7 +146,8 @@ private static List<ClientboundRecipeBookAddPacket.Entry> entries(boolean split,
 
     private static ClientboundRecipeBookAddPacket.Entry entry(int id, int group, ItemStack output) {
         var display = new ShapedCraftingRecipeDisplay(1, 1, List.of(new SlotDisplay.ItemSlotDisplay(Items.STICK)),
-                new SlotDisplay.ItemStackSlotDisplay(output), new SlotDisplay.ItemSlotDisplay(Items.CRAFTING_TABLE));
+                new SlotDisplay.ItemStackSlotDisplay(net.minecraft.world.item.ItemStackTemplate.fromNonEmptyStack(output)),
+                new SlotDisplay.ItemSlotDisplay(Items.CRAFTING_TABLE));
         return new ClientboundRecipeBookAddPacket.Entry(new RecipeDisplayEntry(new RecipeDisplayId(id), display,
                 OptionalInt.of(group), RecipeBookCategories.CRAFTING_MISC, Optional.empty()), false, false);
     }
diff --git a/test-rig/gradle.properties b/test-rig/gradle.properties
index 6ebada88..edb93fbf 100644
--- a/test-rig/gradle.properties
+++ b/test-rig/gradle.properties
@@ -1,10 +1,11 @@
 org.gradle.jvmargs=-Xmx2G
 org.gradle.daemon=false
 
-minecraft_version=1.21.11
-forge_version=61.1.0
+minecraft_version=26.1.2
+forge_version=64.1.5
 mapping_channel=official
-mapping_version=1.21.11
-mcp_version=20251223.124241
-harness_version=1.1.5.121111
-works_power_sha256=C98D2CF163BE2480D9AFB0023BBD2D92D401AE0D50BEF73191235BF3F83774A7
+mapping_version=26.1.2
+mcp_version=20260409.101008
+harness_version=1.1.6.2601021
+# Local unqualified Power rebuilt against the released OreSpawn 4.1.1.
+works_power_sha256=23ABCC1FEFDAA6988BF709437EB165C8948C757E773ADAB738092EB93CA8D2B0
diff --git a/test-rig/migration/fixtures/native2612-client-netty-java25.txt b/test-rig/migration/fixtures/native2612-client-netty-java25.txt
new file mode 100644
index 00000000..720c73d8
--- /dev/null
+++ b/test-rig/migration/fixtures/native2612-client-netty-java25.txt
@@ -0,0 +1,47 @@
+[12Nov2026 06:49:14.263] [Server thread/DEBUG] [io.netty.util.internal.CleanerJava9/]: java.nio.ByteBuffer.cleaner(): unavailable
+java.lang.UnsupportedOperationException: sun.misc.Unsafe unavailable
+	at SECURE-BOOTSTRAP/io.netty.common@4.2.7.Final/io.netty.util.internal.CleanerJava9.<clinit>(CleanerJava9.java:70) ~[netty-common-4.2.7.Final.jar:4.2.7.Final]
+	at SECURE-BOOTSTRAP/io.netty.common@4.2.7.Final/io.netty.util.internal.PlatformDependent.<clinit>(PlatformDependent.java:198) ~[netty-common-4.2.7.Final.jar:4.2.7.Final]
+	at SECURE-BOOTSTRAP/io.netty.buffer@4.2.7.Final/io.netty.buffer.UnpooledByteBufAllocator.<clinit>(UnpooledByteBufAllocator.java:38) ~[netty-buffer-4.2.7.Final.jar:4.2.7.Final]
+	at SECURE-BOOTSTRAP/io.netty.buffer@4.2.7.Final/io.netty.buffer.Unpooled.<clinit>(Unpooled.java:75) ~[netty-buffer-4.2.7.Final.jar:4.2.7.Final]
+	at TRANSFORMER/net.minecraftforge.forge@64.1.5/net.minecraftforge.network.ServerStatusPing.toBuf(ServerStatusPing.java:156) ~[forge-26.1.2-64.1.5.jar:?]
+	at TRANSFORMER/net.minecraftforge.forge@64.1.5/net.minecraftforge.network.ServerStatusPing.lambda$static$1(ServerStatusPing.java:88) ~[forge-26.1.2-64.1.5.jar:?]
+	at SECURE-BOOTSTRAP/datafixerupper@9.0.19/com.mojang.serialization.codecs.RecordCodecBuilder$Instance.lambda$ap2$4(RecordCodecBuilder.java:217) ~[datafixerupper-9.0.19.jar!/:?]
+	at SECURE-BOOTSTRAP/datafixerupper@9.0.19/com.mojang.serialization.codecs.RecordCodecBuilder$Instance.lambda$ap3$6(RecordCodecBuilder.java:284) ~[datafixerupper-9.0.19.jar!/:?]
+	at SECURE-BOOTSTRAP/datafixerupper@9.0.19/com.mojang.serialization.codecs.RecordCodecBuilder$2.encode(RecordCodecBuilder.java:112) ~[datafixerupper-9.0.19.jar!/:?]
+	at SECURE-BOOTSTRAP/datafixerupper@9.0.19/com.mojang.serialization.MapCodec$MapCodecCodec.encode(MapCodec.java:164) ~[datafixerupper-9.0.19.jar!/:?]
+	at SECURE-BOOTSTRAP/datafixerupper@9.0.19/com.mojang.serialization.Encoder.encodeStart(Encoder.java:14) ~[datafixerupper-9.0.19.jar!/:?]
+	at SECURE-BOOTSTRAP/datafixerupper@9.0.19/com.mojang.serialization.codecs.OptionalFieldCodec.encode(OptionalFieldCodec.java:44) ~[datafixerupper-9.0.19.jar!/:?]
+	at SECURE-BOOTSTRAP/datafixerupper@9.0.19/com.mojang.serialization.codecs.OptionalFieldCodec.encode(OptionalFieldCodec.java:17) ~[datafixerupper-9.0.19.jar!/:?]
+	at SECURE-BOOTSTRAP/datafixerupper@9.0.19/com.mojang.serialization.codecs.RecordCodecBuilder$Instance$6.encode(RecordCodecBuilder.java:298) ~[datafixerupper-9.0.19.jar!/:?]
+	at SECURE-BOOTSTRAP/datafixerupper@9.0.19/com.mojang.serialization.codecs.RecordCodecBuilder$2.encode(RecordCodecBuilder.java:112) ~[datafixerupper-9.0.19.jar!/:?]
+	at SECURE-BOOTSTRAP/datafixerupper@9.0.19/com.mojang.serialization.MapCodec$MapCodecCodec.encode(MapCodec.java:164) ~[datafixerupper-9.0.19.jar!/:?]
+	at SECURE-BOOTSTRAP/datafixerupper@9.0.19/com.mojang.serialization.Encoder.encodeStart(Encoder.java:14) ~[datafixerupper-9.0.19.jar!/:?]
+	at TRANSFORMER/minecraft@26.1.2/net.minecraft.server.MinecraftServer.resetStatusCache(MinecraftServer.java:2263) [forge-26.1.2-64.1.5.jar%230!/:?]
+	at TRANSFORMER/minecraft@26.1.2/net.minecraft.server.MinecraftServer.runServer(MinecraftServer.java:746) [forge-26.1.2-64.1.5.jar%230!/:?]
+	at TRANSFORMER/minecraft@26.1.2/net.minecraft.server.MinecraftServer.lambda$spin$0(MinecraftServer.java:300) [forge-26.1.2-64.1.5.jar%230!/:?]
+	at java.base/java.lang.Thread.run(Thread.java:1474) [?:?]
+[12Nov2026 06:49:14.265] [Server thread/DEBUG] [io.netty.util.internal.CleanerJava24Linker/]: java.nio.ByteBuffer.cleaner(): unavailable
+java.lang.UnsupportedOperationException: Native access (restricted methods) is not enabled for the io.netty.common module.
+	at SECURE-BOOTSTRAP/io.netty.common@4.2.7.Final/io.netty.util.internal.CleanerJava24Linker.<clinit>(CleanerJava24Linker.java:78) ~[netty-common-4.2.7.Final.jar:4.2.7.Final]
+	at SECURE-BOOTSTRAP/io.netty.common@4.2.7.Final/io.netty.util.internal.PlatformDependent.<clinit>(PlatformDependent.java:200) ~[netty-common-4.2.7.Final.jar:4.2.7.Final]
+	at SECURE-BOOTSTRAP/io.netty.buffer@4.2.7.Final/io.netty.buffer.UnpooledByteBufAllocator.<clinit>(UnpooledByteBufAllocator.java:38) ~[netty-buffer-4.2.7.Final.jar:4.2.7.Final]
+	at SECURE-BOOTSTRAP/io.netty.buffer@4.2.7.Final/io.netty.buffer.Unpooled.<clinit>(Unpooled.java:75) ~[netty-buffer-4.2.7.Final.jar:4.2.7.Final]
+	at TRANSFORMER/net.minecraftforge.forge@64.1.5/net.minecraftforge.network.ServerStatusPing.toBuf(ServerStatusPing.java:156) ~[forge-26.1.2-64.1.5.jar:?]
+	at TRANSFORMER/net.minecraftforge.forge@64.1.5/net.minecraftforge.network.ServerStatusPing.lambda$static$1(ServerStatusPing.java:88) ~[forge-26.1.2-64.1.5.jar:?]
+	at SECURE-BOOTSTRAP/datafixerupper@9.0.19/com.mojang.serialization.codecs.RecordCodecBuilder$Instance.lambda$ap2$4(RecordCodecBuilder.java:217) ~[datafixerupper-9.0.19.jar!/:?]
+	at SECURE-BOOTSTRAP/datafixerupper@9.0.19/com.mojang.serialization.codecs.RecordCodecBuilder$Instance.lambda$ap3$6(RecordCodecBuilder.java:284) ~[datafixerupper-9.0.19.jar!/:?]
+	at SECURE-BOOTSTRAP/datafixerupper@9.0.19/com.mojang.serialization.codecs.RecordCodecBuilder$2.encode(RecordCodecBuilder.java:112) ~[datafixerupper-9.0.19.jar!/:?]
+	at SECURE-BOOTSTRAP/datafixerupper@9.0.19/com.mojang.serialization.MapCodec$MapCodecCodec.encode(MapCodec.java:164) ~[datafixerupper-9.0.19.jar!/:?]
+	at SECURE-BOOTSTRAP/datafixerupper@9.0.19/com.mojang.serialization.Encoder.encodeStart(Encoder.java:14) ~[datafixerupper-9.0.19.jar!/:?]
+	at SECURE-BOOTSTRAP/datafixerupper@9.0.19/com.mojang.serialization.codecs.OptionalFieldCodec.encode(OptionalFieldCodec.java:44) ~[datafixerupper-9.0.19.jar!/:?]
+	at SECURE-BOOTSTRAP/datafixerupper@9.0.19/com.mojang.serialization.codecs.OptionalFieldCodec.encode(OptionalFieldCodec.java:17) ~[datafixerupper-9.0.19.jar!/:?]
+	at SECURE-BOOTSTRAP/datafixerupper@9.0.19/com.mojang.serialization.codecs.RecordCodecBuilder$Instance$6.encode(RecordCodecBuilder.java:298) ~[datafixerupper-9.0.19.jar!/:?]
+	at SECURE-BOOTSTRAP/datafixerupper@9.0.19/com.mojang.serialization.codecs.RecordCodecBuilder$2.encode(RecordCodecBuilder.java:112) ~[datafixerupper-9.0.19.jar!/:?]
+	at SECURE-BOOTSTRAP/datafixerupper@9.0.19/com.mojang.serialization.MapCodec$MapCodecCodec.encode(MapCodec.java:164) ~[datafixerupper-9.0.19.jar!/:?]
+	at SECURE-BOOTSTRAP/datafixerupper@9.0.19/com.mojang.serialization.Encoder.encodeStart(Encoder.java:14) ~[datafixerupper-9.0.19.jar!/:?]
+	at TRANSFORMER/minecraft@26.1.2/net.minecraft.server.MinecraftServer.resetStatusCache(MinecraftServer.java:2263) [forge-26.1.2-64.1.5.jar%230!/:?]
+	at TRANSFORMER/minecraft@26.1.2/net.minecraft.server.MinecraftServer.runServer(MinecraftServer.java:746) [forge-26.1.2-64.1.5.jar%230!/:?]
+	at TRANSFORMER/minecraft@26.1.2/net.minecraft.server.MinecraftServer.lambda$spin$0(MinecraftServer.java:300) [forge-26.1.2-64.1.5.jar%230!/:?]
+	at java.base/java.lang.Thread.run(Thread.java:1474) [?:?]
+[12Nov2026 06:49:14.267] [Server thread/DEBUG] [io.netty.util.internal.CleanerJava25/]: java.nio.ByteBuffer.cleaner(): available
diff --git a/test-rig/migration/native2612.py b/test-rig/migration/native2612.py
new file mode 100644
index 00000000..065e589f
--- /dev/null
+++ b/test-rig/migration/native2612.py
@@ -0,0 +1,451 @@
+"""Forge 64.1.5 server custody and process control; historical engines stay unchanged."""
+
+import argparse
+import hashlib
+import json
+import os
+from pathlib import Path
+import re
+import socket
+import subprocess
+from zipfile import ZipFile
+
+from matrix import digest, stage as stage_server, write_json
+from native117 import jar_identity, require_disjoint
+from native117_code import NativeLaunch, code_files
+from native117_interop import mark_runtime
+from native1201 import FLAT_SETTINGS
+from native12111 import (compat_tile_nbt, compat_tile_data, parse_endurance_snapshot,
+                         log_findings as previous_log_findings)
+from native2612_platform_diagnostics import COMMON_JAR_SHA, classify as classify_platform_log
+
+
+RIG = Path(__file__).resolve().parents[1]
+MINECRAFT = "26.1.2"
+FORGE = "64.1.5"
+MCP = "20260409.101008"
+FORGE_VERSION = f"{MINECRAFT}-{FORGE}"
+SHIM = f"forge-{FORGE_VERSION}-shim.jar"
+SHIM_SHA = "0C74CB2A8E7A71AEB7055396C1E25864584A2D837D7DD42136A06D0B41ADD545"
+INSTALLER_SHA = "6E01323837051176762BD466340A601DA122F179FE6A00AC616E05429AE07648"
+JAVA_SHA = "D5F1B9E03E298EBFB04D2326ECC1E2AF3E6817F9B4D7F9F151FE856D56975650"
+JAVA_VERSION = "25.0.3+9"
+LOGGING_JAR_SHA = "7299C7AF7AE427C44C9AE83A92508F7BB09764DC30D21A4E8E86C7FFF2B0C4BC"
+LOGGING_XML_SHA = "9680BAF9F936C8CD009CD3A8D75253B476FCA9C316F8D5B5C51700053BEAE440"
+LAUNCHER = f"libraries/net/minecraftforge/forge/{FORGE_VERSION}/" + (
+    "win_args.txt" if os.name == "nt" else "unix_args.txt")
+INVENTORY = "native2612-code-inventory.json"
+EXPLORATORY = "EXPLORATORY_UNQUALIFIED"
+VERSIONS = {"basepower": "2.4.16.2601021", "advantageworkstest": "1.1.6.2601021",
+            "basesteam": "2.2.17.2601021", "baseelectric": "2.2.17.2601021",
+            "basemetals": "3.1.2.2601021", "orespawn": "4.1.1.2601021"}
+
+
+def read_json(path):
+    def unique(pairs):
+        result = {}
+        for key, value in pairs:
+            if key in result:
+                raise ValueError("Duplicate JSON field: " + key)
+            result[key] = value
+        return result
+    path = Path(path)
+    if path.stat().st_size > 16 * 1024 * 1024:
+        raise ValueError("Unbounded input document: " + str(path))
+    return json.loads(path.read_text(encoding="utf-8-sig"), object_pairs_hook=unique)
+
+
+def validate_hash(path, expected):
+    if not isinstance(expected, str) or not re.fullmatch(r"[A-Fa-f0-9]{64}", expected):
+        raise ValueError("An exact SHA-256 pin is required: " + str(path))
+    if digest(path) != expected.upper():
+        raise AssertionError("Artifact SHA-256 mismatch: " + str(path))
+
+
+def native_launch_environment(runtime=None, label=None, *, diagnostic_environment=None,
+                              diagnostic_environment_sha256=None):
+    environment = os.environ.copy()
+    for key in ("JAVA_TOOL_OPTIONS", "JDK_JAVA_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH"):
+        if environment.get(key, "").strip():
+            raise ValueError("Forge 64 cannot inherit launch options from " + key)
+    if diagnostic_environment is None and diagnostic_environment_sha256 is None:
+        return environment
+    if diagnostic_environment is None or diagnostic_environment_sha256 is None:
+        raise ValueError("Diagnostic manifest and exact SHA-256 must be supplied together")
+    if runtime is None or not isinstance(label, str) or not re.fullmatch(r"[A-Za-z0-9_-][A-Za-z0-9_.-]{0,99}", label):
+        raise ValueError("Diagnostic launch needs a bounded runtime and label")
+    runtime = Path(runtime).resolve(strict=True)
+    path = Path(diagnostic_environment).resolve(strict=True)
+    if path.stat().st_size > 16384:
+        raise ValueError("Unbounded diagnostic manifest")
+    validate_hash(path, diagnostic_environment_sha256)
+    document = read_json(path)
+    if (set(document) != {"format", "purpose", "runtime", "label", "properties"}
+            or type(document["format"]) is not int or document["format"] != 1
+            or document["purpose"] != "NATIVE64_MIXIN_EXPORT_DIAGNOSTIC"
+            or document["runtime"] != str(runtime) or document["label"] != label):
+        raise ValueError("Diagnostic manifest is not bound to this native64 launch")
+    properties = document["properties"]
+    allowed = {"mixin.debug.export", "mixin.debug.export.decompile", "mixin.debug.export.filter"}
+    if (not isinstance(properties, dict) or set(properties) - allowed
+            or properties.get("mixin.debug.export") is not True):
+        raise ValueError("Only explicitly sealed mixin export properties are permitted")
+    options = ["-Dmixin.debug.export=true"]
+    if "mixin.debug.export.decompile" in properties:
+        value = properties["mixin.debug.export.decompile"]
+        if type(value) is not bool:
+            raise ValueError("Mixin decompile must be boolean")
+        options.append("-Dmixin.debug.export.decompile=" + str(value).lower())
+    if "mixin.debug.export.filter" in properties:
+        value = properties["mixin.debug.export.filter"]
+        if not isinstance(value, str) or not re.fullmatch(r"[A-Za-z0-9_.$*?]{1,256}", value):
+            raise ValueError("Unsafe mixin export filter")
+        options.append("-Dmixin.debug.export.filter=" + value)
+    injected = {"JAVA_TOOL_OPTIONS": " ".join(options)}
+    with (runtime / f"native64-launch-environment-{label}.json").open("x", encoding="utf-8") as output:
+        json.dump(dict(status="DIAGNOSTIC_NOT_QUALIFIED", qualificationAllowed=False,
+                       manifestSha256=diagnostic_environment_sha256.upper(), manifest=document,
+                       environment=injected), output, indent=2, sort_keys=True)
+    environment.update(injected)
+    return environment
+
+
+def java25(executable):
+    java = Path(executable).resolve(strict=True)
+    validate_hash(java, JAVA_SHA)
+    result = subprocess.run([str(java), "-XX:+UseCompactObjectHeaders", "-version"],
+                            env=native_launch_environment(), capture_output=True, text=True,
+                            check=True, timeout=30)
+    version = (result.stderr or result.stdout).strip()
+    if not re.search(r'version "25\.0\.3"', version) or "25.0.3+9" not in version:
+        raise ValueError("Forge 64 requires the pinned Java 25.0.3+9: " + version)
+    return java, version
+
+
+def require_free_port(port):
+    if type(port) is not int or not 1024 <= port <= 65535:
+        raise ValueError("Supply a nonprivileged TCP port")
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as probe:
+        if hasattr(socket, "SO_EXCLUSIVEADDRUSE"):
+            probe.setsockopt(socket.SOL_SOCKET, socket.SO_EXCLUSIVEADDRUSE, 1)
+        try:
+            probe.bind(("127.0.0.1", port))
+        except OSError as failure:
+            raise ValueError(f"TCP port {port} is occupied; no process will be terminated") from failure
+
+
+def inspect_seed(seed):
+    seed = Path(seed).resolve(strict=True)
+    for path in [seed, *(seed / "libraries").rglob("*"), *seed.glob("*.jar")]:
+        if path.is_symlink() or path.is_junction():
+            raise ValueError("Server code may not use filesystem aliases: " + str(path))
+        if path.is_file() and path.stat().st_nlink != 1:
+            raise ValueError("Server code may not share writable hard links: " + str(path))
+    validate_hash(seed / SHIM, SHIM_SHA)
+    validate_hash(seed / "libraries/io/netty/netty-common/4.2.7.Final/netty-common-4.2.7.Final.jar", COMMON_JAR_SHA)
+    command = (seed / LAUNCHER).read_text(encoding="utf-8").split()
+    if command != ["-Djava.net.preferIPv6Addresses=system", "-XX:+UseCompactObjectHeaders", "-jar", SHIM]:
+        raise AssertionError("Forge 64 launcher is not the selected official shim command")
+    files = code_files(seed)
+    if set(seed.glob("*.jar")) != {seed / SHIM}:
+        raise AssertionError("Unexpected root server code")
+    return dict(forge=FORGE_VERSION, javaVersion=JAVA_VERSION, javaSha256=JAVA_SHA,
+                installerSha256=INSTALLER_SHA, files=files)
+
+
+def seal(seed, inventory):
+    seed, inventory = Path(seed).resolve(strict=True), Path(inventory).resolve()
+    require_disjoint(inventory, seed)
+    if inventory.exists():
+        raise FileExistsError(inventory)
+    allowed = {SHIM, "libraries"}
+    if {path.name for path in seed.iterdir()} != allowed:
+        raise ValueError("Seal only a fresh code-only SDK, never a configured server/world")
+    result = inspect_seed(seed)
+    inventory.parent.mkdir(parents=True, exist_ok=True)
+    with inventory.open("x", encoding="utf-8") as output:
+        json.dump(result, output, indent=2, sort_keys=True)
+        output.write("\n")
+    return result
+
+
+def verify_compile_pin(harness, power_sha256):
+    with ZipFile(harness) as jar:
+        manifest = dict(line.split(": ", 1) for line in
+                        jar.read("META-INF/MANIFEST.MF").decode().replace("\r\n ", "").splitlines()
+                        if ": " in line)
+    if (manifest.get("Built-On") != FORGE_VERSION
+            or manifest.get("Power-Input-Status") != EXPLORATORY
+            or manifest.get("Power-Input-SHA256") != power_sha256.upper()):
+        raise AssertionError("Harness compile pin and staged ordinary Power jar differ")
+
+
+def read_family_target(profile, seed, inventory_file, inventory_sha256):
+    seed = Path(seed).resolve(strict=True)
+    validate_hash(inventory_file, inventory_sha256)
+    inventory = read_json(inventory_file)
+    if inspect_seed(seed) != inventory:
+        raise AssertionError("Selected Forge 64 server differs from its sealed inventory")
+    document = read_json(profile)
+    if (document.get("mode"), document.get("minecraftVersion"), document.get("forge", {}).get("version"),
+            document.get("qualificationStatus")) != ("packaged", MINECRAFT, FORGE_VERSION, EXPLORATORY):
+        raise ValueError("Expected an explicitly materialized Forge 64 packaged profile")
+    mods = {}
+    for item in document["mods"]:
+        identity, version = item["id"], item["version"]
+        path = (RIG / item["path"]).resolve(strict=True)
+        if identity in mods or version != VERSIONS.get(identity) or path.name != item["file"] or not path.name.endswith(f"-{version}.jar"):
+            raise ValueError("Invalid native2612 ordinary mod pin: " + identity)
+        validate_hash(path, item["sha256"])
+        jar_identity(path, identity, version)
+        mods[identity] = version, path, item["sha256"].upper()
+    if set(mods) != set(VERSIONS):
+        raise ValueError("Full family qualification requires all six exact native2612 inputs")
+    verify_compile_pin(mods["advantageworkstest"][1], mods["basepower"][2])
+    return seed, inventory, mods
+
+
+def verify_runtime(runtime, inventory, expected):
+    runtime = Path(runtime)
+    if inspect_seed(runtime) != inventory:
+        raise AssertionError("Staged Forge 64 code changed")
+    mods = runtime / "mods"
+    if any(not path.is_file() or path.is_symlink() or path.stat().st_nlink != 1 for path in mods.iterdir()):
+        raise AssertionError("Unexpected aliased or nested mod input")
+    if {path.name: digest(path) for path in mods.iterdir()} != expected:
+        raise AssertionError("Staged mod jars changed or unexpected files were added")
+
+
+def audit_staged(runtime):
+    runtime = Path(runtime)
+    expected = {item["file"]: item["sha256"] for item in read_json(runtime / "input-jars.json")}
+    verify_runtime(runtime, read_json(runtime / INVENTORY), expected)
+
+
+def stage(runtime, seed, inventory, mods, port):
+    runtime = Path(runtime).resolve()
+    native_launch_environment()
+    if set(mods) != set(VERSIONS) or any(mods[key][0] != version for key, version in VERSIONS.items()):
+        raise ValueError("Staging requires all six actual native2612 family inputs")
+    if len({mod[1].name.casefold() for mod in mods.values()}) != len(mods):
+        raise ValueError("Mod filenames must be unique")
+    require_free_port(port)
+    if runtime.exists():
+        raise FileExistsError(runtime)
+    for path in [Path(seed), *(mod[1] for mod in mods.values())]:
+        require_disjoint(runtime, Path(path).resolve(strict=True))
+    if inspect_seed(seed) != inventory:
+        raise AssertionError("Seed custody changed before staging")
+    for _, path, sha in mods.values():
+        validate_hash(path, sha)
+    stage_server(runtime, (seed, LAUNCHER, [mod[1] for mod in mods.values()]))
+    expected = {path.name: sha.upper() for _, path, sha in mods.values()}
+    write_json(runtime / INVENTORY, inventory)
+    configure_runtime(runtime, port)
+    verify_runtime(runtime, inventory, expected)
+    return expected
+
+
+def configure_runtime(runtime, port, profile=None, recipe_profile=None):
+    if recipe_profile is not None:
+        raise ValueError("Recipe configuration needs an explicit reviewed native2612 adapter")
+    runtime = Path(runtime)
+    profile = profile or {}
+    overrides = {"level-type": profile.get("levelType", "minecraft:flat"),
+                 "generator-settings": json.dumps(FLAT_SETTINGS, separators=(",", ":")),
+                 "server-ip": "127.0.0.1", "server-port": port,
+                 "generate-structures": "false", "simulation-distance": 4, "allow-nether": "true",
+                 "pause-when-empty-seconds": "-1"}
+    settings = runtime / "server.properties"
+    old = [line for line in settings.read_text(encoding="utf-8").splitlines()
+           if line.partition("=")[0] not in overrides]
+    settings.write_text("\n".join(old + [f"{key}={value}" for key, value in overrides.items()]) + "\n", encoding="utf-8")
+    config = runtime / "config/fml.toml"
+    config.parent.mkdir(exist_ok=True)
+    config.write_text("versionCheck = false\n", encoding="utf-8")
+    mark_runtime(runtime)
+
+
+def require_launch_settings(runtime):
+    settings = {}
+    for line in (Path(runtime) / "server.properties").read_text(encoding="utf-8").splitlines():
+        if not line or line.startswith(("#", "!")):
+            continue
+        key, separator, value = line.partition("=")
+        if not separator or key in settings:
+            raise ValueError("Ambiguous server launch property: " + key)
+        settings[key] = value
+    if settings.get("pause-when-empty-seconds") != "-1" or settings.get("server-ip") != "127.0.0.1":
+        raise ValueError("Native2612 requires explicit loopback binding and disabled empty-server pausing")
+    require_free_port(int(settings["server-port"]))
+
+
+def plain_logging_bytes(original):
+    if hashlib.sha256(original).hexdigest().upper() != LOGGING_XML_SHA or original.count(b"%xEx") != 2:
+        raise AssertionError("Selected Forge 64 logging source changed; review the formatter adapter")
+    # Byte preservation keeps every level, filter, marker and appender unchanged.
+    return original.replace(b"%xEx", b"%ex")
+
+
+def logging_configuration(runtime, logging_jar):
+    runtime, logging_jar = Path(runtime), Path(logging_jar)
+    validate_hash(logging_jar, LOGGING_JAR_SHA)
+    with ZipFile(logging_jar) as jar:
+        content = plain_logging_bytes(jar.read("log4j2.xml"))
+    config = runtime / "forge64-log4j2-plain-stacktraces.xml"
+    custody = runtime / "forge64-logging-custody.json"
+    receipt = dict(sourceJarSha256=LOGGING_JAR_SHA, sourceXmlSha256=LOGGING_XML_SHA,
+                   configSha256=hashlib.sha256(content).hexdigest().upper(),
+                   modification="Exactly two %xEx renderers to %ex; all other source bytes retained")
+    if config.exists() or custody.exists():
+        if not config.is_file() or not custody.is_file() or config.read_bytes() != content or read_json(custody) != receipt:
+            raise AssertionError("Forge 64 logging custody changed")
+    else:
+        with config.open("xb") as output:
+            output.write(content)
+        with custody.open("x", encoding="utf-8") as output:
+            json.dump(receipt, output, indent=2, sort_keys=True)
+    return config.resolve().as_uri()
+
+
+def log_findings(text):
+    failures, diagnostics = classify_platform_log(text, previous_log_findings)
+    for line in text.splitlines():
+        if re.search(r"Server empty for \d+ seconds, pausing|Unable to write to stream|Unable to invoke factory method", line):
+            if line not in failures:
+                failures.append(line)
+    return failures, diagnostics
+
+
+def require_clean_log(path):
+    failures, diagnostics = log_findings(Path(path).read_text(encoding="utf-8", errors="replace"))
+    if failures:
+        raise AssertionError(f"Native64 runtime errors in {path}: {failures[:5]}")
+    return diagnostics
+
+
+def require_complete_boot(text, *, stop_sent, returncode):
+    if returncode != 0 or not stop_sent:
+        raise AssertionError("Native64 requires its owned stop command and a zero process exit")
+    markers = (f"Forge mod loading, version {FORGE}, for MC {MINECRAFT} with MCP {MCP}",
+               f"Starting minecraft server version {MINECRAFT}", "Done (", "Stopping server",
+               "All dimensions are saved")
+    cursor = 0
+    for marker in markers:
+        position = text.find(marker, cursor)
+        if position < 0:
+            raise AssertionError("Missing or out-of-order native64 startup / cold-stop witness: " + marker)
+        cursor = position + len(marker)
+
+
+class Server(NativeLaunch):
+    forge_version = FORGE_VERSION
+
+    def __init__(self, runtime, java, launcher, label, *, diagnostic_environment=None,
+                 diagnostic_environment_sha256=None):
+        runtime = Path(runtime).resolve(strict=True)
+        if not re.fullmatch(r"[A-Za-z0-9_-][A-Za-z0-9_.-]{0,99}", label):
+            raise ValueError("Unsafe launch label")
+        if str(launcher).replace("\\", "/") != LAUNCHER:
+            raise ValueError("Launch only the selected Forge 64 official argument file")
+        java25(java)
+        audit_staged(runtime)
+        require_launch_settings(runtime)
+        self.diagnostic_environment = diagnostic_environment
+        self.diagnostic_environment_sha256 = diagnostic_environment_sha256
+        self.stop_sent = False
+        self.closed = False
+        super().__init__(runtime, java, launcher, label)
+        write_json(runtime / f"native64-process-{label}.json", dict(
+            pid=self.process.pid, runtime=str(runtime), javaSha256=JAVA_SHA,
+            javaVersion=JAVA_VERSION, forge=FORGE_VERSION, stdin="OWNED_PIPE",
+            qualificationAllowed=diagnostic_environment is None))
+
+    def launch_environment(self):
+        return native_launch_environment(self.native_runtime, self.native_label,
+                                        diagnostic_environment=self.diagnostic_environment,
+                                        diagnostic_environment_sha256=self.diagnostic_environment_sha256)
+
+    @staticmethod
+    def unexpected_line(line):
+        return re.search(r"Server empty for \d+ seconds, pausing", line) is not None
+
+    def logging_configuration(self, logging_jar):
+        return logging_configuration(self.native_runtime, logging_jar)
+
+    def send(self, command):
+        if not isinstance(command, str) or not command or "\n" in command or "\r" in command:
+            raise ValueError("Expected one bounded server command")
+        if command.startswith("gamerule "):
+            words = command.split()
+            if len(words) not in (2, 3):
+                raise ValueError("Expected one gamerule query or assignment")
+            aliases = {"doMobSpawning": "spawn_mobs", "randomTickSpeed": "random_tick_speed",
+                       "doWeatherCycle": "advance_weather", "doDaylightCycle": "advance_time",
+                       "doTileDrops": "block_drops", "doEntityDrops": "entity_drops",
+                       "keepInventory": "keep_inventory", "mobGriefing": "mob_griefing"}
+            rule = aliases.get(words[1], words[1])
+            if not re.fullmatch(r"(?:[a-z0-9_.-]+:)?[a-z0-9_./-]+", rule):
+                raise ValueError("Unknown legacy gamerule: " + words[1])
+            if ":" not in rule:
+                rule = "minecraft:" + rule
+            super().send(" ".join(["gamerule", rule, *words[2:]]))
+            shown = rule.removeprefix("minecraft:")
+            self.wait(f"Gamerule {shown} is now set to: {words[2]}" if len(words) == 3
+                      else f"Gamerule {shown} is currently set to: ", 15)
+            return
+        super().send(command)
+        if command == "stop":
+            self.stop_sent = True
+
+    def validate_native_log(self, path):
+        diagnostics = require_clean_log(path)
+        if diagnostics:
+            write_json(path.with_suffix(".platform-diagnostics.json"), diagnostics)
+
+    def close(self):
+        if self.closed:
+            audit_staged(self.native_runtime)
+            return
+        try:
+            super().close()
+            text = (self.native_runtime / f"console-{self.native_label}.log").read_text(encoding="utf-8")
+            require_complete_boot(text, stop_sent=self.stop_sent, returncode=self.process.returncode)
+            logging_jar = self.native_runtime / f"libraries/net/minecraftforge/fmlloader/{FORGE_VERSION}/fmlloader-{FORGE_VERSION}.jar"
+            self.logging_configuration(logging_jar)
+        finally:
+            audit_staged(self.native_runtime)
+            self.closed = self.process.poll() is not None
+
+
+def launch(runtime, java, label="native64"):
+    return Server(runtime, java, LAUNCHER, label)
+
+
+def cold_stop(server):
+    server.close()
+
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__)
+    sub = parser.add_subparsers(dest="command", required=True)
+    command = sub.add_parser("seal")
+    command.add_argument("--seed", type=Path, required=True)
+    command.add_argument("--inventory", type=Path, required=True)
+    command = sub.add_parser("verify")
+    command.add_argument("--profile", type=Path, required=True)
+    command.add_argument("--seed", type=Path, required=True)
+    command.add_argument("--inventory", type=Path, required=True)
+    command.add_argument("--inventory-sha256", required=True)
+    command.add_argument("--java", type=Path, required=True)
+    args = parser.parse_args()
+    if args.command == "seal":
+        seal(args.seed, args.inventory)
+    else:
+        java25(args.java)
+        read_family_target(args.profile, args.seed, args.inventory, args.inventory_sha256)
+        print("Native2612 inputs verified; no world opened")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/test-rig/migration/native2612_actor_comparison.py b/test-rig/migration/native2612_actor_comparison.py
new file mode 100644
index 00000000..e59f4078
--- /dev/null
+++ b/test-rig/migration/native2612_actor_comparison.py
@@ -0,0 +1,124 @@
+"""Read-only actor restart diagnosis; never replaces or upgrades the frozen verdict."""
+
+import argparse
+import hashlib
+import json
+import math
+from pathlib import Path
+import struct
+import uuid
+
+import nbtlib
+
+import native117_machine_operations as frozen
+
+
+CASES = {"steam/extra-explosive-0", "steam/extra-explosive-1"}
+SOURCES_SHA256 = "9175F1245E5E2907EA3ECAB13DC40F9B8994E61759E75363F6FB14322335F013"
+
+
+def differences(before, after, path="$"):
+    if isinstance(before, dict) and isinstance(after, dict):
+        result = []
+        for key in sorted(set(before) | set(after)):
+            name = path + "." + key
+            if key not in before or key not in after:
+                result.append(dict(path=name, before=before.get(key), after=after.get(key),
+                                   beforePresent=key in before, afterPresent=key in after))
+            else:
+                result.extend(differences(before[key], after[key], name))
+        return result
+    if (isinstance(before, list) and isinstance(after, list) and len(before) == len(after) == 3
+            and before[0] == after[0] == "List" and before[1] == after[1]
+            and len(before[2]) == len(after[2])):
+        return [delta for index, (a, b) in enumerate(zip(before[2], after[2]))
+                for delta in differences(a, b, path + "[" + str(index) + "]")]
+    return [] if before == after else [dict(path=path, before=before, after=after)]
+
+
+def actors(case):
+    result = {}
+    for row in case.get("entities", []):
+        identity = str(uuid.UUID(row["uuid"]))
+        if identity != row["uuid"] or identity in result:
+            raise AssertionError("Duplicate or noncanonical native actor UUID")
+        tag = nbtlib.parse_nbt(row["nbt"])
+        if not isinstance(tag.get("UUID"), nbtlib.IntArray) or len(tag["UUID"]) != 4:
+            raise AssertionError("Missing native actor UUID array")
+        actual = uuid.UUID(bytes=struct.pack(">4i", *(int(part) for part in tag["UUID"])))
+        if str(actual) != identity:
+            raise AssertionError("Native actor metadata and saved UUID disagree")
+        result[identity] = tag
+    return result
+
+
+def stationary_cows(case_id, before, after):
+    return case_id in CASES and all(
+        isinstance(tag.get("id"), nbtlib.String) and str(tag["id"]) == "minecraft:cow"
+        and type(tag.get("NoAI")) is nbtlib.Byte and int(tag["NoAI"]) == 1
+        and type(tag.get("NoGravity")) is nbtlib.Byte and int(tag["NoGravity"]) == 1
+        for tag in (before, after))
+
+
+def explanation(case_id, before, after, delta):
+    if not stationary_cows(case_id, before, after):
+        return None
+    for index in range(3):
+        if delta["path"] != "$.Motion[" + str(index) + "]":
+            continue
+        a, b = before.get("Motion"), after.get("Motion")
+        if (isinstance(a, nbtlib.List) and isinstance(b, nbtlib.List)
+                and a.subtype is b.subtype is nbtlib.Double and len(a) == len(b) == 3
+                and all(math.isfinite(float(value)) for value in (*a, *b))
+                and abs(float(a[index])) > 10.0 and float(b[index]) == 0.0):
+            return "Entity.load: only this >10 native velocity component is clamped to zero"
+    if delta["path"] == "$.HurtByTimestamp":
+        if (type(before.get("HurtByTimestamp")) is nbtlib.Int
+                and type(after.get("HurtByTimestamp")) is nbtlib.Int
+                and int(before["HurtByTimestamp"]) >= 0 and int(after["HurtByTimestamp"]) == 0
+                and all(key not in tag for tag in (before, after)
+                        for key in ("last_hurt_by_mob", "ticks_since_last_hurt_by_mob"))):
+            return "LivingEntity.readAdditionalSaveData: absent relative hurt key rebases to unticked zero"
+    return None
+
+
+def diagnose(fixture, inspected):
+    # Recheck exact selected native load methods before explaining any transition.
+    from native2612_operations import native_load_sources
+    native_load_sources()
+    verdict = frozen.validate_restart(fixture, inspected)
+    actual = {row["id"]: row for row in inspected["cases"]}
+    observations = []
+    for case in fixture["cases"]:
+        before, after = actors(case), actors(actual[case["id"]])
+        for identity in sorted(set(before) | set(after)):
+            if identity not in before or identity not in after:
+                observations.append(dict(case=case["id"], uuid=identity, path="$",
+                                         beforePresent=identity in before, afterPresent=identity in after,
+                                         explanation=None))
+                continue
+            for delta in differences(frozen.saved_actor_nbt(before[identity]), frozen.saved_actor_nbt(after[identity])):
+                observations.append(dict(case=case["id"], uuid=identity, **delta,
+                                         explanation=explanation(case["id"], before[identity], after[identity], delta)))
+    unknown = sum(row["explanation"] is None for row in observations)
+    return dict(diagnosticOnly=True, frozenRestartResult=verdict, actorDifferences=observations,
+                unexplainedActorDifferences=unknown, primarySourcesSha256=SOURCES_SHA256,
+                scope="Explains exact native load transitions only; no NBT writes or passing reclassification")
+
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("runtime", type=Path)
+    args = parser.parse_args()
+    paths = [args.runtime / "machine-operation-fixture.json",
+             args.runtime / "advantage-works-results/machine-inspection-restarted.json"]
+    data = [path.read_bytes() for path in paths]
+    report = diagnose(*(json.loads(value) for value in data))
+    report["inputSha256"] = {str(path.resolve()): hashlib.sha256(value).hexdigest().upper()
+                             for path, value in zip(paths, data)}
+    print(json.dumps(report, indent=2, sort_keys=True))
+    return int(report["frozenRestartResult"]["status"] != "PASS")
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/test-rig/migration/native2612_actor_fixtures.py b/test-rig/migration/native2612_actor_fixtures.py
new file mode 100644
index 00000000..7c67337b
--- /dev/null
+++ b/test-rig/migration/native2612_actor_fixtures.py
@@ -0,0 +1,152 @@
+"""Explicit derived fixture copies: native-owned FML config authority and legal battery slots."""
+
+import argparse
+import base64
+import copy
+import gzip
+import io
+from pathlib import Path
+import shutil
+
+import nbtlib
+from matrix import WORLD, digest, fingerprint, write_json
+from native117 import output_path, require_disjoint
+from native117_actor_io import bind, capture_actors, capture_dimensions
+import native2612 as native
+import native2612_actors as actors
+
+BATTERIES = {namespace + ":" + item for namespace in ("electricadvantage", "baseelectric")
+             for item in ("lithium_battery", "lead_acid_battery", "alkaline_battery", "nickel_hydride_battery")}
+
+
+def legal_ender_batteries(player):
+    """Split only the four known artificial overstacked witnesses, retaining every item and tag."""
+    inventory = player.get("EnderItems", ())
+    slots = [int(item["Slot"]) for item in inventory]
+    if len(slots) != len(set(slots)) or any(not 0 <= slot < 27 for slot in slots):
+        raise AssertionError("Malformed historical EnderItems slots")
+    free = [slot for slot in range(27) if slot not in slots]
+    required = 0
+    for item in inventory:
+        key = "Count" if "Count" in item else "count"
+        count = int(item[key])
+        if str(item["id"]) in BATTERIES and count > 1:
+            if count != 3 or ("Count" in item and "count" in item):
+                raise AssertionError("Unreviewed battery overstack")
+            required += 2
+    if len(free) < required:
+        raise AssertionError("Insufficient free EnderItems slots")
+    changes, appended = [], []
+    for item in inventory:
+        key = "Count" if "Count" in item else "count"
+        count = int(item[key])
+        if str(item["id"]) not in BATTERIES or count <= 1:
+            continue
+        original = copy.deepcopy(item)
+        item[key] = type(item[key])(1)
+        destinations = [int(item["Slot"])]
+        for _ in range(2):
+            sibling = copy.deepcopy(item)
+            destination = free.pop(0)
+            sibling["Slot"] = type(item["Slot"])(destination)
+            appended.append(sibling)
+            destinations.append(destination)
+        for sibling in (item, *appended[-2:]):
+            old_payload = {key: value for key, value in original.items() if key not in ("Slot", "Count", "count")}
+            new_payload = {key: value for key, value in sibling.items() if key not in ("Slot", "Count", "count")}
+            if old_payload != new_payload:
+                raise AssertionError("Fixture item metadata changed during legal splitting")
+        changes.append(dict(id=str(item["id"]), fromSlot=int(item["Slot"]), toSlots=destinations, preservedTotal=count))
+    if appended:
+        inventory.extend(appended)
+    return changes
+
+
+def derive(source, receipt, checksum, output, kind, legalize=False):
+    native.validate_hash(receipt, checksum)
+    approval = native.read_json(receipt)
+    before = fingerprint(source)
+    if Path(approval["source"]).resolve() != source or before != approval["sourceFingerprint"]:
+        raise AssertionError("Protected fixture differs from its explicit source receipt")
+    output = output_path(output)
+    require_disjoint(output, source)
+    require_disjoint(output, receipt)
+    output.mkdir(parents=True)
+    world_before = fingerprint(source / WORLD)
+    shutil.copytree(source / WORLD, output / WORLD)
+    config_evidence = output / "config-overlay-evidence"
+    config_evidence.mkdir()
+    for path in (source / "config").rglob("*"):
+        if not path.is_file():
+            continue
+        relative = path.relative_to(source / "config")
+        target = config_evidence / "historical-fml.toml" if relative.as_posix() == "fml.toml" else output / "config" / relative
+        target.parent.mkdir(parents=True, exist_ok=True)
+        shutil.copy2(path, target)
+    name = "dimension" if kind == "dimensions" else "actor"
+    for filename in (name + "-fixture.json", "migration-fixture.json"):
+        shutil.copy2(source / filename, output / filename)
+    prefix = "dimension-semantic-" if kind == "dimensions" else "semantic-"
+    label = next(label for label in ("runtime-restart", "restarted", "source") if (source / (prefix + label + ".json")).is_file())
+    record_name = ("dimensions-" if kind == "dimensions" else "actors-") + label + ".json"
+    record = native.read_json(source / record_name)
+    definition = native.read_json(source / (name + "-fixture.json"))
+    changes = {}
+    if legalize:
+        player_path = output / WORLD / "playerdata" / (definition["playerUuid"] + ".dat")
+        player = nbtlib.load(player_path)
+        edits = legal_ender_batteries(player)
+        if edits:
+            player.save()
+            changes["loosePlayer"] = edits
+        if record.get("playerAdapter"):
+            raw = nbtlib.File.parse(io.BytesIO(gzip.decompress(base64.b64decode(record["player"]["nbtBase64"], validate=True))))
+            edits = legal_ender_batteries(raw)
+            if edits:
+                data = io.BytesIO()
+                raw.write(data)
+                record["player"]["nbtBase64"] = base64.b64encode(gzip.compress(data.getvalue(), mtime=0)).decode()
+                changes["serializerPlayer"] = edits
+        level_path = output / WORLD / "level.dat"
+        level = nbtlib.load(level_path)
+        if "Player" in level["Data"]:
+            edits = legal_ender_batteries(level["Data"]["Player"])
+            if edits:
+                level.save()
+                changes["embeddedPlayer"] = edits
+    write_json(output / record_name, record)
+    capture = bind(capture_dimensions, semantic=actors.player_semantic) if kind == "dimensions" else capture_actors
+    write_json(output / (prefix + label + ".json"), capture(output, label))
+    world_after = fingerprint(output / WORLD)
+    changed = [key for key in world_before if world_before[key] != world_after.get(key)]
+    allowed = {"level.dat", str(Path("playerdata") / (definition["playerUuid"] + ".dat"))}
+    if set(world_before) != set(world_after) or not set(changed) <= allowed or (not legalize and changed):
+        raise AssertionError("Unexpected world change in derived fixture")
+    if fingerprint(source) != before:
+        raise AssertionError("Protected source changed during derivation")
+    retained_fml = config_evidence / "historical-fml.toml"
+    report = dict(source=str(output), sourceFingerprint=fingerprint(output), originalSource=str(source),
+                  originalReceiptSha256=checksum, originalUnchanged=True, exactWorldFileChanges=changed,
+                  legalBatterySplits=changes, kind=kind,
+                  configOverlay=dict(owner="Forge64 native2612.stage", authority="native target fml.toml; no historical config overwrite",
+                                     historicalFmlRetainedSha256=digest(retained_fml) if retained_fml.exists() else None,
+                                     nativeFmlContent="versionCheck = false\n"),
+                  scope="Explicit derived fixture, not a new old-engine serializer qualification")
+    target_receipt = output.with_name(output.name + "-receipt.json")
+    if target_receipt.exists():
+        raise FileExistsError(target_receipt)
+    write_json(target_receipt, report)
+    return target_receipt
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description=__doc__)
+    for name in ("source", "receipt", "output"):
+        parser.add_argument("--" + name, type=lambda value: Path(value).resolve(), required=True)
+    parser.add_argument("--receipt-sha256", required=True)
+    parser.add_argument("--kind", choices=("actors", "dimensions"), required=True)
+    parser.add_argument("--legal-batteries", action="store_true")
+    args = parser.parse_args()
+    result = derive(args.source, args.receipt, args.receipt_sha256, args.output, args.kind, args.legal_batteries)
+    print(result)
+    print(digest(result))
diff --git a/test-rig/migration/native2612_actor_transformer_order.py b/test-rig/migration/native2612_actor_transformer_order.py
new file mode 100644
index 00000000..0c2ca826
--- /dev/null
+++ b/test-rig/migration/native2612_actor_transformer_order.py
@@ -0,0 +1,330 @@
+"""Actual two-order actor proof with source-numeric enchantments; never production qualification."""
+
+import argparse
+import base64
+import copy
+from datetime import datetime, timezone
+from functools import partial
+import gzip
+import io
+import json
+from pathlib import Path
+from types import SimpleNamespace
+import traceback
+
+import nbtlib
+
+from matrix import WORLD, digest, fingerprint, write_json
+from native117 import output_path, require_disjoint
+from native117_actor_io import bind
+from native117_identity import target_id
+import native2612 as native
+import native2612_actors as actors
+import native2612_transformer_order as order
+import native2612_upgrade as upgrade
+
+
+SCOPE = "INSTRUMENTED_ACTOR_PLAYER_ENTITY_ORDER_PROOF"
+WITNESSES = ("cart", "dropped-musket")
+PHASES = ("converted", "adapter", "restarted", "runtime", "runtime-restart")
+STOP_PHASES = ("conversion", "restart", "runtime-restart")
+ENCHANTMENTS = {10: "basesteam:high_explosive", 11: "basesteam:powderless",
+                12: "basesteam:rapid_reload", 13: "basesteam:recoil"}
+MUTATIONS = ("curse", "missing", "extra", "level", "count", "wear", "payload")
+
+
+def item(entity, witness, *, native_format):
+    if witness == "cart":
+        values = entity.get("Items", ())
+        matches = [value for value in values if str(value.get("id", "")).endswith(":musket")]
+        if len(matches) != 1 or matches[0].get("Slot") != 1:
+            raise AssertionError("Missing/duplicate cart musket at its source slot")
+        result = matches[0]
+    else:
+        result = entity.get("Item", {})
+    if not str(result.get("id", "")).endswith(":musket"):
+        raise AssertionError("Missing " + witness + " musket")
+    if native_format and result.get("id") != "basesteam:musket":
+        raise AssertionError("Native musket identity was not preserved")
+    return result
+
+
+def exact_value(expected, observed):
+    if type(expected) is not type(observed):
+        return False
+    if isinstance(expected, dict):
+        return expected.keys() == observed.keys() and all(exact_value(value, observed[key]) for key, value in expected.items())
+    if isinstance(expected, list):
+        return len(expected) == len(observed) and all(exact_value(left, right) for left, right in zip(expected, observed))
+    return expected == observed
+
+
+def source_context(level, record, expected):
+    version = level.get("Data", {}).get("DataVersion")
+    if type(version) is not nbtlib.Int or int(version) != 512:
+        raise AssertionError("Context regression requires the approved raw original110 schema")
+    registry = level.get("FML", {}).get("Registries", {}).get("minecraft:enchantments", {}).get("ids", ())
+    saved = {}
+    for entry in registry:
+        number = entry.get("V")
+        if type(number) is not nbtlib.Int or int(number) in saved or type(entry.get("K")) is not nbtlib.String:
+            raise AssertionError("Ambiguous saved Forge enchantment index")
+        saved[int(number)] = str(entry["K"])
+    if {number: target_id(saved.get(number, "")) for number in ENCHANTMENTS} != ENCHANTMENTS:
+        raise AssertionError("Saved IDs10..13 do not name the four Steam enchantments")
+    rows = record.get("entities", [])
+    result = {}
+    for witness in WITNESSES:
+        matches = [row for row in rows if row.get("witness") == witness]
+        if len(matches) != 1:
+            raise AssertionError("Missing/duplicate raw source witness: " + witness)
+        raw = gzip.decompress(base64.b64decode(matches[0]["nbtBase64"], validate=True))
+        stream = io.BytesIO(raw)
+        entity = nbtlib.File.parse(stream)
+        if stream.read(1):
+            raise AssertionError("Trailing raw source entity data")
+        stack = item(entity, witness, native_format=False)
+        entries = stack.get("tag", {}).get("ench", ())
+        if len(entries) != 4 or any(type(row.get("id")) is not nbtlib.Short
+                or type(row.get("lvl")) is not nbtlib.Short or int(row["lvl"]) != 1 for row in entries):
+            raise AssertionError("Source enchantments must remain four numeric short IDs at level1")
+        ids = [int(row["id"]) for row in entries]
+        if len(set(ids)) != 4 or set(ids) != set(ENCHANTMENTS):
+            raise AssertionError("Source numeric enchantment witnesses were changed")
+        goal = item(expected["entities"][witness], witness, native_format=True)
+        if goal.get("components", {}).get("minecraft:enchantments") != dict.fromkeys(ENCHANTMENTS.values(), 1):
+            raise AssertionError("Historical oracle disagrees with the independently saved registry")
+        result[witness] = dict(numericIds=ids, savedNames=[saved[number] for number in ids], levels=[1] * 4,
+                               expectedStack=copy.deepcopy(goal))
+    return dict(sourceDataVersion=512, savedForgeIds=saved, witnesses=result, targetObservationsUsed=False)
+
+
+def preflight(args):
+    source = Path(args.fixture).resolve(strict=True)
+    upgrade.validate_hash(args.fixture_receipt, args.fixture_receipt_sha256)
+    approved = upgrade.read_json(args.fixture_receipt)
+    before = fingerprint(source)
+    if Path(approved["source"]).resolve() != source or approved["sourceFingerprint"] != before:
+        raise AssertionError("Actor fixture differs from its approved independent receipt")
+    expected, label = actors.baseline(source, "actors")
+    context = source_context(nbtlib.load(source / WORLD / "level.dat"),
+                             upgrade.read_json(source / ("actors-" + label + ".json")), expected)
+    if fingerprint(source) != before:
+        raise AssertionError("Read-only source preflight changed its fixture")
+    return dict(source=str(source), fixtureReceipt=str(args.fixture_receipt),
+                fixtureReceiptSha256=args.fixture_receipt_sha256.upper(),
+                sourceFingerprint=before, sourceLabel=label, context=context)
+
+
+def assert_witnesses(expected, observed):
+    result = {}
+    for witness in WITNESSES:
+        if witness not in observed.get("entities", {}):
+            raise AssertionError("Missing native witness: " + witness)
+        actual = item(observed["entities"][witness], witness, native_format=True)
+        before = expected["witnesses"][witness]["expectedStack"]
+        if not exact_value(before, actual):
+            raise AssertionError("Exact native musket payload changed: " + witness + ": " + repr(actual))
+        result[witness] = copy.deepcopy(actual)
+    return result
+
+
+def negative_controls(expected, observed):
+    assert_witnesses(expected, observed)
+    results = {"baseline": "PASS"}
+    for witness in WITNESSES:
+        for mutation in MUTATIONS:
+            changed = copy.deepcopy(observed)
+            stack = item(changed["entities"][witness], witness, native_format=True)
+            components = stack["components"]
+            levels = components["minecraft:enchantments"]
+            first = next(iter(levels))
+            if mutation == "curse": components["minecraft:enchantments"] = {"minecraft:binding_curse": 1}
+            elif mutation == "missing": del levels[first]
+            elif mutation == "extra": levels["minecraft:unbreaking"] = 1
+            elif mutation == "level": levels[first] = 2
+            elif mutation == "count": stack["count"] += 1
+            elif mutation == "wear": components["minecraft:damage"] += 1
+            elif mutation == "payload": components.setdefault("minecraft:custom_data", {})["order_probe_mutation"] = 1
+            try:
+                assert_witnesses(expected, changed)
+            except AssertionError:
+                results[witness + "/" + mutation] = "REJECTED"
+            else:
+                raise AssertionError("Actor witness mutation accepted: " + witness + "/" + mutation)
+    return dict(status="PASS", scope="DERIVED_IN_MEMORY_NATIVE_ACTOR_WITNESS_NEGATIVES",
+                qualificationAllowed=False, controls=results, sourceOrWorldFilesMutated=False)
+
+
+def raw_receipt(path):
+    raw = upgrade.read_json(path)
+    if raw.get("status") != "PASS" or type(raw.get("matchedEntities")) is not int or raw["matchedEntities"] < 2:
+        raise AssertionError("Missing complete, nonempty stopped entity audit: " + str(path))
+    return dict(file=str(path), sha256=digest(path), **raw)
+
+
+def all_orders_proven(primary, modes):
+    controls = {"baseline": "PASS", **{witness + "/" + mutation: "REJECTED"
+                for witness in WITNESSES for mutation in MUTATIONS}}
+    return (primary.get("status") == "PASS" and set(modes) == set(order.MODES)
+            and all(mode.get("status") == "PASS" and mode.get("sourceUnchanged") is True
+                    and set(mode.get("witnessChecks", {})) == set(PHASES)
+                    and all(row.get("status") == "PASS" for row in mode["witnessChecks"].values())
+                    and set(mode.get("rawAudits", {})) == set(STOP_PHASES)
+                    and all(row.get("status") == "PASS" for row in mode["rawAudits"].values())
+                    and mode.get("entityControls", {}).get("controls") == controls for mode in modes.values()))
+
+
+def run_actor_campaign(args, *, server_type, stage_function, hook_only=False):
+    if hook_only is not False:
+        raise ValueError("Actor order proof always requires all three native actor boots")
+    approved = preflight(args)
+    target = native.read_family_target(args.profile, args.seed, args.inventory, args.inventory_sha256)
+    java, _ = native.java25(args.java)
+    output = Path(args.output)
+    output.mkdir(parents=True, exist_ok=False)
+    runtime = output / "server"
+    report = output / "native2612-actor-order-campaign.json"
+    result = dict(status="RUNNING", scope=SCOPE, qualificationAllowed=False,
+                  profileSha256=digest(args.profile), sourceContext=approved["context"],
+                  checks={}, witnessChecks={}, rawAudits={}, entityControls=dict(status="NOT_RUN"))
+    write_json(report, result)
+    expected_jars = {}
+
+    def stage(destination, actual_target, port):
+        expected_jars.update(stage_function(destination, *actual_target, port))
+        return native.LAUNCHER
+
+    class CheckedServer(server_type):
+        def __init__(self, *values):
+            native.verify_runtime(runtime, target[1], expected_jars)
+            super().__init__(*values)
+
+        def close(self):
+            failure = None
+            try:
+                super().close()
+            except BaseException as error:
+                failure = error
+            try:
+                native.verify_runtime(runtime, target[1], expected_jars)
+            except BaseException as audit:
+                if failure is None:
+                    raise
+                failure.add_note("Pinned seven-jar audit also failed: " + repr(audit))
+            if failure is not None:
+                raise failure
+
+    values = SimpleNamespace(**vars(args))
+    values.target_manifest, values.java17, values.kind = args.profile, java, "actors"
+    try:
+        result["checks"] = actors.run_route(Path(args.fixture), runtime, target, values, stage=stage,
+            server_type=CheckedServer, stop_audit=partial(actors.audit_stopped,
+                minecraft_version=native.MINECRAFT, data_version=4790, stopping_phase="ServerStoppingEvent"),
+            check_log=native.require_clean_log, minecraft=native.MINECRAFT)
+        for label in PHASES:
+            path = runtime / ("semantic-" + label + ".json")
+            try:
+                observed = upgrade.read_json(path)
+                stacks = assert_witnesses(approved["context"], observed)
+                result["witnessChecks"][label] = dict(status="PASS", file=str(path), sha256=digest(path), stacks=stacks)
+            except (AssertionError, OSError, ValueError) as error:
+                result["witnessChecks"][label] = dict(status="FAIL", file=str(path), error=repr(error))
+        for label in STOP_PHASES:
+            path = runtime / "stopped-entity-evidence" / label / "receipt.json"
+            result["rawAudits"][label] = raw_receipt(path)
+        failures = [key for key, value in result["checks"].items() if value.get("status") != "PASS"]
+        failures.extend("witness-" + key for key, value in result["witnessChecks"].items() if value["status"] != "PASS")
+        if not result["checks"] or failures:
+            raise AssertionError("Actor order payload failed: " + repr(failures) + "; retained " + str(report))
+        result["entityControls"] = negative_controls(approved["context"], upgrade.read_json(runtime / "semantic-converted.json"))
+        result["status"] = "PASS"
+    except BaseException as error:
+        result.update(status="FAIL", error=repr(error), traceback=traceback.format_exc())
+        checkpoint = runtime / "native117-comparison.json"
+        if checkpoint.is_file(): result["checks"] = upgrade.read_json(checkpoint)
+        raise
+    finally:
+        result["sourceUnchanged"] = fingerprint(Path(args.fixture)) == approved["sourceFingerprint"]
+        if not result["sourceUnchanged"]: result["status"] = "FAIL"
+        write_json(report, result)
+    return int(result["status"] != "PASS")
+
+
+def run(args):
+    args.source, args.legacy_reference, args.hook_only = args.fixture, None, False
+    approved = preflight(args)
+    root = output_path(args.output)
+    for path in (args.fixture, args.fixture_receipt, args.profile, args.seed, args.inventory, args.build_receipt, args.pre_run_seal):
+        require_disjoint(root, path)
+    for path in (args.fixture, args.fixture_receipt, args.profile, args.seed, args.inventory, args.build_receipt):
+        require_disjoint(args.pre_run_seal, path)
+    upgrade.validate_hash(args.build_receipt, args.build_receipt_sha256)
+    build = upgrade.read_json(args.build_receipt)
+    target = native.read_family_target(args.profile, args.seed, args.inventory, args.inventory_sha256)
+    java, _ = native.java25(args.java)
+    files = order.validate_build(build, args.profile, java)
+    files.update(upgrade.oracle_closure())
+    files.update({Path(args.fixture_receipt): digest(args.fixture_receipt), Path(args.build_receipt): digest(args.build_receipt),
+                  Path(args.profile): digest(args.profile), Path(args.inventory): digest(args.inventory), java: digest(java)})
+    files.update({Path(path): sha for _, path, sha in target[2].values()})
+    seed_before = fingerprint(Path(args.seed))
+    with Path(args.pre_run_seal).open("x", encoding="utf-8") as output:
+        json.dump(dict(scope="GENUINE_PRE_RUN_ACTOR_INCLUSIVE_ORDER_CUSTODY", createdUtc=datetime.now(timezone.utc).isoformat(),
+                       setupNotStarted=True, qualificationAllowed=False, source=approved, seedFingerprint=seed_before,
+                       files={str(path): sha for path, sha in files.items()}, modes=list(reversed(order.MODES)) if args.bm_first else order.MODES),
+                  output, indent=2, sort_keys=True)
+    seal_sha = digest(args.pre_run_seal)
+    facade = SimpleNamespace(**{**vars(upgrade), "SCOPE": SCOPE, "read_source": preflight,
+        "run": run_actor_campaign, "oracle_closure": lambda: {**upgrade.oracle_closure(),
+                        Path(args.fixture_receipt): args.fixture_receipt_sha256.upper()}})
+    campaign = bind(order.run, upgrade=facade, MODES=tuple(reversed(order.MODES)) if args.bm_first else order.MODES)
+    exit_code = 1
+    proven = False
+    try:
+        order.verify_files(files)
+        exit_code = campaign(args)
+    finally:
+        if root.is_dir():
+            base = root / "native2612-transformer-order-results.json"
+            primary = upgrade.read_json(base) if base.is_file() else dict(status="FAIL", error="Missing order receipt")
+            modes = {}
+            for mode in order.MODES:
+                path = root / mode / "native2612-actor-order-campaign.json"
+                if path.is_file(): modes[mode] = dict(file=str(path), sha256=digest(path), **upgrade.read_json(path))
+            custody_failure = None
+            try:
+                order.verify_files({**files, Path(args.pre_run_seal): seal_sha})
+                if fingerprint(Path(args.seed)) != seed_before or fingerprint(Path(args.fixture)) != approved["sourceFingerprint"]:
+                    raise AssertionError("Pre-run protected tree changed")
+            except Exception as error:
+                custody_failure = repr(error)
+            proven = custody_failure is None and all_orders_proven(primary, modes)
+            write_json(root / "native2612-actor-order-results.json", dict(status="PASS" if proven else "FAIL", scope=SCOPE,
+                qualificationAllowed=False, profileSha256=digest(args.profile), preRunSeal=str(args.pre_run_seal),
+                preRunSealSha256=seal_sha, preRunCustodyFailure=custody_failure, sourceContext=approved["context"],
+                orderReceipt=str(base), orderReceiptSha256=digest(base) if base.is_file() else None, actorCampaigns=modes,
+                finalBothOrdersProven=proven))
+    return exit_code or int(not proven)
+
+
+def parser():
+    cli = argparse.ArgumentParser(description=__doc__)
+    for name in ("fixture", "fixture-receipt", "profile", "seed", "inventory", "java", "build-receipt", "output", "pre-run-seal"):
+        cli.add_argument("--" + name, type=lambda value: Path(value).resolve(), required=True)
+    for name in ("fixture-receipt-sha256", "inventory-sha256", "build-receipt-sha256"):
+        cli.add_argument("--" + name, required=True)
+    cli.add_argument("--port", type=int, required=True)
+    cli.add_argument("--bm-first", action="store_true", help="Run actual BM-first priority mode first; failures remain failures")
+    return cli
+
+
+def main():
+    cli = parser()
+    args = cli.parse_args()
+    if not 26450 <= args.port <= 65534: cli.error("Require two assigned consecutive disposable ports")
+    return run(args)
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/test-rig/migration/native2612_actors.py b/test-rig/migration/native2612_actors.py
new file mode 100644
index 00000000..16959ad5
--- /dev/null
+++ b/test-rig/migration/native2612_actors.py
@@ -0,0 +1,739 @@
+"""Sealed historical actor routes on Forge64 with explicit native target storage."""
+
+import argparse
+import builtins
+import copy
+from functools import partial
+import math
+from pathlib import Path
+import shutil
+import socket
+import traceback
+import uuid
+import json
+import sys
+from types import SimpleNamespace
+
+import nbtlib
+
+import actors
+import dimensions
+from matrix import WORLD, digest, fingerprint, plain, write_json
+from native117 import output_path, require_disjoint
+from native117_actor_io import bind, capture_actors, capture_dimensions, semantic as historical_semantic
+import native117_actors as historical
+from native117_dimension_io import parse_dimension_nbt, project_entity
+from native117_format import DIMENSIONS, dimension_id
+import native117_entity_storage as entity_storage
+import native117_helper_contract as helper_contract
+import native117_stopped_entities as stopped
+import native2612 as native
+import native2612_layout as layout
+
+
+DATA_VERSION = 4790
+HELPER_CONTRACT_SHA = "C2407DA9E3785032E26FCFB739133B2F4DEA8F1B537AD81F8AC562E2A61A59E8"
+DIMENSION_PATHS = {key: (number, "dimensions/" + key.replace(":", "/"))
+                   for key, number in zip(layout.VANILLA_DIMENSIONS, (0, -1, 1))}
+PLAYER_EQUIPMENT_SLOTS = {100: "feet", 101: "legs", 102: "chest", 103: "head", -106: "offhand"}
+NATIVE_ATTRIBUTE_ALIASES = {
+    "minecraft:" + name: "minecraft:generic." + name
+    for name in ("max_health", "knockback_resistance", "movement_speed", "armor",
+                 "armor_toughness", "follow_range", "attack_damage")
+}
+NATIVE_ATTRIBUTE_ALIASES["minecraft:jump_strength"] = "minecraft:horse.jump_strength"
+BOAT_VARIANTS = frozenset(("oak", "spruce", "birch", "jungle", "acacia", "cherry", "dark_oak", "mangrove", "bamboo"))
+WOLF_CONTROL_HASHES = {
+    512: "EBA6D43B2CD97637B6ED0F443F36931C988EC22E293A5D07D87B3B1F41D99A06",
+    1343: "8916E9A2B040C7777245EA1D4F6F504505A974B0A871F1FDA7F80B5F8599773B",
+}
+WOLF_RUNTIME_SHA = "549D583899A32FCFDE6AD5751CC8381C6C6472512F0A4570EE80109FF69199CC"
+ENCHANTMENTS = {
+    "Enchantments": "minecraft:enchantments",
+    "StoredEnchantments": "minecraft:stored_enchantments",
+}
+
+
+def expected_components(value):
+    """Convert the historical expectation, never normalize a native observation away."""
+    if isinstance(value, list):
+        return [expected_components(item) for item in value]
+    if not isinstance(value, dict):
+        return value
+    if "id" not in value or "Count" not in value:
+        return {key: expected_components(item) for key, item in value.items()}
+    if type(value["Count"]) is not int or value["Count"] <= 0 or "count" in value or "components" in value:
+        raise AssertionError("Malformed or ambiguous historical stack")
+    result = {key: item for key, item in value.items() if key not in ("Count", "tag")}
+    result["count"] = value["Count"]
+    custom = dict(value.get("tag", {}))
+    if "BlockEntityTag" in custom:
+        raise AssertionError("This actor adapter does not translate nested block-entity stack data")
+    components = {}
+    if "Damage" in custom:
+        components["minecraft:damage"] = custom.pop("Damage")
+    for key, component in ENCHANTMENTS.items():
+        if key in custom:
+            enchantments = custom.pop(key)
+            levels = {item["id"]: item["lvl"] for item in enchantments}
+            if len(levels) != len(enchantments) or any(not isinstance(key, str) for key in levels):
+                raise AssertionError("Historical enchantments must have unique registry names")
+            components[component] = levels
+    if custom:
+        components["minecraft:custom_data"] = custom
+    if components:
+        result["components"] = components
+    return result
+
+
+def exact_items(expected, observed, path=""):
+    if isinstance(expected, dict) and isinstance(observed, dict):
+        if "id" in expected and "count" in expected:
+            if expected != observed:
+                return [dict(path=path + ".exact-item", expected=expected, actual=observed)]
+        else:
+            return [finding for key in sorted(expected.keys() & observed.keys())
+                    for finding in exact_items(expected[key], observed[key], f"{path}.{key}")]
+    elif isinstance(expected, list) and isinstance(observed, list):
+        return [finding for index, (before, after) in enumerate(zip(expected, observed))
+                for finding in exact_items(before, after, f"{path}[{index}]")]
+    return []
+
+
+def source_components(state, version):
+    if version in (3839, 3955):
+        from native12111_upgrade import expected_components as modern_components
+        return modern_components(state, source_version={3839: "1.20.6", 3955: "1.21.1"}[version])
+    if version >= 3839:
+        raise ValueError("Unreviewed native component player source version: " + str(version))
+    return expected_components(state)
+
+
+def baseline(source, kind):
+    source_baseline = bind(historical.baseline,
+                           capture_dimensions=bind(capture_dimensions, semantic=player_semantic))
+    state, label = source_baseline(source, kind)
+    definition = native.read_json(source / ("dimension-fixture.json" if kind == "dimensions" else "actor-fixture.json"))
+    player = nbtlib.load(source / WORLD / "playerdata" / (definition["playerUuid"] + ".dat"))
+    result = source_components(state, int(player.get("DataVersion", -1)))
+    level = nbtlib.load(source / WORLD / "level.dat")["Data"]
+    host = level.get("Player")
+    if host is not None:
+        if "UUID" in host:
+            authority = str(layout.uuid_tag(host["UUID"]))
+        else:
+            authority = str(uuid.UUID(int=((int(host["UUIDMost"]) & ((1 << 64) - 1)) << 64)
+                                     | (int(host["UUIDLeast"]) & ((1 << 64) - 1))))
+        if authority != definition["playerUuid"]:
+            raise AssertionError("Source embedded host differs from the sealed fixture player")
+        result["hostAuthority"] = authority
+    else:
+        result["hostAuthority"] = None
+    return result, label
+
+
+def expected_player_equipment(player):
+    """Apply native PlayerEquipmentFix's exact placement to expectations only."""
+    result = copy.deepcopy(player)
+    if "Inventory" not in result:
+        return result
+    inventory = result["Inventory"]
+    if not isinstance(inventory, list):
+        raise ValueError("Malformed expected player inventory")
+    equipment = result.get("equipment", {})
+    if not isinstance(equipment, dict):
+        raise ValueError("Malformed expected player equipment")
+    slots, remaining, moved = set(), [], {}
+    for item in inventory:
+        if not isinstance(item, dict) or type(item.get("Slot")) is not int:
+            raise ValueError("Missing or malformed expected inventory Slot")
+        slot = item["Slot"]
+        if slot in slots:
+            raise ValueError("Duplicate expected inventory Slot")
+        slots.add(slot)
+        name = PLAYER_EQUIPMENT_SLOTS.get(slot)
+        if name is None:
+            remaining.append(item)
+        else:
+            if "equipment" in result or not isinstance(item.get("id"), str) or type(item.get("count")) is not int or item["count"] <= 0:
+                raise ValueError("Ambiguous or malformed expected legacy equipment")
+            moved[name] = {key: value for key, value in item.items() if key != "Slot"}
+    result["Inventory"] = remaining
+    if moved:
+        result["equipment"] = moved
+    return result
+
+
+def expected_state(value, kind, survival=False, adapter=True):
+    result = historical.expected_state(value, kind, survival, adapter)
+    # Conversion leaves the unopened loose file historical. Level.dat host data
+    # has already undergone DFU, and every read phase loads/saves the loose player.
+    for container in ("file", "adapter", "embedded"):
+        if container in result and (container != "file" or adapter):
+            result[container] = expected_player_equipment(result[container])
+            if kind == "dimensions":
+                result[container] = expected_player_respawn(result[container])
+    if kind == "dimensions":
+        for entity in result.get("entities", {}).values():
+            expected_dimension_entity(entity)
+    # Native26 replaces embedded host NBT with explicit singleplayer_uuid authority.
+    # Its identity is checked separately from the existing loose-file payload.
+    result.pop("embedded", None)
+    return result
+
+
+def expected_player_respawn(player):
+    result = copy.deepcopy(player)
+    fields = ("SpawnX", "SpawnY", "SpawnZ", "SpawnDimension", "SpawnAngle", "SpawnForced")
+    if not any(key in result for key in fields):
+        return result
+    if "respawn" in result or not all(type(result.get(key)) is int for key in fields[:3]):
+        raise ValueError("Incomplete or ambiguous expected respawn position")
+    yaw = result.get("SpawnAngle", 0.0)
+    forced = result.get("SpawnForced", 0)
+    if (type(yaw) not in (int, float) or not math.isfinite(yaw)
+            or type(forced) not in (int, bool) or forced not in (0, 1)):
+        raise ValueError("Malformed expected respawn angle or forced flag")
+    respawn = dict(pos=[result[key] for key in fields[:3]],
+                   dimension=DIMENSIONS[dimension_id(result.get("SpawnDimension", 0))], yaw=yaw, pitch=0.0)
+    if forced:
+        respawn["forced"] = 1
+    for key in fields:
+        result.pop(key, None)
+    result["respawn"] = respawn
+    return result
+
+
+def expected_dimension_entity(entity):
+    if entity.get("id") in ("minecraft:boat", "minecraft:chest_boat"):
+        variant = entity.get("Type", "oak")
+        if variant not in BOAT_VARIANTS:
+            raise ValueError("Unproven historical boat variant")
+        chest = entity["id"] == "minecraft:chest_boat"
+        entity["id"] = "minecraft:" + variant + ("_chest" if chest else "") + ("_raft" if variant == "bamboo" else "_boat")
+        entity.pop("Type", None)
+    if entity.get("id") == "minecraft:horse":
+        moved = {}
+        for old, slot in (("SaddleItem", "saddle"), ("ArmorItem", "body")):
+            if old in entity:
+                if "equipment" in entity:
+                    raise ValueError("Ambiguous expected horse equipment")
+                moved[slot] = entity.pop(old)
+        if moved:
+            entity["equipment"] = moved
+    for passenger in entity.get("Passengers", ()):
+        expected_dimension_entity(passenger)
+
+
+def player_semantic(value, keys, registry):
+    if "SpawnX" in keys:
+        keys = (*keys, "SpawnAngle")
+    result = historical_semantic(value, keys, registry)
+    if "Inventory" in keys and "equipment" in value:
+        equipment = value["equipment"]
+        if not isinstance(equipment, dict):
+            raise ValueError("Malformed observed player equipment")
+        result["equipment"] = plain(equipment)
+    if "SpawnX" in keys and "respawn" in value:
+        if not isinstance(value["respawn"], dict):
+            raise ValueError("Malformed observed player respawn")
+        if any(key in value for key in ("SpawnX", "SpawnY", "SpawnZ", "SpawnDimension", "SpawnAngle", "SpawnForced")):
+            raise ValueError("Ambiguous observed native and historical respawn")
+        result["respawn"] = plain(value["respawn"])
+    return result
+
+
+def dimension_entity_state(value):
+    result = dimensions.entity_state(value)
+    if "equipment" in value:
+        if not isinstance(value["equipment"], dict):
+            raise ValueError("Malformed observed entity equipment")
+        if any(key in value for key in ("SaddleItem", "ArmorItem", "body_armor_item", "saddle", "ArmorItems", "HandItems")):
+            raise ValueError("Ambiguous observed native and historical entity equipment")
+        result["equipment"] = copy.deepcopy(value["equipment"])
+    if "Passengers" in value:
+        result["Passengers"] = [dimension_entity_state(entry) for entry in value["Passengers"]]
+    return result
+
+
+def leash_position(value):
+    if (len(value) != 3 or any(type(coordinate) is not int or not -(1 << 31) <= coordinate < (1 << 31)
+                               for coordinate in value)):
+        raise ValueError("Expected the native leash knot's block-position int[3]")
+    return dict(zip(("X", "Y", "Z"), value))
+
+
+def dimension_entity_view(value):
+    if value.get("id") == "minecraft:horse":
+        if "leash" in value:
+            if "Leash" in value:
+                raise ValueError("Ambiguous saved horse leash")
+            value["Leash"] = leash_position(value.pop("leash"))
+        if "body_armor_item" in value:
+            if "ArmorItem" in value:
+                raise ValueError("Ambiguous saved horse armor")
+            value["ArmorItem"] = value.pop("body_armor_item")
+        for attribute in value.get("Attributes", ()):
+            if attribute["Name"] == "minecraft:generic.jump_strength":
+                if any(other["Name"] == "horse.jumpStrength" for other in value["Attributes"]):
+                    raise ValueError("Ambiguous saved horse jump strength")
+                attribute["Name"] = "horse.jumpStrength"
+    for passenger in value.get("Passengers", ()):
+        dimension_entity_view(passenger)
+    return value
+
+
+def native_dimension_nbt(entry):
+    parser = bind(parse_dimension_nbt, project_entity=lambda value, contexts:
+                  project_entity(native_attribute_view(value), contexts))
+    return dimension_entity_view(parser(entry))
+
+
+def native_attribute_view(value):
+    """Expose the new field spelling to the retained semantic oracle without changing values."""
+    result = copy.deepcopy(value)
+
+    def visit(entity):
+        if "attributes" in entity:
+            if "Attributes" in entity or not isinstance(entity["attributes"], list):
+                raise ValueError("Ambiguous native attribute list")
+            attributes, names = [], set()
+            for original in entity.pop("attributes"):
+                if not isinstance(original, dict) or not isinstance(original.get("id"), str):
+                    raise ValueError("Malformed native attribute")
+                row = dict(original)
+                raw_name = row.pop("id")
+                name = NATIVE_ATTRIBUTE_ALIASES.get(raw_name, raw_name)
+                if name in names or "Name" in row or "Base" in row or "Modifiers" in row:
+                    raise ValueError("Duplicate or ambiguous native attribute")
+                names.add(name)
+                row["Name"] = name
+                if "base" in row:
+                    row["Base"] = row.pop("base")
+                if "modifiers" in row:
+                    row["Modifiers"] = row.pop("modifiers")
+                attributes.append(row)
+            entity["Attributes"] = attributes
+        for passenger in entity.get("Passengers", ()):
+            visit(passenger)
+    visit(result)
+    return result
+
+
+def capture_player_version(capture, runtime, label, evidence):
+    state = capture(runtime, label, evidence)
+    version = int(nbtlib.load(evidence / "player.dat").get("DataVersion", -1))
+    if version != DATA_VERSION:
+        if label != "converted" or version >= DATA_VERSION:
+            raise AssertionError(f"{label}: native player file was not serialized as data version {DATA_VERSION}: {version}")
+        # The unopened loose file has not gone through PlayerDataStorage yet.
+        # Compare the retained source representation but keep its original file and version as evidence.
+        state["file"] = source_components(state["file"], version)
+    write_json(evidence / "player-format.json", dict(dataVersion=version, native=version == DATA_VERSION))
+    return state
+
+
+def retain(runtime, kind, label):
+    definition = native.read_json(runtime / ("dimension-fixture.json" if kind == "dimensions" else "actor-fixture.json"))
+    folder = runtime / ("dimension-evidence" if kind == "dimensions" else "actor-evidence") / label
+    folder.mkdir(parents=True, exist_ok=False)
+    world = runtime / WORLD
+    player = layout.player_file(world, definition["playerUuid"])
+    # Never fall back to historical playerdata or an embedded Player observation.
+    shutil.copy2(player, folder / "player.dat")
+    shutil.copy2(world / "level.dat", folder / "level.dat")
+    level = layout.read_level(world)
+    if "Player" in level:
+        raise AssertionError("Native target retains ambiguous embedded host data")
+    authority = layout.singleplayer_uuid(world)
+    if authority is not None and str(authority) != definition["playerUuid"]:
+        raise AssertionError("Native target host UUID differs from fixture player")
+    capture = (bind(capture_dimensions, semantic=player_semantic, entity_state=dimension_entity_state,
+                    parse_nbt=native_dimension_nbt) if kind == "dimensions"
+               else bind(capture_actors, semantic=player_semantic))
+    state = capture_player_version(capture, runtime, label, folder)
+    state["hostAuthority"] = str(authority) if authority else None
+    if "embedded" in state:
+        raise AssertionError("Probe reports historical embedded player data on a native26 target")
+    if kind == "dimensions":
+        state = historical.native_dimension_state(state)
+    write_json(folder / "authority.json", dict(playerPath=str(player), singleplayerUuid=str(authority) if authority else None,
+               embeddedPlayerAbsent=True, playerFileSha256=digest(player)))
+    write_json(runtime / (("dimension-semantic-" if kind == "dimensions" else "semantic-") + label + ".json"), state)
+    return state
+
+
+command = bind(historical.command, retain=retain)
+release = bind(historical.release, command=command)
+
+
+def helper_snapshot(record):
+    expected, rows, roots = entity_storage._snapshots(record)
+    for row in rows.values():
+        if "leash" not in row:
+            continue
+        position = row["leash"]
+        if "Leash" in row or not isinstance(position, nbtlib.IntArray):
+            raise ValueError("Malformed or ambiguous native stopped leash")
+        if len(position) == 3:
+            row["Leash"] = nbtlib.Compound({key: nbtlib.Int(number)
+                                           for key, number in leash_position(list(map(int, position))).items()})
+        elif len(position) != 4:
+            raise ValueError("Unexpected native stopped leash array length")
+    return expected, rows, roots
+
+
+validate_helpers = bind(helper_contract.validate, native=SimpleNamespace(
+    _snapshots=helper_snapshot, _nbt=entity_storage._nbt, _decompress=entity_storage._decompress,
+    _identity=entity_storage._identity), CONTRACT_SHA=HELPER_CONTRACT_SHA,
+    POLICY="native2612-leash-knot-nosave-v1")
+helper_adapter = SimpleNamespace(CONTRACT="native2612-helper-contract.json", LIFECYCLE=helper_contract.LIFECYCLE,
+                                 validate=validate_helpers, raw_helpers_absent=helper_contract.raw_helpers_absent)
+
+
+def stop_audit_import(name, globals=None, locals=None, fromlist=(), level=0):
+    # Only this function's local helper import is adapted. The raw region audit
+    # still uses the original on-disk NBT and the module is never monkey-patched.
+    if level == 0 and name == "native117_helper_contract":
+        return helper_adapter
+    return builtins.__import__(name, globals, locals, fromlist, level)
+
+
+def audit_entity_storage(snapshot_record, world_path, evidence_folder, *, data_version=DATA_VERSION, dimension=None):
+    """Frozen complete-NBT comparator, with an explicit native dimension key."""
+    world = Path(world_path).resolve(strict=True)
+    key = dimension or snapshot_record.get("worldDimensionKey")
+    if key not in DIMENSION_PATHS or not world.as_posix().endswith("/" + DIMENSION_PATHS[key][1]):
+        raise ValueError("Expected an explicit native dimension path and key")
+    evidence = Path(evidence_folder).resolve()
+    require_disjoint(evidence, world)
+    evidence.mkdir(parents=True, exist_ok=False)
+    receipt = dict(format=1, status="FAIL", scope="EXACT_STOPPED_ENTITY_NBT_ONLY", world=str(world),
+                   callerMustStopServer=True, files={}, sourceFiles={}, chunks={}, matched={})
+
+    def retain_raw(relative, data):
+        path = evidence / relative
+        path.parent.mkdir(parents=True, exist_ok=True)
+        with path.open("xb") as output:
+            output.write(data)
+        receipt["files"][relative] = entity_storage._sha(data)
+
+    try:
+        expected, rows, roots = entity_storage._snapshots(snapshot_record)
+        retain_raw("snapshot.json", (json.dumps(snapshot_record, sort_keys=True, indent=2) + "\n").encode())
+        number = DIMENSION_PATHS[key][0]
+        for field in ("dimension", "worldDimensionKey"):
+            if field in snapshot_record and dimension_id(snapshot_record[field]) != number:
+                raise AssertionError("Snapshot dimension disagrees with the explicit native dimension")
+        source = world / "entities"
+        if source.is_symlink() or not source.is_dir():
+            raise ValueError("Missing regular native entities directory")
+        paths = sorted(source.glob("*.mca"))
+        if not paths:
+            raise ValueError("No native entity regions found")
+        saved, root_chunks = {}, {}
+        for path in paths:
+            match = entity_storage.REGION_NAME.fullmatch(path.name)
+            if path.is_symlink() or not path.is_file() or match is None or path.stat().st_nlink != 1:
+                raise ValueError("Unsafe native entity region path")
+            rx, rz = map(int, match.groups())
+            if path.name != "r.%d.%d.mca" % (rx, rz) or any(not -(1 << 26) <= n < (1 << 26) for n in (rx, rz)):
+                raise ValueError("Noncanonical native entity region coordinates")
+            data = path.read_bytes()
+            receipt["sourceFiles"][path.name] = entity_storage._sha(data)
+            retain_raw("regions/" + path.name, data)
+            for coordinates, payload in entity_storage._payloads(data, rx, rz):
+                relative = "chunks/%d.%d.chunk" % coordinates
+                retain_raw(relative, payload)
+                receipt["chunks"][relative] = dict(position=list(coordinates), sha256=entity_storage._sha(payload), source=path.name)
+                for root in entity_storage._entity_chunk(payload, coordinates, data_version):
+                    root_id = entity_storage._identity(root)
+                    if entity_storage._chunk(root) != coordinates:
+                        raise AssertionError("Root entity saved Pos differs from its EntityStorage chunk")
+                    root_chunks[root_id] = coordinates
+                    for identity, tag, parent in entity_storage._tree(root):
+                        if identity in saved:
+                            raise AssertionError("Duplicate UUID in raw entity storage: " + identity)
+                        if "Dimension" in tag and dimension_id(plain(tag["Dimension"].unpack())) != number:
+                            raise AssertionError("Raw entity NBT dimension differs from explicit directory")
+                        saved[identity] = dict(nbt=entity_storage._semantic(tag), root=root_id, chunk=coordinates)
+        for identity, entity in roots.items():
+            if identity not in root_chunks or root_chunks[identity] != entity_storage._chunk(entity):
+                raise AssertionError("Snapshot root UUID absent from its actual saved Pos chunk: " + identity)
+        for identity, semantic in expected.items():
+            if identity not in saved or saved[identity]["nbt"] != semantic:
+                raise AssertionError("Complete saved entity NBT differs from actual snapshot: " + identity)
+            entry = saved[identity]
+            receipt["matched"][identity] = dict(rootUuid=entry["root"], chunk=list(entry["chunk"]),
+                payload="chunks/%d.%d.chunk" % entry["chunk"], separatelyObserved=identity in rows)
+        if sorted(source.glob("*.mca")) != paths or any(entity_storage._sha(p.read_bytes()) != receipt["sourceFiles"][p.name] for p in paths):
+            raise AssertionError("Entity storage changed during stopped audit")
+        receipt.update(status="PASS", snapshotRecords=len(rows), matchedEntities=len(expected), rawEntities=len(saved),
+                       unrelatedEntities=len(set(saved) - set(expected)), dimension=number, worldDimensionKey=key)
+    except Exception as error:
+        receipt["error"] = repr(error)
+        raise
+    finally:
+        write_json(evidence / "receipt.json", receipt)
+    return receipt
+
+
+audit_stopped = bind(stopped.audit_stopped, DIMENSIONS=DIMENSION_PATHS,
+                     entity_storage=SimpleNamespace(_snapshots=entity_storage._snapshots, audit=audit_entity_storage),
+                     __builtins__=dict(vars(builtins), __import__=stop_audit_import))
+
+
+def verdict(oracle, before, after):
+    result = oracle(before, after)
+    findings = exact_items(before, after)
+    findings.extend(exact_native_maps(before, after))
+    result["differences"].extend(findings)
+    if findings:
+        result["status"] = "FAIL"
+        if "entity_status" in result and any(row["path"].startswith(".entities.") for row in findings):
+            result["entity_status"] = "FAIL"
+        if "player_status" in result and any(not row["path"].startswith(".entities.") for row in findings):
+            result["player_status"] = "FAIL"
+    return result
+
+
+def exact_native_maps(expected, actual, path=""):
+    findings = []
+    if isinstance(expected, dict) and isinstance(actual, dict):
+        for key, default in (("equipment", {}), ("respawn", None)):
+            before, after = expected.get(key, default), actual.get(key, default)
+            if before != after:
+                findings.append(dict(path=f"{path}.{key}.exact-map", expected=before, actual=after))
+        for key in expected.keys() & actual.keys():
+            findings.extend(exact_native_maps(expected[key], actual[key], f"{path}.{key}"))
+    elif isinstance(expected, list) and isinstance(actual, list):
+        for index, (before, after) in enumerate(zip(expected, actual)):
+            findings.extend(exact_native_maps(before, after, f"{path}[{index}]"))
+    return findings
+
+
+def assess_native(before, after, strict, proof, scope, adapter):
+    result = dict(status=strict["status"], rawStrictStatus=strict["status"],
+                  rawStrictResult=copy.deepcopy(strict), nativeDifferences=[])
+    if strict["status"] == "PASS" or proof is None:
+        return result
+    expected = copy.deepcopy(before)
+    wolf = expected.get("entities", {}).get("passenger-wolf", {})
+    actual = after.get("entities", {}).get("passenger-wolf", {})
+    maximum = wolf.get("Attributes", {}).get("generic.maxHealth", {})
+    if (wolf.get("id") != "minecraft:wolf" or actual.get("id") != wolf["id"]
+            or wolf.get("Health") != 8 or maximum.get("Base") != 20
+            or any(key not in wolf or actual.get(key) != wolf[key]
+                   for key in ("UUIDMost", "UUIDLeast", "OwnerUUID"))):
+        return result
+    # These exact changes were independently reproduced by vanilla DFU and native
+    # Wolf load/save on a classpath that contains no Advantage classes.
+    controls = {}
+    runtime_path = Path(proof) / "control-runtime.json"
+    native.validate_hash(runtime_path, WOLF_RUNTIME_SHA)
+    runtime = native.read_json(runtime_path)
+    if (runtime.get("minecraftVersion") != native.MINECRAFT or runtime.get("targetDataVersion") != DATA_VERSION
+            or runtime.get("inheritedJvmEnvironmentAbsent") is not True
+            or "-XX:ActiveProcessorCount=4" not in runtime.get("jvmArguments", ())
+            or runtime.get("javaSha256") != native.JAVA_SHA
+            or runtime.get("mainClass") != "NativeWolfPlatformControl"
+            or not any(row.get("sha256") == "EAF67CF3E6DD7D6546A315A64C5C89BD82C704C361321A081E5B219B3212BA46"
+                       for row in runtime.get("classpath", ()))):
+        raise ValueError("Historical wolf controls cannot qualify the native26 target")
+    controls["runtime"] = dict(path=str(runtime_path), sha256=WOLF_RUNTIME_SHA, observation=runtime)
+    for version, checksum in WOLF_CONTROL_HASHES.items():
+        path = Path(proof) / f"legacy-{version}-receipt.json"
+        native.validate_hash(path, checksum)
+        observation = native.read_json(path)
+        if (observation.get("sourceDataVersion") != version or observation.get("targetDataVersion") != DATA_VERSION
+                or observation.get("noPower") is not True
+                or observation.get("uuidPreserved") is not True or observation.get("ownerPreserved") is not True
+                or [observation.get(key) for key in ("sourceHealth", "savedHealth", "sourceMaxHealth", "savedMaxHealth")] != [8, 16, 20, 40]):
+            raise ValueError("Historical wolf controls cannot qualify the native26 target")
+        controls[str(version)] = dict(path=str(path), sha256=checksum, observation=observation)
+    wolf["Health"] = 16
+    maximum["Base"] = 40
+    checked = verdict(dimensions.verdict, expected, after)
+    if checked["status"] == "PASS":
+        result.update(status="PASS_WITH_NATIVE_DIFFERENCE", allOtherFieldsStrictMatch=True,
+                      controlledProof=controls, nativeDifferences=copy.deepcopy(strict["differences"]))
+    return result
+
+
+def summarize_native(checks, assessments):
+    failures, native_changes = [], []
+    for key, check in checks.items():
+        if check["status"] == "PASS":
+            continue
+        assessment = assessments.get(key)
+        if (assessment is None or assessment.get("rawStrictResult") != check
+                or assessment.get("status") != "PASS_WITH_NATIVE_DIFFERENCE"
+                or assessment.get("allOtherFieldsStrictMatch") is not True):
+            failures.append(key)
+        else:
+            native_changes.append(dict(check=key, assessment=assessment))
+    return dict(status="FAIL" if not checks or failures else
+                "PASS_WITH_NATIVE_DIFFERENCE" if native_changes else "PASS",
+                rawStrictStatus="FAIL" if native_changes or failures else "PASS",
+                failures=failures, nativeDifferences=native_changes)
+
+
+def copy_fixture(source, runtime):
+    shutil.copytree(source / WORLD, runtime / WORLD)
+    shutil.copy2(source / "migration-fixture.json", runtime / "migration-fixture.json")
+    config = source / "config"
+    if config.is_dir():
+        for item in config.rglob("*"):
+            destination = runtime / "config" / item.relative_to(config)
+            if item.is_file() and item.relative_to(config).as_posix() == "fml.toml":
+                retained = runtime / "historical-config-custody" / "fml.toml"
+                retained.parent.mkdir(parents=True, exist_ok=False)
+                shutil.copy2(item, retained)
+                continue
+            if item.is_file() and destination.exists():
+                raise FileExistsError(f"Retained fixture config conflicts with native runtime: {destination}")
+            if item.is_file():
+                destination.parent.mkdir(parents=True, exist_ok=True)
+                shutil.copy2(item, destination)
+
+
+run_route = bind(historical.run_route, baseline=baseline, expected_state=expected_state, command=command, release=release,
+                 copy_fixture=copy_fixture, assess=assess_native,
+                 summarize_checks=summarize_native,
+                 native117_dimension_assessment=SimpleNamespace(__file__=__file__),
+                 actors=SimpleNamespace(compare=partial(verdict, actors.compare), freeze_result=actors.freeze_result,
+                                        tick_result=actors.tick_result, backup_state=actors.backup_state),
+                 dimensions=SimpleNamespace(verdict=partial(verdict, dimensions.verdict),
+                                             tick_result=dimensions.tick_result))
+
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__)
+    for name in ("fixture", "fixture-receipt", "profile", "seed", "inventory", "java", "output"):
+        parser.add_argument("--" + name, type=lambda value: Path(value).resolve(), required=True)
+    parser.add_argument("--fixture-receipt-sha256", required=True)
+    parser.add_argument("--inventory-sha256", required=True)
+    parser.add_argument("--kind", choices=("actors", "dimensions"), required=True)
+    parser.add_argument("--native-wolf-proof", type=lambda value: Path(value).resolve(strict=True))
+    parser.add_argument("--source-stopped-reference", type=lambda value: Path(value).resolve(strict=True))
+    parser.add_argument("--source-stopped-reference-sha256")
+    parser.add_argument("--port", type=int, required=True)
+    parser.add_argument("--provisional", action="store_true", help="Diagnostic input profile, never final qualification")
+    args = parser.parse_args()
+    if not 26450 <= args.port <= 65535:
+        parser.error("Use a disposable localhost port at or above 26450")
+
+    output = output_path(args.output)
+    source = args.fixture.resolve(strict=True)
+    profile_document = native.read_json(args.profile)
+    if profile_document.get("diagnosticScope") is not None and not args.provisional:
+        raise ValueError("A diagnostic profile requires explicit --provisional scope")
+    seed, inventory, mods = native.read_family_target(args.profile, args.seed, args.inventory, args.inventory_sha256)
+    java, version = native.java25(args.java)
+    for path in (source, args.fixture_receipt, args.profile, seed, args.inventory, java,
+                 *(entry[1] for entry in mods.values())):
+        require_disjoint(output, path)
+    native.validate_hash(args.fixture_receipt, args.fixture_receipt_sha256)
+    approved = native.read_json(args.fixture_receipt)
+    before = fingerprint(source)
+    if not before or Path(approved["source"]).resolve() != source or approved["sourceFingerprint"] != before:
+        raise AssertionError("Historical fixture no longer matches its approved receipt")
+    source_reference, reference_before, reference_helper, active_route = None, None, None, run_route
+    if args.source_stopped_reference is not None or args.source_stopped_reference_sha256 is not None:
+        if args.kind != "actors" or args.source_stopped_reference is None or args.source_stopped_reference_sha256 is None:
+            raise ValueError("Stopped source reference requires actors mode and explicit file plus SHA-256")
+        import native2612_stopped_actor_reference as reference_helper
+        require_disjoint(output, args.source_stopped_reference.parent)
+        source_reference = reference_helper.validate(args.source_stopped_reference, args.source_stopped_reference_sha256,
+                                                     source, args.fixture_receipt_sha256)
+        reference_before = fingerprint(args.source_stopped_reference.parent)
+        def stopped_baseline(actual_source, kind):
+            if actual_source.resolve() != source or kind != "actors":
+                raise AssertionError("Stopped source reference bound to a different route")
+            return copy.deepcopy(source_reference), "sealed-source-stopped-disk"
+        active_route = bind(run_route, baseline=stopped_baseline)
+    with socket.socket() as listener:
+        listener.bind(("127.0.0.1", args.port))
+    seed_before = fingerprint(seed)
+    expected_jars = {path.name: sha.upper() for _, path, sha in mods.values()}
+    runtime = output / "server"
+    report = output / "native2612-actors-results.json"
+    runner = Path(__file__)
+    closure = {Path(module.__file__).resolve(): digest(Path(module.__file__)) for module in tuple(sys.modules.values())
+               if getattr(module, "__file__", None) and Path(module.__file__).suffix == ".py"
+               and Path(module.__file__).resolve().parent == Path(__file__).resolve().parent
+               and not Path(module.__file__).name.startswith("test_")}
+    result = dict(status="RUNNING", kind=args.kind, source=str(source), realClientLogin="NOT_TESTED",
+                  qualificationStatus=native.EXPLORATORY, minecraft=native.MINECRAFT, forge=native.FORGE,
+                  fixtureReceiptSha256=digest(args.fixture_receipt), profileSha256=digest(args.profile),
+                  inventorySha256=digest(args.inventory), runnerSha256=digest(runner),
+                  historicalOracleSha256=digest(Path(historical.__file__)), javaSha256=digest(java),
+                  javaVersion=version, port=args.port, jars=expected_jars, checks={},
+                  preRunCustody=True, oracleClosure={str(path): sha for path, sha in closure.items()},
+                  provisional=args.provisional, finalQualificationAllowed=False,
+                  scope="PROVISIONAL_CONTEXT_NOT_FINAL_ATLAS_QUALIFICATION" if args.provisional else "FROZEN_INPUT_ACTOR_ROUTE_NOT_MANUAL_ACCEPTANCE")
+    output.mkdir()
+    shutil.copy2(runner, output / runner.name)
+    if source_reference is not None:
+        result["stoppedSourceReference"] = dict(path=str(args.source_stopped_reference),
+                sha256=digest(args.source_stopped_reference), helperSha256=digest(Path(reference_helper.__file__)),
+                targetObservationsUsed=False, sealedBeforeTargetLoad=True)
+        shutil.copy2(Path(reference_helper.__file__), output / "stopped-reference-builder-source.py")
+    write_json(report, result)
+
+    def stage(destination, target, port):
+        native.stage(destination, *target, port)
+        return native.LAUNCHER
+
+    class Server(native.Server):
+        def __init__(self, *values):
+            native.verify_runtime(runtime, inventory, expected_jars)
+            super().__init__(*values)
+
+        def close(self):
+            try:
+                super().close()
+            finally:
+                native.verify_runtime(runtime, inventory, expected_jars)
+
+    try:
+        args.target_manifest, args.java17 = args.profile, java
+        result["checks"] = active_route(
+            source, runtime, (seed, inventory, mods), args, stage=stage, server_type=Server,
+            stop_audit=partial(audit_stopped, minecraft_version=native.MINECRAFT,
+                               data_version=DATA_VERSION, stopping_phase="ServerStoppingEvent"),
+            check_log=native.require_clean_log, minecraft=native.MINECRAFT)
+        checks = result["checks"]
+        result["status"] = "PASS" if checks and all(c["status"] == "PASS" for c in checks.values()) else "FAIL"
+        if args.kind == "dimensions":
+            result["nativeAssessment"] = native.read_json(runtime / "native117-platform-assessment.json")
+            result["status"] = result["nativeAssessment"]["assessment"]["status"]
+    except BaseException as failure:
+        result.update(status="FAIL", error=repr(failure), traceback=traceback.format_exc())
+        checkpoint = runtime / "native117-comparison.json"
+        if checkpoint.is_file():
+            result["checks"] = native.read_json(checkpoint)
+        raise
+    finally:
+        result["sourceUnchanged"] = fingerprint(source) == before
+        result["seedUnchanged"] = fingerprint(seed) == seed_before
+        result["inputsUnchanged"] = all(digest(path) == sha for path, sha in (
+            (args.profile, result["profileSha256"]), (args.inventory, result["inventorySha256"]),
+            (args.fixture_receipt, result["fixtureReceiptSha256"]), (java, result["javaSha256"]),
+            (runner, result["runnerSha256"]), (Path(historical.__file__), result["historicalOracleSha256"]),
+            *((path, sha.upper()) for _, path, sha in mods.values()), *closure.items(),
+        ))
+        if not all(result[key] for key in ("sourceUnchanged", "seedUnchanged", "inputsUnchanged")):
+            result["status"] = "FAIL"
+        if source_reference is not None:
+            result["stoppedSourceReferenceUnchanged"] = (
+                fingerprint(args.source_stopped_reference.parent) == reference_before
+                and digest(Path(reference_helper.__file__)) == result["stoppedSourceReference"]["helperSha256"])
+            if not result["stoppedSourceReferenceUnchanged"]:
+                result["status"] = "FAIL"
+        write_json(report, result)
+    return int(result["status"] not in ("PASS", "PASS_WITH_NATIVE_DIFFERENCE"))
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/test-rig/migration/native2612_broad.py b/test-rig/migration/native2612_broad.py
new file mode 100644
index 00000000..c0664127
--- /dev/null
+++ b/test-rig/migration/native2612_broad.py
@@ -0,0 +1,126 @@
+"""Native26 walkable works: retain the 21-bay and twelve-drill operation oracles."""
+
+import argparse
+from pathlib import Path
+import sys
+from types import SimpleNamespace
+import traceback
+
+from matrix import digest, fingerprint, write_json
+from native117 import output_path, require_disjoint
+from native117_actor_io import bind
+from native117_broad import campaign_document, run_profile
+import native12111_broad as previous
+import native2612 as native
+
+
+RECEIPT = "native2612-broad-results.json"
+
+
+def supported_mode(value):
+    if value != "packaged-current":
+        raise argparse.ArgumentTypeError(
+            f"{value!r} is unsupported for Minecraft 26.1.2: BaseMetals is mandatory. "
+            "Use packaged-current with the complete pinned family profile.")
+    return value
+
+
+class Adapter:
+    Server = native.Server
+    MINECRAFT, FORGE, FLAT_SETTINGS = native.MINECRAFT, native.FORGE, native.FLAT_SETTINGS
+    verify_runtime = staticmethod(native.audit_staged)
+    require_clean_log = staticmethod(native.require_clean_log)
+    drill_tag = staticmethod(previous.Adapter.drill_tag)
+    drill_tickets = staticmethod(bind(previous.Adapter.drill_tickets, native=native))
+
+    @staticmethod
+    def stage(runtime, target, port):
+        seed, inventory, entries = target
+        native.stage(runtime, seed, inventory, {
+            key: (item["version"], item["path"], item["sha256"]) for key, item in entries.items()
+        }, port)
+        return native.LAUNCHER
+
+    @staticmethod
+    def drill_data(row):
+        data = native.compat_tile_data(row)
+        if "AdvBayWitness" in data.get("ForgeData", {}):
+            raise AssertionError("Broad witness must come from the native tile component")
+        marker = data.get("components", {}).get("minecraft:custom_data", {}).get("AdvBayWitness")
+        if marker is not None:
+            data["ForgeData"] = {"AdvBayWitness": marker}
+        return data
+
+
+def oracle_closure():
+    directory = Path(__file__).resolve().parent
+    return {Path(module.__file__).resolve(): digest(Path(module.__file__)) for module in tuple(sys.modules.values())
+            if getattr(module, "__file__", None) and Path(module.__file__).suffix == ".py"
+            and Path(module.__file__).resolve().parent == directory
+            and not Path(module.__file__).name.startswith("test_")}
+
+
+def main(argv=None):
+    parser = argparse.ArgumentParser(description=__doc__)
+    for key in ("profile", "seed", "inventory", "java", "output"):
+        parser.add_argument("--" + key, type=lambda value: Path(value).resolve(), required=True)
+    parser.add_argument("--profile-sha256", required=True)
+    parser.add_argument("--inventory-sha256", required=True)
+    parser.add_argument("--port", type=int, required=True)
+    parser.add_argument("--run-seconds", type=int, default=8)
+    parser.add_argument("--mode", type=supported_mode, default="packaged-current", metavar="packaged-current")
+    args = parser.parse_args(argv)
+    if not 1 <= args.run_seconds <= 60 or not 1024 <= args.port < 65535:
+        parser.error("Use a bounded duration and an unprivileged localhost port")
+    native.validate_hash(args.profile, args.profile_sha256)
+    seed, inventory, mods = native.read_family_target(args.profile, args.seed, args.inventory, args.inventory_sha256)
+    if set(mods) != set(native.VERSIONS):
+        parser.error("BaseMetals and the complete six-jar family are mandatory for Minecraft 26.1.2")
+    output = output_path(args.output)
+    java, version = native.java25(args.java)
+    for path in (args.profile, seed, args.inventory, java, *(item[1] for item in mods.values())):
+        require_disjoint(output, path)
+    seed_before = fingerprint(seed)
+    entries = {key: dict(id=key, version=value[0], path=value[1], file=value[1].name, sha256=value[2])
+               for key, value in mods.items()}
+    spec = native.RIG / "src/main/resources/assets/advantageworkstest/works/works-1.13.2.json"
+    stations = native.read_json(spec)["stations"]
+    if len(stations) != 21 or len({station["id"] for station in stations}) != 21:
+        raise AssertionError("The complete 21-bay definition is required")
+    protected = oracle_closure()
+    protected.update({path: digest(path) for path in (args.profile, args.inventory, java, spec,
+                                                    *(value[1] for value in mods.values()))})
+    proof = dict(qualificationStatus="EXPLORATORY_UNQUALIFIED", minecraft=native.MINECRAFT, forge=native.FORGE,
+                 scope="PACKAGED_WALKABLE_WORKS_AND_TWELVE_DRILL_WITNESSES",
+                 profileSha256=digest(args.profile), inventorySha256=digest(args.inventory),
+                 stationDefinitionSha256=digest(spec), javaVersion=version, javaSha256=digest(java),
+                 inputHashes={str(path): sha for path, sha in protected.items()},
+                 jars={key: item["sha256"] for key, item in entries.items()})
+    receipt = output / RECEIPT
+    names = (args.mode,)
+    results = {}
+    write_json(receipt, campaign_document(names, results, proof, finished=False))
+    try:
+        result = run_profile(SimpleNamespace(java17=java, run_seconds=args.run_seconds), None,
+                             output, args.mode, args.port, stations,
+                             native118_target=(seed, inventory, entries), native_adapter=Adapter)
+        results[args.mode] = result
+    except Exception:
+        results[args.mode] = dict(status="FAIL", profile=args.mode, error=traceback.format_exc())
+    try:
+        native.verify_runtime(output / args.mode, inventory,
+                              {item["file"]: item["sha256"] for item in entries.values()})
+    except Exception:
+        results[args.mode].update(status="FAIL", custodyError=traceback.format_exc())
+    final = campaign_document(names, results, proof, finished=True)
+    final["seedUnchanged"] = fingerprint(seed) == seed_before
+    final["inputsUnchanged"] = all(path.is_file() and digest(path) == sha for path, sha in protected.items())
+    if not final["seedUnchanged"] or not final["inputsUnchanged"]:
+        final["status"] = "FAIL"
+    write_json(receipt, final)
+    print(args.mode, final["status"], flush=True)
+    return int(final["status"] != "PASS")
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/test-rig/migration/native2612_client.py b/test-rig/migration/native2612_client.py
new file mode 100644
index 00000000..bb466874
--- /dev/null
+++ b/test-rig/migration/native2612_client.py
@@ -0,0 +1,872 @@
+"""Pinned native64 real-world client launch and strict retained resource evidence.
+
+Actual-world oil/reload and human gameplay remain distinct, mandatory scopes.
+"""
+
+import hashlib
+import json
+import math
+import os
+import re
+from pathlib import Path
+import shlex
+import shutil
+import struct
+import subprocess
+import tomllib
+import xml.etree.ElementTree as ET
+from zipfile import ZipFile
+import zlib
+
+from matrix import digest, fingerprint, write_json
+from native117 import output_path, require_disjoint
+import native2612 as native
+import native2612_layout as layout
+import native2612_client_diagnostics as client_diagnostics
+from native2612_resources import FAMILY, arguments, artifact, preflight, require
+
+
+ASSET_INDEX = "30"
+ASSET_INDEX_SHA1 = "49107CF4E5F961B086AC4F06F3C2C56142B023DC"
+VIEWPORTS = ((320, 240, 1), (426, 240, 2), (640, 360, 1))
+VM_ARGS = ("-Djava.net.preferIPv6Addresses=system", "-XX:+UseCompactObjectHeaders", "--add-opens",
+           "java.base/java.lang.invoke=ALL-UNNAMED", "-Dforge.enableGameTest=true",
+           "-Dforge.logging.markers=REGISTRIES", "-Dforge.logging.console.level=info")
+RESULT = "native2612-client-results.json"
+CLIENT_WORLD = "AdvantageClientResources"
+CLIENT_USERNAME = "AdvantageProbe"
+FIXTURE_PROTOCOL = "NATIVE64_SEALED_EXPERIMENTAL_FIXTURE_SKIP_V2"
+FIXTURE_SCOPE = "COMPLETED_NATIVE64_BROAD_PACKAGED_CURRENT_COPY"
+
+
+def verify_world_source(world, receipt, profile_sha256, mods):
+    require(receipt["status"] == "PASS" and receipt["inputsUnchanged"] is True
+            and receipt["seedUnchanged"] is True and receipt["profileSha256"] == profile_sha256.upper()
+            and receipt["jars"] == {key: row[2] for key, row in mods.items()},
+            "Client world lacks a completed exact-family source receipt")
+    require(receipt["minecraft"] == native.MINECRAFT and receipt["forge"] == native.FORGE
+            and receipt["scope"] == "PACKAGED_WALKABLE_WORKS_AND_TWELVE_DRILL_WITNESSES",
+            "Client source is not the approved native broad fixture")
+    completed = receipt["profiles"]["packaged-current"]
+    require(completed["status"] == "PASS" and completed["profile"] == "packaged-current"
+            and all(completed["phases"][phase]["status"] == "PASS" for phase in (
+                "first", "initial", "operation", "persistence", "restarted"))
+            and completed["expectedMods"] == {"minecraft": native.MINECRAFT, "forge": native.FORGE,
+                **{key: row[0] for key, row in mods.items()}}, "Client broad source is incomplete or has a different family")
+    data = layout.read_level(world)
+    require(str(data["Version"]["Name"]) == native.MINECRAFT, "Client source world is not native26")
+    root = layout._load(Path(world) / "level.dat")
+    versions = {str(row["ModId"]): str(row["ModVersion"]) for row in root["fml"]["LoadingModList"]}
+    require(versions == {"minecraft": native.MINECRAFT, "forge": native.FORGE,
+                         **{key: row[0] for key, row in mods.items()}}, "Client world mod identities differ")
+    return fingerprint(world)
+
+
+def validate_username(name):
+    require(isinstance(name, str) and re.fullmatch(r"[A-Za-z0-9_]{1,16}", name) is not None,
+            "Native offline probe name must contain 1..16 ASCII letters, digits or underscores")
+    return name
+
+
+def words(value):
+    return [word[1:-1] if word.startswith('"') and word.endswith('"') else word
+            for word in shlex.split(value, posix=False)]
+
+
+def mod_ids(path):
+    with ZipFile(path) as jar:
+        if "META-INF/mods.toml" not in jar.namelist():
+            return set()
+        metadata = tomllib.loads(jar.read("META-INF/mods.toml").decode("utf-8"))
+        return {row["modId"] for row in metadata.get("mods", [])}
+
+
+def record(path):
+    path = Path(path).resolve(strict=True)
+    require(path.is_file() and path.stat().st_nlink == 1, "Client code needs independent files")
+    for part in (path, *path.parents):
+        require(not part.is_symlink() and not getattr(part, "is_junction", lambda: False)(), "Aliased client code")
+    return dict(path=str(path), sha256=digest(path))
+
+
+def inspect_launch(path):
+    launch = record(path)
+    tree = ET.parse(path).getroot()
+    attrs = {}
+    for row in tree.findall("stringAttribute"):
+        require(row.attrib["key"] not in attrs, "Duplicate Eclipse launch attribute")
+        attrs[row.attrib["key"]] = row.attrib["value"]
+    require(attrs["org.eclipse.jdt.launching.MAIN_TYPE"] == "net.minecraftforge.launcher.Main",
+            "Unexpected client entrypoint")
+    vm = words(attrs["org.eclipse.jdt.launching.VM_ARGUMENTS"])
+    require(tuple(vm) == VM_ARGS, "Unreviewed JVM options, agent, or altered client classpath")
+    program = words(attrs["org.eclipse.jdt.launching.PROGRAM_ARGUMENTS"])
+    require(len(program) == 19 and program[:3] == ["--main", "net.minecraftforge.bootstrap.ForgeBootstrap", "--cache"]
+            and program[4] == "--metadata" and program[6:16] == ["--", "--gameDir", ".", "--launchTarget",
+                "forge_userdev_client", "--version", "MOD_DEV", "--assetIndex", ASSET_INDEX, "--assetsDir"]
+            and program[17:] == ["--mixin", "basepower.mixins.json"], "Unreviewed native client program arguments")
+    environment = {}
+    maps = [row for row in tree.findall("mapAttribute") if row.attrib["key"] == "org.eclipse.debug.core.environmentVariables"]
+    require(len(maps) == 1, "Expected one explicit Eclipse environment")
+    for row in maps[0].findall("mapEntry"):
+        require(row.attrib["key"] not in environment, "Duplicate client environment")
+        environment[row.attrib["key"]] = row.attrib["value"]
+    expected_env = dict(MC_VERSION=native.MINECRAFT, FORGE_VERSION=native.FORGE, FORGE_GROUP="net.minecraftforge",
+                        MCP_MAPPINGS="official_26.1.2", MCP_VERSION=native.MCP, target="fmluserdevclient")
+    require({key: value for key, value in environment.items() if key != "MOD_CLASSES"} == expected_env,
+            "Wrong SDK environment or unreviewed injection")
+    # MOD_CLASSES and IDE/JRE entries are not executed. Construct a jar-only classpath below.
+    environment["MOD_CLASSES"] = ""
+    lists = [row for row in tree.findall("listAttribute") if row.attrib["key"] == "org.eclipse.jdt.launching.CLASSPATH"]
+    require(len(lists) == 1, "Expected one explicit client classpath")
+    archives, skipped, ide = [], [], []
+    for row in lists[0].findall("listEntry"):
+        value = ET.fromstring(row.attrib["value"]).attrib
+        if "externalArchive" not in value:
+            require(value in ({"projectName": "PowerAdvantage", "type": "1", "path": "5"},
+                              {"containerPath": "org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25",
+                               "type": "4", "path": "5"}), "Unreviewed IDE classpath output")
+            ide.append(value)
+            continue
+        archive = Path(value["externalArchive"]).resolve(strict=True)
+        require(archive.suffix == ".jar", "Loose client code is forbidden")
+        identities = mod_ids(archive)
+        if identities & FAMILY:
+            require(len(identities) == 1, "Ambiguous source candidate archive")
+            skipped.append(str(archive))
+        else:
+            require(identities <= {"forge", "minecraft"}, "Unexpected mod on SDK classpath")
+            archives.append(record(archive))
+    require(len(ide) == len({tuple(sorted(row.items())) for row in ide}) == 2
+            and len({row["path"] for row in archives}) == len(archives), "Duplicate/missing SDK classpath entries")
+    require(sum(Path(row["path"]).name == "forge-26.1.2-64.1.5.jar" for row in archives) == 1,
+            "Missing exact mapped Forge64 runtime")
+    require(sum(Path(row["path"]).name == "client-extra-26.1.2-20260409.101008.jar" for row in archives) == 1,
+            "Missing exact native vanilla client resources")
+    require(not any("forge-1." in Path(row["path"]).name or "client-extra-1." in Path(row["path"]).name for row in archives),
+            "Historical native archive in client classpath")
+    metadata = record(program[5])
+    with ZipFile(metadata["path"]) as jar:
+        version = json.loads(jar.read("minecraft/version.json"))
+    require(version["id"] == native.MINECRAFT and version["javaVersion"]["majorVersion"] == 25
+            and version["assetIndex"]["id"] == ASSET_INDEX
+            and version["assetIndex"]["sha1"].upper() == ASSET_INDEX_SHA1, "Wrong actual native SDK manifest")
+    index = Path(program[16]) / "indexes" / (ASSET_INDEX + ".json")
+    require(hashlib.sha1(index.read_bytes()).hexdigest().upper() == ASSET_INDEX_SHA1, "Wrong native client asset index")
+    return dict(format=1, minecraft=native.MINECRAFT, forge=native.FORGE, mcp=native.MCP,
+                javaSha256=native.JAVA_SHA, launch=launch, archives=archives, metadata=metadata,
+                assetIndex=record(index), program=program, vm=vm, environment=environment,
+                excludedMutableCandidatePaths=skipped)
+
+
+def seal_client_code(launch, output):
+    output = Path(output).resolve()
+    require_disjoint(output, Path(launch).resolve(strict=True))
+    document = inspect_launch(launch)
+    with output.open("x", encoding="utf-8") as stream:
+        json.dump(document, stream, indent=2, sort_keys=True)
+        stream.write("\n")
+    return document
+
+
+def png_record(root, name, dimensions):
+    path = Path(root) / name
+    row = record(path)
+    require(Path(row["path"]).is_relative_to(Path(root).resolve()), "Image escaped client runtime")
+    require(path.stat().st_size <= 64 * 1024 * 1024, "Oversized native image")
+    data = path.read_bytes()
+    header = data[:24]
+    require(header[:8] == b"\x89PNG\r\n\x1a\n" and header[12:16] == b"IHDR"
+            and len(header) == 24 and struct.unpack(">II", header[16:24]) == dimensions,
+            "Missing/malformed native image: " + name)
+    offset, chunks, compressed, channels = 8, [], bytearray(), None
+    while offset < len(data):
+        require(offset + 12 <= len(data), "Truncated PNG chunk")
+        length = struct.unpack(">I", data[offset:offset + 4])[0]
+        end = offset + 12 + length
+        require(end <= len(data), "Unbounded PNG chunk")
+        kind, content = data[offset + 4:offset + 8], data[offset + 8:end - 4]
+        require(zlib.crc32(kind + content) & 0xFFFFFFFF == struct.unpack(">I", data[end - 4:end])[0], "PNG CRC mismatch")
+        chunks.append(kind)
+        if kind == b"IHDR":
+            require(len(content) == 13 and content[8] == 8 and content[9] in (2, 6)
+                    and content[10:] == b"\0\0\0", "Unexpected native PNG encoding")
+            channels = 4 if content[9] == 6 else 3
+        elif kind == b"IDAT":
+            compressed.extend(content)
+        elif kind == b"IEND":
+            require(length == 0 and end == len(data), "Trailing PNG data")
+        offset = end
+    require(chunks[0] == b"IHDR" and chunks.count(b"IHDR") == 1 and chunks[-1] == b"IEND"
+            and chunks.count(b"IEND") == 1 and compressed, "Incomplete native PNG")
+    stride = dimensions[0] * channels + 1
+    decoder = zlib.decompressobj()
+    raw = decoder.decompress(compressed, stride * dimensions[1] + 1)
+    require(len(raw) == stride * dimensions[1] and decoder.eof and not decoder.unused_data
+            and not decoder.unconsumed_tail and all(raw[row * stride] <= 4 for row in range(dimensions[1])),
+            "Malformed or oversized native PNG pixel stream")
+    return dict(file=name, sha256=row["sha256"], width=dimensions[0], height=dimensions[1])
+
+
+def read_frame(root, frame):
+    width, height = frame["width"], frame["height"]
+    require(type(width) is int and type(height) is int and 1 <= width <= 4096 and 1 <= height <= 4096,
+            "Invalid native framebuffer dimensions")
+    rgba = artifact(root, frame["rgba"])
+    require(rgba.stat().st_size == width * height * 4, "Truncated native framebuffer")
+    png = artifact(root, frame["png"])
+    png_record(root, str(png.relative_to(Path(root).resolve())), (width, height))
+    state = native.read_json(artifact(root, frame["native"]))
+    fills = state.get("fills", [])
+    require(state["protocol"] == "NATIVE64_GUI_FRAMEBUFFER_FENCED_V1"
+            and (state["width"], state["height"]) == (width, height)
+            and state["renderer"] == "net.minecraft.client.gui.render.GuiRenderer"
+            and state["extractor"] in ("net.minecraft.client.gui.GuiGraphicsExtractor",
+                "zone.moddev.mc.advantageworks.client.MachineGuiLayoutProbe$RecordingScreen$1")
+            and all(state[key] is True for key in ("renderSubmitted", "fenceCompleted", "screenshotCallbackCompleted"))
+            and isinstance(state["texts"], list) and isinstance(state["blits"], list) and isinstance(fills, list)
+            and 0 < len(state["blits"]) + len(fills) <= 10000,
+            "No actual native extraction/submission/fenced screenshot evidence")
+    for blit in state["blits"]:
+        require(all(type(blit[key]) is int for key in ("x0", "y0", "x1", "y1", "color", "textureViewIdentity"))
+                and blit["textureViewIdentity"] != 0 and isinstance(blit["pipeline"], str) and blit["pipeline"]
+                and len(blit["pose"]) == 6 and all(type(value) in (int, float) and math.isfinite(value)
+                    for value in [*blit["pose"], *(blit[key] for key in ("u0", "v0", "u1", "v1"))]),
+                "Malformed/empty native blit extraction")
+    for fill in fills:
+        require(all(type(fill[key]) is int for key in ("x0", "y0", "x1", "y1", "col1", "col2"))
+                and isinstance(fill["pipeline"], str) and fill["pipeline"] and len(fill["pose"]) == 6
+                and all(type(value) in (int, float) and math.isfinite(value) for value in fill["pose"]),
+                "Malformed native color extraction")
+    return width, height, rgba.read_bytes(), state
+
+
+def verify_projection_calibration(root, calibration):
+    require(calibration["protocol"] == "NATIVE64_GUI_PROJECTION_PIXEL_RULER_V1" and calibration["status"] == "PASS",
+            "Native projection calibration did not complete")
+    cases = calibration["cases"]
+    require(len(cases) == 2 and {row["scale"] for row in cases} == {1, 2}, "Missing projection scale control")
+    checked = 0
+    for row in cases:
+        scale = row["scale"]
+        require((row["logicalWidth"], row["logicalHeight"]) == (64, 48)
+                and row["exactPixelsChecked"] == 64 * 48 * scale * scale, "Wrong projection control dimensions")
+        for key, shift in (("actual", 0), ("shiftedRejected", 1)):
+            frame = read_frame(root, row[key])
+            require(frame[:2] == (64 * scale, 48 * scale) and len(frame[3].get("fills", [])) == 3,
+                    "Calibration lacks actual native rectangle extraction")
+            expected = bytearray()
+            for y in range(48 * scale):
+                for x in range(64 * scale):
+                    u, v = x // scale, y // scale
+                    color = 0xFF37A95C if 7 + shift <= u < 23 + shift and 9 <= v < 25 else (
+                        0xFF3158D5 if (u, v) == (2, 2) else 0xFFDD7341 if (u, v) == (63, 47) else 0xFF101820)
+                    expected.extend((color >> 16 & 255, color >> 8 & 255, color & 255, 255))
+            require(frame[2] == expected, "Native projection ruler pixels are compressed/clipped/shifted")
+        require(row["actual"]["rgba"]["sha256"] != row["shiftedRejected"]["rgba"]["sha256"],
+                "Shifted projection negative control was accepted")
+        checked += row["exactPixelsChecked"]
+    return dict(status="PASS", physicalPixels=checked, shiftedGpuControls=2)
+
+
+def source_references(document, mods):
+    requested = set()
+
+    def collect(value):
+        if isinstance(value, dict):
+            if set(value) == {"resource", "sha256", "width", "height"}:
+                requested.add(value["resource"])
+            for child in value.values():
+                collect(child)
+        elif isinstance(value, list):
+            for child in value:
+                collect(child)
+
+    collect(document)
+    require(requested, "Missing source artwork provenance")
+    wanted = {"assets/" + key.replace(":", "/", 1): key for key in requested}
+    found = {}
+    for _, path, _ in mods.values():
+        with ZipFile(path) as jar:
+            for name in set(jar.namelist()) & wanted.keys():
+                key = wanted[name]
+                require(key not in found, "Ambiguous GUI source artwork provider: " + key)
+                found[key] = hashlib.sha256(jar.read(name)).hexdigest().upper()
+    require(set(found) == requested, "GUI source artwork is absent from the frozen family")
+    return found
+
+
+def verify_producer(document):
+    require(document.get("status") == "PASS", "Native client producer failed: " + json.dumps(
+        {key: document[key] for key in ("status", "error", "cause", "loginReadiness", "scope_results") if key in document},
+        sort_keys=True))
+
+
+def fixture_policy(runtime, profile, profile_sha, source_receipt, source_world):
+    native.validate_hash(profile, profile_sha)
+    document = native.read_json(profile)
+    require(document["minecraftVersion"] == native.MINECRAFT and document["forge"]["version"] == native.FORGE_VERSION,
+            "Experimental warning action requires the exact native target")
+    mods = {row["id"]: (row["version"], Path(row["path"]), row["sha256"]) for row in document["mods"]}
+    require(len(document["mods"]) == len(mods) == 6 and set(mods) == FAMILY, "Experimental warning policy needs the ordinary six-jar family")
+    require(Path(source_world).resolve() == Path(source_receipt).resolve().parent / "packaged-current/AdvantageWorksMigration",
+            "Experimental warning action is not approved for this source-world route")
+    verify_world_source(source_world, native.read_json(source_receipt), profile_sha, mods)
+    copy = Path(runtime) / "saves" / CLIENT_WORLD
+    level_sha = digest(Path(source_world) / "level.dat")
+    require(level_sha == digest(copy / "level.dat"),
+            "Experimental warning action requires the exact approved stopped source/copy")
+    return dict(protocol=FIXTURE_PROTOCOL, eligibility=FIXTURE_SCOPE, profileSha256=profile_sha.upper(), profilePath=str(Path(profile).resolve()),
+                sourceReceiptSha256=digest(source_receipt), copiedWorld=str(copy.resolve()), copiedLevelSha256=level_sha,
+                sourceLedgerSha256=digest(Path(runtime) / "client-world-source-files.json"))
+
+
+def verify_fixture_action(root, action):
+    require(action["protocol"] == FIXTURE_PROTOCOL, "Unknown native fixture action protocol")
+    if action["status"] == "NOT_OBSERVED":
+        require(type(action["actionCount"]) is int and action["actionCount"] == 0, "Unreported native fixture action")
+        return dict(status="NOT_OBSERVED", actionCount=0)
+    require(action["status"] == "NATIVE_SKIP_BUTTON_RETURNED" and action["onPressReturned"] is True
+            and type(action["actionCount"]) is int and action["actionCount"] == 1
+            and action["screenClass"] == "net.minecraft.client.gui.screens.BackupConfirmScreen"
+            and action["titleKey"] == "selectWorld.backupQuestion.experimental"
+            and action["buttonKey"] == "selectWorld.backupJoinSkipButton"
+            and (action["key"], action["scancode"], action["modifiers"]) == (257, 0, 0)
+            and action["fenceCompleted"] is True,
+            "Unapproved/repeated native confirmation action")
+    policy = native.read_json(Path(root) / "client-fixture-policy.json")
+    input_doc = native.read_json(Path(root) / "client-input.json")
+    require(policy["protocol"] == FIXTURE_PROTOCOL and policy["eligibility"] == FIXTURE_SCOPE
+            and action["profileSha256"] == policy["profileSha256"] == input_doc["profileSha256"]
+            and action["sourceReceiptSha256"] == policy["sourceReceiptSha256"] == digest(Path(input_doc["sourceWorldReceipt"]))
+            and digest(Path(policy["profilePath"])) == policy["profileSha256"], "Native warning action has different sealed inputs")
+    require(digest(Path(root) / "client-fixture-policy.json") == action["policySha256"]
+            and Path(action["copiedWorld"]) == Path(root).resolve() / "saves" / CLIENT_WORLD,
+            "Native fixture action lost its sealed copied-world binding")
+    before = native.read_json(Path(root) / "login-readiness/experimental-before-action.json")
+    require(before["status"] == "RECORDED_BEFORE_NATIVE_ACTION" and before["actionCount"] == 0
+            and {key: value for key, value in before.items() if key not in ("status", "actionCount")}
+                == {key: value for key, value in action.items() if key not in ("status", "actionCount", "onPressReturned")},
+            "Native fixture action lacks its immutable pre-action record")
+    readiness = action["readinessBeforeAction"]
+    require(readiness["overlayClass"] == "none" and all(readiness[key] is False for key in (
+        "levelPresent", "playerPresent", "integratedServer", "singleplayerServerPresent", "connectionPresent")),
+        "Native fixture action ran outside the unconnected pre-server screen")
+    image = png_record(root, action["screenshot"], (action["width"], action["height"]))
+    require(image["sha256"] == action["screenshotSha256"] and action["fenceCompleted"] is True,
+            "Native warning frame changed or was not fenced before action")
+    require(action["copiedLevelCustody"]["initialSha256"] == policy["copiedLevelSha256"]
+            and action["copiedLevelCustody"]["exactTypedNbtTransform"] in (
+                "UNCHANGED_TYPED_ROOT", "ONLY_FML_LOWERCASE_EMPTY_BIOME_INDEX_REMOVED"), "Unapproved copied-level transformation")
+    return dict(status="PASS", actionCount=1, screenshot=image)
+
+
+def world_sample_pixel(matrix, camera, point, width, height):
+    offset = [point[index] - camera[index] for index in range(3)] + [1.0]
+    clip = [sum(matrix[column * 4 + row] * offset[column] for column in range(4)) for row in range(4)]
+    require(clip[3] > 0 and all(math.isfinite(value) for value in clip), "World oil sample is behind the native camera")
+    return [int((clip[0] / clip[3] * .5 + .5) * width), int((.5 - clip[1] / clip[3] * .5) * height)]
+
+
+def verify_world_oil(root, report):
+    require(report["protocol"] == "NATIVE64_LEVEL_RENDERER_OIL_RELOAD_V1" and report["status"] == "PASS"
+            and report["scope"] == "ACTUAL_LEVEL_RENDERER_NOT_GUI_OR_SYNTHETIC_WORLD" and report["mipmapLevel"] == 4,
+            "Actual-world oil/reload did not complete")
+    frames = report["frames"]
+    require(set(frames) == {"original", "empty", "wrong_water", "restored", "after_reload"}, "Missing world oil control/reload frame")
+    pixels, dimensions = {}, None
+    for name, frame in frames.items():
+        width, height = frame["width"], frame["height"]
+        require(type(width) is int and type(height) is int and 320 <= width <= 4096 and 240 <= height <= 2160,
+                "Invalid world framebuffer dimensions")
+        if dimensions is None:
+            dimensions = (width, height)
+        require(dimensions == (width, height) and frame["renderer"] == "net.minecraft.client.renderer.LevelRenderer"
+                and frame["dimension"] == "minecraft:overworld" and frame["fenceCompleted"] is True
+                and frame["hudHidden"] is True and type(frame["renderedSections"]) is int and frame["renderedSections"] > 0,
+                "Missing actual native world renderer/compiled-section/fence evidence")
+        raw = artifact(root, frame["rgba"])
+        require(raw.stat().st_size == width * height * 4, "Truncated world framebuffer")
+        pixels[name] = raw.read_bytes()
+        png = artifact(root, frame["png"])
+        png_record(root, str(png.relative_to(Path(root).resolve())), (width, height))
+        require(len(frame["camera"]) == 3 and all(type(value) in (int, float) and math.isfinite(value) for value in frame["camera"])
+                and abs(frame["camera"][0] - 512.5) < .001 and abs(frame["camera"][2] - 527) < .001
+                and 14 <= frame["camera"][1] <= 16 and len(frame["viewRotationProjection"]) == 16
+                and all(type(value) in (int, float) and math.isfinite(value) for value in frame["viewRotationProjection"]), "Uncontrolled native oil camera")
+        require(len(frame["pools"]) == 3, "Missing world control pool")
+        for index, pool in enumerate(frame["pools"]):
+            expected = "minecraft:water" if index == 2 or name == "wrong_water" else "minecraft:empty" if name == "empty" else (
+                "basepower:crude_oil" if index == 0 else "basepower:refined_oil")
+            require(pool["pool"] == ("crude-oil", "refined-oil", "water-control")[index] and pool["fluid"] == expected
+                    and pool["compiledAndVisible"] is True and len(pool["samples"]) == 16, "Incorrect actual-world fluid/control state")
+            for sample, (x, z) in zip(pool["samples"], ((x, z) for x in range(4) for z in range(4))):
+                require(len(sample) == 5 and sample[:3] == [(504, 510, 516)[index] + .75 + x * .75, 6 + 8 / 9, 510 + .75 + z * .75]
+                        and all(type(value) is int for value in sample[3:]) and 2 <= sample[3] < width - 2 and 2 <= sample[4] < height - 2,
+                        "World oil samples escaped the exact native pool geometry/frame")
+                require(sample[3:] == world_sample_pixel(frame["viewRotationProjection"], frame["camera"], sample[:3], width, height),
+                        "World oil pixel does not project from the retained native camera/pool point")
+    checks = []
+    for actual in ("original", "after_reload"):
+        require(frames[actual]["camera"] == frames["empty"]["camera"] == frames["wrong_water"]["camera"]
+                and frames[actual]["viewRotationProjection"] == frames["empty"]["viewRotationProjection"]
+                    == frames["wrong_water"]["viewRotationProjection"], "World camera/projection moved between negative controls")
+        for index, pool in enumerate(frames[actual]["pools"]):
+            row = dict(actual=actual, pool=pool["pool"], samples=144)
+            for control in ("empty", "wrong_water"):
+                changed = 0
+                for sample in pool["samples"]:
+                    for dy in range(-1, 2):
+                        for dx in range(-1, 2):
+                            at = ((sample[4] + dy) * dimensions[0] + sample[3] + dx) * 4
+                            distance = sum(abs(a - b) for a, b in zip(pixels[actual][at:at + 3], pixels[control][at:at + 3]))
+                            changed += distance > (32 if index == 2 else 64)
+                require(changed <= 14 if index == 2 else changed >= 72, "Native world oil blank/wrong-fluid control was accepted")
+                row[control + "Different"] = changed
+            checks.append(row)
+    require(checks == report["pixelControls"], "World pixel-control counts differ from retained raw RGBA")
+    for key in ("modelsBeforeReload", "modelsAfterReload"):
+        require(len(report[key]) == 2, "Missing actual-world oil model")
+        for index, model in enumerate(report[key]):
+            name = ("crude_oil", "refined_oil")[index]
+            require(model["fluid"] == "basepower:" + name and model["layer"] == "TRANSLUCENT"
+                    and model["stillSprite"] == f"basepower:blocks/{name}_still"
+                    and model["flowingSprite"] == f"basepower:blocks/{name}_flow", "Actual-world oil used the wrong native model/sprites")
+            if key == "modelsAfterReload":
+                require(all(model[field] != report["modelsBeforeReload"][index][field] for field in ("stillIdentity", "flowingIdentity")),
+                        "Actual-world oil retained its pre-reload atlas sprites")
+    geometry = report["nativeGeometryAfterReload"]
+    require(len(geometry["fluid_rendering"]) == 6 and all(row["correct_sprite"] is True and row["vertices"] >= 4
+            for row in geometry["fluid_rendering"]), "Native post-reload fluid geometry is incomplete or stale")
+    return dict(status="PASS", frames=5, oilNegativeComparisons=8, waterControlComparisons=4)
+
+
+def require_source(source, references):
+    require(source["resource"] in references and source["sha256"] == references[source["resource"]],
+            "Source artwork does not match the frozen jar bytes")
+
+
+def slot_mismatches(frame, proof, left, top, scale):
+    width, height, data, _ = frame
+    points, slots = proof["border_points"], proof["slots"]
+    require(len(points) == 68 and {(x, y) for x, y, _ in points}
+            == {(x, y) for x in range(18) for y in range(18) if x in (0, 17) or y in (0, 17)},
+            "Incomplete independent slot-border pixel template")
+    require(len(slots) >= 36 and len({tuple(pos) for pos in slots}) == len(slots), "Missing/duplicate slot extraction")
+    require(proof["logical_texture_size"] == 256 and slots[:-36] == proof["expected_machine_slots"],
+            "Machine slot/background geometry differs from GUI declaration")
+    colors = proof["slot_border_colors"]
+    require(proof["source_sampling"] == "PHYSICAL_PIXEL_CENTERS_ON_256_LOGICAL_UV_V1"
+            and len(colors) == len(slots) and all(len(row) == 68 * scale * scale
+                and all(type(value) is int for value in row) for row in colors),
+            "Missing per-slot source artwork pixels")
+    require(all(len(set(row)) >= 2 for row in colors), "Blank source slot-border crop")
+    require(all(row == [value for _, _, value in points for _ in range(scale * scale)] for row in colors[-36:]), "Player inventory template changed")
+    player = [[7 + i % 9 * 18, 157 + i // 9 * 18] for i in range(27)] + [[7 + i * 18, 215] for i in range(9)]
+    require(slots[-36:] == player, "Player slot/background geometry changed")
+    require(proof["checked_pixels"] == len(slots) * 68 * scale * scale, "Incomplete slot pixel coverage")
+    different = 0
+    for index, (slot_x, slot_y) in enumerate(slots):
+        require(type(slot_x) is int and type(slot_y) is int, "Invalid extracted slot coordinate")
+        for point_index, (x, y, _) in enumerate(points):
+            for dy in range(scale):
+                for dx in range(scale):
+                    argb = colors[index][point_index * scale * scale + dy * scale + dx]
+                    expected = bytes((argb >> 16 & 255, argb >> 8 & 255, argb & 255, argb >> 24 & 255))
+                    px, py = (left + slot_x + x) * scale + dx, (top + slot_y + y) * scale + dy
+                    require(0 <= px < width and 0 <= py < height, "Slot framebuffer bounds escaped")
+                    at = (py * width + px) * 4
+                    different += data[at:at + 4] != expected
+    return different
+
+
+def verify_machine_frame(root, proof, title, inventory, references):
+    width, height, scale = proof["viewport"]
+    require((width, height, scale) in VIEWPORTS and type(proof["fill"]) is int and proof["fill"] in range(3),
+            "Unknown native GUI render case")
+    left, top = (width - 176) // 2, (height - 240) // 2
+    require((proof["left"], proof["top"]) == (left, top), "Native background is not centered/aligned")
+    actual, expected, background = (read_frame(root, proof[key]) for key in ("actual", "expected", "background"))
+    require(all(frame[:2] == (width * scale, height * scale) for frame in (actual, expected, background)),
+            "Viewport/framebuffer size mismatch")
+    for text in (title, inventory):
+        signatures = []
+        for frame in (actual, expected):
+            matches = [row for row in frame[3]["texts"] if row["text"] == text]
+            require(len(matches) == 1 and matches[0]["color"] == -1 and matches[0]["dropShadow"] is True,
+                    "Missing/garbled native caption extraction")
+            row = matches[0]
+            signatures.append((row["x"], row["y"], row["pose"]))
+        require(signatures[0] == signatures[1], "Native caption placement differs from independent labels")
+    ink_total = 0
+    for x0, y0, x1, y1 in ((4, top + 1, width - 4, top + 12), (left + 8, top + 140, left + 168, top + 150)):
+        ink = 0
+        for y in range(y0 * scale, y1 * scale):
+            for x in range(x0 * scale, x1 * scale):
+                at = (y * actual[0] + x) * 4
+                if expected[2][at:at + 4] != background[2][at:at + 4]:
+                    ink += 1
+                    require(actual[2][at:at + 4] == expected[2][at:at + 4], "Caption framebuffer pixels are missing/garbled/clipped")
+        require(ink >= 20 * scale * scale, "Blank expected caption or a missing-text control passed")
+        ink_total += ink
+    slots = proof["slot_pixels"]
+    require_source(slots["inventory_source"], references)
+    require_source(slots["machine_source"], references)
+    require(slot_mismatches(actual, slots, left, top, scale) == 0, "Slot framebuffer pixels differ from source artwork")
+    return dict(captionInkPixels=ink_total, slotPixels=slots["checked_pixels"])
+
+
+def verify_tank_frames(root, row, references):
+    scale = row["render_scale"]
+    require(type(scale) is int and scale in (1, 2), "Unexpected tank pixel scale")
+    actual, expected, empty = (read_frame(root, row[key]) for key in ("actual_frame", "expected_frame", "empty_frame"))
+    require(all(frame[:2] == (176 * scale, 240 * scale) for frame in (actual, expected, empty)), "Wrong tank framebuffer dimensions")
+    require_source(row["source_artwork"], references)
+    require(actual[2] == expected[2] and row["whole_panel_different_pixels"] == 0,
+            "Whole tank background/frame/slot pixels differ")
+    if row["fill_rows"]:
+        start = 81 - row["fill_rows"]
+
+        def quads(frame):
+            selected = [blit for blit in frame[3]["blits"] if blit.get("scissor") == [80, start, 16, row["fill_rows"]]]
+            require(len(selected) == (row["fill_rows"] + 15) // 16
+                    and {(blit["x0"], blit["y0"], blit["x1"], blit["y1"]) for blit in selected}
+                        == {(80, y, 96, y + 16) for y in range(start, 81, 16)},
+                    "Native fluid extraction stretched/cropped a tile instead of scissor clipping")
+            signature = [(blit["u0"], blit["v0"], blit["u1"], blit["v1"], blit["color"], blit["textureViewIdentity"])
+                         for blit in sorted(selected, key=lambda value: value["y0"])]
+            require(all(value == signature[0] for value in signature), "Native fluid tiles changed sprite UV or tint")
+            return signature
+
+        require(quads(actual) == quads(expected), "Native fluid sprite UV/tint differs from independent reference")
+        visible = sum(expected[2][at:at + 4] != empty[2][at:at + 4]
+                      for y in range(21 * scale, 81 * scale) for x in range(80 * scale, 96 * scale)
+                      for at in [(y * 176 * scale + x) * 4])
+        require(visible >= row["fill_rows"] * 8 * scale * scale, "Blank reference fluid sprite")
+        garbled = read_frame(root, row["garbled_frame"])
+        require(garbled[:2] == actual[:2] and garbled[2] != expected[2] and empty[2] != expected[2]
+                and row["blank_control_different_pixels"] > 0 and row["garbled_control_different_pixels"] > 0,
+                "Blank/garbled tank control was accepted")
+
+
+def freeze_native_frames(root):
+    folder = Path(root) / "native-gui-evidence"
+    if not folder.exists():
+        return dict(status="NOT_CAPTURED", frames=[])
+    frames, claimed = [], set()
+    for path in sorted(folder.glob("frame-*-native.json")):
+        state = native.read_json(path)
+        stem = path.name.removesuffix("-native.json")
+        frame = dict(width=state["width"], height=state["height"])
+        for key, suffix in (("png", ".png"), ("rgba", ".rgba"), ("native", "-native.json")):
+            file = folder / (stem + suffix)
+            frame[key] = dict(file=str(file.relative_to(root)), sha256=digest(file))
+            claimed.add(file.resolve())
+        read_frame(root, frame)
+        frames.append(frame)
+    require(claimed == {path.resolve() for path in folder.iterdir()} and 0 < len(frames) <= 2000,
+            "Native framebuffer freeze has partial/unknown artifacts")
+    return dict(status="FROZEN_CAPTURE_EVIDENCE_NOT_MANUAL_ACCEPTANCE", frames=frames)
+
+
+def verify_vanilla_resources(root, code):
+    folder = Path(root) / "vanilla-resource-controls"
+    if not folder.exists():
+        return dict(status="NOT_CAPTURED", controls=[])
+    paths = sorted(folder.iterdir())
+    require(1 <= len(paths) <= 4 and [path.name for path in paths]
+            == [f"control-{number:02d}.json" for number in range(1, len(paths) + 1)],
+            "Incomplete/unexpected native vanilla resource controls")
+    wanted = {"minecraft:textures/block/stone.png", "minecraft:atlases/blocks.json"}
+    sources = {key: [] for key in wanted}
+    vanilla = [archive for archive in code["archives"]
+               if Path(archive["path"]).name == "client-extra-26.1.2-20260409.101008.jar"]
+    require(len(vanilla) == 1, "Need the exact native vanilla client-resource archive")
+    for archive in vanilla:
+        with ZipFile(archive["path"]) as jar:
+            for key in wanted:
+                name = "assets/" + key.replace(":", "/", 1)
+                if name in jar.namelist():
+                    data = jar.read(name)
+                    require(data, "Empty primary vanilla resource")
+                    sources[key].append(dict(archive=archive, sha256=hashlib.sha256(data).hexdigest().upper(), bytes=len(data)))
+    require(all(rows and len({(row["sha256"], row["bytes"]) for row in rows}) == 1 for rows in sources.values()),
+            "Missing/ambiguous pinned SDK vanilla resource source")
+    controls = []
+    for path in paths:
+        proof = record(path)
+        document = native.read_json(path)
+        require(document["protocol"] == "NATIVE64_VANILLA_RESOURCE_ROOTS_V1" and document["status"] == "PASS"
+                and document["phase"] == "reload-preparation-before-atlas-upload", "Vanilla native root lookup failed")
+        rows = document["resources"]
+        require(len(rows) == 2 and {row["resource"] for row in rows} == wanted, "Missing/duplicate vanilla lookup control")
+        for row in rows:
+            expected = sources[row["resource"]][0]
+            require(row["vanilla"]["present"] is True
+                    and all(row["vanilla"][key] == expected[key] for key in ("sha256", "bytes")),
+                    "Vanilla pack differs from pinned SDK resource bytes")
+            merged = row["merged"]
+            require(isinstance(merged, list) and merged and all(isinstance(value["pack"], str) and value["pack"] for value in merged)
+                    and sum(all(value[key] == expected[key] for key in ("sha256", "bytes")) for value in merged) == 1,
+                    "Merged resource manager lost/duplicated the actual vanilla resource")
+            if row["resource"].endswith("stone.png"):
+                require(len(merged) == 1, "Unexpected override of the vanilla stone control")
+        controls.append(proof)
+    return dict(status="PASS", scope="VANILLA_PACK_ROOT_LOOKUP_NOT_ATLAS_UPLOAD_OR_GRAPHICS", controls=controls, primarySources=sources)
+
+
+def validate_result(document, root, labels, references):
+    require((document["status"], document["minecraft"], document["forge"])
+            == ("PASS", native.MINECRAFT, native.FORGE), "Not a completed native64 client result")
+    login = document["login"]
+    require(login["status"] == "PASS" and all(login[key] is True for key in (
+                "realWorld", "integratedServer", "nativeComponentsBound", "loggingInEventObserved", "connectionConnected", "clientLoaded"))
+            and login["syntheticComponentBinding"] is False and type(login["itemHolders"]) is int and login["itemHolders"] > 0,
+            "Client item/GUI checks did not run after actual native login")
+    calibration = verify_projection_calibration(root, document["projectionCalibration"])
+    fixture_action = verify_fixture_action(root, document["experimentalFixtureGate"])
+    world_oil = verify_world_oil(root, document["world_oil_visual"])
+    require(set(document["advantage_mods"]) == {"basepower", "basesteam", "baseelectric"}
+            and len(document["advantage_mods"]) == 3, "Incomplete/duplicate client family")
+    require(document["mod_versions"] == {key: native.VERSIONS[key] for key in document["advantage_mods"]},
+            "Wrong client candidate versions")
+    require(all(type(document[key]) is int and document[key] > 0 for key in ("items", "block_states", "creative_entries"))
+            and document["resource_errors"] == [] and document["primary_resource_status"] == "PASS", "Empty/failed resources or creative tab")
+    scopes = document["scope_results"]
+    require(set(scopes) == {"registered_resources", "tank_pixels", "machine_gui", "oil_renderer", "recipe_book", "child_geometry"}
+            and all(row["status"] == "PASS" for row in scopes.values()), "Missing or failed client scope")
+    fluids = document["fluid_rendering"]
+    require(document["oil_bucket_identities"] is True and len(fluids) == 6
+            and {row["fluid"] for row in fluids} == {"basepower:crude_oil", "basepower:flowing_crude_oil",
+                "basepower:refined_oil", "basepower:flowing_refined_oil", "minecraft:water", "minecraft:lava"}
+            and all(row["correct_sprite"] is True and type(row["vertices"]) is int and row["vertices"] >= 4 for row in fluids),
+            "Incomplete worldless native fluid-model extraction")
+    require(document["machine_gui_layout_status"] == document["machine_gui_text_status"] == "PASS"
+            and document["machine_gui_framebuffer_spec"] == 3
+            and document["machine_gui_text_spec"] == 2 and document["machine_gui_layout_count"] == 39
+            and document["machine_gui_text_checks"] == 351 and document["machine_gui_negative_controls_rejected"] == 356,
+            "Missing all39 GUI/351-caption/background negative controls")
+    rows = document["machine_gui_layouts"]
+    require(len(labels["machines"]) == len(rows) == 39 and {row["block"] for row in rows} == set(labels["machines"]),
+            "Machine GUI identity inventory changed")
+    images = []
+    framebuffer_checks = []
+    for row in rows:
+        require(row["status"] == row["required_text"] == row["tooltip_and_inventory_hitbox"] == "PASS"
+                and row["renders"] == row["blank_label_controls_rejected"] == 9
+                and type(row["background_extraction_calls"]) is int and row["background_extraction_calls"] == 1
+                and row["menu_title"] == row["expected_title"] == labels["machines"][row["block"]],
+                "Missing caption, tooltip, native background-once, or layout case")
+        proofs = row["framebuffer_cases"]
+        require(len(proofs) == 9 and {(tuple(proof["viewport"]), proof["fill"]) for proof in proofs}
+                == {(viewport, fill) for viewport in VIEWPORTS for fill in range(3)},
+                "Missing/duplicate GUI framebuffer cases")
+        for proof in proofs:
+            framebuffer_checks.append(verify_machine_frame(root, proof, row["expected_title"], labels["inventory"], references))
+        control = read_frame(root, row["garbled_background_control"])
+        initial = next(proof for proof in proofs if proof["viewport"] == list(VIEWPORTS[0]) and proof["fill"] == 0)
+        require(control[:2] == VIEWPORTS[0][:2] and slot_mismatches(control, initial["slot_pixels"],
+                    initial["left"], initial["top"], 1) > 0, "Garbled background passed actual slot framebuffer replay")
+        stem = row["block"].replace(":", "-")
+        for width, height, scale in VIEWPORTS:
+            for fill in range(3):
+                images.append(png_record(root, f"machine-gui-layouts/{stem}-{width}x{height}-scale{scale}-fill{fill}.png",
+                                         (width * scale, height * scale)))
+        images.append(png_record(root, f"machine-gui-layouts/{stem}-tooltip.png", (320, 240)))
+    gauges = document["tank_gauge_pixels"]
+    require(document["tank_gauge_pixel_status"] == "PASS" and len(gauges) == 26, "Incomplete real gauge pixels")
+    for tank in ("portable", "metal"):
+        selected = [row for row in gauges if row["tank"] == tank]
+        require(len(selected) == 13 and {(row["fluid"], row["fill_rows"]) for row in selected}
+                == {("empty", 0)} | {(fluid, rows) for fluid in ("water", "lava", "crude-oil", "refined-oil") for rows in (15, 30, 60)},
+                "Gauge omitted a fluid or partial tile height")
+    for row in gauges:
+        require(type(row["different_pixels"]) is int and row["different_pixels"] == 0, "Gauge pixel mismatch")
+        require(row["render_scale"] == 2, "Final gauge evidence must exercise native GUI scale2")
+        verify_tank_frames(root, row, references)
+        images.append(png_record(root, f"tank-gauge-{row['tank']}-{row['fluid']}-{row['amount_mb']}.png", (352, 480)))
+    require(document["recipe_book_grouping_status"] == "PASS", "Native recipe packets were not rendered")
+    recipes = document["recipe_book_grouping"]
+    require(len(recipes) == 3 and {row["packet"] for row in recipes}
+            == {f"recipes-{mode}-sweep.bin" for mode in ("normal", "tech", "apocalyptic")}
+            and all(row["status"] == "PASS" and all(type(row[key]) is int and row[key] > 0
+                    for key in ("recipes", "displays", "cells", "item_tags")) for row in recipes), "Incomplete native recipe/tag decoding")
+    geometry = document["child_renderer_geometry"]
+    geometry_context = document["child_geometry_context"]
+    require(geometry_context["stage"] == "GENUINELY_WORLDLESS_BEFORE_LOGIN" and all(geometry_context[key] is False
+            for key in ("levelPresent", "playerPresent", "singleplayerServerPresent")), "Child geometry lost genuine worldless isolation")
+    require(document["child_renderer_geometry_status"] == geometry["status"] == "PASS_WITH_MANUAL_GAPS"
+            and geometry["passed_geometry_cases"] == 25 and type(geometry["manual_gaps"]) is int and geometry["manual_gaps"] == 1
+            and len(geometry["cases"]) == 26, "Missing/waived native renderer geometry scope")
+    require(sum(row["status"] == "PASS" for row in geometry["cases"]) == 25
+            and len({row["case"] for row in geometry["cases"]}) == 26
+            and [row["case"] for row in geometry["cases"] if row["status"] == "MANUAL_GAP_WORLD_REQUIRED"]
+                == ["hydroturbine-registration"],
+            "Manual geometry gap was promoted to PASS")
+    require(document["recipe_registry_ids_match_actual_login"] is True, "Recipe packets lack actual login registry identity")
+    return dict(status="PASS", scope="CONNECTED_CLIENT_GUI_RESOURCE_PROBE_NOT_MANUAL_ACCEPTANCE", images=images,
+                projectionCalibration=calibration,
+                experimentalFixtureAction=fixture_action,
+                actualWorldOilAndReload=world_oil,
+                framebufferChecks=framebuffer_checks, garbledBackgroundControls=39, blankAndGarbledTankControls=48,
+                manualRequired=["hydroturbine-world-orientation-spin"])
+
+
+def _run(args, owned):
+    inputs = preflight(args, [Path(__file__), Path(client_diagnostics.__file__), args.launch, args.client_code, args.probe, args.recipe_exports,
+                              args.client_world_receipt,
+                              native.RIG / "client-resources/resources/gui-label-expectations.json"])
+    native.validate_hash(args.client_code, args.client_code_sha256)
+    code = native.read_json(args.client_code)
+    diagnostic_bindings = client_diagnostics.verify_bindings(code)
+    for row in diagnostic_bindings:
+        inputs.hashes[row["path"]] = row["sha256"]
+    require(code == inspect_launch(args.launch), "Client SDK differs from the independently sealed inventory")
+    native.validate_hash(args.probe, args.probe_sha256)
+    with ZipFile(args.probe) as jar:
+        metadata = tomllib.loads(jar.read("META-INF/mods.toml").decode("utf-8"))
+    require(metadata["loaderVersion"] == "[64,65)" and metadata["mods"][0]["modId"] == "advantageclientresources",
+            "Wrong native client probe")
+    deps = {row["modId"]: row["versionRange"] for row in metadata["dependencies"]["advantageclientresources"]}
+    require(deps == {"basepower": "[2.4.16.2601021]", "forge": "[64.1.5]", "minecraft": "[26.1.2]"}, "Stale client probe dependencies")
+    for row in [*code["archives"], code["metadata"], code["assetIndex"]]:
+        inputs.hashes[row["path"]] = row["sha256"]
+    source_world = args.client_world.resolve(strict=True)
+    require_disjoint(args.output.resolve(), source_world)
+    world_before = verify_world_source(source_world, native.read_json(args.client_world_receipt),
+                                       args.profile_sha256, inputs.mods)
+    if args.preflight_only:
+        return dict(status="READY_NOT_RUN", qualificationAllowed=False, **inputs.receipt())
+    runtime = output_path(args.output)
+    runtime.mkdir(parents=True, exist_ok=False)
+    owned["runtime"] = runtime
+    shutil.copy2(Path(__file__), runtime / "native2612-client-source.py")
+    (runtime / "mods").mkdir()
+    expected = {}
+    for key, (_, path, sha) in inputs.mods.items():
+        shutil.copy2(path, runtime / "mods" / path.name)
+        expected[path.name] = sha
+    shutil.copy2(args.probe, runtime / "mods/advantageclientresources.jar")
+    expected["advantageclientresources.jar"] = args.probe_sha256.upper()
+    exports = native.read_json(args.recipe_exports)
+    require(exports["status"] == "PASS" and exports["profileSha256"] == args.profile_sha256.upper()
+            and exports["target_jars"] == inputs.receipt()["target_jars"], "Recipe exports lack this frozen family binding")
+    fixture_root = Path(exports["recipe_fixture"]["directory"])
+    from native2612_resources import verify_packet_exports
+    packet_records = verify_packet_exports(fixture_root)
+    destination = runtime / "recipe-book-fixtures"
+    destination.mkdir()
+    for row in packet_records:
+        for path in (Path(row["packet"]), Path(row["packet"]).with_suffix(".json"), Path(row["tags"])):
+            require_disjoint(runtime, path.resolve(strict=True))
+            inputs.hashes[str(path.resolve())] = digest(path)
+            shutil.copy2(path, destination / path.name)
+    level = fixture_root / "AdvantageWorksMigration/level.dat"
+    require_disjoint(runtime, level.resolve(strict=True))
+    inputs.hashes[str(level.resolve())] = digest(level)
+    shutil.copy2(level, destination / "server-registries.dat")
+    shutil.copytree(source_world, runtime / "saves" / CLIENT_WORLD)
+    write_json(runtime / "client-world-source-files.json", world_before)
+    write_json(runtime / "client-fixture-policy.json", fixture_policy(runtime, args.profile, args.profile_sha256,
+        args.client_world_receipt, source_world))
+    (runtime / "options.txt").write_text("onboardAccessibility:false\n", encoding="utf-8")
+    program = list(code["program"])
+    program[3] = str(runtime / "bootstrap-cache")
+    program += ["--quickPlaySingleplayer", CLIENT_WORLD, "--offlineDeveloperMode", "--username", validate_username(CLIENT_USERNAME)]
+    logging_jar = [Path(row["path"]) for row in code["archives"] if Path(row["path"]).name == "fmlloader-26.1.2-64.1.5.jar"]
+    require(len(logging_jar) == 1, "Missing exact native logging configuration source")
+    logging = native.logging_configuration(runtime, logging_jar[0])
+    environment = native.native_launch_environment()
+    environment.update(code["environment"])
+    command = [str(inputs.java), *code["vm"], "-Xmx2G", "-Dadvantageworks.clientResources=true",
+               "-Dadvantageworks.requireExtensions=true", "-Dadvantageworks.machineGuiLayouts=true",
+               "-Dadvantageworks.childRendererGeometry=true", "-Dlog4j.configurationFile=" + str(logging),
+               "-cp", os.pathsep.join(row["path"] for row in code["archives"]), "net.minecraftforge.launcher.Main", *program]
+    report = dict(status="RUNNING", **inputs.receipt(), profileSha256=args.profile_sha256.upper(),
+                  clientCodeSha256=args.client_code_sha256.upper(), command=command, runtimeJars=expected,
+                  sourceWorld=str(source_world), sourceWorldReceipt=str(args.client_world_receipt),
+                  worldSourceLedgerSha256=digest(runtime / "client-world-source-files.json"))
+    report["experimentalFixturePolicy"] = dict(file="client-fixture-policy.json", sha256=digest(runtime / "client-fixture-policy.json"))
+    write_json(runtime / "client-input.json", report)
+    process = None
+    try:
+        require(type(args.timeout) is int and 30 <= args.timeout <= 1800, "Bound client process timeout")
+        with (runtime / "launcher.stdout.log").open("wb") as stdout, (runtime / "launcher.stderr.log").open("wb") as stderr:
+            process = subprocess.Popen(command, cwd=runtime, env=environment, stdout=stdout, stderr=stderr,
+                                       creationflags=subprocess.CREATE_NO_WINDOW if os.name == "nt" else 0,
+                                       start_new_session=os.name != "nt")
+            report["pid"] = process.pid
+            require(process.wait(timeout=args.timeout) == 0, "Native client exited nonzero")
+        labels = native.read_json(native.RIG / "client-resources/resources/gui-label-expectations.json")
+        result = native.read_json(runtime / "client-resources.json")
+        report["nativeProducer"] = result
+        verify_producer(result)
+        report["verification"] = validate_result(result, runtime, labels, source_references(result, inputs.mods))
+        report["clientLogAudit"] = []
+        for path in (runtime / "logs/debug.log", runtime / "logs/latest.log", runtime / "launcher.stdout.log", runtime / "launcher.stderr.log"):
+            errors, diagnostics = client_diagnostics.classify(path.read_text(encoding="utf-8", errors="strict"), native.previous_log_findings)
+            report["clientLogAudit"].append(dict(path=str(path), sha256=digest(path), errors=errors, diagnostics=diagnostics))
+            require(not errors, "Native client log has unclassified failures: " + str(errors))
+        report["clientLogPrimaryBindings"] = diagnostic_bindings
+        report["status"] = "PASS"
+    except BaseException as failure:
+        report.update(status="FAIL", error=repr(failure))
+        raise
+    finally:
+        try:
+            if process is not None and process.poll() is None:
+                if os.name == "nt":
+                    subprocess.run(["taskkill", "/PID", str(process.pid), "/T", "/F"], check=True, capture_output=True)
+                else:
+                    import signal
+                    os.killpg(process.pid, signal.SIGKILL)
+                process.wait(timeout=30)
+            require({path.name: digest(path) for path in (runtime / "mods").iterdir()} == expected, "Client runtime jars changed")
+            report["vanillaResourceControls"] = verify_vanilla_resources(runtime, code)
+            report["nativeFramebufferFreeze"] = freeze_native_frames(runtime)
+            if report["status"] == "PASS":
+                require(report["vanillaResourceControls"]["status"] == "PASS", "Missing native vanilla resource-root control")
+                require(len(report["nativeFramebufferFreeze"]["frames"]) >= 1207,
+                        "Incomplete native GUI framebuffer inventory")
+            report["sourceUnchanged"] = inputs.unchanged()
+            require(fingerprint(source_world) == world_before, "Protected stopped client-source world changed")
+            report["sourceWorldUnchanged"] = True
+            if report["status"] == "PASS":
+                stopped = runtime / "saves" / CLIENT_WORLD
+                layout.read_level(stopped)
+                report["stoppedClientLevelSha256"] = digest(stopped / "level.dat")
+        except BaseException as failure:
+            report.update(status="FAIL", custodyError=repr(failure))
+            raise
+        finally:
+            write_json(runtime / RESULT, report)
+    return report
+
+
+def run(args):
+    owned = {}
+    try:
+        return _run(args, owned)
+    except BaseException as failure:
+        if "runtime" in owned:
+            runtime = owned["runtime"]
+            failed = dict(status="FAIL", minecraft=native.MINECRAFT, forge=native.FORGE,
+                          scope="CLIENT_PREPARATION_OR_LAUNCH", error=repr(failure))
+            write_json(runtime / "runner-failure.json", failed)
+            if not (runtime / RESULT).exists():
+                write_json(runtime / RESULT, failed)
+        raise
+
+
+def main():
+    parser = arguments(__doc__)
+    for key in ("launch", "client-code", "probe", "recipe-exports", "client-world", "client-world-receipt"):
+        parser.add_argument("--" + key, required=True, type=Path)
+    for key in ("client-code-sha256", "probe-sha256"):
+        parser.add_argument("--" + key, required=True)
+    parser.add_argument("--timeout", type=int, default=600)
+    print(run(parser.parse_args())["status"], flush=True)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/test-rig/migration/native2612_client_diagnostics.py b/test-rig/migration/native2612_client_diagnostics.py
new file mode 100644
index 00000000..e57aad44
--- /dev/null
+++ b/test-rig/migration/native2612_client_diagnostics.py
@@ -0,0 +1,106 @@
+"""Exact integrated-server status-ping cleaner probe; dedicated-server policy is untouched."""
+
+import hashlib
+import json
+from pathlib import Path
+from zipfile import ZipFile
+
+from matrix import digest
+from native2612_platform_diagnostics import HEADER, LOGGERS, verify_sources
+
+
+# Mavenizer's SDK ZIP metadata varies between clean builds. Two independent
+# preparations match all 12,677 payloads; native dependency jars stay byte-bound.
+SDK_NAME = "forge-26.1.2-64.1.5.jar"
+SDK_PAYLOAD_SHA = "5C3984377983C8CDE452AB12DFFE0043FC0E3E1ECA0DE8276F833D0C0D2033BF"
+BINARIES = {
+    SDK_NAME: SDK_PAYLOAD_SHA,
+    "netty-common-4.2.7.Final.jar": "2345BC0ED5843FA57AA49EBA67529485C3A1D420FCF0429324C8220C7A80E9A6",
+    "netty-buffer-4.2.7.Final.jar": "B81613C8ED22B1CC39ECCF2A28BD0C1D4561FB2E5E542061617EF4CE1D228BF5",
+    "datafixerupper-9.0.19.jar": "9653A39CF5C4853CC98628D902DCB23FFEB2755122ECC563BDE38C8F60C0B61E",
+}
+BODY_HASHES = (
+    "4E8F6351774C4403FA25710142BA5F4D9BA4B930B8FD295D48015238E1B4019E",
+    "08586307371AFC1E3D067ACB177498E72D16C1C9F0832293146FA8A8BEC4A47A",
+    "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855",
+)
+
+
+def sdk_payload_sha(path):
+    with ZipFile(path) as archive:
+        entries = [entry for entry in archive.infolist() if not entry.is_dir()]
+        if len({entry.filename for entry in entries}) != len(entries):
+            raise AssertionError("Ambiguous duplicate SDK payload")
+        payloads = {entry.filename: hashlib.sha256(archive.read(entry)).hexdigest().upper() for entry in entries}
+    return hashlib.sha256(json.dumps(payloads, sort_keys=True, separators=(",", ":")).encode("ascii")).hexdigest().upper()
+
+
+def verify_sdk_payload(path):
+    if sdk_payload_sha(path) != SDK_PAYLOAD_SHA:
+        raise AssertionError("Client cleaner SDK payload differs from independent clean-build proof")
+
+
+def verify_bindings(code):
+    found = [row for row in code["archives"] if Path(row["path"]).name in BINARIES]
+    if len(found) != 4 or {Path(row["path"]).name for row in found} != set(BINARIES):
+        raise AssertionError("Missing/duplicate exact client cleaner initialization dependencies")
+    for row in found:
+        path = Path(row["path"])
+        if digest(path) != row["sha256"]:
+            raise AssertionError("Client cleaner dependency bytes differ from primary proof")
+        if path.name == SDK_NAME:
+            verify_sdk_payload(path)
+        elif row["sha256"] != BINARIES[path.name]:
+            raise AssertionError("Client cleaner dependency bytes differ from primary proof")
+    records = [dict(row) for row in found]
+    for binary, source_sha in (
+            ("forge-26.1.2-64.1.5.jar", "9175F1245E5E2907EA3ECAB13DC40F9B8994E61759E75363F6FB14322335F013"),
+            ("netty-common-4.2.7.Final.jar", "0B5D0B0498D009DDCFAF2B48A84F23F9380F82DAFD8B0061406BAF895349080C"),
+            ("netty-buffer-4.2.7.Final.jar", "B2142CC082E763042E1A50649808DA1A29601F0E471F0CA4F8082CACC69950FA")):
+        path = Path(next(row["path"] for row in found if Path(row["path"]).name == binary))
+        name = path.stem + "-sources.jar"
+        candidates = [path.with_name(name)] if binary.startswith("forge-") else list(path.parent.parent.glob("*/" + name))
+        if len(candidates) != 1 or digest(candidates[0]) != source_sha:
+            raise AssertionError("Exact client cleaner primary-source archive absent/changed")
+        if binary.startswith("netty-common"):
+            verify_sources(candidates[0])
+        records.append(dict(path=str(candidates[0].resolve()), sha256=source_sha))
+    return records
+
+
+def classify(text, fallback):
+    blocks = []
+    for line in text.splitlines():
+        if HEADER.fullmatch(line) or not blocks:
+            blocks.append([line])
+        else:
+            blocks[-1].append(line)
+    selected = [(index, HEADER.fullmatch(block[0])) for index, block in enumerate(blocks)
+                if HEADER.fullmatch(block[0]) and HEADER.fullmatch(block[0])[3] in LOGGERS]
+    if not selected:
+        return fallback(text)
+    valid = len(selected) == 3
+    if valid:
+        positions = [row[0] for row in selected]
+        valid = positions == list(range(positions[0], positions[0] + 3))
+        for slot, (index, header) in enumerate(selected):
+            body = [line for line in blocks[index][1:] if line.strip()]
+            sha = hashlib.sha256("\n".join(body).encode("utf-8")).hexdigest().upper()
+            valid = valid and (header[1], header[2], header[3], header[4], len(body), sha) == (
+                "Server thread", "DEBUG", LOGGERS[slot], "java.nio.ByteBuffer.cleaner(): " + (
+                    "available" if slot == 2 else "unavailable"), 0 if slot == 2 else 22, BODY_HASHES[slot])
+    if not valid:
+        errors, diagnostics = fallback(text)
+        errors.append("Unproven native64 integrated-server cleaner sequence: exact status-ping frames/order/DEBUG/native25 fallback required")
+        return errors, diagnostics
+    accepted = {index for index, _ in selected[:2]}
+    errors, diagnostics = [], []
+    for index, block in enumerate(blocks):
+        if index in accepted:
+            diagnostics.append(dict(classification="SOURCE_PROVEN_NATIVE64_STATUS_PING_JAVA25_CLEANER_FALLBACK",
+                logger=HEADER.fullmatch(block[0])[3], level="DEBUG", rawBlock=block, binaryBindings=BINARIES,
+                requiredSubsequentFallback="io.netty.util.internal.CleanerJava25 available"))
+        else:
+            failures, other = fallback("\n".join(block))
+            errors.extend(failures); diagnostics.extend(other)
+    return errors, diagnostics
diff --git a/test-rig/migration/native2612_endurance.py b/test-rig/migration/native2612_endurance.py
new file mode 100644
index 00000000..201d40f8
--- /dev/null
+++ b/test-rig/migration/native2612_endurance.py
@@ -0,0 +1,307 @@
+"""Measured two-world Forge64 endurance, new-world proof and full cold restart."""
+
+import argparse
+from collections import Counter
+from datetime import datetime
+import json
+from pathlib import Path
+import shutil
+import time
+
+import endurance
+from matrix import WORLD, digest, fingerprint, write_json
+from native117 import output_path, require_disjoint
+from native117_actor_io import bind
+from native117_endurance import (NativeEnduranceRig, FRESH_FIXTURE_SEED, POI_POSITION,
+                                 configure_new_fresh_fixture)
+from native117_broad import read_json
+import native12111_endurance as previous
+import native2612 as native
+from native2612_layout import read_level, read_worldgen, shared_file
+from native2612_upgrade import SCOPE as MIGRATION_SCOPE, comparison, copy_source
+
+
+MODES = ("fresh2612", "retained-upgrade-native2612")
+RECEIPT = "native2612-endurance-results.json"
+EnduranceHold = previous.EnduranceHold
+check_hold = previous.check_hold
+stop_at_checkpoint = previous.stop_at_checkpoint
+measure_batch = bind(previous.measure_batch, native=native)
+
+
+class ThroughputFailure(AssertionError):
+    pass
+
+
+def interval_metrics(before, after, label):
+    if type(before.get("worldTime")) is not int or type(after.get("worldTime")) is not int:
+        raise AssertionError("Missing native integer interval world time")
+    seconds = (datetime.fromisoformat(after["recordedAtUtc"]) - datetime.fromisoformat(before["recordedAtUtc"])).total_seconds()
+    ticks = after["worldTime"] - before["worldTime"]
+    if seconds <= 0 or ticks < 0:
+        raise AssertionError("Nonmonotonic native interval clocks")
+    if ticks < 18 * seconds:
+        raise ThroughputFailure(f"RESOURCE_THROUGHPUT_GATE {label}: {ticks / seconds:.3f} TPS below 18; not a gameplay diagnosis")
+    return dict(label=label, gameTicks=ticks, elapsedSeconds=seconds, ticksPerSecond=ticks / seconds)
+
+
+class Rig(previous.Rig):
+    server_type = native.Server
+    checkpoint = bind(previous.Rig.checkpoint, native=native)
+    batch = bind(previous.Rig.batch, measure_batch=measure_batch)
+
+    def boot(self, phase):
+        native.verify_runtime(self.runtime, self.code_inventory, self.expected_jars)
+        NativeEnduranceRig.boot(self, phase)
+
+
+def world_info(world):
+    level, envelope = read_level(world), read_worldgen(world)
+    settings = envelope["data"]
+    import nbtlib
+    if type(settings.get("seed")) is not nbtlib.Long or type(settings.get("generate_structures")) is not nbtlib.Byte:
+        raise AssertionError("Native worldgen seed/structure flag is missing or wrongly typed")
+    return dict(RandomSeed=int(settings["seed"]), MapFeatures=int(settings["generate_structures"]),
+                dataVersion=int(level["DataVersion"]), fullWorldgenSnbt=envelope.snbt())
+
+
+def verify_fresh_fixture_proof(runtime, proof):
+    endurance.require(proof.get("existing_world_absent") is True and proof.get("status") in ("UNVERIFIED", "PASS"),
+                      "Missing independent new-world isolation proof")
+    for name, expected in proof["files"].items():
+        endurance.require(digest(runtime / name) == expected, "Fresh isolation evidence changed: " + name)
+    properties = dict(line.split("=", 1) for line in
+                      (runtime / "fresh-fixture-proof/server-before-first-creation.properties").read_text().splitlines()
+                      if line and not line.startswith("#") and "=" in line)
+    endurance.require(properties.get("generate-structures") == "false"
+                      and properties.get("level-seed") == str(FRESH_FIXTURE_SEED), "Wrong fresh creation settings")
+    actual = world_info(runtime / "fresh-fixture-proof/world")
+    endurance.require(actual["MapFeatures"] == 0 and actual["RandomSeed"] == FRESH_FIXTURE_SEED,
+                      "Actual native external worldgen differs from configured fresh world")
+    endurance.require(actual == proof["actual_world_info"], "Native worldgen/unknown NBT proof changed")
+    rows = read_json(runtime / "migration-fresh-isolation-before-build.json")
+    endurance.require(len(rows) == 1 and tuple(rows[0][key] for key in ("x", "y", "z")) == POI_POSITION
+                      and rows[0]["actualName"] == "minecraft:air" and rows[0] == proof["critical_block"],
+                      "Missing exact original composter AIR control")
+    return actual
+
+
+def prove_fresh_fixture_before_build(rig, configuration):
+    runtime = rig.runtime
+    write_json(runtime / "migration-fixture.json", [dict(id="poi-target", x=POI_POSITION[0], y=POI_POSITION[1], z=POI_POSITION[2])])
+    rig.server.snapshot("fresh-isolation-before-build")
+    rig.command("save-all flush", "Saved the game")
+    root = runtime / "fresh-fixture-proof/world"
+    root.mkdir()
+    shutil.copy2(runtime / WORLD / "level.dat", root / "level.dat")
+    destination = shared_file(root, "minecraft:world_gen_settings")
+    destination.parent.mkdir(parents=True)
+    shutil.copy2(shared_file(runtime / WORLD, "minecraft:world_gen_settings"), destination)
+    files = ["fresh-fixture-proof/server-before-first-creation.properties", "fresh-fixture-proof/world/level.dat",
+             "fresh-fixture-proof/world/data/minecraft/world_gen_settings.dat", "migration-fresh-isolation-before-build.json"]
+    proof = dict(configuration, status="UNVERIFIED", actual_world_info=world_info(root),
+                 critical_block=read_json(runtime / files[-1])[0], files={name: digest(runtime / name) for name in files},
+                 scope="NEW native4790 world before Works build; complete external SavedData preserved; no source edits")
+    path = runtime / "fresh-fixture-proof.json"
+    write_json(path, proof)
+    verify_fresh_fixture_proof(runtime, proof)
+    proof["status"] = "PASS"
+    write_json(path, proof)
+    return proof
+
+
+def require_retained_receipt(prior, profile_sha, inventory_sha):
+    if (prior.get("status") != "PASS" or prior.get("scope") != MIGRATION_SCOPE or prior.get("route") != "original110"
+            or prior.get("minecraft") != native.MINECRAFT or prior.get("forge") != native.FORGE
+            or prior.get("profileSha256") != profile_sha
+            or inventory_sha not in prior.get("inputHashes", {}).values()
+            or not all(prior.get(key) is True for key in ("sourceUnchanged", "referenceUnchanged", "seedUnchanged", "inputsUnchanged"))):
+        raise AssertionError("Endurance requires the full passing original110 migration under the same candidate")
+    for phase in ("converted", "restarted"):
+        observation = prior["phases"][phase]
+        if (observation.get("status") != "PASS" or observation.get("serialized", {}).get("status") != "PASS"
+                or observation.get("witnesses") != 14 or observation["serialized"].get("witnesses") != 14
+                or observation["serialized"].get("nativeDataVersion") != 4790):
+            raise AssertionError("Missing genuine stopped native migration capture")
+    if not {"destination", "steamCrusher", "electricFurnace", "readiness"} <= prior["phases"].get("operation", {}).keys():
+        raise AssertionError("Hook-only or non-operating migration cannot supply retained endurance")
+
+
+def retained_input(args):
+    if args.retained is None:
+        if args.seconds >= 1800:
+            raise ValueError("Qualified endurance requires the fresh original-world migration first")
+        return None
+    if args.retained_receipt is None or args.retained_receipt_sha256 is None:
+        raise ValueError("Retained runtime needs its explicit passing migration receipt and SHA-256")
+    native.validate_hash(args.retained_receipt, args.retained_receipt_sha256)
+    prior = read_json(args.retained_receipt)
+    require_retained_receipt(prior, digest(args.profile), digest(args.inventory))
+    if (Path(prior["runtime"]).resolve() != args.retained
+            or prior.get("inputHashes", {}).get(str(args.inventory)) != digest(args.inventory)
+            or digest(args.retained / "migration-restarted.json") != prior["phases"]["restarted"]["snapshotSha256"]):
+        raise AssertionError("Retained world does not match the actual passing pinned native2612 migration")
+    return fingerprint(args.retained)
+
+
+def run(args):
+    endurance.require(args.seconds >= 60 and args.seconds % 60 == 0, "Use whole one-minute batches")
+    root = output_path(args.output)
+    target = native.read_family_target(args.profile, args.seed, args.inventory, args.inventory_sha256)
+    java, version = native.java25(args.java)
+    for port in (args.port, args.port + 1):
+        native.require_free_port(port)
+    for protected in (args.profile, args.seed, args.inventory, java, *(item[1] for item in target[2].values())):
+        require_disjoint(root, protected)
+    if args.retained:
+        require_disjoint(root, args.retained)
+    source_before = retained_input(args)
+    from native2612_endurance_replay import Budget, verify_seal
+    sealed = verify_seal(args.seal, args.seal_sha256, Budget())
+    if sealed["purpose"] != "NATIVE64_ENDURANCE_PRE_RUN_SEAL":
+        raise ValueError("Producer requires a genuine pre-run seal, never retrospective")
+    if (sealed["files"].get(str(args.profile)) != digest(args.profile)
+            or sealed.get("retainedReceipt") != (str(args.retained_receipt) if args.retained_receipt else None)):
+        raise ValueError("Producer inputs differ from pre-run seal")
+    seed_before = fingerprint(args.seed)
+    spec = native.RIG / "src/main/resources/assets/advantageworkstest/works/works-1.13.2.json"
+    definitions = {row["id"]: row for row in read_json(spec)["stations"]}
+    report = dict(status="RUNNING", minecraft=native.MINECRAFT, forge=native.FORGE,
+                  qualificationStatus=native.EXPLORATORY, javaVersion=version, javaSha256=digest(java),
+                  jars={key: item[2] for key, item in target[2].items()}, duration_seconds=args.seconds,
+                  interval_seconds=60, profileSha256=digest(args.profile), inventorySha256=digest(args.inventory),
+                  stationDefinitionSha256=digest(spec), active_stations=endurance.ACTIVE, checked_stations=endurance.CHECKED,
+                  profiles={}, retained=str(args.retained) if args.retained else None, inputSealSha256=args.seal_sha256)
+    receipt = root / RECEIPT
+    write_json(receipt, report)
+    rigs = []
+    try:
+        cases = tuple(zip(MODES, (None, args.retained))) if args.retained else ((MODES[0], None),)
+        for index, (name, source) in enumerate(cases):
+            check_hold(root)
+            runtime = root / name
+            expected = native.stage(runtime, *target, args.port + index)
+            rig = Rig(name, runtime, java, native.LAUNCHER, definitions, target[1], expected)
+            rigs.append(rig)
+            if source:
+                copy_source(source, runtime)
+                write_json(runtime / "migration-fixture.json", read_json(source / "migration-fixture.json"))
+                rig.boot("retained-before-build")
+                rig.server.snapshot("retained-before-build")
+                rig.shutdown()
+                preservation = comparison(read_json(source / "migration-restarted.json"),
+                                          read_json(runtime / "migration-retained-before-build.json"), modern=False)
+                write_json(runtime / "retained-comparison.json", preservation)
+                endurance.require(preservation["status"] == "PASS", "Retained fixture changed before operation")
+            else:
+                creation = configure_new_fresh_fixture(runtime)
+            (runtime / "advantage-works.allow").touch()
+            (runtime / "migration-operate.allow").touch()
+            rig.boot("endurance")
+            if source is None:
+                report["fresh_fixture_proof"] = prove_fresh_fixture_before_build(rig, creation)
+            rig.start(build=True)
+        initial = {rig.name: rig.documents["W-01"]["worldTime"] for rig in rigs}
+        previous_intervals = {rig.name: rig.documents["W-01"].copy() for rig in rigs}
+        intervals = {rig.name: [] for rig in rigs}
+        started, cycles = time.monotonic(), args.seconds // 60
+        for cycle in range(1, cycles + 1):
+            deadline = started + cycle * 60
+            while time.monotonic() < deadline:
+                check_hold(root)
+                for rig in rigs:
+                    endurance.require(rig.server.process.poll() is None, rig.name + ": server died")
+                time.sleep(min(1, max(0, deadline - time.monotonic())))
+            for rig in rigs:
+                check_hold(root)
+                label = f"cycle-{cycle:03}"
+                rig.checkpoint(label)
+                intervals[rig.name].append(interval_metrics(previous_intervals[rig.name], rig.documents["W-01"], label))
+                previous_intervals[rig.name] = rig.documents["W-01"].copy()
+                rig.batch(label)
+                if cycle < cycles:
+                    rig.seed()
+                report["profiles"][rig.name] = dict(status="RUNNING", completed_batches=len(rig.ledger),
+                                                   latest_world_time=rig.documents["W-01"]["worldTime"])
+            write_json(receipt, report)
+            print(f"{cycle * 60}s: all requested profiles passed batch {cycle}", flush=True)
+        elapsed = time.monotonic() - started
+        ticks = {rig.name: rig.documents["W-01"]["worldTime"] - initial[rig.name] for rig in rigs}
+        for rig in rigs:
+            check_hold(root)
+            endurance.require(ticks[rig.name] >= args.seconds * 18, rig.name + ": fewer than 18 game ticks per second")
+            rig.structure()
+            rig.checkpoint("before-restart")
+            rig.batch("before-restart")
+            rig.command("save-all flush", "Saved the game")
+            rig.shutdown()
+            rig.boot("endurance-restart")
+            rig.checkpoint("after-restart")
+            previous_intervals[rig.name] = rig.documents["W-01"].copy()
+            rig.batch("after-restart")
+            rig.structure()
+            rig.seed()
+        deadline = time.monotonic() + 60
+        while time.monotonic() < deadline:
+            check_hold(root)
+            time.sleep(min(1, max(0, deadline - time.monotonic())))
+        for rig in rigs:
+            check_hold(root)
+            statuses = stop_at_checkpoint(rig)
+            resumed_rate = interval_metrics(previous_intervals[rig.name], rig.documents["W-01"], "restart-resumed")
+            totals = Counter()
+            for batch in rig.ledger:
+                if batch["label"].startswith("cycle-"):
+                    totals.update(batch["outputs"])
+            report["profiles"][rig.name] = dict(status="PASS", elapsed_seconds=elapsed, endurance_batches=cycles,
+                                               game_ticks=ticks[rig.name], verified_checkpoints=len(rig.ledger),
+                                               endurance_outputs=dict(totals), station_statuses=statuses,
+                                               restart="PASS", resumed_processing="PASS", intervalMeasurements=intervals[rig.name],
+                                               minimumIntervalTicksPerSecond=min(row["ticksPerSecond"] for row in intervals[rig.name]),
+                                               resumedRate=resumed_rate)
+        report["status"] = "PASS" if args.seconds >= 1800 else "SMOKE_PASS_NOT_ENDURANCE"
+    except EnduranceHold as hold:
+        report.update(status="HELD", holdReason=str(hold))
+    except ThroughputFailure as failure:
+        report.update(status="FAIL", failure=repr(failure), failureCategory="RESOURCE_THROUGHPUT_NOT_GAMEPLAY_DIAGNOSIS")
+        raise
+    except BaseException as failure:
+        report.update(status="FAIL", failure=repr(failure))
+        raise
+    finally:
+        for rig in rigs:
+            try:
+                rig.shutdown()
+                native.verify_runtime(rig.runtime, rig.code_inventory, rig.expected_jars)
+            except Exception as failure:
+                report.update(status="FAIL", shutdown_or_audit_error=repr(failure))
+        report["seedUnchanged"] = fingerprint(args.seed) == seed_before
+        if args.retained:
+            report["retained_unchanged"] = fingerprint(args.retained) == source_before
+        if not report["seedUnchanged"] or (args.retained and not report["retained_unchanged"]):
+            report["status"] = "FAIL"
+        try:
+            verify_seal(args.seal, args.seal_sha256, Budget())
+        except Exception as failure:
+            report.update(status="FAIL", sealAuditError=repr(failure))
+        write_json(receipt, report)
+    print(report["status"] + ": " + str(receipt), flush=True)
+    return 2 if report["status"] == "HELD" else int(report["status"] == "FAIL")
+
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__)
+    for name in ("profile", "seed", "inventory", "output", "java", "seal"):
+        parser.add_argument("--" + name, required=True, type=lambda value: Path(value).resolve())
+    for name in ("inventory-sha256", "seal-sha256"):
+        parser.add_argument("--" + name, required=True)
+    parser.add_argument("--seconds", type=int, default=1800)
+    parser.add_argument("--retained", type=lambda value: Path(value).resolve(strict=True))
+    parser.add_argument("--retained-receipt", type=lambda value: Path(value).resolve(strict=True))
+    parser.add_argument("--retained-receipt-sha256")
+    parser.add_argument("--port", type=int, required=True)
+    return run(parser.parse_args())
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/test-rig/migration/native2612_endurance_replay.py b/test-rig/migration/native2612_endurance_replay.py
new file mode 100644
index 00000000..7f9d5ab6
--- /dev/null
+++ b/test-rig/migration/native2612_endurance_replay.py
@@ -0,0 +1,338 @@
+"""Genuine preseal, exact stopped freeze and independent Forge64 endurance replay."""
+
+import argparse
+from contextlib import ExitStack
+from datetime import datetime, timezone
+import json
+from pathlib import Path
+import sys
+
+import nbtlib
+
+import audit_native1201_endurance as checkpoint_audit
+import endurance
+from matrix import WORLD
+from native117_actor_io import bind
+from native117_entity_storage import _decompress, _nbt, _payloads
+from native117_machine_saved import state
+import native12111_endurance_replay as previous
+import native2612 as native
+import native2612_platform_diagnostics as platform_diagnostics
+from native2612_endurance import MODES, RECEIPT, interval_metrics, measure_batch, verify_fresh_fixture_proof, require_retained_receipt
+from native2612_layout import DATA_VERSION, region_file, read_worldgen
+
+
+Budget = previous.Budget
+require, pin, regular = previous.require, previous.pin, previous.regular
+write_new, disjoint, tree = previous.write_new, previous.disjoint, previous.tree
+stopped = previous.stopped
+MAX_JSON = previous.MAX_JSON
+row_nbt, typed_nbt_or_none = previous.row_nbt, previous.typed_nbt_or_none
+snapshot = bind(previous.snapshot, native=native)
+terrain = bind(previous.terrain, DATA_VERSION=DATA_VERSION)
+complete = bind(previous.complete, native=native, MODES=MODES)
+feed_audit = bind(previous.feed_audit, native=native)
+PRE_RUN = "NATIVE64_ENDURANCE_PRE_RUN_SEAL"
+RETROSPECTIVE = "NATIVE64_ENDURANCE_RETROSPECTIVE_SEAL"
+FREEZE = "NATIVE64_STOPPED_ENDURANCE_FREEZE"
+
+
+def oracle_paths():
+    # Warm the typed-array path before inventorying its imported native dependencies.
+    nbtlib.IntArray([3, 2, 1]).snbt()
+    paths = set(previous.oracle_paths())
+    paths.update(Path(path).resolve() for path in (sys.executable, getattr(sys, "_base_executable", sys.executable)))
+    for module in list(sys.modules.values()):
+        path = getattr(module, "__file__", None)
+        if path and getattr(module, "__name__", "").startswith("numpy"):
+            paths.add(Path(path).resolve())
+    import numpy
+    runtime_root = Path(numpy.__file__).resolve().parent.parent
+    paths.update(path.resolve() for path in (runtime_root / "numpy.libs").glob("*.dll"))
+    custody = runtime_root / "native2612-python-runtime-custody.json"
+    if custody.is_file():
+        paths.add(custody)
+    return sorted(paths)
+
+
+class Forge64:
+    MINECRAFT, FORGE = native.MINECRAFT, native.FORGE
+    verify_runtime = staticmethod(native.audit_staged)
+    parse_snapshot = staticmethod(snapshot)
+
+    @staticmethod
+    def require_native_boot(path):
+        native.require_clean_log(path)
+        native.require_complete_boot(path.read_text(encoding="utf-8"), stop_sent=True, returncode=0)
+
+    @staticmethod
+    def verify_batch(runtime, label, documents, definitions):
+        measured = measure_batch({key: documents[key] for key in ("S-04", "E-03", "W-04", "W-03")}, definitions)
+        recorded = native.read_json(runtime / f"semantic-batch-{label}.json")
+        require(measured["status"] == "PASS" and measured == recorded,
+                f"{runtime.name}/{label}: independent batch measurements disagree")
+
+
+def engine_inputs(path, expected, budget):
+    pin(budget.read(path), expected)
+    proof = budget.json(path)
+    require(proof.get("status") == "STRICT_CLASSIFIER_AND_ORDERED_COLDSTOP_READY"
+            and proof.get("noJvmFlagsAdded") is True and proof.get("debugNotSuppressed") is True
+            and proof.get("coreSha256") == budget.digest(Path(native.__file__))
+            and proof.get("classifierSha256") == budget.digest(Path(platform_diagnostics.__file__)),
+            "Engine proof does not describe the actual current reviewed core/classifier")
+    require(platform_diagnostics.COMMON_JAR_SHA in proof["proofFiles"].values()
+            and platform_diagnostics.SOURCES_JAR_SHA in proof["proofFiles"].values(),
+            "Primary Netty source and native binary proof are missing")
+    files = {Path(row["path"]): row["sha256"] for row in proof["sourceClosure"]}
+    files.update({Path(name): checksum for name, checksum in proof["proofFiles"].items()})
+    for name, checksum in files.items():
+        pin(budget.read(name), checksum)
+    return files
+
+
+def seal(profile, profile_sha256, specification, inventory, inventory_sha256, java, budget, *,
+         retrospective=False, retained_receipt=None, retained_receipt_sha256=None,
+         engine_receipt=None, engine_receipt_sha256=None):
+    pin(budget.read(profile), profile_sha256)
+    pin(budget.read(inventory), inventory_sha256)
+    document = budget.json(profile)
+    require(document["minecraftVersion"] == native.MINECRAFT and document["forge"]["version"] == native.FORGE_VERSION,
+            "Wrong selected native runtime profile")
+    mods = document["mods"]
+    require(len(mods) == 6 and {row["id"] for row in mods} == set(native.VERSIONS), "Seal requires exactly six native inputs")
+    for row in mods:
+        require(Path(row["path"]).name == row["file"] and row["version"] == native.VERSIONS[row["id"]],
+                "Artifact identity/version differs")
+        pin(budget.read(row["path"]), row["sha256"])
+    executable, version = native.java25(Path(java))
+    native.verify_compile_pin(next(Path(row["path"]) for row in mods if row["id"] == "advantageworkstest"),
+                              next(row["sha256"] for row in mods if row["id"] == "basepower"))
+    require(engine_receipt is not None and engine_receipt_sha256 is not None,
+            "Preseal must bind the reviewed platform classifier and primary-source proof")
+    proof_files = engine_inputs(engine_receipt, engine_receipt_sha256, budget)
+    retained_files = []
+    if retained_receipt is not None:
+        pin(budget.read(retained_receipt), retained_receipt_sha256)
+        prior = budget.json(retained_receipt)
+        require_retained_receipt(prior, profile_sha256.upper(), inventory_sha256.upper())
+        retained_files.append(Path(retained_receipt))
+    files = [Path(profile), Path(specification), Path(inventory), executable, Path(engine_receipt),
+             *(Path(row["path"]) for row in mods), *retained_files, *proof_files, *oracle_paths()]
+    return dict(format=1, purpose=RETROSPECTIVE if retrospective else PRE_RUN,
+                createdAtUtc=datetime.now(timezone.utc).isoformat(), profile=str(Path(profile).resolve()),
+                specification=str(Path(specification).resolve()), inventory=str(Path(inventory).resolve()),
+                java=str(executable), javaVersion=version,
+                engineReceipt=str(Path(engine_receipt).resolve()), engineReceiptSha256=engine_receipt_sha256.upper(),
+                retainedReceipt=str(Path(retained_receipt).resolve()) if retained_receipt else None,
+                files={str(path.resolve()): budget.digest(path) for path in files},
+                oracles=[str(path) for path in oracle_paths()])
+
+
+def verify_seal(path, expected, budget):
+    pin(budget.read(path), expected)
+    document = budget.json(path)
+    require(document.get("format") == 1 and document.get("purpose") in (PRE_RUN, RETROSPECTIVE), "Wrong input seal")
+    require(document["oracles"] == [str(path) for path in oracle_paths()], "Full transitive oracle module coverage changed")
+    required = set(document["oracles"]) | {document[key] for key in ("profile", "specification", "inventory", "java", "engineReceipt")}
+    if document.get("retainedReceipt"):
+        required.add(document["retainedReceipt"])
+    require(required <= document["files"].keys(), "Seal lists an oracle/input without binding its bytes")
+    require(document["files"][document["engineReceipt"]] == document["engineReceiptSha256"], "Engine receipt pin differs")
+    proof_files = engine_inputs(Path(document["engineReceipt"]), document["engineReceiptSha256"], budget)
+    require(all(document["files"].get(str(path.resolve())) == checksum for path, checksum in proof_files.items()),
+            "Seal omits reviewed engine/source proof bytes")
+    for name, checksum in document["files"].items():
+        pin(budget.read(name), checksum)
+    return document
+
+
+def custody(sealed, run, budget):
+    setup = min(datetime.fromisoformat(budget.json(
+        run / mode / "advantage-works-results/W-01-checkpoint-setup.json")["recordedAtUtc"]) for mode in MODES)
+    created = datetime.fromisoformat(sealed["createdAtUtc"])
+    retrospective = sealed["purpose"] == RETROSPECTIVE
+    require(retrospective or created < setup, "Seal was not made before setup; retrospective cannot qualify")
+    return dict(preRunCustody=not retrospective, sealCreatedAtUtc=sealed["createdAtUtc"], earliestSetupAtUtc=setup.isoformat(),
+                coverageGap="No pre-run oracle custody proof; seal is retrospective" if retrospective else None)
+
+
+def freeze(run, seal_path, seal_sha256, receipt_sha256, output, budget):
+    run, output = Path(run).resolve(), Path(output).resolve()
+    sealed = verify_seal(seal_path, seal_sha256, budget)
+    disjoint(output, run, seal_path, *(Path(name) for name in sealed["files"]))
+    pin(budget.read(run / RECEIPT), receipt_sha256)
+    complete(budget.json(run / RECEIPT))
+    provenance = custody(sealed, run, budget)
+    output.mkdir()
+    result = dict(status="FAIL", format=1, purpose=FREEZE, sealSha256=seal_sha256.upper(),
+                  inputReceiptSha256=receipt_sha256.upper(), source=str(run), custody=provenance)
+    try:
+        with ExitStack() as stack:
+            for mode in MODES:
+                stack.enter_context(stopped(run / mode, budget))
+            files = tree(run, budget)
+            for name, checksum in files.items():
+                data = budget.read(run / name)
+                pin(data, checksum)
+                destination = output / "run" / name
+                destination.parent.mkdir(parents=True, exist_ok=True)
+                with destination.open("xb") as stream:
+                    stream.write(data)
+            require(tree(run, budget) == files and tree(output / "run", budget) == files, "Stopped source/frozen copy changed")
+        verify_seal(seal_path, seal_sha256, budget)
+        with (output / "seal.json").open("xb") as output_seal:
+            output_seal.write(budget.read(seal_path))
+        result.update(status="PASS", files=files)
+    except BaseException as failure:
+        result["failure"] = repr(failure)
+        raise
+    finally:
+        write_new(output / "freeze.json", result)
+    return result
+
+
+def raw_final(runtime, budget):
+    world = runtime / WORLD
+    root = _nbt(_decompress(budget.read(world / "level.dat", MAX_JSON), 1))
+    version = root["Data"].get("DataVersion")
+    require(type(version) is nbtlib.Int and int(version) == DATA_VERSION, "Wrong stopped native level DataVersion")
+    # Absence/unknown fields stay in the actual separate SavedData, never synthesized from level.dat.
+    read_worldgen(world)
+    grouped, count = {}, 0
+    for station in endurance.CHECKED:
+        document = budget.json(runtime / "advantage-works-results" / f"{station}-checkpoint-restart-resumed.json")
+        snapshot(document)
+        dimension = document.get("dimension", "minecraft:overworld")
+        for row in document["snapshot"]:
+            x, _, z = row["pos"]
+            grouped.setdefault((dimension, x // 16, z // 16), []).append(row)
+            count += 1
+    regions, differences = {}, []
+    for (dimension, cx, cz), rows in grouped.items():
+        budget.check()
+        path = region_file(world, dimension, cx, cz)
+        if path not in regions:
+            regions[path] = dict(_payloads(budget.read(path), cx // 32, cz // 32))
+        require((cx, cz) in regions[path], "Missing stopped terrain chunk")
+        sections, tiles = terrain(regions[path][cx, cz], (cx, cz))
+        for row in rows:
+            x, y, z = pos = tuple(row["pos"])
+            palette = sections.get(y // 16)
+            actual = palette[((y & 15) << 8) | ((z & 15) << 4) | (x & 15)] if palette else {"Name": "minecraft:air"}
+            actual = dict(Name=actual["Name"], Properties=actual.get("Properties", {}))
+            if actual != state(row) or typed_nbt_or_none(row_nbt(row)) != typed_nbt_or_none(tiles.get(pos)):
+                differences.append(dict(pos=list(pos), dimension=dimension, checkpoint=row,
+                                        savedState=actual, savedNbt=typed_nbt_or_none(tiles.get(pos))))
+    require(not differences, "Stopped raw state/component mismatch: " + json.dumps(differences[:3]))
+    return dict(status="PASS", dataVersion=DATA_VERSION, comparedRows=count, comparedChunks=len(grouped))
+
+
+def interval_audit(runtime, report, budget):
+    station = runtime / "advantage-works-results"
+    before = budget.json(station / "W-01-checkpoint-setup.json")
+    measured = []
+    for index in range(1, 31):
+        label = f"cycle-{index:03}"
+        after = budget.json(station / f"W-01-checkpoint-{label}.json")
+        measured.append(interval_metrics(before, after, label))
+        before = after
+    resumed = interval_metrics(budget.json(station / "W-01-checkpoint-after-restart.json"),
+                               budget.json(station / "W-01-checkpoint-restart-resumed.json"), "restart-resumed")
+    require(measured == report.get("intervalMeasurements") and resumed == report.get("resumedRate")
+            and min(row["ticksPerSecond"] for row in measured) == report.get("minimumIntervalTicksPerSecond"),
+            "Recorded per-interval TPS differs from native checkpoint clocks")
+    return dict(status="PASS", measuredIntervals=len(measured),
+                minimumTicksPerSecond=min(row["ticksPerSecond"] for row in measured), resumed=resumed)
+
+
+def replay(frozen, freeze_sha256, seal_sha256, budget):
+    frozen = Path(frozen).resolve()
+    pin(budget.read(frozen / "freeze.json"), freeze_sha256)
+    manifest = budget.json(frozen / "freeze.json")
+    require(manifest.get("status") == "PASS" and manifest.get("format") == 1
+            and manifest.get("purpose") == FREEZE and manifest.get("sealSha256") == seal_sha256.upper(),
+            "Incomplete or different frozen evidence")
+    sealed = verify_seal(frozen / "seal.json", seal_sha256, budget)
+    run = frozen / "run"
+    require(tree(run, budget) == manifest["files"], "Frozen file inventory changed")
+    pin(budget.read(run / RECEIPT), manifest["inputReceiptSha256"])
+    report = budget.json(run / RECEIPT)
+    complete(report)
+    provenance = custody(sealed, run, budget)
+    require(manifest.get("custody") == provenance, "Frozen custody attestation changed")
+    require(report["profileSha256"] == sealed["files"][sealed["profile"]]
+            and report["stationDefinitionSha256"] == sealed["files"][sealed["specification"]]
+            and report["inventorySha256"] == sealed["files"][sealed["inventory"]]
+            and report["javaSha256"] == sealed["files"][sealed["java"]] and report["javaVersion"] == sealed["javaVersion"]
+            and report["inputSealSha256"].upper() == seal_sha256.upper()
+            and report["jars"] == {row["id"]: row["sha256"].upper() for row in budget.json(sealed["profile"])["mods"]},
+            "Producer differs from pre-run seal")
+    verify_fresh_fixture_proof(run / MODES[0], report["fresh_fixture_proof"])
+
+    class BoundedForge64(Forge64):
+        @staticmethod
+        def verify_batch(runtime, label, documents, definitions):
+            budget.check()
+            Forge64.verify_batch(runtime, label, documents, definitions)
+
+    replay_checkpoints = bind(checkpoint_audit.replay, read_json=budget.json, digest=budget.digest)
+    measured = replay_checkpoints(run, Path(sealed["profile"]), Path(sealed["specification"]), adapter=BoundedForge64)
+    raw, feeds, rates = {}, {}, {}
+    for mode in MODES:
+        inventory = budget.json(run / mode / native.INVENTORY)
+        require(inventory == budget.json(sealed["inventory"]), "Runtime code inventory differs from sealed seed")
+        require(not list((run / mode).glob("native*-launch-environment-*.json")), "Diagnostic launch cannot qualify")
+        raw[mode], feeds[mode] = raw_final(run / mode, budget), feed_audit(run / mode, budget)
+        rates[mode] = interval_audit(run / mode, report["profiles"][mode], budget)
+    require(tree(run, budget) == manifest["files"], "Frozen files changed during replay")
+    verify_seal(frozen / "seal.json", seal_sha256, budget)
+    return dict(status="PASS" if provenance["preRunCustody"] else "PASS_RETROSPECTIVE_REPLAY_NOT_PRE_RUN_CUSTODY",
+                qualificationAllowed=provenance["preRunCustody"], custody=provenance,
+                scope="Independent stopped native64 raw and every-batch replay; not client/player-conversion acceptance",
+                inputFreezeSha256=freeze_sha256.upper(), inputSealSha256=seal_sha256.upper(),
+                inputReceiptSha256=manifest["inputReceiptSha256"], checkpointReplay=measured, stoppedRaw=raw, nativeFeeds=feeds,
+                intervalThroughput=rates)
+
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__)
+    sub = parser.add_subparsers(dest="command", required=True)
+    make_seal = sub.add_parser("seal")
+    for name in ("profile", "specification", "inventory", "java", "output"):
+        make_seal.add_argument("--" + name, required=True, type=Path)
+    make_seal.add_argument("--engine-receipt", required=True, type=Path)
+    for name in ("profile-sha256", "inventory-sha256"):
+        make_seal.add_argument("--" + name, required=True)
+    make_seal.add_argument("--engine-receipt-sha256", required=True)
+    make_seal.add_argument("--retained-receipt", type=Path)
+    make_seal.add_argument("--retained-receipt-sha256")
+    make_seal.add_argument("--retrospective", action="store_true")
+    make_freeze = sub.add_parser("freeze")
+    for name in ("run", "seal", "output"):
+        make_freeze.add_argument("--" + name, required=True, type=Path)
+    for name in ("seal-sha256", "receipt-sha256"):
+        make_freeze.add_argument("--" + name, required=True)
+    make_replay = sub.add_parser("replay")
+    for name in ("frozen", "output"):
+        make_replay.add_argument("--" + name, required=True, type=Path)
+    for name in ("freeze-sha256", "seal-sha256"):
+        make_replay.add_argument("--" + name, required=True)
+    args = parser.parse_args()
+    budget = Budget()
+    if args.command == "seal":
+        disjoint(args.output, args.profile, args.specification, args.inventory, args.java)
+        result = seal(args.profile, args.profile_sha256, args.specification, args.inventory, args.inventory_sha256,
+                      args.java, budget, retrospective=args.retrospective, retained_receipt=args.retained_receipt,
+                      retained_receipt_sha256=args.retained_receipt_sha256, engine_receipt=args.engine_receipt,
+                      engine_receipt_sha256=args.engine_receipt_sha256)
+        write_new(args.output, result)
+    elif args.command == "freeze":
+        freeze(args.run, args.seal, args.seal_sha256, args.receipt_sha256, args.output, budget)
+    else:
+        disjoint(args.output, args.frozen)
+        write_new(args.output, replay(args.frozen, args.freeze_sha256, args.seal_sha256, budget))
+
+
+if __name__ == "__main__":
+    main()
diff --git a/test-rig/migration/native2612_interop.py b/test-rig/migration/native2612_interop.py
new file mode 100644
index 00000000..43e1b700
--- /dev/null
+++ b/test-rig/migration/native2612_interop.py
@@ -0,0 +1,87 @@
+"""Native26 capability, locked automation, portable tank and survival oil-bucket checks."""
+
+from pathlib import Path
+import traceback
+
+from matrix import digest, write_json
+from native117_interop import require_checks, require_probe_order
+from native117_readiness import await_ready
+import native117_interop as contracts
+import native12111 as previous
+import native2612 as native
+from native2612_resources import arguments, preflight
+
+
+RECEIPT = "native2612-interop-results.json"
+
+
+def validate_observation(document, phase, readiness):
+    require_probe_order(document, readiness)
+    require_checks(document, phase)
+    previous.require_shared_crushing(document)
+
+
+def run(args):
+    if not 1024 <= args.port < 65535:
+        raise ValueError("Use an unprivileged localhost port")
+    inputs = preflight(args, [Path(__file__), Path(previous.__file__), Path(contracts.__file__)])
+    if args.preflight_only:
+        return dict(status="READY_NOT_RUN", qualificationAllowed=False, **inputs.receipt())
+    runtime = args.output.resolve()
+    expected = native.stage(runtime, *inputs.target, args.port)
+    (runtime / "advantage-native-oil-bucket.allow").touch()
+    report = dict(status="RUNNING", scope="PACKAGED_NATIVE_INTERFACES_AND_CONTAINER_RESTART",
+                  qualificationStatus="EXPLORATORY_UNQUALIFIED", phases={}, profileSha256=digest(args.profile),
+                  inventorySha256=digest(args.inventory), jars=expected, **inputs.receipt())
+    receipt = runtime / RECEIPT
+    write_json(receipt, report)
+    server = None
+    try:
+        for phase in ("exercise", "restored"):
+            native.verify_runtime(runtime, inputs.target[1], expected)
+            server = native.Server(runtime, inputs.java, native.LAUNCHER, phase)
+            server.send("forceload add 1023 1023 1100 1030")
+            ready = await_ready(server, runtime, (63, 63, 68, 64), f"interop-{phase}", minecraft=native.MINECRAFT)
+            server.send(f"advinterop {phase}")
+            server.wait(f"ADVINTEROP COMPLETE {phase}", 120)
+            document = native.read_json(runtime / "advantage-works-results" / f"native-interop-{phase}.json")
+            report["phases"][phase] = dict(readiness=ready, observation=document)
+            validate_observation(document, phase, ready)
+            if phase == "exercise":
+                server.send("advoilbuckets")
+                server.wait("ADVOILBUCKETS COMPLETE", 120)
+                buckets = native.read_json(runtime / "advantage-works-results/native-oil-buckets.json")
+                report["phases"][phase]["oilBuckets"] = buckets
+                previous.require_oil_buckets(buckets, ready)
+            server.send("save-all flush")
+            server.wait("Saved the game", 30)
+            server.close()
+            server = None
+            write_json(receipt, report)
+        report["status"] = "PASS"
+    except BaseException as failure:
+        report.update(status="FAIL", failure=repr(failure), traceback=traceback.format_exc())
+        raise
+    finally:
+        try:
+            if server is not None:
+                server.close()
+            native.verify_runtime(runtime, inputs.target[1], expected)
+            report["inputsUnchanged"] = inputs.unchanged()
+        except BaseException as failure:
+            report.update(status="FAIL", shutdownOrCustodyError=repr(failure))
+            raise
+        finally:
+            write_json(receipt, report)
+    return report
+
+
+def main():
+    args = arguments(__doc__).parse_args()
+    result = run(args)
+    print(result["status"], flush=True)
+    return int(result["status"] not in ("PASS", "READY_NOT_RUN"))
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/test-rig/migration/native2612_layout.py b/test-rig/migration/native2612_layout.py
new file mode 100644
index 00000000..2c3c14b3
--- /dev/null
+++ b/test-rig/migration/native2612_layout.py
@@ -0,0 +1,128 @@
+"""Explicit 26.1.2 target paths and lossless stopped-save readers, never source fallbacks."""
+
+import copy
+import gzip
+import io
+from pathlib import Path
+import re
+import uuid
+
+import nbtlib
+
+
+DATA_VERSION = 4790
+VANILLA_DIMENSIONS = ("minecraft:overworld", "minecraft:the_nether", "minecraft:the_end")
+STORAGE_KINDS = ("region", "entities", "poi")
+MAX_NBT_BYTES = 64 * 1024 * 1024
+
+
+def resource_parts(key):
+    if not isinstance(key, str) or not re.fullmatch(r"[a-z0-9_.-]+:[a-z0-9_./-]+", key):
+        raise ValueError("Expected an explicit namespaced target resource key")
+    namespace, path = key.split(":")
+    if namespace in (".", "..") or any(part in ("", ".", "..") for part in path.split("/")):
+        raise ValueError("Unsafe target resource path")
+    return namespace, path
+
+
+def dimension_directory(world, key):
+    namespace, path = resource_parts(key)
+    return Path(world) / "dimensions" / namespace / path
+
+
+def region_file(world, dimension, chunk_x, chunk_z, kind="region"):
+    if type(chunk_x) is not int or type(chunk_z) is not int or kind not in STORAGE_KINDS:
+        raise ValueError("Expected integer chunk coordinates and native region/entities/poi storage")
+    return dimension_directory(world, dimension) / kind / f"r.{chunk_x // 32}.{chunk_z // 32}.mca"
+
+
+def shared_file(world, key):
+    namespace, path = resource_parts(key)
+    return Path(world) / "data" / namespace / (path + ".dat")
+
+
+def player_identity(value):
+    if isinstance(value, uuid.UUID):
+        return value
+    if not isinstance(value, str):
+        raise ValueError("Expected an explicit canonical player UUID")
+    try:
+        identity = uuid.UUID(value)
+    except ValueError as error:
+        raise ValueError("Expected an explicit canonical player UUID") from error
+    if str(identity) != value:
+        raise ValueError("Player UUID must be canonical, not a filename alias")
+    return identity
+
+
+def player_file(world, identity):
+    return Path(world) / "players/data" / (str(player_identity(identity)) + ".dat")
+
+
+def _load(path):
+    path = Path(path)
+    for part in (path, *path.parents):
+        if part.is_symlink() or getattr(part, "is_junction", lambda: False)():
+            raise ValueError("Aliased target save path")
+    if path.stat().st_nlink != 1 or path.stat().st_size > MAX_NBT_BYTES:
+        raise ValueError("Aliased or oversized target save file")
+    raw = path.read_bytes()
+    if raw.startswith(b"\x1f\x8b"):
+        with gzip.GzipFile(fileobj=io.BytesIO(raw)) as stream:
+            raw = stream.read(MAX_NBT_BYTES + 1)
+    if len(raw) > MAX_NBT_BYTES:
+        raise ValueError("Expanded target save exceeds the NBT budget")
+    stream = io.BytesIO(raw)
+    result = nbtlib.File.parse(stream)
+    if stream.read(1):
+        raise ValueError("Trailing data in target NBT file")
+    return result
+
+
+def _version(tag):
+    value = tag.get("DataVersion")
+    if type(value) is not nbtlib.Int or int(value) != DATA_VERSION:
+        raise ValueError("Expected native 26.1.2 DataVersion 4790, without source coercion")
+
+
+def read_level(world):
+    root = _load(Path(world) / "level.dat")
+    data = root.get("Data")
+    if not isinstance(data, nbtlib.Compound):
+        raise ValueError("Target level.dat lacks its native Data compound")
+    _version(data)
+    return copy.deepcopy(data)
+
+
+def read_worldgen(world):
+    read_level(world)
+    root = _load(shared_file(world, "minecraft:world_gen_settings"))
+    _version(root)
+    if not isinstance(root.get("data"), nbtlib.Compound):
+        raise ValueError("Target worldgen SavedData lacks its native data compound")
+    return copy.deepcopy(root)
+
+
+def uuid_tag(value):
+    if type(value) is not nbtlib.IntArray or len(value) != 4:
+        raise ValueError("Native player authority must be a four-int UUID")
+    number = 0
+    for word in value:
+        number = (number << 32) | (int(word) & 0xffffffff)
+    return uuid.UUID(int=number)
+
+
+def singleplayer_uuid(world):
+    data = read_level(world)
+    if "Player" in data:
+        raise ValueError("Embedded Player is historical authority, not native 26 player storage")
+    return uuid_tag(data["singleplayer_uuid"]) if "singleplayer_uuid" in data else None
+
+
+def read_player(world, identity):
+    identity = player_identity(identity)
+    data = _load(player_file(world, identity))
+    _version(data)
+    if uuid_tag(data.get("UUID")) != identity:
+        raise ValueError("Saved native player UUID differs from its authoritative path")
+    return copy.deepcopy(data)
diff --git a/test-rig/migration/native2612_legacy_alternatives.py b/test-rig/migration/native2612_legacy_alternatives.py
new file mode 100644
index 00000000..a1d355a3
--- /dev/null
+++ b/test-rig/migration/native2612_legacy_alternatives.py
@@ -0,0 +1,119 @@
+"""Version the legacy no-duplicate contract for visible, disabled native26 alternatives.
+
+Historical drivers and failed receipts remain unchanged. Only three literal
+absence assertions change; original OS1 payloads and all sampling/restart gates
+are still checked independently.
+"""
+
+import copy
+from pathlib import Path
+
+from matrix import digest, write_json
+from native117_actor_io import bind
+import native2612 as native
+import native2612_retained_worldgen as retained
+import native2612_strict_migration as strict
+import native2612_worldgen as worldgen
+from native2612_resources import arguments, require
+
+
+SPEC = native.RIG / "profiles/native2612/legacy-visible-alternatives.json"
+RESULT = "native2612-legacy-alternative-worldgen-results.json"
+
+
+def contract_spec():
+    value = native.read_json(SPEC)
+    require(value["protocol"] == "NATIVE26_LEGACY_VISIBLE_DISABLED_ALTERNATIVES_V1"
+            and len(value["replacesOnly"]) == 3
+            and value["replacement"] == dict(present=True, field="enabled", expectedBoolean=False),
+            "Unexpected versioned legacy alternative contract")
+    return value
+
+
+def campaign_spec(name):
+    require(name == "legacy-import", "This contract is only for the legacy import route")
+    spec = copy.deepcopy(worldgen.campaign_spec(name))
+    replacements = {row["id"]: row for row in contract_spec()["replacesOnly"]}
+    require(len(replacements) == 3, "Duplicate alternative contract IDs")
+    for phase in ("first", "restart"):
+        seen = set()
+        for assertion in spec[phase + "ProfileAssertions"]:
+            if assertion["id"] not in replacements:
+                continue
+            require(assertion["id"] not in seen, "Duplicated historical alternative assertion")
+            target = replacements[assertion["id"]]
+            require(assertion == {key: target[key] for key in ("id", "section", "entry")} | {"present": False},
+                    "Historical absence assertion changed; review rather than replace it blindly")
+            assertion.update(contract_spec()["replacement"])
+            seen.add(assertion["id"])
+        require(seen == replacements.keys(), "Missing or duplicated historical alternative assertions")
+    return spec
+
+
+def validate_profile(document, assertions):
+    rows = worldgen.validate_profile(document, assertions)
+    for target in contract_spec()["replacesOnly"]:
+        rule = document[target["section"]][target["entry"]]
+        require(rule.get("enabled") is False and rule.get("block") == target["block"],
+                "Modern alternative must be visible but disabled: " + target["entry"])
+        require(rule.get("retrogen", False) is False, "Import must not enable retrogen")
+        dimensions = rule.get("dimensions")
+        require(isinstance(dimensions, dict) and "minecraft:overworld" in dimensions,
+                "Alternative is not a complete editable placement rule")
+        for placement in dimensions.values():
+            require(isinstance(placement, dict)
+                    and all(key in placement for key in ("enabled", "min_y", "max_y", "frequency", "host_blocks", "host_tags"))
+                    and placement["min_y"] <= placement["max_y"] and placement["frequency"] > 0
+                    and isinstance(placement["host_blocks"], list) and placement["host_blocks"],
+                    "Disabled alternative lost its actual editable geometry/hosts")
+        if target["section"] == "ores":
+            require(all(key in row for row in dimensions.values() for key in
+                        ("min_quantity", "max_quantity", "pattern", "placement_channel")),
+                    "Typed ore alternative is incomplete")
+        else:
+            require(all(key in row for row in dimensions.values() for key in
+                        ("min_radius", "max_radius", "min_vertical_radius", "max_vertical_radius")),
+                    "Fluid alternative is incomplete")
+    spec = campaign_spec("legacy-import")
+    expected = dict(ores={}, fluid_deposits={})
+    for source, destination in spec["configFixtures"]:
+        old = destination.stem
+        current = {"poweradvantage": "basepower", "electricadvantage": "baseelectric"}[old]
+        projected = retained.os1_profile(native.read_json(source), current, old)
+        expected["ores"].update(projected["ores"])
+    outputs = {row["block"] for row in contract_spec()["replacesOnly"]}
+    audit = retained.audit_transition(expected, document, outputs)
+    require(audit["status"] == "PASS", "Imported OS1 settings changed: " + str(audit["issues"]))
+    return rows + [dict(id="source-os1-payload-and-no-active-duplicates", status="PASS", contract=audit)]
+
+
+class LegacyServer(worldgen.WorldgenServer):
+    def validate_native_log(self, path):
+        super().validate_native_log(path)
+        strict.clean_log(path)
+
+
+def preflight(args, sources):
+    return worldgen.preflight(args, [*sources, SPEC, Path(worldgen.__file__), Path(retained.__file__), Path(strict.__file__)])
+
+
+def run(args):
+    execute = bind(worldgen.run, campaign_spec=campaign_spec, validate_profile=validate_profile,
+                   WorldgenServer=LegacyServer, preflight=preflight, RESULT=RESULT, __file__=__file__)
+    result = execute(args)
+    result["expectationContract"] = dict(path=str(SPEC), sha256=digest(SPEC), **contract_spec())
+    result["historicalDriverSha256"] = digest(Path(worldgen.__file__))
+    if not args.preflight_only:
+        write_json(Path(args.output) / RESULT, result)
+    return result
+
+
+def main():
+    parser = arguments(__doc__)
+    parser.add_argument("--campaign", choices=("legacy-import",), default="legacy-import")
+    parser.add_argument("--sample-timeout", type=int, default=1800)
+    print(run(parser.parse_args())["status"], flush=True)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/test-rig/migration/native2612_machines.py b/test-rig/migration/native2612_machines.py
new file mode 100644
index 00000000..b7996aaf
--- /dev/null
+++ b/test-rig/migration/native2612_machines.py
@@ -0,0 +1,101 @@
+"""Native64 harvest and lifecycle transport; retain historical machine oracles."""
+
+import traceback
+from types import SimpleNamespace
+
+import lifecycle
+from matrix import digest, write_json
+from native117_actor_io import bind
+from native117_identity import fixture_ids
+from native117_lifecycle import NativeLifecycleRun, authorize_lifecycle, exercise
+import native1201_machines
+import native2612 as native
+from native2612_networks import (MAX_TICKET_DISTANCE, Server, arguments, compatibility_view,
+                                native_boot, native_inventory_item, prepare_inputs, validate_snapshot)
+
+
+class LifecycleRun(NativeLifecycleRun):
+    minecraft = native.MINECRAFT
+    max_ticket_distance = MAX_TICKET_DISTANCE
+    require_boot = staticmethod(native_boot)
+
+    def __init__(self, *args):
+        super().__init__(*args)
+        self.pids = []
+
+    def open_server(self, label):
+        server = Server(self.runtime, self.java, self.launcher, label)
+        self.pids.append(server.process.pid)
+        return server
+
+    def inventory(self, pos, slot, item, count):
+        coordinates = " ".join(map(str, pos))
+        self.command(f"item replace block {coordinates} container.{slot} with {native_inventory_item(item)} {count}")
+
+    def _raw_probe(self, operation, label):
+        return validate_snapshot(super()._raw_probe(operation, label))
+
+    def probe(self, operation, label):
+        return compatibility_view(super().probe(operation, label))
+
+
+harvest = bind(native1201_machines.harvest, native1201=SimpleNamespace(
+    Server=Server, MINECRAFT=native.MINECRAFT, LAUNCHER=native.LAUNCHER))
+
+
+def run(args):
+    inputs = prepare_inputs(args)
+    if args.preflight_only:
+        return dict(status="READY_NOT_RUN", qualificationAllowed=False, **inputs.receipt())
+    runtime = inputs.output
+    receipt = runtime / f"native2612-{args.campaign}-results.json"
+    report = dict(status="RUNNING", campaign=args.campaign, scope="FINITE_HARVEST_AND_PHYSICAL_MACHINE_LIFECYCLE",
+                  **inputs.receipt())
+
+    def progress(value):
+        report["observations"] = value
+        write_json(receipt, report)
+
+    runner, staged = None, False
+    try:
+        native.stage(runtime, *inputs.target, args.port)
+        staged = True
+        write_json(receipt, report)
+        if args.campaign == "harvest":
+            result = harvest(runtime, inputs.java, native.LAUNCHER, {}, progress)
+        else:
+            definition = fixture_ids(lifecycle.fixtures())
+            fixture = runtime / "lifecycle-fixture.json"
+            write_json(fixture, definition)
+            report["fixtureSha256"] = digest(fixture)
+            authorize_lifecycle(runtime)
+            runner = LifecycleRun(runtime, inputs.java, native.LAUNCHER, definition)
+            result = exercise(runner, "fresh2612", progress)
+        report.update(status=result["status"], observations=result)
+    except BaseException as failure:
+        report.update(status="FAIL", failure=repr(failure), traceback=traceback.format_exc())
+    finally:
+        try:
+            if runner is not None:
+                runner.close()
+                report["processIds"] = runner.pids
+                report["processesClosed"] = runner.server is None
+            inputs.verify(staged)
+            report.update(seedUnchanged=True, inputsUnchanged=True, oraclesUnchanged=True)
+        except BaseException as failure:
+            report.update(status="FAIL", custodyError=repr(failure), custodyTraceback=traceback.format_exc())
+        if runtime.is_dir():
+            write_json(receipt, report)
+    return report
+
+
+def main(argv=None):
+    parser = arguments(__doc__)
+    parser.add_argument("--campaign", choices=("harvest", "lifecycle"), required=True)
+    report = run(parser.parse_args(argv))
+    print(report["status"], flush=True)
+    return int(report["status"] not in ("PASS", "READY_NOT_RUN"))
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/test-rig/migration/native2612_networks.py b/test-rig/migration/native2612_networks.py
new file mode 100644
index 00000000..8abd90c7
--- /dev/null
+++ b/test-rig/migration/native2612_networks.py
@@ -0,0 +1,294 @@
+"""Native64 transport for unchanged physical-unload, bridge and extended-drill oracles."""
+
+import argparse
+from dataclasses import dataclass
+from pathlib import Path
+import sys
+import subprocess
+import traceback
+
+import nbtlib
+
+from matrix import digest, fingerprint, write_json
+from native117 import output_path, require_disjoint
+from native117_actor_io import bind
+import native117_extended
+from native117_geometry import FORCED_LEVEL, FULL_LEVEL
+from native117_holder_networks import bridge_fixtures, extended_fixtures, linear_fixtures
+from native117_lifecycle import authorize_lifecycle
+from native117_partial import exercise_bridge, exercise_partial
+from native117_ticket_networks import NativeTicketExtendedRun
+import native2612 as native
+
+
+# Native ChunkLevel derives 33 + GENERATION_PYRAMID's radius. Every live probe
+# must confirm radius 11, forced level 31 and the resulting 13-chunk holder halo.
+MAX_TICKET_DISTANCE = 11
+HOLDER_RADIUS = FULL_LEVEL + MAX_TICKET_DISTANCE - FORCED_LEVEL
+CAMPAIGNS = {
+    "partial": (linear_fixtures, exercise_partial),
+    "bridge": (bridge_fixtures, exercise_bridge),
+    "extended": (extended_fixtures, native117_extended.exercise),
+}
+
+
+def capped_command(command):
+    command = list(command)
+    if (not command or "-Xmx2G" not in command or not any(part.startswith("@") for part in command)
+            or any(part.startswith("-XX:ActiveProcessorCount=") for part in command)):
+        raise ValueError("Review a changed native finite-server launch before adding its CPU cap")
+    return [command[0], "-XX:ActiveProcessorCount=4", *command[1:]]
+
+
+class _NativeProcess:
+    def __init__(self, owner):
+        self.owner = owner
+
+    def __getattr__(self, name):
+        return getattr(subprocess, name)
+
+    def Popen(self, command, *args, **kwargs):
+        command = capped_command(command)
+        environment = kwargs.get("env")
+        if not isinstance(environment, dict):
+            raise ValueError("Finite native launch needs the core's explicit environment")
+        names = ("JAVA_TOOL_OPTIONS", "JDK_JAVA_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH")
+        if any(name in environment for name in names):
+            raise ValueError("Finite native launch may not inherit JVM options/classpath")
+        path = Path(kwargs["cwd"]) / f"native2612-finite-launch-{self.owner.native_label}.json"
+        if path.exists():
+            raise FileExistsError(path)
+        record = dict(status="PLANNED", command=command, inheritedOptions={name: None for name in names},
+                      explicitProcessorCap=4, explicitMaxHeap="2G")
+        write_json(path, record)
+        process = None
+        try:
+            process = subprocess.Popen(command, *args, **kwargs)
+            record.update(status="REAL_PROCESS_STARTED", pid=process.pid)
+            write_json(path, record)
+            return process
+        except BaseException:
+            if process is not None and process.poll() is None:
+                process.kill()
+                process.wait(timeout=30)
+            raise
+
+
+class _CappedLaunch(native.NativeLaunch):
+    def __init__(self, *args, **kwargs):
+        bind(native.NativeLaunch.__init__, subprocess=_NativeProcess(self))(self, *args, **kwargs)
+
+
+class Server(native.Server, _CappedLaunch):
+    """Keep the sealed core transport; add a recorded command-line cap without global mutation."""
+
+
+def native_boot(path):
+    native.require_clean_log(path)
+    text = Path(path).read_text(encoding="utf-8")
+    for marker in (f"Starting minecraft server version {native.MINECRAFT}",
+                   f"Forge mod loading, version {native.FORGE}, for MC {native.MINECRAFT} with MCP {native.MCP}"):
+        if marker not in text:
+            raise AssertionError("Missing native64 finite-campaign boot proof: " + marker)
+
+
+def native_inventory_item(item):
+    identity, separator, payload = item.partition("{")
+    if not separator:
+        return item
+    if "[" in identity:
+        raise ValueError("Ambiguous legacy and native fixture item components")
+    custom = nbtlib.parse_nbt(separator + payload)
+    if not isinstance(custom, nbtlib.Compound):
+        raise AssertionError("Historical fixture item data must be a compound")
+    return identity + "[minecraft:custom_data=" + custom.snbt(compact=True) + "]"
+
+
+def compatibility_view(value):
+    """Derived legacy accessors only; never rewrite native probe files or input objects."""
+    if isinstance(value, list):
+        return [compatibility_view(item) for item in value]
+    if not isinstance(value, dict):
+        return value
+    result = {key: compatibility_view(item) for key, item in value.items()}
+    if isinstance(value.get("nbt"), str):
+        compound = nbtlib.parse_nbt(value["nbt"])
+        if not isinstance(compound, nbtlib.Compound):
+            raise AssertionError("Native lifecycle witness NBT must be a compound")
+        items = compound.get("Items", ())
+        if "Items" in compound and not isinstance(items, nbtlib.List):
+            raise AssertionError("Native inventory must be a typed list")
+        for stack in items:
+            if (not isinstance(stack, nbtlib.Compound) or not isinstance(stack.get("id"), nbtlib.String)
+                    or not isinstance(stack.get("count"), nbtlib.Int) or int(stack["count"]) <= 0
+                    or "Count" in stack or "tag" in stack):
+                raise AssertionError(f"Expected native 26.1.2 inventory stack: {stack}")
+            components = stack.get("components", nbtlib.Compound())
+            if not isinstance(components, nbtlib.Compound):
+                raise AssertionError("Native item components must be a compound")
+            stack["Count"] = stack["count"]
+            custom = components.get("minecraft:custom_data")
+            if custom is not None:
+                if not isinstance(custom, nbtlib.Compound):
+                    raise AssertionError("Native inventory custom_data must be a compound")
+                stack["tag"] = custom
+        result["nbt"] = compound.snbt(compact=True)
+    return result
+
+
+def validate_snapshot(snapshot):
+    if ((snapshot.get("minecraft"), snapshot.get("forge"), snapshot.get("station"))
+            != (native.MINECRAFT, native.FORGE, "lifecycle")
+            or type(snapshot.get("worldTime")) is not int or snapshot["worldTime"] < 0):
+        raise AssertionError("Historical or incomplete lifecycle evidence is not native64 proof")
+    return snapshot
+
+
+def oracle_closure():
+    directory = Path(__file__).resolve().parent
+    return {Path(module.__file__).resolve(): digest(Path(module.__file__)) for module in tuple(sys.modules.values())
+            if getattr(module, "__file__", None) and Path(module.__file__).suffix == ".py"
+            and Path(module.__file__).resolve().parent == directory
+            and not Path(module.__file__).name.startswith("test_")}
+
+
+@dataclass
+class Inputs:
+    target: tuple
+    java: Path
+    java_version: str
+    output: Path
+    hashes: dict
+    seed_before: dict
+
+    def verify(self, staged):
+        if staged:
+            native.verify_runtime(self.output, self.target[1],
+                                  {path.name: sha for _, path, sha in self.target[2].values()})
+        if fingerprint(self.target[0]) != self.seed_before:
+            raise AssertionError("Protected server seed changed")
+        for path, expected in self.hashes.items():
+            native.validate_hash(path, expected)
+        if set(oracle_closure()) - set(self.hashes):
+            raise AssertionError("An unsealed migration oracle was imported during the run")
+
+    def receipt(self):
+        return dict(qualificationStatus=native.EXPLORATORY, minecraft=native.MINECRAFT,
+                    forge=native.FORGE, mcp=native.MCP, javaVersion=self.java_version,
+                    inputHashes={str(path): sha for path, sha in self.hashes.items()},
+                    jars={key: value[2] for key, value in self.target[2].items()},
+                    pythonVersion=sys.version, pythonExecutable=str(Path(sys.executable).resolve()),
+                    inheritedJvmOptions={name: None for name in ("JAVA_TOOL_OPTIONS", "JDK_JAVA_OPTIONS", "_JAVA_OPTIONS")},
+                    explicitProcessorCap=4, explicitMaxHeap="2G",
+                    legacyOracleView="Derived aliases only; original native probe files are unchanged")
+
+
+def prepare_inputs(args):
+    if any(name in native.os.environ for name in ("JAVA_TOOL_OPTIONS", "JDK_JAVA_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH")):
+        raise ValueError("Finite native campaigns require absent JVM option/classpath variables")
+    native.native_launch_environment()
+    native.validate_hash(args.profile, args.profile_sha256)
+    target = native.read_family_target(args.profile, args.seed, args.inventory, args.inventory_sha256)
+    if set(target[2]) != set(native.VERSIONS):
+        raise ValueError("Require the complete six-jar native64 family")
+    java, version = native.java25(args.java)
+    native.require_free_port(args.port)
+    output = output_path(Path(args.output))
+    sources = oracle_closure()
+    sources.update({Path(path).resolve(): digest(path) for path in (
+        args.profile, args.inventory, java, Path(sys.executable), *(value[1] for value in target[2].values()))})
+    for path in [target[0], *sources]:
+        require_disjoint(output, Path(path))
+    return Inputs(target, java, version, output, sources, fingerprint(target[0]))
+
+
+def arguments(description=__doc__):
+    parser = argparse.ArgumentParser(description=description)
+    for name in ("profile", "seed", "inventory", "output", "java"):
+        parser.add_argument("--" + name, type=lambda value: Path(value).resolve(), required=True)
+    parser.add_argument("--profile-sha256", required=True)
+    parser.add_argument("--inventory-sha256", required=True)
+    parser.add_argument("--port", type=int, required=True)
+    parser.add_argument("--preflight-only", action="store_true")
+    return parser
+
+
+class PartialRun(NativeTicketExtendedRun):
+    minecraft = native.MINECRAFT
+    max_ticket_distance = MAX_TICKET_DISTANCE
+    require_boot = staticmethod(native_boot)
+
+    def __init__(self, *args):
+        super().__init__(*args)
+        self.pids = []
+
+    def open_server(self, label):
+        server = Server(self.runtime, self.java, self.launcher, label)
+        self.pids.append(server.process.pid)
+        return server
+
+    def inventory(self, pos, slot, item, count):
+        coordinates = " ".join(map(str, pos))
+        self.command(f"item replace block {coordinates} container.{slot} with {native_inventory_item(item)} {count}")
+
+    def _raw_probe(self, operation, label):
+        return validate_snapshot(super()._raw_probe(operation, label))
+
+    def probe(self, operation, label):
+        return compatibility_view(super().probe(operation, label))
+
+
+def run(args):
+    inputs = prepare_inputs(args)
+    if args.preflight_only:
+        return dict(status="READY_NOT_RUN", qualificationAllowed=False, **inputs.receipt())
+    runtime = inputs.output
+    receipt = runtime / f"native2612-{args.campaign}-results.json"
+    report = dict(status="RUNNING", campaign=args.campaign, scope="FINITE_PHYSICAL_UNLOAD_NETWORKS_AND_DRILLS",
+                  **inputs.receipt())
+
+    def progress(value):
+        report["observations"] = value
+        write_json(receipt, report)
+
+    runner, staged = None, False
+    try:
+        native.stage(runtime, *inputs.target, args.port)
+        staged = True
+        write_json(receipt, report)
+        layout, exercise = CAMPAIGNS[args.campaign]
+        definition = layout(HOLDER_RADIUS)
+        fixture = runtime / "lifecycle-fixture.json"
+        write_json(fixture, definition)
+        report["fixtureSha256"] = digest(fixture)
+        authorize_lifecycle(runtime)
+        runner = PartialRun(runtime, inputs.java, native.LAUNCHER, definition)
+        result = exercise(runner, progress)
+        report.update(status=result["status"], observations=result)
+    except BaseException as failure:
+        report.update(status="FAIL", failure=repr(failure), traceback=traceback.format_exc())
+    finally:
+        try:
+            if runner is not None:
+                runner.close()
+                report["processIds"] = runner.pids
+                report["processesClosed"] = runner.server is None
+            inputs.verify(staged)
+            report.update(seedUnchanged=True, inputsUnchanged=True, oraclesUnchanged=True)
+        except BaseException as failure:
+            report.update(status="FAIL", custodyError=repr(failure), custodyTraceback=traceback.format_exc())
+        if runtime.is_dir():
+            write_json(receipt, report)
+    return report
+
+
+def main(argv=None):
+    parser = arguments()
+    parser.add_argument("--campaign", choices=tuple(CAMPAIGNS), required=True)
+    report = run(parser.parse_args(argv))
+    print(report["status"], flush=True)
+    return int(report["status"] not in ("PASS", "READY_NOT_RUN"))
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/test-rig/migration/native2612_oil.py b/test-rig/migration/native2612_oil.py
new file mode 100644
index 00000000..ddac1387
--- /dev/null
+++ b/test-rig/migration/native2612_oil.py
@@ -0,0 +1,178 @@
+"""Native64 oil transport and separately classified actual-world renderer evidence."""
+
+from pathlib import Path
+import shutil
+
+import lifecycle
+from matrix import digest, write_json
+from native117 import output_path
+from native117_lifecycle import authorize_lifecycle
+from native117_oil import NativeOilRun, construction_commands, exercise, fixtures, require_document
+import native2612 as native
+import native2612_layout as layout
+from native2612_resources import arguments, artifact, pixel_pair, preflight, require
+
+
+RESULT = "native2612-oil-results.json"
+OILS = ("crude_oil", "refined_oil")
+
+
+def native_boot(path):
+    native.require_clean_log(path)
+    text = path.read_text(encoding="utf-8")
+    require(f"Starting minecraft server version {native.MINECRAFT}" in text
+            and f"Forge mod loading, version {native.FORGE}, for MC {native.MINECRAFT} with MCP {native.MCP}" in text,
+            "Missing native64 oil startup proof")
+
+
+def validate_snapshot(snapshot, definition, *, initial_air=False):
+    require_document(snapshot, definition)
+    require((snapshot["minecraft"], snapshot["forge"], snapshot["station"]) == (native.MINECRAFT, native.FORGE, "lifecycle")
+            and type(snapshot["worldTime"]) is int and snapshot["worldTime"] >= 0,
+            "Historical oil snapshot is not target evidence")
+    for lane in definition:
+        for row in snapshot["cases"][lane["id"]]:
+            require(row["loaded"] is True, "Oil witness is not actually loaded")
+            if initial_air:
+                require(set(row) == {"pos", "loaded", "block", "state"}
+                        and row["block"] == "minecraft:air" and row["state"] == "Block{minecraft:air}",
+                        "Initial oil witness is not untouched loaded air")
+        if initial_air:
+            continue
+        for role in ("drain", "output"):
+            data = lifecycle.parse(lifecycle.at(snapshot, lane["id"], lane[role]))
+            tank = data["Tank"]
+            require(isinstance(tank, dict), "Missing native tank data")
+            if set(tank) == {"Empty"}:
+                require(type(tank["Empty"]) is layout.nbtlib.Byte and int(tank["Empty"]) == 1,
+                        "Unknown native empty-tank encoding")
+            else:
+                require(set(tank) == {"FluidName", "Amount"} and tank["FluidName"] == lane["fluid"]
+                        and type(tank["Amount"]) is layout.nbtlib.Int and tank["Amount"] >= 0,
+                        "Unknown/ambiguous native oil tank data")
+    return snapshot
+
+
+class OilRun(NativeOilRun):
+    expected_launcher = native.LAUNCHER
+    max_ticket_distance = 11
+    require_boot = staticmethod(native_boot)
+
+    def __init__(self, *args):
+        super().__init__(*args)
+        self.pids = []
+
+    def open_server(self, label):
+        native.audit_staged(self.runtime)
+        server = native.Server(self.runtime, self.java, self.launcher, label)
+        self.pids.append(server.process.pid)
+        require(len(self.pids) == len(set(self.pids)), "Oil restart reused a process")
+        return server
+
+    def probe(self, operation, label):
+        initial_air = (operation, label) == ("load", "oil-loaded") and self.boots == ["oil-first-fill"] \
+            and not self.construction_sealed and self.pending_construction == construction_commands(self.definition)
+        return validate_snapshot(super().probe(operation, label), self.definition, initial_air=initial_air)
+
+
+def validate_in_world_render(document, root, profile_sha256):
+    """Requires future real-world producer data; the existing worldless probe cannot satisfy it."""
+    require((document["protocol"], document["minecraft"], document["forge"])
+            == ("NATIVE64_IN_WORLD_OIL_ATLAS_V1", native.MINECRAFT, native.FORGE), "Wrong in-world oil protocol")
+    require(document["profileSha256"] == profile_sha256 and document["worldLoaded"] is True
+            and document["dimension"] == "minecraft:overworld" and document["syntheticWorld"] is False,
+            "Oil rendering must use the actual pinned loaded world")
+    level = layout._load(artifact(root, document["stoppedLevel"]))["Data"]
+    require(type(level["DataVersion"]) is layout.nbtlib.Int and int(level["DataVersion"]) == layout.DATA_VERSION
+            and str(level["Version"]["Name"]) == native.MINECRAFT, "In-world oil used a historical or fake stopped level")
+    phases = document["phases"]
+    require(len(phases) == 2 and [row["phase"] for row in phases] == ["initial", "after-resource-reload"],
+            "Actual atlas reload is required")
+    initial = {}
+    for index, phase in enumerate(phases):
+        require(type(phase["atlasGeneration"]) is int and phase["atlasGeneration"] >= 0,
+                "Missing atlas generation")
+        if index:
+            require(phase["reloadCompleted"] is True and phase["atlasGeneration"] > phases[0]["atlasGeneration"],
+                    "Atlas was not actually reloaded")
+        cases = phase["cases"]
+        require(len(cases) == 4 and {(row["oil"], row["flowing"]) for row in cases}
+                == {(oil, flowing) for oil in OILS for flowing in (True, False)}, "Incomplete in-world oil cases")
+        for row in cases:
+            key = row["oil"], row["flowing"]
+            require(type(row["flowing"]) is bool and row["worldBlock"] == "basepower:" + row["oil"]
+                    and row["modelLayer"] == "TRANSLUCENT" and row["missingModel"] is False,
+                    "Wrong actual oil block/model/layer")
+            expected = "basepower:blocks/" + row["oil"] + ("_flow" if row["flowing"] else "_still")
+            require(row["modelSprite"] == row["atlasSprite"] == expected and row["modelLookup"] == "IClientFluidTypeExtensions.getModel",
+                    "World rendering did not select the current native oil model")
+            require(all(type(row[field]) is int and row[field] != 0 for field in ("modelSpriteIdentity", "atlasSpriteIdentity", "modelIdentity"))
+                    and row["modelSpriteIdentity"] == row["atlasSpriteIdentity"],
+                    "Missing real model/sprite identity")
+            require(isinstance(row["pos"], list) and len(row["pos"]) == 3 and all(type(value) is int for value in row["pos"])
+                    and type(row["worldTime"]) is int and row["worldTime"] >= 0, "Missing actual-world position/time")
+            require(type(row["vertices"]) is int and row["vertices"] >= 4, "Blank in-world fluid geometry")
+            pixel_pair(root, row["pixels"])
+            if index:
+                old = initial[key]
+                require(row["modelSpriteIdentity"] != old["modelSpriteIdentity"] and row["modelIdentity"] != old["modelIdentity"],
+                        "Oil model retained a stale pre-reload atlas sprite")
+            else:
+                initial[key] = row
+    controls = document["negativeControls"]
+    require(set(controls) == {"missing-model", "wrong-sprite", "stale-atlas"}, "Missing actual-world oil negative controls")
+    for row in controls.values():
+        pixel_pair(root, row, matches=False)
+    return dict(status="PASS", scope="ACTUAL_WORLD_OIL_AND_ATLAS_RELOAD", cases=8, negativeControls=3)
+
+
+def run(args):
+    require(type(args.seconds) is int and 2 <= args.seconds <= 120, "Bound oil observation intervals")
+    inputs = preflight(args, [Path(__file__), Path(lifecycle.__file__), Path(exercise.__code__.co_filename)])
+    native.require_free_port(args.port)
+    if args.preflight_only:
+        return dict(status="READY_NOT_RUN", qualificationAllowed=False, **inputs.receipt())
+    runtime = output_path(args.output)
+    expected = native.stage(runtime, *inputs.target, args.port)
+    shutil.copy2(Path(__file__), runtime / "native2612-oil-source.py")
+    pins = {"jars": inputs.receipt()["target_jars"]}
+    definition = fixtures(pins)
+    require(len(definition) == 4, "Only the four approved Power oil lanes are pinned")
+    write_json(runtime / "lifecycle-fixture.json", definition)
+    authorize_lifecycle(runtime)
+    report = dict(status="RUNNING", scope="BUCKET_PIPE_TRANSPORT_NOT_WORLD_RENDERING", **inputs.receipt(),
+                  inWorldRendering="NOT_RUN_SEPARATE_CLIENT_WITNESS_REQUIRED")
+    runner = OilRun(runtime, inputs.java, native.LAUNCHER, definition, pins, inputs.seed_before)
+
+    def progress(value):
+        report.update(value)
+        write_json(runtime / RESULT, report)
+
+    try:
+        exercise(runner, args.seconds, progress)
+        require(len(runner.pids) == 3, "Need three distinct native oil processes")
+        report.update(status="PASS", processIds=runner.pids)
+    except BaseException as failure:
+        report.update(status="FAIL", error=repr(failure))
+        raise
+    finally:
+        try:
+            runner.close()
+            native.verify_runtime(runtime, inputs.target[1], expected)
+            report["sourceUnchanged"] = inputs.unchanged()
+        except BaseException as failure:
+            report.update(status="FAIL", custodyError=repr(failure))
+            raise
+        finally:
+            write_json(runtime / RESULT, report)
+    return report
+
+
+def main():
+    parser = arguments(__doc__)
+    parser.add_argument("--seconds", type=int, default=8)
+    print(run(parser.parse_args())["status"], flush=True)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/test-rig/migration/native2612_operations.py b/test-rig/migration/native2612_operations.py
new file mode 100644
index 00000000..ff181645
--- /dev/null
+++ b/test-rig/migration/native2612_operations.py
@@ -0,0 +1,192 @@
+"""Run the unchanged 132 finite-job oracles against explicit Forge64 storage."""
+
+import argparse
+from pathlib import Path
+import traceback
+from zipfile import ZipFile
+
+import nbtlib
+
+from matrix import WORLD, digest, fingerprint, write_json
+from native117 import output_path, require_disjoint
+from native117_entity_storage import _decompress, _nbt
+from native117_machine_operations import validate_operation as frozen_validate_operation
+import native117_machine_saved as saved
+import native12111_operations as previous
+import native2612 as native
+from native2612_layout import DATA_VERSION, region_file
+from transformer_order import read_region
+
+
+def validate_operation(catalog, document, group):
+    result = frozen_validate_operation(catalog, document, group)
+    if group == "all" and result["cases"] != 132:
+        raise AssertionError("Native2612 full operations requires all 132 finite jobs")
+    return result
+
+
+def modern_chunk(payload):
+    if len(payload) < 6 or int.from_bytes(payload[:4], "big") != len(payload) - 4:
+        raise ValueError("Invalid native terrain payload length")
+    root = _nbt(_decompress(payload[5:], payload[4]))
+    if type(root.get("DataVersion")) is not nbtlib.Int or int(root["DataVersion"]) != DATA_VERSION or "Level" in root:
+        raise ValueError("Machine save must be native 26.1.2 terrain")
+    if (type(root.get("xPos")) is not nbtlib.Int or type(root.get("zPos")) is not nbtlib.Int
+            or not isinstance(root.get("sections"), nbtlib.List)
+            or not isinstance(root.get("block_entities"), nbtlib.List)):
+        raise ValueError("Missing typed native chunk fields")
+    sections = []
+    for section in root["sections"]:
+        view = nbtlib.Compound({"Y": section["Y"]})
+        if "block_states" in section:
+            states = section["block_states"]
+            view["Palette"] = states["palette"]
+            if "data" in states:
+                view["BlockStates"] = states["data"]
+        sections.append(view)
+    return nbtlib.Compound({"xPos": root["xPos"], "zPos": root["zPos"],
+                           "Sections": nbtlib.List[nbtlib.Compound](sections), "TileEntities": root["block_entities"]})
+
+
+def audit_saved(runtime, fixture, evidence):
+    """Same typed state/NBT comparator, new explicit dimension storage; retain raw payloads."""
+    runtime, evidence = Path(runtime).resolve(), Path(evidence).resolve()
+    world = runtime / WORLD
+    require_disjoint(evidence, world)
+    evidence.mkdir(parents=True, exist_ok=False)
+    report = dict(status="FAIL", cases=len(fixture["cases"]), files={}, failures=[],
+                  scope="Stopped Forge64 terrain state and complete typed machine NBT; no source writes")
+    write_json(evidence / "snapshot.json", fixture)
+    regions, chunks = {}, {}
+    try:
+        for case in fixture["cases"]:
+            dimension = case.get("dimension", "minecraft:overworld")
+            grouped = {}
+            for row in case["positions"]:
+                grouped.setdefault((row["x"] // 16, row["z"] // 16), []).append(row)
+            for (cx, cz), rows in grouped.items():
+                path = region_file(world, dimension, cx, cz)
+                if path not in regions:
+                    report["files"][str(path)] = digest(path)
+                    regions[path] = read_region(path)[1]
+                key = dimension, cx, cz
+                if key not in chunks:
+                    payload = regions[path][(cx & 31) + (cz & 31) * 32]
+                    with (evidence / f"chunk-{len(chunks):05}.bin").open("xb") as output:
+                        output.write(payload)
+                    chunks[key] = modern_chunk(payload)
+                    if (int(chunks[key]["xPos"]), int(chunks[key]["zPos"])) != (cx, cz):
+                        raise AssertionError("Saved chunk coordinate differs from its region slot")
+                differences = saved.compare_chunk(rows, chunks[key])
+                if differences:
+                    report["failures"].append(dict(id=case["id"], dimension=dimension, differences=differences))
+        if any(digest(Path(path)) != sha for path, sha in report["files"].items()):
+            raise AssertionError("Terrain changed during stopped audit")
+        report["status"] = "FAIL" if report["failures"] else "PASS"
+    except BaseException as failure:
+        report["error"] = repr(failure)
+        raise
+    finally:
+        write_json(evidence / "receipt.json", report)
+    return report
+
+
+def native_load_sources():
+    sources = native.RIG / f".gradle/mavenizer/repo/net/minecraftforge/forge/{native.FORGE_VERSION}/forge-{native.FORGE_VERSION}-sources.jar"
+    expected = {"net/minecraft/world/entity/Entity.java":
+                "C2DDDA9E977317EE507B8DD340F5AEFEE4426C705718B81DA7E6C4F693C39A52",
+                "net/minecraft/world/entity/LivingEntity.java":
+                "16AA50EC0C5F1666B6476AE95A870308DFCA68F7C8A0AA26036B5700A917AD89"}
+    # Both load methods are source-bound before reusing the existing exact expected-only
+    # clamp/rebase rules. Observed full NBT and the frozen equality oracle are unchanged.
+    import hashlib
+    with ZipFile(sources) as jar:
+        for path, sha in expected.items():
+            if hashlib.sha256(jar.read(path)).hexdigest().upper() != sha:
+                raise AssertionError("Review selected native actor load source: " + path)
+    return expected
+
+
+def validate_restart(fixture, inspected):
+    source_hashes = native_load_sources()
+    result = previous.validate_restart(fixture, inspected)
+    result["comparison"] = result["comparison"].replace("1.21.11 explosive", "26.1.2 source-verified explosive")
+    result["nativeLoadSourceSha256"] = source_hashes
+    return result
+
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__)
+    for name in ("profile", "seed", "inventory", "java", "output"):
+        parser.add_argument("--" + name, required=True, type=lambda value: Path(value).resolve())
+    parser.add_argument("--inventory-sha256", required=True)
+    parser.add_argument("--port", required=True, type=int)
+    parser.add_argument("--group", choices=("all", "pickup", "power", "steam", "electric"), default="all")
+    args = parser.parse_args()
+    target = native.read_family_target(args.profile, args.seed, args.inventory, args.inventory_sha256)
+    java, version = native.java25(args.java)
+    runtime = output_path(args.output)
+    for path in (args.profile, args.seed, args.inventory, java, *(entry[1] for entry in target[2].values())):
+        require_disjoint(runtime, path)
+    seed_before = fingerprint(args.seed)
+    expected = native.stage(runtime, *target, args.port)
+    for marker in ("advantage-machine-operation.allow", "migration-operate.allow"):
+        (runtime / marker).touch()
+    report = dict(status="RUNNING", minecraft=native.MINECRAFT, forge=native.FORGE, group=args.group,
+                  profileSha256=digest(args.profile), inventorySha256=digest(args.inventory), jars=expected,
+                  javaSha256=digest(java), javaVersion=version, phases={})
+    receipt = runtime / "native2612-machine-operation-results.json"
+    write_json(receipt, report)
+    server = None
+    try:
+        server = native.Server(runtime, java, native.LAUNCHER, "operate")
+        for command in ("gamerule doMobSpawning false", "gamerule randomTickSpeed 0",
+                        "gamerule doWeatherCycle false", "weather clear"):
+            server.send(command)
+        server.send("advmachines run " + args.group + " measured")
+        server.wait("ADVMACHINES COMPLETE measured", 1500)
+        catalog = native.read_json(runtime / "advantage-works-results/machine-catalog-measured.json")
+        document = native.read_json(runtime / "advantage-works-results/machine-operation-measured.json")
+        report["phases"]["operation"] = validate_operation(catalog, document, args.group)
+        server.send("save-all flush")
+        server.wait("Saved the game", 30)
+        server.close()
+        server = None
+        fixture = native.read_json(runtime / "machine-operation-fixture.json")
+        fixture_sha = report["fixtureSha256"] = digest(runtime / "machine-operation-fixture.json")
+        report["phases"]["saved-before-restart"] = audit_saved(runtime, fixture, runtime / "raw-before-restart")
+        write_json(receipt, report)
+        server = native.Server(runtime, java, native.LAUNCHER, "restart")
+        server.send("advmachines inspect restarted")
+        server.wait("ADVMACHINES INSPECTED restarted", 360)
+        observed = native.read_json(runtime / "advantage-works-results/machine-inspection-restarted.json")
+        report["phases"]["restart"] = validate_restart(fixture, observed)
+        server.send("save-all flush")
+        server.wait("Saved the game", 30)
+        server.close()
+        server = None
+        report["phases"]["saved-after-restart"] = audit_saved(runtime, observed, runtime / "raw-after-restart")
+        if digest(runtime / "machine-operation-fixture.json") != fixture_sha:
+            raise AssertionError("Operating fixture changed across restart")
+        report["status"] = "PASS" if all(value["status"] == "PASS" for value in report["phases"].values()) else "FAIL"
+    except BaseException as failure:
+        report.update(status="FAIL", failure=repr(failure), traceback=traceback.format_exc())
+        raise
+    finally:
+        try:
+            if server is not None:
+                server.close()
+            native.verify_runtime(runtime, target[1], expected)
+            report["seedUnchanged"] = fingerprint(args.seed) == seed_before
+            if not report["seedUnchanged"]:
+                raise AssertionError("Protected server seed changed")
+        except BaseException as failure:
+            report.update(status="FAIL", custodyError=repr(failure))
+            raise
+        finally:
+            write_json(receipt, report)
+    return int(report["status"] != "PASS")
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/test-rig/migration/native2612_platform_diagnostics.py b/test-rig/migration/native2612_platform_diagnostics.py
new file mode 100644
index 00000000..fe90cc33
--- /dev/null
+++ b/test-rig/migration/native2612_platform_diagnostics.py
@@ -0,0 +1,86 @@
+"""Exact source-bound Netty Java25 capability sequence, never an exception wildcard."""
+
+import hashlib
+import re
+from zipfile import ZipFile
+
+
+COMMON_JAR_SHA = "2345BC0ED5843FA57AA49EBA67529485C3A1D420FCF0429324C8220C7A80E9A6"
+SOURCES_JAR_SHA = "0B5D0B0498D009DDCFAF2B48A84F23F9380F82DAFD8B0061406BAF895349080C"
+SOURCE_SHA = {
+    "io/netty/util/internal/PlatformDependent.java": "69E9D992C55F08AAC62CD80C398C0E665D5600BA3FD0F7BC54FE512AC4DD8C4B",
+    "io/netty/util/internal/CleanerJava9.java": "4B15FA528C78E0020E107A6034B64F8A4C243690F9BAF1A60EF7370909D6E2AF",
+    "io/netty/util/internal/CleanerJava24Linker.java": "29E2B3DD59468D41EA702AEE787110D691F8D46A93534F13FEBF809770AC6FAE",
+    "io/netty/util/internal/CleanerJava25.java": "D02B9CA4BC2981AC9A34E246AB6B93CA0D63766BBDE742D7A0D9F7C7B359F202",
+}
+HEADER = re.compile(r"^\[[^\]]+\] \[([^\]]+)/([A-Z]+)\] \[([^\]]+)/\]: (.*)$")
+LOGGERS = tuple("io.netty.util.internal." + name for name in ("CleanerJava9", "CleanerJava24Linker", "CleanerJava25"))
+COMMON_TAIL = (
+    "\tat SECURE-BOOTSTRAP/io.netty.common@4.2.7.Final/io.netty.util.internal.ClassInitializerUtil.tryLoadClasses(ClassInitializerUtil.java:32)",
+    "\tat SECURE-BOOTSTRAP/io.netty.transport.classes.kqueue@4.2.7.Final/io.netty.channel.kqueue.Native.<clinit>(Native.java:65)",
+    "\tat SECURE-BOOTSTRAP/io.netty.transport.classes.kqueue@4.2.7.Final/io.netty.channel.kqueue.KQueue.<clinit>(KQueue.java:38)",
+    "\tat TRANSFORMER/minecraft@26.1.2/net.minecraft.server.network.EventLoopGroupHolder.remote(EventLoopGroupHolder.java:59)",
+    "\tat TRANSFORMER/minecraft@26.1.2/net.minecraft.server.network.ServerConnectionListener.startTcpServerListener(ServerConnectionListener.java:57)",
+    "\tat TRANSFORMER/minecraft@26.1.2/net.minecraft.server.dedicated.DedicatedServer.initServer(DedicatedServer.java:261)",
+    "\tat TRANSFORMER/minecraft@26.1.2/net.minecraft.server.MinecraftServer.runServer(MinecraftServer.java:738)",
+    "\tat TRANSFORMER/minecraft@26.1.2/net.minecraft.server.MinecraftServer.lambda$spin$0(MinecraftServer.java:300)",
+    "\tat java.base/java.lang.Thread.run(Thread.java:1474)",
+)
+EXPECTED = (
+    ("java.lang.UnsupportedOperationException: sun.misc.Unsafe unavailable",
+     "\tat SECURE-BOOTSTRAP/io.netty.common@4.2.7.Final/io.netty.util.internal.CleanerJava9.<clinit>(CleanerJava9.java:70)",
+     "\tat SECURE-BOOTSTRAP/io.netty.common@4.2.7.Final/io.netty.util.internal.PlatformDependent.<clinit>(PlatformDependent.java:198)", *COMMON_TAIL),
+    ("java.lang.UnsupportedOperationException: Native access (restricted methods) is not enabled for the io.netty.common module.",
+     "\tat SECURE-BOOTSTRAP/io.netty.common@4.2.7.Final/io.netty.util.internal.CleanerJava24Linker.<clinit>(CleanerJava24Linker.java:78)",
+     "\tat SECURE-BOOTSTRAP/io.netty.common@4.2.7.Final/io.netty.util.internal.PlatformDependent.<clinit>(PlatformDependent.java:200)", *COMMON_TAIL),
+    (),
+)
+
+
+def verify_sources(path):
+    if hashlib.sha256(path.read_bytes()).hexdigest().upper() != SOURCES_JAR_SHA:
+        raise AssertionError("Selected native Netty primary-source archive changed")
+    with ZipFile(path) as jar:
+        for name, expected in SOURCE_SHA.items():
+            if hashlib.sha256(jar.read(name)).hexdigest().upper() != expected:
+                raise AssertionError("Selected native cleaner source changed: " + name)
+    return SOURCE_SHA.copy()
+
+
+def classify(text, fallback):
+    blocks = []
+    for line in text.splitlines():
+        if HEADER.fullmatch(line) or not blocks:
+            blocks.append([line])
+        else:
+            blocks[-1].append(line)
+    selected = [(index, HEADER.fullmatch(block[0])) for index, block in enumerate(blocks)
+                if HEADER.fullmatch(block[0]) and HEADER.fullmatch(block[0])[3] in LOGGERS]
+    if not selected:
+        return fallback(text)
+    valid = len(selected) == 3
+    if valid:
+        positions = [item[0] for item in selected]
+        valid = positions == list(range(positions[0], positions[0] + 3))
+        for slot, (index, header) in enumerate(selected):
+            body = tuple(line for line in blocks[index][1:] if line.strip())
+            valid = valid and (header[1], header[2], header[3], header[4], body) == (
+                "Server thread", "DEBUG", LOGGERS[slot],
+                "java.nio.ByteBuffer.cleaner(): " + ("available" if slot == 2 else "unavailable"), EXPECTED[slot])
+    if not valid:
+        failures, diagnostics = fallback(text)
+        failures.append("Unproven native64 Java25 cleaner sequence: exact two DEBUG probes and subsequent native25 availability required")
+        return failures, diagnostics
+    accepted = {index for index, _ in selected[:2]}
+    failures, diagnostics = [], []
+    for index, block in enumerate(blocks):
+        if index in accepted:
+            diagnostics.append(dict(classification="SOURCE_PROVEN_NATIVE_NETTY_JAVA25_CLEANER_FALLBACK",
+                                    nativeDependencySha256=COMMON_JAR_SHA, primarySourcesSha256=SOURCES_JAR_SHA,
+                                    logger=HEADER.fullmatch(block[0])[3], level="DEBUG", rawBlock=block,
+                                    requiredSubsequentFallback="io.netty.util.internal.CleanerJava25 available"))
+        else:
+            errors, other = fallback("\n".join(block))
+            failures.extend(errors)
+            diagnostics.extend(other)
+    return failures, diagnostics
diff --git a/test-rig/migration/native2612_resources.py b/test-rig/migration/native2612_resources.py
new file mode 100644
index 00000000..eeff35a9
--- /dev/null
+++ b/test-rig/migration/native2612_resources.py
@@ -0,0 +1,259 @@
+"""Native64 recipe/resource adapters; historical engines and assertions stay unchanged.
+
+Unit/preflight success is not packaged-game or graphical qualification.
+"""
+
+import argparse
+from dataclasses import dataclass
+from pathlib import Path
+import re
+import shutil
+import types
+
+import nbtlib
+
+from matrix import WORLD, digest, fingerprint, write_json
+from native117 import output_path, require_disjoint
+import native117_recipes as recipes
+import native2612 as native
+import native2612_layout as layout
+
+
+FAMILY = frozenset(native.VERSIONS)
+MODES = ("NORMAL", "TECH_PROGRESSION", "APOCALYPTIC")
+PACK_METADATA = {"min_format": [101, 1], "max_format": [101, 1],
+                 "description": "Disposable loot-override witness"}
+RESULT = "native2612-resources-results.json"
+
+
+def require(condition, message):
+    if not condition:
+        raise AssertionError(message)
+
+
+def bind(function, **bindings):
+    """Copy an existing assertion/campaign with explicit globals, never monkey-patch it."""
+    result = types.FunctionType(function.__code__, dict(function.__globals__, **bindings),
+                                function.__name__, function.__defaults__, function.__closure__)
+    result.__kwdefaults__ = function.__kwdefaults__
+    return result
+
+
+def artifact(root, record):
+    root = Path(root).resolve(strict=True)
+    relative = Path(record["file"])
+    require(not relative.is_absolute() and ".." not in relative.parts, "Unsafe retained artifact path")
+    path = root / relative
+    for part in (path, *path.parents):
+        require(not part.is_symlink() and not getattr(part, "is_junction", lambda: False)(), "Aliased retained artifact")
+    path = path.resolve(strict=True)
+    require(path.is_relative_to(root) and path.is_file() and path.stat().st_nlink == 1,
+            "Retained artifact must be an independent in-root file")
+    native.validate_hash(path, record["sha256"])
+    require(path.stat().st_size > 0, "Empty retained artifact")
+    return path
+
+
+def pixel_pair(root, record, *, matches=True):
+    width, height = record["width"], record["height"]
+    require(type(width) is int and type(height) is int and 1 <= width <= 4096 and 1 <= height <= 4096,
+            "Invalid raw pixel dimensions")
+    actual, reference = artifact(root, record["actualRgba"]), artifact(root, record["referenceRgba"])
+    require(actual != reference, "Pixel reference must be independently retained")
+    left, right = actual.read_bytes(), reference.read_bytes()
+    require(len(left) == len(right) == width * height * 4, "Truncated RGBA extraction")
+    require(any(left[3::4]) and len(set(left)) > 1, "Blank rendered pixels")
+    different = sum(left[index:index + 4] != right[index:index + 4] for index in range(0, len(left), 4))
+    require((different == 0) is matches, "Independent rendered pixel comparison failed")
+    return different
+
+
+@dataclass
+class Inputs:
+    target: tuple
+    java: Path
+    java_version: str
+    hashes: dict
+    seed_before: dict
+
+    @property
+    def mods(self):
+        return self.target[2]
+
+    def unchanged(self):
+        require(fingerprint(self.target[0]) == self.seed_before, "Protected SDK seed changed")
+        for path, expected in self.hashes.items():
+            native.validate_hash(Path(path), expected)
+        return True
+
+    def receipt(self):
+        return dict(minecraft=native.MINECRAFT, forge=native.FORGE, mcp=native.MCP,
+                    javaVersion=self.java_version, inputs=dict(self.hashes),
+                    target_jars=[dict(id=key, version=version, path=str(path), sha256=sha)
+                                 for key, (version, path, sha) in sorted(self.mods.items())])
+
+
+def preflight(args, helpers=()):
+    require((native.MINECRAFT, native.FORGE, native.MCP, native.JAVA_VERSION)
+            == ("26.1.2", "64.1.5", "20260409.101008", "25.0.3+9"), "Wrong core SDK contract")
+    native.validate_hash(args.profile, args.profile_sha256)
+    target = native.read_family_target(args.profile, args.seed, args.inventory, args.inventory_sha256)
+    require(set(target[2]) == FAMILY, "Require the exact six-jar native64 family")
+    java, version = native.java25(args.java)
+    root = output_path(args.output)
+    sources = [args.profile, args.inventory, java, Path(__file__), Path(native.__file__), Path(layout.__file__),
+               *helpers, *(value[1] for value in target[2].values())]
+    for path in [target[0], *sources]:
+        require_disjoint(root, Path(path).resolve(strict=True))
+    return Inputs(target, java, version, {str(Path(path).resolve()): digest(Path(path)) for path in sources},
+                  fingerprint(target[0]))
+
+
+def verify_saved_level(runtime, entry, minecraft="26.1.2", forge="64.1.5"):
+    require((minecraft, forge) == (native.MINECRAFT, native.FORGE), "Historical saved-level reader requested")
+    world = Path(runtime) / WORLD
+    data = layout.read_level(world)
+    require(str(data["Version"]["Name"]) == native.MINECRAFT, "Wrong stopped native level version")
+    root = layout._load(world / "level.dat")
+    fml = root["fml"]
+    versions = {}
+    for row in fml["LoadingModList"]:
+        key, value = str(row["ModId"]), str(row["ModVersion"])
+        require(key not in versions, "Duplicate stopped mod identity")
+        versions[key] = value
+    expected = {row["id"]: row["version"] for row in entry["jars"]}
+    require(len(expected) == len(entry["jars"]) and set(expected) == FAMILY,
+            "Stopped recipe proof needs all six exact jars")
+    expected.update(minecraft=native.MINECRAFT, forge=native.FORGE)
+    require(versions == expected, "Stopped native mod identities differ from frozen family")
+    registries = fml["Registries"]
+    for key in ("minecraft:item", "minecraft:block"):
+        require(isinstance(registries[key]["ids"], nbtlib.List) and len(registries[key]["ids"]) > 0,
+                "Missing native stopped registry: " + key)
+    return dict(path=str(world / "level.dat"), sha256=digest(world / "level.dat"),
+                mods=versions, dataVersion=layout.DATA_VERSION)
+
+
+class RecipeServer(recipes.RecipePruning, native.Server):
+    errors = staticmethod(lambda text: native.log_findings(text)[0])
+
+    @staticmethod
+    def unexpected_line(line):
+        loading_failure = re.search(r"\[[^\]]+/(?:ERROR|FATAL)\]", line) and any(marker in line for marker in (
+            "Caught exception during event", "Failed to complete lifecycle event", "Failed to start the minecraft server"))
+        return bool(loading_failure) or native.Server.unexpected_line(line)
+
+
+class Engine:
+    version = (native.MINECRAFT, native.FORGE)
+    pack_metadata = PACK_METADATA
+    require_clean_log = staticmethod(native.require_clean_log)
+    loot_directory = "loot_table"
+    server = native.Server
+    recipe_server = RecipeServer
+    result_name = RESULT
+
+    @staticmethod
+    def stage(runtime, target, port, campaign):
+        require(campaign in ("unlock", "progression"), "Unknown native recipe campaign")
+        native.stage(runtime, *target, port)
+        (runtime / ("advantage-recipes.allow" if campaign == "unlock" else "advantage-progression.allow")).touch()
+        if campaign == "progression":
+            for marker in ("advantage-works.allow", "migration-operate.allow"):
+                (runtime / marker).touch()
+        return native.LAUNCHER
+
+
+unlock_campaign = bind(recipes.unlock_campaign, verify_level=verify_saved_level)
+progression_campaign = bind(recipes.progression_campaign, verify_level=verify_saved_level)
+
+
+def verify_packet_exports(runtime):
+    rows = []
+    for mode in ("normal", "tech", "apocalyptic"):
+        packet = runtime / f"recipes-{mode}-sweep.bin"
+        manifest_file = packet.with_suffix(".json")
+        manifest = native.read_json(manifest_file)
+        require(manifest["bookPacketType"] == "ClientboundRecipeBookAddPacket"
+                and manifest["tagsPacketType"] == "ClientboundUpdateTagsPacket"
+                and type(manifest["itemTagCount"]) is int and manifest["itemTagCount"] > 0,
+                "Missing native recipe display/item-tag packet protocol")
+        name = manifest["tagsPacketFile"]
+        require(isinstance(name, str) and Path(name).name == name and name.startswith("tags-")
+                and name.endswith(".bin"), "Unsafe native tag packet path")
+        tags = runtime / name
+        native.validate_hash(tags, manifest["tagsPacketSha256"])
+        require(packet.stat().st_size > 0 and tags.stat().st_size > 0, "Empty native recipe/tag packet")
+        rows.append(dict(mode=mode, packet=str(packet), sha256=digest(packet),
+                         manifestSha256=digest(manifest_file), tags=str(tags), tagsSha256=digest(tags)))
+    return rows
+
+
+def run(args):
+    require(args.campaign in ("all", "unlock", "progression"), "Unknown native recipe campaign")
+    inputs = preflight(args, [Path(recipes.__file__)])
+    native.require_free_port(args.port)
+    root = output_path(args.output)
+    if args.preflight_only:
+        return dict(status="READY_NOT_RUN", qualificationAllowed=False, **inputs.receipt())
+    definition, sources = recipes.recipe_fixture([value[1] for value in inputs.mods.values()],
+                                                 component_predicates=True, singular_directories=True)
+    root.mkdir(parents=True, exist_ok=False)
+    shutil.copy2(Path(__file__), root / "native2612-resources-source.py")
+    report = dict(status="RUNNING", scope="PACKAGED_RECIPE_SERVER_NOT_GRAPHICAL_ACCEPTANCE",
+                  profileSha256=digest(args.profile), inventorySha256=digest(args.inventory),
+                  **inputs.receipt(), recipe_inventory=recipes.MOD_COUNTS, unlock_boots=[], progression_cases=[])
+    entry = {"jars": report["target_jars"]}
+    expected = {path.name: sha for _, path, sha in inputs.mods.values()}
+    write_json(root / "packaged-recipe-sources.json", sources)
+    try:
+        if args.campaign in ("all", "unlock"):
+            unlock_campaign(root, inputs.target, entry, inputs.java, args.port, definition, report, engine=Engine)
+            require(len(report["unlock_boots"]) == 5 and all(row["status"] == "PASS" for row in report["unlock_boots"]),
+                    "Incomplete native64 unlock boots")
+            report["packet_exports"] = verify_packet_exports(root / "unlock")
+        if args.campaign in ("all", "progression"):
+            progression_campaign(root, inputs.target, entry, inputs.java, args.port, report, engine=Engine)
+            required = {(mode, rubber, phase) for mode in MODES for rubber in (True, False)
+                        for phase in ("initial", "reload", "restart")}
+            actual = {(row["mode"], row["rubber"], row["phase"]) for row in report["progression_cases"]}
+            require(len(report["progression_cases"]) == 18 and actual == required
+                    and all(row["status"] == "PASS" for row in report["progression_cases"]),
+                    "Incomplete native64 three-mode progression matrix")
+        report["status"] = "PASS"
+    except BaseException as failure:
+        report.update(status="FAIL", error=repr(failure))
+        raise
+    finally:
+        try:
+            for campaign in ("unlock", "progression"):
+                if (root / campaign).exists():
+                    native.verify_runtime(root / campaign, inputs.target[1], expected)
+            report["sourceUnchanged"] = inputs.unchanged()
+        except BaseException as failure:
+            report.update(status="FAIL", custodyError=repr(failure))
+            raise
+        finally:
+            write_json(root / RESULT, report)
+    return report
+
+
+def arguments(description=__doc__):
+    parser = argparse.ArgumentParser(description=description)
+    for key in ("profile", "seed", "inventory", "java", "output"):
+        parser.add_argument("--" + key, type=Path, required=True)
+    for key in ("profile-sha256", "inventory-sha256"):
+        parser.add_argument("--" + key, required=True)
+    parser.add_argument("--port", type=int, required=True)
+    parser.add_argument("--preflight-only", action="store_true")
+    return parser
+
+
+def main():
+    parser = arguments()
+    parser.add_argument("--campaign", choices=("all", "unlock", "progression"), default="all")
+    print(run(parser.parse_args())["status"], flush=True)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/test-rig/migration/native2612_retained_worldgen.py b/test-rig/migration/native2612_retained_worldgen.py
new file mode 100644
index 00000000..5dea8816
--- /dev/null
+++ b/test-rig/migration/native2612_retained_worldgen.py
@@ -0,0 +1,279 @@
+"""Preserve sealed retained rules, then sample genuinely new native64 normal chunks.
+
+This module is deliberately outside the sealed actor/core/endurance import graph.
+Positive fallback block counts never override a failed saved-rule contract.
+"""
+
+import copy
+from pathlib import Path
+import re
+import shutil
+
+from matrix import digest, fingerprint, write_json
+from native117 import output_path, require_disjoint
+import native2612 as native
+import native2612_layout as layout
+import native2612_worldgen as worldgen
+from native2612_resources import arguments, preflight, require
+
+
+MOD_ALIASES = {"electricadvantage": "baseelectric", "poweradvantage": "basepower", "steamadvantage": "basesteam"}
+SECTIONS = ("ores", "fluid_deposits")
+CONTROLS = ("manage_vanilla_ores", "suppress_all_ore_features", "place_fluid_deposits")
+RESULT = "native2612-retained-worldgen-results.json"
+
+
+def output_id(value):
+    if value == "minecraft:quartz_ore":
+        return "minecraft:nether_quartz_ore"
+    if isinstance(value, str) and ":" in value:
+        namespace, suffix = value.split(":", 1)
+        return MOD_ALIASES.get(namespace, namespace) + ":" + suffix
+    return value
+
+
+def expected_rule(value):
+    result = copy.deepcopy(value)
+    for key in ("block", "deep_output"):
+        if key in result:
+            result[key] = output_id(result[key])
+    for row in result.get("outputs", []):
+        if isinstance(row, dict) and "block" in row:
+            row["block"] = output_id(row["block"])
+    return result
+
+
+def differences(expected, actual, path=""):
+    if isinstance(expected, dict):
+        if not isinstance(actual, dict):
+            return [dict(path=path, expected=expected, actual=actual)]
+        result = []
+        for key, value in expected.items():
+            if key not in actual:
+                result.append(dict(path=path + "/" + key, expected=value, missing=True))
+            else:
+                result.extend(differences(value, actual[key], path + "/" + key))
+        return result
+    if type(expected) is not type(actual) or expected != actual:
+        return [dict(path=path, expected=expected, actual=actual)]
+    return []
+
+
+def active(rule):
+    return rule.get("enabled", True) and any(row.get("enabled", True) and row.get("frequency", 1) > 0 for section in
+        ("dimensions", "dimension_selectors") for row in rule.get(section, {}).values())
+
+
+def audit_transition(source, destination, registry):
+    issues = []
+    for key in (*CONTROLS, "history", "migration_history", "user_notes"):
+        if key in source:
+            issues.extend(dict(kind="SOURCE_AUTHORITY", **row) for row in
+                          differences({key: source[key]}, destination))
+    for section in SECTIONS:
+        original, actual = source.get(section, {}), destination.get(section, {})
+        expected_outputs = set()
+        for key, original_rule in original.items():
+            if not isinstance(original_rule, dict):
+                continue
+            expected = expected_rule(original_rule)
+            expected_output = expected.get("block", output_id(key))
+            if expected_output.startswith(("baseelectric:", "basepower:")):
+                expected_outputs.add(expected_output)
+            if key not in actual:
+                issues.append(dict(kind="MISSING_OR_RENAMED_RULE", section=section, rule=key))
+                continue
+            row = actual[key]
+            issues.extend(dict(kind="RULE_PAYLOAD_CHANGED", section=section, rule=key, **delta)
+                          for delta in differences(expected, row))
+            actual_output = row.get("block", key)
+            if actual_output not in registry:
+                issues.append(dict(kind="UNKNOWN_OUTPUT", section=section, rule=key, output=actual_output))
+        for key, row in actual.items():
+            if key not in original and isinstance(row, dict) and active(row) and row.get("block", key) in expected_outputs:
+                issues.append(dict(kind="NEW_ACTIVE_DEFAULT", section=section, rule=key, output=row.get("block", key)))
+    return dict(status="FAIL" if issues else "PASS", issues=issues,
+                ruleKeyPolicy="EXACT_SOURCE_KEYS_NO_SILENT_RENAME", positiveBlockCountsCannotWaiveFailure=True)
+
+
+def os1_profile(document, current, legacy):
+    """Independent projection of the frozen OS1 data contract, not target observations."""
+    require(isinstance(document.get("dimensions"), list), "Expected sealed OS1 dimensions")
+    result = dict(ores={}, fluid_deposits={})
+    ordinal = 0
+    clamp = lambda value, low, high: max(low, min(high, value))
+    for dimension in document["dimensions"]:
+        for ore in dimension.get("ores", []):
+            block = ore["blockID"]
+            require(block.startswith(legacy + ":") or block.startswith(current + ":"), "Unexpected OS1 provider owner")
+            block = current + block[block.index(":"):]
+            size, variation = int(ore.get("size", 8)), max(0, int(ore.get("variation", 0)))
+            minimum = clamp(int(ore.get("minHeight", 0)), 0, 255)
+            maximum = clamp(int(ore.get("maxHeight", 256)), 0, 256) - 1
+            require(maximum >= minimum, "Invalid source OS1 bounds")
+            placement = dict(enabled=True, min_y=minimum, max_y=maximum,
+                frequency=max(0.0, float(ore.get("frequency", 0.5))), pattern="default", height_distribution="uniform",
+                spread=8, vertical_spread=clamp(variation, 1, 64), node_size=clamp(size, 1, 32),
+                host_blocks=["minecraft:stone"], host_tags=["forge:stone"],
+                host_families=["sedimentary", "metamorphic", "igneous_intrusive", "igneous_volcanic"],
+                biome_ids=[value for value in ore.get("biomes", []) if ":" in value], excluded_biome_ids=[],
+                biome_dictionary=[value.upper() for value in ore.get("biomes", []) if re.fullmatch(r"[A-Za-z_]+", value)],
+                excluded_biome_dictionary=[], geomes={})
+            if variation:
+                placement.update(min_quantity=clamp(size - variation, 1, 64), max_quantity=clamp(size + variation - 1, 1, 64))
+            else:
+                placement["quantity"] = clamp(size, 1, 64)
+            rule = dict(block=block, enabled=True, native_generation=False, suppress_vanilla=False, retrogen=False)
+            dimension_id = dimension["dimension"]
+            if dimension_id == "+":
+                rule["dimension_selectors"] = {"orespawn:all_except_nether_end": placement}
+            else:
+                name = {0: "minecraft:overworld", -1: "minecraft:the_nether", 1: "minecraft:the_end"}.get(dimension_id)
+                require(name is not None, "Unreviewed OS1 dimension")
+                rule["dimensions"] = {name: placement}
+            safe = re.sub(r"[^a-z0-9_]+", "_", block.lower()).strip("_")
+            result["ores"][current + ":legacy/" + safe + "_" + str(ordinal)] = rule
+            ordinal += 1
+    require(ordinal > 0, "Empty OS1 source oracle")
+    return result
+
+
+def require_new_world(world):
+    world = Path(world)
+    require(not any(world.rglob("*.mca")) and not (world / "level.dat").exists(),
+            "New-chunk proof cannot contain preexisting save or region data")
+
+
+def source_expectation(source):
+    source = Path(source)
+    for relative in ("AdvantageWorksMigration/serverconfig/orespawn-worldgen.json", "config/orespawn-worldgen.json"):
+        path = source / relative
+        if path.is_file():
+            return native.read_json(path), dict(kind="RETAINED_PROFILE", path=str(path), sha256=digest(path))
+    result, files = dict(ores={}, fluid_deposits={}), []
+    for current, legacy in (("baseelectric", "electricadvantage"), ("basepower", "poweradvantage")):
+        path = source / "config/orespawn" / (legacy + ".json")
+        expected = os1_profile(native.read_json(path), current, legacy)
+        result["ores"].update(expected["ores"])
+        files.append(dict(path=str(path), sha256=digest(path)))
+    return result, dict(kind="RAW_OS1_SOURCE_NO_TARGET_DERIVED_ORACLE", files=files)
+
+
+def registered_blocks(world):
+    layout.read_level(world)
+    root = layout._load(Path(world) / "level.dat")
+    rows = root["fml"]["Registries"]["minecraft:block"]["ids"]
+    values = {str(row["K"]) for row in rows}
+    require(len(values) == len(rows) and values, "Incomplete or duplicate actual native block registry")
+    return values
+
+
+def run(args):
+    native.validate_hash(args.source_seal, args.source_seal_sha256)
+    seal = native.read_json(args.source_seal)
+    matches = [row for row in seal["routes"] if row["name"] == args.route]
+    require(len(matches) == 1, "Expected an exact approved source route")
+    route = matches[0]
+    source = Path(route["source"]).resolve(strict=True)
+    require(fingerprint(source) == route["sourceFingerprint"], "Sealed source fixture changed")
+    expected_profile, oracle = source_expectation(source)
+    helpers = [Path(__file__), args.source_seal, Path(worldgen.__file__),
+               *(path for path in (source / "config").rglob("*") if path.is_file())]
+    inputs = preflight(args, helpers)
+    require_disjoint(Path(args.output).resolve(), source)
+    require(1 <= args.radius <= 8 and 300 <= args.sample_timeout <= 3600, "Bound native sampling")
+    native.require_free_port(args.port)
+    if args.preflight_only:
+        return dict(status="READY_NOT_RUN", oracle=oracle, sourceRoute=args.route, **inputs.receipt())
+    runtime = output_path(args.output)
+    expected_jars = native.stage(runtime, *inputs.target, args.port)
+    for path in (source / "config").rglob("*"):
+        if not path.is_file() or path.name == "fml.toml":
+            continue
+        target = runtime / "config" / path.relative_to(source / "config")
+        target.parent.mkdir(parents=True, exist_ok=True)
+        shutil.copy2(path, target)
+    world = runtime / worldgen.WORLD
+    old_world_profile = source / "AdvantageWorksMigration/serverconfig/orespawn-worldgen.json"
+    if old_world_profile.is_file():
+        target = world / "serverconfig/orespawn-worldgen.json"
+        target.parent.mkdir(parents=True, exist_ok=True)
+        shutil.copy2(old_world_profile, target)
+    require_new_world(world)
+    spec = worldgen.campaign_spec("advantage")
+    spec["worldgenSampleRadius"] = args.radius
+    enabled = {output_id(row.get("block", key)) for section in SECTIONS for key, row in expected_profile.get(section, {}).items()
+               if active(row) and output_id(row.get("block", key)).startswith(("basepower:", "baseelectric:"))}
+    spec["worldgenExpectations"] = dict(minimumCounts={key: 1 for key in enabled}, maximumCounts={}, zeroBiomeViolations=False)
+    worldgen.configure_normal_world(runtime, spec, args.port)
+    report = dict(status="RUNNING", sourceRoute=args.route, oracle=oracle, profileSha256=digest(args.profile),
+        sourceSealSha256=digest(args.source_seal), sourceFingerprintBefore=route["sourceFingerprint"],
+        newWorldBeforeFirstBoot=True, sourceScope="RELEASED" if args.route.startswith("released") else "OTHER_EXPLICIT_SOURCE_ROUTE",
+        ruleKeyPolicy="EXACT_SOURCE_KEYS_PENDING_PARENT_HELPER_CONTRACT", phases={}, **inputs.receipt())
+    write_json(runtime / "source-profile-oracle.json", expected_profile)
+    server, first, settings = None, None, None
+    pids = []
+    try:
+        for phase in ("initial", "restart"):
+            native.verify_runtime(runtime, inputs.target[1], expected_jars)
+            server = worldgen.WorldgenServer(runtime, inputs.java, native.LAUNCHER, "retained-worldgen-" + phase)
+            pids.append(server.process.pid)
+            require(len(pids) == len(set(pids)), "Restart reused a process")
+            server.send("gamerule minecraft:spawn_mobs false")
+            server.send("save-all flush")
+            server.wait("Saved the game", 30)
+            profile = native.read_json(world / "serverconfig/orespawn-worldgen.json")
+            contract = audit_transition(expected_profile, profile, registered_blocks(world))
+            write_json(runtime / ("profile-" + phase + ".json"), profile)
+            server.send("advworks sample-worldgen " + str(args.radius))
+            server.wait("Worldgen sample wrote ", args.sample_timeout)
+            sample = native.read_json(runtime / "advantage-works-results/worldgen-sample.json")
+            write_json(runtime / ("sample-" + phase + ".json"), sample)
+            worldgen.validate_sample(sample, spec, inputs.mods)
+            server.send("save-all flush")
+            server.wait("Saved the game", 30)
+            server.close()
+            server = None
+            saved = worldgen.normal_world(world)
+            if first is None:
+                first, settings = sample, saved
+            else:
+                worldgen.validate_restart(first, sample, spec)
+                require(saved == settings, "Native generator SavedData changed on restart")
+            require(any(layout.dimension_directory(world, "minecraft:overworld").rglob("*.mca")), "No actual new native regions saved")
+            report["phases"][phase] = dict(status=contract["status"], contract=contract, sampleSha256=digest(runtime / ("sample-" + phase + ".json")), pid=pids[-1])
+            write_json(runtime / RESULT, report)
+        report["status"] = "PASS" if all(row["status"] == "PASS" for row in report["phases"].values()) else "FAIL"
+    except BaseException as failure:
+        report.update(status="FAIL", error=repr(failure))
+        raise
+    finally:
+        try:
+            if server is not None:
+                server.close()
+            native.verify_runtime(runtime, inputs.target[1], expected_jars)
+            report["inputsUnchanged"] = inputs.unchanged()
+            require(fingerprint(source) == route["sourceFingerprint"], "Protected source fixture changed")
+            report["sourceUnchanged"] = True
+        except BaseException as failure:
+            report.update(status="FAIL", custodyError=repr(failure))
+            raise
+        finally:
+            write_json(runtime / RESULT, report)
+    return report
+
+
+def main():
+    parser = arguments(__doc__)
+    parser.add_argument("--source-seal", type=Path, required=True)
+    parser.add_argument("--source-seal-sha256", required=True)
+    parser.add_argument("--route", required=True)
+    parser.add_argument("--radius", type=int, default=3)
+    parser.add_argument("--sample-timeout", type=int, default=1800)
+    result = run(parser.parse_args())
+    print(result["status"], flush=True)
+    raise SystemExit(1 if result["status"] == "FAIL" else 0)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/test-rig/migration/native2612_stopped_actor_reference.py b/test-rig/migration/native2612_stopped_actor_reference.py
new file mode 100644
index 00000000..2bdcbec0
--- /dev/null
+++ b/test-rig/migration/native2612_stopped_actor_reference.py
@@ -0,0 +1,163 @@
+"""Seal an actor reference from stopped source disk only, before any target load."""
+
+import argparse
+import copy
+import io
+from pathlib import Path
+import uuid
+
+import nbtlib
+import actors
+from matrix import WORLD, digest, fingerprint, plain, write_json
+from native117 import require_disjoint
+import native117_entity_storage as storage
+from native117_format import uuid_longs
+import native2612 as native
+
+VERSION = 3955
+SCOPE = "SOURCE_STOPPED_DISK_ONLY_NATIVE1211_ACTOR_REFERENCE"
+WITNESSES = {"cart": "minecraft:chest_minecart", "dropped-musket": "minecraft:item",
+             "dropped-oil": "minecraft:item", "owned-wolf": "minecraft:wolf", "hydroturbine": "baseelectric:hydroturbine"}
+
+
+def read_nbt(path):
+    return storage._nbt(storage._decompress(path.read_bytes(), 1))
+
+
+def identity(words):
+    if not isinstance(words, nbtlib.IntArray):
+        raise AssertionError("Source player requires a native UUID int array")
+    most, least = uuid_longs(list(map(int, words)))
+    return str(uuid.UUID(int=((most & ((1 << 64) - 1)) << 64) | (least & ((1 << 64) - 1))))
+
+
+def encoded(tag):
+    output = io.BytesIO()
+    nbtlib.File(copy.deepcopy(tag)).write(output)
+    return output.getvalue()
+
+
+def disk_state(source):
+    # No serializer snapshot, stopped-event report, or target runtime is read here.
+    import native2612_actors as driver
+    definition = native.read_json(source / "actor-fixture.json")
+    world = source / WORLD
+    level = read_nbt(world / "level.dat")
+    if type(level["Data"]["DataVersion"]) is not nbtlib.Int or int(level["Data"]["DataVersion"]) != VERSION:
+        raise AssertionError("Only an actual stopped native1.21.1 source world is supported")
+    player_relative = Path("playerdata") / (definition["playerUuid"] + ".dat")
+    player = read_nbt(world / player_relative)
+    if (type(player["DataVersion"]) is not nbtlib.Int or int(player["DataVersion"]) != VERSION
+            or identity(player["UUID"]) != definition["playerUuid"]):
+        raise AssertionError("Wrong source player identity or native version")
+    registry = actors.enchantments(source)
+    player_state = driver.player_semantic(plain(player.unpack()), actors.PLAYER_KEYS, registry)
+    result = dict(file=player_state, adapter=copy.deepcopy(player_state), entities={}, hostAuthority=None)
+    if "Player" in level["Data"]:
+        host = level["Data"]["Player"]
+        if identity(host["UUID"]) != definition["playerUuid"]:
+            raise AssertionError("Embedded source host is not the actor witness player")
+        result["hostAuthority"] = definition["playerUuid"]
+        result["embedded"] = driver.player_semantic(plain(host.unpack()), actors.PLAYER_KEYS, registry)
+    assets = {"raw/level.dat": (world / "level.dat").read_bytes(), "raw/player.dat": (world / player_relative).read_bytes(),
+              "raw/actor-fixture.json": (source / "actor-fixture.json").read_bytes()}
+    metadata, seen = {}, set()
+    directory = world / "entities"
+    for region in sorted(directory.iterdir()):
+        if not region.is_file():
+            raise AssertionError("Unexpected directory in source entity storage")
+        match = storage.REGION_NAME.fullmatch(region.name)
+        if match is None:
+            raise AssertionError("Unreviewed source entity storage file: " + region.name)
+        raw = region.read_bytes()
+        assets["raw/entities/" + region.name] = raw
+        for coordinates, payload in storage._payloads(raw, int(match[1]), int(match[2])):
+            for root in storage._entity_chunk(payload, coordinates, VERSION):
+                if storage._chunk(root) != coordinates:
+                    raise AssertionError("Source entity position does not match its physical region slot")
+                for identifier, entity, parent in storage._tree(root):
+                    if identifier in seen:
+                        raise AssertionError("Duplicate source entity UUID in stopped regions")
+                    seen.add(identifier)
+                    data = entity.get("ForgeData", {})
+                    if "AdvWorksActor" not in data:
+                        continue
+                    witness = str(data["AdvWorksActor"])
+                    if (type(data["AdvWorksActor"]) is not nbtlib.String or witness not in WITNESSES
+                            or witness in result["entities"] or str(entity["id"]) != WITNESSES[witness]):
+                        raise AssertionError("Missing, duplicate or unexpected source actor witness/type")
+                    if parent is not None or "Passengers" in entity:
+                        raise AssertionError("This bounded stopped actor reference does not model passenger fixtures")
+                    if not definition["minX"] <= float(entity["Pos"][0]) <= definition["maxX"]:
+                        raise AssertionError("Source witness outside the actor fixture bounds")
+                    result["entities"][witness] = driver.historical_semantic(plain(entity.unpack()), actors.ENTITY_KEYS, registry)
+                    asset = "raw/witnesses/" + witness + ".nbt"
+                    assets[asset] = encoded(entity)
+                    metadata[witness] = dict(uuid=identifier, region=region.name, chunk=list(coordinates), rawNbtAsset=asset)
+    if set(result["entities"]) != set(WITNESSES):
+        raise AssertionError("Stopped source does not contain the exact five actor witnesses")
+    return driver.source_components(result, VERSION), metadata, assets
+
+
+def seal(source, fixture_receipt, fixture_sha, output):
+    source = Path(source).resolve(strict=True)
+    output = Path(output).resolve()
+    native.validate_hash(fixture_receipt, fixture_sha)
+    approved = native.read_json(fixture_receipt)
+    before = fingerprint(source)
+    if Path(approved["source"]).resolve() != source or approved["sourceFingerprint"] != before:
+        raise AssertionError("Stopped source differs from its approved fixture receipt")
+    require_disjoint(output, source)
+    require_disjoint(output, fixture_receipt)
+    output.mkdir(parents=True, exist_ok=False)
+    state, metadata, assets = disk_state(source)
+    for name, data in assets.items():
+        path = output / name
+        path.parent.mkdir(parents=True, exist_ok=True)
+        with path.open("xb") as stream:
+            stream.write(data)
+    if fingerprint(source) != before:
+        raise AssertionError("Source changed while sealing its stopped reference")
+    document = dict(format=1, scope=SCOPE, source=str(source), sourceDataVersion=VERSION,
+                    sourceFingerprint=before, fixtureReceiptSha256=fixture_sha.upper(), sourceUnchanged=True,
+                    referenceBuilderSha256=digest(Path(__file__)), callerMustStopSourceServer=True,
+                    targetObservationsUsed=False, projection="Unchanged actor oracle keys plus exact complete stack/component payloads",
+                    expected=state, actorBindings=metadata, assets={name: digest(output / name) for name in assets})
+    write_json(output / "reference.json", document)
+    return output / "reference.json"
+
+
+def validate(path, checksum, source, fixture_sha):
+    path, source = Path(path).resolve(strict=True), Path(source).resolve(strict=True)
+    native.validate_hash(path, checksum)
+    document = native.read_json(path)
+    if (document.get("format") != 1 or document.get("scope") != SCOPE or document.get("source") != str(source)
+            or document.get("sourceDataVersion") != VERSION or document.get("sourceUnchanged") is not True
+            or document.get("targetObservationsUsed") is not False or document.get("fixtureReceiptSha256") != fixture_sha.upper()
+            or document.get("referenceBuilderSha256") != digest(Path(__file__))
+            or document.get("sourceFingerprint") != fingerprint(source)):
+        raise AssertionError("Unbound or changed stopped source reference")
+    expected, bindings, assets = disk_state(source)
+    if document["expected"] != expected or document["actorBindings"] != bindings or set(document["assets"]) != set(assets):
+        raise AssertionError("Stopped golden does not derive exactly from source disk")
+    expected_files = {"reference.json", *assets}
+    actual_files = {item.relative_to(path.parent).as_posix() for item in path.parent.rglob("*") if item.is_file()}
+    if actual_files != expected_files:
+        raise AssertionError("Unexpected/missing reference asset (target evidence is forbidden)")
+    for name, raw in assets.items():
+        artifact = path.parent / name
+        native.validate_hash(artifact, document["assets"][name])
+        if artifact.read_bytes() != raw:
+            raise AssertionError("Stopped raw reference asset differs from source bytes")
+    return copy.deepcopy(expected)
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description=__doc__)
+    for name in ("source", "fixture-receipt", "output"):
+        parser.add_argument("--" + name, type=lambda value: Path(value).resolve(), required=True)
+    parser.add_argument("--fixture-receipt-sha256", required=True)
+    args = parser.parse_args()
+    reference = seal(args.source, args.fixture_receipt, args.fixture_receipt_sha256, args.output)
+    print(reference)
+    print(digest(reference))
diff --git a/test-rig/migration/native2612_strict_migration.py b/test-rig/migration/native2612_strict_migration.py
new file mode 100644
index 00000000..27e824ac
--- /dev/null
+++ b/test-rig/migration/native2612_strict_migration.py
@@ -0,0 +1,151 @@
+"""Stopped-boot retained-profile and zero-invalid-output gates; old drivers stay unchanged."""
+
+import copy
+from datetime import datetime, timezone
+from pathlib import Path
+from types import SimpleNamespace
+import traceback
+
+from matrix import WORLD, digest, fingerprint, write_json
+from native117 import output_path
+from native117_actor_io import bind
+import native2612 as native
+import native2612_upgrade as upgrade
+import native2612_actor_transformer_order as actor_order
+import native2612_retained_worldgen as retained
+
+
+REJECT = ("Ignoring invalid OreSpawn-managed ore", "Ignoring OreSpawn-managed ore",
+          "Ignoring invalid fluid deposit", "Ignoring invalid dimension",
+          "Ignoring invalid placement rule for OreSpawn-managed ore",
+          "Ignoring unknown dimension selector", "Ignoring invalid selector rule")
+
+
+def clean_log(path):
+    diagnostics = native.require_clean_log(path)
+    lines = Path(path).read_text(encoding="utf-8", errors="strict").splitlines()
+    failures = [line for line in lines if any(value in line for value in REJECT)]
+    if failures:
+        raise AssertionError("Ignored/invalid worldgen outputs are forbidden: " + repr(failures[:8]))
+    return diagnostics
+
+
+def contract(expected, actual, registry):
+    result = retained.audit_transition(expected, actual, registry)
+    outputs = {retained.output_id(row.get("block", key)) for section in retained.SECTIONS
+               for key, row in expected.get(section, {}).items() if isinstance(row, dict)}
+    for section in retained.SECTIONS:
+        for key, rule in actual.get(section, {}).items():
+            if not isinstance(rule, dict):
+                raise AssertionError("Malformed actual ore/deposit rule: " + key)
+            if key not in expected.get(section, {}) and retained.active(rule) and rule.get("block", key) in outputs:
+                result["issues"].append(dict(kind="CROSS_SECTION_NEW_ACTIVE_DEFAULT", section=section, rule=key))
+            for field, output in [("block", rule.get("block", key)), ("deep_output", rule.get("deep_output")),
+                                  *(("outputs", row.get("block")) for row in rule.get("outputs", []))]:
+                if output is not None and output not in registry:
+                    result["issues"].append(dict(kind="UNKNOWN_ACTUAL_OUTPUT", section=section, rule=key, field=field, output=output))
+    result["status"] = "FAIL" if result["issues"] else "PASS"
+    return result
+
+
+def source_profiles(source):
+    source = Path(source)
+    expected, fact = retained.source_expectation(source)
+    global_file = source / "config/orespawn-worldgen.json"
+    return dict(world=expected, global_profile=upgrade.read_json(global_file) if global_file.is_file() else None,
+                oracle=fact, sourceFingerprint=fingerprint(source))
+
+
+def server_type(base, source):
+    expectations = source_profiles(source)
+
+    class StrictServer(base):
+        def close(self):
+            if getattr(self, "strict_profile_audited", False):
+                return super().close()
+            self.strict_profile_audited = True
+            failure = None
+            try:
+                super().close()
+            except BaseException as error:
+                failure = error
+            root = Path(self.native_runtime)
+            output = root / "strict-profile-audits" / self.native_label
+            output.mkdir(parents=True, exist_ok=False)
+            report = dict(status="FAIL", oracle=expectations["oracle"], ignoredOutputWarningCount=None,
+                          driverFailure=repr(failure) if failure else None, profiles={})
+            try:
+                if self.process.poll() is None:
+                    raise AssertionError("Never inspect profile/registry state of an active server")
+                clean_log(root / ("console-" + self.native_label + ".log"))
+                report["ignoredOutputWarningCount"] = 0
+                world = root / WORLD
+                registry = retained.registered_blocks(world)
+                cases = [("world", world / "serverconfig/orespawn-worldgen.json", expectations["world"])]
+                if expectations["global_profile"] is not None:
+                    cases.append(("global", root / "config/orespawn-worldgen.json", expectations["global_profile"]))
+                for label, path, expected in cases:
+                    actual = upgrade.read_json(path)
+                    checked = contract(expected, actual, registry)
+                    write_json(output / (label + ".json"), actual)
+                    report["profiles"][label] = dict(file=str(path), sha256=digest(path), contract=checked)
+                if any(row["contract"]["status"] != "PASS" for row in report["profiles"].values()):
+                    raise AssertionError("Retained global/world profile differs from its own sealed source: " + str(output))
+                if fingerprint(Path(source)) != expectations["sourceFingerprint"]:
+                    raise AssertionError("Protected source changed")
+                if failure is None:
+                    report["status"] = "PASS"
+            except BaseException as audit:
+                report.update(error=repr(audit), traceback=traceback.format_exc())
+                if failure is None:
+                    failure = audit
+                else:
+                    failure.add_note("Strict profile/output audit also failed: " + repr(audit))
+            finally:
+                write_json(output / "receipt.json", report)
+            if failure is not None:
+                raise failure
+
+    return StrictServer
+
+
+def machine(args, seal):
+    source, reference, receipt, _, _, _ = upgrade.read_source(args)
+    native.read_family_target(args.profile, args.seed, args.inventory, args.inventory_sha256)
+    native.java25(args.java)
+    root = output_path(args.output)
+    files = {**upgrade.oracle_closure(), Path(args.profile): digest(args.profile),
+             Path(args.inventory): digest(args.inventory), receipt: digest(receipt)}
+    files.update({Path(row["path"]): row["sha256"] for row in upgrade.read_json(args.profile)["mods"]})
+    if Path(seal).exists():
+        raise AssertionError("Never replace a pre-run seal")
+    write_json(Path(seal), dict(scope="GENUINE_PRERUN_STRICT_MACHINE_MIGRATION", setupNotStarted=True,
+               createdUtc=datetime.now(timezone.utc).isoformat(), files={str(p): h for p, h in files.items()},
+               source=str(source), sourceFingerprint=fingerprint(source), reference=str(reference),
+               referenceFingerprint=fingerprint(reference), seedFingerprint=fingerprint(Path(args.seed)),
+               oracle=source_profiles(source)["oracle"], arguments={k: str(v) if isinstance(v, Path) else v for k, v in vars(args).items()}))
+    return upgrade.run(args, server_type=server_type(native.Server, source))
+
+
+def actors(args):
+    def campaign(values, *, server_type: type, stage_function, hook_only=False):
+        return actor_order.run_actor_campaign(values, server_type=globals()["server_type"](server_type, values.fixture),
+                                              stage_function=stage_function, hook_only=hook_only)
+    return bind(actor_order.run, run_actor_campaign=campaign)(args)
+
+
+def main():
+    import sys
+    mode = sys.argv.pop(1)
+    if mode == "machine":
+        parser = upgrade.parser()
+        parser.add_argument("--pre-run-seal", type=Path, required=True)
+        args = parser.parse_args()
+        return machine(args, args.pre_run_seal)
+    if mode == "actors":
+        return actors(actor_order.parser().parse_args())
+    raise ValueError("Expected machine or actors")
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/test-rig/migration/native2612_transformer_order.py b/test-rig/migration/native2612_transformer_order.py
new file mode 100644
index 00000000..409add79
--- /dev/null
+++ b/test-rig/migration/native2612_transformer_order.py
@@ -0,0 +1,481 @@
+"""Pinned Forge64 two-order process proof. Instrumented, never production qualification."""
+
+import argparse
+import copy
+import importlib.util
+import json
+import os
+from pathlib import Path
+import shutil
+import subprocess
+import sys
+import tomllib
+from types import SimpleNamespace
+import traceback
+import xml.etree.ElementTree as ET
+from zipfile import ZipFile
+
+from matrix import digest, fingerprint, write_json
+from native117 import output_path, require_disjoint
+from native117_actor_io import bind
+import native12111_order_probe as prior
+import native2612_upgrade as upgrade
+
+SCOPE = prior.SCOPE
+MOD_ID, VERSION = prior.MOD_ID, "1.0.0.2601021"
+MOD_IDS, MODES, VECTORS = upgrade.MOD_IDS, prior.MODES, prior.VECTORS
+RIG = Path(__file__).resolve().parents[1]
+TEMPLATES = RIG / "order-probe"
+TAG = "Lnet/minecraft/nbt/CompoundTag;"
+UPGRADE = "(" + TAG + "I" + TAG + "I)" + TAG
+SELECTED = "net/minecraft/world/level/storage/LevelStorageSource$LevelStorageAccess"
+RAW_READ = "(Ljava/nio/file/Path;)" + TAG
+TARGETS = ("net/minecraft/world/level/chunk/storage/SimpleRegionStorage", SELECTED,
+           "net/minecraft/server/level/WorldGenRegion")
+GUARD_CONTROLS = ("jar-hash", "class-hash", "config-hash", "missing-config", "duplicate-config",
+                  "not-required", "config-priority", "explicit-class-priority", "missing-mixin-annotation", "mixin-version")
+WOVEN_CONTROLS = ("body", "constant-body", "duplicate-handler", "priority", "early-return", "missing-head",
+                  "missing-return", "bypass-head", "worldgen-body", "worldgen-true", "worldgen-extra-cast")
+TEMPLATE_HASHES = {
+    "src/zone/moddev/orderprobe/ProbeGuard.java": "AF284EC4E6826701085BECC159A1984095DD3429CEA85D2BA3160E4399BAD53B",
+    "src/zone/moddev/orderprobe/OrderProbeAudit.java": "46AE94FB298E1683C1B71B149A307AF42BEBECAE875EE8658F7F104E6509C6C3",
+    "src/zone/moddev/orderprobe/OrderProbePlugin.java": "21DEABC1DBECCAFE49CBD67F13B44B10426BD4F0A874F1438CA06AD4ECE33FE5",
+    "src/zone/moddev/orderprobe/OrderProbeMod.java": "54E37CE043BD3DB401E9D8ED383A112340B3DD21A8729716AC1929800CD68582",
+    "test/WovenNegativeControl.java": "08C5840485E84F58B1D1C698F508F7A6F6A8A74DFA181CE73553B5877FD139FA",
+    "test/run_guard_controls.py": "307CCF9BEBDD58E242A7B4D961D372803E16315B0D2F8286DBCCEC3A7A0DDDC3",
+    "test/run_woven_controls.py": "A6892AAADBF027953569D71C9EC9FCA33BB539CFBB47BD2C563CA63D03A26F81",
+    "resources/META-INF/mods.toml": "01A57052CC5BD5CEA7458BBD75ADFEE6C0F7E01B73DD431420BE570F5658A954",
+    "resources/advantageorderprobe.mixins.json": "1652355A2C5397D6F34CC7F07C8355D85F830876E107D32625A98F459E7644DC",
+}
+
+
+def replace_once(text, old, new):
+    if text.count(old) != 1:
+        raise AssertionError("Unreviewed order-probe template drift: " + old[:90])
+    return text.replace(old, new, 1)
+
+
+LOCK_AUDIT = '''        MethodNode selected = method(level, "getUnfixedDataTag", "(Z)Lcom/mojang/serialization/Dynamic;");
+        MethodNode nativeSelected = method(exported(nativeClasses, LEVEL), "getUnfixedDataTag", selected.desc);
+        List<AbstractInsnNode> selectedCode = instructions(selected);
+        int lockedAt = -1, rawAt = -1;
+        List<Integer> capturedAt = new ArrayList<>();
+        for (int i = 0; i < selectedCode.size(); i++) {
+            if (!(selectedCode.get(i) instanceof MethodInsnNode call)) continue;
+            if (call.owner.equals(LEVEL) && call.name.equals("checkLock") && call.desc.equals("()V")) {
+                ProbeGuard.require(lockedAt < 0, "duplicate selected-world lock check"); lockedAt = i;
+            }
+            if (call.owner.equals("net/minecraft/world/level/storage/LevelStorageSource")
+                    && call.name.equals("readLevelDataTagRaw")
+                    && call.desc.equals("(Ljava/nio/file/Path;)Lnet/minecraft/nbt/CompoundTag;")) {
+                ProbeGuard.require(rawAt < 0, "duplicate selected-world raw read"); rawAt = i;
+            }
+            if (worldHeads.containsKey(call.name)) capturedAt.add(i);
+            ProbeGuard.require(!call.name.equals("isCancelled"), "selected-world capture became cancellable");
+        }
+        ProbeGuard.require(lockedAt >= 0 && capturedAt.size() == 2 && lockedAt < capturedAt.getFirst()
+                && capturedAt.getLast() < rawAt, "capture is not after session lock and before raw read");
+        for (int site : capturedAt) {
+            ProbeGuard.require(dominates(selected, lockedAt, site), "selected-world lock can be bypassed");
+            ProbeGuard.require(dominates(selected, site, rawAt), "selected-world capture can be bypassed");
+        }
+        ProbeGuard.require(dominates(selected, capturedAt.getFirst(), capturedAt.getLast()), "capture order can be bypassed");
+        ProbeGuard.require(selected.tryCatchBlocks.stream().map(row -> row.type).toList().equals(
+                nativeSelected.tryCatchBlocks.stream().map(row -> row.type).toList()), "selected-world exception coverage changed");
+        List<String> levelOrder = sequence(selected, worldHeads);'''
+
+
+def retarget(relative, text):
+    if relative.endswith("OrderProbeAudit.java"):
+        text = replace_once(text, '"net/minecraft/world/level/storage/LevelStorageSource";', '"' + SELECTED + '";')
+        text = replace_once(text, '+ target.name.substring(target.name.lastIndexOf(\'/\') + 1) + "Mixin";',
+                            '+ (target.name.equals(LEVEL) ? (mod.equals("basepower") ? "SelectedWorldStorageMixin" : "LevelStorageSourceMixin")\n'
+                            '                : target.name.substring(target.name.lastIndexOf(\'/\') + 1) + "Mixin");')
+        text = replace_once(text, '"(" + TAG + "I" + TAG + ")" + TAG', '"(" + TAG + "I" + TAG + "I)" + TAG')
+        text = replace_once(text, '        List<String> levelOrder = sequence(method(level, "readLevelDataTagFixed", null), worldHeads);', LOCK_AUDIT)
+        text = replace_once(text, '        result.addProperty("exceptionEdgesChecked", true);',
+                            '        result.addProperty("exceptionEdgesChecked", true);\n'
+                            '        result.addProperty("minecraft", "26.1.2"); result.addProperty("forge", "64.1.5");\n'
+                            '        result.addProperty("dataVersion", 4790); result.addProperty("upgradeDescriptor", upgrade.desc);\n'
+                            '        result.addProperty("selectedWorldAfterLock", true);\n'
+                            '        result.addProperty("selectedWorldTarget", LEVEL);\n'
+                            '        result.addProperty("rawReadDescriptor", "(Ljava/nio/file/Path;)Lnet/minecraft/nbt/CompoundTag;");')
+    elif relative.endswith("OrderProbePlugin.java"):
+        text = replace_once(text, "native61-order-plugin-", "native64-order-plugin-")
+        text = replace_once(text, "NATIVE61_ORDER_PROBE_PRIORITIES", "NATIVE64_ORDER_PROBE_PRIORITIES")
+    elif relative.endswith("WovenNegativeControl.java"):
+        text = replace_once(text, "(Lnet/minecraft/nbt/CompoundTag;ILnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/nbt/CompoundTag;", UPGRADE)
+    elif relative.endswith(".py"):
+        text = replace_once(text, "native12111 as native", "native2612 as native")
+        text = replace_once(text, "native12111_order_probe", "native2612_transformer_order")
+        text = replace_once(text, '"--release", "21"', '"--release", "25"')
+    elif relative.endswith("mods.toml"):
+        for old, new in (('[61,)', '[64,)'), ('1.0.0.121111', VERSION), ('Native61', 'Native64'),
+                         ('[61.1.0]', '[64.1.5]'), ('[1.21.11]', '[26.1.2]')):
+            text = replace_once(text, old, new)
+    return text
+
+
+def prepare_sources(output):
+    payloads = {}
+    for relative, checksum in TEMPLATE_HASHES.items():
+        path = TEMPLATES / relative
+        upgrade.validate_hash(path, checksum)
+        payloads[relative] = retarget(relative, path.read_text(encoding="utf-8"))
+    # Fail before creating any output if a template is stale.
+    output.mkdir(parents=True, exist_ok=False)
+    for relative, text in payloads.items():
+        path = output / relative
+        path.parent.mkdir(parents=True, exist_ok=True)
+        path.write_text(text, encoding="utf-8", newline="\n")
+    return fingerprint(output)
+
+
+def builder():
+    spec = importlib.util.spec_from_file_location("native2612_pinned_probe_builder", TEMPLATES / "build.py")
+    module = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(module)
+    return module
+
+
+def verify_files(hashes):
+    for path, checksum in hashes.items():
+        upgrade.validate_hash(Path(path), checksum)
+
+
+def verify_probe_package(path):
+    required = ("META-INF/mods.toml", "advantageorderprobe.mixins.json", "order-probe-pins.json",
+                *("zone/moddev/orderprobe/" + name + ".class" for name in
+                  ("OrderProbeMod", "OrderProbeAudit", "OrderProbePlugin", "ProbeGuard")))
+    with ZipFile(path) as archive:
+        for name in required:
+            if archive.namelist().count(name) != 1:
+                raise AssertionError("Missing/duplicate order sidecar entry: " + name)
+        metadata = tomllib.loads(archive.read("META-INF/mods.toml").decode("utf-8"))
+        if [(row.get("modId"), row.get("version")) for row in metadata.get("mods", [])] != [(MOD_ID, VERSION)]:
+            raise AssertionError("Order sidecar must declare exactly its own current mod identity")
+
+
+def build_sidecar(profile, seed, java, output):
+    native = upgrade.engine()
+    java, _ = native.java25(java)
+    baseline = builder()
+    classes = copy.deepcopy(baseline.CLASSES)
+    classes["basepower"].insert(2, "SelectedWorldStorageMixin")
+    pins = bind(baseline.base_pins, native=native, CLASSES=classes, RIG=RIG)(profile, seed)
+    classpath_file = RIG.parent / ".classpath"
+    classpath = [Path(row.attrib["path"]).resolve(strict=True)
+                 for row in ET.parse(classpath_file).getroot().findall("classpathentry") if row.attrib.get("kind") == "lib"]
+    if not classpath or any(not path.is_file() for path in classpath):
+        raise AssertionError("Missing sealed javac dependencies")
+    engine = Path(seed) / "libraries/net/minecraftforge/forge/26.1.2-64.1.5/forge-26.1.2-64.1.5-server.jar"
+    engine_sha = digest(engine)
+    output = output_path(output)
+    for path in (profile, seed, java, classpath_file, TEMPLATES, Path(__file__), *classpath):
+        require_disjoint(output, path)
+    output.mkdir(parents=True, exist_ok=False)
+    source_tree = output / "source-tree"
+    sources = prepare_sources(source_tree)
+    compiled = output / "classes"
+    compiled.mkdir()
+    cp_hashes = {str(path): digest(path) for path in classpath}
+    command = [str(java.with_name("javac.exe" if os.name == "nt" else "javac")), "-proc:none", "--release", "25",
+               "-cp", os.pathsep.join(map(str, classpath)), "-d", str(compiled), *map(str, sorted((source_tree / "src").rglob("*.java")))]
+    completed = subprocess.run(command, env=native.native_launch_environment(), capture_output=True, text=True, timeout=120)
+    (output / "javac.log").write_text(completed.stdout + completed.stderr, encoding="utf-8")
+    if completed.returncode:
+        raise AssertionError("Order probe compilation failed: " + str(output / "javac.log"))
+    native_classes = output / "native-classes"
+    with ZipFile(engine) as original:
+        for name in TARGETS:
+            path = native_classes / (name + ".class")
+            path.parent.mkdir(parents=True, exist_ok=True)
+            path.write_bytes(baseline.unique_entry(original, name + ".class"))
+    variants = {}
+    for mode in MODES:
+        directory = output / mode
+        directory.mkdir()
+        selected = copy.deepcopy(pins)
+        selected.update(mode=mode, priorities={"basepower.mixins.json": 900 if mode == "power-low" else 1100,
+                                               "basemetals.mixins.json": 1100 if mode == "power-low" else 900})
+        raw = (json.dumps(selected, indent=2, sort_keys=True) + "\n").encode()
+        plan = directory / "order-probe-pins.json"
+        plan.write_bytes(raw)
+        files = {path.relative_to(compiled).as_posix(): path.read_bytes() for path in compiled.rglob("*.class")}
+        files.update({path.relative_to(source_tree / "resources").as_posix(): path.read_bytes()
+                      for path in (source_tree / "resources").rglob("*") if path.is_file()})
+        files["order-probe-pins.json"] = raw
+        files["META-INF/MANIFEST.MF"] = ("Manifest-Version: 1.0\r\nMixinConfigs: advantageorderprobe.mixins.json\r\n"
+                                       "Automatic-Module-Name: advantageorderprobe\r\n\r\n").encode()
+        jar = directory / ("AdvantageOrderProbe-" + VERSION + ".jar")
+        baseline.archive(jar, files)
+        verify_probe_package(jar)
+        variants[mode] = dict(jar=str(jar), sha256=digest(jar), pins=str(plan), pinsSha256=digest(plan))
+    verify_files(cp_hashes)
+    if fingerprint(source_tree) != sources or digest(engine) != engine_sha:
+        raise AssertionError("Probe build inputs changed")
+    result = dict(scope=SCOPE, qualificationAllowed=False, minecraft=upgrade.MINECRAFT, forge=upgrade.FORGE,
+                  profile=str(profile), profileSha256=digest(profile), javaSha256=digest(java), sourceTree=str(source_tree),
+                  sourceFingerprint=sources, templateHashes=TEMPLATE_HASHES, builderSha256=digest(TEMPLATES / "build.py"),
+                  adapterSha256=digest(Path(__file__)), classpathFile=str(classpath_file), classpathFileSha256=digest(classpath_file),
+                  classpath=cp_hashes, nativeEngine=str(engine), nativeEngineSha256=engine_sha,
+                  nativeClasses=str(native_classes), nativeClassHashes=fingerprint(native_classes), variants=variants)
+    write_json(output / "build-receipt.json", result)
+    return result
+
+
+def verify_woven(proof):
+    required = dict(status="PASS", scope=SCOPE, qualificationAllowed=False, minecraft=upgrade.MINECRAFT,
+                    forge=upgrade.FORGE, dataVersion=4790, upgradeDescriptor=UPGRADE,
+                    selectedWorldAfterLock=True, selectedWorldTarget=SELECTED, rawReadDescriptor=RAW_READ,
+                    allHandlerBodiesMatchPinnedProduction=True, nativeReturnsCovered=2, exceptionEdgesChecked=True)
+    if any(type(proof.get(key)) is not type(value) or proof[key] != value for key, value in required.items()):
+        raise AssertionError("Missing Forge64 locked-world / four-argument woven proof")
+    prior.compare_orders(proof, {**proof, **{name: ([list(reversed(pair)) for pair in proof[name]] if name == "regionReturns"
+                                                  else list(reversed(proof[name]))) for name in VECTORS}})
+    return proof
+
+
+def compare_orders(first, second):
+    verify_woven(first)
+    verify_woven(second)
+    return prior.compare_orders(first, second)
+
+
+verify_plugin = prior.verify_plugin
+
+
+def diagnostic_manifest(runtime, label):
+    path = Path(runtime) / ("order-export-" + label + ".json")
+    document = dict(format=1, purpose="NATIVE64_MIXIN_EXPORT_DIAGNOSTIC", runtime=str(Path(runtime).resolve()), label=label,
+                    properties={"mixin.debug.export": True, "mixin.debug.export.decompile": False})
+    with path.open("x", encoding="utf-8") as output:
+        json.dump(document, output, sort_keys=True, indent=2)
+        output.write("\n")
+    return path, digest(path)
+
+
+def archive_exports(runtime, folder):
+    runtime, folder = Path(runtime).resolve(strict=True), Path(folder).resolve(strict=True)
+    folder.relative_to(runtime)
+    source = runtime / ".mixin.out"
+    source.resolve(strict=True).relative_to(runtime)
+    for target in TARGETS:
+        upgrade.regular_bytes(source / "class" / (target + ".class"))
+    for path in source.rglob("*"):
+        if path.is_symlink() or getattr(path, "is_junction", lambda: False)():
+            raise AssertionError("Aliased Mixin export input")
+        if path.is_file():
+            upgrade.regular_bytes(path)
+    shutil.copytree(source / "class", folder / "export")
+    source.rename(folder / "mixin-output")
+    return fingerprint(folder / "mixin-output")
+
+
+def audit_command(java, build, variant, runtime, exports, output):
+    proof = bind(prior.audit_command, native=upgrade.engine())(java, build, variant, runtime, exports, output)
+    return verify_woven(proof)
+
+
+def instrumented_stage(variant):
+    def stage(runtime, seed, inventory, mods, port):
+        native = upgrade.engine()
+        upgrade.validate_hash(variant["jar"], variant["sha256"])
+        expected = native.stage(runtime, seed, inventory, mods, port)
+        jar = Path(variant["jar"])
+        if jar.name in expected:
+            raise AssertionError("Order sidecar collides with a production input")
+        shutil.copy2(jar, Path(runtime) / "mods" / jar.name)
+        expected[jar.name] = variant["sha256"].upper()
+        path = Path(runtime) / "input-jars.json"
+        inputs = upgrade.read_json(path)
+        inputs.append(dict(file=jar.name, source=str(jar), sha256=variant["sha256"].upper(),
+                           scope=SCOPE, qualificationAllowed=False))
+        write_json(path, inputs)
+        native.verify_runtime(runtime, inventory, expected)
+        return expected
+    return stage
+
+
+def controls(java, build_path, build, output, *, runtime=None, exports=None):
+    woven = runtime is not None
+    script = Path(build["sourceTree"]) / "test" / ("run_woven_controls.py" if woven else "run_guard_controls.py")
+    command = [sys.executable, "-B", str(script), "--build-receipt", str(build_path), "--java", str(java), "--output", str(output)]
+    if woven:
+        command.extend(["--runtime", str(runtime), "--exports", str(exports)])
+    env = upgrade.engine().native_launch_environment()
+    env["PYTHONPATH"] = os.pathsep.join([str(RIG / "migration"), *sys.path])
+    done = subprocess.run(command, env=env, capture_output=True, text=True, timeout=300)
+    Path(str(output) + ".log").write_text(done.stdout + done.stderr, encoding="utf-8")
+    if done.returncode:
+        raise AssertionError("Order mutation controls failed: " + str(output))
+    path = Path(output) / ("negative-controls.json" if woven else "guard-controls.json")
+    receipt = upgrade.read_json(path)
+    expected = {"unmodified" if woven else "baseline": "PASS", **dict.fromkeys(WOVEN_CONTROLS if woven else GUARD_CONTROLS, "REJECTED")}
+    if (receipt.get("status") != "PASS" or receipt.get("scope") != SCOPE
+            or receipt.get("qualificationAllowed") is not False or receipt.get("controls") != expected
+            or receipt.get("buildReceiptSha256") != digest(build_path)):
+        raise AssertionError("Missing exact 21 mutation controls / positive baselines")
+    return dict(file=str(path), sha256=digest(path), **receipt)
+
+
+def validate_build(build, profile, java):
+    if (build.get("scope") != SCOPE or build.get("qualificationAllowed") is not False
+            or (build.get("minecraft"), build.get("forge")) != (upgrade.MINECRAFT, upgrade.FORGE)
+            or build["profileSha256"] != digest(profile) or build["javaSha256"] != digest(java)
+            or build["templateHashes"] != TEMPLATE_HASHES):
+        raise AssertionError("Probe is not bound to this exact Forge64 production profile")
+    paths = {Path(path): sha for path, sha in build["classpath"].items()}
+    paths.update({TEMPLATES / path: sha for path, sha in TEMPLATE_HASHES.items()})
+    paths.update({Path(__file__): build["adapterSha256"], TEMPLATES / "build.py": build["builderSha256"],
+                  Path(build["nativeEngine"]): build["nativeEngineSha256"],
+                  Path(build["classpathFile"]): build["classpathFileSha256"]})
+    for variant in build["variants"].values():
+        paths.update({Path(variant["jar"]): variant["sha256"], Path(variant["pins"]): variant["pinsSha256"]})
+        verify_probe_package(Path(variant["jar"]))
+    verify_files(paths)
+    for folder, hashes in ((build["nativeClasses"], build["nativeClassHashes"]), (build["sourceTree"], build["sourceFingerprint"])):
+        if fingerprint(Path(folder)) != hashes:
+            raise AssertionError("Pinned native audit or generated source tree changed")
+        paths.update({Path(folder) / name: sha for name, sha in hashes.items()})
+    if set(build["variants"]) != set(MODES):
+        raise AssertionError("Both pinned order variants are required")
+    return paths
+
+
+def run(args):
+    native = upgrade.engine()
+    upgrade.read_source(args)
+    upgrade.validate_hash(args.build_receipt, args.build_receipt_sha256)
+    build = upgrade.read_json(args.build_receipt)
+    target = native.read_family_target(args.profile, args.seed, args.inventory, args.inventory_sha256)
+    java, _ = native.java25(args.java)
+    protected = validate_build(build, args.profile, java)
+    protected.update({Path(args.build_receipt): digest(args.build_receipt), Path(args.profile): digest(args.profile),
+                      Path(args.inventory): digest(args.inventory), java: digest(java), **upgrade.oracle_closure()})
+    protected.update({Path(path): checksum for _, path, checksum in target[2].values()})
+    trees = {Path(path): fingerprint(Path(path)) for path in (args.source, args.legacy_reference or args.source, args.seed)}
+    root = output_path(args.output)
+    for path in (args.source, args.legacy_reference or args.source, args.profile, args.seed, args.inventory, java, *protected,
+                 *(row[1] for row in target[2].values())):
+        require_disjoint(root, path)
+    root.mkdir(parents=True, exist_ok=False)
+    hook_only = getattr(args, "hook_only", False)
+    result = dict(status="RUNNING", scope=SCOPE, qualificationAllowed=False, minecraft=upgrade.MINECRAFT,
+                  forge=upgrade.FORGE, profileSha256=digest(args.profile), buildReceiptSha256=digest(args.build_receipt),
+                  inputHashes={str(path): sha for path, sha in protected.items()},
+                  migrationScope=upgrade.HOOK_SCOPE if hook_only else upgrade.SCOPE,
+                  operationRequested=not hook_only, modes={})
+    report = root / "native2612-transformer-order-results.json"
+    write_json(report, result)
+    try:
+        result["guardControls"] = controls(java, args.build_receipt, build, root / "guard-controls")
+        for index, mode in enumerate(MODES):
+            variant = build["variants"][mode]
+            pins = upgrade.read_json(variant["pins"])
+            observations = []
+            result["modes"][mode] = dict(status="RUNNING", observations=observations)
+            write_json(report, result)
+
+            class OrderServer(native.Server):
+                def __init__(self, runtime, java, launcher, label):
+                    self.order_archived = False
+                    if (Path(runtime) / ".mixin.out").exists():
+                        raise AssertionError("Never reuse stale exports from an earlier boot")
+                    manifest, checksum = diagnostic_manifest(runtime, label)
+                    super().__init__(runtime, java, launcher, label, diagnostic_environment=manifest,
+                                     diagnostic_environment_sha256=checksum)
+
+                def close(self):
+                    failure = None
+                    try:
+                        super().close()
+                    except BaseException as error:
+                        failure = error
+                    try:
+                        if not self.order_archived:
+                            if self.process.poll() is None:
+                                raise AssertionError("Never archive an active order-probe JVM")
+                            self.order_archived = True
+                            runtime = self.native_runtime
+                            folder = runtime / "order-evidence" / self.native_label
+                            folder.mkdir(parents=True, exist_ok=False)
+                            plugin_file = runtime / ("native64-order-plugin-" + str(self.process.pid) + ".json")
+                            plugin = upgrade.read_json(plugin_file)
+                            verify_plugin(plugin, pins, runtime, self.process.pid)
+                            if plugin["pinsSha256"] != variant["pinsSha256"]:
+                                raise AssertionError("Plugin resource pins changed")
+                            shutil.copy2(plugin_file, folder / "plugin.json")
+                            exports = archive_exports(runtime, folder)
+                            woven = audit_command(java, build, variant, runtime, folder / "export", folder / "audit.json")
+                            launch = upgrade.read_json(runtime / ("native64-launch-environment-" + self.native_label + ".json"))
+                            if launch["status"] != "DIAGNOSTIC_NOT_QUALIFIED" or launch["qualificationAllowed"] is not False:
+                                raise AssertionError("Diagnostic launch was relabelled production qualified")
+                            observations.append(dict(runtime=str(runtime), label=self.native_label, folder=str(folder), audit=woven,
+                                                     auditSha256=digest(folder / "audit.json"), pluginSha256=digest(plugin_file),
+                                                     fullExportHashes=exports))
+                    except BaseException as audit:
+                        if failure is None:
+                            raise
+                        failure.add_note("Order archive/audit also failed: " + repr(audit))
+                    if failure is not None:
+                        raise failure
+
+            values = SimpleNamespace(**vars(args))
+            values.output, values.port = root / mode, args.port + index
+            expected_boots = 2 if hook_only else 3
+            if upgrade.run(values, server_type=OrderServer, stage_function=instrumented_stage(variant),
+                           hook_only=hook_only) or len(observations) != expected_boots:
+                raise AssertionError("Missing real woven process proofs for the explicitly requested migration scope")
+            signature = {key: observations[0]["audit"][key] for key in VECTORS}
+            if any({key: observation["audit"][key] for key in VECTORS} != signature for observation in observations):
+                raise AssertionError("Actual callback order changed across cold boots")
+            result["modes"][mode] = dict(status="PASS", observations=observations)
+            write_json(report, result)
+        first = result["modes"][MODES[0]]["observations"][0]
+        result["wovenControls"] = controls(java, args.build_receipt, build, root / "woven-controls",
+                                           runtime=Path(first["runtime"]), exports=Path(first["folder"]) / "export")
+        result["permutationProof"] = compare_orders(first["audit"], result["modes"][MODES[1]]["observations"][0]["audit"])
+        result["status"] = "PASS"
+    except BaseException as failure:
+        result.update(status="FAIL", error=repr(failure), traceback=traceback.format_exc())
+        raise
+    finally:
+        try:
+            validate_build(build, args.profile, java)
+            result["inputsUnchanged"] = all(digest(path) == sha.upper() for path, sha in protected.items())
+            result["protectedTreesUnchanged"] = all(fingerprint(path) == hashes for path, hashes in trees.items())
+            if not result["inputsUnchanged"] or not result["protectedTreesUnchanged"]:
+                raise AssertionError("Pinned order inputs changed")
+        except Exception as audit:
+            result.update(status="FAIL", custodyFailure=repr(audit))
+        write_json(report, result)
+    return int(result["status"] != "PASS")
+
+
+def main():
+    if len(sys.argv) > 1 and sys.argv[1] == "build":
+        parser = argparse.ArgumentParser(description="Compile the local diagnostic sidecar without launching Minecraft")
+        for name in ("profile", "seed", "inventory", "java", "output"):
+            parser.add_argument("--" + name, type=lambda value: Path(value).resolve(), required=True)
+        parser.add_argument("--inventory-sha256", required=True)
+        args = parser.parse_args(sys.argv[2:])
+        native = upgrade.engine()
+        native.read_family_target(args.profile, args.seed, args.inventory, args.inventory_sha256)
+        build_sidecar(args.profile, args.seed, args.java, args.output)
+        return 0
+    parser = upgrade.parser()
+    parser.description = __doc__
+    parser.add_argument("--hook-only", action="store_true", help="Explicit non-consuming conversion/restart proof; never operating qualification")
+    parser.add_argument("--build-receipt", type=lambda value: Path(value).resolve())
+    parser.add_argument("--build-receipt-sha256")
+    args = parser.parse_args()
+    if not 1024 <= args.port <= 65534:
+        parser.error("Require two assigned consecutive unprivileged ports")
+    if args.build_receipt is None or args.build_receipt_sha256 is None:
+        parser.error("Require the independently pinned sidecar build receipt and SHA")
+    return run(args)
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/test-rig/migration/native2612_upgrade.py b/test-rig/migration/native2612_upgrade.py
new file mode 100644
index 00000000..d355adf6
--- /dev/null
+++ b/test-rig/migration/native2612_upgrade.py
@@ -0,0 +1,402 @@
+"""Strict machine migration to Forge64; historical inputs and oracles stay immutable."""
+
+import argparse
+import copy
+import importlib
+import json
+from pathlib import Path
+import re
+import shutil
+import sys
+import traceback
+
+import nbtlib
+
+from matrix import WORLD, digest, fingerprint, parse_nbt, plain, write_json
+from native117 import output_path, require_disjoint
+from native117_actor_io import bind
+from native117_entity_storage import _decompress, _entity_chunk, _nbt, _payloads
+from native117_format import decode_palette, uuid_longs
+import native12111_upgrade as previous
+import native2612_layout as layout
+
+
+MINECRAFT, FORGE, DATA_VERSION = "26.1.2", "64.1.5", 4790
+SOURCE_VERSIONS = {"1.13.2": 1631, "1.14.4": 1976, "1.15.2": 2230, "1.16.5": 2586,
+                   "1.17.1": 2730, "1.18.2": 2975, "1.19.4": 3337,
+                   **previous.COMPONENT_SOURCE_VERSIONS, "1.21.11": 4671}
+LEGACY_ROUTES = ("original110", "released110", "maintained112", "released112")
+LEGACY_SOURCE_VERSIONS = dict(original110=512, released110=512, maintained112=1343, released112=1343)
+MOD_IDS = frozenset(("basepower", "basesteam", "baseelectric", "basemetals", "orespawn", "advantageworkstest"))
+SCOPE = "MACHINE_MIGRATION_STOPPED_STORAGE_AND_PLAYER_AUTHORITY"
+HOOK_SCOPE = "INSTRUMENTED_MIGRATION_HOOK_CONVERSION_RESTART_ONLY"
+MAX_FILE = 256 * 1024 * 1024
+
+
+def read_json(path):
+    def unique(pairs):
+        result = {}
+        for key, value in pairs:
+            if key in result:
+                raise ValueError("Duplicate receipt key: " + key)
+            result[key] = value
+        return result
+    return json.loads(Path(path).read_text(encoding="utf-8-sig"), object_pairs_hook=unique,
+                      parse_constant=lambda value: (_ for _ in ()).throw(ValueError("Nonfinite JSON: " + value)))
+
+
+def engine():
+    module = importlib.import_module("native2612")
+    if (module.MINECRAFT, module.FORGE) != (MINECRAFT, FORGE):
+        raise AssertionError("Migration requires the handed-off Forge64.1.5 engine")
+    for name in ("Server", "java25", "read_family_target", "stage", "verify_runtime", "LAUNCHER"):
+        if not hasattr(module, name):
+            raise AssertionError("Missing native2612 engine contract: " + name)
+    return module
+
+
+def validate_hash(path, checksum):
+    if not isinstance(checksum, str) or not re.fullmatch(r"[A-Fa-f0-9]{64}", checksum) or digest(Path(path)) != checksum.upper():
+        raise AssertionError("Input checksum differs: " + str(path))
+
+
+def expected_components(value, *, source_version):
+    if not isinstance(source_version, str) or source_version not in SOURCE_VERSIONS:
+        raise AssertionError("Unsupported sealed source version: " + str(source_version))
+    if source_version in previous.COMPONENT_SOURCE_VERSIONS:
+        return previous.expected_components(value, source_version=source_version)
+    if SOURCE_VERSIONS[source_version] < 3465:
+        return previous.components(copy.deepcopy(value))
+    # 1.21.11 already has the target count and unwrapped enchantment map. Never
+    # recursively reinterpret unknown component payloads as another item schema.
+    def walk(node):
+        if isinstance(node, list):
+            return [walk(item) for item in node]
+        if not isinstance(node, dict):
+            return copy.deepcopy(node)
+        if "id" not in node or not any(key in node for key in ("Count", "count")):
+            return {key: walk(item) for key, item in node.items()}
+        if "Count" in node or type(node.get("count")) is not int or node["count"] < 1:
+            raise AssertionError("1.21.11 source requires native integer count")
+        if not isinstance(node["id"], str) or not re.fullmatch(r"[a-z0-9_.-]+:[a-z0-9_./-]+", node["id"]):
+            raise AssertionError("Invalid source item identity")
+        patch = node.get("components", {})
+        if not isinstance(patch, dict):
+            raise AssertionError("Source components must be a map")
+        for name in ("minecraft:enchantments", "minecraft:stored_enchantments"):
+            if name not in patch:
+                continue
+            levels = patch[name]
+            if not isinstance(levels, dict) or any(not isinstance(key, str)
+                    or not re.fullmatch(r"[a-z0-9_.-]+:[a-z0-9_./-]+", key)
+                    or type(level) is not int or not 1 <= level <= 255 for key, level in levels.items()):
+                raise AssertionError("Non-native 1.21.11 enchantment map")
+        return copy.deepcopy(node)
+    return walk(value)
+
+
+def comparison(before, after, *, modern, source_version="1.20.1"):
+    return bind(previous.comparison, expected_components=expected_components)(
+        before, after, modern=modern, source_version=source_version)
+
+
+load_operating_chunks = bind(previous.load_operating_chunks, MINECRAFT=MINECRAFT)
+
+
+def oracle_closure():
+    directory = Path(__file__).resolve().parent
+    return {Path(module.__file__).resolve(): digest(Path(module.__file__)) for module in tuple(sys.modules.values())
+            if getattr(module, "__file__", None) and Path(module.__file__).suffix == ".py"
+            and Path(module.__file__).resolve().parent == directory
+            and not Path(module.__file__).name.startswith("test_")}
+
+
+def regular_bytes(path):
+    path = Path(path)
+    for part in (path, *path.parents):
+        if part.is_symlink() or getattr(part, "is_junction", lambda: False)():
+            raise ValueError("Aliased stopped-save input")
+    if not path.is_file() or path.stat().st_nlink != 1 or path.stat().st_size > MAX_FILE:
+        raise ValueError("Missing, aliased or oversized stopped-save input")
+    return path.read_bytes()
+
+
+def player_authority(world):
+    identity = layout.singleplayer_uuid(world)
+    if identity is None:
+        return dict(status="NO_SINGLEPLAYER_OWNER", playerConversionQualified=False)
+    path = layout.player_file(world, identity)
+    tag = layout._load(path)
+    if layout.uuid_tag(tag.get("UUID")) != identity:
+        raise AssertionError("Host UUID differs from its authoritative player file")
+    version = tag.get("DataVersion")
+    if type(version) is not nbtlib.Int or not 0 < int(version) <= DATA_VERSION:
+        raise AssertionError("Unproven host-player serialization version")
+    return dict(status="NATIVE_PLAYER" if int(version) == DATA_VERSION else "RETAINED_UNOPENED_SOURCE_PLAYER",
+                uuid=str(identity), file=str(path.relative_to(world)), sha256=digest(path),
+                dataVersion=int(version), playerConversionQualified=False)
+
+
+def capture(runtime, label, rows):
+    world = Path(runtime) / WORLD
+    output = Path(runtime) / "native2612-save" / label
+    output.mkdir(parents=True, exist_ok=False)
+    level, settings = layout.read_level(world), layout.read_worldgen(world)
+    shutil.copy2(world / "level.dat", output / "level.dat")
+    shutil.copy2(layout.shared_file(world, "minecraft:world_gen_settings"), output / "world_gen_settings.dat")
+    chunks, regions = {}, {}
+    identities = set()
+    for row in rows:
+        pos = tuple(row[axis] for axis in ("x", "y", "z"))
+        if any(type(value) is not int for value in pos) or (row["name"], *pos) in identities:
+            raise AssertionError("Invalid or duplicate live machine witness")
+        identities.add((row["name"], *pos))
+        x, y, z = pos
+        cx, cz = key = x // 16, z // 16
+        if key not in chunks:
+            region = cx // 32, cz // 32
+            if region not in regions:
+                path = layout.region_file(world, "minecraft:overworld", cx, cz)
+                raw = regular_bytes(path)
+                regions[region] = dict(_payloads(raw, *region))
+                (output / path.name).write_bytes(raw)
+            if key not in regions[region]:
+                raise AssertionError("Missing stopped native terrain witness")
+            payload = regions[region][key]
+            tag = _nbt(_decompress(payload[5:], payload[4]))
+            if (type(tag.get("DataVersion")) is not nbtlib.Int or int(tag["DataVersion"]) != DATA_VERSION
+                    or "Level" in tag or any(type(tag.get(name)) is not nbtlib.Int for name in ("xPos", "zPos"))
+                    or tuple(int(tag[name]) for name in ("xPos", "zPos")) != key):
+                raise AssertionError("Saved chunk differs from its native4790 region slot")
+            (output / f"{cx}_{cz}.chunk").write_bytes(payload)
+            chunk = plain(tag.unpack())
+            sections, tiles = {}, {}
+            for section in chunk["sections"]:
+                section_y = section["Y"]
+                if section_y in sections or any(name in section for name in ("Blocks", "Palette", "BlockStates")):
+                    raise AssertionError("Duplicate section or historical target palette")
+                states = section.get("block_states")
+                sections[section_y] = decode_palette(states["palette"], states.get("data", [])) if states else None
+            for tile in chunk["block_entities"]:
+                location = tuple(tile[axis] for axis in ("x", "y", "z"))
+                if location in tiles:
+                    raise AssertionError("Duplicate stopped block entity")
+                if "keepPacked" in tile:
+                    if tile.pop("keepPacked") != 0:
+                        raise AssertionError("Unreviewed packed block-entity representation")
+                tiles[location] = tile
+            chunks[key] = sections, tiles
+        sections, tiles = chunks[key]
+        palette = sections.get(y // 16)
+        block = palette[((y & 15) << 8) | ((z & 15) << 4) | (x & 15)] if palette else {"Name": "minecraft:air"}
+        if (block["Name"], block.get("Properties", {})) != (row["actualName"], row["properties"]):
+            raise AssertionError("Stopped block differs from actual live state: " + str(pos))
+        if tiles.get(pos) != (plain(parse_nbt(row)) if row.get("nbtBase64") else None):
+            raise AssertionError("Stopped block entity differs exactly from live NBT: " + str(pos))
+    if not identities:
+        raise AssertionError("Empty migration witnesses cannot qualify")
+    result = dict(status="PASS", scope=SCOPE, witnesses=len(rows), nativeDataVersion=DATA_VERSION,
+                  worldGenSettings=plain(settings.unpack()), playerAuthority=player_authority(world),
+                  files={path.name: digest(path) for path in output.iterdir()})
+    write_json(output / "receipt.json", result)
+    return result
+
+
+def turbine(world, position):
+    x, _, z = position
+    cx, cz = x // 16, z // 16
+    path = layout.region_file(world, "minecraft:overworld", cx, cz, "entities")
+    payloads = dict(_payloads(regular_bytes(path), cx // 32, cz // 32))
+    entities = _entity_chunk(payloads[(cx, cz)], (cx, cz), DATA_VERSION)
+    found = [tag for tag in entities if str(tag["id"]) == "baseelectric:hydroturbine"]
+    if len(found) != 1:
+        raise AssertionError("Expected exactly one stopped native turbine")
+    tag = found[0]
+    words = tag.get("UUID")
+    if type(words) is not nbtlib.IntArray or len(words) != 4 or any(key in tag for key in ("UUIDMost", "UUIDLeast")):
+        raise AssertionError("Turbine requires its native UUID int[4]")
+    return dict(id=str(tag["id"]), parent=list(map(int, tag["parentPos"])),
+                position=list(map(float, tag["Pos"])), uuid=list(uuid_longs(words.tolist())))
+
+
+def copy_source(source, runtime):
+    before = fingerprint(Path(source) / WORLD)
+    shutil.copytree(Path(source) / WORLD, Path(runtime) / WORLD)
+    if fingerprint(Path(runtime) / WORLD) != before:
+        raise AssertionError("Disposable world differs from its sealed source")
+    overlay = {}
+    config = Path(source) / "config"
+    if config.is_dir():
+        for path in sorted(config.rglob("*")):
+            if not path.is_file():
+                continue
+            relative = path.relative_to(config)
+            target = Path(runtime) / "config" / relative
+            if relative.as_posix() == "fml.toml" and target.is_file():
+                overlay[str(relative)] = dict(authority="NATIVE_TARGET_LOADER", sourceSha256=digest(path), targetSha256=digest(target))
+                continue
+            if target.exists() and regular_bytes(target) != regular_bytes(path):
+                raise AssertionError("Unreviewed target/source configuration collision: " + str(relative))
+            target.parent.mkdir(parents=True, exist_ok=True)
+            shutil.copy2(path, target)
+    write_json(Path(runtime) / "historical-config-custody.json", overlay)
+
+
+def with_server(runtime, java, label, action, *, server_type=None):
+    native = engine()
+    server = (server_type or native.Server)(runtime, java, native.LAUNCHER, label)
+    try:
+        action(server)
+        server.send("tick freeze")
+        server.wait("The game is frozen", 30)
+        server.snapshot(label)
+        server.send("save-all flush")
+        server.wait("Saved the game", 30)
+    except BaseException as failure:
+        try:
+            server.close()
+        except BaseException as shutdown:
+            failure.add_note("Shutdown/log audit also failed: " + repr(shutdown))
+        raise
+    else:
+        server.close()
+    return read_json(Path(runtime) / f"migration-{label}.json")
+
+
+def read_source(args):
+    if args.source_route not in (*LEGACY_ROUTES, *SOURCE_VERSIONS):
+        raise AssertionError("Unsupported explicit source route")
+    source = Path(args.source).resolve(strict=True)
+    reference = Path(args.legacy_reference).resolve(strict=True) if args.legacy_reference else source
+    path = reference / args.source_receipt_name
+    validate_hash(path, args.receipt_sha256)
+    prior = read_json(path)
+    restart = prior["phases"]["restarted"]
+    version = prior.get("minecraft", "1.20.1" if args.legacy_reference else None)
+    serialized = restart.get("serialized", {})
+    if (not isinstance(version, str) or version not in SOURCE_VERSIONS or type(serialized.get("nativeDataVersion")) is not int
+            or serialized["nativeDataVersion"] != SOURCE_VERSIONS[version]):
+        raise AssertionError("Unproven sealed source version/data-version pair")
+    if prior.get("status") != "PASS" or prior.get("sourceUnchanged") is not True or restart.get("status") != "PASS":
+        raise AssertionError("Missing passing immutable source and restart proof")
+    if not args.legacy_reference and args.source_route in SOURCE_VERSIONS and args.source_route != version:
+        raise AssertionError("Source route differs from the sealed receipt platform")
+    if args.source_route in LEGACY_ROUTES and not args.legacy_reference:
+        raise AssertionError("Raw historical routes require their independent reference")
+    snapshot = reference / "migration-restarted.json"
+    validate_hash(snapshot, restart["snapshotSha256"])
+    if args.legacy_reference:
+        route = args.source_route
+        allowed = {**LEGACY_SOURCE_VERSIONS, **{name: number for name, number in SOURCE_VERSIONS.items() if number < 3465}}
+        if version != "1.20.1" or route not in allowed:
+            raise AssertionError("Historical bridge requires a sealed 1.20.1 reference and an older source route")
+        portable = lambda values: {key.replace("\\", "/"): value.upper() for key, value in values.items()}
+        if source != Path(prior["source"]).resolve() or portable(fingerprint(source)) != portable(prior["sourceFingerprint"]):
+            raise AssertionError("Original historical source no longer matches its independent reference")
+        level = layout._load(source / WORLD / "level.dat").get("Data", {})
+        if type(level.get("DataVersion")) is not nbtlib.Int or int(level["DataVersion"]) != allowed[route]:
+            raise AssertionError("Historical route differs from the immutable source level version")
+    return source, reference, path, prior, version, read_json(snapshot)
+
+
+def run(args, *, server_type=None, stage_function=None, hook_only=False):
+    if type(hook_only) is not bool:
+        raise ValueError("Hook-only scope must be explicitly boolean")
+    source, reference, prior_path, prior, version, old_rows = read_source(args)
+    native = engine()
+    staging = stage_function or native.stage
+    target = native.read_family_target(args.profile, args.seed, args.inventory, args.inventory_sha256)
+    if set(target[2]) != MOD_IDS:
+        raise AssertionError("Migration requires exactly six frozen production jars")
+    java, java_version = native.java25(args.java)
+    root = output_path(args.output)
+    for protected in (source, reference, args.seed, args.profile, args.inventory, java, *(row[1] for row in target[2].values())):
+        require_disjoint(root, protected)
+    before, seed_before, reference_before = fingerprint(source), fingerprint(args.seed), fingerprint(reference)
+    protected = {Path(args.profile): digest(args.profile), Path(args.inventory): digest(args.inventory),
+                 prior_path: digest(prior_path), java: digest(java), **oracle_closure()}
+    protected.update({Path(path): checksum for _, path, checksum in target[2].values()})
+    root.mkdir(parents=True, exist_ok=False)
+    runtime = root / "runtime"
+    receipt = root / "native2612-upgrade-results.json"
+    result = dict(status="RUNNING", scope=HOOK_SCOPE if hook_only else SCOPE,
+                  minecraft=MINECRAFT, forge=FORGE, runtime=str(runtime),
+                  qualificationStatus="EXPLORATORY_UNQUALIFIED",
+                  route=args.source_route, source=str(source), sourceReceiptSha256=digest(prior_path),
+                  profileSha256=digest(args.profile), javaSha256=digest(java), javaVersion=java_version,
+                  playerConversionQualified=False, inputHashes={str(path): sha for path, sha in protected.items()}, phases={})
+    if hook_only:
+        result.update(qualificationAllowed=False, operationNotRun=dict(status="NOT_RUN",
+                      reason="Explicit non-consuming instrumented hook scope; not operating qualification"))
+    write_json(receipt, result)
+    expected = None
+    try:
+        expected = staging(runtime, *target, args.port)
+        copy_source(source, runtime)
+        fixture = read_json(reference / "migration-fixture.json")
+        write_json(runtime / "migration-fixture.json", fixture)
+        positions = {row["name"]: [row[axis] for axis in ("x", "y", "z")] for row in fixture}
+        saves = []
+        for label in ("converted", "restarted"):
+            rows = with_server(runtime, java, label, lambda server: None, server_type=server_type)
+            phase = comparison(old_rows, rows, modern=True, source_version=version)
+            phase["snapshotSha256"] = digest(runtime / f"migration-{label}.json")
+            result["phases"][label] = phase
+            write_json(receipt, result)
+            if phase["status"] != "PASS":
+                raise AssertionError("Strict source witness mismatch: " + repr(phase["differences"][:5]))
+            phase["serialized"] = capture(runtime, label, rows)
+            phase["turbine"] = turbine(runtime / WORLD, positions["hydroGenerator"])
+            if phase["turbine"] != prior["phases"]["restarted"]["turbine"]:
+                raise AssertionError("Turbine UUID, parent or position changed")
+            saves.append((rows, phase["serialized"]["worldGenSettings"]))
+        if saves[0][1] != saves[1][1] or comparison(saves[0][0], saves[1][0], modern=False)["status"] != "PASS":
+            raise AssertionError("Machine NBT or full worldgen settings changed on restart")
+        if not hook_only:
+            operation = bind(previous.operate, stage=staging, copy_source=copy_source,
+                             with_server=lambda *a: with_server(*a, server_type=server_type),
+                             verify_runtime=native.verify_runtime, load_operating_chunks=load_operating_chunks)
+            result["phases"]["operation"] = operation(root / "operation", runtime, target, java, args.port, positions, saves[1][0])
+        result["status"] = "PASS"
+    except BaseException as failure:
+        result.update(status="FAIL", failure=repr(failure), traceback=traceback.format_exc())
+        raise
+    finally:
+        try:
+            if expected is not None:
+                native.verify_runtime(runtime, target[1], expected)
+            result["sourceUnchanged"] = fingerprint(source) == before
+            result["seedUnchanged"] = fingerprint(args.seed) == seed_before
+            result["referenceUnchanged"] = fingerprint(reference) == reference_before
+            result["inputsUnchanged"] = all(digest(path) == checksum for path, checksum in protected.items())
+            if not all(result[key] for key in ("sourceUnchanged", "seedUnchanged", "referenceUnchanged", "inputsUnchanged")):
+                raise AssertionError("Protected migration inputs changed")
+        except Exception as audit:
+            result.update(status="FAIL", auditError=repr(audit))
+        write_json(receipt, result)
+    return int(result["status"] != "PASS")
+
+
+def parser():
+    result = argparse.ArgumentParser(description=__doc__)
+    for name in ("source", "profile", "seed", "inventory", "java", "output"):
+        result.add_argument("--" + name, type=lambda value: Path(value).resolve(), required=True)
+    result.add_argument("--legacy-reference", type=lambda value: Path(value).resolve())
+    result.add_argument("--source-route", choices=(*LEGACY_ROUTES, *SOURCE_VERSIONS), required=True)
+    result.add_argument("--source-receipt-name", required=True)
+    for name in ("receipt-sha256", "inventory-sha256"):
+        result.add_argument("--" + name, required=True)
+    result.add_argument("--port", type=int, required=True)
+    return result
+
+
+def main():
+    cli = parser()
+    args = cli.parse_args()
+    if not 1024 <= args.port <= 65535 or (args.source_route in LEGACY_ROUTES and not args.legacy_reference):
+        cli.error("Require an unprivileged assigned port and an independent reference for raw historical routes")
+    return run(args)
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/test-rig/migration/native2612_worldgen.py b/test-rig/migration/native2612_worldgen.py
new file mode 100644
index 00000000..9f174ad1
--- /dev/null
+++ b/test-rig/migration/native2612_worldgen.py
@@ -0,0 +1,155 @@
+"""Native64 normal-world sampling with lossless separate WorldGenSettings custody."""
+
+import copy
+from pathlib import Path
+import shutil
+
+from matrix import digest, write_json
+from native117 import output_path
+import native12111_worldgen as previous
+import native2612 as native
+import native2612_layout as layout
+from native2612_resources import FAMILY, arguments, bind, preflight, require
+
+
+CAMPAIGNS = ("advantage", "legacy-import")
+WORLD = previous.WORLD
+RESULT = "native2612-worldgen-results.json"
+validate_profile = previous.validate_profile
+validate_initial_hierarchy = previous.validate_initial_hierarchy
+mutated_profile = previous.mutated_profile
+check_files = previous.check_files
+validate_sample = bind(previous.validate_sample, native=native)
+configure_normal_world = previous.configure_normal_world
+_campaign_spec = bind(previous.campaign_spec, native=native)
+
+
+def campaign_spec(name):
+    require(name in CAMPAIGNS, "Worldgen route lacks an approved native64 provider pin: " + name)
+    return _campaign_spec(name)
+
+
+def select_mods(mods, spec):
+    require(set(mods) == FAMILY and spec["requiredMods"] <= mods.keys(),
+            "Worldgen needs all six exact frozen jars without an unpinned provider")
+    return dict(mods)
+
+
+def normal_world(world):
+    level = layout.read_level(world)
+    require(str(level["LevelName"]) == WORLD, "Unexpected native normal-world identity")
+    require("WorldGenSettings" not in level, "Historical embedded settings are not native64 authority")
+    saved = layout.read_worldgen(world)
+    data = saved["data"]
+    generator = data["dimensions"]["minecraft:overworld"]["generator"]
+    require(str(generator["type"]) == "minecraft:noise" and str(generator["settings"]) == "minecraft:overworld",
+            "Must sample actual normal terrain, not the flat machine fixture")
+    require(type(data["seed"]) is layout.nbtlib.Long, "Missing native world seed")
+    # Retain the complete native SavedData envelope, not a projected set of known settings.
+    return copy.deepcopy(saved)
+
+
+def validate_restart(first, restart, spec):
+    previous.validate_restart(first, restart, spec)
+    for field in ("counts", "biomeViolations", "biomeBoundaryBlocks"):
+        require(first[field] == restart[field], "Native64 restart measurements changed; no historical exclusion is inherited")
+
+
+class WorldgenServer(native.Server):
+    @staticmethod
+    def unexpected_line(line):
+        return native.Server.unexpected_line(line) or any(marker in line for marker in (
+            "Worldgen sample failed", "Advantage Works command failed"))
+
+
+def run(args):
+    require(type(args.sample_timeout) is int and 300 <= args.sample_timeout <= 3600, "Bound the sampling deadline")
+    spec = campaign_spec(args.campaign)
+    inputs = preflight(args, [Path(__file__), Path(previous.__file__), spec["template"],
+                              *(source for source, _ in spec["configFixtures"])])
+    mods = select_mods(inputs.mods, spec)
+    native.require_free_port(args.port)
+    if args.preflight_only:
+        return dict(status="READY_NOT_RUN", qualificationAllowed=False, campaign=args.campaign, **inputs.receipt())
+    runtime = output_path(args.output)
+    expected = native.stage(runtime, *inputs.target, args.port)
+    shutil.copy2(Path(__file__), runtime / "native2612-worldgen-source.py")
+    configure_normal_world(runtime, spec, args.port)
+    for source, destination in spec["configFixtures"]:
+        path = runtime / destination
+        path.parent.mkdir(parents=True, exist_ok=True)
+        shutil.copy2(source, path)
+    report = dict(status="RUNNING", campaign=args.campaign, **inputs.receipt(), phases={})
+    server, initial, saved_settings = None, None, None
+    pids = []
+    try:
+        for phase in ("initial", "restart"):
+            native.verify_runtime(runtime, inputs.target[1], expected)
+            server = WorldgenServer(runtime, inputs.java, native.LAUNCHER, "worldgen-" + phase)
+            pids.append(server.process.pid)
+            require(len(pids) == len(set(pids)), "Worldgen restart reused a process")
+            server.send("gamerule minecraft:spawn_mobs false")
+            server.send("advworks sample-worldgen " + str(spec["worldgenSampleRadius"]))
+            server.wait("Worldgen sample wrote ", args.sample_timeout)
+            sample_file = runtime / "advantage-works-results/worldgen-sample.json"
+            sample = native.read_json(sample_file)
+            shutil.copy2(sample_file, runtime / f"worldgen-{phase}.json")
+            validate_sample(sample, spec, mods)
+            server.send("save-all flush")
+            server.wait("Saved the game", 30)
+            server.close()
+            server = None
+            world = runtime / WORLD
+            settings = normal_world(world)
+            raw = layout.shared_file(world, "minecraft:world_gen_settings")
+            for source, name in ((world / "level.dat", f"level-{phase}.dat"),
+                                 (raw, f"world-gen-settings-{phase}.dat")):
+                shutil.copy2(source, runtime / name)
+            profile_path = world / "serverconfig/orespawn-worldgen.json"
+            profile = native.read_json(profile_path)
+            write_json(runtime / f"orespawn-profile-{phase}.json", profile)
+            prefix = "first" if phase == "initial" else "restart"
+            assertions = validate_profile(profile, spec[prefix + "ProfileAssertions"])
+            check_files(runtime, spec[prefix + "FileAssertions"])
+            for source, destination in spec["configFixtures"]:
+                require(digest(runtime / destination) == inputs.hashes[str(source)], "Legacy import rewrote its source")
+            if initial is None:
+                validate_initial_hierarchy(profile, mods, legacy=args.campaign == "legacy-import")
+                initial, saved_settings = sample, settings
+                if spec["profileMutations"]:
+                    write_json(profile_path, mutated_profile(profile, spec["profileMutations"]))
+            else:
+                validate_restart(initial, sample, spec)
+                require(settings == saved_settings, "Native worldgen SavedData changed across restart")
+            report["phases"][phase] = dict(status="PASS", pid=pids[-1], assertions=assertions,
+                                            sampleSha256=digest(runtime / f"worldgen-{phase}.json"),
+                                            stoppedLevelSha256=digest(runtime / f"level-{phase}.dat"),
+                                            stoppedSettingsSha256=digest(runtime / f"world-gen-settings-{phase}.dat"))
+            write_json(runtime / RESULT, report)
+        report["status"] = "PASS"
+    except BaseException as failure:
+        report.update(status="FAIL", error=repr(failure))
+        raise
+    finally:
+        try:
+            if server is not None:
+                server.close()
+            native.verify_runtime(runtime, inputs.target[1], expected)
+            report["sourceUnchanged"] = inputs.unchanged()
+        except BaseException as failure:
+            report.update(status="FAIL", custodyError=repr(failure))
+            raise
+        finally:
+            write_json(runtime / RESULT, report)
+    return report
+
+
+def main():
+    parser = arguments(__doc__)
+    parser.add_argument("--campaign", choices=CAMPAIGNS, required=True)
+    parser.add_argument("--sample-timeout", type=int, default=1800)
+    print(run(parser.parse_args())["status"], flush=True)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/test-rig/migration/test_native2612.py b/test-rig/migration/test_native2612.py
new file mode 100644
index 00000000..d8dac464
--- /dev/null
+++ b/test-rig/migration/test_native2612.py
@@ -0,0 +1,223 @@
+"""Bounded process/custody negatives plus the actual selected SDK logging source."""
+
+import json
+import os
+from pathlib import Path
+import socket
+import tempfile
+import unittest
+from unittest.mock import patch
+from zipfile import ZipFile
+
+import native2612 as native
+
+
+SDK = Path(os.environ.get("NATIVE2612_TEST_SDK",
+           "D:/BaseMetals/.verification-basemetals2612/runtime-64.1.5-server"))
+LOGGING = SDK / f"libraries/net/minecraftforge/fmlloader/{native.FORGE_VERSION}/fmlloader-{native.FORGE_VERSION}.jar"
+
+
+class Native2612GuardsTest(unittest.TestCase):
+    def setUp(self):
+        self.temp = tempfile.TemporaryDirectory()
+        self.addCleanup(self.temp.cleanup)
+        self.root = Path(self.temp.name).resolve()
+
+    def test_all_inherited_option_channels_fail(self):
+        for key in ("JAVA_TOOL_OPTIONS", "JDK_JAVA_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH"):
+            with self.subTest(key=key), patch.dict(os.environ, {key: "injected"}, clear=True):
+                with self.assertRaises(ValueError):
+                    native.native_launch_environment()
+
+    def test_empty_environment_is_not_given_an_agent(self):
+        with patch.dict(os.environ, {}, clear=True):
+            self.assertEqual({}, native.native_launch_environment())
+
+    def test_wrong_java_hash_fails_before_execution(self):
+        executable = self.root / "java.exe"
+        executable.write_bytes(b"wrong Java")
+        with patch.object(native.subprocess, "run") as run:
+            with self.assertRaises(AssertionError):
+                native.java25(executable)
+            run.assert_not_called()
+
+    def test_hash_pin_is_required_and_not_coerced(self):
+        file = self.root / "input"
+        file.write_bytes(b"exact")
+        for sha in (None, "", "pending", "0" * 63):
+            with self.subTest(sha=sha), self.assertRaises(ValueError):
+                native.validate_hash(file, sha)
+        with self.assertRaises(AssertionError):
+            native.validate_hash(file, "0" * 64)
+        native.validate_hash(file, native.digest(file))
+
+    def test_duplicate_document_fields_fail_closed(self):
+        path = self.root / "profile.json"
+        path.write_text('{"mods":[],"mods":["hidden"]}')
+        with self.assertRaises(ValueError):
+            native.read_json(path)
+
+    def test_missing_family_mod_does_not_create_runtime(self):
+        runtime = self.root / "not-created"
+        for missing in native.VERSIONS:
+            mods = {key: (version, self.root / (key + ".jar"), "0" * 64)
+                    for key, version in native.VERSIONS.items() if key != missing}
+            with self.subTest(missing=missing), patch.dict(os.environ, {}, clear=True), self.assertRaises(ValueError):
+                native.stage(runtime, self.root, {}, mods, 26660)
+            self.assertFalse(runtime.exists())
+
+    def test_occupied_port_does_not_get_reclaimed(self):
+        with socket.socket() as occupied:
+            occupied.bind(("127.0.0.1", 0))
+            occupied.listen()
+            with self.assertRaises(ValueError):
+                native.require_free_port(occupied.getsockname()[1])
+            self.assertGreater(occupied.fileno(), -1)
+
+    def test_invalid_ports_fail_without_coercion(self):
+        for port in (True, "26660", 80, 65536, -1):
+            with self.subTest(port=port), self.assertRaises(ValueError):
+                native.require_free_port(port)
+
+    def settings(self, value):
+        (self.root / "server.properties").write_text(value)
+
+    def test_pause_guard_is_explicit(self):
+        for pause in ("", "pause-when-empty-seconds=0\n", "pause-when-empty-seconds=60\n"):
+            self.settings("server-ip=127.0.0.1\nserver-port=26660\n" + pause)
+            with self.subTest(pause=pause), self.assertRaises(ValueError):
+                native.require_launch_settings(self.root)
+
+    def test_duplicate_settings_fail_before_port_probe(self):
+        self.settings("server-port=26660\nserver-port=26661\n")
+        with patch.object(native, "require_free_port") as probe:
+            with self.assertRaises(ValueError):
+                native.require_launch_settings(self.root)
+            probe.assert_not_called()
+
+    def test_good_settings_check_actual_selected_port(self):
+        self.settings("server-ip=127.0.0.1\nserver-port=26660\npause-when-empty-seconds=-1\n")
+        with patch.object(native, "require_free_port") as probe:
+            native.require_launch_settings(self.root)
+            probe.assert_called_once_with(26660)
+
+    def manifest(self, **changes):
+        document = dict(format=1, purpose="NATIVE64_MIXIN_EXPORT_DIAGNOSTIC",
+                        runtime=str(self.root), label="order-a", properties={"mixin.debug.export": True})
+        document.update(changes)
+        path = self.root / "diagnostic.json"
+        path.write_text(json.dumps(document))
+        return path
+
+    def test_diagnostic_manifest_is_explicit_and_nonqualifying(self):
+        path = self.manifest()
+        with patch.dict(os.environ, {}, clear=True):
+            environment = native.native_launch_environment(self.root, "order-a", diagnostic_environment=path,
+                                                          diagnostic_environment_sha256=native.digest(path))
+        self.assertEqual(environment, {"JAVA_TOOL_OPTIONS": "-Dmixin.debug.export=true"})
+        receipt = native.read_json(self.root / "native64-launch-environment-order-a.json")
+        self.assertFalse(receipt["qualificationAllowed"])
+        self.assertEqual("DIAGNOSTIC_NOT_QUALIFIED", receipt["status"])
+        with patch.dict(os.environ, {}, clear=True), self.assertRaises(FileExistsError):
+            native.native_launch_environment(self.root, "order-a", diagnostic_environment=path,
+                                             diagnostic_environment_sha256=native.digest(path))
+
+    def test_old_purpose_wrong_binding_and_injected_agent_rejected(self):
+        for change in (dict(purpose="NATIVE61_MIXIN_EXPORT_DIAGNOSTIC"), dict(label="another"),
+                       dict(properties={"mixin.debug.export": True, "javaagent": "hidden"})):
+            path = self.manifest(**change)
+            with self.subTest(change=change), patch.dict(os.environ, {}, clear=True), self.assertRaises(ValueError):
+                native.native_launch_environment(self.root, "order-a", diagnostic_environment=path,
+                                                 diagnostic_environment_sha256=native.digest(path))
+        self.assertFalse((self.root / "native64-launch-environment-order-a.json").exists())
+
+    def test_diagnostic_tamper_is_preserved_not_resealed(self):
+        path = self.manifest()
+        pin = native.digest(path)
+        path.write_text(path.read_text() + " ")
+        with patch.dict(os.environ, {}, clear=True), self.assertRaises(AssertionError):
+            native.native_launch_environment(self.root, "order-a", diagnostic_environment=path,
+                                             diagnostic_environment_sha256=pin)
+
+    @staticmethod
+    def complete_log():
+        return "\n".join((f"Forge mod loading, version {native.FORGE}, for MC {native.MINECRAFT} with MCP {native.MCP}",
+                          f"Starting minecraft server version {native.MINECRAFT}", "Done (0.1s)!",
+                          "Stopping server", "All dimensions are saved"))
+
+    def test_real_boot_requires_all_witnesses_in_order(self):
+        text = self.complete_log()
+        native.require_complete_boot(text, stop_sent=True, returncode=0)
+        for line in text.splitlines():
+            with self.subTest(line=line), self.assertRaises(AssertionError):
+                native.require_complete_boot(text.replace(line, ""), stop_sent=True, returncode=0)
+        with self.assertRaises(AssertionError):
+            native.require_complete_boot("\n".join(reversed(text.splitlines())), stop_sent=True, returncode=0)
+
+    def test_crash_exit_zero_and_external_termination_are_not_cold_stop(self):
+        with self.assertRaises(AssertionError):
+            native.require_complete_boot("Crash report saved", stop_sent=False, returncode=0)
+        with self.assertRaises(AssertionError):
+            native.require_complete_boot(self.complete_log(), stop_sent=False, returncode=0)
+        with self.assertRaises(AssertionError):
+            native.require_complete_boot(self.complete_log(), stop_sent=True, returncode=1)
+
+    def test_earlier_autosave_and_explicit_flush_cannot_shadow_final_save(self):
+        text = self.complete_log().replace("Done (", "All dimensions are saved\nDone (")
+        text = text.replace("Stopping server", "All dimensions are saved\nStopping server")
+        native.require_complete_boot(text, stop_sent=True, returncode=0)
+        without_final = text.rsplit("All dimensions are saved", 1)[0]
+        with self.assertRaisesRegex(AssertionError, "All dimensions are saved"):
+            native.require_complete_boot(without_final, stop_sent=True, returncode=0)
+
+    def test_stop_before_done_or_save_before_stop_cannot_qualify(self):
+        misordered = self.complete_log().replace("Done (0.1s)!\nStopping server", "Stopping server\nDone (0.1s)!")
+        with self.assertRaisesRegex(AssertionError, "Stopping server"):
+            native.require_complete_boot(misordered, stop_sent=True, returncode=0)
+        no_final_flush = self.complete_log().replace("Stopping server\nAll dimensions are saved",
+                                                   "All dimensions are saved\nStopping server")
+        with self.assertRaisesRegex(AssertionError, "All dimensions are saved"):
+            native.require_complete_boot(no_final_flush, stop_sent=True, returncode=0)
+
+    def test_formatter_faults_and_debug_runtime_errors_stay_failures(self):
+        for text in ("Unable to write to stream DebugFile", "java.lang.ExceptionInInitializerError",
+                     "[now] [main/DEBUG] [mod/]: java.lang.IllegalStateException: actual defect",
+                     "[now] [main/ERROR] [io.netty.channel.epoll.Epoll/]: Epoll support is not available",
+                     "Server empty for 60 seconds, pausing"):
+            with self.subTest(text=text):
+                self.assertTrue(native.log_findings(text)[0])
+
+
+class Native2612SelectedSdkTest(unittest.TestCase):
+    def test_selected_sdk_identity_and_compact_headers(self):
+        inventory = native.inspect_seed(SDK)
+        self.assertEqual("26.1.2-64.1.5", inventory["forge"])
+        self.assertEqual(96, len(inventory["files"]))
+        self.assertEqual(native.SHIM_SHA, inventory["files"][native.SHIM]["sha256"])
+
+    def test_actual_logging_adapter_changes_only_two_renderers(self):
+        native.validate_hash(LOGGING, native.LOGGING_JAR_SHA)
+        with ZipFile(LOGGING) as jar:
+            original = jar.read("log4j2.xml")
+        changed = native.plain_logging_bytes(original)
+        self.assertEqual(original.replace(b"%xEx", b"%ex"), changed)
+        self.assertIn(b'forge.logging.debugFile.level:-debug', changed)
+        self.assertIn(b'<Root level="all">', changed)
+        self.assertEqual(2, original.count(b"%xEx"))
+        with self.assertRaises(AssertionError):
+            native.plain_logging_bytes(original.replace(b'level="all"', b'level="info"'))
+
+    def test_logging_custody_rejects_existing_configuration_tamper(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            native.logging_configuration(root, LOGGING)
+            native.logging_configuration(root, LOGGING)
+            config = root / "forge64-log4j2-plain-stacktraces.xml"
+            config.write_bytes(config.read_bytes() + b"<!--tamper-->")
+            with self.assertRaises(AssertionError):
+                native.logging_configuration(root, LOGGING)
+            self.assertTrue(config.read_bytes().endswith(b"<!--tamper-->"))
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/test-rig/migration/test_native2612_actor_transformer_order.py b/test-rig/migration/test_native2612_actor_transformer_order.py
new file mode 100644
index 00000000..047cfc07
--- /dev/null
+++ b/test-rig/migration/test_native2612_actor_transformer_order.py
@@ -0,0 +1,274 @@
+import base64
+import copy
+import gzip
+import io
+import json
+from pathlib import Path
+import tempfile
+from types import SimpleNamespace
+import unittest
+from unittest.mock import patch
+
+import nbtlib as nbt
+
+import native2612_actor_transformer_order as target
+
+
+def expected_state():
+    stack = dict(id="basesteam:musket", count=1, components={
+        "minecraft:damage": 5, "minecraft:enchantments": dict.fromkeys(target.ENCHANTMENTS.values(), 1),
+        "minecraft:custom_data": {"Nested": {"OwnerNote": "keep-this-verbatim"},
+                                  "MigrationWitness": "steamadvantage:musket"}})
+    return dict(entities={"cart": {"Items": [dict(Slot=1, **copy.deepcopy(stack))]},
+                          "dropped-musket": {"Item": stack}})
+
+
+def source_level():
+    entries = [nbt.Compound(K=nbt.String(value.replace("basesteam:", "steamadvantage:")), V=nbt.Int(key))
+               for key, value in target.ENCHANTMENTS.items()]
+    return nbt.File({"Data": nbt.Compound(DataVersion=nbt.Int(512)),
+                     "FML": nbt.Compound(Registries=nbt.Compound({
+                         "minecraft:enchantments": nbt.Compound(ids=nbt.List[nbt.Compound](entries))}))})
+
+
+def source_entity(witness):
+    stack = nbt.Compound(id=nbt.String("steamadvantage:musket"), Count=nbt.Byte(1),
+        tag=nbt.Compound(ench=nbt.List[nbt.Compound]([
+            nbt.Compound(id=nbt.Short(key), lvl=nbt.Short(1)) for key in (11, 13, 10, 12)])))
+    if witness == "cart":
+        stack["Slot"] = nbt.Byte(1)
+        return nbt.File({"Items": nbt.List[nbt.Compound]([stack])})
+    return nbt.File({"Item": stack})
+
+
+def row(witness, value=None):
+    stream = io.BytesIO()
+    (value if value is not None else source_entity(witness)).write(stream)
+    return dict(witness=witness, nbtBase64=base64.b64encode(gzip.compress(stream.getvalue())).decode("ascii"))
+
+
+def source_record():
+    return dict(entities=[row(witness) for witness in target.WITNESSES])
+
+
+def context():
+    return target.source_context(source_level(), source_record(), expected_state())
+
+
+class SourceContextTest(unittest.TestCase):
+    def test_original_numeric_ids_and_saved_names_define_expected_not_target(self):
+        result = context()
+        self.assertFalse(result["targetObservationsUsed"])
+        self.assertEqual([11, 13, 10, 12], result["witnesses"]["cart"]["numericIds"])
+        self.assertEqual(expected_state()["entities"]["dropped-musket"]["Item"],
+                         result["witnesses"]["dropped-musket"]["expectedStack"])
+
+    def test_native_or_wrongly_typed_source_version_rejects(self):
+        for version in (nbt.Int(4790), nbt.Short(512), nbt.String("512")):
+            with self.subTest(version=version):
+                level = source_level()
+                level["Data"]["DataVersion"] = version
+                with self.assertRaisesRegex(AssertionError, "raw original110"):
+                    target.source_context(level, source_record(), expected_state())
+
+    def test_saved_registry_missing_collision_duplicate_or_typed_id_rejects(self):
+        for mutation in ("missing", "collision", "duplicate", "type"):
+            with self.subTest(mutation=mutation):
+                level = source_level()
+                entries = level["FML"]["Registries"]["minecraft:enchantments"]["ids"]
+                if mutation == "missing": entries.pop()
+                elif mutation == "collision": entries[0]["K"] = nbt.String("minecraft:binding_curse")
+                elif mutation == "duplicate": entries.append(copy.deepcopy(entries[0]))
+                else: entries[0]["V"] = nbt.Short(10)
+                with self.assertRaises(AssertionError):
+                    target.source_context(level, source_record(), expected_state())
+
+    def test_raw_enchantment_mutations_reject_for_both_entity_witnesses(self):
+        for witness in target.WITNESSES:
+            for mutation in ("string-id", "int-id", "level", "duplicate", "missing"):
+                with self.subTest(witness=witness, mutation=mutation):
+                    value = source_entity(witness)
+                    entries = target.item(value, witness, native_format=False)["tag"]["ench"]
+                    if mutation == "string-id": entries[0]["id"] = nbt.String("basesteam:powderless")
+                    elif mutation == "int-id": entries[0]["id"] = nbt.Int(11)
+                    elif mutation == "level": entries[0]["lvl"] = nbt.Short(2)
+                    elif mutation == "duplicate": entries[0]["id"] = nbt.Short(13)
+                    else: entries.pop()
+                    record = source_record()
+                    record["entities"] = [row(witness, value) if item["witness"] == witness else item
+                                          for item in record["entities"]]
+                    with self.assertRaises(AssertionError):
+                        target.source_context(source_level(), record, expected_state())
+
+    def test_missing_or_duplicate_source_entities_reject(self):
+        for values in ([], [row("cart"), row("cart"), row("dropped-musket")]):
+            with self.assertRaisesRegex(AssertionError, "source witness"):
+                target.source_context(source_level(), dict(entities=values), expected_state())
+
+    def test_historical_oracle_cannot_derive_curse_substitution_from_target(self):
+        changed = expected_state()
+        changed["entities"]["cart"]["Items"][0]["components"]["minecraft:enchantments"] = {"minecraft:binding_curse": 1}
+        with self.assertRaisesRegex(AssertionError, "Historical oracle"):
+            target.source_context(source_level(), source_record(), changed)
+
+    def test_preflight_requires_receipt_and_entire_original_fingerprint_before_output(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            source = root / "original"
+            (source / target.WORLD).mkdir(parents=True)
+            source_level().save(source / target.WORLD / "level.dat", gzipped=True)
+            target.write_json(source / "actors-source.json", source_record())
+            receipt = root / "approved.json"
+            target.write_json(receipt, dict(source=str(source), sourceFingerprint=target.fingerprint(source)))
+            args = SimpleNamespace(fixture=source, fixture_receipt=receipt,
+                                   fixture_receipt_sha256=target.digest(receipt), output=root / "never-created")
+            with patch.object(target.actors, "baseline", return_value=(expected_state(), "source")):
+                self.assertEqual(512, target.preflight(args)["context"]["sourceDataVersion"])
+                (source / "unapproved.txt").write_text("drift", encoding="ascii")
+                with self.assertRaisesRegex(AssertionError, "approved independent receipt"):
+                    target.preflight(args)
+            self.assertFalse(args.output.exists())
+            args.fixture_receipt_sha256 = "0" * 64
+            with self.assertRaises(AssertionError): target.preflight(args)
+
+
+class NativeWitnessTest(unittest.TestCase):
+    def test_all_fourteen_derived_controls_reject_without_altering_baseline(self):
+        actual = expected_state()
+        before = copy.deepcopy(actual)
+        result = target.negative_controls(context(), actual)
+        self.assertEqual(before, actual)
+        self.assertEqual(14, list(result["controls"].values()).count("REJECTED"))
+        self.assertIs(False, result["sourceOrWorldFilesMutated"])
+        self.assertIs(False, result["qualificationAllowed"])
+
+    def test_false_native_types_cannot_equal_expected_numbers(self):
+        for witness in target.WITNESSES:
+            for location, value in (("count", True), ("count", 1.0), ("wear", 5.0),
+                                    ("level", True), ("level", "1"), ("slot", True)):
+                if location == "slot" and witness != "cart": continue
+                with self.subTest(witness=witness, location=location, value=value):
+                    actual = expected_state()
+                    stack = target.item(actual["entities"][witness], witness, native_format=True)
+                    if location == "count": stack["count"] = value
+                    elif location == "wear": stack["components"]["minecraft:damage"] = value
+                    elif location == "slot": stack["Slot"] = value
+                    else: stack["components"]["minecraft:enchantments"]["basesteam:recoil"] = value
+                    with self.assertRaises(AssertionError): target.assert_witnesses(context(), actual)
+
+    def test_missing_duplicate_slot_and_renamed_native_musket_reject(self):
+        for mutation in ("missing", "duplicate", "slot", "namespace"):
+            actual = expected_state()
+            values = actual["entities"]["cart"]["Items"]
+            if mutation == "missing": values.clear()
+            elif mutation == "duplicate": values.append(copy.deepcopy(values[0]))
+            elif mutation == "slot": values[0]["Slot"] = 2
+            else: values[0]["id"] = "steamadvantage:musket"
+            with self.assertRaises(AssertionError): target.assert_witnesses(context(), actual)
+
+    def test_complete_unknown_custom_payload_is_part_of_exact_oracle(self):
+        actual = expected_state()
+        del actual["entities"]["dropped-musket"]["Item"]["components"]["minecraft:custom_data"]["Nested"]
+        with self.assertRaises(AssertionError): target.assert_witnesses(context(), actual)
+
+    def test_stopped_audit_cannot_accept_empty_failed_or_boolean_count(self):
+        with tempfile.TemporaryDirectory() as directory:
+            path = Path(directory) / "receipt.json"
+            for status, count in (("FAIL", 2), ("PASS", 0), ("PASS", 1), ("PASS", True), ("PASS", "2")):
+                target.write_json(path, dict(status=status, matchedEntities=count))
+                with self.assertRaises(AssertionError): target.raw_receipt(path)
+            target.write_json(path, dict(status="PASS", matchedEntities=2))
+            self.assertEqual(target.digest(path), target.raw_receipt(path)["sha256"])
+
+    def test_hook_only_is_not_actor_proof(self):
+        with self.assertRaisesRegex(ValueError, "all three"):
+            target.run_actor_campaign(SimpleNamespace(), server_type=object, stage_function=None, hook_only=True)
+
+    def test_actor_facade_binding_does_not_mutate_sealed_order_globals(self):
+        original, modes = target.order.upgrade, target.order.MODES
+        facade = SimpleNamespace()
+        campaign = target.bind(target.order.run, upgrade=facade, MODES=tuple(reversed(modes)))
+        self.assertIs(facade, campaign.__globals__["upgrade"])
+        self.assertIs(original, target.order.upgrade)
+        self.assertEqual(modes, target.order.MODES)
+        self.assertEqual(21, len(target.order.GUARD_CONTROLS) + len(target.order.WOVEN_CONTROLS))
+        self.assertEqual(("converted", "adapter", "restarted", "runtime", "runtime-restart"), target.PHASES)
+        self.assertEqual(("conversion", "restart", "runtime-restart"), target.STOP_PHASES)
+
+
+class CampaignContractTest(unittest.TestCase):
+    def exercise(self, root, mutation=None):
+        source = root / "source"
+        source.mkdir()
+        profile = root / "profile.json"
+        profile.write_text("{}", encoding="ascii")
+        args = SimpleNamespace(fixture=source, profile=profile, seed=root / "seed", inventory=root / "inventory",
+                               inventory_sha256="0" * 64, java=root / "java.exe", output=root / "campaign", port=26560)
+        approved = dict(context=context(), sourceFingerprint=target.fingerprint(source))
+
+        def route(actual_source, runtime, actual_target, values, **hooks):
+            self.assertEqual(source, actual_source)
+            self.assertEqual("actors", values.kind)
+            self.assertEqual(args.profile, values.target_manifest)
+            self.assertEqual("26.1.2", hooks["minecraft"])
+            self.assertIsNotNone(hooks["stop_audit"])
+            runtime.mkdir()
+            if mutation == "stop": raise RuntimeError("owned stop/raw audit failure")
+            for label in target.PHASES:
+                actual = expected_state()
+                if mutation == "curse" and label == "converted":
+                    actual["entities"]["cart"]["Items"][0]["components"]["minecraft:enchantments"] = {"minecraft:binding_curse": 1}
+                if mutation != "missing-phase" or label != "runtime-restart":
+                    target.write_json(runtime / ("semantic-" + label + ".json"), actual)
+            for label in target.STOP_PHASES:
+                path = runtime / "stopped-entity-evidence" / label / "receipt.json"
+                path.parent.mkdir(parents=True)
+                target.write_json(path, dict(status="FAIL" if mutation == "raw" else "PASS", matchedEntities=2))
+            return {} if mutation == "empty-checks" else {"conversion": dict(status="PASS"), "runtime-restart": dict(status="PASS")}
+
+        with patch.object(target, "preflight", return_value=approved), \
+             patch.object(target.native, "read_family_target", return_value=(args.seed, {}, {})), \
+             patch.object(target.native, "java25", return_value=(args.java, "25")), \
+             patch.object(target.actors, "run_route", side_effect=route):
+            if mutation:
+                with self.assertRaises((AssertionError, RuntimeError)):
+                    target.run_actor_campaign(args, server_type=object, stage_function=None)
+            else:
+                self.assertEqual(0, target.run_actor_campaign(args, server_type=object, stage_function=None))
+        return target.upgrade.read_json(args.output / "native2612-actor-order-campaign.json")
+
+    def test_complete_actor_campaign_requires_all_phases_raw_audits_and_controls(self):
+        with tempfile.TemporaryDirectory() as directory:
+            result = self.exercise(Path(directory))
+        self.assertEqual("PASS", result["status"])
+        self.assertEqual(set(target.PHASES), set(result["witnessChecks"]))
+        self.assertEqual(set(target.STOP_PHASES), set(result["rawAudits"]))
+        self.assertEqual(14, list(result["entityControls"]["controls"].values()).count("REJECTED"))
+        self.assertIs(False, result["qualificationAllowed"])
+        modes = dict.fromkeys(target.order.MODES, result)
+        self.assertTrue(target.all_orders_proven(dict(status="PASS"), modes))
+        for mutation in ("missing-mode", "failed-mode", "missing-phase", "failed-raw", "missing-control", "custody"):
+            changed = copy.deepcopy(modes)
+            first = changed[target.order.MODES[0]]
+            if mutation == "missing-mode": del changed[target.order.MODES[0]]
+            elif mutation == "failed-mode": first["status"] = "FAIL"
+            elif mutation == "missing-phase": del first["witnessChecks"]["converted"]
+            elif mutation == "failed-raw": first["rawAudits"]["conversion"]["status"] = "FAIL"
+            elif mutation == "missing-control": del first["entityControls"]["controls"]["cart/curse"]
+            else: first["sourceUnchanged"] = False
+            self.assertFalse(target.all_orders_proven(dict(status="PASS"), changed), mutation)
+        self.assertFalse(target.all_orders_proven(dict(status="FAIL"), modes))
+
+    def test_curse_missing_phase_empty_checks_and_failed_stop_are_retained_failures(self):
+        for mutation in ("curse", "missing-phase", "empty-checks", "raw", "stop"):
+            with self.subTest(mutation=mutation), tempfile.TemporaryDirectory() as directory:
+                result = self.exercise(Path(directory), mutation)
+                self.assertEqual("FAIL", result["status"])
+                self.assertTrue(result["sourceUnchanged"])
+                self.assertEqual("NOT_RUN", result["entityControls"]["status"])
+                if mutation == "stop": self.assertIn("stop/raw audit failure", result["error"])
+                if mutation == "curse": self.assertEqual("FAIL", result["witnessChecks"]["converted"]["status"])
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/test-rig/migration/test_native2612_actors.py b/test-rig/migration/test_native2612_actors.py
new file mode 100644
index 00000000..668cfcc7
--- /dev/null
+++ b/test-rig/migration/test_native2612_actors.py
@@ -0,0 +1,146 @@
+"""Native target layout and unchanged historical actor assertion controls."""
+import copy
+from pathlib import Path
+import tempfile
+import unittest
+import sys
+from unittest.mock import patch
+
+import nbtlib
+import native2612_actors as target
+import native2612_layout as layout
+from native117_actor_io import bind
+import test_native12111_actor_network_adapters as previous_adapters
+import test_native12111_actor_fixtures as previous_fixtures
+import test_native12111_actor_comparison as previous_comparison
+import test_native12111_stopped_actor_reference as previous_reference
+import native2612_actor_comparison as comparison
+import native2612_actor_fixtures as fixtures
+import native2612_stopped_actor_reference as reference
+from test_native117_entity_storage import entity, entry, put, root as entity_root
+
+
+def retained_controls(source, **bindings):
+    """Run every unchanged assertion against the new adapter, not its old module."""
+    values = {
+        name: bind(value, **bindings) if callable(value) and hasattr(value, '__code__') else value
+        for name, value in vars(source).items() if name not in ('__dict__', '__weakref__')}
+    values['__module__'] = __name__
+    return type('Native2612' + source.__name__, (unittest.TestCase,), values)
+
+
+Native2612FixtureControls = retained_controls(previous_fixtures.NativeActorFixtureControls,
+    legal_ender_batteries=fixtures.legal_ender_batteries, source_components=target.source_components)
+Native2612ComparisonControls = retained_controls(previous_comparison.NativeActorComparisonTest, diagnosis=comparison)
+Native2612StoppedReferenceControls = retained_controls(previous_reference.SourceStoppedReferenceTest, reference=reference)
+Native2612PayloadControls = retained_controls(previous_adapters.ActorAdapters, actor_driver=target)
+
+
+class Native2612Actors(unittest.TestCase):
+    def test_diagnostic_profile_cannot_be_run_without_explicit_provisional_scope(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            argv = ['native2612_actors.py', '--fixture', str(root), '--fixture-receipt', str(root / 'receipt.json'),
+                    '--fixture-receipt-sha256', '0' * 64, '--profile', str(root / 'profile.json'),
+                    '--seed', str(root / 'seed'), '--inventory', str(root / 'inventory.json'),
+                    '--inventory-sha256', '0' * 64, '--java', str(root / 'java'),
+                    '--output', str(root / 'output'), '--kind', 'actors', '--port', '28690']
+            with patch.object(sys, 'argv', argv), patch.object(target, 'output_path', return_value=root / 'output'), \
+                    patch.object(target.native, 'read_json', return_value={'diagnosticScope': 'context-only'}), \
+                    patch.object(target.native, 'read_family_target') as stage:
+                with self.assertRaisesRegex(ValueError, 'explicit --provisional'):
+                    target.main()
+                stage.assert_not_called()
+
+    def test_explicit_dimension_paths_do_not_use_legacy_basenames(self):
+        for key in layout.VANILLA_DIMENSIONS:
+            self.assertEqual(layout.dimension_directory(Path('world'), key),
+                             Path('world') / target.DIMENSION_PATHS[key][1])
+
+    def test_player_equipment_and_respawn_keep_exact_native_maps(self):
+        state = {'file': {'Inventory': [{'Slot': -106, 'id': 'basesteam:musket', 'count': 1,
+                    'components': {'minecraft:damage': 9}}], 'SpawnX': 1, 'SpawnY': 80,
+                    'SpawnZ': 3, 'SpawnDimension': -1, 'SpawnAngle': 27.0}, 'entities': {}}
+        result = target.expected_state(state, 'dimensions')
+        self.assertEqual([], result['file']['Inventory'])
+        self.assertEqual(9, result['file']['equipment']['offhand']['components']['minecraft:damage'])
+        self.assertEqual('minecraft:the_nether', result['file']['respawn']['dimension'])
+        actual = copy.deepcopy(result)
+        actual['file']['equipment']['offhand']['components']['minecraft:damage'] = 8
+        self.assertEqual('FAIL', target.verdict(target.actors.compare, result, actual)['status'])
+
+    def test_old_dimension_directory_and_wrong_snapshot_dimension_reject(self):
+        with tempfile.TemporaryDirectory() as root:
+            root = Path(root)
+            old = root / 'DIM-1'
+            old.mkdir()
+            with self.assertRaisesRegex(ValueError, 'native dimension'):
+                target.audit_entity_storage({}, old, root / 'evidence', dimension='minecraft:the_nether')
+
+    def test_native_helper_bytes_are_exact_and_old_contract_rejects(self):
+        root = Path(__file__).resolve().parents[1] / 'src/main/resources/assets/advantageworkstest'
+        document = dict(helperPolicy='native2612-leash-knot-nosave-v1',
+                        helperContractSha256=target.HELPER_CONTRACT_SHA, dimensions={},
+                        entityCount=0, nonpersistentHelperCount=0, observedEntityCount=0)
+        self.assertEqual('NOT_REQUIRED', target.validate_helpers(document, (root / 'native2612-helper-contract.json').read_bytes())['status'])
+        with self.assertRaises(AssertionError):
+            target.validate_helpers(document, (root / 'native12111-helper-contract.json').read_bytes())
+
+    def test_native_entity_audit_keeps_unknown_nbt_and_rejects_payload_loss(self):
+        with tempfile.TemporaryDirectory() as directory:
+            base = Path(directory)
+            world = layout.dimension_directory(base / 'world', 'minecraft:the_nether')
+            actor = entity()
+            chunk = entity_root((0, 0), [actor])
+            chunk['DataVersion'] = nbtlib.Int(4790)
+            path, _ = put(world, (0, 0), value=chunk)
+            before = path.read_bytes()
+            record = dict(entities=[entry(actor)], worldDimensionKey='minecraft:the_nether', dimension=-1)
+            receipt = target.audit_entity_storage(record, world, base / 'positive')
+            self.assertEqual(1, receipt['matchedEntities'])
+            self.assertEqual(-1, receipt['dimension'])
+            damaged = copy.deepcopy(actor)
+            damaged['Items'][0]['tag']['Private'] = nbtlib.String('lost')
+            with self.assertRaisesRegex(AssertionError, 'Complete saved entity NBT'):
+                target.audit_entity_storage(dict(record, entities=[entry(damaged)]), world, base / 'negative')
+            self.assertEqual(before, path.read_bytes())
+
+    def test_old_wolf_proof_cannot_relabel_native26_failure(self):
+        old = previous_adapters.NativeDifferenceAssessment()
+        old.setUp()
+        strict = target.verdict(target.dimensions.verdict, old.before, old.after)
+        with patch.object(target.native, 'validate_hash'), patch.object(target.native, 'read_json', return_value={'noPower': True}):
+            with self.assertRaisesRegex(ValueError, 'Historical wolf controls'):
+                target.assess_native(old.before, old.after, strict, Path('old-proof'), 'strict', True)
+
+    def test_native_wolf_assessment_keeps_raw_failure_and_rejects_unrelated_changes(self):
+        old = previous_adapters.NativeDifferenceAssessment()
+        old.setUp()
+        runtime = dict(minecraftVersion='26.1.2', targetDataVersion=4790,
+                       inheritedJvmEnvironmentAbsent=True, jvmArguments=['-XX:ActiveProcessorCount=4'],
+                       javaSha256=target.native.JAVA_SHA, mainClass='NativeWolfPlatformControl',
+                       classpath=[dict(sha256='EAF67CF3E6DD7D6546A315A64C5C89BD82C704C361321A081E5B219B3212BA46')])
+
+        def evidence(path):
+            if path.name == 'control-runtime.json':
+                return runtime
+            return dict(sourceDataVersion=int(path.stem.split('-')[1]), targetDataVersion=4790,
+                        noPower=True, uuidPreserved=True, ownerPreserved=True,
+                        sourceHealth=8, savedHealth=16, sourceMaxHealth=20, savedMaxHealth=40)
+
+        strict = target.verdict(target.dimensions.verdict, old.before, old.after)
+        with patch.object(target.native, 'validate_hash'), patch.object(target.native, 'read_json', side_effect=evidence):
+            result = target.assess_native(old.before, old.after, strict, Path('proof'), 'strict', True)
+            self.assertEqual('PASS_WITH_NATIVE_DIFFERENCE', result['status'])
+            self.assertEqual('FAIL', result['rawStrictResult']['status'])
+            changed = copy.deepcopy(old.after)
+            changed['player']['Inventory'][0]['Count'] = 16
+            bad = target.verdict(target.dimensions.verdict, old.before, changed)
+            self.assertEqual('FAIL', target.assess_native(old.before, changed, bad, Path('proof'), 'strict', True)['status'])
+            runtime['inheritedJvmEnvironmentAbsent'] = False
+            with self.assertRaisesRegex(ValueError, 'Historical wolf controls'):
+                target.assess_native(old.before, old.after, strict, Path('proof'), 'strict', True)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test-rig/migration/test_native2612_broad.py b/test-rig/migration/test_native2612_broad.py
new file mode 100644
index 00000000..a10a11b3
--- /dev/null
+++ b/test-rig/migration/test_native2612_broad.py
@@ -0,0 +1,172 @@
+"""Adapter rejection and orchestration controls; these tests launch no Minecraft."""
+
+from contextlib import redirect_stderr, redirect_stdout
+import io
+import json
+from pathlib import Path
+import subprocess
+import sys
+import tempfile
+import unittest
+from unittest.mock import patch
+
+import native2612_broad as broad
+from test_broad_campaign_status import passed
+
+
+class Native2612BroadTest(unittest.TestCase):
+    def setUp(self):
+        self.directory = tempfile.TemporaryDirectory(prefix="native26-broad-", dir=broad.native.RIG / "build")
+        self.addCleanup(self.directory.cleanup)
+        self.root = Path(self.directory.name).resolve()
+        self.output = self.root / "result"
+        self.seed = self.root / "seed"
+        self.seed.mkdir()
+        (self.seed / "protected").write_bytes(b"untouched seed")
+        self.profile = self.root / "profile.json"
+        self.inventory = self.root / "inventory.json"
+        self.java = self.root / "java.exe"
+        for path in (self.profile, self.inventory, self.java):
+            path.write_bytes(b"unit test only, never launched")
+        self.mods = {}
+        for name in broad.native.VERSIONS:
+            path = self.root / (name + ".jar")
+            path.write_bytes(name.encode("ascii"))
+            self.mods[name] = ("unit.2601021", path, broad.digest(path))
+
+    def arguments(self):
+        return ["--profile", str(self.profile), "--profile-sha256", broad.digest(self.profile),
+                "--seed", str(self.seed), "--inventory", str(self.inventory),
+                "--inventory-sha256", broad.digest(self.inventory), "--java", str(self.java),
+                "--output", str(self.output), "--port", "26600"]
+
+    def exercise(self, *, failed=False, changed_seed=False, changed_input=False, custody_failed=False):
+        def launch(*args, **kwargs):
+            self.assertEqual(args[2:5], (self.output, "packaged-current", 26600))
+            self.assertEqual(21, len(args[5]))
+            self.assertEqual(set(self.mods), set(kwargs["native118_target"][2]))
+            self.assertIs(broad.Adapter, kwargs["native_adapter"])
+            if changed_seed:
+                (self.seed / "protected").write_bytes(b"changed")
+            if changed_input:
+                self.profile.write_bytes(b"changed")
+            return dict(status="FAIL", profile="packaged-current", error="finite assertion failed") if failed else passed("packaged-current")
+        with patch.object(broad.native, "read_family_target", return_value=(self.seed, {}, self.mods)), \
+                patch.object(broad.native, "java25", return_value=(self.java, "Java25 unit fixture")), \
+                patch.object(broad, "oracle_closure", return_value={}), \
+                patch.object(broad, "run_profile", side_effect=launch) as run, \
+                patch.object(broad.native, "verify_runtime", side_effect=(AssertionError("jar changed") if custody_failed else None)), \
+                redirect_stdout(io.StringIO()):
+            code = broad.main(self.arguments())
+        self.assertEqual(1, run.call_count)
+        result = json.loads((self.output / broad.RECEIPT).read_text(encoding="utf-8"))
+        self.assertEqual({"packaged-current"}, set(result["profiles"]))
+        self.assertEqual(set(self.mods), set(result["jars"]))
+        return code, result
+
+    def test_native_sdk_and_existing_oracles_are_not_historical_dispatch(self):
+        self.assertEqual(("26.1.2", "64.1.5"), (broad.Adapter.MINECRAFT, broad.Adapter.FORGE))
+        self.assertIs(broad.native.Server, broad.Adapter.Server)
+        self.assertIs(broad.previous.Adapter.drill_tag, broad.Adapter.drill_tag)
+        self.assertIs(broad.native, broad.Adapter.drill_tickets.__globals__["native"])
+
+    def test_native_tile_component_witness_and_stock_are_projected_without_dropping_components(self):
+        row = {"nbt": '{components:{"minecraft:custom_data":{AdvBayWitness:"S-05:north"}},'
+                      'Items:[{Slot:0b,id:"minecraft:diamond",count:7,'
+                      'components:{"minecraft:custom_data":{AdvBayStock:"S-05:north",Unknown:[2,1]}}}]}' }
+        data = broad.Adapter.drill_data(row)
+        self.assertEqual({"AdvBayWitness": "S-05:north"}, data["ForgeData"])
+        self.assertEqual(7, data["Items"][0]["Count"])
+        custom = data["Items"][0]["components"]["minecraft:custom_data"]
+        self.assertEqual("S-05:north", custom["AdvBayStock"])
+        self.assertEqual([2, 1], list(custom["Unknown"]))
+        self.assertEqual(custom, data["Items"][0]["tag"])
+
+    def test_legacy_witness_and_incorrect_native_item_types_are_rejected(self):
+        for nbt in ('{ForgeData:{AdvBayWitness:"stale"}}',
+                    '{Items:[{id:"minecraft:diamond",count:7.0f}]}',
+                    '{Items:[{id:"minecraft:diamond",count:7,Count:7b}]}'):
+            with self.subTest(nbt=nbt), self.assertRaises(AssertionError):
+                broad.Adapter.drill_data({"nbt": nbt})
+
+    def test_staging_passes_only_the_exact_native_target_and_launcher(self):
+        entries = {key: dict(version=value[0], path=value[1], sha256=value[2]) for key, value in self.mods.items()}
+        with patch.object(broad.native, "stage") as stage:
+            self.assertEqual(broad.native.LAUNCHER,
+                             broad.Adapter.stage(self.output, (self.seed, {}, entries), 26600))
+        stage.assert_called_once_with(self.output, self.seed, {}, self.mods, 26600)
+
+    def test_supported_full_family_dispatches_all_twenty_one_stations(self):
+        code, result = self.exercise()
+        self.assertEqual(0, code)
+        self.assertEqual("PASS", result["status"])
+        self.assertTrue(result["seedUnchanged"] and result["inputsUnchanged"])
+
+    def test_measured_failure_cannot_become_pass(self):
+        code, result = self.exercise(failed=True)
+        self.assertEqual(1, code)
+        self.assertEqual("FAIL", result["status"])
+        self.assertIn("finite assertion failed", result["profiles"]["packaged-current"]["error"])
+
+    def test_staged_jar_change_cannot_become_pass(self):
+        code, result = self.exercise(custody_failed=True)
+        self.assertEqual(1, code)
+        self.assertEqual("FAIL", result["status"])
+        self.assertIn("jar changed", result["profiles"]["packaged-current"]["custodyError"])
+
+    def test_protected_seed_change_cannot_become_pass(self):
+        code, result = self.exercise(changed_seed=True)
+        self.assertEqual(1, code)
+        self.assertFalse(result["seedUnchanged"])
+
+    def test_profile_change_cannot_become_pass(self):
+        code, result = self.exercise(changed_input=True)
+        self.assertEqual(1, code)
+        self.assertFalse(result["inputsUnchanged"])
+
+    def test_missing_mandatory_mod_refuses_before_java_or_output(self):
+        del self.mods["basemetals"]
+        with patch.object(broad.native, "read_family_target", return_value=(self.seed, {}, self.mods)), \
+                patch.object(broad.native, "java25") as java, patch.object(broad, "run_profile") as launch, \
+                redirect_stderr(io.StringIO()):
+            with self.assertRaises(SystemExit) as failure:
+                broad.main(self.arguments())
+        self.assertEqual(2, failure.exception.code)
+        java.assert_not_called()
+        launch.assert_not_called()
+        self.assertFalse(self.output.exists())
+
+    def test_incorrect_profile_hash_refuses_before_family_or_launch(self):
+        args = self.arguments()
+        args[args.index("--profile-sha256") + 1] = "0" * 64
+        with patch.object(broad.native, "read_family_target") as read, patch.object(broad, "run_profile") as launch:
+            with self.assertRaises(AssertionError):
+                broad.main(args)
+        read.assert_not_called()
+        launch.assert_not_called()
+        self.assertFalse(self.output.exists())
+
+    def test_unsupported_modes_do_not_touch_an_existing_failure(self):
+        self.output.mkdir()
+        receipt = self.output / broad.RECEIPT
+        old = b'{"status":"FAIL","reason":"preserve this"}\n'
+        receipt.write_bytes(old)
+        for mode in ("both", "packaged-decoupled"):
+            with patch.object(broad.native, "read_family_target") as read, redirect_stderr(io.StringIO()):
+                with self.assertRaises(SystemExit) as failure:
+                    broad.main(self.arguments() + ["--mode", mode])
+                self.assertEqual(2, failure.exception.code)
+                read.assert_not_called()
+                self.assertEqual(old, receipt.read_bytes())
+
+    def test_real_cli_refuses_unsupported_mode_before_missing_paths(self):
+        process = subprocess.run([sys.executable, "-B", str(Path(broad.__file__).resolve()),
+                                  "--mode", "packaged-decoupled"], capture_output=True, text=True, timeout=20)
+        self.assertEqual(2, process.returncode)
+        self.assertIn("BaseMetals is mandatory", process.stderr)
+        self.assertIn("26.1.2", process.stderr)
+        self.assertNotIn("Traceback", process.stderr)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/test-rig/migration/test_native2612_client.py b/test-rig/migration/test_native2612_client.py
new file mode 100644
index 00000000..600ad8e1
--- /dev/null
+++ b/test-rig/migration/test_native2612_client.py
@@ -0,0 +1,588 @@
+"""Adapter and actual-SDK preflight tests. No Minecraft client is launched."""
+
+import copy
+import json
+import nbtlib
+from pathlib import Path
+import shutil
+import struct
+import tempfile
+import unittest
+from unittest.mock import patch
+import xml.etree.ElementTree as ET
+import zlib
+from zipfile import ZipFile
+
+from matrix import digest
+import native2612_client as client
+
+
+def report_fixture():
+    labels = {"inventory": "Inventory", "machines": {f"basepower:unit-{index}": f"Unit {index}" for index in range(39)}}
+    machines = [dict(block=key, menu_title=name, expected_title=name, status="PASS", required_text="PASS",
+                     tooltip_and_inventory_hitbox="PASS", renders=9, blank_label_controls_rejected=9,
+                     background_extraction_calls=1) for key, name in labels["machines"].items()]
+    for row in machines:
+        row["framebuffer_cases"] = [dict(viewport=list(viewport), fill=fill, slot_pixels={}, left=(viewport[0] - 176) // 2,
+                                         top=(viewport[1] - 240) // 2) for viewport in client.VIEWPORTS for fill in range(3)]
+        row["garbled_background_control"] = "synthetic-header-test-only"
+    gauges = []
+    for tank in ("portable", "metal"):
+        gauges.append(dict(tank=tank, fluid="empty", amount_mb=0, fill_rows=0, different_pixels=0, render_scale=2))
+        for fluid in ("water", "lava", "crude-oil", "refined-oil"):
+            for rows in (15, 30, 60):
+                gauges.append(dict(tank=tank, fluid=fluid, amount_mb=rows * 10, fill_rows=rows, different_pixels=0, render_scale=2))
+    report = dict(status="PASS", minecraft="26.1.2", forge="64.1.5", advantage_mods=["basepower", "basesteam", "baseelectric"],
+                  mod_versions={key: client.native.VERSIONS[key] for key in ("basepower", "basesteam", "baseelectric")},
+                  items=109, block_states=100, creative_entries=100, resource_errors=[], primary_resource_status="PASS",
+                  scope_results={key: dict(status="PASS") for key in ("registered_resources", "tank_pixels", "machine_gui", "oil_renderer", "recipe_book", "child_geometry")},
+                  oil_bucket_identities=True, fluid_rendering=[dict(fluid=key, correct_sprite=True, vertices=4) for key in (
+                      "basepower:crude_oil", "basepower:flowing_crude_oil", "basepower:refined_oil", "basepower:flowing_refined_oil", "minecraft:water", "minecraft:lava")],
+                  machine_gui_layout_status="PASS", machine_gui_text_status="PASS", machine_gui_text_spec=2,
+                  machine_gui_framebuffer_spec=3,
+                  machine_gui_layout_count=39, machine_gui_text_checks=351, machine_gui_negative_controls_rejected=356,
+                  machine_gui_layouts=machines, tank_gauge_pixel_status="PASS", tank_gauge_pixels=gauges,
+                  recipe_book_grouping_status="PASS", recipe_book_grouping=[dict(packet=f"recipes-{mode}-sweep.bin", status="PASS",
+                      recipes=10, displays=10, cells=10, item_tags=10) for mode in ("normal", "tech", "apocalyptic")],
+                  child_renderer_geometry_status="PASS_WITH_MANUAL_GAPS", child_renderer_geometry=dict(status="PASS_WITH_MANUAL_GAPS",
+                      passed_geometry_cases=25, manual_gaps=1, cases=[dict(case="unit-" + str(i), status="PASS") for i in range(25)]
+                      + [dict(case="hydroturbine-registration", status="MANUAL_GAP_WORLD_REQUIRED")]),
+                  login=dict(status="PASS", realWorld=True, integratedServer=True, nativeComponentsBound=True,
+                             loggingInEventObserved=True, connectionConnected=True, clientLoaded=True,
+                             syntheticComponentBinding=False, itemHolders=100),
+                  projectionCalibration={"synthetic-header-test-only": True}, recipe_registry_ids_match_actual_login=True,
+                  experimentalFixtureGate=dict(protocol=client.FIXTURE_PROTOCOL, status="NOT_OBSERVED", actionCount=0))
+    report["world_oil_visual"] = {"synthetic-header-test-only": True}
+    report["child_geometry_context"] = dict(stage="GENUINELY_WORLDLESS_BEFORE_LOGIN", levelPresent=False,
+        playerPresent=False, singleplayerServerPresent=False)
+    return report, labels
+
+
+class ClientAdapterTest(unittest.TestCase):
+    def test_offline_username_is_bounded_to_native_ascii_protocol_names(self):
+        for name in ("A", "AdvantageProbe", "A_0123456789abcd"):
+            self.assertEqual(name, client.validate_username(name))
+        for name in ("", "AdvantageClientProbe", "name with space", "name-dash", "caf\u00e9", None, 10):
+            with self.assertRaisesRegex(AssertionError, "1..16 ASCII"):
+                client.validate_username(name)
+    def test_experimental_fixture_policy_rejects_other_profile_receipt_and_copied_level(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            source = root / "campaign/packaged-current/AdvantageWorksMigration"
+            source.mkdir(parents=True)
+            versions = {"minecraft": client.native.MINECRAFT, "forge": client.native.FORGE, **client.native.VERSIONS}
+            level = nbtlib.File({"Data": nbtlib.Compound({"DataVersion": nbtlib.Int(4790),
+                "Version": nbtlib.Compound({"Name": nbtlib.String("26.1.2")})}),
+                "fml": nbtlib.Compound({"LoadingModList": nbtlib.List[nbtlib.Compound]([
+                    nbtlib.Compound({"ModId": nbtlib.String(key), "ModVersion": nbtlib.String(value)})
+                    for key, value in versions.items()])})})
+            level.save(source / "level.dat", gzipped=True)
+            copied_world = root / "runtime/saves" / client.CLIENT_WORLD
+            copied_world.mkdir(parents=True)
+            shutil.copy2(source / "level.dat", copied_world / "level.dat")
+            (root / "runtime/client-world-source-files.json").write_text(json.dumps({"level.dat": digest(source / "level.dat")}))
+            profile = root / "profile.json"
+            mods = [dict(id=key, version=value, path=str(root / (key + ".jar")), sha256=client.hashlib.sha256(key.encode()).hexdigest().upper())
+                    for key, value in client.native.VERSIONS.items()]
+            profile.write_text(json.dumps(dict(minecraftVersion="26.1.2", forge=dict(version="26.1.2-64.1.5"), mods=mods)))
+            profile_sha = digest(profile)
+            receipt_path = source.parents[1] / "native2612-broad-results.json"
+            receipt = dict(status="PASS", minecraft="26.1.2", forge="64.1.5", inputsUnchanged=True, seedUnchanged=True,
+                profileSha256=profile_sha, scope="PACKAGED_WALKABLE_WORKS_AND_TWELVE_DRILL_WITNESSES",
+                jars={row["id"]: row["sha256"] for row in mods}, profiles={"packaged-current": dict(status="PASS", profile="packaged-current",
+                    expectedMods=versions, phases={phase: dict(status="PASS") for phase in ("first", "initial", "operation", "persistence", "restarted")})})
+            receipt_path.write_text(json.dumps(receipt))
+            policy = client.fixture_policy(root / "runtime", profile, profile_sha, receipt_path, source)
+            self.assertEqual(client.FIXTURE_SCOPE, policy["eligibility"])
+            self.assertEqual(digest(source / "level.dat"), policy["copiedLevelSha256"])
+            with self.assertRaisesRegex(AssertionError, "SHA-256 mismatch"):
+                client.fixture_policy(root / "runtime", profile, "0" * 64, receipt_path, source)
+            for change in (lambda doc: doc.update(status="FAIL"), lambda doc: doc.update(inputsUnchanged=False),
+                    lambda doc: doc.update(profileSha256="0" * 64), lambda doc: doc["profiles"]["packaged-current"]["phases"]["restarted"].update(status="RUNNING"),
+                    lambda doc: doc["jars"].update(orespawn="0" * 64)):
+                wrong = copy.deepcopy(receipt)
+                change(wrong)
+                receipt_path.write_text(json.dumps(wrong))
+                with self.assertRaises(AssertionError):
+                    client.fixture_policy(root / "runtime", profile, profile_sha, receipt_path, source)
+            receipt_path.write_text(json.dumps(receipt))
+            (copied_world / "level.dat").write_bytes(b"copy")
+            with self.assertRaisesRegex(AssertionError, "stopped source/copy"):
+                client.fixture_policy(root / "runtime", profile, profile_sha, receipt_path, source)
+
+    def test_failed_native_producer_is_reported_before_success_only_artwork_contract(self):
+        failed = dict(status="FAIL", error="Native real-world login/component binding did not complete",
+                      loginReadiness=dict(screenClass="unit.UnknownScreen", stage="BEFORE_INTEGRATED_SERVER"))
+        before = copy.deepcopy(failed)
+        with self.assertRaisesRegex(AssertionError, "Native real-world login/component binding"):
+            client.verify_producer(failed)
+        self.assertEqual(before, failed)
+        client.verify_producer(dict(status="PASS"))
+        with self.assertRaisesRegex(AssertionError, "Missing source artwork provenance"):
+            client.source_references(dict(status="PASS"), {})
+
+    def test_source_artwork_hashes_and_unique_provider_are_still_required(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            path = root / "power.jar"
+            name, content = "basepower:textures/gui/unit.png", b"strict-artwork-bytes"
+            with ZipFile(path, "w") as jar:
+                jar.writestr("assets/basepower/textures/gui/unit.png", content)
+            proof = dict(resource=name, sha256=client.hashlib.sha256(content).hexdigest().upper(), width=256, height=256)
+            mods = dict(basepower=("unit", path, digest(path)))
+            references = client.source_references(dict(source=proof), mods)
+            client.require_source(proof, references)
+            with self.assertRaisesRegex(AssertionError, "frozen jar bytes"):
+                client.require_source({**proof, "sha256": "0" * 64}, references)
+            with self.assertRaisesRegex(AssertionError, "Ambiguous"):
+                client.source_references(dict(source=proof), {**mods, "other": ("unit", path, digest(path))})
+
+    def test_native_vanilla_root_control_requires_exact_sdk_bytes_and_merged_presence(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            archive = root / "client-extra-26.1.2-20260409.101008.jar"
+            resources = {"minecraft:textures/block/stone.png": b"unit-stone-only",
+                         "minecraft:atlases/blocks.json": b'{"sources":[]}'}
+            with ZipFile(archive, "w") as jar:
+                for key, value in resources.items():
+                    jar.writestr("assets/" + key.replace(":", "/", 1), value)
+            code = dict(archives=[client.record(archive)])
+            self.assertEqual("NOT_CAPTURED", client.verify_vanilla_resources(root, code)["status"])
+            folder = root / "vanilla-resource-controls"
+            folder.mkdir()
+            rows = [dict(resource=key, vanilla=dict(present=True, bytes=len(value),
+                         sha256=client.hashlib.sha256(value).hexdigest().upper()), merged=[dict(pack="vanilla",
+                         bytes=len(value), sha256=client.hashlib.sha256(value).hexdigest().upper())])
+                    for key, value in resources.items()]
+            original = dict(protocol="NATIVE64_VANILLA_RESOURCE_ROOTS_V1", status="PASS",
+                            phase="reload-preparation-before-atlas-upload", resources=rows)
+            path = folder / "control-01.json"
+            path.write_text(json.dumps(original))
+            self.assertEqual("PASS", client.verify_vanilla_resources(root, code)["status"])
+            overlay = root / "forge-26.1.2-64.1.5.jar"
+            overlay_data = b'{"sources":[{"type":"unit-forge-overlay"}]}'
+            with ZipFile(overlay, "w") as jar:
+                jar.writestr("assets/minecraft/atlases/blocks.json", overlay_data)
+            code["archives"].append(client.record(overlay))
+            original["resources"][1]["merged"].append(dict(pack="mod:forge", bytes=len(overlay_data),
+                sha256=client.hashlib.sha256(overlay_data).hexdigest().upper()))
+            path.write_text(json.dumps(original))
+            self.assertEqual("PASS", client.verify_vanilla_resources(root, code)["status"])
+            for change in (lambda doc: doc["resources"][0]["vanilla"].update(present=False),
+                           lambda doc: doc["resources"][0]["vanilla"].update(sha256="0" * 64),
+                           lambda doc: doc["resources"][0].update(merged=[]),
+                           lambda doc: doc["resources"][0]["merged"].append(doc["resources"][0]["merged"][0]),
+                           lambda doc: doc["resources"].pop()):
+                wrong = copy.deepcopy(original)
+                change(wrong)
+                path.write_text(json.dumps(wrong))
+                with self.assertRaises(AssertionError):
+                    client.verify_vanilla_resources(root, code)
+
+    def test_preparation_failure_retains_receipt_only_in_a_new_owned_runtime(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+
+            def fail(args, owned):
+                owned["runtime"] = root
+                raise AssertionError("synthetic preparation failure")
+
+            with patch.object(client, "_run", side_effect=fail):
+                with self.assertRaises(AssertionError):
+                    client.run(None)
+            self.assertEqual("FAIL", json.loads((root / client.RESULT).read_text())["status"])
+            before = (root / client.RESULT).read_bytes()
+            with patch.object(client, "_run", side_effect=AssertionError("unowned preflight failure")):
+                with self.assertRaises(AssertionError):
+                    client.run(None)
+            self.assertEqual(before, (root / client.RESULT).read_bytes())
+
+    def test_actual_native_sdk_launch_is_read_only_and_excludes_mutable_child_outputs(self):
+        source = client.native.RIG.parent / "runClient.launch"
+        before = source.read_bytes()
+        plan = client.inspect_launch(source)
+        self.assertEqual(("26.1.2", "64.1.5", "20260409.101008"), (plan["minecraft"], plan["forge"], plan["mcp"]))
+        self.assertEqual("", plan["environment"]["MOD_CLASSES"])
+        self.assertEqual(before, source.read_bytes())
+        self.assertGreater(len(plan["archives"]), 50)
+        self.assertTrue(all(not client.mod_ids(row["path"]) & client.FAMILY for row in plan["archives"]))
+        self.assertEqual(client.ASSET_INDEX_SHA1, "49107CF4E5F961B086AC4F06F3C2C56142B023DC")
+
+    def test_missing_native_client_extra_cannot_pass_sdk_preflight(self):
+        tree = ET.parse(client.native.RIG.parent / "runClient.launch")
+        entries = next(row for row in tree.getroot().findall("listAttribute")
+                       if row.attrib["key"] == "org.eclipse.jdt.launching.CLASSPATH")
+        for row in list(entries):
+            if "client-extra-26.1.2-20260409.101008.jar" in row.attrib["value"]:
+                entries.remove(row)
+        with tempfile.TemporaryDirectory() as directory:
+            path = Path(directory) / "launch.xml"
+            tree.write(path, encoding="utf-8")
+            with self.assertRaisesRegex(AssertionError, "native vanilla client resources"):
+                client.inspect_launch(path)
+
+    def mutate_launch(self, key, transform):
+        tree = ET.parse(client.native.RIG.parent / "runClient.launch")
+        node = next(row for row in tree.findall("stringAttribute") if row.attrib["key"] == key)
+        node.attrib["value"] = transform(node.attrib["value"])
+        with tempfile.TemporaryDirectory() as directory:
+            path = Path(directory) / "launch.xml"
+            tree.write(path, encoding="utf-8")
+            with self.assertRaises(AssertionError):
+                client.inspect_launch(path)
+
+    def test_agents_classpath_injection_legacy_target_and_connection_arguments_fail(self):
+        vm = "org.eclipse.jdt.launching.VM_ARGUMENTS"
+        program = "org.eclipse.jdt.launching.PROGRAM_ARGUMENTS"
+        for option in (" -javaagent:wrong.jar", " -cp unpinned", " -Dmixin.debug.export=true"):
+            self.mutate_launch(vm, lambda value, option=option: value + option)
+        for change in (lambda value: value + " --server localhost", lambda value: value.replace("--gameDir .", "--gameDir protected"),
+                       lambda value: value.replace("--assetIndex 30", "--assetIndex 29"),
+                       lambda value: value.replace("forge_userdev_client", "forge_userdev_server")):
+            self.mutate_launch(program, change)
+
+    def test_whole_result_requires_all39_gui_and_all26_gauges_without_promoting_manual_gaps(self):
+        report, labels = report_fixture()
+        before = copy.deepcopy(report)
+        with patch.object(client, "png_record", side_effect=lambda root, name, dims: dict(file=name, dimensions=dims)) as images, \
+                patch.object(client, "verify_machine_frame", return_value={}), \
+                patch.object(client, "verify_tank_frames"), \
+                patch.object(client, "verify_projection_calibration", return_value=dict(status="PASS")), \
+                patch.object(client, "verify_world_oil", return_value=dict(status="PASS")), \
+                patch.object(client, "read_frame", return_value=(320, 240, b"header-test-only", {})), \
+                patch.object(client, "slot_mismatches", return_value=1):
+            result = client.validate_result(report, Path("NOT_A_GAME"), labels, {})
+            self.assertEqual(416, images.call_count)
+            self.assertEqual(1, len(result["manualRequired"]))
+            self.assertEqual(before, report)
+            changes = (lambda value: value.update(minecraft="1.21.11"),
+                       lambda value: value["login"].update(realWorld=False),
+                       lambda value: value["login"].update(loggingInEventObserved=False),
+                       lambda value: value["login"].update(syntheticComponentBinding=True),
+                       lambda value: value["experimentalFixtureGate"].update(actionCount=1),
+                       lambda value: value["experimentalFixtureGate"].update(status="AUTO_ACCEPTED"),
+                       lambda value: value["child_geometry_context"].update(levelPresent=True),
+                       lambda value: value.update(recipe_registry_ids_match_actual_login=False),
+                       lambda value: value.update(machine_gui_text_checks=350),
+                       lambda value: value.update(machine_gui_negative_controls_rejected=355),
+                       lambda value: value["machine_gui_layouts"][0].update(background_extraction_calls=True),
+                       lambda value: value["machine_gui_layouts"][0].update(menu_title="Wrong name"),
+                       lambda value: value["machine_gui_layouts"].pop(),
+                       lambda value: value["tank_gauge_pixels"][0].update(different_pixels=1),
+                       lambda value: value["tank_gauge_pixels"].pop(),
+                       lambda value: value["fluid_rendering"][0].update(correct_sprite=False),
+                       lambda value: value["recipe_book_grouping"].pop(),
+                       lambda value: value["scope_results"].pop("oil_renderer"),
+                       lambda value: value["child_renderer_geometry"]["cases"][-1].update(status="PASS"))
+            for change in changes:
+                wrong = copy.deepcopy(report)
+                change(wrong)
+                with self.assertRaises((AssertionError, KeyError)):
+                    client.validate_result(wrong, Path("NOT_A_GAME"), labels, {})
+
+    def test_png_integrity_requires_real_bounded_pixel_stream_not_just_an_ihdr_header(self):
+        def chunk(kind, value):
+            return struct.pack(">I", len(value)) + kind + value + struct.pack(">I", zlib.crc32(kind + value) & 0xFFFFFFFF)
+
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            header = chunk(b"IHDR", struct.pack(">IIBBBBB", 2, 2, 8, 6, 0, 0, 0))
+            raw = b"\0" + bytes((1, 2, 3, 255)) * 2
+            valid = b"\x89PNG\r\n\x1a\n" + header + chunk(b"IDAT", zlib.compress(raw * 2)) + chunk(b"IEND", b"")
+            path = root / "unit.png"
+            path.write_bytes(valid)
+            self.assertEqual(2, client.png_record(root, path.name, (2, 2))["width"])
+            for wrong in (valid[:24], valid + b"extra", valid[:-1] + b"x",
+                           b"\x89PNG\r\n\x1a\n" + header + chunk(b"IDAT", zlib.compress(b"")) + chunk(b"IEND", b"")):
+                path.write_bytes(wrong)
+                with self.assertRaises((AssertionError, zlib.error)):
+                    client.png_record(root, path.name, (2, 2))
+
+
+def write_frame(root, name, width, height, data, texts=()):
+    """Synthetic framebuffer fixture; no native render or campaign PASS is claimed."""
+    def chunk(kind, value):
+        return struct.pack(">I", len(value)) + kind + value + struct.pack(">I", zlib.crc32(kind + value) & 0xFFFFFFFF)
+
+    rgba = root / (name + ".rgba")
+    rgba.write_bytes(data)
+    png = root / (name + ".png")
+    scanlines = b"".join(b"\0" + data[y * width * 4:(y + 1) * width * 4] for y in range(height))
+    png.write_bytes(b"\x89PNG\r\n\x1a\n" + chunk(b"IHDR", struct.pack(">IIBBBBB", width, height, 8, 6, 0, 0, 0))
+                    + chunk(b"IDAT", zlib.compress(scanlines)) + chunk(b"IEND", b""))
+    state = dict(protocol="NATIVE64_GUI_FRAMEBUFFER_FENCED_V1", width=width, height=height,
+                 renderer="net.minecraft.client.gui.render.GuiRenderer", extractor="net.minecraft.client.gui.GuiGraphicsExtractor",
+                 renderSubmitted=True, fenceCompleted=True, screenshotCallbackCompleted=True, texts=list(texts),
+                 blits=[dict(x0=0, y0=12, x1=176, y1=140, color=-1, textureViewIdentity=1,
+                             pipeline="minecraft:pipeline/gui_textured", pose=[1, 0, 0, 1, 0, 0], u0=0, v0=0, u1=1, v1=1)])
+    native = root / (name + "-native.json")
+    native.write_text(json.dumps(state))
+    return dict(width=width, height=height, rgba=dict(file=rgba.name, sha256=digest(rgba)),
+                png=dict(file=png.name, sha256=digest(png)), native=dict(file=native.name, sha256=digest(native)))
+
+
+def machine_frame_fixture(root, *, rendered_text=True):
+    width, height, left = 320, 240, 72
+    slots = [[7 + i % 9 * 18, 157 + i // 9 * 18] for i in range(27)] + [[7 + i * 18, 215] for i in range(9)]
+    points = [[x, y, -1 if (x + y) % 2 == 0 else -8355712] for x in range(18) for y in range(18)
+              if x in (0, 17) or y in (0, 17)]
+    background = bytearray(bytes((20, 30, 40, 255)) * width * height)
+    for slot_x, slot_y in slots:
+        for x, y, color in points:
+            at = ((slot_y + y) * width + left + slot_x + x) * 4
+            background[at:at + 4] = bytes((color >> 16 & 255, color >> 8 & 255, color & 255, 255))
+    expected = bytearray(background)
+    if rendered_text:
+        for x0, y0 in ((112, 2), (80, 141)):
+            for y in range(y0, y0 + 2):
+                for x in range(x0, x0 + 40):
+                    at = (y * width + x) * 4
+                    expected[at:at + 4] = b"\xff" * 4
+    texts = [dict(text=name, x=x, y=y, color=-1, dropShadow=True, pose=[1, 0, 0, 1, 72, 0])
+             for name, x, y in (("Unit machine", 40, 1), ("Inventory", 8, 140))]
+    actual = write_frame(root, "machine-actual", width, height, expected, texts)
+    reference = write_frame(root, "machine-expected", width, height, expected, texts)
+    hidden = write_frame(root, "machine-background", width, height, background)
+    sources = {"basepower:textures/gui/container/player_inventory.png": "A" * 64,
+               "basepower:textures/gui/container/unit.png": "B" * 64}
+    proof = dict(viewport=[320, 240, 1], fill=0, left=72, top=0, actual=actual, expected=reference, background=hidden,
+                 slot_pixels=dict(border_points=points, slots=slots, checked_pixels=36 * 68,
+                     source_sampling="PHYSICAL_PIXEL_CENTERS_ON_256_LOGICAL_UV_V1",
+                     logical_texture_size=256, expected_machine_slots=[],
+                     slot_border_colors=[[value for _, _, value in points] for _ in slots],
+                     inventory_source=dict(resource=list(sources)[0], sha256="A" * 64, width=256, height=256),
+                     machine_source=dict(resource=list(sources)[1], sha256="B" * 64, width=256, height=256)))
+    return proof, sources
+
+
+class FramebufferReplayTest(unittest.TestCase):
+    def test_world_oil_replay_requires_raw_negative_controls_replaced_atlas_and_real_renderer_metadata(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            report = dict(protocol="NATIVE64_LEVEL_RENDERER_OIL_RELOAD_V1", status="PASS", mipmapLevel=4,
+                scope="ACTUAL_LEVEL_RENDERER_NOT_GUI_OR_SYNTHETIC_WORLD", frames={}, pixelControls=[],
+                modelsBeforeReload=[], modelsAfterReload=[], nativeGeometryAfterReload=dict(fluid_rendering=[
+                    dict(correct_sprite=True, vertices=4) for _ in range(6)]))
+            for name in ("original", "empty", "wrong_water", "restored", "after_reload"):
+                pixels = bytearray(bytes((40, 50, 60, 255)) * 320 * 240)
+                matrix = [.06, 0, 0, 0, 0, .01, 0, 0, 0, .045, .01, 0, 0, 0, 0, 1]
+                camera = [512.5, 15.62, 527]
+                pools = []
+                for index in range(3):
+                    fluid = "minecraft:water" if index == 2 or name == "wrong_water" else "minecraft:empty" if name == "empty" else (
+                        "basepower:crude_oil" if index == 0 else "basepower:refined_oil")
+                    color = (20, 70, 200, 255) if fluid == "minecraft:water" else (230, 230, 230, 255) if fluid == "minecraft:empty" else (
+                        (20, 20, 20, 255) if index == 0 else (210, 170, 50, 255))
+                    samples = []
+                    for x in range(4):
+                        for z in range(4):
+                            point = [(504, 510, 516)[index] + .75 + x * .75, 6 + 8 / 9, 510 + .75 + z * .75]
+                            px, py = client.world_sample_pixel(matrix, camera, point, 320, 240)
+                            samples.append(point + [px, py])
+                            for dy in range(-1, 2):
+                                for dx in range(-1, 2):
+                                    at = ((py + dy) * 320 + px + dx) * 4
+                                    pixels[at:at + 4] = bytes(color)
+                    pools.append(dict(pool=("crude-oil", "refined-oil", "water-control")[index], fluid=fluid,
+                        compiledAndVisible=True, samples=samples))
+                frame = write_frame(root, "synthetic-world-" + name, 320, 240, pixels)
+                frame.pop("native")
+                frame.update(renderer="net.minecraft.client.renderer.LevelRenderer", dimension="minecraft:overworld",
+                    fenceCompleted=True, hudHidden=True, renderedSections=4, camera=camera,
+                    viewRotationProjection=matrix, pools=pools)
+                report["frames"][name] = frame
+            for actual in ("original", "after_reload"):
+                for index, pool in enumerate(("crude-oil", "refined-oil", "water-control")):
+                    report["pixelControls"].append(dict(actual=actual, pool=pool, samples=144,
+                        emptyDifferent=0 if index == 2 else 144, wrong_waterDifferent=0 if index == 2 else 144))
+            for key, offset in (("modelsBeforeReload", 0), ("modelsAfterReload", 10)):
+                for index, name in enumerate(("crude_oil", "refined_oil")):
+                    report[key].append(dict(fluid="basepower:" + name, layer="TRANSLUCENT",
+                        stillSprite=f"basepower:blocks/{name}_still", flowingSprite=f"basepower:blocks/{name}_flow",
+                        stillIdentity=1 + index * 2 + offset, flowingIdentity=2 + index * 2 + offset))
+            self.assertEqual(8, client.verify_world_oil(root, report)["oilNegativeComparisons"])
+            for change in (lambda doc: doc.update(status="FAIL"), lambda doc: doc.update(mipmapLevel=0),
+                    lambda doc: doc["frames"]["original"].update(renderer="net.minecraft.client.gui.render.GuiRenderer"),
+                    lambda doc: doc["frames"]["original"]["pools"][0].update(compiledAndVisible=False),
+                    lambda doc: doc["frames"]["original"]["pools"][0]["samples"][0].__setitem__(3, 10),
+                    lambda doc: doc["frames"]["after_reload"].update(camera=[512.5, 15.63, 527]),
+                    lambda doc: doc["frames"]["after_reload"].update(rgba=doc["frames"]["empty"]["rgba"]),
+                    lambda doc: doc["frames"]["original"].update(rgba=doc["frames"]["wrong_water"]["rgba"]),
+                    lambda doc: doc["pixelControls"][0].update(emptyDifferent=0),
+                    lambda doc: doc["modelsAfterReload"][0].update(stillIdentity=doc["modelsBeforeReload"][0]["stillIdentity"]),
+                    lambda doc: doc["modelsAfterReload"][0].update(stillSprite="minecraft:missingno")):
+                wrong = copy.deepcopy(report)
+                change(wrong)
+                with self.assertRaises(AssertionError):
+                    client.verify_world_oil(root, wrong)
+
+    def test_scale2_high_resolution_border_requires_each_physical_sample_not_repeated_center(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            proof, _ = machine_frame_fixture(root)
+            slots = proof["slot_pixels"]
+            slots["slots"].insert(0, [31, 40])
+            slots["expected_machine_slots"] = [[31, 40]]
+            slots["slot_border_colors"] = [[0xFF123410 + point % 2 * 16 + sample for point in range(68) for sample in range(4)]] + [
+                [value for value in row for _ in range(4)] for row in slots["slot_border_colors"]]
+            slots["checked_pixels"] = 37 * 68 * 4
+            pixels = bytearray(bytes((20, 30, 40, 255)) * 640 * 480)
+            for index, (slot_x, slot_y) in enumerate(slots["slots"]):
+                for point, (x, y, _) in enumerate(slots["border_points"]):
+                    for dy in range(2):
+                        for dx in range(2):
+                            color = slots["slot_border_colors"][index][point * 4 + dy * 2 + dx]
+                            at = (((slot_y + y) * 2 + dy) * 640 + (72 + slot_x + x) * 2 + dx) * 4
+                            pixels[at:at + 4] = bytes((color >> 16 & 255, color >> 8 & 255, color & 255, 255))
+            frame = (640, 480, pixels, {})
+            self.assertEqual(0, client.slot_mismatches(frame, slots, 72, 0, 2))
+            wrong = copy.deepcopy(slots)
+            wrong["slot_border_colors"][0] = [0xFF123413 + point % 2 * 16 for point in range(68) for _ in range(4)]
+            self.assertGreater(client.slot_mismatches(frame, wrong, 72, 0, 2), 0)
+
+    def test_projection_ruler_replays_every_pixel_and_shifted_negative_at_both_scales(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            calibration = dict(protocol="NATIVE64_GUI_PROJECTION_PIXEL_RULER_V1", status="PASS", cases=[])
+            for scale in (1, 2):
+                row = dict(scale=scale, logicalWidth=64, logicalHeight=48, exactPixelsChecked=64 * 48 * scale * scale)
+                for key, shift in (("actual", 0), ("shiftedRejected", 1)):
+                    pixels = bytearray()
+                    for y in range(48 * scale):
+                        for x in range(64 * scale):
+                            u, v = x // scale, y // scale
+                            color = 0xFF37A95C if 7 + shift <= u < 23 + shift and 9 <= v < 25 else (
+                                0xFF3158D5 if (u, v) == (2, 2) else 0xFFDD7341 if (u, v) == (63, 47) else 0xFF101820)
+                            pixels.extend((color >> 16 & 255, color >> 8 & 255, color & 255, 255))
+                    frame = write_frame(root, f"ruler-{scale}-{key}", 64 * scale, 48 * scale, pixels)
+                    state_path = root / frame["native"]["file"]
+                    state = json.loads(state_path.read_text())
+                    state.update(blits=[], fills=[dict(x0=x, y0=y, x1=x + w, y1=y + h, col1=-1, col2=-1,
+                        pipeline="minecraft:pipeline/gui", pose=[1, 0, 0, 1, 0, 0])
+                        for x, y, w, h in ((7 + shift, 9, 16, 16), (2, 2, 1, 1), (63, 47, 1, 1))])
+                    state_path.write_text(json.dumps(state))
+                    frame["native"]["sha256"] = digest(state_path)
+                    row[key] = frame
+                calibration["cases"].append(row)
+            self.assertEqual(15360, client.verify_projection_calibration(root, calibration)["physicalPixels"])
+            for key in ("actual", "shiftedRejected"):
+                wrong = copy.deepcopy(calibration)
+                wrong["cases"][1][key] = copy.deepcopy(wrong["cases"][1]["shiftedRejected" if key == "actual" else "actual"])
+                with self.assertRaisesRegex(AssertionError, "ruler pixels"):
+                    client.verify_projection_calibration(root, wrong)
+
+    def test_custom_gold_machine_border_is_distinct_from_fixed_player_inventory(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            proof, _ = machine_frame_fixture(root)
+            frame = client.read_frame(root, proof["actual"])
+            slots = proof["slot_pixels"]
+            gold = [0xFFDBAA20 if index % 2 else 0xFF805311 for index in range(68)]
+            slots["slots"].insert(0, [31, 40])
+            slots["expected_machine_slots"] = [[31, 40]]
+            slots["slot_border_colors"].insert(0, gold)
+            slots["checked_pixels"] += 68
+            pixels = bytearray(frame[2])
+            for (x, y, _), color in zip(slots["border_points"], gold):
+                at = ((40 + y) * 320 + 72 + 31 + x) * 4
+                pixels[at:at + 4] = bytes((color >> 16 & 255, color >> 8 & 255, color & 255, 255))
+            self.assertEqual(0, client.slot_mismatches((320, 240, pixels, {}), slots, 72, 0, 1))
+            wrong = copy.deepcopy(slots)
+            wrong["slot_border_colors"][0] = wrong["slot_border_colors"][-1]
+            self.assertGreater(client.slot_mismatches((320, 240, pixels, {}), wrong, 72, 0, 1), 0)
+            wrong = copy.deepcopy(slots)
+            wrong["slots"][0][0] += 1
+            with self.assertRaisesRegex(AssertionError, "GUI declaration"):
+                client.slot_mismatches((320, 240, pixels, {}), wrong, 72, 0, 1)
+
+    def test_caption_pixels_and_slot_borders_are_replayed_independently(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            proof, sources = machine_frame_fixture(root)
+            result = client.verify_machine_frame(root, proof, "Unit machine", "Inventory", sources)
+            self.assertEqual(160, result["captionInkPixels"])
+            self.assertEqual(36 * 68, result["slotPixels"])
+            actual = root / proof["actual"]["rgba"]["file"]
+            data = bytearray(actual.read_bytes())
+            for x, y, message in ((112, 2, "Caption framebuffer"), (79, 157, "Slot framebuffer")):
+                changed = bytearray(data)
+                at = (y * 320 + x) * 4
+                changed[at:at + 4] = bytes((0, 0, 0, 255))
+                actual.write_bytes(changed)
+                proof["actual"]["rgba"]["sha256"] = digest(actual)
+                with self.assertRaisesRegex(AssertionError, message):
+                    client.verify_machine_frame(root, proof, "Unit machine", "Inventory", sources)
+
+    def test_extracted_caption_without_actual_glyph_pixels_cannot_pass(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            proof, sources = machine_frame_fixture(root, rendered_text=False)
+            with self.assertRaisesRegex(AssertionError, "Blank expected caption"):
+                client.verify_machine_frame(root, proof, "Unit machine", "Inventory", sources)
+
+    def test_missing_fence_or_native_queue_is_rejected_even_with_valid_png_and_rgba(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            frame = write_frame(root, "fence", 2, 2, bytes((1, 2, 3, 255)) * 4)
+            path = root / frame["native"]["file"]
+            original = json.loads(path.read_text())
+            for change in (lambda value: value.update(fenceCompleted=False), lambda value: value.update(blits=[]),
+                           lambda value: value["blits"][0].update(textureViewIdentity=0),
+                           lambda value: value["blits"][0].update(u0=float("nan"))):
+                changed = copy.deepcopy(original)
+                change(changed)
+                path.write_text(json.dumps(changed))
+                frame["native"]["sha256"] = digest(path)
+                with self.assertRaises(AssertionError):
+                    client.read_frame(root, frame)
+
+    def test_tank_pixels_outside_gauge_and_accepted_garbled_control_are_rejected(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            empty = bytearray(bytes((10, 20, 30, 255)) * 176 * 240)
+            expected, wrong = bytearray(empty), bytearray(empty)
+            for y in range(66, 81):
+                for x in range(80, 96):
+                    at = (y * 176 + x) * 4
+                    expected[at:at + 4] = bytes((20, 70, 200, 255))
+                    wrong[at:at + 4] = bytes((200, 70, 20, 255))
+            row = dict(actual_frame=write_frame(root, "tank-actual", 176, 240, expected),
+                       expected_frame=write_frame(root, "tank-expected", 176, 240, expected),
+                       empty_frame=write_frame(root, "tank-empty", 176, 240, empty),
+                       garbled_frame=write_frame(root, "tank-garbled", 176, 240, wrong),
+                       source_artwork=dict(resource="basepower:tank.png", sha256="A" * 64, width=256, height=256),
+                       render_scale=1,
+                       fill_rows=15, whole_panel_different_pixels=0, blank_control_different_pixels=240,
+                       garbled_control_different_pixels=240)
+            for key in ("actual_frame", "expected_frame"):
+                path = root / row[key]["native"]["file"]
+                state = json.loads(path.read_text())
+                blit = {**state["blits"][0], "x0": 80, "y0": 66, "x1": 96, "y1": 82,
+                        "scissor": [80, 66, 16, 15]}
+                state["blits"].append(blit)
+                path.write_text(json.dumps(state))
+                row[key]["native"]["sha256"] = digest(path)
+            client.verify_tank_frames(root, row, {"basepower:tank.png": "A" * 64})
+            actual = root / row["actual_frame"]["rgba"]["file"]
+            changed = bytearray(expected)
+            changed[(20 * 176 + 5) * 4] = 255
+            actual.write_bytes(changed)
+            row["actual_frame"]["rgba"]["sha256"] = digest(actual)
+            with self.assertRaisesRegex(AssertionError, "Whole tank"):
+                client.verify_tank_frames(root, row, {"basepower:tank.png": "A" * 64})
+            actual.write_bytes(expected)
+            row["actual_frame"]["rgba"]["sha256"] = digest(actual)
+            row["garbled_frame"] = copy.deepcopy(row["expected_frame"])
+            with self.assertRaisesRegex(AssertionError, "garbled tank control"):
+                client.verify_tank_frames(root, row, {"basepower:tank.png": "A" * 64})
+            state_path = root / row["actual_frame"]["native"]["file"]
+            state = json.loads(state_path.read_text())
+            state["blits"][-1]["y1"] = 81
+            state_path.write_text(json.dumps(state))
+            row["actual_frame"]["native"]["sha256"] = digest(state_path)
+            with self.assertRaisesRegex(AssertionError, "Native fluid extraction"):
+                client.verify_tank_frames(root, row, {"basepower:tank.png": "A" * 64})
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/test-rig/migration/test_native2612_client_diagnostics.py b/test-rig/migration/test_native2612_client_diagnostics.py
new file mode 100644
index 00000000..250c15ab
--- /dev/null
+++ b/test-rig/migration/test_native2612_client_diagnostics.py
@@ -0,0 +1,81 @@
+"""Client-only exact stack controls; no dedicated-server classifier or old receipt is changed."""
+
+import copy
+from pathlib import Path
+import tempfile
+import unittest
+from unittest.mock import patch
+from zipfile import ZipFile, ZipInfo
+
+import native2612_client as client
+import native2612_client_diagnostics as diagnostics
+
+
+class ClientCleanerTest(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls.observed = (Path(__file__).parent / "fixtures/native2612-client-netty-java25.txt").read_text(encoding="utf-8")
+
+    def test_exact_observed_integrated_status_ping_sequence_is_source_classified(self):
+        errors, accepted = diagnostics.classify(self.observed, client.native.previous_log_findings)
+        self.assertEqual([], errors)
+        self.assertEqual(2, len(accepted))
+        self.assertTrue(all(row["classification"] == "SOURCE_PROVEN_NATIVE64_STATUS_PING_JAVA25_CLEANER_FALLBACK" for row in accepted))
+
+    def test_changed_thread_level_body_order_count_fallback_and_unknown_exceptions_are_not_accepted(self):
+        changes = (
+            self.observed.replace("Server thread/DEBUG", "Render thread/DEBUG", 1),
+            self.observed.replace("Server thread/DEBUG", "Server thread/ERROR", 1),
+            self.observed.replace("ServerStatusPing.java:156", "ServerStatusPing.java:157", 1),
+            self.observed.replace("sun.misc.Unsafe unavailable", "different failure", 1),
+            self.observed.replace("CleanerJava25/", "OtherCleaner25/", 1),
+            self.observed.replace("cleaner(): available", "cleaner(): unavailable", 1),
+            self.observed + self.observed,
+            self.observed.replace("\tat java.base/java.lang.Thread.run(Thread.java:1474) [?:?]", "\tat unknown.Frame.run(Frame.java:1)", 1),
+            self.observed.replace("[12Nov2026 06:49:14.265]", "[12Nov2026 06:49:14.264] [Server thread/INFO] [unit.other/]: interruption\n[12Nov2026 06:49:14.265]", 1),
+            self.observed + "\n[12Nov2026 06:49:14.268] [Server thread/ERROR] [unknown/]: failure\njava.lang.UnsupportedOperationException: new fault\n",
+        )
+        for text in changes:
+            with self.subTest(text=text[:100]):
+                errors, _ = diagnostics.classify(text, client.native.previous_log_findings)
+                self.assertTrue(errors)
+
+    def test_real_sdk_and_primary_sources_are_exact_and_mutations_cannot_bind(self):
+        code = client.inspect_launch(client.native.RIG.parent / "runClient.launch")
+        self.assertEqual(7, len(diagnostics.verify_bindings(code)))
+        wrong = copy.deepcopy(code)
+        next(row for row in wrong["archives"] if Path(row["path"]).name == "netty-common-4.2.7.Final.jar")["sha256"] = "0" * 64
+        with self.assertRaisesRegex(AssertionError, "dependency bytes"):
+            diagnostics.verify_bindings(wrong)
+        with patch.object(diagnostics, "digest", return_value="0" * 64):
+            with self.assertRaises(AssertionError):
+                diagnostics.verify_bindings(code)
+
+    def test_sdk_zip_metadata_changes_are_distinct_from_payload_mutations(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            def archive(name, rows, stamp):
+                path = root / name
+                with ZipFile(path, "w") as output:
+                    for key, value in rows:
+                        output.writestr(ZipInfo(key, date_time=stamp), value)
+                return path
+            rows = [("a/A.class", b"class-bytes"), ("META-INF/MANIFEST.MF", b"Manifest-Version: 1.0\n")]
+            original = archive("original.jar", rows, (2026, 1, 1, 0, 0, 0))
+            reordered = archive("repacked.jar", list(reversed(rows)), (2026, 11, 12, 0, 0, 0))
+            expected = diagnostics.sdk_payload_sha(original)
+            with patch.object(diagnostics, "SDK_PAYLOAD_SHA", expected):
+                diagnostics.verify_sdk_payload(reordered)
+                for label, changed in (("changed", [("a/A.class", b"mutated"), rows[1]]),
+                                       ("missing", rows[1:]), ("added", rows + [("other.class", b"extra")]),
+                                       ("renamed", [("a/B.class", rows[0][1]), rows[1]])):
+                    with self.subTest(label=label), self.assertRaises(AssertionError):
+                        diagnostics.verify_sdk_payload(archive(label + ".jar", changed, (2026, 1, 1, 0, 0, 0)))
+                with self.assertWarns(UserWarning):
+                    duplicate = archive("duplicate.jar", rows + [rows[0]], (2026, 1, 1, 0, 0, 0))
+                with self.assertRaisesRegex(AssertionError, "duplicate SDK"):
+                    diagnostics.verify_sdk_payload(duplicate)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/test-rig/migration/test_native2612_endurance.py b/test-rig/migration/test_native2612_endurance.py
new file mode 100644
index 00000000..c67f0318
--- /dev/null
+++ b/test-rig/migration/test_native2612_endurance.py
@@ -0,0 +1,240 @@
+import copy
+import gzip
+import json
+import os
+from pathlib import Path
+import tempfile
+from types import SimpleNamespace
+import unittest
+from unittest.mock import patch
+
+import nbtlib as n
+
+import native2612 as native
+import native2612_endurance as producer
+import native2612_endurance_replay as replay
+from native2612_layout import shared_file, region_file
+import test_native12111_endurance_replay as retained_controls
+
+VERIFICATION = Path("D:/PowerAdvantage/_verification/base-2612-port-20261112")
+
+
+def native_control_seal():
+    keys = ("NATIVE2612_CONTROL_PROFILE", "NATIVE2612_CONTROL_PROFILE_SHA256",
+            "NATIVE2612_CONTROL_ENGINE_RECEIPT", "NATIVE2612_CONTROL_ENGINE_SHA256")
+    selected = [os.environ.get(key) for key in keys]
+    if any(selected):
+        if not all(selected):
+            raise ValueError("Select the complete hash-bound native endurance control fixture")
+        return replay.seal(Path(selected[0]), selected[1],
+            native.RIG / "src/main/resources/assets/advantageworkstest/works/works-1.13.2.json",
+            VERIFICATION / "native2612-forge-64.1.5-code-inventory-01.json",
+            "3401E46C31606FC080837075542747F2A63865D8A5F8A5E2AFE4E907A35568E7",
+            Path("C:/Users/johnb/.jdks/jdk-25.0.3+9/bin/java.exe"), replay.Budget(), retrospective=True,
+            engine_receipt=Path(selected[2]), engine_receipt_sha256=selected[3])
+    return replay.seal(VERIFICATION / "native2612-local-candidate-04.json",
+        "672B91F20AF5A97936A81783A07F3134A4479D20E40F49972A4EA6F78B577240",
+        native.RIG / "src/main/resources/assets/advantageworkstest/works/works-1.13.2.json",
+        VERIFICATION / "native2612-forge-64.1.5-code-inventory-01.json",
+        "3401E46C31606FC080837075542747F2A63865D8A5F8A5E2AFE4E907A35568E7",
+        Path("C:/Users/johnb/.jdks/jdk-25.0.3+9/bin/java.exe"), replay.Budget(), retrospective=True,
+        engine_receipt=VERIFICATION / "native2612-engine-classifier-02/receipt.json",
+        engine_receipt_sha256="8DFC3F6CCD287AFA07BC502AF180B9EF5A8D59366F291E83DA4D82C49517979D")
+
+
+def put_nbt(path, value):
+    path.parent.mkdir(parents=True, exist_ok=True)
+    path.write_bytes(gzip.compress(retained_controls.encoded(value)))
+
+
+def stopped_fixture(root, dimension="minecraft:overworld"):
+    world = root / replay.WORLD
+    put_nbt(world / "level.dat", n.Compound(Data=n.Compound(DataVersion=n.Int(4790))))
+    put_nbt(shared_file(world, "minecraft:world_gen_settings"), n.Compound(
+        DataVersion=n.Int(4790), data=n.Compound(seed=n.Long(77), generate_structures=n.Byte(0),
+                                              unknown=n.IntArray([3, 2, 1]))))
+    chunk = retained_controls.chunk()
+    chunk["DataVersion"] = n.Int(4790)
+    path = region_file(world, dimension, 0, 0)
+    path.parent.mkdir(parents=True)
+    path.write_bytes(retained_controls.region(retained_controls.payload(chunk)))
+    for station in replay.endurance.CHECKED:
+        document = retained_controls.document()
+        document["dimension"] = dimension
+        retained_controls.put_json(root / "advantage-works-results" / f"{station}-checkpoint-restart-resumed.json", document)
+    return world
+
+
+def complete_report():
+    report = retained_controls.complete_report()
+    report.update(minecraft="26.1.2", forge="64.1.5")
+    report["profiles"] = {mode: copy.deepcopy(next(iter(report["profiles"].values()))) for mode in replay.MODES}
+    return report
+
+
+class Native2612EnduranceContracts(unittest.TestCase):
+    def test_complete_two_world_gate_rejects_held_smoke_missing_resume_and_low_ticks(self):
+        replay.complete(complete_report())
+        for key, value in (("status", "HELD"), ("status", "SMOKE_PASS_NOT_ENDURANCE"),
+                           ("minecraft", "1.21.11"), ("duration_seconds", 1799), ("retained_unchanged", False)):
+            changed = complete_report()
+            changed[key] = value
+            with self.subTest(key=key, value=value), self.assertRaises(AssertionError):
+                replay.complete(changed)
+        for key, value in (("resumed_processing", "FAIL"), ("endurance_batches", 29),
+                           ("verified_checkpoints", 32), ("game_ticks", 32399), ("elapsed_seconds", 1799)):
+            changed = complete_report()
+            changed["profiles"][replay.MODES[1]][key] = value
+            with self.subTest(key=key), self.assertRaises(AssertionError):
+                replay.complete(changed)
+
+    def test_stopped_exact_typed_nbt_all_dimensions_and_nested_custom_dimension(self):
+        for dimension in ("minecraft:overworld", "minecraft:the_nether", "minecraft:the_end", "example:deep/cave"):
+            with self.subTest(dimension=dimension), tempfile.TemporaryDirectory() as folder:
+                root = Path(folder)
+                world = stopped_fixture(root, dimension)
+                before = {str(path.relative_to(world)): path.read_bytes() for path in world.rglob("*") if path.is_file()}
+                actual = replay.raw_final(root, replay.Budget())
+                self.assertEqual("PASS", actual["status"])
+                self.assertEqual(4790, actual["dataVersion"])
+                self.assertEqual(len(replay.endurance.CHECKED), actual["comparedRows"])
+                self.assertEqual(before, {str(path.relative_to(world)): path.read_bytes() for path in world.rglob("*") if path.is_file()})
+                station = replay.endurance.CHECKED[0]
+                path = root / "advantage-works-results" / f"{station}-checkpoint-restart-resumed.json"
+                document = json.loads(path.read_text())
+                value = retained_controls.tile()
+                value["Items"][0]["count"] = n.Int(2)
+                document["snapshot"][0]["nbt"] = value.snbt()
+                path.write_text(json.dumps(document))
+                with self.assertRaisesRegex(AssertionError, "raw state/component mismatch"):
+                    replay.raw_final(root, replay.Budget())
+
+    def test_missing_external_worldgen_is_not_recovered_from_level_dat(self):
+        with tempfile.TemporaryDirectory() as folder:
+            root = Path(folder)
+            world = stopped_fixture(root)
+            shared_file(world, "minecraft:world_gen_settings").unlink()
+            with self.assertRaises(FileNotFoundError):
+                replay.raw_final(root, replay.Budget())
+
+    def test_native_terrain_rejects_old_version_wrong_count_and_packed_tile(self):
+        native_chunk = retained_controls.chunk()
+        with self.assertRaises(AssertionError):
+            replay.terrain(retained_controls.payload(native_chunk), (0, 0))
+        native_chunk["DataVersion"] = n.Int(4790)
+        for compression in (1, 2, 3):
+            replay.terrain(retained_controls.payload(native_chunk, compression), (0, 0))
+        for callback in (lambda value: value.__setitem__("DataVersion", n.Short(4790)),
+                         lambda value: value["block_entities"][0]["Items"][0].__setitem__("count", n.Byte(1)),
+                         lambda value: value["block_entities"][0].__setitem__("keepPacked", n.Byte(1))):
+            changed = copy.deepcopy(native_chunk)
+            callback(changed)
+            with self.assertRaises(AssertionError):
+                replay.terrain(retained_controls.payload(changed), (0, 0))
+
+    def test_preseal_time_precedes_both_setups_retrospective_never_becomes_genuine(self):
+        with tempfile.TemporaryDirectory() as folder:
+            root = Path(folder)
+            for mode in replay.MODES:
+                retained_controls.put_json(root / mode / "advantage-works-results/W-01-checkpoint-setup.json",
+                                           dict(recordedAtUtc="2026-11-12T04:00:00+00:00"))
+            seal = dict(purpose=replay.PRE_RUN, createdAtUtc="2026-11-12T03:59:59+00:00")
+            self.assertTrue(replay.custody(seal, root, replay.Budget())["preRunCustody"])
+            seal["createdAtUtc"] = "2026-11-12T04:00:01+00:00"
+            with self.assertRaises(AssertionError):
+                replay.custody(seal, root, replay.Budget())
+            seal["purpose"] = replay.RETROSPECTIVE
+            self.assertFalse(replay.custody(seal, root, replay.Budget())["preRunCustody"])
+
+    def test_hold_request_is_not_a_pass(self):
+        with tempfile.TemporaryDirectory() as folder:
+            root = Path(folder)
+            (root / "hold-endurance.request").touch()
+            with self.assertRaises(producer.EnduranceHold):
+                producer.check_hold(root)
+
+    def test_qualified_run_cannot_silently_omit_retained_world(self):
+        with self.assertRaisesRegex(ValueError, "original-world migration"):
+            producer.retained_input(SimpleNamespace(retained=None, seconds=1800))
+        self.assertIsNone(producer.retained_input(SimpleNamespace(retained=None, seconds=60)))
+
+    def test_retained_receipt_must_be_full_original110_not_hook_only_or_an_old_candidate(self):
+        prior = native.read_json(native.RIG / "build/native2612-migration-candidate04-original110-02/native2612-upgrade-results.json")
+        profile_sha = "672B91F20AF5A97936A81783A07F3134A4479D20E40F49972A4EA6F78B577240"
+        inventory_sha = "3401E46C31606FC080837075542747F2A63865D8A5F8A5E2AFE4E907A35568E7"
+        producer.require_retained_receipt(prior, profile_sha, inventory_sha)
+        for field, value in (("route", "released110"), ("scope", "INSTRUMENTED_MIGRATION_HOOK_CONVERSION_RESTART_ONLY"),
+                             ("profileSha256", "0" * 64), ("referenceUnchanged", False)):
+            changed = copy.deepcopy(prior)
+            changed[field] = value
+            with self.subTest(field=field), self.assertRaises(AssertionError):
+                producer.require_retained_receipt(changed, profile_sha, inventory_sha)
+        for field in ("operation", "restarted"):
+            changed = copy.deepcopy(prior)
+            changed["phases"][field] = {}
+            with self.subTest(phase=field), self.assertRaises(AssertionError):
+                producer.require_retained_receipt(changed, profile_sha, inventory_sha)
+
+    def test_every_interval_has_real_18_tps_and_starvation_is_not_a_gameplay_diagnosis(self):
+        before = dict(worldTime=100, recordedAtUtc="2026-11-12T04:00:00+00:00")
+        after = dict(worldTime=1300, recordedAtUtc="2026-11-12T04:01:00+00:00")
+        self.assertEqual(20, producer.interval_metrics(before, after, "cycle-001")["ticksPerSecond"])
+        after["worldTime"] = 1179
+        with self.assertRaisesRegex(producer.ThroughputFailure, "not a gameplay diagnosis"):
+            producer.interval_metrics(before, after, "cycle-001")
+        after["worldTime"] = True
+        with self.assertRaises(AssertionError):
+            producer.interval_metrics(before, after, "cycle-001")
+
+    def test_fresh_world_info_retains_full_native_unknown_data(self):
+        with tempfile.TemporaryDirectory() as folder:
+            root = Path(folder)
+            world = stopped_fixture(root)
+            actual = producer.world_info(world)
+            self.assertEqual(77, actual["RandomSeed"])
+            self.assertEqual(0, actual["MapFeatures"])
+            self.assertIn("unknown", actual["fullWorldgenSnbt"])
+            self.assertIn("[I; 3, 2, 1]", actual["fullWorldgenSnbt"])
+
+    def test_frozen_oracle_verifier_rejects_changed_bytes_duplicate_fields_and_wrong_purpose(self):
+        with tempfile.TemporaryDirectory() as folder:
+            root = Path(folder)
+            oracle = root / "oracle.py"
+            oracle.write_text("test fixture, not a production oracle")
+            seal_path = root / "seal.json"
+            document = native_control_seal()
+            document["files"][str(oracle)] = native.digest(oracle)
+            seal_path.write_text(json.dumps(document))
+            pin = native.digest(seal_path)
+            replay.verify_seal(seal_path, pin, replay.Budget())
+            oracle.write_text("changed")
+            with self.assertRaises(AssertionError):
+                replay.verify_seal(seal_path, pin, replay.Budget())
+            seal_path.write_text('{"format":1,"format":1}')
+            with self.assertRaises(ValueError):
+                replay.verify_seal(seal_path, native.digest(seal_path), replay.Budget())
+
+    def test_full_closure_binds_classifier_review_receipt_and_native_primary_sources(self):
+        document = native_control_seal()
+        self.assertEqual(replay.RETROSPECTIVE, document["purpose"], "Unit control is never a genuine qualification seal")
+        self.assertIn(str(Path(native.__file__).resolve()), document["files"])
+        self.assertIn(str(Path(replay.platform_diagnostics.__file__).resolve()), document["files"])
+        self.assertIn(document["engineReceipt"], document["files"])
+        self.assertIn(replay.platform_diagnostics.SOURCES_JAR_SHA, document["files"].values())
+        with tempfile.TemporaryDirectory() as folder:
+            path = Path(folder) / "seal.json"
+            for change in ("omit-oracle", "omit-engine", "old-purpose"):
+                altered = copy.deepcopy(document)
+                if change == "omit-oracle":
+                    del altered["files"][altered["oracles"][0]]
+                elif change == "omit-engine":
+                    del altered["files"][altered["engineReceipt"]]
+                else:
+                    altered["purpose"] = "NATIVE61_ENDURANCE_PRE_RUN_SEAL"
+                path.write_text(json.dumps(altered))
+                with self.subTest(change=change), self.assertRaises(AssertionError):
+                    replay.verify_seal(path, native.digest(path), replay.Budget())
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/test-rig/migration/test_native2612_interop.py b/test-rig/migration/test_native2612_interop.py
new file mode 100644
index 00000000..30d2eb28
--- /dev/null
+++ b/test-rig/migration/test_native2612_interop.py
@@ -0,0 +1,85 @@
+"""Keep the native capability checks strict; synthetic documents are not gameplay proof."""
+
+import copy
+from types import SimpleNamespace
+import unittest
+from unittest.mock import patch
+
+import native2612_interop as adapter
+
+
+def observation(phase="exercise"):
+    ids = adapter.contracts.EXERCISE_CHECK_IDS if phase == "exercise" else adapter.contracts.RESTORED_CHECK_IDS
+    return dict(phase=phase, status="PASS", worldTime=20,
+                checks=[dict(id=key, status="PASS") for key in sorted(ids)],
+                sharedChecks=[dict(id="basemetals/native-power-crushing", status="PASS")])
+
+
+class Native2612InteropTest(unittest.TestCase):
+    def validate(self, document, phase="exercise"):
+        adapter.validate_observation(document, phase, dict(completedWorldTime=20))
+
+    def test_both_phases_retain_the_exact_interface_contracts(self):
+        for phase in ("exercise", "restored"):
+            self.validate(observation(phase), phase)
+        self.assertEqual(("26.1.2", "64.1.5"), (adapter.native.MINECRAFT, adapter.native.FORGE))
+
+    def test_missing_duplicate_and_failed_capability_witnesses_are_rejected(self):
+        document = observation()
+        changes = [copy.deepcopy(document) for _ in range(3)]
+        changes[0]["checks"].pop()
+        changes[1]["checks"][-1] = changes[1]["checks"][0]
+        changes[2]["checks"][0]["status"] = "FAIL"
+        for changed in changes:
+            with self.subTest(checks=changed["checks"]), self.assertRaises(AssertionError):
+                self.validate(changed)
+
+    def test_wrong_phase_time_or_overall_status_cannot_be_pass(self):
+        for field, value in (("phase", "restored"), ("worldTime", 19), ("worldTime", 20.0), ("status", "MANUAL_REQUIRED")):
+            changed = observation()
+            changed[field] = value
+            with self.subTest(field=field), self.assertRaises(AssertionError):
+                self.validate(changed)
+
+    def test_central_base_metals_crushing_is_mandatory(self):
+        for checks in ([], [dict(id="basemetals/native-power-crushing", status="SKIP")],
+                       [dict(id="local-fallback", status="PASS")],
+                       [dict(id="basemetals/native-power-crushing", status="PASS")] * 2):
+            changed = observation()
+            changed["sharedChecks"] = checks
+            with self.subTest(checks=checks), self.assertRaises(AssertionError):
+                self.validate(changed)
+
+    def test_survival_oil_contract_keeps_both_oils_and_all_ten_checks(self):
+        ids = [f"{oil}/{check}" for oil in ("crude_oil", "refined_oil")
+               for check in ("world-roundtrip", "machine-roundtrip", "machine-below-bucket",
+                             "machine-insufficient-room", "machine-full")]
+        good = dict(gameMode="survival", worldTime=20, checks=[dict(id=key, status="PASS") for key in ids])
+        adapter.previous.require_oil_buckets(good, dict(completedWorldTime=20))
+        for field, value in (("gameMode", "creative"), ("checks", good["checks"][:-1]), ("worldTime", 19)):
+            changed = copy.deepcopy(good)
+            changed[field] = value
+            with self.subTest(field=field), self.assertRaises(AssertionError):
+                adapter.previous.require_oil_buckets(changed, dict(completedWorldTime=20))
+
+    def test_preflight_does_not_start_or_stage_a_world(self):
+        args = SimpleNamespace(port=26601, preflight_only=True)
+        inputs = SimpleNamespace(receipt=lambda: dict(minecraft="26.1.2", forge="64.1.5"))
+        with patch.object(adapter, "preflight", return_value=inputs), \
+                patch.object(adapter.native, "stage") as stage, patch.object(adapter.native, "Server") as server:
+            result = adapter.run(args)
+        self.assertEqual("READY_NOT_RUN", result["status"])
+        self.assertFalse(result["qualificationAllowed"])
+        stage.assert_not_called()
+        server.assert_not_called()
+
+    def test_privileged_port_is_refused_before_inputs_or_launch(self):
+        with patch.object(adapter, "preflight") as preflight, patch.object(adapter.native, "Server") as server:
+            with self.assertRaises(ValueError):
+                adapter.run(SimpleNamespace(port=80))
+        preflight.assert_not_called()
+        server.assert_not_called()
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/test-rig/migration/test_native2612_layout.py b/test-rig/migration/test_native2612_layout.py
new file mode 100644
index 00000000..0f7651a9
--- /dev/null
+++ b/test-rig/migration/test_native2612_layout.py
@@ -0,0 +1,165 @@
+import copy
+from pathlib import Path
+import tempfile
+import unittest
+import uuid
+
+import nbtlib
+
+import native2612_layout as layout
+
+
+class Native2612LayoutTest(unittest.TestCase):
+    def setUp(self):
+        self.temp = tempfile.TemporaryDirectory()
+        self.addCleanup(self.temp.cleanup)
+        self.world = Path(self.temp.name) / "world"
+        self.world.mkdir()
+        self.identity = uuid.UUID("12345678-1234-5678-9abc-def012345678")
+
+    def save(self, path, value):
+        path.parent.mkdir(parents=True, exist_ok=True)
+        nbtlib.File(value, gzipped=True).save(path)
+
+    def level(self, **extra):
+        data = nbtlib.Compound(DataVersion=nbtlib.Int(4790), **extra)
+        self.save(self.world / "level.dat", nbtlib.Compound(Data=data))
+        return data
+
+    def words(self, identity=None):
+        value = (identity or self.identity).int
+        return nbtlib.IntArray([((value >> shift) & 0xffffffff) -
+                               (0x100000000 if (value >> shift) & 0x80000000 else 0)
+                               for shift in (96, 64, 32, 0)])
+
+    def test_all_vanilla_dimensions_are_namespaced_not_legacy_folders(self):
+        for key, name in (("minecraft:overworld", "overworld"),
+                          ("minecraft:the_nether", "the_nether"),
+                          ("minecraft:the_end", "the_end")):
+            self.assertEqual(self.world / "dimensions/minecraft" / name,
+                             layout.dimension_directory(self.world, key))
+
+    def test_custom_nested_dimension_identity_is_not_inferred_from_basename(self):
+        for key in ("test:deep/caverns", "test:dim-1", "other:dim1"):
+            namespace, path = key.split(":")
+            self.assertEqual(self.world / "dimensions" / namespace / path,
+                             layout.dimension_directory(self.world, key))
+        self.assertNotEqual(layout.dimension_directory(self.world, "test:dim-1"),
+                            layout.dimension_directory(self.world, "minecraft:the_nether"))
+
+    def test_legacy_folders_never_override_target_layout(self):
+        for path in ("region", "DIM-1/region", "DIM1/region", "playerdata"):
+            (self.world / path).mkdir(parents=True)
+        self.assertEqual(self.world / "dimensions/minecraft/overworld/region/r.0.0.mca",
+                         layout.region_file(self.world, "minecraft:overworld", 0, 0))
+        self.assertEqual(self.world / "players/data" / (str(self.identity) + ".dat"),
+                         layout.player_file(self.world, self.identity))
+
+    def test_negative_chunk_coordinates_use_floor_division_for_every_storage_kind(self):
+        for x, z, rx, rz in ((-33, -1, -2, -1), (-32, -32, -1, -1),
+                             (-1, 32, -1, 1), (31, -33, 0, -2), (32, 0, 1, 0)):
+            for kind in ("region", "entities", "poi"):
+                path = layout.region_file(self.world, "test:deep/caverns", x, z, kind)
+                self.assertEqual(self.world / "dimensions/test/deep/caverns" / kind /
+                                 f"r.{rx}.{rz}.mca", path)
+
+    def test_coordinates_and_storage_kinds_fail_closed(self):
+        for x, z in ((True, 0), (0, False), (1.5, 0), (0, "1")):
+            with self.subTest(x=x, z=z), self.assertRaises(ValueError):
+                layout.region_file(self.world, "minecraft:overworld", x, z)
+        for kind in ("DIM-1", "../entities", "data", ""):
+            with self.subTest(kind=kind), self.assertRaises(ValueError):
+                layout.region_file(self.world, "minecraft:overworld", 0, 0, kind)
+
+    def test_resource_keys_cannot_escape_or_change_phase(self):
+        for key in ("overworld", "../minecraft:overworld", "minecraft:../overworld",
+                    "minecraft:/overworld", "minecraft:a//b", "minecraft:a/./b",
+                    "minecraft:a\\b", "Minecraft:overworld", "minecraft:", "a:b:c"):
+            with self.subTest(key=key), self.assertRaises(ValueError):
+                layout.dimension_directory(self.world, key)
+
+    def test_shared_data_uses_its_full_namespaced_resource_key(self):
+        self.assertEqual(self.world / "data/minecraft/world_gen_settings.dat",
+                         layout.shared_file(self.world, "minecraft:world_gen_settings"))
+        self.assertEqual(self.world / "data/test/deep/unknown.dat",
+                         layout.shared_file(self.world, "test:deep/unknown"))
+
+    def test_player_uuid_is_not_a_path_or_a_loose_alias(self):
+        for value in ("../player", "not-a-uuid", "12345678123456789abcdef012345678",
+                      str(self.identity).upper(), None, 0):
+            with self.subTest(value=value), self.assertRaises(ValueError):
+                layout.player_file(self.world, value)
+
+    def test_level_requires_the_native_target_version_without_coercion(self):
+        for value in (nbtlib.Int(4671), nbtlib.String("4790"), nbtlib.Long(4790)):
+            self.save(self.world / "level.dat", nbtlib.Compound(Data=nbtlib.Compound(DataVersion=value)))
+            with self.subTest(value=value), self.assertRaises(ValueError):
+                layout.read_level(self.world)
+        self.level(Unknown=nbtlib.Compound(keep=nbtlib.String("exact")))
+        data = layout.read_level(self.world)
+        self.assertEqual("exact", data["Unknown"]["keep"])
+
+    def test_missing_shared_worldgen_does_not_fall_back_to_embedded_legacy_data(self):
+        self.level(WorldGenSettings=nbtlib.Compound(seed=nbtlib.Long(17)))
+        with self.assertRaises(FileNotFoundError):
+            layout.read_worldgen(self.world)
+
+    def test_shared_worldgen_preserves_unknown_complete_nbt(self):
+        self.level()
+        settings = nbtlib.Compound(seed=nbtlib.Long(-17),
+                                  Unknown=nbtlib.Compound(raw=nbtlib.ByteArray([1, -2, 3])))
+        path = layout.shared_file(self.world, "minecraft:world_gen_settings")
+        self.save(path, nbtlib.Compound(DataVersion=nbtlib.Int(4790), data=settings,
+                                      UnknownEnvelope=nbtlib.String("retain")))
+        before = path.read_bytes()
+        result = layout.read_worldgen(self.world)
+        self.assertEqual(settings, result["data"])
+        self.assertEqual("retain", result["UnknownEnvelope"])
+        result["data"]["Unknown"]["raw"][0] = 99
+        self.assertEqual(before, path.read_bytes())
+
+    def test_shared_data_requires_native_version_and_compound_payload(self):
+        self.level()
+        path = layout.shared_file(self.world, "minecraft:world_gen_settings")
+        for tag in (nbtlib.Compound(DataVersion=nbtlib.Int(4671), data=nbtlib.Compound()),
+                    nbtlib.Compound(DataVersion=nbtlib.Int(4790)),
+                    nbtlib.Compound(DataVersion=nbtlib.Int(4790), data=nbtlib.String("wrong"))):
+            self.save(path, tag)
+            with self.subTest(tag=tag), self.assertRaises(ValueError):
+                layout.read_worldgen(self.world)
+
+    def test_singleplayer_uuid_is_explicit_authority_and_missing_is_not_invented(self):
+        self.level()
+        self.assertIsNone(layout.singleplayer_uuid(self.world))
+        self.level(singleplayer_uuid=self.words())
+        self.assertEqual(self.identity, layout.singleplayer_uuid(self.world))
+
+    def test_malformed_or_embedded_player_authority_is_rejected(self):
+        for value in (nbtlib.String(str(self.identity)), nbtlib.IntArray([1, 2]),
+                      nbtlib.List[nbtlib.Int]([1, 2, 3, 4])):
+            self.level(singleplayer_uuid=value)
+            with self.subTest(value=value), self.assertRaises(ValueError):
+                layout.singleplayer_uuid(self.world)
+        for extra in ({"Player": nbtlib.Compound(UUID=self.words())},
+                      {"singleplayer_uuid": self.words(),
+                       "Player": nbtlib.Compound(UUID=self.words(uuid.uuid4()))}):
+            self.level(**extra)
+            with self.assertRaises(ValueError):
+                layout.singleplayer_uuid(self.world)
+
+    def test_player_file_keeps_all_unknown_fields_and_checks_identity(self):
+        tag = nbtlib.Compound(DataVersion=nbtlib.Int(4790), UUID=self.words(),
+                             Dimension=nbtlib.String("test:deep/caverns"),
+                             Unknown=nbtlib.Compound(opaque=nbtlib.LongArray([1, -2])))
+        path = layout.player_file(self.world, self.identity)
+        self.save(path, tag)
+        expected = copy.deepcopy(tag)
+        self.assertEqual(expected.snbt(), layout.read_player(self.world, self.identity).snbt())
+        for changed in (dict(UUID=self.words(uuid.uuid4())), dict(DataVersion=nbtlib.Int(4671))):
+            self.save(path, nbtlib.Compound({**tag, **changed}))
+            with self.assertRaises(ValueError):
+                layout.read_player(self.world, self.identity)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/test-rig/migration/test_native2612_legacy_alternatives.py b/test-rig/migration/test_native2612_legacy_alternatives.py
new file mode 100644
index 00000000..fa5e5e02
--- /dev/null
+++ b/test-rig/migration/test_native2612_legacy_alternatives.py
@@ -0,0 +1,91 @@
+import copy
+import json
+from pathlib import Path
+import tempfile
+import unittest
+from unittest.mock import patch
+
+import native2612_legacy_alternatives as current
+import native2612_retained_worldgen as retained
+import native2612_worldgen as old
+
+
+class VisibleAlternativeContractTest(unittest.TestCase):
+    def fixture(self, root):
+        expected = dict(ores={}, fluid_deposits={})
+        files = []
+        for old_owner, owner, blocks in (("poweradvantage", "basepower", ["crude_oil"]),
+                                        ("electricadvantage", "baseelectric", ["li_ore", "sulfur_ore"])):
+            document = dict(dimensions=[dict(dimension="+", ores=[dict(blockID=old_owner + ":" + block,
+                minHeight=4, maxHeight=32, frequency=0.375, size=8, variation=2, biomes=[]) for block in blocks])])
+            source = root / (old_owner + ".json")
+            source.write_text(json.dumps(document), encoding="utf-8")
+            files.append((source, Path("config/orespawn") / source.name))
+            expected["ores"].update(retained.os1_profile(document, owner, old_owner)["ores"])
+        result = copy.deepcopy(expected)
+        result["schema_version"] = 7
+        for target in current.contract_spec()["replacesOnly"]:
+            dimension = dict(enabled=True, min_y=1, max_y=31, frequency=0.125,
+                             host_blocks=["minecraft:stone"], host_tags=["forge:stone"],
+                             min_quantity=6, max_quantity=9, pattern="default", placement_channel="orespawn:standard",
+                             min_radius=5, max_radius=12, min_vertical_radius=2, max_vertical_radius=5)
+            result[target["section"]][target["entry"]] = dict(block=target["block"], enabled=False,
+                retrogen=False, dimensions={"minecraft:overworld": dimension})
+        spec = dict(configFixtures=files)
+        assertions = [dict(id=row["id"], section=row["section"], entry=row["entry"],
+                           **current.contract_spec()["replacement"]) for row in current.contract_spec()["replacesOnly"]]
+        return result, spec, assertions
+
+    def test_only_three_explicit_absence_assertions_change_and_history_stays_unchanged(self):
+        before = old.campaign_spec("legacy-import")
+        changed = current.campaign_spec("legacy-import")
+        targets = {row["id"] for row in current.contract_spec()["replacesOnly"]}
+        expected = copy.deepcopy(before)
+        for phase in ("first", "restart"):
+            for row in expected[phase + "ProfileAssertions"]:
+                if row["id"] in targets:
+                    row.update(current.contract_spec()["replacement"])
+        self.assertEqual(expected, changed)
+        self.assertEqual(before, old.campaign_spec("legacy-import"))
+        self.assertIs(current.worldgen.validate_restart, old.validate_restart)
+        with self.assertRaises(AssertionError): current.campaign_spec("advantage")
+
+    def test_complete_disabled_alternatives_and_all_raw_os1_settings_pass(self):
+        with tempfile.TemporaryDirectory() as directory:
+            document, spec, assertions = self.fixture(Path(directory))
+            with patch.object(current, "campaign_spec", return_value=spec):
+                rows = current.validate_profile(document, assertions)
+            self.assertEqual("PASS", rows[-1]["status"])
+
+    def test_enabled_missing_or_incomplete_alternatives_are_rejected(self):
+        with tempfile.TemporaryDirectory() as directory:
+            original, spec, assertions = self.fixture(Path(directory))
+            for mutation in ("enabled", "missing", "empty", "channel", "host", "geometry"):
+                document = copy.deepcopy(original)
+                rule = document["ores"]["baseelectric:ore/lithium"]
+                if mutation == "enabled": rule["enabled"] = True
+                elif mutation == "missing": del document["ores"]["baseelectric:ore/lithium"]
+                elif mutation == "empty": rule["dimensions"] = {}
+                else:
+                    dimension = rule["dimensions"]["minecraft:overworld"]
+                    dimension.pop({"channel": "placement_channel", "host": "host_blocks", "geometry": "max_y"}[mutation])
+                with self.subTest(mutation=mutation), patch.object(current, "campaign_spec", return_value=spec):
+                    with self.assertRaises(AssertionError): current.validate_profile(document, assertions)
+
+    def test_changed_legacy_rates_or_a_new_active_duplicate_cannot_hide_behind_disabled_guards(self):
+        with tempfile.TemporaryDirectory() as directory:
+            original, spec, assertions = self.fixture(Path(directory))
+            for mutation in ("rate", "duplicate", "disabled", "output"):
+                document = copy.deepcopy(original)
+                key = "baseelectric:legacy/baseelectric_li_ore_0"
+                rule = document["ores"][key]
+                if mutation == "rate": rule["dimension_selectors"]["orespawn:all_except_nether_end"]["frequency"] = 99
+                elif mutation == "duplicate": document["ores"]["pack:unapproved_lithium"] = copy.deepcopy(rule)
+                elif mutation == "disabled": rule["enabled"] = False
+                else: rule["block"] = "baseelectric:unknown_block"
+                with self.subTest(mutation=mutation), patch.object(current, "campaign_spec", return_value=spec):
+                    with self.assertRaises(AssertionError): current.validate_profile(document, assertions)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/test-rig/migration/test_native2612_machines.py b/test-rig/migration/test_native2612_machines.py
new file mode 100644
index 00000000..cbc7662c
--- /dev/null
+++ b/test-rig/migration/test_native2612_machines.py
@@ -0,0 +1,56 @@
+from pathlib import Path
+import tempfile
+import unittest
+
+import lifecycle
+from native117_identity import fixture_ids
+from native117_lifecycle import NativeLifecycleRun, exercise
+import native1201_machines
+import native2612_machines as machines
+
+
+class NativeMachineAdapterTest(unittest.TestCase):
+    def test_harvest_reuses_the_old_oracle_without_mutating_its_module(self):
+        self.assertIs(machines.harvest.__globals__["native1201"].Server, machines.Server)
+        self.assertEqual(machines.harvest.__globals__["native1201"].MINECRAFT, machines.native.MINECRAFT)
+        self.assertIsNot(native1201_machines.harvest.__globals__["native1201"], machines.native)
+        self.assertIs(machines.harvest.__globals__["require_checks"],
+                      native1201_machines.harvest.__globals__["require_checks"])
+        self.assertIs(machines.harvest.__globals__["require_isolation"],
+                      native1201_machines.harvest.__globals__["require_isolation"])
+
+    def test_lifecycle_keeps_all_twelve_moves_and_three_processing_networks(self):
+        self.assertTrue(issubclass(machines.LifecycleRun, NativeLifecycleRun))
+        self.assertIs(machines.exercise, exercise)
+        rows = fixture_ids(lifecycle.fixtures())
+        self.assertEqual(15, len(rows))
+        for prefix in ("S-MOVE-", "E-MOVE-"):
+            selected = [row for row in rows if row["id"].startswith(prefix)]
+            self.assertEqual(6, len(selected))
+            self.assertEqual({"down", "up", "north", "south", "west", "east"},
+                             {row["facing"] for row in selected})
+        self.assertEqual({"C-STEAM", "C-ELECTRIC", "C-FLUID"}, {row["id"] for row in rows if "from" not in row})
+
+    def test_boot_identity_rejects_historical_engines_and_missing_native_markers(self):
+        with tempfile.TemporaryDirectory() as directory:
+            log = Path(directory) / "console.log"
+            valid = ("Starting minecraft server version 26.1.2\n"
+                     "Forge mod loading, version 64.1.5, for MC 26.1.2 with MCP 20260409.101008\n")
+            log.write_text(valid, encoding="utf-8")
+            machines.native_boot(log)
+            for wrong in (valid.replace("26.1.2", "1.21.11"), valid.replace("64.1.5", "64.0.9"),
+                          "Starting minecraft server version 26.1.2\n",
+                          valid + "[00:00:00] [main/ERROR] Resource failure\n"):
+                log.write_text(wrong, encoding="utf-8")
+                with self.assertRaises(AssertionError):
+                    machines.native_boot(log)
+
+    def test_native_lifecycle_configuration_does_not_redirect_to_old_java_or_launcher(self):
+        self.assertEqual("26.1.2", machines.LifecycleRun.minecraft)
+        self.assertEqual(11, machines.LifecycleRun.max_ticket_distance)
+        self.assertEqual("25.0.3+9", machines.native.JAVA_VERSION)
+        self.assertIn("26.1.2-64.1.5", machines.native.LAUNCHER)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/test-rig/migration/test_native2612_networks.py b/test-rig/migration/test_native2612_networks.py
new file mode 100644
index 00000000..f217fe56
--- /dev/null
+++ b/test-rig/migration/test_native2612_networks.py
@@ -0,0 +1,159 @@
+import copy
+from pathlib import Path
+import tempfile
+import unittest
+from unittest.mock import patch
+
+import nbtlib
+
+from matrix import digest, fingerprint
+from native117_geometry import require_geometry
+from native117_partial import exercise_bridge, exercise_partial
+from native117_ticket_networks import NativeTicketExtendedRun
+import native117_extended
+import native2612_networks as networks
+
+
+class NativeNetworkAdapterTest(unittest.TestCase):
+    def test_native_sdk_and_historical_oracles_remain_explicit(self):
+        self.assertEqual(("26.1.2", "64.1.5", "20260409.101008", "25.0.3+9"),
+                         (networks.native.MINECRAFT, networks.native.FORGE,
+                          networks.native.MCP, networks.native.JAVA_VERSION))
+        self.assertEqual(11, networks.MAX_TICKET_DISTANCE)
+        self.assertEqual(13, networks.HOLDER_RADIUS)
+        self.assertTrue(issubclass(networks.PartialRun, NativeTicketExtendedRun))
+        self.assertIs(networks.CAMPAIGNS["partial"][1], exercise_partial)
+        self.assertIs(networks.CAMPAIGNS["bridge"][1], exercise_bridge)
+        self.assertIs(networks.CAMPAIGNS["extended"][1], native117_extended.exercise)
+
+    def test_live_geometry_cannot_accept_an_old_radius_or_unobserved_forced_ticket(self):
+        original = dict(ticketGeometry=dict(fullLevel=33, entityTickingLevel=31, maxDistance=11,
+                        lastHolderLevel=44, holderRadius=13, observedForcedLevels=[31]))
+        require_geometry(original, forced=True, max_distance=networks.MAX_TICKET_DISTANCE)
+        for key, value in (("maxDistance", 12), ("lastHolderLevel", 45),
+                           ("holderRadius", 12), ("observedForcedLevels", []),
+                           ("observedForcedLevels", [32])):
+            wrong = copy.deepcopy(original)
+            wrong["ticketGeometry"][key] = value
+            with self.assertRaises(AssertionError):
+                require_geometry(wrong, forced=True, max_distance=networks.MAX_TICKET_DISTANCE)
+
+    def test_three_network_types_are_outside_each_others_loaded_holder_apron(self):
+        linear = networks.linear_fixtures(networks.HOLDER_RADIUS)
+        bridges = networks.bridge_fixtures(networks.HOLDER_RADIUS)
+        self.assertEqual({"C-STEAM", "C-ELECTRIC", "C-FLUID"}, {row["id"] for row in linear})
+        self.assertEqual(3, len(bridges))
+        for rows, left, right in ((linear, "supply", "machine"), (bridges, "bridge", "endpoints")):
+            for row in rows:
+                a, b = row["groups"][left][0], row["groups"][right][0]
+                self.assertGreater(max(abs(a[0] - b[0]), abs(a[1] - b[1])), 2 * networks.HOLDER_RADIUS)
+
+    def test_extended_retains_six_facings_vertical_routes_and_junctions_for_both_drills(self):
+        rows = networks.extended_fixtures(networks.HOLDER_RADIUS)
+        self.assertEqual(21, len(rows))
+        faces = {"down", "up", "north", "south", "west", "east"}
+        for prefix in ("S-EXT-", "E-EXT-"):
+            routes = [row for row in rows if row["id"].startswith(prefix)]
+            self.assertEqual(9, len(routes))
+            self.assertEqual(faces, {row["facing"] for row in routes})
+            self.assertTrue({prefix + suffix for suffix in ("vertical-up", "vertical-down", "junction")}
+                            <= {row["id"] for row in routes})
+
+    def test_item_command_adapter_preserves_all_typed_custom_fields(self):
+        old = 'minecraft:dirt{AdvWorksWitness:"unit",Extra:{kind:5s}}'
+        converted = networks.native_inventory_item(old)
+        self.assertTrue(converted.startswith("minecraft:dirt[minecraft:custom_data="))
+        self.assertEqual(nbtlib.parse_nbt(old.partition("{")[1] + old.partition("{")[2]),
+                         nbtlib.parse_nbt(converted.partition("=")[2][:-1]))
+        self.assertEqual("minecraft:coal", networks.native_inventory_item("minecraft:coal"))
+        with self.assertRaises(ValueError):
+            networks.native_inventory_item('minecraft:dirt[minecraft:custom_data={A:1}]')
+
+    def test_derived_inventory_view_preserves_components_unknown_fields_and_original(self):
+        original = dict(nbt='{Items:[{id:"minecraft:dirt",count:7,components:{'
+                            '"minecraft:custom_data":{AdvWorksWitness:"unit",Typed:2b},'
+                            '"future:payload":{Value:9L}}}],Outside:3s}', extra=[dict(value=4)])
+        frozen = copy.deepcopy(original)
+        derived = networks.compatibility_view(original)
+        self.assertEqual(frozen, original)
+        self.assertIsNot(derived, original)
+        raw, converted = nbtlib.parse_nbt(original["nbt"]), nbtlib.parse_nbt(derived["nbt"])
+        self.assertEqual(raw["Outside"], converted["Outside"])
+        self.assertEqual(raw["Items"][0]["components"], converted["Items"][0]["components"])
+        self.assertEqual(raw["Items"][0]["count"], converted["Items"][0]["Count"])
+        self.assertEqual(raw["Items"][0]["components"]["minecraft:custom_data"], converted["Items"][0]["tag"])
+
+    def test_native_inventory_rejects_legacy_ambiguous_and_badly_typed_stacks(self):
+        invalid = ['{Items:{}}', '{Items:[{count:1}]}', '{Items:[{id:"minecraft:dirt",Count:1b}]}',
+                   '{Items:[{id:"minecraft:dirt",count:1,Count:1b}]}',
+                   '{Items:[{id:"minecraft:dirt",count:1,tag:{}}]}',
+                   '{Items:[{id:"minecraft:dirt",count:1,components:[]}]}',
+                   '{Items:[{id:"minecraft:dirt",count:1,components:{"minecraft:custom_data":1}}]}']
+        invalid += ['{Items:[{id:"minecraft:dirt",count:' + value + '}]}'
+                    for value in ("0", "-1", "1b", "1s", "1L", "1.0f", '"1"')]
+        for nbt in invalid:
+            with self.subTest(nbt=nbt), self.assertRaises(AssertionError):
+                networks.compatibility_view(dict(nbt=nbt))
+
+    def test_native_snapshot_identity_and_clock_cannot_be_coerced(self):
+        good = dict(minecraft="26.1.2", forge="64.1.5", station="lifecycle", worldTime=0)
+        self.assertIs(good, networks.validate_snapshot(good))
+        for key, value in (("minecraft", "1.21.11"), ("forge", "64.0.9"), ("station", "works"),
+                           ("worldTime", True), ("worldTime", -1), ("worldTime", "0")):
+            wrong = dict(good, **{key: value})
+            with self.assertRaises(AssertionError):
+                networks.validate_snapshot(wrong)
+
+    def test_custody_rejects_changed_seed_and_oracle_input(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            seed = root / "seed"
+            seed.mkdir()
+            (seed / "library").write_bytes(b"sealed seed")
+            source = root / "oracle.py"
+            source.write_bytes(b"sealed oracle")
+            hashes = networks.oracle_closure()
+            hashes[source] = digest(source)
+            inputs = networks.Inputs((seed, {}, {}), root / "java", "unit", root / "output", hashes, fingerprint(seed))
+            inputs.verify(False)
+            source.write_bytes(b"changed oracle")
+            with self.assertRaises(AssertionError):
+                inputs.verify(False)
+            source.write_bytes(b"sealed oracle")
+            (seed / "library").write_bytes(b"changed seed")
+            with self.assertRaises(AssertionError):
+                inputs.verify(False)
+
+    def test_preflight_rejects_inherited_jvm_options_before_any_world_work(self):
+        from types import SimpleNamespace
+        for key in ("JAVA_TOOL_OPTIONS", "JDK_JAVA_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH"):
+            with patch.dict(networks.native.os.environ, {key: "unexpected"}), self.assertRaises(ValueError):
+                networks.prepare_inputs(SimpleNamespace())
+
+    def test_explicit_cpu_cap_preserves_the_real_pinned_command(self):
+        original = ["actual-java.exe", "-Xms512M", "-Xmx2G", "@native-win-args.txt", "nogui"]
+        actual = networks.capped_command(original)
+        self.assertEqual([original[0], "-XX:ActiveProcessorCount=4", *original[1:]], actual)
+        self.assertNotIn("-XX:ActiveProcessorCount=4", original)
+        self.assertEqual(1, actual.count("-XX:ActiveProcessorCount=4"))
+        for command in ([], ["java", "-version"], ["java", "-Xmx3G", "@args"],
+                        ["java", "-Xmx2G", "@args", "-XX:ActiveProcessorCount=8"]):
+            with self.assertRaises(ValueError):
+                networks.capped_command(command)
+
+    def test_finite_server_retains_the_actual_core_mro_and_local_constructor_binding(self):
+        self.assertTrue(issubclass(networks.Server, networks.native.Server))
+        mro = networks.Server.__mro__
+        self.assertLess(mro.index(networks.native.Server), mro.index(networks._CappedLaunch))
+        self.assertLess(mro.index(networks._CappedLaunch), mro.index(networks.native.NativeLaunch))
+        self.assertIs(networks.native.NativeLaunch.__init__.__globals__["subprocess"], networks.subprocess)
+
+    def test_even_empty_inherited_options_are_rejected(self):
+        from types import SimpleNamespace
+        for key in ("JAVA_TOOL_OPTIONS", "JDK_JAVA_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH"):
+            with patch.dict(networks.native.os.environ, {key: ""}), self.assertRaises(ValueError):
+                networks.prepare_inputs(SimpleNamespace())
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/test-rig/migration/test_native2612_oil.py b/test-rig/migration/test_native2612_oil.py
new file mode 100644
index 00000000..3b933765
--- /dev/null
+++ b/test-rig/migration/test_native2612_oil.py
@@ -0,0 +1,162 @@
+import copy
+from pathlib import Path
+import tempfile
+import unittest
+from unittest.mock import patch
+
+from matrix import digest
+from native117_oil import construction_commands
+import native2612_oil as oil
+from test_native2612_resources import level_fixture
+
+
+def in_world_fixture(root):
+    world, _ = level_fixture(root, "unit-oil-world")
+    record = dict(file="unit-oil-world/level.dat", sha256=digest(world / "level.dat"))
+
+    def pixels(name, broken=False):
+        a, b = root / (name + "-actual.rgba"), root / (name + "-reference.rgba")
+        a.write_bytes(bytes((1, 2, 3, 255)) * 4)
+        b.write_bytes(bytes((10 if broken else 1, 2, 3, 255)) * 4)
+        return dict(width=2, height=2, actualRgba=dict(file=a.name, sha256=digest(a)),
+                    referenceRgba=dict(file=b.name, sha256=digest(b)))
+
+    phases = []
+    for index, phase in enumerate(("initial", "after-resource-reload")):
+        rows = []
+        for number, (name, flowing) in enumerate((name, flowing) for name in oil.OILS for flowing in (False, True)):
+            sprite = "basepower:blocks/" + name + ("_flow" if flowing else "_still")
+            rows.append(dict(oil=name, flowing=flowing, worldBlock="basepower:" + name, modelLayer="TRANSLUCENT",
+                             missingModel=False, modelSprite=sprite, atlasSprite=sprite,
+                             modelLookup="IClientFluidTypeExtensions.getModel", modelSpriteIdentity=number + 1 + index * 100,
+                             atlasSpriteIdentity=number + 1 + index * 100, modelIdentity=number + 10 + index * 100,
+                             vertices=4, pos=[number, 80, 0], worldTime=100, pixels=pixels(phase + str(number))))
+        phases.append(dict(phase=phase, atlasGeneration=index, reloadCompleted=bool(index), cases=rows))
+    return dict(protocol="NATIVE64_IN_WORLD_OIL_ATLAS_V1", minecraft="26.1.2", forge="64.1.5",
+                profileSha256="A" * 64, worldLoaded=True, dimension="minecraft:overworld", syntheticWorld=False,
+                stoppedLevel=record, phases=phases,
+                negativeControls={key: pixels(key, True) for key in ("missing-model", "wrong-sprite", "stale-atlas")})
+
+
+class OilAdapterTest(unittest.TestCase):
+    def test_only_the_four_power_lanes_are_defined_without_a_new_mineralogy_pin(self):
+        definition = oil.fixtures({"jars": []})
+        self.assertEqual(4, len(definition))
+        self.assertEqual({"basepower:crude_oil", "basepower:refined_oil"}, {row["fluid"] for row in definition})
+        self.assertEqual(oil.native.LAUNCHER, oil.OilRun.expected_launcher)
+
+    def test_missing_tank_or_wrong_identity_cannot_be_defaulted_to_empty(self):
+        definition = oil.fixtures({"jars": []})
+        original = dict(minecraft="26.1.2", forge="64.1.5", station="lifecycle", worldTime=0, cases={
+            lane["id"]: [dict(pos=pos, loaded=True, nbt="{Tank:{Empty:1b}}") for pos in lane["witnesses"]]
+            for lane in definition})
+        self.assertIs(original, oil.validate_snapshot(original, definition))
+        for text in ("{}", '{Tank:{FluidName:"minecraft:water",Amount:1000}}',
+                     '{Tank:{FluidName:"basepower:crude_oil",Amount:-1}}', '{Tank:{Empty:1}}',
+                     '{Tank:{Empty:0b}}', '{Tank:{Empty:1b,Amount:0}}'):
+            wrong = copy.deepcopy(original)
+            lane = definition[0]
+            next(row for row in wrong["cases"][lane["id"]] if row["pos"] == lane["drain"])["nbt"] = text
+            with self.assertRaises((AssertionError, KeyError)):
+                oil.validate_snapshot(wrong, definition)
+        wrong = copy.deepcopy(original)
+        wrong["minecraft"] = "1.21.11"
+        with self.assertRaises(AssertionError):
+            oil.validate_snapshot(wrong, definition)
+
+    def test_filled_oil_requires_native_int_amount_and_exact_fluid_payload(self):
+        definition = oil.fixtures({"jars": []})
+        original = dict(minecraft="26.1.2", forge="64.1.5", station="lifecycle", worldTime=1, cases={
+            lane["id"]: [dict(pos=pos, loaded=True, nbt='{Tank:{Amount:1000,FluidName:"' + lane["fluid"] + '"}}')
+                         for pos in lane["witnesses"]] for lane in definition})
+        self.assertIs(original, oil.validate_snapshot(original, definition))
+        for amount in ("1000s", "1000L", "1000.0f", "1000.0d", '"1000"'):
+            wrong = copy.deepcopy(original)
+            row = wrong["cases"][definition[0]["id"]][1]
+            row["nbt"] = row["nbt"].replace("Amount:1000", "Amount:" + amount)
+            with self.assertRaises(AssertionError):
+                oil.validate_snapshot(wrong, definition)
+
+    def test_only_exact_first_preconstruction_load_accepts_loaded_air(self):
+        definition = oil.fixtures({"jars": []})
+        original = dict(minecraft="26.1.2", forge="64.1.5", station="lifecycle", worldTime=1, cases={
+            lane["id"]: [dict(pos=pos, loaded=True, block="minecraft:air", state="Block{minecraft:air}")
+                         for pos in lane["witnesses"]] for lane in definition})
+        runner = object.__new__(oil.OilRun)
+        runner.definition = definition
+        runner.boots = ["oil-first-fill"]
+        runner.pending_construction = construction_commands(definition)
+        runner.construction_sealed = False
+        with patch.object(oil.NativeOilRun, "probe", return_value=original):
+            self.assertIs(original, runner.probe("load", "oil-loaded"))
+            for operation, label in (("snapshot", "oil-loaded"), ("load", "oil-restart-loaded")):
+                with self.assertRaises((AssertionError, KeyError)):
+                    runner.probe(operation, label)
+            runner.pending_construction.pop(0)
+            with self.assertRaises((AssertionError, KeyError)):
+                runner.probe("load", "oil-loaded")
+        runner.pending_construction = construction_commands(definition)
+        for change in (lambda row: row.update(loaded=False), lambda row: row.update(block="basepower:fluid_drain"),
+                       lambda row: row.update(state="Block{minecraft:stone}"), lambda row: row.update(nbt="{}")):
+            wrong = copy.deepcopy(original)
+            change(wrong["cases"][definition[0]["id"]][0])
+            with patch.object(oil.NativeOilRun, "probe", return_value=wrong):
+                with self.assertRaises((AssertionError, KeyError)):
+                    runner.probe("load", "oil-loaded")
+
+    def test_worldless_oil_gauges_cannot_claim_actual_world_rendering(self):
+        with tempfile.TemporaryDirectory() as directory:
+            with self.assertRaises((AssertionError, KeyError)):
+                oil.validate_in_world_render(dict(tank_gauge_pixel_status="PASS", fluid_rendering=[]), Path(directory), "A" * 64)
+
+    def test_actual_world_schema_requires_exact_native_model_and_reload_controls(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            original = in_world_fixture(root)
+            before = copy.deepcopy(original)
+            result = oil.validate_in_world_render(original, root, "A" * 64)
+            self.assertEqual(8, result["cases"])
+            self.assertEqual(before, original)
+            changes = (
+                lambda doc: doc.update(worldLoaded=False),
+                lambda doc: doc.update(syntheticWorld=True),
+                lambda doc: doc.update(profileSha256="B" * 64),
+                lambda doc: doc["phases"][1].update(reloadCompleted=False),
+                lambda doc: doc["phases"][1].update(atlasGeneration=0),
+                lambda doc: doc["phases"][1]["cases"][0].update(modelIdentity=10),
+                lambda doc: doc["phases"][1]["cases"][0].update(modelSpriteIdentity=1, atlasSpriteIdentity=1),
+                lambda doc: doc["phases"][0]["cases"][0].update(modelLayer="SOLID"),
+                lambda doc: doc["phases"][0]["cases"][0].update(missingModel=True),
+                lambda doc: doc["phases"][0]["cases"][0].update(modelSprite="minecraft:block/water_still"),
+                lambda doc: doc["phases"][0]["cases"][0].update(atlasSpriteIdentity=999),
+                lambda doc: doc["negativeControls"].pop("stale-atlas"),
+                lambda doc: doc["phases"][1]["cases"].pop(),
+            )
+            for change in changes:
+                wrong = copy.deepcopy(original)
+                change(wrong)
+                with self.assertRaises((AssertionError, KeyError)):
+                    oil.validate_in_world_render(wrong, root, "A" * 64)
+
+    def test_pixel_mismatch_and_passing_broken_control_are_rejected_from_raw_bytes(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            document = in_world_fixture(root)
+            row = document["phases"][0]["cases"][0]["pixels"]
+            wrong = root / row["actualRgba"]["file"]
+            wrong.write_bytes(bytes((4, 5, 6, 255)) * 4)
+            row["actualRgba"]["sha256"] = digest(wrong)
+            with self.assertRaisesRegex(AssertionError, "pixel comparison"):
+                oil.validate_in_world_render(document, root, "A" * 64)
+            document = in_world_fixture(root)
+            broken = document["negativeControls"]["missing-model"]
+            a = root / broken["actualRgba"]["file"]
+            b = root / broken["referenceRgba"]["file"]
+            b.write_bytes(a.read_bytes())
+            broken["referenceRgba"]["sha256"] = digest(b)
+            with self.assertRaisesRegex(AssertionError, "pixel comparison"):
+                oil.validate_in_world_render(document, root, "A" * 64)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/test-rig/migration/test_native2612_operations.py b/test-rig/migration/test_native2612_operations.py
new file mode 100644
index 00000000..3001a915
--- /dev/null
+++ b/test-rig/migration/test_native2612_operations.py
@@ -0,0 +1,86 @@
+import copy
+import io
+from pathlib import Path
+import tempfile
+import unittest
+from unittest.mock import patch
+
+import nbtlib
+
+from matrix import WORLD
+import native2612_operations as native
+import test_native12111_operations_actor_load as retained_controls
+from native2612_layout import region_file
+
+
+class Native2612ExpectedActorLoadTest(retained_controls.NativeExpectedActorLoadTest):
+    def compare(self, fixture, inspected):
+        original = copy.deepcopy((fixture, inspected))
+        try:
+            return native.validate_restart(fixture, inspected)
+        finally:
+            self.assertEqual(original, (fixture, inspected))
+
+    def test_selected_native_sources_are_exact(self):
+        self.assertEqual(2, len(native.native_load_sources()))
+
+
+class Native2612StoppedMachineTest(unittest.TestCase):
+    def test_full_job_count_cannot_be_a_smaller_passing_catalog(self):
+        for count in (0, 131, 133):
+            with self.subTest(count=count), patch.object(native, "frozen_validate_operation", return_value=dict(status="PASS", cases=count)):
+                with self.assertRaisesRegex(AssertionError, "132"):
+                    native.validate_operation({}, {}, "all")
+        with patch.object(native, "frozen_validate_operation", return_value=dict(status="FAIL", cases=132)):
+            self.assertEqual("FAIL", native.validate_operation({}, {}, "all")["status"])
+
+    def payload(self, version=4790):
+        tile = nbtlib.Compound(id=nbtlib.String("basepower:fluidtank"), x=nbtlib.Int(-1),
+                              y=nbtlib.Int(80), z=nbtlib.Int(-1), keepPacked=nbtlib.Byte(0),
+                              unknown=nbtlib.Compound(ordered=nbtlib.IntArray([3, 2, 1])))
+        root = nbtlib.File(dict(DataVersion=nbtlib.Int(version), xPos=nbtlib.Int(-1), zPos=nbtlib.Int(-1),
+                sections=nbtlib.List[nbtlib.Compound]([nbtlib.Compound(Y=nbtlib.Byte(5), block_states=nbtlib.Compound(
+                    palette=nbtlib.List[nbtlib.Compound]([nbtlib.Compound(Name=nbtlib.String("basepower:fluidtank"))])))]),
+                block_entities=nbtlib.List[nbtlib.Compound]([tile]), opaque=nbtlib.IntArray([9, 8, 7])))
+        buffer = io.BytesIO()
+        root.write(buffer)
+        body = b"\x03" + buffer.getvalue()
+        return len(body).to_bytes(4, "big") + body, tile
+
+    def test_old_data_version_and_wrong_type_are_not_coerced(self):
+        with self.assertRaises(ValueError):
+            native.modern_chunk(self.payload(4671)[0])
+        payload, _ = self.payload()
+        native.modern_chunk(payload)
+        with self.assertRaises(ValueError):
+            native.modern_chunk(payload[:-1])
+
+    def test_all_dimensions_and_custom_negative_coordinates_use_explicit_paths(self):
+        for dimension in ("minecraft:overworld", "minecraft:the_nether", "minecraft:the_end", "example:deep/cave"):
+            with self.subTest(dimension=dimension), tempfile.TemporaryDirectory() as folder:
+                runtime = Path(folder) / "runtime"
+                evidence = Path(folder) / "evidence"
+                region = region_file(runtime / WORLD, dimension, -1, -1)
+                region.parent.mkdir(parents=True)
+                region.write_bytes(b"immutable native region fixture")
+                payload, tile = self.payload()
+                expected = copy.deepcopy(tile)
+                del expected["keepPacked"]
+                row = dict(x=-1, y=80, z=-1, block="basepower:fluidtank",
+                           state="Block{basepower:fluidtank}", nbt=expected.snbt())
+                fixture = dict(cases=[dict(id="typed", dimension=dimension, positions=[row])])
+                with patch.object(native, "read_region", return_value=(None, {1023: payload})) as read:
+                    result = native.audit_saved(runtime, fixture, evidence)
+                    self.assertEqual("PASS", result["status"])
+                    read.assert_called_once_with(region)
+                self.assertEqual(payload, (evidence / "chunk-00000.bin").read_bytes())
+                self.assertEqual(b"immutable native region fixture", region.read_bytes())
+                changed = copy.deepcopy(fixture)
+                changed["cases"][0]["positions"][0]["nbt"] = expected.snbt().replace("[I; 3, 2, 1]", "[I; 1, 2, 3]")
+                self.assertNotEqual(fixture, changed)
+                with patch.object(native, "read_region", return_value=(None, {1023: payload})):
+                    self.assertEqual("FAIL", native.audit_saved(runtime, changed, evidence.parent / "changed")["status"])
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/test-rig/migration/test_native2612_platform_diagnostics.py b/test-rig/migration/test_native2612_platform_diagnostics.py
new file mode 100644
index 00000000..ee18a93a
--- /dev/null
+++ b/test-rig/migration/test_native2612_platform_diagnostics.py
@@ -0,0 +1,96 @@
+import os
+from pathlib import Path
+import unittest
+
+import native12111
+import native2612_platform_diagnostics as native
+
+
+REFERENCE = Path(os.environ.get("NATIVE2612_NETTY_REFERENCE",
+    "D:/PowerAdvantage/PA2612/PowerAdvantage/test-rig/build/native2612-migration-candidate01-from12111-01/runtime/debug-converted.log"))
+SOURCES = Path("D:/GradleCaches/minecraft-mods-shared/caches/modules-2/files-2.1/io.netty/netty-common/4.2.7.Final/ca57754b709612b8a2a9a270129d2ed1c2cd351/netty-common-4.2.7.Final-sources.jar")
+
+
+def captured():
+    lines = REFERENCE.read_text(encoding="utf-8").splitlines()
+    first = next(index for index, line in enumerate(lines) if "[io.netty.util.internal.CleanerJava9/]:" in line)
+    last = next(index for index, line in enumerate(lines) if "[io.netty.util.internal.CleanerJava25/]:" in line)
+    return "\n".join(lines[first:last + 1])
+
+
+class Native2612CleanerDiagnosticsTest(unittest.TestCase):
+    def check(self, text):
+        return native.classify(text, native12111.log_findings)
+
+    def test_actual_primary_sources_are_hash_bound(self):
+        self.assertEqual(native.SOURCE_SHA, native.verify_sources(SOURCES))
+
+    def test_actual_native_log_requires_both_failures_then_working_native25(self):
+        text = captured()
+        self.assertTrue(native12111.log_findings(text)[0], "Baseline strict classifier must reject the new exceptions")
+        failures, diagnostics = self.check(text)
+        self.assertEqual([], failures)
+        self.assertEqual(2, len(diagnostics))
+        self.assertTrue(all(row["level"] == "DEBUG" and row["rawBlock"] for row in diagnostics))
+        self.assertEqual({native.COMMON_JAR_SHA}, {row["nativeDependencySha256"] for row in diagnostics})
+
+    def test_raw_full_retained_debug_log_remains_unchanged(self):
+        original = REFERENCE.read_bytes()
+        failures, diagnostics = self.check(original.decode("utf-8"))
+        self.assertEqual([], failures)
+        self.assertEqual(2, sum(row.get("classification") == "SOURCE_PROVEN_NATIVE_NETTY_JAVA25_CLEANER_FALLBACK"
+                                for row in diagnostics))
+        self.assertEqual(original, REFERENCE.read_bytes())
+
+    def test_error_level_never_classifies_as_a_capability_probe(self):
+        for logger in ("CleanerJava9", "CleanerJava24Linker", "CleanerJava25"):
+            text = captured().splitlines()
+            text = [line.replace("/DEBUG]", "/ERROR]") if "internal." + logger + "/]" in line else line for line in text]
+            self.assertTrue(self.check("\n".join(text))[0])
+
+    def test_missing_or_changed_available_fallback_fails(self):
+        text = captured()
+        for changed in ("\n".join(text.splitlines()[:-1]), text.replace("cleaner(): available", "cleaner(): unavailable"),
+                        text.replace("CleanerJava25/", "UnexpectedCleaner/")):
+            self.assertTrue(self.check(changed)[0])
+
+    def test_changed_exception_type_message_or_module_fails(self):
+        text = captured()
+        for changed in (text.replace("UnsupportedOperationException", "IllegalStateException", 1),
+                        text.replace("sun.misc.Unsafe unavailable", "actual runtime defect"),
+                        text.replace("io.netty.common module.", "other module.")):
+            self.assertTrue(self.check(changed)[0])
+
+    def test_unknown_removed_added_or_mutated_frames_fail(self):
+        text = captured()
+        for changed in (text.replace("ClassInitializerUtil.tryLoadClasses", "UnknownBootstrap.run", 1),
+                        text.replace("\tat java.base/java.lang.Thread.run(Thread.java:1474)", "", 1),
+                        text.replace("CleanerJava9.java:70", "CleanerJava9.java:71"),
+                        text.replace("@4.2.7.Final", "@4.2.15.Final", 1),
+                        text.replace("\tat SECURE-BOOTSTRAP/io.netty.common", "\tat zone.moddev.mc.basepower.Broken.run(Broken.java:1)\n\tat SECURE-BOOTSTRAP/io.netty.common", 1)):
+            self.assertTrue(self.check(changed)[0])
+
+    def test_wrong_count_order_thread_and_interposed_event_fail(self):
+        text = captured()
+        blocks = []
+        for line in text.splitlines():
+            if native.HEADER.fullmatch(line):
+                blocks.append([])
+            blocks[-1].append(line)
+        variants = ("\n".join(blocks[0] + blocks[0] + blocks[1] + blocks[2]),
+                    "\n".join(blocks[1] + blocks[0] + blocks[2]),
+                    "\n".join(blocks[1] + blocks[2]), "\n".join(blocks[2]),
+                    text.replace("Server thread/DEBUG", "mod-worker/DEBUG", 1),
+                    "\n".join(blocks[0] + ["[now] [Server thread/DEBUG] [unknown/]: interposed"] + blocks[1] + blocks[2]))
+        for changed in variants:
+            self.assertTrue(self.check(changed)[0])
+
+    def test_unrelated_failures_outside_exact_sequence_remain_failures(self):
+        for message in ("java.lang.UnsupportedOperationException: actual machine defect",
+                        "[now] [Server thread/ERROR] [basepower/]: runtime failure",
+                        "java.lang.NoClassDefFoundError: InventoryLocks$Fields"):
+            self.assertTrue(self.check(captured() + "\n" + message)[0])
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/test-rig/migration/test_native2612_resources.py b/test-rig/migration/test_native2612_resources.py
new file mode 100644
index 00000000..82398c49
--- /dev/null
+++ b/test-rig/migration/test_native2612_resources.py
@@ -0,0 +1,144 @@
+"""Synthetic adapter controls, never substitute campaign receipts."""
+
+import copy
+import json
+from pathlib import Path
+import tempfile
+import unittest
+from unittest.mock import patch
+
+import nbtlib
+
+from matrix import WORLD, digest
+import native117_recipes as old
+import native2612_resources as resources
+
+
+def level_fixture(root, world=WORLD):
+    target = Path(root) / world
+    target.mkdir(parents=True, exist_ok=True)
+    versions = {**resources.native.VERSIONS, "forge": "64.1.5", "minecraft": "26.1.2"}
+    data = nbtlib.Compound(DataVersion=nbtlib.Int(4790), LevelName=nbtlib.String(world),
+                          Version=nbtlib.Compound(Name=nbtlib.String("26.1.2")))
+    entries = nbtlib.List[nbtlib.Compound]([nbtlib.Compound(ModId=nbtlib.String(key), ModVersion=nbtlib.String(value))
+                                         for key, value in versions.items()])
+    registry = nbtlib.Compound(ids=nbtlib.List[nbtlib.Compound]([
+        nbtlib.Compound(K=nbtlib.String("minecraft:stone"), V=nbtlib.Int(1))]))
+    result = nbtlib.File({"Data": data, "fml": nbtlib.Compound(LoadingModList=entries, Registries=nbtlib.Compound({
+        "minecraft:item": copy.deepcopy(registry), "minecraft:block": copy.deepcopy(registry)}))})
+    result.save(target / "level.dat", gzipped=True)
+    return target, result
+
+
+class ResourcesAdapterTest(unittest.TestCase):
+    def test_native_loader_errors_abort_waits_without_becoming_allowed_diagnostics(self):
+        for line in ("[00:00:00] [modloading-worker-0/ERROR] [FML/]: Caught exception during event FMLCommonSetupEvent",
+                     "[00:00:00] [main/FATAL] [FML/]: Failed to complete lifecycle event COMMON_SETUP",
+                     "[00:00:00] [main/ERROR] [minecraft/Main]: Failed to start the minecraft server"):
+            self.assertTrue(resources.RecipeServer.unexpected_line(line))
+        self.assertFalse(resources.RecipeServer.unexpected_line("[00:00:00] [main/DEBUG] [unit/]: Caught exception during event control"))
+        self.assertFalse(resources.RecipeServer.unexpected_line("Common setup complete"))
+
+    def test_exact_engine_metadata_and_read_only_bindings(self):
+        self.assertEqual(("26.1.2", "64.1.5"), resources.Engine.version)
+        self.assertEqual({"min_format": [101, 1], "max_format": [101, 1],
+                          "description": "Disposable loot-override witness"}, resources.Engine.pack_metadata)
+        self.assertIs(resources.unlock_campaign.__code__, old.unlock_campaign.__code__)
+        self.assertIs(resources.progression_campaign.__code__, old.progression_campaign.__code__)
+        self.assertIs(resources.unlock_campaign.__globals__["verify_level"], resources.verify_saved_level)
+        self.assertIs(old.unlock_campaign.__globals__["verify_level"], old.verify_level)
+        self.assertEqual({"engine": None}, resources.progression_campaign.__kwdefaults__)
+
+    def test_new_engine_selects_native_pack_codec_without_changing_old_metadata(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+
+            def stage(runtime, *_):
+                runtime.mkdir()
+                return "NOT_RUN"
+
+            with patch.object(resources.Engine, "stage", stage), patch.dict(resources.progression_campaign.__globals__, MODES=()):
+                resources.progression_campaign(root, None, None, None, 26520, {}, engine=resources.Engine)
+            pack = json.loads((root / "progression" / WORLD / "datapacks/progression-override/pack.mcmeta").read_text())
+            self.assertEqual(resources.PACK_METADATA, pack["pack"])
+            self.assertNotIn("pack_format", pack["pack"])
+        self.assertEqual(("NORMAL", "TECH_PROGRESSION", "APOCALYPTIC"), old.MODES)
+
+    def test_native_stopped_level_checks_exact_all_six_mods_and_registry_maps(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            world, saved = level_fixture(root)
+            entry = {"jars": [dict(id=key, version=value) for key, value in resources.native.VERSIONS.items()]}
+            result = resources.verify_saved_level(root, entry)
+            self.assertEqual(4790, result["dataVersion"])
+            self.assertEqual(digest(world / "level.dat"), result["sha256"])
+            for change in (lambda tag: tag["Data"].update(DataVersion=nbtlib.Int(4671)),
+                           lambda tag: tag["fml"]["LoadingModList"].append(copy.deepcopy(tag["fml"]["LoadingModList"][0])),
+                           lambda tag: tag["fml"]["Registries"].pop("minecraft:item"),
+                           lambda tag: tag["fml"]["LoadingModList"].pop()):
+                wrong = copy.deepcopy(saved)
+                change(wrong)
+                wrong.save(world / "level.dat", gzipped=True)
+                with self.assertRaises((AssertionError, ValueError, KeyError)):
+                    resources.verify_saved_level(root, entry)
+
+    def test_packet_exports_require_every_mode_and_nonempty_hash_bound_item_tags(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            for mode in ("normal", "tech", "apocalyptic"):
+                (root / f"recipes-{mode}-sweep.bin").write_bytes(b"synthetic-unit-packet")
+                tags = root / f"tags-{mode}.bin"
+                tags.write_bytes(b"synthetic-unit-tags")
+                manifest = dict(bookPacketType="ClientboundRecipeBookAddPacket", tagsPacketType="ClientboundUpdateTagsPacket",
+                                itemTagCount=2, tagsPacketFile=tags.name, tagsPacketSha256=digest(tags))
+                (root / f"recipes-{mode}-sweep.json").write_text(json.dumps(manifest))
+            self.assertEqual(3, len(resources.verify_packet_exports(root)))
+            path = root / "recipes-normal-sweep.json"
+            original = json.loads(path.read_text())
+            for key, value in (("tagsPacketFile", "../outside.bin"), ("itemTagCount", True),
+                               ("tagsPacketSha256", "0" * 64), ("bookPacketType", "OldRecipePacket")):
+                path.write_text(json.dumps({**original, key: value}))
+                with self.assertRaises((AssertionError, KeyError)):
+                    resources.verify_packet_exports(root)
+            path.write_text(json.dumps(original))
+            (root / "recipes-apocalyptic-sweep.bin").write_bytes(b"")
+            with self.assertRaises(AssertionError):
+                resources.verify_packet_exports(root)
+
+    def test_retained_pixels_are_replayed_not_accepted_from_a_pass_label(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            a, b = root / "a.rgba", root / "b.rgba"
+            a.write_bytes(bytes((1, 2, 3, 255)) * 4)
+            b.write_bytes(a.read_bytes())
+            spec = dict(width=2, height=2, actualRgba=dict(file=a.name, sha256=digest(a)),
+                        referenceRgba=dict(file=b.name, sha256=digest(b)))
+            self.assertEqual(0, resources.pixel_pair(root, spec))
+            with self.assertRaises(AssertionError):
+                resources.pixel_pair(root, {**spec, "referenceRgba": spec["actualRgba"]})
+            b.write_bytes(bytes((10, 2, 3, 255)) * 4)
+            spec["referenceRgba"]["sha256"] = digest(b)
+            with self.assertRaises(AssertionError):
+                resources.pixel_pair(root, spec)
+            self.assertEqual(4, resources.pixel_pair(root, spec, matches=False))
+            spec["width"] = True
+            with self.assertRaises(AssertionError):
+                resources.pixel_pair(root, spec)
+
+    def test_artifact_path_escape_hash_and_hardlink_fail_closed(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            path = root / "witness"
+            path.write_bytes(b"synthetic-unit-artifact")
+            self.assertEqual(path, resources.artifact(root, dict(file=path.name, sha256=digest(path))))
+            for value in (dict(file="../witness", sha256=digest(path)), dict(file=path.name, sha256="0" * 64)):
+                with self.assertRaises(AssertionError):
+                    resources.artifact(root, value)
+            linked = root / "hardlink"
+            linked.hardlink_to(path)
+            with self.assertRaises(AssertionError):
+                resources.artifact(root, dict(file=path.name, sha256=digest(path)))
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/test-rig/migration/test_native2612_retained_worldgen.py b/test-rig/migration/test_native2612_retained_worldgen.py
new file mode 100644
index 00000000..6678339f
--- /dev/null
+++ b/test-rig/migration/test_native2612_retained_worldgen.py
@@ -0,0 +1,145 @@
+import copy
+from pathlib import Path
+import tempfile
+import unittest
+
+import native2612_retained_worldgen as retained
+
+
+def fixture():
+    return dict(manage_vanilla_ores=False, place_fluid_deposits=True, suppress_all_ore_features=False,
+                history={"note": "electricadvantage:li_ore is literal history"}, ores={
+        "electricadvantage:legacy/custom_lithium": dict(block="electricadvantage:li_ore", enabled=True,
+            source_provider="electricadvantage", opaque={"keep": [1, 2, 3], "block": "electricadvantage:li_ore"}, dimension_selectors={
+                "orespawn:all_except_nether_end": dict(enabled=True, min_y=3, max_y=29,
+                    frequency=0.375, min_quantity=5, max_quantity=11, pattern="default",
+                    spread=7, vertical_spread=2, node_size=8, biome_ids=["minecraft:forest"],
+                    excluded_biome_ids=["minecraft:desert"])})}, fluid_deposits={})
+
+
+class RetainedWorldgenContractTest(unittest.TestCase):
+    registry = {"baseelectric:li_ore", "baseelectric:sulfur_ore", "basepower:crude_oil", "minecraft:nether_quartz_ore"}
+
+    def fixed(self, source):
+        result = copy.deepcopy(source)
+        rule = result["ores"]["electricadvantage:legacy/custom_lithium"]
+        rule["block"] = "baseelectric:li_ore"
+        return result
+
+    def test_full_payload_and_rule_id_are_retained_without_rewriting_history(self):
+        source = fixture()
+        result = retained.audit_transition(source, self.fixed(source), self.registry)
+        self.assertEqual("PASS", result["status"])
+        self.assertEqual("electricadvantage:li_ore is literal history", source["history"]["note"])
+
+    def test_provider_identity_and_opaque_block_text_are_not_output_references(self):
+        source = fixture()
+        actual = self.fixed(source)
+        self.assertEqual("PASS", retained.audit_transition(source, actual, self.registry)["status"])
+        actual["ores"]["electricadvantage:legacy/custom_lithium"]["source_provider"] = "baseelectric"
+        self.assertEqual("FAIL", retained.audit_transition(source, actual, self.registry)["status"])
+
+    def test_zero_rate_saved_rule_cannot_be_reenabled_by_missing_default(self):
+        source = fixture()
+        source["ores"]["electricadvantage:legacy/custom_lithium"]["dimension_selectors"]["orespawn:all_except_nether_end"]["frequency"] = 0.0
+        actual = self.fixed(source)
+        actual["ores"]["baseelectric:ore/lithium"] = dict(block="baseelectric:li_ore", enabled=True,
+            dimensions={"minecraft:overworld": {"enabled": True, "frequency": 0.125}})
+        self.assertEqual("FAIL", retained.audit_transition(source, actual, self.registry)["status"])
+
+    def test_old_unknown_output_is_failure_even_if_valid_fallback_exists(self):
+        source = fixture()
+        actual = copy.deepcopy(source)
+        actual["ores"]["baseelectric:ore/lithium"] = dict(block="baseelectric:li_ore", enabled=True,
+            dimensions={"minecraft:overworld": {"enabled": True}})
+        result = retained.audit_transition(source, actual, self.registry)
+        self.assertEqual("FAIL", result["status"])
+        self.assertTrue(any(row["kind"] == "UNKNOWN_OUTPUT" for row in result["issues"]))
+
+    def test_each_user_bound_geometry_filter_and_enabled_mutation_is_rejected(self):
+        source = fixture()
+        for key, value in dict(min_y=4, max_y=30, frequency=0.5, min_quantity=6, max_quantity=12,
+                               spread=8, vertical_spread=4, node_size=4, enabled=False,
+                               biome_ids=[], excluded_biome_ids=[]).items():
+            with self.subTest(key=key):
+                actual = self.fixed(source)
+                actual["ores"]["electricadvantage:legacy/custom_lithium"]["dimension_selectors"][
+                    "orespawn:all_except_nether_end"][key] = value
+                self.assertEqual("FAIL", retained.audit_transition(source, actual, self.registry)["status"])
+
+    def test_dimension_selector_must_not_be_replaced_by_overworld_fallback(self):
+        source = fixture()
+        actual = self.fixed(source)
+        rule = actual["ores"]["electricadvantage:legacy/custom_lithium"]
+        rule["dimensions"] = {"minecraft:overworld": rule.pop("dimension_selectors")["orespawn:all_except_nether_end"]}
+        self.assertEqual("FAIL", retained.audit_transition(source, actual, self.registry)["status"])
+
+    def test_disabled_saved_rule_does_not_allow_new_enabled_default(self):
+        source = fixture()
+        source["ores"]["electricadvantage:legacy/custom_lithium"]["enabled"] = False
+        actual = self.fixed(source)
+        actual["ores"]["baseelectric:ore/lithium"] = dict(block="baseelectric:li_ore", enabled=True,
+            dimensions={"minecraft:overworld": {"enabled": True}})
+        result = retained.audit_transition(source, actual, self.registry)
+        self.assertEqual("FAIL", result["status"])
+        self.assertTrue(any(row["kind"] == "NEW_ACTIVE_DEFAULT" for row in result["issues"]))
+
+    def test_enabled_saved_rule_also_rejects_new_duplicate_generation(self):
+        source = fixture()
+        actual = self.fixed(source)
+        actual["ores"]["baseelectric:ore/lithium"] = copy.deepcopy(actual["ores"]["electricadvantage:legacy/custom_lithium"])
+        self.assertEqual("FAIL", retained.audit_transition(source, actual, self.registry)["status"])
+
+    def test_explicit_current_id_collision_is_not_replaced_with_old_default(self):
+        source = fixture()
+        source["ores"]["baseelectric:ore/lithium"] = dict(block="baseelectric:li_ore", enabled=False,
+            dimensions={"minecraft:overworld": dict(enabled=True, min_y=9, max_y=17, frequency=0.875)})
+        actual = self.fixed(source)
+        self.assertEqual("PASS", retained.audit_transition(source, actual, self.registry)["status"])
+        actual["ores"]["baseelectric:ore/lithium"]["enabled"] = True
+        self.assertEqual("FAIL", retained.audit_transition(source, actual, self.registry)["status"])
+
+    def test_rule_keys_must_not_silently_rename_or_disappear(self):
+        source = fixture()
+        actual = self.fixed(source)
+        actual["ores"]["baseelectric:legacy/custom_lithium"] = actual["ores"].pop("electricadvantage:legacy/custom_lithium")
+        self.assertEqual("FAIL", retained.audit_transition(source, actual, self.registry)["status"])
+
+    def test_opaque_rule_payload_and_root_history_cannot_be_dropped(self):
+        source = fixture()
+        for remove in ("opaque", "history"):
+            actual = self.fixed(source)
+            if remove == "opaque": del actual["ores"]["electricadvantage:legacy/custom_lithium"][remove]
+            else: del actual[remove]
+            self.assertEqual("FAIL", retained.audit_transition(source, actual, self.registry)["status"])
+
+    def test_source_controls_cannot_change_even_with_all_positive_sample_counts(self):
+        source = fixture()
+        for key in ("manage_vanilla_ores", "suppress_all_ore_features", "place_fluid_deposits"):
+            actual = self.fixed(source)
+            actual[key] = not source[key]
+            self.assertEqual("FAIL", retained.audit_transition(source, actual, self.registry)["status"])
+
+    def test_os1_oracle_uses_raw_source_rates_and_original_selector(self):
+        source = dict(dimensions=[dict(dimension="+", ores=[dict(blockID="electricadvantage:li_ore",
+            minHeight=3, maxHeight=30, frequency=0.375, size=8, variation=2, biomes=["FOREST"])])])
+        expected = retained.os1_profile(source, "baseelectric", "electricadvantage")
+        row = expected["ores"]["baseelectric:legacy/baseelectric_li_ore_0"]
+        rule = row["dimension_selectors"]["orespawn:all_except_nether_end"]
+        self.assertEqual((3, 29, 0.375, 6, 9, 2, 8), tuple(rule[k] for k in
+            ("min_y", "max_y", "frequency", "min_quantity", "max_quantity", "vertical_spread", "node_size")))
+        self.assertEqual(["FOREST"], rule["biome_dictionary"])
+
+    def test_new_chunk_custody_rejects_any_preexisting_region_file(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            retained.require_new_world(root)
+            region = root / "dimensions/minecraft/overworld/region/r.0.0.mca"
+            region.parent.mkdir(parents=True)
+            region.write_bytes(b"old-region")
+            with self.assertRaisesRegex(AssertionError, "preexisting"):
+                retained.require_new_world(root)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/test-rig/migration/test_native2612_strict_migration.py b/test-rig/migration/test_native2612_strict_migration.py
new file mode 100644
index 00000000..5f1d1dc5
--- /dev/null
+++ b/test-rig/migration/test_native2612_strict_migration.py
@@ -0,0 +1,63 @@
+import copy
+from pathlib import Path
+import tempfile
+import unittest
+from unittest.mock import patch
+
+import native2612_strict_migration as target
+
+
+class StrictMigrationTest(unittest.TestCase):
+    def test_every_previous_warning_is_a_failure_even_when_old_log_gate_accepts(self):
+        with tempfile.TemporaryDirectory() as directory:
+            path = Path(directory) / "console.log"
+            for text in target.REJECT:
+                path.write_text("[Server thread/WARN] " + text + " 'old:rule'", encoding="utf-8")
+                with patch.object(target.native, "require_clean_log", return_value=[]):
+                    with self.assertRaisesRegex(AssertionError, "forbidden"):
+                        target.clean_log(path)
+
+    def test_clean_log_retains_native_platform_classifier(self):
+        with tempfile.TemporaryDirectory() as directory:
+            path = Path(directory) / "console.log"
+            path.write_text("native startup completed", encoding="utf-8")
+            with patch.object(target.native, "require_clean_log", return_value=["classified"]):
+                self.assertEqual(["classified"], target.clean_log(path))
+            with patch.object(target.native, "require_clean_log", side_effect=AssertionError("native failure")):
+                with self.assertRaisesRegex(AssertionError, "native failure"): target.clean_log(path)
+
+    def test_world_rates_disabled_choices_rule_ids_and_payloads_remain_authoritative(self):
+        source = {"place_fluid_deposits": False, "ores": {"pack:saved": {"block": "electricadvantage:li_ore",
+            "enabled": False, "dimensions": {"minecraft:overworld": {"frequency": 0.25, "private": "unchanged"}}}}}
+        actual = copy.deepcopy(source)
+        actual["ores"]["pack:saved"]["block"] = "baseelectric:li_ore"
+        self.assertEqual("PASS", target.contract(source, actual, {"baseelectric:li_ore"})["status"])
+        for change in ("rate", "enable", "root", "rule", "payload"):
+            modified = copy.deepcopy(actual)
+            row = modified["ores"]["pack:saved"]
+            if change == "rate": row["dimensions"]["minecraft:overworld"]["frequency"] = 0.125
+            elif change == "enable": row["enabled"] = True
+            elif change == "root": modified["place_fluid_deposits"] = True
+            elif change == "payload": row["dimensions"]["minecraft:overworld"]["private"] = "lost"
+            else: modified["ores"]["pack:renamed"] = modified["ores"].pop("pack:saved")
+            self.assertEqual("FAIL", target.contract(source, modified, {"baseelectric:li_ore"})["status"], change)
+
+    def test_new_cross_section_active_fallback_cannot_hide_behind_positive_counts(self):
+        source = {"ores": {"poweradvantage:legacy/oil": {"block": "poweradvantage:crude_oil", "enabled": False}}}
+        actual = {"ores": {"poweradvantage:legacy/oil": {"block": "basepower:crude_oil", "enabled": False}},
+                  "fluid_deposits": {"basepower:default": {"block": "basepower:crude_oil", "enabled": True,
+                      "dimensions": {"minecraft:overworld": {"frequency": 1}}}}}
+        self.assertEqual("FAIL", target.contract(source, actual, {"basepower:crude_oil"})["status"])
+        actual["fluid_deposits"]["basepower:default"]["enabled"] = False
+        self.assertEqual("PASS", target.contract(source, actual, {"basepower:crude_oil"})["status"])
+
+    def test_unknown_primary_deep_and_weighted_outputs_cannot_pass_even_disabled(self):
+        for field in ("block", "deep_output", "outputs"):
+            actual = {"ores": {"test:ore": {"block": "baseelectric:li_ore", "enabled": False}}}
+            row = actual["ores"]["test:ore"]
+            row[field] = [{"block": "electricadvantage:li_ore", "weight": 1}] if field == "outputs" else "electricadvantage:li_ore"
+            self.assertEqual("FAIL", target.contract({}, actual, {"baseelectric:li_ore"})["status"])
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/test-rig/migration/test_native2612_transformer_order.py b/test-rig/migration/test_native2612_transformer_order.py
new file mode 100644
index 00000000..4d47a7a3
--- /dev/null
+++ b/test-rig/migration/test_native2612_transformer_order.py
@@ -0,0 +1,290 @@
+"""Order-proof contracts and strict template adaptation; no Minecraft process is started."""
+
+import ast
+import copy
+import json
+import os
+from pathlib import Path
+import tempfile
+from types import SimpleNamespace
+import unittest
+from unittest.mock import Mock, patch
+from zipfile import ZipFile
+
+from matrix import digest, fingerprint, write_json
+import native2612 as native
+import native2612_transformer_order as probe
+
+
+def woven(reverse=False):
+    order = ["basemetals", "basepower"] if reverse else ["basepower", "basemetals"]
+    return dict(status="PASS", scope=probe.SCOPE, qualificationAllowed=False,
+                minecraft="26.1.2", forge="64.1.5", dataVersion=4790, upgradeDescriptor=probe.UPGRADE,
+                selectedWorldAfterLock=True, selectedWorldTarget=probe.SELECTED, rawReadDescriptor=probe.RAW_READ,
+                allHandlerBodiesMatchPinnedProduction=True, nativeReturnsCovered=2, exceptionEdgesChecked=True,
+                regionHeads=order[:], regionReturns=[order[:], order[:]], worldHeads=order[:], worldgenHeads=order[:])
+
+
+class Native2612TransformerOrderTest(unittest.TestCase):
+    def setUp(self):
+        self.temp = tempfile.TemporaryDirectory()
+        self.addCleanup(self.temp.cleanup)
+        self.root = Path(self.temp.name).resolve()
+
+    def test_only_exact_four_vectors_reverse_and_remain_diagnostic(self):
+        result = probe.compare_orders(woven(), woven(True))
+        self.assertEqual("PASS", result["status"])
+        self.assertFalse(result["qualificationAllowed"])
+        self.assertEqual(set(probe.VECTORS), set(result["permutations"]))
+        with self.assertRaisesRegex(AssertionError, "did not reverse"):
+            probe.compare_orders(woven(), woven())
+
+    def test_stale_61_abi_layout_and_selected_world_proofs_fail_closed(self):
+        for key, value in (("minecraft", "1.21.11"), ("forge", "61.1.0"), ("dataVersion", 4671),
+                           ("upgradeDescriptor", probe.UPGRADE.replace(";I)", ";)")),
+                           ("selectedWorldTarget", "net/minecraft/world/level/storage/LevelStorageSource"),
+                           ("selectedWorldAfterLock", False), ("rawReadDescriptor", "old"),
+                           ("qualificationAllowed", True), ("scope", "QUALIFIED"), ("status", "FAIL"),
+                           ("allHandlerBodiesMatchPinnedProduction", False), ("exceptionEdgesChecked", False),
+                           ("nativeReturnsCovered", 1), ("nativeReturnsCovered", 2.0), ("selectedWorldAfterLock", 1)):
+            actual = woven(True)
+            actual[key] = value
+            with self.subTest(key=key, value=value), self.assertRaises(AssertionError):
+                probe.compare_orders(woven(), actual)
+        for key in ("minecraft", "upgradeDescriptor", "selectedWorldAfterLock"):
+            actual = woven()
+            del actual[key]
+            with self.assertRaises(AssertionError):
+                probe.verify_woven(actual)
+
+    def test_missing_duplicate_partial_and_unreversed_callbacks_cannot_pass(self):
+        for key in probe.VECTORS:
+            for value in ([], ["basepower"], ["basepower", "basepower"], ["basepower", "unknown"]):
+                actual = woven(True)
+                actual[key] = [value, value] if key == "regionReturns" else value
+                with self.subTest(key=key, value=value), self.assertRaises(AssertionError):
+                    probe.compare_orders(woven(), actual)
+            actual = woven(True)
+            actual[key] = copy.deepcopy(woven()[key])
+            with self.assertRaises(AssertionError):
+                probe.compare_orders(woven(), actual)
+        actual = woven(True)
+        actual["regionReturns"].pop()
+        with self.assertRaises(AssertionError):
+            probe.compare_orders(woven(), actual)
+
+    def test_guarded_template_generation_preserves_templates_and_target_contract(self):
+        before = fingerprint(probe.TEMPLATES)
+        target = self.root / "sources"
+        generated = probe.prepare_sources(target)
+        self.assertEqual(before, fingerprint(probe.TEMPLATES))
+        self.assertEqual(set(probe.TEMPLATE_HASHES), {name.replace("\\", "/") for name in generated})
+        audit = (target / "src/zone/moddev/orderprobe/OrderProbeAudit.java").read_text()
+        self.assertIn(probe.SELECTED, audit)
+        self.assertIn('"(" + TAG + "I" + TAG + "I)" + TAG', audit)
+        self.assertIn("SelectedWorldStorageMixin", audit)
+        self.assertIn("dominates(selected, lockedAt, site)", audit)
+        self.assertIn("dominates(selected, site, rawAt)", audit)
+        self.assertIn("nativeSelected.tryCatchBlocks", audit)
+        self.assertNotIn("readLevelDataTagFixed", audit)
+        self.assertIn("allHandlerBodiesMatchPinnedProduction", audit)
+        self.assertIn("native exception-handler coverage changed", audit)
+        self.assertIn("native64-order-plugin-", (target / "src/zone/moddev/orderprobe/OrderProbePlugin.java").read_text())
+        self.assertIn('@net.minecraftforge.fml.common.Mod("advantageorderprobe")',
+                      (target / "src/zone/moddev/orderprobe/OrderProbeMod.java").read_text())
+        metadata = (target / "resources/META-INF/mods.toml").read_text()
+        self.assertIn('[64.1.5]', metadata)
+        self.assertIn('[26.1.2]', metadata)
+        config = json.loads((target / "resources/advantageorderprobe.mixins.json").read_text())
+        self.assertEqual("JAVA_21", config["compatibilityLevel"])
+        self.assertEqual([], config["mixins"])
+        self.assertEqual({"defaultRequire": 1}, config["injectors"])
+        with self.assertRaises(FileExistsError):
+            probe.prepare_sources(target)
+
+    def test_unknown_or_duplicate_template_patterns_fail_before_output_creation(self):
+        output = self.root / "bad"
+        with patch.dict(probe.TEMPLATE_HASHES, {"resources/META-INF/mods.toml": "0" * 64}), self.assertRaises(AssertionError):
+            probe.prepare_sources(output)
+        self.assertFalse(output.exists())
+        for text in ("not-reviewed", "x x"):
+            with self.assertRaises(AssertionError):
+                probe.replace_once(text, "x", "y")
+
+    def test_all_21_original_mutations_and_two_positive_baselines_remain_executable(self):
+        target = self.root / "sources"
+        probe.prepare_sources(target)
+        self.assertEqual(10, len(probe.GUARD_CONTROLS))
+        self.assertEqual(11, len(probe.WOVEN_CONTROLS))
+        for filename, names, baseline in (("run_guard_controls.py", probe.GUARD_CONTROLS, "baseline"),
+                                         ("run_woven_controls.py", probe.WOVEN_CONTROLS, "unmodified")):
+            text = (target / "test" / filename).read_text()
+            tree = ast.parse(text)
+            constants = {node.value for node in ast.walk(tree) if isinstance(node, ast.Constant) and isinstance(node.value, str)}
+            self.assertTrue(set(names) <= constants)
+            self.assertIn(baseline, constants)
+            self.assertIn('"--release", "25"', text)
+            self.assertIn("java.lang.AssertionError: ORDER_PROBE:", text)
+            self.assertIn("subprocess.run", text)
+            self.assertNotIn("import native12111", text)
+        mutator = (target / "test/WovenNegativeControl.java").read_text()
+        self.assertIn(probe.UPGRADE, mutator)
+        self.assertIn("StandardOpenOption.CREATE_NEW", mutator)
+        self.assertIn("jar/existing-file writes forbidden", mutator)
+
+    def test_sealed_diagnostic_launch_does_not_relax_default_options_policy(self):
+        clean = dict(JAVA_TOOL_OPTIONS="", JDK_JAVA_OPTIONS="", _JAVA_OPTIONS="", CLASSPATH="")
+        with patch.dict(os.environ, clean):
+            manifest, checksum = probe.diagnostic_manifest(self.root, "converted")
+            env = native.native_launch_environment(self.root, "converted", diagnostic_environment=manifest,
+                                                   diagnostic_environment_sha256=checksum)
+            self.assertEqual("-Dmixin.debug.export=true -Dmixin.debug.export.decompile=false", env["JAVA_TOOL_OPTIONS"])
+            receipt = native.read_json(self.root / "native64-launch-environment-converted.json")
+            self.assertEqual("DIAGNOSTIC_NOT_QUALIFIED", receipt["status"])
+            self.assertFalse(receipt["qualificationAllowed"])
+        for key in clean:
+            with patch.dict(os.environ, {**clean, key: "-javaagent:forbidden.jar"}), self.assertRaises(ValueError):
+                native.native_launch_environment()
+
+    def test_diagnostic_manifest_cannot_be_reused_or_modified_without_seal(self):
+        clean = dict(JAVA_TOOL_OPTIONS="", JDK_JAVA_OPTIONS="", _JAVA_OPTIONS="", CLASSPATH="")
+        with patch.dict(os.environ, clean):
+            path, checksum = probe.diagnostic_manifest(self.root, "converted")
+            with self.assertRaises(FileExistsError):
+                probe.diagnostic_manifest(self.root, "converted")
+            with self.assertRaises(ValueError):
+                native.native_launch_environment(self.root, "other", diagnostic_environment=path, diagnostic_environment_sha256=checksum)
+            document = json.loads(path.read_text())
+            document["properties"]["arbitrary.vm.property"] = True
+            path.write_text(json.dumps(document))
+            with self.assertRaises(AssertionError):
+                native.native_launch_environment(self.root, "converted", diagnostic_environment=path, diagnostic_environment_sha256=checksum)
+            with self.assertRaises(ValueError):
+                native.native_launch_environment(self.root, "converted", diagnostic_environment=path, diagnostic_environment_sha256=digest(path))
+
+    def test_sidecar_staging_does_not_relax_six_mod_reader_or_rewrite_production_jars(self):
+        runtime = self.root / "runtime"
+        (runtime / "mods").mkdir(parents=True)
+        production = runtime / "mods" / "production.jar"
+        production.write_bytes(b"immutable-production")
+        sidecar = self.root / "sidecar.jar"
+        sidecar.write_bytes(b"diagnostic-only")
+        variant = dict(jar=str(sidecar), sha256=digest(sidecar))
+        inputs = [dict(file=production.name, sha256=digest(production))]
+        write_json(runtime / "input-jars.json", inputs)
+        expected = {production.name: digest(production)}
+        core = SimpleNamespace(stage=Mock(return_value=expected.copy()), verify_runtime=Mock())
+        mods = {name: ("v", Path(name), "s") for name in probe.MOD_IDS}
+        with patch.object(probe.upgrade, "engine", return_value=core):
+            result = probe.instrumented_stage(variant)(runtime, "seed", "inventory", mods, 26510)
+        self.assertEqual(set(probe.MOD_IDS), set(mods))
+        self.assertEqual({**expected, sidecar.name: digest(sidecar)}, result)
+        self.assertEqual(b"immutable-production", production.read_bytes())
+        receipt = native.read_json(runtime / "input-jars.json")
+        self.assertEqual(inputs, receipt[:-1])
+        self.assertIs(False, receipt[-1]["qualificationAllowed"])
+        core.verify_runtime.assert_called_once_with(runtime, "inventory", result)
+        sidecar.write_bytes(b"changed")
+        with patch.object(probe.upgrade, "engine", return_value=core), self.assertRaises(AssertionError):
+            probe.instrumented_stage(variant)(runtime, "seed", "inventory", mods, 26510)
+        self.assertEqual(1, core.stage.call_count)
+
+    def test_plugin_identity_priority_and_registered_config_guards_are_retained(self):
+        pins = dict(mode="power-low", priorities={"basepower.mixins.json": 900, "basemetals.mixins.json": 1100})
+        before = {"basepower.mixins.json": 1000, "basemetals.mixins.json": 1000, "other.json": 321}
+        proof = dict(status=probe.SCOPE, qualificationAllowed=False, mode="power-low", runtime=str(self.root), pid=123,
+                     preparedBefore=False, before=before, after={**before, **pins["priorities"]})
+        probe.verify_plugin(proof, pins, self.root, 123)
+        for field, value in (("pid", 124), ("preparedBefore", True), ("runtime", "other"), ("qualificationAllowed", True)):
+            with self.assertRaises(AssertionError):
+                probe.verify_plugin({**proof, field: value}, pins, self.root, 123)
+        bad = copy.deepcopy(proof)
+        bad["after"]["other.json"] = 322
+        with self.assertRaises(AssertionError):
+            probe.verify_plugin(bad, pins, self.root, 123)
+
+    def test_control_receipts_require_every_named_rejection_and_build_hash(self):
+        build_path = self.root / "build.json"
+        write_json(build_path, {})
+        output = self.root / "controls"
+        output.mkdir()
+        receipt = dict(status="PASS", scope=probe.SCOPE, qualificationAllowed=False, buildReceiptSha256=digest(build_path),
+                       controls={"baseline": "PASS", **dict.fromkeys(probe.GUARD_CONTROLS, "REJECTED")})
+        path = output / "guard-controls.json"
+        write_json(path, receipt)
+        core = SimpleNamespace(native_launch_environment=lambda: {})
+        with patch.object(probe.upgrade, "engine", return_value=core), patch.object(probe.subprocess, "run", return_value=SimpleNamespace(returncode=0, stdout="", stderr="")):
+            self.assertEqual("PASS", probe.controls(Path("java"), build_path, {"sourceTree": str(self.root)}, output)["status"])
+            for key in probe.GUARD_CONTROLS:
+                bad = copy.deepcopy(receipt)
+                del bad["controls"][key]
+                write_json(path, bad)
+                with self.subTest(key=key), self.assertRaises(AssertionError):
+                    probe.controls(Path("java"), build_path, {"sourceTree": str(self.root)}, output)
+
+    def test_export_archive_preserves_complete_tree_and_clears_only_owned_stale_export_name(self):
+        runtime = self.root / "runtime"
+        source = runtime / ".mixin.out"
+        for name in probe.TARGETS:
+            path = source / "class" / (name + ".class")
+            path.parent.mkdir(parents=True, exist_ok=True)
+            path.write_bytes(name.encode())
+        (source / "audit-note.txt").write_text("retain complete export output")
+        before = fingerprint(source)
+        folder = runtime / "order-evidence/converted"
+        folder.mkdir(parents=True)
+        self.assertEqual(before, probe.archive_exports(runtime, folder))
+        self.assertFalse(source.exists())
+        self.assertEqual(before, fingerprint(folder / "mixin-output"))
+        self.assertEqual("retain complete export output", (folder / "mixin-output/audit-note.txt").read_text())
+        for name in probe.TARGETS:
+            self.assertEqual(name.encode(), (folder / "export" / (name + ".class")).read_bytes())
+        with self.assertRaises(FileNotFoundError):
+            probe.archive_exports(runtime, folder)
+
+    def test_incomplete_export_tree_cannot_be_archived_as_current_proof(self):
+        runtime = self.root / "runtime"
+        (runtime / ".mixin.out/class").mkdir(parents=True)
+        folder = runtime / "order-evidence/failed"
+        folder.mkdir(parents=True)
+        with self.assertRaisesRegex(ValueError, "Missing"):
+            probe.archive_exports(runtime, folder)
+        self.assertTrue((runtime / ".mixin.out/class").is_dir())
+        self.assertFalse((folder / "export").exists())
+
+    def test_json_string_custody_paths_are_converted_and_changed_bytes_are_rejected(self):
+        path = self.root / "classpath.jar"
+        path.write_bytes(b"pinned dependency")
+        hashes = json.loads(json.dumps({str(path): digest(path)}))
+        probe.verify_files(hashes)
+        path.write_bytes(b"changed dependency")
+        with self.assertRaisesRegex(AssertionError, "checksum differs"):
+            probe.verify_files(hashes)
+        path.unlink()
+        with self.assertRaises(FileNotFoundError):
+            probe.verify_files(hashes)
+
+    def test_sidecar_rejects_missing_entrypoint_or_wrong_mod_identity_before_launch(self):
+        files = {"META-INF/mods.toml": f'[[mods]]\nmodId="{probe.MOD_ID}"\nversion="{probe.VERSION}"\n'.encode(),
+                 "advantageorderprobe.mixins.json": b"{}", "order-probe-pins.json": b"{}"}
+        files.update({"zone/moddev/orderprobe/" + name + ".class": b"unit packaging fixture only"
+                      for name in ("OrderProbeMod", "OrderProbeAudit", "OrderProbePlugin", "ProbeGuard")})
+        for index, change in enumerate((None, "entrypoint", "identity", "duplicate")):
+            payloads = files.copy()
+            if change == "entrypoint": del payloads["zone/moddev/orderprobe/OrderProbeMod.class"]
+            elif change == "identity": payloads["META-INF/mods.toml"] = b'[[mods]]\nmodId="unknown"\nversion="1"\n'
+            path = self.root / (str(index) + ".jar")
+            with ZipFile(path, "x") as archive:
+                for name, data in payloads.items(): archive.writestr(name, data)
+                if change == "duplicate":
+                    with self.assertWarns(UserWarning):
+                        archive.writestr("zone/moddev/orderprobe/OrderProbeMod.class", b"duplicate fixture")
+            if change is None:
+                probe.verify_probe_package(path)
+            else:
+                with self.subTest(change=change), self.assertRaises(AssertionError):
+                    probe.verify_probe_package(path)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/test-rig/migration/test_native2612_upgrade.py b/test-rig/migration/test_native2612_upgrade.py
new file mode 100644
index 00000000..d6d4c513
--- /dev/null
+++ b/test-rig/migration/test_native2612_upgrade.py
@@ -0,0 +1,455 @@
+"""Real stopped-storage fixtures and fail-closed migration adapter contracts, no JVM launch."""
+
+import base64
+import copy
+import gzip
+import io
+from pathlib import Path
+import tempfile
+from types import SimpleNamespace
+import unittest
+from unittest.mock import Mock, patch
+import uuid
+import zlib
+
+import nbtlib as n
+
+from matrix import WORLD, digest, fingerprint, write_json
+from native117_actor_io import bind
+import native2612_upgrade as upgrade
+
+
+def encoded(tag):
+    stream = io.BytesIO()
+    n.File(tag).write(stream)
+    return stream.getvalue()
+
+
+def region(tag, cx=-1, cz=-2):
+    payload = b"\x02" + zlib.compress(encoded(tag))
+    record = len(payload).to_bytes(4, "big") + payload
+    sectors = (len(record) + 4095) // 4096
+    header = bytearray(8192)
+    slot = (cx & 31) + ((cz & 31) << 5)
+    header[slot * 4:slot * 4 + 4] = ((2 << 8) | sectors).to_bytes(4, "big")
+    return bytes(header) + record.ljust(sectors * 4096, b"\0")
+
+
+def reject_operation(*args):
+    raise AssertionError("Required ordinary operation executed and failed")
+
+
+class Native2612UpgradeTest(unittest.TestCase):
+    def setUp(self):
+        self.temp = tempfile.TemporaryDirectory()
+        self.addCleanup(self.temp.cleanup)
+        self.root = Path(self.temp.name)
+        self.runtime = self.root / "runtime"
+        self.world = self.runtime / WORLD
+        self.world.mkdir(parents=True)
+        self.identity = uuid.UUID("12345678-1234-5678-9abc-def012345678")
+
+    def save(self, path, tag):
+        path.parent.mkdir(parents=True, exist_ok=True)
+        n.File(tag, gzipped=True).save(path)
+
+    def words(self, identity=None):
+        value = (identity or self.identity).int
+        return n.IntArray([((value >> shift) & 0xffffffff) -
+                           (0x100000000 if (value >> shift) & 0x80000000 else 0) for shift in (96, 64, 32, 0)])
+
+    def storage(self):
+        self.save(self.world / "level.dat", n.Compound(Data=n.Compound(DataVersion=n.Int(4790))))
+        self.save(upgrade.layout.shared_file(self.world, "minecraft:world_gen_settings"),
+                  n.Compound(DataVersion=n.Int(4790), data=n.Compound(seed=n.Long(-17),
+                             unknown=n.Compound(retain=n.ByteArray([1, -2, 3])))))
+        tile = n.Compound(id=n.String("minecraft:chest"), x=n.Int(-1), y=n.Int(64), z=n.Int(-17),
+                          Items=n.List[n.Compound]([]), components=n.Compound(), Unknown=n.Long(718))
+        chunk = n.Compound(DataVersion=n.Int(4790), xPos=n.Int(-1), zPos=n.Int(-2),
+                           sections=n.List[n.Compound]([n.Compound(Y=n.Byte(4), block_states=n.Compound(
+                               palette=n.List[n.Compound]([n.Compound(Name=n.String("minecraft:chest"))])))]),
+                           block_entities=n.List[n.Compound]([copy.deepcopy(tile)]))
+        path = upgrade.layout.region_file(self.world, "minecraft:overworld", -1, -2)
+        path.parent.mkdir(parents=True, exist_ok=True)
+        path.write_bytes(region(chunk))
+        row = dict(name="chest", x=-1, y=64, z=-17, actualName="minecraft:chest", properties={},
+                   nbtBase64=base64.b64encode(gzip.compress(encoded(tile))).decode())
+        return path, chunk, row
+
+    def test_native_stopped_capture_reads_only_relocated_region_and_shared_worldgen(self):
+        path, chunk, row = self.storage()
+        (self.world / "region").mkdir()
+        (self.world / "region" / path.name).write_bytes(b"stale legacy decoy")
+        original = fingerprint(self.world)
+        receipt = upgrade.capture(self.runtime, "converted", [row])
+        self.assertEqual("PASS", receipt["status"])
+        self.assertEqual(4790, receipt["nativeDataVersion"])
+        self.assertEqual([1, -2, 3], receipt["worldGenSettings"]["data"]["unknown"]["retain"])
+        self.assertEqual("NO_SINGLEPLAYER_OWNER", receipt["playerAuthority"]["status"])
+        self.assertEqual(original, fingerprint(self.world))
+        self.assertEqual(path.read_bytes(), (self.runtime / "native2612-save/converted" / path.name).read_bytes())
+
+    def test_raw_chunk_mutations_cannot_be_hidden_by_live_projection(self):
+        path, baseline, row = self.storage()
+        for index, mutation in enumerate(("version", "version-type", "coordinate", "coordinate-type", "historical",
+                                           "block", "tile", "extra-tile-field", "duplicate-tile", "duplicate-section", "packed")):
+            chunk = copy.deepcopy(baseline)
+            if mutation == "version": chunk["DataVersion"] = n.Int(4671)
+            elif mutation == "version-type": chunk["DataVersion"] = n.Long(4790)
+            elif mutation == "coordinate": chunk["xPos"] = n.Int(0)
+            elif mutation == "coordinate-type": chunk["xPos"] = n.String("-1")
+            elif mutation == "historical": chunk["Level"] = n.Compound()
+            elif mutation == "block": chunk["sections"][0]["block_states"]["palette"][0]["Name"] = n.String("minecraft:air")
+            elif mutation == "tile": chunk["block_entities"][0]["Unknown"] = n.Long(719)
+            elif mutation == "extra-tile-field": chunk["block_entities"][0]["Unexpected"] = n.Int(1)
+            elif mutation == "duplicate-tile": chunk["block_entities"].append(copy.deepcopy(chunk["block_entities"][0]))
+            elif mutation == "duplicate-section": chunk["sections"].append(copy.deepcopy(chunk["sections"][0]))
+            elif mutation == "packed": chunk["block_entities"][0]["keepPacked"] = n.Byte(1)
+            path.write_bytes(region(chunk))
+            with self.subTest(mutation=mutation), self.assertRaises((AssertionError, ValueError)):
+                upgrade.capture(self.runtime, "mutant-" + str(index), [row])
+
+    def test_only_reviewed_zero_keep_packed_storage_field_is_projected(self):
+        path, chunk, row = self.storage()
+        chunk["block_entities"][0]["keepPacked"] = n.Byte(0)
+        path.write_bytes(region(chunk))
+        self.assertEqual("PASS", upgrade.capture(self.runtime, "zero-packed", [row])["status"])
+
+    def test_empty_duplicate_and_misaddressed_live_witnesses_cannot_pass(self):
+        _, _, row = self.storage()
+        for index, rows in enumerate(([], [row, row], [{**row, "x": True}], [{**row, "x": 16}])):
+            with self.subTest(rows=rows), self.assertRaises((AssertionError, ValueError)):
+                upgrade.capture(self.runtime, "invalid-" + str(index), rows)
+
+    def test_archive_damage_and_missing_native_path_do_not_use_legacy_fallback(self):
+        path, chunk, row = self.storage()
+        native = path.read_bytes()
+        legacy = self.world / "region" / path.name
+        legacy.parent.mkdir()
+        legacy.write_bytes(native)
+        for index, raw in enumerate((b"", native[:-1], b"invalid", bytes(8192))):
+            path.write_bytes(raw)
+            with self.subTest(raw=len(raw)), self.assertRaises((ValueError, AssertionError)):
+                upgrade.capture(self.runtime, "damaged-" + str(index), [row])
+        path.unlink()
+        with self.assertRaisesRegex(ValueError, "Missing"):
+            upgrade.capture(self.runtime, "missing", [row])
+
+    def test_host_uuid_owns_native_player_path_not_legacy_or_embedded_decoys(self):
+        self.storage()
+        self.save(self.world / "level.dat", n.Compound(Data=n.Compound(DataVersion=n.Int(4790), singleplayer_uuid=self.words())))
+        player = n.Compound(DataVersion=n.Int(4790), UUID=self.words(), Unknown=n.Long(88))
+        path = upgrade.layout.player_file(self.world, self.identity)
+        self.save(path, player)
+        self.save(self.world / "playerdata" / path.name, n.Compound(UUID=self.words(uuid.uuid4())))
+        result = upgrade.player_authority(self.world)
+        self.assertEqual("NATIVE_PLAYER", result["status"])
+        self.assertEqual("players/data/" + path.name, result["file"].replace("\\", "/"))
+        self.assertFalse(result["playerConversionQualified"])
+        player["DataVersion"] = n.Int(4671)
+        self.save(path, player)
+        self.assertEqual("RETAINED_UNOPENED_SOURCE_PLAYER", upgrade.player_authority(self.world)["status"])
+        path.unlink()
+        with self.assertRaises(FileNotFoundError):
+            upgrade.player_authority(self.world)
+
+    def test_host_uuid_version_and_embedded_conflicts_fail_closed(self):
+        self.storage()
+        self.save(self.world / "level.dat", n.Compound(Data=n.Compound(DataVersion=n.Int(4790), singleplayer_uuid=self.words())))
+        path = upgrade.layout.player_file(self.world, self.identity)
+        for change in (dict(UUID=self.words(uuid.uuid4())), dict(DataVersion=n.Int(4791)),
+                       dict(DataVersion=n.String("4790")), dict(DataVersion=n.Int(0))):
+            tag = n.Compound(DataVersion=n.Int(4790), UUID=self.words(), **{})
+            tag.update(change)
+            self.save(path, tag)
+            with self.subTest(change=change), self.assertRaises(AssertionError):
+                upgrade.player_authority(self.world)
+        self.save(self.world / "level.dat", n.Compound(Data=n.Compound(DataVersion=n.Int(4790),
+                  singleplayer_uuid=self.words(), Player=n.Compound(UUID=self.words()))))
+        with self.assertRaises(ValueError):
+            upgrade.player_authority(self.world)
+
+    def test_turbine_native_entity_region_preserves_uuid_parent_and_position(self):
+        self.storage()
+        actor = n.Compound(id=n.String("baseelectric:hydroturbine"), UUID=self.words(), parentPos=n.IntArray([-1, 64, -17]),
+                           Pos=n.List[n.Double]([-0.5, 64.0, -16.5]))
+        tag = n.Compound(DataVersion=n.Int(4790), Position=n.IntArray([-1, -2]), Entities=n.List[n.Compound]([actor]))
+        path = upgrade.layout.region_file(self.world, "minecraft:overworld", -1, -2, "entities")
+        path.parent.mkdir(parents=True)
+        path.write_bytes(region(tag))
+        result = upgrade.turbine(self.world, [-1, 64, -17])
+        self.assertEqual([-1, 64, -17], result["parent"])
+        self.assertEqual([-0.5, 64.0, -16.5], result["position"])
+        for version in (4671, 4791):
+            tag["DataVersion"] = n.Int(version)
+            path.write_bytes(region(tag))
+            with self.assertRaises((AssertionError, ValueError)):
+                upgrade.turbine(self.world, [-1, 64, -17])
+
+    def source_receipt(self, version="1.21.11", data_version=4671, route=None):
+        source = self.root / "source"
+        source.mkdir(exist_ok=True)
+        write_json(source / "migration-restarted.json", [])
+        receipt = dict(status="PASS", minecraft=version, sourceUnchanged=True, phases={"restarted": dict(
+            status="PASS", snapshotSha256=digest(source / "migration-restarted.json"), serialized=dict(nativeDataVersion=data_version))})
+        path = source / "receipt.json"
+        write_json(path, receipt)
+        return SimpleNamespace(source=source, legacy_reference=None, source_receipt_name=path.name,
+                               receipt_sha256=digest(path), source_route=route or version), receipt
+
+    def test_each_retained_intermediate_and_12111_route_requires_exact_sealed_version(self):
+        for version, data_version in upgrade.SOURCE_VERSIONS.items():
+            args, _ = self.source_receipt(version, data_version)
+            self.assertEqual(version, upgrade.read_source(args)[4])
+        self.assertEqual(("original110", "released110", "maintained112", "released112"), upgrade.LEGACY_ROUTES)
+
+    def test_source_receipt_cannot_lie_about_version_status_route_or_snapshot(self):
+        for version, dv, route in (("1.21.11", 3955, "1.21.11"), (None, 4671, "1.21.11"),
+                                    ({}, 4671, "1.21.11"), ("1.21.11", "4671", "1.21.11"),
+                                    ("1.21.11", 4671, "1.21.1"), ("1.21.11", 4671, "original110")):
+            args, _ = self.source_receipt(version, dv, route)
+            with self.subTest(version=version, dv=dv, route=route), self.assertRaises(AssertionError):
+                upgrade.read_source(args)
+        args, receipt = self.source_receipt()
+        receipt["status"] = "FAIL"
+        write_json(args.source / "receipt.json", receipt)
+        args.receipt_sha256 = digest(args.source / "receipt.json")
+        with self.assertRaisesRegex(AssertionError, "passing"):
+            upgrade.read_source(args)
+        args, _ = self.source_receipt()
+        (args.source / "migration-restarted.json").write_text("[1]")
+        with self.assertRaisesRegex(AssertionError, "checksum"):
+            upgrade.read_source(args)
+
+    def test_raw_historical_routes_require_independent_exact_source_fingerprint(self):
+        for route in upgrade.LEGACY_ROUTES:
+            args, receipt = self.source_receipt("1.20.1", 3465, route)
+            original = self.root / route
+            original.mkdir()
+            (original / "immutable").write_bytes(b"retained historic input")
+            self.save(original / WORLD / "level.dat", n.Compound(Data=n.Compound(DataVersion=n.Int(upgrade.LEGACY_SOURCE_VERSIONS[route]))))
+            receipt.update(source=str(original), sourceFingerprint=fingerprint(original))
+            write_json(args.source / "receipt.json", receipt)
+            args.legacy_reference, args.source = args.source, original
+            args.receipt_sha256 = digest(args.legacy_reference / "receipt.json")
+            self.assertEqual("1.20.1", upgrade.read_source(args)[4])
+            (original / "immutable").write_bytes(b"changed")
+            with self.subTest(route=route), self.assertRaisesRegex(AssertionError, "no longer matches"):
+                upgrade.read_source(args)
+
+    def test_pre_1201_intermediates_can_use_their_sealed_1201_bridge_without_mislabeling_format(self):
+        for route, version in upgrade.SOURCE_VERSIONS.items():
+            if version >= 3465:
+                continue
+            args, receipt = self.source_receipt("1.20.1", 3465, route)
+            original = self.root / ("bridge-" + route)
+            self.save(original / WORLD / "level.dat", n.Compound(Data=n.Compound(DataVersion=n.Int(version))))
+            receipt.update(source=str(original), sourceFingerprint=fingerprint(original))
+            write_json(args.source / "receipt.json", receipt)
+            args.legacy_reference, args.source = args.source, original
+            args.receipt_sha256 = digest(args.legacy_reference / "receipt.json")
+            self.assertEqual("1.20.1", upgrade.read_source(args)[4])
+            args.source_route = "1.21.11"
+            with self.assertRaisesRegex(AssertionError, "Historical bridge"):
+                upgrade.read_source(args)
+
+    def test_expected_components_preserve_legacy_adapters_and_native_opaque_payloads(self):
+        legacy = dict(id="basesteam:musket", Count=1, tag=dict(Damage=7, loaded=1,
+                      Enchantments=[dict(id="basesteam:powderless", lvl=1)]))
+        for version, data_version in upgrade.SOURCE_VERSIONS.items():
+            if data_version < 3465 or version == "1.20.1":
+                self.assertEqual(upgrade.previous.components(legacy), upgrade.expected_components(legacy, source_version=version))
+        native = dict(id="basesteam:musket", count=1, components={"minecraft:damage": 7,
+                      "minecraft:enchantments": {"basesteam:powderless": 1},
+                      "other:opaque": {"id": "not:an_item", "count": False, "components": {"levels": "opaque"}}})
+        original = copy.deepcopy(native)
+        adapted = upgrade.expected_components(native, source_version="1.21.11")
+        self.assertEqual(original, adapted)
+        adapted["components"]["other:opaque"]["count"] = 3
+        self.assertEqual(original, native)
+
+    def test_native_expected_component_types_and_wrappers_are_not_coerced(self):
+        for version in (None, {}, True, "26.1.2"):
+            with self.assertRaises(AssertionError):
+                upgrade.expected_components({}, source_version=version)
+        base = dict(id="basesteam:musket", count=1, components={"minecraft:enchantments": {"basesteam:powderless": 1}})
+        for field, value in (("count", True), ("count", 0), ("count", "1"), ("id", "bad id"), ("components", None), ("Count", 1)):
+            with self.subTest(field=field, value=value), self.assertRaises(AssertionError):
+                upgrade.expected_components({**base, field: value}, source_version="1.21.11")
+        for levels in ({"levels": {}}, {"basesteam:powderless": True}, {"basesteam:powderless": 256}, {7: 1}, []):
+            with self.subTest(levels=levels), self.assertRaises(AssertionError):
+                upgrade.expected_components({**base, "components": {"minecraft:enchantments": levels}}, source_version="1.21.11")
+
+    def test_native_observation_extra_unknown_wear_enchantment_and_count_changes_stay_failures(self):
+        tag = {"Items": [dict(id="basesteam:musket", count=1, components={"minecraft:damage": 7,
+                           "minecraft:enchantments": {"basesteam:powderless": 1}, "other:opaque": {"retain": [1, 2]}})], "components": {}}
+        row = dict(name="chest", x=1, y=2, z=3, actualName="minecraft:chest", properties={}, nbtBase64="fixture")
+        for change in (None, "wear", "enchantment", "count", "opaque", "extra", "missing"):
+            observed = copy.deepcopy(tag)
+            stack = observed["Items"][0]
+            if change == "wear": stack["components"]["minecraft:damage"] = 8
+            elif change == "enchantment": stack["components"]["minecraft:enchantments"]["basesteam:powderless"] = 2
+            elif change == "count": stack["count"] = 2
+            elif change == "opaque": stack["components"]["other:opaque"]["retain"].append(3)
+            elif change == "extra": stack["components"]["other:added"] = 9
+            elif change == "missing": del stack["components"]["other:opaque"]
+            with patch.object(upgrade.previous, "parse_nbt", side_effect=[tag, observed]):
+                actual = upgrade.comparison([row], [row], modern=True, source_version="1.21.11")
+            self.assertEqual("PASS" if change is None else "FAIL", actual["status"])
+        with patch.object(upgrade.previous, "parse_nbt", side_effect=[tag, tag]):
+            self.assertEqual("PASS", upgrade.comparison([row], [row], modern=False)["status"])
+
+    def test_stopped_protocol_freezes_before_snapshot_flushes_then_closes(self):
+        events = []
+        server = Mock()
+        server.send.side_effect = lambda command: events.append(command)
+        server.snapshot.side_effect = lambda label: (events.append("snapshot:" + label), write_json(self.runtime / ("migration-" + label + ".json"), []))
+        server.close.side_effect = lambda: events.append("close")
+        core = SimpleNamespace(Server=Mock(return_value=server), LAUNCHER="official-args")
+        with patch.object(upgrade, "engine", return_value=core):
+            self.assertEqual([], upgrade.with_server(self.runtime, "java", "converted", lambda run: events.append("action")))
+        self.assertEqual(["action", "tick freeze", "snapshot:converted", "save-all flush", "close"], events)
+        self.assertEqual([("The game is frozen", 30), ("Saved the game", 30)], [call.args for call in server.wait.call_args_list])
+
+    def test_action_and_stop_failures_both_remain_visible_and_no_snapshot_passes(self):
+        server = Mock()
+        server.close.side_effect = AssertionError("stop log failure")
+        core = SimpleNamespace(Server=Mock(return_value=server), LAUNCHER="official-args")
+        original = AssertionError("action failed")
+        with patch.object(upgrade, "engine", return_value=core), self.assertRaisesRegex(AssertionError, "action failed") as failure:
+            upgrade.with_server(self.runtime, "java", "converted", Mock(side_effect=original))
+        self.assertIn("stop log failure", failure.exception.__notes__[0])
+        server.snapshot.assert_not_called()
+        server.close.assert_called_once()
+
+    def test_operation_readiness_uses_target_identity_and_all_distinct_chunks(self):
+        server = Mock()
+        ready = Mock(return_value={"status": "PASS"})
+        load = bind(upgrade.load_operating_chunks, await_ready=ready)
+        self.assertEqual(2, len(load(server, self.runtime, {"a": (-1, 64, 32), "b": (16, 64, -1), "same": (31, 5, -8)})))
+        self.assertTrue(all(call.kwargs["minecraft"] == "26.1.2" for call in ready.call_args_list))
+        self.assertEqual(["forceload add -16 32", "forceload add 16 -16"], [call.args[0] for call in server.send.call_args_list])
+        ready.side_effect = AssertionError("not ticking")
+        with self.assertRaisesRegex(AssertionError, "not ticking"):
+            load(server, self.runtime, {"a": (0, 5, 0)})
+
+    def test_historical_world_copy_is_exact_and_only_loader_config_collision_is_explicit(self):
+        source = self.root / "copy-source"
+        (source / WORLD).mkdir(parents=True)
+        (source / WORLD / "retain").write_bytes(b"immutable")
+        (source / "config").mkdir()
+        (source / "config/fml.toml").write_text("old-loader")
+        (source / "config/mod.cfg").write_text("old-mod")
+        target = self.root / "copy-target"
+        (target / "config").mkdir(parents=True)
+        (target / "config/fml.toml").write_text("native-loader")
+        before = fingerprint(source)
+        upgrade.copy_source(source, target)
+        self.assertEqual(before, fingerprint(source))
+        self.assertEqual(fingerprint(source / WORLD), fingerprint(target / WORLD))
+        receipt = upgrade.read_json(target / "historical-config-custody.json")
+        self.assertEqual("NATIVE_TARGET_LOADER", receipt["fml.toml"]["authority"])
+        self.assertEqual("native-loader", (target / "config/fml.toml").read_text())
+        bad = self.root / "bad-copy"
+        (bad / "config").mkdir(parents=True)
+        (bad / "config/mod.cfg").write_text("unreviewed")
+        with self.assertRaisesRegex(AssertionError, "collision"):
+            upgrade.copy_source(source, bad)
+
+    def test_staging_failure_retains_fail_receipt_and_oracle_input_hashes_without_launch(self):
+        args, _ = self.source_receipt()
+        args.profile, args.inventory = self.root / "profile.json", self.root / "inventory.json"
+        write_json(args.profile, {})
+        write_json(args.inventory, {})
+        args.seed = self.root / "seed"
+        args.seed.mkdir()
+        args.java = self.root / "java.exe"
+        args.java.write_bytes(b"unit fake, never executed")
+        args.output, args.port, args.inventory_sha256 = self.root / "failed-output", 26510, digest(args.inventory)
+        mods = {}
+        for name in upgrade.MOD_IDS:
+            jar = self.root / (name + ".jar")
+            jar.write_bytes(name.encode())
+            mods[name] = "unit", jar, digest(jar)
+        core = SimpleNamespace(read_family_target=Mock(return_value=(args.seed, {}, mods)),
+                               java25=Mock(return_value=(args.java, "unit")),
+                               stage=Mock(side_effect=AssertionError("owned staging failed")), verify_runtime=Mock())
+        with patch.object(upgrade, "engine", return_value=core), patch.object(upgrade, "output_path", return_value=args.output), \
+                self.assertRaisesRegex(AssertionError, "owned staging failed"):
+            upgrade.run(args)
+        receipt = upgrade.read_json(args.output / "native2612-upgrade-results.json")
+        self.assertEqual("FAIL", receipt["status"])
+        self.assertIn("owned staging failed", receipt["traceback"])
+        self.assertTrue(receipt["sourceUnchanged"])
+        self.assertTrue(receipt["inputsUnchanged"])
+        self.assertTrue(receipt["referenceUnchanged"])
+        self.assertTrue(any(path.endswith("native12111_upgrade.py") for path in receipt["inputHashes"]))
+        self.assertTrue(all(str(path) in receipt["inputHashes"] for _, path, _ in mods.values()))
+
+    def test_hook_only_scope_never_invents_operation_pass_and_ordinary_operation_remains_required(self):
+        args, prior = self.source_receipt()
+        rows = [dict(name="hydroGenerator", x=1, y=5, z=1, actualName="baseelectric:hydrogenerator", properties={})]
+        write_json(args.source / "migration-restarted.json", rows)
+        write_json(args.source / "migration-fixture.json", rows)
+        prior["phases"]["restarted"].update(snapshotSha256=digest(args.source / "migration-restarted.json"),
+                                           turbine=dict(id="baseelectric:hydroturbine", uuid=[1, 2]))
+        write_json(args.source / "receipt.json", prior)
+        args.receipt_sha256 = digest(args.source / "receipt.json")
+        (args.source / WORLD).mkdir()
+        args.profile, args.inventory = self.root / "profile.json", self.root / "inventory.json"
+        write_json(args.profile, {})
+        write_json(args.inventory, {})
+        args.seed = self.root / "seed"
+        args.seed.mkdir()
+        args.java = self.root / "java.exe"
+        args.java.write_bytes(b"unit fake, never executed")
+        args.port, args.inventory_sha256 = 26560, digest(args.inventory)
+        mods = {}
+        for name in upgrade.MOD_IDS:
+            path = self.root / (name + ".jar")
+            path.write_bytes(name.encode())
+            mods[name] = "unit", path, digest(path)
+
+        def stage(runtime, *values):
+            runtime.mkdir()
+            return {}
+
+        def snapshot(runtime, java, label, action, **options):
+            write_json(runtime / ("migration-" + label + ".json"), rows)
+            return rows
+
+        core = SimpleNamespace(read_family_target=Mock(return_value=(args.seed, {}, mods)),
+                               java25=Mock(return_value=(args.java, "unit")), stage=stage, verify_runtime=Mock())
+        for hook_only in (True, False):
+            args.output = self.root / ("hook-only" if hook_only else "ordinary")
+            with patch.object(upgrade, "engine", return_value=core), patch.object(upgrade, "output_path", return_value=args.output), \
+                    patch.object(upgrade, "with_server", side_effect=snapshot) as boots, \
+                    patch.object(upgrade, "capture", return_value=dict(status="PASS", worldGenSettings={"seed": 17})), \
+                    patch.object(upgrade, "turbine", return_value=prior["phases"]["restarted"]["turbine"]), \
+                    patch.object(upgrade.previous, "operate", reject_operation):
+                if hook_only:
+                    self.assertEqual(0, upgrade.run(args, hook_only=True))
+                else:
+                    with self.assertRaisesRegex(AssertionError, "Required ordinary operation"):
+                        upgrade.run(args)
+                self.assertEqual(2, boots.call_count)
+            result = upgrade.read_json(args.output / "native2612-upgrade-results.json")
+            self.assertNotIn("operation", result["phases"])
+            if hook_only:
+                self.assertEqual("PASS", result["status"])
+                self.assertEqual(upgrade.HOOK_SCOPE, result["scope"])
+                self.assertIs(False, result["qualificationAllowed"])
+                self.assertEqual("NOT_RUN", result["operationNotRun"]["status"])
+            else:
+                self.assertEqual("FAIL", result["status"])
+                self.assertEqual(upgrade.SCOPE, result["scope"])
+                self.assertNotIn("operationNotRun", result)
+
+    def test_hook_scope_rejects_implicit_truthy_mode_values(self):
+        for value in ("true", 1, None, []):
+            with self.subTest(value=value), self.assertRaisesRegex(ValueError, "explicitly boolean"):
+                upgrade.run(None, hook_only=value)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/test-rig/migration/test_native2612_worldgen.py b/test-rig/migration/test_native2612_worldgen.py
new file mode 100644
index 00000000..02721395
--- /dev/null
+++ b/test-rig/migration/test_native2612_worldgen.py
@@ -0,0 +1,86 @@
+import copy
+from pathlib import Path
+import tempfile
+import unittest
+
+import nbtlib
+
+import native12111_worldgen as old
+import native2612_worldgen as worldgen
+from test_native2612_resources import level_fixture
+
+
+class WorldgenAdapterTest(unittest.TestCase):
+    def test_existing_assertion_bodies_and_templates_are_not_rewritten(self):
+        self.assertIs(worldgen.validate_profile, old.validate_profile)
+        self.assertIs(worldgen.validate_sample.__code__, old.validate_sample.__code__)
+        self.assertIs(worldgen.validate_sample.__globals__["native"], worldgen.native)
+        self.assertIsNot(old.validate_sample.__globals__["native"], worldgen.native)
+        spec = worldgen.campaign_spec("advantage")
+        source = worldgen.native.read_json(spec["template"])
+        for key in ("worldgenExpectations", "firstProfileAssertions", "restartProfileAssertions"):
+            self.assertEqual(source[key], spec[key])
+        with self.assertRaisesRegex(AssertionError, "provider pin"):
+            worldgen.campaign_spec("mineralogy")
+
+    def test_all_six_jars_remain_pinned_and_extra_providers_are_not_smuggled_in(self):
+        spec = worldgen.campaign_spec("advantage")
+        mods = dict.fromkeys(worldgen.FAMILY, "synthetic-unit-pin")
+        self.assertEqual(mods, worldgen.select_mods(mods, spec))
+        for wrong in ({**mods, "mineralogy": "unapproved"}, {k: v for k, v in mods.items() if k != "basesteam"}):
+            with self.assertRaises(AssertionError):
+                worldgen.select_mods(wrong, spec)
+
+    def test_separate_native_saved_data_is_lossless_and_no_flat_or_legacy_fallback(self):
+        with tempfile.TemporaryDirectory() as directory:
+            world, level = level_fixture(directory, worldgen.WORLD)
+            settings_path = worldgen.layout.shared_file(world, "minecraft:world_gen_settings")
+            settings_path.parent.mkdir(parents=True)
+            settings = nbtlib.File({"DataVersion": nbtlib.Int(4790), "data": nbtlib.Compound(
+                seed=nbtlib.Long(1234), unknown_retained=nbtlib.String("not-projected-away"), dimensions=nbtlib.Compound({
+                    "minecraft:overworld": nbtlib.Compound(generator=nbtlib.Compound(type=nbtlib.String("minecraft:noise"),
+                                                                                  settings=nbtlib.String("minecraft:overworld")))}))})
+            settings.save(settings_path, gzipped=True)
+            before = settings_path.read_bytes()
+            actual = worldgen.normal_world(world)
+            self.assertEqual(settings, actual)
+            self.assertEqual(before, settings_path.read_bytes())
+            self.assertEqual("not-projected-away", actual["data"]["unknown_retained"])
+            for wrong in (nbtlib.Int(4671), nbtlib.String("4790")):
+                changed = copy.deepcopy(settings)
+                changed["DataVersion"] = wrong
+                changed.save(settings_path, gzipped=True)
+                with self.assertRaises(ValueError):
+                    worldgen.normal_world(world)
+            settings["data"]["dimensions"]["minecraft:overworld"]["generator"]["type"] = nbtlib.String("minecraft:flat")
+            settings.save(settings_path, gzipped=True)
+            with self.assertRaisesRegex(AssertionError, "normal terrain"):
+                worldgen.normal_world(world)
+
+    def test_native_restart_does_not_inherit_old_oil_exclusion_as_a_waiver(self):
+        sample = dict(centers={"DESERT": "0,0"}, chunksScanned=1,
+                      counts={"basepower:crude_oil": 5}, biomeViolations={"basepower:crude_oil": 0},
+                      biomeBoundaryBlocks={"basepower:crude_oil": 0})
+        spec = dict(name="worldgen-legacy-import", stableWorldgenCountExclusions=["basepower:crude_oil"])
+        worldgen.validate_restart(sample, copy.deepcopy(sample), spec)
+        changed = copy.deepcopy(sample)
+        changed["counts"]["basepower:crude_oil"] += 1
+        old.validate_restart(sample, changed, spec)
+        with self.assertRaisesRegex(AssertionError, "no historical exclusion"):
+            worldgen.validate_restart(sample, changed, spec)
+
+    def test_stage_changes_only_disposable_normal_world_properties(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            settings = root / "server.properties"
+            settings.write_text("level-type=minecraft:flat\ngenerator-settings=flat\nserver-ip=127.0.0.1\n")
+            worldgen.configure_normal_world(root, worldgen.campaign_spec("advantage"), 26520)
+            data = dict(line.split("=", 1) for line in settings.read_text().splitlines())
+            self.assertEqual("minecraft:normal", data["level-type"])
+            self.assertEqual("", data["generator-settings"])
+            self.assertEqual("-1", data["pause-when-empty-seconds"])
+            self.assertEqual("127.0.0.1", data["server-ip"])
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/test-rig/platform-controls/NativeLeashKnotPlatformControl.java b/test-rig/platform-controls/NativeLeashKnotPlatformControl.java
index 6843e3d4..6e1f247e 100644
--- a/test-rig/platform-controls/NativeLeashKnotPlatformControl.java
+++ b/test-rig/platform-controls/NativeLeashKnotPlatformControl.java
@@ -79,7 +79,7 @@ public static void main(String[] args) throws Exception {
 
         Map<String, Object> proof = new LinkedHashMap<>();
         proof.put("format", 1);
-        proof.put("policy", "native12111-leash-knot-nosave-v1");
+        proof.put("policy", "native2612-leash-knot-nosave-v1");
         proof.put("minecraftVersion", SharedConstants.getCurrentVersion().name());
         proof.put("dataVersion", SharedConstants.getCurrentVersion().dataVersion().version());
         proof.put("forgeVersion", net.minecraftforge.versions.forge.ForgeVersion.getVersion());
diff --git a/test-rig/platform-controls/NativePlatformSupport.java b/test-rig/platform-controls/NativePlatformSupport.java
index 59a1949d..f1545fc5 100644
--- a/test-rig/platform-controls/NativePlatformSupport.java
+++ b/test-rig/platform-controls/NativePlatformSupport.java
@@ -62,7 +62,7 @@ static ServerLevel context(boolean worldgen) throws Exception {
                 var tags = TagLoader.loadTagsForExistingRegistries(resources, base.getLayer(RegistryLayer.STATIC));
                 var lookups = TagLoader.buildUpdatedLookups(base.getAccessForLoading(RegistryLayer.WORLDGEN), tags);
                 var loaded = RegistryDataLoader.load(resources, lookups,
-                        RegistryDataLoader.WORLDGEN_REGISTRIES);
+                        RegistryDataLoader.WORLDGEN_REGISTRIES, Runnable::run).join();
                 registries = base.replaceFrom(RegistryLayer.WORLDGEN, loaded).compositeAccess();
             }
         }
diff --git a/test-rig/profiles/native2612/dev-core.json b/test-rig/profiles/native2612/dev-core.json
new file mode 100644
index 00000000..503d7983
--- /dev/null
+++ b/test-rig/profiles/native2612/dev-core.json
@@ -0,0 +1,20 @@
+{
+  "name": "dev-core",
+  "mode": "development",
+  "qualificationStatus": "DEVELOPMENT_ONLY_NOT_QUALIFIED",
+  "minecraftVersion": "26.1.2",
+  "forgeVersion": "64.1.5",
+  "powerDeobfSha256": "23ABCC1FEFDAA6988BF709437EB165C8948C757E773ADAB738092EB93CA8D2B0",
+  "mods": [
+    {
+      "id": "basesteam",
+      "version": "2.2.17.2601021",
+      "sha256": "4A4E7D8C3704DCF17F46EBB55A7A908A6E1B547FCAB93E3B6782EE32E49301CB"
+    },
+    {
+      "id": "baseelectric",
+      "version": "2.2.17.2601021",
+      "sha256": "E2929ED56B4CEE1AD50B6B0D2BF1AF000AA15F2C9D66E5DFB3679B53FBDED9FC"
+    }
+  ]
+}
diff --git a/test-rig/profiles/native2612/legacy-visible-alternatives.json b/test-rig/profiles/native2612/legacy-visible-alternatives.json
new file mode 100644
index 00000000..dee289df
--- /dev/null
+++ b/test-rig/profiles/native2612/legacy-visible-alternatives.json
@@ -0,0 +1,11 @@
+{
+  "protocol": "NATIVE26_LEGACY_VISIBLE_DISABLED_ALTERNATIVES_V1",
+  "reason": "Retain the imported placement rules and show complete disabled modern alternatives. Presence is not duplicate generation; enabling a second overlapping source is.",
+  "replacesOnly": [
+    {"id": "modern-oil-not-duplicated", "section": "fluid_deposits", "entry": "basepower:fluid_deposit/desert_crude_oil", "block": "basepower:crude_oil"},
+    {"id": "modern-lithium-not-duplicated", "section": "ores", "entry": "baseelectric:ore/lithium", "block": "baseelectric:li_ore"},
+    {"id": "modern-sulfur-not-duplicated", "section": "ores", "entry": "baseelectric:ore/sulfur", "block": "baseelectric:sulfur_ore"}
+  ],
+  "replacement": {"present": true, "field": "enabled", "expectedBoolean": false},
+  "historicalAssertionsAndReceiptsRemainUnchanged": true
+}
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/ElectricOperationalCases.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/ElectricOperationalCases.java
index 5607809d..98ee2939 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/ElectricOperationalCases.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/ElectricOperationalCases.java
@@ -422,11 +422,11 @@ private static void hydro(List<MachineScenario> cases) {
                 + "This exclusive case restores global time after measurement, including on assertion failure.", 160, c -> {
                     c.block(8, Y, Z, EA + "photovoltaic_generator");
                     c.require(c.world.canSeeSky(c.at(8, Y + 1, Z)), "Daylight panel top surface has actual sky access");
-                    previousTime[0] = c.world.getDayTime();
+                    previousTime[0] = c.world.getDefaultClockTime();
                     weatherFactor[0] = c.world.isThundering() ? 0.2f : c.world.isRaining() ? 0.35f : 1;
                     c.record("setup.previousDayTime", previousTime[0]);
                     c.record("setup.weatherFactor", weatherFactor[0]);
-                    c.world.setDayTime(6000);
+                    c.world.getServer().clockManager().setTotalTicks(c.world.dimensionType().defaultClock().orElseThrow(), 6000);
                     daylightCycle[0] = c.world.getGameRules().get(GameRules.ADVANCE_TIME);
                     c.record("setup.daylightCycle", daylightCycle[0]);
                     c.record("daylight.constructionGameTime", c.world.getGameTime());
@@ -441,9 +441,9 @@ private static void hydro(List<MachineScenario> cases) {
                         c.record("daylight.expectedGenerated", expected);
                         // Math.sin is independent of Minecraft's quantized sine table; allow only its rounding error.
                         close(c, "daylight.generated", c.energy(8, Y, Z, ELECTRICITY), expected, 0.01f);
-                        c.record("daylight.lastDayTime", c.world.getDayTime());
+                        c.record("daylight.lastDayTime", c.world.getDefaultClockTime());
                     } finally {
-                        c.world.setDayTime(previousTime[0]);
+                        c.world.getServer().clockManager().setTotalTicks(c.world.dimensionType().defaultClock().orElseThrow(), previousTime[0]);
                     }
                 }).exclusive());
     }
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/LifecycleProbe.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/LifecycleProbe.java
index 73da1bc6..513e5b97 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/LifecycleProbe.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/LifecycleProbe.java
@@ -76,7 +76,7 @@ static final class Fixture {
     }
 
     static void validate(Fixture fixture) {
-        validate(fixture, () -> ModList.get().isLoaded("mineralogy"));
+        validate(fixture, () -> ModList.isLoaded("mineralogy"));
     }
 
     static void validate(Fixture fixture, BooleanSupplier mineralogyLoaded) {
@@ -213,13 +213,13 @@ private void execute(ServerLevel world, String operation, String label) {
             Set<Long> selected = new LinkedHashSet<>();
             for (Fixture fixture : fixtures.values()) {
                 if (fixture.groups == null || !fixture.groups.containsKey(group)) continue;
-                for (int[] pos : fixture.groups.get(group)) selected.add(ChunkPos.asLong(pos[0], pos[1]));
+                for (int[] pos : fixture.groups.get(group)) selected.add(ChunkPos.pack(pos[0], pos[1]));
             }
             if (selected.isEmpty()) throw new IllegalArgumentException("Unknown chunk group " + group);
             for (long key : selected) {
-                ChunkPos pos = new ChunkPos(key);
-                world.setChunkForced(pos.x, pos.z, acquire);
-                if (acquire) world.getChunk(pos.x, pos.z);
+                ChunkPos pos = ChunkPos.unpack(key);
+                world.setChunkForced(pos.x(), pos.z(), acquire);
+                if (acquire) world.getChunk(pos.x(), pos.z());
                 // Removing the forced ticket lets the native ticket manager unload naturally.
                 // The runner still requires actual ChunkEvent.Unload/Load witnesses.
             }
@@ -261,15 +261,15 @@ private void execute(ServerLevel world, String operation, String label) {
             case "trace-loads": tracingLoads = true; break;
             case "release":
                 for (long key : chunks()) {
-                    ChunkPos pos = new ChunkPos(key);
-                    world.setChunkForced(pos.x, pos.z, false);
+                    ChunkPos pos = ChunkPos.unpack(key);
+                    world.setChunkForced(pos.x(), pos.z(), false);
                 }
                 break;
             case "load":
                 for (long key : chunks()) {
-                    ChunkPos pos = new ChunkPos(key);
-                    world.setChunkForced(pos.x, pos.z, true);
-                    world.getChunk(pos.x, pos.z);
+                    ChunkPos pos = ChunkPos.unpack(key);
+                    world.setChunkForced(pos.x(), pos.z(), true);
+                    world.getChunk(pos.x(), pos.z());
                 }
                 break;
             case "offer":
@@ -323,9 +323,9 @@ private boolean roundTripPrerequisites(RoundTripRequest request) {
         ServerLevel world = request.world;
         boolean allChunks = true;
         for (long key : chunks()) {
-            ChunkPos chunk = new ChunkPos(key);
+            ChunkPos chunk = ChunkPos.unpack(key);
             BlockPos pos = new BlockPos(chunk.getMinBlockX(), 80, chunk.getMinBlockZ());
-            allChunks &= world.getChunkSource().getChunkNow(chunk.x, chunk.z) != null
+            allChunks &= world.getChunkSource().getChunkNow(chunk.x(), chunk.z()) != null
                     && Native118ChunkTicking.withEntitiesLoaded(world, pos) && world.isPositionEntityTicking(pos);
         }
         request.bindings.clear(); request.prerequisites.clear();
@@ -494,29 +494,29 @@ private Set<Long> chunks() {
         Set<Long> result = new LinkedHashSet<>();
         for (Fixture fixture : fixtures.values())
             for (int z = fixture.min[2] >> 4; z <= fixture.max[2] >> 4; z++)
-                for (int x = fixture.min[0] >> 4; x <= fixture.max[0] >> 4; x++) result.add(ChunkPos.asLong(x, z));
+                for (int x = fixture.min[0] >> 4; x <= fixture.max[0] >> 4; x++) result.add(ChunkPos.pack(x, z));
         return result;
     }
 
     private void unload(ChunkEvent.Unload event) {
         if (event.getLevel() instanceof ServerLevel) {
-            increment(unloads, event.getChunk().getPos().toLong());
+            increment(unloads, event.getChunk().getPos().pack());
             recordEvent(event, "unload");
         }
     }
 
     private void load(ChunkEvent.Load event) {
         if (event.getLevel() instanceof ServerLevel) {
-            increment(loads, event.getChunk().getPos().toLong());
+            increment(loads, event.getChunk().getPos().pack());
             recordEvent(event, "load");
         }
     }
 
     private void recordEvent(ChunkEvent event, String operation) {
-        if (!chunks().contains(event.getChunk().getPos().toLong())) return;
+        if (!chunks().contains(event.getChunk().getPos().pack())) return;
         Map<String, Object> record = new LinkedHashMap<>();
         record.put("operation", operation);
-        record.put("pos", Arrays.asList(event.getChunk().getPos().x, event.getChunk().getPos().z));
+        record.put("pos", Arrays.asList(event.getChunk().getPos().x(), event.getChunk().getPos().z()));
         record.put("worldTime", ((ServerLevel) event.getLevel()).getGameTime());
         if (tracingLoads && "load".equals(operation)) {
             List<String> stack = new ArrayList<>();
@@ -605,10 +605,10 @@ private Map<String, Object> observe(ServerLevel world) {
         }
         List<Map<String, Object>> chunkStates = new ArrayList<>();
         for (long key : chunks()) {
-            ChunkPos pos = new ChunkPos(key);
+            ChunkPos pos = ChunkPos.unpack(key);
             Map<String, Object> entry = new LinkedHashMap<>();
-            entry.put("pos", Arrays.asList(pos.x, pos.z));
-            entry.put("loaded", world.getChunkSource().getChunkNow(pos.x, pos.z) != null);
+            entry.put("pos", Arrays.asList(pos.x(), pos.z()));
+            entry.put("loaded", world.getChunkSource().getChunkNow(pos.x(), pos.z()) != null);
             entry.put("unloads", unloads.getOrDefault(key, 0));
             entry.put("loads", loads.getOrDefault(key, 0));
             chunkStates.add(entry);
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/Native117StoppedEntitiesSnapshotV2.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/Native117StoppedEntitiesSnapshotV2.java
index d7440dbf..cc68c409 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/Native117StoppedEntitiesSnapshotV2.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/Native117StoppedEntitiesSnapshotV2.java
@@ -37,8 +37,8 @@
 
 /** Versioned stop-boundary observation. Native no-save helpers are never saved-state witnesses. */
 final class Native117StoppedEntitiesSnapshotV2 {
-    static final String CONTRACT = "native12111-helper-contract.json";
-    static final String POLICY = "native12111-leash-knot-nosave-v1";
+    static final String CONTRACT = "native2612-helper-contract.json";
+    static final String POLICY = "native2612-leash-knot-nosave-v1";
     private static final Map<MinecraftServer, String> BOOTS = Collections.synchronizedMap(new WeakHashMap<>());
 
     private Native117StoppedEntitiesSnapshotV2() {}
@@ -64,7 +64,7 @@ static void validateContract(byte[] bytes) throws IOException {
             if (control.get("format").getAsInt() != 1 || !POLICY.equals(control.get("policy").getAsString())
                     || !SharedConstants.getCurrentVersion().name().equals(control.get("minecraftVersion").getAsString())
                     || SharedConstants.getCurrentVersion().dataVersion().version() != control.get("dataVersion").getAsInt()
-                    || !"61.1.0".equals(control.get("forgeVersion").getAsString())) {
+                    || !"64.1.5".equals(control.get("forgeVersion").getAsString())) {
                 throw new IOException("Native helper control does not describe this pinned engine");
             }
         } catch (RuntimeException error) {
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/Native118ChunkTicking.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/Native118ChunkTicking.java
index a1f4b30e..55343140 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/Native118ChunkTicking.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/Native118ChunkTicking.java
@@ -9,7 +9,7 @@ private Native118ChunkTicking() {}
 
     static boolean withEntitiesLoaded(ServerLevel world, BlockPos pos) {
         // The native combined check became private in 1.18.
-        long key = ChunkPos.asLong(pos);
+        long key = ChunkPos.pack(pos);
         return world.areEntitiesLoaded(key) && world.getChunkSource().isPositionTicking(key);
     }
 }
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/NativeBlockEntityTicks.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/NativeBlockEntityTicks.java
index d7887a08..fecd4a5d 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/NativeBlockEntityTicks.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/NativeBlockEntityTicks.java
@@ -12,11 +12,11 @@ final class NativeBlockEntityTicks {
     private NativeBlockEntityTicks() {}
 
     private static List<TickingBlockEntity> active(Level world) {
-        return ObfuscationReflectionHelper.getPrivateValue(Level.class, world, "f_151512_");
+        return ObfuscationReflectionHelper.getPrivateValue(Level.class, world, "blockEntityTickers");
     }
 
     private static List<TickingBlockEntity> pending(Level world) {
-        return ObfuscationReflectionHelper.getPrivateValue(Level.class, world, "f_151503_");
+        return ObfuscationReflectionHelper.getPrivateValue(Level.class, world, "pendingBlockEntityTickers");
     }
 
     static List<TickingBlockEntity> registrations(Level world) {
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/NativeInteropProbe.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/NativeInteropProbe.java
index 6e23e516..52662944 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/NativeInteropProbe.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/NativeInteropProbe.java
@@ -336,7 +336,7 @@ private static void run(ServerLevel world, String phase) throws Exception {
         report.addProperty("status", java.util.stream.StreamSupport.stream(checks.spliterator(), false)
                 .allMatch(row -> row.getAsJsonObject().get("status").getAsString().equals("PASS")) ? "PASS" : "FAIL");
         report.add("checks", checks);
-        if (net.minecraftforge.fml.ModList.get().isLoaded("basemetals")) {
+        if (net.minecraftforge.fml.ModList.isLoaded("basemetals")) {
             JsonArray shared = new JsonArray();
             check(shared, "basemetals/native-power-crushing", () -> sharedCrushing(world));
             report.add("sharedChecks", shared);
@@ -359,7 +359,7 @@ private static void sharedCrushing(ServerLevel world) {
         for (var potato : List.of(net.minecraft.world.item.Items.POTATO, net.minecraft.world.item.Items.POISONOUS_POTATO)) {
             var input = new net.minecraft.world.item.crafting.SingleRecipeInput(new ItemStack(potato, 3));
             require(recipe.matches(input, world), "Shared crusher rejected " + potato);
-            ItemStack result = recipe.assemble(input, world.registryAccess());
+            ItemStack result = recipe.assemble(input);
             require(result.getCount() == 1 && Identifier.fromNamespaceAndPath("basepower", "starch").equals(
                     ForgeRegistries.ITEMS.getKey(result.getItem())), "Incorrect shared crushing result: " + result);
             require(input.getItem(0).getCount() == 3, "Assembling a recipe preview mutated its input");
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/ProcessProgression.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/ProcessProgression.java
index c0a05ffb..9a851572 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/ProcessProgression.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/ProcessProgression.java
@@ -140,8 +140,7 @@ private static JsonObject hammerRecipeSelection(ServerLevel world, ItemStack ham
                 selection.addProperty("id", selected.id().identifier().toString());
                 selection.addProperty("class", selected.value().getClass().getName());
                 selection.addProperty("resultNbt", stackNbt(world,
-                        selected.value().assemble(new net.minecraft.world.item.crafting.SingleRecipeInput(input.copy()),
-                                world.registryAccess())));
+                        selected.value().assemble(new net.minecraft.world.item.crafting.SingleRecipeInput(input.copy()))));
             }
         } catch (RuntimeException | LinkageError error) {
             selection.addProperty("status", "OBSERVER_ERROR");
@@ -163,7 +162,7 @@ private static JsonObject hammerSnapshot(ServerLevel world, ServerPlayer player,
         sample.addProperty("sourceIntersectsArea", source.getBoundingBox().intersects(area));
         sample.addProperty("sourceNbt", stackNbt(world, source.getItem()));
         sample.addProperty("uuidLookupIsSource", world.getEntity(source.getUUID()) == source);
-        sample.addProperty("entitiesLoaded", world.areEntitiesLoaded(net.minecraft.world.level.ChunkPos.asLong(pos)));
+        sample.addProperty("entitiesLoaded", world.areEntitiesLoaded(net.minecraft.world.level.ChunkPos.pack(pos)));
         sample.addProperty("blockAndEntitiesTicking", Native118ChunkTicking.withEntitiesLoaded(world, pos));
         sample.addProperty("entityTicking", world.isPositionEntityTicking(pos));
         sample.addProperty("clientSide", world.isClientSide());
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/ProgressionProbe.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/ProgressionProbe.java
index a6fd2beb..ef76d4e9 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/ProgressionProbe.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/ProgressionProbe.java
@@ -314,7 +314,7 @@ private static ItemStack matchedResult(Recipe<?> recipe, net.minecraft.world.Con
         var input = inventory instanceof CraftingContainer grid ? grid.asCraftInput()
                 : new net.minecraft.world.item.crafting.SingleRecipeInput(inventory.getItem(0));
         Recipe<net.minecraft.world.item.crafting.RecipeInput> typed = (Recipe<net.minecraft.world.item.crafting.RecipeInput>) recipe;
-        return typed.matches(input, world) ? typed.assemble(input, world.registryAccess()) : ItemStack.EMPTY;
+        return typed.matches(input, world) ? typed.assemble(input) : ItemStack.EMPTY;
     }
 
     private static boolean advantage(ItemStack stack) { return !stack.isEmpty() && owned(net.minecraftforge.registries.ForgeRegistries.ITEMS.getKey(stack.getItem())); }
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/RecipeBookProbe.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/RecipeBookProbe.java
index 74e1bcc4..d0ffa252 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/RecipeBookProbe.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/RecipeBookProbe.java
@@ -105,7 +105,7 @@ static void verify(MinecraftServer server, ServerLevel world, String label, Json
                 require(starch.matches(grid.asCraftInput(), world), "Potato recipe rejected slot/stack " + slot + "/" + count);
                 RecipeHolder<?> selected = world.recipeAccess().getRecipeFor(RecipeType.CRAFTING, grid.asCraftInput(), world).orElse(null);
                 require(selected != null && selected.id().equals(starchId), "Conflicting native potato crafting recipe");
-                ItemStack result = starch.assemble(grid.asCraftInput(), world.registryAccess());
+                ItemStack result = starch.assemble(grid.asCraftInput());
                 require(id(result).equals("basepower:starch") && result.getCount() == 1, "Starch output changed");
                 require(grid.getItem(slot).getCount() == count, "Result preview mutated input");
                 ItemStack consumed = grid.removeItem(slot, 1);
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/RedstoneReloadProbe.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/RedstoneReloadProbe.java
index 7c51d6ce..072c49a7 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/RedstoneReloadProbe.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/RedstoneReloadProbe.java
@@ -184,7 +184,7 @@ private boolean ready(String stage) {
         List<Map<String, Object>> rows = new ArrayList<>();
         for (Witness witness : witnesses) {
             BlockEntity tile = tile(witness);
-            boolean ticking = world.getChunkSource().isPositionTicking(new net.minecraft.world.level.ChunkPos(witness.pos).toLong());
+            boolean ticking = world.getChunkSource().isPositionTicking(net.minecraft.world.level.ChunkPos.pack(witness.pos));
             boolean listed = NativeBlockEntityTicks.contains(world, tile);
             boolean blockAndEntitiesLoaded = Native118ChunkTicking.withEntitiesLoaded(world, witness.pos);
             boolean entityTicking = world.isPositionEntityTicking(witness.pos);
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/WorksController.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/WorksController.java
index cb3b6a83..1d356c8f 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/WorksController.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/WorksController.java
@@ -375,9 +375,9 @@ private boolean evaluateAssertion(ServerLevel world, WorksDefinition.Station sta
                         if (assertion.meta != null) {
                             return state.equals(legacyState(assertion.block, block(assertion.block), assertion.meta));
                         }
-                        return state.getValues().entrySet().stream().anyMatch(entry ->
-                                assertion.property.equals(entry.getKey().getName())
-                                        && assertion.expectedText.equals(String.valueOf(entry.getValue())));
+                        return state.getValues().anyMatch(entry ->
+                                assertion.property.equals(entry.property().getName())
+                                        && assertion.expectedText.equals(String.valueOf(entry.value())));
                     });
         }
         if ("registryBlock".equals(assertion.type)) {
@@ -387,7 +387,7 @@ private boolean evaluateAssertion(ServerLevel world, WorksDefinition.Station sta
             return assertion.item != null && item(assertion.item) != null;
         }
         if ("modLoaded".equals(assertion.type)) {
-            return ModList.get().isLoaded(assertion.item);
+            return ModList.isLoaded(assertion.item);
         }
         if ("fluidAmount".equals(assertion.type)) {
             long total = 0;
@@ -407,12 +407,8 @@ private boolean evaluateAssertion(ServerLevel world, WorksDefinition.Station sta
         if ("blockProperty".equals(assertion.type)) {
             BlockState state = world.getBlockState(pos);
             if (state.getBlock() != block(assertion.block)) return false;
-            for (Map.Entry<Property<?>, Comparable<?>> entry : state.getValues().entrySet()) {
-                if (entry.getKey().getName().equals(assertion.property)) {
-                    return assertion.expectedText.equals(String.valueOf(entry.getValue()));
-                }
-            }
-            return false;
+            return state.getValues().anyMatch(entry -> entry.property().getName().equals(assertion.property)
+                    && assertion.expectedText.equals(String.valueOf(entry.value())));
         }
         if ("comparatorOutput".equals(assertion.type)) {
             BlockState state = world.getBlockState(pos);
@@ -709,19 +705,19 @@ private void applyActions(ServerLevel world, WorksDefinition.Station station,
                     world.addFreshEntity(entity);
                     break;
                 case "time":
-                    world.setDayTime(action.value);
+                    world.getServer().clockManager().setTotalTicks(world.dimensionType().defaultClock().orElseThrow(), action.value);
                     break;
                 case "weatherClear":
-                    world.getLevelData().setRaining(false);
-                    ((net.minecraft.world.level.storage.ServerLevelData) world.getLevelData()).setThundering(false);
+                    world.getWeatherData().setRaining(false);
+                    world.getWeatherData().setThundering(false);
                     break;
                 case "weatherRain":
-                    world.getLevelData().setRaining(true);
-                    ((net.minecraft.world.level.storage.ServerLevelData) world.getLevelData()).setThundering(false);
+                    world.getWeatherData().setRaining(true);
+                    world.getWeatherData().setThundering(false);
                     break;
                 case "weatherThunder":
-                    world.getLevelData().setRaining(true);
-                    ((net.minecraft.world.level.storage.ServerLevelData) world.getLevelData()).setThundering(true);
+                    world.getWeatherData().setRaining(true);
+                    world.getWeatherData().setThundering(true);
                     break;
                 default:
                     throw new IllegalArgumentException("Unsupported action type " + type);
@@ -787,7 +783,7 @@ private static boolean requirementsPresent(WorksDefinition.Station station) {
     }
 
     private static boolean requirementsPresent(List<String> requiredMods) {
-        for (String mod : requiredMods) if (!ModList.get().isLoaded(mod)) return false;
+        for (String mod : requiredMods) if (!ModList.isLoaded(mod)) return false;
         return true;
     }
 
diff --git a/test-rig/src/main/java/zone/moddev/mc/advantageworks/WorksResultWriter.java b/test-rig/src/main/java/zone/moddev/mc/advantageworks/WorksResultWriter.java
index bb2f8841..2d2131a2 100644
--- a/test-rig/src/main/java/zone/moddev/mc/advantageworks/WorksResultWriter.java
+++ b/test-rig/src/main/java/zone/moddev/mc/advantageworks/WorksResultWriter.java
@@ -57,7 +57,7 @@ File write(String stationId, String kind, Map<String, Object> payload) {
 
     private static Map<String, String> loadedMods() {
         Map<String, String> result = new LinkedHashMap<>();
-        for (IModInfo mod : ModList.get().getMods()) {
+        for (IModInfo mod : ModList.getMods()) {
             result.put(mod.getModId(), mod.getVersion().toString());
         }
         return result;
diff --git a/test-rig/src/main/resources/META-INF/mods.toml b/test-rig/src/main/resources/META-INF/mods.toml
index 76f8878b..843cccb2 100644
--- a/test-rig/src/main/resources/META-INF/mods.toml
+++ b/test-rig/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader="javafml"
-loaderVersion="[61,62)"
+loaderVersion="[64,65)"
 license="LGPL-3.0-only"
 
 [[mods]]
@@ -13,20 +13,20 @@ description='''Server-side commissioning harness for the Advantage family. Not f
 [[dependencies.advantageworkstest]]
 modId="basepower"
 mandatory=true
-versionRange="[2.4.15.121111,3.0.0)"
+versionRange="[2.4.16.2601021,3.0.0)"
 ordering="AFTER"
 side="SERVER"
 
 [[dependencies.advantageworkstest]]
 modId="forge"
 mandatory=true
-versionRange="[61.1.0,62)"
+versionRange="[64.1.5,65)"
 ordering="NONE"
 side="SERVER"
 
 [[dependencies.advantageworkstest]]
 modId="minecraft"
 mandatory=true
-versionRange="[1.21.11]"
+versionRange="[26.1.2]"
 ordering="NONE"
 side="SERVER"
diff --git a/test-rig/src/main/resources/assets/advantageworkstest/native2612-helper-contract.json b/test-rig/src/main/resources/assets/advantageworkstest/native2612-helper-contract.json
new file mode 100644
index 00000000..07d78f64
--- /dev/null
+++ b/test-rig/src/main/resources/assets/advantageworkstest/native2612-helper-contract.json
@@ -0,0 +1,54 @@
+{
+  "format": 1,
+  "policy": "native2612-leash-knot-nosave-v1",
+  "minecraftVersion": "26.1.2",
+  "dataVersion": 4790,
+  "forgeVersion": "64.1.5",
+  "nativeClass": "net.minecraft.world.entity.decoration.LeashFenceKnotEntity",
+  "registryId": "minecraft:leash_knot",
+  "canSerialize": false,
+  "storageSelectorAccepts": true,
+  "encodedIdPresent": false,
+  "rootWriterAccepted": false,
+  "passengerWriterAccepted": false,
+  "refusedWritersLeaveNoPayload": true,
+  "observationalUuidPreserved": true,
+  "observationalStateUnchanged": true,
+  "observationalTagKeys": [
+    "Air",
+    "CanUpdate",
+    "Fire",
+    "Invulnerable",
+    "Motion",
+    "OnGround",
+    "PortalCooldown",
+    "Pos",
+    "Rotation",
+    "UUID",
+    "fall_distance"
+  ],
+  "noPower": true,
+  "powerAccessTransformerAbsent": true,
+  "noHarness": true,
+  "noServer": true,
+  "noTicks": true,
+  "nativeMethodsUnmodified": true,
+  "nativeClassSha256": {
+    "net.minecraft.world.entity.Entity": "E78F541C2A2A424F6DCCA2092D7D9A485AC74BE6A52A162E63E140D6A4759997",
+    "net.minecraft.world.entity.EntityType": "AEFFCA69BBAB54EB535AC6AE84F5BD8E1AE37508146B5C58B2F96EBCC8D83073",
+    "net.minecraft.world.entity.decoration.LeashFenceKnotEntity": "4E8C74E2E20C2453E014992F1102EF49CB361929B837A13601A16CE5E82D9DED",
+    "net.minecraft.util.datafix.fixes.BlockStateData": "3192DA9F2107E79270B73FB742CBDB1CB6BCD2B5228C579757E3C899A5C8E51A"
+  },
+  "engineJarSha256": "EAF67CF3E6DD7D6546A315A64C5C89BD82C704C361321A081E5B219B3212BA46",
+  "engineSourcesSha256": "9175F1245E5E2907EA3ECAB13DC40F9B8994E61759E75363F6FB14322335F013",
+  "nativeSourceSha256": {
+    "net/minecraft/world/entity/Entity.java": "C2DDDA9E977317EE507B8DD340F5AEFEE4426C705718B81DA7E6C4F693C39A52",
+    "net/minecraft/world/entity/EntityType.java": "6800D946097FB0D832921E5C354B7378D9ACAAAA8F4598661A99A4BE9B7DAC5C",
+    "net/minecraft/world/entity/decoration/LeashFenceKnotEntity.java": "B344E22539256C8B58CA38B8C66E3793FE0EB5820149C80355AC524B692B60BC",
+    "net/minecraft/util/datafix/fixes/BlockStateData.java": "6196F9039890D5F67B59CB372EC06DA987E8A5EA80B49FD8BEE9EECA0A1784A4"
+  },
+  "controlSourceSha256": {
+    "NativePlatformSupport.java": "F2E039B4DF081ED11350422EBB1DB096306B549FF17BC93FECB1DBF4CD770031",
+    "NativeLeashKnotPlatformControl.java": "7869C465B9426BC11F187F02A1CEA284EDFE32C4B927C486A75DE2CCF20B5BC9"
+  }
+}
diff --git a/test-rig/src/runner/java/zone/moddev/mc/advantageworks/runner/WorksRunner.java b/test-rig/src/runner/java/zone/moddev/mc/advantageworks/runner/WorksRunner.java
index f4a8908f..fbffc8d4 100644
--- a/test-rig/src/runner/java/zone/moddev/mc/advantageworks/runner/WorksRunner.java
+++ b/test-rig/src/runner/java/zone/moddev/mc/advantageworks/runner/WorksRunner.java
@@ -79,7 +79,13 @@ public static void main(String[] args) throws Exception {
             List<Map<String, Object>> inputs = stageMods(testRig, null, profile.mods);
             if ("packaged".equals(profile.mode)) {
                 runtimeJavaHome(profile);
-                if (profile.preparedSeed != null) packagedCommand(profile, profile.preparedSeed.root.toFile());
+                if (profile.preparedSeed != null) {
+                    if ("26.1.2".equals(profile.minecraftVersion)) {
+                        requireModularLauncher(profile.preparedSeed.root.toFile(), serverLauncherPath(profile));
+                        native2612LoggingBytes(profile.preparedSeed.root.resolve(
+                                "libraries/net/minecraftforge/fmlloader/26.1.2-64.1.5/fmlloader-26.1.2-64.1.5.jar").toFile());
+                    } else packagedCommand(profile, profile.preparedSeed.root.toFile());
+                }
             }
             System.out.println("Native " + profile.minecraftVersion + " profile preflight only (no world opened): " + GSON.toJson(inputs));
             return;
@@ -89,7 +95,8 @@ public static void main(String[] args) throws Exception {
         File runtime = new File(runtimeBase, profile.name + "-" + stamp).getCanonicalFile();
         requireChild(new File(testRig, "build").getCanonicalFile(), runtime);
         if (profile.preparedSeed == null) {
-            throw new IllegalArgumentException(("1.21.11".equals(profile.minecraftVersion) ? "Forge 61" : "Forge 52")
+            throw new IllegalArgumentException(("26.1.2".equals(profile.minecraftVersion) ? "Forge 64"
+                    : "1.21.11".equals(profile.minecraftVersion) ? "Forge 61" : "Forge 52")
                     + " runtime requires an official prepared server and sealed inventory");
         }
         if (profile.preparedSeed != null) profile.preparedSeed.requireDisjoint(runtime);
@@ -309,18 +316,66 @@ static List<String> packagedCommand(Profile profile, File runtime) throws Except
         try (ZipFile jar = new ZipFile(loggingJar)) {
             if (jar.getEntry("log4j2.xml") == null) throw new IllegalStateException("Forge logging configuration missing");
         }
+        String logging = "26.1.2".equals(profile.minecraftVersion)
+                ? native2612LoggingConfiguration(runtime, loggingJar)
+                : "jar:" + loggingJar.toURI().toASCIIString() + "!/log4j2.xml";
         return Arrays.asList(java.getAbsolutePath(), "-Xms512M", "-Xmx2G", "--add-opens",
                 "java.base/java.lang.invoke=ALL-UNNAMED",
-                "-Dlog4j.configurationFile=jar:" + loggingJar.toURI().toASCIIString() + "!/log4j2.xml",
+                "-Dlog4j.configurationFile=" + logging,
                 "-Dfml.queryResult=confirm", "@" + launcher, "nogui");
     }
 
+    static byte[] native2612LoggingBytes(File loggingJar) throws Exception {
+        String sourceJarSha = "7299C7AF7AE427C44C9AE83A92508F7BB09764DC30D21A4E8E86C7FFF2B0C4BC";
+        String sourceXmlSha = "9680BAF9F936C8CD009CD3A8D75253B476FCA9C316F8D5B5C51700053BEAE440";
+        if (!sourceJarSha.equals(sha256(loggingJar))) throw new IllegalArgumentException("Forge 64 logging jar changed");
+        byte[] original;
+        try (ZipFile jar = new ZipFile(loggingJar)) {
+            try (InputStream input = jar.getInputStream(jar.getEntry("log4j2.xml"))) { original = input.readAllBytes(); }
+        }
+        if (!sourceXmlSha.equals(java.util.HexFormat.of().withUpperCase().formatHex(MessageDigest.getInstance("SHA-256").digest(original))))
+            throw new IllegalArgumentException("Forge 64 logging source changed");
+        String text = new String(original, StandardCharsets.UTF_8);
+        if (text.split("%xEx", -1).length != 3) throw new IllegalArgumentException("Expected exactly two extended trace renderers");
+        return text.replace("%xEx", "%ex").getBytes(StandardCharsets.UTF_8);
+    }
+
+    static String native2612LoggingConfiguration(File runtime, File loggingJar) throws Exception {
+        byte[] modified = native2612LoggingBytes(loggingJar);
+        Path config = runtime.toPath().resolve("forge64-log4j2-plain-stacktraces.xml");
+        Path custody = runtime.toPath().resolve("forge64-logging-custody.json");
+        Map<String, String> receipt = new LinkedHashMap<>();
+        receipt.put("sourceJarSha256", "7299C7AF7AE427C44C9AE83A92508F7BB09764DC30D21A4E8E86C7FFF2B0C4BC");
+        receipt.put("sourceXmlSha256", "9680BAF9F936C8CD009CD3A8D75253B476FCA9C316F8D5B5C51700053BEAE440");
+        receipt.put("configSha256", java.util.HexFormat.of().withUpperCase().formatHex(MessageDigest.getInstance("SHA-256").digest(modified)));
+        receipt.put("modification", "Exactly two %xEx renderers to %ex; all other source bytes retained");
+        if (Files.exists(config) || Files.exists(custody)) {
+            if (!Files.isRegularFile(config) || !Files.isRegularFile(custody)
+                    || !Arrays.equals(modified, Files.readAllBytes(config))
+                    || !GSON.toJsonTree(receipt).equals(GSON.fromJson(Files.readString(custody), JsonObject.class)))
+                throw new IllegalStateException("Forge 64 logging custody changed");
+        } else {
+            Files.write(config, modified, java.nio.file.StandardOpenOption.CREATE_NEW);
+            Files.writeString(custody, GSON.toJson(receipt), StandardCharsets.UTF_8, java.nio.file.StandardOpenOption.CREATE_NEW);
+        }
+        return config.toUri().toASCIIString();
+    }
+
     static void requireModularLauncher(File runtime, String launcher) throws Exception {
         Path root = runtime.toPath().toAbsolutePath().normalize();
         PreparedServerSeed.requirePlain(root);
         Path args = root.resolve(launcher);
         PreparedServerSeed.requirePlain(args);
         boolean forge61 = launcher.startsWith("libraries/net/minecraftforge/forge/1.21.11-61.1.0/");
+        if (launcher.startsWith("libraries/net/minecraftforge/forge/26.1.2-64.1.5/")) {
+            Path jar = root.resolve("forge-26.1.2-64.1.5-shim.jar");
+            PreparedServerSeed.requirePlain(jar);
+            if (!Files.readString(args, StandardCharsets.UTF_8).strip().equals(
+                    "-Djava.net.preferIPv6Addresses=system -XX:+UseCompactObjectHeaders -jar forge-26.1.2-64.1.5-shim.jar")
+                    || !sha256(jar.toFile()).equals("0C74CB2A8E7A71AEB7055396C1E25864584A2D837D7DD42136A06D0B41ADD545"))
+                throw new IllegalArgumentException("Unexpected selected Forge 64 shim command");
+            return;
+        }
         boolean forge52 = launcher.startsWith("libraries/net/minecraftforge/forge/1.21.1-52.1.0/");
         if (forge61 || forge52 || launcher.startsWith("libraries/net/minecraftforge/forge/1.20.6-50.2.0/")) {
             String shim = forge61 ? "forge-1.21.11-61.1.0-shim.jar"
@@ -811,7 +866,9 @@ static PreparedServerSeed preparedServerSeed(File testRig, Profile profile, Argu
         }
         return new PreparedServerSeed(preparedPath(testRig, arguments.preparedServerSeed),
                 preparedPath(testRig, arguments.preparedServerSeedInventory), arguments.preparedServerSeedSha256,
-                serverLauncherPath(profile), "1.21.11".equals(profile.minecraftVersion)
+                serverLauncherPath(profile), "26.1.2".equals(profile.minecraftVersion)
+                        ? "forge-26.1.2-64.1.5-shim.jar"
+                        : "1.21.11".equals(profile.minecraftVersion)
                         ? "forge-1.21.11-61.1.0-shim.jar"
                         : "1.21.1".equals(profile.minecraftVersion)
                         ? "forge-1.21.1-52.1.0-shim.jar"
@@ -864,13 +921,14 @@ static final class PreparedServerSeed {
         final Map<String, SeedFile> files = new LinkedHashMap<>();
         final Set<String> directories = new LinkedHashSet<>();
         final List<Process> processes = new ArrayList<>();
-        final boolean forge50, forge52, forge61;
+        final boolean forge50, forge52, forge61, forge64;
 
         PreparedServerSeed(Path root, Path inventory, String expectedHash, String launcher, String minecraft)
                 throws Exception {
             forge50 = "forge-1.20.6-50.2.0-shim.jar".equals(minecraft);
             forge52 = "forge-1.21.1-52.1.0-shim.jar".equals(minecraft);
             forge61 = "forge-1.21.11-61.1.0-shim.jar".equals(minecraft);
+            forge64 = "forge-26.1.2-64.1.5-shim.jar".equals(minecraft);
             this.root = root.toAbsolutePath().normalize();
             this.inventory = inventory.toAbsolutePath().normalize();
             if (expectedHash == null || !expectedHash.matches("[0-9A-F]{64}")) {
@@ -938,6 +996,18 @@ static final class PreparedServerSeed {
                     }
                 }
                 reader.endObject();
+                if (forge64) {
+                    Map<String, String> expected = new LinkedHashMap<>();
+                    expected.put("forge", "26.1.2-64.1.5");
+                    expected.put("installerSha256", "6E01323837051176762BD466340A601DA122F179FE6A00AC616E05429AE07648");
+                    expected.put("javaSha256", "D5F1B9E03E298EBFB04D2326ECC1E2AF3E6817F9B4D7F9F151FE856D56975650");
+                    expected.put("javaVersion", "25.0.3+9");
+                    for (var entry : expected.entrySet()) {
+                        if (!reader.hasNext() || !entry.getKey().equals(reader.nextName())
+                                || reader.peek() != JsonToken.STRING || !entry.getValue().equals(reader.nextString()))
+                            throw new IllegalArgumentException("Incorrect Forge 64 inventory metadata: " + entry.getKey());
+                    }
+                }
                 if (forge61 && (!reader.hasNext() || !"forge".equals(reader.nextName())
                         || !"1.21.11-61.1.0".equals(reader.nextString())))
                     throw new IllegalArgumentException("Incorrect Forge 61 shim inventory metadata");
@@ -1152,11 +1222,26 @@ static String serverLauncherPath(Profile profile) {
     private static boolean modularForge(Profile profile) {
         return "1.17.1".equals(profile.minecraftVersion) || "1.18.2".equals(profile.minecraftVersion)
                 || "1.20.1".equals(profile.minecraftVersion) || "1.20.6".equals(profile.minecraftVersion)
-                || "1.21.1".equals(profile.minecraftVersion) || "1.21.11".equals(profile.minecraftVersion);
+                || "1.21.1".equals(profile.minecraftVersion) || "1.21.11".equals(profile.minecraftVersion)
+                || "26.1.2".equals(profile.minecraftVersion);
     }
 
     private static File runtimeJavaHome(Profile profile) throws Exception {
         if (!modularForge(profile)) return java8Home(profile);
+        if ("26.1.2".equals(profile.minecraftVersion)) {
+            requireNative2612Environment(System.getenv());
+            String configured = profile.java25Home;
+            if (configured == null || configured.isBlank()) configured = System.getenv("ADVANTAGE_WORKS_JAVA25_HOME");
+            File home = new File(configured == null || configured.isBlank()
+                    ? System.getProperty("java.home") : expand(configured)).getCanonicalFile();
+            java.util.Properties release = new java.util.Properties();
+            try (InputStream input = Files.newInputStream(new File(home, "release").toPath())) { release.load(input); }
+            if (!"\"25.0.3\"".equals(release.getProperty("JAVA_VERSION"))
+                    || !"\"Temurin-25.0.3+9\"".equals(release.getProperty("IMPLEMENTOR_VERSION"))
+                    || !sha256(javaExecutable(home)).equals("D5F1B9E03E298EBFB04D2326ECC1E2AF3E6817F9B4D7F9F151FE856D56975650"))
+                throw new IllegalArgumentException("Forge 64 requires pinned Temurin 25.0.3+9 and exact Java binary");
+            return home;
+        }
         if ("1.21.11".equals(profile.minecraftVersion)) requireNative12111Environment(System.getenv());
         if ("1.20.6".equals(profile.minecraftVersion) || "1.21.1".equals(profile.minecraftVersion)
                 || "1.21.11".equals(profile.minecraftVersion)) {
@@ -1202,6 +1287,13 @@ static void requireNative12111Environment(Map<String, String> environment) {
         }
     }
 
+    static void requireNative2612Environment(Map<String, String> environment) {
+        for (String key : List.of("JAVA_TOOL_OPTIONS", "JDK_JAVA_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH")) {
+            if (environment.get(key) != null && !environment.get(key).isBlank())
+                throw new IllegalArgumentException("Forge 64 cannot inherit launch options from " + key);
+        }
+    }
+
     private static File java8Home(Profile profile) throws Exception {
         String configured = profile.java8Home;
         if (configured == null || configured.trim().isEmpty()) {
@@ -1290,7 +1382,7 @@ static void writeRuntimeFiles(File runtime, Profile profile) throws Exception {
                 + "spawn-npcs=false\n"
                 + "spawn-protection=0\n"
                 + "view-distance=10\n";
-        if ("1.21.11".equals(profile.minecraftVersion)) {
+        if ("1.21.11".equals(profile.minecraftVersion) || "26.1.2".equals(profile.minecraftVersion)) {
             properties += "pause-when-empty-seconds=-1\n";
         }
         write(new File(runtime, "server.properties"), properties);
@@ -1378,6 +1470,9 @@ static Profile readNative12111Profile(File file) throws Exception {
     static Profile readRunnerProfile(File file) throws Exception {
         try (InputStreamReader reader = new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8)) {
             JsonObject metadata = GSON.fromJson(reader, JsonObject.class);
+            if (metadata != null && metadata.has("minecraftVersion")
+                    && "26.1.2".equals(metadata.get("minecraftVersion").getAsString()))
+                return readNative2612Profile(file);
             if (metadata != null && metadata.has("minecraftVersion")
                     && "1.21.11".equals(metadata.get("minecraftVersion").getAsString())) {
                 return readNative12111Profile(file);
@@ -1386,6 +1481,17 @@ static Profile readRunnerProfile(File file) throws Exception {
         return readNative1211Profile(file);
     }
 
+    static Profile readNative2612Profile(File file) throws Exception {
+        Profile profile = readNativeShimProfile(file, "26.1.2", "26.1.2-64.1.5", ".2601021");
+        if (!"build/works-native2612".equals(profile.runtimeBase))
+            throw new IllegalArgumentException("Forge 64 must use isolated build/works-native2612 runtimes");
+        Set<String> ids = new LinkedHashSet<>();
+        profile.mods.forEach(input -> ids.add(input.id));
+        if (!ids.containsAll(Set.of("basepower", "advantageworkstest", "basemetals", "orespawn")))
+            throw new IllegalArgumentException("Forge 64 requires the actual Base Metals dependency as well as Power, OreSpawn and harness");
+        return profile;
+    }
+
     private static Profile readNativeShimProfile(File file, String minecraft, String forge, String suffix) throws Exception {
         Profile profile = readProfile(file, minecraft, forge);
         if (!"EXPLORATORY_UNQUALIFIED".equals(profile.qualificationStatus) || !"packaged".equals(profile.mode)) {
@@ -1965,6 +2071,7 @@ static final class Profile {
         String java16Home;
         String java17Home;
         String java21Home;
+        String java25Home;
         String gradleJavaHome;
         String recipeMode = "NORMAL";
         String sourceCommit;
diff --git a/test-rig/src/test/java/zone/moddev/mc/advantageworks/ConnectedProbeObservationTest.java b/test-rig/src/test/java/zone/moddev/mc/advantageworks/ConnectedProbeObservationTest.java
index ffeadae2..0fef4666 100644
--- a/test-rig/src/test/java/zone/moddev/mc/advantageworks/ConnectedProbeObservationTest.java
+++ b/test-rig/src/test/java/zone/moddev/mc/advantageworks/ConnectedProbeObservationTest.java
@@ -102,7 +102,7 @@ public CompoundTag getPersistentData() {
 
     private static final class ObservationWorld extends ServerLevel {
         BlockEntity tile;
-        private ObservationWorld() { super(null, null, null, null, null, null, false, 0L, List.of(), false, null); }
+        private ObservationWorld() { super(null, null, null, null, null, null, false, 0L, List.of(), false); }
         @Override public BlockState getBlockState(BlockPos pos) { return Blocks.CHEST.defaultBlockState(); }
         @Override public BlockEntity getBlockEntity(BlockPos pos) { return tile; }
         @Override public RegistryAccess registryAccess() {
diff --git a/test-rig/src/test/java/zone/moddev/mc/advantageworks/Native117EntityContextTest.java b/test-rig/src/test/java/zone/moddev/mc/advantageworks/Native117EntityContextTest.java
index ecb58fc5..cb4d13a1 100644
--- a/test-rig/src/test/java/zone/moddev/mc/advantageworks/Native117EntityContextTest.java
+++ b/test-rig/src/test/java/zone/moddev/mc/advantageworks/Native117EntityContextTest.java
@@ -104,7 +104,7 @@ private static void set(ServerLevel world, String name, Object value) throws Exc
     }
 
     private static final class EntityFixtureWorld extends ServerLevel {
-        private EntityFixtureWorld() { super(null, null, null, null, null, null, false, 0L, java.util.List.of(), false, null); }
+        private EntityFixtureWorld() { super(null, null, null, null, null, null, false, 0L, java.util.List.of(), false); }
 
         @Override public net.minecraft.world.flag.FeatureFlagSet enabledFeatures() {
             return net.minecraft.world.flag.FeatureFlags.DEFAULT_FLAGS;
diff --git a/test-rig/src/test/java/zone/moddev/mc/advantageworks/Native1201TestFlatTest.java b/test-rig/src/test/java/zone/moddev/mc/advantageworks/Native1201TestFlatTest.java
index 3a609580..7113e550 100644
--- a/test-rig/src/test/java/zone/moddev/mc/advantageworks/Native1201TestFlatTest.java
+++ b/test-rig/src/test/java/zone/moddev/mc/advantageworks/Native1201TestFlatTest.java
@@ -37,7 +37,7 @@ public class Native1201TestFlatTest {
             var lookups = net.minecraft.tags.TagLoader.buildUpdatedLookups(
                     base.getAccessForLoading(RegistryLayer.WORLDGEN), pendingTags);
             var worldgen = RegistryDataLoader.load(resources, lookups,
-                    RegistryDataLoader.WORLDGEN_REGISTRIES);
+                    RegistryDataLoader.WORLDGEN_REGISTRIES, Runnable::run).join();
             registries = base.replaceFrom(RegistryLayer.WORLDGEN, worldgen).compositeAccess();
         }
     }
@@ -66,7 +66,8 @@ public class Native1201TestFlatTest {
                 new WorldGenSettings(settings.worldOptions, dimensions))
                 .getOrThrow(AssertionError::new).getAsJsonObject();
         assertEquals(42L, saved.get("seed").getAsLong());
-        assertFalse(saved.get("generate_features").getAsBoolean());
+        assertFalse(saved.has("generate_features"));
+        assertFalse(saved.get("generate_structures").getAsBoolean());
         assertFalse(saved.get("bonus_chest").getAsBoolean());
         JsonObject dimensionsTag = saved.getAsJsonObject("dimensions");
         assertEquals(3, dimensionsTag.entrySet().size());
diff --git a/test-rig/src/test/java/zone/moddev/mc/advantageworks/Native12111HelperContractTest.java b/test-rig/src/test/java/zone/moddev/mc/advantageworks/Native12111HelperContractTest.java
index 6fe6c3ba..b3ebaad8 100644
--- a/test-rig/src/test/java/zone/moddev/mc/advantageworks/Native12111HelperContractTest.java
+++ b/test-rig/src/test/java/zone/moddev/mc/advantageworks/Native12111HelperContractTest.java
@@ -24,7 +24,7 @@
 import org.junit.Test;
 
 public class Native12111HelperContractTest {
-    private static final String SHA = "EBFF575F4777A43C12255250B704C06FF700D5160AFCAFE7252508353CD430C4";
+    private static final String SHA = "C2407DA9E3785032E26FCFB739133B2F4DEA8F1B537AD81F8AC562E2A61A59E8";
 
     @BeforeClass public static void bootstrap() { SharedConstants.tryDetectVersion(); Bootstrap.bootStrap(); }
 
@@ -32,10 +32,10 @@ public class Native12111HelperContractTest {
         byte[] bytes = Native117StoppedEntitiesSnapshotV2.contract();
         assertEquals(SHA, Native117StoppedEntitiesSnapshotV2.sha(bytes));
         JsonObject control = JsonParser.parseString(new String(bytes, StandardCharsets.UTF_8)).getAsJsonObject();
-        assertEquals("native12111-leash-knot-nosave-v1", control.get("policy").getAsString());
+        assertEquals("native2612-leash-knot-nosave-v1", control.get("policy").getAsString());
         assertEquals(SharedConstants.getCurrentVersion().name(), control.get("minecraftVersion").getAsString());
         assertEquals(SharedConstants.getCurrentVersion().dataVersion().version(), control.get("dataVersion").getAsInt());
-        assertEquals("61.1.0", control.get("forgeVersion").getAsString());
+        assertEquals("64.1.5", control.get("forgeVersion").getAsString());
         for (String key : List.of("noPower", "powerAccessTransformerAbsent", "noHarness", "noServer", "noTicks", "nativeMethodsUnmodified",
                 "observationalUuidPreserved", "observationalStateUnchanged", "refusedWritersLeaveNoPayload")) {
             assertTrue(key, control.get(key).getAsBoolean());
diff --git a/test-rig/src/test/java/zone/moddev/mc/advantageworks/Native12111ProgressionProbeTest.java b/test-rig/src/test/java/zone/moddev/mc/advantageworks/Native12111ProgressionProbeTest.java
index 1d53d0c8..40752b15 100644
--- a/test-rig/src/test/java/zone/moddev/mc/advantageworks/Native12111ProgressionProbeTest.java
+++ b/test-rig/src/test/java/zone/moddev/mc/advantageworks/Native12111ProgressionProbeTest.java
@@ -84,12 +84,14 @@ private static Recipe<SingleRecipeInput> specialRecipe() {
             @Override public boolean matches(SingleRecipeInput input, Level world) {
                 return input.item().is(Items.POTATO) && input.item().getCount() == 1;
             }
-            @Override public ItemStack assemble(SingleRecipeInput input, HolderLookup.Provider registries) {
+            @Override public ItemStack assemble(SingleRecipeInput input) {
                 return new ItemStack(Items.CARROT);
             }
-            @Override public RecipeSerializer<? extends Recipe<SingleRecipeInput>> getSerializer() { return RecipeSerializer.SMELTING_RECIPE; }
+            @Override public RecipeSerializer<? extends Recipe<SingleRecipeInput>> getSerializer() { return net.minecraft.world.item.crafting.SmeltingRecipe.SERIALIZER; }
             @Override public RecipeType<? extends Recipe<SingleRecipeInput>> getType() { return RecipeType.SMELTING; }
             @Override public boolean isSpecial() { return true; }
+            @Override public boolean showNotification() { return false; }
+            @Override public String group() { return ""; }
             @Override public PlacementInfo placementInfo() { return PlacementInfo.NOT_PLACEABLE; }
             @Override public RecipeBookCategory recipeBookCategory() { return RecipeBookCategories.FURNACE_FOOD; }
         };
diff --git a/test-rig/src/test/java/zone/moddev/mc/advantageworks/Native12111RecipeBookProbeTest.java b/test-rig/src/test/java/zone/moddev/mc/advantageworks/Native12111RecipeBookProbeTest.java
index 0cc8a5c8..b4d55ac8 100644
--- a/test-rig/src/test/java/zone/moddev/mc/advantageworks/Native12111RecipeBookProbeTest.java
+++ b/test-rig/src/test/java/zone/moddev/mc/advantageworks/Native12111RecipeBookProbeTest.java
@@ -38,7 +38,7 @@ public class Native12111RecipeBookProbeTest {
     @Test public void nativeDisplayRetainsOutputCountAndIdentity() {
         ItemStack expected = new ItemStack(Items.CARROT, 3);
         assertTrue(ItemStack.matches(expected,
-                RecipeBookProbe.displayResult(display(new SlotDisplay.ItemStackSlotDisplay(expected)), CONTEXT)));
+                RecipeBookProbe.displayResult(display(new SlotDisplay.ItemStackSlotDisplay(net.minecraft.world.item.ItemStackTemplate.fromNonEmptyStack(expected))), CONTEXT)));
     }
 
     @Test public void emptyDisplayFailsClosed() {
@@ -52,7 +52,7 @@ public class Native12111RecipeBookProbeTest {
     }
 
     @Test public void nativeBookPacketRoundTripsDisplayIdsGroupsAndIngredients() {
-        RecipeDisplayEntry expected = display(new SlotDisplay.ItemStackSlotDisplay(new ItemStack(Items.CARROT, 3)));
+        RecipeDisplayEntry expected = display(new SlotDisplay.ItemStackSlotDisplay(new net.minecraft.world.item.ItemStackTemplate(Items.CARROT, 3)));
         var entries = List.of(new ClientboundRecipeBookAddPacket.Entry(expected, false, false));
         RegistryFriendlyByteBuf buffer = new RegistryFriendlyByteBuf(Unpooled.buffer(),
                 RegistryAccess.fromRegistryOfRegistries(BuiltInRegistries.REGISTRY));
diff --git a/test-rig/src/test/java/zone/moddev/mc/advantageworks/runner/Native2612ProfileTest.java b/test-rig/src/test/java/zone/moddev/mc/advantageworks/runner/Native2612ProfileTest.java
new file mode 100644
index 00000000..2d73acb0
--- /dev/null
+++ b/test-rig/src/test/java/zone/moddev/mc/advantageworks/runner/Native2612ProfileTest.java
@@ -0,0 +1,86 @@
+package zone.moddev.mc.advantageworks.runner;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonArray;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Map;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import static org.junit.Assert.*;
+
+public class Native2612ProfileTest {
+    @Rule public TemporaryFolder temporary = new TemporaryFolder();
+
+    private JsonObject profile() {
+        JsonObject result = new Gson().fromJson("{\"name\":\"native2612-test\",\"mode\":\"packaged\","
+                + "\"minecraftVersion\":\"26.1.2\",\"runtimeBase\":\"build/works-native2612\","
+                + "\"portStatus\":\"PORTED_UNQUALIFIED\",\"qualificationStatus\":\"EXPLORATORY_UNQUALIFIED\","
+                + "\"forge\":{\"version\":\"26.1.2-64.1.5\"}}", JsonObject.class);
+        JsonArray mods = new JsonArray();
+        result.add("mods", mods);
+        for (var entry : Map.of("basepower", "2.4.16.2601021", "advantageworkstest", "1.1.6.2601021",
+                "basemetals", "3.1.2.2601021", "orespawn", "4.1.1.2601021").entrySet()) {
+            JsonObject input = new JsonObject();
+            input.addProperty("id", entry.getKey());
+            input.addProperty("version", entry.getValue());
+            input.addProperty("file", entry.getKey() + "-" + entry.getValue() + ".jar");
+            mods.add(input);
+        }
+        return result;
+    }
+
+    private Path save(JsonObject profile) throws Exception {
+        Path path = temporary.newFile().toPath();
+        Files.writeString(path, new Gson().toJson(profile));
+        return path;
+    }
+
+    @Test public void routesExplicit26ProfileWithoutCoercingHistoricalProfile() throws Exception {
+        WorksRunner.Profile actual = WorksRunner.readRunnerProfile(save(profile()).toFile());
+        assertEquals("26.1.2", actual.minecraftVersion);
+        assertEquals("build/works-native2612", actual.runtimeBase);
+        assertTrue(WorksRunner.serverLauncherPath(actual).contains("26.1.2-64.1.5"));
+        var old = profile();
+        old.addProperty("minecraftVersion", "1.21.11");
+        assertThrows(IllegalArgumentException.class, () -> WorksRunner.readNative2612Profile(save(old).toFile()));
+    }
+
+    @Test public void selectedForgeAndIsolatedOutputCannotDrift() throws Exception {
+        var wrongForge = profile();
+        wrongForge.getAsJsonObject("forge").addProperty("version", "26.1.2-64.0.9");
+        assertThrows(IllegalArgumentException.class, () -> WorksRunner.readNative2612Profile(save(wrongForge).toFile()));
+        var oldOutput = profile();
+        oldOutput.addProperty("runtimeBase", "build/works-native12111");
+        assertThrows(IllegalArgumentException.class, () -> WorksRunner.readNative2612Profile(save(oldOutput).toFile()));
+    }
+
+    @Test public void missingMandatoryBaseMetalsCannotBeAPowerOnlyPass() throws Exception {
+        var missing = profile();
+        var mods = missing.getAsJsonArray("mods");
+        for (int index = mods.size() - 1; index >= 0; index--) {
+            if (mods.get(index).getAsJsonObject().get("id").getAsString().equals("basemetals")) mods.remove(index);
+        }
+        assertThrows(IllegalArgumentException.class, () -> WorksRunner.readNative2612Profile(save(missing).toFile()));
+    }
+
+    @Test public void inheritedJvmOptionsAndClasspathAreRejected() {
+        WorksRunner.requireNative2612Environment(Map.of());
+        for (String key : new String[] {"JAVA_TOOL_OPTIONS", "JDK_JAVA_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH"}) {
+            assertThrows(key, IllegalArgumentException.class,
+                    () -> WorksRunner.requireNative2612Environment(Map.of(key, "injected")));
+        }
+    }
+
+    @Test public void alteredLoggingSourceIsNotSilentlyAdapted() throws Exception {
+        Path runtime = temporary.newFolder().toPath();
+        Path jar = temporary.newFile("altered-loader.jar").toPath();
+        Files.write(jar, new byte[] {1, 2, 3});
+        assertThrows(IllegalArgumentException.class,
+                () -> WorksRunner.native2612LoggingConfiguration(runtime.toFile(), jar.toFile()));
+        assertFalse(Files.exists(runtime.resolve("forge64-log4j2-plain-stacktraces.xml")));
+        assertFalse(Files.exists(runtime.resolve("forge64-logging-custody.json")));
+    }
+}
diff --git a/test-rig/unit-bootstrap/ForgeCapabilityBootstrap.java b/test-rig/unit-bootstrap/ForgeCapabilityBootstrap.java
index facfff1a..d2f030b1 100644
--- a/test-rig/unit-bootstrap/ForgeCapabilityBootstrap.java
+++ b/test-rig/unit-bootstrap/ForgeCapabilityBootstrap.java
@@ -2,48 +2,38 @@
 
 import java.lang.instrument.ClassFileTransformer;
 import java.lang.instrument.Instrumentation;
-import java.lang.reflect.Proxy;
 import java.security.ProtectionDomain;
-import java.util.List;
-import java.util.Optional;
 
-/** Runs Forge's capability-token transform and an empty loader for plain JUnit. */
+/** Runs Forge's capability-token transform and native empty discovery for plain JUnit. */
 public final class ForgeCapabilityBootstrap {
-    private static final String MOD_LOADER = "net/minecraftforge/fml/ModLoader";
-    private static final String AGENT = "zone/moddev/mc/advantageworks/unit/ForgeCapabilityBootstrap";
 
     public static void premain(String options, Instrumentation instrumentation) {
         instrumentation.addTransformer(new ClassFileTransformer() {
             @Override public byte[] transform(ClassLoader loader, String name, Class<?> type,
                     ProtectionDomain domain, byte[] bytes) {
                 if (loader == null || name == null) return null;
-                boolean modLoader = MOD_LOADER.equals(name);
                 String token = "net/minecraftforge/common/capabilities/CapabilityToken";
-                if (!modLoader && !(name.contains("$") || name.equals(token))) return null;
-                if (!modLoader && !token.equals(name)
+                if (!(name.contains("$") || name.equals(token))) return null;
+                if (!token.equals(name)
                         && loader.getResource("org/objectweb/asm/ClassReader.class") == null) return null;
                 try {
                     Class<?> readerType = Class.forName("org.objectweb.asm.ClassReader", true, loader);
                     Object reader = readerType.getConstructor(byte[].class).newInstance((Object)bytes);
                     String parent = (String)readerType.getMethod("getSuperName").invoke(reader);
-                    if (!modLoader && !token.equals(name) && !token.equals(parent)) return null;
+                    if (!token.equals(name) && !token.equals(parent)) return null;
                     Class<?> nodeType = Class.forName("org.objectweb.asm.tree.ClassNode", true, loader);
                     Object node = nodeType.getConstructor().newInstance();
                     Class<?> visitorType = Class.forName("org.objectweb.asm.ClassVisitor", true, loader);
                     readerType.getMethod("accept", visitorType, int.class).invoke(reader, node, 0);
                     Class<?> asmType = Class.forName("org.objectweb.asm.Type", true, loader);
                     Object asmName = asmType.getMethod("getObjectType", String.class).invoke(null, name);
-                    if (modLoader) {
-                        addLoaderFixture(loader, nodeType, node, asmName);
-                    } else {
-                        Class<?> phaseType = Class.forName(
+                    Class<?> phaseType = Class.forName(
                                 "cpw.mods.modlauncher.serviceapi.ILaunchPluginService$Phase", true, loader);
                         Object phase = phaseType.getField("BEFORE").get(null);
                         Class<?> pluginType = Class.forName(
                                 "net.minecraftforge.fml.common.asm.CapabilityTokenSubclass", true, loader);
                         pluginType.getMethod("processClassWithFlags", phaseType, nodeType, asmType, String.class)
                                 .invoke(pluginType.getConstructor().newInstance(), phase, node, asmName, "junit");
-                    }
                     Class<?> writerType = Class.forName("org.objectweb.asm.ClassWriter", true, loader);
                     Object writer = writerType.getConstructor(int.class).newInstance(1);
                     nodeType.getMethod("accept", visitorType).invoke(node, writer);
@@ -54,73 +44,11 @@ public static void premain(String options, Instrumentation instrumentation) {
                 }
             }
         });
-    }
-
-    private static void addLoaderFixture(ClassLoader loader, Class<?> nodeType, Object node, Object asmName)
-            throws ReflectiveOperationException {
-        Class<?> insn = Class.forName("org.objectweb.asm.tree.AbstractInsnNode", true, loader);
-        Class<?> list = Class.forName("org.objectweb.asm.tree.InsnList", true, loader);
-        Class<?> ldc = Class.forName("org.objectweb.asm.tree.LdcInsnNode", true, loader);
-        Class<?> var = Class.forName("org.objectweb.asm.tree.VarInsnNode", true, loader);
-        Class<?> method = Class.forName("org.objectweb.asm.tree.MethodInsnNode", true, loader);
-        for (Object ctor : (List<?>) nodeType.getField("methods").get(node)) {
-            Class<?> type = ctor.getClass();
-            if (!"<init>".equals(type.getField("name").get(ctor)) || !"()V".equals(type.getField("desc").get(ctor))) continue;
-            Object instructions = type.getField("instructions").get(ctor);
-            Object entry = list.getConstructor().newInstance();
-            var add = list.getMethod("add", insn);
-            var call = method.getConstructor(int.class, String.class, String.class, String.class, boolean.class);
-            add.invoke(entry, ldc.getConstructor(Object.class).newInstance(asmName));
-            add.invoke(entry, call.newInstance(184, AGENT, "beforeModLoader", "(Ljava/lang/Class;)V", false));
-            for (Object instruction : (Object[]) list.getMethod("toArray").invoke(instructions)) {
-                if ((int) insn.getMethod("getOpcode").invoke(instruction) != 177) continue; // RETURN
-                Object exit = list.getConstructor().newInstance();
-                add.invoke(exit, var.getConstructor(int.class, int.class).newInstance(25, 0)); // ALOAD 0
-                add.invoke(exit, call.newInstance(184, AGENT, "afterModLoader", "(Ljava/lang/Object;)V", false));
-                list.getMethod("insertBefore", insn, list).invoke(instructions, instruction, exit);
-            }
-            list.getMethod("insert", list).invoke(instructions, entry);
-            return;
+        try {
+            Class.forName("zone.moddev.mc.advantageworks.unit.Forge64UnitLoader")
+                    .getMethod("initialize").invoke(null);
+        } catch (ReflectiveOperationException failure) {
+            throw new IllegalStateException("Cannot initialize native Forge 64 JUnit discovery", failure);
         }
-        throw new NoSuchMethodException("Forge 61 ModLoader()");
-    }
-
-    public static void beforeModLoader(Class<?> owner) throws ReflectiveOperationException {
-        ClassLoader loader = owner.getClassLoader();
-        Class<?> fml = Class.forName("net.minecraftforge.fml.loading.FMLLoader", true, loader);
-        if (fml.getMethod("getLoadingModList").invoke(null) != null) {
-            throw new IllegalStateException("The JUnit agent must not run inside a real Forge launch");
-        }
-        Class<?> loading = Class.forName("net.minecraftforge.fml.loading.LoadingModList", true, loader);
-        Class<?> earlyError = Class.forName("net.minecraftforge.fml.loading.EarlyLoadingException", true, loader);
-        Object emptyDiscovery = loading.getMethod("of", List.class, List.class, earlyError)
-                .invoke(null, List.of(), List.of(), null);
-        loading.getMethod("setBrokenFiles", List.class).invoke(emptyDiscovery, List.of());
-        var listField = fml.getDeclaredField("loadingModList");
-        listField.setAccessible(true);
-        listField.set(null, emptyDiscovery);
-        Class<?> layers = Class.forName("cpw.mods.modlauncher.api.IModuleLayerManager", true, loader);
-        Object classpathLayers = Proxy.newProxyInstance(loader, new Class<?>[] {layers}, (proxy, method, args) -> {
-            if (method.getName().equals("getLayer")) return Optional.of(ModuleLayer.boot());
-            throw new UnsupportedOperationException(method.toString());
-        });
-        var layerField = fml.getDeclaredField("moduleLayerManager");
-        layerField.setAccessible(true);
-        layerField.set(null, classpathLayers);
-    }
-
-    public static void afterModLoader(Object loader) throws ReflectiveOperationException {
-        Class<?> owner = loader.getClass();
-        Class<?> mods = Class.forName("net.minecraftforge.fml.ModList", true, owner.getClassLoader());
-        Object emptyMods = mods.getMethod("of", List.class, List.class).invoke(null, List.of(), List.of());
-        var setLoaded = mods.getDeclaredMethod("setLoadedMods", List.class);
-        setLoaded.setAccessible(true);
-        setLoaded.invoke(emptyMods, List.of());
-        var modList = owner.getDeclaredField("modList");
-        modList.setAccessible(true);
-        modList.set(loader, emptyMods);
-        var valid = owner.getDeclaredField("loadingStateValid");
-        valid.setAccessible(true);
-        valid.setBoolean(loader, true);
     }
 }
diff --git a/test-rig/unit-support/zone/moddev/mc/advantageworks/unit/Forge61UnitControl.java b/test-rig/unit-support/zone/moddev/mc/advantageworks/unit/Forge61UnitControl.java
index 4448becd..7d2eff0b 100644
--- a/test-rig/unit-support/zone/moddev/mc/advantageworks/unit/Forge61UnitControl.java
+++ b/test-rig/unit-support/zone/moddev/mc/advantageworks/unit/Forge61UnitControl.java
@@ -13,16 +13,16 @@
 /** Proves the test-only fixture reaches Forge's native item, registry, and capability paths. */
 public final class Forge61UnitControl {
     public static void main(String[] args) throws Exception {
-        net.minecraftforge.fml.ModLoader.get();
+        net.minecraftforge.fml.ModList.init();
         SharedConstants.tryDetectVersion();
         Bootstrap.bootStrap();
         if (new ItemStack(Items.DIRT, 16).get(DataComponents.MAX_STACK_SIZE) != 64)
             throw new AssertionError("Native item component gathering did not complete");
         if (!net.minecraftforge.fml.ModLoader.isLoadingStateValid())
             throw new AssertionError("The native unit loader is invalid");
-        if (net.minecraftforge.fml.ModList.get().size() != 0)
+        if (net.minecraftforge.fml.ModList.size() != 0)
             throw new AssertionError("The native unit loader contains mods: "
-                    + net.minecraftforge.fml.ModList.get().size());
+                    + net.minecraftforge.fml.ModList.size());
         for (int run = 0; run < 2; run++) {
             ForgeUnitRegistries.registerVanillaFluidTypes();
             ForgeUnitRegistries.registerForgeEntries("ATTRIBUTES", ForgeRegistries.Keys.ATTRIBUTES, ForgeRegistries.ATTRIBUTES);
@@ -35,6 +35,6 @@ public static void main(String[] args) throws Exception {
                 || (Object) ForgeCapabilities.FLUID_HANDLER == ForgeCapabilities.ITEM_HANDLER) {
             throw new AssertionError("Native Forge capability tokens were not transformed");
         }
-        System.out.println("Forge 61 plain-JUnit bootstrap control PASS");
+        System.out.println("Forge 64 plain-JUnit bootstrap control PASS");
     }
 }
diff --git a/test-rig/unit-support/zone/moddev/mc/advantageworks/unit/Forge64UnitLoader.java b/test-rig/unit-support/zone/moddev/mc/advantageworks/unit/Forge64UnitLoader.java
new file mode 100644
index 00000000..84744c03
--- /dev/null
+++ b/test-rig/unit-support/zone/moddev/mc/advantageworks/unit/Forge64UnitLoader.java
@@ -0,0 +1,75 @@
+package zone.moddev.mc.advantageworks.unit;
+
+import java.util.List;
+import net.minecraftforge.fml.ModList;
+import net.minecraftforge.fml.ModLoader;
+import net.minecraftforge.fml.loading.FMLLoader;
+import net.minecraftforge.fml.loading.LoadingModList;
+
+/** Native empty discovery for plain JUnit only, never a substitute for a Forge game launch. */
+public final class Forge64UnitLoader {
+    private static boolean initialized;
+
+    private Forge64UnitLoader() {}
+
+    public static synchronized void initialize() {
+        if (initialized) return;
+        if (FMLLoader.getGamePath() != null)
+            throw new IllegalStateException("JUnit discovery must not run inside a Forge launch");
+        initializeEmptyDiscovery();
+        if (!LoadingModList.getMods().isEmpty() || !LoadingModList.getErrors().isEmpty()
+                || !LoadingModList.getBrokenFiles().isEmpty())
+            throw new IllegalStateException("Native JUnit discovery is not an empty successful result");
+        initializeEmptyDispatch();
+        if (!ModLoader.isLoadingStateValid() || ModList.size() != 0
+                || !ModList.getMods().isEmpty() || !ModList.getModFiles().isEmpty())
+            throw new IllegalStateException("Native JUnit loader did not initialize an empty mod list");
+        net.minecraft.SharedConstants.tryDetectVersion();
+        net.minecraft.server.Bootstrap.bootStrap();
+        net.minecraft.core.registries.BuiltInRegistries.DATA_COMPONENT_INITIALIZERS
+                .build(net.minecraft.data.registries.VanillaRegistries.createLookup())
+                .forEach(net.minecraft.core.component.DataComponentInitializers.PendingComponents::apply);
+        initialized = true;
+    }
+
+    private static void initializeEmptyDispatch() {
+        try {
+            if (ModLoader.isLoadingStateValid() || FMLLoader.backgroundScanHandler != null)
+                throw new IllegalStateException("JUnit discovery found an active mod loader");
+            var setLoaded = ModList.class.getDeclaredMethod("setLoadedMods", List.class);
+            setLoaded.setAccessible(true);
+            setLoaded.invoke(null, List.of());
+            // Preserve the old worldless fixture's empty event-dispatch readiness. Running
+            // gatherAndInitializeMods here would falsely require a ModLauncher game layer.
+            var valid = ModLoader.class.getDeclaredField("loadingStateValid");
+            valid.setAccessible(true);
+            valid.setBoolean(null, true);
+        } catch (ReflectiveOperationException failure) {
+            throw new IllegalStateException("Cannot initialize empty JUnit event dispatch", failure);
+        }
+    }
+
+    private static void initializeEmptyDiscovery() {
+        try {
+            // Only worldless JUnit bypasses system-mod sorting. ModList still reads Forge's
+            // own discovery record; no production mods or successful game launch are claimed.
+            Class<?> stateType = Class.forName("net.minecraftforge.fml.loading.ModSorter$State");
+            var constructor = stateType.getDeclaredConstructor(List.class, List.class);
+            constructor.setAccessible(true);
+            Object state = constructor.newInstance(List.of(), List.of());
+            Class<?> discovery = Class.forName("net.minecraftforge.fml.loading.LoadingModListImpl");
+            var temporaryState = discovery.getDeclaredField("temp");
+            temporaryState.setAccessible(true);
+            if (temporaryState.get(null) != null)
+                throw new IllegalStateException("Native mod discovery is already initializing");
+            temporaryState.set(null, state);
+            try {
+                ModList.init();
+            } finally {
+                temporaryState.set(null, null);
+            }
+        } catch (ReflectiveOperationException failure) {
+            throw new IllegalStateException("Cannot initialize native empty JUnit discovery", failure);
+        }
+    }
+}
diff --git a/tools/verification/EclipseTestInventory.java b/tools/verification/EclipseTestInventory.java
new file mode 100644
index 00000000..4ff47cf8
--- /dev/null
+++ b/tools/verification/EclipseTestInventory.java
@@ -0,0 +1,53 @@
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Set;
+import java.util.TreeSet;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.AnnotationNode;
+import org.objectweb.asm.tree.ClassNode;
+
+/** Rejects a filtered Gradle result before calling it a complete independent compiler test. */
+public final class EclipseTestInventory {
+    public static void main(String[] args) throws Exception {
+        if (args.length != 3) throw new IllegalArgumentException("classes, inventory file, expected test count");
+        Set<String> declared = new TreeSet<>(Files.readAllLines(Path.of(args[1]), StandardCharsets.UTF_8));
+        if (declared.isEmpty() || declared.contains("")) throw new AssertionError("Empty Gradle test inventory");
+        Set<String> compiled = new TreeSet<>();
+        int tests = 0;
+        try (var paths = Files.walk(Path.of(args[0]))) {
+            for (Path file : paths.filter(path -> path.toString().endsWith(".class")).toList()) {
+                ClassNode type = new ClassNode();
+                new ClassReader(Files.readAllBytes(file)).accept(type,
+                        ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
+                if (has(type.visibleAnnotations, "Lorg/junit/runner/RunWith;")
+                        || "junit/framework/TestCase".equals(type.superName)) {
+                    throw new AssertionError("Review custom JUnit discovery before qualification: " + type.name);
+                }
+                int methods = (int) type.methods.stream()
+                        .filter(method -> has(method.visibleAnnotations, "Lorg/junit/Test;")).count();
+                if (methods == 0) continue;
+                if (type.name.contains("$") || (type.access & (Opcodes.ACC_ABSTRACT | Opcodes.ACC_INTERFACE)) != 0
+                        || !"java/lang/Object".equals(type.superName)) {
+                    throw new AssertionError("Review nested or inherited JUnit discovery: " + type.name);
+                }
+                compiled.add(type.name.replace('/', '.'));
+                tests += methods;
+            }
+        }
+        if (!compiled.equals(declared) || tests != Integer.parseInt(args[2])) {
+            Set<String> omitted = new TreeSet<>(compiled);
+            omitted.removeAll(declared);
+            Set<String> stale = new TreeSet<>(declared);
+            stale.removeAll(compiled);
+            throw new AssertionError("Incomplete or stale Gradle inventory: omitted=" + omitted + ", stale="
+                    + stale + ", compiled tests=" + tests + ", declared tests=" + args[2]);
+        }
+        System.out.println("PASS: complete compiled JUnit inventory; " + compiled.size() + " suites, " + tests + " tests");
+    }
+
+    private static boolean has(java.util.List<AnnotationNode> annotations, String descriptor) {
+        return annotations != null && annotations.stream().anyMatch(annotation -> descriptor.equals(annotation.desc));
+    }
+}
diff --git a/tools/verification/Verify-NativeEclipse.ps1 b/tools/verification/Verify-NativeEclipse.ps1
index a9853b47..9bd81fe6 100644
--- a/tools/verification/Verify-NativeEclipse.ps1
+++ b/tools/verification/Verify-NativeEclipse.ps1
@@ -9,8 +9,12 @@ Set-StrictMode -Version Latest
 $ProjectRoot = (Resolve-Path -LiteralPath $ProjectRoot).Path
 $Evidence = [IO.Path]::GetFullPath($Evidence)
 if (Test-Path -LiteralPath $Evidence) { throw 'Refusing to replace Eclipse evidence' }
-if ((Get-Content -LiteralPath (Join-Path $JavaHome 'release') -Raw) -notmatch '(?m)^JAVA_VERSION="21(?:\.|\+|")') {
-    throw 'The native Eclipse build requires Java 21'
+if ((Get-Content -LiteralPath (Join-Path $JavaHome 'release') -Raw) -notmatch '(?m)^IMPLEMENTOR_VERSION="Temurin-25\.0\.3\+9"') {
+    throw 'The native Eclipse build requires Temurin 25.0.3+9'
+}
+if ((Get-FileHash -LiteralPath $Compiler -Algorithm SHA256).Hash -cne
+        'D0D43F8E2D7003E5EFED612E2CBB5F01870043397D8F1BBE536FD9128F4FCBF7') {
+    throw 'The Eclipse compiler must match the pinned ECJ 3.46.0 binary'
 }
 $null = New-Item -ItemType Directory -Path $Evidence
 $java = Join-Path $JavaHome 'bin/java.exe'
@@ -47,7 +51,7 @@ try {
         $null = New-Item -ItemType Directory -Path $output
         $outputs[$scope] = $output
         if ($scope -eq 'test') { $libraries += @($outputs.main, (Join-Path $ProjectRoot 'build/resources/main')) }
-        $arguments = @('-21','-proc:none','-encoding','UTF-8','-warn:none','-classpath',
+        $arguments = @('-25','-proc:none','-encoding','UTF-8','-warn:none','-classpath',
             ('"' + ($libraries -join ';') + '"'), '-d', ('"' + $output + '"'))
         $arguments += @($sources | Sort-Object FullName | ForEach-Object { '"' + $_.FullName + '"' })
         $argFile = Join-Path $Evidence "$scope.args"
@@ -60,7 +64,7 @@ try {
         if (-not $classes.Count) { throw "No Eclipse $scope classes" }
         foreach ($file in $classes) {
             $bytes = [IO.File]::ReadAllBytes($file.FullName)
-            if ($bytes[6] * 256 + $bytes[7] -ne 65) { throw "Non-Java-21 class: $file" }
+            if ($bytes[6] * 256 + $bytes[7] -ne 69) { throw "Non-Java-25 class: $file" }
         }
         $report.compilations[$scope].classes = $classes.Count
     }
@@ -78,6 +82,13 @@ try {
     $runtime = @($outputs.test, $outputs.main, (Join-Path $ProjectRoot 'build/resources/main'),
             (Join-Path $ProjectRoot 'build/resources/test')) + $libraries
     $runtimeClasspath = $runtime -join ';'
+    $inventoryFile = Join-Path $Evidence 'gradle-test-inventory.txt'
+    [IO.File]::WriteAllLines($inventoryFile, ($inventory | Sort-Object -Unique), [Text.UTF8Encoding]::new($false))
+    $inventoryValidator = Join-Path $PSScriptRoot 'EclipseTestInventory.java'
+    $inventoryLog = Join-Path $Evidence 'inventory-validation.log'
+    & $java -cp $runtimeClasspath $inventoryValidator $outputs.test $inventoryFile $expected *> $inventoryLog
+    if ($LASTEXITCODE -ne 0) { throw 'Gradle results are filtered, stale or incomplete; inspect inventory-validation.log' }
+    $report['inventoryValidatorSha256'] = (Get-FileHash -LiteralPath $inventoryValidator -Algorithm SHA256).Hash
     $bootstrap = Join-Path $ProjectRoot 'build/unit-bootstrap/forge-native-unit-bootstrap.jar'
     if (-not (Test-Path -LiteralPath $bootstrap -PathType Leaf)) { throw 'Missing native unit bootstrap' }
     $testArgs = @('-Xmx2G', ('"-javaagent:' + $bootstrap.Replace('\', '/') + '"'),