Split feast spending quests by scope

2026-07-29 09:15:42 +00:00 · 2026-05-29 19:50:37 -07:00
1841 changed files with 168365 additions and 313840 deletions
@@ -3,9 +3,18 @@
 # for now: filter out annoying TASTY warnings
 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

+# Try to speed up sandboxes
+common --experimental_reuse_sandbox_directories
+
 common --enable_platform_specific_config

 common --strategy=Scalac=worker
@@ -14,49 +23,12 @@ common --worker_sandboxing
 common --local_test_jobs=64
 common --jobs=64

-# Keep these C++ standard flags in sync with tools/copts.bzl and scripts/shardok_cpp_config.sh.
 common --cxxopt="--std=c++23"
 common --cxxopt="-Wno-deprecated-non-prototype"
-common --per_file_copt=src/test/cpp/.*@-Wno-character-conversion
-common --per_file_copt=src/test/cpp/.*@-Wno-deprecated-enum-compare
-common --per_file_copt=src/test/cpp/.*@-Wno-sign-compare
-common --per_file_copt=src/test/cpp/.*@-Wno-unknown-warning-option
 common --host_cxxopt="--std=c++23"

-# C++ sanitizer configs for targeted Shardok safety checks.
-# Example: bazel test --config=asan //src/test/cpp/net/eagle0/shardok/library/...
-build:asan --compilation_mode=dbg
-build:asan --strip=never
-build:asan --copt=-fno-omit-frame-pointer
-build:asan --copt=-Wno-macro-redefined
-build:asan --copt=-fsanitize=address
-build:asan --linkopt=-fsanitize=address
-test:asan --test_env=ASAN_OPTIONS=detect_leaks=0:strict_init_order=1
-
-build:ubsan --compilation_mode=dbg
-build:ubsan --strip=never
-build:ubsan --copt=-fno-omit-frame-pointer
-build:ubsan --copt=-Wno-macro-redefined
-build:ubsan --copt=-fsanitize=undefined
-# Protobuf's arena implementation trips UBSan alignment checks in external code on macOS.
-build:ubsan --copt=-fno-sanitize=alignment
-build:ubsan --linkopt=-fsanitize=undefined
-test:ubsan --test_env=UBSAN_OPTIONS=print_stacktrace=1:halt_on_error=1
-
-build:tsan --compilation_mode=dbg
-build:tsan --strip=never
-build:tsan --copt=-fno-omit-frame-pointer
-build:tsan --copt=-Wno-macro-redefined
-build:tsan --copt=-fsanitize=thread
-build:tsan --linkopt=-fsanitize=thread
-test:tsan --test_env=TSAN_OPTIONS=halt_on_error=1
-
 common --javacopt="-Xlint:-options"

-# Prefer protobuf's prebuilt protoc toolchain instead of building protoc from
-# source when compatible binaries are available.
-common --@com_google_protobuf//bazel/toolchains:prefer_prebuilt_protoc
-
 # std::filesystem and other modern C++ deps require macOS 10.15+.
 common:macos --macos_minimum_os=10.15
 common:macos --host_macos_minimum_os=10.15
@@ -65,8 +37,13 @@ common:macos --host_macos_minimum_os=10.15
 # Use host_linkopt for macOS-specific flags to avoid passing them to Linux cross-compilation
 common:macos --host_linkopt=-Wl,-no_warn_duplicate_libraries

-# Pin default DEVELOPER_DIR so Apple repo rules use full Xcode instead of
-# Command Line Tools when they are needed.
+# Workaround for grpc cf_event_engine build error on macOS with Bazel 7.x
+# See: https://github.com/grpc/grpc/issues/37619
+common:macos --features=-module_maps
+
+# Pin DEVELOPER_DIR so Apple repo rules use full Xcode instead of Command Line
+# Tools. The sync script writes .bazelrc.xcode with an Xcode build-version
+# marker so in-place Xcode updates refresh Bazel's generated Apple toolchains.
 common:macos --repo_env=DEVELOPER_DIR=/Applications/Xcode.app/Contents/Developer

 # Local machine or CI overrides. This lets Bazel-only runners use Command Line
@@ -74,9 +51,8 @@ common:macos --repo_env=DEVELOPER_DIR=/Applications/Xcode.app/Contents/Developer
 # generated Xcode settings win when both files exist.
 try-import %workspace%/.bazelrc.local

-# Xcode config for Apple tool builds. Generated by scripts/sync_bazel_xcode.sh.
-# Bakes the Xcode build version into mactools action cache keys without making
-# ordinary macOS Bazel builds depend on the installed Xcode build number.
+# Xcode config for macOS builds. 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
@@ -1 +1 @@
-9.1.1
+8.5.1
@@ -1,24 +0,0 @@
-Checks: >
-  -*,
-  bugprone-*,
-  performance-*,
-  modernize-use-nullptr,
-  modernize-use-override,
-  modernize-use-auto,
-  modernize-use-nodiscard,
-  readability-braces-around-statements,
-  readability-qualified-auto,
-  readability-redundant-member-init,
-  cppcoreguidelines-pro-type-cstyle-cast,
-  -bugprone-easily-swappable-parameters,
-  -bugprone-branch-clone,
-  -bugprone-signed-char-misuse
-WarningsAsErrors: ''
-HeaderFilterRegex: 'src/(main|test)/cpp/net/eagle0/(shardok|common)/.*'
-FormatStyle: file
-CheckOptions:
-  readability-braces-around-statements.ShortStatementLines: '1'
-  readability-function-size.LineThreshold: '160'
-  readability-function-size.StatementThreshold: '80'
-  readability-function-size.BranchThreshold: '20'
-  modernize-use-nullptr.NullMacros: 'NULL'
@@ -1,9 +0,0 @@
-name: Setup Bazel
-description: Ensure Bazel is installed on a self-hosted runner.
-
-runs:
-  using: composite
-  steps:
-    - name: Ensure Bazel installed
-      shell: bash
-      run: ./ci/github_actions/ensure_bazel_installed.sh
@@ -0,0 +1,75 @@
+name: Artifact Storage Check
+
+on:
+  schedule:
+    # Run every 6 hours
+    - cron: '0 */6 * * *'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  actions: write
+
+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:
+      - name: Check artifact storage size
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          # Calculate total artifact storage
+          total_bytes=$(gh api "repos/${{ github.repository }}/actions/artifacts" \
+            --paginate -q '.artifacts[].size_in_bytes' | awk '{sum+=$1} END {print sum}')
+
+          total_mb=$((total_bytes / 1024 / 1024))
+          echo "Total artifact storage: ${total_mb} MB"
+
+          # Fail if over 500MB
+          if [ "$total_mb" -gt 500 ]; then
+            echo "::error::Artifact storage is ${total_mb} MB, which exceeds the 500 MB threshold!"
+            echo ""
+            echo "Largest artifacts:"
+            # Save to temp file to avoid SIGPIPE/broken pipe errors with head
+            gh api "repos/${{ github.repository }}/actions/artifacts" \
+              --paginate -q '.artifacts[] | "\(.size_in_bytes)\t\(.name)\t\(.created_at)"' > /tmp/artifacts.txt
+            sort -rn /tmp/artifacts.txt | head -20 | \
+              awk -F'\t' '{printf "%d MB\t%s\t%s\n", $1/1024/1024, $2, $3}'
+            rm -f /tmp/artifacts.txt
+            exit 1
+          fi
+
+          echo "Storage is within acceptable limits."
@@ -6,38 +6,12 @@ on:
    paths:
      - 'src/main/go/net/eagle0/authservice/**'
      - 'src/main/go/net/eagle0/authcli/**'
-      - 'src/main/go/net/eagle0/common/**'
-      - 'src/main/go/net/eagle0/util/**'
      - 'src/main/protobuf/net/eagle0/eagle/api/auth.proto'
      - 'src/main/protobuf/net/eagle0/eagle/api/admin/**'
      - 'src/main/protobuf/net/eagle0/eagle/internal/auth_internal.proto'
      - 'src/main/resources/net/eagle0/attributions.json'
      - 'ci/BUILD.bazel'
      - 'ci/github_actions/ensure_bazel_installed.sh'
-      - '.github/actions/setup-bazel/**'
-      - 'go.mod'
-      - 'go.sum'
-      - 'MODULE.bazel'
-      - 'MODULE.bazel.lock'
-      - '.bazelrc'
-      - '.github/workflows/auth_build.yml'
-  pull_request:
-    paths:
-      - 'src/main/go/net/eagle0/authservice/**'
-      - 'src/main/go/net/eagle0/authcli/**'
-      - 'src/main/go/net/eagle0/common/**'
-      - 'src/main/go/net/eagle0/util/**'
-      - 'src/main/protobuf/net/eagle0/eagle/api/auth.proto'
-      - 'src/main/protobuf/net/eagle0/eagle/api/admin/**'
-      - 'src/main/protobuf/net/eagle0/eagle/internal/auth_internal.proto'
-      - 'src/main/resources/net/eagle0/attributions.json'
-      - 'ci/BUILD.bazel'
-      - 'ci/github_actions/ensure_bazel_installed.sh'
-      - '.github/actions/setup-bazel/**'
-      - 'go.mod'
-      - 'go.sum'
-      - 'MODULE.bazel'
-      - 'MODULE.bazel.lock'
      - '.bazelrc'
      - '.github/workflows/auth_build.yml'
  workflow_dispatch:
@@ -52,43 +26,23 @@ permissions:
  contents: read

 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || 'deploy' }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+  group: auth-build-deploy
+  cancel-in-progress: false

 jobs:
  build-auth:
-    runs-on: [self-hosted, bazel]
+    runs-on: [self-hosted, bazel, halfdan]
    outputs:
      image_tag: ${{ steps.push-auth.outputs.image_tag }}
    steps:
-      - name: Prepare non-LFS checkout
-        env:
-          GIT_CONFIG_GLOBAL: ${{ runner.temp }}/gitconfig-no-lfs
-          GIT_CONFIG_NOSYSTEM: "1"
-        run: |
-          git config --global --unset-all filter.lfs.process || true
-          git config --global filter.lfs.smudge "cat"
-          git config --global filter.lfs.clean "cat"
-          git config --global filter.lfs.required false
-          if [ -d ".git" ]; then
-            git config --local --unset-all filter.lfs.process || true
-            git config --local filter.lfs.smudge "cat"
-            git config --local filter.lfs.clean "cat"
-            git config --local filter.lfs.required false
-          fi
-          rm -f .git/hooks/post-checkout .git/hooks/post-merge .git/hooks/pre-push
-
      - name: Checkout repository
        uses: actions/checkout@v6
-        env:
-          GIT_CONFIG_GLOBAL: ${{ runner.temp }}/gitconfig-no-lfs
-          GIT_CONFIG_NOSYSTEM: "1"
        with:
          persist-credentials: false
          lfs: false

      - name: Ensure Bazel installed
-        uses: ./.github/actions/setup-bazel
+        run: ./ci/github_actions/ensure_bazel_installed.sh

      - name: Build Auth Server Docker image
        id: build-auth
@@ -0,0 +1,41 @@
+name: Bazel Cache Cleanup
+
+on:
+  # Disabled: bazel clean fails when another runner shares the output_base
+  # on /Volumes/remote_cache (unlinkat "Directory not empty" race).
+  # See https://github.com/nolen777/eagle0/issues/TBD for details.
+  # schedule:
+  #   - cron: '0 0 * * 0'
+  workflow_dispatch:  # Allow manual trigger
+
+jobs:
+  cleanup:
+    runs-on: [self-hosted, bazel, halfdan]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+          lfs: false
+
+      - name: Show disk usage before cleanup
+        run: |
+          echo "=== Disk usage before cleanup ==="
+          BAZEL_USER_ROOT="/private/var/tmp/_bazel_$(whoami)"
+          echo "Bazel user root: $BAZEL_USER_ROOT"
+          du -sh "$BAZEL_USER_ROOT" 2>/dev/null || echo "Not found"
+          df -h .
+
+      - name: Run bazel clean
+        run: |
+          echo "=== Running bazel clean ==="
+          bazel clean
+          echo "Clean complete"
+
+      - name: Show disk usage after cleanup
+        run: |
+          echo "=== Disk usage after cleanup ==="
+          BAZEL_USER_ROOT="/private/var/tmp/_bazel_$(whoami)"
+          du -sh "$BAZEL_USER_ROOT" 2>/dev/null || echo "Not found"
+          df -h .
@@ -1,136 +0,0 @@
-name: Bazel Cache Maintenance
-
-on:
-  workflow_dispatch:
-    inputs:
-      target:
-        description: 'Maintenance target'
-        required: true
-        default: 'parity'
-        type: choice
-        options:
-          - parity
-          - clean
-  schedule:
-    - cron: '17 11 * * *'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: false
-
-permissions:
-  contents: read
-
-jobs:
-  warm-cache:
-    if: github.event_name == 'schedule' || github.event.inputs.target == 'parity'
-    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: Ensure Git LFS available for checkout
-        run: |
-          COMMON_PATHS=(/opt/homebrew/bin /usr/local/bin)
-          for path in "${COMMON_PATHS[@]}"; do
-            if [ -d "$path" ]; then
-              echo "$path" >> "$GITHUB_PATH"
-              export PATH="$path:$PATH"
-            fi
-          done
-
-          if command -v git-lfs >/dev/null 2>&1; then
-            git-lfs version
-            exit 0
-          fi
-
-          brew install git-lfs
-          git-lfs version
-      - name: Checkout repository
-        uses: actions/checkout@v6
-        with:
-          persist-credentials: false
-          lfs: false
-      - name: Ensure Bazel installed
-        uses: ./.github/actions/setup-bazel
-      - name: Warm remote cache
-        run: ./scripts/check_bazel_remote_cache_parity.sh warm
-
-  verify-cache:
-    needs: warm-cache
-    if: github.event_name == 'schedule' || github.event.inputs.target == 'parity'
-    runs-on: [self-hosted, bazel]
-    strategy:
-      fail-fast: false
-      matrix:
-        probe: [a, b]
-
-    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: Ensure Git LFS available for checkout
-        run: |
-          COMMON_PATHS=(/opt/homebrew/bin /usr/local/bin)
-          for path in "${COMMON_PATHS[@]}"; do
-            if [ -d "$path" ]; then
-              echo "$path" >> "$GITHUB_PATH"
-              export PATH="$path:$PATH"
-            fi
-          done
-
-          if command -v git-lfs >/dev/null 2>&1; then
-            git-lfs version
-            exit 0
-          fi
-
-          brew install git-lfs
-          git-lfs version
-      - name: Checkout repository
-        uses: actions/checkout@v6
-        with:
-          persist-credentials: false
-          lfs: false
-      - name: Ensure Bazel installed
-        uses: ./.github/actions/setup-bazel
-      - name: Verify remote cache parity
-        run: ./scripts/check_bazel_remote_cache_parity.sh verify
-
-  clean-cache:
-    if: github.event_name == 'workflow_dispatch' && github.event.inputs.target == 'clean'
-    runs-on: [self-hosted, bazel]
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-        with:
-          persist-credentials: false
-          lfs: false
-
-      - name: Show disk usage before cleanup
-        run: |
-          echo "=== Disk usage before cleanup ==="
-          BAZEL_USER_ROOT="/private/var/tmp/_bazel_$(whoami)"
-          echo "Bazel user root: $BAZEL_USER_ROOT"
-          du -sh "$BAZEL_USER_ROOT" 2>/dev/null || echo "Not found"
-          df -h .
-
-      - name: Run bazel clean
-        run: |
-          echo "=== Running bazel clean ==="
-          bazel clean
-          echo "Clean complete"
-
-      - name: Show disk usage after cleanup
-        run: |
-          echo "=== Disk usage after cleanup ==="
-          BAZEL_USER_ROOT="/private/var/tmp/_bazel_$(whoami)"
-          du -sh "$BAZEL_USER_ROOT" 2>/dev/null || echo "Not found"
-          df -h .
@@ -7,16 +7,9 @@ on:
      - 'src/**'
      - 'WORKSPACE'
      - 'MODULE.bazel'
-      - 'MODULE.bazel.lock'
      - 'BUILD.bazel'
      - '.bazelrc'
      - 'ci/github_actions/ensure_bazel_installed.sh'
-      - 'ci/github_actions/summarize_bazel_bep.py'
-      - '.clang-tidy'
-      - 'scripts/run-clang-tidy.sh'
-      - 'scripts/check_shardok_clang_tidy.sh'
-      - 'scripts/sync_bazel_xcode.sh'
-      - '.github/actions/setup-bazel/**'
      - '.github/workflows/bazel_test.yml'
      - '!src/main/csharp/**'
      - '!src/test/csharp/**'
@@ -25,16 +18,9 @@ on:
      - 'src/**'
      - 'WORKSPACE'
      - 'MODULE.bazel'
-      - 'MODULE.bazel.lock'
      - 'BUILD.bazel'
      - '.bazelrc'
      - 'ci/github_actions/ensure_bazel_installed.sh'
-      - 'ci/github_actions/summarize_bazel_bep.py'
-      - '.clang-tidy'
-      - 'scripts/run-clang-tidy.sh'
-      - 'scripts/check_shardok_clang_tidy.sh'
-      - 'scripts/sync_bazel_xcode.sh'
-      - '.github/actions/setup-bazel/**'
      - '.github/workflows/bazel_test.yml'
      - '!src/main/csharp/**'
      - '!src/test/csharp/**'
@@ -86,8 +72,6 @@ jobs:
        node-version: 'lts/*'
    - name: Check JavaScript syntax
      run: node --check src/main/go/net/eagle0/admin_server/static/map_editor.js
-    - name: Check Shardok clang-tidy gate
-      run: ./scripts/check_shardok_clang_tidy.sh

  test:
    runs-on: [self-hosted, bazel]
@@ -120,15 +104,10 @@ jobs:
      with:
        persist-credentials: false
        lfs: false
-    - name: Setup Bazel
-      uses: ./.github/actions/setup-bazel
-    - name: Sync Bazel Xcode config
-      run: ./scripts/sync_bazel_xcode.sh
+    - name: Ensure Bazel installed
+      run: ./ci/github_actions/ensure_bazel_installed.sh
    - name: Run tests
      run: bazel test --build_event_json_file=test.json //src/test/... //src/main/go/...
-    - name: Summarize Bazel build metrics
-      if: always()
-      run: python3 ci/github_actions/summarize_bazel_bep.py test.json
    - name: Collect failed test logs
      if: always()
      run: |
@@ -0,0 +1,31 @@
+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, halfdan]
+
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+          lfs: false
+          clean: false
+
+      - name: Ensure Bazel installed
+        run: ./ci/github_actions/ensure_bazel_installed.sh
+
+      - 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
@@ -22,36 +22,22 @@ permissions:
  contents: read

 jobs:
-  build-sysroot:
-    name: Build Linux Sysroot (${{ matrix.architecture }})
+  build-sysroot-amd64:
+    if: ${{ inputs.architecture == 'amd64' || inputs.architecture == 'both' }}
    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix: ${{ fromJSON(inputs.architecture == 'both' && '{"include":[{"architecture":"amd64","build_script":"./tools/sysroot/build_sysroot.sh","artifact_name":"ubuntu-noble-sysroot-amd64","archive_name":"ubuntu_noble_amd64_sysroot.tar.xz","checksum_name":"ubuntu_noble_amd64_sysroot.sha256","module_name":"linux_sysroot"},{"architecture":"arm64","build_script":"./tools/sysroot/build_sysroot_arm64.sh","artifact_name":"ubuntu-noble-sysroot-arm64","archive_name":"ubuntu_noble_arm64_sysroot.tar.xz","checksum_name":"ubuntu_noble_arm64_sysroot.sha256","module_name":"linux_sysroot_arm64"}]}' || inputs.architecture == 'arm64' && '{"include":[{"architecture":"arm64","build_script":"./tools/sysroot/build_sysroot_arm64.sh","artifact_name":"ubuntu-noble-sysroot-arm64","archive_name":"ubuntu_noble_arm64_sysroot.tar.xz","checksum_name":"ubuntu_noble_arm64_sysroot.sha256","module_name":"linux_sysroot_arm64"}]}' || '{"include":[{"architecture":"amd64","build_script":"./tools/sysroot/build_sysroot.sh","artifact_name":"ubuntu-noble-sysroot-amd64","archive_name":"ubuntu_noble_amd64_sysroot.tar.xz","checksum_name":"ubuntu_noble_amd64_sysroot.sha256","module_name":"linux_sysroot"}]}') }}
-
    steps:
      - name: Checkout repository
        uses: actions/checkout@v6
        with:
          persist-credentials: false

-      - name: Set up QEMU for ARM64 emulation
-        if: ${{ matrix.architecture == 'arm64' }}
-        uses: docker/setup-qemu-action@v4
-        with:
-          platforms: arm64
-
-      - name: Set up Docker Buildx
-        if: ${{ matrix.architecture == 'arm64' }}
-        uses: docker/setup-buildx-action@v4
-
      - name: Build sysroot
-        run: ${{ matrix.build_script }}
+        run: ./tools/sysroot/build_sysroot.sh

      - name: Upload sysroot artifact
        uses: actions/upload-artifact@v7
        with:
-          name: ${{ matrix.artifact_name }}
+          name: ubuntu-noble-sysroot-amd64
          path: tools/sysroot/output/
          retention-days: 1

@@ -69,25 +55,89 @@ jobs:
          AWS_SECRET_ACCESS_KEY: ${{ secrets.SECRET_KEY }}
        run: |
          # Upload sysroot tarball to DO Spaces
-          aws s3 cp "tools/sysroot/output/${{ matrix.archive_name }}" \
-            "s3://eagle0-sysroot/${{ inputs.version }}/${{ matrix.archive_name }}" \
+          aws s3 cp tools/sysroot/output/ubuntu_noble_amd64_sysroot.tar.xz \
+            s3://eagle0-sysroot/${{ inputs.version }}/ubuntu_noble_amd64_sysroot.tar.xz \
            --endpoint-url https://sfo3.digitaloceanspaces.com \
            --acl public-read

          # Upload sha256 file
-          aws s3 cp "tools/sysroot/output/${{ matrix.checksum_name }}" \
-            "s3://eagle0-sysroot/${{ inputs.version }}/${{ matrix.checksum_name }}" \
+          aws s3 cp tools/sysroot/output/ubuntu_noble_amd64_sysroot.sha256 \
+            s3://eagle0-sysroot/${{ inputs.version }}/ubuntu_noble_amd64_sysroot.sha256 \
            --endpoint-url https://sfo3.digitaloceanspaces.com \
            --acl public-read

          echo ""
-          echo "=== ${{ matrix.architecture }} Sysroot uploaded ==="
-          echo "URL: https://eagle0-sysroot.sfo3.digitaloceanspaces.com/${{ inputs.version }}/${{ matrix.archive_name }}"
-          echo "SHA256: $(cat "tools/sysroot/output/${{ matrix.checksum_name }}")"
+          echo "=== AMD64 Sysroot uploaded ==="
+          echo "URL: https://eagle0-sysroot.sfo3.digitaloceanspaces.com/${{ inputs.version }}/ubuntu_noble_amd64_sysroot.tar.xz"
+          echo "SHA256: $(cat tools/sysroot/output/ubuntu_noble_amd64_sysroot.sha256)"
          echo ""
          echo "Update MODULE.bazel with:"
          echo "sysroot("
-          echo "    name = \"${{ matrix.module_name }}\","
-          echo "    sha256 = \"$(cat "tools/sysroot/output/${{ matrix.checksum_name }}")\","
-          echo "    urls = [\"https://eagle0-sysroot.sfo3.digitaloceanspaces.com/${{ inputs.version }}/${{ matrix.archive_name }}\"],"
+          echo "    name = \"linux_sysroot\","
+          echo "    sha256 = \"$(cat tools/sysroot/output/ubuntu_noble_amd64_sysroot.sha256)\","
+          echo "    urls = [\"https://eagle0-sysroot.sfo3.digitaloceanspaces.com/${{ inputs.version }}/ubuntu_noble_amd64_sysroot.tar.xz\"],"
+          echo ")"
+
+  build-sysroot-arm64:
+    if: ${{ inputs.architecture == 'arm64' || inputs.architecture == 'both' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+
+      - name: Set up QEMU for ARM64 emulation
+        uses: docker/setup-qemu-action@v4
+        with:
+          platforms: arm64
+
+      - name: Set up Docker Buildx
+        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@v7
+        with:
+          name: ubuntu-noble-sysroot-arm64
+          path: tools/sysroot/output/
+          retention-days: 1
+
+      - name: Install AWS CLI
+        run: |
+          if ! command -v aws &> /dev/null; then
+            curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+            unzip -q awscliv2.zip
+            sudo ./aws/install
+          fi
+
+      - name: Upload to DigitalOcean Spaces
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.SECRET_KEY }}
+        run: |
+          # Upload sysroot tarball to DO Spaces
+          aws s3 cp tools/sysroot/output/ubuntu_noble_arm64_sysroot.tar.xz \
+            s3://eagle0-sysroot/${{ inputs.version }}/ubuntu_noble_arm64_sysroot.tar.xz \
+            --endpoint-url https://sfo3.digitaloceanspaces.com \
+            --acl public-read
+
+          # Upload sha256 file
+          aws s3 cp tools/sysroot/output/ubuntu_noble_arm64_sysroot.sha256 \
+            s3://eagle0-sysroot/${{ inputs.version }}/ubuntu_noble_arm64_sysroot.sha256 \
+            --endpoint-url https://sfo3.digitaloceanspaces.com \
+            --acl public-read
+
+          echo ""
+          echo "=== ARM64 Sysroot uploaded ==="
+          echo "URL: https://eagle0-sysroot.sfo3.digitaloceanspaces.com/${{ inputs.version }}/ubuntu_noble_arm64_sysroot.tar.xz"
+          echo "SHA256: $(cat tools/sysroot/output/ubuntu_noble_arm64_sysroot.sha256)"
+          echo ""
+          echo "Update MODULE.bazel with:"
+          echo "sysroot("
+          echo "    name = \"linux_sysroot_arm64\","
+          echo "    sha256 = \"$(cat tools/sysroot/output/ubuntu_noble_arm64_sysroot.sha256)\","
+          echo "    urls = [\"https://eagle0-sysroot.sfo3.digitaloceanspaces.com/${{ inputs.version }}/ubuntu_noble_arm64_sysroot.tar.xz\"],"
          echo ")"
@@ -19,35 +19,7 @@ on:
      - 'src/main/resources/**'
      - 'ci/BUILD.bazel'
      - 'ci/github_actions/ensure_bazel_installed.sh'
-      - 'scripts/sync_bazel_xcode.sh'
-      - '.github/actions/setup-bazel/**'
      - 'MODULE.bazel'
-      - 'MODULE.bazel.lock'
-      - '.bazelrc'
-      - 'docker-compose.prod.yml'
-      - 'nginx/**'
-      - '.github/workflows/docker_build.yml'
-  pull_request:
-    paths:
-      # Note: Auth changes trigger auth_build.yml instead
-      # Note: Windows installer changes trigger installer_build.yml instead
-      - 'src/main/go/net/eagle0/admin_server/**'
-      - 'src/main/go/net/eagle0/common/**'
-      - 'src/main/go/net/eagle0/util/**'
-      - 'src/main/scala/**'
-      - 'src/main/protobuf/**'
-      - '!src/main/protobuf/net/eagle0/eagle/api/auth.proto'
-      - '!src/main/protobuf/net/eagle0/eagle/internal/auth_internal.proto'
-      - 'src/main/resources/**'
-      - 'ci/BUILD.bazel'
-      - 'ci/github_actions/ensure_bazel_installed.sh'
-      - 'ci/github_actions/fetch_lfs.sh'
-      - 'scripts/sync_bazel_xcode.sh'
-      - '.github/actions/setup-bazel/**'
-      - 'go.mod'
-      - 'go.sum'
-      - 'MODULE.bazel'
-      - 'MODULE.bazel.lock'
      - '.bazelrc'
      - 'docker-compose.prod.yml'
      - 'nginx/**'
@@ -64,8 +36,8 @@ on:
 # 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: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || 'deploy' }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+  group: docker-build-deploy
+  cancel-in-progress: false

 permissions:
  contents: read
@@ -76,15 +48,13 @@ jobs:
  # This uses 1 runner slot instead of 4, and Bazel parallelizes internally
  # NOTE: Must run on a runner with the bazel label to ensure consistent Bazel cache
  build-all:
-    runs-on: [self-hosted, bazel]
+    runs-on: [self-hosted, bazel, halfdan]
    outputs:
      eagle_image_tag: ${{ steps.push-images.outputs.eagle_image_tag }}
      admin_image_tag: ${{ steps.push-images.outputs.admin_image_tag }}
      jfr_sidecar_image_tag: ${{ steps.push-images.outputs.jfr_sidecar_image_tag }}
-      skip_build: ${{ steps.check-latest.outputs.skip }}
    steps:
      - name: Skip if superseded
-        if: github.event_name != 'pull_request'
        id: check-latest
        run: |
          # Check if there's a newer run of this workflow waiting in the queue.
@@ -125,11 +95,7 @@ jobs:

      - name: Ensure Bazel installed
        if: steps.check-latest.outputs.skip != 'true'
-        uses: ./.github/actions/setup-bazel
-
-      - name: Sync Bazel Xcode config
-        if: steps.check-latest.outputs.skip != 'true'
-        run: ./scripts/sync_bazel_xcode.sh
+        run: ./ci/github_actions/ensure_bazel_installed.sh

      - name: Fetch LFS files needed for admin server
        if: steps.check-latest.outputs.skip != 'true'
@@ -150,7 +116,7 @@ jobs:
          bazel build \
            --stamp \
            --platforms=//:linux_x86_64 \
-            --extra_toolchains=@llvm_toolchain_linux//:cc-toolchain-x86_64-linux \
+            --extra_toolchains=@llvm_toolchain_linux//:all \
            //ci:eagle_server_image \
            //ci:admin_server_image \
            //ci:jfr_sidecar_image \
@@ -175,7 +141,7 @@ jobs:
          echo "JFR Sidecar: $JFR_PATH"

      - name: Upload warmup binary
-        if: steps.check-latest.outputs.skip != 'true' && github.event_name != 'pull_request'
+        if: steps.check-latest.outputs.skip != 'true'
        uses: actions/upload-artifact@v7
        with:
          name: warmup-binary
@@ -195,7 +161,7 @@ jobs:

      - name: Push all images to DO registry
        id: push-images
-        if: steps.check-latest.outputs.skip != 'true' && (github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && github.event.inputs.push_images == 'true'))
+        if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && github.event.inputs.push_images == 'true')
        env:
          DOCKER_CONFIG: ${{ github.workspace }}/.docker
        run: |
@@ -261,9 +227,9 @@ jobs:
          echo "=== All images pushed successfully ==="

  deploy:
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, bazel, halfdan]
    needs: [build-all]
-    if: needs.build-all.outputs.skip_build != 'true' && (github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && github.event.inputs.push_images == 'true'))
+    if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && github.event.inputs.push_images == 'true')
    environment: production
    env:
      EAGLE_IMAGE: ${{ needs.build-all.outputs.eagle_image_tag }}
@@ -274,7 +240,6 @@ jobs:
      GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
      GPT_MODEL_NAME: ${{ secrets.GPT_MODEL_NAME }}
      EAGLE_ENABLE_S3: ${{ secrets.EAGLE_ENABLE_S3 }}
-      DO_SPACES_ENDPOINT: ${{ secrets.DO_SPACES_ENDPOINT }}
      DO_SPACES_ACCESS_KEY: ${{ secrets.DO_SPACES_ACCESS_KEY }}
      DO_SPACES_SECRET_KEY: ${{ secrets.DO_SPACES_SECRET_KEY }}
      # Admin server uses different credentials (for eagle0-assets bucket)
@@ -299,12 +264,6 @@ jobs:
      FASTMAIL_API_TOKEN: ${{ secrets.FASTMAIL_API_TOKEN }}
      FASTMAIL_FROM_EMAIL: ${{ secrets.FASTMAIL_FROM_EMAIL }}
      FASTMAIL_FROM_NAME: ${{ secrets.FASTMAIL_FROM_NAME }}
-      EAGLE_HISTORY_BACKEND: ${{ secrets.EAGLE_HISTORY_BACKEND }}
-      EAGLE_POSTGRES_HOST: ${{ secrets.EAGLE_POSTGRES_HOST }}
-      EAGLE_POSTGRES_PORT: ${{ secrets.EAGLE_POSTGRES_PORT }}
-      EAGLE_POSTGRES_DATABASE: ${{ secrets.EAGLE_POSTGRES_DATABASE }}
-      EAGLE_POSTGRES_USER: ${{ secrets.EAGLE_POSTGRES_USER }}
-      EAGLE_POSTGRES_PASSWORD: ${{ secrets.EAGLE_POSTGRES_PASSWORD }}
      DO_DROPLET_IP: ${{ secrets.DO_DROPLET_IP }}
      DO_REGISTRY_TOKEN: ${{ secrets.DO_REGISTRY_TOKEN }}
      NOTIFY_SECRET: ${{ secrets.EAGLE_NOTIFY_SECRET }}
@@ -401,10 +360,6 @@ jobs:
          validate_env "EAGLE_IMAGE" "${EAGLE_IMAGE}" "" || VALIDATION_FAILED=1
          validate_env "JWT_PRIVATE_KEY" "${JWT_PRIVATE_KEY}" "" || VALIDATION_FAILED=1
          validate_env "DO_REGISTRY_TOKEN" "${DO_REGISTRY_TOKEN}" "" || VALIDATION_FAILED=1
-          validate_env "EAGLE_POSTGRES_HOST" "${EAGLE_POSTGRES_HOST}" "" || VALIDATION_FAILED=1
-          validate_env "EAGLE_POSTGRES_DATABASE" "${EAGLE_POSTGRES_DATABASE}" "" || VALIDATION_FAILED=1
-          validate_env "EAGLE_POSTGRES_USER" "${EAGLE_POSTGRES_USER}" "" || VALIDATION_FAILED=1
-          validate_env "EAGLE_POSTGRES_PASSWORD" "${EAGLE_POSTGRES_PASSWORD}" "" || VALIDATION_FAILED=1

          if [ "\${VALIDATION_FAILED}" -eq 1 ]; then
              echo ""
@@ -452,12 +407,6 @@ jobs:
          export FASTMAIL_API_TOKEN="${FASTMAIL_API_TOKEN}"
          export FASTMAIL_FROM_EMAIL="${FASTMAIL_FROM_EMAIL}"
          export FASTMAIL_FROM_NAME="${FASTMAIL_FROM_NAME}"
-          export EAGLE_HISTORY_BACKEND="${EAGLE_HISTORY_BACKEND:-postgres}"
-          export EAGLE_POSTGRES_HOST="${EAGLE_POSTGRES_HOST}"
-          export EAGLE_POSTGRES_PORT="${EAGLE_POSTGRES_PORT}"
-          export EAGLE_POSTGRES_DATABASE="${EAGLE_POSTGRES_DATABASE}"
-          export EAGLE_POSTGRES_USER="${EAGLE_POSTGRES_USER}"
-          export EAGLE_POSTGRES_PASSWORD="${EAGLE_POSTGRES_PASSWORD}"
          export DO_REGISTRY_TOKEN="${DO_REGISTRY_TOKEN}"
          export NOTIFY_SECRET="${NOTIFY_SECRET}"
          export GITHUB_TOKEN="${GITHUB_TOKEN_FOR_ADMIN}"
@@ -567,7 +516,7 @@ jobs:

  cleanup:
    needs: [build-all, deploy]
-    if: always() && github.event_name != 'pull_request'
+    if: always()
    runs-on: ubuntu-latest
    steps:
      - name: Delete warmup-binary artifact
@@ -1,86 +0,0 @@
-name: Eagle0pedia Build
-
-on:
-  push:
-    branches: [ "main" ]
-    paths:
-      - 'docs/eagle0pedia/**'
-      - 'ci/github_actions/ensure_bazel_installed.sh'
-      - '.github/actions/setup-bazel/**'
-      - '.github/workflows/eagle0pedia_build.yml'
-      - 'MODULE.bazel'
-      - 'MODULE.bazel.lock'
-      - '.bazelrc'
-  pull_request:
-    paths:
-      - 'docs/eagle0pedia/**'
-      - 'ci/github_actions/ensure_bazel_installed.sh'
-      - '.github/actions/setup-bazel/**'
-      - '.github/workflows/eagle0pedia_build.yml'
-      - 'MODULE.bazel'
-      - 'MODULE.bazel.lock'
-      - '.bazelrc'
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
-
-jobs:
-  build:
-    runs-on: [self-hosted, bazel]
-    steps:
-      - name: Prepare workspace
-        run: |
-          chmod -R u+w eagle0pedia-dist 2>/dev/null || true
-          rm -rf eagle0pedia-dist
-
-      - name: Prepare non-LFS checkout
-        env:
-          GIT_CONFIG_GLOBAL: ${{ runner.temp }}/gitconfig-no-lfs
-          GIT_CONFIG_NOSYSTEM: "1"
-        run: |
-          git config --global --unset-all filter.lfs.process || true
-          git config --global filter.lfs.smudge "cat"
-          git config --global filter.lfs.clean "cat"
-          git config --global filter.lfs.required false
-          if [ -d ".git" ]; then
-            git config --local --unset-all filter.lfs.process || true
-            git config --local filter.lfs.smudge "cat"
-            git config --local filter.lfs.clean "cat"
-            git config --local filter.lfs.required false
-          fi
-          rm -f .git/hooks/post-checkout .git/hooks/post-merge .git/hooks/pre-push
-
-      - name: Checkout repository
-        uses: actions/checkout@v6
-        env:
-          GIT_CONFIG_GLOBAL: ${{ runner.temp }}/gitconfig-no-lfs
-          GIT_CONFIG_NOSYSTEM: "1"
-        with:
-          persist-credentials: false
-          lfs: false
-
-      - name: Setup Bazel
-        uses: ./.github/actions/setup-bazel
-
-      - name: Build Eagle0pedia
-        run: bazel build //docs/eagle0pedia:site
-
-      - name: Stage static site artifact
-        run: |
-          rm -rf eagle0pedia-dist
-          mkdir -p eagle0pedia-dist
-          cp -R bazel-bin/docs/eagle0pedia/dist/. eagle0pedia-dist/
-          chmod -R u+w eagle0pedia-dist
-
-      - name: Upload static site artifact
-        uses: actions/upload-artifact@v7
-        with:
-          name: eagle0pedia-dist
-          path: eagle0pedia-dist/
-          if-no-files-found: error
-          retention-days: 3
@@ -0,0 +1,54 @@
+name: Eagle Build
+
+on:
+  # Main pushes are covered by docker_build.yml which builds the same target
+  pull_request:
+    paths:
+      - 'src/main/scala/**'
+      - 'src/main/protobuf/net/eagle0/eagle/**'
+      - 'src/main/protobuf/net/eagle0/common/**'
+      - 'WORKSPACE'
+      - 'MODULE.bazel'
+      - 'BUILD.bazel'
+      - '.bazelrc'
+      - 'ci/github_actions/ensure_bazel_installed.sh'
+      - '.github/workflows/eagle_build.yml'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: [self-hosted, bazel]
+
+    steps:
+      - name: Ensure Git LFS available for checkout
+        run: |
+          COMMON_PATHS=(/opt/homebrew/bin /usr/local/bin)
+          for path in "${COMMON_PATHS[@]}"; do
+            if [ -d "$path" ]; then
+              echo "$path" >> "$GITHUB_PATH"
+              export PATH="$path:$PATH"
+            fi
+          done
+
+          if command -v git-lfs >/dev/null 2>&1; then
+            git-lfs version
+            exit 0
+          fi
+
+          brew install git-lfs
+          git-lfs version
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+          lfs: false
+      - name: Ensure Bazel installed
+        run: ./ci/github_actions/ensure_bazel_installed.sh
+      - name: Build Eagle server
+        run: bazel build //src/main/scala/net/eagle0/eagle:eagle_server
@@ -5,16 +5,12 @@ on:
    branches: [ "main" ]
    paths:
      - ".github/workflows/installer_build.yml"
-      - ".github/actions/setup-bazel/**"
      - "ci/github_actions/ensure_bazel_installed.sh"
-      - ".bazelrc"
      - "src/main/go/net/eagle0/clients/win/installer/**"
  pull_request:
    paths:
      - ".github/workflows/installer_build.yml"
-      - ".github/actions/setup-bazel/**"
      - "ci/github_actions/ensure_bazel_installed.sh"
-      - ".bazelrc"
      - "src/main/go/net/eagle0/clients/win/installer/**"
  workflow_dispatch:

@@ -50,8 +46,8 @@ jobs:
          lfs: false
          clean: false

-      - name: Setup Bazel
-        uses: ./.github/actions/setup-bazel
+      - name: Ensure Bazel installed
+        run: ./ci/github_actions/ensure_bazel_installed.sh

      - name: Build Go installer for Windows
        env:
@@ -13,7 +13,7 @@ on:

 permissions:
  contents: read
-  actions: write
+  actions: read

 env:
  # Runner-specific build directory to allow parallel builds on multiple runners
@@ -31,7 +31,7 @@ jobs:
    steps:
      - name: Check for relevant changes since last successful run
        id: check
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
        with:
          script: |
            if (context.eventName === 'workflow_dispatch') {
@@ -74,7 +74,6 @@ jobs:
              'ci/',                  // CI scripts & workflows
              '.github/workflows/ios_testflight.yml',
              'MODULE.bazel',
-              'MODULE.bazel.lock',
              '.bazelrc',
            ];

@@ -109,7 +108,7 @@ jobs:
  build-unity:
    needs: check-changes
    if: needs.check-changes.outputs.should_build == 'true'
-    runs-on: [self-hosted, macOS, testflight]
+    runs-on: [self-hosted, macOS, testflight, halfdan]

    steps:
      - name: Prune stale PR refs
@@ -166,23 +165,21 @@ jobs:
          ./ci/github_actions/build_unity_ios.sh "$EAGLE0_BUILD_DIR/eagle0iOS"

      - name: Upload Addressables to CDN
-        if: success() && github.event.inputs.skip_upload != 'true'
+        if: success()
        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.event.inputs.skip_upload != 'true'
+        if: success()
        env:
          DO_CDN_PAT: ${{ secrets.DO_CDN_PAT }}
        run: |
-          UNITY_VERSION=$(grep "m_EditorVersion:" src/main/csharp/net/eagle0/clients/unity/eagle0/ProjectSettings/ProjectVersion.txt | head -1 | sed 's/m_EditorVersion: //')
-          UNITY_MAJOR_MINOR=$(echo "$UNITY_VERSION" | sed -E 's/^([0-9]+)\.([0-9]+).*/\1.\2/')
          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/$UNITY_MAJOR_MINOR/*\"]}" \
+            -d '{"files": ["addressables/iOS/*"]}' \
            --fail || echo "Warning: CDN purge failed (non-fatal)"

      - name: Archive Build Log
@@ -212,7 +209,7 @@ jobs:

  archive-and-upload:
    needs: build-unity
-    runs-on: [self-hosted, macOS, testflight]
+    runs-on: [self-hosted, macOS, testflight, halfdan]

    steps:
      - name: Ensure Git LFS available for checkout
@@ -250,30 +247,6 @@ jobs:
          mkdir -p "$EAGLE0_BUILD_DIR"
          tar -xzf "$RUNNER_TEMP/eagle0-ios-project.tar.gz" -C "$EAGLE0_BUILD_DIR"

-      - name: Delete generated iOS project artifact
-        uses: actions/github-script@v9
-        with:
-          script: |
-            const artifactName = 'eagle0-ios-project-${{ github.run_id }}';
-            const artifacts = await github.paginate(github.rest.actions.listWorkflowRunArtifacts, {
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              run_id: context.runId,
-            });
-
-            const artifact = artifacts.find(a => a.name === artifactName);
-            if (artifact === undefined) {
-              console.log(`Artifact not found: ${artifactName}`);
-              return;
-            }
-
-            await github.rest.actions.deleteArtifact({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              artifact_id: artifact.id,
-            });
-            console.log(`Deleted artifact: ${artifactName} (${artifact.id})`);
-
      - name: Install Signing Certificate
        env:
          IOS_CERTIFICATE: ${{ secrets.IOS_CERTIFICATE }}
@@ -14,7 +14,6 @@ on:
      - "src/main/go/net/eagle0/build/mac_build_handler/**"
      - "scripts/build_protos.sh"
      - "scripts/build_mac_plugin.sh"
-      - "scripts/build_sparkle_plugin.sh"
      - "scripts/inject_sparkle.sh"
      - "scripts/codesign_mac_app.sh"
      - "scripts/notarize_submit.sh"
@@ -22,14 +21,10 @@ on:
      - "ci/github_actions/build_mac.sh"
      - "ci/github_actions/build_unity_mac.sh"
      - "ci/github_actions/ensure_bazel_installed.sh"
-      - ".github/actions/setup-bazel/**"
-      - "ci/github_actions/detect_addressables_changes.sh"
      - "ci/github_actions/upload_addressables.sh"
      - "ci/github_actions/ensure_unity_installed.sh"
      - "src/main/csharp/net/eagle0/clients/unity/eagle0/ProjectSettings/ProjectVersion.txt"
-      - ".bazelrc"
      - "ci/mac/**"
-      - "src/main/objc/net/eagle0/clients/unity/sparkle/**"
  pull_request:
    # On PRs, only build Mac when Mac-specific files change. Shared C#/proto
    # changes are covered by the Windows build — if it passes, Mac will too.
@@ -38,11 +33,6 @@ on:
      - "src/main/go/net/eagle0/build/mac_build_handler/**"
      - "scripts/build_mac_plugin.sh"
      - "scripts/build_sparkle_plugin.sh"
-      - "src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/Editor/BuildScript.cs"
-      - "src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/Eagle/SparkleInitializer.cs"
-      - "src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/Eagle/SparkleUpdater.cs"
-      - "src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/common/UpdateNotification/UpdateNotificationManager.cs"
-      - "src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/common/WindowFocusManager.cs"
      - "src/main/objc/net/eagle0/clients/unity/sparkle/**"
      - "scripts/inject_sparkle.sh"
      - "scripts/codesign_mac_app.sh"
@@ -50,13 +40,7 @@ on:
      - "scripts/notarize_wait.sh"
      - "ci/github_actions/build_mac.sh"
      - "ci/github_actions/build_unity_mac.sh"
-      - "ci/github_actions/ensure_unity_installed.sh"
      - "ci/github_actions/ensure_bazel_installed.sh"
-      - ".github/actions/setup-bazel/**"
-      - "ci/github_actions/detect_addressables_changes.sh"
-      - "src/main/csharp/net/eagle0/clients/unity/eagle0/ProjectSettings/ProjectVersion.txt"
-      - "src/main/csharp/net/eagle0/clients/unity/eagle0/ProjectSettings/ProjectSettings.asset"
-      - ".bazelrc"
      - "ci/mac/**"
  workflow_dispatch:
    inputs:
@@ -66,6 +50,10 @@ on:
        default: 'false'
        type: boolean

+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 permissions:
  contents: read
  actions: write  # Required to delete artifacts after deploy
@@ -77,14 +65,11 @@ env:
  KEYCHAIN_NAME: build-${{ github.run_id }}.keychain

 jobs:
-  build-mac:
-    runs-on: [self-hosted, macOS, unity-mac]
-    concurrency:
-      group: ${{ github.workflow }}-build-${{ github.head_ref || github.run_id }}
-      cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+  build-and-sign:
+    runs-on: [self-hosted, macOS, unity-mac, halfdan]
    outputs:
+      submission_id: ${{ steps.notarize-submit.outputs.submission_id }}
      should_deploy: ${{ steps.check-deploy.outputs.should_deploy }}
-      addressables_changed: ${{ steps.addressables.outputs.changed }}

    steps:
      - name: Prune stale PR refs
@@ -125,25 +110,11 @@ 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="$LIBRARY_DIR/Bee"
-          SHA_FILE="$LIBRARY_DIR/.last_built_sha"
+          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"
          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
@@ -165,34 +136,14 @@ jobs:
      - name: Ensure Unity version installed
        run: ./ci/github_actions/ensure_unity_installed.sh mac

-      - name: Ensure .NET SDK installed
-        uses: actions/setup-dotnet@v5
-        with:
-          dotnet-version: '8.0.x'
-
      - name: Ensure Bazel installed
-        uses: ./.github/actions/setup-bazel
+        run: ./ci/github_actions/ensure_bazel_installed.sh

      - name: Sync Bazel Xcode config
        run: ./scripts/sync_bazel_xcode.sh

-      - name: Detect Addressables changes
-        id: addressables
-        if: success()
-        shell: bash
-        run: |
-          set -euo pipefail
-
-          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
-            BASE_SHA="${{ github.event.pull_request.base.sha }}"
-          else
-            BASE_SHA="${{ github.event.before }}"
-          fi
-
-          ./ci/github_actions/detect_addressables_changes.sh "$BASE_SHA" "${{ github.sha }}"
-
      - name: Build Mac Unity
-        run: ./ci/github_actions/build_unity_mac.sh "${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC" "${{ steps.addressables.outputs.changed }}" "${{ steps.addressables.outputs.changed }}"
+        run: ./ci/github_actions/build_unity_mac.sh "${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC"

      - name: Save build SHA for Bee/ cache invalidation
        if: success()
@@ -200,11 +151,20 @@ jobs:
          mkdir -p src/main/csharp/net/eagle0/clients/unity/eagle0/Library
          git rev-parse HEAD > src/main/csharp/net/eagle0/clients/unity/eagle0/Library/.last_built_sha

-      - name: Save Unity version for Library/ cache invalidation
+      - 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 StandaloneOSX
+
+      - name: Inject Sparkle Framework
        if: success()
+        env:
+          SPARKLE_EDDSA_PUBLIC_KEY: ${{ secrets.SPARKLE_EDDSA_PUBLIC_KEY }}
        run: |
-          mkdir -p src/main/csharp/net/eagle0/clients/unity/eagle0/Library
-          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
+          chmod +x ./scripts/inject_sparkle.sh
+          ./scripts/inject_sparkle.sh "${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC/eagle0.app"

      - name: Check if should deploy
        id: check-deploy
@@ -219,146 +179,8 @@ jobs:
            echo "should_deploy=false" >> $GITHUB_OUTPUT
          fi

-      - name: Zip unsigned app for deploy
-        if: success() && steps.check-deploy.outputs.should_deploy == 'true'
-        run: |
-          cd ${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC
-          ditto -c -k --keepParent eagle0.app eagle0.app.zip
-
-      - name: Upload unsigned app
-        if: success() && steps.check-deploy.outputs.should_deploy == 'true'
-        uses: actions/upload-artifact@v7
-        with:
-          name: unsigned-mac-app-${{ github.run_id }}
-          path: ${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC/eagle0.app.zip
-          retention-days: 1
-
-      - name: Upload Mac Addressables for deploy
-        if: success() && steps.check-deploy.outputs.should_deploy == 'true' && steps.addressables.outputs.changed == 'true'
-        uses: actions/upload-artifact@v7
-        with:
-          name: mac-addressables-${{ github.run_id }}
-          path: src/main/csharp/net/eagle0/clients/unity/eagle0/ServerData/StandaloneOSX
-          if-no-files-found: ignore
-          retention-days: 1
-
-      - name: Archive Build Log
-        if: success() || failure()
-        uses: actions/upload-artifact@v7
-        with:
-          name: editor_mac.log
-          path: ${{ env.EAGLE0_BUILD_DIR }}/editor_mac.log
-          retention-days: 3
-      - name: Archive Addressables build reports
-        if: (success() || failure()) && steps.addressables.outputs.changed == 'true'
-        uses: actions/upload-artifact@v7
-        with:
-          name: mac-addressables-build-reports
-          path: src/main/csharp/net/eagle0/clients/unity/eagle0/Library/com.unity.addressables/BuildReports
-          if-no-files-found: ignore
-          retention-days: 3
-      - name: Cleanup build directory
-        if: always()
-        run: rm -rf "${{ env.EAGLE0_BUILD_DIR }}"
-
-  deploy-mac:
-    needs: build-mac
-    if: needs.build-mac.outputs.should_deploy == 'true'
-    runs-on: [self-hosted, macOS, notarize]
-    outputs:
-      deployed_version: ${{ steps.deploy-mac.outputs.deployed_version }}
-      deployed_unity_major_minor: ${{ steps.deploy-mac.outputs.deployed_unity_major_minor }}
-    concurrency:
-      group: mac-deploy-${{ github.ref }}
-      cancel-in-progress: false
-
-    steps:
-      - name: Ensure Git LFS available for checkout
-        run: |
-          COMMON_PATHS="/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
-          export PATH="${COMMON_PATHS}:${PATH}"
-          for path in /opt/homebrew/bin /usr/local/bin; do
-            if [ -d "$path" ]; then
-              echo "$path" >> "$GITHUB_PATH"
-            fi
-          done
-          if ! command -v git-lfs >/dev/null 2>&1; then
-            brew install git-lfs
-          fi
-          git-lfs --version
-
-      - uses: actions/checkout@v6
-        env:
-          GIT_LFS_SKIP_SMUDGE: 1
-        with:
-          persist-credentials: false
-          fetch-depth: 0  # For version numbering
-
-      - name: Check if run is still latest main
-        id: check-latest
-        run: |
-          if [[ "${{ github.event_name }}" == "push" && "${{ github.ref }}" == "refs/heads/main" ]]; then
-            LATEST_SHA=$(curl -fsSL \
-              -H "Authorization: Bearer ${{ github.token }}" \
-              -H "Accept: application/vnd.github+json" \
-              "https://api.github.com/repos/${{ github.repository }}/commits/main" \
-              | python3 -c 'import json, sys; print(json.load(sys.stdin)["sha"])')
-            if [[ "$LATEST_SHA" != "${{ github.sha }}" ]]; then
-              echo "Skipping deploy because ${{ github.sha }} is no longer latest main ($LATEST_SHA is latest)"
-              echo "should_deploy=false" >> "$GITHUB_OUTPUT"
-              exit 0
-            fi
-          fi
-          echo "should_deploy=true" >> "$GITHUB_OUTPUT"
-
-      - name: Clean download directory
-        if: steps.check-latest.outputs.should_deploy == 'true'
-        run: rm -rf ${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC
-
-      - name: Download unsigned app
-        if: steps.check-latest.outputs.should_deploy == 'true'
-        uses: actions/download-artifact@v8
-        with:
-          name: unsigned-mac-app-${{ github.run_id }}
-          path: ${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC
-
-      - name: Unzip unsigned app
-        if: steps.check-latest.outputs.should_deploy == 'true'
-        run: |
-          cd ${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC
-          ditto -x -k eagle0.app.zip .
-          rm eagle0.app.zip
-          ls -la ${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC/eagle0.app/
-
-      - name: Clean Addressables directory
-        if: steps.check-latest.outputs.should_deploy == 'true' && needs.build-mac.outputs.addressables_changed == 'true'
-        run: rm -rf src/main/csharp/net/eagle0/clients/unity/eagle0/ServerData/StandaloneOSX
-
-      - name: Download Mac Addressables
-        if: steps.check-latest.outputs.should_deploy == 'true' && needs.build-mac.outputs.addressables_changed == 'true'
-        uses: actions/download-artifact@v8
-        continue-on-error: true
-        with:
-          name: mac-addressables-${{ github.run_id }}
-          path: src/main/csharp/net/eagle0/clients/unity/eagle0/ServerData/StandaloneOSX
-
-      - name: Upload Addressables to CDN
-        if: steps.check-latest.outputs.should_deploy == 'true' && needs.build-mac.outputs.addressables_changed == 'true'
-        env:
-          ACCESS_KEY_ID: ${{ secrets.ACCESS_KEY_ID }}
-          SECRET_KEY: ${{ secrets.SECRET_KEY }}
-        run: ./ci/github_actions/upload_addressables.sh StandaloneOSX
-
-      - name: Inject Sparkle Framework
-        if: steps.check-latest.outputs.should_deploy == 'true'
-        env:
-          SPARKLE_EDDSA_PUBLIC_KEY: ${{ secrets.SPARKLE_EDDSA_PUBLIC_KEY }}
-        run: |
-          chmod +x ./scripts/inject_sparkle.sh
-          ./scripts/inject_sparkle.sh "${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC/eagle0.app"
-
      - name: Import Code Signing Certificate
-        if: steps.check-latest.outputs.should_deploy == 'true'
+        if: success() && steps.check-deploy.outputs.should_deploy == 'true'
        env:
          MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
          MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_CERTIFICATE_PWD }}
@@ -401,7 +223,7 @@ jobs:
          rm certificate.p12

      - name: Code Sign App
-        if: steps.check-latest.outputs.should_deploy == 'true'
+        if: success() && steps.check-deploy.outputs.should_deploy == 'true'
        env:
          SIGNING_IDENTITY: ${{ secrets.SIGNING_IDENTITY }}
        run: |
@@ -410,7 +232,7 @@ jobs:

      - name: Submit for Notarization
        id: notarize-submit
-        if: steps.check-latest.outputs.should_deploy == 'true'
+        if: success() && steps.check-deploy.outputs.should_deploy == 'true'
        env:
          APPLE_ID: ${{ secrets.APPLE_ID }}
          APP_SPECIFIC_PASSWORD: ${{ secrets.APP_SPECIFIC_PASSWORD }}
@@ -419,47 +241,156 @@ jobs:
          chmod +x ./scripts/notarize_submit.sh
          ./scripts/notarize_submit.sh "${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC/eagle0.app" >> $GITHUB_OUTPUT

+      - name: Cleanup Keychain
+        if: always()
+        run: |
+          security delete-keychain "$KEYCHAIN_NAME" 2>/dev/null || true
+
+      - name: Zip signed app for artifact
+        if: success() && steps.check-deploy.outputs.should_deploy == 'true'
+        run: |
+          cd ${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC
+          ditto -c -k --keepParent eagle0.app eagle0.app.zip
+
+      - name: Upload signed app
+        if: success() && steps.check-deploy.outputs.should_deploy == 'true'
+        uses: actions/upload-artifact@v7
+        with:
+          name: signed-mac-app-${{ github.run_id }}
+          path: ${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC/eagle0.app.zip
+          retention-days: 1
+
+      - name: Archive Build Log
+        if: success() || failure()
+        uses: actions/upload-artifact@v7
+        with:
+          name: editor_mac.log
+          path: ${{ env.EAGLE0_BUILD_DIR }}/editor_mac.log
+          retention-days: 3
+      - name: Cleanup build directory
+        if: always()
+        run: rm -rf "${{ env.EAGLE0_BUILD_DIR }}"
+
+  wait-notarization:
+    needs: build-and-sign
+    if: needs.build-and-sign.outputs.should_deploy == 'true'
+    runs-on: [self-hosted, macOS, notarize, halfdan]
+
+    steps:
+      - name: Ensure Git LFS available for checkout
+        run: |
+          COMMON_PATHS="/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+          export PATH="${COMMON_PATHS}:${PATH}"
+          for path in /opt/homebrew/bin /usr/local/bin; do
+            if [ -d "$path" ]; then
+              echo "$path" >> "$GITHUB_PATH"
+            fi
+          done
+          if ! command -v git-lfs >/dev/null 2>&1; then
+            brew install git-lfs
+          fi
+          git-lfs --version
+
+      - uses: actions/checkout@v6
+        env:
+          GIT_LFS_SKIP_SMUDGE: 1
+        with:
+          persist-credentials: false
+          sparse-checkout: scripts
+
+      - name: Clean download directory
+        run: rm -rf ${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC
+
+      - name: Download signed app
+        uses: actions/download-artifact@v8
+        with:
+          name: signed-mac-app-${{ github.run_id }}
+          path: ${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC
+
+      - name: Unzip signed app
+        run: |
+          cd ${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC
+          ditto -x -k eagle0.app.zip .
+          rm eagle0.app.zip
+          ls -la ${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC/eagle0.app/
+
      - name: Wait for Notarization and Staple
-        if: steps.check-latest.outputs.should_deploy == 'true'
        env:
          APPLE_ID: ${{ secrets.APPLE_ID }}
          APP_SPECIFIC_PASSWORD: ${{ secrets.APP_SPECIFIC_PASSWORD }}
          TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
        run: |
          chmod +x ./scripts/notarize_wait.sh
-          ./scripts/notarize_wait.sh "${{ steps.notarize-submit.outputs.submission_id }}" "${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC/eagle0.app"
-
-      - name: Cleanup Keychain
-        if: always()
-        run: |
-          security delete-keychain "$KEYCHAIN_NAME" 2>/dev/null || true
+          ./scripts/notarize_wait.sh "${{ needs.build-and-sign.outputs.submission_id }}" "${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC/eagle0.app"

      - name: Zip notarized app for artifact
-        if: steps.check-latest.outputs.should_deploy == 'true'
        run: |
          cd ${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC
          rm -f eagle0.app.zip
          ditto -c -k --keepParent eagle0.app eagle0.app.zip

      - name: Upload notarized app
-        if: steps.check-latest.outputs.should_deploy == 'true'
        uses: actions/upload-artifact@v7
        with:
          name: notarized-mac-app-${{ github.run_id }}
          path: ${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC/eagle0.app.zip
          retention-days: 1
+      - name: Cleanup build directory
+        if: always()
+        run: rm -rf "${{ env.EAGLE0_BUILD_DIR }}"
+
+  deploy:
+    needs: [build-and-sign, wait-notarization]
+    if: needs.build-and-sign.outputs.should_deploy == 'true'
+    runs-on: [self-hosted, macOS, notarize, halfdan]
+    outputs:
+      deployed_version: ${{ steps.deploy-mac.outputs.deployed_version }}
+
+    steps:
+      - name: Ensure Git LFS available for checkout
+        run: |
+          COMMON_PATHS="/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+          export PATH="${COMMON_PATHS}:${PATH}"
+          for path in /opt/homebrew/bin /usr/local/bin; do
+            if [ -d "$path" ]; then
+              echo "$path" >> "$GITHUB_PATH"
+            fi
+          done
+          if ! command -v git-lfs >/dev/null 2>&1; then
+            brew install git-lfs
+          fi
+          git-lfs --version
+
+      - uses: actions/checkout@v6
+        env:
+          GIT_LFS_SKIP_SMUDGE: 1
+        with:
+          persist-credentials: false
+          fetch-depth: 0  # For version numbering
+
+      - name: Clean download directory
+        run: rm -rf ${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC
+
+      - name: Download notarized app
+        uses: actions/download-artifact@v8
+        with:
+          name: notarized-mac-app-${{ github.run_id }}
+          path: ${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC
+
+      - name: Unzip notarized app
+        run: |
+          cd ${{ env.EAGLE0_BUILD_DIR }}/eagle0MAC
+          ditto -x -k eagle0.app.zip .
+          rm eagle0.app.zip

      - name: Ensure Bazel installed
-        if: steps.check-latest.outputs.should_deploy == 'true'
-        uses: ./.github/actions/setup-bazel
+        run: ./ci/github_actions/ensure_bazel_installed.sh

      - name: Sync Bazel Xcode config
-        if: steps.check-latest.outputs.should_deploy == 'true'
        run: ./scripts/sync_bazel_xcode.sh

      - name: Deploy Mac Build
        id: deploy-mac
-        if: steps.check-latest.outputs.should_deploy == 'true'
        env:
          ACCESS_KEY_ID: ${{ secrets.ACCESS_KEY_ID }}
          SECRET_KEY: ${{ secrets.SECRET_KEY }}
@@ -470,13 +401,8 @@ jobs:
          echo "$SPARKLE_EDDSA_PRIVATE_KEY" > "$SPARKLE_PRIVATE_KEY_PATH"
          chmod 600 "$SPARKLE_PRIVATE_KEY_PATH"

-          # Install dmgbuild in an isolated venv. Homebrew Python rejects system
-          # installs under PEP 668, and mac_build_handler shells out to dmgbuild.
-          DMGBUILD_VENV="${{ env.EAGLE0_BUILD_DIR }}/dmgbuild-venv"
-          python3 -m venv "$DMGBUILD_VENV"
-          "$DMGBUILD_VENV/bin/python" -m pip install --upgrade pip
-          "$DMGBUILD_VENV/bin/python" -m pip install dmgbuild
-          export PATH="$DMGBUILD_VENV/bin:$PATH"
+          # Install dmgbuild (creates .DS_Store programmatically, no AppleScript needed)
+          pip3 install dmgbuild

          # Background image for styled DMG
          BACKGROUND_PATH="$(pwd)/ci/mac/dmg/background.png"
@@ -496,9 +422,6 @@ jobs:
          rm "$SPARKLE_PRIVATE_KEY_PATH"

          echo "deployed_version=$VERSION" >> $GITHUB_OUTPUT
-          UNITY_VERSION=$(grep "m_EditorVersion:" src/main/csharp/net/eagle0/clients/unity/eagle0/ProjectSettings/ProjectVersion.txt | head -1 | sed 's/m_EditorVersion: //')
-          UNITY_MAJOR_MINOR=$(echo "$UNITY_VERSION" | sed -E 's/^([0-9]+)\.([0-9]+).*/\1.\2/')
-          echo "deployed_unity_major_minor=$UNITY_MAJOR_MINOR" >> $GITHUB_OUTPUT

      # Artifact cleanup is handled by the cleanup job on ubuntu-latest
      - name: Cleanup build directory
@@ -506,8 +429,8 @@ jobs:
        run: rm -rf "${{ env.EAGLE0_BUILD_DIR }}"

  notify-mac:
-    needs: deploy-mac
-    if: needs.deploy-mac.outputs.deployed_version != ''
+    needs: deploy
+    if: needs.deploy.outputs.deployed_version != ''
    runs-on: ubuntu-latest
    steps:
      - name: Purge CDN cache and notify clients
@@ -519,16 +442,16 @@ jobs:
          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": ["mac/*", "addressables/StandaloneOSX/${{ needs.deploy-mac.outputs.deployed_unity_major_minor }}/*"]}' \
+            -d '{"files": ["mac/*", "addressables/StandaloneOSX/*"]}' \
            --fail || echo "Warning: CDN purge failed (non-fatal)"

-          curl -X POST "https://admin.eagle0.net/notify-update?platform=mac&version=${{ needs.deploy-mac.outputs.deployed_version }}&required=false" \
+          curl -X POST "https://admin.eagle0.net/notify-update?platform=mac&version=${{ needs.deploy.outputs.deployed_version }}&required=false" \
            -H "X-Notify-Secret: $NOTIFY_SECRET" \
            --fail --silent --show-error || echo "Warning: Failed to notify clients (non-fatal)"

  # Cleanup job runs regardless of success/failure to prevent artifact accumulation
  cleanup:
-    needs: [build-mac, deploy-mac, notify-mac]
+    needs: [build-and-sign, wait-notarization, deploy, notify-mac]
    if: always()
    runs-on: ubuntu-latest

@@ -538,7 +461,7 @@ jobs:
          GH_TOKEN: ${{ github.token }}
        run: |
          # Delete this run's artifacts (names include run ID to avoid conflicts)
-          for artifact_name in unsigned-mac-app-${{ github.run_id }} notarized-mac-app-${{ github.run_id }} mac-addressables-${{ github.run_id }}; do
+          for artifact_name in signed-mac-app-${{ github.run_id }} notarized-mac-app-${{ github.run_id }}; do
            echo "Deleting artifact: $artifact_name"
            artifact_id=$(gh api "repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/artifacts" \
              -q ".artifacts[] | select(.name == \"$artifact_name\") | .id")
@@ -0,0 +1,92 @@
+name: Cleanup Old Container Images
+
+on:
+  schedule:
+    # Run daily at 3am UTC
+    - cron: '0 3 * * *'
+  workflow_dispatch:
+    inputs:
+      dry_run:
+        description: 'Dry run (show what would be deleted without deleting)'
+        required: true
+        default: 'true'
+        type: boolean
+
+permissions:
+  contents: read
+
+jobs:
+  cleanup:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install doctl
+        uses: digitalocean/action-doctl@v2
+        with:
+          token: ${{ secrets.DO_REGISTRY_TOKEN }}
+
+      - name: Cleanup old images
+        env:
+          DRY_RUN: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.dry_run == 'true' }}
+        run: |
+          set -e
+
+          RETENTION_DAYS=5
+          CUTOFF_DATE=$(date -d "-${RETENTION_DAYS} days" +%s)
+          REGISTRY="eagle0"
+
+          echo "Cleaning up images older than ${RETENTION_DAYS} days"
+          echo "Cutoff date: $(date -d "@${CUTOFF_DATE}" -Iseconds)"
+          echo "Dry run: ${DRY_RUN}"
+          echo ""
+
+          # List of repositories to clean
+          # Use tail to skip header row in case --no-header doesn't work
+          REPOS=$(doctl registry repository list-v2 --format Name --no-header | grep -v '^Name$' | grep -v '^$')
+
+          for REPO in $REPOS; do
+            echo "=== Processing repository: ${REPO} ==="
+
+            # Get all manifests with their tags and dates using JSON output for reliable parsing
+            MANIFESTS_JSON=$(doctl registry repository list-manifests "${REPO}" --output json 2>/dev/null || echo "[]")
+
+            if [ "$MANIFESTS_JSON" = "[]" ] || [ -z "$MANIFESTS_JSON" ]; then
+              echo "  No manifests found"
+              continue
+            fi
+
+            # Parse JSON and process each manifest
+            echo "$MANIFESTS_JSON" | jq -r '.[] | "\(.digest) \(.updated_at) \(.tags // [] | join(","))"' | while read -r DIGEST UPDATED_AT TAGS; do
+              # Skip if no digest or if it doesn't look like a valid digest (sha256:...)
+              if [ -z "$DIGEST" ] || ! echo "$DIGEST" | grep -q '^sha256:'; then
+                continue
+              fi
+
+              # Parse the date (ISO 8601 format from JSON)
+              MANIFEST_DATE=$(date -d "$UPDATED_AT" +%s 2>/dev/null || echo "0")
+
+              # Skip protected tags (latest, arm64-latest)
+              if echo ",$TAGS," | grep -qE ',(latest|arm64-latest),'; then
+                echo "  KEEP: ${DIGEST:0:20}... (protected tag: $TAGS)"
+                continue
+              fi
+
+              # Check if older than cutoff
+              if [ "$MANIFEST_DATE" -lt "$CUTOFF_DATE" ]; then
+                echo "  DELETE: ${DIGEST:0:20}... (updated: $UPDATED_AT, tags: $TAGS)"
+                if [ "$DRY_RUN" != "true" ]; then
+                  doctl registry repository delete-manifest "${REPO}" "$DIGEST" --force
+                fi
+              else
+                echo "  KEEP: ${DIGEST:0:20}... (updated: $UPDATED_AT, tags: $TAGS)"
+              fi
+            done
+
+            echo ""
+          done
+
+      - name: Run garbage collection
+        if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.event.inputs.dry_run == 'false')
+        run: |
+          echo "Starting garbage collection..."
+          doctl registry garbage-collection start --force
+          echo "Garbage collection started. It may take a few minutes to complete."
@@ -1,219 +0,0 @@
-name: Renovate Dependency Artifacts
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize, ready_for_review]
-    paths:
-      - 'MODULE.bazel'
-      - 'MODULE.bazel.lock'
-      - 'maven_install.json'
-      - 'renovate.json'
-      - 'ci/github_actions/ensure_bazel_installed.sh'
-      - '.github/actions/setup-bazel/**'
-      - '.github/workflows/renovate_dependency_artifacts.yml'
-
-  pull_request_target:
-    types: [opened, reopened, synchronize, ready_for_review]
-    paths:
-      - 'MODULE.bazel'
-      - 'MODULE.bazel.lock'
-      - 'maven_install.json'
-      - 'go.mod'
-      - 'go.sum'
-      - 'renovate.json'
-      - 'ci/github_actions/ensure_bazel_installed.sh'
-      - '.github/actions/setup-bazel/**'
-      - '.github/workflows/renovate_dependency_artifacts.yml'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.head.ref }}
-  cancel-in-progress: true
-
-permissions:
-  contents: write
-  pull-requests: read
-
-jobs:
-  changes:
-    runs-on: ubuntu-latest
-    outputs:
-      bazel: ${{ steps.changed-files.outputs.bazel }}
-      go: ${{ steps.changed-files.outputs.go }}
-      update_matrix: ${{ steps.changed-files.outputs.update_matrix }}
-    steps:
-      - name: Detect changed dependency files
-        id: changed-files
-        uses: actions/github-script@v9
-        with:
-          script: |
-            const files = await github.paginate(
-              github.rest.pulls.listFiles,
-              {
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                pull_number: context.payload.pull_request.number,
-                per_page: 100,
-              },
-            );
-
-            const changed = files.map((file) => file.filename);
-            const bazelPatterns = [
-              /^MODULE\.bazel$/,
-              /^MODULE\.bazel\.lock$/,
-              /^maven_install\.json$/,
-              /^renovate\.json$/,
-              /^ci\/github_actions\/ensure_bazel_installed\.sh$/,
-              /^\.github\/actions\/setup-bazel\//,
-              /^\.github\/workflows\/renovate_dependency_artifacts\.yml$/,
-            ];
-            const goPatterns = [
-              /^go\.mod$/,
-              /^go\.sum$/,
-              /^renovate\.json$/,
-              /^\.github\/workflows\/renovate_dependency_artifacts\.yml$/,
-            ];
-
-            core.setOutput(
-              'bazel',
-              changed.some((file) => bazelPatterns.some((pattern) => pattern.test(file))),
-            );
-            core.setOutput(
-              'go',
-              changed.some((file) => goPatterns.some((pattern) => pattern.test(file))),
-            );
-
-            const include = [];
-            if (changed.some((file) => bazelPatterns.some((pattern) => pattern.test(file)))) {
-              include.push({
-                artifact: 'bazel',
-                name: 'Bazel lockfiles',
-                changed_files: 'MODULE.bazel.lock maven_install.json',
-                commit_message: 'Update generated dependency lockfiles',
-              });
-            }
-            if (changed.some((file) => goPatterns.some((pattern) => pattern.test(file)))) {
-              include.push({
-                artifact: 'go',
-                name: 'Go artifacts',
-                changed_files: 'go.sum',
-                commit_message: 'Update generated Go artifacts',
-              });
-            }
-            core.setOutput('update_matrix', JSON.stringify({include}));
-
-  check-lockfile:
-    if: >-
-      github.event_name == 'pull_request' &&
-      github.event.pull_request.user.login != 'renovate[bot]'
-    runs-on: [self-hosted, bazel]
-    permissions:
-      contents: read
-
-    steps:
-      - name: Checkout PR
-        uses: actions/checkout@v6
-        with:
-          lfs: false
-
-      - name: Ensure Bazel installed
-        uses: ./.github/actions/setup-bazel
-
-      - name: Update Maven lockfile
-        env:
-          REPIN: "1"
-        run: bazel run @maven//:pin
-
-      - name: Refresh Bazel lockfile
-        run: bazel build --nobuild //src/main/scala/net/eagle0/eagle:eagle_server //src/main/cpp/net/eagle0/shardok:shardok-server
-
-      - name: Verify generated lockfiles are current
-        run: |
-          if git diff --quiet -- MODULE.bazel.lock maven_install.json; then
-            echo "Generated dependency lockfiles are current"
-            exit 0
-          fi
-
-          echo "Generated dependency lockfiles are stale. Run the lockfile update commands and commit the result:"
-          echo "  REPIN=1 bazel run @maven//:pin"
-          echo "  bazel build --nobuild //src/main/scala/net/eagle0/eagle:eagle_server //src/main/cpp/net/eagle0/shardok:shardok-server"
-          git diff -- MODULE.bazel.lock maven_install.json
-          exit 1
-
-  update-artifacts:
-    name: Update ${{ matrix.name }}
-    needs: changes
-    if: >-
-      github.event_name == 'pull_request_target' &&
-      github.event.pull_request.user.login == 'renovate[bot]' &&
-      github.event.pull_request.head.repo.full_name == github.repository &&
-      startsWith(github.event.pull_request.head.ref, 'renovate/') &&
-      needs.changes.outputs.update_matrix != '{"include":[]}'
-    runs-on: [self-hosted, bazel]
-    strategy:
-      fail-fast: false
-      matrix: ${{ fromJSON(needs.changes.outputs.update_matrix) }}
-
-    steps:
-      - name: Ensure Git LFS available for checkout
-        run: |
-          COMMON_PATHS=(/opt/homebrew/bin /usr/local/bin)
-          for path in "${COMMON_PATHS[@]}"; do
-            if [ -d "$path" ]; then
-              echo "$path" >> "$GITHUB_PATH"
-              export PATH="$path:$PATH"
-            fi
-          done
-
-          if command -v git-lfs >/dev/null 2>&1; then
-            git-lfs version
-            exit 0
-          fi
-
-          brew install git-lfs
-          git-lfs version
-
-      - name: Checkout Renovate branch
-        uses: actions/checkout@v6
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-          token: ${{ secrets.RENOVATE_LOCKFILE_TOKEN || github.token }}
-          lfs: false
-
-      - name: Ensure Bazel installed
-        if: matrix.artifact == 'bazel'
-        uses: ./.github/actions/setup-bazel
-
-      - name: Update Maven lockfile
-        if: matrix.artifact == 'bazel'
-        env:
-          REPIN: "1"
-        run: bazel run @maven//:pin
-
-      - name: Refresh Bazel lockfile
-        if: matrix.artifact == 'bazel'
-        run: bazel build --nobuild //src/main/scala/net/eagle0/eagle:eagle_server //src/main/cpp/net/eagle0/shardok:shardok-server
-
-      - name: Set up Go
-        if: matrix.artifact == 'go'
-        uses: actions/setup-go@v6
-        with:
-          go-version-file: go.mod
-          cache: false
-
-      - name: Update Go module sums
-        if: matrix.artifact == 'go'
-        run: go mod download all
-
-      - name: Commit generated artifact updates
-        run: |
-          if git diff --quiet -- ${{ matrix.changed_files }}; then
-            echo "${{ matrix.name }} are already up to date"
-            exit 0
-          fi
-
-          git config user.name "github-actions[bot]"
-          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git add ${{ matrix.changed_files }}
-          git commit -m "${{ matrix.commit_message }}"
-          git push origin "HEAD:${{ github.event.pull_request.head.ref }}"
@@ -1,189 +0,0 @@
-name: Repository Cleanup
-
-on:
-  schedule:
-    # Registry cleanup: run daily at 03:00 UTC
-    - cron: '0 3 * * *'
-    # Artifact cleanup and storage check: run every 6 hours
-    - cron: '0 */6 * * *'
-  workflow_dispatch:
-    inputs:
-      target:
-        description: 'Cleanup target'
-        required: true
-        default: 'all'
-        type: choice
-        options:
-          - all
-          - artifacts
-          - registry
-      registry_dry_run:
-        description: 'Dry run registry cleanup'
-        required: true
-        default: 'true'
-        type: boolean
-
-permissions:
-  contents: read
-  actions: write
-
-jobs:
-  cleanup-and-check-artifacts:
-    if: >-
-      github.event_name == 'workflow_dispatch' &&
-      (github.event.inputs.target == 'all' || github.event.inputs.target == 'artifacts') ||
-      github.event_name == 'schedule' &&
-      github.event.schedule == '0 */6 * * *'
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Delete expired artifacts and 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\(.expired)\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 expired artifacts and artifacts created before $cutoff"
-
-          deleted=0
-          while IFS=$'\t' read -r id created_at expired name; do
-            if [[ "$expired" == "true" || "$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 artifacts out of $total total."
-          rm -f /tmp/all_artifacts.txt
-
-      - name: Check artifact storage size
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          # Calculate active artifact storage. The artifacts API can list expired
-          # artifacts until they are explicitly deleted, so do not count them.
-          total_bytes=$(gh api "repos/${{ github.repository }}/actions/artifacts" \
-            --paginate -q '.artifacts[] | select(.expired == false) | .size_in_bytes' | awk '{sum+=$1} END {print sum}')
-
-          total_mb=$(( ${total_bytes:-0} / 1024 / 1024 ))
-          echo "Total artifact storage: ${total_mb} MB"
-
-          # Fail if over 500MB
-          if [ "$total_mb" -gt 500 ]; then
-            echo "::error::Artifact storage is ${total_mb} MB, which exceeds the 500 MB threshold!"
-            echo ""
-            echo "Largest artifacts:"
-            # Save to temp file to avoid SIGPIPE/broken pipe errors with head
-            gh api "repos/${{ github.repository }}/actions/artifacts" \
-              --paginate -q '.artifacts[] | select(.expired == false) | "\(.size_in_bytes)\t\(.name)\t\(.created_at)"' > /tmp/artifacts.txt
-            sort -rn /tmp/artifacts.txt | head -20 | \
-              awk -F'\t' '{printf "%d MB\t%s\t%s\n", $1/1024/1024, $2, $3}'
-            rm -f /tmp/artifacts.txt
-            exit 1
-          fi
-
-          echo "Storage is within acceptable limits."
-
-  cleanup-registry:
-    if: >-
-      github.event_name == 'workflow_dispatch' &&
-      (github.event.inputs.target == 'all' || github.event.inputs.target == 'registry') ||
-      github.event_name == 'schedule' &&
-      github.event.schedule == '0 3 * * *'
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Install doctl
-        uses: digitalocean/action-doctl@v2
-        with:
-          token: ${{ secrets.DO_REGISTRY_TOKEN }}
-
-      - name: Cleanup old images
-        env:
-          DRY_RUN: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.registry_dry_run == 'true' }}
-        run: |
-          set -e
-
-          RETENTION_DAYS=5
-          CUTOFF_DATE=$(date -d "-${RETENTION_DAYS} days" +%s)
-          REGISTRY="eagle0"
-
-          echo "Cleaning up images older than ${RETENTION_DAYS} days"
-          echo "Cutoff date: $(date -d "@${CUTOFF_DATE}" -Iseconds)"
-          echo "Dry run: ${DRY_RUN}"
-          echo ""
-
-          # List repositories via JSON. Text output can wrap table rows and make
-          # headers/tags/digests look like repository names.
-          REPOS=$(doctl registry repository list-v2 "${REGISTRY}" --output json | jq -r '.[] | .name // .Name // empty')
-
-          for REPO in $REPOS; do
-            echo "=== Processing repository: ${REPO} ==="
-
-            # Get all manifests with their tags and dates using JSON output for reliable parsing
-            MANIFESTS_JSON=$(doctl registry repository list-manifests "${REPO}" --output json 2>/dev/null || echo "[]")
-
-            if [ "$MANIFESTS_JSON" = "[]" ] || [ -z "$MANIFESTS_JSON" ]; then
-              echo "  No manifests found"
-              continue
-            fi
-
-            # Parse JSON and process each manifest
-            echo "$MANIFESTS_JSON" | jq -r '.[] | "\(.digest) \(.updated_at) \(.tags // [] | join(","))"' | while read -r DIGEST UPDATED_AT TAGS; do
-              # Skip if no digest or if it doesn't look like a valid digest (sha256:...)
-              if [ -z "$DIGEST" ] || ! echo "$DIGEST" | grep -q '^sha256:'; then
-                continue
-              fi
-
-              # Parse the date (ISO 8601 format from JSON)
-              MANIFEST_DATE=$(date -d "$UPDATED_AT" +%s 2>/dev/null || echo "0")
-
-              # Skip protected tags (latest, arm64-latest)
-              if echo ",$TAGS," | grep -qE ',(latest|arm64-latest),'; then
-                echo "  KEEP: ${DIGEST:0:20}... (protected tag: $TAGS)"
-                continue
-              fi
-
-              # Check if older than cutoff
-              if [ "$MANIFEST_DATE" -lt "$CUTOFF_DATE" ]; then
-                echo "  DELETE: ${DIGEST:0:20}... (updated: $UPDATED_AT, tags: $TAGS)"
-                if [ "$DRY_RUN" != "true" ]; then
-                  doctl registry repository delete-manifest "${REPO}" "$DIGEST" --force
-                fi
-              else
-                echo "  KEEP: ${DIGEST:0:20}... (updated: $UPDATED_AT, tags: $TAGS)"
-              fi
-            done
-
-            echo ""
-          done
-
-      - name: Run garbage collection
-        if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.event.inputs.registry_dry_run == 'false')
-        run: |
-          echo "Starting garbage collection..."
-          set +e
-          GC_OUTPUT=$(doctl registry garbage-collection start --force 2>&1)
-          GC_STATUS=$?
-          set -e
-
-          echo "$GC_OUTPUT"
-          if [ "$GC_STATUS" -eq 0 ]; then
-            echo "Garbage collection started. It may take a few minutes to complete."
-            exit 0
-          fi
-
-          if echo "$GC_OUTPUT" | grep -q "automated garbage collection is enabled"; then
-            echo "Automated garbage collection is enabled for this registry; skipping manual garbage collection."
-            exit 0
-          fi
-
-          exit "$GC_STATUS"
@@ -0,0 +1,86 @@
+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: [self-hosted, bazel, halfdan]
+
+    steps:
+      - name: Ensure AWS CLI is available
+        run: |
+          if ! command -v aws &> /dev/null; then
+            brew install awscli
+          fi
+
+      - name: Delete old archived game folders
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.DO_SPACES_ACCESS_KEY }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.DO_SPACES_SECRET_KEY }}
+        run: |
+          set -euo pipefail
+
+          S3_ENDPOINT="https://sfo3.digitaloceanspaces.com"
+          BUCKET="s3://eagle0/eagle/archived/"
+
+          # macOS date syntax
+          CUTOFF=$(date -v-1m +%s)
+          DELETED=0
+          SKIPPED=0
+          NO_DIR_FILE=0
+
+          echo "Cutoff date: $(date -r ${CUTOFF} '+%Y-%m-%dT%H:%M:%S')"
+          echo ""
+
+          FOLDERS=$(aws s3 ls "$BUCKET" --endpoint-url "$S3_ENDPOINT" \
+            | awk '/PRE/{gsub(/\/$/,"",$2); print $2}')
+
+          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=$(aws s3 ls "${BUCKET}${game_id}/directory.e0i" \
+              --endpoint-url "$S3_ENDPOINT" 2>/dev/null || true)
+
+            if [ -z "$DIR_INFO" ]; then
+              echo "[$CURRENT/$TOTAL] DELETE $game_id (no directory.e0i)"
+              aws s3 rm --recursive "${BUCKET}${game_id}/" \
+                --endpoint-url "$S3_ENDPOINT" > /dev/null 2>&1
+              DELETED=$((DELETED + 1))
+              NO_DIR_FILE=$((NO_DIR_FILE + 1))
+              continue
+            fi
+
+            FILE_DATE=$(echo "$DIR_INFO" | awk '{print $1 " " $2}')
+            FILE_EPOCH=$(date -j -f '%Y-%m-%d %H:%M:%S' "$FILE_DATE" +%s 2>/dev/null || echo "0")
+
+            if [ "$FILE_EPOCH" -lt "$CUTOFF" ]; then
+              echo "[$CURRENT/$TOTAL] DELETE $game_id (directory.e0i from $FILE_DATE)"
+              aws s3 rm --recursive "${BUCKET}${game_id}/" \
+                --endpoint-url "$S3_ENDPOINT" > /dev/null 2>&1
+              DELETED=$((DELETED + 1))
+            else
+              echo "[$CURRENT/$TOTAL] KEEP $game_id (directory.e0i from $FILE_DATE)"
+              SKIPPED=$((SKIPPED + 1))
+            fi
+          done
+
+          echo ""
+          echo "=== Summary ==="
+          echo "Total folders: $TOTAL"
+          echo "Deleted: $DELETED"
+          echo "Kept (recent): $SKIPPED"
@@ -1,153 +0,0 @@
-name: Server Build
-
-on:
-  # Main pushes are covered by deploy workflows that build these targets.
-  pull_request:
-    paths:
-      - 'src/main/scala/**'
-      - 'src/main/cpp/**'
-      - 'src/main/protobuf/net/eagle0/eagle/**'
-      - 'src/main/protobuf/net/eagle0/shardok/**'
-      - 'src/main/protobuf/net/eagle0/common/**'
-      - 'src/main/go/net/eagle0/build/**'
-      - 'go.mod'
-      - 'go.sum'
-      - 'WORKSPACE'
-      - 'MODULE.bazel'
-      - 'MODULE.bazel.lock'
-      - 'BUILD.bazel'
-      - '.bazelrc'
-      - 'ci/github_actions/ensure_bazel_installed.sh'
-      - 'scripts/build_eagle_ci.sh'
-      - 'scripts/build_shardok_ci.sh'
-      - 'scripts/build_shardok_linux_arm64_ci.sh'
-      - '.github/actions/setup-bazel/**'
-      - '.github/workflows/server_build.yml'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
-  cancel-in-progress: true
-
-permissions:
-  contents: read
-  pull-requests: read
-
-jobs:
-  changes:
-    runs-on: ubuntu-latest
-    outputs:
-      eagle: ${{ steps.filter.outputs.eagle }}
-      shardok: ${{ steps.filter.outputs.shardok }}
-      build_matrix: ${{ steps.filter.outputs.build_matrix }}
-    steps:
-      - name: Detect changed server areas
-        id: filter
-        uses: actions/github-script@v9
-        with:
-          script: |
-            const files = await github.paginate(github.rest.pulls.listFiles, {
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              pull_number: context.payload.pull_request.number,
-              per_page: 100,
-            });
-
-            const changed = files.map(file => file.filename);
-            const matches = patterns => changed.some(file =>
-              patterns.some(pattern =>
-                pattern.endsWith('/') ? file.startsWith(pattern) : file === pattern
-              )
-            );
-
-            const sharedPatterns = [
-              'src/main/protobuf/net/eagle0/common/',
-              'src/main/go/net/eagle0/build/',
-              'go.mod',
-              'go.sum',
-              'WORKSPACE',
-              'MODULE.bazel',
-              'MODULE.bazel.lock',
-              'BUILD.bazel',
-              '.bazelrc',
-              'ci/github_actions/ensure_bazel_installed.sh',
-              '.github/actions/setup-bazel/',
-              '.github/workflows/server_build.yml',
-            ];
-
-            const eaglePatterns = [
-              'src/main/scala/',
-              'src/main/protobuf/net/eagle0/eagle/',
-              'scripts/build_eagle_ci.sh',
-            ];
-
-            const shardokPatterns = [
-              'src/main/cpp/',
-              'src/main/protobuf/net/eagle0/shardok/',
-              'scripts/build_shardok_ci.sh',
-              'scripts/build_shardok_linux_arm64_ci.sh',
-            ];
-
-            const shared = matches(sharedPatterns);
-            const eagle = shared || matches(eaglePatterns);
-            const shardok = shared || matches(shardokPatterns);
-
-            core.info(`Changed files:\n${changed.join('\n')}`);
-            core.info(`Run Eagle build: ${eagle}`);
-            core.info(`Run Shardok build: ${shardok}`);
-            core.setOutput('eagle', String(eagle));
-            core.setOutput('shardok', String(shardok));
-            const include = [];
-            if (eagle) {
-              include.push({
-                name: 'Eagle server',
-                command: './scripts/build_eagle_ci.sh',
-              });
-            }
-            if (shardok) {
-              include.push({
-                name: 'Shardok server',
-                command: './scripts/build_shardok_ci.sh',
-              });
-              include.push({
-                name: 'Shardok Linux ARM64 server',
-                command: './scripts/build_shardok_linux_arm64_ci.sh',
-              });
-            }
-            core.setOutput('build_matrix', JSON.stringify({include}));
-
-  server-build:
-    name: Build ${{ matrix.name }}
-    needs: changes
-    if: needs.changes.outputs.build_matrix != '{"include":[]}'
-    runs-on: [self-hosted, bazel]
-    strategy:
-      fail-fast: false
-      matrix: ${{ fromJSON(needs.changes.outputs.build_matrix) }}
-
-    steps:
-      - name: Ensure Git LFS available for checkout
-        run: |
-          COMMON_PATHS=(/opt/homebrew/bin /usr/local/bin)
-          for path in "${COMMON_PATHS[@]}"; do
-            if [ -d "$path" ]; then
-              echo "$path" >> "$GITHUB_PATH"
-              export PATH="$path:$PATH"
-            fi
-          done
-
-          if command -v git-lfs >/dev/null 2>&1; then
-            git-lfs version
-            exit 0
-          fi
-
-          brew install git-lfs
-          git-lfs version
-      - name: Checkout repository
-        uses: actions/checkout@v6
-        with:
-          persist-credentials: false
-          lfs: false
-      - name: Setup Bazel
-        uses: ./.github/actions/setup-bazel
-      - name: Build server
-        run: ${{ matrix.command }}
@@ -7,15 +7,10 @@ on:
      - 'src/main/cpp/**'
      - 'src/main/protobuf/net/eagle0/shardok/**'
      - 'src/main/protobuf/net/eagle0/common/**'
-      - 'src/main/go/net/eagle0/build/**'
      - 'src/main/resources/net/eagle0/shardok/**'
      - 'ci/BUILD.bazel'
      - 'ci/github_actions/ensure_bazel_installed.sh'
-      - '.github/actions/setup-bazel/**'
-      - 'go.mod'
-      - 'go.sum'
      - 'MODULE.bazel'
-      - 'MODULE.bazel.lock'
      - '.bazelrc'
      - '.github/workflows/shardok_arm64_build.yml'
  workflow_dispatch:
@@ -35,38 +30,18 @@ permissions:

 jobs:
  build-shardok-arm64:
-    runs-on: [self-hosted, bazel]
+    runs-on: [self-hosted, bazel, halfdan]
    outputs:
      image_tag: ${{ steps.push-shardok.outputs.image_tag }}
    steps:
-      - name: Prepare non-LFS checkout
-        env:
-          GIT_CONFIG_GLOBAL: ${{ runner.temp }}/gitconfig-no-lfs
-          GIT_CONFIG_NOSYSTEM: "1"
-        run: |
-          git config --global --unset-all filter.lfs.process || true
-          git config --global filter.lfs.smudge "cat"
-          git config --global filter.lfs.clean "cat"
-          git config --global filter.lfs.required false
-          if [ -d ".git" ]; then
-            git config --local --unset-all filter.lfs.process || true
-            git config --local filter.lfs.smudge "cat"
-            git config --local filter.lfs.clean "cat"
-            git config --local filter.lfs.required false
-          fi
-          rm -f .git/hooks/post-checkout .git/hooks/post-merge .git/hooks/pre-push
-
      - name: Checkout repository
        uses: actions/checkout@v6
-        env:
-          GIT_CONFIG_GLOBAL: ${{ runner.temp }}/gitconfig-no-lfs
-          GIT_CONFIG_NOSYSTEM: "1"
        with:
          persist-credentials: false
          lfs: false

      - name: Ensure Bazel installed
-        uses: ./.github/actions/setup-bazel
+        run: ./ci/github_actions/ensure_bazel_installed.sh

      - name: Build Shardok ARM64 binary (cross-compile for Linux ARM64)
        run: |
@@ -75,7 +50,7 @@ jobs:
          echo "=== Building shardok-server binary for linux-aarch64 ==="
          bazel build \
            --platforms=//:linux_arm64 \
-            --extra_toolchains=@llvm_toolchain_linux_arm64//:cc-toolchain-aarch64-linux \
+            --extra_toolchains=@llvm_toolchain_linux_arm64//:all \
            //src/main/cpp/net/eagle0/shardok:shardok-server

          LINUX_BIN="bazel-bin/src/main/cpp/net/eagle0/shardok/shardok-server"
@@ -116,10 +91,9 @@ jobs:
        run: |
          set -ex

-          # Keep this in sync with the standalone binary build above.
          bazel build \
            --platforms=//:linux_arm64 \
-            --extra_toolchains=@llvm_toolchain_linux_arm64//:cc-toolchain-aarch64-linux \
+            --extra_toolchains=@llvm_toolchain_linux_arm64//:all \
            //ci:shardok_server_image_arm64

          IMAGE_PATH=$(readlink -f bazel-bin/ci/shardok_server_image_arm64)
@@ -196,9 +170,7 @@ jobs:
          echo "Also tagged as: registry.digitalocean.com/eagle0/shardok-server:arm64-latest"

  deploy-hetzner:
-    # Keep this on a self-hosted Mac runner for IPv6 reachability to Hetzner,
-    # but do not require a Bazel runner slot for artifact transport/deploy work.
-    runs-on: [self-hosted, macOS, ARM64]
+    runs-on: [self-hosted, bazel, halfdan]
    needs: [build-shardok-arm64]
    if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && github.event.inputs.push_images == 'true')
    environment: production
@@ -0,0 +1,55 @@
+name: Shardok Build
+
+on:
+  # Main pushes are covered by shardok_arm64_build.yml which builds the same target
+  pull_request:
+    paths:
+      - 'src/main/cpp/**'
+      - 'src/main/protobuf/net/eagle0/shardok/**'
+      - 'src/main/protobuf/net/eagle0/common/**'
+      - 'src/main/go/net/eagle0/build/**'
+      - 'WORKSPACE'
+      - 'MODULE.bazel'
+      - 'BUILD.bazel'
+      - '.bazelrc'
+      - 'ci/github_actions/ensure_bazel_installed.sh'
+      - '.github/workflows/shardok_build.yml'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: [self-hosted, bazel]
+
+    steps:
+      - name: Ensure Git LFS available for checkout
+        run: |
+          COMMON_PATHS=(/opt/homebrew/bin /usr/local/bin)
+          for path in "${COMMON_PATHS[@]}"; do
+            if [ -d "$path" ]; then
+              echo "$path" >> "$GITHUB_PATH"
+              export PATH="$path:$PATH"
+            fi
+          done
+
+          if command -v git-lfs >/dev/null 2>&1; then
+            git-lfs version
+            exit 0
+          fi
+
+          brew install git-lfs
+          git-lfs version
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+          lfs: false
+      - name: Ensure Bazel installed
+        run: ./ci/github_actions/ensure_bazel_installed.sh
+      - name: Build Shardok server
+        run: bazel build -c opt //src/main/cpp/net/eagle0/shardok:shardok-server
@@ -1,92 +0,0 @@
-name: Shardok Sanitizer Test
-
-on:
-  push:
-    branches: ["main"]
-    paths:
-      - "src/main/cpp/net/eagle0/shardok/**"
-      - "src/test/cpp/net/eagle0/shardok/**"
-      - "src/main/protobuf/net/eagle0/shardok/**"
-      - "src/main/protobuf/net/eagle0/common/**"
-      - "WORKSPACE"
-      - "MODULE.bazel"
-      - "MODULE.bazel.lock"
-      - "BUILD.bazel"
-      - ".bazelrc"
-      - ".github/actions/setup-bazel/**"
-      - ".github/workflows/shardok_sanitizer_test.yml"
-      - "ci/github_actions/ensure_bazel_installed.sh"
-      - "ci/github_actions/summarize_bazel_bep.py"
-  pull_request:
-    paths:
-      - "src/main/cpp/net/eagle0/shardok/**"
-      - "src/test/cpp/net/eagle0/shardok/**"
-      - "src/main/protobuf/net/eagle0/shardok/**"
-      - "src/main/protobuf/net/eagle0/common/**"
-      - "WORKSPACE"
-      - "MODULE.bazel"
-      - "MODULE.bazel.lock"
-      - "BUILD.bazel"
-      - ".bazelrc"
-      - ".github/actions/setup-bazel/**"
-      - ".github/workflows/shardok_sanitizer_test.yml"
-      - "ci/github_actions/ensure_bazel_installed.sh"
-      - "ci/github_actions/summarize_bazel_bep.py"
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
-  cancel-in-progress: true
-
-permissions:
-  contents: read
-
-jobs:
-  shardok-sanitizer-test:
-    name: Shardok ${{ matrix.name }}
-    runs-on: [self-hosted, bazel]
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - name: ASan
-            config: asan
-          - name: UBSan
-            config: ubsan
-
-    steps:
-      - name: Ensure Git LFS available for checkout
-        run: |
-          COMMON_PATHS=(/opt/homebrew/bin /usr/local/bin)
-          for path in "${COMMON_PATHS[@]}"; do
-            if [ -d "$path" ]; then
-              echo "$path" >> "$GITHUB_PATH"
-              export PATH="$path:$PATH"
-            fi
-          done
-
-          if command -v git-lfs >/dev/null 2>&1; then
-            git-lfs version
-            exit 0
-          fi
-
-          brew install git-lfs
-          git-lfs version
-      - name: Checkout repository
-        uses: actions/checkout@v6
-        with:
-          persist-credentials: false
-          lfs: false
-      - name: Setup Bazel
-        uses: ./.github/actions/setup-bazel
-      - name: Run Shardok sanitizer tests
-        run: bazel test --config=${{ matrix.config }} --build_event_json_file=${{ matrix.config }}.json //src/test/cpp/net/eagle0/shardok/...
-      - name: Summarize Bazel build metrics
-        if: always()
-        run: python3 ci/github_actions/summarize_bazel_bep.py ${{ matrix.config }}.json
-      - name: Archive sanitizer test results
-        if: always()
-        uses: actions/upload-artifact@v7
-        with:
-          name: shardok-${{ matrix.config }}.json
-          path: ${{ matrix.config }}.json
-          retention-days: 3
@@ -1,74 +0,0 @@
-name: Storage Cleanup
-
-on:
-  schedule:
-    # Blob cleanup: run daily at 04:00 UTC
-    - cron: '0 4 * * *'
-    # S3 archive cleanup: run weekly on Sunday at 05:00 UTC
-    - cron: '0 5 * * 0'
-  workflow_dispatch:
-    inputs:
-      target:
-        description: 'Cleanup target'
-        required: true
-        default: 'all'
-        type: choice
-        options:
-          - all
-          - blob
-          - archive
-
-permissions:
-  contents: read
-
-jobs:
-  cleanup:
-    name: ${{ matrix.name }}
-    runs-on: [self-hosted, bazel]
-    strategy:
-      fail-fast: false
-      matrix: ${{ fromJSON(github.event_name == 'workflow_dispatch' && github.event.inputs.target == 'all' && '{"include":[{"name":"Blob cleanup","command":"bazel run //src/main/go/net/eagle0/build/blob_cleanup:blob_cleanup -- --min-age=1h"},{"name":"S3 archive cleanup","command":"bazel run //src/main/go/net/eagle0/build/s3_archive_cleanup:s3_archive_cleanup -- --min-age=720h"}]}' || github.event_name == 'workflow_dispatch' && github.event.inputs.target == 'archive' && '{"include":[{"name":"S3 archive cleanup","command":"bazel run //src/main/go/net/eagle0/build/s3_archive_cleanup:s3_archive_cleanup -- --min-age=720h"}]}' || github.event_name == 'schedule' && github.event.schedule == '0 5 * * 0' && '{"include":[{"name":"S3 archive cleanup","command":"bazel run //src/main/go/net/eagle0/build/s3_archive_cleanup:s3_archive_cleanup -- --min-age=720h"}]}' || '{"include":[{"name":"Blob cleanup","command":"bazel run //src/main/go/net/eagle0/build/blob_cleanup:blob_cleanup -- --min-age=1h"}]}') }}
-
-    steps:
-      - name: Prepare non-LFS checkout
-        env:
-          GIT_CONFIG_GLOBAL: ${{ runner.temp }}/gitconfig-no-lfs
-          GIT_CONFIG_NOSYSTEM: "1"
-        run: |
-          git config --global --unset-all filter.lfs.process || true
-          git config --global filter.lfs.smudge "cat"
-          git config --global filter.lfs.clean "cat"
-          git config --global filter.lfs.required false
-          if [ -d ".git" ]; then
-            git config --local --unset-all filter.lfs.process || true
-            git config --local filter.lfs.smudge "cat"
-            git config --local filter.lfs.clean "cat"
-            git config --local filter.lfs.required false
-          fi
-          rm -f .git/hooks/post-checkout .git/hooks/post-merge .git/hooks/pre-push
-
-      - uses: actions/checkout@v6
-        env:
-          GIT_CONFIG_GLOBAL: ${{ runner.temp }}/gitconfig-no-lfs
-          GIT_CONFIG_NOSYSTEM: "1"
-        with:
-          persist-credentials: false
-          lfs: false
-          clean: false
-
-      - name: Ensure Bazel installed
-        uses: ./.github/actions/setup-bazel
-
-      - name: Run blob cleanup
-        if: matrix.name == 'Blob cleanup'
-        env:
-          ACCESS_KEY_ID: ${{ secrets.ACCESS_KEY_ID }}
-          SECRET_KEY: ${{ secrets.SECRET_KEY }}
-        run: ${{ matrix.command }}
-
-      - name: Run S3 archive cleanup
-        if: matrix.name == 'S3 archive cleanup'
-        env:
-          DO_SPACES_ACCESS_KEY: ${{ secrets.DO_SPACES_ACCESS_KEY }}
-          DO_SPACES_SECRET_KEY: ${{ secrets.DO_SPACES_SECRET_KEY }}
-        run: ${{ matrix.command }}
@@ -15,16 +15,11 @@ on:
      - "scripts/build_plugins.sh"
      - "scripts/build_windows_plugin.sh"
      - "ci/github_actions/build_unity.sh"
-      - "ci/github_actions/test_unity_editmode.sh"
      - "ci/github_actions/ensure_bazel_installed.sh"
-      - ".github/actions/setup-bazel/**"
-      - "ci/github_actions/detect_addressables_changes.sh"
      - "ci/github_actions/upload_addressables.sh"
      - "ci/github_actions/ensure_unity_installed.sh"
      - "src/main/csharp/net/eagle0/clients/unity/eagle0/ProjectSettings/ProjectVersion.txt"
      - "MODULE.bazel"
-      - "MODULE.bazel.lock"
-      - ".bazelrc"
      - "WORKSPACE"
  workflow_dispatch:
  pull_request:
@@ -40,147 +35,29 @@ on:
      - "scripts/build_plugins.sh"
      - "scripts/build_windows_plugin.sh"
      - "ci/github_actions/build_unity.sh"
-      - "ci/github_actions/test_unity_editmode.sh"
      - "ci/github_actions/ensure_bazel_installed.sh"
-      - ".github/actions/setup-bazel/**"
-      - "ci/github_actions/detect_addressables_changes.sh"
      - "ci/github_actions/upload_addressables.sh"
      - "ci/github_actions/ensure_unity_installed.sh"
      - "src/main/csharp/net/eagle0/clients/unity/eagle0/ProjectSettings/ProjectVersion.txt"
      - "MODULE.bazel"
-      - "MODULE.bazel.lock"
-      - ".bazelrc"
      - "WORKSPACE"

+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 permissions:
-  actions: write
  contents: read

 env:
  # Runner-specific build directory to allow parallel builds on multiple runners
-  EAGLE0_BUILD_DIR: /tmp/eagle0-${{ github.run_id }}-${{ github.job }}
+  EAGLE0_BUILD_DIR: /tmp/eagle0-${{ github.run_id }}

 jobs:
-  unity-editmode-tests:
-    runs-on: [self-hosted, macOS, unity-windows]
-    concurrency:
-      group: ${{ github.workflow }}-tests-${{ github.head_ref || github.ref }}
-      cancel-in-progress: ${{ github.event_name == 'pull_request' }}
-
-    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
-
-      - name: Ensure Git LFS available for checkout
-        run: |
-          COMMON_PATHS="/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
-          export PATH="${COMMON_PATHS}:${PATH}"
-          for path in /opt/homebrew/bin /usr/local/bin; do
-            if [ -d "$path" ]; then
-              echo "$path" >> "$GITHUB_PATH"
-            fi
-          done
-          if ! command -v git-lfs >/dev/null 2>&1; then
-            brew install git-lfs
-          fi
-          git-lfs --version
-
-      - uses: actions/checkout@v6
-        env:
-          GIT_LFS_SKIP_SMUDGE: 1
-        with:
-          persist-credentials: false
-          lfs: false  # Fetch LFS after checkout to avoid stale ref issues
-          clean: false  # Library/ persists between runs on self-hosted runners
-          fetch-depth: 2
-
-      - name: Clean stale files
-        run: |
-          git clean -ffd
-          UNITY_ROOT="src/main/csharp/net/eagle0/clients/unity/eagle0"
-          # These ignored proto outputs are mutually exclusive across proto-generation
-          # layouts. Clean both before regenerating to avoid stale DLL/source duplicates
-          # when a self-hosted runner switches between main and PR branches.
-          rm -rf "$UNITY_ROOT/Assets/GeneratedProtos"
-          rm -rf "$UNITY_ROOT/Assets/Plugins/Eagle0Protos"
-          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="$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/"
-              rm -rf "$BEE_DIR"
-            else
-              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"
-            rm -rf "$BEE_DIR"
-          fi
-
-      - name: Fetch LFS files
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        run: ./ci/github_actions/fetch_lfs.sh
-      - name: Ensure Unity version installed
-        run: ./ci/github_actions/ensure_unity_installed.sh windows
-      - name: Ensure .NET SDK installed
-        uses: actions/setup-dotnet@v5
-        with:
-          dotnet-version: '8.0.x'
-      - name: Ensure Bazel installed
-        uses: ./.github/actions/setup-bazel
-
-      - name: Run Unity EditMode tests
-        run: ./ci/github_actions/test_unity_editmode.sh
-
-      - name: Archive EditMode test artifacts
-        if: success() || failure()
-        uses: actions/upload-artifact@v7
-        with:
-          name: unity-editmode-tests
-          path: |
-            ${{ env.EAGLE0_BUILD_DIR }}/editor_editmode_tests.log
-            ${{ env.EAGLE0_BUILD_DIR }}/editmode-test-results.xml
-          retention-days: 3
-      - name: Cleanup build directory
-        if: always()
-        run: rm -rf "${{ env.EAGLE0_BUILD_DIR }}"
-
  windows-unity:
-    runs-on: [self-hosted, macOS, unity-windows]
+    runs-on: [self-hosted, macOS, unity-windows, halfdan]
    outputs:
-      addressables_changed: ${{ steps.addressables.outputs.changed }}
      deployed_version: ${{ steps.get-version.outputs.deployed_version }}
-    concurrency:
-      group: ${{ github.workflow }}-build-${{ github.head_ref || github.ref }}
-      cancel-in-progress: ${{ github.event_name == 'pull_request' }}

    steps:
      - name: Prune stale PR refs
@@ -216,17 +93,10 @@ jobs:
          persist-credentials: false
          lfs: false  # Fetch LFS after checkout to avoid stale ref issues
          clean: false  # Library/ persists between runs on self-hosted runners
-          fetch-depth: 2  # Keep the previous main commit available for Addressables change detection

      - name: Clean stale files
        run: |
          git clean -ffd
-          UNITY_ROOT="src/main/csharp/net/eagle0/clients/unity/eagle0"
-          # These ignored proto outputs are mutually exclusive across proto-generation
-          # layouts. Clean both before regenerating to avoid stale DLL/source duplicates
-          # when a self-hosted runner switches between main and PR branches.
-          rm -rf "$UNITY_ROOT/Assets/GeneratedProtos"
-          rm -rf "$UNITY_ROOT/Assets/Plugins/Eagle0Protos"
          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"
@@ -265,29 +135,10 @@ jobs:
        run: ./ci/github_actions/fetch_lfs.sh
      - name: Ensure Unity version installed
        run: ./ci/github_actions/ensure_unity_installed.sh windows
-      - name: Ensure .NET SDK installed
-        uses: actions/setup-dotnet@v5
-        with:
-          dotnet-version: '8.0.x'
      - name: Ensure Bazel installed
-        uses: ./.github/actions/setup-bazel
-
-      - name: Detect Addressables changes
-        id: addressables
-        if: success()
-        shell: bash
-        run: |
-          set -euo pipefail
-
-          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
-            BASE_SHA="${{ github.event.pull_request.base.sha }}"
-          else
-            BASE_SHA="${{ github.event.before }}"
-          fi
-
-          ./ci/github_actions/detect_addressables_changes.sh "$BASE_SHA" "${{ github.sha }}"
+        run: ./ci/github_actions/ensure_bazel_installed.sh
      - name: Build Windows unity
-        run: ./ci/github_actions/build_unity.sh "${{ env.EAGLE0_BUILD_DIR }}/eagle0WIN" true "${{ steps.addressables.outputs.changed }}"
+        run: ./ci/github_actions/build_unity.sh "${{ env.EAGLE0_BUILD_DIR }}/eagle0WIN"

      - name: Save build SHA for Bee/ cache invalidation
        if: success()
@@ -301,89 +152,21 @@ jobs:
          mkdir -p src/main/csharp/net/eagle0/clients/unity/eagle0/Library
          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: Check if run is still latest main for Addressables
-        id: check-addressables-latest
-        if: success() && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && steps.addressables.outputs.changed == 'true'
-        run: |
-          LATEST_SHA=$(curl -fsSL \
-            -H "Authorization: Bearer ${{ github.token }}" \
-            -H "Accept: application/vnd.github+json" \
-            "https://api.github.com/repos/${{ github.repository }}/commits/main" \
-            | python3 -c 'import json, sys; print(json.load(sys.stdin)["sha"])')
-          if [[ "$LATEST_SHA" != "${{ github.sha }}" ]]; then
-            echo "Skipping Addressables upload because ${{ github.sha }} is no longer latest main ($LATEST_SHA is latest)"
-            echo "should_upload=false" >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
-          echo "should_upload=true" >> "$GITHUB_OUTPUT"
-
-      - name: Wait for EditMode tests before publishing
+      - name: Upload Addressables to CDN
        if: success() && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          deadline=$((SECONDS + 600))
-          while [ "$SECONDS" -lt "$deadline" ]; do
-            result=$(curl -fsSL \
-              -H "Authorization: Bearer $GH_TOKEN" \
-              -H "Accept: application/vnd.github+json" \
-              "https://api.github.com/repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/jobs" \
-              | python3 -c 'import json, sys; job = next(j for j in json.load(sys.stdin)["jobs"] if j["name"] == "unity-editmode-tests"); print("{} {}".format(job["status"], job["conclusion"] or ""))')
-            status="${result%% *}"
-            conclusion="${result#* }"
-            if [ "$status" = "completed" ]; then
-              if [ "$conclusion" = "success" ]; then
-                echo "EditMode tests passed; publishing may continue."
-                exit 0
-              fi
-              echo "EditMode tests completed with conclusion: $conclusion"
-              exit 1
-            fi
-            echo "EditMode tests are still $status; waiting..."
-            sleep 5
-          done
-          echo "Timed out waiting for EditMode tests."
-          exit 1
-
-      - name: Check if run is still latest main for publish
-        id: check-publish-latest
-        if: success() && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
-        run: |
-          LATEST_SHA=$(curl -fsSL \
-            -H "Authorization: Bearer ${{ github.token }}" \
-            -H "Accept: application/vnd.github+json" \
-            "https://api.github.com/repos/${{ github.repository }}/commits/main" \
-            | python3 -c 'import json, sys; print(json.load(sys.stdin)["sha"])')
-          if [[ "$LATEST_SHA" != "${{ github.sha }}" ]]; then
-            echo "Skipping publish because ${{ github.sha }} is no longer latest main ($LATEST_SHA is latest)"
-            echo "should_publish=false" >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
-          echo "should_publish=true" >> "$GITHUB_OUTPUT"
-
-      - name: Stage Windows blobs for publish
-        if: success() && steps.check-publish-latest.outputs.should_publish == 'true'
-        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 -- --skip-previous-manifest "${{ env.EAGLE0_BUILD_DIR }}/eagle0WIN" "${{ env.EAGLE0_BUILD_DIR }}/unity_manifest.txt"
-
-      - name: Upload Windows Addressables to CDN
-        if: success() && steps.check-publish-latest.outputs.should_publish == 'true' && steps.check-addressables-latest.outputs.should_upload == 'true'
        env:
          ACCESS_KEY_ID: ${{ secrets.ACCESS_KEY_ID }}
          SECRET_KEY: ${{ secrets.SECRET_KEY }}
        run: ./ci/github_actions/upload_addressables.sh StandaloneWindows64
-
-      - name: Publish previous Windows manifest
-        if: success() && steps.check-publish-latest.outputs.should_publish == 'true'
+      - name: Deploy Windows unity
+        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 -- --publish-previous-manifest "${{ env.EAGLE0_BUILD_DIR }}/unity_manifest.txt"
+        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() && steps.check-publish-latest.outputs.should_publish == 'true'
+        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 }}
@@ -401,16 +184,16 @@ jobs:
          fi

          # Update the v2 manifest at installer/v2/eagle0_manifest.txt
-          bazel run //src/main/go/net/eagle0/build/manifest_manager:manifest_manager -- unity3d-v2 "${{ env.EAGLE0_BUILD_DIR }}/unity_manifest.txt" $SIGNING_ARGS
+          bazel run //src/main/go/net/eagle0/build/manifest_manager:manifest_manager -- unity3d-v2 /tmp/unity_manifest.txt $SIGNING_ARGS

          # Cleanup
          rm -f /tmp/manifest_signing_key

      - name: Export deployed version
        id: get-version
-        if: success() && steps.check-publish-latest.outputs.should_publish == 'true'
+        if: success() && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
        run: |
-          VERSION=$(grep "^version=" "${{ env.EAGLE0_BUILD_DIR }}/unity_manifest.txt" | cut -d= -f2 || date +%Y.%m.%d)
+          VERSION=$(grep "^version=" /tmp/unity_manifest.txt | cut -d= -f2 || date +%Y.%m.%d)
          echo "deployed_version=$VERSION" >> $GITHUB_OUTPUT

      - name: Archive build log
@@ -420,14 +203,6 @@ jobs:
          name: editor_win.log
          path: ${{ env.EAGLE0_BUILD_DIR }}/editor_win.log
          retention-days: 3
-      - name: Archive Addressables build reports
-        if: (success() || failure()) && steps.addressables.outputs.changed == 'true'
-        uses: actions/upload-artifact@v7
-        with:
-          name: windows-addressables-build-reports
-          path: src/main/csharp/net/eagle0/clients/unity/eagle0/Library/com.unity.addressables/BuildReports
-          if-no-files-found: ignore
-          retention-days: 3
      - name: Cleanup build directory
        if: always()
        run: rm -rf "${{ env.EAGLE0_BUILD_DIR }}"
@@ -40,7 +40,6 @@ scripts/refresh_name_layers/refresh_name_layers.zip
 api_keys.txt

 src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/GeneratedProtos/
-src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/Plugins/Eagle0Protos.meta
 src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/Plugins/Eagle0Protos/
 src/main/csharp/net/eagle0/clients/unity/eagle0/ProjectSettings/Packages/com.unity.dedicated-server/
 node_modules/
@@ -1,445 +0,0 @@
-# AGENTS.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.
-
-**NEVER prefix a command with `cd`.** Run `git`, `gh`, `bazel`, etc. directly from whatever the cwd already is. The cwd is a subdirectory of the worktree; `git`/`gh` find the repo via `.git` discovery and `bazel` finds the workspace via MODULE.bazel discovery — walking up from a subdir works fine. The shell resets cwd after every command anyway, so a `cd` never persists. (And `cd <dir> && <cmd>` violates the no-chaining rule above and forces an approval prompt every time.) Only `cd` in the rare case a tool genuinely cannot locate its root, and even then as its own Bash call, never a chain.
-
-## CRITICAL UNITY PROCESS RULES (NEVER VIOLATE)
-
-**NEVER kill Unity without asking the user first.** The user might be actively using the Unity Editor. Do not kill,
-force-quit, terminate, or otherwise stop Unity processes unless the user explicitly approves that specific action.
-
-**NEVER change Unity's default/open scene as part of running checks.** Unity batchmode or editor validation may write
-scene-selection churn such as `ProjectSettings/EditorBuildSettings.asset`, `ProjectSettings/SceneTemplateSettings.json`,
-or scene files simply because a different scene was open or loaded. Treat those as unintended local environment changes:
-do not stage them, and restore them before committing unless the user explicitly asked to change scenes/build settings.
-
-## CRITICAL GIT RULES (NEVER VIOLATE)
-
-**NEVER use `git -C`.** Just run `git` directly from the cwd — it finds the repo via `.git` discovery. Do not `cd` to the repo root either (see the no-`cd` bash rule above).
-
-**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.
-
-**ALWAYS use this workflow:**
-1. Create a feature branch from origin/main
-2. Commit to that branch
-3. Create a PR with `gh pr create`
-4. Wait for user to merge (DO NOT run `gh pr merge`)
-
-If you catch yourself about to run `git push origin main` or `git push origin <branch>:main`, STOP. You are about to violate a critical rule. Create a PR instead.
-
-If you catch yourself about to run `gh pr merge`, STOP. Only the user merges PRs.
-
-## Commit History During Review
-
-Prefer new follow-up commits over amending existing commits once a PR is open and the user is actively reviewing or
-testing it. This preserves working interim states so the user can inspect, compare, or return to a known-good point
-while improvements continue.
-
-Use `git commit --amend` and force-push only when the user explicitly asks for history cleanup, when fixing metadata
-before review has started, or when repairing a local commit that has not been pushed. If you believe squashing is the
-right choice despite an open review, explain why and ask first.
-
-## Worktree Usage
-
-Prefer using the current worktree for small requested fixes. Create a separate worktree only when the user asks for one,
-when the current branch/state would make the change unsafe, or when isolating a large/risky change is clearly beneficial.
-
-**NEVER leave the current worktree without explicit user approval.** Do not create, switch to, edit, commit in, or run
-git commands from another worktree unless the user has specifically asked for that worktree or approved the move. If the
-current worktree is unsafe because of dirty state, report that and ask before using a different worktree.
-
-Codex may edit code and run git commands in the current worktree, even when unrelated files are dirty, as long as it:
- does not revert, reset, clean, or overwrite unrelated changes
- stages only the files relevant to the requested change
- verifies the staged diff before committing
- creates feature branches and PRs as usual
- does not push to main/master or merge PRs
-
-When the user says a Codex-created PR has been merged, delete the corresponding local branch and temporary worktree
-automatically, unless there is uncommitted work that would make cleanup unsafe.
-
-## PR Timing
-
-When code changes appear correct locally, create the PR promptly even if long-running builds or tests are still running.
-Opening the PR starts CI on the build machines, uploads results to the Bazel remote cache, and can speed up subsequent
-local validation. Continue monitoring any already-started local and CI validation after opening the PR.
-
-For PRs expected to trigger substantial Bazel work in CI, run the relevant Bazel builds and tests locally too. This
-workstation is fast, and local Bazel runs can help hydrate the remote cache for the CI builders while still giving
-earlier signal on failures.
-
-## Cleanup PR Batching
-
-When making mechanical cleanup changes, group 3-5 files per PR when the files are receiving the same kind of change
-and can be reviewed as one pattern. Do not open one PR per file for nearly identical few-line cleanups, such as replacing
-the same unsafe accessor pattern with the same contextual failure pattern across multiple Scala files.
-
-Keep separate PRs for changes that involve different semantics, materially different risk, unrelated subsystems, or
-files whose tests/validation strategy makes them better reviewed independently.
-
-## GitHub CLI PR Bodies
-
-When creating or editing PR descriptions with multiline bodies, write the body to a temporary markdown file and pass it
-with `gh pr create --body-file <path>` or `gh pr edit <number> --body-file <path>`. Do not use multiline `$'...'`
-shell quoting for PR bodies; Codex's permission matching may treat that as a complex shell command instead of a clean
-`gh pr` invocation, causing unnecessary approval prompts.
-
-Write these temporary body files under `/private/tmp/eagle0-pr-bodies/`, creating that directory first when needed. This
-directory is the canonical writable scratch location for PR descriptions. Do not write PR body files to protected paths,
-repo-tracked paths, or ad hoc locations that might require additional user permission.
-
-Use ordinary Bash file-writing commands for these temporary PR body files. First run a standalone command to create the
-directory. Then run a standalone `printf` command that writes to `/private/tmp/eagle0-pr-bodies/<name>.md`. **Do not use
-`apply_patch` for temporary PR body files**, because patch tools are for tracked workspace edits and may incorrectly
-request user approval for scratch paths outside the repository.
-
-Write other scratch files needed for commands under `/private/tmp/eagle0-scratch/`, creating that directory first when
-needed. Do not use protected paths that require additional user permission just to create or edit temporary files.
-
---
-
-This file provides guidance to Codex (Codex.ai/code) when working with code in this repository.
-
-## Project Overview
-
-Eagle0 is a multi-language gaming system combining strategic turn-based gameplay (Eagle) with tactical hex-based
-combat (Shardok). The system integrates LLM-based narrative generation and supports both human and AI players.
-
-## Architecture
-
-**Three-Tier Game System:**
-
- **Unity Client (C#)**: Real-time strategy game client with integrated tactical combat UI
- **Eagle (Scala)**: Strategic layer managing turn-based gameplay, diplomacy, hero progression, and province control
- **Shardok (C++)**: Tactical layer handling real-time hex-based combat simulation with performance-critical battle
-  resolution
-
-**Communication Flow:**
-
-```
-Unity Client ↔ Eagle (gRPC streaming) ↔ Shardok (internal gRPC) 
-```
-
-**Key Entry Points:**
-
- `/src/main/csharp/net/eagle0/clients/unity/eagle0/` - Unity C# game client
- `/src/main/scala/net/eagle0/eagle/Main.scala` - Eagle strategic game server
- `/src/main/cpp/net/eagle0/shardok/shardok_server_main.cpp` - Shardok tactical server
-
-**Protocol Buffer Architecture:**
-
- Extensive use of protobuf for type-safe communication
- Separate packages: `api/` (client-facing), `internal/` (server state), `views/` (client projections)
- Event sourcing pattern with immutable action history
-
-## Essential Commands
-
-### Building
-
-```bash
-# Build Eagle server using the same target as GitHub Actions
-./scripts/build_eagle_ci.sh
-
-# Build Shardok server using the same target and flags as GitHub Actions
-./scripts/build_shardok_ci.sh
-
-# Warm the remote cache for the main GitHub Actions Bazel builds
-./scripts/hydrate_bazel_remote_cache.sh
-
-# Build Unity/C# client
-./scripts/build_protos.sh         # Protocol buffer generation for Unity
-./scripts/build_plugins.sh        # Native plugins for all platforms  
-./scripts/build_windows_plugin.sh # Windows-specific plugin build
-# Unity builds via CI: ci/github_actions/build_unity.sh
-```
-
-### Running Services
-
-```bash
-# Eagle server (port 40032)
-bazel run //src/main/scala/net/eagle0/eagle:eagle_server -- --eagle-grpc-port 40032
-# Or: ./scripts/eagle_run.sh
-
-# Shardok server  
-bazel run //src/main/cpp/net/eagle0/shardok:shardok-server --compilation_mode=opt
-# Or: ./scripts/shardok_run.sh
-```
-
-### Testing
-
-```bash
-# Run all tests
-bazel test //src/test/... //src/main/go/...
-
-# Component-specific tests
-bazel test //src/test/scala/...  # Scala Eagle tests
-bazel test //src/test/cpp/...    # C++ Shardok tests
-```
-
-### Code Generation
-
-```bash
-bazel run gazelle              # Update Go build files
-./scripts/updateActionResultTypes.sh   # Update protocol buffer mappings
-```
-
-### Pre-Commit Checklist
-
-**MANDATORY: Before running `git commit`, verify:**
-
-1. **If you modified any BUILD.bazel file:** Run `bazel run gazelle` and stage any changes it makes
-2. **If you modified C++ or C# files:** Run `clang-format -i` on the modified files
-3. **If you modified Scala files:** scalafmt will run automatically via pre-commit hook
-4. **ALWAYS run the full test suite for your language changes before pushing:**
-   - For Scala changes: `bazel test //src/test/scala/...`
-   - For C++ changes: `bazel test //src/test/cpp/...`
-   - This catches exhaustive pattern match errors and other compile-time failures that single-target builds miss
-
-The pre-commit hook runs gazelle but only checks if it succeeds - it does NOT verify the BUILD files are in canonical format. The `gazelle_test` will fail if deps are not alphabetically sorted. **Always run gazelle manually after BUILD file changes.**
-
-### Bazel Cache Hydration
-
-When making changes that will trigger GitHub Actions Bazel builds, run the matching CI script instead of hand-writing
-`bazel build` commands. The scripts keep local cache hydration aligned with CI targets, compilation modes, and flags:
-
-```bash
-./scripts/build_eagle_ci.sh
-./scripts/build_shardok_ci.sh
-./scripts/hydrate_bazel_remote_cache.sh
-```
-
-Use direct `bazel build` commands only for targeted debugging where CI cache hydration is not the goal.
-
-### Code Formatting
-
-```bash
-# ALWAYS run clang-format after making any C++ or C# code changes
-clang-format -i <modified_files>
-
-# Format all C++ files in a directory:
-find . -name "*.cpp" -o -name "*.hpp" | xargs clang-format -i
-
-# Format all C# files in a directory:
-find . -name "*.cs" | xargs clang-format -i
-```
-
-### Static Analysis
-
-```bash
-# Run clang-tidy static analysis on C++ files
-# Note: This may show some header include errors but will still analyze the main file
-bazel run @llvm_toolchain//:clang-tidy -- --checks='readability-*,bugprone-*,clang-analyzer-*' <file_path> -- -I/Users/dancrosby/CodingProjects/github/eagle0 -std=c++23
-
-# Example for AI files:
-bazel run @llvm_toolchain//:clang-tidy -- --checks='readability-*,bugprone-*,clang-analyzer-*' /Users/dancrosby/CodingProjects/github/eagle0/src/main/cpp/net/eagle0/shardok/ai/AIUnitScoreCalculator.cpp -- -I/Users/dancrosby/CodingProjects/github/eagle0 -std=c++23
-```
-
-## AI Algorithm Selection
-
-Eagle0 supports two AI algorithms for tactical combat decision-making:
-
-### Iterative Deepening AI (Default)
-
-The original minimax-based AI with sophisticated randomness handling:
-
- **Advantages**: Proven, sophisticated randomness evaluation, comprehensive lookahead
- **Use cases**: Production builds, scenarios requiring precise evaluation
- **Performance**: Single-threaded, thorough evaluation
-
-### Monte Carlo Tree Search AI (MCTS)
-
-Modern MCTS-based AI with multithreading support:
-
- **Advantages**: Multithreaded, better performance on modern CPUs, anytime algorithm
- **Use cases**: Performance testing, scenarios requiring fast decisions
- **Performance**: Multithreaded, adaptive depth based on time budget
-
-### Switching Between Algorithms
-
-The algorithm is selected at **runtime** via the ShardokAIClient constructor:
-
-```cpp
-// Using Iterative Deepening AI (default)
-ShardokAIClient client(playerId, isDefender, hexMap, settings);
-// OR explicitly:
-ShardokAIClient client(playerId, isDefender, hexMap, settings, AIAlgorithmType::ITERATIVE_DEEPENING);
-
-// Using MCTS AI
-ShardokAIClient client(playerId, isDefender, hexMap, settings, AIAlgorithmType::MCTS);
-```
-
-```bash
-# Build the server (includes both AI algorithms)
-./scripts/build_shardok_ci.sh
-
-# Test both algorithms
-bazel test //src/test/cpp/net/eagle0/shardok/ai:ai_iterative_deepening_test
-bazel test //src/test/cpp/net/eagle0/shardok/ai:ai_mcts_test  # If available
-
-# Performance tests
-./scripts/ai_perf_test.sh  # Uses whatever algorithm the server is configured to use
-```
-
-Both implementations are compatible with all existing interfaces and produce the same `SearchResult` structure.
-
-**Note**: Both implementations are documented in `src/main/cpp/net/eagle0/shardok/ai/AI_SCORING_SYSTEM.md`, including
-recommendations for improving MCTS randomness handling.
-
-The AI algorithm selection is made at runtime when creating ShardokAIClient instances, allowing different AI strategies
-to be used for different players or game situations within the same server process.
-
-## Language-Specific Patterns
-
-**Scala (Strategic Layer):**
-
- Use `EngineImpl.scala` for core game logic modifications
- Follow event sourcing pattern - all changes through immutable actions
- gRPC streaming for real-time client updates via `EagleServiceImpl.scala`
- LLM integration in `/common/llm_integration/` for narrative generation
-
-**C++ (Tactical Layer):**
-
- Performance-critical combat in `ShardokEngine.hpp/.cpp`
- FlatBuffers for efficient serialization in `/flatbuffer/` directory
- AI systems in `/ai/` subdirectory with pluggable strategy selectors
- Extensive unit testing with Google Test framework
-
-**Protocol Buffers:**
-
- Three-layer structure: `api/` (client), `internal/` (server), `views/` (projections)
- Use `shardok_internal_interface.proto` for Eagle-Shardok communication
- Maintain backward compatibility when modifying existing messages
-
-**C# (Unity Client):**
-
- Located in `/src/main/csharp/net/eagle0/clients/unity/eagle0/`
- Uses Unity 6.5 (6000.5.0f1) with comprehensive protobuf integration (100+ .proto files)
- Key components: `EagleConnection.cs` (gRPC client), `EagleGameController.cs` (main game logic)
- Real-time bidirectional streaming with server via `PersistentClientConnection.cs`
- Strategic map UI in `Assets/Eagle/`, tactical battle UI in `Assets/Shardok/`
- Seamless transition between strategic gameplay and hex-based tactical combat
- **NEVER add defensive null checks on Unity Inspector fields** - these hide configuration bugs. If a field isn't
-  linked in the editor, it should throw a NullReferenceException so the problem is immediately obvious. Silently
-  skipping code when a required field is null makes bugs harder to find.
-
-**Go (Build Tools):**
-
- Build automation and code generation utilities
- AWS S3 integration for deployment artifacts
-
-## Testing Strategy
-
- Comprehensive unit tests for both Scala and C++ components
- Integration tests for Eagle-Shardok communication
- Map validation tests ensure game content integrity
- Use `GameSettings_test_utils.cpp` and `ShardokEngineBasedTestData.cpp` for C++ test helpers
-
-### Scala Testing Patterns
-
-**Use `inside()` instead of `asInstanceOf` for type matching in tests:**
-
-Never use `asInstanceOf` in tests. Instead, use ScalaTest's `inside()` pattern for safe type matching:
-
-```scala
-// BAD - don't do this
-val changedHero = result.changedHeroes.head.asInstanceOf[ChangedHeroC]
-changedHero.heroId shouldBe 19
-
-// GOOD - use inside() pattern
-import org.scalatest.Inside.inside
-
-inside(result.changedHeroes.head) { case changedHero: ChangedHeroC =>
-  changedHero.heroId shouldBe 19
-  changedHero.vigorChange shouldBe StatDelta(17.2)
-}
-```
-
-The `inside()` pattern:
- Provides better error messages when the type doesn't match
- Is idiomatic ScalaTest
- Works with pattern matching for more complex assertions
-
-## Performance Testing
-
-When making performance-related changes to the AI or engine:
-
-```bash
-# 1. Commit your changes to a feature branch
-git checkout -b performance-improvement-feature
-git add . && git commit -m "Implement performance improvement"
-
-# 2. Run performance tests multiple times on your branch to reduce noise
-for i in 1 2 3; do 
-    echo "=== Run $i ===" 
-    ./scripts/ai_perf_test.sh 2>&1 | grep -A 20 "AI Search Performance Summary" 
-done
-# Save or note the results
-
-# 3. Switch to main branch and run the same tests
-git checkout main
-for i in 1 2 3; do 
-    echo "=== Run $i ===" 
-    ./scripts/ai_perf_test.sh 2>&1 | grep -A 20 "AI Search Performance Summary" 
-done
-
-# 4. Compare the results between your branch and main
-# Key metrics to compare:
-# - Commands evaluated at each depth (e.g., "Depth 3: 169/523 commands")
-# - Average search depth achieved
-# - Completion rates at each depth
-```
-
-**Important notes:**
-
- Run tests multiple times (3-5) to account for performance variance
- Focus on commands evaluated at each depth rather than total commands
- Commands at different depths aren't directly comparable (depth 3 is more valuable than depth 2)
- **Always test performance changes** - what seems like an optimization may sometimes have unexpected overhead or
-  behavior changes.
-
-## Troubleshooting Scala Build Errors
-
-### MissingType Errors
-
-When you see errors like:
-```
-dotty.tools.dotc.core.MissingType: Cannot resolve reference to type net.eagle0.eagle.internal.game_state.type.GameState
-```
-
-**This is NOT a Scala compiler crash.** This is a missing dependency in BUILD.bazel.
-
-**How to fix:**
-1. Identify the missing type from the error message (e.g., `game_state.GameState`)
-2. Find the Bazel target that provides this type (e.g., `//src/main/protobuf/net/eagle0/eagle/internal:game_state_scala_proto`)
-3. Add it to the `deps` of the failing target
-4. If the type appears in a public method signature, also add it to `exports` so downstream targets can see it
-
-**Common pattern:** When adding a method to a class that takes or returns a proto type, the proto dependency often needs to be added to both `deps` AND `exports`.
-
-### Bazel Clean
-
-**NEVER run `bazel clean` without asking first.** It rarely fixes actual issues and wastes significant rebuild time. The issues that seem like they need `bazel clean` are usually:
- Missing imports in Scala code
- Missing dependencies in BUILD.bazel
- Missing exports for types used in public signatures
-
-## Game Content
-
-**Maps:** `.e0mj` files in `/src/main/resources/net/eagle0/shardok/maps/`
-**Configuration:** Game parameters in `/src/main/resources/net/eagle0/eagle/game_parameters.json`
-**Data Files:** TSV format for battalions, heroes, and other game data
-
-**NEVER modify hero names.** Do not change names in `heroes.tsv`, `generated_heroes`, or any other hero data files. The names are carefully chosen and are not to be altered.
-
-## Deployment
-
- Bazel handles multi-language builds and dependencies
- CI/CD via GitHub Actions with platform-specific build scripts in `/ci/github_actions/`
- Docker containerization available via `ci/eagle_run.Dockerfile`
- Always run "bazel run //:gazelle" after editing any BUILD.bazel files
- *ALWAYS ALWAYS* run "bazel run gazelle" after any change that modifies a BUILD.bazel file
@@ -1,6 +1,5 @@
 load("@bazel_gazelle//:def.bzl", "gazelle")
 load("@io_bazel_rules_go//go:def.bzl", "nogo")
-load("@rules_shell//shell:sh_test.bzl", "sh_test")

 package(default_visibility = ["//visibility:public"])

@@ -11,7 +10,6 @@ platform(
        "@platforms//os:linux",
        "@platforms//cpu:x86_64",
    ],
-    missing_toolchain_error = "No Linux x86_64 toolchain matched. Docker/Eagle image builds should pass --platforms=//:linux_x86_64 and --extra_toolchains=@llvm_toolchain_linux//:cc-toolchain-x86_64-linux when compiling C++ code.",
 )

 # Platform for cross-compiling to Linux ARM64
@@ -21,7 +19,6 @@ platform(
        "@platforms//os:linux",
        "@platforms//cpu:aarch64",
    ],
-    missing_toolchain_error = "No Linux ARM64 toolchain matched. Shardok ARM64 builds should pass --platforms=//:linux_arm64 and --extra_toolchains=@llvm_toolchain_linux_arm64//:cc-toolchain-aarch64-linux.",
 )

 gazelle(name = "gazelle")
@@ -228,7 +228,7 @@ to be used for different players or game situations within the same server proce
 **C# (Unity Client):**

 - Located in `/src/main/csharp/net/eagle0/clients/unity/eagle0/`
- Uses Unity 6 (6000.4.10f1) with comprehensive protobuf integration (100+ .proto files)
+- Uses Unity 6 (6000.4.9f1) with comprehensive protobuf integration (100+ .proto files)
 - Key components: `EagleConnection.cs` (gRPC client), `EagleGameController.cs` (main game logic)
 - Real-time bidirectional streaming with server via `PersistentClientConnection.cs`
 - Strategic map UI in `Assets/Eagle/`, tactical battle UI in `Assets/Shardok/`
@@ -3,54 +3,25 @@ module(name = "net_eagle0")
 # Version constants
 SCALA_VERSION = "3.7.4"

-NETTY_VERSION = "4.1.135.Final"
+NETTY_VERSION = "4.1.127.Final"

-SCALAPB_VERSION = "1.0.0-alpha.5"
+SCALAPB_VERSION = "1.0.0-alpha.1"

-SCALAPB_JSON4S_VERSION = "1.0.0-alpha.1"
-
-AWS_SDK_VERSION = "2.46.9"
-
-SLF4J_VERSION = "2.0.18"
+AWS_SDK_VERSION = "2.41.18"

 #
 # Core Build Tools
 #

 bazel_dep(name = "bazel_skylib", version = "1.9.0")
-bazel_dep(name = "aspect_rules_esbuild", version = "0.26.0")
-bazel_dep(name = "aspect_rules_js", version = "3.2.2")
-bazel_dep(name = "bazel_jar_jar", version = "0.1.15", repo_name = "bazel_jar_jar")
-bazel_dep(name = "platforms", version = "1.1.0")
-bazel_dep(name = "rules_dotnet", version = "0.21.5")
-bazel_dep(name = "rules_foreign_cc", version = "0.15.1")
-bazel_dep(name = "rules_android", version = "0.7.3")
-bazel_dep(name = "rules_nodejs", version = "6.7.4")
+bazel_dep(name = "platforms", version = "1.0.0")
 bazel_dep(name = "rules_pkg", version = "1.2.0")
-bazel_dep(name = "rules_shell", version = "0.8.0")
-
-multiple_version_override(
-    module_name = "aspect_rules_js",
-    versions = [
-        "2.3.8",
-        "3.2.2",
-    ],
-)
-
-npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
-npm.npm_translate_lock(
-    name = "eagle0pedia_npm",
-    pnpm_lock = "//docs/eagle0pedia:pnpm-lock.yaml",
-    run_lifecycle_hooks = False,
-    update_pnpm_lock = False,
-)
-use_repo(npm, "eagle0pedia_npm")

 #
 # Language Support - Scala
 #

-bazel_dep(name = "rules_scala", version = "7.2.6")
+bazel_dep(name = "rules_scala", version = "7.2.1")

 scala_config = use_extension(
    "@rules_scala//scala/extensions:config.bzl",
@@ -70,31 +41,21 @@ scala_deps.scala_proto()
 # Language Support - C++
 #

-bazel_dep(name = "toolchains_llvm", version = "1.8.0")
+bazel_dep(name = "toolchains_llvm", version = "1.6.0")

 llvm = use_extension("@toolchains_llvm//toolchain/extensions:llvm.bzl", "llvm")

-LLVM_VERSION = "22.1.7"
-
-LLVM_DISTRIBUTIONS = {
-    "LLVM-22.1.7-Linux-ARM64.tar.xz": "118ca2d3ad9da34367e05735317854e7977db45dc4c02a32af58da64c23b8789",
-    "LLVM-22.1.7-Linux-X64.tar.xz": "edb0522b41e261819c06ea437d249f9b8acfa413d3805bc9920eec6fb76ff830",
-    "LLVM-22.1.7-macOS-ARM64.tar.xz": "4177245188b0a30a6539c96b361dea56f253485756bfd8927a6a59e7301e7806",
-}
-
 # Native toolchain (macOS -> macOS, Linux -> Linux)
 llvm.toolchain(
    name = "llvm_toolchain",
-    extra_llvm_distributions = LLVM_DISTRIBUTIONS,
-    llvm_version = LLVM_VERSION,
+    llvm_version = "20.1.4",
 )

 # Cross-compilation toolchain (macOS -> Linux x86_64)
 # Uses the same LLVM distribution but with a Linux sysroot
 llvm.toolchain(
    name = "llvm_toolchain_linux",
-    extra_llvm_distributions = LLVM_DISTRIBUTIONS,
-    llvm_version = LLVM_VERSION,
+    llvm_version = "20.1.4",
 )

 # Linux x86_64 sysroot for cross-compilation
@@ -107,8 +68,7 @@ llvm.sysroot(
 # Cross-compilation toolchain (macOS -> Linux ARM64)
 llvm.toolchain(
    name = "llvm_toolchain_linux_arm64",
-    extra_llvm_distributions = LLVM_DISTRIBUTIONS,
-    llvm_version = LLVM_VERSION,
+    llvm_version = "20.1.4",
 )

 # Linux ARM64 sysroot for cross-compilation
@@ -117,6 +77,7 @@ llvm.sysroot(
    label = "@linux_sysroot_arm64//sysroot",
    targets = ["linux-aarch64"],
 )
+
 use_repo(llvm, "llvm_toolchain", "llvm_toolchain_linux", "llvm_toolchain_linux_arm64")

 # Download the Linux sysroots (Ubuntu 24.04 Noble for C++23 support)
@@ -142,11 +103,11 @@ sysroot(
 # Language Support - Go
 #

-bazel_dep(name = "rules_go", version = "0.61.1", repo_name = "io_bazel_rules_go")
-bazel_dep(name = "gazelle", version = "0.51.3", repo_name = "bazel_gazelle")
+bazel_dep(name = "rules_go", version = "0.59.0", repo_name = "io_bazel_rules_go")
+bazel_dep(name = "gazelle", version = "0.47.0", repo_name = "bazel_gazelle")

 go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")
-go_sdk.download(version = "1.25.11")
+go_sdk.download(version = "1.23.3")
 use_repo(go_sdk, "go_default_sdk")

 go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
@@ -169,7 +130,7 @@ use_repo(
 # Language Support - Rust
 #

-bazel_dep(name = "rules_rust", version = "0.70.0")
+bazel_dep(name = "rules_rust", version = "0.68.1")

 rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
 rust.toolchain(edition = "2021")
@@ -189,16 +150,8 @@ use_repo(crate, "map_generator_crates")
 # Platform Support - Apple/iOS
 #

-bazel_dep(name = "apple_support", version = "2.6.1", repo_name = "build_bazel_apple_support")
-bazel_dep(name = "rules_apple", version = "4.5.3", repo_name = "build_bazel_rules_apple")
-
-multiple_version_override(
-    module_name = "rules_swift",
-    versions = [
-        "2.1.1",
-        "3.5.0",
-    ],
-)
+bazel_dep(name = "apple_support", version = "1.24.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(
@@ -211,15 +164,11 @@ use_repo(apple_cc_configure, "local_config_apple_cc", "local_config_apple_cc_too
 # Protocol Buffers & RPC
 #

-bazel_dep(name = "protobuf", version = "35.1", repo_name = "com_google_protobuf")
-single_version_override(
-    module_name = "protobuf",
-    version = "35.1",
-)
+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/oss/toolchains/prebuilt:protoc_extension.bzl", "protoc")
+prebuilt_protoc = use_extension("@com_google_protobuf//bazel/private:prebuilt_protoc_extension.bzl", "protoc")
 use_repo(
    prebuilt_protoc,
    "prebuilt_protoc.linux_aarch_64",
@@ -234,18 +183,21 @@ use_repo(
 )

 bazel_dep(name = "rules_proto", version = "7.1.0")
-bazel_dep(name = "rules_cc", version = "0.2.19")
-bazel_dep(name = "grpc", version = "1.81.1")
+bazel_dep(name = "rules_cc", version = "0.2.14")
+bazel_dep(name = "grpc", version = "1.78.0")

-# gRPC 1.81.1's generated upb module map trips Clang's layering check in the
-# Linux ARM64 cross-toolchain even though the normal Bazel deps are present.
+# 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/grpc/patches:disable_xds_client_layering_check.patch"],
+    patches = ["//third_party/patches:grpc_fix_python_version.patch"],
+    version = "1.78.0",
 )

-bazel_dep(name = "grpc-java", version = "1.78.0.bcr.1")
+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")

@@ -253,13 +205,13 @@ bazel_dep(name = "flatbuffers", version = "25.12.19")
 # Testing
 #

-bazel_dep(name = "googletest", version = "1.17.0.bcr.2")
+bazel_dep(name = "googletest", version = "1.17.0")

 #
 # Container Images (OCI)
 #

-bazel_dep(name = "rules_oci", version = "2.3.0")
+bazel_dep(name = "rules_oci", version = "2.2.7")
 bazel_dep(name = "aspect_bazel_lib", version = "2.22.5")

 oci = use_extension("@rules_oci//oci:extensions.bzl", "oci")
@@ -270,19 +222,19 @@ oci = use_extension("@rules_oci//oci:extensions.bzl", "oci")
 #   curl -s -H "Authorization: Bearer $TOKEN" -H "Accept: application/vnd.oci.image.index.v1+json,application/vnd.docker.distribution.manifest.list.v2+json" "https://registry-1.docker.io/v2/library/eclipse-temurin/manifests/25-jre" | python3 -c "import json,sys; m=json.load(sys.stdin); [print(p['digest']) for p in m.get('manifests',[]) if p['platform']['architecture']=='amd64']"
 oci.pull(
    name = "eclipse_temurin_25_jre",
-    digest = "sha256:0beb258e10ad28d2bae0f74349a170bdfa67da0ef87c028cbf3d95c3e1170120",
+    digest = "sha256:98236ffdfb61cff3fc4f8e40e5b80460a5a4c35a0f56a5b4182a926844a7db49",
    image = "docker.io/library/eclipse-temurin",
    platforms = ["linux/amd64"],
-    tag = "26-jre",
+    tag = "25-jre",
 )

 # Base image for JFR sidecar (Java 25 JDK - includes jcmd for JFR dumps)
 oci.pull(
    name = "eclipse_temurin_25_jdk",
-    digest = "sha256:41c3a5b8a607d226c73e81538cd94d0e66f746f41f057561447eb47b40a91a65",
+    digest = "sha256:bc2d562355813350f47bc472b9721b0b84761866671ad95d9a9f1151fa69da6e",
    image = "docker.io/library/eclipse-temurin",
    platforms = ["linux/amd64"],
-    tag = "26-jdk",
+    tag = "25-jdk",
 )

 # Base image for Shardok (Ubuntu 24.04 for C++ runtime)
@@ -293,16 +245,15 @@ oci.pull(
        "linux/amd64",
        "linux/arm64/v8",
    ],
-    tag = "26.04",
+    tag = "24.04",
 )

 # Base image for Admin Server (Alpine for lightweight Go binary)
 oci.pull(
    name = "alpine_linux",
-    digest = "sha256:28bd5fe8b56d1bd048e5babf5b10710ebe0bae67db86916198a6eec434943f8b",
    image = "docker.io/library/alpine",
    platforms = ["linux/amd64"],
-    tag = "3.24",
+    tag = "3.21",
 )
 use_repo(oci, "alpine_linux", "alpine_linux_linux_amd64", "eclipse_temurin_25_jdk", "eclipse_temurin_25_jdk_linux_amd64", "eclipse_temurin_25_jre", "eclipse_temurin_25_jre_linux_amd64", "ubuntu_24_04", "ubuntu_24_04_linux_amd64", "ubuntu_24_04_linux_arm64_v8")

@@ -310,8 +261,8 @@ use_repo(oci, "alpine_linux", "alpine_linux_linux_amd64", "eclipse_temurin_25_jd
 # Java/Scala Dependencies
 #

-bazel_dep(name = "rules_java", version = "9.6.1")
-bazel_dep(name = "rules_jvm_external", version = "7.0")
+bazel_dep(name = "rules_java", version = "9.3.0")
+bazel_dep(name = "rules_jvm_external", version = "6.10")

 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 maven.install(
@@ -330,7 +281,7 @@ maven.install(

        # ScalaPB
        "com.thesamet.scalapb:lenses_3:%s" % SCALAPB_VERSION,
-        "com.thesamet.scalapb:scalapb-json4s_3:%s" % SCALAPB_JSON4S_VERSION,
+        "com.thesamet.scalapb:scalapb-json4s_3:%s" % SCALAPB_VERSION,
        "com.thesamet.scalapb:scalapb-runtime_3:%s" % SCALAPB_VERSION,
        "com.thesamet.scalapb:scalapb-runtime-grpc_3:%s" % SCALAPB_VERSION,
        "com.thesamet.scalapb:compilerplugin_3:%s" % SCALAPB_VERSION,
@@ -342,10 +293,10 @@ maven.install(
        "org.json4s:json4s-native_3:4.1.0-M8",

        # Testing
-        "org.scalamock:scalamock_3:7.5.5",
+        "org.scalamock:scalamock_3:7.4.1",

        # Developer tools
-        "org.scalameta:scalafmt-cli_2.13:3.11.1",
+        "org.scalameta:scalafmt-cli_2.13:3.9.9",

        # AWS SDK
        "software.amazon.awssdk:s3-transfer-manager:%s" % AWS_SDK_VERSION,
@@ -357,43 +308,35 @@ maven.install(
        "software.amazon.awssdk:http-client-spi:%s" % AWS_SDK_VERSION,

        # AWS Lambda
-        "com.amazonaws:aws-lambda-java-core:1.4.0",
-        "com.amazonaws:aws-lambda-java-events:3.16.1",
+        "com.amazonaws:aws-lambda-java-core:1.2.3",
+        "com.amazonaws:aws-lambda-java-events:3.13.0",

        # Logging
-        "org.slf4j:slf4j-api:%s" % SLF4J_VERSION,
-        "org.slf4j:slf4j-simple:%s" % SLF4J_VERSION,
+        "org.slf4j:slf4j-api:2.0.16",
+        "org.slf4j:slf4j-simple:2.0.16",

        # Other
        "org.reactivestreams:reactive-streams:1.0.4",
        "javax.xml.bind:jaxb-api:2.3.1",

        # OkHttp (for SSE with read timeout support, OAuth HTTP calls)
-        "com.squareup.okhttp3:okhttp-jvm:5.4.0",
-        "com.squareup.okhttp3:okhttp-sse:5.4.0",
+        "com.squareup.okhttp3:okhttp:4.12.0",
+        "com.squareup.okhttp3:okhttp-sse:4.12.0",

        # JWT (for OAuth token handling)
-        "com.nimbusds:nimbus-jose-jwt:10.9.1",
+        "com.nimbusds:nimbus-jose-jwt:9.37.3",

        # Error tracking
-        "io.sentry:sentry:8.43.2",
+        "io.sentry:sentry:8.31.0",

        # SQLite for client text storage
-        "org.xerial:sqlite-jdbc:3.53.2.0",
-
-        # Postgres for production history benchmarking and migration work
-        "com.zaxxer:HikariCP:6.3.3",
-        "org.postgresql:postgresql:42.7.11",
+        "org.xerial:sqlite-jdbc:3.46.1.0",
    ],
    duplicate_version_warning = "error",
    fail_if_repin_required = True,
-    known_contributing_modules = [
-        "grpc-java",
-        "protobuf",
-    ],
    lock_file = "//:maven_install.json",
    repositories = [
-        "https://repo.maven.apache.org/maven2",
+        "https://repo1.maven.org/maven2",
    ],
 )

@@ -403,7 +346,7 @@ maven.artifact(
    artifact = "scala3-staging_3",
    exclusions = ["org.scala-lang:scala3-compiler_3"],
    group = "org.scala-lang",
-    version = SCALA_VERSION,
+    version = "3.3.6",
 )

 # Force specific versions for dependencies with conflicts between grpc-java and protobuf
@@ -411,20 +354,21 @@ maven.artifact(
    artifact = "gson",
    force_version = True,
    group = "com.google.code.gson",
-    version = "2.14.0",
+    version = "2.11.0",
 )
 maven.artifact(
    artifact = "error_prone_annotations",
    force_version = True,
    group = "com.google.errorprone",
-    version = "2.50.0",
+    version = "2.30.0",
 )
 maven.artifact(
    artifact = "guava",
    force_version = True,
    group = "com.google.guava",
-    version = "33.6.0-jre",
+    version = "33.3.1-android",
 )
+
 use_repo(maven, "maven", "unpinned_maven")

 #
@@ -432,7 +376,6 @@ use_repo(maven, "maven", "unpinned_maven")
 #

 http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
 http_file = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")

 # GTL (for parallel_hashmap)
@@ -443,8 +386,6 @@ GTL_SHA = "1969c45dd76eac0dd87e9e2b65cffe358617f4fe1bcd203f72f427742537913a"
 http_archive(
    name = "gtl",
    build_file_content = """
-load("@rules_cc//cc:defs.bzl", "cc_library")
-
 cc_library(
    name = "gtl",
    hdrs = glob(["include/gtl/*.hpp"]),
@@ -472,12 +413,12 @@ http_archive(
 )

 # Sparkle framework for macOS auto-updates
-SPARKLE_VERSION = "2.9.3"
+SPARKLE_VERSION = "2.6.4"

 http_archive(
    name = "sparkle",
    build_file = "//src/main/objc/net/eagle0/clients/unity/sparkle/external:BUILD.sparkle",
-    sha256 = "74a07da821f92b79310009954c0e15f350173374a3abe39095b4fc5096916be6",
+    sha256 = "50612a06038abc931f16011d7903b8326a362c1074dabccb718404ce8e585f0b",
    strip_prefix = "",
    url = "https://github.com/sparkle-project/Sparkle/releases/download/%s/Sparkle-%s.tar.xz" % (SPARKLE_VERSION, SPARKLE_VERSION),
 )
@@ -487,24 +428,24 @@ http_archive(
 # Fallback: busybox.net (can be unreliable/slow)
 http_file(
    name = "busybox_x86_64",
-    downloaded_file_path = "busybox",
-    executable = True,
    sha256 = "6e123e7f3202a8c1e9b1f94d8941580a25135382b99e8d3e34fb858bba311348",
    urls = [
        "https://eagle0-sysroot.sfo3.digitaloceanspaces.com/busybox/busybox-1.35.0-x86_64-linux-musl",
        "https://busybox.net/downloads/binaries/1.35.0-x86_64-linux-musl/busybox",
    ],
+    downloaded_file_path = "busybox",
+    executable = True,
 )

 http_file(
    name = "busybox_aarch64",
-    downloaded_file_path = "busybox",
-    executable = True,
    sha256 = "141adb1b625a6f44c4b114f76b4387b4ea4f7ab802b88eb40e0d2f6adcccb1c3",
    urls = [
        # TODO: Upload aarch64 binary to GitHub release when needed
        "https://busybox.net/downloads/binaries/1.35.0-aarch64-linux-musl/busybox",
    ],
+    downloaded_file_path = "busybox",
+    executable = True,
 )

 # LLVM MinGW toolchain for Windows cross-compilation from macOS
@@ -578,7 +519,7 @@ 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",
-    "@llvm_toolchain_linux//:cc-toolchain-x86_64-linux",
-    "@llvm_toolchain_linux_arm64//:cc-toolchain-aarch64-linux",
+    "@llvm_toolchain_linux//:all",
+    "@llvm_toolchain_linux_arm64//:all",
    dev_dependency = True,
 )
@@ -212,9 +212,9 @@ oci_push(
 )

 #
-# Shardok Server ARM64 Docker Image (for the Hetzner deployment host)
+# Shardok Server ARM64 Docker Image (for Hetzner on-demand compute)
 #
-# Build: bazel build //ci:shardok_server_image_arm64 --platforms=//:linux_arm64 --extra_toolchains=@llvm_toolchain_linux_arm64//:cc-toolchain-aarch64-linux
+# Build: bazel build //ci:shardok_server_image_arm64 --platforms=//:linux_arm64 --extra_toolchains=@llvm_toolchain_linux_arm64//:all
 # Load:  bazel run //ci:shardok_server_load_arm64
 # Push:  bazel run //ci:shardok_server_push_arm64
 #
@@ -5,7 +5,8 @@ set -x

 COMMAND_LOG="$(bazel info command_log)"
 bazel build \
-  //src/main/cpp/net/eagle0/shardok:shardok-server
+  //src/main/cpp/net/eagle0/shardok:shardok-server \
+  //src/main/cpp/net/eagle0/shardok:shardok-inspector
 STATUS="$?"

 if [ $STATUS -eq 0 ]
@@ -25,6 +26,7 @@ echo "Setting up Shardok files..."
 /bin/cp -R ./bazel-bin/src/main/cpp/net/eagle0/shardok/shardok-server ./shardok/
 /bin/mkdir -p ./shardok/shardok-server.runfiles/net_eagle0/src/main/
 /bin/cp -R ./bazel-bin/src/main/cpp/net/eagle0/shardok/shardok-server.runfiles/net_eagle0/src/main/resources ./shardok/shardok-server.runfiles/net_eagle0/src/main/
+/bin/cp -R ./bazel-bin/src/main/cpp/net/eagle0/shardok/shardok-inspector ./shardok/

 echo "tar & zip shardok files..."
 /bin/tar cfh - shardok | /usr/bin/pigz > ./deploy/shardok.tar.gz
@@ -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
@@ -9,23 +9,13 @@ WORKSPACE=$(pwd)
 UNITY_INSTALL_PATH="/Applications/Unity/Hub/Editor"
 BUILD_DIR=$1
 LOG_PATH=$2
-BUILD_ADDRESSABLES=${3:-true}
-ADDRESSABLES_BUILD_LAYOUT=${4:-$BUILD_ADDRESSABLES}

 echo "Building Mac in $BUILD_DIR"
-echo "Build Addressables: $BUILD_ADDRESSABLES"
-echo "Generate Addressables build layout: $ADDRESSABLES_BUILD_LAYOUT"

 echo "Cleaning up $BUILD_DIR"
 /bin/rm -rf "$BUILD_DIR"
 /bin/mkdir -p "$BUILD_DIR"

-if [ -n "${DOTNET_ROOT:-}" ]; then
-    export PATH="$DOTNET_ROOT:$PATH"
-    export DOTNET_HOST_PATH="$DOTNET_ROOT/dotnet"
-fi
-dotnet --list-sdks
-
 # Use custom build script that builds Addressables before the player
 # Capture exit code to show log on failure
 set +e
@@ -35,8 +25,6 @@ ${UNITY_INSTALL_PATH}/${UNITY_VERSION}/Unity.app/Contents/MacOS/Unity \
   -quit \
   -executeMethod BuildScript.BuildMacPlayer \
   -buildPath "$BUILD_DIR/eagle0.app" \
-   -buildAddressables "$BUILD_ADDRESSABLES" \
-   -addressablesBuildLayout "$ADDRESSABLES_BUILD_LAYOUT" \
   -logFile "$LOG_PATH" \
   -projectPath "$WORKSPACE/src/main/csharp/net/eagle0/clients/unity/eagle0"
 UNITY_EXIT_CODE=$?
@@ -15,7 +15,6 @@ git log -3
 /bin/echo "build Windows"
 LOG_PATH="${BUILD_BASE}/editor_win.log"
 BUILD_DIR=$1
-BUILD_ADDRESSABLES=${2:-true}
-ADDRESSABLES_BUILD_LAYOUT=${3:-$BUILD_ADDRESSABLES}

-./ci/github_actions/build_windows.sh "$BUILD_DIR" "$LOG_PATH" "$BUILD_ADDRESSABLES" "$ADDRESSABLES_BUILD_LAYOUT"
+./ci/github_actions/build_windows.sh $BUILD_DIR $LOG_PATH
+
@@ -12,8 +12,6 @@ BUILD_BASE="${EAGLE0_BUILD_DIR:-/tmp/eagle0}"

 WORKSPACE=$(pwd)
 BUILD_PATH=${1:-"${BUILD_BASE}/eagle0iOS"}
-BUILD_ADDRESSABLES=${2:-true}
-ADDRESSABLES_BUILD_LAYOUT=${3:-$BUILD_ADDRESSABLES}
 LOG_PATH="${BUILD_BASE}/editor_ios.log"

 # Generate unique build number from git commit count
@@ -27,8 +25,6 @@ echo "Building protos"
 UNITY_INSTALL_PATH="/Applications/Unity/Hub/Editor"

 echo "Building iOS Unity player to: $BUILD_PATH"
-echo "Build Addressables: $BUILD_ADDRESSABLES"
-echo "Generate Addressables build layout: $ADDRESSABLES_BUILD_LAYOUT"

 mkdir -p "$(dirname "$LOG_PATH")"
 mkdir -p "$BUILD_PATH"
@@ -43,8 +39,6 @@ ${UNITY_INSTALL_PATH}/${UNITY_VERSION}/Unity.app/Contents/MacOS/Unity \
   -executeMethod BuildScript.BuildiOSPlayer \
   -buildPath "$BUILD_PATH" \
   -buildNumber "$BUILD_NUMBER" \
-   -buildAddressables "$BUILD_ADDRESSABLES" \
-   -addressablesBuildLayout "$ADDRESSABLES_BUILD_LAYOUT" \
   -logFile "$LOG_PATH" \
   -projectPath "$WORKSPACE/src/main/csharp/net/eagle0/clients/unity/eagle0"
 UNITY_EXIT_CODE=$?
@@ -59,20 +53,6 @@ if [ $UNITY_EXIT_CODE -ne 0 ]; then
    exit $UNITY_EXIT_CODE
 fi

-if [ ! -f "$LOG_PATH" ]; then
-    echo ""
-    echo "ERROR: Unity exited successfully but did not write an editor log at $LOG_PATH"
-    exit 1
-fi
-
-if [ ! -f "$BUILD_PATH/Data/Raw/aa/settings.json" ]; then
-    echo ""
-    echo "ERROR: iOS player is missing Addressables runtime data at:"
-    echo "  $BUILD_PATH/Data/Raw/aa/settings.json"
-    echo "Build Addressables before packaging the player so Addressables can initialize at runtime."
-    exit 1
-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
@@ -18,7 +18,5 @@ git log -3
 /bin/echo "build Mac"
 LOG_PATH="${BUILD_BASE}/editor_mac.log"
 BUILD_DIR=$1
-BUILD_ADDRESSABLES=${2:-true}
-ADDRESSABLES_BUILD_LAYOUT=${3:-$BUILD_ADDRESSABLES}

-./ci/github_actions/build_mac.sh "$BUILD_DIR" "$LOG_PATH" "$BUILD_ADDRESSABLES" "$ADDRESSABLES_BUILD_LAYOUT"
+./ci/github_actions/build_mac.sh "$BUILD_DIR" "$LOG_PATH"
@@ -9,23 +9,13 @@ WORKSPACE=`pwd`
 UNITY_INSTALL_PATH="/Applications/Unity/Hub/Editor"
 BUILD_DIR=$1
 LOG_PATH=$2
-BUILD_ADDRESSABLES=${3:-true}
-ADDRESSABLES_BUILD_LAYOUT=${4:-$BUILD_ADDRESSABLES}

 echo "Building in $1"
-echo "Build Addressables: $BUILD_ADDRESSABLES"
-echo "Generate Addressables build layout: $ADDRESSABLES_BUILD_LAYOUT"

 echo "Cleaning up $1"
 /bin/rm -rf $1
 /bin/mkdir -p $1

-if [ -n "${DOTNET_ROOT:-}" ]; then
-    export PATH="$DOTNET_ROOT:$PATH"
-    export DOTNET_HOST_PATH="$DOTNET_ROOT/dotnet"
-fi
-dotnet --list-sdks
-
 # Use custom build script that builds Addressables before the player
 # Capture exit code to show log on failure
 set +e
@@ -35,8 +25,6 @@ ${UNITY_INSTALL_PATH}/${UNITY_VERSION}/Unity.app/Contents/MacOS/Unity \
   -quit \
   -executeMethod BuildScript.BuildWindowsPlayer \
   -buildPath "$BUILD_DIR/eagle0.exe" \
-   -buildAddressables "$BUILD_ADDRESSABLES" \
-   -addressablesBuildLayout "$ADDRESSABLES_BUILD_LAYOUT" \
   -logFile $LOG_PATH \
   -projectPath "$WORKSPACE/src/main/csharp/net/eagle0/clients/unity/eagle0"
 UNITY_EXIT_CODE=$?
@@ -57,14 +45,6 @@ if [ ! -f "$LOG_PATH" ]; then
    exit 1
 fi

-if [ ! -f "$BUILD_DIR/eagle0_Data/StreamingAssets/aa/settings.json" ]; then
-    echo ""
-    echo "ERROR: Windows player is missing Addressables runtime data at:"
-    echo "  $BUILD_DIR/eagle0_Data/StreamingAssets/aa/settings.json"
-    echo "Build Addressables before packaging the player so Addressables can initialize at runtime."
-    exit 1
-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
@@ -1,64 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-BASE_SHA=${1:-}
-HEAD_SHA=${2:-HEAD}
-OUTPUT_FILE=${GITHUB_OUTPUT:-}
-
-if [ -z "$BASE_SHA" ] || [[ "$BASE_SHA" =~ ^0+$ ]]; then
-    echo "No usable base SHA for this run; building Addressables as a safe default."
-    changed=true
-elif ! git cat-file -e "$BASE_SHA^{commit}"; then
-    echo "Base SHA $BASE_SHA is not available locally; building Addressables as a safe default."
-    changed=true
-else
-    UNITY_PROJECT="src/main/csharp/net/eagle0/clients/unity/eagle0"
-    ADDRESSABLE_PREFIXES=(
-        "$UNITY_PROJECT/Assets/AddressableAssetsData/"
-        "$UNITY_PROJECT/Assets/Eagle/Effects/"
-        "$UNITY_PROJECT/Assets/Hex Tiles/"
-        "$UNITY_PROJECT/Assets/TileableBridgePack/"
-        "$UNITY_PROJECT/Assets/Shardok/LargeFlames.prefab"
-        "$UNITY_PROJECT/Assets/Shardok/soundEffects/"
-        "$UNITY_PROJECT/Assets/Shardok/Sounds/"
-        "$UNITY_PROJECT/Assets/Medieval Combat Sounds/"
-        "$UNITY_PROJECT/Assets/Magic Spells Sound Effects LITE/"
-        "$UNITY_PROJECT/Assets/Fantasy Interface Sounds/"
-        "$UNITY_PROJECT/Assets/AustraliaAnimalsPackv1/"
-        "$UNITY_PROJECT/Assets/Music/"
-        "$UNITY_PROJECT/Assets/Editor/BuildScript.cs"
-    )
-
-    is_addressables_input() {
-        local file="$1"
-        for prefix in "${ADDRESSABLE_PREFIXES[@]}"; do
-            if [[ "$file" == "$prefix"* ]]; then
-                return 0
-            fi
-        done
-
-        return 1
-    }
-
-    changed=false
-    while IFS= read -r file; do
-        if is_addressables_input "$file"; then
-            echo "Addressables-impacting change: $file"
-            changed=true
-            break
-        fi
-    done < <(git diff --name-only "$BASE_SHA" "$HEAD_SHA")
-fi
-
-if [ "$changed" = "true" ]; then
-    echo "Building Addressables because their inputs changed."
-else
-    echo "Skipping Addressables build; no Addressables inputs changed."
-fi
-
-if [ -n "$OUTPUT_FILE" ]; then
-    echo "changed=$changed" >> "$OUTPUT_FILE"
-else
-    echo "changed=$changed"
-fi
@@ -5,26 +5,8 @@ set -euo pipefail
 COMMON_PATHS="/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
 export PATH="${COMMON_PATHS}:${PATH}"

-repo_contents_cache_dir() {
-    if [ "$(uname -s)" = "Darwin" ]; then
-        printf '%s\n' "${HOME}/Library/Caches/eagle0-bazel-repo-contents"
-    else
-        printf '%s\n' "${XDG_CACHE_HOME:-${HOME}/.cache}/eagle0-bazel-repo-contents"
-    fi
-}
-
-write_bazel_local_config() {
-    local repo_contents_cache
-    repo_contents_cache="$(repo_contents_cache_dir)"
-
+write_developer_dir_override() {
    if [ "$(uname -s)" != "Darwin" ]; then
-        if [ -n "${CI:-}" ]; then
-            mkdir -p "$repo_contents_cache"
-            {
-                echo "# Generated by ci/github_actions/ensure_bazel_installed.sh; do not edit."
-                printf 'common --repo_contents_cache=%s\n' "$repo_contents_cache"
-            } > .bazelrc.local
-        fi
        return
    fi

@@ -48,10 +30,8 @@ write_bazel_local_config() {
    if [ -f .bazelrc.local ] && [ -z "${CI:-}" ]; then
        echo "Keeping existing .bazelrc.local outside CI"
    else
-        mkdir -p "$repo_contents_cache"
        {
            echo "# Generated by ci/github_actions/ensure_bazel_installed.sh; do not edit."
-            printf 'common --repo_contents_cache=%s\n' "$repo_contents_cache"
            printf 'common:macos --repo_env=DEVELOPER_DIR=%s\n' "$developer_dir"
        } > .bazelrc.local
    fi
@@ -63,7 +43,7 @@ write_bazel_local_config() {
    echo "Using Apple developer directory at $developer_dir"
 }

-write_bazel_local_config
+write_developer_dir_override

 if [ -n "${GITHUB_PATH:-}" ]; then
    for path in /opt/homebrew/bin /usr/local/bin; do
@@ -34,7 +34,6 @@ echo "Platform: ${PLATFORM}"
 # Check if Unity is installed and has required modules
 check_modules_installed() {
    local unity_path="${UNITY_INSTALL_PATH}/${UNITY_VERSION}"
-    local unity_app_contents_path="${unity_path}/Unity.app/Contents"

    if [ ! -d "$unity_path" ]; then
        return 1
@@ -49,12 +48,15 @@ check_modules_installed() {
            fi
            ;;
        mac)
-            if ! has_mac_il2cpp_support "$unity_path" "$unity_app_contents_path"; then
+            # Mac IL2CPP module
+            if [ ! -d "${unity_path}/PlaybackEngines/MacStandaloneSupport/Variations/macos_development_il2cpp" ] && \
+               [ ! -d "${unity_path}/PlaybackEngines/MacStandaloneSupport" ]; then
                echo "✗ Mac IL2CPP module not installed for Unity ${UNITY_VERSION}"
                return 1
            fi
            ;;
        windows)
+            # Windows mono module
            if [ ! -d "${unity_path}/PlaybackEngines/WindowsStandaloneSupport" ]; then
                echo "✗ Windows module not installed for Unity ${UNITY_VERSION}"
                return 1
@@ -67,8 +69,8 @@ check_modules_installed() {
                echo "✗ iOS module missing"
                missing=1
            fi
-            if ! has_mac_il2cpp_support "$unity_path" "$unity_app_contents_path"; then
-                echo "✗ Mac IL2CPP module missing"
+            if [ ! -d "${unity_path}/PlaybackEngines/MacStandaloneSupport" ]; then
+                echo "✗ Mac module missing"
                missing=1
            fi
            if [ ! -d "${unity_path}/PlaybackEngines/WindowsStandaloneSupport" ]; then
@@ -84,27 +86,6 @@ check_modules_installed() {
    return 0
 }

-has_mac_il2cpp_support() {
-    local unity_path="$1"
-    local unity_app_contents_path="$2"
-
-    has_il2cpp_variation "${unity_app_contents_path}/PlaybackEngines/MacStandaloneSupport/Variations" ||
-            has_il2cpp_variation "${unity_path}/PlaybackEngines/MacStandaloneSupport/Variations"
-}
-
-has_il2cpp_variation() {
-    local variations_path="$1"
-    local variation
-
-    for variation in "${variations_path}"/*il2cpp*; do
-        if [ -d "$variation" ]; then
-            return 0
-        fi
-    done
-
-    return 1
-}
-
 # Check if already installed with required modules
 if check_modules_installed; then
    echo "✓ Unity ${UNITY_VERSION} is already installed with ${PLATFORM} support"
@@ -210,10 +191,8 @@ echo "Running: ${INSTALL_CMD[*]}"
 echo ""

 # Capture output to check for "already installed" messages
-set +e
-OUTPUT=$("${INSTALL_CMD[@]}" 2>&1)
+OUTPUT=$("${INSTALL_CMD[@]}" 2>&1) || true
 EXIT_CODE=$?
-set -e
 echo "$OUTPUT"

 # Check if modules are already installed (Unity Hub returns error but modules are present)
@@ -240,13 +219,13 @@ else
    exit 1
 fi

-# Verify installation and requested modules
+# Verify installation
 echo ""
-if check_modules_installed; then
-    echo "✓ Verified: Unity ${UNITY_VERSION} is now installed with ${PLATFORM} support"
+if [ -d "${UNITY_INSTALL_PATH}/${UNITY_VERSION}" ]; then
+    echo "✓ Verified: Unity ${UNITY_VERSION} is now installed"
    exit 0
 else
-    echo "✗ Unity ${UNITY_VERSION} installation with ${PLATFORM} support could not be verified"
+    echo "✗ Unity ${UNITY_VERSION} installation could not be verified"
    echo "  Expected path: ${UNITY_INSTALL_PATH}/${UNITY_VERSION}"
    echo ""
    echo "The installation may still be in progress, or may require manual intervention."
@@ -38,23 +38,15 @@ fi
 echo "Using git-lfs at $(command -v git-lfs)"
 git lfs version

-git lfs install --local --force
+git lfs install

 echo "LFS objects before pull:"
 git lfs ls-files | wc -l

 GIT_LFS_PULL=(git lfs pull)
-FALLBACK_GITHUB_LFS_PULL=()
 if [ -n "${GITHUB_TOKEN:-}" ]; then
    BASIC_AUTH=$(printf 'x-access-token:%s' "$GITHUB_TOKEN" | base64 | tr -d '\n')
    GIT_LFS_PULL=(git -c "http.https://github.com/.extraheader=AUTHORIZATION: basic $BASIC_AUTH" lfs pull)
-    FALLBACK_GITHUB_LFS_PULL=(
-        git
-        -c "http.https://github.com/.extraheader=AUTHORIZATION: basic $BASIC_AUTH"
-        -c "lfs.url=https://github.com/nolen777/eagle0.git/info/lfs"
-        lfs
-        pull
-    )
 fi

 for i in $(seq 1 $MAX_ATTEMPTS); do
@@ -69,14 +61,5 @@ for i in $(seq 1 $MAX_ATTEMPTS); do
    fi
 done

-if [ "${#FALLBACK_GITHUB_LFS_PULL[@]}" -gt 0 ]; then
-    echo "LFS mirror pull failed after $MAX_ATTEMPTS attempts; trying GitHub LFS fallback"
-    if "${FALLBACK_GITHUB_LFS_PULL[@]}" "$@"; then
-        echo "LFS objects after GitHub fallback pull:"
-        git lfs ls-files | wc -l
-        exit 0
-    fi
-fi
-
 echo "LFS pull failed after $MAX_ATTEMPTS attempts"
 exit 1
@@ -1,235 +0,0 @@
-#!/usr/bin/env python3
-"""Print a compact timing summary from a Bazel build event JSON file."""
-
-from __future__ import annotations
-
-import json
-import sys
-from collections import Counter, defaultdict
-from pathlib import Path
-from typing import Any
-
-
-def duration_to_ms(value: Any) -> float | None:
-    if value is None:
-        return None
-    if isinstance(value, (int, float)):
-        return float(value)
-    if isinstance(value, str):
-        if value.endswith("s"):
-            try:
-                return float(value[:-1]) * 1000
-            except ValueError:
-                return None
-        try:
-            return float(value)
-        except ValueError:
-            return None
-    if isinstance(value, dict):
-        seconds = value.get("seconds", 0)
-        nanos = value.get("nanos", 0)
-        try:
-            return float(seconds) * 1000 + float(nanos) / 1_000_000
-        except (TypeError, ValueError):
-            return None
-    return None
-
-
-def format_ms(milliseconds: float | None) -> str | None:
-    if milliseconds is None:
-        return None
-    if milliseconds >= 1000:
-        return f"{milliseconds / 1000:.2f}s"
-    return f"{milliseconds:.0f}ms"
-
-
-def nested_get(data: dict[str, Any], *keys: str) -> Any:
-    current: Any = data
-    for key in keys:
-        if not isinstance(current, dict):
-            return None
-        current = current.get(key)
-    return current
-
-
-def read_events(path: Path) -> list[dict[str, Any]]:
-    events = []
-    with path.open() as file:
-        for line_number, line in enumerate(file, start=1):
-            stripped = line.strip()
-            if not stripped:
-                continue
-            try:
-                event = json.loads(stripped)
-            except json.JSONDecodeError as error:
-                print(f"Ignoring malformed BEP line {line_number}: {error}")
-                continue
-            if isinstance(event, dict):
-                events.append(event)
-    return events
-
-
-def collect_metric_events(events: list[dict[str, Any]]) -> list[dict[str, Any]]:
-    metric_events = []
-    for event in events:
-        if isinstance(event.get("buildMetrics"), dict):
-            metric_events.append(event["buildMetrics"])
-    return metric_events
-
-
-def first_present(data: dict[str, Any], keys: list[str]) -> Any:
-    for key in keys:
-        value = data.get(key)
-        if value is not None:
-            return value
-    return None
-
-
-def summarize_timing(build_metrics: dict[str, Any]) -> list[str]:
-    timing = build_metrics.get("timingMetrics")
-    if not isinstance(timing, dict):
-        return []
-
-    labels = [
-        ("Wall time", ["wallTimeInMs", "wallTime", "elapsedTime"]),
-        ("Loading phase", ["loadingPhaseTimeInMs", "loadingPhaseTime"]),
-        ("Analysis phase", ["analysisPhaseTimeInMs", "analysisPhaseTime"]),
-        ("Execution phase", ["executionPhaseTimeInMs", "executionPhaseTime"]),
-        ("Critical path", ["criticalPathTimeInMs", "criticalPathTime"]),
-    ]
-
-    lines = []
-    for label, keys in labels:
-        value = format_ms(duration_to_ms(first_present(timing, keys)))
-        if value is not None:
-            lines.append(f"  {label}: {value}")
-    return lines
-
-
-def summarize_counts(build_metrics: dict[str, Any]) -> list[str]:
-    summaries: list[tuple[str, Any]] = []
-
-    action_summary = build_metrics.get("actionSummary")
-    if isinstance(action_summary, dict):
-        summaries.extend(
-            [
-                ("Actions created", action_summary.get("actionsCreated")),
-                ("Actions executed", action_summary.get("actionsExecuted")),
-                ("Action cache hits", action_summary.get("actionCacheHits")),
-                ("Remote cache hits", action_summary.get("remoteCacheHits")),
-            ]
-        )
-
-    target_metrics = build_metrics.get("targetMetrics")
-    if isinstance(target_metrics, dict):
-        summaries.extend(
-            [
-                ("Targets configured", target_metrics.get("targetsConfigured")),
-                ("Targets loaded", target_metrics.get("targetsLoaded")),
-            ]
-        )
-
-    package_metrics = build_metrics.get("packageMetrics")
-    if isinstance(package_metrics, dict):
-        summaries.extend(
-            [
-                ("Packages loaded", package_metrics.get("packagesLoaded")),
-                ("Packages successfully loaded", package_metrics.get("packagesSuccessfullyLoaded")),
-            ]
-        )
-
-    return [f"  {label}: {value}" for label, value in summaries if value is not None]
-
-
-def worker_mnemonic(metric: dict[str, Any]) -> str:
-    for path in [
-        ("mnemonic",),
-        ("workerKey", "mnemonic"),
-        ("workerKeyInfo", "mnemonic"),
-    ]:
-        value = nested_get(metric, *path)
-        if value:
-            return str(value)
-    return "unknown"
-
-
-def worker_actions(metric: dict[str, Any]) -> int | None:
-    for key in ["actionsExecuted", "executedActionCount", "actionCount", "actions"]:
-        value = metric.get(key)
-        if isinstance(value, int):
-            return value
-        if isinstance(value, str):
-            try:
-                return int(value)
-            except ValueError:
-                pass
-    return None
-
-
-def summarize_workers(build_metrics: dict[str, Any]) -> list[str]:
-    worker_metrics = build_metrics.get("workerMetrics")
-    if not isinstance(worker_metrics, list) or not worker_metrics:
-        return []
-
-    counts = Counter()
-    actions_by_mnemonic: defaultdict[str, int] = defaultdict(int)
-    saw_action_counts = False
-
-    for metric in worker_metrics:
-        if not isinstance(metric, dict):
-            continue
-        mnemonic = worker_mnemonic(metric)
-        counts[mnemonic] += 1
-        actions = worker_actions(metric)
-        if actions is not None:
-            saw_action_counts = True
-            actions_by_mnemonic[mnemonic] += actions
-
-    if not counts:
-        return []
-
-    lines = ["  Worker metric entries:"]
-    for mnemonic, count in counts.most_common():
-        suffix = ""
-        if saw_action_counts:
-            suffix = f", actions={actions_by_mnemonic[mnemonic]}"
-        lines.append(f"    {mnemonic}: workers={count}{suffix}")
-    return lines
-
-
-def main() -> int:
-    if len(sys.argv) != 2:
-        print("Usage: summarize_bazel_bep.py <build_event_json_file>")
-        return 0
-
-    path = Path(sys.argv[1])
-    if not path.exists():
-        print(f"Bazel BEP summary: {path} does not exist")
-        return 0
-
-    events = read_events(path)
-    metric_events = collect_metric_events(events)
-    if not metric_events:
-        print("Bazel BEP summary: no buildMetrics event found")
-        return 0
-
-    build_metrics = metric_events[-1]
-    sections = [
-        summarize_timing(build_metrics),
-        summarize_counts(build_metrics),
-        summarize_workers(build_metrics),
-    ]
-    lines = [line for section in sections for line in section]
-
-    if not lines:
-        print("Bazel BEP summary: buildMetrics event had no recognized metrics")
-        return 0
-
-    print("Bazel BEP summary:")
-    for line in lines:
-        print(line)
-    return 0
-
-
-if __name__ == "__main__":
-    sys.exit(main())
@@ -1,56 +0,0 @@
-#!/usr/bin/env bash
-
-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)
-UNITY_INSTALL_PATH="/Applications/Unity/Hub/Editor"
-LOG_PATH="${BUILD_BASE}/editor_editmode_tests.log"
-RESULTS_PATH="${BUILD_BASE}/editmode-test-results.xml"
-
-mkdir -p "$BUILD_BASE"
-
-echo "Building protos"
-./scripts/build_protos.sh
-
-echo "Running Unity EditMode tests"
-
-set +e
-"${UNITY_INSTALL_PATH}/${UNITY_VERSION}/Unity.app/Contents/MacOS/Unity" \
-   -nographics \
-   -batchmode \
-   -quit \
-   -executeMethod eagle0.Tests.DynamicTextBindingTestRunner.Run \
-   -testResults "$RESULTS_PATH" \
-   -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 EditMode tests failed with exit code $UNITY_EXIT_CODE"
-    echo "=== Unity EditMode Test Log (last 200 lines) ==="
-    tail -200 "$LOG_PATH" || echo "Could not read log file at $LOG_PATH"
-    echo "=== End of Unity EditMode Test Log ==="
-    exit $UNITY_EXIT_CODE
-fi
-
-if [ ! -f "$LOG_PATH" ]; then
-    echo ""
-    echo "ERROR: Unity exited successfully but did not write an editor log at $LOG_PATH"
-    exit 1
-fi
-
-if [ ! -f "$RESULTS_PATH" ]; then
-    echo ""
-    echo "ERROR: Unity exited successfully but did not write test results at $RESULTS_PATH"
-    exit 1
-fi
-
-echo "Unity EditMode tests complete"
@@ -13,166 +13,11 @@ set -euxo pipefail
 BUILD_TARGET=$1
 WORKSPACE=$(pwd)
 UNITY_PROJECT="$WORKSPACE/src/main/csharp/net/eagle0/clients/unity/eagle0"
-UNITY_VERSION=$(grep "m_EditorVersion:" "$UNITY_PROJECT/ProjectSettings/ProjectVersion.txt" | head -1 | sed 's/m_EditorVersion: //')
-UNITY_MAJOR_MINOR=$(echo "$UNITY_VERSION" | sed -E 's/^([0-9]+)\.([0-9]+).*/\1.\2/')
-ADDRESSABLES_PREFIX="addressables/$BUILD_TARGET/$UNITY_MAJOR_MINOR"
-SERVER_DATA="$UNITY_PROJECT/ServerData/$BUILD_TARGET/$UNITY_MAJOR_MINOR"
+SERVER_DATA="$UNITY_PROJECT/ServerData/$BUILD_TARGET"

 # DigitalOcean Spaces configuration (same region as other eagle0 buckets)
 DO_ENDPOINT="https://sfo3.digitaloceanspaces.com"
 DO_BUCKET="eagle0-assets"
-DEFAULT_MAX_UPLOAD_BYTES=$((1024 * 1024 * 1024))
-DEFAULT_MAX_SINGLE_FILE_BYTES=$((512 * 1024 * 1024))
-MAX_UPLOAD_BYTES=${ADDRESSABLES_MAX_UPLOAD_BYTES:-$DEFAULT_MAX_UPLOAD_BYTES}
-MAX_SINGLE_FILE_BYTES=${ADDRESSABLES_MAX_SINGLE_FILE_BYTES:-$DEFAULT_MAX_SINGLE_FILE_BYTES}
-TOP_UPLOAD_COUNT=${ADDRESSABLES_TOP_UPLOAD_COUNT:-20}
-
-COMMON_PATHS="/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
-export PATH="${COMMON_PATHS}:${PATH}"
-
-format_bytes() {
-    local bytes=$1
-    local unit="B"
-    local value=$bytes
-
-    if [ "$bytes" -ge $((1024 * 1024 * 1024)) ]; then
-        unit="GiB"
-        value=$(awk "BEGIN { printf \"%.2f\", $bytes / 1024 / 1024 / 1024 }")
-    elif [ "$bytes" -ge $((1024 * 1024)) ]; then
-        unit="MiB"
-        value=$(awk "BEGIN { printf \"%.2f\", $bytes / 1024 / 1024 }")
-    elif [ "$bytes" -ge 1024 ]; then
-        unit="KiB"
-        value=$(awk "BEGIN { printf \"%.2f\", $bytes / 1024 }")
-    fi
-
-    echo "$value $unit"
-}
-
-file_size() {
-    local path=$1
-    if stat -f%z "$path" >/dev/null 2>&1; then
-        stat -f%z "$path"
-    else
-        stat -c%s "$path"
-    fi
-}
-
-append_summary() {
-    if [ -n "${GITHUB_STEP_SUMMARY:-}" ]; then
-        echo "$1" >> "$GITHUB_STEP_SUMMARY"
-    fi
-}
-
-budget_enabled() {
-    local value=$1
-    [ "$value" -gt 0 ]
-}
-
-summarize_pending_uploads() {
-    local sync_args_file
-    sync_args_file=$(mktemp)
-    local uploads_file
-    uploads_file=$(mktemp)
-    local sorted_uploads_file
-    sorted_uploads_file=$(mktemp)
-    trap 'rm -f "$sync_args_file" "$uploads_file" "$sorted_uploads_file"' RETURN
-
-    aws s3 sync "$SERVER_DATA" "s3://$DO_BUCKET/$ADDRESSABLES_PREFIX/" \
-        --endpoint-url "$DO_ENDPOINT" \
-        --acl public-read \
-        --size-only \
-        --delete \
-        --dryrun > "$sync_args_file"
-
-    while IFS= read -r line; do
-        case "$line" in
-            *upload:*)
-                local source_path=${line#*upload: }
-                source_path=${source_path% to s3://*}
-                if [ -f "$source_path" ]; then
-                    local size
-                    size=$(file_size "$source_path")
-                    printf "%s\t%s\n" "$size" "$source_path" >> "$uploads_file"
-                fi
-                ;;
-        esac
-    done < "$sync_args_file"
-
-    local upload_count=0
-    local upload_bytes=0
-    if [ -s "$uploads_file" ]; then
-        while IFS=$'\t' read -r size _path; do
-            upload_count=$((upload_count + 1))
-            upload_bytes=$((upload_bytes + size))
-        done < "$uploads_file"
-    fi
-
-    echo "Addressables upload preflight: $upload_count changed files, $(format_bytes "$upload_bytes") to upload."
-    append_summary "## Addressables upload preflight"
-    append_summary ""
-    append_summary "- Target: \`$BUILD_TARGET\`"
-    append_summary "- Changed files: \`$upload_count\`"
-    append_summary "- Changed upload bytes: \`$(format_bytes "$upload_bytes")\`"
-    append_summary "- Upload byte budget: \`$(format_bytes "$MAX_UPLOAD_BYTES")\`"
-    append_summary "- Single-file budget: \`$(format_bytes "$MAX_SINGLE_FILE_BYTES")\`"
-
-    local guardrail_failed=0
-
-    if [ -s "$uploads_file" ]; then
-        echo "Largest pending Addressables uploads:"
-        append_summary ""
-        append_summary "### Largest pending uploads"
-        append_summary ""
-        append_summary "| Size | Path |"
-        append_summary "| ---: | --- |"
-        sort -nr "$uploads_file" > "$sorted_uploads_file"
-        local listed_uploads=0
-        while IFS=$'\t' read -r size path; do
-            if [ "$listed_uploads" -ge "$TOP_UPLOAD_COUNT" ]; then
-                break
-            fi
-            local relative_path=${path#"$SERVER_DATA"/}
-            echo "  $(format_bytes "$size") $relative_path"
-            append_summary "| $(format_bytes "$size") | \`$relative_path\` |"
-            listed_uploads=$((listed_uploads + 1))
-        done < "$sorted_uploads_file"
-
-        if budget_enabled "$MAX_SINGLE_FILE_BYTES"; then
-            while IFS=$'\t' read -r size path; do
-                if [ "$size" -gt "$MAX_SINGLE_FILE_BYTES" ]; then
-                    local relative_path=${path#"$SERVER_DATA"/}
-                    echo "ERROR: Pending Addressables upload '$relative_path' is $(format_bytes "$size"), exceeding single-file budget $(format_bytes "$MAX_SINGLE_FILE_BYTES")."
-                    append_summary ""
-                    append_summary ":x: \`$relative_path\` exceeds the single-file budget at \`$(format_bytes "$size")\`."
-                    guardrail_failed=1
-                fi
-            done < "$uploads_file"
-        fi
-    fi
-
-    if budget_enabled "$MAX_UPLOAD_BYTES" && [ "$upload_bytes" -gt "$MAX_UPLOAD_BYTES" ]; then
-        echo "ERROR: Addressables upload is expected to send $(format_bytes "$upload_bytes"), exceeding budget $(format_bytes "$MAX_UPLOAD_BYTES")."
-        echo "A small asset change may have invalidated an oversized bundle; inspect the largest pending uploads above."
-        append_summary ""
-        append_summary ":x: Changed upload bytes exceed budget: \`$(format_bytes "$upload_bytes")\` > \`$(format_bytes "$MAX_UPLOAD_BYTES")\`."
-        guardrail_failed=1
-    fi
-
-    if [ "$guardrail_failed" -ne 0 ]; then
-        echo "Refusing to upload Addressables. Raise ADDRESSABLES_MAX_UPLOAD_BYTES or ADDRESSABLES_MAX_SINGLE_FILE_BYTES only after confirming the upload is intentional."
-        exit 1
-    fi
-}
-
-if ! command -v aws >/dev/null 2>&1; then
-    if command -v brew >/dev/null 2>&1; then
-        brew install awscli
-    else
-        echo "ERROR: aws CLI is unavailable, and Homebrew is not on PATH"
-        exit 1
-    fi
-fi

 if [ ! -d "$SERVER_DATA" ]; then
    echo "No Addressables bundles found at $SERVER_DATA"
@@ -181,34 +26,19 @@ if [ ! -d "$SERVER_DATA" ]; then
 fi

 echo "Uploading Addressables bundles from $SERVER_DATA"
-echo "Target: s3://$DO_BUCKET/$ADDRESSABLES_PREFIX/"
+echo "Target: s3://$DO_BUCKET/addressables/$BUILD_TARGET/"

 # Configure AWS CLI for DigitalOcean Spaces
 export AWS_ACCESS_KEY_ID="$ACCESS_KEY_ID"
 export AWS_SECRET_ACCESS_KEY="$SECRET_KEY"

-summarize_pending_uploads
-
-# Sync bundles to Spaces. Addressable bundle filenames include content hashes, so a
-# same-sized existing bundle is already the same content. Use --size-only to avoid
-# re-uploading every rebuilt bundle just because Unity gave it a fresh local mtime.
-# Metadata files keep stable names, so sync them again without --size-only below.
-#
-# --delete removes files in destination that don't exist in source.
-# --acl public-read makes files publicly accessible.
-aws s3 sync "$SERVER_DATA" "s3://$DO_BUCKET/$ADDRESSABLES_PREFIX/" \
+# Sync bundles to Spaces
+# --delete removes files in destination that don't exist in source
+# --acl public-read makes files publicly accessible
+aws s3 sync "$SERVER_DATA" "s3://$DO_BUCKET/addressables/$BUILD_TARGET/" \
    --endpoint-url "$DO_ENDPOINT" \
    --acl public-read \
-    --size-only \
    --delete

-aws s3 sync "$SERVER_DATA" "s3://$DO_BUCKET/$ADDRESSABLES_PREFIX/" \
-    --endpoint-url "$DO_ENDPOINT" \
-    --acl public-read \
-    --exclude "*" \
-    --include "*.bin" \
-    --include "*.hash" \
-    --include "*.json"
-
 echo "Addressables upload complete"
-echo "Files available at: https://assets.eagle0.net/$ADDRESSABLES_PREFIX/"
+echo "Files available at: https://assets.eagle0.net/addressables/$BUILD_TARGET/"
@@ -5,8 +5,6 @@ lower OCI layer and frequently-changing first-party jars in a small top layer,
 so most pushes only re-upload the small layer.
 """

-load("@rules_java//java/common:java_info.bzl", "JavaInfo")
-
 def _unique_name(jar):
    # short_path is unique per jar and stable across commits (it depends only on
    # the jar's own package/coordinate, not on unrelated targets), so the deps
@@ -1,3 +1,5 @@
+load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
+
 #pkg_tar(
 #    name = "eagle_servers",
 #    strip_prefix = "/src/main/scala/net/eagle0",
@@ -32,20 +32,6 @@ services:
      DO_SPACES_ENDPOINT: "${DO_SPACES_ENDPOINT:-https://sfo3.digitaloceanspaces.com}"
      DO_SPACES_ACCESS_KEY: "${DO_SPACES_ACCESS_KEY:-}"
      DO_SPACES_SECRET_KEY: "${DO_SPACES_SECRET_KEY:-}"
-      EAGLE_HISTORY_BACKEND: "${EAGLE_HISTORY_BACKEND:-postgres}"
-      EAGLE_POSTGRES_HOST: "${EAGLE_POSTGRES_HOST:-}"
-      EAGLE_POSTGRES_PORT: "${EAGLE_POSTGRES_PORT:-}"
-      EAGLE_POSTGRES_DATABASE: "${EAGLE_POSTGRES_DATABASE:-}"
-      EAGLE_POSTGRES_USER: "${EAGLE_POSTGRES_USER:-}"
-      EAGLE_POSTGRES_PASSWORD: "${EAGLE_POSTGRES_PASSWORD:-}"
-      EAGLE_POSTGRES_SSLMODE: "${EAGLE_POSTGRES_SSLMODE:-require}"
-      EAGLE_POSTGRES_MAX_POOL_SIZE: "${EAGLE_POSTGRES_MAX_POOL_SIZE:-7}"
-      EAGLE_POSTGRES_MIN_IDLE: "${EAGLE_POSTGRES_MIN_IDLE:-0}"
-      EAGLE_POSTGRES_CONNECTION_TIMEOUT_MILLIS: "${EAGLE_POSTGRES_CONNECTION_TIMEOUT_MILLIS:-10000}"
-      EAGLE_POSTGRES_IDLE_TIMEOUT_MILLIS: "${EAGLE_POSTGRES_IDLE_TIMEOUT_MILLIS:-120000}"
-      EAGLE_POSTGRES_MAX_LIFETIME_MILLIS: "${EAGLE_POSTGRES_MAX_LIFETIME_MILLIS:-1500000}"
-      EAGLE_POSTGRES_KEEPALIVE_TIME_MILLIS: "${EAGLE_POSTGRES_KEEPALIVE_TIME_MILLIS:-300000}"
-      EAGLE_POSTGRES_LEAK_DETECTION_THRESHOLD_MILLIS: "${EAGLE_POSTGRES_LEAK_DETECTION_THRESHOLD_MILLIS:-60000}"
      # JWT public key for token validation (auth service handles signing)
      # Reads from /etc/eagle0/keys/public.pem via shared volume
      # Auth token for Shardok on Hetzner (required)
@@ -95,20 +81,6 @@ services:
      DO_SPACES_ENDPOINT: "${DO_SPACES_ENDPOINT:-https://sfo3.digitaloceanspaces.com}"
      DO_SPACES_ACCESS_KEY: "${DO_SPACES_ACCESS_KEY:-}"
      DO_SPACES_SECRET_KEY: "${DO_SPACES_SECRET_KEY:-}"
-      EAGLE_HISTORY_BACKEND: "${EAGLE_HISTORY_BACKEND:-postgres}"
-      EAGLE_POSTGRES_HOST: "${EAGLE_POSTGRES_HOST:-}"
-      EAGLE_POSTGRES_PORT: "${EAGLE_POSTGRES_PORT:-}"
-      EAGLE_POSTGRES_DATABASE: "${EAGLE_POSTGRES_DATABASE:-}"
-      EAGLE_POSTGRES_USER: "${EAGLE_POSTGRES_USER:-}"
-      EAGLE_POSTGRES_PASSWORD: "${EAGLE_POSTGRES_PASSWORD:-}"
-      EAGLE_POSTGRES_SSLMODE: "${EAGLE_POSTGRES_SSLMODE:-require}"
-      EAGLE_POSTGRES_MAX_POOL_SIZE: "${EAGLE_POSTGRES_MAX_POOL_SIZE:-7}"
-      EAGLE_POSTGRES_MIN_IDLE: "${EAGLE_POSTGRES_MIN_IDLE:-0}"
-      EAGLE_POSTGRES_CONNECTION_TIMEOUT_MILLIS: "${EAGLE_POSTGRES_CONNECTION_TIMEOUT_MILLIS:-10000}"
-      EAGLE_POSTGRES_IDLE_TIMEOUT_MILLIS: "${EAGLE_POSTGRES_IDLE_TIMEOUT_MILLIS:-120000}"
-      EAGLE_POSTGRES_MAX_LIFETIME_MILLIS: "${EAGLE_POSTGRES_MAX_LIFETIME_MILLIS:-1500000}"
-      EAGLE_POSTGRES_KEEPALIVE_TIME_MILLIS: "${EAGLE_POSTGRES_KEEPALIVE_TIME_MILLIS:-300000}"
-      EAGLE_POSTGRES_LEAK_DETECTION_THRESHOLD_MILLIS: "${EAGLE_POSTGRES_LEAK_DETECTION_THRESHOLD_MILLIS:-60000}"
      # JWT public key for token validation (auth service handles signing)
      # Reads from /etc/eagle0/keys/public.pem via shared volume
      SHARDOK_AUTH_TOKEN: "${SHARDOK_AUTH_TOKEN:-}"
@@ -68,7 +68,7 @@ private GameObject GetEffectPrefab(string beastName) {

 ### 4. Wire up in the scene

-In `Assets/Scenes/Eagle.unity`, find the `ProvinceBeastsController` component on the Eagle map object and assign your new prefab to the new field.
+In `Gameplay.unity`, find the `ProvinceBeastsController` component and assign your new prefab to the new field.

 ### 5. Test

@@ -0,0 +1,159 @@
+# Hetzner Setup Guide
+
+This guide walks through setting up Hetzner Cloud infrastructure for running Shardok on-demand compute.
+
+## Prerequisites
+
+- All code PRs merged (#4990, #4996, #4998, #5001, #5009)
+- Access to DigitalOcean Container Registry (for pulling Shardok ARM64 image)
+
+---
+
+## Step 1: Create Hetzner Cloud Account
+
+1. Go to https://console.hetzner.cloud/
+2. Sign up and add payment method
+3. Create a new project (e.g., "eagle0")
+
+---
+
+## Step 2: Generate Hetzner API Token
+
+1. In Hetzner Console → Security → API Tokens
+2. Click "Generate API Token"
+3. Give it **Read & Write** permissions
+4. Copy the token (you'll only see it once)
+
+---
+
+## Step 3: Generate Shardok Auth Token
+
+Generate a 256-bit random token for Eagle-Shardok authentication:
+
+```bash
+openssl rand -hex 32
+```
+
+Save this output - it's the shared secret between Eagle and Shardok.
+
+---
+
+## Step 4: Store Secrets in GitHub Actions
+
+Add these secrets in GitHub → Settings → Secrets and variables → Actions:
+
+| Secret Name | Description |
+|-------------|-------------|
+| `HETZNER_API_TOKEN` | From Step 2 - for Hetzner API calls |
+| `SHARDOK_AUTH_TOKEN` | From Step 3 - shared secret for gRPC auth |
+
+Note: `DO_REGISTRY_TOKEN` already exists and will be used for Hetzner to pull container images.
+
+These secrets will be passed to Eagle at runtime via `docker_build.yml`, similar to how `OPENAI_API_KEY` and other secrets are handled.
+
+---
+
+## Step 5: DNS Setup (for Let's Encrypt)
+
+You need a domain pointing to the Shardok instance for TLS certificates.
+
+### Option A: Floating IP (Recommended)
+
+1. In Hetzner Console → Networking → Floating IPs
+2. Create a **Floating IPv6** in **Hillsboro, Oregon (hil)** region
+   - IPv6 costs €1/month vs €3/month for IPv4
+   - Hillsboro has better latency to DigitalOcean SFO than Ashburn
+   - Server-to-server communication works fine with IPv6-only
+3. Point `shardok.prod.eagle0.net` to this IP via AAAA record
+4. The ShardokInstanceManager will attach this IP to instances on spin-up
+
+**Location choice**: Hillsboro, OR (`hil`) is recommended for US West Coast. Same pricing as Ashburn (`ash`).
+
+### Option B: Dynamic DNS
+
+Update DNS programmatically when instance spins up. More complex but avoids floating IP cost.
+
+---
+
+## Step 6: Upload SSH Key to Hetzner
+
+For debugging access to instances:
+
+1. In Hetzner Console → Security → SSH Keys
+2. Click "Add SSH Key"
+3. Paste your public key (e.g., `~/.ssh/id_rsa.pub`)
+4. Give it a name (e.g., "eagle-deploy")
+
+---
+
+## Step 7: Wire Security Config into Eagle
+
+Update Eagle's startup code to use the security config when connecting to remote Shardok:
+
+```scala
+val securityConfig = ShardokSecurityConfig(
+  useTls = true,
+  authToken = Some(sys.env("SHARDOK_AUTH_TOKEN"))
+)
+
+val channel = ServerSetupHelpers.newChannel(
+  "shardok.prod.eagle0.net",
+  50051,
+  securityConfig
+)
+```
+
+---
+
+## Testing
+
+### Manual Instance Spin-up
+
+Test the Hetzner integration by triggering instance creation:
+
+```scala
+val manager = new ShardokInstanceManager(
+  hetznerApiToken = sys.env("HETZNER_API_TOKEN"),
+  // ... other config
+)
+
+manager.ensureInstanceRunning()
+```
+
+### Verify TLS and Auth
+
+1. Instance spins up and gets Let's Encrypt certificate
+2. Eagle connects via TLS
+3. Auth token is validated on each request
+
+---
+
+## Cost Estimate
+
+| Component | Cost |
+|-----------|------|
+| CAX41 (16 ARM cores) | ~$0.04/hour |
+| Floating IP | ~$4/month |
+| Typical usage (20 hrs/week) | ~$3.50/month compute |
+
+**Total: ~$7-8/month** for typical usage.
+
+---
+
+## Troubleshooting
+
+### Instance won't start
+- Check Hetzner API token has Read & Write permissions
+- Verify you're using the correct region (`hil` for Hillsboro OR, or `ash` for Ashburn VA)
+
+### TLS certificate fails
+- Ensure DNS points to the instance IP before certbot runs
+- Check port 80 is open for Let's Encrypt HTTP-01 challenge
+
+### Auth failures
+- Verify `SHARDOK_AUTH_TOKEN` matches on both Eagle and Shardok
+- Check the token file is readable by Shardok container
+
+### Can't pull container image
+- Ensure `DO_REGISTRY_TOKEN` is passed to cloud-init
+- Verify the ARM64 image exists: `registry.digitalocean.com/eagle0/shardok-server:arm64-latest`
@@ -71,7 +71,7 @@ LLM settings can be changed at runtime via the admin console:
 1. Navigate to Admin Console → Settings
 2. Change `LlmProvider` to select vendor (gemini, openai, claude)
 3. Change the corresponding model name setting:
-   - `GeminiModelName` (default: gemini-3.1-flash-lite)
+   - `GeminiModelName` (default: gemini-3.1-flash-lite-preview)
   - `OpenAiModelName` (default: gpt-4.1-mini)
   - `ClaudeModelName` (default: claude-3-5-haiku-20241022)

@@ -1,121 +1,23 @@
 # New Profession Proposals

-This document proposes new hero professions for Eagle0. Each profession should matter in both the Eagle strategic layer
-and the Shardok tactical layer, and should be earned through a prime stat in the same way existing professions are.
+This document proposes 5 new hero professions for Eagle0. Each profession has abilities for both the Eagle (strategic) and Shardok (tactical) game layers.

 ## Current Professions Reference

-Professions are currently gained when a no-profession hero crosses the profession stat threshold and wins a profession
-roll. The current stat mapping is:
-
-| Prime Stat | Professions |
-|------------|-------------|
-| **Strength** | Champion |
-| **Agility** | Engineer, Ranger |
-| **Wisdom** | Mage |
-| **Charisma** | Necromancer, Paladin |
-| **Constitution** | None |
-
-The current profession capabilities are:
-
-| Profession | Eagle Ability | Shardok Abilities | Current Niche |
-|------------|---------------|-------------------|---------------|
-| **Mage** | Control Weather: start/end blizzards and droughts in the current or neighboring province | Lightning Bolt, Meteor, Freeze Water, Start Fire access/enhancement | Strategic weather control and high-impact elemental battlefield effects |
-| **Necromancer** | Start Epidemic in the current or neighboring province | Raise Dead, Fear | Attrition pressure, undead creation, morale attack |
-| **Engineer** | Improve command recommendation and bonus improvement output | Repair, Fortify, Build Bridge, Reduce siege | Infrastructure, battlefield construction, mechanical support |
-| **Paladin** | Alms priority and increased support from food | Holy Wave | Public support, holy area effect, anti-undead flavor |
-| **Ranger** | Recon against enemy provinces | Scout, Hide access/enhancement, Brave Water enhancement | Information, stealth, terrain crossing |
-| **Champion** | Train command recommendation and training bonus | Challenge Duel | Martial excellence, battalion training, direct hero confrontation |
-
-## Recommendation
-
-Add **Warden** first.
-
-Warden is the cleanest next profession because Constitution is the only hero stat that does not currently unlock any
-profession. A Constitution profession also creates a distinctive tactical identity: not another caster, scout, or damage
-dealer, but a durable hero who keeps important units alive. That fills a real mechanical gap without forcing a large
-rewrite of the profession system.
-
-The first version should be intentionally simple:
-
- **Prime stat:** Constitution
- **Eagle ability:** Garrison, a defensive province action or passive defense bonus when a Warden is present with enough
-  vigor; or Custody, a prisoner-control ability for captured heroes
- **Shardok ability:** Guard, a command that marks an adjacent friendly unit until the Warden's next turn; the first
-  attack against that unit is redirected to the Warden's unit or reduced by a fixed amount
- **Battalion suitability:** Optimal with durable melee infantry; suboptimal with fragile archers or stealth-focused
-  units if we want a stricter identity
- **Balance direction:** Spend action points and/or vigor to protect another unit, rather than adding free passive
-  prevention every round
-
-This keeps the profession legible: high-Constitution heroes become the people who can hold formation, anchor a province,
-and protect fragile specialists.
+| Profession | Eagle Ability | Shardok Abilities |
+|------------|---------------|-------------------|
+| **Mage** | Control Weather | Lightning Bolt, Meteor, Freeze Water, Start Fire (enhanced) |
+| **Necromancer** | Start Epidemic | Raise Dead, Fear |
+| **Engineer** | (general) | Repair, Fortify, Build Bridge, Reduce (siege) |
+| **Paladin** | Alms (prioritized) | Holy Wave |
+| **Ranger** | Recon | Scout, Hide (enhanced), Brave Water (enhanced) |
+| **Champion** | (general) | Challenge Duel |

 ---

 ## Proposed New Professions

-### 1. WARDEN (Defense & Protection Specialist)
-
-**Fantasy:** The stalwart defender who holds the line and protects allies.
-
-**Why it fits now:**
- Gives Constitution a profession path
- Adds a defensive/tank identity that no current profession owns
- Creates counterplay to burst damage, duel pressure, and fragile high-value units
-
-**Eagle Ability: "Garrison"**
- A province with a Warden-led unit gets a defense bonus when attacked
- Alternative active version: spend vigor to fortify the province until next round
- Synergy: works well in border provinces, choke points, and provinces recovering after losses
-
-**Alternative Eagle Ability: "Custody"**
- A Warden can handle captured heroes with extra authority: execute them immediately or move them to a neighboring ruled
-  province before normal prisoner management
- Passive custody version: each new round, prisoners in a Warden-guarded province become more likely to join the ruling
-  faction
- Prefer implementing this as a small positive addition to the prisoner's existing `factionBiases` entry for the ruling
-  faction, rather than changing the prisoner `roundsInType` multiplier from `+5/round` to `+10/round`
- Rationale: changing the multiplier would be retroactive. A prisoner held for ten rounds would immediately receive a
-  large odds jump the moment a Warden arrived. Accumulating a Warden-specific bias only rewards rounds actually spent
-  under Warden custody, and the existing faction-bias decay makes the effect fade naturally if the Warden leaves
- Stronger version: if the Warden's side captures enemy heroes during battle but still loses the province, the Warden can
-  evacuate one captured hero to a neighboring ruled province instead of losing custody
- This should be limited to one captured hero per battle or require a high-vigor Warden, because keeping prisoners after
-  losing the battle is a major strategic swing
- Best flavor: Wardens are not just defenders of walls, but keepers of oaths, chains, and battlefield custody
-
-**Shardok Ability: "Guard"**
- Target adjacent friendly unit is protected until the Warden's next turn
- First incoming attack against the protected unit is redirected to the Warden's unit or reduced
- Costs action points and cannot target self
- Creates a clear positioning puzzle without introducing another long-range damage button
-
-**Implementation Notes:**
- Add `Warden` to the Scala profession enum and common/client profession enums
- Map Constitution to `Vector(Profession.Warden)` in `HeroStatGainAction`
- Add display names, profession-gained notification copy, tutorial trigger mapping, and headshot bucket support
- Add strategic availability and command handling only after deciding whether Warden uses Garrison, Custody, or both
- For Custody, prefer extending the existing captured-hero/prisoner-management flow instead of creating a parallel
-  prisoner system
- For passive prisoner conversion, update `NewRoundAction` near the existing unaffiliated-hero `roundsInType` and
-  `factionBiases` maintenance. If the province is ruled, contains a ruling-faction Warden, and the unaffiliated hero is
-  a prisoner, add the Warden custody bonus to that prisoner's `factionBiases(rulingFactionId)`.
- For Shardok, start with a single-turn guard status before attempting more complex interception chains
-
-**Current Follow-Up Priorities:**
- Teach the Shardok AI when to use the Warden evacuation command. The command is valuable when the Warden's side has
-  captured enemy heroes and can secure them by leaving the battle, especially when the battle outcome is uncertain or
-  trending against that side.
- Add the strategic passive custody bonus: each round, prisoners in a province guarded by a ruling-faction Warden should
-  get a small accumulated positive bias toward joining that faction. Prefer storing this as an addition to the existing
-  `factionBiases` entry rather than changing the global `roundsInType` multiplier, so the bonus only reflects rounds
-  actually spent under Warden custody.
- Make tactical AI more protective of heroes at risk of capture when a Warden may be present. Warden evacuation makes
-  captured heroes harder to recover, so the AI should treat exposing high-value heroes to capture as more dangerous than
-  before. This matters even when the AI does not have perfect knowledge that a Warden is in the battle.
-
-### 2. HERALD (Morale & Communication Specialist)
+### 1. HERALD (Morale & Communication Specialist)

 **Fantasy:** The inspiring leader who rallies troops and carries messages across the battlefield.

@@ -130,7 +32,7 @@ and protect fragile specialists.

 ---

-### 3. ALCHEMIST (Fire & Transformation Specialist)
+### 2. ALCHEMIST (Fire & Transformation Specialist)

 **Fantasy:** The mad scientist who manipulates the elements through science, not magic.

@@ -145,6 +47,21 @@ and protect fragile specialists.

 ---

+### 3. WARDEN (Defensive Specialist)
+
+**Fantasy:** The stalwart defender who holds the line and protects allies.
+
+**Eagle Ability: "Garrison"**
+- A province with a Warden-led unit gets +1 to defense when attacked
+- Encourages strategic placement of defensive heroes
+
+**Shardok Ability: "Intercept"**
+- Once per turn, when an adjacent friendly unit is attacked, the Warden's unit can take the hit instead
+- Creates a "bodyguard" mechanic that protects valuable units
+- Costs action points to maintain readiness
+
+---
+
 ### 4. INQUISITOR (Anti-Magic & Intelligence)

 **Fantasy:** The witch-hunter who counters supernatural threats and uncovers secrets.
@@ -179,174 +96,8 @@ and protect fragile specialists.

 These professions were designed to:

-1. **Fill mechanical gaps**: Warden gives Constitution a profession and adds defensive depth
-2. **Create counterplay**: Inquisitor vs Mage/Necromancer, Warden vs burst damage, Beastmaster vs beast events
-3. **Avoid overlap**: Each profession should own a tactical and strategic niche not covered by existing professions
-4. **Support both layers**: Each ability should be meaningful in Eagle and Shardok
-5. **Enable interesting decisions**: Guard creates positioning choices, Inspire creates action economy choices, Transmute
-   creates resource tradeoffs
-
-## Unified Candidate Ranking
-
-This ranking considers every candidate together, regardless of where the idea came from. The main criteria are mechanical
-fit, overlap with existing professions, implementation clarity, strategic-layer value, Shardok value, and narrative
-payoff.
-
-1. **Warden**: Best immediate fit. It gives Constitution a profession path and creates a distinctive custody/protection
-   identity.
-2. **Quartermaster**: Best strategic depth after Warden. Logistics touches resources, armies, travel, and attrition
-   without adding another damage specialist.
-3. **Envoy**: Best diplomacy/prisoner-system extension. Strong narrative payoff and clear Eagle-side value.
-4. **Surgeon**: Best loss-mitigation role. Makes battle aftermath less binary and gives non-magical healing a place.
-5. **Herald**: Strong morale and action-economy support. Distinct from Paladin if kept secular and battlefield-command
-   focused.
-6. **Marshal**: Strong army identity, especially for formation play and troop organization, but needs careful separation
-   from Champion.
-7. **Inquisitor**: Useful counterplay against Mage and Necromancer, though anti-magic should not become too narrow.
-8. **Pathfinder**: Good campaign movement role, but should focus on routes and terrain rather than replacing Ranger
-   scouting.
-9. **Alchemist**: Good resource and terrain manipulation fantasy, but risks crowding Mage and Engineer unless scoped
-   around risky transformations.
-10. **Spymaster**: Strong flavor and intelligence value, but needs slow strategic effects to avoid replacing Recon.
-11. **Artificer**: Fun temporary-device fantasy, but overlaps Engineer unless it owns one-shot preparation rather than
-    construction.
-12. **Beastmaster**: Connects nicely to beast events, but overlaps Ranger unless focused on province events and wild
-    allies.
-13. **Harbinger**: Excellent flavor, but probably later because fear/morale already touches Necromancer and Paladin
-    space.
-
-The best near-term sequence is likely **Warden**, then **Quartermaster** or **Envoy**. Avoid adding another pure damage
-caster until defensive, logistical, diplomatic, morale, and aftermath niches are better represented.
-
-## Additional Candidate Details
-
-These ideas come from looking at open mechanical space in Eagle and Shardok: logistics, loyalty, prisoners, province
-events, diplomacy, battlefield control, and non-damage support.
-
-### Marshal
-
-**Fantasy:** The army organizer who turns a pile of units into an actual campaign force.
-
-**Best stat fit:** Strength or Charisma
-
-**Eagle Ability: "Muster"**
- Reorganize, reinforce, or prepare battalions more efficiently than a normal hero
- Could reduce vigor cost for Organize Troops or improve training/armament transfer efficiency
-
-**Shardok Ability: "Command Formation"**
- Adjacent friendly units gain a small defensive or morale bonus while holding formation
- Creates a tactical identity around positioning several units together
-
-**Why it is interesting:** Champion currently owns heroic combat and training, but not army-level coordination. Marshal
-would be about disciplined formations rather than duels.
-
-### Quartermaster
-
-**Fantasy:** The logistics expert who keeps armies fed, paid, armed, and moving.
-
-**Best stat fit:** Constitution or Wisdom
-
-**Eagle Ability: "Provision"**
- Move food/gold/supplies with less waste or farther than normal
- Reduce attrition or readiness loss for armies operating away from strong provinces
-
-**Shardok Ability: "Resupply"**
- Restore limited ammunition, repair light damage, or grant a one-turn readiness buff to a nearby unit
-
-**Why it is interesting:** The strategic layer already has meaningful resources. A profession that manipulates logistics
-would create strong choices without simply adding another combat spell.
-
-### Envoy
-
-**Fantasy:** The negotiator, hostage-broker, and oath-maker.
-
-**Best stat fit:** Charisma
-
-**Eagle Ability: "Parley"**
- Improve diplomacy outcomes, ransom terms, prisoner returns, or truce/alliance offer odds
- Could reduce the risk of ambassadors being imprisoned or create better return-prisoner rewards
-
-**Shardok Ability: "Demand Surrender"**
- Attempt to force a damaged or isolated enemy unit to flee, with odds based on charisma and battlefield state
-
-**Why it is interesting:** Eagle has relationships, ransoms, truces, alliances, and prisoner choices. Envoy would make
-diplomacy feel like a profession rather than only a menu action.
-
-### Spymaster
-
-**Fantasy:** The patient handler of informants, rumors, sabotage, and false trails.
-
-**Best stat fit:** Wisdom or Charisma
-
-**Eagle Ability: "Infiltrate"**
- Plant a delayed intelligence effect in an enemy province, revealing troop movements or weakening support
- Could counter or complement Ranger recon without duplicating it
-
-**Shardok Ability: "Sabotage"**
- Before or during battle, reduce one enemy unit's readiness, movement, or first action effectiveness
-
-**Why it is interesting:** Ranger is field reconnaissance. Spymaster can be slower, political, and province-focused.
-
-### Surgeon
-
-**Fantasy:** The healer who saves lives after the dramatic part of the story is over.
-
-**Best stat fit:** Wisdom or Constitution
-
-**Eagle Ability: "Triage"**
- Reduce hero vigor loss, casualty severity, or prisoner death/execution fallout after battles
- Could improve recovery in provinces with many wounded heroes or battered battalions
-
-**Shardok Ability: "Stabilize"**
- Prevent a nearby friendly hero unit from being captured or destroyed once per battle, leaving it routed or exhausted
-  instead
-
-**Why it is interesting:** Paladin has holy support, but not mundane medical recovery. Surgeon creates a grounded support
-role that can make losses less binary.
-
-### Artificer
-
-**Fantasy:** The maker of rare devices, siege tools, lenses, traps, and battlefield instruments.
-
-**Best stat fit:** Wisdom or Agility
-
-**Eagle Ability: "Prototype"**
- Invest gold and vigor to create a temporary province or battalion enhancement
- Examples: better siege readiness, scouting lenses, defensive traps, or weatherproof stores
-
-**Shardok Ability: "Deploy Device"**
- Place a one-use trap, barricade, signal flare, or field tool on a nearby hex
-
-**Why it is interesting:** Engineer currently owns building and repair. Artificer can own temporary inventions and
-one-shot tactical preparation.
-
-### Harbinger
-
-**Fantasy:** The terrifying omen-bearer whose arrival changes morale before the first blow lands.
-
-**Best stat fit:** Charisma or Wisdom
-
-**Eagle Ability: "Portent"**
- Lower enemy support, increase unrest, or amplify the psychological effect of victories and executions
- Could be risky: fear-based rule damages diplomacy or loyalty if overused
-
-**Shardok Ability: "Dread Standard"**
- Enemies near the Harbinger suffer morale penalties or worse flee odds
-
-**Why it is interesting:** Necromancer has supernatural fear, but Harbinger could be political and symbolic rather than
-undead-focused.
-
-### Pathfinder
-
-**Fantasy:** The guide who knows hidden passes, river crossings, and winter roads.
-
-**Best stat fit:** Agility or Constitution
-
-**Eagle Ability: "Find Passage"**
- Move armies or heroes through difficult terrain, winter, blizzards, or river-heavy borders with lower penalties
- Could create one-turn temporary travel links between neighboring provinces under specific conditions
-
-**Shardok Ability: "Open Route"**
- Let a nearby unit ignore one terrain penalty or cross a difficult hex safely this turn
-
-**Why it is interesting:** Ranger owns stealth and scouting. Pathfinder owns movement and campaign geography.
+1. **Fill mechanical gaps**: Warden provides defensive depth, Inquisitor counters magic-heavy strategies
+2. **Create counterplay**: Inquisitor vs Mage/Necromancer, Beastmaster vs Rangers (nature vs nature)
+3. **Avoid overlap**: Each has a unique niche not covered by existing professions
+4. **Support both layers**: Each ability is meaningful in its respective game mode
+5. **Enable interesting decisions**: Intercept creates bodyguard tactics, Inspire creates action economy choices
@@ -1,149 +0,0 @@
-# Postgres History Migration Plan
-
-## Goal
-
-Evaluate and, if the measurements support it, migrate production game history persistence from local SQLite plus S3 base
-and delta files to a managed Postgres database.
-
-This is not just a mechanical port. The important product requirement is that battle commands, especially Shardok map
-clicks, show results to the player as quickly as possible while still keeping the chance of lost results acceptably low.
-
-## Proposed Direction
-
-Use Postgres as the authoritative production store. Local SQLite should remain useful for development, tests, and rollback
-during rollout, but production should not have two long-lived authoritative stores for the same game.
-
-Start with a small DigitalOcean Managed Postgres instance in the same region and VPC as Eagle. The $15 single-node plan is
-reasonable for early measurement and staging. If the design works, production can move to a more reliable plan when the
-availability requirements justify it.
-
-## Phase 1: Measure First
-
-Before porting the full history implementation, add a benchmark or admin utility that runs from the Eagle deployment
-environment against the candidate Postgres database.
-
-Measure at least:
-
- single action-result append transaction latency
- batch append latency for 25 and 100 action results
- latest snapshot lookup
- replay from a snapshot to a target index
- `since` and stream-update query latency
- Shardok battle result append latency
- p50, p95, p99, and max latency
- async queue lag, if an async persistence prototype is included
-
-Useful initial exit criteria:
-
- Strategic action-result writes should be comfortably below 50 ms p95.
- Shardok synchronous persistence should be below roughly 20-30 ms p95 to stay on the click-to-animation path.
- If Shardok sync writes are above that, use an async Shardok persistence design rather than blocking player feedback.
-
-## Phase 2: Schema Prototype
-
-Add Postgres configuration and a prototype schema that maps the current SQLite history model.
-
-Expected tables:
-
- `games`, for game-level metadata and backend bookkeeping
- `action_results`, for ordered strategic action results
- per-entity decomposition tables currently written by the SQLite dispatchers
- `state_snapshots`, for replay anchors
- Shardok battle result tables, including battle id, sequence number, command/result payloads, and player metadata
- `schema_migrations`, unless the migration mechanism is handled outside the app
-
-Prefer batched inserts and batched reads. The current SQLite implementation can afford some local-file patterns that will
-be too chatty over a network.
-
-## Phase 3: Implement Postgres History
-
-Implement a `FullGameHistory` backend backed by Postgres. Keep the existing SQLite backend available behind a config flag
-during rollout.
-
-Core methods to support:
-
- `count`
- `last`
- `withNewResults`
- `stateAfter`
- `since`
- `sinceDate`
- round-local recent-result queries
- Shardok result writes and reads
-
-The implementation should preserve action ordering and idempotency. If retries are possible, writes should include stable
-keys or sequence ranges so replaying a write request cannot duplicate results.
-
-## Phase 4: Decide Shardok Durability Mode
-
-Shardok latency is the place where this migration can most visibly hurt the player. There are two viable modes.
-
-### Option A: Synchronous Shardok Writes
-
-Use this if measured Postgres latency is low enough. The command path writes results to Postgres before telling the client
-about them.
-
-This is the simplest durability model, but only acceptable if it keeps click-to-animation latency low.
-
-### Option B: Async Shardok Writes
-
-Use this if synchronous Postgres writes add noticeable latency.
-
-The model:
-
- apply battle results to authoritative in-memory game state immediately
- send client updates immediately after the ordered in-memory apply
- enqueue ordered persistence batches in the same order they were applied
- persist batches with `battle_id`, sequence range, payload hash, and payload
- track `lastAppliedSeq` and `lastPersistedSeq`
- retry failed writes until they succeed
- alert when persistence lag exceeds a small threshold
- block or degrade new commands if the queue grows too large
- force a synchronous checkpoint before battle end reconciliation or strategic-layer handoff
- drain the queue during graceful shutdown
-
-This creates a small crash-loss window, but only for rare crashes that happen after the player sees a result and before
-the async write completes. That tradeoff may be better than adding network persistence latency to every tactical command.
-
-## Phase 5: Rollout
-
-Add a backend flag such as:
-
-```text
-EAGLE_HISTORY_BACKEND=sqlite|postgres
-```
-
-Suggested rollout:
-
-1. Run benchmarks from the deployed environment.
-2. Enable Postgres in staging for new games.
-3. Run warmup games and Shardok battle smoke tests.
-4. Enable Postgres for new production games.
-5. Migrate old games either lazily on first open or through an admin-triggered migration job.
-6. Keep SQLite/S3 rollback available until enough new-game production time has passed.
-
-If Postgres is unavailable, commands should not be acknowledged as durable. Either hold/retry them before applying, or
-reject them clearly. Do not show a result to the client while pretending it has already been durably stored unless that is
-an explicit async-durability path with lag monitoring.
-
-## Phase 6: Cleanup
-
-After production confidence:
-
- remove production dependence on S3 base/delta history files
- keep object storage for backups, exports, or emergency archives
- keep SQLite for local development and tests if it remains useful
- document restore, migration, and rollback procedures
-
-## Open Questions
-
- What exact durability guarantee do we want for "the client already saw this result"?
- What Shardok persistence latency is acceptable in real play?
- Should old games migrate lazily or through a bulk/admin process?
- When should the production database move from single-node to HA?
- What should the player experience be if Postgres is reachable but slow?
-
-## Recommended Next PR
-
-The next implementation PR should add a Postgres benchmark/admin utility and configuration plumbing, not the full port.
-That gives us real latency numbers from the Eagle deployment environment before committing to the larger migration.
@@ -486,7 +486,7 @@ jobs:
    outputs:
      version: ${{ steps.version.outputs.version }}
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
        with:
          lfs: false

@@ -517,7 +517,7 @@ jobs:
    runs-on: ubuntu-latest
    needs: []
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
        with:
          lfs: false

@@ -532,7 +532,7 @@ jobs:
        uses: actions/cache@v3
        with:
          path: ~/.cache/bazel
-          key: bazel-linux-${{ hashFiles('MODULE.bazel', 'MODULE.bazel.lock', 'WORKSPACE') }}
+          key: bazel-linux-${{ hashFiles('MODULE.bazel', 'WORKSPACE') }}

      - name: Build Shardok server
        run: bazel build -c opt //src/main/cpp/net/eagle0/shardok:shardok-server
@@ -555,7 +555,7 @@ jobs:
    needs: [build-eagle, build-shardok]
    environment: production
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4

      - name: Deploy to DigitalOcean
        uses: appleboy/ssh-action@v1.0.0
@@ -136,7 +136,7 @@ Create a tool to programmatically regenerate the Eagle strategic map images with
 | `Assets/Eagle/Materials/*.png` | Replaced province masks |
 | `Assets/Eagle/map_bw_labels.png` | Either: regenerated, or removed if using dynamic labels |
 | `province_map.tsv` | Add centroid columns |
-| `Assets/Scenes/Eagle.unity` | Add ProvinceLabelsController, label prefab instances |
+| `Assets/Gameplay.unity` | Add ProvinceLabelsController, label prefab instances |

 ---

@@ -1,77 +0,0 @@
-# Shardok AI Experiment Tooling Plan
-
-## Summary
-
-Build a reusable workflow for Shardok AI battle baselines and scoring experiments. The goal is to
-turn the current one-off benchmark process into repeatable commands that extract real battles, run
-baseline and candidate configurations, capture detailed per-command traces, and write comparable
-reports.
-
-This work starts with the target-aware archery scoring experiment: attacker `EXPERIMENTAL` against
-defender `STANDARD`.
-
-## Key Changes
-
- Add simulator trace support to `ai_battle_simulator_main`.
-  - New flag: `--trace-jsonl=<path>`.
-  - Emit one JSONL row per AI-selected command.
-  - Include run label, config path, state file, phase, sequence, round, player, side, command type,
-    actor unit, target coords, chosen index, available command count, search depth, commands
-    evaluated, completion reason, forced commands posted afterward, and pre/post side troop totals.
-  - Keep existing summary output unchanged.
-
- Add reusable benchmark tooling under
-  `src/main/cpp/net/eagle0/shardok/ai_battle_simulator/benchmarks/`.
-  - `real_battle_suite.py`: shared helpers for reading `game.db`, materializing battle/state/result
-    blobs, extracting configs, running simulator binaries, parsing summaries, and collecting
-    real-game metadata.
-  - `run_real_battle_experiment.py`: CLI orchestration for baseline/candidate runs.
-  - Outputs: `summary.csv`, `comparison.csv`, `report.md`, generated configs, and per-run trace
-    JSONL files.
-
- Add a clean EXPERIMENTAL switch for target-aware archery value.
-  - Use a new experiment id.
-  - Change only archery-availability scoring.
-  - Replace the flat archery-possible value with a target-sensitive value based on the best enemy
-    unit value.
-  - Do not include the previous fear-value change from experiment `27`.
-
-## Execution Plan
-
- Create a feature branch from fetched `origin/main`.
- Commit this plan document first.
- Implement simulator trace output and reusable benchmark tooling.
- Add the target-aware archery-only EXPERIMENTAL switch.
- Run the new tool first on battle `6248`, then on the all-40 saved-battle suite if local runtime is
-  acceptable.
- Compare baseline attacker `STANDARD` / defender `STANDARD` with candidate attacker
-  `EXPERIMENTAL` / defender `STANDARD`.
- Record the results under the existing benchmark results area and call out battle `6248` in the
-  generated report.
- Push the branch and create a PR after local validation.
-
-## Tests
-
- Build:
-  - `bazel build //src/main/cpp/net/eagle0/shardok/ai_battle_simulator:ai_battle_simulator_main`
-  - `bazel build //src/main/cpp/net/eagle0/shardok/ai_battle_simulator:real_battle_config_extractor`
-  - `bazel build //src/main/cpp/net/eagle0/shardok/ai_battle_simulator:real_battle_smoke_metadata`
- Unit/integration:
-  - `bazel test //src/test/cpp/net/eagle0/shardok/ai_battle_simulator:ai_battle_simulator_test`
-  - Add or extend a simulator test that verifies trace output is created and contains required
-    command fields.
-  - `python3 -m py_compile` on the new benchmark scripts.
- Validation:
-  - Run the new tool on battle `6248`.
-  - Run the new tool on all 40 battles if feasible locally.
-  - Run `bazel test //src/test/cpp/...` before push if local time allows; otherwise open the PR
-    promptly and continue validation while CI starts.
-
-## Assumptions
-
- "Experiment 3" means target-aware archery value from the previous recommendation list.
- The first experiment compares attacker-only candidate behavior against unchanged defender
-  `STANDARD`.
- JSONL is the trace format because command diagnostics will evolve over time.
- Python benchmark scripts follow the existing executable-script pattern rather than adding Python
-  Bazel targets.
@@ -1,82 +0,0 @@
-# Shardok AI Scoring Benchmarks
-
-The current STANDARD scoring experiment results are recorded in
-`src/main/cpp/net/eagle0/shardok/ai_battle_simulator/benchmarks/experimental_results/`.
-They use 40 saved Shardok battles extracted from `game_389ffb1901903118.zip`.
-
-The corrected all-40 run uses:
-
- `max_rounds = 31`
- `random_seed = 1`
- iterative-deepening timeout propagation fix from PR #6923
- AI setup placement
- forced single-option commands
- defender scoring fixed to `STANDARD` for every row
- archery/start-fire capability derived like production setup
- per-unit flee capability preserved by real-battle extraction
- zero-troop combat heroes preserved as live units
- `NO_PROFESSION` treated as a valid hero profession state, not as "no hero"
-
-Shardok siege battles do not have a draw result. If the attacker has not won after 31 rounds, the
-defender wins. The simulator records those cutoffs as `max_rounds_reached` defender wins.
-
-All 40 saved battle payloads now produce valid simulator configs. A battle side can have zero
-remaining troops as long as it has a hero; this is common for `NO_PROFESSION` heroes with no
-commanded battalion.
-
-An all-40 real-vs-sim comparison records whether the saved-game attacker/defender were human or AI
-players. Factions `3` and `4` are human players; all other factions in this save are AI players.
-The comparison uses broad winner side from the saved Shardok result payload, because exact replay
-is not available from the compact result rows. Real end-of-battle troop totals come from the
-all-factions Shardok `ActionResultView` stream's final `changed_player_totals`.
-
-An AI-vs-AI smoke check also reruns a subset where neither side used faction `3` or `4`.
-
-## Current Results
-
-These artifacts are the current baseline for future scoring comparisons.
-
-| Dataset | Valid battles | Invalid rows | Attacker wins | Defender wins | Notes |
-| --- | ---: | ---: | ---: | ---: | --- |
-| All-40 timeout-fix STANDARD baseline | 40 | 0 | 18 | 22 | `standard_scoring_all40_post_bugfix_baseline.*`; regenerated after fixing iterative-deepening timeout score propagation |
-| All-40 real saved game | 40 known | 0 unknown | 19 | 21 | `standard_scoring_all40_real_vs_sim.*`; sim matches 39/40 known winners |
-| AI-vs-AI smoke | 31 | 0 | 10 | 21 | 31/31 winner-side matches |
-
-The remaining real-vs-sim winner-side miss is `11754` (real attacker, sim defender), which had an
-AI attacker but a human defender in the saved game. The real attacker won with `2119` troops
-remaining; the STANDARD-vs-STANDARD simulation replaces the human defender with AI and the defender
-wins with `1000` troops remaining, so this row is not a comparable AI-vs-AI smoke miss. Battle
-`6248`, previously the remaining AI-vs-AI miss, now matches as an attacker win after expected-impact
-archery scoring was promoted to STANDARD.
-
-The closest six valid baseline rows are used for the scalar and behavior experiment batches. The
-single-run harness still has some nondeterminism even with `random_seed = 1`, so near-margin changes
-should be repeated before being promoted.
-
-## Experiment Tooling
-
-`src/main/cpp/net/eagle0/shardok/ai_battle_simulator/benchmarks/run_real_battle_experiment.py`
-is the reusable real-battle experiment runner. It can read a saved-game zip or extracted `game.db`,
-generate baseline/candidate simulator configs, run both sides, and write `summary.csv`,
-`comparison.csv`, `report.md`, generated configs, and per-command trace JSONL files.
-
-The repository keeps the current STANDARD baseline artifacts, but omits generated configs/traces
-for abandoned experiment batches. Regenerate those locally with the runner when a new comparison
-needs command-level traces.
-
-`src/main/cpp/net/eagle0/shardok/ai_battle_simulator/benchmarks/run_standard_baselines.py`
-regenerates the tracked STANDARD-vs-STANDARD baseline artifacts from a saved-game zip or extracted
-`game.db`, including the all-40 baseline, real-vs-sim comparison, and AI-vs-AI smoke files.
-
-The simulator supports `--trace-jsonl=<path>` and `--run-label=<label>` for detailed command traces.
-Each row records the selected command, search depth, forced command count, and pre/post side troop
-totals.
-
-Expected-impact archery replaced the old flat archery-position value in STANDARD. A unit that can
-shoot now gets half of the expected volley impact; a unit that is merely positioned for a future
-volley gets one quarter. Promoting that behavior flips `6248` to match the real AI-vs-AI attacker
-win without introducing an AI-vs-AI winner-side miss in the current saved-battle baseline.
-
-The latest baseline refresh was generated after the iterative-deepening evaluator stopped letting
-timeout fallback scores compete with completed command evaluations. Future STANDARD-vs-EXPERIMENTAL
-comparisons should compare against these checked-in timeout-fix baseline artifacts.
@@ -1,136 +0,0 @@
-# Text Client Operator Guide
-
-This guide covers operating the Eagle text client against a running Eagle server. It does not cover game strategy.
-
-## Authentication And Startup
-
-The current bearer-token file is:
-
-```
-/private/tmp/eagle0-text-client-token.txt
-```
-
-If that file is absent or authentication fails, stop and ask the user for a current bearer token. Do not invent a token or use another user's credentials.
-
-Start the production client with:
-
-```bash
-bazel run //src/main/scala/net/eagle0/eagle/text_client:eagle_text_client -- --tls --host prod.eagle0.net --port 443 --bearer-token-file /private/tmp/eagle0-text-client-token.txt
-```
-
-At the `eagle0>` prompt, use `lobby` to list running games and available new-game leaders. To resume a game, use:
-
-```text
-stream <game-id>
-```
-
-Wait for `subscription: success=true` before posting a command.
-
-## Inspecting State
-
-Use these commands before acting:
-
-```text
-status
-state
-commands
-commands-json
-```
-
-`state` is the concise map and owned-province view. `state-json` prints the complete view. `commands-json` includes the exact fields, IDs, resource amounts, and command choices currently accepted by the server.
-
-Generated text is stored locally during the client process. Use `text <text-id>` for a text ID without spaces, such as `text hn_105`. Province leaders in `state` are resolved through this store when their names have been received.
-
-## Posting Eagle Commands
-
-Use the available-command data from `commands-json` to select a command, then post a matching selected command:
-
-```text
-post-json <province-id> <SelectedCommandType> <JSON>
-```
-
-For example:
-
-```text
-post-json 13 ImproveSelectedCommand {"improvementType":"ECONOMY","actingHeroId":105,"lockType":true}
-post-rest 13
-post-feast 13
-```
-
-The client has shortcuts for `post-rest`, `post-return`, `post-feast`, riot decisions, and battle aftermath. Other selected-command JSON schemas are defined in:
-
-```text
-src/main/protobuf/net/eagle0/eagle/api/selected_command.proto
-```
-
-Only post a selected command that is currently listed as available. A successful request prints `post-command: SUCCESS`; do not assume a command was accepted until that response or a later game update arrives.
-
-Some actions enter a temporary subcommand state. For example, trading is operated as:
-
-```text
-post-json <province-id> TravelSelectedCommand {}
-post-json <province-id> TradeSelectedCommand {"tradeType":"BUY_FOOD","amount":<amount>}
-post-return <province-id>
-```
-
-After each step, run `commands-json` again. The server will reject a nested command, such as `TradeSelectedCommand`, if its parent state has not been entered.
-
-## March Warnings
-
-Marches may produce a warning before being sent. Review it, then resubmit only when intentional:
-
-```text
-post-json --force <province-id> MarchSelectedCommand <JSON>
-```
-
-`MarchSelectedCommand.marchingUnits` contains combat units. Each selected battalion is paired with a distinct hero in the same combat-unit entry; do not submit battalion-only entries.
-
-## Shardok Battles
-
-When a battle is active, inspect it with:
-
-```text
-shardok-units
-shardok-commands
-```
-
-Post one of the currently listed command indices with:
-
-```text
-post-shardok <index>
-```
-
-Omit the optional roll value during normal play. The server then generates any
-roll required by the selected command. To override that roll for deterministic
-testing, append an integer value:
-
-```text
-post-shardok <index> <integer-roll>
-```
-
-`roll` is a placeholder in command usage, not a literal argument. Only an
-integer is accepted, and the override has an effect only for Shardok commands
-that support a client-supplied roll.
-
-For a specific active battle:
-
-```text
-post-shardok <shardok-game-id> <index>
-post-shardok <shardok-game-id> <index> <integer-roll>
-```
-
-Use `shardok-commands-json` or `shardok-units-json` when the concise output omits a needed field.
-
-## Reconnects And Shutdown
-
-The client automatically recreates a failed gRPC stream and re-subscribes to the active game. It retains its in-process `ClientTextStore`, so a reconnect should announce:
-
-```text
-Reconnecting to game <game-id> with saved text state.
-```
-
-Followed by a successful subscription without replaying the full generated-text catalog. Do not start a second client merely because a stream reports `GOAWAY`, `UNAVAILABLE`, or `RST_STREAM`; wait for the automatic reconnect and subscription acknowledgment.
-
-The text store is in memory. A newly launched process performs an initial text sync once, then retains byte offsets for reconnects during that process.
-
-Use `quit` to close the client cleanly. Use `drop <game-id>` only when intentionally abandoning that game.
@@ -1,163 +1,267 @@
 # Tutorial Battle System

-This document describes the current opening tutorial battle. It is based on the live implementation in `TutorialGameCreation.scala`, `TutorialBattleController.cpp`, `ShardokGamesManager.cpp`, `ResolveBattleAction.scala`, and the Unity dialogue scripts.
-
-For the Unity tutorial UI/dialogue architecture, see `TUTORIAL_SYSTEM.md`. For copy and content notes, see `TUTORIAL_CONTENT.md`.
+This document describes the tutorial battle system for first-time players. The system provides a scripted introductory battle that teaches combat basics while telling a story.

 ---

-## Current Flow
+## Overview

-When a player creates a tutorial game at the default `OpeningBattle` phase:
+When a new player starts their first game in tutorial mode, they experience:

-1. `TutorialGameCreation.createTutorialGame()` creates a `GameType.Tutorial(TutorialPhase.OpeningBattle)` game starting in `RoundPhase.BattleRequest`.
-2. Province 14, **Onmaa**, belongs to Sadar Rakon's faction and already has a defending army.
-3. Bregos Fyar's faction has a hostile attacking army, led by Ikhaan Tarn, already moving from province 31 to Onmaa.
-4. `RequestBattlesAction` immediately creates the Shardok battle and tags tutorial reinforcement hero IDs `100` and `101`.
-5. `GamesManager` stores the generated `TutorialBattleConfig` for this game and passes it to Shardok when the battle starts.
-6. Shardok creates the battle with the configured timed reinforcement events.
-7. Unity plays the active dialogue scripts from `tutorial_strategic.json` and `tutorial_battle.json`.
-
-There is also a tutorial phase-start path. Starting after `OpeningBattle` applies precomputed tutorial setup results from `TutorialPhaseResultsLoader`; this is why the Unity post-battle trigger logic handles a "battle was never observed" auto-resolve path.
+1. **Narrative Intro** - Story screens introducing the scenario
+2. **Immediate Battle** - Skip strategic map, start directly in combat
+3. **Scripted Flee** - Enemy flees when player is "on the ropes"
+4. **Reinforcements** - Allied heroes arrive mid-battle
+5. **Heroes Join** - Reinforcement heroes join player's faction after battle

 ---

-## Battle Setup
+## Battle Configuration

-### Defender: Sadar Rakon's Faction
+### Defender (Player - John Ranil)
+- **Heroes**: John Ranil + 2 random vassals (3 total)
+- **Units**:
+  - 2x Light Infantry (300 troops each, 60 training/armament)
+  - 1x Longbowmen (200 troops, 60 training/armament)
+- **Province**: 14 (Onmaa) with 40 support, 500 gold, 3000 food
+- **Restriction**: Cannot flee (must defend)

-Configured in `src/main/resources/net/eagle0/eagle/tutorial_parameters.json`:
+### Attacker (Ikhaan Tarn)
+- **Heroes**: Ikhaan Tarn + 2 sworn brothers (3 total)
+- **Units**:
+  - 1x Heavy Cavalry (600 troops, 80 training/armament)
+  - 1x Heavy Infantry (500 troops, 80 training/armament)
+  - 1x Longbowmen (300 troops, 80 training/armament)
+- **Origin Province**: 31

- **Faction ID:** 3
- **Province:** 14, Onmaa
- **Starting support:** 23
- **Starting resources:** 50 gold, 4000 food
- **Heroes:** Sadar Rakon, Old Marek the Learned, Agamemnon
- **Battalions:**
-  - Rakon's Loyalists: Light Infantry, 529 size, 80 training, 75 armament
-  - Onmaa Defenders: Light Infantry, 311 size, 80 training, 60 armament
-  - Hunters of the Steppe: Longbowmen, 478 size, 80 training, 60 armament
+### Flee Trigger
+Attacker flees when ANY of these conditions are met:
+- Player loses 1 unit
+- 5 rounds have passed

-### Attacker: Bregos Fyar's Faction
-
-The opening attacking army is configured under Bregos Fyar's `attackingArmies`:
-
- **Faction ID:** 2
- **Origin province:** 31
- **Destination province:** 14, Onmaa
- **Heroes:** Ikhaan Tarn, Tall Edgtheow, Waylaid Julius, Luke the Prank-tricker
- **Battalions:**
-  - Doomriders: Heavy Cavalry, 592 size, 80 training, 80 armament
-  - The Shardok's Guard: Heavy Infantry, 507 size, 80 training, 80 armament
-  - Bowmen of Nikemi: Longbowmen, 291 size, 80 training, 80 armament
-  - Swift Sabres: Light Cavalry, 450 size, 80 training, 80 armament
-
-Tarn's unit is made visible to the defender from the start through `TutorialBattleConfig.initial_visibilities`.
+### Reinforcements
+When Tarn flees, these heroes arrive as player reinforcements:
+- Elena Fyar
+- Hedrick
+- The Boulder

 ---

-## Reinforcements
+## Implementation Architecture

-The current tutorial config has two timed reinforcement events. It does not currently configure a scripted Tarn flee event.
+### Phase 1: Narrative Intro System

-| Event ID | Trigger | Hero ID | Hero | Battalion |
-|----------|---------|---------|------|-----------|
-| `elena_reinforcement_round_5` | End of round 5 or later | 101 | Elena Fyar | Fyar's Vanguard, Heavy Infantry, 535 size, 75 training, 75 armament |
-| `ranil_reinforcement_round_7` | End of round 7 or later | 100 | John Ranil | Ranil's Riders, Heavy Cavalry, 458 size, 80 training, 80 armament |
+**Proto Changes:**
+- `game_state_view.proto`: Added `TutorialNarrativeScreen` message and `pending_narrative_screens` field
+- `game_parameters.proto`: Added `TutorialNarrativeScreen` and `tutorial_narrative_screens` field

-Shardok creates reinforcement units at battle creation time with `PENDING_REINFORCEMENT` status. `TutorialBattleController` activates them when their event triggers and returns a `TUTORIAL_REINFORCEMENTS_ARRIVED` action result. Unity maps that action to profession-specific dialogue triggers:
+**Unity Client:**
+- `NarrativeScreenController.cs`: Modal screen with title, body text, optional image
+- `EagleGameController.cs`: Checks for pending narrative screens on game start

- `tutorial_reinforcement_paladin` for Elena Fyar
- `tutorial_reinforcement_engineer` for John Ranil
+**Narrative Content** (defined in `tutorial_game_parameters.json`):
+```
+Screen 1: "The Engineer of Onmaa" - Player backstory
+Screen 2: "The Traitor Arrives" - Tarn's attack
+Screen 3: "Defend Your Home" - Call to action
+```

-The reinforcement action includes an `attacker_starting_position_index`; Shardok resolves that to currently open map positions and starts a reinforcement placement phase.
+### Phase 2: Auto-Start Battle
+
+**Configuration:**
+- `tutorial_game_parameters.json`: Contains `tutorialBattle` config with attacker, target, flee conditions
+- `game_parameters.proto`: `TutorialBattleConfig` message
+
+**Game Creation:**
+- `NewGameCreation.scala`: `setupTutorialBattle()` method creates:
+  - `HostileArmyGroup` with `Attacking` status (bypasses decision phase)
+  - `Army` for defender
+  - Both added to target province
+
+**Battle Creation:**
+- When round advances to `BattleRequest` phase, `RequestBattlesAction` automatically creates the `ShardokBattle`
+
+### Phase 3: Scripted Flee Mechanism
+
+**C++ Component:**
+- `TutorialBattleController.hpp/cpp`: Controller for scripted battle logic
+
+**Key Methods:**
+```cpp
+// Check all events and execute triggered actions (called at end of each round)
+std::vector<ActionResult> CheckAndExecuteEvents(
+    const GameStateW& state,
+    const SettingsGetter& settings,
+    const std::shared_ptr<RandomGenerator>& randomGenerator);
+```
+
+**Integration:**
+- `ShardokEngine.cpp`: Calls `CheckAndExecuteEvents()` at end of each round in `HandlePlayerTurnEnd()`
+- Events fire in config order, each event fires at most once
+
+### Phase 4: Mid-Battle Reinforcements
+
+**Action Types** (in `action_type.proto`):
+- `TUTORIAL_ENEMY_FLED = 78`
+- `TUTORIAL_REINFORCEMENTS_ARRIVED = 79`
+
+**Implementation (TODO):**
+- When scripted flee triggers, create reinforcement units in defender's reserves
+- Units have `UnitStatus_RESERVE_UNIT` status
+- Reinforcements enter battle on subsequent turns
+
+### Phase 5: Tutorial Popups
+
+**Content Definitions** (in `TutorialContentDefinitions.cs`):
+- `tutorial_battle_started`: "Defend your province!"
+- `tutorial_enemy_fled`: "The enemy retreats!"
+- `tutorial_reinforcements_arrived`: "Allies have arrived!"
+- `tutorial_battle_victory`: Victory celebration
+
+**Trigger Integration:**
+- `TutorialTriggerRegistry.cs`: Handles tutorial action types from `ActionResultView`
+- `ShardokGameController.cs`: Detects tutorial events and triggers popups
+
+### Phase 6: Post-Battle Hero Joining
+
+**Implementation (TODO):**
+- `ResolveBattleAction.scala`: Check if battle was tutorial and defender won
+- 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.

 ---

-## Scripted Event Controller
-
-`TutorialBattleController` is a generic event-driven controller, even though the current tutorial battle only uses timed reinforcements.
-
-Supported trigger types:
-
- `after_round`
- `units_lost`
- `damage_taken`
- `unit_killed`
-
-Supported action types:
-
- `flee`
- `reinforcements`
-
-Events are checked at the end of each round, evaluated in config order, and each `event_id` fires at most once.
-
---
-
-## Battle Resolution
-
-`RequestBattlesAction` marks tutorial opening battles with `reinforcementHeroIds = Set(100, 101)`. `ResolveBattleAction` uses that metadata so reinforcement heroes are accepted when battle results return, even though they were not part of the original defending army.
-
-After the opening battle resolves, `ResolveBattleAction` applies `TutorialTarnDisappearsAction` for `GameType.Tutorial(TutorialPhase.OpeningBattle)`. Tarn is removed from captured/unaffiliated province state and from his faction's leaders list, matching the post-battle dialogue that he has vanished.
-
-`TutorialBattleAutoResolve` provides a synthetic defender victory for tutorial setup paths that skip past the opening battle. In that synthetic result:
-
- The defender wins.
- Reinforcement heroes 100 and 101 survive.
- Tarn is marked outlawed/escaped.
- Other attacker heroes are captured.
- Defender battalions take about 30% casualties.
- Attacker battalions are destroyed.
-
---
-
-## Unity Dialogue Hooks
-
-Strategic tutorial dialogue:
-
- `game_started`: opening Onmaa monologue, ending with `FightButton` highlighted.
- `tutorial_battle_ended`: post-battle aftermath.
- `tutorial_rebuild_support`: support rebuilding guidance after captured-hero handling is done.
-
-Battle tutorial dialogue:
-
- `shardok_placement_started`: placement and unit overview.
- `shardok_battle_running`: first player turn guidance.
- Ability/terrain triggers such as `archery_available`, `melee_available`, `ability_charge_available`, `start_fire_available`, `thunderstorm`, `duel_available`, `hide_available`, and `engineer_near_enemy`.
- Reinforcement triggers `tutorial_reinforcement_paladin` and `tutorial_reinforcement_engineer`.
- Capture triggers `enemy_hero_captured` and `friendly_hero_captured`.
- `shardok_battle_reset`: replay dialogue after a battle reset.
-
---
-
-## Files To Check First
+## File Summary

+### New Files
 | File | Purpose |
 |------|---------|
-| `src/main/resources/net/eagle0/eagle/tutorial_parameters.json` | Tutorial map, factions, starting provinces, armies |
-| `src/main/scala/net/eagle0/eagle/service/new_game_creation/TutorialGameCreation.scala` | Opening battle setup and `TutorialBattleConfig` creation |
-| `src/main/protobuf/net/eagle0/common/tutorial_battle_config.proto` | Scripted event config schema |
-| `src/main/cpp/net/eagle0/shardok/server/ShardokGamesManager.cpp` | Adds pending reinforcement units and applies initial visibility |
-| `src/main/cpp/net/eagle0/shardok/library/tutorial/TutorialBattleController.cpp` | Evaluates scripted events and creates Shardok action results |
-| `src/main/scala/net/eagle0/eagle/library/actions/impl/action/RequestBattlesAction.scala` | Creates the opening battle and tags reinforcement hero IDs |
-| `src/main/scala/net/eagle0/eagle/library/actions/impl/action/ResolveBattleAction.scala` | Resolves reinforcements and applies Tarn disappearance |
-| `src/main/scala/net/eagle0/eagle/service/tutorial/TutorialBattleAutoResolve.scala` | Synthetic result for phase-start paths after the opening battle |
-| `src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/Tutorial/Triggers/TutorialTriggerRegistry.cs` | Converts strategic and tactical events into dialogue triggers |
-| `src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/Resources/Dialogues/tutorial_battle.json` | Active battle dialogue content |
+| `TutorialBattleController.hpp/cpp` | C++ scripted flee and reinforcement logic |
+| `NarrativeScreenController.cs` | Unity narrative screen display |
+
+### Modified Files
+| File | Changes |
+|------|---------|
+| `tutorial_game_parameters.json` | Battle configuration and narrative content |
+| `game_state_view.proto` | Narrative screens field |
+| `game_parameters.proto` | Tutorial battle config |
+| `player_info.proto` | Tutorial battle flags for Shardok |
+| `action_type.proto` | Tutorial action types |
+| `NewGameCreation.scala` | Auto-start battle setup |
+| `EagleGameController.cs` | Narrative display integration |
+| `TutorialContentDefinitions.cs` | Battle tutorial content |
+| `TutorialTriggerRegistry.cs` | Tutorial event triggers |
+
+---
+
+## Remaining Implementation
+
+### Disable Player Flee
+In `FleeCommandFactory.cpp`:
+- Check if tutorial mode is enabled
+- If defender, don't offer flee commands
+
+### Reinforcement Units
+In `TutorialBattleController::ExecuteScriptedFlee()`:
+- Create `Unit` objects for Elena Fyar, Hedrick, The Boulder
+- Add to defender's reserve units
+- Generate `TUTORIAL_REINFORCEMENTS_ARRIVED` action
+
+### Post-Battle Hero Joining
+In Eagle's battle resolution:
+- Detect tutorial battle completion
+- Create heroes in player's faction with proper stats
+- Generate notification action results

 ---

 ## Testing Checklist

- [ ] Tutorial game starts in BattleRequest and creates an Onmaa battle immediately.
- [ ] Opening strategic dialogue highlights the Fight button.
- [ ] Tarn's unit is visible to the defender from battle start.
- [ ] Placement dialogue fires during setup.
- [ ] First-turn battle-running dialogue fires on the player's first active turn.
- [ ] Elena Fyar arrives from the configured round-5 event.
- [ ] John Ranil arrives from the configured round-7 event.
- [ ] Reinforcement arrival dialogues fire once per hero.
- [ ] Battle reset clears battle dialogue completion for replay.
- [ ] Post-battle aftermath fires after the battle leaves `RunningShardokGameModels`.
- [ ] Rebuild-support dialogue waits until captured-hero handling and visible notifications are done.
- [ ] Starting a tutorial at a later phase uses precomputed setup and still reaches coherent strategic dialogue state.
+- [ ] New user sees narrative screens before battle
+- [ ] Battle starts immediately after narratives (no strategic map)
+- [ ] Player has correct units (3 heroes, 3 battalions)
+- [ ] Attacker has correct units (3 heroes, 3 battalions)
+- [ ] Player cannot flee
+- [ ] Tarn flees after player loses 1 unit
+- [ ] Tarn flees after 5 rounds (if no units lost)
+- [ ] Reinforcements appear when Tarn flees
+- [ ] Tutorial popups appear at correct moments
+- [ ] Reinforcement heroes join faction after battle victory
+
+---
+
+## Configuration Reference
+
+### tutorial_game_parameters.json
+```json
+{
+  "tutorialBattle": {
+    "attackerFactionHead": "Ikhaan Tarn",
+    "targetProvinceId": 14,
+    "fleeAfterDefenderUnitsLost": 1,
+    "fleeAfterRounds": 5,
+    "reinforcements": ["Elena Fyar", "Hedrick", "The Boulder"]
+  },
+  "tutorialNarrativeScreens": [
+    { "title": "...", "bodyText": "...", "imagePath": "" }
+  ]
+}
+```
+
+### TutorialBattleConfig Proto (Shardok)
+```protobuf
+message TutorialBattleConfig {
+    bool enabled = 1;
+    repeated TutorialEvent events = 2;
+    repeated UnitInitialSize initial_sizes = 3;  // For damage tracking
+}
+
+message TutorialEvent {
+    string event_id = 1;
+    TutorialTrigger trigger = 2;
+    TutorialAction action = 3;
+}
+
+message TutorialTrigger {
+    oneof trigger_type {
+        RoundTrigger after_round = 1;
+        UnitsLostTrigger units_lost = 2;
+        DamageTakenTrigger damage_taken = 3;
+        UnitKilledTrigger unit_killed = 4;
+    }
+}
+
+message TutorialAction {
+    oneof action_type {
+        FleeAction flee = 1;
+        ReinforcementsAction reinforcements = 2;  // Uses CommonUnit
+    }
+}
+```
@@ -1,8 +1,6 @@
 # Tutorial Content Guide

-This document describes tutorial content. The active tutorial experience is driven by the narrative dialogue JSON files under `src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/Resources/Dialogues/`.
-
-The older step-based modal/overlay content in `TutorialContentDefinitions.cs` is currently dormant: `RegisterAll()` returns before registering any sequences. Keep that in mind when editing this file; changing `TutorialContentDefinitions.cs` will not affect the live tutorial until the early return is removed and the overlap with dialogue triggers is audited.
+This document defines all tutorial content. Edit this to refine the text, then update `TutorialContentDefinitions.cs` to match.

 ---

@@ -183,16 +181,17 @@ These fire after the first tutorial battle ends and the player returns to the st
 >
 > 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:** John Ranil's step highlights `ImproveProvinceButton` and explains **Improve**. Elena Fyar's step highlights `GiveAlmsButton` and explains **Give Alms**. You must have at least **40** support in the province by January in order to collect gold and food in taxes.
+**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:** `ImproveProvinceButton`, `GiveAlmsButton`
+**Highlight targets:** `SupportField`

 ### Implementation Notes

- Both dialogues are defined in `tutorial_strategic.json`.
- `tutorial_battle_ended` fires from `TutorialTriggerRegistry.CheckTutorialBattleEnded()` when the opening battle is gone and strategic commands are available. It also handles the server-side auto-resolve path where the Unity client never observed a running Shardok model.
- `tutorial_rebuild_support` fires from `TutorialTriggerRegistry.CheckTutorialRebuildSupport()` when available commands no longer include `HandleCapturedHeroCommand` and the notification panel has no visible info.
- `ImproveProvinceButton` and `GiveAlmsButton` are runtime command-button targets registered by `CommandButtonPanelController`.
+- 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)

 ---

@@ -211,10 +210,11 @@ These fire after the first tutorial battle ends and the player returns to the st
 ## Adding New Tutorials

 1. Add entry to this document
-2. For active tutorial content, add or edit a script in `Assets/Resources/Dialogues/tutorial_strategic.json` or `tutorial_battle.json`.
-3. Ensure the trigger event exists in `TutorialTriggerRegistry.cs` or is fired directly by the relevant controller.
-4. If reviving the dormant step-UI system, remove the early return in `TutorialContentDefinitions.RegisterAll()` only after auditing duplicate trigger coverage with the dialogue JSON.
-5. Test the flow.
+2. Update `TutorialContentDefinitions.cs`:
+   - For onboarding: add to `CreateOnboardingSequence()`
+   - For contextual: add to `RegisterStrategicTutorials()` or `RegisterTacticalTutorials()`
+3. Ensure trigger event exists in `TutorialTriggerRegistry.cs`
+4. Test the flow

 ---

@@ -3,7 +3,7 @@
 This document describes how the Unity client's tutorial system is wired together: the classes involved, the trigger catalog, the step lifecycle, and the expected first-session flow. It complements two existing docs:

 - **`TUTORIAL_CONTENT.md`** — human-facing copy for tutorial steps and dialogues
- **`TUTORIAL_BATTLE_SYSTEM.md`** — the scripted opening battle at Onmaa
+- **`TUTORIAL_BATTLE_SYSTEM.md`** — the scripted first-battle scenario (Tarn vs. John Ranil)

 It also overlaps slightly with the in-tree `Assets/Tutorial/TUTORIAL_PLAN.md`, which is an older implementation plan.

@@ -20,13 +20,12 @@ There are **two parallel subsystems** that share the same trigger plumbing:
 | Step-based tutorial UI (modals, overlays, hints) | **Dormant** | `Tutorial/TutorialManager.cs`, `Tutorial/UI/*`, `Tutorial/Content/*` |
 | Narrative dialogue system | **Live** | `Tutorial/Dialogue/*`, `Resources/Dialogues/*.json` |

-`TutorialContentDefinitions.RegisterAll()` returns early with the comment *"Old tutorial content suppressed — replaced by narrative dialogue system."* As a result:
+`TutorialContentDefinitions.RegisterAll()` returns early at line 17 with the comment *"Old tutorial content suppressed — replaced by narrative dialogue system."* As a result:

 - `OnboardingSequence` is never assigned, so `StartOnboarding()` no-ops at the "No onboarding sequence assigned" branch.
 - No contextual tutorial sequences are registered with the trigger registry.
 - The trigger registry still fires events normally, but nothing on the step-UI side is listening.
 - `DialogueManager` consumes those same events and matches them against scripts in `Resources/Dialogues/` (`tutorial_strategic.json`, `tutorial_battle.json`).
- Dialogue completion is persisted per game through `TutorialDialogueProgressStore`, so completed scripts do not replay after a reconnect or scene reload for the same game.

 **In practice today, the entire active tutorial experience runs through the dialogue system.** The step-UI machinery is preserved for future use — content definitions still exist below the early return in `TutorialContentDefinitions.cs` for reference.

@@ -38,7 +37,6 @@ There are **two parallel subsystems** that share the same trigger plumbing:
 - **`Tutorial/TutorialManager.cs`** — Singleton. Owns `OnboardingSequence`, the active step queue, the trigger registry, and the dialogue manager handle. Initialized by `EagleGameController.SetUpGame()` and `ShardokGameController.SetUpGame()`.
 - **`Tutorial/TutorialState.cs`** — PlayerPrefs persistence. Tracks `OnboardingCompleted`, `OnboardingStepReached`, completed sequence IDs (HashSet for O(1) lookup), dismissed hints, and a global "tutorials disabled" preference.
 - **`Tutorial/TutorialTargetRegistry.cs`** — Maps string IDs to `RectTransform`s for highlighting. Static targets are Inspector-assigned (`ProvinceInfoPanel`, `SupportField`, `CommitButton`, etc.); dynamic targets register at runtime (e.g., hero rows from `HeroesAndBattalionsPanelController`).
- **`Tutorial/TutorialDialogueCoordinator.cs`** — Recomputes durable dialogue triggers from the current strategic model and sends them directly to `DialogueManager`. This covers reconnects, phase-start tutorial games, and strategic beats that should be recoverable from state.

 ### Triggers
 - **`Tutorial/Triggers/TutorialTriggerRegistry.cs`** (~1100 lines) — Routes game events to both the step UI (when sequences are registered) and `DialogueManager`. Maintains one-shot session flags so the same first-encounter trigger doesn't fire twice.
@@ -96,14 +94,14 @@ Panels can be anchored via `TutorialPanelAnchor` (`Center` / `Left` / `Right` /

 ## Trigger Catalog

-Most event-style triggers are raised via `TutorialTriggerRegistry`. Durable strategic dialogue beats are also recomputed by `TutorialDialogueCoordinator` on each model update and sent directly to `DialogueManager.TriggerDialogue()`. Both paths match against the dialogue JSON; if step-UI sequences are re-registered, only the registry path will route to them. File:line citations are for the registry unless noted; line numbers may drift.
+All triggers are raised via `TutorialTriggerRegistry`. Today these flow to `DialogueManager.TriggerDialogue()` and are matched against the dialogue JSON; if step-UI sequences are re-registered, they will also route there. File:line citations are for the registry unless noted; line numbers may drift.

 ### Bootstrap / first-session
 | Trigger | Fires from | When |
 |---------|-----------|------|
-| `game_started` | `TutorialDialogueCoordinator.EligibleTriggers()` | Any tutorial strategic model update; dialogue progress keeps it from replaying |
+| `game_started` | `EagleGameController.SetUpGame()` | First time entering a tutorial game |
 | `first_battle_available` | `OnModelUpdated()` ~L204 | A `RunningShardokGameModel` first appears |
-| `battle_entered` | `OnBattleEntered()` ~L793 | User clicks **Fight!** |
+| `battle_entered` | `OnBattleEntered()` ~L793 | User clicks **Battle!** |
 | `tutorial_battle_ended` | `CheckTutorialBattleEnded()` ~L594 | Tutorial battle removed from running models |
 | `tutorial_rebuild_support` | `CheckTutorialRebuildSupport()` ~L616 | Captured-heroes phase done |
 | `tutorial_taxes_collected` | `CheckTaxesCollected()` ~L680 | New Year action with positive tax delta |
@@ -137,7 +135,7 @@ Most event-style triggers are raised via `TutorialTriggerRegistry`. Durable stra
 | `hero_stat_gained` | ~L281 | `HeroStatGained` action result |
 | `hero_profession_gained` | ~L284 | `ProfessionGained` action result |
 | `tutorial_faction_appears` | ~L287 | `TutorialFactionAppears` action — the Fracture Covenant landing |
-| `tutorial_hero_faction_appears` | ~L290 | `TutorialHeroFactionAppears` action; has a four-step strategic dialogue today |
+| `tutorial_hero_faction_appears` | ~L290 | `TutorialHeroFactionAppears` action (no dialogue script today) |
 | `tutorial_hero_departed` | ~L299 | First `HeroesDeparted` action against another player (King's hero abandons service) |
 | `tutorial_hero_departed_again` | ~L302 | Second `HeroesDeparted` in a *different* month than the first |

@@ -222,8 +220,8 @@ Script shape (see `tutorial_strategic.json`):
      "speakerName": "Old Marek the Learned",
      "speakerImagePath": "fixed/old_marek_the_learned.png",
      "dialogueText": "...",
-      "instructionText": "Click <b>Fight!</b> to enter tactical combat.",
-      "highlightTarget": "FightButton",
+      "instructionText": "Click Battle! to enter tactical combat.",
+      "highlightTarget": "GoToBattleButton",
      "persistHighlight": true,
      "highlightProvince": "Onmaa",
      "completionEvent": null
@@ -249,12 +247,10 @@ Dialogue panel position defaults sensibly per scene (`top` during combat) and ca

 Reset paths:
 - `TutorialState.Reset()` clears everything.
- Entering a tutorial game (`GameType.Tutorial`) resets `TutorialState`; dialogue replay is controlled separately by the per-game dialogue progress key.
+- Entering a tutorial game (`GameType.Tutorial`) resets so it can be replayed.
 - Settings → "Reset Tutorials" calls `TutorialManager.ResetAllProgress()`, which also calls `DialogueManager.ResetCompletedScripts()`.

-`TutorialDialogueProgressStore` separately stores completed dialogue script IDs per game under PlayerPrefs keys named `Eagle0_TutorialDialogueProgress_<gameId>`.
-
-`DialogueManager` keeps the active game's completed script IDs in memory and saves them through `TutorialDialogueProgressStore`. `ResetCompletedScripts()` clears the current game's dialogue progress; `ClearCurrentGameProgress()` deletes the current game's persisted dialogue key.
+`DialogueManager` tracks completed scripts in memory only — they reset whenever `TutorialState` does.

 ---

@@ -280,7 +276,7 @@ You play **Sadar Rakon**, formerly Ikhaan Tarn's most trusted lieutenant. Tarn's

 | # | Trigger | What happens |
 |---|---------|--------------|
-| 1 | `game_started` | **Opening monologue** (3 steps): Sadar's backstory, the Reclamation, last stand at Onmaa. Ends highlighting the **Fight!** button (`FightButton`, `persistHighlight`) |
+| 1 | `game_started` | **Opening monologue** (3 steps): Sadar's backstory, the Reclamation, last stand at Onmaa. Ends highlighting the **Battle!** button (`persistHighlight`) |
 | 2 | `tutorial_battle_ended` | **Aftermath**: Tarn has *vanished*; you've captured his lieutenants. Recruit them or hold them |
 | 3 | `tutorial_rebuild_support` | **Rebuild Onmaa** (3 steps): Marek frames it; **John Ranil** introduces *Improve* (engineer bonus); **Elena Fyar** introduces *Give Alms* (paladin bonus). Goal: 40 support by January |
 | 4 | `tutorial_loyalty_warning` | November-ish, low-loyalty hero may leave at year end → use *Give Gold* / *Feast* |
@@ -292,7 +288,6 @@ You play **Sadar Rakon**, formerly Ikhaan Tarn's most trusted lieutenant. Tarn's
 | 10 | `tutorial_faction_appears` | **The twist**: Fracture Covenant lands at Ingia and Soria. *The Eagle* commands them. Tarn may be with them |
 | 11 | `tutorial_hero_departed` | First King's hero abandons service — "something deeper is at work" |
 | 12 | `tutorial_hero_departed_again` | Second one in a different month — "something is wrong, I can feel it" (foreshadowing) |
-| 13 | `tutorial_hero_faction_appears` | John Ranil and Elena Fyar leave Sadar's service and reappear as independent tutorial factions |

 ### Tactical battle flow (`tutorial_battle.json`)

@@ -1,290 +1,173 @@
-# URP Migration Completion Notes
+# URP Migration Plan

-Last refreshed: 2026-06-14
+## Why

-## Why This Matters
+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.

-Unity is steering projects away from the Built-in Render Pipeline (BiRP) toward the
-Universal Render Pipeline (URP). Eagle0 has completed the URP migration and now runs
-on URP:
+## Strategy: Long-Lived Feature Branch

- `ProjectSettings/GraphicsSettings.asset` points at
-  `Assets/Settings/URP/Eagle0URPPipeline.asset`.
- Every active quality level in `ProjectSettings/QualitySettings.asset` uses the
-  same URP pipeline asset.
- Legacy Post Processing Stack v2 has been removed from `Packages/manifest.json`;
-  keep verifying it stays out with the migration inventory.
+All URP conversion work happens on a **long-lived `urp-migration` branch**. Main stays fully functional on BiRP throughout the migration.

-The migration is no longer an active compatibility project. Keep this document as the
-completion record and maintenance checklist for future Unity, URP, shader, material,
-camera layering, or render-order changes.
+- **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.

-## Current Recommendation
+This avoids the "everything is pink" problem of switching the pipeline on main before shaders are converted.

-Keep URP enabled on main. Do not continue speculative URP cleanup. Use the baseline
-checklist and inventory tooling only when a future change touches shaders, materials,
-camera layering, render order, pipeline settings, or a visible rendering regression.
+## Current State

-Maintenance rules:
-
-1. Keep the visual baseline current for Connection, Eagle, Shardok, and Settings.
-2. Refresh the shader/material inventory after meaningful asset or scene changes.
-3. Remove or isolate unused rendering dependencies.
-4. Keep the existing CI guardrails passing.
-5. Treat future pipeline experiments as separate branches with explicit findings.
-
-Known URP regressions found during playtesting have been fixed. Normal gameplay work
-can proceed; future rendering PRs should be driven by observable regressions or
-intentional rendering changes.
-
-## Maintenance Workflow
-
-### 1. Create Visual Baselines
-
-Capture a small set of known-good views before any future change to URP settings,
-custom shaders, render ordering, or third-party visual materials. These should be
-reproducible enough that a human can compare screenshots after each rendering change.
-
-Minimum baseline scenes and states:
-
-| Area | Required View |
-|---|---|
-| Connection | Connect panel, stored account list, running games list |
-| Eagle map | Normal province map with borders, faction highlights, selected province tooltip |
-| Eagle weather | Drought/heat shimmer, flood, blizzard/rain overlays |
-| Eagle beasts | Bird/animal/monster beast effects on map and notification panel |
-| Eagle UI | Command panel, notifications, settings panel, generated text |
-| Shardok | Terrain, grid lines, labels/icons, bridges, fires, overlays, command buttons |
-| Scene transitions | Connection -> Eagle -> Shardok -> Eagle |
-
-Keep the manual checklist and editor-only capture tool working so rendering PRs can
-leave screenshots in an ignored directory.
-
-Use `docs/URP_VISUAL_BASELINE_CHECKLIST.md` for the current manual baseline capture
-set.
-
-### 2. Refresh The Shader And Material Inventory When Needed
-
-The inventory is useful before significant rendering work. It reports:
-
- all shaders under `Assets/`
- all materials and the shader each material uses
- all scenes/prefabs that reference custom shaders or Post Processing components
- all usages of Built-in-only shader features:
-  - `GrabPass`
-  - `#pragma surface`
-  - `UnityCG.cginc`
-  - `UnityUI.cginc`
-  - tessellation
-
-Run `Eagle0 > Rendering > Generate URP Migration Inventory` in the Unity editor to
-generate the current report. The tool writes markdown and CSV files under Unity
-`Temp/urp_migration/`, so running it should not dirty project assets.
-
-The generated CSVs include both the full material list and production material
-references, which helps separate game-path shader risk from unused package/demo
-assets.
-
-`docs/URP_SHADER_DEBT_INVENTORY.md` records the current production-vs-package
-classification for remaining Built-in-style shader patterns.
-
-Current inventory snapshot:
-
- Render pipeline settings are URP for both graphics default and active quality.
- Post Processing Stack reference hits are still zero.
- The all-material inventory is noisy: most material assets are `Standard`, and
-  many Built-in-only shader hits are in third-party or package/demo assets.
- The production material-reference report is the better starting point for the
-  probe. Current production shader references are concentrated in TextMeshPro,
-  Eagle custom map/effect shaders, Shardok grid/fire materials, and a small number
-  of standard-material beast assets.
- The project-owned Eagle and Shardok production custom shaders have been hardened
-  for URP and passed Windows Unity builds after merge.
- Project-owned runtime-created Eagle/Shardok materials now use serialized shader or
-  material references instead of project shader-name fallbacks.
- No project-owned production shader under `Assets/Eagle` or `Assets/Shardok`
-  currently contains the scanned Built-in-era shader patterns.
- Package/third-party shader debt remains documented but is not on the production
-  path unless a future inventory run finds new references.
-
-### 3. Verify Legacy Post Processing Usage
-
-The project no longer depends on `com.unity.postprocessing`. The old references were
-limited to an unused Orc/Ogre sample scene profile and scene-template type metadata,
-not production scenes.
-
-Keep the project free of Post Processing Stack v2 references and use the inventory
-report to catch regressions.
-
-If references reappear:
-
- document the exact scene/camera/profile usage
- either remove the stale dependency or plan the equivalent URP Volume settings
-
-### 4. Keep Drought Effects URP-Friendly
-
-The old `Eagle/HeatShimmer` shader used a Built-in-style `GrabPass`, but shimmer was
-already disabled in `DroughtEffect` because it did not work well with the UI Canvas.
-Drought now intentionally uses the animated sun overlay as its current visual signal.
-
-Keep drought visuals free of `GrabPass` unless we intentionally add a new
-URP-friendly effect.
-
-If stronger drought visuals are needed later, prefer:
-
- an animated transparent texture overlay clipped like the existing province particles
- a small particle/sprite effect around the sun icon
- a URP renderer feature only if screen-space distortion is truly worth the complexity
-
-### 5. Leave Third-Party Shader Conversion Demand-Driven
-
-The riskiest third-party shader set is Polytope Studio. Do not hand-convert package
-shader sets speculatively.
-
-`docs/URP_THIRD_PARTY_ASSET_AUDIT.md` records the current production GUID-reference
-scan. The important result is that production assets use Polytope character prefabs
-for Eagle beast effects, but the Polytope environment/water assets that still contain
-`GrabPass` were not found on the production path.
-
-If a future visible regression or inventory update makes third-party conversion
-necessary, record:
-
- current installed version
- whether a URP-compatible version exists
- whether upgrading is license/account-accessible
- whether the package is still used in production scenes
-
-### 6. Keep Probe Guidance For Future Pipeline Experiments
-
-The original disposable probe has served its main purpose: URP is enabled on main and
-the biggest visual regressions were fixed in focused PRs. Keep the probe playbook as
-a template for future risky pipeline experiments, not as current migration guidance.
-
-Use `docs/URP_PROBE_PLAYBOOK.md` when we need to measure a future Unity or render
-pipeline change cheaply before committing to a mergeable branch.
-
-## Known Maintenance Risks
-
-| Risk | Why It Matters | Right-Now Action |
+| Category | Count | Notes |
 |---|---|---|
-| `UnityUI.cginc` usage in package shaders | URP does not provide the same include path/semantics for hand-authored shaders | Leave package-managed TMP shaders alone unless a visible regression appears. |
-| `GrabPass` in unused package shaders | No direct URP equivalent | Ignore until production starts referencing those assets. |
-| Surface shaders in third-party packages | URP does not support Built-in surface shader generation | Covered by beast material compatibility on current production paths; convert only for a visible regression. |
-| Post Processing Stack v2 | Replaced by URP Volume system | Keep package and runtime/project-setting references from returning. |
-| Scene lighting | URP lighting/shadow settings differ from BiRP | Baseline and rebake only for visible regressions or intentional lighting work. |
-| Render ordering | Shardok and Eagle overlays depend on careful layering | Include affected overlays in baseline whenever render order changes. |
+| 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 |

-## Follow-Up Strategy
+### Positive Findings

-Main now carries the completed URP switch. Future rendering work should be split by
-observable behavior:
+- **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

- **Compatibility fixes**: small PRs for specific pink/missing/dark assets.
- **Render ordering fixes**: small PRs for Shardok/Eagle layer order regressions.
- **Inventory/docs updates**: docs-only or editor-tool PRs that do not alter runtime
-  visuals.
- **Pipeline experiments**: isolated branches using the probe playbook, with findings
-  copied into a mergeable follow-up.
+### Known Risk Areas

-This keeps the project from accumulating another broad, hard-to-revert rendering PR.
+- **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

-## Completed Phases
+## Shader Inventory

-### Phase 0: Preparation And Switch
+### Custom Eagle Shaders (7) -- HIGH PRIORITY

- Visual baseline checklist/screenshots: complete, keep current
- Repeatable shader/material inventory: complete, keep current
- Post Processing Stack usage decision: complete, keep removed
- Drought visual decision: complete, use non-GrabPass visual signal
- Third-party URP availability check: documented
- Disposable URP probe findings: superseded by the merged URP switch
- CI guardrails for pipeline settings, runtime shader lookup, project shader
-  patterns, and beast-material compatibility: complete
+| 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 |

-### Phase 1: Pipeline Setup
+### Hex Mesh Shader (1) -- MODERATE PRIORITY

- Install/configure URP: complete
- Create URP Pipeline Asset and Renderer Asset: complete
- Configure forward rendering, shadows, HDR, and renderer features: complete enough
-  for current gameplay paths
- Run Unity's Render Pipeline Converter: complete for the merged switch
- Keep a record of every auto-converted material: use the inventory/audit tools
+Uses `#pragma surface surf Standard` with GPU instancing. Straightforward conversion to URP Lit or ShaderGraph.

-### Phase 2: Runtime Visual QA And Cleanup
+### Third-Party Shaders (39)

-Project-owned custom shader conversion, shader-name fallback cleanup, and deletion
-cleanup are complete. Current CI coverage keeps the URP pipeline assigned, required
-runtime shader references serialized, required player-runtime-only shaders included,
-project-owned Eagle/Shardok shaders free of scanned Built-in-only patterns, key
-Addressables labels covered, and major Eagle/Shardok visual wiring guarded.
+| 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 |

-Runtime visual QA was completed during playtesting. Known regressions from that pass
-were fixed before the migration was called done.
+### GrabPass Shaders (Require Special Handling)

-Follow-up notes:
+GrabPass does not exist in URP. These must be reimplemented using `ScriptableRenderPass` + `Renderer Features` or Blit-based alternatives:

- Use `docs/URP_VISUAL_BASELINE_CHECKLIST.md` for each future rendering follow-up.
- Keep screenshots in an ignored local directory, not in git.
- Treat package/third-party shader conversions as response work for visible
-  regressions or new production references, not as speculative cleanup.
+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)

-### Phase 3: GrabPass And Special Effects Maintenance
+## Phased Approach

- Keep drought visuals on the current animated sun overlay unless a new URP-friendly
-  effect is intentionally added.
- Reimplement or replace the Polytope `PT_Water_Shader` GrabPass shaders if they are
-  ever become used by production assets.
- Avoid leaving screen-space effects until the end; they are likely to drive renderer
-  feature requirements.
+### Phase 1: Pipeline Setup + Auto-Conversion (Days 1-3)

-### Phase 4: Third-Party Shaders Maintenance
+- 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

- Upgrade packages where vendor URP shaders exist and a production need appears.
- Convert remaining PBR/toon/vegetation shaders manually only for production
-  references or visible regressions.
- Prefer replacement or deletion for unused demo-only assets.
+### Phase 2: Custom Eagle Shaders (Weeks 1-3)

-### Phase 5: Materials, Lighting, And Post Processing Maintenance
+This is the critical path. Without these, the game is unplayable.

- Batch-update materials only for production paths or visible regressions.
- Replace Post Processing Stack v2 with URP Volumes only if a production need returns.
- Rebake lighting for production scenes when scene lighting is intentionally changed.
- Tune shadow and HDR settings when visual QA or performance work justifies it.
+**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

-### Phase 6: Validation Maintenance
+**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)

-Required visual QA for future rendering changes:
+### Phase 3: Third-Party Shaders (Weeks 4-6)

- Connection lobby
- Eagle map and command flows
- Eagle weather/beasts/notifications
- Shardok battle map overlays, unit text/icons, bridges, fires
- Scene transitions
- Mac and Windows builds
- Performance sanity check
+**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)

-## Rough Effort
+**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

-| Work | Status |
-|---|---|
-| Preparation/probe | Complete |
-| Pipeline setup | Complete |
-| Core custom shaders | Complete |
-| Runtime shader/build guardrails | Complete; project-owned runtime paths use serialized shader/material references |
-| GrabPass/special effects | Deferred until a production reference or new effect need appears |
-| Third-party shaders/materials | Covered by runtime compatibility and visual QA unless a visible regression appears |
-| Lighting/post-processing | No current Post Processing Stack dependency; rebake/tune only for visible regressions |
-| QA/polish | Completed for the migration; repeat for future rendering changes |
+### 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

- URP is already enabled on main; keep follow-up work narrowly scoped.
- Project-owned shader-name fallbacks should stay out of runtime-created materials;
-  use serialized shader/material references instead.
- `Shader.Find` remains acceptable for Unity/URP-provided shader names inside
-  third-party compatibility shims, where there is no project asset to serialize.
- Do not hand-convert package shaders unless runtime visual QA exposes a concrete
-  regression or a new production reference appears.
- Keep C# changes minimal; current rendering scripts mostly set material properties.
- Preserve recent Shardok render-order behavior while changing pipelines.
- Treat screenshots as migration tests; compilation alone is not meaningful here.
+- **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.
@@ -1,133 +0,0 @@
-# URP Probe Playbook
-
-Last refreshed: 2026-06-14
-
-This playbook is historical reference for the disposable URP probe described in
-`docs/URP_MIGRATION_PLAN.md`. The URP migration is complete; keep this only as a
-template for future risky render-pipeline experiments. A probe branch is not a
-production branch and should not be merged as-is.
-
-## Goals
-
- Use the already-installed URP package in an isolated branch.
- Create the minimum URP pipeline/renderer assets needed to enter Play Mode.
- Run Unity's Render Pipeline Converter.
- Record compile errors, pink materials, broken shaders, and visual regressions.
- Preserve findings in docs, then discard or reset the probe branch.
-
-## Branch Shape
-
-Use two branches:
-
-| Branch | Purpose | Mergeable |
-|---|---|---|
-| `codex/urp-probe` | Disposable package/settings/material conversion experiment | No |
-| `codex/urp-probe-findings` | Small docs-only summary copied from the probe | Yes |
-
-Do not open a PR from `codex/urp-probe` unless it is clearly marked draft and
-experimental. Prefer opening the PR from `codex/urp-probe-findings`.
-
-## Before Starting
-
-1. Confirm `origin/main` is fresh.
-2. Confirm the worktree is clean.
-3. Capture or review the baseline checklist in
-   `docs/URP_VISUAL_BASELINE_CHECKLIST.md`.
-4. Generate a current inventory with
-   `Eagle0 > Rendering > Generate URP Migration Inventory`.
-5. Keep the inventory output under Unity `Temp/urp_migration/`; do not commit
-   generated reports unless they are intentionally summarized.
-
-## Probe Steps
-
-1. Create `codex/urp-probe` from `origin/main`.
-2. Confirm `com.unity.render-pipelines.universal` is installed in
-   `Packages/manifest.json`.
-3. If testing new pipeline settings, create alternate URP Pipeline/Renderer assets
-   under a clearly named temporary folder.
-4. Assign the alternate URP pipeline asset in:
-   - `ProjectSettings/GraphicsSettings.asset`
-   - `ProjectSettings/QualitySettings.asset`
-5. Run Unity's Render Pipeline Converter only if the experiment intentionally tests
-   material conversion.
-6. Enter Play Mode from `Assets/Scenes/Main.unity`.
-7. Exercise the baseline views:
-   - Connection lobby
-   - Eagle map
-   - Eagle weather and beast effects
-   - Shardok terrain, grid, labels, bridges, fires, overlays
-   - Connection -> Eagle -> Shardok -> Eagle transitions
-8. Record the exact failure mode for every broken visual:
-   - compile error
-   - pink material
-   - invisible mesh or sprite
-   - wrong render order
-   - lighting/shadow difference
-   - input or scene-load regression
-
-## Expected High-Risk Areas
-
- Eagle map rendering:
-  - province colors, borders, and ocean animation
-  - weather overlays and province particles
-  - beast effects on the map and in notifications
- Shardok map rendering:
-  - terrain, bridges, fire overlays, and grid overlays
-  - foreground UI/effect overlays
-  - unit labels/icons over fires, bridges, and one-shot animations
- Third-party 3D materials:
-  - Polytope Studio character prefabs used by Eagle human-type beast effects
-  - RRFreelance Orc/Ogre materials used by `OgreEffect`
- Render ordering in Shardok:
-  - unit text/icons versus fires
-  - unit text/icons versus bridges
-  - selection/command overlays versus labels
-
-## Findings Template
-
-Copy this template into the mergeable findings branch after the probe:
-
-```markdown
-# URP Probe Findings
-
-Date:
-Unity version:
-URP package version:
-Probe branch commit:
-
-## Summary
-
- Entered Play Mode:
- Connection usable:
- Eagle usable:
- Shardok usable:
- Build attempted:
-
-## Converter Results
-
- Materials converted:
- Materials left pink:
- Shader compile errors:
-
-## Visual Regressions
-
-| Area | Expected | Actual | Likely Cause | Next Action |
-|---|---|---|---|---|
-
-## Required Migration PRs
-
-1.
-2.
-3.
-
-## Notes
-
-
-```
-
-## After The Probe
-
-1. Copy findings into a docs-only branch.
-2. Delete or abandon `codex/urp-probe`.
-3. Do not merge probe-generated package/settings/material churn into main until the
-   findings have been reviewed and broken visuals have owner PRs.
@@ -1,145 +0,0 @@
-# URP Shader Debt Inventory
-
-Last refreshed: 2026-06-14
-
-This inventory classifies remaining Built-in Render Pipeline shader patterns after
-the completed URP switch. The project is running URP, but some package shader source
-files still use Built-in-era helpers or features. That is package/vendor debt, not
-evidence that the old pipeline is active and not an active migration blocker.
-
-## Scan Method
-
-The scan looked for these patterns in Unity shader-like assets:
-
- `GrabPass`
- `#pragma surface`
- `UnityCG.cginc`
- `UnityUI.cginc`
- `UNITY_MATRIX_`
- `sampler2D _GrabTexture`
- `tessell`
- `Tessellation`
-
-It then mapped every matching shader asset to its Unity GUID and scanned production
-serialized assets under:
-
- `Assets/Scenes/`
- `Assets/Eagle/`
- `Assets/Shardok/`
- `Assets/ConnectionHandler/`
- `Assets/UI/`
- `Assets/common/`
- `Assets/Tutorial/`
- `Assets/Resources/`
- `Assets/Materials/`
-
-This catches serialized production references. It does not prove runtime code never
-loads an asset by path, but it separates game-path shader debt from package/demo
-noise well enough to decide whether future rendering work is needed.
-
-## Summary
-
-| Bucket | Shader Assets With Built-in Patterns | Serialized Production References |
-|---|---:|---:|
-| Project-owned production shaders | 0 | 0 referenced |
-| Project-owned runtime-loaded shaders | 0 | 0 serialized refs |
-| Project-owned unreferenced shaders | 0 | 0 referenced |
-| TextMeshPro package shaders | 17 | 1 referenced |
-| Third-party/package shaders | 25 | 0 referenced |
-
-Project-owned runtime-created materials now use serialized shader or material
-references for Eagle weather, Eagle fireworks, Shardok foreground UI/effects, and
-Shardok foreground text. Remaining production `Shader.Find` usage is limited to
-Unity/URP-provided shader names inside `BeastMaterialCompatibility`, plus
-third-party package code outside our ownership.
-
-## Completed Project-Owned Shader Hardening
-
-These production shaders have been converted to URP-compatible HLSL and passed the
-Windows Unity build after merge.
-
-| Shader | Production References | Completion Notes |
-|---|---|---|
-| `Assets/Eagle/Shaders/ProvinceMapShader.shader` | `Assets/Eagle/Materials/ProvinceMapMaterial.mat` | Converted with province color, border, ocean, and UI clipping behavior preserved. |
-| `Assets/Eagle/Shaders/ProvinceWeatherMapShader.shader` | `Assets/Eagle/Materials/ProvinceWeatherMapMaterial.mat` | Converted with weather lookup, overlay alignment, clipping, and initialized effect/tint values. |
-| `Assets/Eagle/Shaders/ProvinceWeatherShader.shader` | `Assets/Eagle/Weather/BlizzardEffect.mat`, `Assets/Eagle/Weather/DroughtEffect.mat`, `Assets/Eagle/Weather/FloodEffect.mat` | Converted for the live drought/flood/blizzard material path. |
-| `Assets/Eagle/Shaders/ProvinceParticleShader.shader` | `Assets/Eagle/Effects/ProvinceParticleMaterial.mat` | Converted for Eagle map province particles. Weather effect prefabs serialize the shared particle material instead of relying on shader-name fallback. |
-| `Assets/Eagle/Shaders/ClipRectParticleUnlit.shader` | `Assets/Eagle/Effects/Fireworks.prefab`, `Assets/Eagle/Effects/ParticleAlphaBlendMaterial.mat`, `Assets/Eagle/Effects/ParticleStandardUnlitMaterial.mat` | Converted for Eagle one-shot effects and clipped particle UI paths; Fireworks serializes this shader instead of using shader-name fallback. |
-| `Assets/Eagle/maskShader.shader` | Formerly `Assets/Eagle/Materials/map_color_nolabels.mat`, `Assets/Eagle/Materials/map_color_whitened.mat` | Deleted after confirming the serialized material path was stale. |
-| `Assets/Hex Mesh Shader.shader` | None | Deleted after confirming no serialized or code references to the asset, shader name, or GUID. |
-| `Assets/Shardok/ShardokFireOverlay.shader` | `Assets/Shardok/ShardokFireOverlay.mat` | Converted with the Shardok fire overlay layering path preserved. |
-| `Assets/Shardok/Shaders/ForegroundUIOverlay.shader` | Serialized Shardok foreground UI/effect shader references | URP pass is serialized on the Shardok scene/container and included in `ProjectSettings/GraphicsSettings.asset`; the stale Built-in fallback pass has been removed. |
-| `Assets/TextMesh Pro/Resources/Shaders/TMP_SDF Overlay.shader` | Serialized Shardok foreground text shader references | Serialized on the Shardok scene/container and included in `ProjectSettings/GraphicsSettings.asset` for required foreground text overlay material. |
-
-## CI Guardrails
-
- `URPPipelineSettingsTests` keeps Graphics and Quality settings on the same URP
-  pipeline asset.
- `RuntimeShaderValidationTests` keeps required runtime shader assets present,
-  serialized Shardok foreground shader references assigned, and player-runtime-only
-  shaders listed in Always Included Shaders.
- `WeatherEffectMaterialTests` keeps Eagle flood/blizzard prefabs wired to the
-  shared URP province particle material and prevents shader-name fallbacks from
-  returning to those runtime paths.
- `EpidemicEffectMaterialTests` keeps Eagle epidemic particles wired to the shared
-  clipped particle material.
- `EagleMapMaterialWiringTests` keeps Eagle map/weather controllers wired to the
-  project map materials and expected URP shaders.
- `ProjectShaderPatternTests` fails if project-owned Eagle/Shardok shaders
-  reintroduce the scanned Built-in-only patterns.
- `RuntimeShaderFindUsageTests` fails if project-owned Eagle/Shardok runtime
-  scripts reintroduce shader-name lookups outside documented compatibility shims.
- `BeastMaterialCompatibilityTests` keeps runtime third-party beast material
-  conversion covered.
- `ProvinceBeastsControllerTests` keeps Eagle beast content names routed to
-  specific animated effect prefabs instead of silently falling back to the generic
-  circling-bird effect.
- `FireworksEffectTests` keeps the fireworks prefab wired to the project-owned
-  clipped particle shader and prevents shader-name fallback from returning.
- `TutorialSpriteAssetTests` keeps tutorial TMP sprite assets and the shared dialogue
-  panel instruction sprite asset renderable.
- `ProvinceActionAnimatorSpriteTests` keeps Eagle action animation sprite fields
-  assigned in the Eagle scene.
- `PostProcessingStackRemovalTests` keeps legacy Post Processing Stack v2 package
-  and runtime/project-setting references from returning.
- `ProductionShaderReferenceTests` keeps shaders with Built-in-only patterns, and
-  materials that use them, off the production serialized asset path except for the
-  package-managed TextMeshPro shader family.
-
-## Highest Priority: Referenced Project-Owned Shader Debt
-
-No project-owned production shader under `Assets/Eagle` or `Assets/Shardok`
-currently contains the scanned Built-in-era shader patterns.
-
-| Shader | Patterns | Production References | Recommended Action |
-|---|---|---|---|
-| None | None | None | No active migration work. Re-run inventory after future rendering changes. |
-
-## Referenced Package Shader
-
-| Shader | Patterns | Production References | Recommended Action |
-|---|---|---|---|
-| `Assets/TextMesh Pro/Resources/Shaders/TMP_Sprite.shader` | `UnityCG.cginc`, `UnityUI.cginc`, `UNITY_MATRIX_` | 16 tutorial sprite assets under `Assets/Tutorial/Sprite Assets/` | Leave alone unless Unity/URP surfaces a visible TextMeshPro sprite regression. Prefer package/vendor updates over hand-editing TMP package shaders. |
-
-## Third-Party And Package Hits Without Serialized Production References
-
-These files still contain Built-in-only shader patterns, but the current GUID scan
-did not find serialized production references. Treat them as package/demo cleanup,
-not as urgent game-path blockers.
-
-| Package Area | Examples | Patterns | Recommended Action |
-|---|---|---|---|
-| Polytope Studio characters/weapons/props | Modular NPC, armor, weapons, props shaders | `#pragma surface`, `UnityCG.cginc` | Keep runtime beast material compatibility in place; only import/replace vendor URP materials if we intentionally remove the compatibility shim. |
-| Polytope Studio environment/water | Water, vegetation, rock shaders | `GrabPass`, `#pragma surface`, `UnityCG.cginc`, tessellation | Ignore unless production starts referencing these assets. Water shaders are the only remaining `GrabPass` hits. |
-| RRFreelance Orc/Ogre | Ogre, armor, weapon shaders | `#pragma surface`, `UnityCG.cginc` | Current production references are handled by compatibility/material fixes; do not hand-convert unless a visible ogre regression returns. |
-| TextMeshPro package shaders | TMP SDF/bitmap/surface shaders | `UnityCG.cginc`, `UnityUI.cginc`, `UNITY_MATRIX_`, surface shader variants | Prefer package updates. Avoid editing package shaders unless a concrete TMP visual regression exists. |
-| Clown.fat and TileableBridgePack | Toony shaders, bridge cutout shader | `#pragma surface`, `UnityCG.cginc`, `UNITY_MATRIX_` | Leave as low priority unless a production reference appears. |
-
-## Maintenance Guidance
-
-Runtime visual QA for the URP migration was completed during playtesting and known
-regressions from that pass were fixed. Leave unreferenced third-party/package shaders
-alone until they have a visible regression or production reference.
-
-Future rendering PRs should use `docs/URP_VISUAL_BASELINE_CHECKLIST.md` and include
-affected screenshots in an ignored local directory, not in git.
@@ -1,122 +0,0 @@
-# URP Third-Party Asset Audit
-
-Last refreshed: 2026-06-14
-
-This audit scopes third-party visual packages after the completed URP migration. It
-is based on a GUID reference scan from production Unity assets under:
-
- `Assets/Scenes`
- `Assets/Eagle`
- `Assets/Shardok`
- `Assets/ConnectionHandler`
- `Assets/UI`
- `Assets/common`
- `Assets/Tutorial`
- `Assets/Resources`
- `Assets/Materials`
-
-The scan maps GUIDs from each package folder, then finds production scenes,
-prefabs, materials, controllers, assets, and scripts that reference those GUIDs.
-It does not prove runtime code never loads assets by path, but it catches the
-serialized references that matter most for future render-pipeline maintenance.
-
-## Summary
-
-| Package | Production Use | URP Risk | Notes |
-|---|---:|---|---|
-| Polytope Studio | 20 refs / 18 assets | Medium | Used by Eagle human-type beast effects. Runtime beast-material compatibility converts active renderers to URP materials; production refs are character prefabs, not environment/water assets. |
-| GUI Pro Kit Fantasy RPG | 138 refs / 58 assets | Low | Production use is UI sprites/icons. No package shader dependency found in production refs. |
-| Modern UI Pack v4.2.0 | 23 refs / 6 assets | Low | Production use is UI textures/icons. |
-| RRFreelance Orc/Ogre | 2 refs / 2 assets | Medium | Ogre effect uses custom Built-in surface shaders in source assets, but active renderers are covered by runtime beast-material compatibility under URP. |
-| DungeonMonsters2D | 12 refs / 12 assets | Medium | 2D monster prefabs for Eagle beast effects. Expected to be mostly SpriteRenderer/Animator; keep covered in beast-effect visual checks. |
-| Animal pack deluxe v2 | 7 refs / 7 assets | Medium | Elephant effect and controller refs. Verify lit-material conversion. |
-| Animal pack deluxe | 24 refs / 24 assets | Medium | Multiple Eagle animal beast effects. Verify lit-material conversion. |
-| AfricaAnimalsPackLowPoly V2 | 10 refs / 10 assets | Medium | Eagle beast effects and controllers. Verify lit-material conversion. |
-| AfricaAnimalsPackv1 | 8 refs / 8 assets | Medium | Eagle beast effects and controllers. Verify lit-material conversion. |
-| AustraliaAnimalsPackv1 | 6 refs / 6 assets | Medium | Eagle beast effects and controllers. Verify lit-material conversion. |
-| DinoPackLowPolyV1 | 3 refs / 3 assets | Medium | Velociraptor effect and controller. Verify lit-material conversion. |
-| HEROIC FANTASY CREATURES FULL PACK Vol 2 | 12 refs / 12 assets | Medium | Hippogryph effect and controller. Verify lit-material conversion. |
-| TileableBridgePack | 0 refs | Low | No production serialized refs found. Shardok bridge visuals appear to use project-owned/runtime assets instead. |
-| Stylize Water Texture | 1 ref / 1 asset | Low | Eagle province map material uses one water texture, not a shader. |
-| Terrain Hexes | 2 refs / 1 asset | Low | Shardok scene/container use one rock texture. |
-| Hex Tiles | 0 refs | Low | No production serialized refs found. |
-| 4000_Fantasy_Icons | 273 refs / 117 assets | Low | Sprite/icon assets only. |
-| StrategyGameIcons | 21 refs / 12 assets | Low | Sprite/icon assets only. |
-| Clown.fat | 14 refs / 10 assets | Medium | Clown effects and animation clips; also retargeted by Polytope human effects. |
-| Dragon | 2 refs / 1 asset | Medium | Dragon effect mesh/animation. Verify material conversion. |
-| HoneyBadger | 2 refs / 1 asset | Medium | Honey badger effect mesh/animation. Verify material conversion. |
-| Raccoon | 2 refs / 1 asset | Medium | Raccoon effect mesh/animation. Verify material conversion. |
-
-## Runtime Beast Findings
-
-### Polytope Studio
-
-Production assets reference Polytope character prefabs for Eagle map effects:
-
- `Assets/Eagle/Effects/ArcherEffect.prefab`
- `Assets/Eagle/Effects/GiantEffect.prefab`
- `Assets/Eagle/Effects/KnightEffect.prefab`
- `Assets/Eagle/Effects/MilitiaEffect.prefab`
- `Assets/Eagle/Effects/PeasantEffect.prefab`
- `Assets/Eagle/Effects/SoldierEffect.prefab`
-
-These prefabs ultimately use `PT_NPC_Mat`, which references
-`Polytope Studio/Lowpoly_Characters/Sources/Modular_NPC/Shaders/PT_Modular_NPC_Shader_PBR.shader`.
-That shader uses Built-in surface shader generation and is not URP-ready as-is.
-At runtime, Eagle beast effects pass their renderers through
-`BeastMaterialCompatibility.ConfigureRenderer`, which replaces non-URP materials
-with URP/Lit materials and bakes Polytope palette textures when needed. Treat this
-as covered by the compatibility path unless a future visual regression appears.
-
-Polytope environment and water shaders still exist in the project and include
-Built-in-only features such as `GrabPass`, `UnityCG.cginc`, surface shaders, and
-tessellation. However, this scan found no production serialized references to the
-Polytope environment or water assets. Treat them as demo/package risk, not current
-runtime risk, unless a later inventory run finds production references.
-
-### RRFreelance Orc/Ogre
-
-Production assets reference the Orc/Ogre package from:
-
- `Assets/Eagle/Effects/OgreEffect.prefab`
- `Assets/Eagle/Effects/OgreMapAnims.controller`
-
-The custom materials reference package shaders that use Built-in surface shader
-generation in the source assets:
-
- `RRFreelance-Characters/Orc-Ogre/Shaders/OgreShader.shader`
- `RRFreelance-Characters/Orc-Ogre/Shaders/ArmorShader2sided.shader`
- `RRFreelance-Characters/Orc-Ogre/Shaders/WeaponShader.shader`
-
-At runtime, the Eagle monster-effect path also uses
-`BeastMaterialCompatibility.ConfigureRenderer`, so these renderers should be
-left on the compatibility path unless the Ogre effect becomes pink, dark, or
-otherwise visibly broken.
-
-## Maintenance Guidance
-
-The URP migration is complete; do not convert third-party packages speculatively.
-
-1. Keep the runtime beast-effect compatibility path covered by existing tests and
-   future visual checks when beast rendering changes.
-2. If compatibility leaves a beast pink, dark, or visibly broken, replace the affected
-   materials with URP/Lit materials before touching unused demo-only shader packs.
-3. Leave Polytope water/vegetation/environment conversion until a production
-   reference appears. They are noisy in the shader inventory but not currently on
-   the game path.
-4. Include Eagle beast effects in the visual baseline. They cover most third-party
-   3D package risk in one place.
-5. Treat UI sprite packs as low pipeline risk. Their risk is texture import/render
-   ordering, not shader conversion.
-
-## Vendor Version / Access Notes
-
-Known versions from existing repo docs:
-
- Modern UI Pack: `v4.2.0`
-
-Most other package versions are not recorded in repo-local metadata. Before hand
-converting large third-party shader sets, check the Unity Asset Store or vendor
-account for URP-compatible updates. This especially matters for Polytope Studio,
-because the package contains many Built-in surface shaders even though only a
-small character subset is currently used by production assets.
@@ -1,61 +0,0 @@
-# URP Visual Baseline Checklist
-
-Use this checklist before any future branch changes render-pipeline settings, custom
-shaders, materials, lighting, camera layering, or render order. The URP migration is
-complete; this checklist is now a maintenance tool. The goal is not exhaustive
-gameplay QA, but a stable set of visual states that can be compared by eye after
-rendering changes.
-
-Save screenshots under:
-
-`src/main/csharp/net/eagle0/clients/unity/eagle0/Temp/urp-baselines/`
-
-That directory is ignored by git.
-
-Use `Eagle0 > Rendering > Capture URP Baseline Screenshot` in the Unity editor to
-write a timestamped Game view capture to that directory.
-
-## Capture Setup
-
- Use the same Unity version as the branch under test.
- Start from `Assets/Scenes/Main.unity`.
- Use the same Game view resolution for every capture in a comparison set.
- Capture the full Game view, not cropped panels.
- Name files with a stable prefix and short state name, for example
-  `main_01_connection_accounts.png` and `branch_01_connection_accounts.png`.
- If a view depends on server data or an account, write a short note next to the
-  screenshot naming the game/account/state used.
-
-## Required Captures
-
-| ID | Area | State | Must Verify |
-|---|---|---|---|
-| 01 | Connection | Connect panel with stored accounts visible | Background color, panel layout, text contrast, profession icons |
-| 02 | Connection | Running games list visible | Row icons, timestamps, buttons, selected/hover states if practical |
-| 03 | Eagle map | Normal province map after joining a game | Province colors, borders, ocean animation frame, faction highlights |
-| 04 | Eagle map | Province hovered/selected | On-map province tooltip, selected outline, side-panel readability |
-| 05 | Eagle weather | Drought province | Heat shimmer/drought signal remains visible and does not obscure UI |
-| 06 | Eagle weather | Flood/rain or blizzard province | Weather overlay color, particle ordering, map readability |
-| 07 | Eagle beasts | Beast effect on map | Beast animation visible in Game view and positioned over province |
-| 08 | Eagle beasts | Beast notification open | Animated beast visible in notification and not hidden behind panel art |
-| 09 | Eagle UI | Command panel with generated text | Text glyphs, fallback glyphs, panel clipping, button states |
-| 10 | Eagle UI | Settings panel open | Top-right settings button, Escape behavior, modal layering |
-| 11 | Shardok setup | Initial placement | Terrain tiles, grid lines, unit labels/icons, placement overlays |
-| 12 | Shardok battle | Unit selected with destination overlays | Overlay labels/icons draw above terrain, bridges, fires, and highlights |
-| 13 | Shardok battle | Bridge and fire visible near units | Bridge/fire render order does not cover unit labels/icons |
-| 14 | Shardok battle | Command buttons visible | Right-side UX, disabled/enabled button states, tooltip readability |
-| 15 | Scene transition | Eagle to Shardok to Eagle | No black/blank frame persists, returning Eagle map is visually intact |
-
-## Acceptance Notes
-
-For each rendering follow-up, record:
-
- Unity version and branch name.
- Screenshot directory.
- Any pink/missing materials.
- Any invisible UI, labels, particle effects, bridges, fires, or weather effects.
- Any render-order differences, especially Shardok overlays and Eagle beast effects.
- Whether the difference is acceptable, needs shader work, or needs asset/material work.
-
-Do not merge a rendering branch until the affected Connection, Eagle, Shardok, or
-Settings baseline captures are visually acceptable.
@@ -4,18 +4,11 @@ This document describes which quests the AI attempts to complete proactively to

 ## Overview

-The AI attempts to complete most quests via `FulfillQuestsCommandSelector`, which is invoked by `MidGameAIClient.chosenFulfillEasyQuestsCommand`.
-
-Important scope limits:
-
- The selector only considers quests from unaffiliated heroes in provinces owned by the acting faction.
- It further filters to provinces ruled by that faction's leader.
- It only emits a command when the corresponding command is currently available.
- Handler order is fixed. The first handler that produces a valid command wins.
+The AI attempts to complete quests via `FulfillQuestsCommandSelector`, which is invoked by `MidGameAIClient.chosenFulfillEasyQuestsCommand`. The AI only considers quests from unaffiliated heroes in provinces ruled by a faction leader.

 ## Quests the AI Actively Completes

-This section lists quests with direct `QuestCommandChooser` handlers in `FulfillQuestsCommandSelector`.
+The AI processes quest handlers in priority order. The first handler that produces a valid command wins.

 ### Diplomacy Quests

@@ -43,8 +36,7 @@ This section lists quests with direct `QuestCommandChooser` handlers in `Fulfill
 | `AlmsAcrossRealmQuest` | `AlmsAcrossRealmQuestCommandChooser` | Gives food from the province with the largest surplus |
 | `GiveToHeroesInProvinceQuest` | `GiveToHeroesInProvinceQuestCommandChooser` | Gives gold to the hero with the lowest loyalty in the specified province |
 | `GiveToHeroesAcrossRealmQuest` | `GiveToHeroesAcrossRealmQuestCommandChooser` | Gives gold from the province with the most gold available |
-| `SpendOnFeastsInProvinceQuest` | `SpendOnFeastsQuestCommandChooser` | Spend gold on feasts in the quest holder's province |
-| `SpendOnFeastsAcrossRealmQuest` | `SpendOnFeastsQuestCommandChooser` | Spend gold on the most expensive currently available feast |
+| `SpendOnFeastsQuest` | `SpendOnFeastsQuestCommandChooser` | Spend gold on feasts |
 | `SendSuppliesQuest` | `SendSuppliesQuestCommandChooser` | Send food to the target province |

 ### Prisoner Quests
@@ -80,6 +72,12 @@ This section lists quests with direct `QuestCommandChooser` handlers in `Fulfill
 | `BattalionDiversityQuest` | `BattalionDiversityQuestCommandChooser` | Hires one battalion of a missing type to reach 3+ distinct types. Only attempts if the province already has 2+ existing types, has sufficient development (`meetsRequirements`), and gold/food surplus. |
 | `UpgradeBattalionQuest` | `UpgradeBattalionQuestCommandChooser` | Walks a priority tree per turn: arm-completes (with optional travel and/or food sale setup) → train-completes → march in a pre-qualified neighbor battalion → organize/top-off of the target type → march in an unqualified neighbor battalion → develop Economy/Agriculture → train progress → develop Infrastructure → arm progress. Only toggles Travel when it directly enables an arm-completes finisher. |

+### Riot Quests
+
+| Quest | Handler | Notes |
+|-------|---------|-------|
+| `SuppressRiotByForceQuest` | `CommandChoiceHelpers.handleRiotSelectedCommand` | When this quest exists and the faction has battalions, the AI prefers CrackDown over Give when handling riots. Not a quest command chooser — modifies existing riot handling priority. |
+
 ### Reconnaissance Quests

 | Quest | Handler | Notes |
@@ -107,14 +105,6 @@ This section lists quests with direct `QuestCommandChooser` handlers in `Fulfill
 | `SwearBrotherhoodWithHeroQuest` | `SwearBrotherhoodQuestCommandChooser` | Swear brotherhood with a specific hero |
 | `DismissSpecificVassalQuest` | `DismissSpecificVassalCommandChooser` | Only if province has more than 2 heroes AND the unaffiliated hero's power >= target hero's power * `RequiredPowerMultiplierForDismiss` |

-## Quests the AI Handles Indirectly
-
-These are not in `FulfillQuestsCommandSelector`, but other AI command-selection code can still bias toward completing them.
-
-| Quest | Handler | Notes |
-|-------|---------|-------|
-| `SuppressRiotByForceQuest` | `CommandChoiceHelpers.handleRiotSelectedCommand` | When this quest exists and the faction has battalions, the AI prefers CrackDown over Give when handling riots. |
-
 ## Quests the AI Does Not Yet Attempt to Complete

 The following quests have no handler and must be completed naturally through gameplay. They are listed in rough priority order for future implementation.
@@ -163,7 +153,7 @@ The AI prioritizes quests in the order they appear in `FulfillQuestsCommandSelec
 13. ReturnPrisoner
 14. ReleaseAllPrisoners
 15. ApprehendOutlaw
-16. SpendOnFeastsInProvince / SpendOnFeastsAcrossRealm
+16. SpendOnFeasts
 17. RestProvince
 18. DevelopProvinces
 19. MobilizeProvinces
@@ -1,44 +0,0 @@
-load("@aspect_rules_js//js:defs.bzl", "js_binary", "js_run_binary")
-load("@eagle0pedia_npm//:defs.bzl", "npm_link_all_packages")
-
-package(default_visibility = ["//visibility:public"])
-
-exports_files([
-    "package.json",
-    "pnpm-lock.yaml",
-])
-
-npm_link_all_packages()
-
-filegroup(
-    name = "site_sources",
-    srcs = glob([
-        "src/**",
-        "astro.config.mjs",
-        "package.json",
-        "tsconfig.json",
-    ]),
-)
-
-js_binary(
-    name = "astro",
-    data = [
-        ":node_modules",
-    ],
-    entry_point = "tools/astro-cli.mjs",
-)
-
-js_run_binary(
-    name = "site",
-    srcs = [
-        ":node_modules",
-        ":site_sources",
-    ],
-    args = ["build"],
-    chdir = package_name(),
-    env = {
-        "ASTRO_TELEMETRY_DISABLED": "1",
-    },
-    out_dirs = ["dist"],
-    tool = ":astro",
-)
@@ -1,48 +0,0 @@
-# Eagle0pedia Site
-
-Eagle0pedia is a Starlight static site. CI validates it through Bazel, while
-DigitalOcean App Platform builds and hosts it directly as a static site.
-
-## Local Build
-
-```bash
-bazel build //docs/eagle0pedia:site
-```
-
-The generated site is written to:
-
-```text
-bazel-bin/docs/eagle0pedia/dist
-```
-
-## Deployment
-
-Eagle0pedia is hosted by DigitalOcean App Platform as a static site. Use these
-component settings:
-
-```text
-Resource type: Static Site
-Source directory: docs/eagle0pedia
-Build command: corepack enable && pnpm install --frozen-lockfile && pnpm build
-Output directory: dist
-HTTP route: /
-Domain: pedia.eagle0.net
-```
-
-The App Platform build uses the normal Starlight package scripts:
-
-```text
-npm run build
-```
-
-Set this App Platform environment variable:
-
-```text
-ASTRO_TELEMETRY_DISABLED=1
-```
-
-CI still validates the Bazel build:
-
-```text
-bazel build //docs/eagle0pedia:site
-```
@@ -1,50 +0,0 @@
-import { defineConfig } from "astro/config";
-import starlight from "@astrojs/starlight";
-
-export default defineConfig({
-  site: "https://pedia.eagle0.net",
-  integrations: [
-    starlight({
-      title: "Eagle0pedia",
-      description: "Reference guide for Eagle0 commands, systems, and game concepts.",
-      customCss: ["./src/styles/custom.css"],
-      editLink: {
-        baseUrl: "https://github.com/nolen777/eagle0/edit/main/docs/eagle0pedia/src/content/docs/",
-      },
-      sidebar: [
-        {
-          label: "Reference",
-          items: [
-            { label: "Eagle0pedia", slug: "" },
-            {
-              label: "Concepts",
-              items: [
-                { label: "Game Concepts", slug: "concepts" },
-                { label: "Eagle Round Flow", slug: "concepts/eagle-round-flow" },
-                { label: "From Eagle to Shardok", slug: "concepts/eagle-to-shardok" },
-                { label: "Shardok Battles", slug: "concepts/shardok-battles" },
-                {
-                  label: "Shardok Victory Conditions",
-                  slug: "concepts/shardok-victory-conditions",
-                },
-              ],
-            },
-            { label: "Eagle Commands", slug: "commands" },
-            { label: "Shardok Commands", slug: "shardok-commands" },
-            { label: "Heroes", slug: "heroes" },
-            { label: "Factions", slug: "factions" },
-            { label: "Provinces", slug: "provinces" },
-            { label: "Integration Notes", slug: "integration" },
-          ],
-        },
-      ],
-      social: [
-        {
-          icon: "github",
-          label: "GitHub",
-          href: "https://github.com/nolen777/eagle0",
-        },
-      ],
-    }),
-  ],
-});
@@ -1,23 +0,0 @@
-{
-  "name": "eagle0pedia",
-  "version": "0.1.0",
-  "private": true,
-  "type": "module",
-  "packageManager": "pnpm@9.15.9",
-  "scripts": {
-    "build": "astro build",
-    "dev": "astro dev",
-    "preview": "astro preview"
-  },
-  "dependencies": {
-    "@astrojs/starlight": "^0.36.0",
-    "astro": "^5.11.0",
-    "sharp": "^0.34.0"
-  },
-  "devDependencies": {
-    "typescript": "^5.8.0"
-  },
-  "pnpm": {
-    "onlyBuiltDependencies": []
-  }
-}
@@ -1,6 +0,0 @@
-import { defineCollection } from "astro:content";
-import { docsSchema } from "@astrojs/starlight/schema";
-
-export const collections = {
-  docs: defineCollection({ schema: docsSchema() }),
-};
@@ -1,666 +0,0 @@
---
-title: Eagle Commands
-description: Strategic command reference for Eagle command panels.
---
-
-Eagle commands are the strategic actions a faction can take from a province command panel. The panel shows the actions that are possible for the current province and situation.
-
-Most commands belong to the province currently acting this turn. Some are reaction commands, such as resolving diplomacy offers, handling captured heroes, or choosing a battle aftermath decision.
-
-## Why commands appear and disappear
-
-The command panel changes as the game changes. If an action is not currently possible, it is usually absent instead of appearing as a disabled button.
-
-Availability can change when:
-
- another command spends gold, food, vigor, or the province's turn;
- a hero, battalion, prisoner, event, or incoming army moves or changes state;
- the game advances to another phase;
- a profession or minimum stat is required; or
- a target is no longer valid.
-
-If a command you expected is missing, check its **Available when** entry. The most common reasons are insufficient gold, food, or vigor; no valid target; the wrong hero profession; the hero being elsewhere; or the province having already spent its turn.
-
-An **eligible hero** is simply one of the heroes you can currently choose to perform that action. Eligibility can depend on location, vigor, profession, leadership, and the command's own restrictions.
-
-## Reading a command entry
-
- **Hero requirements** identifies profession or hero restrictions. “None” means no particular profession, not that the command never needs an acting hero.
- **Vigor cost** is paid by the selected acting hero when the command resolves as described.
- **Available when** summarizes the state that makes the command appear.
- **Effect** describes what the action does.
- **Selection** lists what you must choose before confirming it.
-
-## Turns, reactions, and command states
-
-Most commands under **Normal Command Phase Commands** spend the acting province's turn. After using one, you normally cannot choose another ordinary action for that province this round. Entries explicitly identify exceptions such as Issue Orders.
-
-Diplomacy responses, attack and defense decisions, riots, and battle aftermath are prompted by events in their own phases. Resolving one of these decisions does not replace or grant another ordinary province turn.
-
-**Travel** enters a temporary command state. Traveling commands then become available, and the player may use multiple traveling commands in the same round. **Return** leaves that state and returns to the normal province command flow. Individual traveling actions can still spend resources or alter which later choices remain available.
-
-Before confirming any command, check the selected hero, destination, units, gold, and food. Treat confirmation as issuing the order rather than previewing it.
-
-<span class="command-reference-marker" aria-hidden="true"></span>
-
-<!--
-Source map for numeric command details:
- Alms: src/main/resources/net/eagle0/eagle/settings.tsv fields almsSupportIncreasePerFood=0.01, almsPaladinSupportMultiplier=4, maxAlmsFood=1000; applied in src/main/scala/net/eagle0/eagle/library/actions/impl/command/AlmsCommand.scala and src/main/scala/net/eagle0/eagle/library/actions/availability/AvailableAlmsCommandFactory.scala.
- Feast: settings fields loyaltyGainFromFeast=10, vigorGainFromFeast=10, feastGoldCostPerHero=20; applied in src/main/scala/net/eagle0/eagle/library/actions/impl/command/FeastCommand.scala and src/main/scala/net/eagle0/eagle/library/actions/availability/AvailableFeastCommandFactory.scala.
- Hero Gift: settings fields loyaltyIncreasePerGold=0.25 and maxGiftGold=100; applied in src/main/scala/net/eagle0/eagle/library/actions/impl/command/HeroGiftCommand.scala and src/main/scala/net/eagle0/eagle/library/actions/availability/AvailableHeroGiftCommandFactory.scala.
- Rest: settings field restVigorGain=15; applied in src/main/scala/net/eagle0/eagle/library/actions/impl/command/RestCommand.scala.
- Vigor costs: src/main/resources/net/eagle0/eagle/settings.tsv fields actionVigorCost=15, reconVigorCost=30, apprehendOutlawVigorCost=30, controlWeatherVigorDelta=-40, startEpidemicVigorDelta=-30, vigorGainFromFeast=10, restVigorGain=15.
- Divine: divinable heroes are unaffiliated heroes with RecruitmentInfo.NotDivined; see src/main/scala/net/eagle0/eagle/library/actions/availability/AvailableDivineCommandsFactory.scala and src/main/scala/net/eagle0/eagle/library/actions/impl/command/DivineCommand.scala.
- Issue Orders: order availability comes from src/main/scala/net/eagle0/eagle/library/actions/availability/AvailableIssueOrdersCommandFactory.scala; vassal order behavior comes from src/main/scala/net/eagle0/eagle/library/actions/impl/action/PerformVassalCommandsPhaseAction.scala, src/main/scala/net/eagle0/eagle/library/util/command_choice_helpers/CommandChoiceHelpers.scala, and src/main/scala/net/eagle0/eagle/library/util/command_choice_helpers/ExpandCommandSelector.scala.
- Send Supplies: shipment scheduling comes from src/main/scala/net/eagle0/eagle/library/actions/impl/command/SendSuppliesCommand.scala; arrival comes from src/main/scala/net/eagle0/eagle/library/actions/impl/action/PerformProvinceMoveResolutionAction.scala and src/main/scala/net/eagle0/eagle/library/actions/impl/action/ShipmentArrivedAction.scala; timing/loss settings are src/main/resources/net/eagle0/eagle/settings.tsv fields turnsToResolveShipment=1 and shipSuppliesLoss=0.1.
- Battle Aftermath Decision: availability comes from src/main/scala/net/eagle0/eagle/library/actions/availability/AvailableBattleAftermathDecisionCommandFactory.scala; selection comes from src/main/scala/net/eagle0/eagle/library/actions/impl/command/BattleAftermathDecisionCommand.scala; finalization comes from src/main/scala/net/eagle0/eagle/library/actions/impl/action/FinalizeAftermathAction.scala.
- Manage Prisoners: availability comes from src/main/scala/net/eagle0/eagle/library/actions/availability/AvailableManagePrisonersCommandFactory.scala; option effects come from src/main/scala/net/eagle0/eagle/library/actions/impl/command/ManagePrisonersCommand.scala; prisoner move/return timing comes from src/main/scala/net/eagle0/eagle/library/actions/impl/action/EndPlayerCommandsPhaseAction.scala; settings include prisonerEscapeChance=0.01.
- Handle Captured Hero: availability comes from src/main/scala/net/eagle0/eagle/library/actions/availability/AvailableHandleCapturedHeroCommandFactory.scala; option effects come from src/main/scala/net/eagle0/eagle/library/actions/impl/command/HandleCapturedHeroesCommand.scala; deferred aftermath effects come from src/main/scala/net/eagle0/eagle/library/actions/impl/action/EndBattleAftermathPhaseAction.scala; settings include startingLoyalty=60 and truceMonthsFromReturningLeader=12.
-->
-
-## Normal Command Phase Commands
-
-Most command phase actions spend the acting province's turn.
-
-### Alms
-
-<b>Hero requirements:</b> None. [Paladins](/heroes/#paladin) get a bonus.
-
-<b>Vigor cost:</b> 15.
-
-<b>Available when:</b> the acting province has food to give and an eligible hero with enough vigor.
-
-<b>Effect:</b> Give up to 1000 food from the acting province as charity. The province gains 1 [support](/provinces/#support) per 100 food, capped by the province's maximum 100 support. Paladins multiply the support gain by 4, so a Paladin gives 4 support per 100 food. The acting hero spends vigor and gains charisma XP.
-
-<b>Selection:</b> choose an amount of food and the acting hero.
-
-### Apprehend Outlaw
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> 30.
-
-<b>Available when:</b> an [outlaw hero](/factions/#free-heroes) is present in the acting province and an eligible hero has enough vigor.
-
-<b>Effect:</b> Attempt to capture the outlaw. On success, the outlaw is removed from the province's unaffiliated heroes and re-added as a prisoner with a bias against the imprisoning faction. The acting hero spends vigor, and the game creates a deferred notification/story request.
-
-<b>Selection:</b> choose the outlaw, an optional battalion, and the acting hero.
-
-### Control Weather
-
-<b>Hero requirements:</b> [Mage](/heroes/#mage).
-
-<b>Vigor cost:</b> 40.
-
-<b>Available when:</b> a Mage has enough vigor and the acting province or an adjacent province has a valid weather change.
-
-<b>Effect:</b> Change weather in a target province. Available options can start or end blizzards and droughts. The target province receives a deferred weather change, and the acting hero records a weather backstory event, spends or gains the configured vigor delta, and gains wisdom XP.
-
-<b>Selection:</b> choose the weather control type, target province, and acting hero.
-
-### Diplomacy
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> 15 from the messenger hero.
-
-<b>Available when:</b> a diplomatic option is valid against another faction and an eligible messenger hero can be sent.
-
-<b>Effect:</b> Send a hero to another faction with a diplomatic proposal. The target faction receives the offer at the end of the current round, after any battles this round have taken place. Truce, invitation, alliance, break-alliance, and ransom options create [incoming diplomacy offers](/factions/#incoming-diplomacy-offers) for the target faction and story-generation requests. Most diplomacy options spend gold, remove the messenger hero from the acting province, and cost the messenger vigor.
-
-<b>Selection:</b> choose the diplomacy option, target faction, and sent hero.
-
-### Exile Vassal
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> None.
-
-<b>Available when:</b> this province has at least one [vassal](/heroes/#vassals).
-
-<b>Effect:</b> Remove the selected vassal from your faction.
-
-<b>Selection:</b> choose the hero to exile.
-
-### Feast
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> None. This restores up to 10 vigor for each ruling-faction hero in the province.
-
-<b>Available when:</b> the acting province can pay the feast cost: 20 gold per ruling-faction hero in the province, multiplied by the province [price index](/provinces/#price-index).
-
-<b>Effect:</b> Hold a feast in the acting province. Every ruling-faction hero in the province gains up to 10 loyalty, capped at 100, and up to 10 vigor, capped by constitution. Faction leaders do not gain loyalty, but can still gain vigor. The province spends gold, the price index may change, and feast-spending quest counters can advance.
-
-<b>Selection:</b> no additional choices.
-
-### Hero Gift
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> None.
-
-<b>Available when:</b> the province has a non-leader hero with less than 100 LOY and gold available to give.
-
-<b>Effect:</b> Send up to 100 gold as a gift to the selected hero. Loyalty gain depends on the gold amount, the recipient province's price index, and the hero's current loyalty: the base gain is 0.25 loyalty per gold, divided by price index, capped by the remaining room to 100 LOY.
-
-<b>Selection:</b> choose the recipient hero and amount.
-
-### Improve
-
-<b>Hero requirements:</b> None. [Engineers](/heroes/#engineer) get a bonus.
-
-<b>Vigor cost:</b> 15.
-
-<b>Available when:</b> a hero has enough vigor and the province has an available improvement or devastation repair option.
-
-<b>Effect:</b> Improve a province using one of the available improvement types. [Economy, agriculture, and infrastructure](/provinces/#development-stats) rise toward 100; [devastation](/provinces/#devastation) repair reduces all three devastation tracks. The acting hero spends vigor and gains strength/agility XP, and the improvement can optionally be locked as the province's preferred type.
-
-<b>Selection:</b> choose the improvement type, acting hero, and whether to lock the type.
-
-### Issue Orders
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> None. This does not take your turn.
-
-<b>Available when:</b> a faction leader is acting and your faction controls more than one province. This command does not take your turn.
-
-<b>Effect:</b> Set [standing orders](/provinces/#province-orders) for your provinces. Orders guide vassal-ruled provinces during the [Vassal Commands phase](/concepts/eagle-round-flow/#vassal-commands); provinces led directly by faction leaders are still commanded directly. Vassals may still handle urgent problems first, such as defense, riots, severe fatigue, low support, beast suppression, loyalty management, or other immediately available crisis commands.
-
-<b>Selection:</b> submit the new province orders and the new focus province, or clear the focus province.
-
-#### Order Meanings
-
-##### Entrust
-
-Use the vassal's judgment. If the province borders an enemy, the vassal tends to act like **Mobilize**. Otherwise, the vassal tends to act like **Develop**.
-
-##### Develop
-
-Build up the province. The vassal may send away surplus gold and food toward your focus province, if one is set, or otherwise toward the nearest faction leader. Then it prefers **Improve** actions that raise economy, agriculture, infrastructure, or repair devastation. If nothing useful is available, the province rests.
-
-##### Mobilize
-
-Prepare for war. The vassal may ship excess gold and food toward your focus province, if one is set, or otherwise toward the nearest faction leader. Then it may organize troops, arm troops, improve infrastructure when it limits training, train battalions, and fall back to improvement or rest.
-
-##### Expand
-
-Look for growth or attack opportunities. The vassal first tries to march into neutral provinces, usually leaving enough heroes behind to keep the origin province held. If expansion is not practical, it may spread heroes among your existing provinces, attack enemies when appropriate, improve the province, or rest.
-
-### March
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> 15 from each marching hero.
-
-<b>Available when:</b> the acting province has movable heroes, battalions, gold, or food and at least one valid destination.
-
-<b>Effect:</b> Move heroes, battalions, gold, and food from one province to another. The selected units and supplies leave the origin province immediately, each marching hero spends vigor and gains wisdom XP, and the destination receives an [incoming army](/provinces/#incoming-armies) scheduled for the next round.
-
-If the destination is already ruled by your faction when the army arrives, the heroes, battalions, gold, and food enter the province during the next round's Province Move Resolution phase, before riots, vassal commands, and player commands.
-
-If the destination is neutral or hostile, the army does not simply appear in the province at Province Move Resolution. It is set up as a hostile army later in that same next round, after player commands. A neutral province can then be taken in the Uncontested Conquest phase; a defended province can lead into attack, defense, battle request, and battle resolution phases. Until one of those outcomes resolves, the marching heroes are still in the moving army rather than ruling the destination.
-
-<!-- Sources:
- March scheduling: src/main/scala/net/eagle0/eagle/library/actions/impl/command/MarchCommand.scala
- Friendly arrival timing: src/main/scala/net/eagle0/eagle/library/actions/impl/action/PerformProvinceMoveResolutionAction.scala
- Hostile setup and neutral conquest timing:
-  src/main/scala/net/eagle0/eagle/library/actions/impl/action/PerformHostileArmySetupAction.scala
-  src/main/scala/net/eagle0/eagle/library/actions/impl/action/PerformUncontestedConquestAction.scala
- Phase order: src/main/scala/net/eagle0/eagle/model/state/RoundPhase.scala
-->
-
-<b>Selection:</b> choose origin, destination, gold, food, and marching units.
-
-### Organize Troops
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> None.
-
-<b>Available when:</b> the acting province has battalions to manage, troops to reorganize, or gold to raise new troops.
-
-<b>Effect:</b> Create, resize, merge, transfer, or dismiss battalions in the acting province. New troops cost gold and enter with no training or armament, while transferred troops preserve weighted training and armament. Empty battalions are destroyed, new battalions get generated names and initial backstory requests, and the province price index may change from the gold spend.
-
-<b>Selection:</b> submit changed battalions and new battalions, including troop movements and new troop counts.
-
-### Recon
-
-<b>Hero requirements:</b> [Ranger](/heroes/#ranger).
-
-<b>Vigor cost:</b> 30.
-
-<b>Available when:</b> a Ranger has enough vigor and there is a valid target province to scout.
-
-<b>Effect:</b> Send a hero to scout another province.
-
-<b>Selection:</b> choose the acting hero and target province.
-
-### Rest
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> None. This restores up to 15 vigor for each ruling-faction hero in the province.
-
-<b>Available when:</b> the acting province can spend its turn resting.
-
-<b>Effect:</b> Have the acting province rest for the turn. Faction heroes in the province regain up to 15 vigor, capped by constitution, and rest-related quest counters can advance.
-
-<b>Selection:</b> no additional choices.
-
-### Send Supplies
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> 15.
-
-<b>Available when:</b> the acting province has supplies to send, an eligible hero, and a valid destination province.
-
-<b>Effect:</b> Send gold and food from the acting province to another province. The origin province loses the full selected amount immediately, and the destination receives an [incoming shipment](/provinces/#incoming-shipments) scheduled for the next round.
-
-Shipments arrive during the next round's Province Move Resolution phase, before riots, hero departures, vassal commands, player commands, battles, and food consumption. That means food shipped this way is available to feed the destination province later in the same round it arrives. When the shipment arrives, 10% is lost in transit and the destination receives the remaining gold and food, rounded down.
-
-<b>Selection:</b> choose gold, food, acting hero, and destination province.
-
-### Start Epidemic
-
-<b>Hero requirements:</b> [Necromancer](/heroes/#necromancer).
-
-<b>Vigor cost:</b> 30.
-
-<b>Available when:</b> a Necromancer has enough vigor and the acting province or an adjacent province can receive an epidemic.
-
-<b>Effect:</b> Start an epidemic in the target province.
-
-<b>Selection:</b> choose the target province and acting hero.
-
-### Suppress Beasts
-
-<b>Hero requirements:</b> None. Heroes with any profession get a power bonus.
-
-<b>Vigor cost:</b> 15 on success, plus any vigor lost to casualties. If the hero is killed, the command fails.
-
-<b>Available when:</b> the acting province has a [beast event](/provinces/#province-events) and an eligible hero.
-
-<b>Effect:</b> Send a hero, optionally with a battalion, to suppress beasts in the acting province. The fight rolls beast power, applies casualties to the battalion and/or hero, removes the beast event on success or failure, and creates a story notification. Success can award gold, food, support, hero XP, and battalion backstory; failure can kill the hero and destroy the battalion.
-
-<b>Selection:</b> choose the hero and optional battalion.
-
-### Swear Kinship
-
-<b>Hero requirements:</b> The target hero must have at least 95 loyalty.
-
-<b>Vigor cost:</b> None.
-
-<b>Available when:</b> the faction head is in the province, your faction has fewer than 5 faction leaders, and another hero in the province has at least 95 loyalty.
-
-<b>Effect:</b> Choose a hero for a kinship bond. A hero who swears kinship becomes a [faction leader](/heroes/#faction-leaders).
-
-<b>Selection:</b> choose the hero to swear kinship with.
-
-### Train
-
-<b>Hero requirements:</b> None. [Champions](/heroes/#champion) get a bonus.
-
-<b>Vigor cost:</b> 15.
-
-<b>Available when:</b> a hero has enough vigor and the province has at least one battalion with less than 100 TRN.
-
-<b>Effect:</b> Raise the TRN of all trainable battalions in the province. The more troops are present, the lower the amount raised. The acting hero spends vigor and gains charisma, strength, and agility XP.
-
-<b>Selection:</b> choose the acting hero.
-
-### Travel
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> 15.
-
-<b>Available when:</b> the acting province can enter the traveling command state.
-
-<b>Effect:</b> Unlock the traveling commands below. Once you are traveling, you can use as many traveling commands as you want in the same round before using Return to come back to camp.
-
-<b>Selection:</b> no additional choices.
-
-## Traveling Commands
-
-You must use Travel before these commands appear. Once you are traveling, you can use as many traveling commands as you want in one round before using Return to come back to camp.
-
-### Arm Troops
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> None.
-
-<b>Available when:</b> you are traveling, the province has gold, and at least one battalion can raise ARM without exceeding effective infrastructure.
-
-<b>Effect:</b> Spend gold to raise armament on existing battalions. New armament must be higher than the battalion's current armament and cannot exceed the province's effective infrastructure. The province spends gold, the price index may change, and each armed battalion records a backstory event.
-
-<b>Selection:</b> choose the battalions to arm and how much armament each receives.
-
-### Decline Quest
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> None.
-
-<b>Available when:</b> you are traveling and an [unaffiliated hero](/heroes/#unaffiliated-heroes) quest is available in the province.
-
-<b>Effect:</b> Decline one of the unaffiliated hero quests available in the acting province.
-
-<b>Selection:</b> choose the hero whose quest should be declined.
-
-### Divine
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> None.
-
-<b>Available when:</b> you are traveling, the province has gold, and there are free heroes who are not yet ready to join your faction but might be won over.
-
-<b>Effect:</b> Spend gold to divine one or more [free heroes](/factions/#free-heroes). For each divined hero, you receive details about what could impress them enough to become recruitable. Fulfill that ask, and the hero can later appear under Recruit Heroes. Cost scales by the province price index, the province spends gold, and the price index may change.
-
-<b>Selection:</b> choose the heroes to divine.
-
-### Manage Prisoners
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> None.
-
-<b>Available when:</b> you are traveling and the province has prisoner heroes with available management options.
-
-<b>Effect:</b> Choose what happens to ordinary prisoners in the province. These are heroes who are already in the prisoner state, not newly captured heroes still waiting for a battle aftermath decision.
-
-<b>Selection:</b> choose the prisoner and management option.
-
-#### Options
-
-##### Execute
-
-<b>Effect:</b> Kill the prisoner and remove them from the game.
-
-##### Exile
-
-<b>Available when:</b> the prisoner is not a faction leader.
-
-<b>Effect:</b> Turn the prisoner into an outlaw in the same province.
-
-##### Release
-
-<b>Available when:</b> the prisoner is not a faction leader.
-
-<b>Effect:</b> Release the prisoner as a traveler in the same province. Released prisoners are no longer in your custody, but they do not automatically join another faction.
-
-##### Move
-
-<b>Available when:</b> you control an adjacent province.
-
-<b>Effect:</b> Send the prisoner to one adjacent province ruled by your faction. The prisoner leaves the origin province now and arrives at the destination at the end of the Player Commands phase. There is a 1% chance the prisoner escapes during the move; if that happens, they become an outlaw in the destination province instead of remaining a prisoner.
-
-##### Return
-
-<b>Available when:</b> the prisoner is a faction leader and their faction still controls at least one province.
-
-<b>Effect:</b> Return the prisoner to their faction. They leave your custody now and rejoin their faction at the end of the Player Commands phase as a ruling hero in one of that faction's provinces.
-
-Ordinary prisoners cannot be returned this way. Faction leader prisoners cannot be released or exiled, but they can be executed, moved within your territory, or returned if their faction still exists.
-
-### Recruit Heroes
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> None.
-
-<b>Available when:</b> you are traveling and unaffiliated heroes in the province are willing to join.
-
-<b>Effect:</b> Recruit available unaffiliated heroes in the acting province. Recruited heroes join the faction at starting loyalty, move from the province's unaffiliated hero list into its ruling faction heroes, and receive a recruitment backstory event.
-
-<b>Selection:</b> choose the heroes to recruit.
-
-### Return
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> None.
-
-<b>Available when:</b> you are traveling.
-
-<b>Effect:</b> Return from the traveling command state to the normal strategic flow.
-
-<b>Selection:</b> no additional choices.
-
-### Trade
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> None.
-
-<b>Available when:</b> you are traveling and the province has enough gold or food for at least one trade.
-
-<b>Effect:</b> Buy or sell food using the acting province's gold and food stores. Food buy and sell prices are based on the province price index. Buying spends gold and adds food; selling removes food and adds gold. The price index may change after the trade.
-
-<b>Selection:</b> choose buy or sell and the amount of food.
-
-## Special and Conditional Commands
-
-These commands appear only when the game is resolving a special situation, response, or pending decision.
-
-### Attack Decision
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> None.
-
-<b>Available when:</b> an attack decision is pending.
-
-<b>Effect:</b> Choose how to respond to a pending attack opportunity or battle decision. The command shows involved armies, acting units, and the available attack decision types. See [Attack and Defense Decisions](/concepts/eagle-to-shardok/#attack-and-defense-decisions) for how this fits into battle creation.
-
-<b>Selection:</b> choose one available attack decision.
-
-### Defend
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> None.
-
-<b>Available when:</b> a province is under attack and can commit defenders.
-
-<b>Effect:</b> Respond to an incoming attack by committing a defending army. The selected defenders become the province's defending army. If flee provinces are available, one must be selected as the army's fallback destination. See [Attack and Defense Decisions](/concepts/eagle-to-shardok/#attack-and-defense-decisions) for what happens next.
-
-<b>Selection:</b> choose defending units and, when available, an optional flee province.
-
-### Handle Captured Hero
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> None.
-
-<b>Available when:</b> a newly captured hero needs a battle aftermath decision.
-
-<b>Effect:</b> Decide what happens to a hero captured during [battle aftermath](/concepts/eagle-to-shardok/#aftermath) or conquest. Captured heroes are not yet ordinary prisoners. If you imprison one, they become a normal prisoner and can later be handled with Manage Prisoners.
-
-<b>Selection:</b> choose the captured hero and the handling option.
-
-#### Options
-
-##### Recruit
-
-<b>Available when:</b> the captured hero is not a faction leader, has not already refused recruitment, and is not someone who will never join your faction.
-
-<b>Effect:</b> Try to persuade the captured hero to join you immediately. The chance depends on your faction head, your faction's prestige, and the captured hero. On success, the hero joins your faction in the captured province with 60 loyalty. On failure, the hero refuses; you cannot try to recruit that captured hero again from this aftermath decision and must choose another option.
-
-##### Imprison
-
-<b>Effect:</b> Keep the hero as a prisoner in the captured province. This converts them into an ordinary prisoner when the aftermath resolves.
-
-##### Exile
-
-<b>Available when:</b> the captured hero is not a faction leader whose faction still controls a province.
-
-<b>Effect:</b> Cast the hero out as an outlaw in the captured province when the aftermath resolves.
-
-##### Execute
-
-<b>Effect:</b> Kill the captured hero and remove them from the game when the aftermath resolves.
-
-##### Return
-
-<b>Available when:</b> the captured hero is a faction leader and their faction still controls at least one province.
-
-<b>Effect:</b> Return the captured faction leader to the closest province ruled by their old faction when the aftermath resolves. Returning a captured leader creates a 12-month truce between your faction and theirs.
-
-### Handle Riot
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> Depends on the option. Crack Down can cost vigor; Give and Do Nothing do not.
-
-<b>Available when:</b> a province has a riot.
-
-<b>Effect:</b> Respond to a [riot](/provinces/#province-events) in the acting province. The client presents this as one command with multiple response options. The [province leader](/provinces/#ruling-faction-and-ruling-hero)'s Charisma matters, even if a different hero is selected to crack down: leader Charisma improves gift success and makes forceful crackdowns face smaller riots.
-
-If you fail to stop the riot, or if the riot is still unresolved when the riot phase ends, the riot happens. The province loses 25 support, gains 25 economy devastation, gains 25 infrastructure devastation, and the riot event is removed.
-
-<!-- Sources:
- Riot options: src/main/scala/net/eagle0/eagle/library/actions/impl/command/HandleRiotGiveCommand.scala
-  src/main/scala/net/eagle0/eagle/library/actions/impl/command/HandleRiotCrackDownCommand.scala
-  src/main/scala/net/eagle0/eagle/library/actions/impl/command/HandleRiotDoNothingCommand.scala
- Riot consequences: src/main/scala/net/eagle0/eagle/library/actions/impl/command/HandleRiotUtils.scala
- Riot settings: src/main/scala/net/eagle0/eagle/library/settings/BUILD.bazel
-->
-
-#### Options
-
-##### Crack Down
-
-<b>Vigor cost:</b> 15 on success, plus any vigor lost to casualties. If the hero is killed, the command fails.
-
-<b>Effect:</b> Try to suppress the riot by force using a hero and optionally a battalion. The riot size is random from 100 to 1500, but the province leader's Charisma, not the selected acting hero's Charisma, reduces the roll before the size is calculated. Higher leader Charisma therefore makes the riot smaller and easier to defeat.
-
-Casualties are based on riot size against the power of the acting hero and any attached battalion. If a battalion is used, casualties hit the battalion first; the battalion can be destroyed, and excess casualties can injure or kill the acting hero. If no battalion is used, casualties hit the acting hero directly.
-
-Crack Down succeeds if the acting hero survives. On success, the riot event is removed and the acting hero spends 15 vigor, gains Strength and Agility XP, and may take additional vigor damage from casualties. If a battalion helped and survived, its size is reduced by its casualties. A successful crackdown does not directly reduce support, add devastation, or change loyalty; the cost is the violence itself.
-
-Crack Down fails if the acting hero is killed. A failed crackdown does not stop the riot; the riot will still occur and apply the normal riot damage.
-
-<b>Selection:</b> choose the acting hero and an optional battalion.
-
-##### Do Nothing
-
-<b>Vigor cost:</b> None.
-
-<b>Effect:</b> Let the riot proceed without intervention. The riot will occur, causing the normal riot damage: -25 support, +25 economy devastation, and +25 infrastructure devastation.
-
-<b>Selection:</b> no additional choices.
-
-##### Give
-
-<b>Vigor cost:</b> None.
-
-<b>Effect:</b> Offer either food or gold to address the riot. You cannot combine food and gold in the same response. The maximum useful gift is 1000 food or 500 gold, and the selected amount is spent whether the attempt succeeds or fails.
-
-Gift success is probabilistic. The chance is based on the province leader's Charisma plus the fraction of the maximum gift you gave: larger gifts help, and more leader Charisma helps. A partial gift can fail. On success, the riot event is removed. On failure, the gift is still spent and the riot will still occur.
-
-<b>Selection:</b> choose a food amount or a gold amount.
-
-### Please Recruit Me
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> None.
-
-<b>Available when:</b> unaffiliated heroes ask to join.
-
-<b>Effect:</b> Respond to unaffiliated heroes who are asking to join a province.
-
-<b>Selection:</b> choose the province, hero, and whether to accept.
-
-### Resolve Alliance Offer
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> None.
-
-<b>Available when:</b> another faction offers an alliance.
-
-<b>Effect:</b> Accept or reject an [incoming alliance offer](/factions/#incoming-diplomacy-offers).
-
-<b>Selection:</b> choose the originating faction and the resolution.
-
-### Resolve Break Alliance
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> None.
-
-<b>Available when:</b> another faction tries to break an alliance.
-
-<b>Effect:</b> Respond to a faction attempting to break an alliance.
-
-<b>Selection:</b> choose the originating faction and the resolution.
-
-### Resolve Invitation
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> None.
-
-<b>Available when:</b> another faction sends an invitation.
-
-<b>Effect:</b> Accept or reject an invitation from another faction.
-
-<b>Selection:</b> choose the originating faction and the resolution.
-
-### Resolve Ransom Offer
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> None.
-
-<b>Available when:</b> another faction makes a ransom offer.
-
-<b>Effect:</b> Accept or reject an incoming ransom offer.
-
-<b>Selection:</b> choose the offering faction, the ransom offer, and the resolution.
-
-### Resolve Truce Offer
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> None.
-
-<b>Available when:</b> another faction offers a truce.
-
-<b>Effect:</b> Accept or reject an incoming truce offer.
-
-<b>Selection:</b> choose the originating faction and the resolution.
-
-### Resolve Tribute
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> None.
-
-<b>Available when:</b> another faction demands tribute.
-
-<b>Effect:</b> Decide whether to pay demanded tribute. The command shows the demanding factions, requested tribute, their rough strength, and the acting province's available food and gold.
-
-<b>Selection:</b> choose the demanding faction and whether tribute is paid.
-
-### Battle Aftermath Decision
-
-<b>Hero requirements:</b> None.
-
-<b>Vigor cost:</b> None.
-
-<b>Available when:</b> multiple allied attacking factions won the same province and Eagle needs to decide which claimant keeps it.
-
-<b>Effect:</b> Decide what your surviving claimant army does during [battle aftermath](/concepts/eagle-to-shardok/#aftermath) after a shared victory. If no ally has claimed the province yet, you may choose **Keep Province** and become the conqueror. If an ally has already claimed it, you must withdraw.
-
-Keeping the province finalizes conquest: your surviving non-fled heroes become the new ruling heroes, surviving battalions become the province battalions, support is reset to 0, province orders reset to **Entrust**, and non-fled defenders or former ruling heroes can become prisoners.
-
-Withdrawing sends your surviving units to an adjacent province as a moving army. You may take up to the gold and food your claimant army brought into the battle. The withdrawal army arrives next round and does not use the normal Send Supplies transit loss.
-
-<b>Selection:</b> choose whether to keep the province or withdraw. If withdrawing, choose destination province and supplies to take.
@@ -1,137 +0,0 @@
---
-title: Eagle Round Flow
-description: How Eagle strategic rounds advance, including simultaneous player action.
---
-
-<!--
-Source map:
- Phase enum: src/main/protobuf/net/eagle0/eagle/common/round_phase.proto.
- Phase advancement: src/main/scala/net/eagle0/eagle/library/RoundPhaseAdvancer.scala.
- Command availability by phase: src/main/scala/net/eagle0/eagle/library/actions/availability/AvailableCommandsFactory.scala.
- Result visibility/filtering: src/main/scala/net/eagle0/eagle/library/ActionResultFilter.scala and src/main/scala/net/eagle0/eagle/library/util/view_filters/.
-->
-
-Eagle is a simultaneous-turn strategy game. During a phase, every faction gets the chance to act in parallel. The game does not fully resolve the phase just because one player chooses a command; it waits until every required player choice has been made, then advances the phase and reveals the results each faction is allowed to know.
-
-That means two things matter:
-
- Your orders are not a private single-player timeline. Other factions may be choosing their own commands at the same time.
- You do not automatically see every action in the world. You see your faction's results, your allies' visible results, and information your faction has earned through scouting, battle revelations, diplomacy, or province control.
-
-## Round Shape
-
-Most rounds follow this broad rhythm:
-
-1. Upkeep and automatic world changes happen.
-2. Vassals and players issue strategic commands.
-3. Marching armies arrive, attacks are decided, and battles are requested.
-4. Shardok battles resolve outside the strategic map.
-5. Eagle applies battle results, aftermath choices, diplomacy, recon, and end-of-round changes.
-
-Some phases are player-facing. Others are bookkeeping phases that advance automatically unless a special decision is needed.
-
-## Automatic Upkeep
-
-These phases usually advance without direct player input:
-
-### New Round
-
-The game starts a new strategic round. Provinces, heroes, factions, and long-running state are updated for the new date.
-
-### Prisoner Exchange
-
-The game resolves automatic prisoner exchange state.
-
-### Province Events
-
-Province events such as local problems or opportunities are processed.
-
-### Forced Turn Back
-
-Armies that must turn back do so before normal movement resolution.
-
-### Province Move Resolution
-
-Moving armies arrive at their destinations, supplies move, and incoming hostile groups are created where armies meet resistance.
-
-### Hero Departures
-
-Heroes who are ready to leave unaffiliated states or temporary situations may depart.
-
-### Unaffiliated Hero Actions
-
-Unaffiliated heroes may move, appear, escape, or otherwise act without belonging to a faction.
-
-### Hostile Army Setup
-
-The game prepares hostile army groups before conquest or battle decisions.
-
-### Uncontested Conquest
-
-If an attacker reaches a province with no defending force, the conquest can resolve without a Shardok battle.
-
-### Truce Turn Back
-
-Armies affected by truces may turn back instead of fighting.
-
-### Battle Request
-
-Eagle creates Shardok battles for provinces where attackers and defenders must fight.
-
-### Food Consumption
-
-Armies consume food before or around battle handling.
-
-### Battle Resolution
-
-Eagle waits for outstanding Shardok battles to report results. If there are none, the phase advances automatically.
-
-### Recon Resolution
-
-Recon results are applied after the relevant strategic activity has completed.
-
-## Player Decision Phases
-
-These phases can pause until required players have submitted decisions.
-
-### Handle Riot
-
-If your province has a riot, you may need to decide how to respond before the round can continue.
-
-### Please Recruit Me
-
-Some unaffiliated heroes may ask to join a faction. The phase waits while available recruitment decisions remain.
-
-### Vassal Commands
-
-Vassals choose province actions for provinces they rule. Vassals lead provinces and make their own choices, so these commands can happen before the direct player command phase.
-
-### Player Commands
-
-This is the main strategic command phase. Each player acts for provinces and heroes they can command directly. Every player is acting within the same phase, so your command is submitted into a shared strategic moment rather than immediately revealing a global timeline.
-
-See [Eagle commands](/commands/) for the command reference.
-
-### Attack Decision
-
-When an army reaches a hostile province, the attacking side may need to choose whether to attack.
-
-### Defense Decision
-
-The defending side may need to decide how to respond to an incoming attack.
-
-### Battle Aftermath
-
-After Shardok results return to Eagle, winners may need to decide what happens to conquered provinces, captured heroes, or multiple allied claimants.
-
-### Diplomacy Resolution
-
-Diplomatic offers are resolved after players choose how to answer them. Offers can be accepted, rejected, invalidated, or lead to consequences such as imprisonment.
-
-## Simultaneous Information
-
-The important habit is to think in phases, not in a fully visible turn order.
-
-If two factions both issue orders during Player Commands, those orders belong to the same command phase. When the phase ends, each faction receives the filtered results it is allowed to observe. Your own actions are visible to you. Allied and nearby events may be visible depending on game state. Enemy actions may be hidden until scouts, battles, diplomacy, or later consequences reveal them.
-
-This is why Eagle often feels less like "I move, then you move" and more like issuing orders into a living world, then discovering what happened.
@@ -1,133 +0,0 @@
---
-title: From Eagle to Shardok
-description: How strategic Eagle armies become tactical Shardok battles.
---
-
-<!--
-Source map:
- Movement resolution: src/main/scala/net/eagle0/eagle/library/actions/impl/action/PerformProvinceMoveResolutionAction.scala.
- Battle setup phase: src/main/scala/net/eagle0/eagle/library/actions/impl/action/PerformHostileArmySetupAction.scala.
- Uncontested conquest: src/main/scala/net/eagle0/eagle/library/actions/impl/action/PerformUncontestedConquestAction.scala.
- Battle request creation: src/main/scala/net/eagle0/eagle/library/actions/impl/action/RequestBattlesAction.scala.
- Tactical battle resolution back into Eagle: src/main/scala/net/eagle0/eagle/library/actions/impl/action/ResolveBattleAction.scala.
- Province held/conquered outcomes: src/main/scala/net/eagle0/eagle/library/actions/impl/action/ProvinceHeldAction.scala and src/main/scala/net/eagle0/eagle/library/actions/impl/action/ProvinceConqueredAction.scala.
- Multi-winner aftermath: src/main/scala/net/eagle0/eagle/library/actions/impl/action/MultiVictorBattleSetupAction.scala, src/main/scala/net/eagle0/eagle/library/actions/impl/command/BattleAftermathDecisionCommand.scala, and src/main/scala/net/eagle0/eagle/library/actions/impl/action/FinalizeAftermathAction.scala.
- Battle aftermath decisions: src/main/scala/net/eagle0/eagle/library/actions/impl/action/FinalizeAftermathAction.scala and AutoResolveBattleAftermathAction.scala.
-->
-
-Eagle is the strategic layer. Shardok is the tactical layer. The two connect when armies meet in a province and Eagle needs a battlefield result instead of a simple strategic update.
-
-## Strategic Movement
-
-In Eagle, armies move through the March command. A moving army has an origin province, destination province, arrival round, heroes, battalions, and supplies.
-
-Because Eagle is simultaneous, multiple factions can send armies during the same strategic phase. Those armies arrive later during movement resolution, after every relevant player has had the chance to submit orders for the phase.
-
-## Arrival
-
-When an army reaches its destination, the first question is whether it is friendly to the province's current ruler.
-
-Friendly armies arrive during Province Move Resolution. Their heroes, battalions, gold, and food enter the destination province at that point.
-
-Hostile armies do not immediately enter the province. They are converted into hostile army groups later in the round, after player commands, with one group per attacking faction. Each group keeps the armies, units, supplies, and approach direction from the province it marched from.
-
-After hostile setup, Eagle checks for cases that do not need a tactical battle:
-
- If a hostile army reaches an unruled province, the largest army group takes it during Uncontested Conquest. Ties are broken by troop power and then a deterministic random tie-breaker.
- If a single attacking army is attacking and there is no defending army, Eagle can resolve the attack directly as a conquest.
- If diplomacy or truces apply, armies may turn back before fighting.
-
-Otherwise, the player may see attack or defense decision phases before a battle is requested.
-
-## Attack and Defense Decisions
-
-Hostile army groups first wait for an attack decision. An attacking faction can choose whether to press the attack when the game asks for that decision.
-
-If an attack proceeds against a ruled province, the defender may need to choose a defending army. The chosen defenders become the province's defending army. If a fallback province is available, the defender may also need to choose where the army should flee or retreat if Shardok produces that outcome.
-
-## Battle Creation
-
-When Eagle creates a Shardok battle, it sends:
-
- The province's Shardok map.
- The attacking armies.
- The defending army, if any.
- Each side's food for the battle.
- Victory conditions for each player.
- The battle type and battle id.
-
-Attackers in a normal province assault are trying to take the province. Defenders are trying to hold it or survive long enough for the attacker to fail.
-
-The battle food sent to Shardok is limited. Attackers bring up to one month of food consumption from their carried supplies. Defenders bring up to one month of food consumption from the province's food, and that food is removed from the province when the battle is created.
-
-## Tactical Resolution
-
-The battle then runs in Shardok. Players place units, move, attack, use profession commands, spend Action Points, and try to satisfy their victory conditions.
-
-Eagle waits in the battle resolution phase until outstanding Shardok battles report back.
-
-See [Shardok battles](/concepts/shardok-battles/) for the tactical overview and [Shardok victory conditions](/concepts/shardok-victory-conditions/) for battle-ending rules.
-
-## Returning To Eagle
-
-When Shardok reports a result, Eagle applies battle consequences before deciding who owns the province.
-
-The battle result can change:
-
- Hero locations and status.
- Battalion size and survival.
- Captured heroes and prisoners.
- Supplies brought by attacking armies.
- Province devastation.
- Quest progress and battle history.
- Prestige. Winners gain battle prestige; losers lose battle prestige.
-
-Battles add devastation to the battle province. Surviving units may return, flee, become outlaws, be secured, or be captured depending on the tactical result.
-
-Attackers' remaining gold and food are added to the battle province as part of battle resolution. If the defender holds the province, those supplies become part of the defended province. If an attacker later conquers it, the province changes hands with the supplies already present.
-
-## If The Defender Wins
-
-If the defending side wins, the province remains with its current ruler.
-
-Attackers who did not flee, become outlaws, or get otherwise secured may be captured by the defending faction. Captured attacker battalions can be destroyed. The defender receives a Province Held result and any captured heroes become prisoners in the province.
-
-## If One Attacker Wins
-
-If exactly one attacking faction wins, that faction conquers the province directly.
-
-Conquest does several things at once:
-
- Sets the conquering faction as the province's ruler.
- Removes the old ruling-faction heroes from the province.
- Adds the surviving non-fled conquering heroes as the new ruling-faction heroes.
- Replaces the province battalions with the surviving conquering battalions.
- Clears the defending army.
- Sets province support to 0.
- Resets province orders to **Entrust**.
- Captures non-fled defenders and former ruling heroes as prisoners.
- Clears the old owner's focus province if this province was their focus.
- Clears recon on the province for all factions.
-
-Prisoners already held in the conquered province can also be freed. Prisoners from the conquering faction join the new rulers at freed-prisoner loyalty. Prisoners from allied factions are sent toward the closest allied province when possible; if no allied province exists, they can become outlaws.
-
-## If Multiple Allied Attackers Win
-
-If multiple attacking factions win together, Eagle cannot automatically know who should keep the province. It creates a pending conquest decision for the surviving attacking claimants.
-
-During Battle Aftermath, each claimant may be asked to choose:
-
- **Keep Province:** claim the province. Only one claimant can keep it.
- **Withdraw:** leave for an adjacent province, taking up to the gold and food that claimant brought into the battle.
-
-If an ally has already claimed the province, the remaining claimants must withdraw. If only one undecided claimant remains and nobody has claimed the province, Eagle auto-resolves that claimant as keeping it.
-
-When aftermath finalizes, the keeper conquers the province through the same conquest rules as a single attacking winner. Withdrawing claimants become incoming armies to their chosen adjacent provinces, arriving next round with the gold and food they chose to take. These aftermath withdrawals do not apply shipment transit loss.
-
-## Aftermath
-
-Some battle results need another Eagle decision before the round can continue. This happens mainly when multiple allied attackers win the same province or when captured heroes create follow-up handling decisions.
-
-Battle Aftermath happens after tactical results return but before the strategic round fully moves on. It is not a second Shardok battle; it is Eagle deciding ownership, withdrawals, supplies, and captured-hero consequences from the battle that already ended.
-
-Captured heroes can create separate follow-up decisions after this. Those decisions determine what the capturing faction does with the hero now that the battle result has placed them in custody.
@@ -1,16 +0,0 @@
---
-title: Game Concepts
-description: Player-facing explanations of Eagle and Shardok systems.
---
-
-These pages explain how Eagle0's major systems fit together. Use them when you want the big picture behind the command reference.
-
-## Eagle
-
- [Eagle round flow](eagle-round-flow/) explains how a strategic round advances, why actions are simultaneous, and when players see results.
- [From Eagle to Shardok](eagle-to-shardok/) explains how strategic movement turns into tactical battles and how battle results return to Eagle.
-
-## Shardok
-
- [Shardok battles](shardok-battles/) explains tactical setup, turns, units, morale, vigor, terrain, and battle aftermath.
- [Shardok victory conditions](shardok-victory-conditions/) explains how tactical battles end.
@@ -1,76 +0,0 @@
---
-title: Shardok Battles
-description: How tactical Shardok battles work at a high level.
---
-
-<!--
-Source map:
- Shardok battle model: src/main/scala/net/eagle0/eagle/model/state/shardok_battle/ShardokBattle.scala.
- Battle creation from Eagle: src/main/scala/net/eagle0/eagle/library/actions/impl/action/RequestBattlesAction.scala.
- Battle resolution back into Eagle: src/main/scala/net/eagle0/eagle/library/actions/impl/action/ResolveBattleAction.scala.
- Tactical command availability: src/main/cpp/net/eagle0/shardok/library/AvailableCommandsFactory.cpp and command_factories/.
- Victory checks: src/main/cpp/net/eagle0/shardok/library/actions/UpdateGameStatusAction.cpp.
-->
-
-Shardok is the tactical battle layer. Eagle decides that a battle should happen, sends armies into Shardok, and later receives the result back.
-
-## Setup
-
-At the start of a battle, each side places its units onto valid setup hexes. Some battles include reserve or reinforcement units that enter later. Rangers on stealth-capable units may be able to deploy hidden.
-
-The map comes from the province where the battle occurs. A province's Shardok map defines terrain, castles, cities, rivers, bridges, water, and critical tiles.
-
-## Units
-
-A Shardok unit usually represents a hero attached to a battalion. The hero brings stats, vigor, profession abilities, and special command access. The battalion brings troop count, type, morale, training, armament, movement costs, damage profile, and battlefield limits.
-
-Some commands require a profession. Some also require the attached battalion type to support that role. For example, many spell commands require a unit that can cast, while Ranger stealth depends on a stealth-capable battalion.
-
-See [Heroes](/heroes/) for professions and [Shardok commands](/shardok-commands/) for command requirements.
-
-## Action Points
-
-Units act using Action Points. Moving through terrain spends AP based on the terrain and battalion type. Many major actions require a fixed AP minimum and then consume all remaining AP. The [Shardok command reference](/shardok-commands/) lists each command's AP cost and requirements.
-
-Unless a command says otherwise, a unit with morale must have at least 10 morale, and a unit with an attached hero must have at least 10 vigor.
-
-## Turns And Rounds
-
-Shardok advances tactically while units move, attack, cast, hide, scout, flee, and reinforce. When a side ends its turn, control passes according to the tactical state. At the end of a tactical round, Shardok checks end-of-round victory conditions such as holding critical tiles or surviving to the round limit.
-
-Some [victory conditions](/concepts/shardok-victory-conditions/), such as last player standing, can end the battle as soon as only one eligible side remains. Others wait until the end of a round so the opposing side has a chance to respond.
-
-## Terrain
-
-Terrain matters constantly:
-
- It changes movement costs.
- It affects damage and resistance.
- It can block line of fire.
- Castles and cities can become critical objectives.
- Water, bridges, ice, fire, and mountains create command-specific constraints.
-
-Shardok is not just a troop-count comparison. Position, terrain, hidden information, and command timing matter.
-
-## Hidden Units
-
-Hidden units are not fully visible to enemies. Ranger abilities, scouting, terrain, movement, and proximity can reveal or preserve hidden information.
-
-A hidden unit can matter even at battle end. If a losing hidden unit has a capable hero and can flee, it may escape rather than being resolved like an ordinary visible loser.
-
-## Fleeing, Retreating, And Outlaws
-
-Units can leave a battle through flee or retreat mechanics when those commands are available. A hero may also become an outlaw through battle consequences. Eagle receives these statuses when Shardok reports the final battle result.
-
-## Battle Results
-
-When the battle ends, Shardok reports each player's surviving units, destroyed battalions, fled units, captured or secured units, and victory or loss condition.
-
-Eagle then applies the result:
-
- Defenders who win hold the province.
- A single attacking winner can conquer the province.
- Multiple allied attacking winners may trigger battle aftermath decisions.
- Captured heroes and prisoners can create follow-up decisions.
- Battle damage can devastate province economy, agriculture, and infrastructure.
- Winning battles can advance quests.
@@ -1,58 +0,0 @@
---
-title: Shardok Victory Conditions
-description: How tactical battles decide winners and losers.
---
-
-<!--
-Source map:
- Victory condition enum: src/main/protobuf/net/eagle0/common/victory_condition.proto.
- Shardok victory checks: src/main/cpp/net/eagle0/shardok/library/actions/UpdateGameStatusAction.cpp.
- Eagle assignment of battle victory conditions: src/main/scala/net/eagle0/eagle/library/actions/impl/action/RequestBattlesAction.scala.
-->
-
-Shardok battles end when one of the battle's victory conditions is satisfied. Each player has a set of conditions that apply to them.
-
-In a normal Eagle province assault, attackers usually get **Hold Critical Tiles**, **Last Player Standing**, and **Last Alliance Standing**. The defender usually gets **Last Player Standing** and **Win After Max Rounds**.
-
-## Last Player Standing
-
-A player wins if they are the only surviving player and they have this victory condition.
-
-A player counts as surviving when they still have a visible normal unit with troops, or a visible normal unit with a living hero. Hidden units do not keep a player alive for this check, though some hidden losing units may be able to flee when the battle ends.
-
-## Last Alliance Standing
-
-Multiple players can win together if all surviving players are mutually allied and all have this victory condition.
-
-This is the tactical version of "the only forces left on the field are allies."
-
-## Win After Max Rounds
-
-A player wins if the battle lasts past the maximum number of Shardok rounds and they have this victory condition.
-
-In normal province assaults, this is usually the defender's clock. The attacker has to force a result before time runs out.
-
-## Hold Critical Tiles
-
-A player wins by controlling every critical tile on the map. Critical tiles are usually castles or other objective tiles.
-
-To count, each critical tile must be occupied by a unit belonging to the winning player, and the occupying unit must have an attached hero.
-
-Allied attackers can also win this way together if allied players collectively occupy all critical tiles, all occupying players have the condition, and the occupants are mutually allied.
-
-This condition is checked at the end of a tactical round, not immediately after every move, so the defender has a chance to retake objectives before the round closes.
-
-## Most Troops Standing
-
-This condition exists in the battle model, but normal Eagle province assaults do not currently assign it to attackers or defenders.
-
-If a battle type uses it, the winner is the player with the most troops standing when the battle reaches the relevant ending check.
-
-## What Happens After Victory
-
-Shardok reports each player as victorious or defeated, including which condition ended the battle. Eagle then turns that tactical result into strategic consequences:
-
- A defending winner holds the province.
- A single attacking winner conquers the province.
- Multiple allied attacking winners may need to decide who keeps the province.
- Captured heroes, destroyed battalions, fled units, outlaws, and secured prisoners are applied to the Eagle game state.
@@ -1,104 +0,0 @@
---
-title: Factions
-description: Reference for Eagle factions, leaders, prestige, diplomacy, and province focus.
---
-
-Factions are the political actors in Eagle. They control provinces, command heroes and battalions, negotiate diplomacy, and compete for victory.
-
-<!-- Sources:
- FactionView shape: src/main/protobuf/net/eagle0/eagle/views/faction_view.proto
- Relationship levels: src/main/protobuf/net/eagle0/eagle/views/faction_relationship_view.proto
- Trust storage: src/main/scala/net/eagle0/eagle/model/state/faction/FactionRelationship.scala
- Swear Kinship availability: src/main/scala/net/eagle0/eagle/library/actions/availability/AvailableSwearBrotherhoodCommandFactory.scala
- Swear Kinship effect: src/main/scala/net/eagle0/eagle/library/actions/impl/command/SwearBrotherhoodCommand.scala
- Leadership and destruction: src/main/scala/net/eagle0/eagle/library/actions/impl/action/CheckForFactionChangesAction.scala
- Free hero states and recruitment info: src/main/scala/net/eagle0/eagle/model/state/unaffiliated_hero/UnaffiliatedHeroT.scala
- Recruitment availability and odds: src/main/scala/net/eagle0/eagle/library/actions/availability/AvailableRecruitHeroesCommandFactory.scala
-  and src/main/scala/net/eagle0/eagle/library/util/recruitment_odds/RecruitmentOdds.scala
- Prestige calculation: src/main/scala/net/eagle0/eagle/library/util/faction_utils/FactionUtils.scala
- Truce, alliance, break-alliance, ransom, and imprisonment effects:
-  src/main/scala/net/eagle0/eagle/library/actions/impl/action/diplomacy_helpers/
- Trust constants: src/main/scala/net/eagle0/eagle/library/settings/BUILD.bazel
-->
-
-## Faction Head
-
-The faction head is the hero who represents the faction. In a normal game, this is usually your starting leader: the hero whose ideals, title, and story define what your faction is about.
-
-If the faction head is killed, another faction leader can take over as faction head. The faction may also be renamed around the new head if that hero has a faction name of their own.
-
-## Leaders
-
-[Faction leaders](/heroes/#faction-leaders) are the heroes you can command directly. They are different from [vassals](/heroes/#vassals), who rule provinces for you and make their own choices.
-
-You can gain more faction leaders with [**Swear Kinship**](/commands/#swear-kinship). The command is available when your faction head is in the province, your faction has fewer than 5 leaders, and another hero in the province has at least 95 loyalty. The new kinship hero becomes a faction leader.
-
-Faction leaders matter for succession. If the faction head dies, the next available faction leader becomes faction head. If no surviving leader is available to take over immediately, the strongest remaining vassal can rise to become a new faction leader and faction head.
-
-## Prestige
-
-Prestige is a high-level measure of faction stature. It is also the main faction-wide factor in whether free heroes are willing to join you.
-
-You gain prestige by:
-
- Controlling more provinces whose support is high enough for taxes. Each supported province is worth 10 prestige.
- Winning battles.
- Defeating beasts.
-
-Prestige is not the only recruitment factor. The faction head's charisma, the free hero's power and ambition, the hero's current state, and any personal bias toward or against your faction also matter. But when you want more heroes to take you seriously, prestige is the big strategic lever.
-
-## Free Heroes
-
-Free heroes are heroes in a province who do not currently belong to your faction's command structure. The Free Hero panel tells you what state they are in and whether they can be recruited, divined, or managed another way.
-
-The common states are:
-
- **Resident:** A hero living in the province. Residents may be willing to join outright. If they are not ready, they may be divinable: use [**Divine**](/commands/#divine) to learn what would impress them, then fulfill that ask to make them recruitable.
- **Traveler:** A hero passing through. You do not know whether a traveler would join you until a faction leader travels there and talks to them. Travelers are harder to recruit than residents, but they might still join if your prestige and other recruitment factors are strong enough. They are also likely to leave the province soon, so they are more time-sensitive than residents.
- **Prisoner:** A captured hero. Prisoners start with a strong bias against the faction holding them, but desperation can build over time. Eventually a prisoner may become willing to join, especially if your prestige is high enough.
- **Outlaw:** A hostile free hero in the province. Outlaws are not ordinary recruits and will not simply join from the Free Hero panel; you generally deal with them through commands such as [**Apprehend Outlaw**](/commands/#apprehend-outlaw).
-
-Some free heroes are effectively unavailable until circumstances change. For example, a province without one of your faction leaders cannot recruit from the Free Hero panel, and a hero may refuse forever if they have a permanent reason not to join your faction.
-
-## Relationships
-
-Faction relationships have a visible diplomatic state and an internal trust value.
-
-The visible relationship states are:
-
- **Hostile:** The default enemy state. Hostile factions can fight each other.
- **Truce:** A temporary peace. Truce offers set a reset date; when that date passes, the relationship returns to hostile. A truce or alliance also causes hostile armies between those factions to turn back during the truce turn-back phase.
- **Alliance:** A stronger cooperative relationship. Alliances do not have a reset date. They last until they are broken.
-
-Trust is a hidden number used by AI diplomacy. Higher trust makes a faction more willing to accept diplomatic offers. Trust changes in a few ways:
-
- Trust rises by 1 each new round between every pair of factions.
- Accepting a ransom offer raises the offering faction's trust in the faction that accepted it by 25.
- Rejecting a ransom offer lowers the offering faction's trust in the rejecting faction by 25.
- Imprisoning another faction's ambassador is a major trust hit: the ambassador's faction loses 150 trust toward the imprisoning faction.
- Other factions also notice ambassador imprisonment: each neutral faction loses 40 trust toward the imprisoning faction.
-
-## Incoming Diplomacy Offers
-
-Incoming offers are unresolved diplomatic proposals from other factions. They become [special and conditional commands](/commands/#special-and-conditional-commands) such as resolving truce offers, alliance offers, invitations, ransom offers, or alliance breaks.
-
-## Focus Province
-
-A faction can have a focus province. The focus province helps direct [province orders](/provinces/#province-orders) and AI attention toward a particular province.
-
-## Faction Destruction
-
-A faction is destroyed if either of these is true:
-
- It has no ruled provinces and no moving armies.
- It has no faction leaders left.
-
-The leader case has one extra succession step. If a faction loses its available leaders but still has provinces or armies, the game first looks for the strongest surviving vassal and promotes that hero to faction leader and faction head. If no vassal can rise, the faction has no faction leaders left and is destroyed.
-
-When a faction is destroyed:
-
- Its provinces lose their ruling faction.
- Its incoming armies are removed, and their supplies are left in the province.
- Its heroes lose their faction assignment.
- Other factions lose relationships and incoming offers involving the destroyed faction.
- If only one faction remains, the game ends and that faction wins. If no factions remain, the game ends with no winner.
@@ -1,216 +0,0 @@
---
-title: Heroes
-description: Reference for Eagle heroes, stats, professions, and battlefield roles.
---
-
-Heroes are named characters who lead factions, rule provinces, command troops, perform strategic commands, and appear as units in Shardok battles.
-
-The player-facing hero model is `HeroView`. It includes identity, faction membership, profession, core stats, personality stats, vigor, loyalty, abilities, portrait path, and backstory text.
-
-## Core Stats
-
- **Strength** affects physical power and contributes to combat-oriented commands.
- **Agility** affects mobility, scouting-style competence, and some profession eligibility.
- **Constitution** sets a hero's endurance profile and is closely tied to vigor.
- **Charisma** affects leadership, loyalty, diplomacy-flavored actions, and some profession eligibility.
- **Wisdom** affects knowledge, magic-flavored actions, and some profession eligibility.
-
-Stats can also have XP values. Strategic commands often spend vigor and grant XP in the stats connected to that action.
-
-## Personality Stats
-
- **Integrity** represents trustworthiness and moral reliability.
- **Ambition** represents appetite for power or advancement.
- **Gregariousness** represents sociability and ease with other heroes.
- **Bravery** represents willingness to face danger.
-
-These values help drive hero flavor, AI decisions, and story generation.
-
-## Vigor
-
-Vigor is a hero's current energy. Many commands require an acting hero and spend vigor. Resting restores vigor up to the hero's constitution.
-
-## Loyalty
-
-Loyalty measures a hero's attachment to their faction. Feasts, events, captures, faction bias, and story consequences can move loyalty over time.
-
-## Professions
-
-Professions give heroes special command access, bonuses, and tactical identity. Some effects are Eagle strategic effects, while others apply only when the hero is attached to a Shardok battle unit.
-
-Several Shardok profession commands also depend on the attached battalion type. For example, many magic commands require a battalion type that allows casting, and stealth commands require a battalion type that allows stealth.
-
-### Mage
-
-Eagle effects:
-
- Unlocks **Control Weather** for a mage in the acting province with enough vigor.
- Can start or end blizzards and droughts in the acting province or a neighboring province.
- Counts as a profession for general hero power and riot-crackdown hero power.
- Makes the hero naturally capable of starting fires.
-
-Shardok effects:
-
- Unlocks **Lightning Bolt** when attached to a casting-capable unit.
- Unlocks the multi-round **Meteor** command chain: start, target, cast, and cancel.
- Unlocks **Freeze Water** on adjacent water when attached to a casting-capable unit.
- Improves **Start Fire** odds when the unit can start fires.
- Changes hero melee damage from physical damage to magical damage: lightning, cold, fire, and aether essence.
- Can influence AI water-crossing evaluation because Mage can freeze water.
-
-Profession gain:
-
- Wisdom is the qualifying stat for Mage.
-
-### Necromancer
-
-Eagle effects:
-
- Unlocks **Start Epidemic** for a necromancer in the acting province with enough vigor.
- Epidemics can target the acting province or neighboring provinces, excluding friendly provinces that already have an epidemic.
- Counts as a profession for general hero power and riot-crackdown hero power.
-
-Shardok effects:
-
- Unlocks **Raise Dead** when attached to a casting-capable unit and not already controlling a unit.
- Unlocks **Fear** against eligible enemy units when attached to a casting-capable unit.
- Raised dead and fear use the hero's charisma and wisdom in their odds.
-
-Profession gain:
-
- Charisma is one qualifying stat for Necromancer.
-
-### Engineer
-
-Eagle effects:
-
- Is recommended first for **Improve** when an engineer is available.
- Adds the configured engineer bonus to province improvements and devastation repair.
- Counts as a profession for general hero power and riot-crackdown hero power.
-
-Shardok effects:
-
- Unlocks **Build Bridge** from non-water terrain onto adjacent water.
- Unlocks **Repair** for damaged bridges and castles.
- Unlocks **Blow Bridge** while standing on a bridge.
- Unlocks **Reduce** from a castle or fortified position against enemy units or castles.
- Unlocks **Fortify** on fortifiable terrain.
- Can influence AI water-crossing evaluation because engineers can create and destroy bridge access.
-
-Profession gain:
-
- Agility is one qualifying stat for Engineer.
-
-### Paladin
-
-Eagle effects:
-
- Improves **Alms** by multiplying the support gained per food given.
- Is sorted first in the **Alms** hero list when eligible.
- Counts as a profession for general hero power and riot-crackdown hero power.
-
-Shardok effects:
-
- Unlocks **Holy Wave** when the paladin has enough action points.
-
-Profession gain:
-
- Charisma is one qualifying stat for Paladin.
-
-### Ranger
-
-Eagle effects:
-
- Unlocks **Recon** for a ranger in the acting province with enough vigor.
- Recon can target provinces not ruled by the acting faction, as long as that faction does not already have a pending recon there.
- Counts as a profession for general hero power and riot-crackdown hero power.
-
-Shardok effects:
-
- Unlocks **Scout** when attached to a stealth-capable unit.
- Unlocks **Hide** when attached to a stealth-capable unit, outside enemy zone of control, and with multiple hideable positions.
- Allows defending rangers with stealth-capable units to use hidden placement during setup.
- Gives a bonus to **Brave Water** odds when the unit can brave water.
- Reveals adjacent hidden enemies while moving.
- Prevents adjacent enemies from hiding or remaining hidden when the ranger has enough knowledge to be identified.
-
-Profession gain:
-
- Agility is one qualifying stat for Ranger.
-
-### Champion
-
-Eagle effects:
-
- Is recommended first for **Train** when a champion is available.
- Adds the configured champion bonus to training gained by trainable battalions.
- Counts as a profession for general hero power and riot-crackdown hero power.
-
-Shardok effects:
-
- Unlocks **Challenge Duel** against adjacent enemy heroes outside castles.
- The target must have an attached hero and must either have enough known vigor to accept or be insufficiently known to rule that out.
-
-Profession gain:
-
- Strength is the qualifying stat for Champion.
-
-### Warden
-
-Eagle effects:
-
- Improves prisoner recruitment over time. At new round processing, prisoners in a province with a ruling-faction Warden gain additional faction bias toward that province's ruler.
- Counts as a profession for general hero power and riot-crackdown hero power.
-
-Shardok effects:
-
- Unlocks **Evacuate Prisoners** when the warden's unit can flee, has enough action points, and hostile captured hero units are present.
-
-Profession gain:
-
- Constitution is the qualifying stat for Warden.
-
-### NoProfession
-
-Heroes with no profession have no profession-specific command unlocks. They can still lead, fight, train, improve, march, use many normal strategic commands, and gain a profession later.
-
-## Profession Gain
-
-Only heroes with **NoProfession** can gain a profession. At the end of a round, heroes with enough XP can gain stats. If a no-profession hero gains one or more stats, the game checks for profession gain:
-
- The hero gets one profession-gain roll for each stat that increased.
- Eligible professions are based on all post-gain stats at or above the configured prime-stat threshold.
- Strength qualifies **Champion**.
- Agility qualifies **Engineer** and **Ranger**.
- Wisdom qualifies **Mage**.
- Charisma qualifies **Necromancer** and **Paladin**.
- Constitution qualifies **Warden**.
-
-## Faction Leaders
-
-Every faction starts with a **faction head**. The faction head is the hero who defines what the faction represents: its political identity, its public story, and the starting point for its leadership.
-
-Factions can gain additional faction leaders through **Swear Kinship** with another hero. The candidate must already belong to the faction, must have at least 95 loyalty, and must be in a province with the faction head. When the command succeeds, that hero becomes one of the faction's leaders.
-
-Faction leaders are directly commandable. Vassals, by contrast, lead provinces and make their own choices when their province acts. Promoting a loyal vassal into leadership gives the player more direct control over that hero.
-
-Faction leaders also provide succession. If the faction head is killed, another available faction leader can take over as the new faction head.
-
-## Vassals
-
-A **vassal** is a hero who belongs to your faction and rules one of its provinces, but is not a faction leader. You cannot command vassals directly. Instead, their provinces act during the Vassal Commands phase, when each vassal chooses an action based on the province's standing orders and immediate needs.
-
-Vassals can be given standing orders with **Issue Orders**, promoted to faction leaders with **Swear Kinship**, or removed from the faction with **Exile Vassal**.
-
-## Unaffiliated Heroes
-
-Unaffiliated heroes can appear in provinces before joining a faction. Their province entry includes name, profession, status, leader flag, and recruitment information.
-
-Common interactions include recruiting them, divining more information about them, declining their quests, or responding when they ask to join.
-
-## Battle Capabilities
-
-Hero views expose whether a hero is archery-capable or start-fire-capable. Those capabilities affect Shardok command availability when the hero is represented in battle.
-
- **Archery-capable**: the hero needs at least 75 agility.
- **Start-fire-capable**: the hero is always capable if they are a Mage. Otherwise, they need at least 70 agility and at least 70 wisdom.
@@ -1,23 +0,0 @@
---
-title: Eagle0pedia
-description: Reference companion for Eagle0 commands, systems, and game concepts.
---
-
-Eagle0pedia is the in-game reference companion for Eagle0. The tutorial answers "what should I do next?"; these pages answer "what does this mean?"
-
-Eagle0 is a strategy game about factions, heroes, provinces, armies, diplomacy, and tactical battles. The broad strategic layer is **Eagle**: provinces produce food and gold, heroes lead factions or rule as vassals, armies march across the map, and diplomacy shapes the war. When armies clash, battles are resolved in **Shardok**, the tactical hex-based combat system.
-
-Use these pages when you want a quick reference for commands, hero professions, faction leadership, province stats, or tactical battle options.
-
-## Sections
-
- [Game concepts](concepts/) explains the flow of Eagle rounds, the handoff from Eagle to Shardok, tactical battles, and victory conditions.
- [Eagle round flow](concepts/eagle-round-flow/) explains strategic phases and simultaneous player action.
- [From Eagle to Shardok](concepts/eagle-to-shardok/) explains how strategic armies become tactical battles.
- [Shardok battles](concepts/shardok-battles/) explains tactical battle structure, units, terrain, and aftermath.
- [Shardok victory conditions](concepts/shardok-victory-conditions/) explains how tactical battles end.
- [Eagle commands](commands/) explains the strategic commands available from province command panels.
- [Shardok commands](shardok-commands/) explains tactical battle commands and profession-gated battlefield actions.
- [Heroes](heroes/) covers stats, vigor, loyalty, professions, faction leaders, and battle capabilities.
- [Factions](factions/) covers faction heads, leaders, prestige, diplomacy, and focus provinces.
- [Provinces](provinces/) covers province stats, supplies, orders, armies, maps, castles, and unaffiliated heroes.
@@ -1,19 +0,0 @@
---
-title: Integration Notes
-description: Technical notes for Eagle0pedia links, deployment, and review.
---
-
-Eagle0pedia lives close to the game data and can be reviewed with code changes before being deployed to `pedia.eagle0.net`.
-
-## Link Targets
-
-Unity info buttons should link to stable concept URLs. For the command panel, start with anchors on the command reference page:
-
- `https://pedia.eagle0.net/commands/#train`
- `https://pedia.eagle0.net/commands/#march`
- `https://pedia.eagle0.net/commands/#diplomacy`
- `https://pedia.eagle0.net/shardok-commands/#melee`
- `https://pedia.eagle0.net/heroes/#professions`
- `https://pedia.eagle0.net/provinces/#province-stats`
-
-When individual command pages are split out, keep redirects or aliases for these anchors so older clients still land somewhere useful.
@@ -1,229 +0,0 @@
---
-title: Provinces
-description: Reference for Eagle provinces, resources, infrastructure, orders, and tactical maps.
---
-
-Provinces are the strategic map locations in Eagle. They hold resources, heroes, battalions, province orders, incoming armies, local events, and the Shardok map used when battles occur there.
-
-The player-facing province model is `ProvinceView`. Public information includes id, name, ruling faction, known events, known incoming armies, and an `as_of` date. When you have full information, `FullProvinceInfo` adds the detailed local state: gold, food, caps, support, food consumption, battalions, heroes, orders, incoming shipments, and local events.
-
-<!--
-Source map:
- Province view fields: src/main/protobuf/net/eagle0/eagle/views/province_view.proto and src/main/scala/net/eagle0/eagle/library/util/view_filters/ProvinceViewFilter.scala.
- Province utilities: src/main/scala/net/eagle0/eagle/library/util/province/ProvinceUtils.scala.
- New year production and yearly degradation: src/main/scala/net/eagle0/eagle/library/actions/impl/action/NewYearAction.scala.
- New round caps, price-index drift, empty-province devastation repair, and hero-cap loyalty pressure: src/main/scala/net/eagle0/eagle/library/actions/impl/action/NewRoundAction.scala.
- Food consumption and starvation: src/main/scala/net/eagle0/eagle/library/actions/impl/action/PerformFoodConsumptionPhaseAction.scala.
- Shipment arrival: src/main/scala/net/eagle0/eagle/library/actions/impl/action/ShipmentArrivedAction.scala and src/main/scala/net/eagle0/eagle/library/actions/impl/action/PerformProvinceMoveResolutionAction.scala.
- Price index: src/main/scala/net/eagle0/eagle/library/util/PriceIndexUtils.scala.
- Settings: src/main/resources/net/eagle0/eagle/settings.tsv.
-->
-
-## Strategic Role
-
-A province is both a resource base and a staging point. It can:
-
- Produce gold and food at the new year.
- Store gold and food between commands.
- Feed stationed battalions each round.
- Hold heroes, battalions, prisoners, unaffiliated heroes, and events.
- Launch March, Send Supplies, Train, Improve, Arm Troops, Trade, and other province commands.
- Become a Shardok battlefield when hostile armies meet there.
-
-The important strategic question is usually not just "how high are the stats?" It is "can this province keep support above 40, feed its troops, store enough supplies, and stage the actions I need before another faction interferes?"
-
-## Development Stats
-
-The three main development stats are **economy**, **agriculture**, and **infrastructure**.
-
- **Economy** drives annual gold production. A supported province produces 35 gold per effective economy at the new year.
- **Agriculture** drives annual food production. A supported province produces 50 food per effective agriculture at the new year.
- **Infrastructure** increases gold and food storage caps, affects improvement quality, and caps how far battalions can be armed.
-
-Each stat has a matching devastation track. The effective value is the stat minus its devastation, never below 0. For example, 80 agriculture with 25 agriculture devastation behaves like 55 effective agriculture for production and other effective-stat checks.
-
-Improve can raise economy, agriculture, or infrastructure. It can also repair devastation across all three devastation tracks. Engineers get a bonus when improving.
-
-## Support
-
-Support is local backing for the ruling faction. It ranges from 0 to 100 and is one of the most important province numbers.
-
-A province needs at least **40 support** to provide annual gold and food production. If support is below 40, the province does not produce taxes at the new year. That also matters for prestige: supported provinces are worth prestige to the ruling faction.
-
-Support changes through several commands and events:
-
- **Alms** spends food to raise support.
- **Improve** raises support as a side effect.
- **Riot** damage reduces support by 25 if the riot is not stopped.
- **Suppress Beasts** can raise support on success.
- Province events can raise or lower support.
-
-Support also affects risk. Low support makes the province less useful economically and affects riot timing.
-
-## Gold
-
-Gold pays for many strategic actions. Feast, Organize Troops, Arm Troops, Divine, Hero Gift, diplomacy, Trade buys, and some other commands spend gold.
-
-At the new year, supported provinces gain annual gold equal to:
-
-`effective economy * 35`
-
-Gold is stored in the province until spent, traded, shipped, marched away, captured through conquest, or lost because the province is over its storage cap.
-
-Feast costs gold, not food: 20 gold per ruling-faction hero in the province, multiplied by the province price index.
-
-## Food
-
-Food supports armies and can also be spent strategically.
-
-At the new year, supported provinces gain annual food equal to:
-
-`effective agriculture * 50`
-
-Food is consumed during the Food Consumption phase by battalions stationed in the province and by moving armies. The province view exposes monthly food consumption so you can judge how long the province can feed its current troops.
-
-Food is also used by:
-
- **Alms**, which spends food to raise support.
- **Trade**, which buys or sells food for gold.
- **Send Supplies**, which can ship food to another province.
- **March**, which can carry food with moving armies.
- Riot gifts, if you choose to give food.
-
-## Food Consumption and Starvation
-
-Food consumption happens during the Food Consumption phase, after Province Move Resolution, player commands, hostile army setup, and battle requests, but before Battle Resolution.
-
-This timing matters:
-
- A Send Supplies shipment that arrives during Province Move Resolution is available before the destination province consumes food later that same round.
- A friendly marching army that arrives during Province Move Resolution can also bring food before that round's food consumption.
- Moving armies consume food from their own carried supplies while they are still incoming.
-
-If a province cannot feed its battalions, it spends all remaining province food and the battalions are reduced. The maximum battalion reduction from a food shortage is 20% in a single food-consumption event.
-
-The same starvation rule applies to moving armies: if the army's carried food is not enough, the moving battalions are reduced and the army's food drops to 0.
-
-Low-food warnings look ahead to incoming food, upcoming taxes, support, and expected production. If the province has enough food arriving before the next consumption, the warning can account for that.
-
-## Storage Caps
-
-Provinces have separate gold and food caps. These caps are based on effective development and infrastructure:
-
- Gold cap uses effective economy plus effective infrastructure.
- Food cap uses effective agriculture plus effective infrastructure.
- Both start from a base storage limit of 5000.
- Each point of relevant development or infrastructure adds 50 storage.
- A faction's focus province gets 1.5x storage.
-
-Being over cap is not an immediate hard cutoff. During New Round processing, the province loses 20% of the amount above each cap, rounded up. Excess supplies therefore decay over time unless you spend them, ship them, trade them, or move them.
-
-## Price Index
-
-Price index is local price pressure. It changes costs and trade prices in the province.
-
-The normal range is 0.75 to 1.5. A price index above 1 makes local purchases more expensive; below 1 makes them cheaper.
-
-Gold spending can push the price index upward. Selling food counts as negative gold spending and can push it downward. Each gold spent changes the index by 0.0001, clamped to the normal range.
-
-The price index also drifts each new round toward a local steady state based on development and devastation. It moves 10% of the distance toward that steady state per round.
-
-Commands affected by price index include:
-
- **Feast** gold cost.
- **Organize Troops** troop costs.
- **Arm Troops** armament costs.
- **Trade** buy and sell prices.
- **Divine** cost.
- **Hero Gift** loyalty gained per gold.
-
-## Devastation
-
-Devastation is damage to province systems. Economy, agriculture, and infrastructure each have their own devastation value.
-
-Devastation reduces the corresponding effective stat. That means:
-
- Economy devastation reduces gold production and gold storage.
- Agriculture devastation reduces food production and food storage.
- Infrastructure devastation reduces storage, armament ceiling, and infrastructure-dependent checks.
-
-Battles and province events can add devastation. Riots add economy and infrastructure devastation. Blizzards, droughts, floods, epidemics, and battle results can damage different province systems.
-
-Improve with the Devastation option repairs all three devastation tracks. Empty provinces also recover devastation slowly during new round processing.
-
-## Infrastructure and Troops
-
-Infrastructure matters militarily because it caps armament. Arm Troops cannot raise a battalion's ARM above the province's effective infrastructure.
-
-Economy and agriculture also affect which battalion types can be raised in the province. Battalion type availability checks the province's effective economy and effective agriculture against the battalion type's minimums.
-
-Training is handled by [**Train**](/commands/#train). Armament is handled by [**Arm Troops**](/commands/#arm-troops). Organizing troop counts, creating battalions, resizing battalions, and dismissing battalions are handled by [**Organize Troops**](/commands/#organize-troops).
-
-## Heroes and Hero Cap
-
-A province has a hero cap. The default map data sets hero cap from castle count: each castle gives 5 hero capacity.
-
-Going over the cap is allowed, but it creates loyalty pressure. During new round processing, if the province has too many established ruling-faction heroes, those heroes lose loyalty. Newly joined heroes are exempt for their first few rounds.
-
-This is why moving heroes around is not just about command access. Keeping too many heroes stacked in one province can create long-term loyalty damage.
-
-## Ruling Faction and Ruling Hero
-
-A province can have a ruling faction and a ruling hero. The ruling hero is the local leader for the province.
-
-If a faction leader rules the province, the player can command that leader directly. If a [vassal](/heroes/#vassals) rules it, the province acts through vassal behavior during the [Vassal Commands phase](/concepts/eagle-round-flow/#vassal-commands) unless another special phase interrupts it.
-
-Province leadership also matters for riots. The province leader's Charisma affects riot size and gift success, even if another hero is selected to crack down.
-
-## Province Orders
-
-Province orders are standing instructions for vassal-led provinces. The [**Issue Orders**](/commands/#issue-orders) command changes them and can also set or clear the faction focus province.
-
-The main orders are:
-
- **Entrust:** let the vassal judge the situation.
- **Develop:** build up and improve the province.
- **Mobilize:** prepare military strength and supplies.
- **Expand:** look for growth, movement, and attack opportunities.
-
-The focus province also affects logistics. Vassals may ship excess gold and food toward the focus province if one is set, or toward the nearest faction leader if not.
-
-## Incoming Armies
-
-Incoming armies represent forces that are moving toward the province but have not arrived or resolved yet.
-
-Friendly incoming armies arrive during [Province Move Resolution](/concepts/eagle-round-flow/#province-move-resolution) if the destination is already ruled by their faction. Hostile arrivals do not simply enter the province; they can become hostile army groups and later trigger conquest, attack decisions, defense decisions, battle requests, and [Shardok battles](/concepts/eagle-to-shardok/).
-
-Incoming armies can carry gold and food. If supplies arrive with a friendly movement, transit loss can reduce the amount received.
-
-## Incoming Shipments
-
-Incoming shipments are supplies sent by [**Send Supplies**](/commands/#send-supplies).
-
-The origin province loses the selected gold and food immediately. The destination receives an incoming shipment scheduled for the next round. During the next round's Province Move Resolution phase, the shipment arrives before food consumption. 10% is lost in transit, rounded down after loss.
-
-Because shipments arrive before food consumption, shipping food can prevent starvation in the destination province during the arrival round.
-
-## Province Events
-
-Province events are temporary or local conditions that affect the province.
-
-Important event types include:
-
- **Riot:** requires a decision if it reaches Handle Riot. If not stopped, it causes support loss and devastation.
- **Beasts:** can damage support over time and can be suppressed for rewards and prestige.
- **Blizzard:** damages province systems and affects supplies.
- **Drought:** damages agriculture.
- **Flood:** damages infrastructure and agriculture.
- **Epidemic:** damages economy, battalions, and hero vigor, and can spread or end over time.
- **Festival:** improves support and prestige while active.
-
-Some events can be created or changed by commands. Mages can use [**Control Weather**](/commands/#control-weather) to start or end blizzards and droughts. Necromancers can use [**Start Epidemic**](/commands/#start-epidemic).
-
-## Tactical Map and Castles
-
-Each province has a `hex_map_name`. When a battle occurs there, Eagle uses that name to choose the Shardok tactical map.
-
-`castle_count` records the province's fortification count. Castles matter for hero capacity, defensive setup, tactical objectives, and some battle behavior.
-
-The source map data in `province_map.tsv` defines province ids, names, neighbor ids, neighbor positions, tactical map names, neighbor names, and castle counts.
@@ -1,422 +0,0 @@
---
-title: Shardok Commands
-description: Tactical command reference for Shardok battles.
---
-
-<span class="command-reference-marker" aria-hidden="true"></span>
-<span class="command-reference-five-row-marker" aria-hidden="true"></span>
-
-<!--
-Source map for Shardok command requirements/costs:
- Shared morale/vigor filters: src/main/resources/net/eagle0/shardok/settings.tsv fields minimumMoraleToAct=10 and minimumVigorToAct=10; applied in src/main/cpp/net/eagle0/shardok/library/AvailableCommandsFactory.cpp.
- Fixed AP setting values: src/main/resources/net/eagle0/shardok/settings.tsv. Most command factories call SettingsGetter::ActionCostFor(...) in src/main/cpp/net/eagle0/shardok/library/settings/GameSettings.cpp, which returns ActionCost::usesAll; see src/main/cpp/net/eagle0/shardok/library/ActionCost.hpp and src/main/cpp/net/eagle0/shardok/library/unit/Unit.cpp.
- Melee: meleeActionPointCost=5; src/main/cpp/net/eagle0/shardok/library/command_factories/melee_command_factory/MeleeCommandFactory.cpp.
- Archery: archeryActionPointCost=5 and longbowWindBonusRangeMinSpeed=20; hero archery threshold is agility >= 75 in src/main/cpp/net/eagle0/shardok/ai_battle_simulator/AiBattleSimulator.cpp; normal targets come from TwoAwayTilesUnblockedByMountains in src/main/cpp/net/eagle0/shardok/library/util/HexMapUtils.cpp; longbow castle-adjacent and wind-assisted range-3 exceptions are in src/main/cpp/net/eagle0/shardok/library/command_factories/archery_command_factory/ArcheryCommandFactory.cpp; volley spend is in src/main/cpp/net/eagle0/shardok/library/commands/ArcheryCommand.cpp.
- Charge: terrain-entry cost from BattalionType::GetCostToEnterTerrain(...); allowsMoveAfterCharge is true for Light Cavalry and Heavy Cavalry in src/main/resources/net/eagle0/shardok/battalionTypes.tsv; stun settings are baseStunChanceOnCharge and trainingDifferenceMultiplierForStunChanceOnCharge in the same file; src/main/cpp/net/eagle0/shardok/library/command_factories/ChargeCommandFactory.cpp.
- Move: per-hex terrain-entry costs, plus extraCostForZocMovement=1; src/main/cpp/net/eagle0/shardok/library/command_factories/MoveCommandFactory.cpp and src/main/cpp/net/eagle0/shardok/library/commands/MoveCommand.cpp.
- Lightning Bolt: lightningActionPointCost=5 and lightningRange=3; src/main/cpp/net/eagle0/shardok/library/command_factories/LightningBoltCommandFactory.cpp and src/main/cpp/net/eagle0/shardok/library/commands/LightningBoltCommand.cpp.
- Meteor: meteorStartActionPointCost=5, meteorTargetActionPointCost=0, meteorCancelActionPointCost=0, meteorCastActionPointCost=1, meteorCastVigorCost=20, and meteorRange=3; src/main/cpp/net/eagle0/shardok/library/command_factories/MeteorStartCommandFactory.cpp, MeteorTargetCommandFactory.cpp, src/main/cpp/net/eagle0/shardok/library/util/MeteorRangeCoords.cpp, src/main/cpp/net/eagle0/shardok/library/commands/MeteorStartCommand.cpp, MeteorTargetCommand.cpp, MeteorCancelCommand.cpp, and src/main/cpp/net/eagle0/shardok/library/actions/MeteorCastAction.cpp.
- Start Fire: startFireActionPointCost=5; hero start-fire thresholds are Mage or agility >= 70 and wisdom >= 70 in src/main/cpp/net/eagle0/shardok/ai_battle_simulator/AiBattleSimulator.cpp; src/main/cpp/net/eagle0/shardok/library/command_factories/StartFireCommandFactory.cpp and src/main/cpp/net/eagle0/shardok/library/commands/StartFireCommand.cpp.
- Extinguish Fire: extinguishActionPointCost=5; src/main/cpp/net/eagle0/shardok/library/command_factories/ExtinguishFireCommandFactory.cpp and src/main/cpp/net/eagle0/shardok/library/commands/ExtinguishFireCommand.cpp.
- Freeze Water: freezeWaterActionPointCost=5; src/main/cpp/net/eagle0/shardok/library/command_factories/FreezeWaterCommandFactory.cpp.
- Build Bridge: buildBridgeActionPointCost=5; src/main/cpp/net/eagle0/shardok/library/command_factories/BuildBridgeCommandFactory.cpp.
- Blow Bridge: blowBridgeActionPointCost=5; src/main/cpp/net/eagle0/shardok/library/command_factories/BlowBridgeCommandFactory.cpp.
- Placement: no AP cost in setup commands; src/main/cpp/net/eagle0/shardok/library/actions/PlaceUnitCommand.cpp and PlaceHiddenUnitCommand.cpp.
- Scout: scoutActionPointCost=5 and scoutRange=4; src/main/cpp/net/eagle0/shardok/library/command_factories/ScoutCommandFactory.cpp.
- Raise Dead: raiseDeadActionPointCost=5 and raiseDeadRange=2; src/main/cpp/net/eagle0/shardok/library/command_factories/RaiseDeadCommandFactory.cpp.
- Dismiss Unit: requires remainingActionPoints > 0 in src/main/cpp/net/eagle0/shardok/library/command_factories/ControlCommandFactory.cpp; execution zeroes both units in src/main/cpp/net/eagle0/shardok/library/commands/DismissUnitCommand.cpp.
- Holy Wave: holyWaveActionPointCost=5; src/main/cpp/net/eagle0/shardok/library/command_factories/HolyWaveCommandFactory.cpp.
- Stop and Rest: stop posts no AP cost; rest zeroes AP in src/main/cpp/net/eagle0/shardok/library/commands/UnitRestCommand.cpp; stop implementation in UnitStopCommand.cpp.
- Challenge Duel: challengeDuelActionPointCost=5; src/main/cpp/net/eagle0/shardok/library/command_factories/ChallengeDuelCommandFactory.cpp and src/main/cpp/net/eagle0/shardok/library/commands/challenge_duel_command/ChallengeDuelCommand.cpp.
- Fear: fearActionPointCost=5 and fearRange=3; src/main/cpp/net/eagle0/shardok/library/command_factories/FearCommandFactory.cpp.
- Repair: repairActionPointCost=5; src/main/cpp/net/eagle0/shardok/library/command_factories/RepairCommandFactory.cpp.
- Reduce: reduceActionPointCost=5 and reduceRange=3; src/main/cpp/net/eagle0/shardok/library/command_factories/ReduceCommandFactory.cpp.
- Flee and Retreat: fleeActionPointCost=5 and retreatActionPointCost=5; src/main/cpp/net/eagle0/shardok/library/command_factories/FleeCommandFactory.cpp and RetreatCommandFactory.cpp.
- Control: requires remainingActionPoints > 0 in ControlCommandFactory.cpp; execution zeroes acting unit in src/main/cpp/net/eagle0/shardok/library/commands/ControlCommand.cpp.
- Reinforce: reinforceActionPointCost=5; src/main/cpp/net/eagle0/shardok/library/command_factories/ReinforceCommandFactory.cpp.
- Brave Water: braveWaterActionPointCost=8; src/main/cpp/net/eagle0/shardok/library/command_factories/BraveWaterCommandFactory.cpp and src/main/cpp/net/eagle0/shardok/library/commands/BraveWaterCommand.cpp.
- Release Unit: requires remainingActionPoints > 0 in ControlCommandFactory.cpp; execution zeroes both units in src/main/cpp/net/eagle0/shardok/library/commands/ReleaseUnitCommand.cpp.
- End Turn and Setup: no command AP cost; end turn zeroes player unit AP in src/main/cpp/net/eagle0/shardok/library/commands/EndTurnCommand.cpp; setup end in src/main/cpp/net/eagle0/shardok/library/actions/EndPlayerSetupCommand.cpp.
- Hide: hideActionPointCost=5; src/main/cpp/net/eagle0/shardok/library/command_factories/HideCommandFactory.cpp.
- Fortify: fortifyActionPointCost=5; src/main/cpp/net/eagle0/shardok/library/command_factories/FortifyCommandFactory.cpp.
- Become Outlaw: uses fleeActionPointCost=5 through src/main/cpp/net/eagle0/shardok/library/command_factories/FleeCommandFactory.cpp and src/main/cpp/net/eagle0/shardok/library/commands/BecomeOutlawCommand.cpp.
- Evacuate Prisoners: evacuatePrisonersActionPointCost=5; src/main/cpp/net/eagle0/shardok/library/command_factories/EvacuatePrisonersCommandFactory.cpp.
-->
-
-## Shared Requirements
-
-Unless noted otherwise: **10 morale**, **10 hero vigor**, and the listed **Action Point cost**.
-
-## Tactical Commands
-
-### Melee
-
-<b>Unit requirements:</b> any unit.
-
-<b>Action Point cost:</b> 5 AP; consumes all remaining AP.
-
-<b>Available when:</b> an enemy target is adjacent and the acting unit can still act.
-
-<b>Effect:</b> Attack the target in close combat. The UI may show combat odds before you choose the attack.
-
-<b>Selection:</b> choose the attacking unit and adjacent target.
-
-### Archery
-
-<b>Unit requirements:</b> Longbowmen, or a unit with an attached hero who has at least 75 AGI. The unit must have at least one volley remaining.
-
-<b>Action Point cost:</b> 5 AP; consumes all remaining AP.
-
-<b>Available when:</b> a known enemy is exactly 2 hexes away, and the line between the attacker and target is not blocked by mountains.
-
-<b>Effect:</b> Make a ranged attack without requiring adjacency, spending one volley. Longbowmen can also fire at adjacent hexes while standing in a castle, and can fire 3 hexes when the wind is at least 20 mph and blowing toward the target.
-
-<b>Selection:</b> choose the firing unit and target unit or hex.
-
-### Charge
-
-<b>Unit requirements:</b> any unit.
-
-<b>Action Point cost:</b> the cost to enter the target's terrain. Knights and Dragoons spend only that terrain cost and may be able to move again afterward; other units spend all remaining AP.
-
-<b>Available when:</b> a valid path reaches a target that can be attacked at the end of the move.
-
-<b>Effect:</b> Move into an attack as one action. Charge attacks have a chance to stun the target unit.
-
-<b>Selection:</b> choose the charging unit, path, and target.
-
-### Move
-
-<b>Unit requirements:</b> any unit.
-
-<b>Action Point cost:</b> the terrain cost for each hex in the path, plus 1 extra AP for steps that start in enemy zone of control.
-
-<b>Available when:</b> one or more reachable destination hexes are valid for the acting unit.
-
-<b>Effect:</b> Move the unit along the chosen path to a reachable hex, paying terrain costs as it goes. Hidden units may reveal themselves if they move into exposed terrain or near an enemy Ranger.
-
-<b>Selection:</b> choose the unit and destination path.
-
-### Lightning Bolt
-
-<b>Unit requirements:</b> [Mage](/heroes/#mage) attached to Light Infantry, Light Cavalry, or Longbowmen. Heavy units and Undead cannot cast.
-
-<b>Action Point cost:</b> 5 AP; consumes all remaining AP.
-
-<b>Available when:</b> a known enemy is within 3 hexes of the caster.
-
-<b>Effect:</b> Cast a lightning attack at the target. The descriptor may include odds or roll information when the client can display expected results.
-
-<b>Selection:</b> choose the casting unit and target.
-
-### Meteor
-
-<b>Unit requirements:</b> [Mage](/heroes/#mage) attached to Light Infantry, Light Cavalry, or Longbowmen, with enough vigor to start the spell. Heavy units and Undead cannot cast.
-
-<b>Action Point cost:</b> start costs 5 AP and consumes all remaining AP; target and cancel cost 0 AP; the automatic cast step is configured as 1 AP but resolves by setting the caster to 0 AP.
-
-<b>Available when:</b> the caster can begin the spell, choose or change a target within 3 hexes, cast the pending meteor, or cancel the pending meteor.
-
-<b>Effect:</b> Begin a delayed meteor spell, choose where it will land, then resolve the strike when the cast step becomes available. You can cancel while the meteor is still pending.
-
-<b>Selection:</b> choose the caster, spell target, or cancel option depending on the current meteor step.
-
-### Start Fire
-
-<b>Unit requirements:</b> a unit with an attached [Mage](/heroes/#mage), or an attached hero with at least 70 AGI and 70 WIS. Mages improve the odds.
-
-<b>Action Point cost:</b> 5 AP; consumes all remaining AP.
-
-<b>Available when:</b> a target hex can be set on fire.
-
-<b>Effect:</b> Attempt to start a fire on the target hex.
-
-<b>Selection:</b> choose the acting unit and target hex.
-
-### Extinguish Fire
-
-<b>Unit requirements:</b> any unit with an attached hero.
-
-<b>Action Point cost:</b> 5 AP; consumes all remaining AP.
-
-<b>Available when:</b> a target hex contains fire that can be reduced or removed.
-
-<b>Effect:</b> Remove or reduce fire on the target hex.
-
-<b>Selection:</b> choose the acting unit and burning target hex.
-
-### Freeze Water
-
-<b>Unit requirements:</b> [Mage](/heroes/#mage) attached to Light Infantry, Light Cavalry, or Longbowmen. Heavy units and Undead cannot cast.
-
-<b>Action Point cost:</b> 5 AP; consumes all remaining AP.
-
-<b>Available when:</b> a valid water hex can be frozen.
-
-<b>Effect:</b> Turn water into traversable frozen terrain where the command is valid.
-
-<b>Selection:</b> choose the caster and water hex.
-
-### Build Bridge
-
-<b>Unit requirements:</b> [Engineer](/heroes/#engineer).
-
-<b>Action Point cost:</b> 5 AP; consumes all remaining AP.
-
-<b>Available when:</b> the engineer has a valid water or gap target where a bridge can be built.
-
-<b>Effect:</b> Create a bridge across the target.
-
-<b>Selection:</b> choose the engineer unit and bridge target.
-
-### Blow Bridge
-
-<b>Unit requirements:</b> [Engineer](/heroes/#engineer) standing on a bridge.
-
-<b>Action Point cost:</b> 5 AP; consumes all remaining AP.
-
-<b>Available when:</b> the bridge can be destroyed.
-
-<b>Effect:</b> Destroy the existing bridge target.
-
-<b>Selection:</b> choose the engineer unit and bridge.
-
-### Placement
-
-<b>Unit requirements:</b> a unit available for setup placement. Hidden placement requires a defending [Ranger](/heroes/#ranger) attached to a stealth-capable unit.
-
-<b>Action Point cost:</b> no AP cost during setup.
-
-<b>Available when:</b> the battle is in setup and a valid placement hex is available.
-
-<b>Effect:</b> Put a reserve unit onto the battlefield. Rangers on stealth-capable units can be placed hidden during defensive setup.
-
-<b>Selection:</b> choose the unit and setup hex.
-
-### Scout
-
-<b>Unit requirements:</b> [Ranger](/heroes/#ranger) attached to a stealth-capable unit.
-
-<b>Action Point cost:</b> 5 AP; consumes all remaining AP.
-
-<b>Available when:</b> the ranger can scout a hex within 4 hexes.
-
-<b>Effect:</b> Reveal information about the target hex and nearby terrain, including possible hidden-unit information.
-
-<b>Selection:</b> choose the scouting unit and target.
-
-### Raise Dead
-
-<b>Unit requirements:</b> [Necromancer](/heroes/#necromancer) attached to Light Infantry, Light Cavalry, or Longbowmen, and the hero must not already control a unit. Heavy units and Undead cannot cast.
-
-<b>Action Point cost:</b> 5 AP; consumes all remaining AP.
-
-<b>Available when:</b> there is an empty, undead-traversable target hex within 2 hexes.
-
-<b>Effect:</b> Create or restore undead forces through necromantic action.
-
-<b>Selection:</b> choose the necromancer unit and target.
-
-### Dismiss Unit
-
-<b>Unit requirements:</b> a unit that is allowed to be dismissed.
-
-<b>Action Point cost:</b> requires the controlling unit to have more than 0 AP; execution sets both the controlling unit and dismissed unit to 0 AP.
-
-<b>Available when:</b> dismissal is valid for the current tactical state.
-
-<b>Effect:</b> Remove the unit from the tactical battle.
-
-<b>Selection:</b> choose the unit to dismiss.
-
-### Holy Wave
-
-<b>Unit requirements:</b> [Paladin](/heroes/#paladin).
-
-<b>Action Point cost:</b> 5 AP; consumes all remaining AP.
-
-<b>Available when:</b> the paladin has a valid holy-wave action.
-
-<b>Effect:</b> Use a holy-area effect from the capable unit.
-
-<b>Selection:</b> choose the paladin unit and command target, if one is required.
-
-### Stop and Rest
-
-<b>Unit requirements:</b> a unit that can stop or rest.
-
-<b>Action Point cost:</b> Stop costs 0 AP; Rest consumes all remaining AP.
-
-<b>Available when:</b> the unit can end movement or spend its action resting.
-
-<b>Effect:</b> `UNIT_STOP_COMMAND` stops a unit. `UNIT_REST_COMMAND` has a unit spend its action resting instead of acting aggressively.
-
-<b>Selection:</b> choose stop or rest for the acting unit.
-
-### Challenge Duel
-
-<b>Unit requirements:</b> [Champion](/heroes/#champion).
-
-<b>Action Point cost:</b> 5 AP; consumes all remaining AP.
-
-<b>Available when:</b> an opposing unit can be challenged.
-
-<b>Effect:</b> Challenge an opposing unit to a duel. The tactical action emits accepted or declined outcomes directly.
-
-<b>Selection:</b> choose the champion unit and duel target.
-
-### Fear
-
-<b>Unit requirements:</b> [Necromancer](/heroes/#necromancer) attached to Light Infantry, Light Cavalry, or Longbowmen. Heavy units and Undead cannot cast.
-
-<b>Action Point cost:</b> 5 AP; consumes all remaining AP.
-
-<b>Available when:</b> a known enemy that uses morale is within 3 hexes.
-
-<b>Effect:</b> Use a fear effect against the target.
-
-<b>Selection:</b> choose the necromancer unit and target.
-
-### Repair
-
-<b>Unit requirements:</b> [Engineer](/heroes/#engineer).
-
-<b>Action Point cost:</b> 5 AP; consumes all remaining AP.
-
-<b>Available when:</b> a damaged unit or battlefield object can be repaired.
-
-<b>Effect:</b> Repair the damaged target.
-
-<b>Selection:</b> choose the engineer unit and repair target.
-
-### Reduce
-
-<b>Unit requirements:</b> [Engineer](/heroes/#engineer) in a castle or fortified position.
-
-<b>Action Point cost:</b> 5 AP; consumes all remaining AP.
-
-<b>Available when:</b> an enemy or damaged castle is within 3 hexes and the line is not blocked by mountains.
-
-<b>Effect:</b> Reduce the target's defensive or structural value.
-
-<b>Selection:</b> choose the engineer unit and target.
-
-### Flee and Retreat
-
-<b>Unit requirements:</b> a unit that is allowed to leave or withdraw.
-
-<b>Action Point cost:</b> 5 AP; consumes all remaining AP.
-
-<b>Available when:</b> flight or retreat is valid for the current battlefield state.
-
-<b>Effect:</b> `FLEE_COMMAND` handles immediate flight from a tactical situation. `RETREAT_COMMAND` handles a more formal withdrawal command.
-
-<b>Selection:</b> choose the fleeing or retreating unit.
-
-### Control
-
-<b>Unit requirements:</b> a unit with access to a control effect.
-
-<b>Action Point cost:</b> requires more than 0 AP; execution sets the acting unit to 0 AP.
-
-<b>Available when:</b> a valid target can be controlled.
-
-<b>Effect:</b> Take control of the target when the command is available.
-
-<b>Selection:</b> choose the acting unit and control target.
-
-### Reinforce
-
-<b>Unit requirements:</b> reinforcements available to enter the battle.
-
-<b>Action Point cost:</b> 5 AP; consumes all remaining AP.
-
-<b>Available when:</b> the battle state allows reinforcement and there is a valid entry option.
-
-<b>Effect:</b> Bring reinforcements into the battle.
-
-<b>Selection:</b> choose the reinforcement option and entry placement.
-
-### Brave Water
-
-<b>Unit requirements:</b> a unit that can attempt brave-water movement. [Ranger](/heroes/#ranger) is not required, but Rangers get an odds bonus.
-
-<b>Action Point cost:</b> 8 AP; consumes all remaining AP.
-
-<b>Available when:</b> the unit has a valid water path or water target.
-
-<b>Effect:</b> Move through water despite the usual danger or restriction.
-
-<b>Selection:</b> choose the unit and water movement target.
-
-### Release Unit
-
-<b>Unit requirements:</b> a unit that can release a constrained target.
-
-<b>Action Point cost:</b> requires more than 0 AP; execution sets both the controlling unit and released unit to 0 AP.
-
-<b>Available when:</b> a controlled, held, or otherwise constrained unit can be released.
-
-<b>Effect:</b> Release the constrained unit.
-
-<b>Selection:</b> choose the acting unit and unit to release.
-
-### End Turn and Setup
-
-<b>Unit requirements:</b> None.
-
-<b>Action Point cost:</b> no AP cost to post the command; End Turn then sets that player's remaining unit AP to 0.
-
-<b>Available when:</b> the active player can end the tactical turn or finish setup.
-
-<b>Effect:</b> `END_TURN_COMMAND` ends the active tactical turn. `END_PLAYER_SETUP_COMMAND` ends that player's setup phase.
-
-<b>Selection:</b> choose the end-turn or end-setup command.
-
-### Hide
-
-<b>Unit requirements:</b> [Ranger](/heroes/#ranger) attached to a stealth-capable unit.
-
-<b>Action Point cost:</b> 5 AP; consumes all remaining AP.
-
-<b>Available when:</b> the unit can enter or remain in hidden status.
-
-<b>Effect:</b> Hide the unit.
-
-<b>Selection:</b> choose the ranger unit.
-
-### Fortify
-
-<b>Unit requirements:</b> [Engineer](/heroes/#engineer).
-
-<b>Action Point cost:</b> 5 AP; consumes all remaining AP.
-
-<b>Available when:</b> the engineer can fortify its current position.
-
-<b>Effect:</b> Have the unit fortify its current position.
-
-<b>Selection:</b> choose the engineer unit.
-
-### Become Outlaw
-
-<b>Unit requirements:</b> a unit or hero eligible for the outlaw consequence.
-
-<b>Action Point cost:</b> 5 AP through the flee/outlaw action.
-
-<b>Available when:</b> the battle result or tactical state allows the outlaw transition.
-
-<b>Effect:</b> Mark the unit or hero as becoming an outlaw as a battle consequence.
-
-<b>Selection:</b> choose the outlaw command when offered.
-
-### Evacuate Prisoners
-
-<b>Unit requirements:</b> [Warden](/heroes/#warden) on a unit that can flee.
-
-<b>Action Point cost:</b> 5 AP; consumes all remaining AP.
-
-<b>Available when:</b> prisoners can be moved out of danger.
-
-<b>Effect:</b> Move prisoners out of danger when the battlefield state allows prisoner evacuation.
-
-<b>Selection:</b> choose the warden unit and evacuation command.
@@ -1,258 +0,0 @@
-.sl-markdown-content:has(.command-reference-marker) {
-  --command-border: color-mix(in srgb, var(--sl-color-gray-5), transparent 18%);
-  --command-surface: color-mix(in srgb, var(--sl-color-bg), var(--sl-color-gray-6) 22%);
-  --command-surface-strong: color-mix(in srgb, var(--sl-color-bg), var(--sl-color-accent-low) 28%);
-  --command-muted: var(--sl-color-gray-2);
-  --command-label: var(--sl-color-accent-high);
-}
-
-.command-reference-marker {
-  display: none;
-}
-
-.command-reference-five-row-marker {
-  display: none;
-}
-
-.sl-markdown-content:has(.command-reference-marker) > p:has(.command-reference-marker) {
-  display: none;
-}
-
-.sl-markdown-content:has(.command-reference-five-row-marker) > p:has(.command-reference-five-row-marker) {
-  display: none;
-}
-
-.sl-markdown-content:has(.command-reference-marker) > p {
-  max-width: 68rem;
-}
-
-.sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h2 {
-  margin-top: 3rem;
-  padding: 1rem 1.125rem;
-  border: 1px solid var(--command-border);
-  border-radius: 0.5rem;
-  background:
-    linear-gradient(90deg, var(--sl-color-accent-low), transparent 72%),
-    var(--command-surface);
-}
-
-.sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h2 h2 {
-  font-size: clamp(1.35rem, 2.4vw, 1.7rem);
-  line-height: 1.2;
-}
-
-.sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h2 + p {
-  margin-top: 0.75rem;
-  color: var(--command-muted);
-}
-
-.sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h3 {
-  margin-top: 1.5rem;
-  margin-bottom: 0;
-  padding: 1rem 1.125rem 0.875rem;
-  border: 1px solid var(--command-border);
-  border-bottom: 0;
-  border-radius: 0.5rem 0.5rem 0 0;
-  background: var(--command-surface-strong);
-  font-size: 1.18rem;
-}
-
-.sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h3 h3 {
-  font-size: 1.15rem;
-}
-
-.sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h3 + p,
-.sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h3 + p + p,
-.sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h3 + p + p + p,
-.sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h3 + p + p + p + p {
-  margin: 0;
-  padding: 0.75rem 1.125rem;
-  border-right: 1px solid var(--command-border);
-  border-left: 1px solid var(--command-border);
-  background: var(--sl-color-bg);
-  position: relative;
-  padding-left: 13.625rem;
-}
-
-.sl-markdown-content:has(.command-reference-five-row-marker)
-  .sl-heading-wrapper.level-h3
-  + p
-  + p
-  + p
-  + p
-  + p {
-  margin: 0;
-  padding: 0.75rem 1.125rem;
-  border-right: 1px solid var(--command-border);
-  border-left: 1px solid var(--command-border);
-  background: var(--sl-color-bg);
-  position: relative;
-  padding-left: 13.625rem;
-}
-
-.sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h3 + p {
-  padding-top: 1rem;
-}
-
-.sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h3 + p + p + p + p {
-  padding-bottom: 1rem;
-  border-bottom: 1px solid var(--command-border);
-  border-radius: 0 0 0.5rem 0.5rem;
-  box-shadow: 0 0.7rem 1.6rem color-mix(in srgb, black, transparent 92%);
-}
-
-.sl-markdown-content:has(.command-reference-five-row-marker)
-  .sl-heading-wrapper.level-h3
-  + p
-  + p
-  + p
-  + p {
-  padding-bottom: 0.75rem;
-  border-bottom: 0;
-  border-radius: 0;
-  box-shadow: none;
-}
-
-.sl-markdown-content:has(.command-reference-five-row-marker)
-  .sl-heading-wrapper.level-h3
-  + p
-  + p
-  + p
-  + p
-  + p {
-  padding-bottom: 1rem;
-  border-bottom: 1px solid var(--command-border);
-  border-radius: 0 0 0.5rem 0.5rem;
-  box-shadow: 0 0.7rem 1.6rem color-mix(in srgb, black, transparent 92%);
-}
-
-.sl-markdown-content:has(.command-reference-marker) p > b:first-child {
-  color: var(--command-label);
-  font-size: 0.82rem;
-  letter-spacing: 0.04em;
-  text-transform: uppercase;
-  white-space: nowrap;
-}
-
-.sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h3 + p > b:first-child,
-.sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h3 + p + p > b:first-child,
-.sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h3 + p + p + p > b:first-child,
-.sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h3 + p + p + p + p > b:first-child,
-.sl-markdown-content:has(.command-reference-five-row-marker)
-  .sl-heading-wrapper.level-h3
-  + p
-  + p
-  + p
-  + p
-  + p
-  > b:first-child {
-  position: absolute;
-  left: 1.125rem;
-  width: 11.5rem;
-}
-
-.sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h4 {
-  margin-top: 1rem;
-  padding: 0.65rem 1rem;
-  border: 1px solid var(--command-border);
-  border-radius: 0.45rem;
-  background: color-mix(in srgb, var(--sl-color-gray-6), transparent 55%);
-  color: var(--sl-color-white);
-  font-size: 0.92rem;
-  letter-spacing: 0.02em;
-  text-transform: uppercase;
-}
-
-.sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h5 {
-  margin-top: 1rem;
-  margin-bottom: 0;
-  padding: 0.75rem 1rem 0.25rem;
-  border-top: 1px solid var(--command-border);
-  color: var(--sl-color-accent-high);
-}
-
-.sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h5 + p,
-.sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h5 + p + p {
-  margin: 0;
-  padding: 0.4rem 1rem;
-  border-right: 1px solid var(--command-border);
-  border-left: 1px solid var(--command-border);
-  position: relative;
-  padding-left: 7.5rem;
-}
-
-.sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h5 + p > b:first-child,
-.sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h5 + p + p > b:first-child {
-  position: absolute;
-  left: 1rem;
-  width: 5.5rem;
-}
-
-.sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h5 + p + p {
-  padding-bottom: 0.8rem;
-  border-bottom: 1px solid var(--command-border);
-  border-radius: 0 0 0.45rem 0.45rem;
-}
-
-@media (max-width: 50rem) {
-  .sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h2,
-  .sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h3 {
-    padding-right: 0.875rem;
-    padding-left: 0.875rem;
-  }
-
-  .sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h3 + p,
-  .sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h3 + p + p,
-  .sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h3 + p + p + p,
-  .sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h3 + p + p + p + p,
-  .sl-markdown-content:has(.command-reference-five-row-marker)
-    .sl-heading-wrapper.level-h3
-    + p
-    + p
-    + p
-    + p
-    + p {
-    padding-right: 0.875rem;
-    padding-left: 0.875rem;
-  }
-
-  .sl-markdown-content:has(.command-reference-marker) p > b:first-child {
-    display: block;
-    margin-bottom: 0.2rem;
-    white-space: normal;
-  }
-
-  .sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h3 + p,
-  .sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h3 + p + p,
-  .sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h3 + p + p + p,
-  .sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h3 + p + p + p + p,
-  .sl-markdown-content:has(.command-reference-five-row-marker)
-    .sl-heading-wrapper.level-h3
-    + p
-    + p
-    + p
-    + p
-    + p,
-  .sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h5 + p,
-  .sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h5 + p + p {
-    padding-left: 0.875rem;
-  }
-
-  .sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h3 + p > b:first-child,
-  .sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h3 + p + p > b:first-child,
-  .sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h3 + p + p + p > b:first-child,
-  .sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h3 + p + p + p + p > b:first-child,
-  .sl-markdown-content:has(.command-reference-five-row-marker)
-    .sl-heading-wrapper.level-h3
-    + p
-    + p
-    + p
-    + p
-    + p
-    > b:first-child,
-  .sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h5 + p > b:first-child,
-  .sl-markdown-content:has(.command-reference-marker) .sl-heading-wrapper.level-h5 + p + p > b:first-child {
-    position: static;
-    width: auto;
-  }
-}
@@ -1 +0,0 @@
-import "../node_modules/astro/astro.js";
@@ -1,3 +0,0 @@
-{
-  "extends": "astro/tsconfigs/strict"
-}
@@ -87,7 +87,7 @@ Create these prefabs in `Assets/Eagle/Effects/`:

 ### Scene Setup

-Wire up in `Assets/Scenes/Eagle.unity`:
+Wire up in `Gameplay.unity`:
 1. Add controller components to the Map GameObject
 2. Assign `mapContainer`, `centroidsJson` (shared with other controllers)
 3. Assign the effect prefab for each controller
@@ -1,40 +1,36 @@
 module github.com/nolen777/eagle0

-go 1.25.0
+go 1.23.0

-toolchain go1.26.4
+toolchain go1.23.3

 require (
-	github.com/aws/aws-sdk-go-v2 v1.42.0
-	github.com/aws/aws-sdk-go-v2/config v1.32.25
-	github.com/aws/aws-sdk-go-v2/credentials v1.19.24
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.103.3
-	github.com/golang-jwt/jwt/v5 v5.3.1
+	github.com/aws/aws-sdk-go-v2 v1.32.8
+	github.com/aws/aws-sdk-go-v2/config v1.28.10
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.51
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.72.2
+	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.46.0
-	google.golang.org/grpc v1.81.1
-	google.golang.org/protobuf v1.36.11
+	golang.org/x/sys v0.30.0
+	google.golang.org/grpc v1.68.0
+	google.golang.org/protobuf v1.36.3
 )

 require (
-	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.13 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.29 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.29 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.29 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.6 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.30 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.12 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.22 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.29 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.29 // indirect
-	github.com/aws/aws-sdk-go-v2/service/signin v1.2.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.31.3 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.6 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.43.3 // indirect
-	github.com/aws/smithy-go v1.27.2 // indirect
-	golang.org/x/net v0.56.0 // indirect
-	golang.org/x/text v0.38.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20260610212136-7ab31c22f7ad // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20260610212136-7ab31c22f7ad // indirect
+	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.23 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.27 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.27 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.27 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.8 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.8 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.8 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.24.9 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.8 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.33.6 // indirect
+	github.com/aws/smithy-go v1.22.1 // indirect
+	golang.org/x/text v0.25.0 // indirect
 )
@@ -1,184 +1,56 @@
-cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4=
-cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
-cloud.google.com/go/compute/metadata v0.9.0 h1:pDUj4QMoPejqq20dK0Pg2N4yG9zIkYGdBtwLoEkH9Zs=
-cloud.google.com/go/compute/metadata v0.9.0/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.31.0 h1:DHa2U07rk8syqvCge0QIGMCE1WxGj9njT44GH7zNJLQ=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.31.0/go.mod h1:P4WPRUkOhJC13W//jWpyfJNDAIpvRbAUIYLX/4jtlE0=
 github.com/aws/aws-sdk-go-v2 v1.32.8 h1:cZV+NUS/eGxKXMtmyhtYPJ7Z4YLoI/V8bkTdRZfYhGo=
 github.com/aws/aws-sdk-go-v2 v1.32.8/go.mod h1:P5WJBrYqqbWVaOxgH0X/FYYD47/nooaPOZPlQdmiN2U=
-github.com/aws/aws-sdk-go-v2 v1.42.0 h1:XvXMJTkFQtpBKIWZnmr9ZEOc2InWM2yldjXEJ/bymhA=
-github.com/aws/aws-sdk-go-v2 v1.42.0/go.mod h1:27+ACypSLljLAEKsCYOmrjKh83vuTRkuAe9Uv/3A4bg=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 h1:lL7IfaFzngfx0ZwUGOZdsFFnQ5uLvR0hWqqhyE7Q9M8=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7/go.mod h1:QraP0UcVlQJsmHfioCrveWOC1nbiWUl3ej08h4mXWoc=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.13 h1:p1BBrg/Hhp6uK7zpejeI8QFXHJeC/mynzi04Sl03k9g=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.13/go.mod h1:8cIfkE9MDhkRZGpQ22aV6/lkYeYSozpz16Smrs5x4Ls=
 github.com/aws/aws-sdk-go-v2/config v1.28.10 h1:fKODZHfqQu06pCzR69KJ3GuttraRJkhlC8g80RZ0Dfg=
 github.com/aws/aws-sdk-go-v2/config v1.28.10/go.mod h1:PvdxRYZ5Um9QMq9PQ0zHHNdtKK+he2NHtFCUFMXWXeg=
-github.com/aws/aws-sdk-go-v2/config v1.32.25 h1:ACCejvStYoilgwrfegSt5ZntCbPrk52qfwyNcnl3omM=
-github.com/aws/aws-sdk-go-v2/config v1.32.25/go.mod h1:LJyU8sDRbXUxFn8xMJIGP+v9QYYwveNLI8a/giAOiAs=
 github.com/aws/aws-sdk-go-v2/credentials v1.17.51 h1:F/9Sm6Y6k4LqDesZDPJCLxQGXNNHd/ZtJiWd0lCZKRk=
 github.com/aws/aws-sdk-go-v2/credentials v1.17.51/go.mod h1:TKbzCHm43AoPyA+iLGGcruXd4AFhF8tOmLex2R9jWNQ=
-github.com/aws/aws-sdk-go-v2/credentials v1.19.24 h1:2hQqYCV9yqyePQ9o6dCrZc/zO8U3TwPr9mIKlZnPu/I=
-github.com/aws/aws-sdk-go-v2/credentials v1.19.24/go.mod h1:IDwpACtwqHLISdzfwUUNq4P9DsB/h5BLg4FwJPNfqFY=
 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.23 h1:IBAoD/1d8A8/1aA8g4MBVtTRHhXRiNAgwdbo/xRM2DI=
 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.23/go.mod h1:vfENuCM7dofkgKpYzuzf1VT1UKkA/YL3qanfBn7HCaA=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.29 h1:r6qZHbT+wxgWO/e9vYNUEtg7lv5+UN3pRqKhLXvnArg=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.29/go.mod h1:QRnaRcTVGKPGRy8w78HMQtKUGRYcnMZAANATkeVA6Mo=
 github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.27 h1:jSJjSBzw8VDIbWv+mmvBSP8ezsztMYJGH+eKqi9AmNs=
 github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.27/go.mod h1:/DAhLbFRgwhmvJdOfSm+WwikZrCuUJiA4WgJG0fTNSw=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.29 h1:f3vKqSo13fhTYb+JEcXwXefZQE26I1FB5eTSniU67ko=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.29/go.mod h1:MzoLFUArKGpGD+ukmPiTPG1X5x4o6M2kq4v2dr1FiEc=
 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.27 h1:l+X4K77Dui85pIj5foXDhPlnqcNRG2QUyvca300lXh8=
 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.27/go.mod h1:KvZXSFEXm6x84yE8qffKvT3x8J5clWnVFXphpohhzJ8=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.29 h1:RdwIf/CuUsvJX3RgJagbOyotl/cxoLY4xviKuE7p2GY=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.29/go.mod h1:71wt8W2EgswdZy9Mf9KNnzxZ3TiZlv4caKghPktDOkA=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.8.6 h1:qYQ4pzQ2Oz6WpQ8T3HvGHnZydA72MnLuFK9tJwmrbHw=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.8.6/go.mod h1:O3h0IK87yXci+kg6flUKzJnWeziQUKciKrLjcatSNcY=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.27 h1:AmB5QxnD+fBFrg9LcqzkgF/CaYvMyU/BTlejG4t1S7Q=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.27/go.mod h1:Sai7P3xTiyv9ZUYO3IFxMnmiIP759/67iQbU4kdmkyU=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.30 h1:VTGy885W5DKBxWRUJbym9hytNaYzsyaPkCHGRRMAOhU=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.30/go.mod h1:AS0HycUvJRFvTt613AYDOgO2jzw+00cVSMny8XB3yMY=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 h1:iXtILhvDxB6kPvEXgsDhGaZCSC6LQET5ZHSdJozeI0Y=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1/go.mod h1:9nu0fVANtYiAePIBh2/pFUSwtJ402hLnp854CNoDOeE=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.12 h1:ZD2+BSw9vFsNlKYIasSNt3uDbjqqXIBcM13UJv/Lx2k=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.12/go.mod h1:Ms4zlcVBbXbiP7EVLhl+lgjvA/a7YphqQ3Ih3174EmI=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.8 h1:iwYS40JnrBeA9e9aI5S6KKN4EB2zR4iUVYN0nwVivz4=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.8/go.mod h1:Fm9Mi+ApqmFiknZtGpohVcBGvpTu542VC4XO9YudRi0=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.22 h1:V51LGlOq/1VsDsHUdoklAQi7rMmx4qQubvFYAlP2254=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.22/go.mod h1:4Pzhyz8hJOm2bepgl+NjvRx8vlUFAIIvJnZ/MkcNPpU=
 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.8 h1:cWno7lefSH6Pp+mSznagKCgfDGeZRin66UvYUqAkyeA=
 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.8/go.mod h1:tPD+VjU3ABTBoEJ3nctu5Nyg4P4yjqSH5bJGGkY4+XE=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.29 h1:DRebniUGZ2MqiiIVmQJ04vIXr918hubdHMnarSLEWyU=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.29/go.mod h1:LfRkPCD8YHDM2E5eTkos2UpwYeZnBcVarTa8L59bJHA=
 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.8 h1:/Mn7gTedG86nbpjT4QEKsN1D/fThiYe1qvq7WsBGNHg=
 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.8/go.mod h1:Ae3va9LPmvjj231ukHB6UeT8nS7wTPfC3tMZSZMwNYg=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.29 h1:hiME6pBzC7OTl9LMtlyTWBuEl1f4QBcUmFDKC7MLXtc=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.29/go.mod h1:G7RP+uhagpKtKhd1BM9N6JQqjCcGEU47K5lBVZQyRQw=
 github.com/aws/aws-sdk-go-v2/service/s3 v1.72.2 h1:a7aQ3RW+ug4IbhoQp29NZdc7vqrzKZZfWZSaQAXOZvQ=
 github.com/aws/aws-sdk-go-v2/service/s3 v1.72.2/go.mod h1:xMekrnhmJ5aqmyxtmALs7mlvXw5xRh+eYjOjvrIIFJ4=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.103.3 h1:JRseEu/vIDMaWis4bSw0QbXL+cvIGc1XnX076H5ZXLE=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.103.3/go.mod h1:77ZAgynvx1txMvDG8gGWoWkO1augYDxkp9JElWFgjQU=
-github.com/aws/aws-sdk-go-v2/service/signin v1.2.0 h1:3nXpRcFwRCW8n7HgO2QGy0Dc20eQNfBuUemGQhpF8m8=
-github.com/aws/aws-sdk-go-v2/service/signin v1.2.0/go.mod h1:LxYujSTLPRlp2vTtcUO/+1ilrew8ytt6SvQyOgejzFQ=
 github.com/aws/aws-sdk-go-v2/service/sso v1.24.9 h1:YqtxripbjWb2QLyzRK9pByfEDvgg95gpC2AyDq4hFE8=
 github.com/aws/aws-sdk-go-v2/service/sso v1.24.9/go.mod h1:lV8iQpg6OLOfBnqbGMBKYjilBlf633qwHnBEiMSPoHY=
-github.com/aws/aws-sdk-go-v2/service/sso v1.31.3 h1:ey1XLTYXb9PcLt4535632o5kCGXNXEhNb620Dqwuylo=
-github.com/aws/aws-sdk-go-v2/service/sso v1.31.3/go.mod h1:Lk7PlmoTYryQmyBG0EXqj5BcUbj3whXdU2s3yGI3EAc=
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.8 h1:6dBT1Lz8fK11m22R+AqfRsFn8320K0T5DTGxxOQBSMw=
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.8/go.mod h1:/kiBvRQXBc6xeJTYzhSdGvJ5vm1tjaDEjH+MSeRJnlY=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.6 h1:yLr03zQE/5Eu5l3QU0Si+xMbLMbSDF2YXsigqXngs6g=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.6/go.mod h1:Q5N6icH+KJZDLh+ESNwzdv6cZ6vLFF/egy3IOxWhmz4=
 github.com/aws/aws-sdk-go-v2/service/sts v1.33.6 h1:VwhTrsTuVn52an4mXx29PqRzs2Dvu921NpGk7y43tAM=
 github.com/aws/aws-sdk-go-v2/service/sts v1.33.6/go.mod h1:+8h7PZb3yY5ftmVLD7ocEoE98hdc8PoKS0H3wfx1dlc=
-github.com/aws/aws-sdk-go-v2/service/sts v1.43.3 h1:VrIhKRCSK1umelSgB9RghvA9RTUYeQffyAS5ApXehNI=
-github.com/aws/aws-sdk-go-v2/service/sts v1.43.3/go.mod h1:r8wkDOuLaaMFqFiYAb8dGY2A3gJCOujMc6CFOVC4Zhc=
 github.com/aws/smithy-go v1.22.1 h1:/HPHZQ0g7f4eUeK6HKglFz8uwVfZKgoI25rb/J+dnro=
 github.com/aws/smithy-go v1.22.1/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/aws/smithy-go v1.27.1 h1:4T340VFndXtADGF52gYa1POyL7s9E4Z1OeZ1hCscIw8=
-github.com/aws/smithy-go v1.27.1/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc=
-github.com/aws/smithy-go v1.27.2 h1:y9NPmSE6am6LjEFPfqHqG/jJk7AauQvhCJONKh7kpzk=
-github.com/aws/smithy-go v1.27.2/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc=
-github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
-github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cncf/xds/go v0.0.0-20260202195803-dba9d589def2 h1:aBangftG7EVZoUb69Os8IaYg++6uMOdKK83QtkkvJik=
-github.com/cncf/xds/go v0.0.0-20260202195803-dba9d589def2/go.mod h1:qwXFYgsP6T7XnJtbKlf1HP8AjxZZyzxMmc+Lq5GjlU4=
-github.com/envoyproxy/go-control-plane v0.14.0 h1:hbG2kr4RuFj222B6+7T83thSPqLjwBIfQawTkC++2HA=
-github.com/envoyproxy/go-control-plane v0.14.0/go.mod h1:NcS5X47pLl/hfqxU70yPwL9ZMkUlwlKxtAohpi2wBEU=
-github.com/envoyproxy/go-control-plane/envoy v1.37.0 h1:u3riX6BoYRfF4Dr7dwSOroNfdSbEPe9Yyl09/B6wBrQ=
-github.com/envoyproxy/go-control-plane/envoy v1.37.0/go.mod h1:DReE9MMrmecPy+YvQOAOHNYMALuowAnbjjEMkkWOi6A=
-github.com/envoyproxy/go-control-plane/ratelimit v0.1.0 h1:/G9QYbddjL25KvtKTv3an9lx6VBE2cnb8wp1vEGNYGI=
-github.com/envoyproxy/go-control-plane/ratelimit v0.1.0/go.mod h1:Wk+tMFAFbCXaJPzVVHnPgRKdUdwW/KdbRt94AzgRee4=
-github.com/envoyproxy/protoc-gen-validate v1.3.3 h1:MVQghNeW+LZcmXe7SY1V36Z+WFMDjpqGAGacLe2T0ds=
-github.com/envoyproxy/protoc-gen-validate v1.3.3/go.mod h1:TsndJ/ngyIdQRhMcVVGDDHINPLWB7C82oDArY51KfB0=
-github.com/go-jose/go-jose/v4 v4.1.4 h1:moDMcTHmvE6Groj34emNPLs/qtYXRVcd6S7NHbHz3kA=
-github.com/go-jose/go-jose/v4 v4.1.4/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=
-github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
-github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
-github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
-github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
 github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
-github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY=
-github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
-github.com/golang/glog v1.2.5 h1:DrW6hGnjIhtvhOIiAKT6Psh/Kd/ldepEa81DKeiRJ5I=
-github.com/golang/glog v1.2.5/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 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/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=
-github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
-github.com/spiffe/go-spiffe/v2 v2.6.0 h1:l+DolpxNWYgruGQVV0xsfeya3CsC7m8iBzDnMpsbLuo=
-github.com/spiffe/go-spiffe/v2 v2.6.0/go.mod h1:gm2SeUoMZEtpnzPNs2Csc0D/gX33k1xIx7lEzqblHEs=
 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=
-go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
-go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
-go.opentelemetry.io/contrib/detectors/gcp v1.42.0 h1:kpt2PEJuOuqYkPcktfJqWWDjTEd/FNgrxcniL7kQrXQ=
-go.opentelemetry.io/contrib/detectors/gcp v1.42.0/go.mod h1:W9zQ439utxymRrXsUOzZbFX4JhLxXU4+ZnCt8GG7yA8=
-go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=
-go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0=
-go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM=
-go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY=
-go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg=
-go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg=
-go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw=
-go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A=
-go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A=
-go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0=
-golang.org/x/crypto v0.53.0 h1:QZ4Muo8THX6CizN2vPPd5fBGHyogrdK9fG4wLPFUsto=
-golang.org/x/crypto v0.53.0/go.mod h1:DNLU434OwVakk9PzuwV8w62mAJpRJL3vsgcfp4Qnsio=
-golang.org/x/mod v0.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4=
-golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ=
-golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
-golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
-golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o=
-golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec=
-golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
-golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
-golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM=
-golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
 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/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
-golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
-golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
-golang.org/x/term v0.44.0 h1:0rLvDRCtNj0gZkyIXhCyOb2OAzEhLVqc4B+hrsBhrmc=
-golang.org/x/term v0.44.0/go.mod h1:7ze4MdzUzLXpSAoFP1H0bOI9aXDqveSvatT5vKcFh2Y=
 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/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE=
-golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4=
-golang.org/x/tools v0.45.0 h1:18qN3FAooORvApf5XjCXgsuayZOEtXf6JK18I3+ONa8=
-golang.org/x/tools v0.45.0/go.mod h1:LuUGqqaXcXMEFEruIVJVm5mgDD8vww/z/SR1gQ4uE/0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
-gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
-google.golang.org/genproto/googleapis/api v0.0.0-20260610212136-7ab31c22f7ad h1:3iLyITS/sySRwbUKoC7ogfj2Yr1Cjs0pfaRKj5U5HEw=
-google.golang.org/genproto/googleapis/api v0.0.0-20260610212136-7ab31c22f7ad/go.mod h1:KdNqO+rCIWgFumrNBSEDlDNrkrQnpkax7Tv1WxNY8V4=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 h1:ggcbiqK8WWh6l1dnltU4BgWGIGo+EVYxCaAPih/zQXQ=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260610212136-7ab31c22f7ad h1:45WmJvIV6C2+O/jjLkPUH+F3aOj/1miDoU2DD0+NWbg=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260610212136-7ab31c22f7ad/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
 google.golang.org/grpc v1.68.0 h1:aHQeeJbo8zAkAa3pRzrVjZlbz6uSfeOXlJNQM0RAbz0=
 google.golang.org/grpc v1.68.0/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA=
-google.golang.org/grpc v1.71.0 h1:kF77BGdPTQ4/JZWMlb9VpJ5pa25aqvVqogsxNHHdeBg=
-google.golang.org/grpc v1.71.0/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
-google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ=
-google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I=
 google.golang.org/protobuf v1.26.0-rc.1 h1:7QnIQpGRHE5RnLKnESfDoxm2dTapTZua5a0kS0A+VXQ=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU=
 google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
-google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
-google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
-google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
-google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
@@ -1,47 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:recommended"
-  ],
-  "dependencyDashboard": true,
-  "enabledManagers": [
-    "bazel-module",
-    "cargo",
-    "github-actions",
-    "gomod",
-    "swift"
-  ],
-  "labels": [
-    "dependencies"
-  ],
-  "packageRules": [
-    {
-      "description": "Bazel module artifact updates run in GitHub Actions so hosted Renovate does not need unsafe bazel mod deps execution",
-      "matchManagers": [
-        "bazel-module"
-      ],
-      "skipArtifactsUpdate": true
-    },
-    {
-      "description": "Go packages import Bazel-generated protobuf packages, so Renovate's generic Go artifact updater cannot run ./...",
-      "matchManagers": [
-        "gomod"
-      ],
-      "skipArtifactsUpdate": true
-    }
-  ],
-  "lockFileMaintenance": {
-    "enabled": true,
-    "schedule": [
-      "before 6am on monday"
-    ]
-  },
-  "prConcurrentLimit": 3,
-  "prHourlyLimit": 1,
-  "rebaseWhen": "behind-base-branch",
-  "schedule": [
-    "before 6am on monday"
-  ],
-  "separateMajorMinor": true,
-  "timezone": "America/Los_Angeles"
-}
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-bazel_cmd=(bazel)
-if [ -n "${BAZEL_OUTPUT_USER_ROOT:-}" ]; then
-    bazel_cmd+=("--output_user_root=${BAZEL_OUTPUT_USER_ROOT}")
-fi
-if [ -n "${BAZEL_OUTPUT_BASE:-}" ]; then
-    bazel_cmd+=("--output_base=${BAZEL_OUTPUT_BASE}")
-fi
-
-if [ "$(uname -s)" = "Darwin" ]; then
-    ./scripts/sync_bazel_xcode.sh
-fi
-
-"${bazel_cmd[@]}" build "$@" //src/main/scala/net/eagle0/eagle:eagle_server
@@ -1,30 +1,68 @@
 #!/bin/bash

-set -euo pipefail
+set -euxo pipefail

 REPO_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
 UNITY_ROOT="$REPO_ROOT/src/main/csharp/net/eagle0/clients/unity/eagle0"
-PLUGIN_DIR="$UNITY_ROOT/Assets/Plugins/Eagle0Protos"
-GENERATED_SOURCES_DIR="$UNITY_ROOT/Assets/GeneratedProtos"
-PROTO_DLL_TARGET="//src/main/csharp/net/eagle0/clients/unity/eagle0:eagle0_protos"
-PROTO_DLL_OUTPUT="$REPO_ROOT/bazel-bin/src/main/csharp/net/eagle0/clients/unity/eagle0/eagle0_protos/netstandard2.1"
+OUTPUT_DIR="$UNITY_ROOT/Assets/GeneratedProtos"

-/bin/echo "Building C# protobuf DLL..."
-bazel build "$PROTO_DLL_TARGET"
+# All C# protobuf generation targets
+TARGETS=(
+    "//src/main/protobuf/net/eagle0/common:common_csharp_proto_srcs"
+    "//src/main/protobuf/net/eagle0/shardok/storage:storage_csharp_proto_srcs"
+    "//src/main/protobuf/net/eagle0/shardok/common:common_csharp_proto_srcs"
+    "//src/main/protobuf/net/eagle0/shardok/api:api_csharp_proto_srcs"
+    "//src/main/protobuf/net/eagle0/eagle/common:common_csharp_proto_srcs"
+    "//src/main/protobuf/net/eagle0/eagle/views:views_csharp_proto_srcs"
+    "//src/main/protobuf/net/eagle0/eagle/api:api_csharp_proto_srcs"
+    "//src/main/protobuf/net/eagle0/eagle/api:api_csharp_grpc_srcs"
+    "//src/main/protobuf/net/eagle0/eagle/api/command/util:util_csharp_proto_srcs"
+)

-/bin/echo "Syncing generated protobuf DLL to $PLUGIN_DIR..."
+# Subdirectory for each target (avoids filename collisions across packages)
+SUBDIRS=(
+    "net/eagle0/common"
+    "net/eagle0/shardok/storage"
+    "net/eagle0/shardok/common"
+    "net/eagle0/shardok/api"
+    "net/eagle0/eagle/common"
+    "net/eagle0/eagle/views"
+    "net/eagle0/eagle/api"
+    "net/eagle0/eagle/api"
+    "net/eagle0/eagle/api/command/util"
+)

+/bin/echo "Building C# protobuf sources..."
+bazel build "${TARGETS[@]}"
+
+/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

-cp "$PROTO_DLL_OUTPUT/Eagle0Protos.dll" "$STAGING_DIR/"
-cp "$PROTO_DLL_OUTPUT/Eagle0Protos.xml" "$STAGING_DIR/"
+for i in "${!TARGETS[@]}"; do
+    target="${TARGETS[$i]}"
+    subdir="${SUBDIRS[$i]}"
+
+    # Convert target label to bazel-bin path
+    # //src/main/protobuf/net/eagle0/common:common_csharp_proto_srcs
+    # -> bazel-bin/src/main/protobuf/net/eagle0/common/common_csharp_proto_srcs
+    target_path="${target#//}"
+    pkg="${target_path%%:*}"
+    name="${target_path##*:}"
+    bin_dir="$REPO_ROOT/bazel-bin/$pkg/$name"
+
+    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 "$PLUGIN_DIR"
-rsync -rc --delete --exclude "*.meta" "$STAGING_DIR/" "$PLUGIN_DIR/"
+mkdir -p "$OUTPUT_DIR"
+rsync -rc --delete "$STAGING_DIR/" "$OUTPUT_DIR/"

-rm -rf "$GENERATED_SOURCES_DIR"
-
-/bin/echo "Done. Generated C# proto DLL in $PLUGIN_DIR"
+/bin/echo "Done. Generated C# proto sources in $OUTPUT_DIR"
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-bazel_cmd=(bazel)
-if [ -n "${BAZEL_OUTPUT_USER_ROOT:-}" ]; then
-    bazel_cmd+=("--output_user_root=${BAZEL_OUTPUT_USER_ROOT}")
-fi
-if [ -n "${BAZEL_OUTPUT_BASE:-}" ]; then
-    bazel_cmd+=("--output_base=${BAZEL_OUTPUT_BASE}")
-fi
-
-if [ "$(uname -s)" = "Darwin" ]; then
-    ./scripts/sync_bazel_xcode.sh
-fi
-
-"${bazel_cmd[@]}" build -c opt "$@" //src/main/cpp/net/eagle0/shardok:shardok-server
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .1.1
 .5.1