Fix sysroot .so plugins and registry auth

- Exclude GCC plugin .so files from sysroot (Bazel can't handle them) - Only copy GCC headers and static libs needed for cross-compilation - Add tarball structure verification to build script - Fix DO registry auth by setting DOCKER_CONFIG env var for Bazel 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Update sysroot sha256 for v2 with GCC directories
2026-07-29 09:35:42 +00:00 · 2025-12-23 08:50:44 -08:00 · 2025-12-23 08:34:47 -08:00 · 2025-12-23 08:30:55 -08:00 · 2025-12-23 08:23:04 -08:00 · 2025-12-23 08:12:19 -08:00
150 changed files with 8294 additions and 1691 deletions
@@ -6,4 +6,7 @@
 *.bytes filter=lfs diff=lfs merge=lfs -text
 *.psd filter=lfs diff=lfs merge=lfs -text
 *.ttf filter=lfs diff=lfs merge=lfs -text
+# Exclude pre-existing font files that were committed as blobs (not LFS pointers)
+src/main/csharp/**/GUI[[:space:]]Pro[[:space:]]Kit*/**/*.ttf !filter !diff !merge
+src/main/csharp/**/Modern[[:space:]]UI[[:space:]]Pack/**/*.ttf !filter !diff !merge
 *.herodata filter=lfs diff=lfs merge=lfs -text
@@ -0,0 +1,66 @@
+name: Build Linux Sysroot
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Sysroot version (e.g., v2, v3)'
+        required: true
+        default: 'v2'
+        type: string
+
+permissions:
+  contents: read
+
+jobs:
+  build-sysroot:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Build sysroot
+        run: ./tools/sysroot/build_sysroot.sh
+
+      - name: Upload sysroot artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ubuntu-noble-sysroot
+          path: tools/sysroot/output/
+
+      - 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 (using eagle0-windows bucket, same as other workflows)
+          aws s3 cp tools/sysroot/output/ubuntu_noble_amd64_sysroot.tar.xz \
+            s3://eagle0-windows/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/ubuntu_noble_amd64_sysroot.sha256 \
+            s3://eagle0-windows/sysroot/${{ inputs.version }}/ubuntu_noble_amd64_sysroot.sha256 \
+            --endpoint-url https://sfo3.digitaloceanspaces.com \
+            --acl public-read
+
+          echo ""
+          echo "=== Sysroot uploaded ==="
+          echo "URL: https://eagle0-windows.sfo3.digitaloceanspaces.com/sysroot/${{ 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 = \"linux_sysroot\","
+          echo "    sha256 = \"$(cat tools/sysroot/output/ubuntu_noble_amd64_sysroot.sha256)\","
+          echo "    urls = [\"https://eagle0-windows.sfo3.digitaloceanspaces.com/sysroot/${{ inputs.version }}/ubuntu_noble_amd64_sysroot.tar.xz\"],"
+          echo ")"
@@ -0,0 +1,82 @@
+name: Docker Build and Push
+
+on:
+  push:
+    branches: [ "main" ]
+    paths:
+      - 'src/main/cpp/**'
+      - 'src/main/scala/**'
+      - 'src/main/protobuf/**'
+      - 'src/main/resources/**'
+      - 'ci/BUILD.bazel'
+      - 'MODULE.bazel'
+      - '.github/workflows/docker_build.yml'
+  workflow_dispatch:
+    inputs:
+      push_images:
+        description: 'Push images to container registry'
+        required: true
+        default: 'false'
+        type: boolean
+
+permissions:
+  contents: read
+
+jobs:
+  build-eagle:
+    runs-on: self-hosted
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          lfs: false
+
+      - name: Build Eagle Docker image
+        run: bazel build //ci:eagle_server_image
+
+      - name: Login to DigitalOcean Container Registry
+        if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && github.event.inputs.push_images == 'true')
+        env:
+          DO_TOKEN: ${{ secrets.DO_REGISTRY_TOKEN }}
+        run: |
+          mkdir -p ~/.docker
+          AUTH=$(echo -n "${DO_TOKEN}:${DO_TOKEN}" | base64)
+          echo "{\"auths\":{\"registry.digitalocean.com\":{\"auth\":\"${AUTH}\"}}}" > ~/.docker/config.json
+          # Also set for current directory in case Bazel uses different home
+          mkdir -p .docker
+          cp ~/.docker/config.json .docker/
+
+      - name: Push Eagle image to DO registry
+        if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && github.event.inputs.push_images == 'true')
+        env:
+          DOCKER_CONFIG: ${{ github.workspace }}/.docker
+        run: bazel run //ci:eagle_server_push
+
+  build-shardok:
+    runs-on: self-hosted
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          lfs: false
+
+      - name: Build Shardok Docker image (cross-compile for Linux)
+        run: bazel build --platforms=//:linux_x86_64 //ci:shardok_server_image
+
+      - name: Login to DigitalOcean Container Registry
+        if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && github.event.inputs.push_images == 'true')
+        env:
+          DO_TOKEN: ${{ secrets.DO_REGISTRY_TOKEN }}
+        run: |
+          mkdir -p ~/.docker
+          AUTH=$(echo -n "${DO_TOKEN}:${DO_TOKEN}" | base64)
+          echo "{\"auths\":{\"registry.digitalocean.com\":{\"auth\":\"${AUTH}\"}}}" > ~/.docker/config.json
+          # Also set for current directory in case Bazel uses different home
+          mkdir -p .docker
+          cp ~/.docker/config.json .docker/
+
+      - name: Push Shardok image to DO registry
+        if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && github.event.inputs.push_images == 'true')
+        env:
+          DOCKER_CONFIG: ${{ github.workspace }}/.docker
+        run: bazel run --platforms=//:linux_x86_64 //ci:shardok_server_push
@@ -3,6 +3,15 @@ load("@io_bazel_rules_go//go:def.bzl", "nogo")

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

+# Platform for cross-compiling to Linux x86_64
+platform(
+    name = "linux_x86_64",
+    constraint_values = [
+        "@platforms//os:linux",
+        "@platforms//cpu:x86_64",
+    ],
+)
+
 gazelle(name = "gazelle")

 # gazelle:proto file
@@ -26,50 +26,68 @@ scala_config = use_extension(
    "@rules_scala//scala/extensions:config.bzl",
    "scala_config",
 )
-
 scala_config.settings(scala_version = SCALA_VERSION)

 scala_deps = use_extension(
    "@rules_scala//scala/extensions:deps.bzl",
    "scala_deps",
 )
-
 scala_deps.scala()
-
 scala_deps.scalatest()
-
 scala_deps.scala_proto()

 #
 # Language Support - C++
 #

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

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

+# Native toolchain (macOS -> macOS, Linux -> Linux)
 llvm.toolchain(
    name = "llvm_toolchain",
    llvm_version = "20.1.2",
 )

-use_repo(llvm, "llvm_toolchain")
+# Cross-compilation toolchain (macOS -> Linux x86_64)
+# Uses the same LLVM distribution but with a Linux sysroot
+llvm.toolchain(
+    name = "llvm_toolchain_linux",
+    llvm_version = "20.1.2",
+)
+
+# Linux sysroot for cross-compilation (Chromium's Debian sysroot)
+llvm.sysroot(
+    name = "llvm_toolchain_linux",
+    label = "@linux_sysroot//sysroot",
+    targets = ["linux-x86_64"],
+)
+
+use_repo(llvm, "llvm_toolchain", "llvm_toolchain_linux")
+
+# Download the Linux sysroot (Ubuntu 24.04 Noble for C++23 support)
+# Built by: .github/workflows/build_sysroot.yml
+# To rebuild: Run the "Build Linux Sysroot" workflow with a new version, then update sha256 and URL
+sysroot = use_repo_rule("@toolchains_llvm//toolchain:sysroot.bzl", "sysroot")
+sysroot(
+    name = "linux_sysroot",
+    sha256 = "aadb60a2e2c776ac000bb2e29f3039fd81b5b031500cf4a1651b365712819d1f",
+    urls = ["https://eagle0-windows.sfo3.digitaloceanspaces.com/sysroot/v2/ubuntu_noble_amd64_sysroot.tar.xz"],
+)

 #
 # Language Support - Go
 #

-bazel_dep(name = "rules_go", repo_name = "io_bazel_rules_go", version = "0.56.1")
-bazel_dep(name = "gazelle", repo_name = "bazel_gazelle", version = "0.45.0")
+bazel_dep(name = "rules_go", version = "0.56.1", repo_name = "io_bazel_rules_go")
+bazel_dep(name = "gazelle", version = "0.45.0", repo_name = "bazel_gazelle")

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

 go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
-
 go_deps.from_file(go_mod = "//:go.mod")
-
 use_repo(
    go_deps,
    "com_github_aws_aws_sdk_go_v2",
@@ -84,15 +102,15 @@ use_repo(
 # Platform Support - Apple/iOS
 #

-bazel_dep(name = "apple_support", repo_name = "build_bazel_apple_support", version = "1.21.1")
-bazel_dep(name = "rules_apple", repo_name = "build_bazel_rules_apple", version = "3.16.1")
-bazel_dep(name = "rules_swift", repo_name = "build_bazel_rules_swift", version = "2.3.1")
+bazel_dep(name = "apple_support", version = "1.21.1", repo_name = "build_bazel_apple_support")
+bazel_dep(name = "rules_apple", version = "3.16.1", repo_name = "build_bazel_rules_apple")
+bazel_dep(name = "rules_swift", version = "2.3.1", repo_name = "build_bazel_rules_swift")

 #
 # Protocol Buffers & RPC
 #

-bazel_dep(name = "protobuf", repo_name = "com_google_protobuf", version = "29.2")
+bazel_dep(name = "protobuf", version = "29.2", repo_name = "com_google_protobuf")
 bazel_dep(name = "grpc", version = "1.71.0")
 bazel_dep(name = "grpc-java", version = "1.71.0")
 bazel_dep(name = "flatbuffers", version = "25.2.10")
@@ -103,6 +121,32 @@ bazel_dep(name = "flatbuffers", version = "25.2.10")

 bazel_dep(name = "googletest", version = "1.17.0")

+#
+# Container Images (OCI)
+#
+
+bazel_dep(name = "rules_oci", version = "2.2.6")
+bazel_dep(name = "aspect_bazel_lib", version = "2.16.0")
+
+oci = use_extension("@rules_oci//oci:extensions.bzl", "oci")
+
+# Base image for Eagle (Java 17)
+oci.pull(
+    name = "eclipse_temurin_17",
+    digest = "sha256:d286b5352d98777bbf727f54038b04f0145cd9b76ca83f38a67aa111d4303748",
+    image = "docker.io/library/eclipse-temurin",
+    platforms = ["linux/amd64"],
+)
+
+# Base image for Shardok (Ubuntu 24.04 for C++ runtime)
+oci.pull(
+    name = "ubuntu_24_04",
+    image = "docker.io/library/ubuntu",
+    platforms = ["linux/amd64"],
+    tag = "24.04",
+)
+use_repo(oci, "eclipse_temurin_17", "eclipse_temurin_17_linux_amd64", "ubuntu_24_04", "ubuntu_24_04_linux_amd64")
+
 #
 # Java/Scala Dependencies
 #
@@ -110,7 +154,6 @@ bazel_dep(name = "googletest", version = "1.17.0")
 bazel_dep(name = "rules_jvm_external", version = "6.3")

 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
-
 maven.install(
    artifacts = [
        # Netty
@@ -161,6 +204,10 @@ maven.install(
        # Other
        "org.reactivestreams:reactive-streams:1.0.4",
        "javax.xml.bind:jaxb-api:2.3.1",
+
+        # OkHttp (for SSE with read timeout support)
+        "com.squareup.okhttp3:okhttp:4.12.0",
+        "com.squareup.okhttp3:okhttp-sse:4.12.0",
    ],
    duplicate_version_warning = "error",
    fail_if_repin_required = True,
@@ -169,7 +216,6 @@ maven.install(
        "https://repo1.maven.org/maven2",
    ],
 )
-
 use_repo(maven, "maven", "unpinned_maven")

 #
@@ -217,5 +263,6 @@ register_toolchains(
 # Set dev_dependency so we can turn this off for swift MacOS builds
 register_toolchains(
    "@llvm_toolchain//:all",
+    "@llvm_toolchain_linux//:all",
    dev_dependency = True,
 )
@@ -26,7 +26,11 @@
    "https://bcr.bazel.build/modules/aspect_bazel_lib/1.38.0/MODULE.bazel": "6307fec451ba9962c1c969eb516ebfe1e46528f7fa92e1c9ac8646bef4cdaa3f",
    "https://bcr.bazel.build/modules/aspect_bazel_lib/1.40.3/MODULE.bazel": "668e6bcb4d957fc0e284316dba546b705c8d43c857f87119619ee83c4555b859",
    "https://bcr.bazel.build/modules/aspect_bazel_lib/2.11.0/MODULE.bazel": "cb1ba9f9999ed0bc08600c221f532c1ddd8d217686b32ba7d45b0713b5131452",
-    "https://bcr.bazel.build/modules/aspect_bazel_lib/2.11.0/source.json": "92494d5aa43b96665397dd13ee16023097470fa85e276b93674d62a244de47ee",
+    "https://bcr.bazel.build/modules/aspect_bazel_lib/2.14.0/MODULE.bazel": "2b31ffcc9bdc8295b2167e07a757dbbc9ac8906e7028e5170a3708cecaac119f",
+    "https://bcr.bazel.build/modules/aspect_bazel_lib/2.16.0/MODULE.bazel": "852f9ebbda017572a7c113a2434592dd3b2f55cd9a0faea3d4be5a09a59e4900",
+    "https://bcr.bazel.build/modules/aspect_bazel_lib/2.19.3/MODULE.bazel": "253d739ba126f62a5767d832765b12b59e9f8d2bc88cc1572f4a73e46eb298ca",
+    "https://bcr.bazel.build/modules/aspect_bazel_lib/2.19.3/source.json": "ffab9254c65ba945f8369297ad97ca0dec213d3adc6e07877e23a48624a8b456",
+    "https://bcr.bazel.build/modules/aspect_bazel_lib/2.7.2/MODULE.bazel": "780d1a6522b28f5edb7ea09630748720721dfe27690d65a2d33aa7509de77e07",
    "https://bcr.bazel.build/modules/aspect_bazel_lib/2.7.7/MODULE.bazel": "491f8681205e31bb57892d67442ce448cda4f472a8e6b3dc062865e29a64f89c",
    "https://bcr.bazel.build/modules/aspect_bazel_lib/2.8.1/MODULE.bazel": "812d2dd42f65dca362152101fbec418029cc8fd34cbad1a2fde905383d705838",
    "https://bcr.bazel.build/modules/aspect_bazel_lib/2.9.3/MODULE.bazel": "66baf724dbae7aff4787bf2245cc188d50cb08e07789769730151c0943587c14",
@@ -51,8 +55,11 @@
    "https://bcr.bazel.build/modules/bazel_features/1.19.0/MODULE.bazel": "59adcdf28230d220f0067b1f435b8537dd033bfff8db21335ef9217919c7fb58",
    "https://bcr.bazel.build/modules/bazel_features/1.21.0/MODULE.bazel": "675642261665d8eea09989aa3b8afb5c37627f1be178382c320d1b46afba5e3b",
    "https://bcr.bazel.build/modules/bazel_features/1.27.0/MODULE.bazel": "621eeee06c4458a9121d1f104efb80f39d34deff4984e778359c60eaf1a8cb65",
-    "https://bcr.bazel.build/modules/bazel_features/1.27.0/source.json": "ed8cf0ef05c858dce3661689d0a2b110ff398e63994e178e4f1f7555a8067fed",
+    "https://bcr.bazel.build/modules/bazel_features/1.28.0/MODULE.bazel": "4b4200e6cbf8fa335b2c3f43e1d6ef3e240319c33d43d60cc0fbd4b87ece299d",
    "https://bcr.bazel.build/modules/bazel_features/1.3.0/MODULE.bazel": "cdcafe83ec318cda34e02948e81d790aab8df7a929cec6f6969f13a489ccecd9",
+    "https://bcr.bazel.build/modules/bazel_features/1.34.0/MODULE.bazel": "e8475ad7c8965542e0c7aac8af68eb48c4af904be3d614b6aa6274c092c2ea1e",
+    "https://bcr.bazel.build/modules/bazel_features/1.38.0/MODULE.bazel": "f9b8a9c890ebd216b4049fd12a31d3c2602e3403c7af636b04fbbd7453edc9c9",
+    "https://bcr.bazel.build/modules/bazel_features/1.38.0/source.json": "31ba776c122b54a2885e23651642e32f087a87bf025465f8040751894b571277",
    "https://bcr.bazel.build/modules/bazel_features/1.4.1/MODULE.bazel": "e45b6bb2350aff3e442ae1111c555e27eac1d915e77775f6fdc4b351b758b5d7",
    "https://bcr.bazel.build/modules/bazel_features/1.9.0/MODULE.bazel": "885151d58d90d8d9c811eb75e3288c11f850e1d6b481a8c9f766adee4712358b",
    "https://bcr.bazel.build/modules/bazel_features/1.9.1/MODULE.bazel": "8f679097876a9b609ad1f60249c49d68bfab783dd9be012faf9d82547b14815a",
@@ -69,7 +76,8 @@
    "https://bcr.bazel.build/modules/bazel_skylib/1.7.0/MODULE.bazel": "0db596f4563de7938de764cc8deeabec291f55e8ec15299718b93c4423e9796d",
    "https://bcr.bazel.build/modules/bazel_skylib/1.7.1/MODULE.bazel": "3120d80c5861aa616222ec015332e5f8d3171e062e3e804a2a0253e1be26e59b",
    "https://bcr.bazel.build/modules/bazel_skylib/1.8.1/MODULE.bazel": "88ade7293becda963e0e3ea33e7d54d3425127e0a326e0d17da085a5f1f03ff6",
-    "https://bcr.bazel.build/modules/bazel_skylib/1.8.1/source.json": "7ebaefba0b03efe59cac88ed5bbc67bcf59a3eff33af937345ede2a38b2d368a",
+    "https://bcr.bazel.build/modules/bazel_skylib/1.8.2/MODULE.bazel": "69ad6927098316848b34a9142bcc975e018ba27f08c4ff403f50c1b6e646ca67",
+    "https://bcr.bazel.build/modules/bazel_skylib/1.8.2/source.json": "34a3c8bcf233b835eb74be9d628899bb32999d3e0eadef1947a0a562a2b16ffb",
    "https://bcr.bazel.build/modules/bazel_worker_api/0.0.6/MODULE.bazel": "fd1f9432ca04c947e91b500df69ce7c5b6dbfe1bc45ab1820338205dae3383a6",
    "https://bcr.bazel.build/modules/bazel_worker_api/0.0.6/source.json": "5d68545f224904745a3cabd35aea6bc2b6cc5a78b7f49f3f69660eab2eeeb273",
    "https://bcr.bazel.build/modules/boringssl/0.0.0-20211025-d4f1ab9/MODULE.bazel": "6ee6353f8b1a701fe2178e1d925034294971350b6d3ac37e67e5a7d463267834",
@@ -98,6 +106,8 @@
    "https://bcr.bazel.build/modules/envoy_api/0.0.0-20250128-4de3c74/source.json": "028519164a2e24563f4b43d810fdedc702daed90e71e7042d45ba82ad807b46f",
    "https://bcr.bazel.build/modules/flatbuffers/25.2.10/MODULE.bazel": "dab15cafe8512d2c4a8daa44c2d7968c5c79f01e220d40076cdc260bf58605e2",
    "https://bcr.bazel.build/modules/flatbuffers/25.2.10/source.json": "7eae7ea3eb913b9802426e4d5df11d6c6072a3573a548f8cabf1e965f5cca4d0",
+    "https://bcr.bazel.build/modules/gawk/5.3.2.bcr.1/MODULE.bazel": "cdf8cbe5ee750db04b78878c9633cc76e80dcf4416cbe982ac3a9222f80713c8",
+    "https://bcr.bazel.build/modules/gawk/5.3.2.bcr.1/source.json": "fa7b512dfcb5eafd90ce3959cf42a2a6fe96144ebbb4b3b3928054895f2afac2",
    "https://bcr.bazel.build/modules/gazelle/0.27.0/MODULE.bazel": "3446abd608295de6d90b4a8a118ed64a9ce11dcb3dda2dc3290a22056bd20996",
    "https://bcr.bazel.build/modules/gazelle/0.30.0/MODULE.bazel": "f888a1effe338491f35f0e0e85003b47bb9d8295ccba73c37e07702d8d31c65b",
    "https://bcr.bazel.build/modules/gazelle/0.32.0/MODULE.bazel": "b499f58a5d0d3537f3cf5b76d8ada18242f64ec474d8391247438bf04f58c7b8",
@@ -137,6 +147,10 @@
    "https://bcr.bazel.build/modules/grpc/1.70.1/MODULE.bazel": "b800cd8e3e7555c1e61cba2e02d3a2fcf0e91f66e800db286d965d3b7a6a721a",
    "https://bcr.bazel.build/modules/grpc/1.71.0/MODULE.bazel": "7fcab2c05530373f1a442c362b17740dd0c75b6a2a975eec8f5bf4c70a37928a",
    "https://bcr.bazel.build/modules/grpc/1.71.0/source.json": "60ef8c4c72c8280ae94c05b4f38bf67785acb25477ab8dbac096a9604449ff90",
+    "https://bcr.bazel.build/modules/helly25_bzl/0.3.1/MODULE.bazel": "3a4be20f6fc13be32ad44643b8252ef5af09eee936f1d943cd4fd7867fa92826",
+    "https://bcr.bazel.build/modules/helly25_bzl/0.3.1/source.json": "b129ab1828492de2c163785bbeb4065c166de52d932524b4317beb5b7f917994",
+    "https://bcr.bazel.build/modules/jq.bzl/0.1.0/MODULE.bazel": "2ce69b1af49952cd4121a9c3055faa679e748ce774c7f1fda9657f936cae902f",
+    "https://bcr.bazel.build/modules/jq.bzl/0.1.0/source.json": "746bf13cac0860f091df5e4911d0c593971cd8796b5ad4e809b2f8e133eee3d5",
    "https://bcr.bazel.build/modules/jsoncpp/1.9.5/MODULE.bazel": "31271aedc59e815656f5736f282bb7509a97c7ecb43e927ac1a37966e0578075",
    "https://bcr.bazel.build/modules/jsoncpp/1.9.5/source.json": "4108ee5085dd2885a341c7fab149429db457b3169b86eb081fa245eadf69169d",
    "https://bcr.bazel.build/modules/libpfm/4.11.0/MODULE.bazel": "45061ff025b301940f1e30d2c16bea596c25b176c8b6b3087e92615adbd52902",
@@ -161,6 +175,7 @@
    "https://bcr.bazel.build/modules/opentelemetry-proto/1.5.0/source.json": "046b721ce203e88cdaad44d7dd17a86b7200eab9388b663b234e72e13ff7b143",
    "https://bcr.bazel.build/modules/opentracing-cpp/1.6.0/MODULE.bazel": "b3925269f63561b8b880ae7cf62ccf81f6ece55b62cd791eda9925147ae116ec",
    "https://bcr.bazel.build/modules/opentracing-cpp/1.6.0/source.json": "da1cb1add160f5e5074b7272e9db6fd8f1b3336c15032cd0a653af9d2f484aed",
+    "https://bcr.bazel.build/modules/package_metadata/0.0.2/MODULE.bazel": "fb8d25550742674d63d7b250063d4580ca530499f045d70748b1b142081ebb92",
    "https://bcr.bazel.build/modules/package_metadata/0.0.5/MODULE.bazel": "ef4f9439e3270fdd6b9fd4dbc3d2f29d13888e44c529a1b243f7a31dfbc2e8e4",
    "https://bcr.bazel.build/modules/package_metadata/0.0.5/source.json": "2326db2f6592578177751c3e1f74786b79382cd6008834c9d01ec865b9126a85",
    "https://bcr.bazel.build/modules/platforms/0.0.10/MODULE.bazel": "8cb8efaf200bdeb2150d93e162c40f388529a25852b332cec879373771e48ed5",
@@ -225,12 +240,14 @@
    "https://bcr.bazel.build/modules/rules_cc/0.0.15/MODULE.bazel": "6704c35f7b4a72502ee81f61bf88706b54f06b3cbe5558ac17e2e14666cd5dcc",
    "https://bcr.bazel.build/modules/rules_cc/0.0.16/MODULE.bazel": "7661303b8fc1b4d7f532e54e9d6565771fea666fbdf839e0a86affcd02defe87",
    "https://bcr.bazel.build/modules/rules_cc/0.0.17/MODULE.bazel": "2ae1d8f4238ec67d7185d8861cb0a2cdf4bc608697c331b95bf990e69b62e64a",
-    "https://bcr.bazel.build/modules/rules_cc/0.0.17/source.json": "4db99b3f55c90ab28d14552aa0632533e3e8e5e9aea0f5c24ac0014282c2a7c5",
    "https://bcr.bazel.build/modules/rules_cc/0.0.2/MODULE.bazel": "6915987c90970493ab97393024c156ea8fb9f3bea953b2f3ec05c34f19b5695c",
    "https://bcr.bazel.build/modules/rules_cc/0.0.5/MODULE.bazel": "be41f87587998fe8890cd82ea4e848ed8eb799e053c224f78f3ff7fe1a1d9b74",
    "https://bcr.bazel.build/modules/rules_cc/0.0.6/MODULE.bazel": "abf360251023dfe3efcef65ab9d56beefa8394d4176dd29529750e1c57eaa33f",
    "https://bcr.bazel.build/modules/rules_cc/0.0.8/MODULE.bazel": "964c85c82cfeb6f3855e6a07054fdb159aced38e99a5eecf7bce9d53990afa3e",
    "https://bcr.bazel.build/modules/rules_cc/0.0.9/MODULE.bazel": "836e76439f354b89afe6a911a7adf59a6b2518fafb174483ad78a2a2fde7b1c5",
+    "https://bcr.bazel.build/modules/rules_cc/0.1.1/MODULE.bazel": "2f0222a6f229f0bf44cd711dc13c858dad98c62d52bd51d8fc3a764a83125513",
+    "https://bcr.bazel.build/modules/rules_cc/0.2.14/MODULE.bazel": "353c99ed148887ee89c54a17d4100ae7e7e436593d104b668476019023b58df8",
+    "https://bcr.bazel.build/modules/rules_cc/0.2.14/source.json": "55d0a4587c5592fad350f6e698530f4faf0e7dd15e69d43f8d87e220c78bea54",
    "https://bcr.bazel.build/modules/rules_foreign_cc/0.10.1/MODULE.bazel": "b9527010e5fef060af92b6724edb3691970a5b1f76f74b21d39f7d433641be60",
    "https://bcr.bazel.build/modules/rules_foreign_cc/0.10.1/source.json": "9300e71df0cdde0952f10afff1401fa664e9fc5d9ae6204660ba1b158d90d6a6",
    "https://bcr.bazel.build/modules/rules_foreign_cc/0.9.0/MODULE.bazel": "c9e8c682bf75b0e7c704166d79b599f93b72cfca5ad7477df596947891feeef6",
@@ -289,6 +306,8 @@
    "https://bcr.bazel.build/modules/rules_nodejs/6.3.0/MODULE.bazel": "45345e4aba35dd6e4701c1eebf5a4e67af4ed708def9ebcdc6027585b34ee52d",
    "https://bcr.bazel.build/modules/rules_nodejs/6.3.3/MODULE.bazel": "b66eadebd10f1f1b25f52f95ab5213a57e82c37c3f656fcd9a57ad04d2264ce7",
    "https://bcr.bazel.build/modules/rules_nodejs/6.3.3/source.json": "45bd343155bdfed2543f0e39b80ff3f6840efc31975da4b5795797f4c94147ad",
+    "https://bcr.bazel.build/modules/rules_oci/2.2.6/MODULE.bazel": "2ba6ddd679269e00aeffe9ca04faa2d0ca4129650982c9246d0d459fe2da47d9",
+    "https://bcr.bazel.build/modules/rules_oci/2.2.6/source.json": "94e7decb8f95d9465b0bbea71c65064cd16083be1350c7468f131818641dc4a5",
    "https://bcr.bazel.build/modules/rules_pkg/0.7.0/MODULE.bazel": "df99f03fc7934a4737122518bb87e667e62d780b610910f0447665a7e2be62dc",
    "https://bcr.bazel.build/modules/rules_pkg/1.0.1/MODULE.bazel": "5b1df97dbc29623bccdf2b0dcd0f5cb08e2f2c9050aab1092fd39a41e82686ff",
    "https://bcr.bazel.build/modules/rules_pkg/1.1.0/MODULE.bazel": "9db8031e71b6ef32d1846106e10dd0ee2deac042bd9a2de22b4761b0c3036453",
@@ -321,7 +340,8 @@
    "https://bcr.bazel.build/modules/rules_scala/7.1.1/source.json": "5038cb231d4020c5965c920681cf961a7bf137b40315025e40f3a7b6a0ac1f0f",
    "https://bcr.bazel.build/modules/rules_shell/0.2.0/MODULE.bazel": "fda8a652ab3c7d8fee214de05e7a9916d8b28082234e8d2c0094505c5268ed3c",
    "https://bcr.bazel.build/modules/rules_shell/0.3.0/MODULE.bazel": "de4402cd12f4cc8fda2354fce179fdb068c0b9ca1ec2d2b17b3e21b24c1a937b",
-    "https://bcr.bazel.build/modules/rules_shell/0.3.0/source.json": "c55ed591aa5009401ddf80ded9762ac32c358d2517ee7820be981e2de9756cf3",
+    "https://bcr.bazel.build/modules/rules_shell/0.4.1/MODULE.bazel": "00e501db01bbf4e3e1dd1595959092c2fadf2087b2852d3f553b5370f5633592",
+    "https://bcr.bazel.build/modules/rules_shell/0.4.1/source.json": "4757bd277fe1567763991c4425b483477bb82e35e777a56fd846eb5cceda324a",
    "https://bcr.bazel.build/modules/rules_swift/1.16.0/MODULE.bazel": "4a09f199545a60d09895e8281362b1ff3bb08bbde69c6fc87aff5b92fcc916ca",
    "https://bcr.bazel.build/modules/rules_swift/1.18.0/MODULE.bazel": "a6aba73625d0dc64c7b4a1e831549b6e375fbddb9d2dde9d80c9de6ec45b24c9",
    "https://bcr.bazel.build/modules/rules_swift/2.1.1/MODULE.bazel": "494900a80f944fc7aa61500c2073d9729dff0b764f0e89b824eb746959bc1046",
@@ -339,14 +359,19 @@
    "https://bcr.bazel.build/modules/stardoc/0.7.2/source.json": "58b029e5e901d6802967754adf0a9056747e8176f017cfe3607c0851f4d42216",
    "https://bcr.bazel.build/modules/swift_argument_parser/1.3.1.1/MODULE.bazel": "5e463fbfba7b1701d957555ed45097d7f984211330106ccd1352c6e0af0dcf91",
    "https://bcr.bazel.build/modules/swift_argument_parser/1.3.1.1/source.json": "32bd87e5f4d7acc57c5b2ff7c325ae3061d5e242c0c4c214ae87e0f1c13e54cb",
-    "https://bcr.bazel.build/modules/toolchains_llvm/1.4.0/MODULE.bazel": "05239402b7374293359c2f22806f420b75aa5d6f4b15a2eaa809a2c214d58b31",
-    "https://bcr.bazel.build/modules/toolchains_llvm/1.4.0/source.json": "229a516d282b17a82be54c6e3ae220a1b750fb55a8495567e5c7a9d09423f3e2",
+    "https://bcr.bazel.build/modules/tar.bzl/0.2.1/MODULE.bazel": "52d1c00a80a8cc67acbd01649e83d8dd6a9dc426a6c0b754a04fe8c219c76468",
+    "https://bcr.bazel.build/modules/tar.bzl/0.6.0/MODULE.bazel": "a3584b4edcfafcabd9b0ef9819808f05b372957bbdff41601429d5fd0aac2e7c",
+    "https://bcr.bazel.build/modules/tar.bzl/0.6.0/source.json": "4a620381df075a16cb3a7ed57bd1d05f7480222394c64a20fa51bdb636fda658",
+    "https://bcr.bazel.build/modules/toolchains_llvm/1.6.0/MODULE.bazel": "39603859cafb1c6830160fcd6370552e836790e6abb2bfb8d13bff53c0c10a64",
+    "https://bcr.bazel.build/modules/toolchains_llvm/1.6.0/source.json": "6bd3ef95a288dd2bb1582eca332af850c9a5428a23bb92cb1c57c2dfe6cb7369",
    "https://bcr.bazel.build/modules/upb/0.0.0-20211020-160625a/MODULE.bazel": "6cced416be2dc5b9c05efd5b997049ba795e5e4e6fafbe1624f4587767638928",
    "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/MODULE.bazel": "7298990c00040a0e2f121f6c32544bab27d4452f80d9ce51349b1a28f3005c43",
    "https://bcr.bazel.build/modules/upb/0.0.0-20230516-61a97ef/MODULE.bazel": "c0df5e35ad55e264160417fd0875932ee3c9dda63d9fccace35ac62f45e1b6f9",
    "https://bcr.bazel.build/modules/upb/0.0.0-20230907-e7430e6/MODULE.bazel": "3a7dedadf70346e678dc059dbe44d05cbf3ab17f1ce43a1c7a42edc7cbf93fd9",
    "https://bcr.bazel.build/modules/xds/0.0.0-20240423-555b57e/MODULE.bazel": "cea509976a77e34131411684ef05a1d6ad194dd71a8d5816643bc5b0af16dc0f",
    "https://bcr.bazel.build/modules/xds/0.0.0-20240423-555b57e/source.json": "7227e1fcad55f3f3cab1a08691ecd753cb29cc6380a47bc650851be9f9ad6d20",
+    "https://bcr.bazel.build/modules/yq.bzl/0.1.1/MODULE.bazel": "9039681f9bcb8958ee2c87ffc74bdafba9f4369096a2b5634b88abc0eaefa072",
+    "https://bcr.bazel.build/modules/yq.bzl/0.1.1/source.json": "2d2bad780a9f2b9195a4a370314d2c17ae95eaa745cefc2e12fbc49759b15aa3",
    "https://bcr.bazel.build/modules/zlib/1.2.11/MODULE.bazel": "07b389abc85fdbca459b69e2ec656ae5622873af3f845e1c9d80fe179f3effa0",
    "https://bcr.bazel.build/modules/zlib/1.2.12/MODULE.bazel": "3b1a8834ada2a883674be8cbd36ede1b6ec481477ada359cd2d3ddc562340b27",
    "https://bcr.bazel.build/modules/zlib/1.2.13/MODULE.bazel": "aa6deb1b83c18ffecd940c4119aff9567cd0a671d7bba756741cb2ef043a29d5",
@@ -388,7 +413,7 @@
    },
    "@@aspect_rules_esbuild~//esbuild:extensions.bzl%esbuild": {
      "general": {
-        "bzlTransitiveDigest": "8iOqbPY5ve3DvjzaI1mJZ8XTiJypN2PeWvcKOvmZLy8=",
+        "bzlTransitiveDigest": "8jv3p0xDR/oitFeH8y0+Y5xlyrUbfsTRlc9TSwYkwl8=",
        "usagesDigest": "iDVoyPxUeADmfK8ssoyG3Ehq1bj6p7A43LpEiE266os=",
        "recordedFileInputs": {},
        "recordedDirentsInputs": {},
@@ -1265,6 +1290,247 @@
        "recordedRepoMappingEntries": []
      }
    },
+    "@@rules_oci~//oci:extensions.bzl%oci": {
+      "general": {
+        "bzlTransitiveDigest": "FaY+7xb13bB3hmxqwAWaGp3Tf3Q4Nfdlr+F38CP5mcg=",
+        "usagesDigest": "BuciKSozbpJMD9EP+j0RG5ZgrYMeDPsQyiOnLUni2V8=",
+        "recordedFileInputs": {},
+        "recordedDirentsInputs": {},
+        "envVariables": {},
+        "generatedRepoSpecs": {
+          "eclipse_temurin_17_linux_amd64": {
+            "bzlFile": "@@rules_oci~//oci/private:pull.bzl",
+            "ruleClassName": "oci_pull",
+            "attributes": {
+              "www_authenticate_challenges": {},
+              "scheme": "https",
+              "registry": "index.docker.io",
+              "repository": "library/eclipse-temurin",
+              "identifier": "sha256:d286b5352d98777bbf727f54038b04f0145cd9b76ca83f38a67aa111d4303748",
+              "platform": "linux/amd64",
+              "target_name": "eclipse_temurin_17_linux_amd64",
+              "bazel_tags": []
+            }
+          },
+          "eclipse_temurin_17": {
+            "bzlFile": "@@rules_oci~//oci/private:pull.bzl",
+            "ruleClassName": "oci_alias",
+            "attributes": {
+              "target_name": "eclipse_temurin_17",
+              "www_authenticate_challenges": {},
+              "scheme": "https",
+              "registry": "index.docker.io",
+              "repository": "library/eclipse-temurin",
+              "identifier": "sha256:d286b5352d98777bbf727f54038b04f0145cd9b76ca83f38a67aa111d4303748",
+              "platforms": {
+                "@@platforms//cpu:x86_64": "@eclipse_temurin_17_linux_amd64"
+              },
+              "bzlmod_repository": "eclipse_temurin_17",
+              "reproducible": true
+            }
+          },
+          "ubuntu_24_04_linux_amd64": {
+            "bzlFile": "@@rules_oci~//oci/private:pull.bzl",
+            "ruleClassName": "oci_pull",
+            "attributes": {
+              "www_authenticate_challenges": {},
+              "scheme": "https",
+              "registry": "index.docker.io",
+              "repository": "library/ubuntu",
+              "identifier": "24.04",
+              "platform": "linux/amd64",
+              "target_name": "ubuntu_24_04_linux_amd64",
+              "bazel_tags": []
+            }
+          },
+          "ubuntu_24_04": {
+            "bzlFile": "@@rules_oci~//oci/private:pull.bzl",
+            "ruleClassName": "oci_alias",
+            "attributes": {
+              "target_name": "ubuntu_24_04",
+              "www_authenticate_challenges": {},
+              "scheme": "https",
+              "registry": "index.docker.io",
+              "repository": "library/ubuntu",
+              "identifier": "24.04",
+              "platforms": {
+                "@@platforms//cpu:x86_64": "@ubuntu_24_04_linux_amd64"
+              },
+              "bzlmod_repository": "ubuntu_24_04",
+              "reproducible": true
+            }
+          },
+          "oci_crane_darwin_amd64": {
+            "bzlFile": "@@rules_oci~//oci:repositories.bzl",
+            "ruleClassName": "crane_repositories",
+            "attributes": {
+              "platform": "darwin_amd64",
+              "crane_version": "v0.18.0"
+            }
+          },
+          "oci_crane_darwin_arm64": {
+            "bzlFile": "@@rules_oci~//oci:repositories.bzl",
+            "ruleClassName": "crane_repositories",
+            "attributes": {
+              "platform": "darwin_arm64",
+              "crane_version": "v0.18.0"
+            }
+          },
+          "oci_crane_linux_arm64": {
+            "bzlFile": "@@rules_oci~//oci:repositories.bzl",
+            "ruleClassName": "crane_repositories",
+            "attributes": {
+              "platform": "linux_arm64",
+              "crane_version": "v0.18.0"
+            }
+          },
+          "oci_crane_linux_armv6": {
+            "bzlFile": "@@rules_oci~//oci:repositories.bzl",
+            "ruleClassName": "crane_repositories",
+            "attributes": {
+              "platform": "linux_armv6",
+              "crane_version": "v0.18.0"
+            }
+          },
+          "oci_crane_linux_i386": {
+            "bzlFile": "@@rules_oci~//oci:repositories.bzl",
+            "ruleClassName": "crane_repositories",
+            "attributes": {
+              "platform": "linux_i386",
+              "crane_version": "v0.18.0"
+            }
+          },
+          "oci_crane_linux_s390x": {
+            "bzlFile": "@@rules_oci~//oci:repositories.bzl",
+            "ruleClassName": "crane_repositories",
+            "attributes": {
+              "platform": "linux_s390x",
+              "crane_version": "v0.18.0"
+            }
+          },
+          "oci_crane_linux_amd64": {
+            "bzlFile": "@@rules_oci~//oci:repositories.bzl",
+            "ruleClassName": "crane_repositories",
+            "attributes": {
+              "platform": "linux_amd64",
+              "crane_version": "v0.18.0"
+            }
+          },
+          "oci_crane_windows_armv6": {
+            "bzlFile": "@@rules_oci~//oci:repositories.bzl",
+            "ruleClassName": "crane_repositories",
+            "attributes": {
+              "platform": "windows_armv6",
+              "crane_version": "v0.18.0"
+            }
+          },
+          "oci_crane_windows_amd64": {
+            "bzlFile": "@@rules_oci~//oci:repositories.bzl",
+            "ruleClassName": "crane_repositories",
+            "attributes": {
+              "platform": "windows_amd64",
+              "crane_version": "v0.18.0"
+            }
+          },
+          "oci_crane_toolchains": {
+            "bzlFile": "@@rules_oci~//oci/private:toolchains_repo.bzl",
+            "ruleClassName": "toolchains_repo",
+            "attributes": {
+              "toolchain_type": "@rules_oci//oci:crane_toolchain_type",
+              "toolchain": "@oci_crane_{platform}//:crane_toolchain"
+            }
+          },
+          "oci_regctl_darwin_amd64": {
+            "bzlFile": "@@rules_oci~//oci:repositories.bzl",
+            "ruleClassName": "regctl_repositories",
+            "attributes": {
+              "platform": "darwin_amd64"
+            }
+          },
+          "oci_regctl_darwin_arm64": {
+            "bzlFile": "@@rules_oci~//oci:repositories.bzl",
+            "ruleClassName": "regctl_repositories",
+            "attributes": {
+              "platform": "darwin_arm64"
+            }
+          },
+          "oci_regctl_linux_arm64": {
+            "bzlFile": "@@rules_oci~//oci:repositories.bzl",
+            "ruleClassName": "regctl_repositories",
+            "attributes": {
+              "platform": "linux_arm64"
+            }
+          },
+          "oci_regctl_linux_s390x": {
+            "bzlFile": "@@rules_oci~//oci:repositories.bzl",
+            "ruleClassName": "regctl_repositories",
+            "attributes": {
+              "platform": "linux_s390x"
+            }
+          },
+          "oci_regctl_linux_amd64": {
+            "bzlFile": "@@rules_oci~//oci:repositories.bzl",
+            "ruleClassName": "regctl_repositories",
+            "attributes": {
+              "platform": "linux_amd64"
+            }
+          },
+          "oci_regctl_windows_amd64": {
+            "bzlFile": "@@rules_oci~//oci:repositories.bzl",
+            "ruleClassName": "regctl_repositories",
+            "attributes": {
+              "platform": "windows_amd64"
+            }
+          },
+          "oci_regctl_toolchains": {
+            "bzlFile": "@@rules_oci~//oci/private:toolchains_repo.bzl",
+            "ruleClassName": "toolchains_repo",
+            "attributes": {
+              "toolchain_type": "@rules_oci//oci:regctl_toolchain_type",
+              "toolchain": "@oci_regctl_{platform}//:regctl_toolchain"
+            }
+          }
+        },
+        "moduleExtensionMetadata": {
+          "explicitRootModuleDirectDeps": [
+            "eclipse_temurin_17",
+            "eclipse_temurin_17_linux_amd64",
+            "ubuntu_24_04",
+            "ubuntu_24_04_linux_amd64"
+          ],
+          "explicitRootModuleDirectDevDeps": [],
+          "useAllRepos": "NO",
+          "reproducible": false
+        },
+        "recordedRepoMappingEntries": [
+          [
+            "aspect_bazel_lib~",
+            "bazel_tools",
+            "bazel_tools"
+          ],
+          [
+            "bazel_features~",
+            "bazel_tools",
+            "bazel_tools"
+          ],
+          [
+            "rules_oci~",
+            "aspect_bazel_lib",
+            "aspect_bazel_lib~"
+          ],
+          [
+            "rules_oci~",
+            "bazel_features",
+            "bazel_features~"
+          ],
+          [
+            "rules_oci~",
+            "bazel_skylib",
+            "bazel_skylib~"
+          ]
+        ]
+      }
+    },
    "@@rules_scala~//scala/extensions:config.bzl%scala_config": {
      "general": {
        "bzlTransitiveDigest": "TdBxhkZTM7VU6teIFS+KoonKU7wmb5BL7leCWWx7yX8=",
@@ -1293,7 +1559,7 @@
    },
    "@@rules_scala~//scala/extensions:deps.bzl%scala_deps": {
      "general": {
-        "bzlTransitiveDigest": "F2PMm61fmZ/IE+VSw1rigJ71hBDD7k3vqyYR1/GgXeA=",
+        "bzlTransitiveDigest": "5SDZrXQHW6tI/VEw+La2OPOK4ZWm0LGTxnChXOXBCag=",
        "usagesDigest": "kwo8oolISmSSITnit4b4S0vBiUtHlHK0WLDUwScxmOg=",
        "recordedFileInputs": {},
        "recordedDirentsInputs": {},
@@ -4904,85 +5170,6 @@
          ]
        ]
      }
-    },
-    "@@toolchains_llvm~//toolchain/extensions:llvm.bzl%llvm": {
-      "general": {
-        "bzlTransitiveDigest": "afRF0aFOIUrkYl3o040WQ606ep1qciEXzjnAxT3Kek8=",
-        "usagesDigest": "sYVuhiCAQehFTnGTv0bNtTBR4WorebpWBNxF0mRusyw=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "llvm_toolchain_llvm": {
-            "bzlFile": "@@toolchains_llvm~//toolchain:rules.bzl",
-            "ruleClassName": "llvm",
-            "attributes": {
-              "alternative_llvm_sources": [],
-              "auth_patterns": {},
-              "distribution": "auto",
-              "exec_arch": "",
-              "exec_os": "",
-              "libclang_rt": {},
-              "llvm_mirror": "",
-              "llvm_version": "20.1.2",
-              "llvm_versions": {},
-              "netrc": "",
-              "sha256": {},
-              "strip_prefix": {},
-              "urls": {}
-            }
-          },
-          "llvm_toolchain": {
-            "bzlFile": "@@toolchains_llvm~//toolchain:rules.bzl",
-            "ruleClassName": "toolchain",
-            "attributes": {
-              "absolute_paths": false,
-              "archive_flags": {},
-              "compile_flags": {},
-              "conly_flags": {},
-              "coverage_compile_flags": {},
-              "coverage_link_flags": {},
-              "cxx_builtin_include_directories": {},
-              "cxx_flags": {},
-              "cxx_standard": {},
-              "dbg_compile_flags": {},
-              "exec_arch": "",
-              "exec_os": "",
-              "extra_exec_compatible_with": {},
-              "extra_target_compatible_with": {},
-              "link_flags": {},
-              "link_libs": {},
-              "llvm_versions": {
-                "": "20.1.2"
-              },
-              "opt_compile_flags": {},
-              "opt_link_flags": {},
-              "stdlib": {},
-              "target_settings": {},
-              "unfiltered_compile_flags": {},
-              "toolchain_roots": {},
-              "sysroot": {}
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "toolchains_llvm~",
-            "bazel_skylib",
-            "bazel_skylib~"
-          ],
-          [
-            "toolchains_llvm~",
-            "bazel_tools",
-            "bazel_tools"
-          ],
-          [
-            "toolchains_llvm~",
-            "toolchains_llvm",
-            "toolchains_llvm~"
-          ]
-        ]
-      }
    }
  }
 }
@@ -0,0 +1,128 @@
+load("@rules_oci//oci:defs.bzl", "oci_image", "oci_load", "oci_push")
+load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
+
+#
+# Eagle Server Docker Image
+#
+# Build: bazel build //ci:eagle_server_image
+# Load:  bazel run //ci:eagle_server_load
+# Push:  bazel run //ci:eagle_server_push
+#
+
+# Package the deploy JAR
+pkg_tar(
+    name = "eagle_server_jar_layer",
+    srcs = ["//src/main/scala/net/eagle0/eagle:eagle_server_deploy.jar"],
+    package_dir = "/app",
+)
+
+# Package the game resources needed at runtime
+pkg_tar(
+    name = "eagle_resources_layer",
+    srcs = [
+        "//src/main/resources/net/eagle0/eagle:beasts",
+        "//src/main/resources/net/eagle0/eagle:game_parameters",
+        "//src/main/resources/net/eagle0/eagle:headshots",
+        "//src/main/resources/net/eagle0/eagle:heroes",
+        "//src/main/resources/net/eagle0/eagle:province_map",
+        "//src/main/resources/net/eagle0/eagle:settings",
+    ],
+    package_dir = "/app/resources",
+)
+
+oci_image(
+    name = "eagle_server_image",
+    base = "@eclipse_temurin_17_linux_amd64",
+    entrypoint = [
+        "java",
+        "-Xmx4g",
+        "-XX:+UseG1GC",
+        "-jar",
+        "/app/eagle_server_deploy.jar",
+    ],
+    env = {
+        "JAVA_OPTS": "-Xmx4g -XX:+UseG1GC",
+    },
+    exposed_ports = ["40032/tcp"],
+    tars = [
+        ":eagle_server_jar_layer",
+        ":eagle_resources_layer",
+    ],
+    workdir = "/app",
+)
+
+# Load into Docker locally: bazel run //ci:eagle_server_load
+oci_load(
+    name = "eagle_server_load",
+    image = ":eagle_server_image",
+    repo_tags = ["eagle0/eagle-server:latest"],
+)
+
+# Push to DigitalOcean Container Registry
+oci_push(
+    name = "eagle_server_push",
+    image = ":eagle_server_image",
+    repository = "registry.digitalocean.com/eagle0/eagle-server",
+)
+
+#
+# Shardok Server Docker Image
+#
+# Build: bazel build //ci:shardok_server_image
+# Load:  bazel run //ci:shardok_server_load
+# Push:  bazel run //ci:shardok_server_push
+#
+
+# Package the Shardok binary
+pkg_tar(
+    name = "shardok_binary_layer",
+    srcs = ["//src/main/cpp/net/eagle0/shardok:shardok-server"],
+    package_dir = "/app",
+)
+
+# Package the Shardok resources (battalion types, settings)
+pkg_tar(
+    name = "shardok_resources_layer",
+    srcs = [
+        "//src/main/resources/net/eagle0/shardok:battalion_types",
+        "//src/main/resources/net/eagle0/shardok:settings",
+    ],
+    package_dir = "/app/resources",
+)
+
+# Package the converted maps
+pkg_tar(
+    name = "shardok_maps_layer",
+    srcs = ["//src/main/resources/net/eagle0/shardok/maps"],
+    package_dir = "/app/resources/maps",
+)
+
+oci_image(
+    name = "shardok_server_image",
+    base = "@ubuntu_24_04_linux_amd64",
+    entrypoint = ["/app/shardok-server"],
+    exposed_ports = [
+        "40042/tcp",
+        "40052/tcp",
+    ],
+    tars = [
+        ":shardok_binary_layer",
+        ":shardok_resources_layer",
+        ":shardok_maps_layer",
+    ],
+    workdir = "/app",
+)
+
+# Load into Docker locally: bazel run //ci:shardok_server_load
+oci_load(
+    name = "shardok_server_load",
+    image = ":shardok_server_image",
+    repo_tags = ["eagle0/shardok-server:latest"],
+)
+
+# Push to DigitalOcean Container Registry
+oci_push(
+    name = "shardok_server_push",
+    image = ":shardok_server_image",
+    repository = "registry.digitalocean.com/eagle0/shardok-server",
+)
@@ -0,0 +1,47 @@
+# Docker Compose for local testing of production images
+# Build images: bazel run //ci:eagle_server_load && bazel run //ci:shardok_server_load
+# Run: docker compose -f docker-compose.prod.yml up
+
+services:
+  eagle:
+    image: eagle0/eagle-server:latest
+    container_name: eagle-server
+    ports:
+      - "40032:40032"
+    environment:
+      # Eagle server configuration
+      EAGLE_GRPC_PORT: "40032"
+      SHARDOK_HOST: "shardok"
+      SHARDOK_PORT: "40042"
+      # Resource paths (relative to /app in container)
+      EAGLE_RESOURCES_PATH: "/app/resources"
+    volumes:
+      # Mount saves directory for persistence
+      - ./saves:/app/saves
+    depends_on:
+      - shardok
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "nc", "-z", "localhost", "40032"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 30s
+
+  shardok:
+    image: eagle0/shardok-server:latest
+    container_name: shardok-server
+    ports:
+      - "40042:40042"
+      - "40052:40052"
+    environment:
+      # Shardok server configuration
+      SHARDOK_RESOURCES_PATH: "/app/resources"
+      SHARDOK_MAPS_PATH: "/app/resources/maps"
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "nc", "-z", "localhost", "40042"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 10s
@@ -106,7 +106,7 @@ Action.execute()
 ```
 Action.execute()
    → ActionResultT
-    → ActionResultTApplier.applyActionResults()
+    → ActionResultApplier.applyActionResults()
    → GameStateC

    (Proto conversion only at boundaries)
@@ -114,11 +114,11 @@ Action.execute()

 ### Key Files to Convert

-**Tier 1 - Core Applier:**
+**Tier 1 - Core Applier:** ✅ **Complete**
 ```
-src/main/scala/net/eagle0/eagle/library/actions/applier/ActionResultProtoApplierImpl.scala
+src/main/scala/net/eagle0/eagle/library/actions/applier/ActionResultApplierImpl.scala
 ```
-Create `ActionResultApplier` that applies `ActionResultT` directly to Scala `GameState`.
+`ActionResultApplier` applies `ActionResultT` directly to Scala `GameState`. The legacy `ActionResultTApplierImpl` wraps it and converts to/from proto for callers that still need proto types.

 **Tier 2 - RoundPhaseAdvancer:** ✅ **Complete**
 ```
@@ -182,38 +182,70 @@ Change APIs to vend Scala `GameState` and `ActionResultT` instead of proto versi

 ### ActionResultProto Consumer Inventory

-| File | Usage | Target |
+| File | Usage | Status |
 |------|-------|--------|
-| `ActionResultTApplierImpl.scala` | Converts T→Proto, delegates to proto applier | Replace with `ActionResultApplier` |
-| `RoundPhaseAdvancer.scala` | ~~20 converter calls~~ | ✅ **Complete** - uses Scala GameState |
-| `RandomStateTSequencer.scala` | Converts T→Proto internally | Thread Scala GameState throughout |
-| `RandomStateProtoSequencer.scala` | Returns `Vector[ActionResultProto]` | Evaluate if still needed |
-| `VigorXPApplier.scala` | Wraps proto results | Convert to work with T |
-| `ResolveBattleAction.scala` | 2 converter calls | Convert after dependencies |
-| `PerformForcedTurnBackAction.scala` | 1 converter call | Convert after dependencies |
-| `EndFreeForAllDecisionPhaseAction.scala` | ~~fromProtoState~~ | **Complete** - now takes Scala GameState |
-| `EndBattleRequestPhaseAction.scala` | ~~fromProtoState~~ | **Complete** - now takes Scala GameState |
-| `EndDefenseDecisionPhaseAction.scala` | ~~fromProtoState~~ | **Complete** - now takes Scala GameState |
-| `EndPleaseRecruitMePhaseAction.scala` | ~~fromProtoState~~ | **Complete** - now takes Scala GameState |
-| `InMemoryHistory.scala` | Stores proto results | Vend Scala types, remove proto entirely |
-| `PersistedHistory.scala` | Stores proto results | Vend Scala types, convert internally for disk |
+| `ActionResultApplierImpl.scala` | Applies ActionResultT to Scala GameState | ✅ **Complete** |
+| `ActionResultTApplierImpl.scala` | Legacy wrapper - converts to/from proto | Keep until all callers migrated |
+| `RoundPhaseAdvancer.scala` | Uses Scala GameState | ✅ **Complete** |
+| `RandomStateSequencer.scala` | Threads Scala GameState | ✅ **Complete** |
+| `VigorXPApplier.scala` | Has both proto and Scala methods | Scala method exists, delete proto method when unused |
+| `PerformForcedTurnBackAction.scala` | Fully protoless | ✅ **Complete** |
+| `ResolveBattleAction.scala` | Heavy proto usage | Blocked by proto dependencies |
+| `InMemoryHistory.scala` | Stores proto results | Pending - vend Scala types |
+| `PersistedHistory.scala` | Stores proto results | Pending - vend Scala types, convert for disk |
 | `GameController.scala` | Uses proto for client communication | Keep proto (gRPC boundary) |

-### Estimated Effort
+### Remaining Proto Usage in Actions

-| Component | Lines | Complexity |
-|-----------|-------|------------|
-| `ActionResultApplier` | ~900 | High (port of proto applier) |
-| `RandomStateTSequencer` refactor | ~150 | Medium |
-| `RoundPhaseAdvancer` updates | ~100 | Medium |
-| History API updates | ~100 | Low |
-| Action/utility updates | ~200 | Low |
-| **Total** | **~1450** | |
+**Progress: 46 of 52 action files (88%) are fully protoless.**
+
+The following 6 actions still have proto usage:
+
+| Action | Proto Usages | Blocker | Effort |
+|--------|--------------|---------|--------|
+| `ResolveBattleAction` | 24 | Shardok interface, complex battle logic | High |
+| `PerformVassalCommandsPhaseAction` | 3 | `CommandChoiceHelpers` takes proto GameState | Medium |
+| `EndHandleRiotsPhaseAction` | 2 | `CommandChoiceHelpers` takes proto GameState | Medium |
+| `PerformVassalDefenseDecisionsAction` | 2 | `CommandChoiceHelpers` takes proto GameState | Medium |
+| `EndVassalCommandsPhaseAction` | 1 | `CommandChoiceHelpers` takes proto GameState | Medium |
+| `NewRoundAction` | 1 | `ChronicleEventGenerator` returns proto | Medium |
+
+**Deleted Dead Code:**
+- `UnaffiliatedHeroMovedAction` - Was never called; `PerformUnaffiliatedHeroesAction.heroMovedResult` constructs `ActionResultC` directly
+- `HeroBackstoryUpdateActionGenerator.fromGameState` - Dead method that converted proto to Scala; only `apply(GameState)` is used
+
+**Note**: `PerformReconResolutionAction` and `EndBattleAftermathPhaseAction` are now fully protoless after:
+1. Migrating `FactionT.reconnedProvinces` and `ChangedFactionC.updatedReconnedProvinces` to use Scala `ProvinceView`
+2. Adding Scala overload of `ProvinceViewFilter.withdrawnFromProvinceView`
+
+### Estimated Effort (Remaining)
+
+| Component | Lines | Complexity | Blocks |
+|-----------|-------|------------|--------|
+| `CommandChoiceHelpers` to Scala | ~2000 | High | 4 vassal actions |
+| `ResolveBattleAction` refactor | ~500 | High | 1 action (complex) |
+| `ChronicleEventGenerator` to Scala | ~400 | Medium | 1 action |
+| History API updates | ~100 | Low | - |
+| **Total Remaining** | **~3000** | | |
+
+### Progress Summary
+
+| Metric | Value |
+|--------|-------|
+| Action files fully protoless | 46 / 52 (88%) |
+| Proto usages in remaining actions | 33 total |
+| Biggest blocker | `ResolveBattleAction` (24 usages) |
+| Second biggest blocker | `CommandChoiceHelpers` (blocks 4 actions) |

 ### Validation
- [ ] `ActionResultApplier` created and tested
- [ ] `RandomStateTSequencer` threads Scala GameState throughout
- [ ] `RoundPhaseAdvancer` uses T-types internally
+- [x] `ActionResultApplier` created and tested
+- [x] `RandomStateSequencer` threads Scala GameState throughout
+- [x] `RoundPhaseAdvancer` uses T-types internally
+- [x] `ProvinceViewFilter` has Scala overload for server-side use (PR #4752)
+- [x] `FactionT.reconnedProvinces` and `ChangedFactionC.updatedReconnedProvinces` use Scala `ProvinceView`
+- [x] `ProvinceViewFilter.withdrawnFromProvinceView` has Scala overload
+- [ ] `ProvinceViewFilter` faction-filtered views use Scala types
+- [ ] `CommandChoiceHelpers` uses Scala types
 - [ ] History APIs vend Scala types
 - [ ] No `ActionResultProtoConverter.toProto()` calls except at persistence/gRPC boundaries
 - [ ] All tests pass
@@ -236,22 +268,27 @@ Remove remaining direct proto imports from utility classes.
 | `BattalionTypeLoader.scala` | Keep proto for file loading, convert immediately after |
 | `BeastUtils.scala` | **Complete** - now uses Scala `BeastInfo` only |

-### View Filters (Blocking Full Deproto)
+### View Filters (Partially Complete)

-The `ProvinceViewFilter` utility currently works entirely with proto types, blocking full deproto of actions that generate province views:
+The view filter utilities now have Scala overloads for server-side use:

-| File | Issue | Needed |
-|------|-------|--------|
-| `ProvinceViewFilter.scala` | Takes proto `Province`/`GameState`, returns proto `ProvinceView` | Scala `ProvinceViewT` model |
-| `GameStateViewFilter.scala` | Uses proto types throughout | Depends on `ProvinceViewT` |
-| `GameStateViewDiffer.scala` | Works with view protos | Depends on `ProvinceViewT` |
+| File | Status | Notes |
+|------|--------|-------|
+| `ProvinceViewFilter.scala` | **Partial** | `filteredProvinceView(ProvinceT, ScalaGameState)` added (PR #4752) |
+| `ArmyFilter.scala` | **Partial** | `filterArmy(ScalaArmy, Map[BattalionId, BattalionT], Option[FactionId])` added |
+| `BattalionViewFilter.scala` | **Complete** | Uses Scala `BattalionT` throughout |
+| `GameStateViewFilter.scala` | Pending | Uses proto types throughout |
+| `GameStateViewDiffer.scala` | Pending | Works with view protos |

-**Blocked Actions**:
- `EndBattleAftermathPhaseAction` - uses `ProvinceViewFilter` for `revelationChange`, requires lazy proto conversion
- `PerformReconResolutionAction` - uses `ProvinceViewFilter` for reconned provinces
- `GameStateFactionExtensions` - uses `ProvinceViewFilter` for `updatedReconnedProvinces`
+**Unblocked Actions** (PR #4752):
+- `EndBattleAftermathPhaseAction` - can now use `filteredProvinceView(province, scalaGameState)`
+- `PerformReconResolutionAction` - can now use Scala overload
+- `GameStateFactionExtensions` - can now use `updatedReconnedProvinces` with Scala types

-**Solution**: Create Scala `ProvinceViewT` (and possibly `ProvinceViewC`) that mirrors the proto `ProvinceView`. Then create a protoless `ProvinceViewFilter` that operates on Scala types. The proto version can delegate to the Scala version + convert, or we maintain both during transition.
+**Remaining Work**:
+- Faction-filtered `filteredProvinceView(Province, GameState, FactionId)` still uses proto types
+- `withdrawnFromProvinceView` still uses proto types
+- These are needed for client-facing views with visibility restrictions

 ---

@@ -0,0 +1,940 @@
+# Eagle0 Productionization Plan
+
+## Executive Summary
+
+This document outlines a plan to move Eagle0's Eagle and Shardok servers from a home Mac to cloud infrastructure while maintaining a QA environment on the Mac. The architecture uses DigitalOcean (already integrated via Spaces) with containerized deployments and GitHub Actions CI/CD.
+
+## Current Architecture
+
+```
+Unity Client
+     │
+     │ gRPC/TLS (eagle0.net:443)
+     ▼
+nginx (home Mac, via router port forward)
+     │
+     ├─► Eagle Server (Scala/JVM, port 40032)
+     │        │
+     │        │ internal gRPC (port 40042)
+     │        ▼
+     └─► Shardok Server (C++, port 40042/40052)
+
+Storage: DigitalOcean Spaces (sfo3.digitaloceanspaces.com)
+DNS: eagle0.net → home IP
+```
+
+**Key observations:**
+- Already using DigitalOcean Spaces for S3-compatible storage
+- Eagle server is a deployable JAR (`eagle_server_deploy.jar`)
+- Shardok server is a native C++ binary
+- nginx handles TLS termination and gRPC routing
+- Self-hosted GitHub Actions runner on Mac
+
+---
+
+## Target Architecture
+
+### Production Environment (DigitalOcean)
+
+```
+Unity Client
+     │
+     ├─► eagle0.net (Production)
+     │        │
+     │        ▼
+     │   DigitalOcean Load Balancer (TLS termination)
+     │        │
+     │        ▼
+     │   ┌─────────────────────────────────────┐
+     │   │     DigitalOcean Droplet(s)         │
+     │   │  ┌─────────────┬─────────────────┐  │
+     │   │  │   Eagle     │    Shardok      │  │
+     │   │  │   (Docker)  │    (Docker)     │  │
+     │   │  │   :40032    │    :40042       │  │
+     │   │  └─────────────┴─────────────────┘  │
+     │   └─────────────────────────────────────┘
+     │
+     └─► qa.eagle0.net (QA - home Mac, unchanged)
+              │
+              ▼
+         nginx → Eagle/Shardok (current setup)
+```
+
+### Environment Switching
+
+The Unity client already supports configurable server URLs via the connection screen:
+- **Production:** `eagle0.net` (default)
+- **QA:** `qa.eagle0.net`
+
+No client code changes needed - users can simply type the desired URL.
+
+---
+
+## Cloud Provider: DigitalOcean
+
+### Why DigitalOcean
+
+1. **Already integrated** - S3 Spaces storage at `sfo3.digitaloceanspaces.com` with credentials configured
+2. **Simple pricing** - Predictable monthly costs, no surprise bills
+3. **Good performance** - SFO3 datacenter is geographically close
+4. **Managed services** - Load balancers, managed databases if needed later
+5. **Not AWS/GCP** - Per your requirements
+
+### Alternative Considered: Hetzner
+
+- Cheaper for compute ($3.29/mo for 2 vCPU/4GB vs DO's $24/mo)
+- Good EU presence but less US coverage
+- No managed load balancer (need to run HAProxy/nginx yourself)
+- **Recommendation:** Start with DigitalOcean for simplicity; migrate to Hetzner later if cost becomes a concern
+
+---
+
+## Infrastructure Components
+
+### 1. Compute: DigitalOcean Droplets
+
+#### Resource Characteristics
+
+- **Eagle server:** CPU-light, possibly RAM-heavy (JVM). Should be always available.
+- **Shardok server:** Very CPU-heavy (AI algorithms). Only needed during tactical battles. Startup time <1 second.
+
+#### Recommended: On-Demand Shardok (Same Droplet)
+
+For current low player count, optimize for cost while maintaining availability:
+
+| Component | Config | Monthly Cost |
+|-----------|--------|--------------|
+| Droplet | s-2vcpu-4gb | $24/mo |
+| Eagle | Always running | - |
+| Shardok | Started on-demand by Eagle, stopped after idle | - |
+
+**How it works:**
+1. Eagle server runs 24/7 - game is always available
+2. When battle starts, Eagle launches Shardok container/process (<1s startup)
+3. After battle ends, idle timer starts (e.g., 5 minutes)
+4. On timeout, Eagle stops Shardok to free CPU
+5. If new battle starts during idle period, Shardok is already warm
+
+**Shardok lifecycle management** (implement in Eagle):
+```scala
+// Pseudocode for Eagle's Shardok management
+object ShardokManager {
+  private var process: Option[Process] = None
+  private var idleTimer: Option[Timer] = None
+
+  def ensureRunning(): Unit = {
+    cancelIdleTimer()
+    if (process.isEmpty) {
+      process = Some(startShardokProcess())
+      waitForHealthCheck()
+    }
+  }
+
+  def onBattleEnd(): Unit = {
+    idleTimer = Some(scheduleShutdown(5.minutes))
+  }
+
+  private def shutdown(): Unit = {
+    process.foreach(_.destroy())
+    process = None
+  }
+}
+```
+
+#### Future Scaling Options
+
+As player count grows and Shardok needs more CPU:
+
+**Option A: Upgrade Droplet (Simplest)**
+
+| Droplet | vCPU | RAM | Cost | Use Case |
+|---------|------|-----|------|----------|
+| s-2vcpu-4gb | 2 shared | 4 GB | $24/mo | Current (few players) |
+| s-4vcpu-8gb | 4 shared | 8 GB | $48/mo | Moderate usage |
+| c-4 | 4 dedicated | 8 GB | $84/mo | CPU-intensive battles |
+| c-8 | 8 dedicated | 16 GB | $168/mo | Multiple concurrent battles |
+
+**Option B: Separate Shardok Droplet (API-driven)**
+
+For heavy Shardok usage with cost optimization:
+
+- **Eagle droplet:** s-1vcpu-2gb ($12/mo) - always on
+- **Shardok droplet:** Created on-demand via DigitalOcean API
+  - c-4 CPU-optimized: $0.125/hour
+  - c-8 CPU-optimized: $0.25/hour
+  - Created when battle starts, destroyed after idle
+  - 30-60s droplet creation time (acceptable if battles are requested in advance)
+
+**Option C: Fly.io for Shardok (Scale-to-Zero)**
+
+For true pay-per-use with fast cold starts:
+
+- **Eagle:** DigitalOcean or Fly.io (~$10/mo)
+- **Shardok:** Fly.io with auto-scaling
+  - Performance VMs: ~$0.0000022/second when running
+  - Cold start: 2-5 seconds
+  - Scales to zero when idle
+
+Requires learning Fly.io but offers best cost efficiency for sporadic usage.
+
+**Option D: Multiple Shardok Instances (High Scale)**
+
+For many concurrent battles:
+
+- **Eagle:** Dedicated droplet with more RAM
+- **Shardok pool:** Multiple Shardok containers/droplets
+- Eagle routes battles to available Shardok instances
+- Could use Kubernetes or Docker Swarm for orchestration
+
+This is overkill for now but documented for future reference.
+
+### 2. Load Balancer
+
+**DigitalOcean Load Balancer:** $12/mo
+
+- TLS termination with Let's Encrypt
+- Health checks
+- Sticky sessions (if needed)
+- Can add more droplets later for HA
+
+**Alternative:** Run nginx on the droplet for $0 extra, but lose automatic failover.
+
+### 3. Storage
+
+**Already configured:** DigitalOcean Spaces
+- Bucket: `eagle0`
+- Region: `sfo3`
+- Used for game saves and assets
+- Cost: $5/mo base + $0.02/GB storage + $0.01/GB transfer
+
+### 4. DNS
+
+**Option A: DigitalOcean DNS (Recommended)**
+- Free with droplets
+- Easy integration
+- API for automated updates
+
+**Option B: Keep current DNS provider**
+- Update A records manually or via script
+
+**DNS Records:**
+```
+eagle0.net          A     <DO Load Balancer IP>
+qa.eagle0.net       A     <Home IP> (unchanged)
+*.eagle0.net        A     <DO Load Balancer IP> (wildcard for future)
+```
+
+### 5. Firewall
+
+**DigitalOcean Cloud Firewall:** Free
+
+```
+Inbound Rules:
+- TCP 443 (HTTPS/gRPC) from anywhere → Load Balancer
+- TCP 22 (SSH) from your IP only → Droplets
+- TCP 40032 (Eagle) from Load Balancer only
+- TCP 40042 (Shardok) from Load Balancer only
+
+Outbound Rules:
+- All traffic allowed (for external APIs, Spaces, etc.)
+```
+
+---
+
+## Container Strategy
+
+### Dockerfiles
+
+**Eagle Server** (`ci/eagle_run.Dockerfile` - already exists, needs enhancement):
+
+```dockerfile
+FROM eclipse-temurin:17-jre-alpine
+
+# Add non-root user
+RUN addgroup -S eagle && adduser -S eagle -G eagle
+
+WORKDIR /app
+
+# Copy the deploy JAR
+COPY --chown=eagle:eagle deploy/eagle_server_deploy.jar ./
+
+# Copy game resources
+COPY --chown=eagle:eagle src/main/resources/net/eagle0/eagle/ ./resources/
+
+USER eagle
+
+# Health check
+HEALTHCHECK --interval=30s --timeout=10s --retries=3 \
+  CMD wget -q --spider http://localhost:40032/health || exit 1
+
+EXPOSE 40032
+
+ENTRYPOINT ["java", "-Xmx4g", "-jar", "eagle_server_deploy.jar"]
+CMD ["--eagle-grpc-port", "40032", "--shardok-interface-remote-address", "shardok:40042", "--gpt-model-name", "gpt-4"]
+```
+
+**Shardok Server** (new: `ci/shardok_run.Dockerfile`):
+
+```dockerfile
+FROM ubuntu:22.04
+
+# Install runtime dependencies
+RUN apt-get update && apt-get install -y \
+    libstdc++6 \
+    ca-certificates \
+    && rm -rf /var/lib/apt/lists/*
+
+# Add non-root user
+RUN useradd -r -s /bin/false shardok
+
+WORKDIR /app
+
+# Copy the Shardok binary and dependencies
+COPY --chown=shardok:shardok bazel-bin/src/main/cpp/net/eagle0/shardok/shardok-server ./
+COPY --chown=shardok:shardok src/main/resources/net/eagle0/shardok/maps/ ./maps/
+
+USER shardok
+
+# Health check (need to implement gRPC health endpoint)
+HEALTHCHECK --interval=30s --timeout=10s --retries=3 \
+  CMD ./shardok-server --health-check || exit 1
+
+EXPOSE 40042 40052
+
+ENTRYPOINT ["./shardok-server"]
+```
+
+**Docker Compose** (new: `docker-compose.prod.yml`):
+
+```yaml
+version: '3.8'
+
+services:
+  eagle:
+    build:
+      context: .
+      dockerfile: ci/eagle_run.Dockerfile
+    image: eagle0/eagle-server:${VERSION:-latest}
+    ports:
+      - "40032:40032"
+    environment:
+      - SHARDOK_ADDRESS=shardok:40042
+      - GPT_MODEL_NAME=${GPT_MODEL_NAME:-gpt-4}
+      - JAVA_OPTS=-Xmx4g -XX:+UseG1GC
+    depends_on:
+      - shardok
+    restart: unless-stopped
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "100m"
+        max-file: "5"
+
+  shardok:
+    build:
+      context: .
+      dockerfile: ci/shardok_run.Dockerfile
+    image: eagle0/shardok-server:${VERSION:-latest}
+    ports:
+      - "40042:40042"
+      - "40052:40052"
+    restart: unless-stopped
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "100m"
+        max-file: "5"
+```
+
+---
+
+## Build Pipeline
+
+### Build Artifacts
+
+The build process produces:
+1. **Eagle JAR:** `bazel-bin/src/main/scala/net/eagle0/eagle/eagle_server_deploy.jar`
+2. **Shardok binary:** `bazel-bin/src/main/cpp/net/eagle0/shardok/shardok-server`
+
+### Cross-Compilation for Linux
+
+Current builds target macOS (self-hosted runner). For production Linux deployment:
+
+**Option A: Build in Docker (Recommended)**
+```bash
+# Build Eagle (JVM - platform independent)
+bazel build //src/main/scala/net/eagle0/eagle:eagle_server_deploy.jar
+
+# Build Shardok in Linux container
+docker run --rm -v $(pwd):/workspace -w /workspace \
+  ubuntu:22.04 \
+  bash -c "apt-get update && apt-get install -y build-essential && bazel build -c opt //src/main/cpp/net/eagle0/shardok:shardok-server"
+```
+
+**Option B: Use GitHub-hosted Linux runner**
+- Add `runs-on: ubuntu-latest` workflow
+- Builds directly on Linux
+- May need to cache Bazel to avoid long build times
+
+**Option C: Cross-compile on Mac**
+- Configure Bazel for Linux cross-compilation
+- More complex setup but faster iteration
+
+**Recommendation:** Option A (Docker build) for Shardok, since Eagle's JAR is platform-independent.
+
+---
+
+## CI/CD Pipeline
+
+### GitHub Actions Workflows
+
+**New workflow:** `.github/workflows/deploy_production.yml`
+
+```yaml
+name: Deploy to Production
+
+on:
+  push:
+    branches: [main]
+    paths:
+      - 'src/main/scala/**'
+      - 'src/main/cpp/**'
+      - 'src/main/protobuf/**'
+      - 'ci/*.Dockerfile'
+      - 'docker-compose.prod.yml'
+  workflow_dispatch:
+    inputs:
+      environment:
+        description: 'Deployment environment'
+        required: true
+        default: 'production'
+        type: choice
+        options:
+          - production
+          - staging
+
+env:
+  REGISTRY: registry.digitalocean.com
+  EAGLE_IMAGE: eagle0/eagle-server
+  SHARDOK_IMAGE: eagle0/shardok-server
+
+jobs:
+  build-eagle:
+    runs-on: self-hosted
+    outputs:
+      version: ${{ steps.version.outputs.version }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          lfs: false
+
+      - name: Set version
+        id: version
+        run: echo "version=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+
+      - name: Build Eagle server JAR
+        run: bazel build //src/main/scala/net/eagle0/eagle:eagle_server_deploy.jar
+
+      - name: Copy artifacts
+        run: |
+          mkdir -p deploy
+          cp bazel-bin/src/main/scala/net/eagle0/eagle/eagle_server_deploy.jar deploy/
+
+      - name: Build Docker image
+        run: |
+          docker build -f ci/eagle_run.Dockerfile -t ${{ env.REGISTRY }}/${{ env.EAGLE_IMAGE }}:${{ steps.version.outputs.version }} .
+          docker tag ${{ env.REGISTRY }}/${{ env.EAGLE_IMAGE }}:${{ steps.version.outputs.version }} ${{ env.REGISTRY }}/${{ env.EAGLE_IMAGE }}:latest
+
+      - name: Push to registry
+        run: |
+          echo "${{ secrets.DO_REGISTRY_TOKEN }}" | docker login ${{ env.REGISTRY }} -u ${{ secrets.DO_REGISTRY_TOKEN }} --password-stdin
+          docker push ${{ env.REGISTRY }}/${{ env.EAGLE_IMAGE }}:${{ steps.version.outputs.version }}
+          docker push ${{ env.REGISTRY }}/${{ env.EAGLE_IMAGE }}:latest
+
+  build-shardok:
+    runs-on: ubuntu-latest
+    needs: []
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          lfs: false
+
+      - name: Set version
+        id: version
+        run: echo "version=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+
+      - name: Set up Bazel
+        uses: bazelbuild/setup-bazelisk@v2
+
+      - name: Cache Bazel
+        uses: actions/cache@v3
+        with:
+          path: ~/.cache/bazel
+          key: bazel-linux-${{ hashFiles('MODULE.bazel', 'WORKSPACE') }}
+
+      - name: Build Shardok server
+        run: bazel build -c opt //src/main/cpp/net/eagle0/shardok:shardok-server
+
+      - name: Build Docker image
+        run: |
+          mkdir -p bazel-bin/src/main/cpp/net/eagle0/shardok/
+          cp bazel-bin/src/main/cpp/net/eagle0/shardok/shardok-server bazel-bin/src/main/cpp/net/eagle0/shardok/
+          docker build -f ci/shardok_run.Dockerfile -t ${{ env.REGISTRY }}/${{ env.SHARDOK_IMAGE }}:${{ steps.version.outputs.version }} .
+          docker tag ${{ env.REGISTRY }}/${{ env.SHARDOK_IMAGE }}:${{ steps.version.outputs.version }} ${{ env.REGISTRY }}/${{ env.SHARDOK_IMAGE }}:latest
+
+      - name: Push to registry
+        run: |
+          echo "${{ secrets.DO_REGISTRY_TOKEN }}" | docker login ${{ env.REGISTRY }} -u ${{ secrets.DO_REGISTRY_TOKEN }} --password-stdin
+          docker push ${{ env.REGISTRY }}/${{ env.SHARDOK_IMAGE }}:${{ steps.version.outputs.version }}
+          docker push ${{ env.REGISTRY }}/${{ env.SHARDOK_IMAGE }}:latest
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: [build-eagle, build-shardok]
+    environment: production
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Deploy to DigitalOcean
+        uses: appleboy/ssh-action@v1.0.0
+        with:
+          host: ${{ secrets.DO_DROPLET_IP }}
+          username: deploy
+          key: ${{ secrets.DO_SSH_KEY }}
+          script: |
+            cd /opt/eagle0
+
+            # Pull latest images
+            docker-compose -f docker-compose.prod.yml pull
+
+            # Rolling restart (zero-downtime if load balancer configured)
+            docker-compose -f docker-compose.prod.yml up -d --remove-orphans
+
+            # Wait for health checks
+            sleep 30
+            docker-compose -f docker-compose.prod.yml ps
+
+            # Cleanup old images
+            docker image prune -f
+
+      - name: Verify deployment
+        run: |
+          # Health check endpoint
+          curl -f https://eagle0.net/health || exit 1
+
+      - name: Notify on failure
+        if: failure()
+        run: |
+          # Add Slack/Discord notification here
+          echo "Deployment failed!"
+```
+
+### Deployment Steps
+
+1. **On push to main:**
+   - Build Eagle JAR (self-hosted Mac runner - for consistency)
+   - Build Shardok binary (GitHub-hosted Ubuntu runner)
+   - Build Docker images
+   - Push to DigitalOcean Container Registry
+
+2. **Deploy to droplet:**
+   - SSH to production server
+   - Pull new images
+   - `docker-compose up -d` (rolling update)
+   - Verify health checks
+
+3. **Rollback:**
+   ```bash
+   # On server
+   docker-compose -f docker-compose.prod.yml down
+   docker-compose -f docker-compose.prod.yml pull eagle0/eagle-server:<previous-version>
+   docker-compose -f docker-compose.prod.yml up -d
+   ```
+
+---
+
+## Server Setup
+
+### Initial Droplet Setup
+
+```bash
+#!/bin/bash
+# Run on fresh DigitalOcean droplet (Ubuntu 22.04)
+
+# Update system
+apt-get update && apt-get upgrade -y
+
+# Install Docker
+curl -fsSL https://get.docker.com | sh
+systemctl enable docker
+systemctl start docker
+
+# Install Docker Compose
+apt-get install -y docker-compose-plugin
+
+# Create deploy user
+useradd -m -s /bin/bash -G docker deploy
+mkdir -p /home/deploy/.ssh
+# Add your SSH public key to /home/deploy/.ssh/authorized_keys
+
+# Create app directory
+mkdir -p /opt/eagle0
+chown deploy:deploy /opt/eagle0
+
+# Configure Docker to use DigitalOcean Container Registry
+docker login registry.digitalocean.com
+
+# Create systemd service for auto-start
+cat > /etc/systemd/system/eagle0.service << 'EOF'
+[Unit]
+Description=Eagle0 Game Servers
+Requires=docker.service
+After=docker.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+WorkingDirectory=/opt/eagle0
+ExecStart=/usr/bin/docker compose -f docker-compose.prod.yml up -d
+ExecStop=/usr/bin/docker compose -f docker-compose.prod.yml down
+User=deploy
+Group=deploy
+
+[Install]
+WantedBy=multi-user.target
+EOF
+
+systemctl enable eagle0
+```
+
+### Load Balancer Configuration
+
+**DigitalOcean Load Balancer settings:**
+
+- **Forwarding Rules:**
+  - HTTPS 443 → HTTP 40032 (Eagle)
+  - gRPC is HTTP/2, handled automatically
+
+- **Health Checks:**
+  - Protocol: HTTP
+  - Port: 40032
+  - Path: `/health` (need to implement)
+
+- **SSL:**
+  - Let's Encrypt certificate for `eagle0.net`
+
+- **Settings:**
+  - Sticky sessions: Disabled (gRPC streams handle this)
+  - Proxy protocol: Disabled
+
+### nginx on Droplet (Alternative to LB)
+
+If using nginx instead of managed LB:
+
+```nginx
+# /etc/nginx/sites-available/eagle0
+upstream eagle_backend {
+    server 127.0.0.1:40032;
+    keepalive 100;
+}
+
+server {
+    listen 443 ssl http2;
+    server_name eagle0.net;
+
+    ssl_certificate /etc/letsencrypt/live/eagle0.net/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/eagle0.net/privkey.pem;
+
+    # gRPC settings
+    location /net.eagle0.eagle.api.Eagle {
+        grpc_pass grpc://eagle_backend;
+        grpc_read_timeout 1200s;
+        grpc_send_timeout 1200s;
+        grpc_socket_keepalive on;
+
+        # Rate limiting
+        limit_req zone=eagle burst=50 nodelay;
+    }
+
+    # Health check endpoint
+    location /health {
+        proxy_pass http://127.0.0.1:40032/health;
+    }
+}
+
+# Rate limit zone
+limit_req_zone $binary_remote_addr zone=eagle:10m rate=100r/s;
+```
+
+---
+
+## Environment Configuration
+
+### Secrets Management
+
+**GitHub Secrets (for CI/CD):**
+- `DO_REGISTRY_TOKEN` - DigitalOcean Container Registry token
+- `DO_DROPLET_IP` - Production server IP
+- `DO_SSH_KEY` - SSH private key for deployment
+- `OPENAI_API_KEY` - For LLM integration (if used in production)
+- `DO_SPACES_KEY` - Already exists for S3
+
+**On Server (environment variables):**
+```bash
+# /opt/eagle0/.env
+GPT_MODEL_NAME=gpt-4
+OPENAI_API_KEY=sk-...
+DO_SPACES_KEY=...
+DO_SPACES_SECRET=...
+JAVA_OPTS=-Xmx4g -XX:+UseG1GC -XX:MaxGCPauseMillis=200
+```
+
+### Configuration Files
+
+**Production config** (`/opt/eagle0/config/eagle0.conf`):
+```
+monteCarloIterations = 150000
+monteCarloThreads = 4
+grpcAddress = 0.0.0.0:40042
+```
+
+---
+
+## Monitoring & Observability
+
+### Logging
+
+**Docker logging driver:** json-file with rotation
+- Logs stored in `/var/lib/docker/containers/<id>/`
+- Max 5 files of 100MB each
+
+**Log aggregation options:**
+1. **DigitalOcean Logs** - $0 for basic, integrates with Droplets
+2. **Papertrail** - $7/mo for 1GB, good search
+3. **Self-hosted Loki** - Free, more complex
+
+### Metrics
+
+**Prometheus + Grafana** (optional, for advanced monitoring):
+```yaml
+# Add to docker-compose.prod.yml
+  prometheus:
+    image: prom/prometheus
+    volumes:
+      - ./prometheus.yml:/etc/prometheus/prometheus.yml
+    ports:
+      - "9090:9090"
+
+  grafana:
+    image: grafana/grafana
+    ports:
+      - "3000:3000"
+    environment:
+      - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PASSWORD}
+```
+
+**Key metrics to track:**
+- Connection count
+- Request latency (p50, p95, p99)
+- Error rate
+- CPU/memory usage
+- Shardok AI search depth/time
+
+### Alerting
+
+**DigitalOcean Monitoring Alerts:**
+- CPU > 80% for 5 minutes
+- Memory > 90%
+- Disk > 85%
+- Droplet unreachable
+
+**Uptime monitoring:**
+- Use UptimeRobot (free tier) or Better Uptime
+- Check `https://eagle0.net/health` every minute
+
+---
+
+## Cost Estimate
+
+### Recommended Starting Configuration
+
+| Component | Monthly Cost | Notes |
+|-----------|-------------|-------|
+| Droplet (s-2vcpu-4gb) | $24 | Eagle always-on, Shardok on-demand |
+| Spaces | ~$5 | Already paying |
+| Container Registry | $5 | For Docker images |
+| DNS | $0 | Included |
+| Bandwidth | ~$0 | 1TB free, then $0.01/GB |
+| **Total** | **~$34/mo** | |
+
+### Optional Add-ons
+
+| Component | Monthly Cost | Notes |
+|-----------|-------------|-------|
+| Load Balancer | +$12 | Only if need HA/failover |
+| Monitoring (Papertrail) | +$7 | Better log search |
+
+### Scaling Costs
+
+| Scenario | Droplet | Monthly Cost |
+|----------|---------|--------------|
+| Current (few players) | s-2vcpu-4gb | $24 |
+| Growing usage | s-4vcpu-8gb | $48 |
+| CPU-intensive battles | c-4 (dedicated) | $84 |
+| High concurrency | c-8 (dedicated) | $168 |
+| Separate Shardok (on-demand) | s-1vcpu-2gb + c-4 hourly | $12 + usage |
+
+---
+
+## Migration Plan
+
+### Phase 1: Infrastructure Setup (Day 1)
+
+1. Create DigitalOcean resources:
+   - Droplet in SFO3 region
+   - Container Registry
+   - (Optional) Load Balancer
+
+2. Configure DNS:
+   - Point `eagle0.net` to new infrastructure
+   - Keep `qa.eagle0.net` pointing to home IP
+
+3. Set up server:
+   - Run initial setup script
+   - Configure Docker and docker-compose
+   - Test SSH access
+
+### Phase 2: Build Pipeline (Day 2)
+
+1. Create Dockerfiles:
+   - Enhance `ci/eagle_run.Dockerfile`
+   - Create `ci/shardok_run.Dockerfile`
+
+2. Create `docker-compose.prod.yml`
+
+3. Set up GitHub Actions:
+   - Add deployment workflow
+   - Configure secrets
+   - Test build pipeline
+
+### Phase 3: Deployment (Day 3)
+
+1. Deploy to production:
+   - Push first images
+   - Start containers
+   - Verify health checks
+
+2. Configure TLS:
+   - Set up Let's Encrypt
+   - Update nginx/LB configuration
+
+3. Update DNS:
+   - Switch `eagle0.net` to production
+   - Verify client can connect
+
+### Phase 4: Validation (Day 4)
+
+1. Test gameplay:
+   - Connect from Unity client
+   - Play through Eagle gameplay
+   - Test Shardok combat
+
+2. Monitor:
+   - Check logs for errors
+   - Verify resource usage
+   - Test reconnection behavior
+
+3. Document:
+   - Update runbooks
+   - Document rollback procedures
+
+### Phase 5: QA Environment (Day 5)
+
+1. Configure `qa.eagle0.net`:
+   - Keep pointing to home Mac
+   - Ensure nginx routes correctly
+
+2. Test environment switching:
+   - Connect to production
+   - Switch to QA
+   - Verify different game states
+
+---
+
+## Rollback Procedure
+
+### Quick Rollback (< 5 minutes)
+
+```bash
+# SSH to production server
+ssh deploy@<droplet-ip>
+
+# Roll back to previous version
+cd /opt/eagle0
+docker-compose -f docker-compose.prod.yml down
+docker pull registry.digitalocean.com/eagle0/eagle-server:<previous-tag>
+docker pull registry.digitalocean.com/eagle0/shardok-server:<previous-tag>
+VERSION=<previous-tag> docker-compose -f docker-compose.prod.yml up -d
+```
+
+### Full Rollback to Home Mac
+
+1. Update DNS: Point `eagle0.net` back to home IP
+2. Ensure home Mac servers are running
+3. Wait for DNS propagation (5-30 minutes)
+
+---
+
+## Security Checklist
+
+- [ ] SSH key authentication only (disable password)
+- [ ] Firewall configured (only 443, 22 from trusted IPs)
+- [ ] TLS 1.3 enforced
+- [ ] Secrets in environment variables, not in code
+- [ ] Container runs as non-root user
+- [ ] Rate limiting on gRPC endpoints
+- [ ] Regular security updates (`unattended-upgrades`)
+- [ ] Remove Shardok internal interface from public nginx (per CONNECTION_ARCHITECTURE.md)
+
+---
+
+## Resolved Questions
+
+1. **Game state migration:** No migration needed. Saves are currently local only. The codebase has a `Persister` pattern (with existing AWS support) that could be adapted to save to DO Spaces in the future.
+
+2. **LLM API keys:** Yes, OpenAI API keys are needed on the Eagle server. Add `OPENAI_API_KEY` to the `.env` file on the production droplet.
+
+3. **Multiple regions:** Not needed for now. Single SFO3 region is sufficient.
+
+## Remaining Open Questions
+
+1. **Backup strategy:** Should we add automated backups for local persistence, or migrate to DO Spaces persistence first?
+
+2. **Autoscaling:** Is traffic predictable enough to use fixed instance, or need autoscaling later?
+
+---
+
+## Next Steps
+
+### Phase 1: Infrastructure
+1. **Approve this plan** - Review and discuss any changes
+2. **Create DigitalOcean resources** - Droplet (s-2vcpu-4gb), Container Registry
+3. **Set up droplet** - Docker, deploy user, firewall, nginx with TLS
+
+### Phase 2: Containerization
+4. **Implement Dockerfiles** - Eagle and Shardok containers
+5. **Implement Shardok lifecycle management** - Eagle starts/stops Shardok on-demand
+   - Add `ShardokProcessManager` to Eagle server
+   - Start Shardok when battle requested
+   - Stop after idle timeout (5 min)
+   - Health check before routing traffic
+
+### Phase 3: CI/CD
+6. **Set up GitHub Actions** - Build and push Docker images
+7. **Add deployment workflow** - SSH deploy to droplet
+
+### Phase 4: Migration
+8. **Deploy to production** - Push images, start services
+9. **Update DNS** - Point eagle0.net to droplet
+10. **Validate** - Test gameplay, monitor logs
+11. **Configure QA** - Ensure qa.eagle0.net still works (home Mac)
@@ -1,9 +1,10 @@
 {
  "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": 571423113,
-  "__RESOLVED_ARTIFACTS_HASH": 438039003,
+  "__INPUT_ARTIFACTS_HASH": 289080209,
+  "__RESOLVED_ARTIFACTS_HASH": -131178107,
  "conflict_resolution": {
    "com.google.guava:failureaccess:1.0.1": "com.google.guava:failureaccess:1.0.2",
+    "com.squareup.okio:okio:2.10.0": "com.squareup.okio:okio:3.6.0",
    "io.netty:netty-buffer:4.1.110.Final": "io.netty:netty-buffer:4.1.112.Final",
    "io.netty:netty-codec-http2:4.1.110.Final": "io.netty:netty-codec-http2:4.1.112.Final",
    "io.netty:netty-codec-http:4.1.110.Final": "io.netty:netty-codec-http:4.1.112.Final",
@@ -155,6 +156,18 @@
      },
      "version": "1.4.2"
    },
+    "com.squareup.okhttp3:okhttp": {
+      "shasums": {
+        "jar": "b1050081b14bb7a3a7e55a4d3ef01b5dcfabc453b4573a4fc019767191d5f4e0"
+      },
+      "version": "4.12.0"
+    },
+    "com.squareup.okhttp3:okhttp-sse": {
+      "shasums": {
+        "jar": "bff4fbcaef7aac2d910d4ff46dafaa4e6d15da127df6bac97216da46943a7d4c"
+      },
+      "version": "4.12.0"
+    },
    "com.squareup.okhttp:okhttp": {
      "shasums": {
        "jar": "88ac9fd1bb51f82bcc664cc1eb9c225c90dc4389d660231b4cc737bebfe7d0aa"
@@ -163,9 +176,15 @@
    },
    "com.squareup.okio:okio": {
      "shasums": {
-        "jar": "a27f091d34aa452e37227e2cfa85809f29012a8ef2501a9b5a125a978e4fcbc1"
+        "jar": "8e63292e5c53bb93c4a6b0c213e79f15990fed250c1340f1c343880e1c9c39b5"
      },
-      "version": "2.10.0"
+      "version": "3.6.0"
+    },
+    "com.squareup.okio:okio-jvm": {
+      "shasums": {
+        "jar": "67543f0736fc422ae927ed0e504b98bc5e269fda0d3500579337cb713da28412"
+      },
+      "version": "3.6.0"
    },
    "com.thesamet.scalapb:compilerplugin_3": {
      "shasums": {
@@ -444,15 +463,27 @@
    },
    "org.jetbrains.kotlin:kotlin-stdlib": {
      "shasums": {
-        "jar": "b8ab1da5cdc89cb084d41e1f28f20a42bd431538642a5741c52bbfae3fa3e656"
+        "jar": "55e989c512b80907799f854309f3bc7782c5b3d13932442d0379d5c472711504"
      },
-      "version": "1.4.20"
+      "version": "1.9.10"
    },
    "org.jetbrains.kotlin:kotlin-stdlib-common": {
      "shasums": {
-        "jar": "a7112c9b3cefee418286c9c9372f7af992bd1e6e030691d52f60cb36dbec8320"
+        "jar": "cde3341ba18a2ba262b0b7cf6c55b20c90e8d434e42c9a13e6a3f770db965a88"
      },
-      "version": "1.4.20"
+      "version": "1.9.10"
+    },
+    "org.jetbrains.kotlin:kotlin-stdlib-jdk7": {
+      "shasums": {
+        "jar": "ac6361bf9ad1ed382c2103d9712c47cdec166232b4903ed596e8876b0681c9b7"
+      },
+      "version": "1.9.10"
+    },
+    "org.jetbrains.kotlin:kotlin-stdlib-jdk8": {
+      "shasums": {
+        "jar": "a4c74d94d64ce1abe53760fe0389dd941f6fc558d0dab35e47c085a11ec80f28"
+      },
+      "version": "1.9.10"
    },
    "org.jetbrains:annotations": {
      "shasums": {
@@ -779,12 +810,23 @@
      "org.checkerframework:checker-qual",
      "org.ow2.asm:asm"
    ],
+    "com.squareup.okhttp3:okhttp": [
+      "com.squareup.okio:okio",
+      "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+    ],
+    "com.squareup.okhttp3:okhttp-sse": [
+      "com.squareup.okhttp3:okhttp",
+      "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+    ],
    "com.squareup.okhttp:okhttp": [
      "com.squareup.okio:okio"
    ],
    "com.squareup.okio:okio": [
-      "org.jetbrains.kotlin:kotlin-stdlib",
-      "org.jetbrains.kotlin:kotlin-stdlib-common"
+      "com.squareup.okio:okio-jvm"
+    ],
+    "com.squareup.okio:okio-jvm": [
+      "org.jetbrains.kotlin:kotlin-stdlib-common",
+      "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
    ],
    "com.thesamet.scalapb:compilerplugin_3": [
      "com.google.protobuf:protobuf-java",
@@ -992,6 +1034,13 @@
      "org.jetbrains.kotlin:kotlin-stdlib-common",
      "org.jetbrains:annotations"
    ],
+    "org.jetbrains.kotlin:kotlin-stdlib-jdk7": [
+      "org.jetbrains.kotlin:kotlin-stdlib"
+    ],
+    "org.jetbrains.kotlin:kotlin-stdlib-jdk8": [
+      "org.jetbrains.kotlin:kotlin-stdlib",
+      "org.jetbrains.kotlin:kotlin-stdlib-jdk7"
+    ],
    "org.json4s:json4s-ast_3": [
      "org.scala-lang:scala3-library_3"
    ],
@@ -1451,6 +1500,29 @@
    "com.google.truth:truth": [
      "com.google.common.truth"
    ],
+    "com.squareup.okhttp3:okhttp": [
+      "okhttp3",
+      "okhttp3.internal",
+      "okhttp3.internal.authenticator",
+      "okhttp3.internal.cache",
+      "okhttp3.internal.cache2",
+      "okhttp3.internal.concurrent",
+      "okhttp3.internal.connection",
+      "okhttp3.internal.http",
+      "okhttp3.internal.http1",
+      "okhttp3.internal.http2",
+      "okhttp3.internal.io",
+      "okhttp3.internal.platform",
+      "okhttp3.internal.platform.android",
+      "okhttp3.internal.proxy",
+      "okhttp3.internal.publicsuffix",
+      "okhttp3.internal.tls",
+      "okhttp3.internal.ws"
+    ],
+    "com.squareup.okhttp3:okhttp-sse": [
+      "okhttp3.internal.sse",
+      "okhttp3.sse"
+    ],
    "com.squareup.okhttp:okhttp": [
      "com.squareup.okhttp",
      "com.squareup.okhttp.internal",
@@ -1459,7 +1531,7 @@
      "com.squareup.okhttp.internal.io",
      "com.squareup.okhttp.internal.tls"
    ],
-    "com.squareup.okio:okio": [
+    "com.squareup.okio:okio-jvm": [
      "okio",
      "okio.internal"
    ],
@@ -1814,6 +1886,7 @@
      "kotlin.annotation",
      "kotlin.collections",
      "kotlin.collections.builders",
+      "kotlin.collections.jdk8",
      "kotlin.collections.unsigned",
      "kotlin.comparisons",
      "kotlin.concurrent",
@@ -1822,24 +1895,36 @@
      "kotlin.coroutines.cancellation",
      "kotlin.coroutines.intrinsics",
      "kotlin.coroutines.jvm.internal",
+      "kotlin.enums",
      "kotlin.experimental",
      "kotlin.internal",
+      "kotlin.internal.jdk7",
+      "kotlin.internal.jdk8",
      "kotlin.io",
+      "kotlin.io.encoding",
+      "kotlin.io.path",
+      "kotlin.jdk7",
      "kotlin.js",
      "kotlin.jvm",
      "kotlin.jvm.functions",
      "kotlin.jvm.internal",
      "kotlin.jvm.internal.markers",
      "kotlin.jvm.internal.unsafe",
+      "kotlin.jvm.jdk8",
+      "kotlin.jvm.optionals",
      "kotlin.math",
      "kotlin.properties",
      "kotlin.random",
+      "kotlin.random.jdk8",
      "kotlin.ranges",
      "kotlin.reflect",
      "kotlin.sequences",
+      "kotlin.streams.jdk8",
      "kotlin.system",
      "kotlin.text",
-      "kotlin.time"
+      "kotlin.text.jdk8",
+      "kotlin.time",
+      "kotlin.time.jdk8"
    ],
    "org.jetbrains:annotations": [
      "org.intellij.lang.annotations",
@@ -2270,8 +2355,11 @@
      "com.google.protobuf:protobuf-java",
      "com.google.re2j:re2j",
      "com.google.truth:truth",
+      "com.squareup.okhttp3:okhttp",
+      "com.squareup.okhttp3:okhttp-sse",
      "com.squareup.okhttp:okhttp",
      "com.squareup.okio:okio",
+      "com.squareup.okio:okio-jvm",
      "com.thesamet.scalapb:compilerplugin_3",
      "com.thesamet.scalapb:lenses_3",
      "com.thesamet.scalapb:protoc-bridge_2.13",
@@ -2324,6 +2412,8 @@
      "org.hamcrest:hamcrest-core",
      "org.jetbrains.kotlin:kotlin-stdlib",
      "org.jetbrains.kotlin:kotlin-stdlib-common",
+      "org.jetbrains.kotlin:kotlin-stdlib-jdk7",
+      "org.jetbrains.kotlin:kotlin-stdlib-jdk8",
      "org.jetbrains:annotations",
      "org.json4s:json4s-ast_3",
      "org.json4s:json4s-core_3",
@@ -0,0 +1,473 @@
+#!/bin/bash
+#
+# generate_changelog.sh
+#
+# Generates a weekly changelog from merged PRs, uses Claude to create a synopsis,
+# and sends an HTML email via Fastmail JMAP API.
+#
+# Usage: ./scripts/generate_changelog.sh [--dry-run]
+#
+# Configuration files (in ~/.config/eagle0/):
+#   fastmail_token      - API token (required)
+#   changelog_recipient - Email addresses, one per line (optional, defaults to sender)
+#
+# To set up:
+#   mkdir -p ~/.config/eagle0
+#   echo 'your-token' > ~/.config/eagle0/fastmail_token
+#   chmod 600 ~/.config/eagle0/fastmail_token
+#
+#   # Optional: configure recipients (one per line, # for comments)
+#   cat > ~/.config/eagle0/changelog_recipient << EOF
+#   alice@example.com
+#   bob@example.com
+#   EOF
+#
+# The script tracks its last run using a git tag 'changelog-last-run'.
+# On first run (no tag), it defaults to the previous Friday at 4pm.
+
+set -euo pipefail
+
+# Ensure homebrew binaries are in PATH
+export PATH="/opt/homebrew/bin:$PATH"
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+REPO_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
+TAG_NAME="changelog-last-run"
+DRY_RUN=false
+FASTMAIL_API="https://api.fastmail.com/jmap/api/"
+CONFIG_DIR="$HOME/.config/eagle0"
+TOKEN_FILE="$CONFIG_DIR/fastmail_token"
+RECIPIENT_FILE="$CONFIG_DIR/changelog_recipient"
+
+# Load API token from file or environment
+load_api_token() {
+    # Environment variable takes precedence
+    if [[ -n "${FASTMAIL_API_TOKEN:-}" ]]; then
+        return 0
+    fi
+
+    # Try loading from config file
+    if [[ -f "$TOKEN_FILE" ]]; then
+        FASTMAIL_API_TOKEN=$(cat "$TOKEN_FILE" | tr -d '[:space:]')
+        if [[ -n "$FASTMAIL_API_TOKEN" ]]; then
+            echo "Loaded API token from $TOKEN_FILE"
+            export FASTMAIL_API_TOKEN
+            return 0
+        fi
+    fi
+
+    return 1
+}
+
+# Load recipient emails from config file (one per line)
+# Returns JSON array fragment like: {"email": "a@b.com"}, {"email": "c@d.com"}
+load_recipients_json() {
+    local recipients=""
+    if [[ -f "$RECIPIENT_FILE" ]]; then
+        while IFS= read -r line || [[ -n "$line" ]]; do
+            # Skip empty lines and comments
+            line=$(echo "$line" | tr -d '[:space:]')
+            [[ -z "$line" || "$line" == \#* ]] && continue
+
+            if [[ -n "$recipients" ]]; then
+                recipients="$recipients, "
+            fi
+            recipients="$recipients{\"email\": \"$line\"}"
+        done < "$RECIPIENT_FILE"
+    fi
+    echo "$recipients"
+}
+
+# Get human-readable list of recipients
+load_recipients_display() {
+    if [[ -f "$RECIPIENT_FILE" ]]; then
+        grep -v '^#' "$RECIPIENT_FILE" | grep -v '^[[:space:]]*$' | tr '\n' ', ' | sed 's/, $//'
+    fi
+}
+
+# Parse arguments
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        --dry-run)
+            DRY_RUN=true
+            shift
+            ;;
+        *)
+            echo "Unknown option: $1"
+            echo "Usage: $0 [--dry-run]"
+            exit 1
+            ;;
+    esac
+done
+
+cd "$REPO_ROOT"
+
+# Get the cutoff date - either from tag or previous Friday 4pm
+get_cutoff_date() {
+    # Try to get the date from the tag
+    if git rev-parse "$TAG_NAME" >/dev/null 2>&1; then
+        # Get the commit date of the tagged commit
+        git log -1 --format="%aI" "$TAG_NAME"
+    else
+        # Calculate previous Friday at 4pm
+        # Get current day of week (1=Monday, 7=Sunday)
+        local dow=$(date +%u)
+        local days_since_friday
+
+        if [[ $dow -ge 5 ]]; then
+            # Friday (5), Saturday (6), or Sunday (7)
+            days_since_friday=$((dow - 5))
+        else
+            # Monday (1) through Thursday (4)
+            days_since_friday=$((dow + 2))
+        fi
+
+        # Get previous Friday at 4pm in ISO format
+        if [[ "$(uname)" == "Darwin" ]]; then
+            date -v-"${days_since_friday}d" -v16H -v0M -v0S +"%Y-%m-%dT%H:%M:%S%z"
+        else
+            date -d "$days_since_friday days ago 16:00:00" --iso-8601=seconds
+        fi
+    fi
+}
+
+# Fetch merged PRs since the cutoff date
+fetch_merged_prs() {
+    local since_date="$1"
+    local output_file="$2"
+
+    echo "Fetching PRs merged since: $since_date"
+
+    # Use gh to search for merged PRs
+    gh pr list \
+        --state merged \
+        --base main \
+        --json number,title,body,mergedAt,author \
+        --jq ".[] | select(.mergedAt >= \"$since_date\")" \
+        > "$output_file.json"
+
+    # Format the output nicely
+    echo "# Merged PRs since $since_date" > "$output_file"
+    echo "" >> "$output_file"
+
+    # Process each PR
+    jq -r '
+        "## PR #\(.number): \(.title)\n" +
+        "Author: \(.author.login)\n" +
+        "Merged: \(.mergedAt)\n\n" +
+        "### Description\n" +
+        (.body // "(No description)") +
+        "\n\n---\n"
+    ' "$output_file.json" >> "$output_file"
+
+    # Count PRs
+    local pr_count=$(jq -s 'length' "$output_file.json")
+    echo "Found $pr_count merged PRs"
+
+    rm -f "$output_file.json"
+
+    if [[ $pr_count -eq 0 ]]; then
+        echo "No PRs found since $since_date"
+        return 1
+    fi
+
+    return 0
+}
+
+# Generate synopsis using Claude
+generate_synopsis() {
+    local input_file="$1"
+    local output_file="$2"
+
+    echo "Generating synopsis with Claude..."
+
+    # Create a prompt file to avoid shell escaping issues
+    local prompt_file="/tmp/eagle0_prompt_$$.txt"
+    # Get repo URL for PR links
+    local repo_url=$(gh repo view --json url -q '.url')
+
+    cat > "$prompt_file" <<PROMPT_HEADER
+You are summarizing changes for a weekly engineering update email.
+
+Read the following list of merged PRs and create a concise synopsis grouped by theme/feature/area of the codebase.
+
+Structure:
+1. <h1> title (e.g., "Eagle0 Weekly Update")
+2. <h2>BLUF</h2> (Bottom Line Up Front) - A short prose paragraph (2-4 sentences) highlighting the 1-3 most important changes this week and what to look for when testing. This should be conversational and help readers quickly understand what matters most.
+3. Synopsis sections (<h2> headings with bullet point summaries)
+4. <hr> divider
+5. <h2>PR Details</h2> with the same groupings, but smaller (<h3> headings) and listing PR links
+   - Format each PR as: <a href="${repo_url}/pull/NUMBER">#NUMBER</a>: Title
+
+Guidelines for the SYNOPSIS sections:
+- Group related changes together under clear headings (use <h2> tags)
+- Use bullet points (<ul><li>) for individual changes
+- Highlight any significant new features, breaking changes, or important fixes
+- Keep the tone professional but accessible
+- Don't include PR numbers in the synopsis - focus on what changed and why it matters
+
+IMPORTANT: Output valid HTML that can be used directly in an email body. Do NOT wrap in \`\`\`html code blocks - just output the raw HTML.
+
+Here are the merged PRs:
+
+PROMPT_HEADER
+
+    cat "$input_file" >> "$prompt_file"
+    echo "" >> "$prompt_file"
+    echo "Generate the synopsis now:" >> "$prompt_file"
+
+    # Use Claude CLI to generate the synopsis, wrapped in proper HTML with charset
+    local raw_output="/tmp/eagle0_raw_$$.html"
+    cat "$prompt_file" | claude --print > "$raw_output"
+
+    # Wrap in HTML document with UTF-8 charset
+    cat > "$output_file" <<'HTML_HEAD'
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+</head>
+<body>
+HTML_HEAD
+    cat "$raw_output" >> "$output_file"
+    echo "</body></html>" >> "$output_file"
+
+    rm -f "$prompt_file" "$raw_output"
+    echo "Synopsis generated at: $output_file"
+}
+
+# Get Fastmail session info (account ID, identity ID, drafts mailbox ID)
+get_fastmail_session() {
+    echo "Fetching Fastmail session info..." >&2
+
+    # Get session
+    local session=$(curl -s \
+        -H "Authorization: Bearer $FASTMAIL_API_TOKEN" \
+        "https://api.fastmail.com/jmap/session")
+
+    # Extract account ID (first account)
+    FASTMAIL_ACCOUNT_ID=$(echo "$session" | jq -r '.primaryAccounts["urn:ietf:params:jmap:mail"]')
+
+    if [[ -z "$FASTMAIL_ACCOUNT_ID" || "$FASTMAIL_ACCOUNT_ID" == "null" ]]; then
+        echo "Error: Could not get Fastmail account ID. Check your API token." >&2
+        return 1
+    fi
+    echo "Account ID: $FASTMAIL_ACCOUNT_ID" >&2
+
+    # Get identity ID
+    local identity_response=$(curl -s \
+        -H "Authorization: Bearer $FASTMAIL_API_TOKEN" \
+        -H "Content-Type: application/json" \
+        -X POST \
+        -d "{
+            \"using\": [\"urn:ietf:params:jmap:core\", \"urn:ietf:params:jmap:mail\", \"urn:ietf:params:jmap:submission\"],
+            \"methodCalls\": [
+                [\"Identity/get\", {\"accountId\": \"$FASTMAIL_ACCOUNT_ID\"}, \"0\"]
+            ]
+        }" \
+        "$FASTMAIL_API")
+
+    FASTMAIL_IDENTITY_ID=$(echo "$identity_response" | jq -r '.methodResponses[0][1].list[0].id')
+    FASTMAIL_FROM_EMAIL=$(echo "$identity_response" | jq -r '.methodResponses[0][1].list[0].email')
+
+    if [[ -z "$FASTMAIL_IDENTITY_ID" || "$FASTMAIL_IDENTITY_ID" == "null" ]]; then
+        echo "Error: Could not get Fastmail identity ID." >&2
+        return 1
+    fi
+    echo "Identity ID: $FASTMAIL_IDENTITY_ID (${FASTMAIL_FROM_EMAIL})" >&2
+
+    # Get drafts mailbox ID
+    local mailbox_response=$(curl -s \
+        -H "Authorization: Bearer $FASTMAIL_API_TOKEN" \
+        -H "Content-Type: application/json" \
+        -X POST \
+        -d "{
+            \"using\": [\"urn:ietf:params:jmap:core\", \"urn:ietf:params:jmap:mail\"],
+            \"methodCalls\": [
+                [\"Mailbox/query\", {\"accountId\": \"$FASTMAIL_ACCOUNT_ID\", \"filter\": {\"role\": \"drafts\"}}, \"0\"]
+            ]
+        }" \
+        "$FASTMAIL_API")
+
+    FASTMAIL_DRAFTS_ID=$(echo "$mailbox_response" | jq -r '.methodResponses[0][1].ids[0]')
+
+    if [[ -z "$FASTMAIL_DRAFTS_ID" || "$FASTMAIL_DRAFTS_ID" == "null" ]]; then
+        echo "Error: Could not get Fastmail drafts mailbox ID." >&2
+        return 1
+    fi
+    echo "Drafts mailbox ID: $FASTMAIL_DRAFTS_ID" >&2
+
+    return 0
+}
+
+# Send email via Fastmail JMAP API
+send_email_fastmail() {
+    local synopsis_file="$1"
+    local recipients_json="$2"  # JSON array fragment: {"email": "a@b.com"}, {"email": "c@d.com"}
+
+    local subject="Eagle0 Weekly Changelog - $(date +%Y-%m-%d)"
+    local html_body=$(cat "$synopsis_file" | jq -Rs .)
+
+    echo "Sending email via Fastmail JMAP API..."
+
+    # Create the email and send it in one request
+    local response=$(curl -s \
+        -H "Authorization: Bearer $FASTMAIL_API_TOKEN" \
+        -H "Content-Type: application/json" \
+        -X POST \
+        -d "{
+            \"using\": [
+                \"urn:ietf:params:jmap:core\",
+                \"urn:ietf:params:jmap:mail\",
+                \"urn:ietf:params:jmap:submission\"
+            ],
+            \"methodCalls\": [
+                [\"Email/set\", {
+                    \"accountId\": \"$FASTMAIL_ACCOUNT_ID\",
+                    \"create\": {
+                        \"draft\": {
+                            \"from\": [{\"email\": \"$FASTMAIL_FROM_EMAIL\"}],
+                            \"to\": [$recipients_json],
+                            \"subject\": \"$subject\",
+                            \"mailboxIds\": {\"$FASTMAIL_DRAFTS_ID\": true},
+                            \"keywords\": {\"\$draft\": true},
+                            \"htmlBody\": [{\"partId\": \"body\", \"type\": \"text/html\"}],
+                            \"bodyValues\": {
+                                \"body\": {
+                                    \"charset\": \"utf-8\",
+                                    \"value\": $html_body
+                                }
+                            }
+                        }
+                    }
+                }, \"0\"],
+                [\"EmailSubmission/set\", {
+                    \"accountId\": \"$FASTMAIL_ACCOUNT_ID\",
+                    \"onSuccessDestroyEmail\": [\"#sendIt\"],
+                    \"create\": {
+                        \"sendIt\": {
+                            \"emailId\": \"#draft\",
+                            \"identityId\": \"$FASTMAIL_IDENTITY_ID\"
+                        }
+                    }
+                }, \"1\"]
+            ]
+        }" \
+        "$FASTMAIL_API")
+
+    # Check for errors
+    local error=$(echo "$response" | jq -r '.methodResponses[0][1].notCreated.draft.description // empty')
+    if [[ -n "$error" ]]; then
+        echo "Error creating email: $error" >&2
+        echo "Full response: $response" >&2
+        return 1
+    fi
+
+    local send_error=$(echo "$response" | jq -r '.methodResponses[1][1].notCreated.sendIt.description // empty')
+    if [[ -n "$send_error" ]]; then
+        echo "Error sending email: $send_error" >&2
+        echo "Full response: $response" >&2
+        return 1
+    fi
+
+    echo "Email sent successfully"
+}
+
+# Update the tag to mark this run
+update_tag() {
+    echo "Updating $TAG_NAME tag..."
+
+    # Delete existing tag if present
+    git tag -d "$TAG_NAME" 2>/dev/null || true
+    git push origin --delete "$TAG_NAME" 2>/dev/null || true
+
+    # Create new tag at HEAD
+    git tag "$TAG_NAME"
+    git push origin "$TAG_NAME"
+
+    echo "Tag updated to current HEAD"
+}
+
+# Main
+main() {
+    echo "=== Eagle0 Weekly Changelog Generator ==="
+    echo ""
+
+    # Load API token (only required for actual send)
+    if [[ "$DRY_RUN" != "true" ]]; then
+        if ! load_api_token; then
+            echo "Error: No Fastmail API token found."
+            echo ""
+            echo "To create a token:"
+            echo "1. Go to Fastmail Settings -> Password & Security -> API tokens"
+            echo "2. Create a new token with 'Email submission' scope"
+            echo "3. Save it using one of these methods:"
+            echo ""
+            echo "   Option A (recommended): Store in config file"
+            echo "     mkdir -p ~/.config/eagle0"
+            echo "     echo 'your-token' > ~/.config/eagle0/fastmail_token"
+            echo "     chmod 600 ~/.config/eagle0/fastmail_token"
+            echo ""
+            echo "   Option B: Set environment variable"
+            echo "     export FASTMAIL_API_TOKEN='your-token'"
+            exit 1
+        fi
+    fi
+
+    # Get cutoff date
+    local cutoff_date=$(get_cutoff_date)
+    echo "Cutoff date: $cutoff_date"
+
+    # Create temp files
+    local pr_file="/tmp/eagle0_prs_$(date +%s).md"
+    local synopsis_file="/tmp/eagle0_synopsis_$(date +%s).html"
+
+    # Fetch PRs
+    if ! fetch_merged_prs "$cutoff_date" "$pr_file"; then
+        echo "No changes to report. Exiting."
+        exit 0
+    fi
+
+    echo ""
+    echo "PR details saved to: $pr_file"
+
+    # Generate synopsis
+    generate_synopsis "$pr_file" "$synopsis_file"
+
+    if [[ "$DRY_RUN" == "true" ]]; then
+        echo ""
+        echo "=== DRY RUN - Synopsis content ==="
+        cat "$synopsis_file"
+        echo ""
+        echo "=== DRY RUN - Skipping email send and tag update ==="
+    else
+        # Get Fastmail session info
+        if ! get_fastmail_session; then
+            echo "Failed to get Fastmail session info. Exiting."
+            exit 1
+        fi
+
+        # Determine recipients (from config file, or default to sender)
+        local recipients_json=$(load_recipients_json)
+        if [[ -z "$recipients_json" ]]; then
+            recipients_json="{\"email\": \"$FASTMAIL_FROM_EMAIL\"}"
+            echo "No recipients configured, sending to self ($FASTMAIL_FROM_EMAIL)"
+        else
+            local recipients_display=$(load_recipients_display)
+            echo "Sending to: $recipients_display"
+        fi
+
+        # Send email
+        send_email_fastmail "$synopsis_file" "$recipients_json"
+
+        # Update tag for next run
+        update_tag
+    fi
+
+    echo ""
+    echo "Done!"
+    echo "PR details: $pr_file"
+    echo "Synopsis: $synopsis_file"
+}
+
+main
@@ -65,11 +65,6 @@ private:
            const GameStateW& guessedState,
            const CommandListSPtr& realAvailableCommands) const -> CommandChoiceResults;

-    [[nodiscard]] auto ChooseCommandIndex(
-            const GameSettingsSPtr& settings,
-            const net::eagle0::shardok::api::GameStateView& gsv,
-            const CommandListSPtr& realAvailableCommands) const -> CommandChoiceResults;
-
 public:
    explicit ShardokAIClient(
            PlayerId playerId,
@@ -86,6 +81,12 @@ public:
    [[nodiscard]] auto ChooseCommandIndex(const ShardokEngine& engine) const
            -> CommandChoiceResults;

+    // Overload that works on copies of state - allows caller to release lock during AI thinking
+    [[nodiscard]] auto ChooseCommandIndex(
+            const GameSettingsSPtr& settings,
+            const net::eagle0::shardok::api::GameStateView& gsv,
+            const CommandListSPtr& realAvailableCommands) const -> CommandChoiceResults;
+
    // MCTS configuration methods (only relevant when using MCTS algorithm)
    [[nodiscard]] auto GetMCTSConfig() const -> const mcts::MCTSConfig& { return mctsConfig; }
    void SetMCTSConfig(const mcts::MCTSConfig& config) { mctsConfig = config; }
@@ -111,17 +111,67 @@ void ShardokGameController::DoAIThread() {
    if (aiClients.empty()) { printf("No AI players, exiting AI thread.\n"); }

    while (aiThreadKeepGoing) {
-        while (incomingRegistrations > 0) {
-            std::this_thread::sleep_for(std::chrono::milliseconds(1));
+        // Phase 1: Gather data for AI decision (brief lock)
+        shared_ptr<ShardokAIClient> aiClient;
+        PlayerId playerId;
+        GameSettingsSPtr settings;
+        net::eagle0::shardok::api::GameStateView gsv;
+        CommandListSPtr availableCommands;
+        size_t expectedHistoryCount;
+
+        {
+            unique_lock lk(masterLock);
+
+            if (engine->GameIsOver()) {
+                aiThreadKeepGoing = false;
+                continue;
+            }
+
+            playerId = engine->GetCurrentPlayerId();
+            aiClient = LockedAIClientForPid(playerId);
+
+            if (!aiClient) {
+                // Not an AI player's turn - wait for signal
+                aiCondition.wait(lk);
+                aiThreadKeepGoing = aiThreadKeepGoing && !engine->GameIsOver();
+                continue;
+            }
+
+            // Get copies of everything the AI needs
+            settings = engine->GetGameSettings();
+            gsv = engine->GetGameStateView(playerId);
+            availableCommands = engine->GetAvailableCommandsForAIPlayer(playerId);
+            expectedHistoryCount = engine->GetUnfilteredHistoryCount();
+        }
+        // Lock released - polls can now get through
+
+        if (availableCommands->empty()) {
+            printf("no commands for player %d\n", playerId);
+            continue;
        }

-        unique_lock lk(masterLock);
-        if (LockedCheckOneAICommand()) {
+        // Phase 2: AI thinks (NO LOCK - this is the slow part)
+        const auto results = aiClient->ChooseCommandIndex(settings, gsv, availableCommands);
+
+        // Phase 3: Post the command (brief lock)
+        {
+            unique_lock lk(masterLock);
+
+            // Verify state hasn't changed while we were thinking
+            if (engine->GetUnfilteredHistoryCount() != expectedHistoryCount) {
+                // State changed (e.g., human posted command) - re-evaluate
+                printf("AI: State changed while thinking, re-evaluating\n");
+                continue;
+            }
+
+            if (engine->GameIsOver()) {
+                aiThreadKeepGoing = false;
+                continue;
+            }
+
+            engine->PostCommand(playerId, results.chosenIndex);
            LockedNotifyClients();
-            aiThreadKeepGoing = aiThreadKeepGoing && !engine->GameIsOver();
-        } else {
-            aiCondition.wait(lk);
-            aiThreadKeepGoing = aiThreadKeepGoing && !engine->GameIsOver();
+            aiThreadKeepGoing = !engine->GameIsOver();
        }
    }
    printf("Exiting AI thread.\n");
@@ -136,24 +186,6 @@ ShardokGameController::~ShardokGameController() {
    aiThread.join();
 }

-auto ShardokGameController::LockedCheckOneAICommand() -> bool {
-    if (engine->GameIsOver()) {
-        printf("Game is over!\n");
-        return false;
-    }
-
-    const PlayerId currentPid = engine->GetCurrentPlayerId();
-    if (const shared_ptr<ShardokAIClient> currentPlayerClient = LockedAIClientForPid(currentPid)) {
-        const int index = currentPlayerClient->ChooseCommandIndex(*engine).chosenIndex;
-
-        engine->PostCommand(currentPid, index);
-        LockedNotifyClients();
-        return true;
-    }
-
-    return false;
-}
-
 void CheckFactionId(
        const unique_ptr<ShardokEngine> &engine,
        const PlayerId shardokPlayerId,
@@ -229,6 +261,7 @@ void ShardokGameController::PostPlacementCommands(
 }

 auto ShardokGameController::GetCurrentGameStateBytes() -> byte_vector {
+    scoped_lock<mutex> guard(masterLock);
    return engine->GetCurrentGameStateBytes();
 }

@@ -292,6 +325,9 @@ auto ShardokGameController::GetUpdates(const int64_t startingActionId) -> AllUpd
                -1,
                engine->FilterNewResults(-1, startingActionId),
                nullptr);
+
+        auto gameStateBytes = engine->GetCurrentGameStateBytes();
+        updates.currentGameState.swap(gameStateBytes);
    }

    return updates;
@@ -321,4 +357,74 @@ auto ShardokGameController::ResolvedPlayerInfos()
    return engine->GetPlayerInfos();
 }

+void ShardokGameController::RegisterSubscriber(std::shared_ptr<StreamSubscriber> subscriber) {
+    scoped_lock<mutex> guard(subscriberLock);
+    subscribers.push_back(subscriber);
+}
+
+void ShardokGameController::UnregisterSubscriber(const StreamSubscriber *subscriber) {
+    scoped_lock<mutex> guard(subscriberLock);
+    subscribers.erase(
+            std::remove_if(
+                    subscribers.begin(),
+                    subscribers.end(),
+                    [subscriber](const std::weak_ptr<StreamSubscriber> &weakSub) {
+                        auto sub = weakSub.lock();
+                        return !sub || sub.get() == subscriber;
+                    }),
+            subscribers.end());
+}
+
+auto ShardokGameController::WaitForUpdatesAndPush(
+        std::shared_ptr<StreamSubscriber> subscriber,
+        int64_t startingActionId) -> bool {
+    int64_t lastPushedActionId = startingActionId;
+
+    while (subscriber->IsActive()) {
+        bool gameOver = false;
+        GameOverInfo gameOverInfo{};
+
+        {
+            unique_lock<mutex> guard(masterLock);
+
+            // Wait for updates or game over
+            updateCondition.wait(guard, [this, lastPushedActionId] {
+                return engine->GetUnfilteredHistoryCount() >
+                               static_cast<size_t>(lastPushedActionId) ||
+                       engine->GameIsOver();
+            });
+
+            if (!subscriber->IsActive()) { return false; }
+
+            gameOver = engine->GameIsOver();
+
+            if (gameOver) {
+                gameOverInfo.gameStatus = fb::ToProto(engine->GetGameStatus());
+                gameOverInfo.playerInfos = engine->GetPlayerInfos();
+                gameOverInfo.endGameUnits = engine->EndGameUnits();
+            }
+        }
+        // Lock released - GetUpdates will acquire its own lock
+
+        if (gameOver) {
+            subscriber->OnGameOver(gameOverInfo);
+            return true;
+        }
+
+        // Get updates outside the lock (GetUpdates acquires masterLock internally)
+        AllUpdates updates = GetUpdates(lastPushedActionId);
+        lastPushedActionId = updates.newUnfilteredCount;
+
+        if (!updates.mainResults.empty()) {
+            subscriber->OnUpdate(
+                    updates.mainResults,
+                    updates.filteredResults,
+                    updates.newUnfilteredCount,
+                    updates.currentGameState);
+        }
+    }
+
+    return false;  // Subscriber disconnected
+}
+
 }  // namespace shardok
@@ -10,6 +10,7 @@
 #define ShardokGameController_hpp

 #include <functional>
+#include <memory>
 #include <mutex>
 #include <utility>
 #include <vector>
@@ -29,6 +30,50 @@ using std::shared_ptr;
 using std::unique_ptr;
 using std::weak_ptr;

+// Forward declaration
+class ShardokGameController;
+
+/// Info about a game that has ended, for notifying subscribers
+struct GameOverInfo {
+    vector<net::eagle0::shardok::common::PlayerInfo> playerInfos;
+    vector<net::eagle0::shardok::storage::ResolvedUnit> endGameUnits;
+    net::eagle0::shardok::common::GameStatus gameStatus;
+};
+
+/// Updates for a single player (includes faction ID for client routing)
+struct OnePlayerUpdates {
+    int32_t eagleFactionId;
+    vector<ActionResultView> resultViews;
+    shared_ptr<AvailableCommands> availableCommands;
+
+    OnePlayerUpdates(
+            const int32_t fid,
+            const vector<ActionResultView>& arvs,
+            const shared_ptr<AvailableCommands>& acs)
+        : eagleFactionId(fid),
+          resultViews(arvs),
+          availableCommands(acs) {}
+};
+
+/// Interface for subscribers that receive streaming updates from a game
+class StreamSubscriber {
+public:
+    virtual ~StreamSubscriber() = default;
+
+    /// Called when new game updates are available
+    virtual void OnUpdate(
+            const vector<ActionResult>& mainResults,
+            const vector<OnePlayerUpdates>& filteredResults,
+            int32_t newUnfilteredCount,
+            const byte_vector& currentGameState) = 0;
+
+    /// Called when the game ends
+    virtual void OnGameOver(const GameOverInfo& info) = 0;
+
+    /// Returns true if this subscriber is still active and should receive updates
+    [[nodiscard]] virtual auto IsActive() const -> bool = 0;
+};
+
 class ShardokGameController {
 private:
    // This lock should be held any time we call into engine or modify clients.
@@ -39,10 +84,17 @@ private:
    // Fires whenever there is a new game state update.
    mutable std::condition_variable updateCondition{};

+    // Stream subscribers - protected by separate lock to avoid deadlock with masterLock
+    mutable std::mutex subscriberLock{};
+    std::vector<std::weak_ptr<StreamSubscriber>> subscribers{};
+
    string serializedRequest;

    unique_ptr<ShardokEngine> engine;

+    // Cached immutable data - safe to access without lock since it never changes after construction
+    const GameId cachedGameId;
+
    std::atomic_int incomingRegistrations = 0;

    const string mapName;
@@ -60,11 +112,9 @@ private:

    void LockedNotifyClients() const;

-    auto LockedCheckOneAICommand() -> bool;
-
    auto LockedAIClientForPid(PlayerId pid) const -> shared_ptr<ShardokAIClient>;

-    static vector<shared_ptr<ShardokAIClient>> MakeAIClients(const unique_ptr<ShardokEngine> &e);
+    static vector<shared_ptr<ShardokAIClient>> MakeAIClients(const unique_ptr<ShardokEngine>& e);

    void DoAIThread();

@@ -75,6 +125,7 @@ public:
            string serializedRequest = "")
        : serializedRequest(std::move(serializedRequest)),
          engine(std::move(e)),
+          cachedGameId(engine->GetGameId()),
          mapName(std::move(mapName)),
          logFilePath(MakeLogFilePath()),
          aiClients(MakeAIClients(engine)),
@@ -98,26 +149,13 @@ public:
            PlayerId shardokPlayerId,
            int eagleFactionId,
            int64_t token,
-            const vector<UnitPlacementInfo> &infos);
-
-    struct OnePlayerUpdates {
-        int32_t eagleFactionId;
-        vector<ActionResultView> resultViews;
-        shared_ptr<AvailableCommands> availableCommands;
-
-        OnePlayerUpdates(
-                const int32_t fid,
-                const vector<ActionResultView> &arvs,
-                const shared_ptr<AvailableCommands> &acs)
-            : eagleFactionId(fid),
-              resultViews(arvs),
-              availableCommands(acs) {}
-    };
+            const vector<UnitPlacementInfo>& infos);

    struct AllUpdates {
        vector<ActionResult> mainResults;
        vector<OnePlayerUpdates> filteredResults;
        int32_t newUnfilteredCount;
+        byte_vector currentGameState;
    };
    auto GetUpdates(int64_t startingActionId) -> AllUpdates;
    auto GetCurrentGameStateBytes() -> byte_vector;
@@ -127,13 +165,23 @@ public:
    auto ResolvedPlayerInfos() -> vector<net::eagle0::shardok::common::PlayerInfo>;
    auto EndGameUnits() -> vector<net::eagle0::shardok::storage::ResolvedUnit>;

-    [[nodiscard]] auto GetGameId() const -> GameId { return engine->GetGameId(); }
-
-    [[nodiscard]] auto GetHexMap() const -> const HexMap * {
-        return engine->GetCurrentGameState()->hex_map();
-    }
+    [[nodiscard]] auto GetGameId() const -> GameId { return cachedGameId; }

    [[nodiscard]] auto GetLogFilePath() const -> string { return logFilePath; }
+
+    /// Register a subscriber to receive streaming updates for this game.
+    /// The subscriber will receive updates until it becomes inactive or is unregistered.
+    void RegisterSubscriber(std::shared_ptr<StreamSubscriber> subscriber);
+
+    /// Unregister a subscriber. Safe to call even if the subscriber was never registered.
+    void UnregisterSubscriber(const StreamSubscriber* subscriber);
+
+    /// Wait for game updates, pushing them to the given subscriber.
+    /// Blocks until the game ends or the subscriber becomes inactive.
+    /// Returns true if the game ended normally, false if subscriber disconnected.
+    auto WaitForUpdatesAndPush(
+            std::shared_ptr<StreamSubscriber> subscriber,
+            int64_t startingActionId) -> bool;
 };
 }  // namespace shardok

@@ -529,6 +529,130 @@ auto FromInternalStatus(
    throw ShardokInternalErrorException("Bad unit status on resolved unit");
 }

+auto EagleInterfaceImpl::SubscribeToGame(
+        ServerContext *context,
+        const GameSubscriptionRequest *request,
+        grpc::ServerWriter<GameStatusResponse> *writer) -> Status {
+    shared_ptr<ShardokGameController> controller;
+    try {
+        controller = ControllerForGame(request->game_id(), request->game_setup_info());
+    } catch (NewGameException &e) { return e.GetStatus(); }
+
+    if (!controller) { return Status(StatusCode::NOT_FOUND, "Game not found"); }
+
+    // Send initial state
+    GameStatusResponse initialResponse;
+    PopulateGameStatusResponse(
+            controller,
+            request->game_setup_info().known_result_count(),
+            &initialResponse);
+    if (!writer->Write(initialResponse)) {
+        return Status::OK;  // Client disconnected
+    }
+
+    // If game was already over, we're done
+    if (initialResponse.has_game_over_response()) { return Status::OK; }
+
+    // Track the actual count after initial response to avoid duplicate sends
+    const int64_t countAfterInitialResponse =
+            initialResponse.has_game_update_response()
+                    ? initialResponse.game_update_response().total_action_result_count()
+                    : request->game_setup_info().known_result_count();
+
+    // Create a subscriber that writes to the gRPC stream
+    class GrpcStreamSubscriber : public StreamSubscriber {
+    private:
+        grpc::ServerWriter<GameStatusResponse> *writer_;
+        ServerContext *context_;
+        std::atomic<bool> active_{true};
+        std::string gameId_;
+
+    public:
+        GrpcStreamSubscriber(
+                grpc::ServerWriter<GameStatusResponse> *w,
+                ServerContext *ctx,
+                std::string gameId)
+            : writer_(w),
+              context_(ctx),
+              gameId_(std::move(gameId)) {}
+
+        void OnUpdate(
+                const vector<ActionResult> &mainResults,
+                const vector<OnePlayerUpdates> &filteredResults,
+                int32_t newUnfilteredCount,
+                const byte_vector &currentGameState) override {
+            if (!active_) return;
+
+            GameStatusResponse response;
+            response.set_game_id(gameId_);
+
+            response.mutable_game_update_response()->mutable_update_responses()->Add(
+                    begin(mainResults),
+                    end(mainResults));
+
+            // Add filtered results for each player with their faction IDs
+            for (const auto &playerUpdate : filteredResults) {
+                auto *filtered =
+                        response.mutable_game_update_response()->add_filtered_update_responses();
+                filtered->set_eagle_faction_id(playerUpdate.eagleFactionId);
+                filtered->mutable_action_result_views()->Add(
+                        begin(playerUpdate.resultViews),
+                        end(playerUpdate.resultViews));
+                if (playerUpdate.availableCommands) {
+                    *filtered->mutable_available_commands() = *playerUpdate.availableCommands;
+                }
+            }
+
+            response.mutable_game_update_response()->set_total_action_result_count(
+                    newUnfilteredCount);
+            *response.mutable_game_update_response()->mutable_current_game_state() =
+                    std::string(currentGameState.begin(), currentGameState.end());
+
+            if (!writer_->Write(response)) { active_ = false; }
+        }
+
+        void OnGameOver(const GameOverInfo &info) override {
+            if (!active_) return;
+
+            GameStatusResponse response;
+            response.set_game_id(gameId_);
+
+            PopulateGameOverResponse(
+                    gameId_,
+                    info.gameStatus,
+                    info.playerInfos,
+                    info.endGameUnits,
+                    response.mutable_game_over_response());
+
+            writer_->Write(response);
+            active_ = false;
+        }
+
+        [[nodiscard]] auto IsActive() const -> bool override {
+            return active_ && !context_->IsCancelled();
+        }
+    };
+
+    auto subscriber =
+            std::make_shared<GrpcStreamSubscriber>(writer, context, controller->GetGameId());
+
+    controller->RegisterSubscriber(subscriber);
+
+    // Wait for updates and push them until game ends or subscriber disconnects
+    // Use countAfterInitialResponse to avoid re-sending results already in initial response
+    bool gameEnded = controller->WaitForUpdatesAndPush(subscriber, countAfterInitialResponse);
+
+    controller->UnregisterSubscriber(subscriber.get());
+
+    if (gameEnded) {
+        printf("SubscribeToGame: Game ended normally\n");
+    } else {
+        printf("SubscribeToGame: Subscriber disconnected\n");
+    }
+
+    return Status::OK;
+}
+
 }  // namespace shardok

 #ifndef NDEBUG
@@ -33,6 +33,7 @@ using grpc::Status;
 using net::eagle0::common::GameSetupInfo;
 using net::eagle0::common::GameStatusRequest;
 using net::eagle0::common::GameStatusResponse;
+using net::eagle0::common::GameSubscriptionRequest;
 using net::eagle0::common::HexMapNamesRequest;
 using net::eagle0::common::HexMapNamesResponse;
 using net::eagle0::common::HexMapRequest;
@@ -78,6 +79,11 @@ public:
            ServerContext* context,
            const HexMapNamesRequest* request,
            HexMapNamesResponse* response) -> Status override;
+
+    auto SubscribeToGame(
+            ServerContext* context,
+            const GameSubscriptionRequest* request,
+            grpc::ServerWriter<GameStatusResponse>* writer) -> Status override;
 };
 }  // namespace shardok

@@ -149,6 +149,7 @@
    <Compile Include="Assets/Eagle/Notifications/ARNNotifications/TruceRejectedDetailsNotificationGenerator.cs" />
    <Compile Include="Assets/Eagle/Notifications/RiotSuppressedNotificationGenerator.cs" />
    <Compile Include="Assets/Modern UI Pack/Scripts/Modal Window/ModalWindowManagerEditor.cs" />
+    <Compile Include="Assets/common/GUIUtils/AutoScrollingText.cs" />
    <Compile Include="Assets/Bluetooth/NativeDiceInterfaceImports.cs" />
    <Compile Include="Assets/Eagle/Notifications/ProvinceConqueredNotificationGenerator.cs" />
    <Compile Include="Assets/Eagle/Table Rows/ExtraTroopsRowController.cs" />
@@ -19,35 +19,86 @@ namespace eagle {
        }
    }

+    /// <summary>
+    /// Thread-safe provider for streaming LLM text content.
+    ///
+    /// HandleNewStreamingText can be called from any thread (e.g., gRPC thread).
+    /// ProcessPendingUpdates must be called from the main thread (once per frame)
+    /// to notify listeners of changes.
+    /// </summary>
    public class ClientTextProvider {
        public static readonly ClientTextProvider Provider = new();

+        // Lock for thread-safe access to text dictionary
+        // Using a lock instead of ConcurrentDictionary because HandleNewStreamingText
+        // does a read-modify-write that must be atomic
+        private readonly object _lock = new();
        private readonly Dictionary<String, TextEntry> _streamingTexts = new();

+        // Track which text IDs have pending updates
+        private readonly HashSet<String> _pendingUpdates = new();
+
+        // Listeners are only added/removed from main thread
        private readonly HashSet<IClientTextListener> _listeners = new();

-        public void Clear() { _streamingTexts.Clear(); }
-
-        public Dictionary<String, TextEntry> All() {
-            return new Dictionary<string, TextEntry>(_streamingTexts);
+        public void Clear() {
+            lock (_lock) {
+                _streamingTexts.Clear();
+                _pendingUpdates.Clear();
+            }
        }

+        public Dictionary<String, TextEntry> All() {
+            lock (_lock) { return new Dictionary<string, TextEntry>(_streamingTexts); }
+        }
+
+        /// <summary>
+        /// Updates the text dictionary. Thread-safe - can be called from any thread.
+        /// Listeners are NOT notified here; call ProcessPendingUpdates from main thread.
+        /// </summary>
        public String
        HandleNewStreamingText(String llmId, String newText, Int32 knownByteCount, bool completed) {
-            var currentText = "";
-            if (_streamingTexts.TryGetValue(llmId, out var entry)) { currentText = entry.Text; }
+            lock (_lock) {
+                var currentText = "";
+                if (_streamingTexts.TryGetValue(llmId, out var entry)) { currentText = entry.Text; }

-            var currentTextBytes = Encoding.UTF8.GetBytes(currentText);
-            var truncatedBytes = currentTextBytes.Take(knownByteCount).ToArray();
+                var currentTextBytes = Encoding.UTF8.GetBytes(currentText);
+                var truncatedBytes = currentTextBytes.Take(knownByteCount).ToArray();

-            var updatedText = Encoding.UTF8.GetString(truncatedBytes) + newText;
-            _streamingTexts[llmId] = new TextEntry(updatedText, completed);
+                var updatedText = Encoding.UTF8.GetString(truncatedBytes) + newText;
+                _streamingTexts[llmId] = new TextEntry(updatedText, completed);

-            _listeners.Where(x => x.TextId() == llmId)
-                    .ToList()
-                    .ForEach(x => x.OnTextUpdate(updatedText, completed));
+                // Mark this text ID as having pending updates
+                _pendingUpdates.Add(llmId);

-            return updatedText;
+                return updatedText;
+            }
+        }
+
+        /// <summary>
+        /// Process pending updates and notify listeners. Must be called from main thread.
+        /// This batches multiple updates to the same text ID into a single notification per frame.
+        /// </summary>
+        public void ProcessPendingUpdates() {
+            List<(String llmId, TextEntry entry)> updates;
+
+            lock (_lock) {
+                if (_pendingUpdates.Count == 0) return;
+
+                // Collect pending updates and their current values
+                updates = _pendingUpdates.Where(id => _streamingTexts.ContainsKey(id))
+                                  .Select(id => (id, _streamingTexts[id]))
+                                  .ToList();
+
+                _pendingUpdates.Clear();
+            }
+
+            // Notify listeners outside the lock to avoid potential deadlocks
+            foreach (var (llmId, textEntry) in updates) {
+                foreach (var listener in _listeners.Where(x => x.TextId() == llmId)) {
+                    listener.OnTextUpdate(textEntry.Text, textEntry.Completed);
+                }
+            }
        }

        public TextEntry GetTextEntry(string streamId) {
@@ -57,7 +108,10 @@ namespace eagle {
                return new TextEntry(text, true);
            }

-            return _streamingTexts.GetValueOrDefault(streamId, null);
+            lock (_lock) {
+                _streamingTexts.TryGetValue(streamId, out var entry);
+                return entry;
+            }
        }

        public void AddListener(IClientTextListener listener) {
@@ -70,4 +124,4 @@ namespace eagle {

        public void RemoveListener(IClientTextListener listener) { _listeners.Remove(listener); }
    }
-}
+}
@@ -227,10 +227,11 @@ namespace eagle {
        private void MaybeActivateRow(
                EventBasedTable table,
                BattalionTypeId battalionTypeId,
-                Dictionary<BattalionTypeId, int> extraTroopsByType) {
+                int[] extraTroopsByType) {
            var parent = table.gameObject.transform.parent;

-            var allowed = TypeIsAllowed(battalionTypeId) || extraTroopsByType[battalionTypeId] > 0;
+            var allowed =
+                    TypeIsAllowed(battalionTypeId) || extraTroopsByType[(int)battalionTypeId] > 0;

            table.gameObject.GetComponent<OrganizeExtrasTable>().Set(
                    allowed,
@@ -251,7 +252,7 @@ namespace eagle {
            parent.GetComponentInChildren<RawImage>().color = color;
        }

-        private void MaybeActivateRows(Dictionary<BattalionTypeId, int> extraTroopsByType) {
+        private void MaybeActivateRows(int[] extraTroopsByType) {
            MaybeActivateRow(lightInfantryTable, BattalionTypeId.LightInfantry, extraTroopsByType);
            MaybeActivateRow(heavyInfantryTable, BattalionTypeId.HeavyInfantry, extraTroopsByType);
            MaybeActivateRow(longbowmenTable, BattalionTypeId.Longbowmen, extraTroopsByType);
@@ -640,8 +641,6 @@ namespace eagle {
        }

        public void UpdateTable() {
-            battalionsTable.RowCount = 0;
-
            maxAllButton.gameObject.SetActive(false);
            mergeButton.gameObject.SetActive(false);

@@ -655,29 +654,29 @@ namespace eagle {
                    };

            // Cache extra troop counts by type to avoid repeated LINQ queries
-            var extraTroopsByType = new Dictionary<BattalionTypeId, int> {
-                { BattalionTypeId.LightInfantry, 0 },
-                { BattalionTypeId.HeavyInfantry, 0 },
-                { BattalionTypeId.LightCavalry, 0 },
-                { BattalionTypeId.HeavyCavalry, 0 },
-                { BattalionTypeId.Longbowmen, 0 }
-            };
-            foreach (var et in extraTroops) { extraTroopsByType[et.type] += et.count; }
+            // Use array indexed by enum value for O(1) access without hashing
+            var battalionTypeCount = Enum.GetValues(typeof(BattalionTypeId)).Length;
+            var extraTroopsByType = new int[battalionTypeCount];
+            foreach (var et in extraTroops) { extraTroopsByType[(int)et.type] += et.count; }

-            foreach (var eb in existingBattalions) {
-                if (eb.dismissed) continue;
+            // Count total rows needed and set RowCount to reuse existing rows
+            var activeExisting = existingBattalions.Where(eb => !eb.dismissed).ToList();
+            var totalRows = activeExisting.Count + newBattalions.Count;
+            battalionsTable.RowCount = totalRows;

-                var newRow = battalionsTable.AddRowWithComponent<OrganizeTroopsTableRow>();
+            int rowIndex = 0;
+            foreach (var eb in activeExisting) {
+                var row = battalionsTable.ComponentAt<OrganizeTroopsTableRow>(rowIndex);
                eb.Update(existingBattalions);
-                newRow.BattalionInfo = eb;
+                row.BattalionInfo = eb;

-                newRow.PlusButtonClickedCallback = () => PlusClicked(eb);
-                newRow.MinusButtonClickedCallback = () => MinusClicked(eb);
-                newRow.MaxButtonClickedCallback = () => MaxClicked(eb);
-                newRow.DismissButtonClickedCallback = () => DismissClicked(eb);
+                row.PlusButtonClickedCallback = () => PlusClicked(eb);
+                row.MinusButtonClickedCallback = () => MinusClicked(eb);
+                row.MaxButtonClickedCallback = () => MaxClicked(eb);
+                row.DismissButtonClickedCallback = () => DismissClicked(eb);

-                bool canAugment = TypeIsAllowed(eb.TypeId) || extraTroopsByType[eb.TypeId] > 0;
-                newRow.CanAugment = canAugment;
+                bool canAugment = TypeIsAllowed(eb.TypeId) || extraTroopsByType[(int)eb.TypeId] > 0;
+                row.CanAugment = canAugment;

                if (eb.Count < eb.Capacity) {
                    // Enable MaxAll button if we could add new troops to this battalion type
@@ -689,18 +688,19 @@ namespace eagle {
                        mergeButton.gameObject.SetActive(true);
                    }
                }
+                rowIndex++;
            }

            foreach (var newB in newBattalions) {
-                var newRow = battalionsTable.AddRowWithComponent<OrganizeTroopsTableRow>();
+                var row = battalionsTable.ComponentAt<OrganizeTroopsTableRow>(rowIndex);

                newB.Update(existingBattalions);
-                newRow.BattalionInfo = newB;
+                row.BattalionInfo = newB;

-                newRow.PlusButtonClickedCallback = () => PlusClicked(newB);
-                newRow.MinusButtonClickedCallback = () => MinusClicked(newB);
-                newRow.MaxButtonClickedCallback = () => MaxClicked(newB);
-                newRow.DismissButtonClickedCallback = () => DismissClicked(newB);
+                row.PlusButtonClickedCallback = () => PlusClicked(newB);
+                row.MinusButtonClickedCallback = () => MinusClicked(newB);
+                row.MaxButtonClickedCallback = () => MaxClicked(newB);
+                row.DismissButtonClickedCallback = () => DismissClicked(newB);

                if (newB.Count < newB.Capacity) {
                    maxAllButton.gameObject.SetActive(true);
@@ -709,6 +709,7 @@ namespace eagle {
                        mergeButton.gameObject.SetActive(true);
                    }
                }
+                rowIndex++;
            }

            lightInfantryTable.RowCount = 0;
@@ -120,6 +120,19 @@ namespace eagle {
            }
        }

+        /// <summary>
+        /// Force the circuit breaker to allow an immediate reconnect attempt.
+        /// Resets the state to HalfOpen so the next connection will be a test.
+        /// </summary>
+        public void ForceReconnect() {
+            lock (this) {
+                if (_state == State.Open) {
+                    _state = State.HalfOpen;
+                    _logger.LogLine("[CIRCUIT] OPEN → HALF_OPEN (forced by user)");
+                }
+            }
+        }
+
        /// <summary>
        /// Get human-readable status for UI display.
        /// </summary>
@@ -138,7 +151,7 @@ namespace eagle {
                            var timeUntilTest = OpenTimeoutSeconds -
                                                (DateTime.UtcNow - _openedAt.Value).TotalSeconds;
                            if (timeUntilTest > 0) {
-                                return $"Server unavailable. Retrying in {(int)timeUntilTest}s";
+                                return $"Server unavailable. Retrying in {Math.Min(10, (int)timeUntilTest)}s";
                            }
                        }
                        return "Server unavailable. Testing...";
@@ -2,6 +2,7 @@ using System;
 using Net.Eagle0.Eagle.Api;
 using TMPro;
 using UnityEngine;
+using UnityEngine.UI;

 namespace eagle {
    /// <summary>
@@ -26,6 +27,9 @@ namespace eagle {
        private PersistentClientConnection _connection;
        private IGameStateProvider _gameStateProvider;

+        [Tooltip("Optional button to force immediate reconnection when server is down")]
+        public Button retryButton;
+
        // Update interval in seconds
        private const float UpdateInterval = 0.5f;
        private float _timeSinceLastUpdate = 0f;
@@ -39,9 +43,10 @@ namespace eagle {
                return;
            }

-            // Find the PersistentClientConnection - this assumes it's accessible
-            // In production, this would need proper dependency injection
-            // For now, the connection will be set externally or found via another method
+            if (retryButton != null) {
+                retryButton.onClick.AddListener(OnRetryClicked);
+                retryButton.gameObject.SetActive(false);
+            }
        }

        /// <summary>
@@ -73,11 +78,12 @@ namespace eagle {
            // Check circuit breaker state first - it takes precedence
            var circuitState = _connection.CircuitBreaker.CurrentState;
            if (circuitState == ConnectionCircuitBreaker.State.Open) {
+                SetRetryButtonVisible(true);
                var nextTest = _connection.CircuitBreaker.NextTestAttempt;
                if (nextTest.HasValue) {
                    var timeUntilTest = nextTest.Value - DateTime.UtcNow;
                    if (timeUntilTest.TotalSeconds > 0) {
-                        int seconds = (int)Math.Ceiling(timeUntilTest.TotalSeconds);
+                        int seconds = Math.Min(10, (int)Math.Ceiling(timeUntilTest.TotalSeconds));
                        _textComponent.text =
                                $"<color=red>●</color> Server down. Retry in {seconds}s";
                        return;
@@ -86,6 +92,7 @@ namespace eagle {
                _textComponent.text = "<color=red>●</color> Server unavailable";
                return;
            } else if (circuitState == ConnectionCircuitBreaker.State.HalfOpen) {
+                SetRetryButtonVisible(false);
                _textComponent.text = "<color=yellow>●</color> Testing connection...";
                return;
            }
@@ -94,6 +101,11 @@ namespace eagle {
            var state = _connection.CurrentState;
            var nextAttempt = _connection.NextReconnectAttempt;

+            // Show retry button if we're counting down to a reconnect attempt
+            bool isCountingDown = state == ConnectionState.Reconnecting && nextAttempt.HasValue &&
+                                  (nextAttempt.Value - DateTime.UtcNow).TotalSeconds > 0;
+            SetRetryButtonVisible(isCountingDown);
+
            string statusText = state switch {
                ConnectionState.Connected => GetConnectedStatusText(),
                ConnectionState.Connecting => "<color=yellow>●</color> Connecting...",
@@ -142,8 +154,16 @@ namespace eagle {
                return "<color=yellow>●</color> Reconnecting...";
            }

-            int secondsRemaining = (int)Math.Ceiling(timeUntilRetry.TotalSeconds);
+            int secondsRemaining = Math.Min(10, (int)Math.Ceiling(timeUntilRetry.TotalSeconds));
            return $"<color=orange>●</color> Retry in {secondsRemaining}s";
        }
+
+        private void SetRetryButtonVisible(bool visible) {
+            if (retryButton != null) { retryButton.gameObject.SetActive(visible); }
+        }
+
+        private void OnRetryClicked() {
+            if (_connection != null) { _connection.ForceReconnect(); }
+        }
    }
 }
@@ -188,6 +188,9 @@ namespace eagle {
        }

        void Update() {
+            // Process batched streaming text updates (thread-safe, once per frame)
+            ClientTextProvider.Provider.ProcessPendingUpdates();
+
            ArrangeLayout();
            if (_newModel != null) { SwapModel(); }

@@ -226,12 +229,11 @@ namespace eagle {

        void OnApplicationPause(bool pause) {
            if (ModelUpdater == null) { return; }
-            if (pause) {
-                ModelUpdater.StopListeningForUpdates();
-            } else {
-                // Fire-and-forget - subscription is awaited internally and failures are logged
-                _ = ModelUpdater.StartListeningForUpdates();
-            }
+            // Don't unsubscribe on pause - this caused a race condition where the subscriber
+            // could be lost if pause happened before the async StartListeningForUpdates completed.
+            // With MainQueue rate-limiting, keeping the subscription during pause is safe.
+            // Reconnects will continue to work, and updates will queue up and be processed on
+            // resume.
        }

 #if UNITY_EDITOR
@@ -43,7 +43,7 @@ namespace eagle {
        TokenId? CommandToken { get; }
        TokenId LastPostedToken { get; }

-        Dictionary<String, ShardokGameModel> ShardokGameModels { get; }
+        ConcurrentDictionary<String, ShardokGameModel> ShardokGameModels { get; }

        private bool ShardokGameModelIsRunning(ShardokGameModel sgm) =>
                sgm.GameStatus.State == GameStatus.Types.State.GameRunning
@@ -105,10 +105,9 @@ namespace eagle {
                _currentModel.ShardokGameModels
                        .Select(sgm => {
                            var needsResync = _shardokNeedsResync.GetValueOrDefault(sgm.Key, false);
-                            // Use thread-safe count from gRPC thread updates, fall back to model
-                            var count = _shardokResultCounts.GetValueOrDefault(
-                                    sgm.Key,
-                                    sgm.Value.History.Count());
+                            // Use thread-safe count from gRPC thread updates. Fall back to 0 if
+                            // not yet tracked (avoids accessing non-thread-safe History.Count).
+                            var count = _shardokResultCounts.GetValueOrDefault(sgm.Key, 0);
                            return new IClientConnectionSubscriber.ShardokViewStatus {
                                shardokGameId = sgm.Key,
                                filteredResultCount = needsResync ? 0 : count,
@@ -199,7 +198,8 @@ namespace eagle {
                return new List<AvailableCommand>();
            }

-            public Dictionary<String, ShardokGameModel> ShardokGameModels { get; set; }
+            // Thread-safe: accessed from heartbeat timer thread via ShardokViewStatuses
+            public ConcurrentDictionary<String, ShardokGameModel> ShardokGameModels { get; set; }

            public FactionView MaybeDestroyedFaction(FactionId factionId) {
                if (ActiveFactions.TryGetValue(factionId, out var factionView)) {
@@ -241,7 +241,8 @@ namespace eagle {
                    new Dictionary<ProvinceId, OneProvinceAvailableCommands>();

            _currentModel.GsView = new GameStateView();
-            _currentModel.ShardokGameModels = new Dictionary<ShardokGameId, ShardokGameModel>();
+            _currentModel.ShardokGameModels =
+                    new ConcurrentDictionary<ShardokGameId, ShardokGameModel>();

            _currentModel.BattalionTypes = new Dictionary<BattalionTypeId, BattalionType>();

@@ -312,8 +313,10 @@ namespace eagle {
                        ServerStatus = updateItem.ActionResultResponse.ServerGameStatus;
                    }

-                    _lastUnfilteredResultCount =
-                            updateItem.ActionResultResponse.UnfilteredResultCountAfter;
+                    // Note: _lastUnfilteredResultCount is updated on the gRPC thread in
+                    // UpdateResultCounts() before enqueueing. We don't update it here to avoid
+                    // race conditions where a backlogged MainQueue update overwrites a newer count.
+
                    if (updateItem.ActionResultResponse.ActionResultViews.Any() ||
                        updateItem.ActionResultResponse.AvailableCommands == null ||
                        updateItem.ActionResultResponse.AvailableCommands.Token !=
@@ -339,7 +342,9 @@ namespace eagle {
                            // Battle may have ended before we could create the model - remove
                            // any stale reference and skip this update
                            if (shardokGameModel == null) {
-                                _currentModel.ShardokGameModels.Remove(oneResponse.ShardokGameId);
+                                _currentModel.ShardokGameModels.TryRemove(
+                                        oneResponse.ShardokGameId,
+                                        out _);
                                _shardokResultCounts.TryRemove(oneResponse.ShardokGameId, out _);
                                continue;
                            }
@@ -368,7 +373,9 @@ namespace eagle {
                                    shardokGameModel;
                        } else {
                            // Game ended - remove from active models so UI knows battle is over
-                            _currentModel.ShardokGameModels.Remove(oneResponse.ShardokGameId);
+                            _currentModel.ShardokGameModels.TryRemove(
+                                    oneResponse.ShardokGameId,
+                                    out _);
                            _shardokResultCounts.TryRemove(oneResponse.ShardokGameId, out _);
                        }
                    }
@@ -478,6 +485,31 @@ namespace eagle {
            _currentModel.BattalionTypes =
                    startingState.BattalionTypes.ToDictionary(bt => bt.TypeId, bt => bt);
            _currentModel.ChronicleEntries = startingState.ChronicleEntries.ToList();
+
+            // For any outstanding battles not in ShardokGameModels, create models and mark for
+            // resync. This ensures fresh clients get Shardok state for ongoing battles.
+            bool needsResubscribe = false;
+            foreach (var battle in _currentModel.ShardokBattles) {
+                if (!_currentModel.ShardokGameModels.ContainsKey(battle.ShardokGameId)) {
+                    var model = MakeGameModel(battle.ShardokGameId);
+                    if (model != null) {
+                        _currentModel.ShardokGameModels[battle.ShardokGameId] = model;
+                        MarkShardokForResync(battle.ShardokGameId);
+                        _connectionLogger.LogLine(
+                                $"[STATE_RESYNC] Created ShardokGameModel for outstanding battle {battle.ShardokGameId}");
+                        needsResubscribe = true;
+                    }
+                }
+            }
+
+            // If we created new ShardokGameModels, re-subscribe to request their full state.
+            // The original subscribe didn't include these battles since we didn't know about them
+            // yet.
+            if (needsResubscribe) {
+                _connectionLogger.LogLine(
+                        "[STATE_RESYNC] Re-subscribing to request full Shardok state for new battles");
+                _ = StartListeningForUpdates();
+            }
        }

        private void HandleUpdates(List<ActionResultView> results) {
@@ -780,7 +812,7 @@ namespace eagle {
                // the Eagle update removing the battle arrives before the Shardok Victory update.
                if (_currentModel.ShardokGameModels.TryGetValue(rb, out var sgm)) {
                    sgm.MarkBattleEnded("Battle has ended.");
-                    _currentModel.ShardokGameModels.Remove(rb);
+                    _currentModel.ShardokGameModels.TryRemove(rb, out _);
                }
                _shardokResultCounts.TryRemove(rb, out _);

@@ -132,7 +132,10 @@ namespace eagle {

        public void ProvinceHovered(ProvinceId? pid) {
            // Highlight moving armies table
+            // Check row count to avoid index out of range if data changed after table was built
+            var rowCount = movingArmiesTable.RowCount;
            MovingArmies.Each((army, i) => {
+                if (i >= rowCount) return;
                var row = movingArmiesTable.ComponentAt<MovingArmyTableRow>(i);
                if (army.DestinationProvinceId == pid || army.OriginProvinceId == pid) {
                    row.ShadeOn();
@@ -1,30 +1,106 @@
+using System;
 using System.Collections.Generic;
 using Net.Eagle0.Eagle.Common;
 using Net.Eagle0.Eagle.Views;

 namespace eagle.Notifications.ARNNotifications {
+    using ProvinceId = Int32;
+    using HeroId = Int32;
+
    public static class ProfessionGainedDetailsNotificationGenerator {
        public static readonly ARNNotificationGenerator Generator = GenerateNotifications;

-        private static readonly Dictionary<Profession, string> ProfessionNames =
-                new Dictionary<Profession, string> {
-                    { Profession.Mage, "Mage" },
-                    { Profession.Necromancer, "Necromancer" },
-                    { Profession.Engineer, "Engineer" },
-                    { Profession.Paladin, "Paladin" },
-                    { Profession.Ranger, "Ranger" },
-                    { Profession.Champion, "Champion" }
-                };
+        private static readonly Random Random = new();

-        private static readonly Dictionary<Profession, string> ProfessionTitles =
-                new Dictionary<Profession, string> {
-                    { Profession.Mage, "Arcane Awakening" },
-                    { Profession.Necromancer, "Dark Pact Sealed" },
-                    { Profession.Engineer, "Genius Unleashed" },
-                    { Profession.Paladin, "Divine Calling" },
-                    { Profession.Ranger, "One with the Wild" },
-                    { Profession.Champion, "Born for Battle" }
-                };
+        private static readonly Dictionary<Profession, string> ProfessionNames = new() {
+            { Profession.Mage, "Mage" },
+            { Profession.Necromancer, "Necromancer" },
+            { Profession.Engineer, "Engineer" },
+            { Profession.Paladin, "Paladin" },
+            { Profession.Ranger, "Ranger" },
+            { Profession.Champion, "Champion" }
+        };
+
+        private static readonly Dictionary<Profession, List<string>> ProfessionTitles = new() {
+            { Profession.Mage,
+              new List<string> {
+                  "Arcane Awakening",
+                  "The Gift Revealed",
+                  "Touched by Magic",
+                  "Mystical Ascension",
+                  "Power Unbound",
+                  "The Arcane Path",
+                  "Secrets of the Weave",
+                  "Spellborn",
+                  "Wielder of the Unseen",
+                  "Flames of Knowledge"
+              } },
+            { Profession.Necromancer,
+              new List<string> {
+                  "Dark Pact Sealed",
+                  "Beyond the Veil",
+                  "Death's Apprentice",
+                  "Whispers from Beyond",
+                  "The Forbidden Art",
+                  "Shadow Covenant",
+                  "Secrets of the Grave",
+                  "Communion with Darkness",
+                  "The Deathless Path",
+                  "Embrace of Shadow"
+              } },
+            { Profession.Engineer,
+              new List<string> {
+                  "Genius Unleashed",
+                  "Master of Mechanisms",
+                  "The Inventor's Spark",
+                  "Gears of Progress",
+                  "Mind of Innovation",
+                  "Builder of Wonders",
+                  "The Tinkerer's Art",
+                  "Siege Mastery",
+                  "Architect of War",
+                  "Mechanical Brilliance"
+              } },
+            { Profession.Paladin,
+              new List<string> {
+                  "Divine Calling",
+                  "Holy Vows Taken",
+                  "Blessed Champion",
+                  "The Righteous Path",
+                  "Shield of the Faith",
+                  "Anointed Warrior",
+                  "Oath of Light",
+                  "Heaven's Chosen",
+                  "Sacred Duty",
+                  "Defender of the Realm"
+              } },
+            { Profession.Ranger,
+              new List<string> {
+                  "One with the Wild",
+                  "Voice of the Forest",
+                  "The Untamed Path",
+                  "Nature's Guardian",
+                  "Shadow of the Woods",
+                  "Hunter's Instinct",
+                  "Wild Heart",
+                  "The Wanderer's Way",
+                  "Beast Companion",
+                  "Eyes of the Hawk"
+              } },
+            { Profession.Champion,
+              new List<string> {
+                  "Born for Battle",
+                  "Blade Mastery",
+                  "The Warrior's Edge",
+                  "Forged in Combat",
+                  "Unmatched Prowess",
+                  "Heart of Steel",
+                  "The Victor's Path",
+                  "Legend in the Making",
+                  "Master of Arms",
+                  "Glory Awaits"
+              } }
+        };

        private static string GetProfessionName(Profession profession) {
            return ProfessionNames.TryGetValue(profession, out var name) ? name : "Unknown";
@@ -40,8 +116,19 @@ namespace eagle.Notifications.ARNNotifications {
        }

        private static string GetProfessionTitle(Profession profession) {
-            return ProfessionTitles.TryGetValue(profession, out var title) ? title
-                                                                           : "Profession Gained";
+            if (ProfessionTitles.TryGetValue(profession, out var titles) && titles.Count > 0) {
+                return titles[Random.Next(titles.Count)];
+            }
+            return "Profession Gained";
+        }
+
+        private static ProvinceId? FindProvinceForHero(HeroId heroId, IGameModel model) {
+            foreach (var province in model.Provinces.Values) {
+                if (province.FullInfo?.RulingFactionHeroIds.Contains(heroId) == true) {
+                    return province.Id;
+                }
+            }
+            return null;
        }

        private static IEnumerable<Notification> GenerateNotifications(
@@ -49,14 +136,38 @@ namespace eagle.Notifications.ARNNotifications {
                IGameModel currentModel) {
            var details = notification.Details.ProfessionGainedDetails;
            var hero = currentModel.Heroes[details.HeroId];
-            var factionName = currentModel.FactionName(details.FactionId);
            var professionName = GetProfessionName(details.NewProfession);
            var article = GetArticle(professionName);

-            var affectedProvinces = currentModel.ProvincesForFaction(details.FactionId);
+            string textTemplate;
+            List<ProvinceId> affectedProvinces;

-            string textTemplate =
-                    $"{{Hero}} of {factionName} became {article} {professionName}.\n\n";
+            if (details.FactionId == currentModel.PlayerId) {
+                // Player's own hero - vary text based on faction leader status
+                string heroDescription;
+                if (hero.IsFactionLeader) {
+                    heroDescription =
+                            $"Your sworn {DisplayNames.SiblingDescription(hero.PronounGender)}";
+                } else {
+                    heroDescription = "Your vassal";
+                }
+                var heroProvinceId = FindProvinceForHero(details.HeroId, currentModel);
+                if (heroProvinceId.HasValue) {
+                    var provinceName = currentModel.Provinces[heroProvinceId.Value].Name;
+                    textTemplate =
+                            $"{heroDescription} {{Hero}} in {provinceName} became {article} {professionName}.\n\n";
+                    affectedProvinces = new List<ProvinceId> { heroProvinceId.Value };
+                } else {
+                    textTemplate =
+                            $"{heroDescription} {{Hero}} became {article} {professionName}.\n\n";
+                    affectedProvinces = currentModel.ProvincesForFaction(details.FactionId);
+                }
+            } else {
+                // Another faction's hero
+                var factionName = currentModel.FactionName(details.FactionId);
+                textTemplate = $"{{Hero}} of {factionName} became {article} {professionName}.\n\n";
+                affectedProvinces = currentModel.ProvincesForFaction(details.FactionId);
+            }

            var heroPlaceholders = new Dictionary<string, (string nameTextId, string fallback)> {
                { "Hero", (hero.NameTextId, "A hero") }
@@ -31,7 +31,13 @@ namespace eagle.Notifications.ARNNotifications {
            };

            if (playerId.HasValue && playerId.Value == paidToFactionId) {
-                // no notification
+                yield return DynamicTextNotification.StreamingDynamicNotification(
+                        title: "Ransom Accepted",
+                        textTemplate: $"We have accepted the ransom from {currentModel.FactionName(paidByFactionId)} for {{RansomedHero}}.\n\n",
+                        heroPlaceholders: heroPlaceholders,
+                        llmId: notification.LlmId,
+                        provinceIds: new List<ProvinceId>(),
+                        displayedHeroes: new List<HeroView> { ransomedHero, offeringFactionHead });
            } else if (playerId.HasValue && playerId.Value == paidByFactionId) {
                yield return DynamicTextNotification.StreamingDynamicNotification(
                        title: "Ransom Accepted",
@@ -9,6 +9,7 @@ namespace eagle.Notifications {
        private List<GeneratedTextListener> textListeners = new();
        private string textTemplate;
        private Dictionary<string, string> placeholderValues = new();
+        private Dictionary<string, string> fallbackValues = new();

        public DynamicTextNotification(
                string title,
@@ -72,6 +73,9 @@ namespace eagle.Notifications {
                string nameTextId = kvp.Value.nameTextId;
                string fallback = kvp.Value.fallback;

+                // Store fallback so UpdateText can use it for missing placeholders
+                fallbackValues[placeholder] = fallback;
+
                if (!string.IsNullOrEmpty(nameTextId)) {
                    var listener = new GeneratedTextListener(
                            nameTextId,
@@ -95,6 +99,15 @@ namespace eagle.Notifications {

        private void UpdateText() {
            string result = textTemplate;
+
+            // First apply fallbacks for any placeholder without a loaded value
+            foreach (var kvp in fallbackValues) {
+                if (!placeholderValues.ContainsKey(kvp.Key)) {
+                    result = result.Replace($"{{{kvp.Key}}}", kvp.Value);
+                }
+            }
+
+            // Then apply actual loaded values
            foreach (var kvp in placeholderValues) {
                result = result.Replace($"{{{kvp.Key}}}", kvp.Value);
            }
@@ -69,6 +69,17 @@ namespace eagle {
        private ConnectionCircuitBreaker _circuitBreaker = new ConnectionCircuitBreaker();
        public ConnectionCircuitBreaker CircuitBreaker => _circuitBreaker;

+        /// <summary>
+        /// Force an immediate reconnection attempt, bypassing the circuit breaker timeout.
+        /// </summary>
+        public void ForceReconnect() {
+            _circuitBreaker.ForceReconnect();
+            _retryTimer?.Dispose();
+            NextReconnectAttempt = null;
+            LogConnectionEvent("force_reconnect", "User requested immediate reconnect");
+            Task.Run(() => Connect());
+        }
+
        private DateTime? GetDeadlineFromNow() {
            return DateTime.UtcNow.AddSeconds(TimeoutSeconds);
        }
@@ -701,9 +712,23 @@ namespace eagle {
                    });
                    break;

+                case GameUpdate.GameUpdateDetailsOneofCase.StreamingTextResponse:
+                    // Handle streaming text directly on gRPC thread - dictionary is thread-safe.
+                    // Listeners are notified later via ProcessPendingUpdates() on main thread.
+                    var str = gameUpdate.StreamingTextResponse;
+                    if (str != null) {
+                        ClientTextProvider.Provider.HandleNewStreamingText(
+                                str.LlmIdentifier,
+                                str.NewText,
+                                str.StartingByteCount,
+                                str.Completed);
+                    }
+                    // No MainQueue enqueue needed - ProcessPendingUpdates handles listener
+                    // notification
+                    break;
+
                case GameUpdate.GameUpdateDetailsOneofCase.ActionResultResponse:
                case GameUpdate.GameUpdateDetailsOneofCase.ShardokActionResultResponse:
-                case GameUpdate.GameUpdateDetailsOneofCase.StreamingTextResponse:
                    // Update result counts IMMEDIATELY on the gRPC thread, before enqueueing.
                    // This ensures reconnects use accurate counts even when MainQueue is blocked
                    // (e.g., when Unity is backgrounded).
@@ -1046,51 +1071,69 @@ namespace eagle {
            }
        }

+        // Grace period after connect before sync mismatch triggers reconnect.
+        // Allows time to receive and process historical results after fresh subscribe.
+        private const double SyncMismatchGracePeriodSeconds = 60.0;
+
        private void HandleHeartbeatResponse(HeartbeatResponse response) {
            _remoteEagleClientLogger.LogLine(
                    $"[HEARTBEAT] Got response, server_timestamp={response.ServerTimestamp}");

            // Check for sync mismatches reported by server
-            if (response.GameSyncResults.Count > 0) {
-                foreach (var syncResult in response.GameSyncResults) {
-                    if (!syncResult.EagleInSync) {
+            bool hasMismatch = false;
+            foreach (var syncResult in response.GameSyncResults) {
+                if (!syncResult.EagleInSync) {
+                    _remoteEagleClientLogger.LogLine(
+                            $"[SYNC_MISMATCH] Game {syncResult.GameId}: Eagle out of sync, " +
+                            $"server has {syncResult.ServerUnfilteredResultCount} results");
+                    LogConnectionEvent(
+                            "sync_mismatch_eagle",
+                            $"game={syncResult.GameId}, server_count={syncResult.ServerUnfilteredResultCount}");
+                    hasMismatch = true;
+                }
+
+                foreach (var shardokResult in syncResult.ShardokSyncResults) {
+                    if (!shardokResult.InSync) {
                        _remoteEagleClientLogger.LogLine(
-                                $"[SYNC_MISMATCH] Game {syncResult.GameId}: Eagle out of sync, " +
-                                $"server has {syncResult.ServerUnfilteredResultCount} results");
+                                $"[SYNC_MISMATCH] Game {syncResult.GameId}, Shardok {shardokResult.ShardokGameId}: " +
+                                $"out of sync, server has {shardokResult.ServerFilteredResultCount} results");
                        LogConnectionEvent(
-                                "sync_mismatch_eagle",
-                                $"game={syncResult.GameId}, server_count={syncResult.ServerUnfilteredResultCount}");
-                    }
-
-                    foreach (var shardokResult in syncResult.ShardokSyncResults) {
-                        if (!shardokResult.InSync) {
-                            _remoteEagleClientLogger.LogLine(
-                                    $"[SYNC_MISMATCH] Game {syncResult.GameId}, Shardok {shardokResult.ShardokGameId}: " +
-                                    $"out of sync, server has {shardokResult.ServerFilteredResultCount} results");
-                            LogConnectionEvent(
-                                    "sync_mismatch_shardok",
-                                    $"game={syncResult.GameId}, shardok={shardokResult.ShardokGameId}, " +
-                                            $"server_count={shardokResult.ServerFilteredResultCount}");
-                        }
+                                "sync_mismatch_shardok",
+                                $"game={syncResult.GameId}, shardok={shardokResult.ShardokGameId}, " +
+                                        $"server_count={shardokResult.ServerFilteredResultCount}");
+                        hasMismatch = true;
                    }
                }
-
-                // Trigger resync by reconnecting - this will re-subscribe with current counts
-                // and the server will send missing updates
-                _remoteEagleClientLogger.LogLine(
-                        "[SYNC_MISMATCH] Detected sync mismatch, triggering reconnect to resync");
-                LogConnectionEvent("sync_mismatch_reconnect", "Triggering reconnect to resync");
-
-                // Schedule reconnect to resync
-                lock (this) {
-                    _streamingCall?.Dispose();
-                    _streamingCall = null;
-                    _threadCancellationTokenSource?.Cancel();
-                }
-                MarkAllShardokGamesForResync();
-                CancelAllPendingSubscriptionAcks();
-                ScheduleReconnect("SyncMismatch");
            }
+
+            if (!hasMismatch) return;
+
+            // Grace period after connect - allow time to receive historical results
+            if (_lastSuccessfulConnect.HasValue) {
+                var timeSinceConnect =
+                        (DateTime.UtcNow - _lastSuccessfulConnect.Value).TotalSeconds;
+                if (timeSinceConnect < SyncMismatchGracePeriodSeconds) {
+                    _remoteEagleClientLogger.LogLine(
+                            $"[SYNC_MISMATCH] Ignoring mismatch during grace period ({timeSinceConnect:F1}s < {SyncMismatchGracePeriodSeconds}s)");
+                    return;
+                }
+            }
+
+            // Trigger resync by reconnecting - this will re-subscribe with current counts
+            // and the server will send missing updates
+            _remoteEagleClientLogger.LogLine(
+                    "[SYNC_MISMATCH] Detected sync mismatch, triggering reconnect to resync");
+            LogConnectionEvent("sync_mismatch_reconnect", "Triggering reconnect to resync");
+
+            // Schedule reconnect to resync
+            lock (this) {
+                _streamingCall?.Dispose();
+                _streamingCall = null;
+                _threadCancellationTokenSource?.Cancel();
+            }
+            MarkAllShardokGamesForResync();
+            CancelAllPendingSubscriptionAcks();
+            ScheduleReconnect("SyncMismatch");
        }
    }
 }
@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using common;
 using eagle;
 using Net.Eagle0.Shardok.Api;
 using TMPro;
@@ -27,6 +28,9 @@ public class SettingsPanelController : MonoBehaviour {
    public Toggle tooltipHugsCursorToggle;
    public HoveringTooltip hoveringTooltip;

+    public Slider autoScrollSpeedSlider;
+    public TMP_Text autoScrollSpeedLabel;
+
    public HexGrid hexGrid;

    private bool _active = false;
@@ -54,6 +58,11 @@ public class SettingsPanelController : MonoBehaviour {

        tooltipHugsCursorToggle.isOn = PlayerPrefs.GetInt(TooltipHugsCursorKey, 0) == 1;
        hoveringTooltip.HugsCursor = tooltipHugsCursorToggle.isOn;
+
+        if (autoScrollSpeedSlider != null) {
+            autoScrollSpeedSlider.value = AutoScrollingText.GlobalScrollSpeedMultiplier;
+            UpdateAutoScrollSpeedLabel(autoScrollSpeedSlider.value);
+        }
    }

    // Update is called once per frame
@@ -107,6 +116,21 @@ public class SettingsPanelController : MonoBehaviour {
        hoveringTooltip.HugsCursor = val;
    }

+    public void OnAutoScrollSpeedSliderChange(float val) {
+        AutoScrollingText.GlobalScrollSpeedMultiplier = val;
+        UpdateAutoScrollSpeedLabel(val);
+    }
+
+    private void UpdateAutoScrollSpeedLabel(float val) {
+        if (autoScrollSpeedLabel != null) {
+            if (val < 0.01f) {
+                autoScrollSpeedLabel.text = "Paused";
+            } else {
+                autoScrollSpeedLabel.text = $"{val:F2}x";
+            }
+        }
+    }
+
    public void OnResourcesFolderClick() {
        Process.Start(Path.Combine(Application.persistentDataPath, "eagle0", "Resources"));
    }
@@ -385,98 +385,99 @@ namespace Shardok {
                    Model.MyUncommittedUnits.Where(uv => uv.Location.Row == -1).ToList();
        }

+        /// <summary>
+        /// Called when the ShardokGameModel is updated. This is invoked from UpdateAction,
+        /// which is called from ShardokGameModel.HandleUpdates, which runs on MainQueue.
+        /// No need to re-enqueue - we're already on the main thread.
+        /// </summary>
        void ModelUpdated() {
-            MainQueue.Q.Enqueue(() => {
-                if (Model == null) { return; }
-                SetHeroLabels();
-                SetModifiers();
-                UpdateReserves();
+            if (Model == null) { return; }
+            SetHeroLabels();
+            SetModifiers();
+            UpdateReserves();

-                HandleEnemyStartingPositionOverlays();
+            HandleEnemyStartingPositionOverlays();

-                endTurnButton.interactable = false;
+            endTurnButton.interactable = false;

-                if (Model.GameStatus != null &&
-                    (Model.GameStatus.State == GameStatus.Types.State.Victory)) {
-                    turnStatusLabel.text = "Game Over!";
+            if (Model.GameStatus != null &&
+                (Model.GameStatus.State == GameStatus.Types.State.Victory)) {
+                turnStatusLabel.text = "Game Over!";

-                    gameOverText.text = Model.GameStatus.Description;
-                    gameOverCanvas.gameObject.SetActive(true);
+                gameOverText.text = Model.GameStatus.Description;
+                gameOverCanvas.gameObject.SetActive(true);

-                    endTurnButton.GetComponentInChildren<TMP_Text>().text = "Back to Eagle";
-                    endTurnButton.interactable = true;
-                } else if (Model.GameStatus != null && Model.MyTurn) {
-                    gameOverCanvas.gameObject.SetActive(false);
-                    turnStatusLabel.text = "Your Turn";
+                endTurnButton.GetComponentInChildren<TMP_Text>().text = "Back to Eagle";
+                endTurnButton.interactable = true;
+            } else if (Model.GameStatus != null && Model.MyTurn) {
+                gameOverCanvas.gameObject.SetActive(false);
+                turnStatusLabel.text = "Your Turn";

-                    if (Model.InSetUp) {
-                        endTurnButton.GetComponentInChildren<TMP_Text>().text = "Commit";
+                if (Model.InSetUp) {
+                    endTurnButton.GetComponentInChildren<TMP_Text>().text = "Commit";

-                        var unplacedUnitsWithLocations =
-                                Model.MyUncommittedUnits
-                                        .Where(u => u.Location.Row >= 0 && u.Location.Column >= 0)
-                                        .ToList();
+                    var unplacedUnitsWithLocations =
+                            Model.MyUncommittedUnits
+                                    .Where(u => u.Location.Row >= 0 && u.Location.Column >= 0)
+                                    .ToList();

-                        if (!Model.MyTurn) {
-                            endTurnButton.interactable = false;
-                        } else if (unplacedUnitsWithLocations.Count() < 1) {
-                            endTurnButton.GetComponentInChildren<TMP_Text>().text =
-                                    "No units placed";
-                            endTurnButton.interactable = false;
-                        } else if (unplacedUnitsWithLocations.Count() > 10) {
-                            endTurnButton.GetComponentInChildren<TMP_Text>().text =
-                                    "Too many units";
-                            endTurnButton.interactable = false;
-                        } else {
-                            endTurnButton.interactable = true;
-                        }
-
-                        SetDisplayedCommandGroup(0);
+                    if (!Model.MyTurn) {
+                        endTurnButton.interactable = false;
+                    } else if (unplacedUnitsWithLocations.Count() < 1) {
+                        endTurnButton.GetComponentInChildren<TMP_Text>().text = "No units placed";
+                        endTurnButton.interactable = false;
+                    } else if (unplacedUnitsWithLocations.Count() > 10) {
+                        endTurnButton.GetComponentInChildren<TMP_Text>().text = "Too many units";
+                        endTurnButton.interactable = false;
                    } else {
-                        endTurnButton.GetComponentInChildren<TMP_Text>().text = "End Turn";
-                    }
-
-                    if (Model.HasAvailableCommandWhere(
-                                command => commandTypeUIManager.CommandGroupForType(command.Type) ==
-                                           CommandTypeUIManager.EndTurnCommandGroup)) {
                        endTurnButton.interactable = true;
                    }

-                    SelectAppropriateDefaultCommand();
+                    SetDisplayedCommandGroup(0);
                } else {
-                    turnStatusLabel.text = $"{Model.CurrentPlayerName}'s Turn";
+                    endTurnButton.GetComponentInChildren<TMP_Text>().text = "End Turn";
                }

-                locationNameText.text = Model.LocationName;
-
-                if (Model.History.Count > 0) {
-                    string monthString = new DateTime(777, Model.Month, 1)
-                                                 .ToString("MMMM", CultureInfo.InvariantCulture);
-                    roundInfoText.text = $"{monthString} {Model.CurrentRound}";
-                    Weather weather = Model.Weather;
-                    if (weather != null) {
-                        roundInfoText.text += ", " + ProtoExtensions.WeatherToString(weather);
-                    }
+                if (Model.HasAvailableCommandWhere(
+                            command => commandTypeUIManager.CommandGroupForType(command.Type) ==
+                                       CommandTypeUIManager.EndTurnCommandGroup)) {
+                    endTurnButton.interactable = true;
                }

-                if (Model.History.Count == 0) {
-                    turnHistoryButtonText.text = NoHistoryText;
-                } else if (Model.History.Count > _lastRetrievedHistoryCount) {
-                    for (int i = _lastRetrievedHistoryCount; i < Model.History.Count; i++) {
-                        var historyEntry = Model.History[i];
-                        turnHistoryPanel.AddLine(GetActionResultDescription(historyEntry));
+                SelectAppropriateDefaultCommand();
+            } else {
+                turnStatusLabel.text = $"{Model.CurrentPlayerName}'s Turn";
+            }

-                        ActionType type = historyEntry.Type;
-                        var thisSound = soundManager.SoundForType(type);
-                        if (thisSound != null) { audioClipSource.PlayOneShot(thisSound, 1.0f); }
-                    }
-                    _lastRetrievedHistoryCount = Model.History.Count;
-                    turnHistoryButtonText.text = GetActionResultDescription(Model.History.Last());
-                    SetModifiers();
+            locationNameText.text = Model.LocationName;
+
+            if (Model.History.Count > 0) {
+                string monthString = new DateTime(777, Model.Month, 1)
+                                             .ToString("MMMM", CultureInfo.InvariantCulture);
+                roundInfoText.text = $"{monthString} {Model.CurrentRound}";
+                Weather weather = Model.Weather;
+                if (weather != null) {
+                    roundInfoText.text += ", " + ProtoExtensions.WeatherToString(weather);
                }
+            }

-                SetupArmiesTable();
-            });
+            if (Model.History.Count == 0) {
+                turnHistoryButtonText.text = NoHistoryText;
+            } else if (Model.History.Count > _lastRetrievedHistoryCount) {
+                for (int i = _lastRetrievedHistoryCount; i < Model.History.Count; i++) {
+                    var historyEntry = Model.History[i];
+                    turnHistoryPanel.AddLine(GetActionResultDescription(historyEntry));
+
+                    ActionType type = historyEntry.Type;
+                    var thisSound = soundManager.SoundForType(type);
+                    if (thisSound != null) { audioClipSource.PlayOneShot(thisSound, 1.0f); }
+                }
+                _lastRetrievedHistoryCount = Model.History.Count;
+                turnHistoryButtonText.text = GetActionResultDescription(Model.History.Last());
+                SetModifiers();
+            }
+
+            SetupArmiesTable();
        }

        private void SetupArmiesTable() {
@@ -707,34 +708,33 @@ namespace Shardok {
        }

        void SetModifiers() {
-            MainQueue.Q.Enqueue(() => {
-                hexGrid.ClearCellModifierImages();
+            // Called from ModelUpdated which runs on MainQueue - no need to re-enqueue
+            hexGrid.ClearCellModifierImages();

-                for (byte row = 0; row < Model.Map.RowCount; row++) {
-                    for (byte column = 0; column < Model.Map.ColumnCount; column++) {
-                        Coords coords = new Coords();
-                        coords.Row = row;
-                        coords.Column = column;
+            for (byte row = 0; row < Model.Map.RowCount; row++) {
+                for (byte column = 0; column < Model.Map.ColumnCount; column++) {
+                    Coords coords = new Coords();
+                    coords.Row = row;
+                    coords.Column = column;

-                        var terrain = Model.Map.TerrainAt(coords);
-                        int cellIndex = MapCoordsToGridIndex(coords);
-                        int numberForCell = _randomNumberForCellIndex[cellIndex];
-                        hexGrid.SetCellTerrainImage(
-                                cellIndex,
-                                _imageForTerrainTracker
-                                        .GetImageForTerrain(terrain, numberForCell, Model.Month));
-                        if (terrain.Modifier?.Fire != null) {
-                            hexGrid.SetCellModifierEffect(cellIndex, fireEffectPrefab);
-                        } else {
-                            hexGrid.SetCellModifierEffect(cellIndex, null);
-                        }
+                    var terrain = Model.Map.TerrainAt(coords);
+                    int cellIndex = MapCoordsToGridIndex(coords);
+                    int numberForCell = _randomNumberForCellIndex[cellIndex];
+                    hexGrid.SetCellTerrainImage(
+                            cellIndex,
+                            _imageForTerrainTracker
+                                    .GetImageForTerrain(terrain, numberForCell, Model.Month));
+                    if (terrain.Modifier?.Fire != null) {
+                        hexGrid.SetCellModifierEffect(cellIndex, fireEffectPrefab);
+                    } else {
+                        hexGrid.SetCellModifierEffect(cellIndex, null);
+                    }

-                        if (terrain.Modifier?.Bridge != null) {
-                            hexGrid.SetCellModifierImage(cellIndex, bridgeImage);
-                        }
+                    if (terrain.Modifier?.Bridge != null) {
+                        hexGrid.SetCellModifierImage(cellIndex, bridgeImage);
                    }
                }
-            });
+            }
        }

        void HandleButton() {
@@ -82,7 +82,7 @@ public class ShardokGameModel {
    public int Month { get; private set; }
    private List<PlayerTotals> PlayerTotals { get; set; }

-    public List<CommandDescriptor> AvailableCommands { get; private set; }
+    public List<CommandDescriptor> AvailableCommands { get; private set; } = new();
    public Action UpdateAction { get; set; }
    public List<PlayerWithHostility> players;
    public String GetPlayerName(PlayerId playerId) {
@@ -217,6 +217,8 @@ public class ShardokGameModel {
                                        ? newCommands.CurrentCommand.ToList()
                                        : newCommands.PreviewCommand.ToList();
        }
+        // Trigger UI refresh after commands are updated so unit action indicators reflect new state
+        UpdateAction?.Invoke();
    }

    public bool HasTargetedCommand(Coords start, Coords target, List<CommandType> possibleTypes) {
@@ -0,0 +1,278 @@
+using TMPro;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace common {
+    /// <summary>
+    /// Automatically scrolls text content that overflows its container.
+    /// Shows a fade gradient at the bottom when content overflows, then begins
+    /// auto-scrolling after a delay. Useful for tooltips where the user can't
+    /// manually scroll.
+    ///
+    /// Also supports dynamic height sizing: the ScrollRect will grow to fit its
+    /// content up to available screen space, only enabling scrolling when needed.
+    /// </summary>
+    public class AutoScrollingText : MonoBehaviour {
+        /// <summary>
+        /// Global scroll speed multiplier controlled by Settings.
+        /// Default is 1.0 (use instance scrollSpeed as-is).
+        /// Range: 0.0 (paused) to 2.0 (double speed).
+        /// </summary>
+        public static float GlobalScrollSpeedMultiplier {
+            get => PlayerPrefs.GetFloat(ScrollSpeedKey, 1.0f);
+            set => PlayerPrefs.SetFloat(ScrollSpeedKey, Mathf.Clamp(value, 0f, 2f));
+        }
+
+        private const string ScrollSpeedKey = "autoScrollSpeedMultiplier";
+
+        [Header("Scroll Rect")]
+        [Tooltip("The ScrollRect containing the text content")]
+        public ScrollRect scrollRect;
+
+        [Tooltip("Optional gradient image to show when content overflows (fades at bottom)")]
+        public GameObject fadeGradient;
+
+        [Header("Auto-Scroll Timing")]
+        [Tooltip("Seconds to wait before starting to scroll")]
+        public float scrollDelaySeconds = 1.5f;
+
+        [Tooltip("Scroll speed in normalized units per second (0-1 range)")]
+        public float scrollSpeed = 0.15f;
+
+        [Tooltip("Seconds to pause at the bottom before resetting")]
+        public float pauseAtBottomSeconds = 1.0f;
+
+        [Header("Dynamic Sizing")]
+        [Tooltip("If true, resize the ScrollRect to fit content up to available space")]
+        public bool dynamicHeight = true;
+
+        [Tooltip("Margin from top of screen in pixels")]
+        public float topMargin = 20f;
+
+        [Tooltip("LayoutElement to adjust for dynamic height (usually on ScrollRect)")]
+        public LayoutElement layoutElement;
+
+        [Tooltip("Other content in the panel (e.g., hero details). Height will be preserved.")]
+        public RectTransform otherContent;
+
+        [Tooltip("Optional: Panel to hide until layout is complete (prevents jumpy resize)")]
+        public CanvasGroup panelCanvasGroup;
+
+        private float _visibleTime = 0f;
+        private bool _isScrolling = false;
+        private bool _isPausedAtBottom = false;
+        private float _pauseTimer = 0f;
+        private RectTransform _scrollRectTransform;
+        private Canvas _rootCanvas;
+
+        private void OnEnable() {
+            // Hide panel until layout is complete to prevent jumpy resize
+            if (panelCanvasGroup != null) { panelCanvasGroup.alpha = 0f; }
+
+            if (scrollRect != null) {
+                _scrollRectTransform = scrollRect.GetComponent<RectTransform>();
+                _rootCanvas = scrollRect.GetComponentInParent<Canvas>()?.rootCanvas;
+
+                // Immediately reset scroll position to prevent visual jump on first frame
+                // Use normalizedPosition to reset both horizontal and vertical
+                scrollRect.normalizedPosition = new Vector2(0f, 1f);
+
+                // Also reset the content's anchored position to prevent any offset
+                if (scrollRect.content != null) {
+                    var contentRect = scrollRect.content;
+                    contentRect.anchoredPosition = new Vector2(0f, contentRect.anchoredPosition.y);
+                }
+            }
+
+            // Delay layout update to next frame so content has time to rebuild
+            StartCoroutine(DelayedInitialize());
+        }
+
+        private System.Collections.IEnumerator DelayedInitialize() {
+            yield return null;  // Wait one frame for layout to rebuild
+            yield return null;  // Extra frame for ContentSizeFitter
+
+            UpdateDynamicHeight();
+            ResetScroll();
+
+            // Show panel now that layout is complete
+            if (panelCanvasGroup != null) { panelCanvasGroup.alpha = 1f; }
+        }
+
+        private void OnDisable() { ResetScroll(); }
+
+        /// <summary>
+        /// Resets scroll position to top and restarts the delay timer.
+        /// Call this when the text content changes.
+        /// </summary>
+        public void ResetScroll() {
+            _visibleTime = 0f;
+            _isScrolling = false;
+            _isPausedAtBottom = false;
+            _pauseTimer = 0f;
+
+            if (scrollRect != null) {
+                scrollRect.verticalNormalizedPosition = 1f;  // Top
+            }
+
+            UpdateFadeGradient();
+        }
+
+        [Header("Debug")]
+        [Tooltip("Enable debug logging to console")]
+        public bool debugLogging = false;
+
+        /// <summary>
+        /// Updates the ScrollRect height to fit content, up to available screen space.
+        /// </summary>
+        private void UpdateDynamicHeight() {
+            if (!dynamicHeight || layoutElement == null || scrollRect == null) return;
+            if (_scrollRectTransform == null || _rootCanvas == null) return;
+
+            // Get content height - prefer TMP_Text.preferredHeight over rect.height
+            // because rect.height may not reflect actual text size without ContentSizeFitter
+            float contentHeight = 0f;
+            float rectHeight = scrollRect.content != null ? scrollRect.content.rect.height : 0f;
+            var tmpText = scrollRect.content?.GetComponentInChildren<TMP_Text>();
+            if (tmpText != null) {
+                // Use TMP's calculated preferred height - this is the actual text size
+                contentHeight = tmpText.preferredHeight;
+
+                // Sync Content RectTransform height with actual text size.
+                // Must both grow AND shrink to prevent blank space when scrolling to bottom.
+                if (Mathf.Abs(scrollRect.content.rect.height - contentHeight) > 1f) {
+                    scrollRect.content.SetSizeWithCurrentAnchors(
+                            RectTransform.Axis.Vertical,
+                            contentHeight);
+                }
+            } else {
+                contentHeight = rectHeight;
+            }
+
+            // Get the bottom of the ScrollRect in screen space
+            Vector3[] corners = new Vector3[4];
+            _scrollRectTransform.GetWorldCorners(corners);
+
+            Camera cam = _rootCanvas.renderMode == RenderMode.ScreenSpaceOverlay
+                                 ? null
+                                 : _rootCanvas.worldCamera;
+            Vector2 scrollRectBottomScreen =
+                    RectTransformUtility.WorldToScreenPoint(cam, corners[0]);
+
+            // Calculate how much space we have from ScrollRect bottom to top of screen
+            float spaceToTop = Screen.height - scrollRectBottomScreen.y - topMargin;
+
+            // Account for canvas scaling
+            float scaleFactor = _rootCanvas.scaleFactor;
+            if (scaleFactor > 0) { spaceToTop /= scaleFactor; }
+
+            // Get height of other content (hero details) if specified
+            float otherContentHeight = 0f;
+            if (otherContent != null) { otherContentHeight = otherContent.rect.height; }
+
+            // Max height for ScrollRect = space to top minus other content
+            float maxScrollRectHeight = spaceToTop - otherContentHeight;
+
+            // Clamp to reasonable bounds
+            maxScrollRectHeight = Mathf.Max(maxScrollRectHeight, 50f);
+
+            // Set preferred height to content or max, whichever is smaller
+            float targetHeight = Mathf.Min(contentHeight, maxScrollRectHeight);
+            layoutElement.preferredHeight = targetHeight;
+
+            if (debugLogging) {
+                Debug.Log(
+                        $"[AutoScrollingText] contentHeight={contentHeight:F0} (rectHeight={rectHeight:F0}), " +
+                        $"spaceToTop={spaceToTop:F0}, otherContent={otherContentHeight:F0}, " +
+                        $"maxHeight={maxScrollRectHeight:F0}, targetHeight={targetHeight:F0}");
+            }
+
+            // Force layout rebuild
+            RectTransform parentRect = _scrollRectTransform.parent as RectTransform;
+            if (parentRect != null) { LayoutRebuilder.ForceRebuildLayoutImmediate(parentRect); }
+        }
+
+        private void Update() {
+            if (scrollRect == null) return;
+
+            bool hasOverflow = HasContentOverflow();
+            UpdateFadeGradient();
+
+            if (!hasOverflow) {
+                _isScrolling = false;
+                return;
+            }
+
+            // Hold Shift to pause scrolling (lets user read at their own pace)
+            bool isPausedByUser =
+                    Input.GetKey(KeyCode.LeftShift) || Input.GetKey(KeyCode.RightShift);
+            if (isPausedByUser) return;
+
+            // Handle pause at bottom
+            if (_isPausedAtBottom) {
+                _pauseTimer += Time.deltaTime;
+                if (_pauseTimer >= pauseAtBottomSeconds) {
+                    // Reset to top and start over
+                    scrollRect.verticalNormalizedPosition = 1f;
+                    _isPausedAtBottom = false;
+                    _pauseTimer = 0f;
+                    _visibleTime = 0f;
+                    _isScrolling = false;
+                }
+                return;
+            }
+
+            // Track time visible
+            _visibleTime += Time.deltaTime;
+
+            // Start scrolling after delay
+            if (!_isScrolling && _visibleTime >= scrollDelaySeconds) { _isScrolling = true; }
+
+            // Perform scrolling (apply global speed multiplier from settings)
+            if (_isScrolling) {
+                float effectiveSpeed = scrollSpeed * GlobalScrollSpeedMultiplier;
+                float newPosition =
+                        scrollRect.verticalNormalizedPosition - (effectiveSpeed * Time.deltaTime);
+
+                if (newPosition <= 0f) {
+                    // Reached bottom
+                    scrollRect.verticalNormalizedPosition = 0f;
+                    _isScrolling = false;
+                    _isPausedAtBottom = true;
+                    _pauseTimer = 0f;
+                } else {
+                    scrollRect.verticalNormalizedPosition = newPosition;
+                }
+            }
+        }
+
+        private bool HasContentOverflow() {
+            if (scrollRect == null || scrollRect.content == null) return false;
+
+            // Use TMP_Text.preferredHeight for accurate content measurement
+            float contentHeight;
+            var tmpText = scrollRect.content.GetComponentInChildren<TMP_Text>();
+            if (tmpText != null) {
+                contentHeight = tmpText.preferredHeight;
+            } else {
+                contentHeight = scrollRect.content.rect.height;
+            }
+
+            float viewportHeight = scrollRect.viewport != null
+                                           ? scrollRect.viewport.rect.height
+                                           : scrollRect.GetComponent<RectTransform>().rect.height;
+
+            return contentHeight > viewportHeight + 1f;  // Small buffer for floating point
+        }
+
+        private void UpdateFadeGradient() {
+            if (fadeGradient == null) return;
+
+            bool hasOverflow = HasContentOverflow();
+            bool notAtBottom = scrollRect != null && scrollRect.verticalNormalizedPosition > 0.01f;
+
+            // Show gradient when there's overflow and we're not at the bottom
+            fadeGradient.SetActive(hasOverflow && notAtBottom);
+        }
+    }
+}
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: ac5d868c54ceb4893b1c95894cd4ec6f
@@ -54,18 +54,43 @@ namespace common.GUIUtils {
                    Type = type,
                    Time = DateTime.UtcNow
                });
-                MainQueue.Q.Enqueue(() => {
-                    errorTextField.text = AllMessageText;
-                    panel.gameObject.SetActive(true);
-                });
+
+                // Try to display immediately if possible, otherwise queue for later
+                try {
+                    if (MainQueue.Q != null) {
+                        MainQueue.Q.Enqueue(ShowErrorPanel);
+                    } else {
+                        _pendingShow = true;
+                    }
+                } catch {
+                    // MainQueue not ready yet - will show in Update
+                    _pendingShow = true;
+                }
+            }
+        }
+
+        private bool _pendingShow = false;
+
+        private void ShowErrorPanel() {
+            if (errorTextField != null && panel != null) {
+                errorTextField.text = AllMessageText;
+                panel.gameObject.SetActive(true);
+            }
+        }
+
+        // Register for log messages as early as possible
+        void Awake() { Application.logMessageReceivedThreaded += HandleLog; }
+
+        void Update() {
+            // Handle errors that occurred before MainQueue was ready
+            if (_pendingShow) {
+                _pendingShow = false;
+                ShowErrorPanel();
            }
        }

        // Use this for initialization
-        void Start() {
-            panel.gameObject.SetActive(false);
-            Application.logMessageReceivedThreaded += HandleLog;
-        }
+        void Start() { panel.gameObject.SetActive(false); }

        public void DismissClicked() {
            lock (_messages) {
@@ -21,14 +21,24 @@ option java_outer_classname = "EagleInterface";
 option objc_class_prefix = "E0G";

 service ShardokInternalInterface {
+    // Server-side streaming for game updates - replaces polling via GetGameStatus
+    rpc SubscribeToGame(GameSubscriptionRequest) returns (stream GameStatusResponse) {}
+
    rpc PostCommand(PostCommandRequest) returns (GameStatusResponse) {}
    rpc PostPlacementCommands(PlacementCommandsRequest) returns (GameStatusResponse) {}
+
+    // Deprecated: Use SubscribeToGame for streaming updates instead
    rpc GetGameStatus(GameStatusRequest) returns (GameStatusResponse) {}

    rpc GetHexMap(HexMapRequest) returns (HexMapResponse) {}
    rpc GetHexMapNames(HexMapNamesRequest) returns (HexMapNamesResponse) {}
 }

+message GameSubscriptionRequest {
+    string game_id = 1;
+    GameSetupInfo game_setup_info = 2;
+}
+
 message PostCommandRequest {
    string game_id = 1;
    int32 player_id = 2;
@@ -58,4 +58,8 @@ message Hero {
    repeated EventForHeroBackstory new_backstory_events = 29;

    .net.eagle0.eagle.common.Gender pronoun_gender = 27;
+
+    // The name of the faction this hero would lead, if they led one.
+    // Populated for "great person" heroes from the heroes TSV; empty for others.
+    string led_faction_name = 30;
 }
@@ -4,6 +4,7 @@ filegroup(
    name = "settings",
    srcs = ["settings.tsv"],
    visibility = [
+        "//ci:__pkg__",
        "//src/main/scala/net/eagle0/eagle:__pkg__",
        "//src/main/scala/net/eagle0/eagle/service:__pkg__",
    ],
@@ -13,6 +14,7 @@ filegroup(
    name = "game_parameters",
    srcs = ["game_parameters.json"],
    visibility = [
+        "//ci:__pkg__",
        "//src/main/scala/net/eagle0:__subpackages__",
        "//src/test:__subpackages__",
    ],
@@ -22,6 +24,7 @@ filegroup(
    name = "beasts",
    srcs = ["beasts.tsv"],
    visibility = [
+        "//ci:__pkg__",
        "//src/main/scala/net/eagle0/eagle/library/util:__pkg__",
        "//src/main/scala/net/eagle0/util:__pkg__",
        "//src/test:__subpackages__",
@@ -32,6 +35,7 @@ filegroup(
    name = "headshots",
    srcs = ["headshots.tsv"],
    visibility = [
+        "//ci:__pkg__",
        "//src/main/scala/net/eagle0/eagle/library/util/hero_generator/image_paths:__pkg__",
        "//src/main/scala/net/eagle0/eagle/library/util/hero_generator/random_hero_generator:__pkg__",
        "//src/main/scala/net/eagle0/util:__pkg__",
@@ -46,6 +50,7 @@ filegroup(
        "heroes.tsv",
    ],
    visibility = [
+        "//ci:__pkg__",
        "//src/main/scala/net/eagle0/eagle/service/new_game_creation:__pkg__",
        "//src/main/scala/net/eagle0/util:__pkg__",
        "//src/test:__subpackages__",
@@ -56,6 +61,7 @@ filegroup(
    name = "province_map",
    srcs = ["province_map.tsv"],
    visibility = [
+        "//ci:__pkg__",
        "//src/main/scala/net/eagle0:__subpackages__",
        "//src/test:__subpackages__",
    ],
@@ -5,6 +5,7 @@ filegroup(
    name = "settings",
    srcs = ["settings.tsv"],
    visibility = [
+        "//ci:__pkg__",
        "//src/main/cpp/net/eagle0/shardok:__subpackages__",
        "//src/test/cpp/net/eagle0/shardok:__subpackages__",
    ],
@@ -44,6 +45,7 @@ filegroup(
    name = "battalion_types",
    srcs = ["battalionTypes.tsv"],
    visibility = [
+        "//ci:__pkg__",
        "//src/main/cpp/net/eagle0/shardok:__subpackages__",
        "//src/main/scala/net/eagle0/eagle/service:__pkg__",
        "//src/main/scala/net/eagle0/util:__pkg__",
@@ -21,6 +21,7 @@ scala_binary(
        ":external_text_generation_caller",
        ":external_text_generation_service_impl",
        ":open_ai_chat_completions_service_impl",
+        ":open_ai_responses_service_impl",
        ":streaming_text_results",
    ],
 )
@@ -52,7 +53,10 @@ scala_library(
        ":external_text_generation_service_impl",
        ":rate_limits",
        ":streaming_text_results",
-        "//src/main/scala/net/eagle0/common/sse:sse_subscriber",
+        "//src/main/scala/net/eagle0/common/sse:okhttp_sse_listener",
+        "@maven//:com_squareup_okhttp3_okhttp",
+        "@maven//:com_squareup_okhttp3_okhttp_sse",
+        "@maven//:com_squareup_okio_okio_jvm",
    ],
 )

@@ -86,6 +90,24 @@ scala_library(
    ],
 )

+scala_library(
+    name = "open_ai_responses_service_impl",
+    srcs = ["OpenAIResponsesServiceImpl.scala"],
+    visibility = [
+        "//visibility:public",
+    ],
+    deps = [
+        ":api_keys",
+        ":external_text_generation_service_impl",
+        ":open_ai_duration_parser",
+        ":rate_limits",
+        ":streaming_text_results",
+        "@maven//:org_json4s_json4s_ast_3",
+        "@maven//:org_json4s_json4s_core_3",
+        "@maven//:org_json4s_json4s_native_3",
+    ],
+)
+
 scala_library(
    name = "open_ai_duration_parser",
    srcs = ["OpenAiDurationParser.scala"],
@@ -1,21 +1,23 @@
 package net.eagle0.common.llm_integration

-import java.net.http.{HttpClient, HttpRequest, HttpResponse, HttpTimeoutException}
-import java.net.http.HttpClient.{Redirect, Version}
-import java.net.http.HttpResponse.ResponseInfo
+import java.io.IOException
+import java.net.http.HttpRequest
 import java.net.HttpURLConnection
+import java.net.SocketTimeoutException
 import java.time.{Duration, ZonedDateTime}
 import java.time.temporal.ChronoUnit
 import java.util.{Timer, TimerTask}
-import java.util.concurrent.CompletionException
+import java.util.concurrent.TimeUnit
 import java.util.function.Consumer

 import scala.concurrent.{ExecutionContext, Future, Promise}
-import scala.jdk.CollectionConverters.{CollectionHasAsScala, MapHasAsScala}
+import scala.jdk.CollectionConverters.{CollectionHasAsScala, IterableHasAsScala}
 import scala.jdk.FutureConverters.CompletionStageOps
 import scala.util.{Failure, Success}

-import net.eagle0.common.sse.SseSubscriber
+import net.eagle0.common.sse.OkHttpSseListener
+import okhttp3.{MediaType, OkHttpClient, Request, RequestBody, Response}
+import okhttp3.sse.{EventSource, EventSources}

 enum ExternalTextGenerationError extends Error:
  case RateLimit(code: Int, msg: String)
@@ -35,10 +37,51 @@ object ExternalTextGenerationCaller {

  private def nextBackoff(backoffSeconds: Double): Double =
    Math.min(backoffSeconds * backoffMultiplier, maxBackoffSeconds)
+
+  /** Convert a Java HttpRequest to an OkHttp Request */
+  private def toOkHttpRequest(javaRequest: HttpRequest): Request = {
+    val builder = new Request.Builder()
+      .url(javaRequest.uri().toString)
+
+    // Copy headers
+    javaRequest.headers().map().forEach { (name, values) =>
+      values.forEach(value => builder.addHeader(name, value))
+    }
+
+    // Handle request body
+    javaRequest.method() match {
+      case "GET"  => builder.get()
+      case "POST" =>
+        val bodyPublisher = javaRequest.bodyPublisher().orElse(null)
+        if bodyPublisher != null then {
+          // Extract body content - for BodyPublishers.ofString, we can get the content
+          val bodyContent = new StringBuilder()
+          val subscriber  = new java.util.concurrent.Flow.Subscriber[java.nio.ByteBuffer] {
+            override def onSubscribe(subscription: java.util.concurrent.Flow.Subscription): Unit =
+              subscription.request(Long.MaxValue)
+            override def onNext(item: java.nio.ByteBuffer): Unit                                 =
+              bodyContent.append(java.nio.charset.StandardCharsets.UTF_8.decode(item).toString)
+            override def onError(throwable: Throwable): Unit                                     = ()
+            override def onComplete(): Unit                                                      = ()
+          }
+          bodyPublisher.subscribe(subscriber)
+          val contentType =
+            javaRequest.headers().firstValue("Content-Type").orElse("application/json")
+          val mediaType   = MediaType.parse(contentType)
+          builder.post(RequestBody.create(bodyContent.toString, mediaType))
+        } else {
+          builder.post(RequestBody.create("", null))
+        }
+      case other  => throw new UnsupportedOperationException(s"HTTP method $other not supported")
+    }
+
+    builder.build()
+  }
 }

 final class ExternalTextGenerationCaller(
    val timeoutSeconds: Int = 10,
+    val readTimeoutSeconds: Int = 60,
    serviceImpl: ExternalTextGenerationServiceImpl
 ) {
  private var inProgressCount = 0
@@ -57,13 +100,17 @@ final class ExternalTextGenerationCaller(

  implicit val ec: ExecutionContext = ExecutionContext.global

-  private val httpClient = HttpClient
-    .newBuilder()
-    .version(Version.HTTP_2)
-    .followRedirects(Redirect.NORMAL)
-    .connectTimeout(Duration.ofSeconds(timeoutSeconds))
+  // OkHttp client with read timeout - the key benefit over Java HttpClient
+  // If no data is received for readTimeoutSeconds, the connection will timeout
+  private val okHttpClient = new OkHttpClient.Builder()
+    .connectTimeout(timeoutSeconds.toLong, TimeUnit.SECONDS)
+    .readTimeout(readTimeoutSeconds.toLong, TimeUnit.SECONDS)
+    .writeTimeout(timeoutSeconds.toLong, TimeUnit.SECONDS)
+    .retryOnConnectionFailure(true)
    .build()

+  private val eventSourceFactory = EventSources.createFactory(okHttpClient)
+
  private var successDurations =
    new scala.collection.mutable.ArrayBuffer[Long]()

@@ -72,7 +119,7 @@ final class ExternalTextGenerationCaller(
      partialCompletion: Option[String],
      streamingConsumer: Consumer[StreamingTextResults],
      backoffSeconds: Double = ExternalTextGenerationCaller.initialBackoffSeconds
-  ): Future[HttpResponse[Unit]] =
+  ): Future[Unit] =
    streamCompletion(
      inputText = inputText,
      request = serviceImpl.makeRequest(
@@ -88,13 +135,13 @@ final class ExternalTextGenerationCaller(
      request: HttpRequest,
      backoffSeconds: Double,
      streamingConsumer: Consumer[StreamingTextResults]
-  ): Future[HttpResponse[Unit]] = {
+  ): Future[Unit] = {
    val startTime = System.currentTimeMillis()

-    def tryAgain: () => Future[HttpResponse[Unit]] = () => {
+    def tryAgain: () => Future[Unit] = () => {
      println(s"Trying again after $backoffSeconds seconds...")

-      val promise = Promise[HttpResponse[Unit]]()
+      val promise = Promise[Unit]()
      val t       = new Timer()
      t.schedule(
        new TimerTask {
@@ -113,104 +160,63 @@ final class ExternalTextGenerationCaller(
      promise.future
    }

+    val okHttpRequest = ExternalTextGenerationCaller.toOkHttpRequest(request)
+    val sseListener   = new OkHttpSseListener(serviceImpl.stringConsumer(streamingConsumer))
+
    inProgressCount += 1
-    httpClient
-      .sendAsync(
-        request,
-        (respInfo: ResponseInfo) =>
-          if respInfo.statusCode() == HttpURLConnection.HTTP_OK then
-            new SseSubscriber(serviceImpl.stringConsumer(streamingConsumer))
-          else
-            // For error responses, read the body to get error details
-            HttpResponse.BodySubscribers.mapping(
-              HttpResponse.BodySubscribers.ofString(java.nio.charset.StandardCharsets.UTF_8),
-              (body: String) => {
-                val code = respInfo.statusCode()
-                println(s"Error response ($code): $body")
-                // 4xx errors (except 429) are client errors - don't retry
-                if code >= 400 && code < 500 && code != 429 then
-                  throw ExternalTextGenerationError.Http(
-                    code,
-                    s"Client error $code: $body"
-                  )
-                else
-                  throw new RuntimeException(
-                    s"Server error $code: $body"
-                  )
-              }
-            )
-      )
-      .asScala
-      .andThen {
-        case x =>
-          inProgressCount -= 1
-          x
-      }
-      .transform {
-        case Success(httpResponse) =>
-          val rateLimits = serviceImpl.rateLimitsFrom(
-            headers = httpResponse
-              .headers()
-              .map()
-              .asScala
-              .map { case (k, v) => (k, v.asScala.toVector) }
-              .toMap
+
+    // Start the SSE connection
+    val eventSource = eventSourceFactory.newEventSource(okHttpRequest, sseListener)
+
+    // Convert the CompletableFuture to a Scala Future
+    sseListener.getFuture.asScala.andThen {
+      case _ =>
+        inProgressCount -= 1
+    }.transform {
+      case Success(_) =>
+        val duration = System.currentTimeMillis() - startTime
+        this.synchronized {
+          successDurations.addOne(duration)
+          if successDurations.size % 100 == 0 then {
+            successDurations = successDurations.sorted
+            val p99pos =
+              successDurations.size - successDurations.size / 100
+            println(s"p99 duration: ${successDurations(p99pos)}ms")
+          }
+        }
+        Success(())
+
+      case Failure(e: SocketTimeoutException) =>
+        println(s"Read timeout after ${readTimeoutSeconds}s: ${e.getMessage}")
+        Failure(
+          ExternalTextGenerationError.Timeout(
+            s"Read timeout after ${readTimeoutSeconds}s: ${e.getMessage}"
          )
-          currentRateLimits = rateLimits
-          currentRateLimitTime = ZonedDateTime.now()
+        )

-          val responseCode = httpResponse.statusCode()
-          if responseCode < HttpURLConnection.HTTP_BAD_REQUEST then {
-            val duration = System.currentTimeMillis() - startTime
-
-            this.synchronized {
-              successDurations.addOne(duration)
-              if successDurations.size % 100 == 0 then {
-                successDurations = successDurations.sorted
-                val p99pos =
-                  successDurations.size - successDurations.size / 100
-                println(s"p99 duration: ${successDurations(p99pos)}ms")
-              }
-
-              Success(httpResponse)
-            }
-          } else if responseCode == 429 then
-            Failure(
-              ExternalTextGenerationError.RateLimit(
-                responseCode,
-                httpResponse.toString
-              )
-            )
-          else
-            Failure(
-              ExternalTextGenerationError.Http(
-                responseCode,
-                "An error occurred while generating a response.\n" + httpResponse
-              )
-            )
-
-        case Failure(timeoutException: HttpTimeoutException) =>
-          Failure(
-            ExternalTextGenerationError.Timeout(
-              s"Timed out: ${timeoutException.getMessage}"
-            )
+      case Failure(e: IOException) if e.getMessage != null && e.getMessage.contains("timeout") =>
+        println(s"Timeout: ${e.getMessage}")
+        Failure(
+          ExternalTextGenerationError.Timeout(
+            s"Timeout: ${e.getMessage}"
          )
+        )

-        case Failure(exception) => Failure(exception)
-      }
-      .recoverWith {
-        // Don't retry 4xx client errors - they won't succeed
-        case e: CompletionException if e.getCause.isInstanceOf[ExternalTextGenerationError.Http] =>
-          Future.failed(e.getCause)
-        case e: ExternalTextGenerationError.Http                                                 =>
-          Future.failed(e)
-        // Retry transient errors (5xx, timeouts, network issues)
-        case e: CompletionException                                                              =>
-          println(s"CompletionException error $e - retrying")
-          tryAgain()
-        case e: Throwable                                                                        =>
-          println(s"error $e - retrying")
-          tryAgain()
-      }
+      case Failure(exception) => Failure(exception)
+    }.recoverWith {
+      // Don't retry 4xx client errors - they won't succeed
+      case e: ExternalTextGenerationError.Http    =>
+        Future.failed(e)
+      // Retry transient errors (timeouts, network issues)
+      case e: ExternalTextGenerationError.Timeout =>
+        println(s"Timeout error - retrying: ${e.message}")
+        tryAgain()
+      case e: IOException                         =>
+        println(s"IOException - retrying: ${e.getMessage}")
+        tryAgain()
+      case e: Throwable                           =>
+        println(s"error $e - retrying")
+        tryAgain()
+    }
  }
 }
@@ -4,6 +4,9 @@ import scala.concurrent.duration.{Duration, SECONDS}
 import scala.concurrent.Await
 //import scala.util.Random

+enum LlmProvider:
+  case Claude, OpenAIChatCompletions, OpenAIResponses
+
 object ExternalTextGenerationCallerApp {
  def main(args: Array[String]): Unit = {
 //    val personalityWords = Vector(
@@ -30,8 +33,16 @@ object ExternalTextGenerationCallerApp {
    val chatGptImpl: ExternalTextGenerationServiceImpl =
      new OpenAIChatCompletionsServiceImpl()

-    val caller = new ExternalTextGenerationCaller(
-      serviceImpl = if true then claudeImpl else chatGptImpl
+    val openAiResponsesImpl: ExternalTextGenerationServiceImpl =
+      new OpenAIResponsesServiceImpl()
+
+    val selectedProvider = LlmProvider.OpenAIResponses
+    val caller           = new ExternalTextGenerationCaller(
+      serviceImpl = selectedProvider match {
+        case LlmProvider.Claude                => claudeImpl
+        case LlmProvider.OpenAIChatCompletions => chatGptImpl
+        case LlmProvider.OpenAIResponses       => openAiResponsesImpl
+      }
    )

    (0 to 0).foreach { _ =>
@@ -0,0 +1,200 @@
+package net.eagle0.common.llm_integration
+
+import java.net.{URI, URL}
+import java.net.http.HttpRequest
+import java.net.http.HttpRequest.BodyPublishers
+import java.time.{Duration, ZonedDateTime}
+import java.util.function.Consumer
+
+import org.json4s.{DefaultFormats, JString}
+import org.json4s.jvalue2extractable
+import org.json4s.jvalue2monadic
+import org.json4s.native.{Json, Serialization}
+
+/**
+ * OpenAI Responses API implementation.
+ *
+ * The Responses API is OpenAI's newer API primitive that offers: - Better performance with reasoning models (3%
+ * improvement in SWE-bench) - Lower costs through improved cache utilization (40-80% improvement) - Semantic streaming
+ * events with clear lifecycle (response.created, response.output_text.delta, response.completed) - Built-in tools (web
+ * search, file search, computer use, code interpreter)
+ *
+ * @see
+ *   https://platform.openai.com/docs/api-reference/responses
+ */
+object OpenAIResponsesServiceImpl {
+  val gpt5: String = "gpt-5.1"
+
+  private val apiKey              = ApiKeys.openAI
+  private val baseURL             = new URL("https://api.openai.com/v1/responses")
+  private val temperature: Double = 1.0
+
+  private def baseRequest(timeoutSeconds: Int): HttpRequest.Builder =
+    HttpRequest
+      .newBuilder()
+      .uri(URI.create(baseURL.toString))
+      .timeout(Duration.ofSeconds(timeoutSeconds))
+      .header(
+        "Authorization",
+        s"Bearer ${OpenAIResponsesServiceImpl.apiKey}"
+      )
+}
+
+class OpenAIResponsesServiceImpl(
+    timeoutSeconds: Int = 10,
+    val defaultModelName: String = "gpt-5.1"
+) extends ExternalTextGenerationServiceImpl {
+  implicit val jsonFormats: DefaultFormats.type = DefaultFormats
+
+  private def requestDictionary(
+      inputText: String,
+      partialCompletion: Option[String]
+  ): Map[String, Any] = {
+    // For partial completions, we need to format as an array of input items
+    // The Responses API uses "input" instead of "messages"
+    val input = partialCompletion match {
+      case Some(partial) =>
+        // When we have a partial completion, send as array of items
+        Vector(
+          Map("type" -> "message", "role" -> "user", "content"      -> inputText),
+          Map("type" -> "message", "role" -> "assistant", "content" -> partial)
+        )
+      case None          =>
+        // Simple text input when no partial completion
+        inputText
+    }
+
+    Map(
+      "model"       -> defaultModelName,
+      "temperature" -> OpenAIResponsesServiceImpl.temperature,
+      "stream"      -> true,
+      "input"       -> input
+    )
+  }
+
+  override def makeRequest(
+      inputText: String,
+      partialCompletion: Option[String]
+  ): HttpRequest =
+    OpenAIResponsesServiceImpl
+      .baseRequest(timeoutSeconds = timeoutSeconds)
+      .header("Content-Type", "application/json")
+      .POST(
+        BodyPublishers.ofString(
+          Serialization.write(
+            requestDictionary(
+              inputText = inputText,
+              partialCompletion = partialCompletion
+            )
+          )
+        )
+      )
+      .build()
+
+  override def stringConsumer(
+      streamingConsumer: Consumer[StreamingTextResults]
+  ): Consumer[String] = (t: String) => {
+    val json       = new Json(DefaultFormats)
+    val parsedJson =
+      try
+        json.parse(t)
+      catch {
+        case pe: org.json4s.ParserUtil.ParseException =>
+          println(s"Failed to parse JSON: $t")
+          throw pe
+      }
+
+    val eventType = (parsedJson \ "type").extractOpt[String]
+
+    eventType match {
+      case Some("response.output_text.delta") =>
+        // Text delta event - extract the delta and stream ID
+        val delta    = (parsedJson \ "delta").extract[String]
+        val itemId   = (parsedJson \ "item_id").extractOpt[String].getOrElse("unknown")
+        val streamId = itemId
+
+        streamingConsumer.accept(
+          StreamingTextResults(
+            streamId = streamId,
+            value = delta,
+            completed = false
+          )
+        )
+
+      case Some("response.output_text.done") =>
+        // Text is complete for this output item
+        val itemId   = (parsedJson \ "item_id").extractOpt[String].getOrElse("unknown")
+        val streamId = itemId
+
+        streamingConsumer.accept(
+          StreamingTextResults(
+            streamId = streamId,
+            value = "",
+            completed = true
+          )
+        )
+
+      case Some("response.completed") =>
+        // Response is fully complete - extract the response ID as streamId
+        val responseId = (parsedJson \ "response" \ "id").extractOpt[String].getOrElse("unknown")
+        streamingConsumer.accept(
+          StreamingTextResults(
+            streamId = responseId,
+            value = "",
+            completed = true
+          )
+        )
+
+      case Some("response.created") | Some("response.in_progress") | Some("response.output_item.added") | Some(
+            "response.content_part.added"
+          ) =>
+        // Lifecycle events - ignore, no content to stream
+        ()
+
+      case Some("error") =>
+        // Error event
+        val errorMsg = (parsedJson \ "error" \ "message").extractOpt[String].getOrElse("Unknown error")
+        throw new RuntimeException(s"OpenAI Responses API error: $errorMsg")
+
+      case Some(other) =>
+        // Unknown event type - log but continue
+        println(s"OpenAI Responses API: ignoring unknown event type: $other")
+
+      case None =>
+        // No event type - might be malformed, log it
+        println(s"OpenAI Responses API: received message without event type: $t")
+    }
+  }
+
+  override def rateLimitsFrom(
+      headers: Map[String, Vector[String]]
+  ): Option[RateLimits] =
+    // The Responses API uses the same rate limit headers as Chat Completions
+    for {
+      requestLimit      <- headers.get("x-ratelimit-limit-requests")
+      tokenLimit        <- headers.get("x-ratelimit-limit-tokens")
+      requestsRemaining <- headers.get("x-ratelimit-remaining-requests")
+      tokensRemaining   <- headers.get("x-ratelimit-remaining-tokens")
+      requestResetTime  <- headers.get("x-ratelimit-reset-requests")
+      tokenResetTime    <- headers.get("x-ratelimit-reset-tokens")
+    } yield RateLimits(
+      requestLimit = requestLimit.head.toInt,
+      tokenLimit = tokenLimit.head.toInt,
+      requestsRemaining = requestsRemaining.head.toInt,
+      tokensRemaining = tokensRemaining.head.toInt,
+      requestResetTime = ZonedDateTime
+        .now()
+        .plus(
+          OpenAiDurationParser
+            .parseDuration(requestResetTime.head)
+            .getOrElse(Duration.ZERO)
+        ),
+      tokenResetTime = ZonedDateTime
+        .now()
+        .plus(
+          OpenAiDurationParser
+            .parseDuration(tokenResetTime.head)
+            .getOrElse(Duration.ZERO)
+        )
+    )
+}
@@ -18,3 +18,13 @@ scala_library(
        "@maven//:org_json4s_json4s_core_3",
    ],
 )
+
+scala_library(
+    name = "okhttp_sse_listener",
+    srcs = ["OkHttpSseListener.scala"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "@maven//:com_squareup_okhttp3_okhttp",
+        "@maven//:com_squareup_okhttp3_okhttp_sse",
+    ],
+)
@@ -0,0 +1,62 @@
+package net.eagle0.common.sse
+
+import java.util.concurrent.CompletableFuture
+import java.util.function.Consumer
+
+import okhttp3.sse.{EventSource, EventSourceListener}
+import okhttp3.Response
+
+/**
+ * OkHttp-based SSE listener that wraps our existing SseEventReader logic.
+ *
+ * Key benefit over Java HttpClient: OkHttp supports read timeouts, so if the server stops sending data without properly
+ * closing the connection, we'll get a timeout error instead of waiting forever.
+ */
+class OkHttpSseListener(messageDataConsumer: Consumer[String]) extends EventSourceListener {
+
+  private val future: CompletableFuture[Unit] = new CompletableFuture[Unit]
+
+  private val DoneToken = "[DONE]"
+
+  def getFuture: CompletableFuture[Unit] = future
+
+  override def onOpen(eventSource: EventSource, response: Response): Unit = {
+    // Connection established, nothing to do
+  }
+
+  override def onEvent(
+      eventSource: EventSource,
+      id: String,
+      `type`: String,
+      data: String
+  ): Unit =
+    try
+      if data != DoneToken then {
+        messageDataConsumer.accept(data)
+      }
+      // If it's [DONE], just ignore - onClosed will be called
+    catch {
+      case e: Exception =>
+        val _ = future.completeExceptionally(e)
+        eventSource.cancel()
+    }
+
+  override def onClosed(eventSource: EventSource): Unit =
+    if !future.isDone then {
+      val _ = future.complete(())
+    }
+
+  override def onFailure(
+      eventSource: EventSource,
+      t: Throwable,
+      response: Response
+  ): Unit =
+    if !future.isDone then {
+      if response != null then {
+        println(s"SSE failure with response code ${response.code()}: ${t.getMessage}")
+      } else {
+        println(s"SSE failure: ${t.getMessage}")
+      }
+      val _ = future.completeExceptionally(t)
+    }
+}
@@ -214,7 +214,6 @@ scala_library(
        "//src/main/scala/net/eagle0/eagle/library/actions/impl/common:vigor_xp_applier",
        "//src/main/scala/net/eagle0/eagle/library/util:eagle_require",
        "//src/main/scala/net/eagle0/eagle/library/util/hero_generator",
-        "//src/main/scala/net/eagle0/eagle/library/util/validations:scala_runtime_validator",
        "//src/main/scala/net/eagle0/eagle/model/action_result:action_result_trait",
        "//src/main/scala/net/eagle0/eagle/model/action_result:changed_battalion_trait",
        "//src/main/scala/net/eagle0/eagle/model/action_result:changed_faction_trait",
@@ -4,11 +4,7 @@ import scala.collection.mutable

 import net.eagle0.common.SeededRandom
 import net.eagle0.eagle.internal.game_state.GameState as GameStateProto
-import net.eagle0.eagle.library.actions.applier.{
-  ActionResultApplier,
-  ActionResultTApplierImpl,
-  ActionResultWithResultingState
-}
+import net.eagle0.eagle.library.actions.applier.{ActionResultApplier, ActionResultWithResultingState}
 import net.eagle0.eagle.library.actions.availability.AvailableCommandsFactory
 import net.eagle0.eagle.library.actions.impl.action.*
 import net.eagle0.eagle.library.actions.impl.command.CommandFactory
@@ -53,9 +49,6 @@ object RoundPhaseAdvancer {
    // Lazy conversion to proto for AvailableCommandsFactory calls
    lazy val currentStateProto: GameStateProto = GameStateConverter.toProto(currentState)

-    // ActionResultTApplier for actions that need internal state tracking
-    val actionResultTApplier = ActionResultTApplierImpl(actionResultApplier)
-
    val currentPhase = currentState.currentPhase
    val startTime    = System.currentTimeMillis

@@ -92,8 +85,8 @@ object RoundPhaseAdvancer {
        )

      case ProvinceMoveResolution =>
-        val actionResults = PerformProvinceMoveResolutionAction(currentState)
-          .results(SeededRandom(currentState.randomSeed), actionResultTApplier)
+        val actionResults = PerformProvinceMoveResolutionAction(currentState, actionResultApplier)
+          .results(SeededRandom(currentState.randomSeed))
          .map(VigorXPApplier.withVigorXp)
        actionResultApplier.applyActionResults(currentState, actionResults)

@@ -114,6 +114,7 @@ class ActionResultApplierImpl(validator: Option[ScalaValidator]) extends ActionR
    // Apply all remaining entity changes using extension methods
    val finalState = stateAfterChangedBattalions
      .applyProvinceActed(result.provinceIdActed)
+      .applyLastCommand(result.provinceId, result.lastCommandTypeForActingProvince)
      .applyNewBattalions(result.newBattalions, result.provinceId)
      .applyDestroyedBattalionIds(result.destroyedBattalionIds)
      .applyNewHeroes(result.newHeroes)
@@ -54,6 +54,7 @@ scala_library(
    deps = [
        ":province_update_helpers",
        ":province_update_helpers2",
+        "//src/main/protobuf/net/eagle0/eagle/api:selected_command_scala_proto",
        "//src/main/scala/net/eagle0/eagle:eagle_pkg",
        "//src/main/scala/net/eagle0/eagle/library:eagle_internal_exception",
        "//src/main/scala/net/eagle0/eagle/library/util:eagle_require",
@@ -106,7 +107,6 @@ scala_library(
    srcs = ["GameStateFactionExtensions.scala"],
    visibility = ["//visibility:private"],
    deps = [
-        "//src/main/protobuf/net/eagle0/eagle/views:province_view_scala_proto",
        "//src/main/scala/net/eagle0/eagle:eagle_pkg",
        "//src/main/scala/net/eagle0/eagle/library:eagle_internal_exception",
        "//src/main/scala/net/eagle0/eagle/model/action_result:changed_faction_trait",
@@ -114,6 +114,7 @@ scala_library(
        "//src/main/scala/net/eagle0/eagle/model/state/faction",
        "//src/main/scala/net/eagle0/eagle/model/state/faction/concrete",
        "//src/main/scala/net/eagle0/eagle/model/state/game_state",
+        "//src/main/scala/net/eagle0/eagle/model/view/province:province_view",
    ],
 )

@@ -154,6 +155,7 @@ scala_library(
        ":game_state_hero_extensions",
        ":game_state_misc_extensions",
        ":game_state_province_extensions",
+        "//src/main/protobuf/net/eagle0/eagle/api:selected_command_scala_proto",
        "//src/main/scala/net/eagle0/eagle:eagle_pkg",
        "//src/main/scala/net/eagle0/eagle/model/action_result:changed_battalion_trait",
        "//src/main/scala/net/eagle0/eagle/model/action_result:changed_faction_trait",
@@ -169,6 +171,7 @@ scala_library(
        ":game_state_hero_extensions",
        ":game_state_misc_extensions",
        ":game_state_province_extensions",
+        "//src/main/protobuf/net/eagle0/eagle/api:selected_command_scala_proto",
        "//src/main/scala/net/eagle0/eagle:eagle_pkg",
        "//src/main/scala/net/eagle0/eagle/library/settings:extra_xp_for_stat_bump_over100",
        "//src/main/scala/net/eagle0/eagle/library/settings:xp_for_stat_bump",
@@ -9,7 +9,7 @@ import net.eagle0.eagle.model.state.faction.FactionRelationship
 import net.eagle0.eagle.model.state.faction.FactionT
 import net.eagle0.eagle.model.state.faction.FactionT.OutgoingOfferRound
 import net.eagle0.eagle.model.state.game_state.GameState
-import net.eagle0.eagle.views.province_view.ProvinceView
+import net.eagle0.eagle.model.view.province.ProvinceView

 object GameStateFactionExtensions {

@@ -1,6 +1,7 @@
 package net.eagle0.eagle.library.actions.applier

 import net.eagle0.eagle.*
+import net.eagle0.eagle.api.selected_command.SelectedCommand
 import net.eagle0.eagle.library.util.EagleRequire.internalRequire
 import net.eagle0.eagle.library.EagleInternalException
 import net.eagle0.eagle.model.action_result.changed_province.concrete.ChangedProvinceC
@@ -75,5 +76,22 @@ object GameStateProvinceExtensions {
      }
        .getOrElse(gameState)
    }
+
+    def applyLastCommand(
+        provinceId: Option[ProvinceId],
+        lastCommand: Option[SelectedCommand]
+    ): GameState =
+      provinceId
+        .filter(_ => lastCommand.exists(!_.isEmpty))
+        .map { pid =>
+          val province = gameState.provinces(pid) match {
+            case p: ProvinceC => p
+            case p            => throw new EagleInternalException(s"Unknown ProvinceT type: ${p.getClass}")
+          }
+          gameState.copy(
+            provinces = gameState.provinces.updated(pid, province.copy(lastCommand = lastCommand))
+          )
+        }
+        .getOrElse(gameState)
  }
 }
@@ -207,9 +207,6 @@ scala_library(
        "//src/main/scala/net/eagle0/eagle/model/action_result/generated_text_request",
        "//src/main/scala/net/eagle0/eagle/model/action_result/types:captured_hero_resolved_result_type",
        "//src/main/scala/net/eagle0/eagle/model/action_result/types:end_aftermath_phase_result_type",
-        "//src/main/scala/net/eagle0/eagle/model/proto_converters:battle_revelation_converter",
-        "//src/main/scala/net/eagle0/eagle/model/proto_converters:notification_converter",
-        "//src/main/scala/net/eagle0/eagle/model/proto_converters/game_state",
        "//src/main/scala/net/eagle0/eagle/model/proto_converters/llm_request",
        "//src/main/scala/net/eagle0/eagle/model/state:battle_revelation",
        "//src/main/scala/net/eagle0/eagle/model/state:round_phase",
@@ -803,7 +800,6 @@ scala_library(
        "//src/main/scala/net/eagle0/eagle/model/action_result/concrete:action_result_concrete",
        "//src/main/scala/net/eagle0/eagle/model/action_result/concrete:changed_battalion_concrete",
        "//src/main/scala/net/eagle0/eagle/model/action_result/concrete:changed_hero_concrete",
-        "//src/main/scala/net/eagle0/eagle/model/proto_converters/game_state",
        "//src/main/scala/net/eagle0/eagle/model/state/game_state",
        "//src/main/scala/net/eagle0/eagle/model/state/hero",
        "//src/main/scala/net/eagle0/eagle/model/state/hero:gender",
@@ -1199,41 +1195,21 @@ scala_library(
        "//src/test/scala/net/eagle0/eagle/library/actions/impl:__subpackages__",
    ],
    exports = [
-        "//src/main/scala/net/eagle0/eagle/library/actions/impl/common:action",
-        "//src/main/scala/net/eagle0/eagle/library/actions/impl/common:action_with_resulting_state",
-        "//src/main/scala/net/eagle0/eagle/library/actions/impl/common:t_random_sequential_results_action",
+        "//src/main/scala/net/eagle0/eagle/library/actions/impl/common:protoless_random_sequential_results_action",
    ],
    deps = [
        ":end_province_move_resolution_phase_action",
        ":friendly_move_action",
        ":shipment_arrived_action",
-        "//src/main/protobuf/net/eagle0/eagle/common:round_phase_scala_proto",
-        "//src/main/protobuf/net/eagle0/eagle/internal:game_state_scala_proto",
        "//src/main/scala/net/eagle0/common:functional_random",
        "//src/main/scala/net/eagle0/eagle:eagle_pkg",
-        "//src/main/scala/net/eagle0/eagle/library/actions/applier:action_result_trait_applier",
-        "//src/main/scala/net/eagle0/eagle/library/actions/impl/common:action",
-        "//src/main/scala/net/eagle0/eagle/library/actions/impl/common:action_with_resulting_state",
-        "//src/main/scala/net/eagle0/eagle/library/actions/impl/common:t_random_sequential_results_action",
+        "//src/main/scala/net/eagle0/eagle/library/actions/applier:action_result_applier",
+        "//src/main/scala/net/eagle0/eagle/library/actions/impl/common:protoless_random_sequential_results_action",
+        "//src/main/scala/net/eagle0/eagle/library/actions/random_state_sequencer",
        "//src/main/scala/net/eagle0/eagle/model/action_result:action_result_trait",
-        "//src/main/scala/net/eagle0/eagle/model/action_result:changed_battalion_trait",
-        "//src/main/scala/net/eagle0/eagle/model/action_result:changed_hero_trait",
-        "//src/main/scala/net/eagle0/eagle/model/action_result:notification_trait",
-        "//src/main/scala/net/eagle0/eagle/model/action_result/changed_province",
-        "//src/main/scala/net/eagle0/eagle/model/action_result/concrete:action_result_concrete",
-        "//src/main/scala/net/eagle0/eagle/model/action_result/concrete:changed_battalion_concrete",
-        "//src/main/scala/net/eagle0/eagle/model/action_result/concrete:changed_hero_concrete",
-        "//src/main/scala/net/eagle0/eagle/model/action_result/generated_text_request",
-        "//src/main/scala/net/eagle0/eagle/model/proto_converters:army_converter",
-        "//src/main/scala/net/eagle0/eagle/model/proto_converters:supplies_converter",
-        "//src/main/scala/net/eagle0/eagle/model/proto_converters/faction",
-        "//src/main/scala/net/eagle0/eagle/model/proto_converters/game_state",
-        "//src/main/scala/net/eagle0/eagle/model/proto_converters/hero",
-        "//src/main/scala/net/eagle0/eagle/model/proto_converters/province",
        "//src/main/scala/net/eagle0/eagle/model/state:army",
        "//src/main/scala/net/eagle0/eagle/model/state/game_state",
-        "//src/main/scala/net/eagle0/eagle/model/state/hero",
-        "//src/main/scala/net/eagle0/eagle/model/state/hero:gender",
+        "//src/main/scala/net/eagle0/eagle/model/state/province",
    ],
 )

@@ -1308,7 +1284,6 @@ scala_library(
        "//src/main/scala/net/eagle0/eagle/model/action_result/generated_text_request",
        "//src/main/scala/net/eagle0/eagle/model/action_result/types:end_recon_resolution_phase_result_type",
        "//src/main/scala/net/eagle0/eagle/model/action_result/types:recon_succeeded_result_type",
-        "//src/main/scala/net/eagle0/eagle/model/proto_converters/game_state",
        "//src/main/scala/net/eagle0/eagle/model/state:round_phase",
        "//src/main/scala/net/eagle0/eagle/model/state/game_state",
        "//src/main/scala/net/eagle0/eagle/model/state/province:incoming_end_turn_action",
@@ -1857,35 +1832,6 @@ scala_library(
    ],
 )

-scala_library(
-    name = "unaffiliated_hero_moved_action",
-    srcs = ["UnaffiliatedHeroMovedAction.scala"],
-    visibility = [
-        "//src/main/scala/net/eagle0/eagle/library:__subpackages__",
-        "//src/test/scala/net/eagle0/eagle/library/actions/impl:__subpackages__",
-    ],
-    exports = [
-        "//src/main/scala/net/eagle0/common:functional_random",
-        "//src/main/scala/net/eagle0/eagle/library/actions/impl/common:action",
-        "//src/main/scala/net/eagle0/eagle/library/actions/impl/common:action_with_resulting_state",
-    ],
-    deps = [
-        "//src/main/protobuf/net/eagle0/eagle/common:round_phase_scala_proto",
-        "//src/main/protobuf/net/eagle0/eagle/internal:action_result_scala_proto",
-        "//src/main/protobuf/net/eagle0/eagle/internal:game_state_scala_proto",
-        "//src/main/scala/net/eagle0/common:functional_random",
-        "//src/main/scala/net/eagle0/eagle:eagle_pkg",
-        "//src/main/scala/net/eagle0/eagle/library/actions/impl/common:action",
-        "//src/main/scala/net/eagle0/eagle/library/settings:free_hero_move_vigor_cost",
-        "//src/main/scala/net/eagle0/eagle/library/util/unaffiliated_hero",
-        "//src/main/scala/net/eagle0/eagle/model/proto_converters:unaffiliated_hero_converter",
-        "//src/main/scala/net/eagle0/eagle/model/proto_converters/game_state",
-        "//src/main/scala/net/eagle0/eagle/model/state/game_state",
-        "//src/main/scala/net/eagle0/eagle/model/state/quest",
-        "//src/main/scala/net/eagle0/eagle/model/state/unaffiliated_hero",
-    ],
-)
-
 scala_library(
    name = "unaffiliated_hero_rejoined_action",
    srcs = ["UnaffiliatedHeroRejoinedAction.scala"],
@@ -22,7 +22,6 @@ import net.eagle0.eagle.model.action_result.{ActionResultT, NotificationDetails,
 import net.eagle0.eagle.model.action_result.changed_province.concrete.ChangedProvinceC
 import net.eagle0.eagle.model.action_result.concrete.{ActionResultC, ChangedFactionC, ChangedHeroC, NotificationC}
 import net.eagle0.eagle.model.action_result.types.{CapturedHeroResolvedResultType, EndAftermathPhaseResultType}
-import net.eagle0.eagle.model.proto_converters.game_state.GameStateConverter
 import net.eagle0.eagle.model.state.{BattleRevelation, RoundPhase}
 import net.eagle0.eagle.model.state.faction.FactionRelationship
 import net.eagle0.eagle.model.state.game_state.GameState
@@ -350,15 +349,10 @@ case class EndBattleAftermathPhaseAction(
    actionResultApplier: ActionResultApplier
 ) extends ProtolessRandomSequentialResultsAction {

-  // Revelation changes still need proto for ProvinceViewFilter
  private def revelationChange(
      battleRevelation: BattleRevelation,
      gs: GameState
-  ): RevelationChange = {
-    // Lazy conversion to proto for ProvinceViewFilter calls
-    lazy val gsProto       = GameStateConverter.toProto(gs)
-    lazy val provinceProto = gsProto.provinces(battleRevelation.provinceId)
-
+  ): RevelationChange =
    RevelationChange(
      changedFaction = battleRevelation.revelationType match {
        case Unknown   =>
@@ -369,25 +363,21 @@ case class EndBattleAftermathPhaseAction(
            updatedReconnedProvinces = Vector(
              ProvinceViewFilter
                .withdrawnFromProvinceView(
-                  province = provinceProto,
-                  gs = gsProto,
+                  province = gs.provinces(battleRevelation.provinceId),
+                  gs = gs,
                  factionId = battleRevelation.revealedToFactionId
                )
-                .withAsOf(gsProto.currentDate.get)
+                .copy(asOf = gs.currentDate)
            )
          )
        case DidBattle =>
          ChangedFactionC(
            factionId = battleRevelation.revealedToFactionId,
            updatedReconnedProvinces = Vector(
-              ProvinceViewFilter
-                .filteredProvinceView(
-                  provinceProto,
-                  gsProto
-                  // FIXME: setting factionId to None right now to grab the full info. This
-                  // probably isn't exactly what we want.
-                )
-                .withAsOf(gsProto.currentDate.get)
+              ProvinceViewFilter.filteredProvinceView(
+                gs.provinces(battleRevelation.provinceId),
+                gs
+              )
            )
          )
      },
@@ -396,7 +386,6 @@ case class EndBattleAftermathPhaseAction(
        removedBattleRevelations = Vector(battleRevelation)
      )
    )
-  }

  def revelationChanges(gs: GameState): Vector[RevelationChange] =
    for {
@@ -1,14 +1,11 @@
 package net.eagle0.eagle.library.actions.impl.action

-import net.eagle0.eagle.internal.game_state.GameState as GameStateProto
 import net.eagle0.eagle.library.actions.impl.common.ProtolessSequentialResultsAction
 import net.eagle0.eagle.library.util.faction_utils.FactionUtils
-import net.eagle0.eagle.model.proto_converters.game_state.GameStateConverter
 import net.eagle0.eagle.model.state.game_state.GameState

 object HeroBackstoryUpdateActionGenerator {

-  /** Creates action from Scala GameState (preferred) */
  def apply(gameState: GameState): ProtolessSequentialResultsAction = {
    val factions = gameState.factions.values.toVector
    HeroBackstoryUpdateAction(
@@ -25,8 +22,4 @@ object HeroBackstoryUpdateActionGenerator {
          .flatMap(_.rulingFactionId)
    )
  }
-
-  /** Creates action from proto GameState (for sequencer callbacks) */
-  def fromGameState(gameState: GameStateProto): ProtolessSequentialResultsAction =
-    apply(GameStateConverter.fromProto(gameState))
 }
@@ -1,94 +1,64 @@
 package net.eagle0.eagle.library.actions.impl.action

 import net.eagle0.common.{FunctionalRandom, RandomState}
-import net.eagle0.eagle.internal.army.MovingArmy
-import net.eagle0.eagle.internal.game_state.GameState as GameStateProto
-import net.eagle0.eagle.internal.province.Province as ProvinceProto
-import net.eagle0.eagle.library.actions.applier.{ActionResultTApplier, ActionResultTWithResultingState}
-import net.eagle0.eagle.library.actions.impl.common.TRandomSequentialResultsAction
+import net.eagle0.eagle.library.actions.applier.ActionResultApplier
+import net.eagle0.eagle.library.actions.impl.common.ProtolessRandomSequentialResultsAction
+import net.eagle0.eagle.library.actions.random_state_sequencer.RandomStateSequencer
 import net.eagle0.eagle.model.action_result.ActionResultT
-import net.eagle0.eagle.model.proto_converters.{ArmyConverter, SuppliesConverter}
-import net.eagle0.eagle.model.proto_converters.faction.FactionConverter
-import net.eagle0.eagle.model.proto_converters.game_state.GameStateConverter
-import net.eagle0.eagle.model.proto_converters.hero.HeroConverter
-import net.eagle0.eagle.model.proto_converters.province.ProvinceConverter
 import net.eagle0.eagle.model.state.game_state.GameState
+import net.eagle0.eagle.model.state.province.ProvinceT
+import net.eagle0.eagle.model.state.MovingArmy

 case class PerformProvinceMoveResolutionAction(
-    gameState: GameState
-) extends TRandomSequentialResultsAction(gameState) {
+    gameState: GameState,
+    actionResultApplier: ActionResultApplier
+) extends ProtolessRandomSequentialResultsAction {

  override protected def randomResults(
-      functionalRandom: FunctionalRandom,
-      actionResultTApplier: ActionResultTApplier
+      functionalRandom: FunctionalRandom
  ): RandomState[Vector[ActionResultT]] = {
-    val startingState                   = GameStateConverter.toProto(gameState)
-    val provincesWithIncomingFriendlies = startingState.provinces.values
+    val provincesWithIncomingFriendlies = gameState.provinces.values
      .filter(_.rulingFactionId.isDefined)
-      .map(p =>
-        (
-          p,
-          p.incomingArmies.filter(ma =>
-            ma.arrivalRound == startingState.currentRoundId && isFriendlyMove(
-              ma,
-              p
-            )
-          )
-        )
-      )
-      .filter(_._2.nonEmpty)
-
-    val movingFriendliesStates = provincesWithIncomingFriendlies
-      .foldLeft(Vector(ActionResultTWithResultingState(null, startingState))) {
-        case (acc, (province, armies)) =>
-          armies.foldLeft(acc) {
-            case (acc2, army) =>
-              acc2 :+ actionResultTApplier.applyActionResult(
-                acc2.last.resultingState,
-                FriendlyMoveAction(
-                  ArmyConverter.fromProto(army),
-                  province.id
-                ).immediateExecute
-              )
-          }
+      .flatMap { province =>
+        val friendlyArmies = province.incomingArmies.filter { ma =>
+          ma.arrivalRound == gameState.currentRoundId && isFriendlyMove(ma, province)
+        }
+        friendlyArmies.map(army => (province.id, army))
      }
+      .toVector

-    val provincesWithIncomingShipments = startingState.provinces.values
-      .map(p =>
-        (
-          p,
-          p.incomingShipments
-            .filter(ma => ma.arrivalRound == startingState.currentRoundId)
-        )
-      )
-      .filter(_._2.nonEmpty)
+    val provincesWithIncomingShipments = gameState.provinces.values.flatMap { province =>
+      val arrivingShipments = province.incomingShipments
+        .filter(_.arrivalRound == gameState.currentRoundId)
+      arrivingShipments.map(shipment => (province.id, shipment))
+    }.toVector

-    val states = provincesWithIncomingShipments
-      .foldLeft(movingFriendliesStates) {
-        case (acc, (province, shipments)) =>
-          shipments.foldLeft(acc) {
-            case (acc2, supplies) =>
-              acc2 :+ actionResultTApplier.applyActionResult(
-                acc2.last.resultingState,
-                ShipmentArrivedAction(
-                  SuppliesConverter.fromProto(supplies),
-                  province.id
-                ).immediateExecute
-              )
-          }
-      }
-      .drop(1)
+    val sequencer = RandomStateSequencer(
+      initialState = gameState,
+      actionResultApplier = actionResultApplier,
+      functionalRandom = functionalRandom
+    )

-    val lastState = states.lastOption.map(_.resultingState).getOrElse(startingState)
-    EndProvinceMoveResolutionPhaseAction(
-      gameId = lastState.gameId,
-      factions = lastState.factions.values.map(FactionConverter.fromProto).toVector,
-      provinces = lastState.provinces.values.toVector.map(ProvinceConverter.fromProto),
-      heroes = lastState.heroes.values.toVector.map(HeroConverter.fromProto)
-    ).randomResults(functionalRandom)
-      .map(states.map(_.actionResult) ++ _)
+    val afterFriendlyMoves = provincesWithIncomingFriendlies.foldLeft(sequencer) {
+      case (seq, (provinceId, movingArmy)) =>
+        seq.withProtolessSimpleAction(_ => FriendlyMoveAction(movingArmy, provinceId))
+    }
+
+    val afterShipments = provincesWithIncomingShipments.foldLeft(afterFriendlyMoves) {
+      case (seq, (provinceId, movingSupplies)) =>
+        seq.withProtolessSimpleAction(_ => ShipmentArrivedAction(movingSupplies, provinceId))
+    }
+
+    afterShipments.withRandomActionResults { (gs, fr) =>
+      EndProvinceMoveResolutionPhaseAction(
+        gameId = gs.gameId,
+        factions = gs.factions.values.toVector,
+        provinces = gs.provinces.values.toVector,
+        heroes = gs.heroes.values.toVector
+      ).randomResults(fr)
+    }.actionResults
  }

-  private def isFriendlyMove(ma: MovingArmy, p: ProvinceProto): Boolean =
-    ma.army.forall(army => p.rulingFactionId.contains(army.factionId))
+  private def isFriendlyMove(ma: MovingArmy, province: ProvinceT): Boolean =
+    province.rulingFactionId.contains(ma.army.factionId)
 }
@@ -1,7 +1,6 @@
 package net.eagle0.eagle.library.actions.impl.action

 import net.eagle0.common.{FunctionalRandom, RandomState}
-import net.eagle0.eagle.internal.game_state.GameState as GameStateProto
 import net.eagle0.eagle.library.actions.applier.ActionResultApplier
 import net.eagle0.eagle.library.actions.impl.common.ProtolessRandomSequentialResultsAction
 import net.eagle0.eagle.library.actions.random_state_sequencer.RandomStateSequencer
@@ -11,7 +10,6 @@ import net.eagle0.eagle.model.action_result.changed_province.concrete.ChangedPro
 import net.eagle0.eagle.model.action_result.concrete.{ActionResultC, ChangedFactionC, ClientTextVisibilityExtensionC}
 import net.eagle0.eagle.model.action_result.types.{EndReconResolutionPhaseResultType, ReconSucceededResultType}
 import net.eagle0.eagle.model.action_result.ActionResultT
-import net.eagle0.eagle.model.proto_converters.game_state.GameStateConverter
 import net.eagle0.eagle.model.state.game_state.GameState
 import net.eagle0.eagle.model.state.province.{IncomingEndTurnAction, IncomingRecon}
 import net.eagle0.eagle.model.state.RoundPhase
@@ -22,9 +20,6 @@ case class PerformReconResolutionAction(
    actionResultApplier: ActionResultApplier
 ) extends ProtolessRandomSequentialResultsAction {

-  // Proto GameState still needed for ProvinceViewFilter.filteredProvinceView
-  private lazy val startingGameStateProto: GameStateProto = GameStateConverter.toProto(gameState)
-
  override protected def randomResults(
      functionalRandom: FunctionalRandom
  ): RandomState[Vector[ActionResultT]] =
@@ -94,14 +89,10 @@ case class PerformReconResolutionAction(
            ChangedFactionC(
              factionId = fromFactionId,
              updatedReconnedProvinces = Vector(
-                ProvinceViewFilter
-                  .filteredProvinceView(
-                    startingGameStateProto.provinces(provinceId),
-                    startingGameStateProto
-                    // FIXME: setting factionId to None right now to grab the full info. This
-                    // probably isn't exactly what we want.
-                  )
-                  .withAsOf(startingGameStateProto.currentDate.get)
+                ProvinceViewFilter.filteredProvinceView(
+                  gameState.provinces(provinceId),
+                  gameState
+                )
              )
            )
          ),
@@ -1,84 +0,0 @@
-package net.eagle0.eagle.library.actions.impl.action
-
-import net.eagle0.common.{FunctionalRandom, RandomState}
-import net.eagle0.eagle.common.action_result_notification_details.{Notification, OutlawSpottedDetails}
-import net.eagle0.eagle.common.action_result_type.ActionResultType.HERO_MOVED
-import net.eagle0.eagle.common.unaffiliated_hero_type.UnaffiliatedHeroType.UNAFFILIATED_HERO_OUTLAW
-import net.eagle0.eagle.internal.action_result.ActionResult
-import net.eagle0.eagle.internal.changed_hero.ChangedHero
-import net.eagle0.eagle.internal.changed_hero.ChangedHero.Vigor
-import net.eagle0.eagle.internal.changed_province.ChangedProvince
-import net.eagle0.eagle.internal.game_state.GameState
-import net.eagle0.eagle.internal.unaffiliated_hero.UnaffiliatedHero
-import net.eagle0.eagle.library.settings.FreeHeroMoveVigorCost
-import net.eagle0.eagle.library.util.unaffiliated_hero.UnaffiliatedHeroUtils
-import net.eagle0.eagle.model.proto_converters.game_state.GameStateConverter
-import net.eagle0.eagle.model.proto_converters.UnaffiliatedHeroConverter
-import net.eagle0.eagle.ProvinceId
-
-case class UnaffiliatedHeroMovedAction(
-    uh: UnaffiliatedHero,
-    fromProvinceId: ProvinceId,
-    toProvinceId: ProvinceId,
-    gameState: GameState
-) {
-
-  private val affectedProvinces =
-    Vector(fromProvinceId, toProvinceId).map(gameState.provinces)
-  private val affectedFactions  = affectedProvinces.flatMap(_.rulingFactionId)
-  private val notifications     = Option
-    .when(uh.`type` == UNAFFILIATED_HERO_OUTLAW && affectedFactions.nonEmpty) {
-      Notification(
-        details = OutlawSpottedDetails(
-          outlawHeroId = uh.heroId,
-          provinceId = toProvinceId
-        ),
-        targetFactions = affectedFactions
-          .map(fid => Notification.TargetFaction(factionId = fid))
-      )
-    }
-    .toVector
-
-  def immediateExecute(
-      functionalRandom: FunctionalRandom
-  ): RandomState[ActionResult] =
-    computeNewRecruitmentInfo(functionalRandom).map { newRecruitmentInfo =>
-      ActionResult(
-        `type` = HERO_MOVED,
-        changedHeroes = Vector(
-          ChangedHero(
-            id = uh.heroId,
-            vigor = Vigor.VigorDelta(-FreeHeroMoveVigorCost.doubleValue)
-          )
-        ),
-        changedProvinces = Vector(
-          ChangedProvince(
-            id = fromProvinceId,
-            removedUnaffiliatedHeroIds = Vector(uh.heroId)
-          ),
-          ChangedProvince(
-            id = toProvinceId,
-            newUnaffiliatedHeroes = Vector(
-              uh.update(
-                _.recruitmentInfo := UnaffiliatedHeroConverter.recruitmentInfoToProto(newRecruitmentInfo)
-              )
-            )
-          )
-        ),
-        notificationsToDeliver = notifications
-      )
-    }
-
-  private def computeNewRecruitmentInfo(
-      functionalRandom: FunctionalRandom
-  ): RandomState[net.eagle0.eagle.model.state.unaffiliated_hero.RecruitmentInfo] = {
-    val scalaGameState = GameStateConverter.fromProto(gameState)
-    UnaffiliatedHeroUtils.newRecruitmentInfo(
-      gameState = scalaGameState,
-      provinceId = toProvinceId,
-      unaffiliatedHero = UnaffiliatedHeroConverter.fromProto(uh),
-      hero = scalaGameState.heroes(uh.heroId),
-      functionalRandom = functionalRandom
-    )
-  }
-}
@@ -119,8 +119,8 @@ object ResolveRansomOfferCommand {
          case Accepted =>
            NotificationDetails.RansomPaid(
              ransomedHeroId = ransomOffer.prisonerToBeRansomed.prisonerHeroId,
-              ransomPaidByFactionId = actingFactionId,
-              ransomPaidToFactionId = ransomOffer.originatingFactionId
+              ransomPaidByFactionId = ransomOffer.originatingFactionId,
+              ransomPaidToFactionId = actingFactionId
            )

          case Rejected =>
@@ -54,7 +54,9 @@ case class HeroBackstoryUpdatePromptGenerator(
    gameState: GameState,
    clientTextStore: ClientTextStore
 ) extends LLMPromptGenerator {
-  private val maxWordCountIncrease = 30
+  private val normalGrowthRate = 30
+  private val slowGrowthRate   = 8
+  private val softCap          = 225 // approximately 1350 characters

  private val hero = gameState.heroes.getOrElse(
    backstoryUpdateRequest.heroId,
@@ -95,8 +97,10 @@ case class HeroBackstoryUpdatePromptGenerator(
                               "\n----\n"
                             )
  } yield {
+    val previousWordCount   = previousBackstoryText.split("\\W+").length
    val newMaximumWordCount =
-      previousBackstoryText.split("\\W+").length + maxWordCountIncrease
+      if previousWordCount >= softCap then previousWordCount + slowGrowthRate
+      else Math.min(previousWordCount + normalGrowthRate, softCap)
    s"""$setup
       |
       |$heroDescription
@@ -386,8 +386,12 @@ scala_library(
        "//src/main/scala/net/eagle0/eagle:__subpackages__",
        "//src/test/scala/net/eagle0/eagle/library/util:__pkg__",
    ],
+    exports = [
+        "//src/main/scala/net/eagle0/eagle/model/view/stat_with_condition",
+    ],
    deps = [
        "//src/main/protobuf/net/eagle0/eagle/views:stat_with_condition_scala_proto",
+        "//src/main/scala/net/eagle0/eagle/model/view/stat_with_condition",
    ],
 )

@@ -1,5 +1,6 @@
 package net.eagle0.eagle.library.util

+import net.eagle0.eagle.model.view.stat_with_condition.{Condition, StatWithCondition as StatWithConditionT}
 import net.eagle0.eagle.views.stat_with_condition.StatWithCondition
 import net.eagle0.eagle.views.stat_with_condition.StatWithCondition.Condition.{HIGH, LOW, MEDIUM}

@@ -11,6 +12,13 @@ object StatWithConditionUtils {
      minHigh = 55
    )

+  def supportScala(support: Double): StatWithConditionT =
+    scWithRangesScala(
+      support.floor.toInt,
+      minMedium = 40,
+      minHigh = 55
+    )
+
  def scWithRanges(
      stat: Int,
      minMedium: Int,
@@ -23,4 +31,17 @@ object StatWithConditionUtils {
        else if stat >= minMedium then MEDIUM
        else LOW
    )
+
+  def scWithRangesScala(
+      stat: Int,
+      minMedium: Int,
+      minHigh: Int
+  ): StatWithConditionT =
+    StatWithConditionT(
+      stat = stat,
+      condition =
+        if stat >= minHigh then Condition.High
+        else if stat >= minMedium then Condition.Medium
+        else Condition.Low
+    )
 }
@@ -56,6 +56,13 @@ object FactionUtils {
  ): Boolean =
    hasTruce(fid1, fid2, factions) || hasAlliance(fid1, fid2, factions)

+  def factionsAreHostile(
+      fid1: FactionId,
+      fid2: FactionId,
+      factions: Vector[FactionT]
+  ): Boolean =
+    fid1 != fid2 && !hasTruceOrAlliance(fid1, fid2, factions)
+
  private def incomingHids(province: ProvinceT): Vector[HeroId] =
    province.incomingArmies
      .map(_.army)
@@ -42,11 +42,13 @@ scala_library(
        "//src/main/scala/net/eagle0/eagle/library/settings:gold_increase_per_economy",
        "//src/main/scala/net/eagle0/eagle/library/settings:min_support_for_taxes",
        "//src/main/scala/net/eagle0/eagle/library/settings:per_development_resource_limit",
+        "//src/main/scala/net/eagle0/eagle/library/util:battalion_utils",
        "//src/main/scala/net/eagle0/eagle/model/action_result/changed_province",
        "//src/main/scala/net/eagle0/eagle/model/action_result/changed_province/concrete",
        "//src/main/scala/net/eagle0/eagle/model/state:army",
        "//src/main/scala/net/eagle0/eagle/model/state:beast_info",
        "//src/main/scala/net/eagle0/eagle/model/state/faction",
+        "//src/main/scala/net/eagle0/eagle/model/state/game_state",
        "//src/main/scala/net/eagle0/eagle/model/state/hero",
        "//src/main/scala/net/eagle0/eagle/model/state/hero:gender",
        "//src/main/scala/net/eagle0/eagle/model/state/province",
@@ -9,11 +9,13 @@ import net.eagle0.eagle.library.settings.{
  MinSupportForTaxes,
  PerDevelopmentResourceLimit
 }
+import net.eagle0.eagle.library.util.BattalionUtils
 import net.eagle0.eagle.library.EagleInternalException
 import net.eagle0.eagle.model.action_result.changed_province.concrete.ChangedProvinceC
 import net.eagle0.eagle.model.action_result.changed_province.ChangedProvinceT
 import net.eagle0.eagle.model.state.{BattalionTypeId, BeastInfo, MovingArmy}
 import net.eagle0.eagle.model.state.faction.FactionT
+import net.eagle0.eagle.model.state.game_state.GameState
 import net.eagle0.eagle.model.state.hero.HeroT
 import net.eagle0.eagle.model.state.province.{
  BeastsEvent,
@@ -74,6 +76,15 @@ object ProvinceUtils {
        ) * FoodIncreasePerAgriculture.doubleValue).toInt
      )

+  def monthlyFoodConsumption(
+      province: ProvinceT,
+      gs: GameState
+  ): Int =
+    BattalionUtils.monthlyConsumedFood(
+      province.battalionIds.map(gs.battalions),
+      gs.battalionTypes
+    )
+
  def provinceLeader(
      startingProvince: ProvinceT,
      rulingFactionOpt: Option[FactionT],
@@ -1,14 +1,34 @@
 package net.eagle0.eagle.library.util.view_filters

 import net.eagle0.eagle.{BattalionId, FactionId}
-import net.eagle0.eagle.internal.army.Army
-import net.eagle0.eagle.internal.battalion.Battalion
+import net.eagle0.eagle.internal.army.Army as ProtoArmy
+import net.eagle0.eagle.internal.battalion.Battalion as ProtoBattalion
+import net.eagle0.eagle.model.proto_converters.CombatUnitConverter
+import net.eagle0.eagle.model.state.battalion.BattalionT
+import net.eagle0.eagle.model.state.Army as ScalaArmy
+import net.eagle0.eagle.model.view.army.ArmyView as ArmyViewT
 import net.eagle0.eagle.views.army_view.ArmyView

 object ArmyFilter {
+  // Pure Scala version
  def filterArmy(
-      army: Army,
-      battalions: Map[BattalionId, Battalion],
+      army: ScalaArmy,
+      battalions: Map[BattalionId, BattalionT],
+      factionId: Option[FactionId]
+  ): ArmyViewT =
+    ArmyViewT(
+      factionId = army.factionId,
+      units =
+        if factionId.forall(_ == army.factionId) then army.units
+        else Vector.empty,
+      unitCount = army.units.length,
+      troopCount = army.units.flatMap(_.battalionId).map(bid => battalions(bid)).map(_.size).sum
+    )
+
+  // Proto version (legacy)
+  def filterArmy(
+      army: ProtoArmy,
+      battalions: Map[BattalionId, ProtoBattalion],
      factionId: Option[FactionId]
  ): ArmyView =
    ArmyView(
@@ -19,4 +39,18 @@ object ArmyFilter {
      unitCount = army.units.length,
      troopCount = army.units.flatMap(_.battalionId).map(battalions).map(_.size).sum
    )
+
+  def filterArmyScala(
+      army: ProtoArmy,
+      battalions: Map[BattalionId, ProtoBattalion],
+      factionId: Option[FactionId]
+  ): ArmyViewT =
+    ArmyViewT(
+      factionId = army.factionId,
+      units =
+        if factionId.forall(_ == army.factionId) then army.units.map(CombatUnitConverter.fromProto).toVector
+        else Vector.empty,
+      unitCount = army.units.length,
+      troopCount = army.units.flatMap(_.battalionId).map(battalions).map(_.size).sum
+    )
 }
@@ -8,11 +8,18 @@ scala_library(
        "//src/main/scala/net/eagle0/eagle/library:__subpackages__",
        "//src/test/scala/net/eagle0/eagle/library:__subpackages__",
    ],
+    exports = [
+        "//src/main/scala/net/eagle0/eagle/model/view/army:army_view",
+    ],
    deps = [
        "//src/main/protobuf/net/eagle0/eagle/internal:army_scala_proto",
        "//src/main/protobuf/net/eagle0/eagle/internal:battalion_scala_proto",
        "//src/main/protobuf/net/eagle0/eagle/views:army_view_scala_proto",
        "//src/main/scala/net/eagle0/eagle:eagle_pkg",
+        "//src/main/scala/net/eagle0/eagle/model/proto_converters:combat_unit_converter",
+        "//src/main/scala/net/eagle0/eagle/model/state:army",
+        "//src/main/scala/net/eagle0/eagle/model/state/battalion",
+        "//src/main/scala/net/eagle0/eagle/model/view/army:army_view",
    ],
 )

@@ -116,6 +123,7 @@ scala_library(
        "//src/main/scala/net/eagle0/eagle/library/util/view_filters:faction_view_filter",
        "//src/main/scala/net/eagle0/eagle/library/util/view_filters:hero_view_filter",
        "//src/main/scala/net/eagle0/eagle/library/util/view_filters:province_view_filter",
+        "//src/main/scala/net/eagle0/eagle/model/proto_converters/view/province:province_view",
    ],
 )

@@ -146,10 +154,15 @@ scala_library(
        "//src/main/scala/net/eagle0/eagle/library:__subpackages__",
        "//src/test/scala/net/eagle0/eagle/library:__subpackages__",
    ],
+    exports = [
+        "//src/main/scala/net/eagle0/eagle/model/view/battalion",
+    ],
    deps = [
        "//src/main/protobuf/net/eagle0/eagle/internal:battalion_scala_proto",
        "//src/main/protobuf/net/eagle0/eagle/views:battalion_view_scala_proto",
        "//src/main/scala/net/eagle0/eagle:eagle_pkg",
+        "//src/main/scala/net/eagle0/eagle/model/proto_converters:battalion_type_id_converter",
+        "//src/main/scala/net/eagle0/eagle/model/view/battalion",
    ],
 )

@@ -161,20 +174,41 @@ scala_library(
        "//src/main/scala/net/eagle0/eagle/library:__subpackages__",
        "//src/test/scala/net/eagle0/eagle/library:__subpackages__",
    ],
+    exports = [
+        "//src/main/scala/net/eagle0/eagle/model/state/game_state",
+        "//src/main/scala/net/eagle0/eagle/model/state/province",
+        "//src/main/scala/net/eagle0/eagle/model/view/province:full_province_info",
+        "//src/main/scala/net/eagle0/eagle/model/view/province:province_view",
+    ],
    deps = [
        ":army_filter",
+        ":battalion_view_filter",
        ":legacy_battalion_view_filter",
        ":visibility",
        "//src/main/protobuf/net/eagle0/eagle/internal:game_state_scala_proto",
        "//src/main/scala/net/eagle0/eagle:eagle_pkg",
-        "//src/main/scala/net/eagle0/eagle/library/util:beast_utils",
        "//src/main/scala/net/eagle0/eagle/library/util:date_utils",
        "//src/main/scala/net/eagle0/eagle/library/util:incoming_army_utils",
        "//src/main/scala/net/eagle0/eagle/library/util:province_event_utils",
        "//src/main/scala/net/eagle0/eagle/library/util:stat_with_condition_utils",
        "//src/main/scala/net/eagle0/eagle/library/util/faction_utils:legacy_faction_utils",
+        "//src/main/scala/net/eagle0/eagle/library/util/hero:hero_utils",
        "//src/main/scala/net/eagle0/eagle/library/util/hero:legacy_hero_utils",
+        "//src/main/scala/net/eagle0/eagle/library/util/province",
        "//src/main/scala/net/eagle0/eagle/library/util/province:legacy_province_utils",
+        "//src/main/scala/net/eagle0/eagle/model/proto_converters:unaffiliated_hero_converter",
+        "//src/main/scala/net/eagle0/eagle/model/proto_converters/date",
+        "//src/main/scala/net/eagle0/eagle/model/proto_converters/hero:profession",
+        "//src/main/scala/net/eagle0/eagle/model/proto_converters/province:event",
+        "//src/main/scala/net/eagle0/eagle/model/proto_converters/province:order_type",
+        "//src/main/scala/net/eagle0/eagle/model/proto_converters/view/province:full_province_info",
+        "//src/main/scala/net/eagle0/eagle/model/proto_converters/view/province:province_view",
+        "//src/main/scala/net/eagle0/eagle/model/state/game_state",
+        "//src/main/scala/net/eagle0/eagle/model/state/province",
+        "//src/main/scala/net/eagle0/eagle/model/view/incoming_army:incoming_army_view",
+        "//src/main/scala/net/eagle0/eagle/model/view/province:full_province_info",
+        "//src/main/scala/net/eagle0/eagle/model/view/province:province_view",
+        "//src/main/scala/net/eagle0/eagle/model/view/province:unaffiliated_hero_basics",
    ],
 )

@@ -13,4 +13,15 @@ object BattalionViewFilter {
      armament = Some(battT.armament),
      name = battT.name
    )
+
+  /** Limited view that hides training and armament (for withdrawn faction views) */
+  def limitedBattalionView(battT: BattalionT): BattalionView =
+    BattalionView(
+      id = battT.id,
+      typeId = battT.typeId,
+      size = battT.size,
+      training = None,
+      armament = None,
+      name = battT.name
+    )
 }
@@ -1,6 +1,7 @@
 package net.eagle0.eagle.library.util.view_filters

 import net.eagle0.eagle.internal.game_state.GameState
+import net.eagle0.eagle.model.proto_converters.view.province.ProvinceViewConverter
 import net.eagle0.eagle.views.faction_view.FactionView
 import net.eagle0.eagle.views.game_state_view.GameStateView
 import net.eagle0.eagle.FactionId
@@ -16,9 +17,11 @@ object GameStateViewFilter {
      currentDate = gs.currentDate,
      provinces = gs.provinces.map {
        case (pid, prov) =>
-          pid -> factionId
-            .map(fid => ProvinceViewFilter.filteredProvinceView(prov, gs, fid))
-            .getOrElse(ProvinceViewFilter.filteredProvinceView(prov, gs))
+          pid -> ProvinceViewConverter.toProto(
+            factionId
+              .map(fid => ProvinceViewFilter.filteredProvinceView(prov, gs, fid))
+              .getOrElse(ProvinceViewFilter.filteredProvinceView(prov, gs))
+          )
      },
      heroes = (gs.heroes ++ gs.killedHeroes).map {
        case (hid, hero) =>
@@ -1,6 +1,8 @@
 package net.eagle0.eagle.library.util.view_filters

 import net.eagle0.eagle.internal.battalion.Battalion
+import net.eagle0.eagle.model.proto_converters.BattalionTypeIdConverter
+import net.eagle0.eagle.model.view.battalion.BattalionView as BattalionViewT
 import net.eagle0.eagle.views.battalion_view.BattalionView

 object LegacyBattalionViewFilter {
@@ -14,6 +16,16 @@ object LegacyBattalionViewFilter {
      name = batt.name
    )

+  def filteredBattalionViewBelongingToPlayerScala(batt: Battalion): BattalionViewT =
+    BattalionViewT(
+      id = batt.id,
+      typeId = BattalionTypeIdConverter.fromProto(batt.`type`),
+      size = batt.size,
+      training = Some(batt.training),
+      armament = Some(batt.armament),
+      name = batt.name
+    )
+
  def limitedBattalionView(batt: Battalion): BattalionView =
    BattalionView(
      id = batt.id,
@@ -23,4 +35,14 @@ object LegacyBattalionViewFilter {
      armament = None,
      name = batt.name
    )
+
+  def limitedBattalionViewScala(batt: Battalion): BattalionViewT =
+    BattalionViewT(
+      id = batt.id,
+      typeId = BattalionTypeIdConverter.fromProto(batt.`type`),
+      size = batt.size,
+      training = None,
+      armament = None,
+      name = batt.name
+    )
 }
@@ -8,14 +8,191 @@ import net.eagle0.eagle.internal.province.Province
 import net.eagle0.eagle.internal.unaffiliated_hero.UnaffiliatedHero
 import net.eagle0.eagle.library.util.{IncomingArmyUtils, ProvinceEventUtils}
 import net.eagle0.eagle.library.util.faction_utils.LegacyFactionUtils
+import net.eagle0.eagle.library.util.hero.HeroUtils
 import net.eagle0.eagle.library.util.hero.LegacyHeroUtils
 import net.eagle0.eagle.library.util.province.LegacyProvinceUtils
-import net.eagle0.eagle.library.util.StatWithConditionUtils.supportSc
-import net.eagle0.eagle.views.incoming_army_view.IncomingArmyView
-import net.eagle0.eagle.views.province_view.{FullProvinceInfo, ProvinceView, UnaffiliatedHeroBasics}
+import net.eagle0.eagle.library.util.province.ProvinceUtils
+import net.eagle0.eagle.library.util.StatWithConditionUtils.supportScala
+import net.eagle0.eagle.model.proto_converters.date.DateConverter
+import net.eagle0.eagle.model.proto_converters.hero.ProfessionConverter
+import net.eagle0.eagle.model.proto_converters.province.{ProvinceEventConverter, ProvinceOrderTypeConverter}
+import net.eagle0.eagle.model.proto_converters.view.province.{FullProvinceInfoConverter, ProvinceViewConverter}
+import net.eagle0.eagle.model.proto_converters.UnaffiliatedHeroConverter
+import net.eagle0.eagle.model.state.game_state.GameState as ScalaGameState
+import net.eagle0.eagle.model.state.province.ProvinceT
+import net.eagle0.eagle.model.state.unaffiliated_hero.RecruitmentInfo
+import net.eagle0.eagle.model.view.incoming_army.{IncomingArmyView, UnitDetails}
+import net.eagle0.eagle.model.view.province.{FullProvinceInfo, ProvinceView, UnaffiliatedHeroBasics}
 import net.eagle0.eagle.FactionId

 object ProvinceViewFilter {
+  // =============== Scala GameState overloads ===============
+
+  /** Filtered view for server-side use (no faction visibility restrictions) */
+  def filteredProvinceView(
+      province: ProvinceT,
+      gs: ScalaGameState
+  ): ProvinceView = {
+    val factions         = gs.factions.values.toVector
+    val factionLeaderIds = factions.flatMap(_.leaderIds)
+
+    val info: FullProvinceInfo = FullProvinceInfo(
+      rulingHeroId = province.rulingHeroId,
+      rulingFactionHeroIds = province.rulingFactionHeroIds
+        .map(hid => gs.heroes(hid))
+        .sortWith(HeroUtils.sortOrderer(factionLeaderIds))
+        .map(_.id),
+      battalions = province.battalionIds
+        .map(bid => gs.battalions(bid))
+        .map(BattalionViewFilter.filteredBattalionViewBelongingToPlayer)
+        .sortBy(_.typeId.value),
+      defendingArmy = province.defendingArmy
+        .map(army => ArmyFilter.filterArmy(army, gs.battalions, None)),
+      economy = province.economy.toFloat,
+      agriculture = province.agriculture.toFloat,
+      infrastructure = province.infrastructure.toFloat,
+      economyDevastation = province.economyDevastation.toFloat,
+      agricultureDevastation = province.agricultureDevastation.toFloat,
+      infrastructureDevastation = province.infrastructureDevastation.toFloat,
+      gold = province.gold,
+      food = province.food,
+      priceIndex = province.priceIndex,
+      goldCap = ProvinceUtils.goldCap(province),
+      foodCap = ProvinceUtils.foodCap(province),
+      support = Some(supportScala(province.support)),
+      foodConsumption = ProvinceUtils.monthlyFoodConsumption(province, gs),
+      provinceOrders = ProvinceOrderTypeConverter.toProto(province.provinceOrders),
+      hexMapName = province.hexMapName,
+      castleCount = province.castleCount,
+      heroCap = province.heroCap,
+      unaffiliatedHeroes = Vector.empty,
+      rulerIsTraveling = province.rulerIsTraveling
+    )
+
+    ProvinceView(
+      id = province.id,
+      name = province.name,
+      rulingFactionId = province.rulingFactionId,
+      fullInfo = Some(info),
+      knownEvents = Vector.empty,
+      asOf = gs.currentDate
+    )
+  }
+
+  /** View shown to a player who withdraws from a province they do not own. (Scala overload) */
+  def withdrawnFromProvinceView(
+      province: ProvinceT,
+      gs: ScalaGameState,
+      factionId: FactionId
+  ): ProvinceView = {
+    val reconnedView = for {
+      faction <- gs.factions.get(factionId)
+      pv      <- faction.reconnedProvinces.find(_.id == province.id)
+    } yield pv // Already Scala ProvinceView, no conversion needed
+
+    // Convert Scala events to proto for filtering (ProvinceView uses proto events)
+    val activeEventsProto = province.activeEvents.map(ProvinceEventConverter.toProto)
+    val knownEvents       = activeEventsProto.filter { pe =>
+      if reconnedView.exists(_.knownEvents.contains(pe)) then true
+      else eventIsUniversallyVisible(pe)
+    }
+
+    val incomingAttackers = myIncomingArmiesScala(province, gs, factionId)
+
+    val factions         = gs.factions.values.toVector
+    val factionLeaderIds = factions.flatMap(_.leaderIds)
+
+    val fullInfo = reconnedView
+      .flatMap(_.fullInfo)
+      .getOrElse(
+        FullProvinceInfo(
+          rulingHeroId = province.rulingHeroId,
+          rulingFactionHeroIds = province.rulingFactionHeroIds
+            .map(hid => gs.heroes(hid))
+            .sortWith(HeroUtils.sortOrderer(factionLeaderIds))
+            .map(_.id),
+          battalions = Vector.empty, // Will be replaced below
+          defendingArmy = province.defendingArmy
+            .map(army => ArmyFilter.filterArmy(army, gs.battalions, Some(factionId))),
+          economy = province.economy.toFloat,
+          agriculture = province.agriculture.toFloat,
+          infrastructure = province.infrastructure.toFloat,
+          economyDevastation = province.economyDevastation.toFloat,
+          agricultureDevastation = province.agricultureDevastation.toFloat,
+          infrastructureDevastation = province.infrastructureDevastation.toFloat,
+          gold = province.gold,
+          food = province.food,
+          priceIndex = province.priceIndex,
+          goldCap = ProvinceUtils.goldCap(province),
+          foodCap = ProvinceUtils.foodCap(province),
+          support = Some(supportScala(province.support)),
+          foodConsumption = ProvinceUtils.monthlyFoodConsumption(province, gs),
+          provinceOrders = ProvinceOrderTypeConverter.toProto(province.provinceOrders),
+          hexMapName = province.hexMapName,
+          castleCount = province.castleCount,
+          heroCap = province.heroCap,
+          unaffiliatedHeroes = Vector.empty,
+          rulerIsTraveling = province.rulerIsTraveling
+        )
+      )
+      .copy(
+        battalions = province.battalionIds
+          .map(bid => gs.battalions(bid))
+          .map(BattalionViewFilter.limitedBattalionView)
+          .toVector
+      )
+
+    ProvinceView(
+      id = province.id,
+      name = province.name,
+      rulingFactionId = province.rulingFactionId,
+      fullInfo = Some(fullInfo),
+      knownEvents = knownEvents.toVector,
+      asOf = reconnedView.flatMap(_.asOf),
+      knownIncomingArmies = incomingAttackers
+    )
+  }
+
+  private def myIncomingArmiesScala(
+      province: ProvinceT,
+      gs: ScalaGameState,
+      factionId: FactionId
+  ): Vector[IncomingArmyView] =
+    province.incomingArmies
+      .filter(_.army.factionId == factionId)
+      .map(army => incomingArmyInfoScala(ma = army, gs = gs, showDetails = true))
+
+  private def incomingArmyInfoScala(
+      ma: net.eagle0.eagle.model.state.MovingArmy,
+      gs: ScalaGameState,
+      showDetails: Boolean
+  ): IncomingArmyView =
+    IncomingArmyView(
+      factionId = ma.army.factionId,
+      heroCount = ma.army.units.size,
+      troopCount = ma.army.units
+        .flatMap(_.battalionId)
+        .map(gs.battalions)
+        .map(_.size)
+        .sum,
+      originProvinceId = ma.originProvinceId,
+      destinationProvinceId = ma.destinationProvinceId,
+      arrivalRoundId = ma.arrivalRound,
+      food = ma.supplies.food,
+      gold = ma.supplies.gold,
+      unitDetails =
+        if showDetails then
+          ma.army.units.map { cu =>
+            UnitDetails(
+              heroId = cu.heroId,
+              battalion = cu.battalionId.map(gs.battalions).map { b =>
+                BattalionViewFilter.filteredBattalionViewBelongingToPlayer(b)
+              }
+            )
+          }
+        else Vector()
+    )
+
  private val universallyVisibleCheckers: List[ProvinceEvent => Boolean] = List(
    ProvinceEventUtils.isBlizzardEvent,
    ProvinceEventUtils.isFestivalEvent,
@@ -36,21 +213,19 @@ object ProvinceViewFilter {
      name = province.name,
      rulingFactionId = province.rulingFactionId,
      fullInfo = Some(fullProvinceInfo(province, gs, None)),
-      knownEvents = province.activeEvents,
-      asOf = Some(gs.currentDate.get)
+      knownEvents = province.activeEvents.toVector,
+      asOf = Some(DateConverter.fromProto(gs.currentDate))
    )

  private def deadHeroesFilteredOut(
      fullProvinceInfo: FullProvinceInfo,
      gameState: GameState
  ): FullProvinceInfo =
-    fullProvinceInfo.update(
-      _.rulingFactionHeroIds.modify(
-        _.filterNot(hid => gameState.killedHeroes.contains(hid))
-      ),
-      _.unaffiliatedHeroes.modify(
-        _.filterNot(uh => gameState.killedHeroes.contains(uh.heroId))
-      )
+    fullProvinceInfo.copy(
+      rulingFactionHeroIds =
+        fullProvinceInfo.rulingFactionHeroIds.filterNot(hid => gameState.killedHeroes.contains(hid)),
+      unaffiliatedHeroes =
+        fullProvinceInfo.unaffiliatedHeroes.filterNot(uh => gameState.killedHeroes.contains(uh.heroId))
    )

  def filteredProvinceView(
@@ -65,11 +240,13 @@ object ProvinceViewFilter {
    ) ++ gs.factions.get(factionId)

    // Take the most recent reconned view from this faction or any allies
+    // (stored as proto, convert to Scala)
    val reconnedView =
      relevantFactions
        .flatMap(_.reconnedProvinces)
        .filter(_.id == province.id)
        .maxByOption(_.getAsOf)
+        .map(ProvinceViewConverter.fromProto)

    val showAll = province.rulingFactionId.exists { rfid =>
      Visibility.hasFullVisibility(factionId, rfid, gs)
@@ -103,7 +280,7 @@ object ProvinceViewFilter {
            food = shipment.supplies.map(_.food).getOrElse(0),
            gold = shipment.supplies.map(_.gold).getOrElse(0)
          )
-        }
+        }.toVector
      else Vector()

    val fullInfo = Option
@@ -117,9 +294,9 @@ object ProvinceViewFilter {
      name = province.name,
      rulingFactionId = province.rulingFactionId,
      fullInfo = fullInfo,
-      knownEvents = knownEvents,
+      knownEvents = knownEvents.toVector,
      asOf =
-        if showAll then Some(gs.currentDate.get)
+        if showAll then Some(DateConverter.fromProto(gs.currentDate))
        else reconnedView.flatMap(_.asOf),
      knownIncomingArmies = incomingAttackers ++ incomingSupplies
    )
@@ -131,10 +308,11 @@ object ProvinceViewFilter {
      gs: GameState,
      factionId: FactionId
  ): ProvinceView = {
+    // Stored as proto, convert to Scala
    val reconnedView = for {
      faction <- gs.factions.get(factionId)
      pv      <- faction.reconnedProvinces.find(_.id == province.id)
-    } yield pv
+    } yield ProvinceViewConverter.fromProto(pv)

    val knownEvents = province.activeEvents.filter { pe =>
      if reconnedView.exists(_.knownEvents.contains(pe)) then true
@@ -148,10 +326,13 @@ object ProvinceViewFilter {
    val fullInfo = reconnedView
      .flatMap(_.fullInfo)
      .getOrElse(fullProvinceInfo(province, gs, Some(factionId)))
-      .update(
-        _.battalions := province.battalionIds.map(gs.battalions).map {
-          LegacyBattalionViewFilter.limitedBattalionView
-        }
+      .copy(
+        battalions = province.battalionIds
+          .map(gs.battalions)
+          .map {
+            LegacyBattalionViewFilter.limitedBattalionViewScala
+          }
+          .toVector
      )

    ProvinceView(
@@ -159,7 +340,7 @@ object ProvinceViewFilter {
      name = province.name,
      rulingFactionId = province.rulingFactionId,
      fullInfo = Some(fullInfo),
-      knownEvents = knownEvents,
+      knownEvents = knownEvents.toVector,
      asOf = reconnedView.flatMap(_.asOf),
      knownIncomingArmies = incomingAttackers ++ incomingSupplies
    )
@@ -172,13 +353,15 @@ object ProvinceViewFilter {
  ): FullProvinceInfo = FullProvinceInfo(
    rulingHeroId = province.rulingHeroId,
    rulingFactionHeroIds = province.rulingFactionHeroIds
-      .sortWith(LegacyHeroUtils.sortOrderer(gs)),
+      .sortWith(LegacyHeroUtils.sortOrderer(gs))
+      .toVector,
    battalions = province.battalionIds
      .map(gs.battalions)
-      .map(LegacyBattalionViewFilter.filteredBattalionViewBelongingToPlayer)
-      .sortBy(_.`type`.index),
+      .map(LegacyBattalionViewFilter.filteredBattalionViewBelongingToPlayerScala)
+      .sortBy(_.typeId.value)
+      .toVector,
    defendingArmy = province.defendingArmy
-      .map(ArmyFilter.filterArmy(_, gs.battalions, factionId)),
+      .map(ArmyFilter.filterArmyScala(_, gs.battalions, factionId)),
    economy = province.economy.toFloat,
    agriculture = province.agriculture.toFloat,
    infrastructure = province.infrastructure.toFloat,
@@ -190,13 +373,13 @@ object ProvinceViewFilter {
    priceIndex = province.priceIndex,
    goldCap = LegacyProvinceUtils.goldCap(province),
    foodCap = LegacyProvinceUtils.foodCap(province),
-    support = Some(supportSc(province.support)),
+    support = Some(supportScala(province.support)),
    foodConsumption = LegacyProvinceUtils.monthlyFoodConsumption(province.id, gs),
    provinceOrders = province.provinceOrders,
    hexMapName = province.hexMapName,
    castleCount = province.castleCount,
    heroCap = province.heroCap,
-    unaffiliatedHeroes = province.unaffiliatedHeroes.map(unaffiliatedHeroInfo(_, gs)),
+    unaffiliatedHeroes = province.unaffiliatedHeroes.map(unaffiliatedHeroInfo(_, gs)).toVector,
    rulerIsTraveling = province.rulerIsTraveling
  )

@@ -224,6 +407,7 @@ object ProvinceViewFilter {
        )
      )
      .map(army => incomingArmyInfo(ma = army, gs = gs, showDetails = false))
+      .toVector

  private def incomingArmyInfo(
      ma: MovingArmy,
@@ -246,14 +430,14 @@ object ProvinceViewFilter {
      unitDetails =
        if showDetails then
          ma.getArmy.units.map { cu =>
-            IncomingArmyView.UnitDetails(
+            UnitDetails(
              heroId = cu.heroId,
              battalion = cu.battalionId.map(gs.battalions).map { b =>
                LegacyBattalionViewFilter
-                  .filteredBattalionViewBelongingToPlayer(b)
+                  .filteredBattalionViewBelongingToPlayerScala(b)
              }
            )
-          }
+          }.toVector
        else Vector()
    )

@@ -265,10 +449,11 @@ object ProvinceViewFilter {
      UnaffiliatedHeroBasics(
        heroId = hero.id,
        nameTextId = hero.nameTextId,
-        profession = hero.profession,
-        status = uh.`type`,
+        profession = ProfessionConverter.fromProto(hero.profession),
+        status = UnaffiliatedHeroConverter.unaffiliatedHeroTypeFromProto(uh.`type`),
        isFactionLeader = LegacyFactionUtils.isFactionLeader(hero.id, gs),
-        recruitmentInfo = uh.recruitmentInfo
+        recruitmentInfo =
+          uh.recruitmentInfo.fold(RecruitmentInfo.Unknown)(UnaffiliatedHeroConverter.recruitmentInfoFromProto)
      )
  }
 }
@@ -1,6 +1,7 @@
 package net.eagle0.eagle.model.action_result

 import net.eagle0.eagle.{BattalionId, FactionId, HeroId, ProvinceId, RoundId}
+import net.eagle0.eagle.api.selected_command.SelectedCommand
 import net.eagle0.eagle.model.action_result.changed_province.ChangedProvinceT
 import net.eagle0.eagle.model.action_result.generated_text_request.GeneratedTextRequestT
 import net.eagle0.eagle.model.action_result.types.base.ActionResultType
@@ -27,7 +28,7 @@ trait ActionResultT {
  def newRoundId: Option[RoundId]
  def newDate: Option[Date]

-  // def lastCommandTypeForActingProvince: Option[CommandType]
+  def lastCommandTypeForActingProvince: Option[SelectedCommand]

  def newBattle: Option[ShardokBattle]
  // def resolvedBattle: Option[String]
@@ -73,7 +74,7 @@ trait ActionResultT {
      newRoundPhase: Option[RoundPhase] = newRoundPhase,
      newRoundId: Option[RoundId] = newRoundId,
      newDate: Option[Date] = newDate,
-      // lastCommandTypeForActingProvince: Option[CommandType] = None,
+      lastCommandTypeForActingProvince: Option[SelectedCommand] = lastCommandTypeForActingProvince,
      newBattle: Option[ShardokBattle] = newBattle,
      // resolvedBattle: Option[String] = None,
      // resolvedImminentBattle: Option[Int] = None,
@@ -51,6 +51,7 @@ scala_library(
        ":changed_hero_trait",
        ":client_text_visibility_extension_trait",
        ":notification_trait",
+        "//src/main/protobuf/net/eagle0/eagle/api:selected_command_scala_proto",
        "//src/main/scala/net/eagle0/eagle:eagle_pkg",
        "//src/main/scala/net/eagle0/eagle/model/action_result/changed_province",
        "//src/main/scala/net/eagle0/eagle/model/action_result/generated_text_request",
@@ -1,6 +1,7 @@
 package net.eagle0.eagle.model.action_result.concrete

 import net.eagle0.eagle.{BattalionId, FactionId, HeroId, ProvinceId, RoundId}
+import net.eagle0.eagle.api.selected_command.SelectedCommand
 import net.eagle0.eagle.model.action_result.{
  ActionResultT,
  ChangedBattalionT,
@@ -34,6 +35,7 @@ case class ActionResultC(
    newRoundPhase: Option[RoundPhase] = None,
    newRoundId: Option[RoundId] = None,
    newDate: Option[Date] = None,
+    lastCommandTypeForActingProvince: Option[SelectedCommand] = None,
    newBattle: Option[ShardokBattle] = None,
    newChronicleEntry: Option[ChronicleEntry] = None,
    changedBattalions: Vector[ChangedBattalionT] = Vector.empty,
@@ -68,6 +70,7 @@ case class ActionResultC(
      newRoundPhase: Option[RoundPhase] = newRoundPhase,
      newRoundId: Option[RoundId] = newRoundId,
      newDate: Option[Date] = newDate,
+      lastCommandTypeForActingProvince: Option[SelectedCommand] = lastCommandTypeForActingProvince,
      newBattle: Option[ShardokBattle] = newBattle,
      newChronicleEntry: Option[ChronicleEntry] = newChronicleEntry,
      changedBattalions: Vector[ChangedBattalionT] = changedBattalions,
@@ -99,6 +102,7 @@ case class ActionResultC(
      newRoundPhase = newRoundPhase,
      newRoundId = newRoundId,
      newDate = newDate,
+      lastCommandTypeForActingProvince = lastCommandTypeForActingProvince,
      newBattle = newBattle,
      newChronicleEntry = newChronicleEntry,
      changedBattalions = changedBattalions,
@@ -16,6 +16,7 @@ scala_library(
        "//src/main/scala/net/eagle0/eagle/model/action_result/types/base:action_result_type",
    ],
    deps = [
+        "//src/main/protobuf/net/eagle0/eagle/api:selected_command_scala_proto",
        "//src/main/scala/net/eagle0/eagle:eagle_pkg",
        "//src/main/scala/net/eagle0/eagle/model/action_result:action_result_trait",
        "//src/main/scala/net/eagle0/eagle/model/action_result:changed_battalion_trait",
@@ -71,12 +72,12 @@ scala_library(
        "//src/main/scala/net/eagle0/eagle/model/action_result:changed_faction_trait",
    ],
    deps = [
-        "//src/main/protobuf/net/eagle0/eagle/views:province_view_scala_proto",
        "//src/main/scala/net/eagle0/eagle:eagle_pkg",
        "//src/main/scala/net/eagle0/eagle/model/action_result:changed_faction_trait",
        "//src/main/scala/net/eagle0/eagle/model/state/diplomacy_offer",
        "//src/main/scala/net/eagle0/eagle/model/state/faction:faction_relationship",
        "//src/main/scala/net/eagle0/eagle/model/state/faction:prestige_modifier",
+        "//src/main/scala/net/eagle0/eagle/model/view/province:province_view",
    ],
 )

@@ -10,7 +10,7 @@ import net.eagle0.eagle.model.action_result.concrete.ChangedFactionC.{
 import net.eagle0.eagle.model.action_result.ChangedFactionT
 import net.eagle0.eagle.model.state.diplomacy_offer.DiplomacyOffer
 import net.eagle0.eagle.model.state.faction.{FactionRelationship, PrestigeModifier}
-import net.eagle0.eagle.views.province_view.ProvinceView
+import net.eagle0.eagle.model.view.province.ProvinceView

 case class TrustLevelUpdate(
    targetFactionId: FactionId,
@@ -1,6 +1,7 @@
 package net.eagle0.eagle.model.proto_converters

 import net.eagle0.eagle.{BattalionId, FactionId, HeroId, ProvinceId, RoundId}
+import net.eagle0.eagle.api.selected_command.SelectedCommand
 import net.eagle0.eagle.common.action_result_type.ActionResultType as ActionResultTypeProto
 import net.eagle0.eagle.common.round_phase.NewRoundPhase as NewRoundPhaseProto
 import net.eagle0.eagle.internal.action_result.ActionResult as ActionResultProto
@@ -53,6 +54,7 @@ object ActionResultProtoConverter {
            newRoundPhase: Option[RoundPhase],
            newRoundId: Option[RoundId],
            newDate: Option[Date],
+            lastCommandTypeForActingProvince: Option[SelectedCommand],
            newBattle: Option[ShardokBattle],
            newChronicleEntry: Option[ChronicleEntry],
            changedBattalions: Vector[ChangedBattalionT],
@@ -86,6 +88,7 @@ object ActionResultProtoConverter {
          newRoundPhase = newRoundPhase.map(rp => NewRoundPhaseProto(RoundPhaseConverter.toProto(rp))),
          newRoundId = newRoundId,
          newDate = newDate.map(DateConverter.toProto),
+          lastCommandTypeForActingProvince = lastCommandTypeForActingProvince.getOrElse(SelectedCommand.Empty),
          newBattle = newBattle.map(ShardokBattleConverter.toProto),
          newChronicleEntry = newChronicleEntry.map(ChronicleEntryConverter.toProto),
          changedBattalions = changedBattalions.map {
@@ -24,6 +24,7 @@ scala_library(
        ":changed_province_converter",
        ":notification_converter",
        ":round_phase_converter",
+        "//src/main/protobuf/net/eagle0/eagle/api:selected_command_scala_proto",
        "//src/main/protobuf/net/eagle0/eagle/common:action_result_type_scala_proto",
        "//src/main/protobuf/net/eagle0/eagle/internal:action_result_scala_proto",
        "//src/main/scala/net/eagle0/eagle:eagle_pkg",
@@ -110,6 +111,9 @@ scala_library(
        "//src/main/scala/net/eagle0/eagle/model/proto_converters/view/battalion:__pkg__",
        "//src/test/scala/net/eagle0/eagle/model/proto_converters:__pkg__",
    ],
+    exports = [
+        "//src/main/scala/net/eagle0/eagle/model/state:battalion_type_id",
+    ],
    deps = [
        "//src/main/protobuf/net/eagle0/eagle/common:battalion_type_scala_proto",
        "//src/main/scala/net/eagle0/eagle:eagle_pkg",
@@ -211,10 +215,13 @@ scala_library(
    ],
    deps = [
        "//src/main/protobuf/net/eagle0/eagle/internal:changed_faction_scala_proto",
+        "//src/main/protobuf/net/eagle0/eagle/views:province_view_scala_proto",
        "//src/main/scala/net/eagle0/eagle:eagle_pkg",
        "//src/main/scala/net/eagle0/eagle/model/action_result/concrete:changed_faction_concrete",
        "//src/main/scala/net/eagle0/eagle/model/proto_converters/diplomacy_offer",
        "//src/main/scala/net/eagle0/eagle/model/proto_converters/faction",
+        "//src/main/scala/net/eagle0/eagle/model/proto_converters/view/province:province_view",
+        "//src/main/scala/net/eagle0/eagle/model/view/province:province_view",
    ],
 )

@@ -257,9 +264,14 @@ scala_library(
    srcs = ["CombatUnitConverter.scala"],
    visibility = [
        "//src/main/scala/net/eagle0/eagle/library/actions/impl:__subpackages__",
+        "//src/main/scala/net/eagle0/eagle/library/util/view_filters:__pkg__",
+        "//src/main/scala/net/eagle0/eagle/model/proto_converters/view:__subpackages__",
        "//src/test/scala/net/eagle0/eagle/library/actions/impl/command:__pkg__",
        "//src/test/scala/net/eagle0/eagle/model/proto_converters:__pkg__",
    ],
+    exports = [
+        "//src/main/scala/net/eagle0/eagle/model/state:combat_unit",
+    ],
    deps = [
        "//src/main/protobuf/net/eagle0/eagle/common:combat_unit_scala_proto",
        "//src/main/scala/net/eagle0/eagle:eagle_pkg",
@@ -425,10 +437,15 @@ scala_library(
    visibility = [
        "//src/main/scala/net/eagle0/eagle/library/actions/availability:__pkg__",
        "//src/main/scala/net/eagle0/eagle/library/actions/impl:__subpackages__",
+        "//src/main/scala/net/eagle0/eagle/library/util/view_filters:__pkg__",
        "//src/main/scala/net/eagle0/eagle/model/proto_converters/province:__pkg__",
+        "//src/main/scala/net/eagle0/eagle/model/proto_converters/view:__subpackages__",
        "//src/test/scala/net/eagle0/eagle/library/actions/impl:__subpackages__",
        "//src/test/scala/net/eagle0/eagle/model/proto_converters:__pkg__",
    ],
+    exports = [
+        "//src/main/scala/net/eagle0/eagle/model/state/unaffiliated_hero",
+    ],
    deps = [
        "//src/main/protobuf/net/eagle0/eagle/internal:unaffiliated_hero_scala_proto",
        "//src/main/scala/net/eagle0/eagle:eagle_pkg",
@@ -18,9 +18,11 @@ import net.eagle0.eagle.model.action_result.concrete.ChangedFactionC.{
 import net.eagle0.eagle.model.action_result.ChangedFactionT
 import net.eagle0.eagle.model.proto_converters.diplomacy_offer.DiplomacyOfferConverter
 import net.eagle0.eagle.model.proto_converters.faction.FactionConverter
+import net.eagle0.eagle.model.proto_converters.view.province.ProvinceViewConverter
 import net.eagle0.eagle.model.state.diplomacy_offer.DiplomacyOffer
 import net.eagle0.eagle.model.state.faction.{FactionRelationship, PrestigeModifier}
-import net.eagle0.eagle.views.province_view.ProvinceView
+import net.eagle0.eagle.model.view.province.ProvinceView
+import net.eagle0.eagle.views.province_view.ProvinceView as ProvinceViewProto

 object ChangedFactionConverter {
  def toProto(changedFaction: ChangedFactionT): ChangedFactionProto =
@@ -73,7 +75,7 @@ object ChangedFactionConverter {
          addedOutgoingRansomOfferPartners = newOutgoingRansomOfferFactionIds.map(_.fid),
          newFocusProvinceId = newFocusProvinceId,
          clearFocusProvinceId = clearFocusProvinceId,
-          updatedReconnedProvinces = updatedReconnedProvinces,
+          updatedReconnedProvinces = updatedReconnedProvinces.map(ProvinceViewConverter.toProto),
          removedReconnedProvinceIds = removedReconnedProvinceIds,
          trustLevelUpdates = trustLevelUpdates.map { tlu =>
            TrustLevelUpdateProto(
@@ -105,7 +107,7 @@ object ChangedFactionConverter {
            addedOutgoingRansomOfferPartners: Seq[FactionId],
            newFocusProvinceId: Option[ProvinceId],
            clearFocusProvinceId: Boolean,
-            updatedReconnedProvinces: Seq[ProvinceView],
+            updatedReconnedProvinces: Seq[ProvinceViewProto],
            removedReconnedProvinceIds: Seq[ProvinceId],
            trustLevelUpdates: Seq[TrustLevelUpdateProto],
            newLastActedProvinceId: Option[ProvinceId],
@@ -141,7 +143,7 @@ object ChangedFactionConverter {
            .toVector,
          newFocusProvinceId = newFocusProvinceId,
          clearFocusProvinceId = clearFocusProvinceId,
-          updatedReconnedProvinces = updatedReconnedProvinces.toVector,
+          updatedReconnedProvinces = updatedReconnedProvinces.map(ProvinceViewConverter.fromProto).toVector,
          removedReconnedProvinceIds = removedReconnedProvinceIds.toVector,
          trustLevelUpdates = trustLevelUpdates.map { tlu =>
            TrustLevelUpdate(
@@ -31,7 +31,12 @@ object UnaffiliatedHeroConverter {
      UNAFFILIATED_HERO_RETURNING_PRISONER -> UnaffiliatedHeroType.ReturningPrisoner
    )

-  private def recruitmentInfoFromProto(
+  def unaffiliatedHeroTypeFromProto(
+      protoType: UnaffiliatedHeroTypeProto
+  ): UnaffiliatedHeroType =
+    unaffiliatedHeroTypeMap.getOrElse(protoType, UnaffiliatedHeroType.Unknown)
+
+  def recruitmentInfoFromProto(
      recruitmentInfoProto: RecruitmentInfoProto
  ): RecruitmentInfo = recruitmentInfoProto.status match {
    case RecruitmentStatusProto.RECRUITMENT_STATUS_UNKNOWN              =>
@@ -7,6 +7,7 @@ scala_library(
        "//src/main/scala/net/eagle0/eagle/library:__pkg__",
        "//src/main/scala/net/eagle0/eagle/library/actions/impl:__subpackages__",
        "//src/main/scala/net/eagle0/eagle/library/util/quest_fulfillment:__pkg__",
+        "//src/main/scala/net/eagle0/eagle/library/util/view_filters:__pkg__",
        "//src/main/scala/net/eagle0/eagle/model:__subpackages__",
        "//src/main/scala/net/eagle0/eagle/service:__pkg__",
        "//src/main/scala/net/eagle0/eagle/service/new_game_creation:__pkg__",
@@ -15,14 +15,17 @@ scala_library(
    ],
    deps = [
        "//src/main/protobuf/net/eagle0/eagle/internal:faction_scala_proto",
+        "//src/main/protobuf/net/eagle0/eagle/views:province_view_scala_proto",
        "//src/main/scala/net/eagle0/eagle:eagle_pkg",
        "//src/main/scala/net/eagle0/eagle/model/proto_converters:proto_conversion_exception",
        "//src/main/scala/net/eagle0/eagle/model/proto_converters/date",
        "//src/main/scala/net/eagle0/eagle/model/proto_converters/diplomacy_offer",
+        "//src/main/scala/net/eagle0/eagle/model/proto_converters/view/province:province_view",
        "//src/main/scala/net/eagle0/eagle/model/state/date",
        "//src/main/scala/net/eagle0/eagle/model/state/diplomacy_offer",
        "//src/main/scala/net/eagle0/eagle/model/state/faction",
        "//src/main/scala/net/eagle0/eagle/model/state/faction:faction_relationship",
        "//src/main/scala/net/eagle0/eagle/model/state/faction/concrete",
+        "//src/main/scala/net/eagle0/eagle/model/view/province:province_view",
    ],
 )
@@ -7,13 +7,15 @@ import net.eagle0.eagle.internal.faction.Faction.OutgoingOfferRound as OutgoingO
 import net.eagle0.eagle.internal.faction_relationship.FactionRelationship as FactionRelationshipProto
 import net.eagle0.eagle.model.proto_converters.date.DateConverter
 import net.eagle0.eagle.model.proto_converters.diplomacy_offer.DiplomacyOfferConverter
+import net.eagle0.eagle.model.proto_converters.view.province.ProvinceViewConverter
 import net.eagle0.eagle.model.proto_converters.ProtoConversionException
 import net.eagle0.eagle.model.state.date.Date
 import net.eagle0.eagle.model.state.diplomacy_offer.DiplomacyOffer
 import net.eagle0.eagle.model.state.faction.{FactionRelationship, FactionT, PrestigeModifier}
 import net.eagle0.eagle.model.state.faction.concrete.FactionC
 import net.eagle0.eagle.model.state.faction.FactionT.OutgoingOfferRound
-import net.eagle0.eagle.views.province_view.ProvinceView
+import net.eagle0.eagle.model.view.province.ProvinceView
+import net.eagle0.eagle.views.province_view.ProvinceView as ProvinceViewProto

 object FactionConverter {
  def toProto(faction: FactionT): FactionProto = faction match {
@@ -43,7 +45,7 @@ object FactionConverter {
        factionRelationships = factionRelationships.map(toProto),
        incomingDiplomacyOffers = incomingDiplomacyOffers.map(DiplomacyOfferConverter.toProto),
        focusProvinceId = focusProvinceId,
-        reconnedProvinces = reconnedProvinces,
+        reconnedProvinces = reconnedProvinces.map(ProvinceViewConverter.toProto),
        lastActedProvinceIdThisRound = lastActedProvinceIdThisRound,
        lastOutgoingTruceOfferRounds = lastOutgoingTruceOfferRounds.map(toProto),
        lastOutgoingAllianceOfferRounds = lastOutgoingAllianceOfferRounds.map(toProto),
@@ -117,7 +119,7 @@ object FactionConverter {
          factionRelationships: Seq[FactionRelationshipProto],
          incomingDiplomacyOffers: Seq[DiplomacyOfferProto],
          focusProvinceId: Option[ProvinceId],
-          reconnedProvinces: Seq[ProvinceView],
+          reconnedProvinces: Seq[ProvinceViewProto],
          lastActedProvinceIdThisRound: ProvinceId,
          lastOutgoingTruceOfferRounds: Seq[OutgoingOfferRoundProto],
          lastOutgoingAllianceOfferRounds: Seq[OutgoingOfferRoundProto],
@@ -137,7 +139,7 @@ object FactionConverter {
          .map(DiplomacyOfferConverter.fromProto)
          .toVector,
        focusProvinceId = focusProvinceId,
-        reconnedProvinces = reconnedProvinces.toVector,
+        reconnedProvinces = reconnedProvinces.map(ProvinceViewConverter.fromProto).toVector,
        lastActedProvinceIdThisRound = lastActedProvinceIdThisRound,
        lastOutgoingTruceOfferRounds = lastOutgoingTruceOfferRounds.map(fromProto).toVector,
        lastOutgoingAllianceOfferRounds = lastOutgoingAllianceOfferRounds.map(fromProto).toVector,
@@ -85,6 +85,7 @@ scala_library(
    visibility = [
        "//src/main/scala/net/eagle0/eagle/library:__subpackages__",
        "//src/main/scala/net/eagle0/eagle/library/actions/impl:__subpackages__",
+        "//src/main/scala/net/eagle0/eagle/library/util/view_filters:__pkg__",
        "//src/main/scala/net/eagle0/eagle/model/proto_converters:__pkg__",
        "//src/main/scala/net/eagle0/eagle/model/proto_converters:__subpackages__",
        "//src/main/scala/net/eagle0/eagle/service:__pkg__",
@@ -36,7 +36,8 @@ object HeroConverter {
          imagePath: String,
          personalityWords: Vector[String],
          backstoryVersions: Vector[BackstoryVersion],
-          backstoryEvents: Vector[EventForHeroBackstoryT]
+          backstoryEvents: Vector[EventForHeroBackstoryT],
+          ledFactionName: Option[String]
        ) =>
      HeroProto(
        id = id,
@@ -67,7 +68,8 @@ object HeroConverter {
          case BackstoryVersion(textId, date) =>
            BackstoryVersionProto(textId, Some(DateConverter.toProto(date)))
        },
-        newBackstoryEvents = backstoryEvents.map(EventForHeroBackstoryConverter.toProto)
+        newBackstoryEvents = backstoryEvents.map(EventForHeroBackstoryConverter.toProto),
+        ledFactionName = ledFactionName.getOrElse("")
      )
  }

@@ -99,6 +101,7 @@ object HeroConverter {
          backstoryVersions,
          newBackstoryEvents,
          pronounGender,
+          ledFactionName,
          _ /* unknownFields */
        ) =>
      HeroC(
@@ -132,7 +135,8 @@ object HeroConverter {
        }.toVector,
        backstoryEvents = newBackstoryEvents
          .map(EventForHeroBackstoryConverter.fromProto)
-          .toVector
+          .toVector,
+        ledFactionName = Option(ledFactionName).filter(_.nonEmpty)
      )
  }
 }
@@ -45,6 +45,7 @@ scala_library(
    srcs = ["ProvinceEventConverter.scala"],
    visibility = [
        "//src/main/scala/net/eagle0/eagle/library/actions/impl:__subpackages__",
+        "//src/main/scala/net/eagle0/eagle/library/util/view_filters:__pkg__",
        "//src/main/scala/net/eagle0/eagle/model/proto_converters:__pkg__",
        "//src/test/scala/net/eagle0/eagle/model/proto_converters:__pkg__",
    ],
@@ -65,6 +66,7 @@ scala_library(
    visibility = [
        "//src/main/scala/net/eagle0/eagle/library:__pkg__",
        "//src/main/scala/net/eagle0/eagle/library/actions/impl:__subpackages__",
+        "//src/main/scala/net/eagle0/eagle/library/util/view_filters:__pkg__",
        "//src/test/scala/net/eagle0/eagle/model/proto_converters:__pkg__",
    ],
    deps = [
@@ -100,7 +100,7 @@ object ProvinceConverter {
          hexMapName: String,
          castleCount: Int,
          heroCap: Int,
-          lastCommand: Any
+          lastCommand: Option[SelectedCommand]
        ) =>
      ProvinceProto(
        id = id,
@@ -131,15 +131,7 @@ object ProvinceConverter {
        activeEvents = activeEvents.map(ProvinceEventConverter.toProto),
        lastBeastsDate = lastBeastsDate.map(DateConverter.toProto),
        lastRiotDate = lastRiotDate.map(DateConverter.toProto),
-        lastCommand = lastCommand match {
-          case Some(sc: SelectedCommand) =>
-            sc
-          case Some(x)                   =>
-            throw new ProtoConversionException(
-              s"Unknown lastCommand type: ${x.getClass}"
-            )
-          case None                      => SelectedCommand.Empty
-        },
+        lastCommand = lastCommand.getOrElse(SelectedCommand.Empty),
        incomingArmies = incomingArmies.map(ArmyConverter.toProto),
        hostileArmies = hostileArmies.map(ArmyConverter.toProto),
        defendingArmy = defendingArmy.map(ArmyConverter.toProto),
@@ -228,7 +220,7 @@ object ProvinceConverter {
        activeEvents = activeEvents.map(ProvinceEventConverter.fromProto).toVector,
        lastBeastsDate = lastBeastsDate.map(date => DateConverter.fromProto(Some(date))),
        lastRiotDate = lastRiotDate.map(date => DateConverter.fromProto(Some(date))),
-        lastCommand = Some(lastCommand),
+        lastCommand = Option.when(!lastCommand.isEmpty)(lastCommand),
        incomingArmies = incomingArmies.map(ArmyConverter.fromProto).toVector,
        hostileArmies = hostileArmies.map(ArmyConverter.fromProto).toVector,
        defendingArmy = defendingArmy.map(ArmyConverter.fromProto),
@@ -0,0 +1,23 @@
+package net.eagle0.eagle.model.proto_converters.view.army
+
+import net.eagle0.eagle.model.proto_converters.CombatUnitConverter
+import net.eagle0.eagle.model.view.army.ArmyView
+import net.eagle0.eagle.views.army_view.ArmyView as ArmyViewProto
+
+object ArmyViewConverter {
+  def toProto(armyView: ArmyView): ArmyViewProto =
+    ArmyViewProto(
+      factionId = armyView.factionId,
+      units = armyView.units.map(CombatUnitConverter.toProto),
+      unitCount = armyView.unitCount,
+      troopCount = armyView.troopCount
+    )
+
+  def fromProto(armyViewProto: ArmyViewProto): ArmyView =
+    ArmyView(
+      factionId = armyViewProto.factionId,
+      units = armyViewProto.units.map(CombatUnitConverter.fromProto).toVector,
+      unitCount = armyViewProto.unitCount,
+      troopCount = armyViewProto.troopCount
+    )
+}
@@ -0,0 +1,14 @@
+load("@rules_scala//scala:scala.bzl", "scala_library")
+
+scala_library(
+    name = "army",
+    srcs = ["ArmyViewConverter.scala"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//src/main/protobuf/net/eagle0/eagle/views:army_view_scala_proto",
+        "//src/main/scala/net/eagle0/eagle:eagle_pkg",
+        "//src/main/scala/net/eagle0/eagle/model/proto_converters:combat_unit_converter",
+        "//src/main/scala/net/eagle0/eagle/model/state:combat_unit",
+        "//src/main/scala/net/eagle0/eagle/model/view/army:army_view",
+    ],
+)
@@ -5,6 +5,7 @@ scala_library(
    srcs = ["BattalionViewConverter.scala"],
    visibility = [
        "//src/main/scala/net/eagle0/eagle/model/proto_converters/hero:__pkg__",
+        "//src/main/scala/net/eagle0/eagle/model/proto_converters/view:__subpackages__",
    ],
    deps = [
        "//src/main/protobuf/net/eagle0/eagle/views:battalion_view_scala_proto",
@@ -0,0 +1,14 @@
+load("@rules_scala//scala:scala.bzl", "scala_library")
+
+scala_library(
+    name = "incoming_army",
+    srcs = ["IncomingArmyViewConverter.scala"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//src/main/protobuf/net/eagle0/eagle/views:incoming_army_view_scala_proto",
+        "//src/main/scala/net/eagle0/eagle:eagle_pkg",
+        "//src/main/scala/net/eagle0/eagle/model/proto_converters/view/battalion",
+        "//src/main/scala/net/eagle0/eagle/model/view/battalion",
+        "//src/main/scala/net/eagle0/eagle/model/view/incoming_army:incoming_army_view",
+    ],
+)
@@ -0,0 +1,49 @@
+package net.eagle0.eagle.model.proto_converters.view.incoming_army
+
+import net.eagle0.eagle.model.proto_converters.view.battalion.BattalionViewConverter
+import net.eagle0.eagle.model.view.incoming_army.{IncomingArmyView, UnitDetails}
+import net.eagle0.eagle.views.incoming_army_view.IncomingArmyView as IncomingArmyViewProto
+
+object IncomingArmyViewConverter {
+  def toProto(view: IncomingArmyView): IncomingArmyViewProto =
+    IncomingArmyViewProto(
+      factionId = view.factionId,
+      heroCount = view.heroCount,
+      troopCount = view.troopCount,
+      originProvinceId = view.originProvinceId,
+      destinationProvinceId = view.destinationProvinceId,
+      arrivalRoundId = view.arrivalRoundId,
+      food = view.food,
+      gold = view.gold,
+      unitDetails = view.unitDetails.map(unitDetailsToProto)
+    )
+
+  def fromProto(proto: IncomingArmyViewProto): IncomingArmyView =
+    IncomingArmyView(
+      factionId = proto.factionId,
+      heroCount = proto.heroCount,
+      troopCount = proto.troopCount,
+      originProvinceId = proto.originProvinceId,
+      destinationProvinceId = proto.destinationProvinceId,
+      arrivalRoundId = proto.arrivalRoundId,
+      food = proto.food,
+      gold = proto.gold,
+      unitDetails = proto.unitDetails.map(unitDetailsFromProto).toVector
+    )
+
+  private def unitDetailsToProto(
+      ud: UnitDetails
+  ): IncomingArmyViewProto.UnitDetails =
+    IncomingArmyViewProto.UnitDetails(
+      heroId = ud.heroId,
+      battalion = ud.battalion.map(BattalionViewConverter.toProto)
+    )
+
+  private def unitDetailsFromProto(
+      ud: IncomingArmyViewProto.UnitDetails
+  ): UnitDetails =
+    UnitDetails(
+      heroId = ud.heroId,
+      battalion = ud.battalion.map(BattalionViewConverter.fromProto)
+    )
+}
@@ -0,0 +1,51 @@
+load("@rules_scala//scala:scala.bzl", "scala_library")
+
+scala_library(
+    name = "unaffiliated_hero_basics",
+    srcs = ["UnaffiliatedHeroBasicsConverter.scala"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//src/main/protobuf/net/eagle0/eagle/common:unaffiliated_hero_type_scala_proto",
+        "//src/main/protobuf/net/eagle0/eagle/views:province_view_scala_proto",
+        "//src/main/scala/net/eagle0/eagle:eagle_pkg",
+        "//src/main/scala/net/eagle0/eagle/model/proto_converters:unaffiliated_hero_converter",
+        "//src/main/scala/net/eagle0/eagle/model/proto_converters/hero:profession",
+        "//src/main/scala/net/eagle0/eagle/model/state/unaffiliated_hero",
+        "//src/main/scala/net/eagle0/eagle/model/view/province:unaffiliated_hero_basics",
+    ],
+)
+
+scala_library(
+    name = "full_province_info",
+    srcs = ["FullProvinceInfoConverter.scala"],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":unaffiliated_hero_basics",
+        "//src/main/protobuf/net/eagle0/eagle/views:province_view_scala_proto",
+        "//src/main/scala/net/eagle0/eagle:eagle_pkg",
+        "//src/main/scala/net/eagle0/eagle/model/proto_converters/view/army",
+        "//src/main/scala/net/eagle0/eagle/model/proto_converters/view/battalion",
+        "//src/main/scala/net/eagle0/eagle/model/proto_converters/view/stat_with_condition",
+        "//src/main/scala/net/eagle0/eagle/model/view/army:army_view",
+        "//src/main/scala/net/eagle0/eagle/model/view/battalion",
+        "//src/main/scala/net/eagle0/eagle/model/view/province:full_province_info",
+        "//src/main/scala/net/eagle0/eagle/model/view/province:unaffiliated_hero_basics",
+        "//src/main/scala/net/eagle0/eagle/model/view/stat_with_condition",
+    ],
+)
+
+scala_library(
+    name = "province_view",
+    srcs = ["ProvinceViewConverter.scala"],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":full_province_info",
+        "//src/main/protobuf/net/eagle0/eagle/views:province_view_scala_proto",
+        "//src/main/scala/net/eagle0/eagle:eagle_pkg",
+        "//src/main/scala/net/eagle0/eagle/model/proto_converters/date",
+        "//src/main/scala/net/eagle0/eagle/model/proto_converters/view/incoming_army",
+        "//src/main/scala/net/eagle0/eagle/model/view/incoming_army:incoming_army_view",
+        "//src/main/scala/net/eagle0/eagle/model/view/province:full_province_info",
+        "//src/main/scala/net/eagle0/eagle/model/view/province:province_view",
+    ],
+)
@@ -0,0 +1,63 @@
+package net.eagle0.eagle.model.proto_converters.view.province
+
+import net.eagle0.eagle.model.proto_converters.view.army.ArmyViewConverter
+import net.eagle0.eagle.model.proto_converters.view.battalion.BattalionViewConverter
+import net.eagle0.eagle.model.proto_converters.view.stat_with_condition.StatWithConditionConverter
+import net.eagle0.eagle.model.view.province.FullProvinceInfo
+import net.eagle0.eagle.views.province_view.FullProvinceInfo as FullProvinceInfoProto
+
+object FullProvinceInfoConverter {
+  def toProto(info: FullProvinceInfo): FullProvinceInfoProto =
+    FullProvinceInfoProto(
+      rulingHeroId = info.rulingHeroId,
+      rulingFactionHeroIds = info.rulingFactionHeroIds,
+      battalions = info.battalions.map(BattalionViewConverter.toProto),
+      defendingArmy = info.defendingArmy.map(ArmyViewConverter.toProto),
+      economy = info.economy,
+      agriculture = info.agriculture,
+      infrastructure = info.infrastructure,
+      economyDevastation = info.economyDevastation,
+      agricultureDevastation = info.agricultureDevastation,
+      infrastructureDevastation = info.infrastructureDevastation,
+      gold = info.gold,
+      food = info.food,
+      priceIndex = info.priceIndex,
+      goldCap = info.goldCap,
+      foodCap = info.foodCap,
+      support = info.support.map(StatWithConditionConverter.toProto),
+      foodConsumption = info.foodConsumption,
+      provinceOrders = info.provinceOrders,
+      hexMapName = info.hexMapName,
+      castleCount = info.castleCount,
+      heroCap = info.heroCap,
+      unaffiliatedHeroes = info.unaffiliatedHeroes.map(UnaffiliatedHeroBasicsConverter.toProto),
+      rulerIsTraveling = info.rulerIsTraveling
+    )
+
+  def fromProto(proto: FullProvinceInfoProto): FullProvinceInfo =
+    FullProvinceInfo(
+      rulingHeroId = proto.rulingHeroId,
+      rulingFactionHeroIds = proto.rulingFactionHeroIds.toVector,
+      battalions = proto.battalions.map(BattalionViewConverter.fromProto).toVector,
+      defendingArmy = proto.defendingArmy.map(ArmyViewConverter.fromProto),
+      economy = proto.economy,
+      agriculture = proto.agriculture,
+      infrastructure = proto.infrastructure,
+      economyDevastation = proto.economyDevastation,
+      agricultureDevastation = proto.agricultureDevastation,
+      infrastructureDevastation = proto.infrastructureDevastation,
+      gold = proto.gold,
+      food = proto.food,
+      priceIndex = proto.priceIndex,
+      goldCap = proto.goldCap,
+      foodCap = proto.foodCap,
+      support = proto.support.map(StatWithConditionConverter.fromProto),
+      foodConsumption = proto.foodConsumption,
+      provinceOrders = proto.provinceOrders,
+      hexMapName = proto.hexMapName,
+      castleCount = proto.castleCount,
+      heroCap = proto.heroCap,
+      unaffiliatedHeroes = proto.unaffiliatedHeroes.map(UnaffiliatedHeroBasicsConverter.fromProto).toVector,
+      rulerIsTraveling = proto.rulerIsTraveling
+    )
+}
@@ -0,0 +1,30 @@
+package net.eagle0.eagle.model.proto_converters.view.province
+
+import net.eagle0.eagle.model.proto_converters.date.DateConverter
+import net.eagle0.eagle.model.proto_converters.view.incoming_army.IncomingArmyViewConverter
+import net.eagle0.eagle.model.view.province.ProvinceView
+import net.eagle0.eagle.views.province_view.ProvinceView as ProvinceViewProto
+
+object ProvinceViewConverter {
+  def toProto(view: ProvinceView): ProvinceViewProto =
+    ProvinceViewProto(
+      id = view.id,
+      name = view.name,
+      rulingFactionId = view.rulingFactionId,
+      fullInfo = view.fullInfo.map(FullProvinceInfoConverter.toProto),
+      knownEvents = view.knownEvents,
+      knownIncomingArmies = view.knownIncomingArmies.map(IncomingArmyViewConverter.toProto),
+      asOf = view.asOf.map(DateConverter.toProto)
+    )
+
+  def fromProto(proto: ProvinceViewProto): ProvinceView =
+    ProvinceView(
+      id = proto.id,
+      name = proto.name,
+      rulingFactionId = proto.rulingFactionId,
+      fullInfo = proto.fullInfo.map(FullProvinceInfoConverter.fromProto),
+      knownEvents = proto.knownEvents.toVector,
+      knownIncomingArmies = proto.knownIncomingArmies.map(IncomingArmyViewConverter.fromProto).toVector,
+      asOf = proto.asOf.map(d => DateConverter.fromProto(Some(d)))
+    )
+}
@@ -0,0 +1,55 @@
+package net.eagle0.eagle.model.proto_converters.view.province
+
+import net.eagle0.eagle.common.unaffiliated_hero_type.UnaffiliatedHeroType.{
+  UNAFFILIATED_HERO_MOVING_PRISONER,
+  UNAFFILIATED_HERO_OUTLAW,
+  UNAFFILIATED_HERO_PRISONER,
+  UNAFFILIATED_HERO_RESIDENT,
+  UNAFFILIATED_HERO_RETURNING_PRISONER,
+  UNAFFILIATED_HERO_TRAVELER,
+  UNAFFILIATED_HERO_UNKNOWN
+}
+import net.eagle0.eagle.common.unaffiliated_hero_type.UnaffiliatedHeroType as UnaffiliatedHeroTypeProto
+import net.eagle0.eagle.model.proto_converters.hero.ProfessionConverter
+import net.eagle0.eagle.model.proto_converters.UnaffiliatedHeroConverter
+import net.eagle0.eagle.model.state.unaffiliated_hero.{RecruitmentInfo, UnaffiliatedHeroType}
+import net.eagle0.eagle.model.view.province.UnaffiliatedHeroBasics
+import net.eagle0.eagle.views.province_view.UnaffiliatedHeroBasics as UnaffiliatedHeroBasicsProto
+
+object UnaffiliatedHeroBasicsConverter {
+  private val typeToProtoMap: Map[UnaffiliatedHeroType, UnaffiliatedHeroTypeProto] =
+    Map(
+      UnaffiliatedHeroType.Unknown           -> UNAFFILIATED_HERO_UNKNOWN,
+      UnaffiliatedHeroType.Prisoner          -> UNAFFILIATED_HERO_PRISONER,
+      UnaffiliatedHeroType.Traveler          -> UNAFFILIATED_HERO_TRAVELER,
+      UnaffiliatedHeroType.Resident          -> UNAFFILIATED_HERO_RESIDENT,
+      UnaffiliatedHeroType.Outlaw            -> UNAFFILIATED_HERO_OUTLAW,
+      UnaffiliatedHeroType.MovingPrisoner    -> UNAFFILIATED_HERO_MOVING_PRISONER,
+      UnaffiliatedHeroType.ReturningPrisoner -> UNAFFILIATED_HERO_RETURNING_PRISONER
+    )
+
+  private val typeFromProtoMap: Map[UnaffiliatedHeroTypeProto, UnaffiliatedHeroType] =
+    typeToProtoMap.map(_.swap)
+
+  def toProto(uh: UnaffiliatedHeroBasics): UnaffiliatedHeroBasicsProto =
+    UnaffiliatedHeroBasicsProto(
+      heroId = uh.heroId,
+      nameTextId = uh.nameTextId,
+      profession = ProfessionConverter.toProto(uh.profession),
+      status = typeToProtoMap(uh.status),
+      isFactionLeader = uh.isFactionLeader,
+      recruitmentInfo = Some(UnaffiliatedHeroConverter.recruitmentInfoToProto(uh.recruitmentInfo))
+    )
+
+  def fromProto(proto: UnaffiliatedHeroBasicsProto): UnaffiliatedHeroBasics =
+    UnaffiliatedHeroBasics(
+      heroId = proto.heroId,
+      nameTextId = proto.nameTextId,
+      profession = ProfessionConverter.fromProto(proto.profession),
+      status = typeFromProtoMap.getOrElse(proto.status, UnaffiliatedHeroType.Unknown),
+      isFactionLeader = proto.isFactionLeader,
+      recruitmentInfo = proto.recruitmentInfo
+        .map(ri => UnaffiliatedHeroConverter.recruitmentInfoFromProto(ri))
+        .getOrElse(RecruitmentInfo.Unknown)
+    )
+}
@@ -0,0 +1,11 @@
+load("@rules_scala//scala:scala.bzl", "scala_library")
+
+scala_library(
+    name = "stat_with_condition",
+    srcs = ["StatWithConditionConverter.scala"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//src/main/protobuf/net/eagle0/eagle/views:stat_with_condition_scala_proto",
+        "//src/main/scala/net/eagle0/eagle/model/view/stat_with_condition",
+    ],
+)
@@ -0,0 +1,40 @@
+package net.eagle0.eagle.model.proto_converters.view.stat_with_condition
+
+import net.eagle0.eagle.model.view.stat_with_condition.{Condition, StatWithCondition}
+import net.eagle0.eagle.views.stat_with_condition.StatWithCondition.Condition as ConditionProto
+import net.eagle0.eagle.views.stat_with_condition.StatWithCondition as StatWithConditionProto
+
+object StatWithConditionConverter {
+  def toProto(sc: StatWithCondition): StatWithConditionProto =
+    StatWithConditionProto(
+      stat = sc.stat,
+      condition = conditionToProto(sc.condition)
+    )
+
+  def fromProto(sc: StatWithConditionProto): StatWithCondition =
+    StatWithCondition(
+      stat = sc.stat,
+      condition = conditionFromProto(sc.condition)
+    )
+
+  private def conditionToProto(condition: Condition): ConditionProto =
+    condition match {
+      case Condition.Unknown  => ConditionProto.UNKNOWN
+      case Condition.VeryHigh => ConditionProto.VERY_HIGH
+      case Condition.High     => ConditionProto.HIGH
+      case Condition.Medium   => ConditionProto.MEDIUM
+      case Condition.Low      => ConditionProto.LOW
+      case Condition.VeryLow  => ConditionProto.VERY_LOW
+    }
+
+  private def conditionFromProto(condition: ConditionProto): Condition =
+    condition match {
+      case ConditionProto.UNKNOWN         => Condition.Unknown
+      case ConditionProto.VERY_HIGH       => Condition.VeryHigh
+      case ConditionProto.HIGH            => Condition.High
+      case ConditionProto.MEDIUM          => Condition.Medium
+      case ConditionProto.LOW             => Condition.Low
+      case ConditionProto.VERY_LOW        => Condition.VeryLow
+      case ConditionProto.Unrecognized(_) => Condition.Unknown
+    }
+}
@@ -9,6 +9,7 @@ scala_library(
        "//src/main/scala/net/eagle0/eagle/library/util:__pkg__",
        "//src/main/scala/net/eagle0/eagle/library/util/province:__pkg__",
        "//src/main/scala/net/eagle0/eagle/library/util/validations:__pkg__",
+        "//src/main/scala/net/eagle0/eagle/library/util/view_filters:__pkg__",
        "//src/main/scala/net/eagle0/eagle/model/action_result:__subpackages__",
        "//src/main/scala/net/eagle0/eagle/model/proto_converters:__pkg__",
        "//src/main/scala/net/eagle0/eagle/model/proto_converters/shardok_battle:__pkg__",
@@ -41,6 +42,7 @@ scala_library(
        "//src/main/scala/net/eagle0/eagle/model/view/battalion:__pkg__",
        "//src/test/scala/net/eagle0/eagle/library:__subpackages__",
        "//src/test/scala/net/eagle0/eagle/library/util:__subpackages__",
+        "//src/test/scala/net/eagle0/eagle/model/proto_converters/view:__subpackages__",
    ],
    deps = [
    ],
@@ -117,8 +119,11 @@ scala_library(
        "//src/main/scala/net/eagle0/eagle/library:__subpackages__",
        "//src/main/scala/net/eagle0/eagle/model/action_result:__subpackages__",
        "//src/main/scala/net/eagle0/eagle/model/proto_converters:__pkg__",
+        "//src/main/scala/net/eagle0/eagle/model/proto_converters/view:__subpackages__",
+        "//src/main/scala/net/eagle0/eagle/model/view:__subpackages__",
        "//src/test/scala/net/eagle0/eagle/library:__subpackages__",
        "//src/test/scala/net/eagle0/eagle/library/util:__subpackages__",
+        "//src/test/scala/net/eagle0/eagle/model/proto_converters/view:__subpackages__",
    ],
    deps = [
        "//src/main/scala/net/eagle0/eagle:eagle_pkg",
@@ -41,9 +41,9 @@ scala_library(
    deps = [
        ":faction_relationship",
        ":prestige_modifier",
-        "//src/main/protobuf/net/eagle0/eagle/views:province_view_scala_proto",
        "//src/main/scala/net/eagle0/eagle:eagle_pkg",
        "//src/main/scala/net/eagle0/eagle/model/state/diplomacy_offer",
+        "//src/main/scala/net/eagle0/eagle/model/view/province:province_view",
    ],
 )

--- a/Show More
+++ b/Show More