Replace Modern UI Pack texture reference in Running Game prefab

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Remove unused Modern UI Pack asset package
2026-07-29 01:35:42 +00:00 · 2026-04-03 08:28:28 -07:00 · 2026-04-03 07:29:31 -07:00 · 2026-04-03 07:25:17 -07:00 · 2026-04-03 07:03:45 -07:00 · 2026-04-02 22:03:13 -07:00
7544 changed files with 644860 additions and 728342 deletions
@@ -5,6 +5,10 @@ common --ui_event_filters=-INFO

 common --enable_bzlmod

+# Use pre-built protoc binary instead of compiling from source
+common --incompatible_enable_proto_toolchain_resolution
+common --@com_google_protobuf//bazel/toolchains:prefer_prebuilt_protoc=true
+
 # Don't use toolchains_llvm for the swift app build
 common:mactools --ignore_dev_dependency

@@ -33,9 +37,14 @@ common:macos --host_linkopt=-Wl,-no_warn_duplicate_libraries
 # See: https://github.com/grpc/grpc/issues/37619
 common:macos --features=-module_maps

-# Fix Xcode version caching issue - avoids need for `bazel clean --expunge` after Xcode updates
+# Pin DEVELOPER_DIR so the apple_cc_autoconf repo rule doesn't re-evaluate
+# when Xcode updates in-place. The sync script overrides this for mactools.
 common:macos --repo_env=DEVELOPER_DIR=/Applications/Xcode.app/Contents/Developer

+# Xcode config for mactools builds only. Generated by scripts/sync_bazel_xcode.sh.
+# Bakes the Xcode build version into action cache keys and sets DEVELOPER_DIR.
+try-import %workspace%/.bazelrc.xcode
+
 common --java_language_version=25
 common --java_runtime_version=remotejdk_25
 common --tool_java_language_version=25
@@ -5,12 +5,26 @@
 *.tif filter=lfs diff=lfs merge=lfs -text
 *.bytes filter=lfs diff=lfs merge=lfs -text
 *.psd filter=lfs diff=lfs merge=lfs -text
+*.psb filter=lfs diff=lfs merge=lfs -text
+# PSB meta files contain bone/sprite import data and can be very large
+*.psb.meta filter=lfs diff=lfs merge=lfs -text
 *.ttf filter=lfs diff=lfs merge=lfs -text
 # Exclude pre-existing font files that were committed as blobs (not LFS pointers)
 src/main/csharp/**/GUI[[:space:]]Pro[[:space:]]Kit*/**/*.ttf !filter !diff !merge
 src/main/csharp/**/Modern[[:space:]]UI[[:space:]]Pack/**/*.ttf !filter !diff !merge
 *.herodata filter=lfs diff=lfs merge=lfs -text
 *.ogg filter=lfs diff=lfs merge=lfs -text
+*.tga filter=lfs diff=lfs merge=lfs -text
+*.fbx filter=lfs diff=lfs merge=lfs -text
+*.FBX filter=lfs diff=lfs merge=lfs -text
+*.pdf filter=lfs diff=lfs merge=lfs -text
+# Third-party asset packs: track all files via LFS (never manually edited)
+src/main/csharp/**/DungeonMonsters2D/** filter=lfs diff=lfs merge=lfs -text
+src/main/csharp/**/Raccoon/** filter=lfs diff=lfs merge=lfs -text
+src/main/csharp/**/Polytope[[:space:]]Studio/** filter=lfs diff=lfs merge=lfs -text
+src/main/csharp/**/RRFreelance-Characters/** filter=lfs diff=lfs merge=lfs -text
+src/main/csharp/**/Dragon/** filter=lfs diff=lfs merge=lfs -text
+*.jpg filter=lfs diff=lfs merge=lfs -text

 # Unity Smart Merge - use UnityYAMLMerge for Unity files
 # Requires configuring unityyamlmerge in ~/.gitconfig:
@@ -7,7 +7,39 @@ on:
  workflow_dispatch:

 jobs:
+  cleanup-expired:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Delete artifacts older than 3 days
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          echo "Fetching all artifacts..."
+          gh api "repos/${{ github.repository }}/actions/artifacts" \
+            --paginate -q '.artifacts[] | "\(.id)\t\(.created_at)\t\(.name)"' > /tmp/all_artifacts.txt
+
+          total=$(wc -l < /tmp/all_artifacts.txt)
+          echo "Found $total total artifacts"
+
+          cutoff=$(date -u -d '3 days ago' '+%Y-%m-%dT%H:%M:%SZ')
+          echo "Deleting artifacts created before $cutoff"
+
+          deleted=0
+          while IFS=$'\t' read -r id created_at name; do
+            if [[ "$created_at" < "$cutoff" ]]; then
+              gh api -X DELETE "repos/${{ github.repository }}/actions/artifacts/$id" 2>/dev/null && deleted=$((deleted + 1))
+              if [ $((deleted % 50)) -eq 0 ]; then
+                echo "Deleted $deleted artifacts so far..."
+              fi
+            fi
+          done < /tmp/all_artifacts.txt
+
+          echo "Cleanup complete. Deleted $deleted expired artifacts out of $total total."
+          rm -f /tmp/all_artifacts.txt
+
  check-storage:
+    needs: cleanup-expired
    runs-on: ubuntu-latest

    steps:
@@ -31,7 +31,7 @@ jobs:
      image_tag: ${{ steps.push-auth.outputs.image_tag }}
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
        with:
          lfs: false

@@ -127,10 +127,10 @@ jobs:
      FASTMAIL_FROM_NAME: ${{ secrets.FASTMAIL_FROM_NAME }}
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6

      - name: Deploy auth service to production
-        uses: appleboy/ssh-action@v1.0.3
+        uses: appleboy/ssh-action@v1.2.5
        with:
          host: ${{ secrets.DO_DROPLET_IP }}
          username: deploy
@@ -12,7 +12,7 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
        with:
          lfs: false

@@ -34,18 +34,36 @@ jobs:
  lint:
    runs-on: [self-hosted, bazel]
    steps:
+    - name: Clean workspace
+      run: |
+        git sparse-checkout disable 2>/dev/null || true
+        git config --local core.sparseCheckout false 2>/dev/null || true
+        git config --local --unset extensions.worktreeConfig 2>/dev/null || true
+        rm -f .git/info/sparse-checkout .git/config.worktree 2>/dev/null || true
    - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
      with:
        lfs: false
    - name: Check BUILD.bazel dependencies
      run: ./scripts/check_build_deps.sh --strict
+    - name: Set up Node.js
+      uses: actions/setup-node@v6
+      with:
+        node-version: 'lts/*'
+    - name: Check JavaScript syntax
+      run: node --check src/main/go/net/eagle0/admin_server/static/map_editor.js

  test:
    runs-on: [self-hosted, bazel]
    steps:
+    - name: Clean workspace
+      run: |
+        git sparse-checkout disable 2>/dev/null || true
+        git config --local core.sparseCheckout false 2>/dev/null || true
+        git config --local --unset extensions.worktreeConfig 2>/dev/null || true
+        rm -f .git/info/sparse-checkout .git/config.worktree 2>/dev/null || true
    - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
      with:
        lfs: false
    - name: Run tests
@@ -84,16 +102,16 @@ jobs:
        ls -lh failed_test_logs/ 2>/dev/null || echo "No logs collected"
    - name: Archive test results
      if: always()
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
      with:
        name: test.json
        path: test.json
-        retention-days: 5
+        retention-days: 3
    - name: Archive failed test logs
      if: always()
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
      with:
        name: failed-test-logs
        path: failed_test_logs/
        if-no-files-found: ignore
-        retention-days: 5
+        retention-days: 3
@@ -0,0 +1,27 @@
+name: Blob Cleanup
+
+on:
+  schedule:
+    # Run daily at 04:00 UTC
+    - cron: '0 4 * * *'
+  workflow_dispatch:  # Allow manual trigger
+
+permissions:
+  contents: read
+
+jobs:
+  cleanup:
+    runs-on: [self-hosted, bazel]
+
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          lfs: false
+          clean: false
+
+      - name: Clean up unreferenced blobs
+        env:
+          ACCESS_KEY_ID: ${{ secrets.ACCESS_KEY_ID }}
+          SECRET_KEY: ${{ secrets.SECRET_KEY }}
+        run: |
+          bazel run //src/main/go/net/eagle0/build/blob_cleanup:blob_cleanup -- --min-age=1h
@@ -27,13 +27,13 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6

      - name: Build sysroot
        run: ./tools/sysroot/build_sysroot.sh

      - name: Upload sysroot artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
        with:
          name: ubuntu-noble-sysroot-amd64
          path: tools/sysroot/output/
@@ -81,21 +81,21 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6

      - name: Set up QEMU for ARM64 emulation
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v4
        with:
          platforms: arm64

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4

      - name: Build ARM64 sysroot
        run: ./tools/sysroot/build_sysroot_arm64.sh

      - name: Upload sysroot artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
        with:
          name: ubuntu-noble-sysroot-arm64
          path: tools/sysroot/output/
@@ -31,13 +31,16 @@ on:
        default: 'false'
        type: boolean

-# Only allow one deployment at a time to prevent race conditions
+# Only allow one deployment at a time; queue new ones (never cancel a running deploy).
+# The build-all job checks if it's still the latest commit on main and skips if not,
+# so intermediate commits don't waste time building when a newer one is already queued.
 concurrency:
  group: docker-build-deploy
-  cancel-in-progress: false  # Don't cancel running deployments, queue new ones
+  cancel-in-progress: false

 permissions:
  contents: read
+  actions: write  # Required to delete artifacts after deploy

 jobs:
  # Single consolidated build job - builds all images with one bazel invocation
@@ -50,12 +53,33 @@ jobs:
      admin_image_tag: ${{ steps.push-images.outputs.admin_image_tag }}
      jfr_sidecar_image_tag: ${{ steps.push-images.outputs.jfr_sidecar_image_tag }}
    steps:
+      - name: Skip if superseded
+        id: check-latest
+        run: |
+          # Check if there's a newer run of this workflow waiting in the queue.
+          # If so, skip this build — the queued run will deploy a newer commit.
+          QUEUED=$(curl -s -H "Authorization: Bearer $GH_TOKEN" \
+            "https://api.github.com/repos/${{ github.repository }}/actions/workflows/docker_build.yml/runs?status=queued" \
+            | python3 -c "import sys,json; runs=json.load(sys.stdin).get('workflow_runs',[]); print(len([r for r in runs if r['run_number'] > ${{ github.run_number }}]))")
+          if [ "$QUEUED" -gt 0 ]; then
+            echo "::notice::Skipping build — $QUEUED newer run(s) queued for this workflow"
+            echo "skip=true" >> $GITHUB_OUTPUT
+          fi
+        env:
+          GH_TOKEN: ${{ github.token }}
+
      - name: Checkout repository
-        uses: actions/checkout@v4
+        if: steps.check-latest.outputs.skip != 'true'
+        uses: actions/checkout@v6
        with:
          lfs: false

+      - name: Fetch LFS files needed for admin server
+        if: steps.check-latest.outputs.skip != 'true'
+        run: ./ci/github_actions/fetch_lfs.sh --include="src/main/go/net/eagle0/admin_server/static/tiles/*"
+
      - name: Build all Docker images
+        if: steps.check-latest.outputs.skip != 'true'
        id: build-all
        run: |
          set -ex
@@ -92,14 +116,15 @@ jobs:
          echo "JFR Sidecar: $JFR_PATH"

      - name: Upload warmup binary
-        uses: actions/upload-artifact@v4
+        if: steps.check-latest.outputs.skip != 'true'
+        uses: actions/upload-artifact@v7
        with:
          name: warmup-binary
          path: scripts/bin/warmup
          retention-days: 1

      - name: Login to DigitalOcean Container Registry
-        if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && github.event.inputs.push_images == 'true')
+        if: steps.check-latest.outputs.skip != 'true' && (github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && github.event.inputs.push_images == 'true'))
        env:
          DO_TOKEN: ${{ secrets.DO_REGISTRY_TOKEN }}
        run: |
@@ -217,16 +242,12 @@ jobs:
      DO_DROPLET_IP: ${{ secrets.DO_DROPLET_IP }}
      DO_REGISTRY_TOKEN: ${{ secrets.DO_REGISTRY_TOKEN }}
      NOTIFY_SECRET: ${{ secrets.EAGLE_NOTIFY_SECRET }}
+      GITHUB_TOKEN_FOR_ADMIN: ${{ secrets.ADMIN_GITHUB_TOKEN }}
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
        with:
          lfs: false
-          sparse-checkout: |
-            docker-compose.prod.yml
-            nginx
-            scripts
-          sparse-checkout-cone-mode: false

      - name: Setup SSH key
        run: |
@@ -236,7 +257,7 @@ jobs:
          ssh-keyscan -H "$DO_DROPLET_IP" >> ~/.ssh/known_hosts 2>/dev/null || true

      - name: Download warmup binary
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
        with:
          name: warmup-binary
          path: scripts/bin/
@@ -346,6 +367,7 @@ jobs:
          export FASTMAIL_FROM_NAME="${FASTMAIL_FROM_NAME}"
          export DO_REGISTRY_TOKEN="${DO_REGISTRY_TOKEN}"
          export NOTIFY_SECRET="${NOTIFY_SECRET}"
+          export GITHUB_TOKEN="${GITHUB_TOKEN_FOR_ADMIN}"

          # Check Docker has IPv6 support
          if ! cat /etc/docker/daemon.json 2>/dev/null | grep -q '"ip6tables"'; then
@@ -449,3 +471,19 @@ jobs:
          # Remove images older than 24h (keeps recent images for rollback)
          docker image prune -a -f --filter "until=24h" || true
          DEPLOY_SCRIPT
+
+  cleanup:
+    needs: [build-all, deploy]
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      - name: Delete warmup-binary artifact
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          ARTIFACT_ID=$(gh api "repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/artifacts" \
+            -q '.artifacts[] | select(.name == "warmup-binary") | .id')
+          if [ -n "$ARTIFACT_ID" ]; then
+            echo "Deleting warmup-binary artifact (ID: $ARTIFACT_ID)"
+            gh api -X DELETE "repos/${{ github.repository }}/actions/artifacts/$ARTIFACT_ID" || true
+          fi
@@ -26,7 +26,7 @@ jobs:

    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
        with:
          lfs: false
      - name: Build Eagle server
@@ -21,7 +21,7 @@ jobs:
    runs-on: [self-hosted, bazel]

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
        with:
          lfs: false
          clean: false
@@ -50,7 +50,7 @@ jobs:

      - name: Archive installer binary
        if: success() || failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
        with:
          name: eagle-installer
          path: ./installer-output/
@@ -112,14 +112,29 @@ jobs:
      - name: Delete all installer artifacts
        if: success() && github.ref == 'refs/heads/main' && github.event_name == 'push'
        env:
-          GH_TOKEN: ${{ github.token }}
+          GITHUB_TOKEN: ${{ github.token }}
        run: |
          # Delete ALL eagle-installer artifacts to free up storage
          echo "Fetching all eagle-installer artifacts..."
-          artifact_ids=$(gh api "repos/${{ github.repository }}/actions/artifacts" \
-            --paginate -q '.artifacts[] | select(.name == "eagle-installer") | .id')
-          for id in $artifact_ids; do
-            echo "Deleting artifact ID: $id"
-            gh api -X DELETE "repos/${{ github.repository }}/actions/artifacts/$id" || true
+          page=1
+          while true; do
+            response=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" \
+              "https://api.github.com/repos/${{ github.repository }}/actions/artifacts?per_page=100&page=$page")
+            ids=$(echo "$response" | python3 -c "
+          import json, sys
+          data = json.load(sys.stdin)
+          for a in data.get('artifacts', []):
+              if a['name'] == 'eagle-installer':
+                  print(a['id'])
+          " 2>/dev/null)
+            if [ -z "$ids" ]; then
+              break
+            fi
+            for id in $ids; do
+              echo "Deleting artifact ID: $id"
+              curl -s -X DELETE -H "Authorization: Bearer $GITHUB_TOKEN" \
+                "https://api.github.com/repos/${{ github.repository }}/actions/artifacts/$id" || true
+            done
+            page=$((page + 1))
          done
          echo "Cleanup complete"
@@ -1,98 +0,0 @@
-name: iOS Addressables Build
-
-on:
-  push:
-    branches: [ "main" ]
-    paths:
-      - ".github/workflows/ios_addressables_build.yml"
-      - "src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/AddressableAssetsData/**"
-      - "src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/Music/**"
-      - "src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/Editor/BuildScript.cs"
-      - "ci/github_actions/build_ios_addressables.sh"
-      - "ci/github_actions/upload_addressables.sh"
-  pull_request:
-    paths:
-      - ".github/workflows/ios_addressables_build.yml"
-      - "src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/AddressableAssetsData/**"
-      - "src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/Music/**"
-      - "src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/Editor/BuildScript.cs"
-      - "ci/github_actions/build_ios_addressables.sh"
-      - "ci/github_actions/upload_addressables.sh"
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
-
-permissions:
-  contents: read
-
-env:
-  # Runner-specific build directory to allow parallel builds on multiple runners
-  EAGLE0_BUILD_DIR: /tmp/eagle0-${{ github.run_id }}
-
-jobs:
-  build-ios-addressables:
-    runs-on: [self-hosted, macOS, unity-mac]
-
-    steps:
-      - name: Prune stale PR refs
-        run: |
-          # Self-hosted runners persist .git between runs. When a PR is updated,
-          # old local refs (refs/remotes/pull/*/merge) may point to commits whose
-          # objects were never fetched or have been pruned. Remove these stale refs
-          # before checkout to prevent "missing object" errors.
-          if [ -d ".git" ]; then
-            echo "Pruning stale PR refs..."
-            git for-each-ref --format='%(refname)' refs/remotes/pull/ 2>/dev/null | \
-              xargs -r git update-ref -d 2>/dev/null || true
-          fi
-      - uses: actions/checkout@v4
-        with:
-          lfs: false  # Fetch LFS after checkout to avoid stale ref issues
-          clean: false  # Library/ persists between runs on self-hosted runners
-
-      - name: Clean stale files
-        run: |
-          git clean -ffd
-          rm -rf src/main/csharp/net/eagle0/clients/unity/eagle0/Library/Bee/
-
-      - name: Fetch LFS files
-        run: |
-          git lfs install
-          git lfs pull
-
-      - name: Ensure Unity version installed
-        run: ./ci/github_actions/ensure_unity_installed.sh ios
-
-      - name: Build iOS Addressables
-        run: ./ci/github_actions/build_ios_addressables.sh "$EAGLE0_BUILD_DIR/editor_ios_addressables.log"
-
-      - name: Upload Addressables to CDN
-        if: success() && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
-        env:
-          ACCESS_KEY_ID: ${{ secrets.ACCESS_KEY_ID }}
-          SECRET_KEY: ${{ secrets.SECRET_KEY }}
-        run: ./ci/github_actions/upload_addressables.sh iOS
-
-      - name: Purge CDN cache for iOS addressables
-        if: success() && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
-        env:
-          DO_CDN_PAT: ${{ secrets.DO_CDN_PAT }}
-        run: |
-          curl -s -X DELETE "https://api.digitalocean.com/v2/cdn/endpoints/8c98df29-6f0c-4704-8e82-ca40a2b81aa8/cache" \
-            -H "Authorization: Bearer $DO_CDN_PAT" \
-            -H "Content-Type: application/json" \
-            -d '{"files": ["addressables/iOS/*"]}' \
-            --fail || echo "Warning: CDN purge failed (non-fatal)"
-
-      - name: Archive Build Log
-        if: success() || failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: editor_ios_addressables.log
-          path: ${{ env.EAGLE0_BUILD_DIR }}/editor_ios_addressables.log
-          retention-days: 5
-      - name: Cleanup build directory
-        if: always()
-        run: rm -rf "${{ env.EAGLE0_BUILD_DIR }}"
@@ -1,6 +1,8 @@
 name: iOS TestFlight

 on:
+  schedule:
+    - cron: '0 5 * * *'  # 9 PM Pacific (UTC-8) / 10 PM PDT (UTC-7)
  workflow_dispatch:
    inputs:
      skip_upload:
@@ -11,6 +13,7 @@ on:

 permissions:
  contents: read
+  actions: read

 env:
  # Runner-specific build directory to allow parallel builds on multiple runners
@@ -19,7 +22,92 @@ env:
  KEYCHAIN_NAME: ios-build-${{ github.run_id }}.keychain

 jobs:
+  check-changes:
+    # Skip nightly builds when nothing has changed since the last successful
+    # scheduled run. Manual workflow_dispatch always builds.
+    runs-on: ubuntu-latest
+    outputs:
+      should_build: ${{ steps.check.outputs.should_build }}
+    steps:
+      - name: Check for relevant changes since last successful run
+        id: check
+        uses: actions/github-script@v8
+        with:
+          script: |
+            if (context.eventName === 'workflow_dispatch') {
+              core.setOutput('should_build', 'true');
+              console.log('Manual trigger — building');
+              return;
+            }
+
+            const { data: { workflow_runs: runs } } = await github.rest.actions.listWorkflowRuns({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              workflow_id: 'ios_testflight.yml',
+              status: 'success',
+              event: 'schedule',
+              per_page: 1,
+            });
+
+            if (runs.length === 0) {
+              core.setOutput('should_build', 'true');
+              console.log('No previous successful scheduled run — building');
+              return;
+            }
+
+            const lastSha = runs[0].head_sha;
+            console.log(`Last successful scheduled run: ${lastSha}`);
+            console.log(`Current SHA: ${context.sha}`);
+
+            if (lastSha === context.sha) {
+              core.setOutput('should_build', 'false');
+              console.log('No changes since last successful run — skipping');
+              return;
+            }
+
+            // Paths that can affect the iOS Unity build.
+            const relevantPrefixes = [
+              'src/main/csharp/',     // Unity project
+              'src/main/protobuf/',   // Generates C# code
+              'src/main/resources/',  // Game data & maps
+              'scripts/',             // Build scripts
+              'ci/',                  // CI scripts & workflows
+              '.github/workflows/ios_testflight.yml',
+              'MODULE.bazel',
+              '.bazelrc',
+            ];
+
+            const { data: comparison } = await github.rest.repos.compareCommitsWithBasehead({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              basehead: `${lastSha}...${context.sha}`,
+              per_page: 1,  // We only need the file list, not patches
+            });
+
+            // If the diff is too large, build to be safe
+            if (comparison.files === undefined) {
+              core.setOutput('should_build', 'true');
+              console.log('Could not retrieve file list — building to be safe');
+              return;
+            }
+
+            const relevant = comparison.files.filter(f =>
+              relevantPrefixes.some(p => f.filename.startsWith(p))
+            );
+
+            if (relevant.length > 0) {
+              core.setOutput('should_build', 'true');
+              console.log(`${relevant.length} relevant file(s) changed:`);
+              relevant.slice(0, 20).forEach(f => console.log(`  ${f.filename}`));
+              if (relevant.length > 20) console.log(`  ... and ${relevant.length - 20} more`);
+            } else {
+              core.setOutput('should_build', 'false');
+              console.log(`${comparison.files.length} file(s) changed, none in relevant paths — skipping`);
+            }
+
  build-unity:
+    needs: check-changes
+    if: needs.check-changes.outputs.should_build == 'true'
    runs-on: [self-hosted, macOS, testflight]

    steps:
@@ -34,7 +122,7 @@ jobs:
            git for-each-ref --format='%(refname)' refs/remotes/pull/ 2>/dev/null | \
              xargs -r git update-ref -d 2>/dev/null || true
          fi
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
        with:
          lfs: false  # Fetch LFS after checkout to avoid stale ref issues
          clean: false  # Library/ persists between runs on self-hosted runners
@@ -46,9 +134,7 @@ jobs:
          rm -rf src/main/csharp/net/eagle0/clients/unity/eagle0/Library/Bee/

      - name: Fetch LFS files
-        run: |
-          git lfs install
-          git lfs pull
+        run: ./ci/github_actions/fetch_lfs.sh

      - name: Ensure Unity version installed
        run: ./ci/github_actions/ensure_unity_installed.sh ios
@@ -78,11 +164,11 @@ jobs:

      - name: Archive Build Log
        if: success() || failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
        with:
          name: editor_ios.log
          path: ${{ env.EAGLE0_BUILD_DIR }}/editor_ios.log
-          retention-days: 5
+          retention-days: 3

  archive-and-upload:
    needs: build-unity
@@ -140,10 +226,20 @@ jobs:
      - name: Archive and Export IPA
        env:
          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          APP_STORE_CONNECT_API_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ID }}
+          APP_STORE_CONNECT_API_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_ISSUER_ID }}
+          APP_STORE_CONNECT_API_KEY: ${{ secrets.APP_STORE_CONNECT_API_KEY }}
        run: |
+          # Write API key to file for xcodebuild
+          API_KEY_PATH=$(mktemp)
+          echo "$APP_STORE_CONNECT_API_KEY" > "$API_KEY_PATH"
+          export APP_STORE_CONNECT_API_KEY_PATH="$API_KEY_PATH"
+
          chmod +x ./ci/github_actions/archive_ios.sh
          ./ci/github_actions/archive_ios.sh "$EAGLE0_BUILD_DIR/eagle0iOS" "$EAGLE0_BUILD_DIR/archive" "$APPLE_TEAM_ID" "$PROFILE_UUID"

+          rm -f "$API_KEY_PATH"
+
      - name: Upload to TestFlight
        if: ${{ github.event.inputs.skip_upload != 'true' }}
        env:
@@ -168,7 +264,7 @@ jobs:
      - name: Upload IPA artifact
        # Only keep artifact if we skipped TestFlight upload (for debugging)
        if: success() && github.event.inputs.skip_upload == 'true'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
        with:
          name: eagle0-ios-${{ github.run_id }}
          path: ${{ env.EAGLE0_BUILD_DIR }}/archive/eagle0.ipa
@@ -32,6 +32,7 @@ on:
      - "src/main/go/net/eagle0/build/mac_build_handler/**"
      - "scripts/build_mac_plugin.sh"
      - "scripts/build_sparkle_plugin.sh"
+      - "src/main/objc/net/eagle0/clients/unity/sparkle/**"
      - "scripts/inject_sparkle.sh"
      - "scripts/codesign_mac_app.sh"
      - "scripts/notarize_submit.sh"
@@ -80,7 +81,7 @@ jobs:
            git for-each-ref --format='%(refname)' refs/remotes/pull/ 2>/dev/null | \
              xargs -r git update-ref -d 2>/dev/null || true
          fi
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
        with:
          lfs: false  # Fetch LFS after checkout to avoid stale ref issues
          clean: false  # Library/ persists between runs on self-hosted runners
@@ -108,13 +109,14 @@ jobs:
          fi

      - name: Fetch LFS files
-        run: |
-          git lfs install
-          git lfs pull
+        run: ./ci/github_actions/fetch_lfs.sh

      - name: Ensure Unity version installed
        run: ./ci/github_actions/ensure_unity_installed.sh mac

+      - name: Sync Bazel Xcode config
+        run: ./scripts/sync_bazel_xcode.sh
+
      - name: Build Mac Unity
        run: ./ci/github_actions/build_unity_mac.sh "${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC"

@@ -225,7 +227,7 @@ jobs:

      - name: Upload signed app
        if: success() && steps.check-deploy.outputs.should_deploy == 'true'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
        with:
          name: signed-mac-app-${{ github.run_id }}
          path: ${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC/eagle0.app.zip
@@ -233,11 +235,11 @@ jobs:

      - name: Archive Build Log
        if: success() || failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
        with:
          name: editor_mac.log
          path: ${{ env.EAGLE0_BUILD_DIR }}/editor_mac.log
-          retention-days: 5
+          retention-days: 3
      - name: Cleanup build directory
        if: always()
        run: rm -rf "${{ env.EAGLE0_BUILD_DIR }}"
@@ -248,7 +250,7 @@ jobs:
    runs-on: [self-hosted, macOS, notarize]

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
        with:
          sparse-checkout: scripts

@@ -256,7 +258,7 @@ jobs:
        run: rm -rf ${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC

      - name: Download signed app
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
        with:
          name: signed-mac-app-${{ github.run_id }}
          path: ${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC
@@ -284,7 +286,7 @@ jobs:
          ditto -c -k --keepParent eagle0.app eagle0.app.zip

      - name: Upload notarized app
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
        with:
          name: notarized-mac-app-${{ github.run_id }}
          path: ${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC/eagle0.app.zip
@@ -301,7 +303,7 @@ jobs:
      deployed_version: ${{ steps.deploy-mac.outputs.deployed_version }}

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
        with:
          fetch-depth: 0  # For version numbering

@@ -309,7 +311,7 @@ jobs:
        run: rm -rf ${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC

      - name: Download notarized app
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
        with:
          name: notarized-mac-app-${{ github.run_id }}
          path: ${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC
@@ -320,6 +322,9 @@ jobs:
          ditto -x -k eagle0.app.zip .
          rm eagle0.app.zip

+      - name: Sync Bazel Xcode config
+        run: ./scripts/sync_bazel_xcode.sh
+
      - name: Deploy Mac Build
        id: deploy-mac
        env:
@@ -0,0 +1,85 @@
+name: S3 Archive Cleanup
+
+on:
+  schedule:
+    # Run weekly on Sunday at 05:00 UTC
+    - cron: '0 5 * * 0'
+  workflow_dispatch:  # Allow manual trigger
+
+permissions:
+  contents: read
+
+jobs:
+  cleanup:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Install s3cmd
+        run: sudo apt-get install -y s3cmd
+
+      - name: Configure s3cmd
+        env:
+          ACCESS_KEY_ID: ${{ secrets.ACCESS_KEY_ID }}
+          SECRET_KEY: ${{ secrets.SECRET_KEY }}
+        run: |
+          cat > ~/.s3cfg <<EOF
+          [default]
+          access_key = ${ACCESS_KEY_ID}
+          secret_key = ${SECRET_KEY}
+          host_base = sfo3.digitaloceanspaces.com
+          host_bucket = %(bucket)s.sfo3.digitaloceanspaces.com
+          EOF
+
+      - name: Delete old archived game folders
+        run: |
+          set -euo pipefail
+
+          CUTOFF=$(date -d "1 month ago" +%s)
+          DELETED=0
+          SKIPPED=0
+          NO_DIR_FILE=0
+
+          echo "Cutoff date: $(date -d "@${CUTOFF}" -Iseconds)"
+          echo ""
+
+          FOLDERS=$(s3cmd ls s3://eagle0/eagle/archived/ | awk '{print $NF}' | sed 's|s3://eagle0/eagle/archived/||' | sed 's|/||')
+
+          if [ -z "$FOLDERS" ]; then
+            echo "No archived folders found."
+            exit 0
+          fi
+
+          TOTAL=$(echo "$FOLDERS" | wc -l | tr -d ' ')
+          CURRENT=0
+
+          for game_id in $FOLDERS; do
+            CURRENT=$((CURRENT + 1))
+
+            DIR_INFO=$(s3cmd ls "s3://eagle0/eagle/archived/${game_id}/directory.e0i" 2>/dev/null || true)
+
+            if [ -z "$DIR_INFO" ]; then
+              echo "[$CURRENT/$TOTAL] DELETE $game_id (no directory.e0i)"
+              s3cmd del --recursive "s3://eagle0/eagle/archived/${game_id}/" > /dev/null 2>&1
+              DELETED=$((DELETED + 1))
+              NO_DIR_FILE=$((NO_DIR_FILE + 1))
+              continue
+            fi
+
+            FILE_DATE=$(echo "$DIR_INFO" | awk '{print $1 "T" $2 ":00"}')
+            FILE_EPOCH=$(date -d "$FILE_DATE" +%s 2>/dev/null || echo "0")
+
+            if [ "$FILE_EPOCH" -lt "$CUTOFF" ]; then
+              echo "[$CURRENT/$TOTAL] DELETE $game_id (directory.e0i from $(echo "$DIR_INFO" | awk '{print $1, $2}'))"
+              s3cmd del --recursive "s3://eagle0/eagle/archived/${game_id}/" > /dev/null 2>&1
+              DELETED=$((DELETED + 1))
+            else
+              echo "[$CURRENT/$TOTAL] KEEP $game_id (directory.e0i from $(echo "$DIR_INFO" | awk '{print $1, $2}'))"
+              SKIPPED=$((SKIPPED + 1))
+            fi
+          done
+
+          echo ""
+          echo "=== Summary ==="
+          echo "Total folders: $TOTAL"
+          echo "Deleted: $DELETED"
+          echo "Kept (recent): $SKIPPED"
@@ -34,7 +34,7 @@ jobs:
      image_tag: ${{ steps.push-shardok.outputs.image_tag }}
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
        with:
          lfs: false

@@ -191,8 +191,22 @@ jobs:

          echo "Deploying Shardok ARM64: ${{ needs.build-shardok-arm64.outputs.image_tag }}"

-          # Pull the new image
-          docker pull "${{ needs.build-shardok-arm64.outputs.image_tag }}"
+          # Pre-warm NAT64 path to DigitalOcean registry (IPv6-only Hetzner → IPv4 registry)
+          curl -sf --max-time 10 https://registry.digitalocean.com/v2/ > /dev/null 2>&1 || true
+
+          # Pull the new image (retry up to 3 times for NAT64 connectivity flakiness)
+          for attempt in 1 2 3; do
+            echo "Pull attempt $attempt..."
+            if docker pull "${{ needs.build-shardok-arm64.outputs.image_tag }}"; then
+              break
+            fi
+            if [ "$attempt" -eq 3 ]; then
+              echo "ERROR: docker pull failed after 3 attempts"
+              exit 1
+            fi
+            echo "Pull failed, retrying in 10s..."
+            sleep 10
+          done

          # Stop and remove any container using port 40042 or named shardok*
          docker ps -q --filter "publish=40042" | xargs -r docker stop
@@ -27,7 +27,7 @@ jobs:

    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
        with:
          lfs: false
      - name: Build Shardok server
@@ -69,7 +69,7 @@ jobs:
            git for-each-ref --format='%(refname)' refs/remotes/pull/ 2>/dev/null | \
              xargs -r git update-ref -d 2>/dev/null || true
          fi
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
        with:
          lfs: false  # Fetch LFS after checkout to avoid stale ref issues
          clean: false  # Library/ persists between runs on self-hosted runners
@@ -77,28 +77,40 @@ jobs:
      - name: Clean stale files
        run: |
          git clean -ffd
+          LIBRARY_DIR="src/main/csharp/net/eagle0/clients/unity/eagle0/Library"
+          VERSION_CACHE="$LIBRARY_DIR/.last_unity_version"
+          PROJECT_VERSION_FILE="src/main/csharp/net/eagle0/clients/unity/eagle0/ProjectSettings/ProjectVersion.txt"
+          CURRENT_VERSION=$(grep "m_EditorVersion:" "$PROJECT_VERSION_FILE" | head -1 | sed 's/m_EditorVersion: //')
+
+          # Nuke Library/ when Unity version changes to avoid import loops
+          if [ -f "$VERSION_CACHE" ]; then
+            CACHED_VERSION=$(cat "$VERSION_CACHE")
+            if [ "$CACHED_VERSION" != "$CURRENT_VERSION" ]; then
+              echo "Unity version changed ($CACHED_VERSION -> $CURRENT_VERSION) -- clearing Library/"
+              rm -rf "$LIBRARY_DIR"
+            fi
+          fi
+
          # Only clear Bee/ when C# files were added/deleted/renamed (structural
          # changes that stale the DAG). Content-only modifications are handled by
          # Bee's incremental compilation. See persist_library.sh for background.
-          BEE_DIR="src/main/csharp/net/eagle0/clients/unity/eagle0/Library/Bee"
-          SHA_FILE="src/main/csharp/net/eagle0/clients/unity/eagle0/Library/.last_built_sha"
+          BEE_DIR="$LIBRARY_DIR/Bee"
+          SHA_FILE="$LIBRARY_DIR/.last_built_sha"
          if [ -f "$SHA_FILE" ] && [ -d "$BEE_DIR" ]; then
            LAST_SHA=$(cat "$SHA_FILE")
            if git diff --diff-filter=ADR --name-only "$LAST_SHA" HEAD -- '*.cs' '*.csproj' '*.asmdef' 2>/dev/null | grep -q .; then
-              echo "C# files added/deleted/renamed since $LAST_SHA — clearing Bee/"
+              echo "C# files added/deleted/renamed since $LAST_SHA -- clearing Bee/"
              rm -rf "$BEE_DIR"
            else
-              echo "No structural C# changes since $LAST_SHA — keeping Bee/"
+              echo "No structural C# changes since $LAST_SHA -- keeping Bee/"
            fi
          else
-            echo "No previous build SHA or no Bee/ — clearing Bee/ as safe default"
+            echo "No previous build SHA or no Bee/ -- clearing Bee/ as safe default"
            rm -rf "$BEE_DIR"
          fi

      - name: Fetch LFS files
-        run: |
-          git lfs install
-          git lfs pull
+        run: ./ci/github_actions/fetch_lfs.sh
      - name: Ensure Unity version installed
        run: ./ci/github_actions/ensure_unity_installed.sh windows
      - name: Build Windows unity
@@ -108,6 +120,11 @@ jobs:
        if: success()
        run: git rev-parse HEAD > src/main/csharp/net/eagle0/clients/unity/eagle0/Library/.last_built_sha

+      - name: Save Unity version for Library/ cache invalidation
+        if: success()
+        run: |
+          grep "m_EditorVersion:" src/main/csharp/net/eagle0/clients/unity/eagle0/ProjectSettings/ProjectVersion.txt | head -1 | sed 's/m_EditorVersion: //' > src/main/csharp/net/eagle0/clients/unity/eagle0/Library/.last_unity_version
+
      - name: Upload Addressables to CDN
        if: success() && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
        env:
@@ -115,14 +132,14 @@ jobs:
          SECRET_KEY: ${{ secrets.SECRET_KEY }}
        run: ./ci/github_actions/upload_addressables.sh StandaloneWindows64
      - name: Deploy Windows unity
-        if: success() && github.ref == 'refs/heads/main' && github.event_name == 'push'
+        if: success() && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
        env:
          ACCESS_KEY_ID: ${{ secrets.ACCESS_KEY_ID }}
          SECRET_KEY: ${{ secrets.SECRET_KEY }}
        run: bazel run //src/main/go/net/eagle0/build/unity3d_windows_build_handler:unity3d_windows_build_handler -- "${{ env.EAGLE0_BUILD_DIR }}/eagle0WIN" "/tmp/unity_manifest.txt"

      - name: Update unified manifest
-        if: success() && github.ref == 'refs/heads/main' && github.event_name == 'push'
+        if: success() && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
        env:
          ACCESS_KEY_ID: ${{ secrets.ACCESS_KEY_ID }}
          SECRET_KEY: ${{ secrets.SECRET_KEY }}
@@ -147,18 +164,18 @@ jobs:

      - name: Export deployed version
        id: get-version
-        if: success() && github.ref == 'refs/heads/main' && github.event_name == 'push'
+        if: success() && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
        run: |
          VERSION=$(grep "^version=" /tmp/unity_manifest.txt | cut -d= -f2 || date +%Y.%m.%d)
          echo "deployed_version=$VERSION" >> $GITHUB_OUTPUT

      - name: Archive build log
        if: success() || failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
        with:
          name: editor_win.log
          path: ${{ env.EAGLE0_BUILD_DIR }}/editor_win.log
-          retention-days: 5
+          retention-days: 3
      - name: Cleanup build directory
        if: always()
        run: rm -rf "${{ env.EAGLE0_BUILD_DIR }}"
@@ -168,18 +185,10 @@ jobs:
    if: needs.windows-unity.outputs.deployed_version != ''
    runs-on: ubuntu-latest
    steps:
-      - name: Purge CDN cache and notify clients
+      - name: Notify clients of update
        env:
          NOTIFY_SECRET: ${{ secrets.EAGLE_NOTIFY_SECRET }}
-          DO_CDN_PAT: ${{ secrets.DO_CDN_PAT }}
        run: |
-          # Purge CDN cache so clients get the latest files immediately
-          curl -s -X DELETE "https://api.digitalocean.com/v2/cdn/endpoints/8c98df29-6f0c-4704-8e82-ca40a2b81aa8/cache" \
-            -H "Authorization: Bearer $DO_CDN_PAT" \
-            -H "Content-Type: application/json" \
-            -d '{"files": ["windows/*", "addressables/StandaloneWindows64/*"]}' \
-            --fail || echo "Warning: CDN purge failed (non-fatal)"
-
          curl -X POST "https://admin.eagle0.net/notify-update?platform=windows&version=${{ needs.windows-unity.outputs.deployed_version }}&required=false" \
            -H "X-Notify-Secret: $NOTIFY_SECRET" \
-            --fail --silent --show-error || echo "Warning: Failed to notify clients (non-fatal)"
+            --fail --silent --show-error || echo "Warning: Failed to notify clients (non-fatal)"
@@ -23,6 +23,7 @@ bazel-bin
 bazel-eagle0*
 bazel-out
 bazel-testlogs
+.bazelrc.xcode
 .ijwb
 .clwb
 buildWin.sh
@@ -5,6 +5,7 @@ repos:
    rev: v4.3.0
    hooks:
    -   id: check-added-large-files
+    -   id: check-merge-conflict
    -   id: no-commit-to-branch
        args: [--branch, main]
 -   repo: https://github.com/pocc/pre-commit-hooks
@@ -13,7 +14,16 @@ repos:
    -   id: clang-format
        args: [-i, --no-diff]
        types_or: ["c++", "c#"]
-        exclude: ^src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/Plugins
+        exclude: >-
+          (?x)^src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/(
+            Plugins|
+            DungeonMonsters2D|
+            Dragon|
+            ithappy|
+            Polytope\ Studio|
+            RRFreelance-Characters|
+            Raccoon
+          )/
 -   repo: https://github.com/yoheimuta/protolint
    rev: v0.42.2
    hooks:
@@ -1,7 +1,13 @@
 # CLAUDE.md

+## CRITICAL BASH RULES (NEVER VIOLATE)
+
+**NEVER chain bash commands.** Do not use `&&`, `||`, or `;` to combine commands. Each command must be a separate Bash tool call. Use parallel tool calls when commands are independent.
+
 ## CRITICAL GIT RULES (NEVER VIOLATE)

+**NEVER use `git -C`.** Instead, cd to the repo root and run git commands from there.
+
 **NEVER push directly to main/master.** No exceptions. Not for "small changes." Not for docs. Not ever.

 **NEVER merge PRs.** You create PRs. The user merges them. No exceptions.
@@ -149,38 +149,54 @@ use_repo(crate, "map_generator_crates")
 #
 # Platform Support - Apple/iOS
 #
-# Note: rules_apple is NOT included in the main workspace due to rules_swift
-# version conflicts with grpc. SparklePlugin (which needs rules_apple) is built
-# in a separate workspace at sparkle_workspace/ to isolate the conflict.
-#

 bazel_dep(name = "apple_support", version = "1.24.1", repo_name = "build_bazel_apple_support")
-
-# rules_swift is a transitive dep of grpc and flatbuffers with conflicting versions:
-# - grpc 1.76.0.bcr.1 requires rules_swift 3.x (compatibility level 3)
-# - flatbuffers requires rules_swift 2.x (compatibility level 2)
-# We don't use Swift directly, but we need to force a single version.
-# Force 3.x since grpc is more complex and harder to downgrade.
-single_version_override(
-    module_name = "rules_swift",
-    version = "3.1.2",
-)
+bazel_dep(name = "rules_apple", version = "4.3.3", repo_name = "build_bazel_rules_apple")

 # Register Apple CC toolchain for Objective-C compilation
 apple_cc_configure = use_extension(
    "@build_bazel_apple_support//crosstool:setup.bzl",
    "apple_cc_configure_extension",
 )
-use_repo(apple_cc_configure, "local_config_apple_cc")
+use_repo(apple_cc_configure, "local_config_apple_cc", "local_config_apple_cc_toolchains")

 #
 # Protocol Buffers & RPC
 #

 bazel_dep(name = "protobuf", version = "33.5", repo_name = "com_google_protobuf")
+
+# Use pre-built protoc binaries instead of compiling from source.
+# See: https://protobuf.dev/reference/cpp/cpp-generated/#invocation
+prebuilt_protoc = use_extension("@com_google_protobuf//bazel/private:prebuilt_protoc_extension.bzl", "protoc")
+use_repo(
+    prebuilt_protoc,
+    "prebuilt_protoc.linux_aarch_64",
+    "prebuilt_protoc.linux_ppcle_64",
+    "prebuilt_protoc.linux_s390_64",
+    "prebuilt_protoc.linux_x86_32",
+    "prebuilt_protoc.linux_x86_64",
+    "prebuilt_protoc.osx_aarch_64",
+    "prebuilt_protoc.osx_x86_64",
+    "prebuilt_protoc.win32",
+    "prebuilt_protoc.win64",
+)
+
 bazel_dep(name = "rules_proto", version = "7.1.0")
 bazel_dep(name = "rules_cc", version = "0.2.14")
-bazel_dep(name = "grpc", version = "1.74.1")
+bazel_dep(name = "grpc", version = "1.78.0")
+
+# Patch grpc 1.78.0 to fix rules_python incompatibility: grpc requests Python
+# 3.14.0b2 toolchain but rules_python >= 1.6.0 removed it in favor of 3.14.
+# Upstream fix: https://github.com/grpc/grpc/commit/459279b
+# TODO: Remove this override once a fixed grpc version is published to BCR.
+single_version_override(
+    module_name = "grpc",
+    patch_strip = 1,
+    patches = ["//third_party/patches:grpc_fix_python_version.patch"],
+    version = "1.78.0",
+)
+
 bazel_dep(name = "grpc-java", version = "1.78.0")
 bazel_dep(name = "rules_proto_grpc_csharp", version = "5.8.0")
 bazel_dep(name = "flatbuffers", version = "25.12.19")
@@ -384,8 +400,16 @@ http_archive(
    ],
 )

-# Note: Sparkle framework is defined in sparkle_workspace/MODULE.bazel
-# (not in main workspace due to rules_swift version conflicts)
+# Sparkle framework for macOS auto-updates
+SPARKLE_VERSION = "2.6.4"
+
+http_archive(
+    name = "sparkle",
+    build_file = "//src/main/objc/net/eagle0/clients/unity/sparkle/external:BUILD.sparkle",
+    sha256 = "50612a06038abc931f16011d7903b8326a362c1074dabccb718404ce8e585f0b",
+    strip_prefix = "",
+    url = "https://github.com/sparkle-project/Sparkle/releases/download/%s/Sparkle-%s.tar.xz" % (SPARKLE_VERSION, SPARKLE_VERSION),
+)

 # Busybox static binary for Docker health checks (provides nc, wget, etc.)
 # Primary: DigitalOcean Spaces (public, reliable)
@@ -475,6 +499,11 @@ register_toolchains(
    "@rules_scala//testing:scalatest_toolchain",
 )

+# Apple CC toolchain for Objective-C compilation (SparklePlugin).
+# Registered before LLVM so it has higher priority; Apple constraint matching
+# ensures it's only used for Apple-platform targets (objc_library, macos_bundle).
+register_toolchains("@local_config_apple_cc_toolchains//:all")
+
 # Set dev_dependency so we can turn this off for swift MacOS builds
 register_toolchains(
    "@llvm_toolchain//:all",
@@ -4,15 +4,12 @@
    "https://bcr.bazel.build/bazel_registry.json": "8a28e4aff06ee60aed2a8c281907fb8bcbf3b753c91fb5a5c57da3215d5b3497",
    "https://bcr.bazel.build/modules/abseil-cpp/20210324.2/MODULE.bazel": "7cd0312e064fde87c8d1cd79ba06c876bd23630c83466e9500321be55c96ace2",
    "https://bcr.bazel.build/modules/abseil-cpp/20211102.0/MODULE.bazel": "70390338f7a5106231d20620712f7cccb659cd0e9d073d1991c038eb9fc57589",
-    "https://bcr.bazel.build/modules/abseil-cpp/20220623.1/MODULE.bazel": "73ae41b6818d423a11fd79d95aedef1258f304448193d4db4ff90e5e7a0f076c",
    "https://bcr.bazel.build/modules/abseil-cpp/20230125.1/MODULE.bazel": "89047429cb0207707b2dface14ba7f8df85273d484c2572755be4bab7ce9c3a0",
    "https://bcr.bazel.build/modules/abseil-cpp/20230802.0.bcr.1/MODULE.bazel": "1c8cec495288dccd14fdae6e3f95f772c1c91857047a098fad772034264cc8cb",
    "https://bcr.bazel.build/modules/abseil-cpp/20230802.0/MODULE.bazel": "d253ae36a8bd9ee3c5955384096ccb6baf16a1b1e93e858370da0a3b94f77c16",
    "https://bcr.bazel.build/modules/abseil-cpp/20230802.1/MODULE.bazel": "fa92e2eb41a04df73cdabeec37107316f7e5272650f81d6cc096418fe647b915",
-    "https://bcr.bazel.build/modules/abseil-cpp/20240116.0/MODULE.bazel": "98dc378d64c12a4e4741ad3362f87fb737ee6a0886b2d90c3cdbb4d93ea3e0bf",
    "https://bcr.bazel.build/modules/abseil-cpp/20240116.1/MODULE.bazel": "37bcdb4440fbb61df6a1c296ae01b327f19e9bb521f9b8e26ec854b6f97309ed",
    "https://bcr.bazel.build/modules/abseil-cpp/20240116.2/MODULE.bazel": "73939767a4686cd9a520d16af5ab440071ed75cec1a876bf2fcfaf1f71987a16",
-    "https://bcr.bazel.build/modules/abseil-cpp/20240722.0/MODULE.bazel": "88668a07647adbdc14cb3a7cd116fb23c9dda37a90a1681590b6c9d8339a5b84",
    "https://bcr.bazel.build/modules/abseil-cpp/20250127.0/MODULE.bazel": "d1086e248cda6576862b4b3fe9ad76a214e08c189af5b42557a6e1888812c5d5",
    "https://bcr.bazel.build/modules/abseil-cpp/20250127.1/MODULE.bazel": "c4a89e7ceb9bf1e25cf84a9f830ff6b817b72874088bf5141b314726e46a57c1",
    "https://bcr.bazel.build/modules/abseil-cpp/20250512.0/MODULE.bazel": "c4d02dd22cd87458516655a45512060246ee2a4732f1fbe948a5bd9eb614e626",
@@ -25,7 +22,7 @@
    "https://bcr.bazel.build/modules/apple_support/1.13.0/MODULE.bazel": "7c8cdea7e031b7f9f67f0b497adf6d2c6a2675e9304ca93a9af6ed84eef5a524",
    "https://bcr.bazel.build/modules/apple_support/1.15.1/MODULE.bazel": "a0556fefca0b1bb2de8567b8827518f94db6a6e7e7d632b4c48dc5f865bc7c85",
    "https://bcr.bazel.build/modules/apple_support/1.17.1/MODULE.bazel": "655c922ab1209978a94ef6ca7d9d43e940cd97d9c172fb55f94d91ac53f8610b",
-    "https://bcr.bazel.build/modules/apple_support/1.21.0/MODULE.bazel": "ac1824ed5edf17dee2fdd4927ada30c9f8c3b520be1b5fd02a5da15bc10bff3e",
+    "https://bcr.bazel.build/modules/apple_support/1.21.1/MODULE.bazel": "5809fa3efab15d1f3c3c635af6974044bac8a4919c62238cce06acee8a8c11f1",
    "https://bcr.bazel.build/modules/apple_support/1.23.0/MODULE.bazel": "317d47e3f65b580e7fb4221c160797fda48e32f07d2dfff63d754ef2316dcd25",
    "https://bcr.bazel.build/modules/apple_support/1.23.1/MODULE.bazel": "53763fed456a968cf919b3240427cf3a9d5481ec5466abc9d5dc51bc70087442",
    "https://bcr.bazel.build/modules/apple_support/1.24.1/MODULE.bazel": "f46e8ddad60aef170ee92b2f3d00ef66c147ceafea68b6877cb45bd91737f5f8",
@@ -67,6 +64,7 @@
    "https://bcr.bazel.build/modules/bazel_features/1.23.0/MODULE.bazel": "fd1ac84bc4e97a5a0816b7fd7d4d4f6d837b0047cf4cbd81652d616af3a6591a",
    "https://bcr.bazel.build/modules/bazel_features/1.27.0/MODULE.bazel": "621eeee06c4458a9121d1f104efb80f39d34deff4984e778359c60eaf1a8cb65",
    "https://bcr.bazel.build/modules/bazel_features/1.28.0/MODULE.bazel": "4b4200e6cbf8fa335b2c3f43e1d6ef3e240319c33d43d60cc0fbd4b87ece299d",
+    "https://bcr.bazel.build/modules/bazel_features/1.3.0/MODULE.bazel": "cdcafe83ec318cda34e02948e81d790aab8df7a929cec6f6969f13a489ccecd9",
    "https://bcr.bazel.build/modules/bazel_features/1.30.0/MODULE.bazel": "a14b62d05969a293b80257e72e597c2da7f717e1e69fa8b339703ed6731bec87",
    "https://bcr.bazel.build/modules/bazel_features/1.32.0/MODULE.bazel": "095d67022a58cb20f7e20e1aefecfa65257a222c18a938e2914fd257b5f1ccdc",
    "https://bcr.bazel.build/modules/bazel_features/1.33.0/MODULE.bazel": "8b8dc9d2a4c88609409c3191165bccec0e4cb044cd7a72ccbe826583303459f6",
@@ -102,7 +100,6 @@
    "https://bcr.bazel.build/modules/bazel_worker_api/0.0.4/MODULE.bazel": "460aa12d01231a80cce03c548287b433b321d205b0028ae596728c35e5ee442e",
    "https://bcr.bazel.build/modules/bazel_worker_java/0.0.4/MODULE.bazel": "82494a01018bb7ef06d4a17ec4cd7a758721f10eb8b6c820a818e70d669500db",
    "https://bcr.bazel.build/modules/bazel_worker_java/0.0.4/source.json": "a2d30458fd86cf022c2b6331e652526fa08e17573b2f5034a9dbcacdf9c2583c",
-    "https://bcr.bazel.build/modules/boringssl/0.0.0-20211025-d4f1ab9/MODULE.bazel": "6ee6353f8b1a701fe2178e1d925034294971350b6d3ac37e67e5a7d463267834",
    "https://bcr.bazel.build/modules/boringssl/0.0.0-20230215-5c22014/MODULE.bazel": "4b03dc0d04375fa0271174badcd202ed249870c8e895b26664fd7298abea7282",
    "https://bcr.bazel.build/modules/boringssl/0.0.0-20240530-2db0eb3/MODULE.bazel": "d0405b762c5e87cd445b7015f2b8da5400ef9a8dbca0bfefa6c1cea79d528a97",
    "https://bcr.bazel.build/modules/boringssl/0.20240913.0/MODULE.bazel": "fcaa7503a5213290831a91ed1eb538551cf11ac0bc3a6ad92d0fef92c5bd25fb",
@@ -110,14 +107,12 @@
    "https://bcr.bazel.build/modules/boringssl/0.20241024.0/source.json": "d843092e682b84188c043ac742965d7f96e04c846c7e338187e03238674909a9",
    "https://bcr.bazel.build/modules/buildozer/7.1.2/MODULE.bazel": "2e8dd40ede9c454042645fd8d8d0cd1527966aa5c919de86661e62953cd73d84",
    "https://bcr.bazel.build/modules/buildozer/7.1.2/source.json": "c9028a501d2db85793a6996205c8de120944f50a0d570438fcae0457a5f9d1f8",
-    "https://bcr.bazel.build/modules/c-ares/1.15.0/MODULE.bazel": "ba0a78360fdc83f02f437a9e7df0532ad1fbaa59b722f6e715c11effebaa0166",
    "https://bcr.bazel.build/modules/c-ares/1.19.1/MODULE.bazel": "73bca21720772370ff91cc8e88bbbaf14897720c6473e87c1ddc0f848284c313",
    "https://bcr.bazel.build/modules/c-ares/1.19.1/source.json": "56bfa95b01e4e0012e90eaa9f1bab823c48c3af4454286b889b9cc74f5098da1",
    "https://bcr.bazel.build/modules/cel-spec/0.15.0/MODULE.bazel": "e1eed53d233acbdcf024b4b0bc1528116d92c29713251b5154078ab1348cb600",
    "https://bcr.bazel.build/modules/cel-spec/0.15.0/source.json": "ab7dccdf21ea2261c0f809b5a5221a4d7f8b580309f285fdf1444baaca75d44a",
    "https://bcr.bazel.build/modules/civetweb/1.16/MODULE.bazel": "46a38f9daeb57392e3827fce7d40926be0c802bd23cdd6bfd3a96c804de42fae",
    "https://bcr.bazel.build/modules/civetweb/1.16/source.json": "ba8b9585adb8355cb51b999d57172fd05e7a762c56b8d4bac6db42c99de3beb7",
-    "https://bcr.bazel.build/modules/curl/8.4.0/MODULE.bazel": "0bc250aa1cb69590049383df7a9537c809591fcf876c620f5f097c58fdc9bc10",
    "https://bcr.bazel.build/modules/curl/8.7.1/MODULE.bazel": "088221c35a2939c555e6e47cb31a81c15f8b59f4daa8009b1e9271a502d33485",
    "https://bcr.bazel.build/modules/curl/8.8.0/MODULE.bazel": "7da3b3e79b0b4ee8f8c95d640bc6ad7b430ce66ef6e9c9d2bc29b3b5ef85f6fe",
    "https://bcr.bazel.build/modules/curl/8.8.0/source.json": "d7d138b6878cf38891692fee0649ace35357fd549b425614d571786f054374d4",
@@ -142,36 +137,33 @@
    "https://bcr.bazel.build/modules/gazelle/0.47.0/source.json": "aeb2e5df14b7fb298625d75d08b9c65bdb0b56014c5eb89da9e5dd0572280ae6",
    "https://bcr.bazel.build/modules/google_benchmark/1.8.2/MODULE.bazel": "a70cf1bba851000ba93b58ae2f6d76490a9feb74192e57ab8e8ff13c34ec50cb",
    "https://bcr.bazel.build/modules/google_benchmark/1.8.4/MODULE.bazel": "c6d54a11dcf64ee63545f42561eda3fd94c1b5f5ebe1357011de63ae33739d5e",
-    "https://bcr.bazel.build/modules/google_benchmark/1.8.5/MODULE.bazel": "9ba9b31b984022828a950e3300410977eda2e35df35584c6b0b2d0c2e52766b7",
-    "https://bcr.bazel.build/modules/google_benchmark/1.8.5/source.json": "2c9c685f9b496f125b9e3a9c696c549d1ed2f33b75830a2fb6ac94fab23c0398",
+    "https://bcr.bazel.build/modules/google_benchmark/1.8.4/source.json": "84590f7bc5a1fd99e1ef274ee16bb41c214f705e62847b42e705010dfa81fe53",
+    "https://bcr.bazel.build/modules/googleapis-cc/1.0.0/MODULE.bazel": "cf01757e7590c56140a4b81638ff2b3e7074769e6271720bbf738fcda25b6fc2",
+    "https://bcr.bazel.build/modules/googleapis-cc/1.0.0/source.json": "ab0e3a2ee9968a8848f59872fbbfa3e1f768597d71d2229e6caa319d357967c7",
+    "https://bcr.bazel.build/modules/googleapis-grpc-cc/1.0.0/MODULE.bazel": "3553358a9d8d96026c9e28d9fb6c268574950d0be7fa9b4c0aeaf3c37c73f2d3",
+    "https://bcr.bazel.build/modules/googleapis-grpc-cc/1.0.0/source.json": "fa7b79043b3c82bf74f1f2fa45af289e19b247375868d0752db2c114a1c7366c",
+    "https://bcr.bazel.build/modules/googleapis-python/1.0.0/MODULE.bazel": "0ccd1614a914fb524b3ac267f9c97f9a5cd5412b027f0176b81a725882ec42ff",
+    "https://bcr.bazel.build/modules/googleapis-python/1.0.0/source.json": "24364f075ec5e6d5e0cfc5d651bd833b119e0cea1a45d51330c93461e3586e42",
+    "https://bcr.bazel.build/modules/googleapis-rules-registry/1.0.0/MODULE.bazel": "97c6a4d413b373d4cc97065da3de1b2166e22cbbb5f4cc9f05760bfa83619e24",
+    "https://bcr.bazel.build/modules/googleapis-rules-registry/1.0.0/source.json": "cf611c836a60e98e2e2ab2de8004f119e9f06878dcf4ea2d95a437b1b7a89fe9",
    "https://bcr.bazel.build/modules/googleapis/0.0.0-20240326-1c8d509c5/MODULE.bazel": "a4b7e46393c1cdcc5a00e6f85524467c48c565256b22b5fae20f84ab4a999a68",
    "https://bcr.bazel.build/modules/googleapis/0.0.0-20240819-fe8ba054a/MODULE.bazel": "117b7c7be7327ed5d6c482274533f2dbd78631313f607094d4625c28203cacdf",
-    "https://bcr.bazel.build/modules/googleapis/0.0.0-20240819-fe8ba054a/source.json": "b31fc7eb283a83f71d2e5bfc3d1c562d2994198fa1278409fbe8caec3afc1d3e",
+    "https://bcr.bazel.build/modules/googleapis/0.0.0-20241220-5e258e33.bcr.1/MODULE.bazel": "ee6c30f82ecd476e61f019fb1151aaab380ea419958ff274ef2f0efca7969f5c",
+    "https://bcr.bazel.build/modules/googleapis/0.0.0-20241220-5e258e33.bcr.1/source.json": "d6f66e3d95ec52821e994015e83ed194f8888c655068e192659e55a8987dfe77",
    "https://bcr.bazel.build/modules/googletest/1.11.0/MODULE.bazel": "3a83f095183f66345ca86aa13c58b59f9f94a2f81999c093d4eeaa2d262d12f4",
    "https://bcr.bazel.build/modules/googletest/1.14.0.bcr.1/MODULE.bazel": "22c31a561553727960057361aa33bf20fb2e98584bc4fec007906e27053f80c6",
    "https://bcr.bazel.build/modules/googletest/1.14.0/MODULE.bazel": "cfbcbf3e6eac06ef9d85900f64424708cc08687d1b527f0ef65aa7517af8118f",
    "https://bcr.bazel.build/modules/googletest/1.15.2/MODULE.bazel": "6de1edc1d26cafb0ea1a6ab3f4d4192d91a312fd2d360b63adaa213cd00b2108",
-    "https://bcr.bazel.build/modules/googletest/1.16.0/MODULE.bazel": "a175623c69e94fca4ca7acbc12031e637b0c489318cd4805606981d4d7adb34a",
    "https://bcr.bazel.build/modules/googletest/1.17.0/MODULE.bazel": "dbec758171594a705933a29fcf69293d2468c49ec1f2ebca65c36f504d72df46",
    "https://bcr.bazel.build/modules/googletest/1.17.0/source.json": "38e4454b25fc30f15439c0378e57909ab1fd0a443158aa35aec685da727cd713",
    "https://bcr.bazel.build/modules/grpc-java/1.62.2/MODULE.bazel": "99b8771e8c7cacb130170fed2a10c9e8fed26334a93e73b42d2953250885a158",
    "https://bcr.bazel.build/modules/grpc-java/1.66.0/MODULE.bazel": "86ff26209fac846adb89db11f3714b3dc0090fb2fb81575673cc74880cda4e7e",
-    "https://bcr.bazel.build/modules/grpc-java/1.69.0/MODULE.bazel": "53887af6a00b3b406d70175d3d07e84ea9362016ff55ea90b9185f0227bfaf98",
    "https://bcr.bazel.build/modules/grpc-java/1.78.0/MODULE.bazel": "48f790fbb95625245295df1283e0dba344a4e30b4a9a9cefbabfa92bd84f3691",
    "https://bcr.bazel.build/modules/grpc-java/1.78.0/source.json": "36c3a83c5ddeb864d7a4b97801456c464077f80a8216354ac1a71f7ce8699771",
    "https://bcr.bazel.build/modules/grpc-proto/0.0.0-20240627-ec30f58/MODULE.bazel": "88de79051e668a04726e9ea94a481ec6f1692086735fd6f488ab908b3b909238",
    "https://bcr.bazel.build/modules/grpc-proto/0.0.0-20240627-ec30f58/source.json": "5035d379c61042930244ab59e750106d893ec440add92ec0df6a0098ca7f131d",
-    "https://bcr.bazel.build/modules/grpc/1.41.0/MODULE.bazel": "5bcbfc2b274dabea628f0649dc50c90cf36543b1cfc31624832538644ad1aae8",
-    "https://bcr.bazel.build/modules/grpc/1.56.3.bcr.1/MODULE.bazel": "cd5b1eb276b806ec5ab85032921f24acc51735a69ace781be586880af20ab33f",
-    "https://bcr.bazel.build/modules/grpc/1.62.1/MODULE.bazel": "2998211594b8a79a6b459c4e797cfa19f0fb8b3be3149760ec7b8c99abfd426f",
-    "https://bcr.bazel.build/modules/grpc/1.63.1.bcr.1/MODULE.bazel": "d7b9fef03bd175e6825237b521b18a3c29f1ac15f8aa52c8a1a0f3bd8f33d54b",
-    "https://bcr.bazel.build/modules/grpc/1.66.0.bcr.2/MODULE.bazel": "0fa2b0fd028ce354febf0fe90f1ed8fecfbfc33118cddd95ac0418cc283333a0",
-    "https://bcr.bazel.build/modules/grpc/1.66.0.bcr.3/MODULE.bazel": "f6047e89faf488f5e3e65cb2594c6f5e86992abec7487163ff6b623526e543b0",
-    "https://bcr.bazel.build/modules/grpc/1.69.0/MODULE.bazel": "4e26e05c9e1ef291ccbc96aad8e457b1b8abedbc141623831629da2f8168eef6",
-    "https://bcr.bazel.build/modules/grpc/1.70.1/MODULE.bazel": "b800cd8e3e7555c1e61cba2e02d3a2fcf0e91f66e800db286d965d3b7a6a721a",
-    "https://bcr.bazel.build/modules/grpc/1.71.0/MODULE.bazel": "7fcab2c05530373f1a442c362b17740dd0c75b6a2a975eec8f5bf4c70a37928a",
-    "https://bcr.bazel.build/modules/grpc/1.74.1/MODULE.bazel": "09523be10ba2bfd999683671d0f8f22fb5b20ec77ad89b05ef58ff19a1b65c82",
-    "https://bcr.bazel.build/modules/grpc/1.74.1/source.json": "8508bcf9bae1b7c647a594e13461ce192240fcdbb409c2741444322d47d01f98",
+    "https://bcr.bazel.build/modules/grpc/1.78.0/MODULE.bazel": "6a72f0b2fe950342fe63b231c76197df6d117a8ea1ac338dac40b053020f586a",
+    "https://bcr.bazel.build/modules/grpc/1.78.0/source.json": "c988abfe519ef5ace8cd27c80c0a66e68e501e5902b623722fcbf6694b355693",
    "https://bcr.bazel.build/modules/helly25_bzl/0.3.1/MODULE.bazel": "3a4be20f6fc13be32ad44643b8252ef5af09eee936f1d943cd4fd7867fa92826",
    "https://bcr.bazel.build/modules/helly25_bzl/0.3.1/source.json": "b129ab1828492de2c163785bbeb4065c166de52d932524b4317beb5b7f917994",
    "https://bcr.bazel.build/modules/jq.bzl/0.1.0/MODULE.bazel": "2ce69b1af49952cd4121a9c3055faa679e748ce774c7f1fda9657f936cae902f",
@@ -188,18 +180,13 @@
    "https://bcr.bazel.build/modules/nlohmann_json/3.6.1/MODULE.bazel": "6f7b417dcc794d9add9e556673ad25cb3ba835224290f4f848f8e2db1e1fca74",
    "https://bcr.bazel.build/modules/opencensus-cpp/0.0.0-20230502-50eb5de.bcr.2/MODULE.bazel": "cc18734138dd18c912c6ce2a59186db28f85d8058c99c9f21b46ca3e0aba0ebe",
    "https://bcr.bazel.build/modules/opencensus-cpp/0.0.0-20230502-50eb5de.bcr.2/source.json": "7c135f9d42bb3b045669c3c6ab3bb3c208e00b46aca4422eea64c29811a5b240",
-    "https://bcr.bazel.build/modules/opencensus-cpp/0.0.0-20230502-50eb5de/MODULE.bazel": "02201d2921dadb4ec90c4980eca4b2a02904eddcf6fa02f3da7594fb7b0d821c",
    "https://bcr.bazel.build/modules/opencensus-proto/0.4.1.bcr.2/MODULE.bazel": "789706a714855f92c5c8cfcf1ef32bbb64dcd3b7c9066756ad7986ec59709d29",
    "https://bcr.bazel.build/modules/opencensus-proto/0.4.1.bcr.2/source.json": "aadf3f53e08b72376506b7c4ea3d167010c9efb160d7d6e1e304ed646bac1b36",
    "https://bcr.bazel.build/modules/opencensus-proto/0.4.1/MODULE.bazel": "4a2e8b4d0b544002502474d611a5a183aa282251e14f6a01afe841c0c1b10372",
    "https://bcr.bazel.build/modules/openssl/3.3.1.bcr.1/MODULE.bazel": "49c0c07e8fb87b480bccb842cfee1b32617f11dac590f732573c69058699a3d1",
    "https://bcr.bazel.build/modules/openssl/3.3.1.bcr.1/source.json": "0c0872e048bbea052a9c541fb47019481a19201ba5555a71d762ad591bf94e1f",
-    "https://bcr.bazel.build/modules/opentelemetry-cpp/1.14.2/MODULE.bazel": "089a5613c2a159c7dfde098dabfc61e966889c7d6a81a98422a84c51535ed17d",
-    "https://bcr.bazel.build/modules/opentelemetry-cpp/1.16.0/MODULE.bazel": "b7379a140f538cea3f749179a2d481ed81942cc6f7b05a6113723eb34ac3b3e7",
    "https://bcr.bazel.build/modules/opentelemetry-cpp/1.19.0/MODULE.bazel": "3455326c08b28415648a3d60d8e3c811847ebdbe64474f75b25878f25585aea1",
    "https://bcr.bazel.build/modules/opentelemetry-cpp/1.19.0/source.json": "4e48137e4c3ecb99401ff99876df8fa330598d7da051869bec643446e8a8ff95",
-    "https://bcr.bazel.build/modules/opentelemetry-proto/1.1.0/MODULE.bazel": "a49f406e99bf05ab43ed4f5b3322fbd33adfd484b6546948929d1316299b68bf",
-    "https://bcr.bazel.build/modules/opentelemetry-proto/1.3.1/MODULE.bazel": "0141a50e989576ee064c11ce8dd5ec89993525bd9f9a09c5618e4dacc8df9352",
    "https://bcr.bazel.build/modules/opentelemetry-proto/1.4.0.bcr.1/MODULE.bazel": "5ceaf25e11170d22eded4c8032728b4a3f273765fccda32f9e94f463755c4167",
    "https://bcr.bazel.build/modules/opentelemetry-proto/1.5.0/MODULE.bazel": "7543d91a53b98e7b5b37c5a0865b93bff12c1ee022b1e322cd236b968894b030",
    "https://bcr.bazel.build/modules/opentelemetry-proto/1.5.0/source.json": "046b721ce203e88cdaad44d7dd17a86b7200eab9388b663b234e72e13ff7b143",
@@ -219,7 +206,6 @@
    "https://bcr.bazel.build/modules/platforms/0.0.9/MODULE.bazel": "4a87a60c927b56ddd67db50c89acaa62f4ce2a1d2149ccb63ffd871d5ce29ebc",
    "https://bcr.bazel.build/modules/platforms/1.0.0/MODULE.bazel": "f05feb42b48f1b3c225e4ccf351f367be0371411a803198ec34a389fb22aa580",
    "https://bcr.bazel.build/modules/platforms/1.0.0/source.json": "f4ff1fd412e0246fd38c82328eb209130ead81d62dcd5a9e40910f867f733d96",
-    "https://bcr.bazel.build/modules/prometheus-cpp/1.2.4/MODULE.bazel": "0fbe5dcff66311947a3f6b86ebc6a6d9328e31a28413ca864debc4a043f371e5",
    "https://bcr.bazel.build/modules/prometheus-cpp/1.3.0.bcr.1/MODULE.bazel": "116ad46e97c1d2aeb020fe2899a342a7e703574ce7c0faf7e4810f938c974a9a",
    "https://bcr.bazel.build/modules/prometheus-cpp/1.3.0.bcr.1/source.json": "e813cce2d450708cfcb26e309c5172583a7440776edf354e83e6788c768e5cca",
    "https://bcr.bazel.build/modules/prometheus-cpp/1.3.0/MODULE.bazel": "ce82e086bbc0b60267e970f6a54b2ca6d0f22d3eb6633e00e2cc2899c700f3d8",
@@ -227,8 +213,6 @@
    "https://bcr.bazel.build/modules/protobuf/23.1/MODULE.bazel": "88b393b3eb4101d18129e5db51847cd40a5517a53e81216144a8c32dfeeca52a",
    "https://bcr.bazel.build/modules/protobuf/24.4/MODULE.bazel": "7bc7ce5f2abf36b3b7b7c8218d3acdebb9426aeb35c2257c96445756f970eb12",
    "https://bcr.bazel.build/modules/protobuf/25.6/MODULE.bazel": "fc0ae073b47c7ede88b825ff79e64f1c058967c7a87a86cdf4abecd9e0516625",
-    "https://bcr.bazel.build/modules/protobuf/26.0.bcr.1/MODULE.bazel": "8f04d38c2da40a3715ff6bdce4d32c5981e6432557571482d43a62c31a24c2cf",
-    "https://bcr.bazel.build/modules/protobuf/26.0.bcr.2/MODULE.bazel": "62e0b84ca727bdeb55a6fe1ef180e6b191bbe548a58305ea1426c158067be534",
    "https://bcr.bazel.build/modules/protobuf/26.0/MODULE.bazel": "8402da964092af40097f4a205eec2a33fd4a7748dc43632b7d1629bfd9a2b856",
    "https://bcr.bazel.build/modules/protobuf/27.0-rc2/MODULE.bazel": "b2b0dbafd57b6bec0ca9b251da02e628c357dab53a097570aa7d79d020f107cf",
    "https://bcr.bazel.build/modules/protobuf/27.0/MODULE.bazel": "7873b60be88844a0a1d8f80b9d5d20cfbd8495a689b8763e76c6372998d3f64c",
@@ -252,7 +236,6 @@
    "https://bcr.bazel.build/modules/protoc-gen-validate/1.0.4/MODULE.bazel": "b8913c154b16177990f6126d2d2477d187f9ddc568e95ee3e2d50fc65d2c494a",
    "https://bcr.bazel.build/modules/protoc-gen-validate/1.2.1.bcr.1/MODULE.bazel": "4bf09676b62fa587ae07e073420a76ec8766dcce7545e5f8c68cfa8e484b5120",
    "https://bcr.bazel.build/modules/protoc-gen-validate/1.2.1.bcr.1/source.json": "c19071ebc4b53b5f1cfab9c66eefaf6e4179eb8a998970d07b1077687e777f29",
-    "https://bcr.bazel.build/modules/protoc-gen-validate/1.2.1/MODULE.bazel": "52b51f50533ec4fbd5d613cd093773f979ac2e035d954e02ca11de383f502505",
    "https://bcr.bazel.build/modules/pybind11_bazel/2.11.1/MODULE.bazel": "88af1c246226d87e65be78ed49ecd1e6f5e98648558c14ce99176da041dc378e",
    "https://bcr.bazel.build/modules/pybind11_bazel/2.12.0/MODULE.bazel": "e6f4c20442eaa7c90d7190d8dc539d0ab422f95c65a57cc59562170c58ae3d34",
    "https://bcr.bazel.build/modules/pybind11_bazel/2.12.0/source.json": "6900fdc8a9e95866b8c0d4ad4aba4d4236317b5c1cd04c502df3f0d33afed680",
@@ -269,8 +252,8 @@
    "https://bcr.bazel.build/modules/rules_android/0.6.6/source.json": "a9d8dc2d5a102dc03269a94acc886a4cab82cdcb9ccbc77b0f665d6d17a6ae09",
    "https://bcr.bazel.build/modules/rules_apple/3.13.0/MODULE.bazel": "b4559a2c6281ca3165275bb36c1f0ac74666632adc5bdb680e366de7ce845f43",
    "https://bcr.bazel.build/modules/rules_apple/3.16.0/MODULE.bazel": "0d1caf0b8375942ce98ea944be754a18874041e4e0459401d925577624d3a54a",
-    "https://bcr.bazel.build/modules/rules_apple/3.16.0/source.json": "d8b5fe461272018cc07cfafce11fe369c7525330804c37eec5a82f84cd475366",
-    "https://bcr.bazel.build/modules/rules_apple/3.5.1/MODULE.bazel": "3d1bbf65ad3692003d36d8a29eff54d4e5c1c5f4bfb60f79e28646a924d9101c",
+    "https://bcr.bazel.build/modules/rules_apple/4.3.3/MODULE.bazel": "c5c2c4adeeac5f3f2f9b7f16abfa8be7ffefa596171d0d92bed4cae9ade0a498",
+    "https://bcr.bazel.build/modules/rules_apple/4.3.3/source.json": "3cb1d69c8243ffcc42ecbf84ae8b9cccd7b1e2f091b0aee5a3e9c9a45267f312",
    "https://bcr.bazel.build/modules/rules_buf/0.1.1/MODULE.bazel": "6189aec18a4f7caff599ad41b851ab7645d4f1e114aa6431acf9b0666eb92162",
    "https://bcr.bazel.build/modules/rules_cc/0.0.1/MODULE.bazel": "cb2aa0747f84c6c3a78dad4e2049c154f08ab9d166b1273835a8174940365647",
    "https://bcr.bazel.build/modules/rules_cc/0.0.10/MODULE.bazel": "ec1705118f7eaedd6e118508d3d26deba2a4e76476ada7e0e3965211be012002",
@@ -313,7 +296,6 @@
    "https://bcr.bazel.build/modules/rules_go/0.59.0/MODULE.bazel": "b7e43e7414a3139a7547d1b4909b29085fbe5182b6c58cbe1ed4c6272815aeae",
    "https://bcr.bazel.build/modules/rules_go/0.59.0/source.json": "1df17bb7865cfc029492c30163cee891d0dd8658ea0d5bfdf252c4b6db5c1ef6",
    "https://bcr.bazel.build/modules/rules_java/4.0.0/MODULE.bazel": "5a78a7ae82cd1a33cef56dc578c7d2a46ed0dca12643ee45edbb8417899e6f74",
-    "https://bcr.bazel.build/modules/rules_java/5.1.0/MODULE.bazel": "324b6478b0343a3ce7a9add8586ad75d24076d6d43d2f622990b9c1cfd8a1b15",
    "https://bcr.bazel.build/modules/rules_java/5.3.5/MODULE.bazel": "a4ec4f2db570171e3e5eb753276ee4b389bae16b96207e9d3230895c99644b86",
    "https://bcr.bazel.build/modules/rules_java/5.5.0/MODULE.bazel": "486ad1aa15cdc881af632b4b1448b0136c76025a1fe1ad1b65c5899376b83a50",
    "https://bcr.bazel.build/modules/rules_java/6.0.0/MODULE.bazel": "8a43b7df601a7ec1af61d79345c17b31ea1fedc6711fd4abfd013ea612978e39",
@@ -391,18 +373,18 @@
    "https://bcr.bazel.build/modules/rules_python/0.23.1/MODULE.bazel": "49ffccf0511cb8414de28321f5fcf2a31312b47c40cc21577144b7447f2bf300",
    "https://bcr.bazel.build/modules/rules_python/0.25.0/MODULE.bazel": "72f1506841c920a1afec76975b35312410eea3aa7b63267436bfb1dd91d2d382",
    "https://bcr.bazel.build/modules/rules_python/0.28.0/MODULE.bazel": "cba2573d870babc976664a912539b320cbaa7114cd3e8f053c720171cde331ed",
-    "https://bcr.bazel.build/modules/rules_python/0.29.0/MODULE.bazel": "2ac8cd70524b4b9ec49a0b8284c79e4cd86199296f82f6e0d5da3f783d660c82",
    "https://bcr.bazel.build/modules/rules_python/0.31.0/MODULE.bazel": "93a43dc47ee570e6ec9f5779b2e64c1476a6ce921c48cc9a1678a91dd5f8fd58",
-    "https://bcr.bazel.build/modules/rules_python/0.32.2/MODULE.bazel": "01052470fc30b49de91fb8483d26bea6f664500cfad0b078d4605b03e3a83ed4",
    "https://bcr.bazel.build/modules/rules_python/0.33.2/MODULE.bazel": "3e036c4ad8d804a4dad897d333d8dce200d943df4827cb849840055be8d2e937",
    "https://bcr.bazel.build/modules/rules_python/0.37.1/MODULE.bazel": "3faeb2d9fa0a81f8980643ee33f212308f4d93eea4b9ce6f36d0b742e71e9500",
    "https://bcr.bazel.build/modules/rules_python/0.37.2/MODULE.bazel": "b5ffde91410745750b6c13be1c5dc4555ef5bc50562af4a89fd77807fdde626a",
    "https://bcr.bazel.build/modules/rules_python/0.4.0/MODULE.bazel": "9208ee05fd48bf09ac60ed269791cf17fb343db56c8226a720fbb1cdf467166c",
    "https://bcr.bazel.build/modules/rules_python/0.40.0/MODULE.bazel": "9d1a3cd88ed7d8e39583d9ffe56ae8a244f67783ae89b60caafc9f5cf318ada7",
    "https://bcr.bazel.build/modules/rules_python/1.0.0/MODULE.bazel": "898a3d999c22caa585eb062b600f88654bf92efb204fa346fb55f6f8edffca43",
+    "https://bcr.bazel.build/modules/rules_python/1.3.0/MODULE.bazel": "8361d57eafb67c09b75bf4bbe6be360e1b8f4f18118ab48037f2bd50aa2ccb13",
    "https://bcr.bazel.build/modules/rules_python/1.4.1/MODULE.bazel": "8991ad45bdc25018301d6b7e1d3626afc3c8af8aaf4bc04f23d0b99c938b73a6",
    "https://bcr.bazel.build/modules/rules_python/1.6.0/MODULE.bazel": "7e04ad8f8d5bea40451cf80b1bd8262552aa73f841415d20db96b7241bd027d8",
-    "https://bcr.bazel.build/modules/rules_python/1.6.0/source.json": "e980f654cf66ec4928672f41fc66c4102b5ea54286acf4aecd23256c84211be6",
+    "https://bcr.bazel.build/modules/rules_python/1.6.3/MODULE.bazel": "a7b80c42cb3de5ee2a5fa1abc119684593704fcd2fec83165ebe615dec76574f",
+    "https://bcr.bazel.build/modules/rules_python/1.6.3/source.json": "f0be74977e5604a6526c8a416cda22985093ff7d5d380d41722d7e44015cc419",
    "https://bcr.bazel.build/modules/rules_robolectric/4.14.1.2/MODULE.bazel": "d44fec647d0aeb67b9f3b980cf68ba634976f3ae7ccd6c07d790b59b87a4f251",
    "https://bcr.bazel.build/modules/rules_robolectric/4.14.1.2/source.json": "37c10335f2361c337c5c1f34ed36d2da70534c23088062b33a8bdaab68aa9dea",
    "https://bcr.bazel.build/modules/rules_rust/0.45.1/MODULE.bazel": "a69d0db3a958fab2c6520961e1b2287afcc8b36690fd31bbc4f6f7391397150d",
@@ -420,8 +402,10 @@
    "https://bcr.bazel.build/modules/rules_shell/0.5.0/MODULE.bazel": "8c8447370594d45539f66858b602b0bb2cb2d3401a4ebb9ad25830c59c0f366d",
    "https://bcr.bazel.build/modules/rules_shell/0.6.1/MODULE.bazel": "72e76b0eea4e81611ef5452aa82b3da34caca0c8b7b5c0c9584338aa93bae26b",
    "https://bcr.bazel.build/modules/rules_shell/0.6.1/source.json": "20ec05cd5e592055e214b2da8ccb283c7f2a421ea0dc2acbf1aa792e11c03d0c",
-    "https://bcr.bazel.build/modules/rules_swift/3.1.2/MODULE.bazel": "72c8f5cf9d26427cee6c76c8e3853eb46ce6b0412a081b2b6db6e8ad56267400",
-    "https://bcr.bazel.build/modules/rules_swift/3.1.2/source.json": "e85761f3098a6faf40b8187695e3de6d97944e98abd0d8ce579cb2daf6319a66",
+    "https://bcr.bazel.build/modules/rules_swift/1.16.0/MODULE.bazel": "4a09f199545a60d09895e8281362b1ff3bb08bbde69c6fc87aff5b92fcc916ca",
+    "https://bcr.bazel.build/modules/rules_swift/2.1.1/MODULE.bazel": "494900a80f944fc7aa61500c2073d9729dff0b764f0e89b824eb746959bc1046",
+    "https://bcr.bazel.build/modules/rules_swift/2.4.0/MODULE.bazel": "1639617eb1ede28d774d967a738b4a68b0accb40650beadb57c21846beab5efd",
+    "https://bcr.bazel.build/modules/rules_swift/2.4.0/source.json": "a6577f57f9febbdc015a01f2a8f3487422032f134d6c61d18ed8e8ca3b9acc7c",
    "https://bcr.bazel.build/modules/stardoc/0.5.0/MODULE.bazel": "f9f1f46ba8d9c3362648eea571c6f9100680efc44913618811b58cc9c02cd678",
    "https://bcr.bazel.build/modules/stardoc/0.5.1/MODULE.bazel": "1a05d92974d0c122f5ccf09291442580317cdd859f07a8655f1db9a60374f9f8",
    "https://bcr.bazel.build/modules/stardoc/0.5.3/MODULE.bazel": "c7f6948dae6999bf0db32c1858ae345f112cacf98f174c7a8bb707e41b974f1c",
@@ -432,8 +416,8 @@
    "https://bcr.bazel.build/modules/stardoc/0.7.1/MODULE.bazel": "3548faea4ee5dda5580f9af150e79d0f6aea934fc60c1cc50f4efdd9420759e7",
    "https://bcr.bazel.build/modules/stardoc/0.7.2/MODULE.bazel": "fc152419aa2ea0f51c29583fab1e8c99ddefd5b3778421845606ee628629e0e5",
    "https://bcr.bazel.build/modules/stardoc/0.7.2/source.json": "58b029e5e901d6802967754adf0a9056747e8176f017cfe3607c0851f4d42216",
-    "https://bcr.bazel.build/modules/swift_argument_parser/1.3.1.2/MODULE.bazel": "75aab2373a4bbe2a1260b9bf2a1ebbdbf872d3bd36f80bff058dccd82e89422f",
-    "https://bcr.bazel.build/modules/swift_argument_parser/1.3.1.2/source.json": "5fba48bbe0ba48761f9e9f75f92876cafb5d07c0ce059cc7a8027416de94a05b",
+    "https://bcr.bazel.build/modules/swift_argument_parser/1.3.1.1/MODULE.bazel": "5e463fbfba7b1701d957555ed45097d7f984211330106ccd1352c6e0af0dcf91",
+    "https://bcr.bazel.build/modules/swift_argument_parser/1.3.1.1/source.json": "32bd87e5f4d7acc57c5b2ff7c325ae3061d5e242c0c4c214ae87e0f1c13e54cb",
    "https://bcr.bazel.build/modules/tar.bzl/0.2.1/MODULE.bazel": "52d1c00a80a8cc67acbd01649e83d8dd6a9dc426a6c0b754a04fe8c219c76468",
    "https://bcr.bazel.build/modules/tar.bzl/0.5.1/MODULE.bazel": "7c2eb3dcfc53b0f3d6f9acdfd911ca803eaf92aadf54f8ca6e4c1f3aee288351",
    "https://bcr.bazel.build/modules/tar.bzl/0.6.0/MODULE.bazel": "a3584b4edcfafcabd9b0ef9819808f05b372957bbdff41601429d5fd0aac2e7c",
@@ -442,23 +426,18 @@
    "https://bcr.bazel.build/modules/toolchains_llvm/1.6.0/source.json": "6bd3ef95a288dd2bb1582eca332af850c9a5428a23bb92cb1c57c2dfe6cb7369",
    "https://bcr.bazel.build/modules/toolchains_protoc/0.5.0/MODULE.bazel": "e649dcd74790d8b186517588c827a777dfa67acfc4cbd733721c4be143ea107f",
    "https://bcr.bazel.build/modules/toolchains_protoc/0.5.0/source.json": "9152bf33827a44f796f94f486252fc0128d9efc2413246ebb09a234bb628a846",
-    "https://bcr.bazel.build/modules/upb/0.0.0-20211020-160625a/MODULE.bazel": "6cced416be2dc5b9c05efd5b997049ba795e5e4e6fafbe1624f4587767638928",
    "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/MODULE.bazel": "7298990c00040a0e2f121f6c32544bab27d4452f80d9ce51349b1a28f3005c43",
    "https://bcr.bazel.build/modules/upb/0.0.0-20230516-61a97ef/MODULE.bazel": "c0df5e35ad55e264160417fd0875932ee3c9dda63d9fccace35ac62f45e1b6f9",
-    "https://bcr.bazel.build/modules/upb/0.0.0-20230907-e7430e6/MODULE.bazel": "3a7dedadf70346e678dc059dbe44d05cbf3ab17f1ce43a1c7a42edc7cbf93fd9",
    "https://bcr.bazel.build/modules/xds/0.0.0-20240423-555b57e/MODULE.bazel": "cea509976a77e34131411684ef05a1d6ad194dd71a8d5816643bc5b0af16dc0f",
    "https://bcr.bazel.build/modules/xds/0.0.0-20240423-555b57e/source.json": "7227e1fcad55f3f3cab1a08691ecd753cb29cc6380a47bc650851be9f9ad6d20",
    "https://bcr.bazel.build/modules/yq.bzl/0.1.1/MODULE.bazel": "9039681f9bcb8958ee2c87ffc74bdafba9f4369096a2b5634b88abc0eaefa072",
    "https://bcr.bazel.build/modules/yq.bzl/0.1.1/source.json": "2d2bad780a9f2b9195a4a370314d2c17ae95eaa745cefc2e12fbc49759b15aa3",
    "https://bcr.bazel.build/modules/zlib/1.2.11/MODULE.bazel": "07b389abc85fdbca459b69e2ec656ae5622873af3f845e1c9d80fe179f3effa0",
    "https://bcr.bazel.build/modules/zlib/1.2.12/MODULE.bazel": "3b1a8834ada2a883674be8cbd36ede1b6ec481477ada359cd2d3ddc562340b27",
-    "https://bcr.bazel.build/modules/zlib/1.2.13/MODULE.bazel": "aa6deb1b83c18ffecd940c4119aff9567cd0a671d7bba756741cb2ef043a29d5",
    "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.1/MODULE.bazel": "6a9fe6e3fc865715a7be9823ce694ceb01e364c35f7a846bf0d2b34762bc066b",
-    "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.3/MODULE.bazel": "af322bc08976524477c79d1e45e241b6efbeb918c497e8840b8ab116802dda79",
    "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.5/MODULE.bazel": "eec517b5bbe5492629466e11dae908d043364302283de25581e3eb944326c4ca",
    "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.5/source.json": "22bc55c47af97246cfc093d0acf683a7869377de362b5d1c552c2c2e16b7a806",
-    "https://bcr.bazel.build/modules/zlib/1.3.1/MODULE.bazel": "751c9940dcfe869f5f7274e1295422a34623555916eb98c174c1e945594bf198",
-    "https://bcr.bazel.build/modules/zlib/1.3/MODULE.bazel": "6a9c02f19a24dcedb05572b2381446e27c272cd383aed11d41d99da9e3167a72"
+    "https://bcr.bazel.build/modules/zlib/1.3.1/MODULE.bazel": "751c9940dcfe869f5f7274e1295422a34623555916eb98c174c1e945594bf198"
  },
  "selectedYankedVersions": {},
  "moduleExtensions": {
@@ -1159,168 +1138,12 @@
    },
    "@@googleapis+//:extensions.bzl%switched_rules": {
      "general": {
-        "bzlTransitiveDigest": "vG6fuTzXD8MMvHWZEQud0MMH7eoC4GXY0va7VrFFh04=",
-        "usagesDigest": "tB2/BAROtqvrfaBweAJxJpqqnx85mOx/aupy9bEK4Ss=",
+        "bzlTransitiveDigest": "liqpEiZfQn8ycdEspyJt6J+baY9GQOl+9/prJJz2wTA=",
+        "usagesDigest": "AtKnJVSfl4DFbEt1Zhzwc971VYZMgmyRYK8WMKrwA7o=",
        "recordedFileInputs": {},
        "recordedDirentsInputs": {},
        "envVariables": {},
-        "generatedRepoSpecs": {
-          "com_google_googleapis_imports": {
-            "repoRuleId": "@@googleapis+//:repository_rules.bzl%switched_rules",
-            "attributes": {
-              "rules": {
-                "proto_library_with_info": [
-                  "",
-                  ""
-                ],
-                "moved_proto_library": [
-                  "",
-                  ""
-                ],
-                "java_proto_library": [
-                  "",
-                  ""
-                ],
-                "java_grpc_library": [
-                  "",
-                  ""
-                ],
-                "java_gapic_library": [
-                  "",
-                  ""
-                ],
-                "java_gapic_test": [
-                  "",
-                  ""
-                ],
-                "java_gapic_assembly_gradle_pkg": [
-                  "",
-                  ""
-                ],
-                "py_proto_library": [
-                  "",
-                  ""
-                ],
-                "py_grpc_library": [
-                  "",
-                  ""
-                ],
-                "py_gapic_library": [
-                  "",
-                  ""
-                ],
-                "py_test": [
-                  "",
-                  ""
-                ],
-                "py_gapic_assembly_pkg": [
-                  "",
-                  ""
-                ],
-                "py_import": [
-                  "",
-                  ""
-                ],
-                "go_proto_library": [
-                  "",
-                  ""
-                ],
-                "go_grpc_library": [
-                  "",
-                  ""
-                ],
-                "go_library": [
-                  "",
-                  ""
-                ],
-                "go_test": [
-                  "",
-                  ""
-                ],
-                "go_gapic_library": [
-                  "",
-                  ""
-                ],
-                "go_gapic_assembly_pkg": [
-                  "",
-                  ""
-                ],
-                "cc_proto_library": [
-                  "",
-                  ""
-                ],
-                "cc_grpc_library": [
-                  "",
-                  ""
-                ],
-                "cc_gapic_library": [
-                  "",
-                  ""
-                ],
-                "php_proto_library": [
-                  "",
-                  "php_proto_library"
-                ],
-                "php_grpc_library": [
-                  "",
-                  "php_grpc_library"
-                ],
-                "php_gapic_library": [
-                  "",
-                  "php_gapic_library"
-                ],
-                "php_gapic_assembly_pkg": [
-                  "",
-                  "php_gapic_assembly_pkg"
-                ],
-                "nodejs_gapic_library": [
-                  "",
-                  "typescript_gapic_library"
-                ],
-                "nodejs_gapic_assembly_pkg": [
-                  "",
-                  "typescript_gapic_assembly_pkg"
-                ],
-                "ruby_proto_library": [
-                  "",
-                  ""
-                ],
-                "ruby_grpc_library": [
-                  "",
-                  ""
-                ],
-                "ruby_ads_gapic_library": [
-                  "",
-                  ""
-                ],
-                "ruby_cloud_gapic_library": [
-                  "",
-                  ""
-                ],
-                "ruby_gapic_assembly_pkg": [
-                  "",
-                  ""
-                ],
-                "csharp_proto_library": [
-                  "",
-                  ""
-                ],
-                "csharp_grpc_library": [
-                  "",
-                  ""
-                ],
-                "csharp_gapic_library": [
-                  "",
-                  ""
-                ],
-                "csharp_gapic_assembly_pkg": [
-                  "",
-                  ""
-                ]
-              }
-            }
-          }
-        },
+        "generatedRepoSpecs": {},
        "recordedRepoMappingEntries": []
      }
    },
@@ -1420,34 +1243,6 @@
        "recordedRepoMappingEntries": []
      }
    },
-    "@@rules_apple+//apple:extensions.bzl%non_module_deps": {
-      "general": {
-        "bzlTransitiveDigest": "UsflLeiazyu2v5pvibcvOeIdDV95S25rT96h4XU1nhY=",
-        "usagesDigest": "M3VqFpeTCo4qmrNKGZw0dxBHvTYDrfV3cscGzlSAhQ4=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "xctestrunner": {
-            "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
-            "attributes": {
-              "urls": [
-                "https://github.com/google/xctestrunner/archive/b7698df3d435b6491b4b4c0f9fc7a63fbed5e3a6.tar.gz"
-              ],
-              "strip_prefix": "xctestrunner-b7698df3d435b6491b4b4c0f9fc7a63fbed5e3a6",
-              "sha256": "ae3a063c985a8633cb7eb566db21656f8db8eb9a0edb8c182312c7f0db53730d"
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "rules_apple+",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    },
    "@@rules_dotnet+//dotnet:extensions.bzl%dotnet": {
      "general": {
        "bzlTransitiveDigest": "fd+R6GHICVvxgxz6YGDAcp7EbUx26nq9MWH1unOHz9I=",
@@ -2398,7 +2193,7 @@
    "@@rules_python+//python/uv:uv.bzl%uv": {
      "general": {
        "bzlTransitiveDigest": "8vT1ddXtljNxYD0tJkksqzeKE6xqx4Ix+tXthAppjTI=",
-        "usagesDigest": "p80sy6cYQuWxx5jhV3fOTu+N9EyIUFG9+F7UC/nhXic=",
+        "usagesDigest": "icnInV8HDGrRQf9x8RMfxWfBHgT3OgRlYovS/9POEJw=",
        "recordedFileInputs": {},
        "recordedDirentsInputs": {},
        "envVariables": {},
@@ -3733,6 +3528,160 @@
          ]
        ]
      }
+    },
+    "@@rules_swift+//swift:extensions.bzl%non_module_deps": {
+      "general": {
+        "bzlTransitiveDigest": "gITmwZkwiDAjxHDTZA8AxJiD5JGajyGl/ExE3dyszB0=",
+        "usagesDigest": "9w18ec4dj90mX/JqpR2tBU2YVc1GU9yNxi/d7q6lLVA=",
+        "recordedFileInputs": {},
+        "recordedDirentsInputs": {},
+        "envVariables": {},
+        "generatedRepoSpecs": {
+          "com_github_apple_swift_protobuf": {
+            "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+            "attributes": {
+              "urls": [
+                "https://github.com/apple/swift-protobuf/archive/1.20.2.tar.gz"
+              ],
+              "sha256": "3fb50bd4d293337f202d917b6ada22f9548a0a0aed9d9a4d791e6fbd8a246ebb",
+              "strip_prefix": "swift-protobuf-1.20.2/",
+              "build_file": "@@rules_swift+//third_party:com_github_apple_swift_protobuf/BUILD.overlay"
+            }
+          },
+          "com_github_grpc_grpc_swift": {
+            "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+            "attributes": {
+              "urls": [
+                "https://github.com/grpc/grpc-swift/archive/1.16.0.tar.gz"
+              ],
+              "sha256": "58b60431d0064969f9679411264b82e40a217ae6bd34e17096d92cc4e47556a5",
+              "strip_prefix": "grpc-swift-1.16.0/",
+              "build_file": "@@rules_swift+//third_party:com_github_grpc_grpc_swift/BUILD.overlay"
+            }
+          },
+          "com_github_apple_swift_docc_symbolkit": {
+            "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+            "attributes": {
+              "urls": [
+                "https://github.com/apple/swift-docc-symbolkit/archive/refs/tags/swift-5.10-RELEASE.tar.gz"
+              ],
+              "sha256": "de1d4b6940468ddb53b89df7aa1a81323b9712775b0e33e8254fa0f6f7469a97",
+              "strip_prefix": "swift-docc-symbolkit-swift-5.10-RELEASE",
+              "build_file": "@@rules_swift+//third_party:com_github_apple_swift_docc_symbolkit/BUILD.overlay"
+            }
+          },
+          "com_github_apple_swift_nio": {
+            "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+            "attributes": {
+              "urls": [
+                "https://github.com/apple/swift-nio/archive/2.42.0.tar.gz"
+              ],
+              "sha256": "e3304bc3fb53aea74a3e54bd005ede11f6dc357117d9b1db642d03aea87194a0",
+              "strip_prefix": "swift-nio-2.42.0/",
+              "build_file": "@@rules_swift+//third_party:com_github_apple_swift_nio/BUILD.overlay"
+            }
+          },
+          "com_github_apple_swift_nio_http2": {
+            "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+            "attributes": {
+              "urls": [
+                "https://github.com/apple/swift-nio-http2/archive/1.26.0.tar.gz"
+              ],
+              "sha256": "f0edfc9d6a7be1d587e5b403f2d04264bdfae59aac1d74f7d974a9022c6d2b25",
+              "strip_prefix": "swift-nio-http2-1.26.0/",
+              "build_file": "@@rules_swift+//third_party:com_github_apple_swift_nio_http2/BUILD.overlay"
+            }
+          },
+          "com_github_apple_swift_nio_transport_services": {
+            "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+            "attributes": {
+              "urls": [
+                "https://github.com/apple/swift-nio-transport-services/archive/1.15.0.tar.gz"
+              ],
+              "sha256": "f3498dafa633751a52b9b7f741f7ac30c42bcbeb3b9edca6d447e0da8e693262",
+              "strip_prefix": "swift-nio-transport-services-1.15.0/",
+              "build_file": "@@rules_swift+//third_party:com_github_apple_swift_nio_transport_services/BUILD.overlay"
+            }
+          },
+          "com_github_apple_swift_nio_extras": {
+            "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+            "attributes": {
+              "urls": [
+                "https://github.com/apple/swift-nio-extras/archive/1.4.0.tar.gz"
+              ],
+              "sha256": "4684b52951d9d9937bb3e8ccd6b5daedd777021ef2519ea2f18c4c922843b52b",
+              "strip_prefix": "swift-nio-extras-1.4.0/",
+              "build_file": "@@rules_swift+//third_party:com_github_apple_swift_nio_extras/BUILD.overlay"
+            }
+          },
+          "com_github_apple_swift_log": {
+            "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+            "attributes": {
+              "urls": [
+                "https://github.com/apple/swift-log/archive/1.4.4.tar.gz"
+              ],
+              "sha256": "48fe66426c784c0c20031f15dc17faf9f4c9037c192bfac2f643f65cb2321ba0",
+              "strip_prefix": "swift-log-1.4.4/",
+              "build_file": "@@rules_swift+//third_party:com_github_apple_swift_log/BUILD.overlay"
+            }
+          },
+          "com_github_apple_swift_nio_ssl": {
+            "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+            "attributes": {
+              "urls": [
+                "https://github.com/apple/swift-nio-ssl/archive/2.23.0.tar.gz"
+              ],
+              "sha256": "4787c63f61dd04d99e498adc3d1a628193387e41efddf8de19b8db04544d016d",
+              "strip_prefix": "swift-nio-ssl-2.23.0/",
+              "build_file": "@@rules_swift+//third_party:com_github_apple_swift_nio_ssl/BUILD.overlay"
+            }
+          },
+          "com_github_apple_swift_collections": {
+            "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+            "attributes": {
+              "urls": [
+                "https://github.com/apple/swift-collections/archive/1.0.4.tar.gz"
+              ],
+              "sha256": "d9e4c8a91c60fb9c92a04caccbb10ded42f4cb47b26a212bc6b39cc390a4b096",
+              "strip_prefix": "swift-collections-1.0.4/",
+              "build_file": "@@rules_swift+//third_party:com_github_apple_swift_collections/BUILD.overlay"
+            }
+          },
+          "com_github_apple_swift_atomics": {
+            "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+            "attributes": {
+              "urls": [
+                "https://github.com/apple/swift-atomics/archive/1.1.0.tar.gz"
+              ],
+              "sha256": "1bee7f469f7e8dc49f11cfa4da07182fbc79eab000ec2c17bfdce468c5d276fb",
+              "strip_prefix": "swift-atomics-1.1.0/",
+              "build_file": "@@rules_swift+//third_party:com_github_apple_swift_atomics/BUILD.overlay"
+            }
+          },
+          "build_bazel_rules_swift_index_import": {
+            "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+            "attributes": {
+              "build_file": "@@rules_swift+//third_party:build_bazel_rules_swift_index_import/BUILD.overlay",
+              "canonical_id": "index-import-5.8",
+              "urls": [
+                "https://github.com/MobileNativeFoundation/index-import/releases/download/5.8.0.1/index-import.tar.gz"
+              ],
+              "sha256": "28c1ffa39d99e74ed70623899b207b41f79214c498c603915aef55972a851a15"
+            }
+          },
+          "build_bazel_rules_swift_local_config": {
+            "repoRuleId": "@@rules_swift+//swift/internal:swift_autoconfiguration.bzl%swift_autoconfiguration",
+            "attributes": {}
+          }
+        },
+        "recordedRepoMappingEntries": [
+          [
+            "rules_swift+",
+            "bazel_tools",
+            "bazel_tools"
+          ]
+        ]
+      }
    }
  },
  "facts": {
@@ -243,6 +243,13 @@ pkg_tar(
    package_dir = "/app",
 )

+# Package the .e0mj map files for the map editor
+pkg_tar(
+    name = "admin_maps_layer",
+    srcs = ["//src/main/resources/net/eagle0/shardok/maps:maps_json"],
+    package_dir = "/app/maps",
+)
+
 oci_image(
    name = "admin_server_image",
    base = "@alpine_linux_linux_amd64",
@@ -251,6 +258,7 @@ oci_image(
    tars = [
        ":busybox_layer",
        ":admin_binary_layer",
+        ":admin_maps_layer",
    ],
    workdir = "/app",
 )
@@ -40,6 +40,19 @@ if [ -f "$INFO_PLIST" ]; then
    /usr/libexec/PlistBuddy -c "Set :ITSAppUsesNonExemptEncryption false" "$INFO_PLIST" 2>/dev/null \
        || /usr/libexec/PlistBuddy -c "Add :ITSAppUsesNonExemptEncryption bool false" "$INFO_PLIST"
    echo "Set ITSAppUsesNonExemptEncryption=false in Info.plist"
+
+    # Remove UIApplicationSceneManifest if present.
+    # Unity 6 generates this key, which opts the app into the iOS scene-based
+    # lifecycle. This breaks Application.deepLinkActivated because iOS routes
+    # deep link URLs through UISceneDelegate instead of UIApplicationDelegate,
+    # and Unity doesn't implement the scene delegate path.
+    # See: https://issuetracker.unity3d.com/issues/in-135632
+    if /usr/libexec/PlistBuddy -c "Print :UIApplicationSceneManifest" "$INFO_PLIST" 2>/dev/null; then
+        echo "Found UIApplicationSceneManifest in Info.plist — removing to fix deep link handling"
+        /usr/libexec/PlistBuddy -c "Delete :UIApplicationSceneManifest" "$INFO_PLIST"
+    else
+        echo "No UIApplicationSceneManifest in Info.plist (deep links should work)"
+    fi
 fi

 # Unity always generates "Unity-iPhone" as the main app scheme
@@ -88,6 +101,16 @@ EOF

 echo "Exporting IPA..."

+# Restore keychain search list before export.
+# xcodebuild archive can reset the user keychain search list during long
+# builds, dropping the temporary CI keychain that holds the signing cert.
+# Re-add it here so xcodebuild -exportArchive can find the certificate.
+if [ -n "${KEYCHAIN_NAME:-}" ]; then
+    echo "Restoring keychain search list (adding $KEYCHAIN_NAME)"
+    security list-keychains -d user -s "$KEYCHAIN_NAME" login.keychain
+    security unlock-keychain -p "$KEYCHAIN_PASSWORD" "$KEYCHAIN_NAME"
+fi
+
 # Debug: List available keychains and signing identities
 echo "=== Debug: Available keychains ==="
 security list-keychains -d user
@@ -97,11 +120,24 @@ echo "=== Debug: Export options plist ==="
 cat "$EXPORT_OPTIONS_PLIST"
 echo "=== End debug ==="

-# Export IPA (removed -allowProvisioningUpdates as we're using manual signing)
+# Export IPA with App Store Connect API key authentication.
+# Without the API key, xcodebuild falls back to the Xcode-Token in the
+# keychain, which expires periodically and breaks headless CI builds.
+EXPORT_AUTH_ARGS=()
+if [ -n "${APP_STORE_CONNECT_API_KEY_PATH:-}" ] && [ -n "${APP_STORE_CONNECT_API_KEY_ID:-}" ] && [ -n "${APP_STORE_CONNECT_API_ISSUER_ID:-}" ]; then
+    echo "Using App Store Connect API key for export authentication"
+    EXPORT_AUTH_ARGS=(
+        -authenticationKeyPath "$APP_STORE_CONNECT_API_KEY_PATH"
+        -authenticationKeyID "$APP_STORE_CONNECT_API_KEY_ID"
+        -authenticationKeyIssuerID "$APP_STORE_CONNECT_API_ISSUER_ID"
+    )
+fi
+
 xcodebuild -exportArchive \
    -archivePath "$ARCHIVE_PATH" \
    -exportPath "$EXPORT_PATH" \
-    -exportOptionsPlist "$EXPORT_OPTIONS_PLIST"
+    -exportOptionsPlist "$EXPORT_OPTIONS_PLIST" \
+    "${EXPORT_AUTH_ARGS[@]}"

 # Find and rename the IPA to a consistent name
 IPA_FILE=$(find "$EXPORT_PATH" -name "*.ipa" | head -1)
@@ -111,3 +147,9 @@ fi

 echo "Export complete: $EXPORT_PATH/eagle0.ipa"
 ls -la "$EXPORT_PATH"
+
+# Clean up DerivedData for Unity-iPhone builds.
+# Each build creates a new ~3.6GB folder (Unity-iPhone-<random>) that
+# accumulates and wastes disk space on the build runner.
+echo "Cleaning up Unity-iPhone DerivedData..."
+find ~/Library/Developer/Xcode/DerivedData -maxdepth 1 -name 'Unity-iPhone-*' -type d -exec rm -rf {} + 2>/dev/null || true
@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-
-# Build iOS Addressables only (no player build)
-# This switches Unity to iOS target and builds addressables for CDN upload
-
-set -euxo pipefail
-
-# Read Unity version from project file
-UNITY_VERSION=$(grep "m_EditorVersion:" src/main/csharp/net/eagle0/clients/unity/eagle0/ProjectSettings/ProjectVersion.txt | head -1 | sed 's/m_EditorVersion: //')
-
-# Use runner-specific build directory if EAGLE0_BUILD_DIR is set, otherwise default
-BUILD_BASE="${EAGLE0_BUILD_DIR:-/tmp/eagle0}"
-
-WORKSPACE=$(pwd)
-
-echo "Building protos"
-./scripts/build_protos.sh
-UNITY_INSTALL_PATH="/Applications/Unity/Hub/Editor"
-LOG_PATH=${1:-"${BUILD_BASE}/editor_ios_addressables.log"}
-
-echo "Building iOS Addressables"
-
-mkdir -p "$(dirname "$LOG_PATH")"
-
-# Build Addressables for iOS target
-# Uses BuildiOSAddressables which explicitly switches build target
-# Capture exit code to show log on failure
-set +e
-${UNITY_INSTALL_PATH}/${UNITY_VERSION}/Unity.app/Contents/MacOS/Unity \
-   -nographics \
-   -batchmode \
-   -quit \
-   -executeMethod BuildScript.BuildiOSAddressables \
-   -logFile "$LOG_PATH" \
-   -projectPath "$WORKSPACE/src/main/csharp/net/eagle0/clients/unity/eagle0"
-UNITY_EXIT_CODE=$?
-set -e
-
-if [ $UNITY_EXIT_CODE -ne 0 ]; then
-    echo ""
-    echo "Unity build failed with exit code $UNITY_EXIT_CODE"
-    echo "=== Unity Editor Log (last 200 lines) ==="
-    tail -200 "$LOG_PATH" || echo "Could not read log file at $LOG_PATH"
-    echo "=== End of Unity Editor Log ==="
-    exit $UNITY_EXIT_CODE
-fi
-
-echo "iOS Addressables build complete"
-echo "Bundles should be in: $WORKSPACE/src/main/csharp/net/eagle0/clients/unity/eagle0/ServerData/iOS/"
@@ -38,3 +38,19 @@ if [ $UNITY_EXIT_CODE -ne 0 ]; then
    echo "=== End of Unity Editor Log ==="
    exit $UNITY_EXIT_CODE
 fi
+
+# Fail the build if any prefab references are broken — this produces a player
+# that launches but has null Inspector fields, which is hard to debug.
+if grep -q "Missing Prefab" "$LOG_PATH"; then
+    echo ""
+    echo "ERROR: Build has missing prefab references (likely stale Library cache):"
+    grep "Missing Prefab" "$LOG_PATH"
+    exit 1
+fi
+
+if grep -q "Build asset version error" "$LOG_PATH"; then
+    echo ""
+    echo "ERROR: Build has asset version mismatches (likely stale Library cache):"
+    grep "Build asset version error" "$LOG_PATH" | head -5
+    exit 1
+fi
@@ -53,6 +53,22 @@ if [ $UNITY_EXIT_CODE -ne 0 ]; then
    exit $UNITY_EXIT_CODE
 fi

+# Fail the build if any prefab references are broken — this produces a player
+# that launches but has null Inspector fields, which is hard to debug.
+if grep -q "Missing Prefab" "$LOG_PATH"; then
+    echo ""
+    echo "ERROR: Build has missing prefab references (likely stale Library cache):"
+    grep "Missing Prefab" "$LOG_PATH"
+    exit 1
+fi
+
+if grep -q "Build asset version error" "$LOG_PATH"; then
+    echo ""
+    echo "ERROR: Build has asset version mismatches (likely stale Library cache):"
+    grep "Build asset version error" "$LOG_PATH" | head -5
+    exit 1
+fi
+
 echo "iOS Unity build complete"
 echo "Xcode project generated at: $BUILD_PATH"
 ls -la "$BUILD_PATH"
@@ -38,3 +38,19 @@ if [ $UNITY_EXIT_CODE -ne 0 ]; then
    echo "=== End of Unity Editor Log ==="
    exit $UNITY_EXIT_CODE
 fi
+
+# Fail the build if any prefab references are broken — this produces a player
+# that launches but has null Inspector fields, which is hard to debug.
+if grep -q "Missing Prefab" "$LOG_PATH"; then
+    echo ""
+    echo "ERROR: Build has missing prefab references (likely stale Library cache):"
+    grep "Missing Prefab" "$LOG_PATH"
+    exit 1
+fi
+
+if grep -q "Build asset version error" "$LOG_PATH"; then
+    echo ""
+    echo "ERROR: Build has asset version mismatches (likely stale Library cache):"
+    grep "Build asset version error" "$LOG_PATH" | head -5
+    exit 1
+fi
@@ -0,0 +1,35 @@
+#!/bin/bash
+# Fetch LFS files from Gitea mirror with retry.
+#
+# Gitea's mirror-sync API is async — the webhook fires on push but the
+# actual sync may still be in progress when CI starts. Retry with backoff
+# to bridge the gap.
+#
+# Usage:
+#   ./ci/github_actions/fetch_lfs.sh                          # full pull
+#   ./ci/github_actions/fetch_lfs.sh --include="path/to/*"    # selective pull
+
+set -euo pipefail
+
+MAX_ATTEMPTS=5
+RETRY_DELAY=15
+
+git lfs install
+
+echo "LFS objects before pull:"
+git lfs ls-files | wc -l
+
+for i in $(seq 1 $MAX_ATTEMPTS); do
+    if git lfs pull "$@"; then
+        echo "LFS objects after pull:"
+        git lfs ls-files | wc -l
+        exit 0
+    fi
+    if [ "$i" -lt "$MAX_ATTEMPTS" ]; then
+        echo "LFS pull attempt $i/$MAX_ATTEMPTS failed, retrying in ${RETRY_DELAY}s..."
+        sleep $RETRY_DELAY
+    fi
+done
+
+echo "LFS pull failed after $MAX_ATTEMPTS attempts"
+exit 1
@@ -208,6 +208,8 @@ services:
      - "${JFR_SIDECAR_ADDR:-jfr-sidecar:8081}"  # Can be switched for blue-green
      - "--http-port"
      - "8080"
+      - "--maps-dir"
+      - "/app/maps"
    environment:
      # Secret for CI to authenticate client update notifications
      NOTIFY_SECRET: "${NOTIFY_SECRET:-}"
@@ -215,6 +217,10 @@ services:
      DO_SPACES_ENDPOINT: "${DO_SPACES_ENDPOINT:-https://sfo3.digitaloceanspaces.com}"
      DO_SPACES_ACCESS_KEY: "${ADMIN_S3_ACCESS_KEY:-}"
      DO_SPACES_SECRET_KEY: "${ADMIN_S3_SECRET_KEY:-}"
+      # GitHub PAT for map editor PR creation (scoped to contents:write + pull_requests:write)
+      GITHUB_TOKEN: "${GITHUB_TOKEN:-}"
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
    # No external port - accessed via nginx at admin.eagle0.net
    depends_on:
      - auth
@@ -0,0 +1,281 @@
+# Allied Victory: Battle Resolution Flow
+
+How allied victories work end-to-end, from Shardok tactical resolution through Eagle strategic
+processing to player-facing aftermath decisions.
+
+## 1. Battle Setup (Eagle -> Shardok)
+
+When Eagle sends a battle to Shardok via `RequestBattlesAction`, each player gets specific victory
+conditions:
+
+| Player      | Victory Conditions                                                    |
+|-------------|-----------------------------------------------------------------------|
+| Attacker(s) | `HoldsCriticalTiles`, `LastPlayerStanding`, `LastAllianceStanding`     |
+| Defender    | `LastPlayerStanding`, `WinAfterMaxRounds`                              |
+
+This is set in `RequestBattlesAction.shardokPlayers`.
+
+Alliance information is sent separately in `PlayerSetupInfo.allies`. Eagle reads each player's
+`factionRelationships` and includes all non-HOSTILE factions as allies
+(`ShardokInterfaceGrpcClient.scala:75-80`).
+
+## 2. Victory Condition Evaluation (Shardok)
+
+Victory conditions are checked in `UpdateGameStatusAction.cpp` in priority order:
+
+### Check 1: LastPlayerStanding (any time)
+
+If exactly **one** player has surviving units and has `LastPlayerStanding`:
+- That player is the sole winner.
+- This applies to solo victories only (1 survivor).
+
+### Check 2: LastAllianceStanding (any time)
+
+If **multiple** players survive, check if they form a winning alliance:
+- ALL survivors must have `LastAllianceStanding` condition
+- ALL survivors must be **mutually** allied (every pair checks both directions)
+- If yes: all survivors are winners
+
+This triggers for AssaultProvince battles when allied attackers eliminate all defenders. Since the
+defender does **not** have `LastAllianceStanding`, the check correctly requires that only the
+allied attackers remain alive.
+
+### Check 3: WinAfterMaxRounds (end-of-round only)
+
+If the round counter exceeds `max_rounds`:
+- Find the player with `WinAfterMaxRounds` (always the defender)
+- That player wins, even if they have no surviving units
+- Eagle validates exactly 1 player has this condition (`internalRequire` in `RequestBattlesAction`)
+
+### Check 4: HoldsCriticalTiles (end-of-round only)
+
+**Single-player castle control**: If one player with `HoldsCriticalTiles` occupies ALL critical
+tiles with hero-bearing units, that player wins. Additionally, any other player who:
+- Has `HoldsCriticalTiles`
+- Is **mutually** allied with the castle holder
+
+is also added to `winning_shardok_ids` as a co-winner.
+
+**Allied castle control**: If multiple players collectively occupy all critical tiles with
+hero-bearing units, AND:
+- All occupants have `HoldsCriticalTiles`
+- All occupants are mutually allied
+
+Then all occupants are winners together.
+
+## 3. EndGameCondition Assignment Per Player (Shardok -> Eagle)
+
+Shardok assigns each player a `Victory` or `Loss`. All winners receive `Victory`; there is no
+`AllyVictory` distinction. The `EndGameCondition` proto reserves fields 2 (`ally_victory`) and
+3 (`draw`) for backwards compatibility but Eagle rejects both.
+
+`GameOverResponsePopulator` validates that any player allied to a winner is also in
+`winning_shardok_ids`. If an ally is missing from the winners list, it throws an internal error.
+
+**Known issue**: This validation is too strict for `LastPlayerStanding`. When one allied attacker
+is the sole survivor, their dead co-attacker is allied to the winner but legitimately not in
+`winning_shardok_ids` (they're dead). The throw should be changed to `Loss` for dead allies, or
+the check should only apply when the ally has surviving units.
+
+| Condition | Criterion |
+|-----------|-----------|
+| `Victory(type)` | Player is in `winning_shardok_ids` |
+| `Loss(type)` | Player is not in `winning_shardok_ids` |
+
+The `type` is the VictoryCondition that caused the game to end (e.g., `HoldsCriticalTiles`).
+
+### When do multiple players get Victory?
+
+In standard AssaultProvince battles:
+
+1. **Allied attackers jointly hold all castles** -> both get `Victory(HoldsCriticalTiles)`.
+
+2. **One attacker holds all castles alone, ally has `HoldsCriticalTiles` and is mutually allied**
+   -> both get `Victory(HoldsCriticalTiles)`. The ally is added to `winning_shardok_ids` by
+   `UpdateGameStatusAction`.
+
+3. **Allied attackers eliminate all defenders** -> both get `Victory(LastAllianceStanding)`.
+   This triggers because both have `LastAllianceStanding` and are mutually allied.
+
+4. **One attacker holds all castles, co-attacker is NOT allied** -> only the castle holder
+   gets `Victory(HoldsCriticalTiles)`; the non-allied co-attacker gets `Loss`.
+
+## 4. Eagle Processes Battle Results
+
+`ResolveBattleAction.scala` receives `BattleResolution` containing each player's
+`EndGameCondition` and resolved units.
+
+### Winner/Loser Partition
+
+Players are split by `isVictory` (line 383-386):
+- `winningResolvedPlayers`: Victory
+- `losingResolvedPlayers`: Loss
+
+### The `unitReturned` Function (line 765-788)
+
+Determines which units go home vs stay at the battle province:
+
+| Unit Status   | Returned? | Notes |
+|---------------|-----------|-------|
+| `Fled`        | Always    | Sent to their army's flee province |
+| `NeverEntered`| Conditional | Only if: attacker AND has flee province AND did NOT win (`!isVictory`) |
+| `Captured`    | Never     | |
+| `Normal`      | Never     | |
+| `Retreated`   | Never     | |
+| `Outlawed`    | Never     | Becomes unaffiliated hero |
+
+Key point: `NeverEntered` units from **winning** factions stay at the battle province rather than
+being sent home. This is important for bounced co-attackers who are allied with the actual winner.
+
+### Withdrawn/Fled Unit Routing (line 690-706)
+
+For units that ARE returned, `armyFromResolvedArmy` builds a returning army with
+`fleeProvinceId = None`. If the army has no `fleeProvinceId`, it becomes "shattered" (units
+become outlaws in the battle province). If the original army had a `fleeProvinceId` set, returned
+units are sent there as incoming armies.
+
+### Battle Resolution Branching (line 397-552)
+
+Three branches based on who won:
+
+#### Branch A: Defender Won
+
+Triggered when: `winningShardokPlayers.exists(_.isDefender)`
+
+- Executes `ProvinceHeldAction`
+- All non-defender, non-returned, non-outlawed units are **captured**
+- Province stays with the defending faction
+
+#### Branch B: Single Attacker Won
+
+Triggered when: exactly 1 attacking winner
+
+- Executes `ProvinceConqueredAction` immediately
+- Winning attacker's non-fled units occupy the province
+- Losing defenders' non-fled units are captured
+- Province transfers to the attacker
+
+#### Branch C: Multiple Allied Attackers Won
+
+Triggered when: 2+ attacking winners
+
+- Executes `MultiVictorBattleSetupAction`
+- Creates `PendingConquestInfo` with aftermath claimants
+- Province enters the **Battle Aftermath** phase
+
+## 5. Battle Aftermath (Multi-Victor Only)
+
+When multiple allied attackers win, the province enters an aftermath decision phase where players
+decide who keeps it.
+
+### Claimant Setup
+
+Each attacking winner becomes an `AftermathClaimant` with:
+- `units`: their non-fled, non-outlawed units still at the battle province
+- `armySize`: total troop count of those units
+- `broughtGold` / `broughtFood`: supplies their armies carried
+
+Claimants are **sorted by army size descending** (largest army decides first).
+
+### Decision Phase
+
+Claimants are presented with a choice **one at a time**, in order:
+
+**If no one has chosen "Keep" yet:**
+- **Keep Province**: claim the province for your faction
+- **Withdraw To**: pick an adjacent province to march your army to, optionally carrying up to
+  the gold/food you brought
+
+**If someone already chose "Keep":**
+- **Withdraw To** is the only option (can't have two keepers)
+
+**Last undecided claimant:**
+- If no one has chosen "Keep" yet, the last claimant **automatically keeps** (no command shown,
+  resolved by `AutoResolveBattleAftermathAction`)
+- This guarantees someone always claims the province
+
+### Finalization
+
+Once all claimants have decided (`FinalizeAftermathAction`):
+
+1. The keeper's units run through `ProvinceConqueredAction` -- province transfers to their faction
+2. Withdrawing claimants' units become incoming armies to their chosen adjacent province,
+   arriving next round, carrying the specified supplies
+3. `PendingConquestInfo` is cleared from the province
+
+## 6. Summary: Who Gets What
+
+### Two allied attackers jointly hold all castles
+- Shardok: Both get `Victory(HoldsCriticalTiles)` (both in `winning_shardok_ids`)
+- Eagle: Both are attacking winners -> MultiVictorBattleSetupAction
+- Players: Largest army picks first: Keep or Withdraw. Last player auto-keeps if no one chose Keep.
+
+### One attacker holds all castles, allied attacker doesn't
+- Shardok: Castle-holder gets `Victory(HoldsCriticalTiles)`. Mutually-allied co-attacker with
+  `HoldsCriticalTiles` is added to `winning_shardok_ids` -> also gets `Victory(HoldsCriticalTiles)`.
+- Eagle: Both are attacking winners -> MultiVictorBattleSetupAction -> Battle Aftermath.
+- Players: Largest army picks first: Keep or Withdraw.
+
+### Allied attackers eliminate all defenders
+- Shardok: Both attackers have `LastAllianceStanding` and are mutually allied -> both get
+  `Victory(LastAllianceStanding)`.
+- Eagle: Both are attacking winners -> MultiVictorBattleSetupAction -> Battle Aftermath.
+- Players: Largest army picks first: Keep or Withdraw.
+
+### Non-allied co-attackers: one holds all castles
+- Shardok: Castle-holder gets `Victory(HoldsCriticalTiles)`, non-allied co-attacker gets
+  `Loss(HoldsCriticalTiles)`.
+- Eagle: Single attacker won -> ProvinceConqueredAction. Non-allied co-attacker's units are
+  captured along with the defender's.
+
+### One allied attacker is sole survivor (LastPlayerStanding)
+- Shardok: Sole survivor gets `Victory(LastPlayerStanding)`. Dead ally should get `Loss`.
+- **BUG**: `GameOverResponsePopulator` currently throws because dead ally is allied to winner
+  but not in `winning_shardok_ids`. Needs fix — see known issue in Section 3.
+- Eagle (once fixed): Single attacker won -> ProvinceConqueredAction. Dead ally's units were
+  already destroyed in battle.
+
+### Single attacker wins (any condition, no co-attackers)
+- No alliance considerations. ProvinceConqueredAction immediately.
+
+### Defender wins (WinAfterMaxRounds or LastPlayerStanding)
+- ProvinceHeldAction. All non-returned attacker units are captured.
+
+## 7. Edge Cases and Known Issues
+
+### BUG: Dead ally causes crash via LastPlayerStanding
+
+When one allied attacker is the sole survivor (both the co-attacker and defender are dead),
+`LastPlayerStanding` fires and only the survivor is in `winning_shardok_ids`. The
+`GameOverResponsePopulator` then sees the dead co-attacker is allied to the winner but not in
+`winning_shardok_ids`, and throws `ShardokInternalErrorException`. Fix: dead allies should
+receive `Loss`, not trigger a validation error.
+
+### Non-allied co-attackers eliminate all defenders
+
+Two non-allied attackers who both survive after eliminating the defender cannot win via
+`LastAllianceStanding` (they aren't mutually allied). The game continues until max rounds,
+at which point the defender wins via `WinAfterMaxRounds`. They must capture all critical tiles.
+
+### Non-allied co-attackers: one holds all castles
+
+Only the castle holder wins. The non-allied co-attacker gets `Loss` and their units are captured
+along with the defender's. The mutual-alliance check in `UpdateGameStatusAction` prevents
+non-allied players from being added to `winning_shardok_ids`.
+
+## Key File References
+
+| Component | File |
+|-----------|------|
+| Victory condition checking | `src/main/cpp/net/eagle0/shardok/library/actions/UpdateGameStatusAction.cpp` |
+| Per-player EndGameCondition | `src/main/cpp/net/eagle0/shardok/server/GameOverResponsePopulator.cpp` |
+| Battle setup (victory conditions) | `src/main/scala/.../library/actions/impl/action/RequestBattlesAction.scala` |
+| Alliance communication | `src/main/scala/.../shardok_interface/ShardokInterfaceGrpcClient.scala:75-80` |
+| Battle result processing | `src/main/scala/.../library/actions/impl/action/ResolveBattleAction.scala` |
+| Unit return logic | `ResolveBattleAction.scala:765-788` (`unitReturned`) |
+| Multi-victor setup | `src/main/scala/.../library/actions/impl/action/MultiVictorBattleSetupAction.scala` |
+| Aftermath availability | `src/main/scala/.../library/actions/availability/AvailableBattleAftermathDecisionCommandFactory.scala` |
+| Aftermath command | `src/main/scala/.../library/actions/impl/command/BattleAftermathDecisionCommand.scala` |
+| Auto-resolve last claimant | `src/main/scala/.../library/actions/impl/action/AutoResolveBattleAftermathAction.scala` |
+| Finalize aftermath | `src/main/scala/.../library/actions/impl/action/FinalizeAftermathAction.scala` |
+| EndGameCondition enum | `src/main/scala/.../model/state/shardok_battle/EndGameCondition.scala` |
@@ -12,7 +12,7 @@ This document catalogs all media assets in the Unity project for licensing revie
 |----------|-------|-------|
 | Images | 10,637 | Mostly PNG icons and UI sprites |
 | Audio | 1,778 | 26 music tracks + 1,752 sound effects |
-| 3D Models | 52 | Bridge pack only |
+| 3D Models | 66+ | Bridge pack, Animal pack deluxe, Honey Badger |
 | Fonts | 16 | TTF files |

 ---
@@ -55,6 +55,30 @@ These are commercial Unity Asset Store purchases tied to your account:
 - **Contents:** Bridge construction pieces
 - **License:** Unity Asset Store

+### Animal pack deluxe
+- **Location:** `Assets/Animal pack deluxe/`
+- **Publisher:** janpec
+- **Asset Store Link:** https://assetstore.unity.com/packages/3d/characters/animals/animal-pack-deluxe-99702
+- **Contents:** 26 rigged and animated 3D animal models (bear, boar, crocodile, wolf, frog, crab, rabbit, scorpion, snake, stag, deer, rat, goat, pig, etc.) with idle, walk, run, eat, attack, and die animations
+- **Used for:** Beast province effects on the strategic map (AnimalEffect)
+- **License:** Unity Asset Store
+
+### 2D Monster Pack: Basic Bundle (+PSB)
+- **Location:** `Assets/DungeonMonsters2D/`
+- **Publisher:** SP1
+- **Asset Store Link:** https://assetstore.unity.com/packages/2d/characters/2d-monster-pack-basic-bundle-psb-328637
+- **Contents:** 2D animated monster sprites with PSB (Photoshop) source files. Characters: SkeletonWarrior, SkeletonArcher, SkeletonMage, Zombie, ZombieWarrior, Demon, Succubus, Imp, Spider, Rat, Vampire, DragonRed, Butcher
+- **Used for:** Beast province effects (MonsterEffect, DragonEffect) and human-type beast effects on the strategic map
+- **License:** Unity Asset Store
+
+### Honey Badger 3D Model
+- **Location:** `Assets/HoneyBadger/`
+- **Creator:** WildMesh 3D (@WildMesh_3D)
+- **Source:** https://sketchfab.com/3d-models/realistic-honey-badger-3d-model-09751ed5383c4afb924cfb6485d313f1
+- **Contents:** Rigged 3D honey badger model (FBX) with 63 animations and PBR texture
+- **Used for:** Honey badger beast province effect (AnimalEffect)
+- **License:** Purchased via Sketchfab/Patreon
+
 ### Fantasy Interface Sounds
 - **Location:** `Assets/Fantasy Interface Sounds/`
 - **Count:** 320 WAV files
@@ -0,0 +1,246 @@
+# Adding Beast-Type-Specific Effects
+
+When a province has a `BeastsEvent`, `ProvinceBeastsController` spawns a visual effect at the province centroid. By default this is the generic `BeastsEffect` (circling vultures/crows). Beast-specific effects can override this based on `BeastInfo.SingularName`.
+
+## Architecture
+
+```
+ProvinceBeastsController
+  ├── GetBeastName(province) → reads BeastsEvent.BeastInfo.SingularName
+  ├── GetEffectPrefab(beastName) → switch on name → returns prefab
+  └── SpawnBeastsEffect(provinceId, beastName) → instantiates at centroid
+```
+
+**Key files:**
+
+| File | Purpose |
+|------|---------|
+| `Assets/Eagle/ProvinceBeastsController.cs` | Routes beast names to prefabs, positions effects |
+| `Assets/Eagle/BeastsEffect.cs` | Generic effect (circling birds via particle system) |
+| `Assets/Eagle/DragonEffect.cs` | Dragon-specific effect (3D model with flying/ground modes) |
+| `Assets/Eagle/MonsterEffect.cs` | Wandering 2D monster group (DungeonMonsters2D prefabs) |
+| `Assets/Eagle/AnimalEffect.cs` | Wandering 3D animal group (Animal Pack Deluxe prefabs) |
+| `Assets/Eagle/Effects/` | All effect prefabs |
+
+## Adding a new beast type
+
+### 1. Create the effect MonoBehaviour (or reuse an existing one)
+
+Three effect scripts exist for different asset types:
+
+**MonsterEffect** (2D sprites, DungeonMonsters2D): Spawns a group of wandering 2D monsters. Uses PascalCase animator states (`Idle`, `Move`) and triggers (`AttackTrigger`, `SpecialATrigger`). Flips sprite X scale for facing direction. Best for DungeonMonsters2D prefabs.
+
+**AnimalEffect** (3D models, Animal Pack Deluxe): Spawns a group of wandering 3D animals. Uses lowercase animator states (`idle`, `walk`, `eat`, `attack`) with `Animator.Play()`. Rotates model on Y axis for facing. Sets `sortingOrder=103`, `renderQueue=4000`, and `ZTest=Always` to render above the map. Best for Animal Pack Deluxe prefabs.
+
+**DragonEffect** (single animated 3D creature): Spawns a 3D dragon that alternates between flying (circling at altitude with fly actions) and grounded (wandering with ground actions) modes. Uses `Animator.Play()` with DragonMapAnims controller. Best for large creatures with flight capabilities.
+
+**Particle-based** (like `BeastsEffect.cs`): Good for simple effects like swarms or atmospheric particles.
+
+To create a new effect script, use `[RequireComponent(typeof(RectTransform))]` for UI canvas positioning and accept tuning parameters as public fields.
+
+### 2. Create the prefab
+
+1. Create an empty GameObject in `Assets/Eagle/Effects/`
+2. Add a `RectTransform` component
+3. Add your effect MonoBehaviour
+4. Wire up any references (animated prefab, textures, materials)
+5. Save as prefab
+
+### 3. Register in ProvinceBeastsController
+
+Add a prefab field and a case in `GetEffectPrefab()`:
+
+```csharp
+// In ProvinceBeastsController.cs
+
+// Add inspector field alongside existing ones:
+public GameObject wolfEffectPrefab;
+
+// Add case in GetEffectPrefab(), keyed by singularName from beasts.tsv:
+private GameObject GetEffectPrefab(string beastName) {
+    switch (beastName) {
+        case "dragon": return dragonEffectPrefab;
+        case "wolf": return wolfEffectPrefab;
+        default: return beastsEffectPrefab;
+    }
+}
+```
+
+### 4. Wire up in the scene
+
+In `Gameplay.unity`, find the `ProvinceBeastsController` component and assign your new prefab to the new field.
+
+### 5. Test
+
+Use `[ContextMenu]` methods on `ProvinceBeastsController` to test:
+- "Test Dragon in Motcia (ID 2)" spawns a dragon effect
+- Add similar methods for your beast type
+- "Clear All Effects" removes all active effects
+
+## Beast name matching
+
+Beast names come from `BeastInfo.SingularName` in the proto, which uses the canonical `singularName` from `src/main/resources/net/eagle0/eagle/beasts.tsv`. The switch in `GetEffectPrefab` uses exact string matching on this canonical name (e.g. `"dragon"`, `"wolf"`, `"skeleton"`).
+
+Human-type beasts (pirates, bandits, etc.) are matched via a `HumanBeastNames` HashSet in `ProvinceBeastsController` rather than individual switch cases.
+
+## Beast animation coverage
+
+### Custom animations
+
+| Beast | Effect Type | Asset Pack | Prefabs Used |
+|---|---|---|---|
+| dragon | DragonEffect | 3dFoin Dragon | dragon_skin.FBX (w/ DragonMapAnims controller) |
+| skeleton | MonsterEffect | DungeonMonsters2D | SkeletonWarrior, SkeletonArcher, SkeletonMage |
+| zombie | MonsterEffect | DungeonMonsters2D | Zombie, ZombieWarrior |
+| rat | MonsterEffect + AnimalEffect | DungeonMonsters2D + Animal Pack Deluxe | Rat (2D), Rat (3D) |
+| spider | MonsterEffect | DungeonMonsters2D | Spider |
+| demon | MonsterEffect | DungeonMonsters2D | Demon, Succubus |
+| orc | MonsterEffect | DungeonMonsters2D | Imp |
+| vampire | MonsterEffect | DungeonMonsters2D | Vampire |
+| knight types (6 names) | AnimalEffect | Polytope Studio | PT_Male_Knight_01/02, PT_Female_Knight_01/02 (w/ HumanMapAnims controller) |
+| soldier types (8 names) | AnimalEffect | Polytope Studio | PT_Male_Soldier_01/02, PT_Female_Soldier_01/02 (w/ HumanMapAnims controller) |
+| archer types (3 names) | AnimalEffect | Polytope Studio | PT_Male_Archer_01/02, PT_Female_Archer_01/02 (w/ HumanMapAnims controller) |
+| militia types (8 names) | AnimalEffect | Polytope Studio | PT_Male_Militia_01/02, PT_Female_Militia_01/02 (w/ HumanMapAnims controller) |
+| peasant types (9 names) | AnimalEffect | Polytope Studio | PT_Male_Peasant_01, PT_Female_Peasant_01_a (w/ HumanMapAnims controller) |
+| clown | AnimalEffect | Clown Pack | Clown, Fat Clown (w/ per-prefab controller overrides) |
+| giant | AnimalEffect | Polytope Studio | PT_Male/Female_Peasant at 3x scale (w/ HumanMapAnims controller) |
+| ogre, troll | AnimalEffect | Orc-Ogre Pack | OrcOgre_Animated (w/ OgreMapAnims controller) |
+| bear | AnimalEffect | Animal Pack Deluxe | Brown_bear |
+| boar | AnimalEffect | Animal Pack Deluxe | Wild_boar |
+| crocodile | AnimalEffect | Animal Pack Deluxe | Crocodile |
+| snake | AnimalEffect | Animal Pack Deluxe | Viper |
+| crab | AnimalEffect | Animal Pack Deluxe | Crab |
+| frog | AnimalEffect | Animal Pack Deluxe | Common_frog, Common_frog_v2, Common_frog_v3 |
+| rabbit | AnimalEffect | Animal Pack Deluxe | Wild_rabbit, Wild_rabbit_v2 |
+| salamander | AnimalEffect | Animal Pack Deluxe | Fire_salamander |
+| scorpion | AnimalEffect | Animal Pack Deluxe | Scorpion, Yellow_fattail_scorpion |
+| stag | AnimalEffect | Animal Pack Deluxe | Deer, Deer_male |
+| wild goat | AnimalEffect | Animal Pack Deluxe | Goat, Ibex |
+| wild pig | AnimalEffect | Animal Pack Deluxe | Iron_age_pig, Iron_age_pig_v2 |
+| wolf, wolverine | AnimalEffect | Animal Pack Deluxe | Wolf |
+| honey badger | AnimalEffect | HoneyBadger (Sketchfab) | HoneyBadger (w/ HoneyBadgerMapAnims controller) |
+| raccoon | AnimalEffect | Raccoon (Sketchfab) | Raccoon (w/ RaccoonMapAnims controller) |
+| tiger | AnimalEffect | ithappy Animals FREE | Tiger_001 (w/ TigerMapAnims controller) |
+| elephant | AnimalEffect | Animal Pack Deluxe v2 | African_elephant, Indian_elephant (w/ ElephantMapAnims controller) |
+| mammoth | AnimalEffect | Animal Pack Deluxe v2 | African_elephant, Indian_elephant (w/ ElephantMapAnims controller) |
+| hippopotamus | AnimalEffect | Africa Animals Pack Low Poly V2 | Hippopotamus (w/ HippopotamusMapAnims controller) |
+| lion | AnimalEffect | Africa Animals Pack Low Poly V1 | Lion, Lioness (w/ LionMapAnims controller) |
+| velociraptor | AnimalEffect | Dino Pack Low Poly V1 | VelociraptorColor1, VelociraptorColor2 (w/ VelociraptorMapAnims controller) |
+| black panther | AnimalEffect | Africa Animals Pack Low Poly V1 | BlackPanther (w/ BlackPantherMapAnims controller) |
+| rhinoceros | AnimalEffect | Africa Animals Pack Low Poly V1 | Rhinoceros (w/ RhinocerosMapAnims controller) |
+| gorilla | AnimalEffect | Africa Animals Pack Low Poly V2 | Gorilla (w/ GorillaMapAnims controller) |
+| hyena | AnimalEffect | Africa Animals Pack Low Poly V2 | Hyena (w/ HyenaMapAnims controller) |
+| leopard | AnimalEffect | Africa Animals Pack Low Poly V2 | Leopard (w/ LeopardMapAnims controller) |
+| warthog | AnimalEffect | Africa Animals Pack Low Poly V2 | Phacochoerus (w/ WarthogMapAnims controller) |
+| emu | AnimalEffect | Australia Animals Pack V1 | Emu (w/ EmuMapAnims controller) |
+| kangaroo | AnimalEffect | Australia Animals Pack V1 | Kangaroo (w/ KangarooMapAnims controller) |
+| tasmanian devil | AnimalEffect | Australia Animals Pack V1 | TasmanianDevil (w/ TasmanianDevilMapAnims controller) |
+| hippogryph | DragonEffect | Heroic Fantasy Creatures Full Pack Vol 2 | Hippogriff_PBR (w/ HippogryphMapAnims controller) |
+
+### Human-type beasts
+
+34 human-type beast names use 3D Polytope Studio characters grouped into 5 archetypes. Each archetype uses a shared `HumanMapAnims.controller` that retargets Clown animation clips (idle, walk, attack, damage) via Unity's Humanoid system. One additional human type (psychopath) uses the 2D Butcher sprite from DungeonMonsters2D.
+
+| Archetype | Polytope Type | Beast Names (count) |
+|---|---|---|
+| **Knight** (heavy armor) | Knight M/F x2 | cultist, heretic, cannibal, terrorist, cossack, desperado (6) |
+| **Soldier** (medium armor) | Soldier M/F x2 | bandit, brigand, robber, highwayman, marauder, dacoit, freebooter, mobster (8) |
+| **Archer** (light armor, ranged) | Archer M/F x2 | thief, pirate, buccaneer (3) |
+| **Militia** (light armed) | Militia M/F x2 | hooligan, street tough, ruffian, scalawag, ne'er-do-well, crook, miscreant, asshole (8) |
+| **Peasant** (unarmed) | Peasant M/F | agitator, instigator, rabble-rouser, separatist, particularist, nihilist, proud boy, rebel, traitor (9) |
+
+Asset packs: Polytope Studio - Lowpoly Medieval Characters (Soldiers, Knights, Militia, Archers, Peasants)
+
+| **Butcher** (armed loner) | DungeonMonsters2D Butcher | psychopath (1) |
+
+### No custom animation (falls back to generic vultures)
+
+Ordered by spawn likelihood (most common first):
+
+| Beast | Likelihood | Notes |
+|---|---|---|
+| chimpanzee | 0.04 | Primate |
+| unknown | 0.00 | Intentional fallback |
+
+## Using low-poly animal packs (Africa Animals, Dino Pack)
+
+Assets from these packs (by the same author) require extra setup because they ship with **Legacy** animation import and include physics components that conflict with AnimalEffect. The workflow below applies to all of them:
+- Africa Animals Pack Low Poly V1 (Lion, Lioness, Black Panther, Crocodile, Elephant, Giraffe, Rhinoceros, Tiger, Zebra)
+- Africa Animals Pack Low Poly V2 (Hippopotamus, Antelope, Gorilla, Hyena, Leopard, Phacochoerus/Warthog)
+- Dino Pack Low Poly V1 (Velociraptor, Brontosaurus, Pteranodon, Stegosaurus, T-Rex, Triceratops)
+- Australia Animals Pack V1 (Chlamydosaurus/Frilled Lizard, Echidna, Emu, Kangaroo, Koala, Platypus, Tasmanian Devil)
+
+### Per-animal setup steps
+
+1. **Switch FBX import to Generic animation type.**
+   In the `.fbx.meta` file (location varies by pack):
+   - Change `animationType: 1` to `animationType: 2`
+   - Change `avatarSetup: 0` to `avatarSetup: 1` (newer format) — older metas without `avatarSetup` will auto-create an avatar at runtime
+   - Set `loopTime: 1` on looping clips (idle, walk, eat, run) but NOT one-shot clips (attack, death, hurt)
+   Unity will re-import the FBX with Mecanim-compatible clips when it next opens.
+
+2. **Create an AnimatorController** in `Assets/Eagle/Effects/` named `<Animal>MapAnims.controller`.
+   Use the same 4-state pattern (idle, walk, eat, attack) as ElephantMapAnims. Reference the animation clips by their fileIDs from the FBX meta's `internalIDToNameTable` (type 74 entries) or `fileIDToRecycleName` (older format, type 7400000+). These IDs are stable across import type changes. Note: if the FBX names its idle clip `idle1`, create the controller state as `idle` but reference the `idle1` clip by fileID.
+
+3. **Create an AnimalEffect prefab** in `Assets/Eagle/Effects/` named `<Animal>Effect.prefab`.
+   Reference the pack's prefab as the animal prefab, and wire up the new AnimatorController. Multiple color/sex variants from the same or similar FBX can share one controller (e.g., Lion and Lioness). AnimalEffect will automatically strip the pack's legacy Animation, Rigidbody, and Collider components at spawn time, and add an Animator if the prefab doesn't already have one.
+
+4. **Register in ProvinceBeastsController** with a case in `GetEffectPrefab()` and a test ContextMenu method.
+
+5. **Mark the effect prefab as Addressable** with the `beast-effects` label in the Unity editor (Window > Asset Management > Addressables > Groups).
+
+### Notes
+
+- The packs include both SingleTexture and TextureAtlas variants; use SingleTexture for best visual quality.
+- Hippos have water-specific animations (idlewater, deathwater) that could be used for future water-province effects.
+- The packs' prefabs include Rigidbody/BoxCollider components intended for gameplay use. AnimalEffect strips these automatically since it controls position directly.
+
+### Available animals not yet set up as beasts
+
+These animals exist in the imported packs and could be set up as in-game beasts using the workflow above:
+
+**Africa Animals Pack V1** (already imported):
+| Animal | Good fit for | Notes |
+|---|---|---|
+| Giraffe (x2 variants) | giraffe beast | Tall model, may need larger scale |
+| Zebra | zebra beast | Herd animal; good with higher animalCount |
+
+(Black Panther, Rhinoceros, Crocodile, Elephant, and Tiger already have effects.)
+
+**Africa Animals Pack V2** (already imported):
+| Animal | Good fit for | Notes |
+|---|---|---|
+| Antelope | antelope/gazelle beast | Fast-moving; good with higher moveSpeed |
+
+(Gorilla, Hyena, Leopard, Warthog, and Hippopotamus already have effects.)
+
+**Dino Pack Low Poly V1** (already imported):
+| Animal | Good fit for | Notes |
+|---|---|---|
+| Brontosaurus | brontosaurus/sauropod beast | Very large; needs big scale, low count |
+| Pteranodon | pteranodon/flying beast | Has fly animation; could use DragonEffect-style flight |
+| Stegosaurus | stegosaurus beast | Large herbivore |
+| T-Rex | tyrannosaurus beast | Iconic predator; good as a solo beast |
+| Triceratops | triceratops beast | Large herbivore; good for tough beast |
+
+(Velociraptor already has an effect.)
+
+**Australia Animals Pack V1** (already imported):
+| Animal | Good fit for | Notes |
+|---|---|---|
+| Koala | koala beast | Peaceful; good for low-threat province events |
+| Echidna | echidna beast | Small, spiny |
+| Chlamydosaurus (Frilled Lizard) | lizard beast | Has threat display animation |
+| Platypus (Ornitorinco) | platypus beast | Semi-aquatic; unique |
+
+(Emu, Kangaroo, and Tasmanian Devil already have effects.)
+
+None of the remaining animals above are currently in `beasts.tsv`.
+
+## Tips
+
+- Keep effects lightweight; multiple provinces may have beasts simultaneously
+- Use `ParticleSystemScalingMode.Hierarchy` so effects scale with the map zoom
+- Set appropriate `sortingOrder` on renderers (existing effects use 102-104)
+- For animated prefabs, set `AnimatorCullingMode.AlwaysAnimate` since UI elements may be considered offscreen by the culling system
+- For 3D models (AnimalEffect), set `renderQueue=4000` and `ZTest=Always` on materials to prevent clipping behind the map
@@ -0,0 +1,79 @@
+# Renaming a Province
+
+This document explains the steps required to rename a province in Eagle0.
+
+## Files to Modify
+
+### 1. Province Map TSV (Server Source of Truth)
+
+**File:** `src/main/resources/net/eagle0/eagle/province_map.tsv`
+
+This is the primary source of province data. Each row contains:
+- Province ID
+- Province name
+- Neighbor IDs
+- Neighbor directions
+- Province name (repeated)
+- Neighbor names (dot-separated)
+- Starting food
+
+You need to:
+1. Change the province name in its own row (columns 2 and 5)
+2. Update the neighbor name references in all neighboring provinces (column 6)
+
+Example: To rename "Fluria" to "NewName", you would need to update:
+- Line 26: The Fluria row itself
+- Lines 5, 10, 18, 24, 27, 38, 41: All provinces that list Fluria as a neighbor
+
+### 2. LLM Map Description
+
+**File:** `src/main/scala/net/eagle0/eagle/library/actions/llm_prompt_generators/MapDescription.scala`
+
+This file contains a hardcoded geographic description of the map used in LLM prompts for generating narrative text. Update any references to the old province name.
+
+### 3. Client Centroids JSON
+
+**File:** `src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/Eagle/centroids.json`
+
+This JSON file contains province metadata used for map rendering (centroid positions, areas, orientations). Each entry has a `name` field that should be updated to match.
+
+Note: The actual province name displayed to players comes from the server via the `ProvinceView` proto, not from this file. However, this file should be kept in sync for consistency and because it may be used for map label positioning.
+
+### 4. Test Files
+
+**File:** `src/test/scala/net/eagle0/eagle/library/util/validations/RuntimeValidatorTest.scala`
+
+Update any test strings that reference the old province name.
+
+## How Province Names Flow to the Client
+
+Province names are sent from the Eagle server to the Unity client via the `ProvinceView` protobuf message:
+
+```protobuf
+message ProvinceView {
+    int32 id = 1;
+    string name = 6;  // <-- Province name sent from server
+    ...
+}
+```
+
+The server reads province names from `province_map.tsv` at startup. The client receives names through the proto and displays them via `province.Name` in C# code. This means:
+
+- Changing the TSV automatically updates what clients see
+- No C# code changes are needed (the code uses `province.Name` generically)
+- The `centroids.json` name field is for map rendering/positioning, not display
+
+## Files That Do NOT Need Changes
+
+- **Hero backstory TSV files** (`heroes.tsv`, `generated_heroes.tsv`) - These don't contain province name references
+- **C# client code** - Uses `province.Name` from the server proto, not hardcoded names
+- **Proto definitions** - No province names are hardcoded in protos
+
+## Checklist
+
+- [ ] Update `province_map.tsv` - province's own row
+- [ ] Update `province_map.tsv` - all neighbor references
+- [ ] Update `MapDescription.scala`
+- [ ] Update `centroids.json`
+- [ ] Update any test files with province name references
+- [ ] Build and run tests: `bazel test //src/test/scala/...`
@@ -129,6 +129,33 @@ std::vector<ActionResult> CheckAndExecuteEvents(
 - Create `TutorialHeroJoined` action results adding reinforcement heroes to player faction
 - Set appropriate loyalty, vigor, location for joined heroes

+### Phase 7: Post-Battle Strategic Dialogue
+
+After the battle ends and the player returns to the strategic map, narrative dialogues guide them through the next steps.
+
+**Dialogue 1: Battle Aftermath** (trigger: `tutorial_battle_ended`)
+- Old Marek reflects on the close call
+- Tarn has vanished — rumors of sorcery or escape, no one knows
+- Captured lieutenants: they followed orders, not to blame for Tarn's madness
+- Player should try to recruit them or hold them
+- No instruction text needed — Handle Captured Heroes UI is self-explanatory
+
+**Dialogue 2: Rebuild Support** (trigger: `tutorial_rebuild_support`)
+- Fires when available commands no longer include HandleCapturedHeroCommand
+- Marek explains the province needs support rebuilt after the battle
+- Engineers (John Ranil) can **Improve** the province — build infrastructure, develop economy
+- Paladins (Elena Fyar) can **Give Alms** — distribute food to win hearts
+- Instructions highlight **Improve** and **Give Alms** buttons
+- Goal: get Support to **40** before January for tax revenue
+
+**Implementation:**
+- Dialogues defined in `tutorial_strategic.json`
+- `tutorial_battle_ended`: fire when tutorial battle is removed from `RunningShardokGameModels`
+- `tutorial_rebuild_support`: fire when available commands no longer include `HandleCapturedHeroCommand`
+- Register `ImproveButton` and `AlmsButton` as highlight targets in `TutorialTargetRegistry`
+
+See `TUTORIAL_CONTENT.md` for full dialogue text.
+
 ---

 ## File Summary
@@ -149,6 +149,52 @@ Triggered during battles when players encounter spells, terrain, or abilities.

 ---

+## Post-Battle Dialogue (Narrative Dialogues)
+
+These fire after the first tutorial battle ends and the player returns to the strategic map. They use the narrative dialogue system (`DialogueManager` / `tutorial_strategic.json`) rather than the modal tutorial system.
+
+### Battle Aftermath
+| Field | Value |
+|-------|-------|
+| ID | `post_battle_aftermath` |
+| Trigger | `tutorial_battle_ended` (battle removed from RunningShardokGameModels) |
+| Speaker | Old Marek the Learned |
+| Panel Position | top |
+
+**Dialogue (Marek):**
+> That was closer than I'd like to admit. We held — barely. But Tarn... Tarn is gone. Not retreated — *gone*. The men say he vanished from the field. Some claim sorcery. Others say he slipped away in the chaos. Whatever the truth, no one can find him.
+>
+> But we captured some of his lieutenants. These are soldiers, Sadar — they followed orders, same as we once did. They're not to blame for Tarn's madness. See if you can bring them to our cause, or at least hold them until they come around.
+
+**Instructions:** *(none — Handle Captured Heroes UI is self-explanatory)*
+
+### Rebuild Support
+| Field | Value |
+|-------|-------|
+| ID | `post_battle_rebuild` |
+| Trigger | `tutorial_rebuild_support` (fires when available commands no longer include HandleCapturedHeroCommand) |
+| Speaker | Old Marek the Learned |
+| Panel Position | top |
+
+**Dialogue (Marek):**
+> Good. Now we need to rebuild our support here in Onmaa. The people are shaken — a battle on their doorstep will do that. We need them behind us if we're going to hold this province.
+>
+> Any of our heroes can develop the land or give alms to the people — nothing wins hearts faster than a full belly. Engineers like John Ranil are especially effective at improving a province, and paladins like Elena Fyar are the best at winning hearts. Either way, we need the people's support before the tax collectors come round in January.
+
+**Instructions:** Use **Improve** and **Give Alms** to raise Support. You must have at least **40** support in the province by January in order to collect gold and food in taxes.
+
+**Highlight targets:** `SupportField`
+
+### Implementation Notes
+
+- Both dialogues go in `tutorial_strategic.json`
+- Need new trigger events: `tutorial_battle_ended` and `tutorial_rebuild_support`
+- `tutorial_battle_ended` should fire when the tutorial battle is removed from `RunningShardokGameModels` in `EagleGameModel.ApplyGameStateViewDiff`
+- `tutorial_rebuild_support` should fire when available commands no longer include `HandleCapturedHeroCommand` (i.e. the captured heroes phase is done and the player has regular commands available)
+- The "rebuild" dialogue should highlight the Improve and Give Alms buttons in the command panel (requires registering them as highlight targets)
+
+---
+
 ## Display Modes

 | Mode | Description | Use For |
@@ -0,0 +1,19 @@
+# Two-Stage Animation Implementation Pattern
+
+Actions with server-determined success/failure outcomes use a two-stage system:
+1. **Attempt phase**: Animation + sound plays immediately when the command is issued
+2. **Result phase**: A distinct success or failure animation + sound plays when the server responds
+
+## Adding a New Two-Stage Action
+
+To add distinct success/failure animations for an action (using `ExtinguishFire` as an example):
+
+1. **AnimationType enum** (`ShardokGameController.cs`): Add `ExtinguishFireFailed`
+2. **AnimationTypeForAction()**: Map `ActionType.ExtinguishFireFailed` to new type
+3. **AttemptAnimationType()**: Map `ExtinguishFireFailed` back to `ExtinguishFire`
+4. **ActionTypeForSound()**: Map new type to `ActionType.ExtinguishFireFailed`
+5. **PlayAnimation()**: Add dispatch case calling the new animator method
+6. **Animator**: Add `AnimateExtinguishFailed()` method
+7. **SoundManager**: Ensure result sound is mapped (usually already done)
+
+See FearAnimator and FleeAnimator for reference implementations.
@@ -0,0 +1,173 @@
+# URP Migration Plan
+
+## Why
+
+Unity is removing Built-In Render Pipeline (BiRP) support after Unity 6.7. We're currently on Unity 6.4. Each Unity minor version ships roughly quarterly, giving us a few release cycles before BiRP is dropped. This document lays out the migration plan.
+
+## Strategy: Long-Lived Feature Branch
+
+All URP conversion work happens on a **long-lived `urp-migration` branch**. Main stays fully functional on BiRP throughout the migration.
+
+- **Main branch**: Continues using BiRP. All gameplay, AI, and server development proceeds normally.
+- **URP branch**: Accumulates rendering pipeline changes across all phases.
+- **Regular rebasing**: Periodically rebase/merge `main` into the URP branch to stay current. Shader and material changes rarely conflict with gameplay code, so merge conflicts should be manageable.
+- **Merge to main**: Only when everything renders correctly and visual QA passes.
+
+This avoids the "everything is pink" problem of switching the pipeline on main before shaders are converted.
+
+## Current State
+
+| Category | Count | Notes |
+|---|---|---|
+| Shaders | 47 | 7 custom Eagle, 1 hex mesh, 20 Polytope, 13 TextMesh Pro, 6 other third-party |
+| Materials | 325 | Mix of Standard shader, custom, and third-party |
+| ShaderGraph files | 4 | All TextMesh Pro (URP + HDRP variants already exist) |
+| Scenes with baked lighting | 6 | Gameplay, Connection, Eagle, Shardok, Shared, Map Editor |
+| Post-processing | 1 profile | PPP_Orc.asset (Post Processing Stack v2, FXAA/TAA, AO) |
+| C# rendering scripts | 16 | Material/shader property manipulation only |
+| Rendering path | Forward | Matches URP default |
+
+### Positive Findings
+
+- **No OnRenderImage, Graphics.Blit, CommandBuffer, or GL.\* usage** in C# code
+- Forward rendering already in use (matches URP default)
+- TextMesh Pro already has URP ShaderGraph variants in the project
+- No custom render passes or ScriptableRenderFeatures
+- Shader property manipulation (SetTexture, SetFloat, SetColor) is URP-compatible
+
+### Known Risk Areas
+
+- **GrabPass shaders** (HeatShimmerShader, PT_Water_Shader) have no direct URP equivalent
+- **ProvinceMapShader** is complex (province ID lookup, border rendering, ocean animation, faction highlighting, UI clipping)
+- **Surface shaders** (`#pragma surface surf Standard`) must be rewritten as HLSL or ShaderGraph
+- **Polytope Studio shaders** (20 shaders) have no vendor-provided URP variants
+- **Post Processing Stack v2** must be replaced with URP's integrated Volume system
+- **Tessellation** (PT_Water_Shader) is not natively supported in URP
+
+## Shader Inventory
+
+### Custom Eagle Shaders (7) -- HIGH PRIORITY
+
+| Shader | Complexity | Key Issues |
+|---|---|---|
+| ProvinceMapShader | High | Province ID texture lookup, border rendering, ocean animation, faction highlighting, `UnityUI.cginc` dependency, stencil/clipping |
+| ProvinceWeatherMapShader | Medium | Weather overlay rendering |
+| ProvinceWeatherShader | Medium | Province weather effects |
+| ProvinceParticleShader | Low | Custom particle rendering |
+| HeatShimmerShader | High | **GrabPass** for screen distortion, province masking |
+| ClipRectParticleUnlit | Low | UI-clipped particle shader |
+| maskShader | Low | UI masking |
+
+### Hex Mesh Shader (1) -- MODERATE PRIORITY
+
+Uses `#pragma surface surf Standard` with GPU instancing. Straightforward conversion to URP Lit or ShaderGraph.
+
+### Third-Party Shaders (39)
+
+| Source | Count | Complexity | Notes |
+|---|---|---|---|
+| Polytope Studio | 20 | Moderate-High | PBR, Toon, vegetation (custom lighting), water (**GrabPass + tessellation**). No vendor URP pack available. |
+| TextMesh Pro | 13 | Low | URP ShaderGraph variants already exist in project |
+| RRFreelance | 3 | Low | Standard surface shaders, direct conversion |
+| Clown.fat | 2 | Moderate | Custom ToonRamp lighting model |
+| GUI Pro Kit | 1 | Low | Hidden particle shader |
+
+### GrabPass Shaders (Require Special Handling)
+
+GrabPass does not exist in URP. These must be reimplemented using `ScriptableRenderPass` + `Renderer Features` or Blit-based alternatives:
+
+1. **HeatShimmerShader** -- Screen distortion effect (currently has a shimmer-disabled TODO, may be deprioritized)
+2. **PT_Water_Shader** -- Water refraction/transparency (PT_Water_Shader_WebGl exists without GrabPass as a reference)
+
+## Phased Approach
+
+### Phase 1: Pipeline Setup + Auto-Conversion (Days 1-3)
+
+- Install URP package
+- Create URP Pipeline Asset and Renderer Asset
+- Configure basic pipeline settings (forward rendering, shadow settings)
+- Run Unity's **Render Pipeline Converter** (Edit > Rendering > Render Pipeline Converter)
+  - Auto-converts Standard shader materials and some built-in shaders
+  - Handles a significant portion of the 325 materials
+  - Will NOT touch custom shaders
+- Create a test scene to validate basic rendering
+- Migrate viewport clipping system (`RendererViewportClipper`, `ViewportClipper`, `PopupClipper`) to use URP-compatible global shader properties
+
+### Phase 2: Custom Eagle Shaders (Weeks 1-3)
+
+This is the critical path. Without these, the game is unplayable.
+
+**Week 1-2: ProvinceMapShader**
+- Convert from BiRP Cg/HLSL to URP HLSL
+- Replace `UnityCG.cginc` includes with `Core.hlsl` / `Common.hlsl`
+- Replace `UnityUI.cginc` with custom URP-compatible UI clipping
+- Preserve province ID texture lookup, border rendering, ocean animation, faction highlighting
+- Validate stencil operations and render queue ordering
+
+**Week 2-3: Remaining Eagle shaders**
+- ProvinceWeatherMapShader + ProvinceWeatherShader
+- ProvinceParticleShader + ClipRectParticleUnlit
+- maskShader
+- Hex Mesh Shader (convert surface shader to URP Lit)
+- HeatShimmerShader (reimplement without GrabPass, or defer if shimmer remains disabled)
+
+### Phase 3: Third-Party Shaders (Weeks 4-6)
+
+**Polytope Studio (20 shaders)**
+- Convert PBR shaders (Armors, NPC, Weapons, Props, Rock) from surface shaders to URP Lit / ShaderGraph
+- Convert Toon shaders to custom URP shader or ShaderGraph with custom lighting
+- Convert vegetation shaders (custom `StandardCustom` lighting) to ShaderGraph
+- PT_Water_Shader: Reimplement without GrabPass and tessellation (use PT_Water_Shader_WebGl as reference for non-GrabPass approach)
+
+**Other third-party**
+- Clown.fat ToonRamp shaders: Convert custom lighting model to ShaderGraph
+- RRFreelance shaders: Direct Standard-to-URP-Lit conversion
+- GUI Pro Kit particle shader: Convert to URP particle shader
+
+### Phase 4: Materials, Lighting & Post-Processing (Weeks 7-8)
+
+**Materials**
+- Batch-update any remaining materials not handled by the auto-converter
+- Verify all 325 materials render correctly
+- Fix any visual differences from lighting model changes
+
+**Lighting**
+- Rebake lightmaps for all 6 scenes (Gameplay, Connection, Eagle, Shardok, Shared, Map Editor)
+- Configure URP shadow cascade settings to match current quality levels
+- Verify HDR rendering
+
+**Post-Processing**
+- Remove Post Processing Stack v2 dependency (`com.unity.postprocessing: 3.5.1`)
+- Replace with URP integrated Volume system
+- Recreate PPP_Orc effects (FXAA/TAA, Ambient Occlusion) using URP Volume overrides
+
+### Phase 5: Testing & Validation (Weeks 9-11)
+
+- Visual QA across all 6 scenes
+- Verify beast/character rendering (vertex colors, animations)
+- Verify weather effects (blizzard, drought, flood)
+- Verify particle systems (fire & explosion effects, UI particles)
+- Verify UI rendering (GUI Pro Kit, Modern UI Pack, TextMesh Pro)
+- Performance profiling (URP has different performance characteristics)
+- Test on target platforms
+- Bug fixes and visual polish
+
+## Effort Estimates
+
+| Phase | Best Case | Realistic | Worst Case |
+|---|---|---|---|
+| 1. Pipeline Setup | 1-2 days | 2-3 days | 3-5 days |
+| 2. Custom Eagle Shaders | 1.5 weeks | 2-3 weeks | 3-4 weeks |
+| 3. Third-Party Shaders | 1.5 weeks | 2-3 weeks | 3-4 weeks |
+| 4. Materials & Lighting | 3-5 days | 1-1.5 weeks | 2 weeks |
+| 5. Testing & Validation | 1 week | 1.5-2 weeks | 2-3 weeks |
+| **Total** | **6-8 weeks** | **8-12 weeks** | **12-16 weeks** |
+
+The biggest variable is Polytope Studio shader conversion. If vendor URP packs become available, Phase 3 shrinks significantly.
+
+## Key Reminders
+
+- **Don't leave GrabPass rewrites and ProvinceMapShader for the end** -- they're the riskiest pieces and should be tackled early.
+- The migration window (~1 year) is comfortable. Spreading the work across this window is fine, but front-load the hard shader work.
+- C# code changes should be minimal -- the codebase avoids direct rendering API usage.
+- `UnityUI.cginc` has no direct URP equivalent. Custom implementation will be needed for UI clipping in shaders.
@@ -12,7 +12,7 @@ require (
 	github.com/golang-jwt/jwt/v5 v5.2.1
 	github.com/google/uuid v1.6.0
 	github.com/webview/webview_go v0.0.0-20240831120633-6173450d4dd6
-	golang.org/x/sys v0.28.0
+	golang.org/x/sys v0.30.0
 	google.golang.org/grpc v1.68.0
 	google.golang.org/protobuf v1.36.3
 )
@@ -43,8 +43,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/webview/webview_go v0.0.0-20240831120633-6173450d4dd6 h1:VQpB2SpK88C6B5lPHTuSZKb2Qee1QWwiFlC5CKY4AW0=
 github.com/webview/webview_go v0.0.0-20240831120633-6173450d4dd6/go.mod h1:yE65LFCeWf4kyWD5re+h4XNvOHJEXOCOuJZ4v8l5sgk=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
 golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -35,8 +35,13 @@ SUBDIRS=(
 /bin/echo "Building C# protobuf sources..."
 bazel build "${TARGETS[@]}"

-/bin/echo "Copying generated .cs files to $OUTPUT_DIR..."
-rm -rf "$OUTPUT_DIR"
+/bin/echo "Syncing generated .cs files to $OUTPUT_DIR..."
+
+# Stage new files in a temp directory, then rsync to preserve timestamps
+# on unchanged files. This avoids triggering Unity reimport when protos
+# haven't changed, saving ~7 minutes of script recompilation.
+STAGING_DIR=$(mktemp -d)
+trap "rm -rf '$STAGING_DIR'" EXIT

 for i in "${!TARGETS[@]}"; do
    target="${TARGETS[$i]}"
@@ -50,9 +55,14 @@ for i in "${!TARGETS[@]}"; do
    name="${target_path##*:}"
    bin_dir="$REPO_ROOT/bazel-bin/$pkg/$name"

-    dest_dir="$OUTPUT_DIR/$subdir"
+    dest_dir="$STAGING_DIR/$subdir"
    mkdir -p "$dest_dir"
    find "$bin_dir" -name "*.cs" -exec cp {} "$dest_dir/" \;
 done

+# Sync only changed files and delete removed ones; --checksum compares
+# content not timestamps so unchanged files keep their original mtime.
+mkdir -p "$OUTPUT_DIR"
+rsync -rc --delete "$STAGING_DIR/" "$OUTPUT_DIR/"
+
 /bin/echo "Done. Generated C# proto sources in $OUTPUT_DIR"
@@ -2,9 +2,6 @@
 #
 # Build the SparklePlugin native library for Unity using Bazel
 #
-# The SparklePlugin is built in a separate Bazel workspace (sparkle_workspace/)
-# to avoid rules_swift version conflicts between grpc and rules_apple.
-#
 # Usage: build_sparkle_plugin.sh [output_dir]

 set -euo pipefail
@@ -14,14 +11,13 @@ PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"

 OUTPUT_DIR="${1:-$PROJECT_ROOT/src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/Plugins/macOS}"

-echo "=== Building SparklePlugin with Bazel (from sparkle_workspace) ==="
+echo "=== Building SparklePlugin with Bazel ==="

-# Build in the separate sparkle_workspace to avoid dependency conflicts
-cd "$PROJECT_ROOT/sparkle_workspace"
-bazel build //:SparklePlugin
+cd "$PROJECT_ROOT"
+bazel build //src/main/objc/net/eagle0/clients/unity/sparkle:SparklePlugin

 # Get the zip path from bazel
-ZIP_PATH=$(bazel cquery --output=files //:SparklePlugin 2>/dev/null)
+ZIP_PATH=$(bazel cquery --output=files //src/main/objc/net/eagle0/clients/unity/sparkle:SparklePlugin 2>/dev/null)

 echo "=== Extracting SparklePlugin.bundle ==="
 mkdir -p "$OUTPUT_DIR"
@@ -0,0 +1,73 @@
+#!/bin/bash
+#
+# Restart the active Eagle instance.
+# Reads the active instance from /opt/eagle0/.active-instance (set by deploy-blue-green.sh).
+#
+# This is useful when you need Eagle to reload game state from persistence
+# (e.g., after a rewind) without doing a full blue-green deployment.
+#
+# Usage:
+#   eagle-restart              # Restart active instance, wait for healthy
+#   eagle-restart --no-wait    # Restart without waiting for health check
+#
+# To create an alias, add to ~/.bashrc:
+#   alias eagle-restart='/opt/eagle0/scripts/eagle-restart.sh'
+#
+
+set -euo pipefail
+
+APP_DIR="${APP_DIR:-/opt/eagle0}"
+ACTIVE_FILE="${APP_DIR}/.active-instance"
+HEALTH_TIMEOUT=120  # seconds
+
+# Read active instance from file, with fallback
+if [ -f "$ACTIVE_FILE" ]; then
+    ACTIVE=$(cat "$ACTIVE_FILE")
+else
+    # Fallback: check which container is actually running
+    if docker inspect --format='{{.State.Running}}' eagle-blue 2>/dev/null | grep -q true; then
+        ACTIVE="eagle-blue"
+    elif docker inspect --format='{{.State.Running}}' eagle-green 2>/dev/null | grep -q true; then
+        ACTIVE="eagle-green"
+    else
+        ACTIVE=""
+    fi
+fi
+
+if [ -z "$ACTIVE" ]; then
+    echo "Error: No active Eagle instance found" >&2
+    exit 1
+fi
+
+NO_WAIT=false
+if [ "${1:-}" = "--no-wait" ]; then
+    NO_WAIT=true
+fi
+
+echo "Restarting ${ACTIVE}..."
+docker restart "$ACTIVE"
+
+if [ "$NO_WAIT" = true ]; then
+    echo "Restart initiated. Not waiting for health check."
+    exit 0
+fi
+
+echo "Waiting for ${ACTIVE} to become healthy (timeout: ${HEALTH_TIMEOUT}s)..."
+elapsed=0
+while [ $elapsed -lt $HEALTH_TIMEOUT ]; do
+    health=$(docker inspect --format='{{.State.Health.Status}}' "$ACTIVE" 2>/dev/null || echo "unknown")
+    if [ "$health" = "healthy" ]; then
+        echo "${ACTIVE} is healthy after ${elapsed}s."
+        exit 0
+    fi
+    sleep 2
+    elapsed=$((elapsed + 2))
+    # Print progress every 10 seconds
+    if [ $((elapsed % 10)) -eq 0 ]; then
+        echo "  ...${elapsed}s (status: ${health})"
+    fi
+done
+
+echo "Warning: ${ACTIVE} did not become healthy within ${HEALTH_TIMEOUT}s (status: ${health})" >&2
+echo "Check logs with: eagle-logs" >&2
+exit 1
@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+# Keeps Bazel mactools builds in sync with the installed Xcode version.
+#
+# Only needed on runners that do mactools builds (Mac/Sparkle). Non-Mac builds
+# don't run this script; their apple_cc_autoconf stays cached because none of
+# its environ vars change, so they're unaffected by Xcode version changes.
+#
+# 1. Writes .bazelrc.xcode with mactools-scoped flags:
+#    - action_env for remote cache key invalidation
+#    - DEVELOPER_DIR pointing to the active Xcode
+#
+# 2. Runs `bazel clean --expunge` when the version actually changes, because
+#    local_config_apple_cc (a cached repository rule) bakes in the old version
+#    and can only be refreshed by clearing the output base.
+#
+# .bazelrc imports the generated file via: try-import %workspace%/.bazelrc.xcode
+
+set -euo pipefail
+
+XCODE_BUILD_VERSION=$(xcodebuild -version 2>/dev/null | awk '/Build version/ {print $3}')
+
+if [ -z "$XCODE_BUILD_VERSION" ]; then
+    echo "Warning: Could not detect Xcode build version, skipping"
+    exit 0
+fi
+
+DEVELOPER_DIR=$(xcode-select -p 2>/dev/null)
+
+BAZELRC_XCODE=".bazelrc.xcode"
+EXPECTED_LINE="common:mactools --action_env=XCODE_BUILD_VERSION=${XCODE_BUILD_VERSION}"
+
+# Check if the file already has the right version (first line is the version marker)
+if [ -f "$BAZELRC_XCODE" ]; then
+    CURRENT_FIRST_LINE=$(head -1 "$BAZELRC_XCODE")
+    if [ "$CURRENT_FIRST_LINE" = "$EXPECTED_LINE" ]; then
+        exit 0
+    fi
+fi
+
+# Xcode version changed (or first run) — expunge local cache to clear
+# stale local_config_apple_cc, then write the new config
+OLD_VERSION="unknown"
+if [ -f "$BAZELRC_XCODE" ]; then
+    OLD_VERSION=$(sed -n 's/.*XCODE_BUILD_VERSION=//p' "$BAZELRC_XCODE" | head -1)
+fi
+echo "Xcode build version changed: ${OLD_VERSION} -> ${XCODE_BUILD_VERSION}"
+echo "Running bazel clean --expunge to clear stale toolchain config..."
+bazel clean --expunge 2>/dev/null || true
+
+cat > "$BAZELRC_XCODE" << EOF
+${EXPECTED_LINE}
+common:mactools --repo_env=DEVELOPER_DIR=${DEVELOPER_DIR}
+EOF
+echo "Updated ${BAZELRC_XCODE} — next mactools build will rebuild with Xcode ${XCODE_BUILD_VERSION}"
@@ -1 +0,0 @@
-7.7.1
@@ -1,2 +0,0 @@
-# Bazel symlinks
-bazel-*
@@ -1,28 +0,0 @@
-module(name = "sparkle_workspace")
-
-# Minimal dependencies for building SparklePlugin
-# This workspace is isolated from the main workspace to avoid
-# rules_swift version conflicts between grpc and rules_apple
-
-bazel_dep(name = "apple_support", version = "1.21.1", repo_name = "build_bazel_apple_support")
-bazel_dep(name = "rules_apple", version = "4.3.3", repo_name = "build_bazel_rules_apple")
-
-# Register Apple CC toolchain for Objective-C compilation
-apple_cc_configure = use_extension(
-    "@build_bazel_apple_support//crosstool:setup.bzl",
-    "apple_cc_configure_extension",
-)
-use_repo(apple_cc_configure, "local_config_apple_cc")
-
-# Sparkle framework for macOS auto-updates
-http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-SPARKLE_VERSION = "2.6.4"
-
-http_archive(
-    name = "sparkle",
-    build_file = "//:external/BUILD.sparkle",
-    sha256 = "50612a06038abc931f16011d7903b8326a362c1074dabccb718404ce8e585f0b",
-    strip_prefix = "",
-    url = "https://github.com/sparkle-project/Sparkle/releases/download/%s/Sparkle-%s.tar.xz" % (SPARKLE_VERSION, SPARKLE_VERSION),
-)
@@ -1,451 +0,0 @@
-{
-  "lockFileVersion": 13,
-  "registryFileHashes": {
-    "https://bcr.bazel.build/bazel_registry.json": "8a28e4aff06ee60aed2a8c281907fb8bcbf3b753c91fb5a5c57da3215d5b3497",
-    "https://bcr.bazel.build/modules/abseil-cpp/20210324.2/MODULE.bazel": "7cd0312e064fde87c8d1cd79ba06c876bd23630c83466e9500321be55c96ace2",
-    "https://bcr.bazel.build/modules/abseil-cpp/20211102.0/MODULE.bazel": "70390338f7a5106231d20620712f7cccb659cd0e9d073d1991c038eb9fc57589",
-    "https://bcr.bazel.build/modules/abseil-cpp/20230125.1/MODULE.bazel": "89047429cb0207707b2dface14ba7f8df85273d484c2572755be4bab7ce9c3a0",
-    "https://bcr.bazel.build/modules/abseil-cpp/20230802.0.bcr.1/MODULE.bazel": "1c8cec495288dccd14fdae6e3f95f772c1c91857047a098fad772034264cc8cb",
-    "https://bcr.bazel.build/modules/abseil-cpp/20230802.0/MODULE.bazel": "d253ae36a8bd9ee3c5955384096ccb6baf16a1b1e93e858370da0a3b94f77c16",
-    "https://bcr.bazel.build/modules/abseil-cpp/20230802.1/MODULE.bazel": "fa92e2eb41a04df73cdabeec37107316f7e5272650f81d6cc096418fe647b915",
-    "https://bcr.bazel.build/modules/abseil-cpp/20240116.1/MODULE.bazel": "37bcdb4440fbb61df6a1c296ae01b327f19e9bb521f9b8e26ec854b6f97309ed",
-    "https://bcr.bazel.build/modules/abseil-cpp/20240116.1/source.json": "9be551b8d4e3ef76875c0d744b5d6a504a27e3ae67bc6b28f46415fd2d2957da",
-    "https://bcr.bazel.build/modules/apple_support/1.11.1/MODULE.bazel": "1843d7cd8a58369a444fc6000e7304425fba600ff641592161d9f15b179fb896",
-    "https://bcr.bazel.build/modules/apple_support/1.15.1/MODULE.bazel": "a0556fefca0b1bb2de8567b8827518f94db6a6e7e7d632b4c48dc5f865bc7c85",
-    "https://bcr.bazel.build/modules/apple_support/1.21.1/MODULE.bazel": "5809fa3efab15d1f3c3c635af6974044bac8a4919c62238cce06acee8a8c11f1",
-    "https://bcr.bazel.build/modules/apple_support/1.23.1/MODULE.bazel": "53763fed456a968cf919b3240427cf3a9d5481ec5466abc9d5dc51bc70087442",
-    "https://bcr.bazel.build/modules/apple_support/1.23.1/source.json": "d888b44312eb0ad2c21a91d026753f330caa48a25c9b2102fae75eb2b0dcfdd2",
-    "https://bcr.bazel.build/modules/bazel_features/1.1.1/MODULE.bazel": "27b8c79ef57efe08efccbd9dd6ef70d61b4798320b8d3c134fd571f78963dbcd",
-    "https://bcr.bazel.build/modules/bazel_features/1.11.0/MODULE.bazel": "f9382337dd5a474c3b7d334c2f83e50b6eaedc284253334cf823044a26de03e8",
-    "https://bcr.bazel.build/modules/bazel_features/1.15.0/MODULE.bazel": "d38ff6e517149dc509406aca0db3ad1efdd890a85e049585b7234d04238e2a4d",
-    "https://bcr.bazel.build/modules/bazel_features/1.17.0/MODULE.bazel": "039de32d21b816b47bd42c778e0454217e9c9caac4a3cf8e15c7231ee3ddee4d",
-    "https://bcr.bazel.build/modules/bazel_features/1.18.0/MODULE.bazel": "1be0ae2557ab3a72a57aeb31b29be347bcdc5d2b1eb1e70f39e3851a7e97041a",
-    "https://bcr.bazel.build/modules/bazel_features/1.19.0/MODULE.bazel": "59adcdf28230d220f0067b1f435b8537dd033bfff8db21335ef9217919c7fb58",
-    "https://bcr.bazel.build/modules/bazel_features/1.21.0/MODULE.bazel": "675642261665d8eea09989aa3b8afb5c37627f1be178382c320d1b46afba5e3b",
-    "https://bcr.bazel.build/modules/bazel_features/1.27.0/MODULE.bazel": "621eeee06c4458a9121d1f104efb80f39d34deff4984e778359c60eaf1a8cb65",
-    "https://bcr.bazel.build/modules/bazel_features/1.28.0/MODULE.bazel": "4b4200e6cbf8fa335b2c3f43e1d6ef3e240319c33d43d60cc0fbd4b87ece299d",
-    "https://bcr.bazel.build/modules/bazel_features/1.3.0/MODULE.bazel": "cdcafe83ec318cda34e02948e81d790aab8df7a929cec6f6969f13a489ccecd9",
-    "https://bcr.bazel.build/modules/bazel_features/1.30.0/MODULE.bazel": "a14b62d05969a293b80257e72e597c2da7f717e1e69fa8b339703ed6731bec87",
-    "https://bcr.bazel.build/modules/bazel_features/1.30.0/source.json": "b07e17f067fe4f69f90b03b36ef1e08fe0d1f3cac254c1241a1818773e3423bc",
-    "https://bcr.bazel.build/modules/bazel_features/1.4.1/MODULE.bazel": "e45b6bb2350aff3e442ae1111c555e27eac1d915e77775f6fdc4b351b758b5d7",
-    "https://bcr.bazel.build/modules/bazel_skylib/1.0.3/MODULE.bazel": "bcb0fd896384802d1ad283b4e4eb4d718eebd8cb820b0a2c3a347fb971afd9d8",
-    "https://bcr.bazel.build/modules/bazel_skylib/1.1.1/MODULE.bazel": "1add3e7d93ff2e6998f9e118022c84d163917d912f5afafb3058e3d2f1545b5e",
-    "https://bcr.bazel.build/modules/bazel_skylib/1.2.0/MODULE.bazel": "44fe84260e454ed94ad326352a698422dbe372b21a1ac9f3eab76eb531223686",
-    "https://bcr.bazel.build/modules/bazel_skylib/1.2.1/MODULE.bazel": "f35baf9da0efe45fa3da1696ae906eea3d615ad41e2e3def4aeb4e8bc0ef9a7a",
-    "https://bcr.bazel.build/modules/bazel_skylib/1.3.0/MODULE.bazel": "20228b92868bf5cfc41bda7afc8a8ba2a543201851de39d990ec957b513579c5",
-    "https://bcr.bazel.build/modules/bazel_skylib/1.4.1/MODULE.bazel": "a0dcb779424be33100dcae821e9e27e4f2901d9dfd5333efe5ac6a8d7ab75e1d",
-    "https://bcr.bazel.build/modules/bazel_skylib/1.4.2/MODULE.bazel": "3bd40978e7a1fac911d5989e6b09d8f64921865a45822d8b09e815eaa726a651",
-    "https://bcr.bazel.build/modules/bazel_skylib/1.5.0/MODULE.bazel": "32880f5e2945ce6a03d1fbd588e9198c0a959bb42297b2cfaf1685b7bc32e138",
-    "https://bcr.bazel.build/modules/bazel_skylib/1.6.1/MODULE.bazel": "8fdee2dbaace6c252131c00e1de4b165dc65af02ea278476187765e1a617b917",
-    "https://bcr.bazel.build/modules/bazel_skylib/1.7.0/MODULE.bazel": "0db596f4563de7938de764cc8deeabec291f55e8ec15299718b93c4423e9796d",
-    "https://bcr.bazel.build/modules/bazel_skylib/1.7.1/MODULE.bazel": "3120d80c5861aa616222ec015332e5f8d3171e062e3e804a2a0253e1be26e59b",
-    "https://bcr.bazel.build/modules/bazel_skylib/1.7.1/source.json": "f121b43eeefc7c29efbd51b83d08631e2347297c95aac9764a701f2a6a2bb953",
-    "https://bcr.bazel.build/modules/buildozer/7.1.2/MODULE.bazel": "2e8dd40ede9c454042645fd8d8d0cd1527966aa5c919de86661e62953cd73d84",
-    "https://bcr.bazel.build/modules/buildozer/7.1.2/source.json": "c9028a501d2db85793a6996205c8de120944f50a0d570438fcae0457a5f9d1f8",
-    "https://bcr.bazel.build/modules/google_benchmark/1.8.2/MODULE.bazel": "a70cf1bba851000ba93b58ae2f6d76490a9feb74192e57ab8e8ff13c34ec50cb",
-    "https://bcr.bazel.build/modules/googletest/1.11.0/MODULE.bazel": "3a83f095183f66345ca86aa13c58b59f9f94a2f81999c093d4eeaa2d262d12f4",
-    "https://bcr.bazel.build/modules/googletest/1.14.0.bcr.1/MODULE.bazel": "22c31a561553727960057361aa33bf20fb2e98584bc4fec007906e27053f80c6",
-    "https://bcr.bazel.build/modules/googletest/1.14.0.bcr.1/source.json": "41e9e129f80d8c8bf103a7acc337b76e54fad1214ac0a7084bf24f4cd924b8b4",
-    "https://bcr.bazel.build/modules/googletest/1.14.0/MODULE.bazel": "cfbcbf3e6eac06ef9d85900f64424708cc08687d1b527f0ef65aa7517af8118f",
-    "https://bcr.bazel.build/modules/jsoncpp/1.9.5/MODULE.bazel": "31271aedc59e815656f5736f282bb7509a97c7ecb43e927ac1a37966e0578075",
-    "https://bcr.bazel.build/modules/jsoncpp/1.9.5/source.json": "4108ee5085dd2885a341c7fab149429db457b3169b86eb081fa245eadf69169d",
-    "https://bcr.bazel.build/modules/libpfm/4.11.0/MODULE.bazel": "45061ff025b301940f1e30d2c16bea596c25b176c8b6b3087e92615adbd52902",
-    "https://bcr.bazel.build/modules/nlohmann_json/3.6.1/MODULE.bazel": "6f7b417dcc794d9add9e556673ad25cb3ba835224290f4f848f8e2db1e1fca74",
-    "https://bcr.bazel.build/modules/nlohmann_json/3.6.1/source.json": "f448c6e8963fdfa7eb831457df83ad63d3d6355018f6574fb017e8169deb43a9",
-    "https://bcr.bazel.build/modules/platforms/0.0.10/MODULE.bazel": "8cb8efaf200bdeb2150d93e162c40f388529a25852b332cec879373771e48ed5",
-    "https://bcr.bazel.build/modules/platforms/0.0.11/MODULE.bazel": "0daefc49732e227caa8bfa834d65dc52e8cc18a2faf80df25e8caea151a9413f",
-    "https://bcr.bazel.build/modules/platforms/0.0.11/source.json": "f7e188b79ebedebfe75e9e1d098b8845226c7992b307e28e1496f23112e8fc29",
-    "https://bcr.bazel.build/modules/platforms/0.0.4/MODULE.bazel": "9b328e31ee156f53f3c416a64f8491f7eb731742655a47c9eec4703a71644aee",
-    "https://bcr.bazel.build/modules/platforms/0.0.5/MODULE.bazel": "5733b54ea419d5eaf7997054bb55f6a1d0b5ff8aedf0176fef9eea44f3acda37",
-    "https://bcr.bazel.build/modules/platforms/0.0.6/MODULE.bazel": "ad6eeef431dc52aefd2d77ed20a4b353f8ebf0f4ecdd26a807d2da5aa8cd0615",
-    "https://bcr.bazel.build/modules/platforms/0.0.7/MODULE.bazel": "72fd4a0ede9ee5c021f6a8dd92b503e089f46c227ba2813ff183b71616034814",
-    "https://bcr.bazel.build/modules/platforms/0.0.8/MODULE.bazel": "9f142c03e348f6d263719f5074b21ef3adf0b139ee4c5133e2aa35664da9eb2d",
-    "https://bcr.bazel.build/modules/platforms/0.0.9/MODULE.bazel": "4a87a60c927b56ddd67db50c89acaa62f4ce2a1d2149ccb63ffd871d5ce29ebc",
-    "https://bcr.bazel.build/modules/protobuf/21.7/MODULE.bazel": "a5a29bb89544f9b97edce05642fac225a808b5b7be74038ea3640fae2f8e66a7",
-    "https://bcr.bazel.build/modules/protobuf/27.0/MODULE.bazel": "7873b60be88844a0a1d8f80b9d5d20cfbd8495a689b8763e76c6372998d3f64c",
-    "https://bcr.bazel.build/modules/protobuf/29.0-rc2/MODULE.bazel": "6241d35983510143049943fc0d57937937122baf1b287862f9dc8590fc4c37df",
-    "https://bcr.bazel.build/modules/protobuf/29.0-rc3/MODULE.bazel": "33c2dfa286578573afc55a7acaea3cada4122b9631007c594bf0729f41c8de92",
-    "https://bcr.bazel.build/modules/protobuf/29.0-rc3/source.json": "c16a6488fb279ef578da7098e605082d72ed85fc8d843eaae81e7d27d0f4625d",
-    "https://bcr.bazel.build/modules/protobuf/3.19.0/MODULE.bazel": "6b5fbb433f760a99a22b18b6850ed5784ef0e9928a72668b66e4d7ccd47db9b0",
-    "https://bcr.bazel.build/modules/protobuf/3.19.6/MODULE.bazel": "9233edc5e1f2ee276a60de3eaa47ac4132302ef9643238f23128fea53ea12858",
-    "https://bcr.bazel.build/modules/pybind11_bazel/2.11.1/MODULE.bazel": "88af1c246226d87e65be78ed49ecd1e6f5e98648558c14ce99176da041dc378e",
-    "https://bcr.bazel.build/modules/pybind11_bazel/2.11.1/source.json": "be4789e951dd5301282729fe3d4938995dc4c1a81c2ff150afc9f1b0504c6022",
-    "https://bcr.bazel.build/modules/re2/2023-09-01/MODULE.bazel": "cb3d511531b16cfc78a225a9e2136007a48cf8a677e4264baeab57fe78a80206",
-    "https://bcr.bazel.build/modules/re2/2023-09-01/source.json": "e044ce89c2883cd957a2969a43e79f7752f9656f6b20050b62f90ede21ec6eb4",
-    "https://bcr.bazel.build/modules/rules_android/0.1.1/MODULE.bazel": "48809ab0091b07ad0182defb787c4c5328bd3a278938415c00a7b69b50c4d3a8",
-    "https://bcr.bazel.build/modules/rules_android/0.1.1/source.json": "e6986b41626ee10bdc864937ffb6d6bf275bb5b9c65120e6137d56e6331f089e",
-    "https://bcr.bazel.build/modules/rules_apple/4.3.3/MODULE.bazel": "c5c2c4adeeac5f3f2f9b7f16abfa8be7ffefa596171d0d92bed4cae9ade0a498",
-    "https://bcr.bazel.build/modules/rules_apple/4.3.3/source.json": "3cb1d69c8243ffcc42ecbf84ae8b9cccd7b1e2f091b0aee5a3e9c9a45267f312",
-    "https://bcr.bazel.build/modules/rules_cc/0.0.1/MODULE.bazel": "cb2aa0747f84c6c3a78dad4e2049c154f08ab9d166b1273835a8174940365647",
-    "https://bcr.bazel.build/modules/rules_cc/0.0.10/MODULE.bazel": "ec1705118f7eaedd6e118508d3d26deba2a4e76476ada7e0e3965211be012002",
-    "https://bcr.bazel.build/modules/rules_cc/0.0.11/MODULE.bazel": "9f249c5624a4788067b96b8b896be10c7e8b4375dc46f6d8e1e51100113e0992",
-    "https://bcr.bazel.build/modules/rules_cc/0.0.13/MODULE.bazel": "0e8529ed7b323dad0775ff924d2ae5af7640b23553dfcd4d34344c7e7a867191",
-    "https://bcr.bazel.build/modules/rules_cc/0.0.15/MODULE.bazel": "6704c35f7b4a72502ee81f61bf88706b54f06b3cbe5558ac17e2e14666cd5dcc",
-    "https://bcr.bazel.build/modules/rules_cc/0.0.16/MODULE.bazel": "7661303b8fc1b4d7f532e54e9d6565771fea666fbdf839e0a86affcd02defe87",
-    "https://bcr.bazel.build/modules/rules_cc/0.0.2/MODULE.bazel": "6915987c90970493ab97393024c156ea8fb9f3bea953b2f3ec05c34f19b5695c",
-    "https://bcr.bazel.build/modules/rules_cc/0.0.6/MODULE.bazel": "abf360251023dfe3efcef65ab9d56beefa8394d4176dd29529750e1c57eaa33f",
-    "https://bcr.bazel.build/modules/rules_cc/0.0.8/MODULE.bazel": "964c85c82cfeb6f3855e6a07054fdb159aced38e99a5eecf7bce9d53990afa3e",
-    "https://bcr.bazel.build/modules/rules_cc/0.0.9/MODULE.bazel": "836e76439f354b89afe6a911a7adf59a6b2518fafb174483ad78a2a2fde7b1c5",
-    "https://bcr.bazel.build/modules/rules_cc/0.1.2/MODULE.bazel": "557ddc3a96858ec0d465a87c0a931054d7dcfd6583af2c7ed3baf494407fd8d0",
-    "https://bcr.bazel.build/modules/rules_cc/0.1.2/source.json": "53fcb09b5816c83ca60d9d7493faf3bfaf410dfc2f15deb52d6ddd146b8d43f0",
-    "https://bcr.bazel.build/modules/rules_foreign_cc/0.9.0/MODULE.bazel": "c9e8c682bf75b0e7c704166d79b599f93b72cfca5ad7477df596947891feeef6",
-    "https://bcr.bazel.build/modules/rules_fuzzing/0.5.2/MODULE.bazel": "40c97d1144356f52905566c55811f13b299453a14ac7769dfba2ac38192337a8",
-    "https://bcr.bazel.build/modules/rules_fuzzing/0.5.2/source.json": "c8b1e2c717646f1702290959a3302a178fb639d987ab61d548105019f11e527e",
-    "https://bcr.bazel.build/modules/rules_java/4.0.0/MODULE.bazel": "5a78a7ae82cd1a33cef56dc578c7d2a46ed0dca12643ee45edbb8417899e6f74",
-    "https://bcr.bazel.build/modules/rules_java/5.3.5/MODULE.bazel": "a4ec4f2db570171e3e5eb753276ee4b389bae16b96207e9d3230895c99644b86",
-    "https://bcr.bazel.build/modules/rules_java/6.5.2/MODULE.bazel": "1d440d262d0e08453fa0c4d8f699ba81609ed0e9a9a0f02cd10b3e7942e61e31",
-    "https://bcr.bazel.build/modules/rules_java/7.10.0/MODULE.bazel": "530c3beb3067e870561739f1144329a21c851ff771cd752a49e06e3dc9c2e71a",
-    "https://bcr.bazel.build/modules/rules_java/7.12.2/MODULE.bazel": "579c505165ee757a4280ef83cda0150eea193eed3bef50b1004ba88b99da6de6",
-    "https://bcr.bazel.build/modules/rules_java/7.2.0/MODULE.bazel": "06c0334c9be61e6cef2c8c84a7800cef502063269a5af25ceb100b192453d4ab",
-    "https://bcr.bazel.build/modules/rules_java/7.6.1/MODULE.bazel": "2f14b7e8a1aa2f67ae92bc69d1ec0fa8d9f827c4e17ff5e5f02e91caa3b2d0fe",
-    "https://bcr.bazel.build/modules/rules_java/7.6.5/MODULE.bazel": "481164be5e02e4cab6e77a36927683263be56b7e36fef918b458d7a8a1ebadb1",
-    "https://bcr.bazel.build/modules/rules_java/8.3.2/MODULE.bazel": "7336d5511ad5af0b8615fdc7477535a2e4e723a357b6713af439fe8cf0195017",
-    "https://bcr.bazel.build/modules/rules_java/8.5.1/MODULE.bazel": "d8a9e38cc5228881f7055a6079f6f7821a073df3744d441978e7a43e20226939",
-    "https://bcr.bazel.build/modules/rules_java/8.5.1/source.json": "db1a77d81b059e0f84985db67a22f3f579a529a86b7997605be3d214a0abe38e",
-    "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/MODULE.bazel": "a56b85e418c83eb1839819f0b515c431010160383306d13ec21959ac412d2fe7",
-    "https://bcr.bazel.build/modules/rules_jvm_external/5.1/MODULE.bazel": "33f6f999e03183f7d088c9be518a63467dfd0be94a11d0055fe2d210f89aa909",
-    "https://bcr.bazel.build/modules/rules_jvm_external/5.2/MODULE.bazel": "d9351ba35217ad0de03816ef3ed63f89d411349353077348a45348b096615036",
-    "https://bcr.bazel.build/modules/rules_jvm_external/6.3/MODULE.bazel": "c998e060b85f71e00de5ec552019347c8bca255062c990ac02d051bb80a38df0",
-    "https://bcr.bazel.build/modules/rules_jvm_external/6.3/source.json": "6f5f5a5a4419ae4e37c35a5bb0a6ae657ed40b7abc5a5189111b47fcebe43197",
-    "https://bcr.bazel.build/modules/rules_kotlin/1.9.6/MODULE.bazel": "d269a01a18ee74d0335450b10f62c9ed81f2321d7958a2934e44272fe82dcef3",
-    "https://bcr.bazel.build/modules/rules_kotlin/1.9.6/source.json": "2faa4794364282db7c06600b7e5e34867a564ae91bda7cae7c29c64e9466b7d5",
-    "https://bcr.bazel.build/modules/rules_license/0.0.3/MODULE.bazel": "627e9ab0247f7d1e05736b59dbb1b6871373de5ad31c3011880b4133cafd4bd0",
-    "https://bcr.bazel.build/modules/rules_license/0.0.7/MODULE.bazel": "088fbeb0b6a419005b89cf93fe62d9517c0a2b8bb56af3244af65ecfe37e7d5d",
-    "https://bcr.bazel.build/modules/rules_license/1.0.0/MODULE.bazel": "a7fda60eefdf3d8c827262ba499957e4df06f659330bbe6cdbdb975b768bb65c",
-    "https://bcr.bazel.build/modules/rules_license/1.0.0/source.json": "a52c89e54cc311196e478f8382df91c15f7a2bfdf4c6cd0e2675cc2ff0b56efb",
-    "https://bcr.bazel.build/modules/rules_pkg/0.7.0/MODULE.bazel": "df99f03fc7934a4737122518bb87e667e62d780b610910f0447665a7e2be62dc",
-    "https://bcr.bazel.build/modules/rules_pkg/1.0.1/MODULE.bazel": "5b1df97dbc29623bccdf2b0dcd0f5cb08e2f2c9050aab1092fd39a41e82686ff",
-    "https://bcr.bazel.build/modules/rules_pkg/1.0.1/source.json": "bd82e5d7b9ce2d31e380dd9f50c111d678c3bdaca190cb76b0e1c71b05e1ba8a",
-    "https://bcr.bazel.build/modules/rules_proto/4.0.0/MODULE.bazel": "a7a7b6ce9bee418c1a760b3d84f83a299ad6952f9903c67f19e4edd964894e06",
-    "https://bcr.bazel.build/modules/rules_proto/5.3.0-21.7/MODULE.bazel": "e8dff86b0971688790ae75528fe1813f71809b5afd57facb44dad9e8eca631b7",
-    "https://bcr.bazel.build/modules/rules_proto/6.0.2/MODULE.bazel": "ce916b775a62b90b61888052a416ccdda405212b6aaeb39522f7dc53431a5e73",
-    "https://bcr.bazel.build/modules/rules_proto/6.0.2/source.json": "17a2e195f56cb28d6bbf763e49973d13890487c6945311ed141e196fb660426d",
-    "https://bcr.bazel.build/modules/rules_python/0.10.2/MODULE.bazel": "cc82bc96f2997baa545ab3ce73f196d040ffb8756fd2d66125a530031cd90e5f",
-    "https://bcr.bazel.build/modules/rules_python/0.22.1/MODULE.bazel": "26114f0c0b5e93018c0c066d6673f1a2c3737c7e90af95eff30cfee38d0bbac7",
-    "https://bcr.bazel.build/modules/rules_python/0.23.1/MODULE.bazel": "49ffccf0511cb8414de28321f5fcf2a31312b47c40cc21577144b7447f2bf300",
-    "https://bcr.bazel.build/modules/rules_python/0.25.0/MODULE.bazel": "72f1506841c920a1afec76975b35312410eea3aa7b63267436bfb1dd91d2d382",
-    "https://bcr.bazel.build/modules/rules_python/0.28.0/MODULE.bazel": "cba2573d870babc976664a912539b320cbaa7114cd3e8f053c720171cde331ed",
-    "https://bcr.bazel.build/modules/rules_python/0.31.0/MODULE.bazel": "93a43dc47ee570e6ec9f5779b2e64c1476a6ce921c48cc9a1678a91dd5f8fd58",
-    "https://bcr.bazel.build/modules/rules_python/0.4.0/MODULE.bazel": "9208ee05fd48bf09ac60ed269791cf17fb343db56c8226a720fbb1cdf467166c",
-    "https://bcr.bazel.build/modules/rules_python/1.3.0/MODULE.bazel": "8361d57eafb67c09b75bf4bbe6be360e1b8f4f18118ab48037f2bd50aa2ccb13",
-    "https://bcr.bazel.build/modules/rules_python/1.3.0/source.json": "25932f917cd279c7baefa6cb1d3fa8750a7a29de522024449b19af6eab51f4a0",
-    "https://bcr.bazel.build/modules/rules_shell/0.2.0/MODULE.bazel": "fda8a652ab3c7d8fee214de05e7a9916d8b28082234e8d2c0094505c5268ed3c",
-    "https://bcr.bazel.build/modules/rules_shell/0.3.0/MODULE.bazel": "de4402cd12f4cc8fda2354fce179fdb068c0b9ca1ec2d2b17b3e21b24c1a937b",
-    "https://bcr.bazel.build/modules/rules_shell/0.3.0/source.json": "c55ed591aa5009401ddf80ded9762ac32c358d2517ee7820be981e2de9756cf3",
-    "https://bcr.bazel.build/modules/rules_swift/1.16.0/MODULE.bazel": "4a09f199545a60d09895e8281362b1ff3bb08bbde69c6fc87aff5b92fcc916ca",
-    "https://bcr.bazel.build/modules/rules_swift/2.4.0/MODULE.bazel": "1639617eb1ede28d774d967a738b4a68b0accb40650beadb57c21846beab5efd",
-    "https://bcr.bazel.build/modules/rules_swift/2.4.0/source.json": "a6577f57f9febbdc015a01f2a8f3487422032f134d6c61d18ed8e8ca3b9acc7c",
-    "https://bcr.bazel.build/modules/stardoc/0.5.1/MODULE.bazel": "1a05d92974d0c122f5ccf09291442580317cdd859f07a8655f1db9a60374f9f8",
-    "https://bcr.bazel.build/modules/stardoc/0.5.3/MODULE.bazel": "c7f6948dae6999bf0db32c1858ae345f112cacf98f174c7a8bb707e41b974f1c",
-    "https://bcr.bazel.build/modules/stardoc/0.7.0/MODULE.bazel": "05e3d6d30c099b6770e97da986c53bd31844d7f13d41412480ea265ac9e8079c",
-    "https://bcr.bazel.build/modules/stardoc/0.7.2/MODULE.bazel": "fc152419aa2ea0f51c29583fab1e8c99ddefd5b3778421845606ee628629e0e5",
-    "https://bcr.bazel.build/modules/stardoc/0.7.2/source.json": "58b029e5e901d6802967754adf0a9056747e8176f017cfe3607c0851f4d42216",
-    "https://bcr.bazel.build/modules/swift_argument_parser/1.3.1.1/MODULE.bazel": "5e463fbfba7b1701d957555ed45097d7f984211330106ccd1352c6e0af0dcf91",
-    "https://bcr.bazel.build/modules/swift_argument_parser/1.3.1.1/source.json": "32bd87e5f4d7acc57c5b2ff7c325ae3061d5e242c0c4c214ae87e0f1c13e54cb",
-    "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/MODULE.bazel": "7298990c00040a0e2f121f6c32544bab27d4452f80d9ce51349b1a28f3005c43",
-    "https://bcr.bazel.build/modules/zlib/1.2.11/MODULE.bazel": "07b389abc85fdbca459b69e2ec656ae5622873af3f845e1c9d80fe179f3effa0",
-    "https://bcr.bazel.build/modules/zlib/1.2.12/MODULE.bazel": "3b1a8834ada2a883674be8cbd36ede1b6ec481477ada359cd2d3ddc562340b27",
-    "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.3/MODULE.bazel": "af322bc08976524477c79d1e45e241b6efbeb918c497e8840b8ab116802dda79",
-    "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.3/source.json": "2be409ac3c7601245958cd4fcdff4288be79ed23bd690b4b951f500d54ee6e7d",
-    "https://bcr.bazel.build/modules/zlib/1.3.1/MODULE.bazel": "751c9940dcfe869f5f7274e1295422a34623555916eb98c174c1e945594bf198"
-  },
-  "selectedYankedVersions": {},
-  "moduleExtensions": {
-    "@@rules_java~//java:rules_java_deps.bzl%compatibility_proxy": {
-      "general": {
-        "bzlTransitiveDigest": "C4xqrMy1wN4iuTN6Z2eCm94S5XingHhD6uwrIXvCxVI=",
-        "usagesDigest": "pwHZ+26iLgQdwvdZeA5wnAjKnNI3y6XO2VbhOTeo5h8=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "compatibility_proxy": {
-            "bzlFile": "@@rules_java~//java:rules_java_deps.bzl",
-            "ruleClassName": "_compatibility_proxy_repo_rule",
-            "attributes": {}
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "rules_java~",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    },
-    "@@rules_kotlin~//src/main/starlark/core/repositories:bzlmod_setup.bzl%rules_kotlin_extensions": {
-      "general": {
-        "bzlTransitiveDigest": "eecmTsmdIQveoA97hPtH3/Ej/kugbdCI24bhXIXaly8=",
-        "usagesDigest": "aJF6fLy82rR95Ff5CZPAqxNoFgOMLMN5ImfBS0nhnkg=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "com_github_jetbrains_kotlin_git": {
-            "bzlFile": "@@rules_kotlin~//src/main/starlark/core/repositories:compiler.bzl",
-            "ruleClassName": "kotlin_compiler_git_repository",
-            "attributes": {
-              "urls": [
-                "https://github.com/JetBrains/kotlin/releases/download/v1.9.23/kotlin-compiler-1.9.23.zip"
-              ],
-              "sha256": "93137d3aab9afa9b27cb06a824c2324195c6b6f6179d8a8653f440f5bd58be88"
-            }
-          },
-          "com_github_jetbrains_kotlin": {
-            "bzlFile": "@@rules_kotlin~//src/main/starlark/core/repositories:compiler.bzl",
-            "ruleClassName": "kotlin_capabilities_repository",
-            "attributes": {
-              "git_repository_name": "com_github_jetbrains_kotlin_git",
-              "compiler_version": "1.9.23"
-            }
-          },
-          "com_github_google_ksp": {
-            "bzlFile": "@@rules_kotlin~//src/main/starlark/core/repositories:ksp.bzl",
-            "ruleClassName": "ksp_compiler_plugin_repository",
-            "attributes": {
-              "urls": [
-                "https://github.com/google/ksp/releases/download/1.9.23-1.0.20/artifacts.zip"
-              ],
-              "sha256": "ee0618755913ef7fd6511288a232e8fad24838b9af6ea73972a76e81053c8c2d",
-              "strip_version": "1.9.23-1.0.20"
-            }
-          },
-          "com_github_pinterest_ktlint": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "01b2e0ef893383a50dbeb13970fe7fa3be36ca3e83259e01649945b09d736985",
-              "urls": [
-                "https://github.com/pinterest/ktlint/releases/download/1.3.0/ktlint"
-              ],
-              "executable": true
-            }
-          },
-          "rules_android": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "cd06d15dd8bb59926e4d65f9003bfc20f9da4b2519985c27e190cddc8b7a7806",
-              "strip_prefix": "rules_android-0.1.1",
-              "urls": [
-                "https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip"
-              ]
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "rules_kotlin~",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    },
-    "@@rules_python~//python/uv:uv.bzl%uv": {
-      "general": {
-        "bzlTransitiveDigest": "Xpqjnjzy6zZ90Es9Wa888ZLHhn7IsNGbph/e6qoxzw8=",
-        "usagesDigest": "qI5PVlIum/YAnGJg5oXGHzDkMFWt2aNSUZY4G8PBbic=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "uv": {
-            "bzlFile": "@@rules_python~//python/uv/private:uv_toolchains_repo.bzl",
-            "ruleClassName": "uv_toolchains_repo",
-            "attributes": {
-              "toolchain_type": "'@@rules_python~//python/uv:uv_toolchain_type'",
-              "toolchain_names": [
-                "none"
-              ],
-              "toolchain_implementations": {
-                "none": "'@@rules_python~//python:none'"
-              },
-              "toolchain_compatible_with": {
-                "none": [
-                  "@platforms//:incompatible"
-                ]
-              },
-              "toolchain_target_settings": {}
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "rules_python~",
-            "platforms",
-            "platforms"
-          ]
-        ]
-      }
-    },
-    "@@rules_swift~//swift:extensions.bzl%non_module_deps": {
-      "general": {
-        "bzlTransitiveDigest": "l+Zu+SMObRQy3DG2LEw0eGVPkYRnyVj+M1QyR5AAFmM=",
-        "usagesDigest": "l2vIL7SL4tJqHIVLWd78Y/ym+r0II64lmvoX8o+0Bb0=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "com_github_apple_swift_protobuf": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "urls": [
-                "https://github.com/apple/swift-protobuf/archive/1.20.2.tar.gz"
-              ],
-              "sha256": "3fb50bd4d293337f202d917b6ada22f9548a0a0aed9d9a4d791e6fbd8a246ebb",
-              "strip_prefix": "swift-protobuf-1.20.2/",
-              "build_file": "@@rules_swift~//third_party:com_github_apple_swift_protobuf/BUILD.overlay"
-            }
-          },
-          "com_github_grpc_grpc_swift": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "urls": [
-                "https://github.com/grpc/grpc-swift/archive/1.16.0.tar.gz"
-              ],
-              "sha256": "58b60431d0064969f9679411264b82e40a217ae6bd34e17096d92cc4e47556a5",
-              "strip_prefix": "grpc-swift-1.16.0/",
-              "build_file": "@@rules_swift~//third_party:com_github_grpc_grpc_swift/BUILD.overlay"
-            }
-          },
-          "com_github_apple_swift_docc_symbolkit": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "urls": [
-                "https://github.com/apple/swift-docc-symbolkit/archive/refs/tags/swift-5.10-RELEASE.tar.gz"
-              ],
-              "sha256": "de1d4b6940468ddb53b89df7aa1a81323b9712775b0e33e8254fa0f6f7469a97",
-              "strip_prefix": "swift-docc-symbolkit-swift-5.10-RELEASE",
-              "build_file": "@@rules_swift~//third_party:com_github_apple_swift_docc_symbolkit/BUILD.overlay"
-            }
-          },
-          "com_github_apple_swift_nio": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "urls": [
-                "https://github.com/apple/swift-nio/archive/2.42.0.tar.gz"
-              ],
-              "sha256": "e3304bc3fb53aea74a3e54bd005ede11f6dc357117d9b1db642d03aea87194a0",
-              "strip_prefix": "swift-nio-2.42.0/",
-              "build_file": "@@rules_swift~//third_party:com_github_apple_swift_nio/BUILD.overlay"
-            }
-          },
-          "com_github_apple_swift_nio_http2": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "urls": [
-                "https://github.com/apple/swift-nio-http2/archive/1.26.0.tar.gz"
-              ],
-              "sha256": "f0edfc9d6a7be1d587e5b403f2d04264bdfae59aac1d74f7d974a9022c6d2b25",
-              "strip_prefix": "swift-nio-http2-1.26.0/",
-              "build_file": "@@rules_swift~//third_party:com_github_apple_swift_nio_http2/BUILD.overlay"
-            }
-          },
-          "com_github_apple_swift_nio_transport_services": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "urls": [
-                "https://github.com/apple/swift-nio-transport-services/archive/1.15.0.tar.gz"
-              ],
-              "sha256": "f3498dafa633751a52b9b7f741f7ac30c42bcbeb3b9edca6d447e0da8e693262",
-              "strip_prefix": "swift-nio-transport-services-1.15.0/",
-              "build_file": "@@rules_swift~//third_party:com_github_apple_swift_nio_transport_services/BUILD.overlay"
-            }
-          },
-          "com_github_apple_swift_nio_extras": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "urls": [
-                "https://github.com/apple/swift-nio-extras/archive/1.4.0.tar.gz"
-              ],
-              "sha256": "4684b52951d9d9937bb3e8ccd6b5daedd777021ef2519ea2f18c4c922843b52b",
-              "strip_prefix": "swift-nio-extras-1.4.0/",
-              "build_file": "@@rules_swift~//third_party:com_github_apple_swift_nio_extras/BUILD.overlay"
-            }
-          },
-          "com_github_apple_swift_log": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "urls": [
-                "https://github.com/apple/swift-log/archive/1.4.4.tar.gz"
-              ],
-              "sha256": "48fe66426c784c0c20031f15dc17faf9f4c9037c192bfac2f643f65cb2321ba0",
-              "strip_prefix": "swift-log-1.4.4/",
-              "build_file": "@@rules_swift~//third_party:com_github_apple_swift_log/BUILD.overlay"
-            }
-          },
-          "com_github_apple_swift_nio_ssl": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "urls": [
-                "https://github.com/apple/swift-nio-ssl/archive/2.23.0.tar.gz"
-              ],
-              "sha256": "4787c63f61dd04d99e498adc3d1a628193387e41efddf8de19b8db04544d016d",
-              "strip_prefix": "swift-nio-ssl-2.23.0/",
-              "build_file": "@@rules_swift~//third_party:com_github_apple_swift_nio_ssl/BUILD.overlay"
-            }
-          },
-          "com_github_apple_swift_collections": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "urls": [
-                "https://github.com/apple/swift-collections/archive/1.0.4.tar.gz"
-              ],
-              "sha256": "d9e4c8a91c60fb9c92a04caccbb10ded42f4cb47b26a212bc6b39cc390a4b096",
-              "strip_prefix": "swift-collections-1.0.4/",
-              "build_file": "@@rules_swift~//third_party:com_github_apple_swift_collections/BUILD.overlay"
-            }
-          },
-          "com_github_apple_swift_atomics": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "urls": [
-                "https://github.com/apple/swift-atomics/archive/1.1.0.tar.gz"
-              ],
-              "sha256": "1bee7f469f7e8dc49f11cfa4da07182fbc79eab000ec2c17bfdce468c5d276fb",
-              "strip_prefix": "swift-atomics-1.1.0/",
-              "build_file": "@@rules_swift~//third_party:com_github_apple_swift_atomics/BUILD.overlay"
-            }
-          },
-          "build_bazel_rules_swift_index_import": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file": "@@rules_swift~//third_party:build_bazel_rules_swift_index_import/BUILD.overlay",
-              "canonical_id": "index-import-5.8",
-              "urls": [
-                "https://github.com/MobileNativeFoundation/index-import/releases/download/5.8.0.1/index-import.tar.gz"
-              ],
-              "sha256": "28c1ffa39d99e74ed70623899b207b41f79214c498c603915aef55972a851a15"
-            }
-          },
-          "build_bazel_rules_swift_local_config": {
-            "bzlFile": "@@rules_swift~//swift/internal:swift_autoconfiguration.bzl",
-            "ruleClassName": "swift_autoconfiguration",
-            "attributes": {}
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "rules_swift~",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    }
-  }
-}
@@ -1,3 +0,0 @@
-# This file marks sparkle_workspace as a separate Bazel workspace.
-# It prevents Bazel from looking up to the parent directory's workspace.
-# The actual dependencies are defined in MODULE.bazel (bzlmod).
@@ -95,9 +95,16 @@ auto ConvertUnit(
    shardokUnit.mutate_stun_rounds_remaining(0);

    for (const PlayerId pid : allPlayerIds) {
+        int8_t initialKnowledge = 0;
+        for (const auto visibleToPid : unit.visible_to_player_ids()) {
+            if (visibleToPid == pid) {
+                initialKnowledge = 100;
+                break;
+            }
+        }
        shardokUnit.mutable_opponent_knowledge()->Mutate(
                static_cast<flatbuffers::uoffset_t>(pid),
-                0);
+                initialKnowledge);
    }

    shardokUnit.mutate_has_moved_in_zoc(false);
@@ -13,6 +13,7 @@
 #include <cstring>
 #include <fstream>
 #include <sstream>
+#include <stdexcept>
 #include <string>
 #include <vector>

@@ -147,6 +148,9 @@ public:

    static auto FromPath(const string& path) -> byte_vector {
        std::ifstream inputFileStream(path, std::ios::binary | std::ios::ate);
+        if (!inputFileStream.is_open()) {
+            throw std::runtime_error("Failed to open file: " + path);
+        }
        const std::streamsize size = inputFileStream.tellg();
        inputFileStream.seekg(0, std::ios::beg);
        byte_vector serializedGame((size_t(size)));
@@ -32,6 +32,32 @@ CoordsSet AICommandFilter::BuildEnemyLocations(const GameStateW& gameState, Play
    return enemyLocations;
 }

+std::vector<size_t> AICommandFilter::FilterLoopingCommands(
+        const CommandListSPtr& commands,
+        const GameStateW& gameState) {
+    std::vector<size_t> filteredIndices;
+    filteredIndices.reserve(commands->size());
+
+    for (size_t i = 0; i < commands->size(); ++i) {
+        const auto& cmd = (*commands)[i];
+
+        bool shouldFilter = false;
+
+        if (cmd->GetCommandType() == CommandType::METEOR_TARGET_COMMAND ||
+            cmd->GetCommandType() == CommandType::METEOR_CANCEL_COMMAND) {
+            const int unitId = cmd->GetActorUnitId();
+            const Unit* unit = gameState->units()->Get(unitId);
+            if (unit->attached_hero().profession_info().cast_target().row() > -1) {
+                shouldFilter = true;
+            }
+        }
+
+        if (!shouldFilter) { filteredIndices.push_back(i); }
+    }
+
+    return filteredIndices;
+}
+
 std::vector<size_t> AICommandFilter::FilterCommands(
        const CommandListSPtr& commands,
        PlayerId pid,
@@ -138,6 +164,17 @@ bool AICommandFilter::IsWastefulAction(
            break;
        }

+        case CommandType::METEOR_TARGET_COMMAND:
+        case CommandType::METEOR_CANCEL_COMMAND: {
+            // Filter out re-target/cancel when the mage already has a target.
+            // Re-targeting exists for human misclick correction; the AI commits
+            // to its first target choice and doesn't need to reconsider.
+            const int unitId = cmd.GetActorUnitId();
+            const Unit* unit = gameState->units()->Get(unitId);
+            if (unit->attached_hero().profession_info().cast_target().row() > -1) { return true; }
+            break;
+        }
+
        case CommandType::START_FIRE_COMMAND: {
            // Fire spell filtering - be very restrictive for attackers
            // Fire only affects adjacent tiles and lasts multiple rounds
@@ -44,6 +44,18 @@ public:
            const APDCache& apdCache,
            const BattalionTypeGetter& battalionTypeLookup);

+    /**
+     * Lightweight filter for the root of the search tree.
+     * Only removes commands that are genuinely never useful (e.g. meteor
+     * re-targeting when a target is already set), as opposed to the full
+     * heuristic filter which aggressively prunes for lookahead performance.
+     * The full filter could miss good moves at the root that only look
+     * bad locally but prove worthwhile with deeper search.
+     */
+    static std::vector<size_t> FilterLoopingCommands(
+            const CommandListSPtr& commands,
+            const GameStateW& gameState);
+
 private:
    // Helper to build enemy locations once for efficiency
    static CoordsSet BuildEnemyLocations(const GameStateW& gameState, PlayerId pid);
@@ -11,6 +11,7 @@

 #include "AIAttackerStrategySelector.hpp"
 #include "AICommandEvaluator.hpp"
+#include "AICommandFilter.hpp"
 #include "TranspositionTable.hpp"
 #include "src/main/cpp/net/eagle0/shardok/ai/score/AIScoreCalculator.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/ShardokEngine.hpp"
@@ -59,6 +60,12 @@ auto IterativeDeepeningAI::IterativeSearch(
        return result;
    }

+    // Lightweight root filter: only remove genuinely never-useful commands
+    // (e.g. meteor re-targeting). The full aggressive filter is reserved for
+    // lookahead where pruning is a performance optimization, not a decision.
+    const std::vector<size_t> rootFilteredIndices =
+            AICommandFilter::FilterLoopingCommands(commands, state);
+
    // Check if we're in SET_UP phase and enforce maximum depth limit
    bool isSetupPhase =
            (state->status()->state() ==
@@ -90,7 +97,8 @@ auto IterativeDeepeningAI::IterativeSearch(
        std::vector<size_t> sortedIndices = GetCommandsSortedByPreviousDepth(
                currentDepth,
                scoresByDepth,
-                highestDepthCompleted);
+                highestDepthCompleted,
+                rootFilteredIndices);

        size_t evaluatedCount = 0;
        bool allEvaluated = true;
@@ -344,15 +352,15 @@ auto IterativeDeepeningAI::SearchCommandAtDepthWithEngine(
 auto IterativeDeepeningAI::GetCommandsSortedByPreviousDepth(
        const size_t currentDepth,
        const std::vector<std::vector<ScoreValue>>& scoresByDepth,
-        const std::vector<size_t>& highestDepthCompleted) -> std::vector<size_t> {
-    std::vector<size_t> indices(scoresByDepth.size());
-    std::iota(indices.begin(), indices.end(), 0);
-
+        const std::vector<size_t>& highestDepthCompleted,
+        const std::vector<size_t>& filteredIndices) -> std::vector<size_t> {
    if (currentDepth == 1) {
-        // For depth 1, return natural order
-        return indices;
+        // For depth 1, return filtered indices in natural order
+        return filteredIndices;
    }

+    std::vector<size_t> indices = filteredIndices;
+
    // Sort by score at previous depth
    const size_t prevDepth = currentDepth - 1;
    std::ranges::sort(indices, [&](const size_t a, const size_t b) {
@@ -101,7 +101,8 @@ private:
    [[nodiscard]] static std::vector<size_t> GetCommandsSortedByPreviousDepth(
            size_t currentDepth,
            const std::vector<std::vector<ScoreValue>>& scoresByDepth,
-            const std::vector<size_t>& highestDepthCompleted);
+            const std::vector<size_t>& highestDepthCompleted,
+            const std::vector<size_t>& filteredIndices);

    [[nodiscard]] static SearchResult SelectBestResult(
            const std::vector<std::vector<ScoreValue>>& scoresByDepth,
@@ -20,6 +20,9 @@
 #include <sstream>
 #endif

+#include <set>
+#include <unordered_map>
+
 #include "AIAttackerStrategySelector.hpp"
 #include "AIConfig.hpp"
 #include "AIDefenderStrategySelector.hpp"
@@ -171,8 +174,117 @@ auto ShardokAIClient::StandardChooseCommandIndex(
    //     }
    // }

-    assert(commandCount == realAvailableCommands->size());
    // Verify that the AI's guessed state produces the same available commands as reality
+    if (commandCount != realAvailableCommands->size()) {
+        fprintf(stderr,
+                "AI command count mismatch: guessed=%zu real=%zu player=%d round=%d\n",
+                commandCount,
+                realAvailableCommands->size(),
+                playerId,
+                guessedState->current_round());
+
+        const auto maxDump = std::max(commandCount, realAvailableCommands->size());
+        for (size_t i = 0; i < maxDump; i++) {
+            const auto *realName = i < realAvailableCommands->size()
+                                           ? net::eagle0::shardok::common::CommandType_Name(
+                                                     (*realAvailableCommands)[i]->GetCommandType())
+                                                     .c_str()
+                                           : "(none)";
+            const auto *guessedName = i < commandCount
+                                              ? net::eagle0::shardok::common::CommandType_Name(
+                                                        (*guessedCommands)[i]->GetCommandType())
+                                                        .c_str()
+                                              : "(none)";
+            const int realActor = i < realAvailableCommands->size()
+                                          ? (*realAvailableCommands)[i]->GetActorUnitId()
+                                          : -1;
+            const int guessedActor =
+                    i < commandCount ? (*guessedCommands)[i]->GetActorUnitId() : -1;
+            const int realRow = i < realAvailableCommands->size()
+                                        ? (*realAvailableCommands)[i]->GetTargetRow()
+                                        : -1;
+            const int realCol = i < realAvailableCommands->size()
+                                        ? (*realAvailableCommands)[i]->GetTargetColumn()
+                                        : -1;
+            const int guessedRow = i < commandCount ? (*guessedCommands)[i]->GetTargetRow() : -1;
+            const int guessedCol = i < commandCount ? (*guessedCommands)[i]->GetTargetColumn() : -1;
+            fprintf(stderr,
+                    "  [%zu] real: %s unit=%d (%d,%d)  guessed: %s unit=%d (%d,%d)\n",
+                    i,
+                    realName,
+                    realActor,
+                    realRow,
+                    realCol,
+                    guessedName,
+                    guessedActor,
+                    guessedRow,
+                    guessedCol);
+        }
+
+        // Find positions in real commands that are missing from guessed commands
+        // Group by unit to find the missing position per unit
+        std::unordered_map<int, std::set<std::pair<int, int>>> realPositions;
+        std::unordered_map<int, std::set<std::pair<int, int>>> guessedPositions;
+        for (size_t i = 0; i < realAvailableCommands->size(); i++) {
+            const auto &cmd = (*realAvailableCommands)[i];
+            realPositions[cmd->GetActorUnitId()].emplace(
+                    cmd->GetTargetRow(),
+                    cmd->GetTargetColumn());
+        }
+        for (size_t i = 0; i < commandCount; i++) {
+            const auto &cmd = (*guessedCommands)[i];
+            guessedPositions[cmd->GetActorUnitId()].emplace(
+                    cmd->GetTargetRow(),
+                    cmd->GetTargetColumn());
+        }
+        for (const auto &[unitId, positions] : realPositions) {
+            for (const auto &[row, col] : positions) {
+                if (!guessedPositions[unitId].contains({row, col})) {
+                    fprintf(stderr,
+                            "  Missing from guessed: unit=%d pos=(%d,%d)",
+                            unitId,
+                            row,
+                            col);
+                    const Coords missingCoords(row, col);
+                    const auto *occupant = guessedState.GetOccupant(missingCoords);
+                    if (occupant) {
+                        fprintf(stderr,
+                                " -> guessed occupant: unit_id=%d player=%d status=%d "
+                                "loc=(%d,%d) hidden=%d battalion_size=%d\n",
+                                occupant->unit_id(),
+                                occupant->player_id(),
+                                static_cast<int>(occupant->status()),
+                                occupant->location().row(),
+                                occupant->location().column(),
+                                occupant->hidden(),
+                                occupant->battalion().size());
+                    } else {
+                        fprintf(stderr, " -> no occupant in guessed state\n");
+                    }
+                }
+            }
+        }
+
+        // Dump all guessed state units for full picture
+        fprintf(stderr, "  Guessed state units (%u total):\n", guessedState->units()->size());
+        for (size_t i = 0; i < guessedState->units()->size(); i++) {
+            const auto *u = guessedState->units()->Get(static_cast<unsigned int>(i));
+            fprintf(stderr,
+                    "    unit_id=%d player=%d status=%d loc=(%d,%d) hidden=%d "
+                    "starting_pos_idx=%d\n",
+                    u->unit_id(),
+                    u->player_id(),
+                    static_cast<int>(u->status()),
+                    u->location().row(),
+                    u->location().column(),
+                    u->hidden(),
+                    u->starting_position_index());
+        }
+
+        throw ShardokInternalErrorException(
+                "AI command count mismatch: guessed=" + std::to_string(commandCount) +
+                " real=" + std::to_string(realAvailableCommands->size()));
+    }
    for (size_t i = 0; i < commandCount; i++) {
        CheckCommand((*realAvailableCommands)[i], (*guessedCommands)[i]);
    }
@@ -93,7 +93,8 @@ auto AbstractAIScoreCalculator::CalculateUnitsScoreComponents(
            case net::eagle0::shardok::storage::fb::UnitStatus_OUTLAWED_UNIT:
            case net::eagle0::shardok::storage::fb::UnitStatus_RESERVE_UNIT:
            case net::eagle0::shardok::storage::fb::UnitStatus_RETREATED_UNIT:
-            case net::eagle0::shardok::storage::fb::UnitStatus_RESERVED_SLOT: break;
+            case net::eagle0::shardok::storage::fb::UnitStatus_RESERVED_SLOT:
+            case net::eagle0::shardok::storage::fb::UnitStatus_PENDING_REINFORCEMENT: break;

            case net::eagle0::shardok::storage::fb::UnitStatus_UNKNOWN_UNIT:
                throw ShardokInternalErrorException("Unknown unit status");
@@ -8,6 +8,8 @@

 #include "ShardokGameController.hpp"

+#include <execinfo.h>
+
 #include <algorithm>
 #include <iterator>
 #include <ranges>
@@ -153,28 +155,48 @@ void ShardokGameController::DoAIThread() {
            continue;
        }

-        // Phase 2: AI thinks (NO LOCK - this is the slow part)
-        const auto results = aiClient->ChooseCommandIndex(settings, gsv, availableCommands);
+        try {
+            // Phase 2: AI thinks (NO LOCK - this is the slow part)
+            const auto results = aiClient->ChooseCommandIndex(settings, gsv, availableCommands);

-        // Phase 3: Post the command (brief lock)
-        {
-            unique_lock lk(masterLock);
+            // Phase 3: Post the command (brief lock)
+            {
+                unique_lock lk(masterLock);

-            // Verify state hasn't changed while we were thinking
-            if (engine->GetUnfilteredHistoryCount() != expectedHistoryCount) {
-                // State changed (e.g., human posted command) - re-evaluate
-                printf("AI: State changed while thinking, re-evaluating\n");
-                continue;
+                // Verify state hasn't changed while we were thinking
+                if (engine->GetUnfilteredHistoryCount() != expectedHistoryCount) {
+                    // State changed (e.g., human posted command) - re-evaluate
+                    printf("AI: State changed while thinking, re-evaluating\n");
+                    continue;
+                }
+
+                if (engine->GameIsOver()) {
+                    aiThreadKeepGoing = false;
+                    continue;
+                }
+
+                engine->PostCommand(playerId, results.chosenIndex);
+                LockedNotifyClients();
+                aiThreadKeepGoing = !engine->GameIsOver();
            }
+        } catch (const std::exception &e) {
+            fprintf(stderr,
+                    "AI thread exception in game %s, player %d, round %d: %s\n",
+                    cachedGameId.c_str(),
+                    playerId,
+                    gsv.current_round(),
+                    e.what());

-            if (engine->GameIsOver()) {
-                aiThreadKeepGoing = false;
-                continue;
-            }
+            void *backtraceArray[20];
+            const int backtraceSize = backtrace(backtraceArray, 20);
+            backtrace_symbols_fd(backtraceArray, backtraceSize, STDERR_FILENO);

-            engine->PostCommand(playerId, results.chosenIndex);
-            LockedNotifyClients();
-            aiThreadKeepGoing = !engine->GameIsOver();
+            aiThreadErrorMessage = "AI error in game " + cachedGameId + ", player " +
+                                   std::to_string(playerId) + ", round " +
+                                   std::to_string(gsv.current_round()) + ": " + e.what();
+            aiThreadFailed.store(true);
+            updateCondition.notify_all();
+            break;
        }
    }
    printf("Exiting AI thread.\n");
@@ -325,6 +347,25 @@ auto ShardokGameController::GetUpdates(const int64_t startingActionId) -> AllUpd

        auto gameStateBytes = engine->GetCurrentGameStateBytes();
        updates.currentGameState.swap(gameStateBytes);
+
+        // Extract battle progress data from the FlatBuffer game state
+        const auto *gs = engine->GetCurrentGameState().Get();
+        updates.currentRound = gs->current_round();
+        for (const auto *player : *gs->player_infos()) {
+            int32_t troopCount = 0;
+            for (const auto *unit : *gs->units()) {
+                if (unit->player_id() != player->player_id()) continue;
+                switch (unit->status()) {
+                    case net::eagle0::shardok::storage::fb::UnitStatus_NORMAL_UNIT:
+                    case net::eagle0::shardok::storage::fb::UnitStatus_RESERVE_UNIT:
+                    case net::eagle0::shardok::storage::fb::UnitStatus_NEVER_ENTERED_UNIT:
+                        troopCount += unit->battalion().size();
+                        break;
+                    default: break;
+                }
+            }
+            updates.playerTroopCounts.emplace_back(player->player_id(), troopCount);
+        }
    }

    return updates;
@@ -374,31 +415,39 @@ void ShardokGameController::UnregisterSubscriber(const StreamSubscriber *subscri

 auto ShardokGameController::WaitForUpdatesAndPush(
        std::shared_ptr<StreamSubscriber> subscriber,
-        int64_t startingActionId) -> bool {
+        int64_t startingActionId) -> WaitResult {
    int64_t lastPushedActionId = startingActionId;

    while (subscriber->IsActive()) {
        bool gameOver = false;
+        bool tutorialReset = false;
        GameOverInfo gameOverInfo{};

        {
            unique_lock<mutex> guard(masterLock);

-            // Wait for updates or game over
+            // Wait for updates, game over, or AI thread failure
            updateCondition.wait(guard, [this, lastPushedActionId] {
                return engine->GetUnfilteredHistoryCount() >
                               static_cast<size_t>(lastPushedActionId) ||
-                       engine->GameIsOver();
+                       engine->GameIsOver() || aiThreadFailed.load();
            });

-            if (!subscriber->IsActive()) { return false; }
+            if (!subscriber->IsActive()) { return WaitResult::DISCONNECTED; }
+
+            if (aiThreadFailed.load()) { return WaitResult::DISCONNECTED; }

            gameOver = engine->GameIsOver();

            if (gameOver) {
-                gameOverInfo.gameStatus = fb::ToProto(engine->GetGameStatus());
-                gameOverInfo.playerInfos = engine->GetPlayerInfos();
-                gameOverInfo.endGameUnits = engine->EndGameUnits();
+                // Check if this is a tutorial battle where the defender lost
+                tutorialReset = engine->IsTutorialBattleEnabled() && engine->DidDefenderLose();
+
+                if (!tutorialReset) {
+                    gameOverInfo.gameStatus = fb::ToProto(engine->GetGameStatus());
+                    gameOverInfo.playerInfos = engine->GetPlayerInfos();
+                    gameOverInfo.endGameUnits = engine->EndGameUnits();
+                }
            }
        }
        // Lock released - GetUpdates will acquire its own lock
@@ -415,17 +464,25 @@ auto ShardokGameController::WaitForUpdatesAndPush(
                    updates.mainResults,
                    updates.filteredResults,
                    updates.newUnfilteredCount,
-                    updates.currentGameState);
+                    updates.currentGameState,
+                    updates.currentRound,
+                    updates.playerTroopCounts);
+        }
+
+        // Tutorial battle reset: defender lost, signal reset instead of game over
+        if (tutorialReset) {
+            subscriber->OnBattleReset();
+            return WaitResult::BATTLE_RESET;
        }

        // Now send gameOver notification after all updates have been sent
        if (gameOver) {
            subscriber->OnGameOver(gameOverInfo);
-            return true;
+            return WaitResult::GAME_OVER;
        }
    }

-    return false;  // Subscriber disconnected
+    return WaitResult::DISCONNECTED;  // Subscriber disconnected
 }

 }  // namespace shardok
@@ -9,6 +9,7 @@
 #ifndef ShardokGameController_hpp
 #define ShardokGameController_hpp

+#include <atomic>
 #include <functional>
 #include <memory>
 #include <mutex>
@@ -55,6 +56,13 @@ struct OnePlayerUpdates {
          availableCommands(acs) {}
 };

+/// Result of WaitForUpdatesAndPush indicating how the wait ended
+enum class WaitResult {
+    GAME_OVER,     // Game ended normally
+    DISCONNECTED,  // Subscriber disconnected
+    BATTLE_RESET   // Tutorial battle reset (defender lost)
+};
+
 /// Interface for subscribers that receive streaming updates from a game
 class StreamSubscriber {
 public:
@@ -65,11 +73,16 @@ public:
            const vector<ActionResult>& mainResults,
            const vector<OnePlayerUpdates>& filteredResults,
            int32_t newUnfilteredCount,
-            const byte_vector& currentGameState) = 0;
+            const byte_vector& currentGameState,
+            int32_t currentRound,
+            const vector<std::pair<int32_t, int32_t>>& playerTroopCounts) = 0;

    /// Called when the game ends
    virtual void OnGameOver(const GameOverInfo& info) = 0;

+    /// Called when a tutorial battle resets (defender lost, battle will restart)
+    virtual void OnBattleReset() = 0;
+
    /// Returns true if this subscriber is still active and should receive updates
    [[nodiscard]] virtual auto IsActive() const -> bool = 0;
 };
@@ -100,6 +113,10 @@ private:
    const string mapName;
    const string logFilePath;

+    // AI thread error state - written once by AI thread before setting atomic flag
+    std::atomic<bool> aiThreadFailed{false};
+    std::string aiThreadErrorMessage;
+
    vector<shared_ptr<ShardokAIClient>> aiClients;
    std::thread aiThread;

@@ -156,6 +173,8 @@ public:
        vector<OnePlayerUpdates> filteredResults;
        int32_t newUnfilteredCount;
        byte_vector currentGameState;
+        int32_t currentRound = 0;
+        vector<std::pair<int32_t, int32_t>> playerTroopCounts;  // (playerId, troopCount)
    };
    auto GetUpdates(int64_t startingActionId) -> AllUpdates;
    auto GetCurrentGameStateBytes() -> byte_vector;
@@ -169,6 +188,9 @@ public:

    [[nodiscard]] auto GetLogFilePath() const -> string { return logFilePath; }

+    [[nodiscard]] auto HasAIThreadError() const -> bool { return aiThreadFailed.load(); }
+    [[nodiscard]] auto GetAIThreadError() const -> std::string { return aiThreadErrorMessage; }
+
    /// Register a subscriber to receive streaming updates for this game.
    /// The subscriber will receive updates until it becomes inactive or is unregistered.
    void RegisterSubscriber(std::shared_ptr<StreamSubscriber> subscriber);
@@ -177,11 +199,10 @@ public:
    void UnregisterSubscriber(const StreamSubscriber* subscriber);

    /// Wait for game updates, pushing them to the given subscriber.
-    /// Blocks until the game ends or the subscriber becomes inactive.
-    /// Returns true if the game ended normally, false if subscriber disconnected.
+    /// Blocks until the game ends, subscriber disconnects, or tutorial battle resets.
    auto WaitForUpdatesAndPush(
            std::shared_ptr<StreamSubscriber> subscriber,
-            int64_t startingActionId) -> bool;
+            int64_t startingActionId) -> WaitResult;
 };
 }  // namespace shardok

@@ -29,6 +29,17 @@ class AvailableCommandsFactoryImpl : public AvailableCommandsFactory {
 private:
    const SettingsGetter settings;

+    static auto CannotBecomeOutlaw(const GameStateW &gameState, PlayerId pid) -> bool {
+        if (pid == UNCONTROLLED_PLAYER_ID) return false;
+
+        const auto &player = std::find_if(
+                begin(*gameState->player_infos()),
+                end(*gameState->player_infos()),
+                [pid](const PlayerInfoFb *pi) { return pi->player_id() == pid; });
+
+        return (player != end(*gameState->player_infos()) && player->cannot_become_outlaw());
+    }
+
    static auto IsAttacker(const GameStateW &gameState, PlayerId pid) -> bool {
        if (pid == UNCONTROLLED_PLAYER_ID) return false;

@@ -56,13 +67,18 @@ public:
          commandFactories(CommandFactoriesList(settings).GetFactories()),
          playerSetupCommandFactory(settings) {}

-    [[nodiscard]] auto GetPlayerSetupCommands(const GameStateW &gameState, PlayerId playerId) const
+    [[nodiscard]] auto GetPlayerSetupCommands(
+            const GameStateW &gameState,
+            PlayerId playerId,
+            const std::optional<std::vector<Coords>> &reinforcementPositions) const
            -> CommandListSPtr override;

    [[nodiscard]] auto GetAvailableCommands(
            const GameStateW &gameState,
            PlayerId player,
-            bool includeFollowUps) const -> CommandListSPtr override;
+            bool includeFollowUps,
+            const std::optional<std::vector<Coords>> &reinforcementPositions) const
+            -> CommandListSPtr override;
 };

 auto AvailableCommandsFactory::MakeAvailableCommandsFactory(const SettingsGetter &settings)
@@ -72,9 +88,14 @@ auto AvailableCommandsFactory::MakeAvailableCommandsFactory(const SettingsGetter

 auto AvailableCommandsFactoryImpl::GetPlayerSetupCommands(
        const GameStateW &gameState,
-        const PlayerId playerId) const -> CommandListSPtr {
+        const PlayerId playerId,
+        const std::optional<std::vector<Coords>> &reinforcementPositions) const -> CommandListSPtr {
    CommandList previewCommands{};
-    playerSetupCommandFactory.AddAvailablePlayerSetupCommands(previewCommands, playerId, gameState);
+    playerSetupCommandFactory.AddAvailablePlayerSetupCommands(
+            previewCommands,
+            playerId,
+            gameState,
+            reinforcementPositions);

    return make_shared<CommandList>(previewCommands);
 }
@@ -88,6 +109,7 @@ void AvailableCommandsFactoryImpl::AddAvailableCommandsForOneUnit(
    const bool hasHero = unit->has_attached_hero();
    const auto allyPids = AlliedPids(gameState, unit->player_id());
    const bool isAttacker = IsAttacker(gameState, unit->player_id());
+    const bool cannotBecomeOutlaw = CannotBecomeOutlaw(gameState, unit->player_id());

    const bool unitMovedIntoZoc = unit->has_moved_in_zoc();
    const ActionPoints remainingActionPoints = unit->remaining_action_points();
@@ -124,6 +146,7 @@ void AvailableCommandsFactoryImpl::AddAvailableCommandsForOneUnit(
            .units = gameState->units(),
            .allyPids = allyPids,
            .isAttacker = isAttacker,
+            .cannotBecomeOutlaw = cannotBecomeOutlaw,
            .unitMovedIntoZoc = unitMovedIntoZoc};

    for (const auto &commandFactory : commandFactories) {
@@ -168,12 +191,14 @@ void AvailableCommandsFactoryImpl::AddAvailableCommandsForOneUnit(
 auto AvailableCommandsFactoryImpl::GetAvailableCommands(
        const GameStateW &gameState,
        PlayerId playerId,
-        bool includeFollowUps) const -> CommandListSPtr {
+        bool includeFollowUps,
+        const std::optional<std::vector<Coords>> &reinforcementPositions) const -> CommandListSPtr {
    CommandList commands{};

    vector<AdjacentTile> adjacentTiles;

-    playerSetupCommandFactory.AddAvailablePlayerSetupCommands(commands, playerId, gameState);
+    playerSetupCommandFactory
+            .AddAvailablePlayerSetupCommands(commands, playerId, gameState, reinforcementPositions);
    if (!commands.empty()) return make_shared<CommandList>(commands);

    for (const Unit *unit : *gameState->units()) {
@@ -9,8 +9,12 @@
 #ifndef AvailableCommandsFactory_hpp
 #define AvailableCommandsFactory_hpp

+#include <optional>
+#include <vector>
+
 #include "src/main/cpp/net/eagle0/shardok/library/GameStateW.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/ShardokCommand.hpp"
+#include "src/main/cpp/net/eagle0/shardok/library/map/Coordinates.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/settings/GameSettings.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/unit/Unit.hpp"

@@ -29,12 +33,16 @@ public:

    [[nodiscard]] virtual auto GetPlayerSetupCommands(
            const GameStateW &gameState,
-            PlayerId playerId) const -> CommandListSPtr = 0;
+            PlayerId playerId,
+            const std::optional<std::vector<Coords>> &reinforcementPositions = std::nullopt) const
+            -> CommandListSPtr = 0;

    [[nodiscard]] virtual auto GetAvailableCommands(
            const GameStateW &gameState,
            PlayerId player,
-            bool includeFollowUps) const -> CommandListSPtr = 0;
+            bool includeFollowUps,
+            const std::optional<std::vector<Coords>> &reinforcementPositions = std::nullopt) const
+            -> CommandListSPtr = 0;
 };
 }  // namespace shardok

@@ -58,6 +58,7 @@ cc_library(
        "//src/main/cpp/net/eagle0/shardok/library/actions:new_round_action",
        "//src/main/cpp/net/eagle0/shardok/library/command_factories:command_factories_list",
        "//src/main/cpp/net/eagle0/shardok/library/commands:end_turn_command",
+        "//src/main/cpp/net/eagle0/shardok/library/map:coordinates",
        "//src/main/cpp/net/eagle0/shardok/library/settings:game_settings",
        "//src/main/cpp/net/eagle0/shardok/library/unit",
        "//src/main/cpp/net/eagle0/shardok/library/util:hex_map_utils",
@@ -288,13 +288,13 @@ void ShardokEngine::HandlePlayerTurnEnd(const std::shared_ptr<RandomGenerator> &

        // Check for tutorial events at end of round
        if (!GameIsOver() && tutorialController_.IsEnabled()) {
-            auto tutorialResults = tutorialController_.CheckAndExecuteEvents(
+            auto tutorialEventResults = tutorialController_.CheckAndExecuteEvents(
                    gameState,
                    settingsGetter,
                    randomGenerator);

-            if (!tutorialResults.empty()) {
-                ApplyAndAddActionResults(tutorialResults);
+            if (!tutorialEventResults.actionResults.empty()) {
+                ApplyAndAddActionResults(tutorialEventResults.actionResults);

                // Update game status after tutorial events (e.g., attackers fled, defender wins)
                ApplyAndAddActionResults(UpdateGameStatusAction(
@@ -306,24 +306,29 @@ void ShardokEngine::HandlePlayerTurnEnd(const std::shared_ptr<RandomGenerator> &

                // If tutorial events ended the game, don't start new round
                if (GameIsOver()) { return; }
+
+                // If reinforcement placement is needed, pause the turn flow
+                if (tutorialEventResults.reinforcementPlacement.has_value()) {
+                    pendingReinforcementPlacement_ = tutorialEventResults.reinforcementPlacement;
+
+                    // Set state to REINFORCEMENT_PLACEMENT
+                    ActionResultProto placementStateAction{};
+                    placementStateAction.set_type(
+                            net::eagle0::shardok::common::TUTORIAL_REINFORCEMENTS_ARRIVED);
+                    placementStateAction.mutable_game_status()->set_state(
+                            GameStatusProto::State::GameStatus_State_REINFORCEMENT_PLACEMENT);
+                    *placementStateAction.mutable_game_status()->mutable_description() =
+                            "Place your reinforcements!";
+                    // Set current player to the reinforcement recipient
+                    placementStateAction.mutable_next_player()->set_value(
+                            pendingReinforcementPlacement_->playerId);
+                    ApplyAndAddActionResult(placementStateAction);
+                    return;
+                }
            }
        }

-        ApplyAndAddActionResults(
-                UpdateOpponentKnowledgeAction(settingsGetter).Execute(gameState, randomGenerator));
-
-        ApplyAndAddActionResults(
-                NewRoundAction(gameState, settingsGetter).Execute(gameState, randomGenerator));
-
-        ApplyAndAddActionResults(
-                StartPlayerTurnAction(gameState, UNCONTROLLED_PLAYER_ID, settingsGetter)
-                        .Execute(gameState, randomGenerator));
-
-        ApplyAndAddActionResults(PerformUndeadCommandsAction(gameState, settingsGetter)
-                                         .Execute(gameState, randomGenerator));
-
-        ApplyAndAddActionResults(StartPlayerTurnAction(gameState, 0, settingsGetter)
-                                         .Execute(gameState, randomGenerator));
+        ResumeAfterReinforcementPlacement(randomGenerator);

    } else {
        const auto updateAction = UpdateGameStatusAction(
@@ -339,6 +344,27 @@ void ShardokEngine::HandlePlayerTurnEnd(const std::shared_ptr<RandomGenerator> &
    }
 }

+void ShardokEngine::ResumeAfterReinforcementPlacement(
+        const std::shared_ptr<RandomGenerator> &randomGenerator) {
+    pendingReinforcementPlacement_ = std::nullopt;
+
+    ApplyAndAddActionResults(
+            UpdateOpponentKnowledgeAction(settingsGetter).Execute(gameState, randomGenerator));
+
+    ApplyAndAddActionResults(
+            NewRoundAction(gameState, settingsGetter).Execute(gameState, randomGenerator));
+
+    ApplyAndAddActionResults(
+            StartPlayerTurnAction(gameState, UNCONTROLLED_PLAYER_ID, settingsGetter)
+                    .Execute(gameState, randomGenerator));
+
+    ApplyAndAddActionResults(PerformUndeadCommandsAction(gameState, settingsGetter)
+                                     .Execute(gameState, randomGenerator));
+
+    ApplyAndAddActionResults(StartPlayerTurnAction(gameState, 0, settingsGetter)
+                                     .Execute(gameState, randomGenerator));
+}
+
 void ShardokEngine::PostPlacementCommands(
        const PlayerId player,
        const vector<UnitPlacementInfo> &placementInfos,
@@ -347,8 +373,15 @@ void ShardokEngine::PostPlacementCommands(
        throw ShardokClientErrorException("Posting for a player who's not the current player ID!");
    }

-    const auto placementCommands =
-            availableCommandsFactory->GetPlayerSetupCommands(gameState, player);
+    const auto reinforcementPositions =
+            pendingReinforcementPlacement_.has_value()
+                    ? std::optional<std::vector<Coords>>(
+                              pendingReinforcementPlacement_->startingPositions)
+                    : std::nullopt;
+    const auto placementCommands = availableCommandsFactory->GetPlayerSetupCommands(
+            gameState,
+            player,
+            reinforcementPositions);

    // first make sure they're all valid and there are no duplicates
    for (size_t i = 0; i < placementInfos.size(); i++) {
@@ -388,6 +421,19 @@ void ShardokEngine::PostPlacementCommands(
        }
    }

+    // If we were in reinforcement placement, check if all units are now placed
+    if (pendingReinforcementPlacement_.has_value()) {
+        const auto reserveUnits =
+                ReserveUnitsForPlayer(gameState->units(), pendingReinforcementPlacement_->playerId);
+        if (reserveUnits.empty()) {
+            // All reinforcements placed — resume the turn flow
+            ResumeAfterReinforcementPlacement(randomGenerator);
+            return;
+        }
+        // Still have units to place — stay in REINFORCEMENT_PLACEMENT state
+        return;
+    }
+
    const auto updateAction = UpdateGameStatusAction(
            GetCurrentGameState(),
            criticalTileCoords,
@@ -586,10 +632,16 @@ auto ShardokEngine::GetAvailableCommandProtos(const PlayerId playerId, const boo
 auto ShardokEngine::UncachedGetAvailableCommands(
        const PlayerId playerId,
        const bool includeFollowUps) const -> CommandListSPtr {
+    const auto reinforcementPositions =
+            pendingReinforcementPlacement_.has_value()
+                    ? std::optional<std::vector<Coords>>(
+                              pendingReinforcementPlacement_->startingPositions)
+                    : std::nullopt;
    return availableCommandsFactory->GetAvailableCommands(
            gameState,
            playerId,
-            /* includeFollowUps=*/includeFollowUps);
+            /* includeFollowUps=*/includeFollowUps,
+            reinforcementPositions);
 }

 void AddUnits(vector<net::eagle0::shardok::storage::ResolvedUnit> &to, const Units &from) {
@@ -621,6 +673,7 @@ void AddUnits(vector<net::eagle0::shardok::storage::ResolvedUnit> &to, const Uni
            case net::eagle0::shardok::storage::fb::UnitStatus_RESERVE_UNIT:
            case net::eagle0::shardok::storage::fb::UnitStatus_NEVER_ENTERED_UNIT:
            case net::eagle0::shardok::storage::fb::UnitStatus_RESERVED_SLOT:
+            case net::eagle0::shardok::storage::fb::UnitStatus_PENDING_REINFORCEMENT:
                ru.set_status(
                        net::eagle0::shardok::storage::ResolvedUnit_UnitStatus_NEVER_ENTERED_UNIT);
                break;
@@ -55,6 +55,7 @@ private:
    const CoordsSet criticalTileCoords;

    TutorialBattleController tutorialController_;
+    std::optional<ReinforcementPlacementInfo> pendingReinforcementPlacement_;

    mutable CommandListSPtr cachedAvailableCommands{};

@@ -76,6 +77,7 @@ private:
    }

    void HandlePlayerTurnEnd(const std::shared_ptr<RandomGenerator> &randomGenerator);
+    void ResumeAfterReinforcementPlacement(const std::shared_ptr<RandomGenerator> &randomGenerator);
    [[nodiscard]] auto UncachedGetAvailableCommands(PlayerId playerId, bool includeFollowUps) const
            -> CommandListSPtr;

@@ -206,11 +208,38 @@ public:
        tutorialController_ = TutorialBattleController(config);
    }

+    /// Returns the pending reinforcement placement info, if any.
+    [[nodiscard]] auto GetPendingReinforcementPlacement() const
+            -> const std::optional<ReinforcementPlacementInfo> & {
+        return pendingReinforcementPlacement_;
+    }
+
    static inline auto GameIsOver(const fb::GameStatus *status) -> bool {
        return (status->state() == net::eagle0::shardok::storage::fb::GameStatus_::State_VICTORY);
    }

    [[nodiscard]] inline auto GameIsOver() const -> bool { return GameIsOver(GetGameStatus()); }
+
+    [[nodiscard]] auto IsTutorialBattleEnabled() const -> bool {
+        return tutorialController_.IsEnabled();
+    }
+
+    /// Returns true if the game is over and the defender lost (not in winning_shardok_ids).
+    [[nodiscard]] auto DidDefenderLose() const -> bool {
+        if (!GameIsOver()) return false;
+        const auto *status = GetGameStatus();
+        const auto *winIds = status->winning_shardok_ids();
+        for (const auto *pi : *GetCurrentGameState()->player_infos()) {
+            if (pi->is_defender()) {
+                if (!winIds) return true;
+                for (const auto wid : *winIds) {
+                    if (wid == pi->player_id()) return false;
+                }
+                return true;
+            }
+        }
+        return false;
+    }
 };
 }  // namespace shardok

@@ -90,6 +90,7 @@ cc_library(
        "//src/main/cpp/net/eagle0/shardok/library/actions:end_player_setup_command",
        "//src/main/cpp/net/eagle0/shardok/library/actions:place_hidden_unit_command",
        "//src/main/cpp/net/eagle0/shardok/library/actions:place_unit_command",
+        "//src/main/cpp/net/eagle0/shardok/library/map:coordinates",
        "//src/main/cpp/net/eagle0/shardok/library/settings:game_settings",
        "//src/main/cpp/net/eagle0/shardok/library/util:hex_map_utils",
        "//src/main/cpp/net/eagle0/shardok/library/util:player_utils",
@@ -66,11 +66,30 @@ auto PlayerSetupCommandFactory::AddAvailablePlaceAndHideUnitCommandsForOneUnit(
 auto PlayerSetupCommandFactory::AddAvailablePlayerSetupCommands(
        CommandList &existingCommands,
        PlayerId playerId,
-        const GameStateW &gameState) const -> void {
+        const GameStateW &gameState,
+        const std::optional<std::vector<Coords>> &reinforcementPositions) const -> void {
    if (playerId < 0) return;
-    if (gameState->status()->state() !=
-        net::eagle0::shardok::storage::fb::GameStatus_::State_SET_UP)
+
+    const auto state = gameState->status()->state();
+
+    // Handle reinforcement placement phase
+    if (state == net::eagle0::shardok::storage::fb::GameStatus_::State_REINFORCEMENT_PLACEMENT) {
+        if (!reinforcementPositions.has_value()) return;
+
+        const auto unplacedUnits = ReserveUnitsForPlayer(gameState->units(), playerId);
+        if (unplacedUnits.empty()) return;
+
+        for (const auto &[unitId, unit] : unplacedUnits) {
+            for (const Coords &position : *reinforcementPositions) {
+                if (!gameState.GetOccupant(position)) {
+                    existingCommands.push_back(std::make_shared<PlaceUnitCommand>(unit, position));
+                }
+            }
+        }
        return;
+    }
+
+    if (state != net::eagle0::shardok::storage::fb::GameStatus_::State_SET_UP) return;

    const bool isDefender = PlayerIsDefender(gameState, playerId);

@@ -5,8 +5,12 @@
 #ifndef EAGLE0_PLAYERSETUPCOMMANDFACTORY_HPP
 #define EAGLE0_PLAYERSETUPCOMMANDFACTORY_HPP

+#include <optional>
+#include <vector>
+
 #include "src/main/cpp/net/eagle0/shardok/library/GameStateW.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/ShardokCommand.hpp"
+#include "src/main/cpp/net/eagle0/shardok/library/map/Coordinates.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/settings/GameSettings.hpp"

 namespace shardok {
@@ -29,7 +33,9 @@ public:
    auto AddAvailablePlayerSetupCommands(
            CommandList& existingCommands,
            PlayerId playerId,
-            const GameStateW& gameState) const -> void;
+            const GameStateW& gameState,
+            const std::optional<std::vector<Coords>>& reinforcementPositions = std::nullopt) const
+            -> void;
 };

 }  // namespace shardok
@@ -29,7 +29,6 @@ using Unit = net::eagle0::shardok::storage::fb::Unit;
 inline auto GetMutableUnit(GameState *state, UnitId unitId) -> Unit * {
    return const_cast<Unit *>(state->mutable_units()->GetMutableObject(unitId));
 }
-using net::eagle0::shardok::storage::fb::DrawType;
 using net::eagle0::shardok::storage::fb::VictoryCondition;
 using net::eagle0::shardok::storage::fb::VictoryType;

@@ -259,23 +258,6 @@ void MutatingApplyResult(
                            ->mutable_end_game_condition()
                            ->mutate_victory_type(VictoryType::VictoryType_UNKNOWN_VICTORY_TYPE);
                    break;
-                case net::eagle0::shardok::common::EndGameCondition::kAllyVictory:
-                    mutatingGameState->mutable_status()
-                            ->mutable_end_game_condition()
-                            ->mutate_victory_type(VictoryType::VictoryType_ALLY_VICTORY);
-                    mutatingGameState->mutable_status()
-                            ->mutable_end_game_condition()
-                            ->mutate_victory_details(static_cast<VictoryCondition>(
-                                    result.game_status().end_game_condition().ally_victory()));
-                    break;
-                case net::eagle0::shardok::common::EndGameCondition::kDraw:
-                    mutatingGameState->mutable_status()
-                            ->mutable_end_game_condition()
-                            ->mutate_victory_type(VictoryType::VictoryType_DRAW);
-                    mutatingGameState->mutable_status()
-                            ->mutable_end_game_condition()
-                            ->mutate_draw_details(static_cast<DrawType>(
-                                    result.game_status().end_game_condition().draw()));
                case net::eagle0::shardok::common::EndGameCondition::kLoss:
                    mutatingGameState->mutable_status()
                            ->mutable_end_game_condition()
@@ -331,7 +313,7 @@ void MutatingApplyResult(
                                                          .size()
                                                : changedUnit->battalion().size();

-        auto status = net::eagle0::shardok::storage::fb::UnitStatus_NORMAL_UNIT;
+        auto status = changedUnit->status();
        if (IsDestroyed(*changedUnit)) {
            status =
                    changedUnit->has_attached_hero()
@@ -34,6 +34,7 @@ auto IsResolved(const net::eagle0::shardok::storage::fb::UnitStatus status) -> b
        case net::eagle0::shardok::storage::fb::UnitStatus_RESERVE_UNIT:
        case net::eagle0::shardok::storage::fb::UnitStatus_NEVER_ENTERED_UNIT:
        case net::eagle0::shardok::storage::fb::UnitStatus_RESERVED_SLOT:
+        case net::eagle0::shardok::storage::fb::UnitStatus_PENDING_REINFORCEMENT:
        case net::eagle0::shardok::storage::fb::UnitStatus_UNKNOWN_UNIT: return false;
    }

@@ -18,6 +18,7 @@ using net::eagle0::shardok::common::GameStatus;
    auto actorAfter = *currentState->units()->Get(actorId);
    actorAfter.mutable_location() = target;
    actorAfter.mutate_hidden(true);
+    actorAfter.mutate_status(net::eagle0::shardok::storage::fb::UnitStatus_NORMAL_UNIT);
    MutatingBumpAllKnowledgeToMinimum(&actorAfter, minimumKnowledge);

    ActionResult placeResult{};
@@ -16,6 +16,7 @@ auto PlaceUnitCommand::InternalExecute(
        const std::shared_ptr<RandomGenerator>& /*generator*/) const -> vector<ActionResult> {
    auto actorAfter = *actor;
    actorAfter.mutable_location() = target;
+    actorAfter.mutate_status(net::eagle0::shardok::storage::fb::UnitStatus_NORMAL_UNIT);

    ActionResult placeResult{};
    placeResult.set_type(ActionType::PLACE_UNIT);
@@ -89,7 +89,9 @@ auto UpdateGameStatusAction::InternalExecute(
    // If the game has already ended, just return that state
    if (GameIsOver(gameState->status())) { return results; }
    if (gameState->status()->state() ==
-        net::eagle0::shardok::storage::fb::GameStatus_::State_SET_UP) {
+                net::eagle0::shardok::storage::fb::GameStatus_::State_SET_UP ||
+        gameState->status()->state() ==
+                net::eagle0::shardok::storage::fb::GameStatus_::State_REINFORCEMENT_PLACEMENT) {
        return results;
    }

@@ -209,21 +211,13 @@ auto UpdateGameStatusAction::InternalExecute(
            }
        }

-        results.emplace_back();
-        results[0].set_type(net::eagle0::shardok::common::GAME_OVER);
-        results[0].mutable_game_status()->set_state(GameStatusProto::DRAW);
-        results[0].mutable_game_status()->clear_winning_shardok_ids();
-        results[0].mutable_game_status()->mutable_end_game_condition()->set_draw(
-                net::eagle0::shardok::common::DRAW_AFTER_MAX_ROUNDS);
-        results[0].mutable_game_status()->set_description(
-                "Draw! No victory after " + std::to_string(settingsGetter.Backing().max_rounds()) +
-                " rounds");
-
-        return results;
+        throw ShardokInternalErrorException(
+                "No player has WIN_AFTER_MAX_ROUNDS but max rounds exceeded");
    }

    // check for castle occupation
    if (!criticalTileLocations.empty()) {
+        // First check: single player holding all critical tiles
        for (const auto* pi : *gameState->player_infos()) {
            if (HasVictoryCondition(
                        pi,
@@ -259,6 +253,30 @@ auto UpdateGameStatusAction::InternalExecute(
                    results[0].mutable_game_status()->set_state(
                            GameStatusProto::State::GameStatus_State_VICTORY);
                    results[0].mutable_game_status()->add_winning_shardok_ids(pi->player_id());
+
+                    // Also add mutually-allied players with HoldsCriticalTiles
+                    for (const auto* otherPi : *gameState->player_infos()) {
+                        if (otherPi->player_id() == pi->player_id()) continue;
+                        if (!HasVictoryCondition(
+                                    otherPi,
+                                    net::eagle0::shardok::storage::fb::
+                                            VictoryCondition_VICTORY_CONDITION_HOLDS_CRITICAL_TILES))
+                            continue;
+                        bool mutuallyAllied =
+                                std::ranges::any_of(
+                                        *pi->allies(),
+                                        [otherPi](const auto* ap) {
+                                            return ap->player_id() == otherPi->player_id();
+                                        }) &&
+                                std::ranges::any_of(*otherPi->allies(), [pi](const auto* ap) {
+                                    return ap->player_id() == pi->player_id();
+                                });
+                        if (mutuallyAllied) {
+                            results[0].mutable_game_status()->add_winning_shardok_ids(
+                                    otherPi->player_id());
+                        }
+                    }
+
                    results[0].mutable_game_status()->mutable_end_game_condition()->set_victory(
                            net::eagle0::shardok::common::VICTORY_CONDITION_HOLDS_CRITICAL_TILES);
                    results[0].mutable_game_status()->set_description(
@@ -268,6 +286,71 @@ auto UpdateGameStatusAction::InternalExecute(
                }
            }
        }
+
+        // Second check: allied players collectively holding all critical tiles
+        unordered_set<PlayerId> occupantPlayerIds{};
+        bool allTilesOccupiedWithHeroes = true;
+        for (const auto& criticalTile : criticalTileLocations) {
+            const auto* possibleOccupant = currentState.GetOccupant(criticalTile);
+            if (!possibleOccupant || !possibleOccupant->has_attached_hero()) {
+                allTilesOccupiedWithHeroes = false;
+                break;
+            }
+            occupantPlayerIds.insert(possibleOccupant->player_id());
+        }
+
+        if (allTilesOccupiedWithHeroes && occupantPlayerIds.size() > 1) {
+            // All occupants must have the HOLDS_CRITICAL_TILES victory condition
+            bool allHaveCondition = true;
+            for (const PlayerId pid : occupantPlayerIds) {
+                const auto* pi = GetPlayerInfo(pid);
+                if (!HasVictoryCondition(
+                            pi,
+                            net::eagle0::shardok::storage::fb::
+                                    VictoryCondition_VICTORY_CONDITION_HOLDS_CRITICAL_TILES)) {
+                    allHaveCondition = false;
+                    break;
+                }
+            }
+
+            if (allHaveCondition) {
+                // Check mutual alliance among all occupants
+                bool allAllied = true;
+                for (const PlayerId pid1 : occupantPlayerIds) {
+                    const auto* p1Info = GetPlayerInfo(pid1);
+                    for (const PlayerId pid2 : occupantPlayerIds) {
+                        if (pid1 == pid2) continue;
+                        if (!std::ranges::any_of(
+                                    *p1Info->allies(),
+                                    [pid2](const net::eagle0::shardok::storage::fb::AlliedPlayer*
+                                                   alliedPlayer) {
+                                        return alliedPlayer->player_id() == pid2;
+                                    })) {
+                            allAllied = false;
+                            break;
+                        }
+                    }
+                    if (!allAllied) break;
+                }
+
+                if (allAllied) {
+                    results.emplace_back();
+                    results[0].set_type(net::eagle0::shardok::common::GAME_OVER);
+                    results[0].mutable_game_status()->set_state(
+                            GameStatusProto::State::GameStatus_State_VICTORY);
+                    *results[0].mutable_game_status()->mutable_winning_shardok_ids() = {
+                            std::begin(occupantPlayerIds),
+                            std::end(occupantPlayerIds)};
+                    results[0].mutable_game_status()->mutable_end_game_condition()->set_victory(
+                            net::eagle0::shardok::common::VICTORY_CONDITION_HOLDS_CRITICAL_TILES);
+                    results[0].mutable_game_status()->set_description(
+                            "Alliance victory! Allied attackers collectively control all "
+                            "critical tiles");
+                    ResolveHiddenLosers(results[0]);
+                    return results;
+                }
+            }
+        }
    }

    // If we got all the way through, keep the status as it is
@@ -10,6 +10,7 @@ cc_library(
        "//src/test/cpp/net/eagle0/shardok/library:__subpackages__",
    ],
    deps = [
+        ":blow_bridge_command_factory",
        ":brave_water_command_factory",
        ":build_bridge_command_factory",
        ":challenge_duel_command_factory",
@@ -38,6 +39,25 @@ cc_library(
    ],
 )

+cc_library(
+    name = "blow_bridge_command_factory",
+    srcs = ["BlowBridgeCommandFactory.cpp"],
+    hdrs = ["BlowBridgeCommandFactory.hpp"],
+    copts = COPTS,
+    visibility = [
+        "//src/main/cpp/net/eagle0/shardok/library:__subpackages__",
+        "//src/test/cpp/net/eagle0/shardok/library:__subpackages__",
+    ],
+    deps = [
+        ":command_factory",
+        "//src/main/cpp/net/eagle0/shardok/library:shardok_command",
+        "//src/main/cpp/net/eagle0/shardok/library/commands:blow_bridge_command",
+        "//src/main/cpp/net/eagle0/shardok/library/settings:game_settings",
+        "//src/main/cpp/net/eagle0/shardok/library/util:combat_utils",
+        "//src/main/cpp/net/eagle0/shardok/library/util:hex_map_utils",
+    ],
+)
+
 cc_library(
    name = "brave_water_command_factory",
    srcs = [
@@ -0,0 +1,104 @@
+//
+// Created by Claude on 3/14/26.
+//
+
+#include "BlowBridgeCommandFactory.hpp"
+
+#include "src/main/cpp/net/eagle0/shardok/library/commands/BlowBridgeCommand.hpp"
+#include "src/main/cpp/net/eagle0/shardok/library/util/HexMapUtils.hpp"
+
+namespace shardok {
+
+[[nodiscard]] auto GetBlowBridgeOdds(
+        const SettingsGetter& settings,
+        double strength,
+        double agility,
+        double intelligence,
+        bool hasForestAccess) -> PercentileRollOdds;
+
+void BlowBridgeCommandFactory::AddAvailableBlowBridgeCommands(
+        CommandList& commands,
+        const Unit* unit,
+        const ActionPoints remainingActionPoints,
+        const Coords& position,
+        const HexMap* hexMap,
+        const Units* units,
+        const vector<PlayerId>& allyPids) const {
+    const PlayerId playerId = unit->player_id();
+    if (!unit->has_attached_hero()) return;
+    const auto& hero = unit->attached_hero();
+
+    if (hero.profession_info().profession() !=
+        net::eagle0::shardok::storage::fb::Profession_ENGINEER)
+        return;
+
+    // Must be on a bridge tile
+    const auto* currentTerrain = GetTerrain(hexMap, position);
+    if (!currentTerrain->modifier().bridge().present()) return;
+
+    const ActionCost cost =
+            settings.ActionCostFor(settings.Backing().blow_bridge_action_point_cost());
+
+    if (!cost.IsPossible(remainingActionPoints)) return;
+
+    const bool nearbyForest = HasForestAccess(position, units, hexMap, allyPids, playerId);
+
+    const auto odds = GetBlowBridgeOdds(
+            settings,
+            hero.strength(),
+            hero.agility(),
+            hero.wisdom(),
+            nearbyForest);
+
+    for (const Coords& adjCoords : HexMapUtils::GetAdjacentCoords(hexMap, position)) {
+        if (IsTraversible(*GetTerrain(hexMap, adjCoords)) && !Occupant(units, adjCoords)) {
+            commands.push_back(std::make_shared<BlowBridgeCommand>(
+                    settings.ActionCostFor(settings.Backing().blow_bridge_action_point_cost()),
+                    unit->player_id(),
+                    unit->unit_id(),
+                    adjCoords,
+                    position,
+                    *currentTerrain,
+                    nearbyForest,
+                    settings.Backing().blow_bridge_agility_xp(),
+                    settings.Backing().blow_bridge_strength_xp(),
+                    settings.Backing().minimum_knowledge_for_profession(),
+                    odds));
+        }
+    }
+}
+
+void BlowBridgeCommandFactory::AddAvailableCommands(
+        CommandList& commands,
+        const CommandParams& params) const {
+    AddAvailableBlowBridgeCommands(
+            commands,
+            params.unit,
+            params.remainingActionPoints,
+            params.position,
+            params.hexMap,
+            params.units,
+            params.allyPids);
+}
+
+auto GetBlowBridgeOdds(
+        const SettingsGetter& settings,
+        const double strength,
+        const double agility,
+        const double intelligence,
+        const bool hasForestAccess) -> PercentileRollOdds {
+    const int16_t base = settings.Backing().blow_bridge_base_odds();
+    constexpr int16_t terrainFactor = 0;
+    constexpr int16_t weatherFactor = 0;
+    constexpr int16_t windFactor = 0;
+    const std::vector stats = {strength, agility, intelligence};
+    std::vector<OtherFactor> otherFactors;
+    if (hasForestAccess) {
+        otherFactors.push_back(
+                MakeOtherFactor(settings.Backing().blow_bridge_forest_bonus(), "forest nearby"));
+    }
+
+    return MakeOdds(base, terrainFactor, weatherFactor, windFactor, stats, otherFactors);
+}
+
+}  // namespace shardok
@@ -0,0 +1,37 @@
+//
+// Created by Claude on 3/14/26.
+//
+
+#ifndef EAGLE0_BLOWBRIDGECOMMANDFACTORY_HPP
+#define EAGLE0_BLOWBRIDGECOMMANDFACTORY_HPP
+
+#include "src/main/cpp/net/eagle0/shardok/library/ShardokCommand.hpp"
+#include "src/main/cpp/net/eagle0/shardok/library/command_factories/CommandFactory.hpp"
+#include "src/main/cpp/net/eagle0/shardok/library/map/Coordinates.hpp"
+#include "src/main/cpp/net/eagle0/shardok/library/settings/GameSettings.hpp"
+#include "src/main/cpp/net/eagle0/shardok/library/unit/Unit.hpp"
+
+namespace shardok {
+
+class BlowBridgeCommandFactory : public CommandFactory {
+private:
+    const SettingsGetter settings;
+
+public:
+    explicit BlowBridgeCommandFactory(const SettingsGetter& getter) : settings(getter){};
+
+    void AddAvailableBlowBridgeCommands(
+            CommandList& commands,
+            const Unit* unit,
+            ActionPoints remainingActionPoints,
+            const Coords& position,
+            const HexMap* hexMap,
+            const Units* units,
+            const vector<PlayerId>& allyPids) const;
+
+    void AddAvailableCommands(CommandList& commands, const CommandParams& params) const override;
+};
+
+}  // namespace shardok
+
+#endif  // EAGLE0_BLOWBRIDGECOMMANDFACTORY_HPP
@@ -4,6 +4,7 @@

 #include "CommandFactoriesList.hpp"

+#include "src/main/cpp/net/eagle0/shardok/library/command_factories/BlowBridgeCommandFactory.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/command_factories/BraveWaterCommandFactory.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/command_factories/BuildBridgeCommandFactory.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/command_factories/ChallengeDuelCommandFactory.hpp"
@@ -41,6 +42,7 @@ auto MakeFactories(const SettingsGetter& settings) -> vector<shared_ptr<const Co
    return {make_shared<MeteorTargetCommandFactory>(settings),
            make_shared<ControlCommandFactory>(settings),
            make_shared<ArcheryCommandFactory>(settings),
+            make_shared<BlowBridgeCommandFactory>(settings),
            make_shared<BraveWaterCommandFactory>(settings),
            make_shared<BuildBridgeCommandFactory>(settings),
            make_shared<ChallengeDuelCommandFactory>(settings),
@@ -35,6 +35,7 @@ public:
        const Units* units;
        const vector<PlayerId>& allyPids;
        const bool isAttacker;
+        const bool cannotBecomeOutlaw;
        const bool unitMovedIntoZoc;
    };

@@ -25,7 +25,8 @@ void FleeCommandFactory::AddAvailableFleeCommands(
        const Units *allUnits,
        const HexMap *map,
        const vector<PlayerId> &allyPids,
-        const ActionPoints remainingActionPoints) const {
+        const ActionPoints remainingActionPoints,
+        const bool cannotBecomeOutlaw) const {
    if (!settings.ActionCostFor(settings.Backing().flee_action_point_cost())
                 .IsPossible(remainingActionPoints))
        return;
@@ -83,7 +84,7 @@ void FleeCommandFactory::AddAvailableFleeCommands(
                unit->player_id(),
                unit->unit_id(),
                odds));
-    } else {
+    } else if (!cannotBecomeOutlaw) {
        commands.push_back(std::make_shared<BecomeOutlawCommand>(
                settings.ActionCostFor(settings.Backing().flee_action_point_cost()),
                unit->player_id(),
@@ -100,7 +101,8 @@ void FleeCommandFactory::AddAvailableCommands(
            params.units,
            params.hexMap,
            params.allyPids,
-            params.remainingActionPoints);
+            params.remainingActionPoints,
+            params.cannotBecomeOutlaw);
 }

 }  // namespace shardok
@@ -27,7 +27,8 @@ public:
            const Units *allUnits,
            const HexMap *map,
            const vector<PlayerId> &allyPids,
-            ActionPoints remainingActionPoints) const;
+            ActionPoints remainingActionPoints,
+            bool cannotBecomeOutlaw) const;

    void AddAvailableCommands(CommandList &commands, const CommandParams &params) const override;

@@ -21,13 +21,18 @@ auto MeteorTargetCommandFactory::AddAvailableMeteorTargetCommands(
    if (unit->attached_hero().profession_info().meteor_cast_state() !=
        net::eagle0::shardok::storage::fb::MultiroundMagicState_TARGET)
        return;
-    if (unit->attached_hero().profession_info().cast_target().row() > -1) return;
+
+    // If the mage already has a target, these commands are optional (re-targeting).
+    // If no target yet, the player must choose before ending their turn.
+    const bool isRetarget = unit->attached_hero().profession_info().cast_target().row() > -1;
+    const bool requiredToEndTurn = !isRetarget;

    existingCommands.emplace_back(std::make_shared<MeteorCancelCommand>(
            settings.ActionCostFor(settings.Backing().meteor_cancel_action_point_cost()),
            settings,
            unit->player_id(),
-            unit->unit_id()));
+            unit->unit_id(),
+            requiredToEndTurn));

    const Coords &unitLocation = unit->location();
    for (const Coords &meteorCoords : CoordsInMeteorRange(map, unitLocation, settings)) {
@@ -37,7 +42,8 @@ auto MeteorTargetCommandFactory::AddAvailableMeteorTargetCommands(
                unit->player_id(),
                unit->unit_id(),
                meteorCoords,
-                settings.Backing().minimum_knowledge_for_profession()));
+                settings.Backing().minimum_knowledge_for_profession(),
+                requiredToEndTurn));
    }
 }
 void MeteorTargetCommandFactory::AddAvailableCommands(
@@ -49,10 +49,10 @@ auto ReduceCommandFactory::AddAvailableReduceCommands(

                const auto *terrain = GetTerrain(map, reduceCoords);

-                // Allow reducing if there's a bridge or castle with integrity > 0, OR an enemy
+                // Allow reducing if there's a castle with integrity > 0, OR an enemy
                // occupant. We already continued in the case of friendly occupants.
-                if (terrain->modifier().bridge().present() ||
-                    (terrain->modifier().castle().present() &&
+                // Note: bridges are no longer valid reduce targets (use Blow Bridge instead).
+                if ((terrain->modifier().castle().present() &&
                     terrain->modifier().castle().integrity() > 0.0) ||
                    enemyOccupant) {
                    existingCommands.push_back(std::make_shared<ReduceCommand>(
@@ -84,6 +84,23 @@ void ArcheryCommandFactory::AddAvailableArcheryCommands(
            targetCoords += HexMapUtils::GetAdjacentCoords(hexMap, position);
        }

+        // Wind-assisted range 3 for longbowmen
+        if (battalionType->alwaysArcheryCapable &&
+            weather->wind().speed_in_mph() >=
+                    settings.Backing().longbow_wind_bonus_range_min_speed()) {
+            const int windDir = (int)weather->wind().direction();
+            for (const Coords &farCoords : TilesWithExactDistance(hexMap, position, 3)) {
+                auto dirTo = DirectionsTo(hexMap, position, farCoords);
+                // 60° cone: tile must be in the wind direction's sector, or on its
+                // boundary (where the secondary direction matches the wind).
+                bool inCone = ((int)dirTo.main == windDir);
+                if (!inCone && dirTo.usesSecondary) { inCone = ((int)dirTo.secondary == windDir); }
+                if (inCone && !HexMapUtils::LineIsBlockedByMountains(hexMap, position, farCoords)) {
+                    targetCoords.Add(farCoords);
+                }
+            }
+        }
+
        for (const Coords &archeryCoords : targetCoords) {
            const auto *const enemyOccupant =
                    KnownEnemyOccupant(unit->player_id(), units, allyPids, archeryCoords);
@@ -39,6 +39,28 @@ cc_library(
    ],
 )

+cc_library(
+    name = "blow_bridge_command",
+    srcs = ["BlowBridgeCommand.cpp"],
+    hdrs = ["BlowBridgeCommand.hpp"],
+    copts = COPTS,
+    visibility = [
+        "//src/main/cpp/net/eagle0/shardok/library:__subpackages__",
+        "//src/test/cpp/net/eagle0/shardok/ai:__subpackages__",
+        "//src/test/cpp/net/eagle0/shardok/library:__subpackages__",
+    ],
+    deps = [
+        "//src/main/cpp/net/eagle0/shardok/library:action_cost",
+        "//src/main/cpp/net/eagle0/shardok/library:shardok_command",
+        "//src/main/cpp/net/eagle0/shardok/library/actions:action_requires_hero_exception",
+        "//src/main/cpp/net/eagle0/shardok/library/map:tile_modifier_with_coords",
+        "//src/main/cpp/net/eagle0/shardok/library/unit",
+        "//src/main/cpp/net/eagle0/shardok/library/util:action_result_flatbuffer_helpers",
+        "//src/main/cpp/net/eagle0/shardok/library/view_filters:odds_filter",
+        "//src/main/protobuf/net/eagle0/shardok/common:terrain_cc_proto",
+    ],
+)
+
 cc_library(
    name = "build_bridge_command",
    srcs = ["BuildBridgeCommand.cpp"],
@@ -0,0 +1,82 @@
+//
+// Created by Claude on 3/14/26.
+//
+
+#include "BlowBridgeCommand.hpp"
+
+#include "src/main/cpp/net/eagle0/shardok/library/actions/ActionRequiresHeroException.hpp"
+#include "src/main/cpp/net/eagle0/shardok/library/map/TileModifierWithCoords.hpp"
+#include "src/main/cpp/net/eagle0/shardok/library/unit/Unit.hpp"
+#include "src/main/cpp/net/eagle0/shardok/library/util/ActionResultFlatbufferHelpers.hpp"
+#include "src/main/cpp/net/eagle0/shardok/library/view_filters/OddsFilter.hpp"
+#include "src/main/protobuf/net/eagle0/shardok/common/tile_modifier.pb.h"
+
+namespace shardok {
+
+using net::eagle0::shardok::common::ActionType;
+
+auto BlowBridgeCommand::InternalExecuteWithRoll(
+        const GameStateW& currentState,
+        const std::shared_ptr<RandomGenerator>& generator,
+        const std::optional<int32_t> roll) const -> vector<ActionResult> {
+    const auto successRoll = 101 - roll.value_or(generator->Percentile());
+    return ExecuteWithRoll(currentState, successRoll);
+}
+
+auto BlowBridgeCommand::ExecuteWithRoll(const GameStateW& currentState, double roll) const
+        -> vector<ActionResult> {
+    const auto* actor = currentState->units()->Get(actorId);
+    if (!actor->has_attached_hero()) { throw ActionRequiresHeroException("blow bridge"); }
+
+    auto actorAfter = *actor;
+    MutatingSpendActionPoints(&actorAfter, cost);
+    MutatingBumpAgilityXp(&actorAfter, agilityXp);
+    MutatingBumpStrengthXp(&actorAfter, strengthXp);
+    MutatingBumpAllKnowledgeToMinimum(&actorAfter, minimumKnowledgeAfter);
+
+    // Always move engineer to target tile
+    actorAfter.mutable_location() = target;
+
+    ActionResult result{};
+    result.mutable_player()->set_value(GetPlayerId());
+    result.mutable_actor()->set_value(actorAfter.unit_id());
+    *result.mutable_target_coords() = ToCoordsProto(target);
+    result.mutable_roll()->set_value(roll);
+    *result.mutable_odds() = successOdds;
+
+    if (PercentileRollSucceeds(successOdds, roll)) {
+        result.set_type(ActionType::BLOW_BRIDGE);
+
+        auto newTileModifier = targetTerrain.modifier();
+        SetBridge(newTileModifier, 0.0);
+        *result.add_changed_tile_modifiers() = MakeTmc(bridgeCoords, newTileModifier);
+    } else {
+        result.set_type(ActionType::BLOW_BRIDGE_FAILED);
+    }
+
+    AddChangedUnit(result, actorAfter);
+
+    return {result};
+}
+
+auto BlowBridgeCommand::GetCommandProto() const -> CommandProto {
+    CommandProto proto{};
+
+    proto.set_player(GetPlayerId());
+    proto.set_type(net::eagle0::shardok::common::BLOW_BRIDGE_COMMAND);
+    proto.mutable_actor()->set_value(actorId);
+    *proto.mutable_target() = ToCoordsProto(target);
+    proto.mutable_roll_request()->set_roll_type(net::eagle0::shardok::api::ROLL_TYPE_D100);
+    proto.mutable_roll_request()->set_command_type(
+            net::eagle0::shardok::common::BLOW_BRIDGE_COMMAND);
+    proto.mutable_roll_request()->set_acting_unit_id(actorId);
+    *proto.mutable_odds() = OddsFilteredForPlayer(successOdds, GetPlayerId());
+
+    return proto;
+}
+
+auto BlowBridgeCommand::GetOddsPercentile() const -> int32_t {
+    return OddsFilteredForPlayer(successOdds, GetPlayerId()).success_chance();
+}
+
+}  // namespace shardok
@@ -0,0 +1,82 @@
+//
+// Created by Claude on 3/14/26.
+//
+
+#ifndef EAGLE0_BLOWBRIDGECOMMAND_HPP
+#define EAGLE0_BLOWBRIDGECOMMAND_HPP
+
+#include <utility>
+
+#include "src/main/cpp/net/eagle0/shardok/library/ActionCost.hpp"
+#include "src/main/cpp/net/eagle0/shardok/library/ShardokCommand.hpp"
+#include "src/main/cpp/net/eagle0/shardok/library/map/Coordinates.hpp"
+
+namespace shardok {
+
+using Terrain = net::eagle0::shardok::storage::fb::Terrain;
+using Unit = net::eagle0::shardok::storage::fb::Unit;
+
+class BlowBridgeCommand : public ShardokCommand {
+protected:
+    [[nodiscard]] auto InternalExecuteWithRoll(
+            const GameStateW& currentState,
+            const std::shared_ptr<RandomGenerator>& generator,
+            std::optional<int32_t> roll) const -> vector<ActionResult> override;
+
+    const ActionCost cost;
+    const UnitId actorId;
+    const Coords target;
+    const Coords bridgeCoords;
+    const Terrain targetTerrain;
+    const bool hasNearbyForest;
+    const int agilityXp;
+    const int strengthXp;
+    int minimumKnowledgeAfter;
+    const PercentileRollOdds successOdds;
+
+public:
+    BlowBridgeCommand(
+            const ActionCost& cost,
+            PlayerId playerId,
+            UnitId actorId,
+            Coords target,
+            Coords bridgeCoords,
+            const Terrain& targetTerrain,
+            bool hasNearbyForest,
+            int agilityXp,
+            int strengthXp,
+            int opponentKnowledgeIncrease,
+            PercentileRollOdds successOdds)
+        : ShardokCommand(playerId),
+          cost(cost),
+          actorId(actorId),
+          target(std::move(target)),
+          bridgeCoords(std::move(bridgeCoords)),
+          targetTerrain(std::move(targetTerrain)),
+          hasNearbyForest(hasNearbyForest),
+          agilityXp(agilityXp),
+          strengthXp(strengthXp),
+          minimumKnowledgeAfter(opponentKnowledgeIncrease),
+          successOdds(std::move(successOdds)){};
+
+    auto ExecuteWithRoll(const GameStateW& currentState, double roll) const -> vector<ActionResult>;
+
+    ~BlowBridgeCommand() override = default;
+
+    [[nodiscard]] auto GetCommandType() const -> CommandType override {
+        return net::eagle0::shardok::common::BLOW_BRIDGE_COMMAND;
+    }
+
+    [[nodiscard]] auto CanUseClientRoll() const -> bool override { return true; }
+    [[nodiscard]] auto GetCommandProto() const -> CommandProto override;
+
+    [[nodiscard]] auto HasOdds() const -> bool override { return true; }
+    [[nodiscard]] auto GetOddsPercentile() const -> int32_t override;
+
+    [[nodiscard]] int GetActorUnitId() const override { return actorId; }
+    [[nodiscard]] MapIndex GetTargetRow() const override { return target.row(); }
+    [[nodiscard]] MapIndex GetTargetColumn() const override { return target.column(); }
+};
+}  // namespace shardok
+
+#endif  // EAGLE0_BLOWBRIDGECOMMAND_HPP
@@ -30,6 +30,7 @@ auto ControlCommand::InternalExecute(
    result.set_type(ActionType::CONTROLLED);
    result.mutable_player()->set_value(GetPlayerId());
    result.mutable_actor()->set_value(actorId);
+    result.mutable_target_unit()->set_value(targetId);
    AddChangedUnit(result, actorAfter);

    return {result};
@@ -16,11 +16,13 @@ MeteorCancelCommand::MeteorCancelCommand(
        const ActionCost& cost,
        const SettingsGetter& settingsGetter,
        const PlayerId playerId,
-        const UnitId casterId)
+        const UnitId casterId,
+        const bool requiredToEndTurn)
    : ShardokCommand(playerId),
      cost(cost),
      settings(settingsGetter),
-      casterId(casterId) {}
+      casterId(casterId),
+      requiredToEndTurn(requiredToEndTurn) {}

 auto MeteorCancelCommand::InternalExecute(
        const GameStateW& currentState,
@@ -21,13 +21,15 @@ protected:
    const ActionCost cost;
    const SettingsGetter settings;
    const UnitId casterId;
+    const bool requiredToEndTurn;

 public:
    MeteorCancelCommand(
            const ActionCost &cost,
            const SettingsGetter &settingsGetter,
            PlayerId playerId,
-            UnitId casterId);
+            UnitId casterId,
+            bool requiredToEndTurn = true);

    ~MeteorCancelCommand() override = default;

@@ -36,7 +38,7 @@ public:
    }

    auto GetCommandProto() const -> CommandProto override;
-    [[nodiscard]] auto IsRequiredToEndTurn() const -> bool override { return true; }
+    [[nodiscard]] auto IsRequiredToEndTurn() const -> bool override { return requiredToEndTurn; }
    [[nodiscard]] auto CanDoWithLowMorale() const -> bool override { return true; }
    [[nodiscard]] auto CanDoWithLowVigor() const -> bool override { return true; }

@@ -41,13 +41,15 @@ MeteorTargetCommand::MeteorTargetCommand(
        const PlayerId playerId,
        const UnitId casterId,
        Coords target,
-        const int minimumKnowledge)
+        const int minimumKnowledge,
+        const bool requiredToEndTurn)
    : ShardokCommand(playerId),
      cost(cost),
      settings(settingsGetter),
      casterId(casterId),
      target(std::move(target)),
-      minimumKnowledge(minimumKnowledge) {}
+      minimumKnowledge(minimumKnowledge),
+      requiredToEndTurn(requiredToEndTurn) {}

 auto MeteorTargetCommand::GetCommandProto() const -> CommandProto {
    CommandProto proto{};
@@ -24,6 +24,7 @@ protected:
    const UnitId casterId;
    const Coords target;
    const int minimumKnowledge;
+    const bool requiredToEndTurn;

 public:
    MeteorTargetCommand(
@@ -32,7 +33,8 @@ public:
            PlayerId playerId,
            UnitId casterId,
            Coords target,
-            int minimumKnowledge);
+            int minimumKnowledge,
+            bool requiredToEndTurn = true);

    ~MeteorTargetCommand() override = default;

@@ -41,7 +43,7 @@ public:
    }

    auto GetCommandProto() const -> CommandProto override;
-    [[nodiscard]] auto IsRequiredToEndTurn() const -> bool override { return true; }
+    [[nodiscard]] auto IsRequiredToEndTurn() const -> bool override { return requiredToEndTurn; }
    [[nodiscard]] auto CanDoWithLowMorale() const -> bool override { return true; }
    [[nodiscard]] auto CanDoWithLowVigor() const -> bool override { return true; }

@@ -25,6 +25,7 @@ auto ReinforceCommand::InternalExecute(
    const Unit* joiningUnit = currentState->units()->Get(joiningUnitId);
    auto joinerAfter = *joiningUnit;
    joinerAfter.mutable_location() = location;
+    joinerAfter.mutate_status(net::eagle0::shardok::storage::fb::UnitStatus_NORMAL_UNIT);

    ActionResult placeResult{};
    placeResult.set_type(ActionType::REINFORCED);
@@ -62,6 +62,7 @@ auto FromPlayerInfoProto(flatbuffers::FlatBufferBuilder& fbb, const PlayerInfoPr
    pib.add_allies(alliesOffset);
    pib.add_victory_conditions(vcOffset);
    pib.add_starting_food(piProto.starting_food());
+    pib.add_cannot_become_outlaw(piProto.cannot_become_outlaw());

    return pib.Finish();
 }
@@ -176,7 +177,10 @@ auto SetupInitialGameState(
        modifiedUnit.mutable_battalion().mutate_base_morale(baseMorale);
        modifiedUnit.mutable_battalion().mutate_morale(baseMorale);

-        modifiedUnit.mutate_status(net::eagle0::shardok::storage::fb::UnitStatus_RESERVE_UNIT);
+        if (modifiedUnit.status() !=
+            net::eagle0::shardok::storage::fb::UnitStatus_PENDING_REINFORCEMENT) {
+            modifiedUnit.mutate_status(net::eagle0::shardok::storage::fb::UnitStatus_RESERVE_UNIT);
+        }

        unitsVec.push_back(modifiedUnit);
    }
@@ -236,14 +240,12 @@ auto ToProto(const GameStatus* fbStatus) -> GameStatusProto {
                            fbStatus->end_game_condition()->victory_details()));
            break;
        case net::eagle0::shardok::storage::fb::VictoryType_ALLY_VICTORY:
-            protoStatus.mutable_end_game_condition()->set_ally_victory(
+            protoStatus.mutable_end_game_condition()->set_victory(
                    static_cast<net::eagle0::shardok::common::VictoryCondition>(
                            fbStatus->end_game_condition()->victory_details()));
            break;
        case net::eagle0::shardok::storage::fb::VictoryType_DRAW:
-            protoStatus.mutable_end_game_condition()->set_draw(
-                    static_cast<net::eagle0::shardok::common::DrawType>(
-                            fbStatus->end_game_condition()->draw_details()));
+            throw InvalidProtoException("Draw victory type is no longer supported");
            break;
        case net::eagle0::shardok::storage::fb::VictoryType_LOSS:
            protoStatus.mutable_end_game_condition()->set_loss(
@@ -275,6 +277,7 @@ auto ToPlayerInfoProto(const PlayerInfo* fbPI) -> PlayerInfoProto {
    }
    piProto.set_is_ai(fbPI->is_ai());
    piProto.set_eagle_faction_id(fbPI->eagle_faction_id());
+    piProto.set_cannot_become_outlaw(fbPI->cannot_become_outlaw());

    return piProto;
 }
@@ -9,6 +9,7 @@ cc_library(
    deps = [
        "//src/main/cpp/net/eagle0/common:random_generator",
        "//src/main/cpp/net/eagle0/shardok/library:game_state_w",
+        "//src/main/cpp/net/eagle0/shardok/library/map:coordinates",
        "//src/main/cpp/net/eagle0/shardok/library/settings:game_settings",
        "//src/main/cpp/net/eagle0/shardok/library/util:action_result_flatbuffer_helpers",
        "//src/main/protobuf/net/eagle0/common:tutorial_battle_config_cc_proto",
@@ -34,10 +34,10 @@ TutorialBattleController::TutorialBattleController(const TutorialBattleConfigPro
 auto TutorialBattleController::CheckAndExecuteEvents(
        const GameStateW& state,
        const SettingsGetter& settings,
-        const std::shared_ptr<RandomGenerator>& randomGenerator) -> std::vector<ActionResult> {
+        const std::shared_ptr<RandomGenerator>& randomGenerator) -> TutorialEventResults {
    if (!enabled_) { return {}; }

-    std::vector<ActionResult> allResults;
+    TutorialEventResults combined;

    // Check events in config order
    for (const auto& event : config_.events()) {
@@ -50,12 +50,20 @@ auto TutorialBattleController::CheckAndExecuteEvents(
            firedEventIds_.insert(event.event_id());

            // Execute the action
-            auto results = ExecuteAction(event.action(), state, settings, randomGenerator);
-            allResults.insert(allResults.end(), results.begin(), results.end());
+            auto eventResults = ExecuteAction(event.action(), state, settings, randomGenerator);
+            combined.actionResults.insert(
+                    combined.actionResults.end(),
+                    eventResults.actionResults.begin(),
+                    eventResults.actionResults.end());
+
+            // Only one reinforcement placement can be pending at a time
+            if (eventResults.reinforcementPlacement.has_value()) {
+                combined.reinforcementPlacement = eventResults.reinforcementPlacement;
+            }
        }
    }

-    return allResults;
+    return combined;
 }

 auto TutorialBattleController::EvaluateTrigger(
@@ -90,15 +98,17 @@ auto TutorialBattleController::EvaluateTrigger(

 auto TutorialBattleController::ExecuteAction(
        const TutorialActionProto& action,
-        [[maybe_unused]] const GameStateW& state,
+        const GameStateW& state,
        [[maybe_unused]] const SettingsGetter& settings,
        [[maybe_unused]] const std::shared_ptr<RandomGenerator>& randomGenerator) const
-        -> std::vector<ActionResult> {
+        -> TutorialEventResults {
    switch (action.action_type_case()) {
-        case TutorialActionProto::kFlee: return ExecuteFleeAction(action.flee(), state);
+        case TutorialActionProto::kFlee:
+            return {.actionResults = ExecuteFleeAction(action.flee(), state),
+                    .reinforcementPlacement = std::nullopt};

        case TutorialActionProto::kReinforcements:
-            return ExecuteReinforcementsAction(action.reinforcements());
+            return ExecuteReinforcementsAction(action.reinforcements(), state);

        case TutorialActionProto::ACTION_TYPE_NOT_SET:
        default: return {};
@@ -116,7 +126,8 @@ auto TutorialBattleController::CountLostUnits(const GameStateW& state, const Pla
        if (status != UnitStatusFB::UnitStatus_NORMAL_UNIT &&
            status != UnitStatusFB::UnitStatus_RESERVE_UNIT &&
            status != UnitStatusFB::UnitStatus_NEVER_ENTERED_UNIT &&
-            status != UnitStatusFB::UnitStatus_RESERVED_SLOT) {
+            status != UnitStatusFB::UnitStatus_RESERVED_SLOT &&
+            status != UnitStatusFB::UnitStatus_PENDING_REINFORCEMENT) {
            count++;
        }
    }
@@ -192,16 +203,25 @@ auto TutorialBattleController::ExecuteFleeAction(
    results.push_back(fleeNotification);

    // Determine which units should flee
-    std::set<int32_t> specificUnits(fleeAction.unit_ids().begin(), fleeAction.unit_ids().end());
-    const bool fleeAllUnits = specificUnits.empty();
+    std::set<int32_t> specificUnitIds(fleeAction.unit_ids().begin(), fleeAction.unit_ids().end());
+    std::set<int32_t> specificHeroIds(
+            fleeAction.eagle_hero_ids().begin(),
+            fleeAction.eagle_hero_ids().end());
+    const bool fleeAllUnits = specificUnitIds.empty() && specificHeroIds.empty();

    // Find all matching units that are still active and make them flee
    for (const auto* unit : *state->units()) {
        if (unit->player_id() != fleeingPlayerId) { continue; }
        if (unit->status() != UnitStatusFB::UnitStatus_NORMAL_UNIT) { continue; }

-        // Check if this is a specific unit to flee, or if we're fleeing all
-        if (!fleeAllUnits && !specificUnits.contains(unit->unit_id())) { continue; }
+        // Check if this unit should flee
+        if (!fleeAllUnits) {
+            const bool matchesUnitId = specificUnitIds.contains(unit->unit_id());
+            const bool matchesHeroId =
+                    unit->has_attached_hero() &&
+                    specificHeroIds.contains(unit->attached_hero().eagle_hero_id());
+            if (!matchesUnitId && !matchesHeroId) { continue; }
+        }

        // Create flee result for this unit (100% success - guaranteed flee)
        ActionResult fleeResult{};
@@ -220,17 +240,54 @@ auto TutorialBattleController::ExecuteFleeAction(
 }

 auto TutorialBattleController::ExecuteReinforcementsAction(
-        const ReinforcementsActionProto& reinforcementsAction) const -> std::vector<ActionResult> {
-    std::vector<ActionResult> results;
+        const ReinforcementsActionProto& reinforcementsAction,
+        const GameStateW& state) const -> TutorialEventResults {
+    TutorialEventResults eventResults;

-    // Add reinforcements arrival notification if there are units
-    if (!reinforcementsAction.units().empty()) {
-        ActionResult reinforcementsResult{};
-        reinforcementsResult.set_type(ActionType::TUTORIAL_REINFORCEMENTS_ARRIVED);
-        results.push_back(reinforcementsResult);
+    if (reinforcementsAction.units().empty()) { return eventResults; }
+
+    const PlayerId playerId = reinforcementsAction.player_id();
+
+    // Look up starting positions from the hex map's attacker starting positions
+    using Coords = net::eagle0::shardok::storage::fb::Coords;
+    std::vector<Coords> availablePositions;
+    const int startingPosGroupIndex = reinforcementsAction.attacker_starting_position_index();
+    const auto* attackerPositions = state->hex_map()->attacker_starting_positions();
+    if (startingPosGroupIndex >= 0 &&
+        startingPosGroupIndex < static_cast<int>(attackerPositions->size())) {
+        for (const auto* pos : *attackerPositions->Get(startingPosGroupIndex)->positions()) {
+            if (!state.GetOccupant(*pos)) { availablePositions.push_back(*pos); }
+        }
    }

-    return results;
+    // Build set of eagle hero IDs for this specific reinforcement event
+    std::set<int32_t> expectedHeroIds;
+    for (const auto& commonUnit : reinforcementsAction.units()) {
+        if (commonUnit.has_hero()) { expectedHeroIds.insert(commonUnit.hero().eagle_hero_id()); }
+    }
+
+    // Place only the PENDING_REINFORCEMENT units that belong to this event
+    ActionResult reinforcementsResult{};
+    reinforcementsResult.set_type(ActionType::TUTORIAL_REINFORCEMENTS_ARRIVED);
+    reinforcementsResult.mutable_player()->set_value(playerId);
+
+    size_t posIndex = 0;
+    for (const auto* unit : *state->units()) {
+        if (unit->status() != UnitStatusFB::UnitStatus_PENDING_REINFORCEMENT) { continue; }
+        if (!unit->has_attached_hero() ||
+            !expectedHeroIds.contains(unit->attached_hero().eagle_hero_id())) {
+            continue;
+        }
+        if (posIndex >= availablePositions.size()) { break; }
+
+        net::eagle0::shardok::storage::fb::Unit changedUnit = *unit;
+        changedUnit.mutate_status(UnitStatusFB::UnitStatus_NORMAL_UNIT);
+        changedUnit.mutable_location() = availablePositions[posIndex++];
+        AddChangedUnit(reinforcementsResult, changedUnit);
+    }
+
+    eventResults.actionResults.push_back(reinforcementsResult);
+    return eventResults;
 }

 }  // namespace shardok
@@ -9,12 +9,14 @@
 #ifndef TutorialBattleController_hpp
 #define TutorialBattleController_hpp

+#include <optional>
 #include <set>
 #include <string>
 #include <vector>

 #include "src/main/cpp/net/eagle0/common/RandomGenerator.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/GameStateW.hpp"
+#include "src/main/cpp/net/eagle0/shardok/library/map/Coordinates.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/settings/GameSettings.hpp"
 #include "src/main/protobuf/net/eagle0/common/tutorial_battle_config.pb.h"
 #include "src/main/protobuf/net/eagle0/shardok/storage/action_result.pb.h"
@@ -27,6 +29,19 @@ using TutorialEventProto = net::eagle0::common::TutorialEvent;
 using TutorialTriggerProto = net::eagle0::common::TutorialTrigger;
 using TutorialActionProto = net::eagle0::common::TutorialAction;

+/// Info about a pending reinforcement placement phase.
+struct ReinforcementPlacementInfo {
+    PlayerId playerId;
+    std::vector<Coords> startingPositions;
+};
+
+/// Results from tutorial event processing, including action results and any pending
+/// reinforcement placement.
+struct TutorialEventResults {
+    std::vector<ActionResult> actionResults;
+    std::optional<ReinforcementPlacementInfo> reinforcementPlacement;
+};
+
 /// Controller for scripted tutorial battles with event-driven triggers and actions.
 /// Events are checked at the end of each round and fire in config order.
 /// Each event fires at most once (tracked by event_id).
@@ -47,7 +62,7 @@ public:
    [[nodiscard]] auto CheckAndExecuteEvents(
            const GameStateW& state,
            const SettingsGetter& settings,
-            const std::shared_ptr<RandomGenerator>& randomGenerator) -> std::vector<ActionResult>;
+            const std::shared_ptr<RandomGenerator>& randomGenerator) -> TutorialEventResults;

    /// Gets the set of fired event IDs (for testing/debugging).
    [[nodiscard]] auto GetFiredEventIds() const -> const std::set<std::string>& {
@@ -68,8 +83,7 @@ private:
            const TutorialActionProto& action,
            const GameStateW& state,
            const SettingsGetter& settings,
-            const std::shared_ptr<RandomGenerator>& randomGenerator) const
-            -> std::vector<ActionResult>;
+            const std::shared_ptr<RandomGenerator>& randomGenerator) const -> TutorialEventResults;

    // Helper methods for trigger evaluation

@@ -91,10 +105,10 @@ private:
            const net::eagle0::common::FleeAction& fleeAction,
            const GameStateW& state) const -> std::vector<ActionResult>;

-    /// Executes a reinforcements action.
+    /// Executes a reinforcements action, placing units directly at available starting positions.
    [[nodiscard]] auto ExecuteReinforcementsAction(
-            const net::eagle0::common::ReinforcementsAction& reinforcementsAction) const
-            -> std::vector<ActionResult>;
+            const net::eagle0::common::ReinforcementsAction& reinforcementsAction,
+            const GameStateW& state) const -> TutorialEventResults;
 };

 }  // namespace shardok
@@ -331,7 +331,8 @@ auto PlacedUnitsForPlayer(const Units *units, const PlayerId pid)
    std::map<UnitId, const Unit *> placedUnits{};
    for (const Unit *unit : *units) {
        if (unit->player_id() == pid &&
-            unit->status() != net::eagle0::shardok::storage::fb::UnitStatus_RESERVE_UNIT)
+            unit->status() != net::eagle0::shardok::storage::fb::UnitStatus_RESERVE_UNIT &&
+            unit->status() != net::eagle0::shardok::storage::fb::UnitStatus_PENDING_REINFORCEMENT)
            placedUnits[unit->unit_id()] = unit;
    }

@@ -73,6 +73,9 @@ void DumpGameStateToFile(const GameStateW& gameState, const std::string& gameId)
                case net::eagle0::shardok::storage::fb::UnitStatus_RETREATED_UNIT:
                    out << "RETREATED_UNIT\n";
                    break;
+                case net::eagle0::shardok::storage::fb::UnitStatus_PENDING_REINFORCEMENT:
+                    out << "PENDING_REINFORCEMENT\n";
+                    break;
                default: out << "OTHER (" << (int)unit->status() << ")\n";
            }
            out << "  Remaining Action Points: " << (int)unit->remaining_action_points() << "\n";
@@ -49,7 +49,8 @@ auto GameStateFilteredForPlayer(
            case net::eagle0::shardok::storage::fb::UnitStatus_FLED_UNIT:
            case net::eagle0::shardok::storage::fb::UnitStatus_RETREATED_UNIT:
            case net::eagle0::shardok::storage::fb::UnitStatus_OUTLAWED_UNIT:
-            case net::eagle0::shardok::storage::fb::UnitStatus_RESERVED_SLOT: break;
+            case net::eagle0::shardok::storage::fb::UnitStatus_RESERVED_SLOT:
+            case net::eagle0::shardok::storage::fb::UnitStatus_PENDING_REINFORCEMENT: break;

            case net::eagle0::shardok::storage::fb::UnitStatus_UNKNOWN_UNIT:
                throw ShardokInternalErrorException("Unknown unit status");
@@ -100,6 +101,7 @@ auto GameStateFilteredForPlayer(
                case net::eagle0::shardok::storage::fb::UnitStatus_RETREATED_UNIT:
                case net::eagle0::shardok::storage::fb::UnitStatus_OUTLAWED_UNIT:
                case net::eagle0::shardok::storage::fb::UnitStatus_RESERVED_SLOT:
+                case net::eagle0::shardok::storage::fb::UnitStatus_PENDING_REINFORCEMENT:
                case net::eagle0::shardok::storage::fb::UnitStatus_UNKNOWN_UNIT: break;
            }
        }
@@ -188,22 +188,6 @@ auto GameStateGuesser::GuessedState(
                                gameStateView.status().end_game_condition().victory()));
                break;

-            case net::eagle0::shardok::common::EndGameCondition::ConditionCase::kAllyVictory:
-                endGameCondition.mutate_victory_type(
-                        net::eagle0::shardok::storage::fb::VictoryType_ALLY_VICTORY);
-                endGameCondition.mutate_victory_details(
-                        static_cast<net::eagle0::shardok::storage::fb::VictoryCondition>(
-                                gameStateView.status().end_game_condition().ally_victory()));
-                break;
-
-            case net::eagle0::shardok::common::EndGameCondition::ConditionCase::kDraw:
-                endGameCondition.mutate_victory_type(
-                        net::eagle0::shardok::storage::fb::VictoryType_DRAW);
-                endGameCondition.mutate_draw_details(
-                        static_cast<net::eagle0::shardok::storage::fb::DrawType>(
-                                gameStateView.status().end_game_condition().draw()));
-                break;
-
            case net::eagle0::shardok::common::EndGameCondition::ConditionCase::kLoss:
                endGameCondition.mutate_victory_type(
                        net::eagle0::shardok::storage::fb::VictoryType_LOSS);
--- a/Show More
+++ b/Show More