it's too much

two still failing
a little cleanup
2026-07-29 07:15:58 +00:00 · 2025-07-31 22:24:41 -07:00 · 2025-07-31 22:12:25 -07:00 · 2025-07-31 21:35:01 -07:00 · 2025-07-31 21:29:24 -07:00 · 2025-07-31 21:29:24 -07:00
836 changed files with 17650 additions and 25591 deletions
@@ -1,8 +1,5 @@
 bazel-1.0.0.bazelrc

-# for now: filter out annoying TASTY warnings
-common --ui_event_filters=-INFO
-
 common --enable_bzlmod

 # Don't use toolchains_llvm for the swift app build
@@ -1,6 +1,2 @@
-version = "3.9.9"
-runner.dialect = scala3
-rewrite.scala3.convertToNewSyntax = true
-# rewrite.scala3.removeOptionalBraces = yes
-rewrite.scala3.insertEndMarkerMinLines = 15
-rewrite.scala3.removeEndMarkerMaxLines = 14
+version = "3.6.1"
+runner.dialect = scala213
@@ -84,16 +84,6 @@ find . -name "*.cpp" -o -name "*.hpp" | xargs clang-format -i
 find . -name "*.cs" | xargs clang-format -i
 ```

-### Static Analysis
-```bash
-# Run clang-tidy static analysis on C++ files
-# Note: This may show some header include errors but will still analyze the main file
-bazel run @llvm_toolchain//:clang-tidy -- --checks='readability-*,bugprone-*,clang-analyzer-*' <file_path> -- -I/Users/dancrosby/CodingProjects/github/eagle0 -std=c++20
-
-# Example for AI files:
-bazel run @llvm_toolchain//:clang-tidy -- --checks='readability-*,bugprone-*,clang-analyzer-*' /Users/dancrosby/CodingProjects/github/eagle0/src/main/cpp/net/eagle0/shardok/ai/AIUnitScoreCalculator.cpp -- -I/Users/dancrosby/CodingProjects/github/eagle0 -std=c++20
-```
-
 ## Language-Specific Patterns

 **Scala (Strategic Layer):**
@@ -178,6 +168,4 @@ done

 - Bazel handles multi-language builds and dependencies
 - CI/CD via GitHub Actions with platform-specific build scripts in `/ci/github_actions/`
- Docker containerization available via `ci/eagle_run.Dockerfile`
- Always run "bazel run //:gazelle" after editing any BUILD.bazel files
- *ALWAYS ALWAYS* run "bazel run gazelle" after any change that modifies a BUILD.bazel file
+- Docker containerization available via `ci/eagle_run.Dockerfile`
@@ -1,66 +1,35 @@
-module(name = "net_eagle0")
-
-# Version constants
-SCALA_VERSION = "3.7.2"
-
-NETTY_VERSION = "4.1.110.Final"
-
-SCALAPB_VERSION = "1.0.0-alpha.1"
-
-AWS_SDK_VERSION = "2.28.1"
+bazel_dep(name = "apple_support", repo_name = "build_bazel_apple_support", version = "1.21.1")

 #
-# Core Build Tools
+# bazel-toolchain
 #

-bazel_dep(name = "bazel_skylib", version = "1.8.1")
-bazel_dep(name = "rules_pkg", version = "1.1.0")
-
-#
-# Language Support - Scala
-#
-
-bazel_dep(name = "rules_scala", version = "7.1.1")
-
-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.2.0")

+# Configure and register the toolchain.
 llvm = use_extension("@toolchains_llvm//toolchain/extensions:llvm.bzl", "llvm")

 llvm.toolchain(
    name = "llvm_toolchain",
-    llvm_version = "20.1.2",
+    llvm_version = "19.1.0",
 )

 use_repo(llvm, "llvm_toolchain")

-#
-# Language Support - Go
-#
+# Set dev_dependency so we can turn this off for swift MacOS builds
+register_toolchains(
+    "@llvm_toolchain//:all",
+    dev_dependency = True,
+)

-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_pkg", version = "1.0.1")
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "protobuf", repo_name = "com_google_protobuf", version = "29.2")
+bazel_dep(name = "grpc", version = "1.71.0")
+bazel_dep(name = "grpc-java", version = "1.71.0")
+bazel_dep(name = "googletest", version = "1.15.2")
+bazel_dep(name = "rules_go", repo_name = "io_bazel_rules_go", version = "0.50.1")
+bazel_dep(name = "gazelle", repo_name = "bazel_gazelle", version = "0.40.0")

 go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")

@@ -77,93 +46,68 @@ use_repo(
    "com_github_aws_aws_sdk_go_v2_credentials",
    "com_github_aws_aws_sdk_go_v2_service_s3",
    "org_golang_google_protobuf",
+    "org_golang_x_text",
+    "com_github_google_go_cmp",
 )

-#
-# 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")
+#go_sdk.nogo(
+#    nogo = "//:my_nogo",
+#)

 #
-# Protocol Buffers & RPC
+# rules_jvm_external
 #

-bazel_dep(name = "protobuf", repo_name = "com_google_protobuf", version = "29.2")
-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")
+scala_version = "2.13.14"

-#
-# Testing
-#
-
-bazel_dep(name = "googletest", version = "1.17.0")
-
-#
-# Java/Scala Dependencies
-#
-
-bazel_dep(name = "rules_jvm_external", version = "6.3")
+bazel_dep(
+    name = "rules_jvm_external",
+    version = "6.3",
+)

 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")

 maven.install(
    artifacts = [
-        # Netty
-        "io.netty:netty-codec:%s" % NETTY_VERSION,
-        "io.netty:netty-codec-http:%s" % NETTY_VERSION,
-        "io.netty:netty-codec-socks:%s" % NETTY_VERSION,
-        "io.netty:netty-codec-http2:%s" % NETTY_VERSION,
-        "io.netty:netty-handler:%s" % NETTY_VERSION,
-        "io.netty:netty-buffer:%s" % NETTY_VERSION,
-        "io.netty:netty-transport:%s" % NETTY_VERSION,
-        "io.netty:netty-resolver:%s" % NETTY_VERSION,
-        "io.netty:netty-common:%s" % NETTY_VERSION,
-        "io.netty:netty-handler-proxy:%s" % NETTY_VERSION,
-
-        # ScalaPB
-        "com.thesamet.scalapb:lenses_3:%s" % SCALAPB_VERSION,
-        "com.thesamet.scalapb:scalapb-json4s_3:%s" % SCALAPB_VERSION,
-        "com.thesamet.scalapb:scalapb-runtime_3:%s" % SCALAPB_VERSION,
-        "com.thesamet.scalapb:scalapb-runtime-grpc_3:%s" % SCALAPB_VERSION,
-        "com.thesamet.scalapb:compilerplugin_3:%s" % SCALAPB_VERSION,
-        "com.thesamet.scalapb:protoc-bridge_3:0.9.9",
-
-        # JSON
-        "org.json4s:json4s-ast_3:4.1.0-M8",
-        "org.json4s:json4s-core_3:4.1.0-M8",
-        "org.json4s:json4s-native_3:4.1.0-M8",
-
-        # Testing
-        "org.scalamock:scalamock_3:7.4.1",
-
-        # AWS SDK
-        "software.amazon.awssdk:s3-transfer-manager:%s" % AWS_SDK_VERSION,
-        "software.amazon.awssdk:s3:%s" % AWS_SDK_VERSION,
-        "software.amazon.awssdk:regions:%s" % AWS_SDK_VERSION,
-        "software.amazon.awssdk:aws-core:%s" % AWS_SDK_VERSION,
-        "software.amazon.awssdk:sdk-core:%s" % AWS_SDK_VERSION,
-        "software.amazon.awssdk:utils:%s" % AWS_SDK_VERSION,
-        "software.amazon.awssdk:http-client-spi:%s" % AWS_SDK_VERSION,
-
-        # AWS Lambda
-        "com.amazonaws:aws-lambda-java-core:1.2.3",
-        "com.amazonaws:aws-lambda-java-events:3.13.0",
-
-        # Logging
+        "org.scala-lang:scala-library:%s" % scala_version,
+        "io.netty:netty-codec:4.1.110.Final",
+        "io.netty:netty-codec-http:4.1.110.Final",
+        "io.netty:netty-codec-socks:4.1.110.Final",
+        "io.netty:netty-codec-http2:4.1.110.Final",
+        "io.netty:netty-handler:4.1.110.Final",
+        "io.netty:netty-buffer:4.1.110.Final",
+        "io.netty:netty-transport:4.1.110.Final",
+        "io.netty:netty-resolver:4.1.110.Final",
+        "io.netty:netty-common:4.1.110.Final",
+        "io.netty:netty-handler-proxy:4.1.110.Final",
+        "com.thesamet.scalapb:lenses_2.13:1.0.0-alpha.1",
+        "com.thesamet.scalapb:scalapb-json4s_2.13:1.0.0-alpha.1",
+        "com.thesamet.scalapb:scalapb-runtime_2.13:1.0.0-alpha.1",
+        "com.thesamet.scalapb:scalapb-runtime-grpc_2.13:1.0.0-alpha.1",
+        "com.thesamet.scalapb:compilerplugin_2.13:1.0.0-alpha.1",
+        "com.thesamet.scalapb:protoc-bridge_2.13:0.9.8",
+        "org.json4s:json4s-ast_2.13:4.0.7",
+        "org.json4s:json4s-core_2.13:4.0.7",
+        "org.json4s:json4s-native_2.13:4.0.7",
+        "org.scalamock:scalamock_2.13:6.0.0",
+        "software.amazon.awssdk:s3-transfer-manager:2.28.1",
+        "software.amazon.awssdk:s3:2.28.1",
+        "software.amazon.awssdk:regions:2.28.1",
+        "software.amazon.awssdk:aws-core:2.28.1",
+        "software.amazon.awssdk:sdk-core:2.28.1",
        "org.slf4j:slf4j-api:2.0.16",
        "org.slf4j:slf4j-simple:2.0.16",
-
-        # Other
+        #"software.amazon.awssdk:sns:2.28.1",
+        "software.amazon.awssdk:utils:2.28.1",
+        "software.amazon.awssdk:http-client-spi:2.28.1",
        "org.reactivestreams:reactive-streams:1.0.4",
+        "com.amazonaws:aws-lambda-java-core:1.2.3",
+        "com.amazonaws:aws-lambda-java-events:3.13.0",
        "javax.xml.bind:jaxb-api:2.3.1",
    ],
    duplicate_version_warning = "error",
    fail_if_repin_required = True,
-    lock_file = "//:maven_install.json",
+    lock_file = "//:maven_install.json",  #
    repositories = [
        "https://repo1.maven.org/maven2",
    ],
@@ -172,49 +116,58 @@ maven.install(
 use_repo(maven, "maven", "unpinned_maven")

 #
-# External Libraries
+# rules_apple
 #

+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",
+)
+
+#
+# Unbazelified imports
+#
 http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

-# GTL (for parallel_hashmap)
-GTL_VERSION = "1.2.0"
+#
+# flatbuffers
+#
+bazel_dep(name = "flatbuffers", version = "25.2.10")

-GTL_SHA = "1969c45dd76eac0dd87e9e2b65cffe358617f4fe1bcd203f72f427742537913a"
+#
+# gtl (for parallel_hashmap)
+#
+
+gtl_version = "1.2.0"
+
+gtl_sha = "1969c45dd76eac0dd87e9e2b65cffe358617f4fe1bcd203f72f427742537913a"

 http_archive(
    name = "gtl",
    build_file = "@//external:BUILD.gtl",
-    sha256 = GTL_SHA,
-    strip_prefix = "gtl-%s" % GTL_VERSION,
-    url = "https://github.com/greg7mdp/gtl/archive/refs/tags/v%s.zip" % GTL_VERSION,
+    sha256 = gtl_sha,
+    strip_prefix = "gtl-%s" % gtl_version,
+    url = "https://github.com/greg7mdp/gtl/archive/refs/tags/v%s.zip" % gtl_version,
 )

-# Unity GoDice Plugin
-UNITY_GODICE_COMMIT = "18d6823991592e4d45fcc0f22692db849dea9063"
+#
+# Plugins for the native code for interacting with GoDice
+#
+unity_godice_commit = "18d6823991592e4d45fcc0f22692db849dea9063"

-UNITY_GODICE_SHA = "04e6ae4155965aab3372592e04061eba1256bb6ea7ccffd0d83f27574e5b3349"
+unity_godice_sha = "04e6ae4155965aab3372592e04061eba1256bb6ea7ccffd0d83f27574e5b3349"

 http_archive(
    name = "net_eagle0_unity_godice",
-    sha256 = UNITY_GODICE_SHA,
-    strip_prefix = "godice-framework-%s" % UNITY_GODICE_COMMIT,
+    sha256 = unity_godice_sha,
+    strip_prefix = "godice-framework-%s" % unity_godice_commit,
    urls = [
-        "https://github.com/nolen777/godice-framework/archive/%s.zip" % UNITY_GODICE_COMMIT,
+        "https://github.com/nolen777/godice-framework/archive/%s.zip" % unity_godice_commit,
    ],
 )
-
-#
-# Toolchain Registration
-#
-
-register_toolchains(
-    "//tools:unused_dependency_checker_error_and_opts_toolchain",
-    "@rules_scala//testing:scalatest_toolchain",
-)
-
-# Set dev_dependency so we can turn this off for swift MacOS builds
-register_toolchains(
-    "@llvm_toolchain//:all",
-    dev_dependency = True,
-)
@@ -1,205 +0,0 @@
-# Scala 3 Modernization Guide
-
-## Overview
-This document outlines opportunities to modernize the Eagle0 codebase to use Scala 3 best practices and features. The migration to Scala 3 is complete, but the code still uses many Scala 2 patterns that can be improved.
-
-## Modernization Opportunities
-
-### 1. **Convert Sealed Traits to Enums** 🎯 HIGH IMPACT
-**Benefits**: Better performance, more concise syntax, improved exhaustiveness checking
-
-**Current pattern** (`ExternalTextGenerationCaller.scala:23-31`):
-```scala
-sealed trait ExternalTextGenerationError extends Error {
-  def message: String
-}
-case class ExternalTextGenerationRateLimitError(code: Int, message: String)
-    extends ExternalTextGenerationError
-case class ExternalTextGenerationHttpError(code: Int, message: String)
-    extends ExternalTextGenerationError
-case class ExternalTextGenerationTimeoutError(message: String)
-    extends ExternalTextGenerationError
-```
-
-**Scala 3 improvement**:
-```scala
-enum ExternalTextGenerationError extends Error:
-  case RateLimit(code: Int, message: String)
-  case Http(code: Int, message: String) 
-  case Timeout(message: String)
-  
-  def message: String = this match
-    case RateLimit(_, msg) => msg
-    case Http(_, msg) => msg
-    case Timeout(msg) => msg
-```
-
-**Files to check**:
- `/src/main/scala/net/eagle0/common/llm_integration/ExternalTextGenerationCaller.scala`
- `/src/main/scala/net/eagle0/eagle/model/action_result/generated_text_request/GeneratedTextRequestT.scala`
- `/src/main/scala/net/eagle0/eagle/model/state/quest/concrete/QuestC.scala`
-
-### 2. **Convert Implicit Classes to Extension Methods** 🎯 HIGH IMPACT
-**Benefits**: Modern syntax, better IDE support, cleaner imports
-
-**Current pattern** (`MoreSeq.scala:23-26`):
-```scala
-implicit def SeqCollect[A, Repr[_]](coll: Repr[A])(implicit
-    itr: IsIterable[Repr[A]]
-): SeqCollect[A, Repr, itr.type] =
-  new SeqCollect[A, Repr, itr.type](coll, itr)
-```
-
-**Scala 3 improvement**:
-```scala
-extension [A, Repr[_]](coll: Repr[A])(using itr: IsIterable[Repr[A]])
-  def flatCollect[B](pf: PartialFunction[itr.A, Option[B]])(using Factory[B, Repr[B]]): Repr[B] =
-    Factory[B, Repr[B]].fromSpecific(itr(coll).collect(pf).flatten)
-    
-  def flatCollectFirst[B](pf: PartialFunction[itr.A, Option[B]]): Option[B] =
-    itr(coll).collect(pf).flatten.headOption
-```
-
-**Files to check**:
- `/src/main/scala/net/eagle0/common/MoreSeq.scala`
- `/src/main/scala/net/eagle0/eagle/library/util/command_choice_helpers/CommandChooser.scala`
- `/src/main/scala/net/eagle0/eagle/service/new_game_creation/NewGameCreation.scala`
- `/src/main/scala/net/eagle0/eagle/library/actions/applier/ActionResultProtoApplierImpl.scala`
- `/src/main/scala/net/eagle0/eagle/service/new_game_creation/StartGameActionResultUtils.scala`
- `/src/main/scala/net/eagle0/eagle/model/state/date/Date.scala`
-
-### 3. **Convert Implicit Parameters to Using Clauses** 🎯 MEDIUM IMPACT
-**Benefits**: Cleaner syntax, better tooling support, clearer intent
-
-**Current pattern**:
-```scala
-def method[T](value: T)(implicit ec: ExecutionContext): Future[T]
-def process[A](items: Seq[A])(implicit ord: Ordering[A]): Seq[A]
-```
-
-**Scala 3 improvement**:
-```scala
-def method[T](value: T)(using ExecutionContext): Future[T]
-def process[A](items: Seq[A])(using Ordering[A]): Seq[A]
-```
-
-**Files to check**:
- `/src/main/scala/net/eagle0/common/MoreSeq.scala`
- `/src/main/scala/net/eagle0/eagle/library/util/hero_name_fetcher/HeroNameFetcher.scala`
- `/src/main/scala/net/eagle0/eagle/library/util/ShardokMapInfo.scala`
- `/src/main/scala/net/eagle0/common/llm_integration/OpenAIChatCompletionsServiceImpl.scala`
- `/src/main/scala/net/eagle0/common/llm_integration/ClaudeServiceImpl.scala`
-
-### 4. **Opaque Types for Type Safety** 🎯 MEDIUM IMPACT
-**Benefits**: Zero runtime cost, compile-time type safety, prevents mixing up similar types
-
-**Pattern to look for**: Type aliases that represent distinct concepts
-```scala
-// Instead of: type UserId = String, type GameId = String
-opaque type UserId = String
-object UserId:
-  def apply(s: String): UserId = s
-  extension (id: UserId) 
-    def value: String = id
-    def isValid: Boolean = id.nonEmpty && id.length > 3
-
-opaque type GameId = Long  
-object GameId:
-  def apply(l: Long): GameId = l
-  extension (id: GameId) def value: Long = id
-```
-
-**Candidates**: Look for simple type aliases and ID types throughout the codebase.
-
-### 5. **Inline Methods for Performance** 🎯 LOW IMPACT
-**Benefits**: Compile-time optimization, better performance for hot paths
-
-**Pattern**: Mark small, frequently-called methods as `inline`
-```scala
-inline def isValidId(id: String): Boolean = 
-  id.nonEmpty && id.length > 3
-
-inline def calculateScore(base: Int, multiplier: Double): Double = 
-  base * multiplier
-```
-
-**Candidates**: Small utility methods in performance-critical paths (AI calculations, game state updates).
-
-### 6. **Union Types Instead of Complex Hierarchies** 🎯 LOW IMPACT  
-**Benefits**: Simpler type definitions for either/or scenarios
-
-**Pattern**: Simple sealed traits with only case classes
-```scala
-// Instead of:
-sealed trait Result
-case class Success(value: String) extends Result  
-case class Error(message: String) extends Result
-
-// Consider:
-type Result = Success | Error
-case class Success(value: String)
-case class Error(message: String)
-```
-
-### 7. **Context Functions for Cleaner APIs** 🎯 LOW IMPACT
-**Benefits**: Cleaner API design, implicit context passing
-
-**Pattern**: Replace implicit function parameters
-```scala
-// Old
-type Handler = GameState => Unit
-def withGameState(gs: GameState)(handler: Handler): Unit = handler(gs)
-
-// New  
-type Handler = GameState ?=> Unit
-def withGameState(gs: GameState)(handler: Handler): Unit = 
-  given GameState = gs
-  handler
-```
-
-## Implementation Priority
-
-### Phase 1: Quick Wins (High Impact, Low Risk)
-1. **Convert Extension Methods** in `MoreSeq.scala` - immediate readability improvement
-2. **Update Using Clauses** - simple find/replace operation  
-3. **Convert Simple Sealed Traits to Enums** - start with error types
-
-### Phase 2: Type Safety Improvements  
-4. **Add Opaque Types** for IDs and measurements - improves type safety
-5. **Inline Performance-Critical Methods** - measure before/after impact
-
-### Phase 3: Advanced Features (Lower Priority)
-6. **Union Types** where appropriate - only for simple either/or cases
-7. **Context Functions** for complex API improvements
-
-## Implementation Guidelines
-
-### Style Consistency
- **Keep curly braces**: Continue using Scala 2 style `{}` instead of indentation-based syntax
- **Gradual adoption**: Modernize files as they're touched for other reasons
- **Test thoroughly**: Each modernization should include verification that behavior is unchanged
-
-### Performance Considerations  
- **Measure enum performance**: Verify that enum conversion actually improves performance in hot paths
- **Benchmark inline methods**: Use profiling to confirm performance gains
- **Consider compilation time**: Some features may increase compile time
-
-### Migration Strategy
- **File-by-file approach**: Complete modernization of one file at a time
- **Separate PRs**: Each modernization type should be its own PR for easier review
- **Documentation**: Update this document as patterns are modernized
-
-## Success Criteria
- [ ] All extension methods converted from implicit classes
- [ ] All implicit parameters converted to using clauses  
- [ ] Key sealed traits converted to enums where appropriate
- [ ] Opaque types introduced for important ID types
- [ ] Performance-critical methods marked as inline (with benchmarks)
- [ ] No regression in functionality or performance
- [ ] Code remains readable and maintainable
-
-## Notes
- Focus on high-impact, low-risk improvements first
- Each change should be driven by clear benefits (performance, readability, type safety)
- Maintain backward compatibility where possible
- Document any breaking changes clearly
@@ -1,2 +1,51 @@
-# This file marks the root of the Bazel workspace.
-# See MODULE.bazel for external dependencies and setup.
+workspace(name = "net_eagle0")
+
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+#
+# Scala support
+#
+
+scala_version = "2.13.14"
+
+#rules_scala_version = "6.6.0"
+
+#rules_scala_sha = "e734eef95cf26c0171566bdc24d83bd82bdaf8ca7873bec6ce9b0d524bdaf05d"
+
+#http_archive(
+#    name = "io_bazel_rules_scala",
+#    sha256 = rules_scala_sha,
+#    strip_prefix = "rules_scala-%s" % rules_scala_version,
+#    url = "https://github.com/bazelbuild/rules_scala/releases/download/v%s/rules_scala-v%s.tar.gz" % (rules_scala_version, rules_scala_version),
+#)
+
+# Using a commit from master to get 2.13.14 support. Restore the commented-out lines above with a new
+# release version when one is cut.
+rules_scala_commit = "e53a43bf48f10a5906b3e91c21798281cec1b334"
+
+rules_scala_sha = "b4fd903724d084d9d9f45e17fc22391bda745bf0574f8934d38a9c1c2fc18834"
+
+http_archive(
+    name = "io_bazel_rules_scala",
+    sha256 = rules_scala_sha,
+    strip_prefix = "rules_scala-%s" % rules_scala_commit,
+    url = "https://github.com/bazelbuild/rules_scala/archive/%s.zip" % rules_scala_commit,
+)
+
+load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
+
+scala_config(scala_version = scala_version)
+
+load("//tools:toolchains.bzl", "scala_register_toolchains")
+
+scala_register_toolchains()
+
+load("@io_bazel_rules_scala//scala:scala.bzl", "scala_repositories")
+
+scala_repositories()
+
+load("@io_bazel_rules_scala//testing:scalatest.bzl", "scalatest_repositories", "scalatest_toolchain")
+
+scalatest_repositories()
+
+scalatest_toolchain()
@@ -1,305 +0,0 @@
-# Actions and Commands Model Usage Analysis
-
-This document analyzes all actions and commands in `src/main/scala/net/eagle0/eagle/library/actions/impl` to determine which use Scala models vs protobuf models, based on BUILD.bazel dependencies.
-
-**Legend:**
- ✅ **Scala Models Only** - Uses only `//src/main/scala/net/eagle0/eagle/model` dependencies
- ❌ **Uses Protobuf** - Has dependencies on `//src/main/protobuf` targets
- 🔄 **Partial Conversion** - Conversion attempted but blocked by dependencies
-
-## Summary
-
-Based on BUILD.bazel dependency analysis (2025-09-16, updated 2025-09-17):
- **Total Commands Analyzed:** 41
- **Commands Fully Migrated (No Protobuf):** 41 (100%) ✅
- **Commands Still Using Protobuf:** 0 (0%) ✅
- **Total Actions Analyzed:** 48
- **Actions Fully Migrated (No Protobuf):** 5 (10.4%)
- **Actions Partially Migrated:** 19 (39.6%)
- **Actions Still Using Protobuf:** 24 (50%)
- **Base Classes:** 8 protoless variants available, 6 still use protobuf
- **Shared Components:** `ResolvedEagleUnit` migrated to use `Option[BattalionT]` for proper null handling
-
-## Conversion Insights
-
-Based on conversion attempt of `ResolveTruceOfferCommand` (see [PR #4379](https://github.com/nolen777/eagle0/pull/4379)):
-
-### Key Challenges Discovered
-
-1. **LLM Integration Dependencies**: Commands that use `DiplomacyResolutionLlmRequestGenerator` face challenges because the LLM system still expects protobuf enum types, not Scala model enums.
-
-2. **Inconsistent Package Naming**: Some files have inconsistent package declarations vs BUILD file locations (e.g., `generated_text_request_generators` in package vs `llm_request_generators` in BUILD).
-
-3. **Model Constructor Differences**: Scala model constructors (e.g., `TruceOffer`) have different required parameters than their protobuf counterparts, requiring more complex data mapping.
-
-4. **Type System Complexity**: Union types and type constraints become more complex when mixing protobuf and Scala model types during transition.
-
-5. **Cascading Dependency Issues**: Converting to `ActionResultC` requires extensive trait dependencies (`ChangedBattalionT`, `ChangedHeroT`, `GeneratedTextRequestT`, etc.) that create complex BUILD dependency graphs, unlike simple protobuf `ActionResult`.
-
-6. **BUILD Complexity**: Each Scala model conversion requires significantly more BUILD dependencies than protobuf equivalents, making incremental conversion difficult.
-
-7. **Build Verification Critical**: Any conversion must maintain working build state - even simple commands like `DefendCommand` can break main server build due to dependency cascades.
-### Successful Conversion Elements
-
- ✅ Base class conversion (`SimpleAction` → `ProtolessSimpleAction`)
- ✅ Import updates for most Scala model types
- ✅ BUILD.bazel dependency updates for core action result types
- ✅ Basic type conversions for simple cases
-
-### Recommended Conversion Strategy
-
-1. **Architecture-First Approach**: Convert base infrastructure (LLM generators, action result builders) before individual commands
-2. **Wrapper Pattern**: Use existing `Protoless*ActionWrapper` classes as templates for gradual transition
-3. **Dependency Analysis**: Map full dependency trees before attempting conversions to avoid cascading build failures
-4. **Batch Conversions**: Convert related commands together to minimize dependency conflicts
-5. **Build Verification**: **ALWAYS** verify `//src/main/scala/net/eagle0/eagle:eagle_server` and test suite build before creating PRs
-
-### Conversion Requirements
-
-**Before creating any PR:**
- ✅ `bazel build //src/main/scala/net/eagle0/eagle:eagle_server` succeeds
- ✅ `bazel test //src/test/scala/... --keep_going` passes (or doesn't introduce new failures)
- ✅ All BUILD dependencies are correctly specified
- ✅ Scalafmt and other linters pass
-
---
-
-## Common Base Classes
-
-| File | Type | Model Usage | Notes |
-|------|------|-------------|-------|
-| Action.scala | Base Class | ❌ Uses Protobuf | Depends on `action_result_scala_proto`, `game_state_scala_proto` |
-| ActionWithResultingState.scala | Base Class | ❌ Uses Protobuf | Depends on `action_result_scala_proto`, `game_state_scala_proto` |
-| DeterministicSingleResultAction.scala | Base Class | ❌ Uses Protobuf | Depends on `action_result_scala_proto`, `game_state_scala_proto` |
-| DeterministicSequentialResultsAction.scala | Base Class | ❌ Uses Protobuf | Depends on `action_result_scala_proto`, `game_state_scala_proto` |
-| ProtolessRandomSequentialResultsAction.scala | Base Class | ✅ Scala Models Only | Uses `//src/main/scala/net/eagle0/eagle/model/action_result` |
-| ProtolessRandomSimpleAction.scala | Base Class | ✅ Scala Models Only | Uses `//src/main/scala/net/eagle0/eagle/model/action_result` |
-| ProtolessSequentialResultsAction.scala | Base Class | ✅ Scala Models Only | Uses `//src/main/scala/net/eagle0/eagle/model/action_result` |
-| ProtolessSimpleAction.scala | Base Class | ✅ Scala Models Only | Uses `//src/main/scala/net/eagle0/eagle/model/action_result` |
-| RandomSequentialResultsAction.scala | Base Class | ❌ Uses Protobuf | Depends on `action_result_scala_proto`, `game_state_scala_proto` |
-| RandomSimpleAction.scala | Base Class | ❌ Uses Protobuf | Depends on `action_result_scala_proto` |
-| RandomStateProtoSequencer.scala | Sequencer | ❌ Uses Protobuf | Bridge class, depends on both protobuf and Scala models |
-| RandomStateTSequencer.scala | Sequencer | ❌ Uses Protobuf | Bridge class, depends on both protobuf and Scala models |
-| SimpleAction.scala | Base Class | ❌ Uses Protobuf | Depends on `action_result_scala_proto` |
-| VigorXPApplier.scala | Utility | ❌ Uses Protobuf | Depends on `action_result_scala_proto` |
-
---
-
-## Actions
-
-### ✅ Fully Migrated Actions (No Protobuf Dependencies)
-
-These actions have been successfully migrated to use Scala models only:
-
-| File | Base Class | Notes |
-|------|------------|-------|
-| HeroBackstoryUpdateAction.scala | ProtolessSequentialResultsAction | Processes hero backstory updates with LLM integration |
-| ProvinceConqueredAction.scala | ProtolessSimpleAction | Uses component-based design (gameId, currentRoundId, currentDate, Scala models) |
-| ProvinceHeldAction.scala | ProtolessSimpleAction | Uses specific components (gameId, currentRoundId, defendingProvince, etc.) instead of full GameState |
-| UnaffiliatedHeroAppearedAction.scala | ProtolessSimpleAction | Handles unaffiliated hero appearance with name generation |
-| WithdrawnArmiesReturnHomeAction.scala | ProtolessSequentialResultsAction | Manages army withdrawal and return mechanics |
-
-### 🔄 Actions Partially Migrated (Using Protoless Base Classes)
-
-These actions use protoless base classes but still have some protobuf dependencies:
-
-| File | Model Usage | Notes |
-|------|-------------|-------|
-| CheckForFactionChangesAction.scala | ProtolessSequentialResultsAction | Still has some protobuf dependencies |
-| CheckForFailedQuestsAction.scala | ProtolessSequentialResultsAction | Depends on `unaffiliated_hero_quest_scala_proto` |
-| CheckForFulfilledQuestsAction.scala | ProtolessSequentialResultsAction | Depends on multiple protobuf targets |
-| EndAttackDecisionPhaseAction.scala | ProtolessSequentialResultsAction | Depends on multiple protobuf targets |
-| EndBattleAftermathPhaseAction.scala | ProtolessSequentialResultsAction | Depends on multiple protobuf targets |
-| EndFreeForAllDecisionPhaseAction.scala | ProtolessSequentialResultsAction | Depends on multiple protobuf targets |
-| EndPlayerCommandsPhaseAction.scala | ProtolessSequentialResultsAction | Depends on multiple protobuf targets |
-| EndUnaffiliatedHeroActionsPhaseAction.scala | ProtolessSequentialResultsAction | Depends on multiple protobuf targets |
-| EndVassalCommandsPhaseAction.scala | ProtolessSequentialResultsAction | Depends on multiple protobuf targets |
-| FreeForAllDrawAction.scala | ProtolessSimpleAction | Depends on multiple protobuf targets |
-| FriendlyMoveAction.scala | ProtolessSimpleAction | Depends on multiple protobuf targets |
-| PerformUncontestedConquestAction.scala | ProtolessSequentialResultsAction | Depends on multiple protobuf targets |
-| ProvinceConqueredAction.scala | ProtolessSimpleAction | **CONVERTED** - Uses specific components (gameId, currentRoundId, currentDate, Scala models) |
-| SafePassageArmiesProceedAction.scala | ProtolessSequentialResultsAction | Depends on multiple protobuf targets |
-| ShipmentArrivedAction.scala | ProtolessSimpleAction | Depends on multiple protobuf targets |
-| TruceTurnBackPhaseAction.scala | ProtolessSequentialResultsAction | Depends on multiple protobuf targets |
-| UnaffiliatedHeroRejoinedAction.scala | ProtolessSimpleAction | Depends on multiple protobuf targets |
-| WonFreeForAllAction.scala | ProtolessSimpleAction | Depends on multiple protobuf targets |
-
-### ❌ Actions Still Using Protobuf (Not Yet Using Protoless Base Classes)
-
-| File | Notes |
-|------|-------|
-| ChronicleEventGenerator.scala | Depends on multiple protobuf targets |
-| EndBattleRequestPhaseAction.scala | Depends on `diplomacy_offer_status_scala_proto` |
-| EndBattleResolutionPhaseAction.scala | Depends on multiple protobuf targets |
-| EndDefenseDecisionPhaseAction.scala | Depends on multiple protobuf targets |
-| EndDiplomacyResolutionPhaseAction.scala | Depends on multiple protobuf targets |
-| EndFreeForAllBattleRequestPhaseAction.scala | Depends on multiple protobuf targets |
-| EndFreeForAllBattleResolutionPhaseAction.scala | Depends on multiple protobuf targets |
-| EndHandleRiotsPhaseAction.scala | Depends on multiple protobuf targets |
-| EndPleaseRecruitMePhaseAction.scala | Depends on multiple protobuf targets |
-| EndProvinceMoveResolutionPhaseAction.scala | Depends on multiple protobuf targets |
-| NewRoundAction.scala | Depends on multiple protobuf targets |
-| NewYearAction.scala | Depends on multiple protobuf targets |
-| PerformFoodConsumptionPhaseAction.scala | Depends on multiple protobuf targets |
-| PerformForcedTurnBackAction.scala | Depends on multiple protobuf targets |
-| PerformHeroDeparturesAction.scala | Depends on multiple protobuf targets |
-| PerformHostileArmySetupAction.scala | Depends on multiple protobuf targets |
-| PerformProvinceEventsAction.scala | Depends on `province_event_scala_proto` |
-| PerformProvinceMoveResolutionAction.scala | Depends on multiple protobuf targets |
-| PerformReconResolutionAction.scala | Depends on multiple protobuf targets |
-| PerformUnaffiliatedHeroesAction.scala | Depends on `unaffiliated_hero_quest_scala_proto` |
-| PerformVassalCommandsPhaseAction.scala | Depends on multiple protobuf targets |
-| PerformVassalDefenseDecisionsAction.scala | Depends on multiple protobuf targets |
-| PrisonerEscapeAction.scala | Depends on `game_state_scala_proto` |
-| PrisonerExchangeAction.scala | Depends on multiple protobuf targets |
-| RequestBattlesAction.scala | Depends on multiple protobuf targets |
-| RequestFreeForAllBattlesAction.scala | Depends on multiple protobuf targets |
-| ResolveBattleAction.scala | Depends on `shardok_internal_interface_scala_grpc` |
-| UnaffiliatedHeroMovedAction.scala | Depends on multiple protobuf targets |
-| UnaffiliatedHeroesChangedAction.scala | Depends on multiple protobuf targets |
-
---
-
-## Commands
-
-✅ **ALL COMMANDS FULLY MIGRATED** (100% - 41/41 commands)
-
-All 41 commands in the codebase have been successfully migrated to use Scala models only, with no protobuf dependencies. This includes:
-
- **Simple Actions**: Use `ProtolessSimpleAction` base class
- **Random Actions**: Use `ProtolessRandomSimpleAction` base class
- **Complex Domain Models**: Successfully integrated with LLM systems, diplomacy, quest fulfillment, and state management
- **Complete Type Safety**: All commands now use type-safe Scala domain models
-
-**Key Migration Achievements:**
- ✅ All military commands (ArmTroops, Train, Organize, etc.)
- ✅ All diplomacy commands (Resolve Alliance/Truce/Ransom offers, etc.)
- ✅ All LLM-integrated commands (backstory generation, diplomacy resolution)
- ✅ All quest and event commands
- ✅ Final remaining command (FreeForAllDecisionCommand) migrated
-
---
-
-## Diplomacy Helpers
-
-All diplomacy helpers use **Scala models only**:
-
-| File | Model Usage | Notes |
-|------|-------------|-------|
-| AllianceResolutionHelpers.scala | ✅ Scala Models Only | Uses `//src/main/scala/net/eagle0/eagle/model` only |
-| BreakAllianceResolutionHelpers.scala | ✅ Scala Models Only | Uses `//src/main/scala/net/eagle0/eagle/model` only |
-| InvitationResolutionHelpers.scala | ✅ Scala Models Only | Uses `//src/main/scala/net/eagle0/eagle/model` only |
-| RansomResolutionHelpers.scala | ✅ Scala Models Only | Uses `//src/main/scala/net/eagle0/eagle/model` only |
-| TruceResolutionHelpers.scala | ✅ Scala Models Only | Uses `//src/main/scala/net/eagle0/eagle/model` only |
-
---
-
-## Migration Priority Analysis
-
-Based on the BUILD.bazel dependency analysis, here are the key findings and recommendations:
-
-### 🎯 High Impact Migration Targets
-
-**Core Dependencies Blocking Multiple Commands:**
-
-1. **`action_result_scala_proto`** - Used by 12+ commands
-   - Blocks: `DefendCommand`, `FreeForAllDecisionCommand`, diplomacy resolvers
-   - Impact: Would unlock many command migrations
-
-2. **`available_command_scala_proto` / `selected_command_scala_proto`** - Used by 10+ commands
-   - Blocks: All UI-interactive commands
-   - Impact: Would enable client-server interaction model migration
-
-3. **`game_state_scala_proto`** - Used by 8+ commands
-   - Blocks: Complex state-dependent commands
-   - Impact: Core state representation migration
-
-### 📊 Migration Tiers by Complexity
-
-**Tier 1 - Quick Wins (2 commands):**
- `ArmTroopsCommand` - Only `battalion_type` dependency
- `TrainCommand` - Only `battalion_type` dependency
- **Effort:** Low, **Impact:** Demonstrates battalion model usage
-
-**Tier 2 - API Layer (5 commands):**
- Commands blocked by `available_command`/`selected_command`
- **Effort:** Medium, **Impact:** High (enables UI interaction models)
-
-**Tier 3 - Diplomacy Suite (6 commands):**
- All `Resolve*Command` diplomacy commands
- **Effort:** High, **Impact:** High (complete diplomacy model migration)
- **Strategy:** Migrate as a group after diplomacy models are ready
-
-### 🏆 Success Metrics
-
-**Current Status:**
- ✅ **100% of commands fully migrated** (41/41) 🎉
- ✅ **All diplomacy helpers use Scala models**
- ✅ **All protoless base classes available**
- ✅ **ALL command migration completed**
-
-**Completed Milestones:**
- ✅ **70% target:** Migrate Tier 1 + some Tier 2 commands **COMPLETED**
- ✅ **80% target:** Continue with remaining non-diplomacy commands **COMPLETED**
- ✅ **85% target:** Complete API layer migration **COMPLETED**
- ✅ **95% target:** Complete diplomacy migration **COMPLETED**
- ✅ **100% target:** Migrate final remaining command (FreeForAllDecisionCommand) **COMPLETED**
-
-### 🎯 Action Migration Progress
-
-**Migration Statistics:**
- 5/48 Actions fully migrated (10.4%)
- 20/48 Actions using protoless base classes but with protobuf dependencies (41.7%)
- 24/48 Actions still fully on protobuf (50%)
-
-**Successfully Migrated Actions:**
-1. **HeroBackstoryUpdateAction** - LLM integration for hero backstories
-2. **ProvinceConqueredAction** - Component-based design with prisoner handling and province conquest
-3. **ProvinceHeldAction** - Component-based design pattern (gameId, currentRoundId, specific models)
-4. **UnaffiliatedHeroAppearedAction** - Hero appearance with name generation
-5. **WithdrawnArmiesReturnHomeAction** - Army withdrawal mechanics
-
-**Recent Migration Updates (2025-09-17):**
- **ResolvedEagleUnit** - Changed `battalion: BattalionT` to `battalion: Option[BattalionT]`
-  - Properly handles units without battalions (battalion ID -1)
-  - Updated `ShardokInterfaceGrpcClient` to check for `defaultBattalionId` and use `None`
-  - Updated `ResolveBattleAction`, `ProvinceConqueredAction`, `RequestBattlesAction`
-  - All tests updated to handle optional battalions
-
-**Key Migration Patterns:**
- ✅ Use specific components instead of full GameState (see ProvinceHeldAction, ProvinceConqueredAction)
- ✅ Convert protobuf models to Scala models at Action boundaries
- ✅ Update BUILD.bazel to remove protobuf dependencies
- ✅ Update all call sites and tests
- ✅ Use `Option[T]` for optional fields instead of special sentinel values (e.g., battalion ID -1)
-
-**Next Migration Candidates (Simple Actions with Protoless Base):**
-1. **FreeForAllDrawAction** - Already uses ProtolessSimpleAction
-2. **FriendlyMoveAction** - Already uses ProtolessSimpleAction
-3. **ShipmentArrivedAction** - Already uses ProtolessSimpleAction
-4. **WonFreeForAllAction** - Already uses ProtolessSimpleAction
-5. **ProvinceConqueredAction** - Already uses ProtolessSimpleAction, only needs `common_unit` migration
-
-### 🔄 Conversion Strategy Updates
-
-**Revised Approach Based on Analysis:**
-
-1. **Focus on Core Dependencies First**
-   - Migrate `battalion_type` model (unlocks 2 commands immediately)
-   - Migrate `action_result` model (unlocks 12+ commands)
-   - Migrate `available_command`/`selected_command` (unlocks UI layer)
-
-2. **Leverage Existing Success**
-   - 77.5% of commands already fully migrated
-   - Use migrated commands as reference implementations
-   - Diplomacy helpers prove complex business logic can work with Scala models
-
-3. **Group Related Migrations**
-   - Military commands: `ArmTroopsCommand`, `TrainCommand`, `OrganizeTroopsCommand`
-   - UI commands: All using `available_command`/`selected_command`
-   - Diplomacy commands: All `Resolve*Command` variants
-
---
-
-*Updated on 2025-09-17 - Analysis based on BUILD.bazel dependencies and code review*
-*Latest update: ResolvedEagleUnit migrated to use Option[BattalionT] for proper battalion handling*
@@ -1,7 +1,7 @@
 {
  "__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": 644967262,
+  "__RESOLVED_ARTIFACTS_HASH": -595552834,
  "conflict_resolution": {
    "com.google.guava:failureaccess:1.0.1": "com.google.guava:failureaccess:1.0.2",
    "io.netty:netty-buffer:4.1.110.Final": "io.netty:netty-buffer:4.1.112.Final",
@@ -14,7 +14,8 @@
    "io.netty:netty-transport-native-unix-common:4.1.110.Final": "io.netty:netty-transport-native-unix-common:4.1.112.Final",
    "io.netty:netty-transport:4.1.110.Final": "io.netty:netty-transport:4.1.112.Final",
    "io.opencensus:opencensus-api:0.31.0": "io.opencensus:opencensus-api:0.31.1",
-    "org.checkerframework:checker-qual:3.12.0": "org.checkerframework:checker-qual:3.43.0"
+    "org.checkerframework:checker-qual:3.12.0": "org.checkerframework:checker-qual:3.43.0",
+    "org.scala-lang:scala-library:2.13.14": "org.scala-lang:scala-library:2.13.15"
  },
  "artifacts": {
    "com.amazonaws:aws-lambda-java-core": {
@@ -167,29 +168,23 @@
      },
      "version": "2.10.0"
    },
-    "com.thesamet.scalapb:compilerplugin_3": {
+    "com.thesamet.scalapb:compilerplugin_2.13": {
      "shasums": {
-        "jar": "e7d7156269fc23cbb539eea60f07c3230aa05a726434fc942b040495567f0a2d"
+        "jar": "218640423ba8156f994d6d700ef960d65025f79a5918070c0898213f4384df1f"
      },
      "version": "1.0.0-alpha.1"
    },
-    "com.thesamet.scalapb:lenses_3": {
+    "com.thesamet.scalapb:lenses_2.13": {
      "shasums": {
-        "jar": "63fdffc573947402c526c49cf6ee92990ede88d55eb56af5123dfd247b365185"
+        "jar": "46902feb0fd848fce92e234514254dc43b3cde5f6e10e88ae6eec52f4c016fbc"
      },
      "version": "1.0.0-alpha.1"
    },
    "com.thesamet.scalapb:protoc-bridge_2.13": {
      "shasums": {
-        "jar": "403f0e7223c8fd052cff0fbf977f3696c387a696a3a12d7b031d95660c7552f5"
+        "jar": "0b3827da2cd9bca867d6963c2a821e7eaff41f5ac3babf671c4c00408bd14a9b"
      },
-      "version": "0.9.7"
-    },
-    "com.thesamet.scalapb:protoc-bridge_3": {
-      "shasums": {
-        "jar": "e7e2f1862f54076b6870bd034a7c16aae7b88cfee3d00b69dbb6b1175108560c"
-      },
-      "version": "0.9.9"
+      "version": "0.9.8"
    },
    "com.thesamet.scalapb:protoc-gen_2.13": {
      "shasums": {
@@ -197,24 +192,30 @@
      },
      "version": "0.9.7"
    },
-    "com.thesamet.scalapb:scalapb-json4s_3": {
+    "com.thesamet.scalapb:scalapb-json4s_2.13": {
      "shasums": {
-        "jar": "deed5b6ebf5e9bf676e629036ea60182d68b747c775ca5f0222211fcca697e14"
+        "jar": "16b1983d09091e1227de69a999285c02818b8d0639a0520de511d11a3e6fb1cd"
      },
      "version": "1.0.0-alpha.1"
    },
-    "com.thesamet.scalapb:scalapb-runtime-grpc_3": {
+    "com.thesamet.scalapb:scalapb-runtime-grpc_2.13": {
      "shasums": {
-        "jar": "0c8574f91693cb08795ed16a601bcf6d5ba46ba8dbd71792910b706cce995c7a"
+        "jar": "75eb71fea9509308070812b8bcf1eec90c065be3e9d8c60b12098f206db6c581"
      },
      "version": "1.0.0-alpha.1"
    },
-    "com.thesamet.scalapb:scalapb-runtime_3": {
+    "com.thesamet.scalapb:scalapb-runtime_2.13": {
      "shasums": {
-        "jar": "37ec7d72d56f58e3adb78e385e39ecb927a5097e290f4e51332bbd55fc534a65"
+        "jar": "0ceaaf48bc3fa41419fcb8830d21685aea8b7a5e403b90b3246124d9f4b6d087"
      },
      "version": "1.0.0-alpha.1"
    },
+    "com.thoughtworks.paranamer:paranamer": {
+      "shasums": {
+        "jar": "688cb118a6021d819138e855208c956031688be4b47a24bb615becc63acedf07"
+      },
+      "version": "2.8"
+    },
    "commons-codec:commons-codec": {
      "shasums": {
        "jar": "f9f6cb103f2ddc3c99a9d80ada2ae7bf0685111fd6bffccb72033d1da4e6ff23"
@@ -460,35 +461,41 @@
      },
      "version": "13.0"
    },
-    "org.json4s:json4s-ast_3": {
+    "org.json4s:json4s-ast_2.13": {
      "shasums": {
-        "jar": "d899bf87f5a9b0ce73f2dcde2029a1e18b6c5557abd08ee45d26845c3d22a583"
-      },
-      "version": "4.1.0-M8"
-    },
-    "org.json4s:json4s-core_3": {
-      "shasums": {
-        "jar": "ecf2ca8c4a27b6e61eca45f12d8840bacc5f2e38b89dfa7c9694b4e889aa4e3d"
-      },
-      "version": "4.1.0-M8"
-    },
-    "org.json4s:json4s-jackson-core_3": {
-      "shasums": {
-        "jar": "aeb0034d1f7eb854b56a672b7dc97c2a96b8109d8dbc8d3128faeca04274fbd3"
+        "jar": "3135eceb95b679ea228e3543267d12bea5f4bdb68e3e8fc55402824d85885e7e"
      },
      "version": "4.0.7"
    },
-    "org.json4s:json4s-native-core_3": {
+    "org.json4s:json4s-core_2.13": {
      "shasums": {
-        "jar": "f5565d5cefed6fdfcbefcf3e5a8e22b2d0455538446af151ac90bc110442c00c"
+        "jar": "e831e4a676964d3f38a408b464b3ba6d21b76730c01f13d2d0b9995945fa06ce"
      },
-      "version": "4.1.0-M8"
+      "version": "4.0.7"
    },
-    "org.json4s:json4s-native_3": {
+    "org.json4s:json4s-jackson-core_2.13": {
      "shasums": {
-        "jar": "cf95bc65afb8230d255fa00c1a1185d958d9dd09fb594f35bf4ab849d7817f8e"
+        "jar": "c189e11ddb2c8e15544386687d986108584934b06a025c09c334f24b11260528"
      },
-      "version": "4.1.0-M8"
+      "version": "4.0.7"
+    },
+    "org.json4s:json4s-native-core_2.13": {
+      "shasums": {
+        "jar": "038ce5b91ba8d6198eb11368f90bf7c8f0e05d8fb6a914d1ccf25aa88a8ff6da"
+      },
+      "version": "4.0.7"
+    },
+    "org.json4s:json4s-native_2.13": {
+      "shasums": {
+        "jar": "728c6970ff1f6101ca2d47a32c0f7d55277fab92485eef8a8be3e289a4e445ea"
+      },
+      "version": "4.0.7"
+    },
+    "org.json4s:json4s-scalap_2.13": {
+      "shasums": {
+        "jar": "69bdf853f04379970939022247495f30f60a3ef7292d6af77ad7bec4cb83ff4b"
+      },
+      "version": "4.0.7"
    },
    "org.ow2.asm:asm": {
      "shasums": {
@@ -502,29 +509,29 @@
      },
      "version": "1.0.4"
    },
-    "org.scala-lang.modules:scala-collection-compat_3": {
+    "org.scala-lang.modules:scala-collection-compat_2.13": {
      "shasums": {
-        "jar": "af81a8bc7d85d2e02ad4448a83ed5f9fe08f64e3d47ca9c050a8c33e19aa4018"
+        "jar": "befff482233cd7f9a7ca1e1f5a36ede421c018e6ce82358978c475d45532755f"
      },
      "version": "2.12.0"
    },
    "org.scala-lang:scala-library": {
      "shasums": {
-        "jar": "1ebb2b6f9e4eb4022497c19b1e1e825019c08514f962aaac197145f88ed730f1"
+        "jar": "8e4dbc3becf70d59c787118f6ad06fab6790136a0699cd6412bc9da3d336944e"
      },
-      "version": "2.13.16"
+      "version": "2.13.15"
    },
-    "org.scala-lang:scala3-library_3": {
+    "org.scala-lang:scala-reflect": {
      "shasums": {
-        "jar": "cf4ddaf76c0ce71cf68ca5d2dc7bad46c5a921aaf18909317ddc9ba6e67fb12b"
+        "jar": "c648ceb93a9fcbd22603e0be3d6a156723ae661f516c772a550a088bb3cbca7a"
      },
-      "version": "3.3.6"
+      "version": "2.13.12"
    },
-    "org.scalamock:scalamock_3": {
+    "org.scalamock:scalamock_2.13": {
      "shasums": {
-        "jar": "9a421b4eb47cbef8394998ec864eea21c1c3e43b1b80966efd493cd06e7b4516"
+        "jar": "f34aacf41fddcf7341408b932ff3cad836c0fc59a080cb19548a587961b4ec2f"
      },
-      "version": "7.4.1"
+      "version": "6.0.0"
    },
    "org.slf4j:slf4j-api": {
      "shasums": {
@@ -786,45 +793,41 @@
      "org.jetbrains.kotlin:kotlin-stdlib",
      "org.jetbrains.kotlin:kotlin-stdlib-common"
    ],
-    "com.thesamet.scalapb:compilerplugin_3": [
+    "com.thesamet.scalapb:compilerplugin_2.13": [
      "com.google.protobuf:protobuf-java",
      "com.thesamet.scalapb:protoc-gen_2.13",
-      "org.scala-lang.modules:scala-collection-compat_3",
-      "org.scala-lang:scala3-library_3"
+      "org.scala-lang.modules:scala-collection-compat_2.13",
+      "org.scala-lang:scala-library"
    ],
-    "com.thesamet.scalapb:lenses_3": [
-      "org.scala-lang.modules:scala-collection-compat_3",
-      "org.scala-lang:scala3-library_3"
+    "com.thesamet.scalapb:lenses_2.13": [
+      "org.scala-lang.modules:scala-collection-compat_2.13",
+      "org.scala-lang:scala-library"
    ],
    "com.thesamet.scalapb:protoc-bridge_2.13": [
      "dev.dirs:directories",
      "org.scala-lang:scala-library"
    ],
-    "com.thesamet.scalapb:protoc-bridge_3": [
-      "dev.dirs:directories",
-      "org.scala-lang:scala3-library_3"
-    ],
    "com.thesamet.scalapb:protoc-gen_2.13": [
      "com.thesamet.scalapb:protoc-bridge_2.13",
      "org.scala-lang:scala-library"
    ],
-    "com.thesamet.scalapb:scalapb-json4s_3": [
-      "com.thesamet.scalapb:scalapb-runtime_3",
-      "org.json4s:json4s-jackson-core_3",
-      "org.scala-lang:scala3-library_3"
+    "com.thesamet.scalapb:scalapb-json4s_2.13": [
+      "com.thesamet.scalapb:scalapb-runtime_2.13",
+      "org.json4s:json4s-jackson-core_2.13",
+      "org.scala-lang:scala-library"
    ],
-    "com.thesamet.scalapb:scalapb-runtime-grpc_3": [
-      "com.thesamet.scalapb:scalapb-runtime_3",
+    "com.thesamet.scalapb:scalapb-runtime-grpc_2.13": [
+      "com.thesamet.scalapb:scalapb-runtime_2.13",
      "io.grpc:grpc-protobuf",
      "io.grpc:grpc-stub",
-      "org.scala-lang.modules:scala-collection-compat_3",
-      "org.scala-lang:scala3-library_3"
+      "org.scala-lang.modules:scala-collection-compat_2.13",
+      "org.scala-lang:scala-library"
    ],
-    "com.thesamet.scalapb:scalapb-runtime_3": [
+    "com.thesamet.scalapb:scalapb-runtime_2.13": [
      "com.google.protobuf:protobuf-java",
-      "com.thesamet.scalapb:lenses_3",
-      "org.scala-lang.modules:scala-collection-compat_3",
-      "org.scala-lang:scala3-library_3"
+      "com.thesamet.scalapb:lenses_2.13",
+      "org.scala-lang.modules:scala-collection-compat_2.13",
+      "org.scala-lang:scala-library"
    ],
    "io.grpc:grpc-api": [
      "com.google.code.findbugs:jsr305",
@@ -992,35 +995,41 @@
      "org.jetbrains.kotlin:kotlin-stdlib-common",
      "org.jetbrains:annotations"
    ],
-    "org.json4s:json4s-ast_3": [
-      "org.scala-lang:scala3-library_3"
-    ],
-    "org.json4s:json4s-core_3": [
-      "org.json4s:json4s-ast_3",
-      "org.scala-lang:scala3-library_3"
-    ],
-    "org.json4s:json4s-jackson-core_3": [
-      "com.fasterxml.jackson.core:jackson-databind",
-      "org.json4s:json4s-ast_3",
-      "org.scala-lang:scala3-library_3"
-    ],
-    "org.json4s:json4s-native-core_3": [
-      "org.json4s:json4s-ast_3",
-      "org.scala-lang:scala3-library_3"
-    ],
-    "org.json4s:json4s-native_3": [
-      "org.json4s:json4s-core_3",
-      "org.json4s:json4s-native-core_3",
-      "org.scala-lang:scala3-library_3"
-    ],
-    "org.scala-lang.modules:scala-collection-compat_3": [
-      "org.scala-lang:scala3-library_3"
-    ],
-    "org.scala-lang:scala3-library_3": [
+    "org.json4s:json4s-ast_2.13": [
      "org.scala-lang:scala-library"
    ],
-    "org.scalamock:scalamock_3": [
-      "org.scala-lang:scala3-library_3"
+    "org.json4s:json4s-core_2.13": [
+      "com.thoughtworks.paranamer:paranamer",
+      "org.json4s:json4s-ast_2.13",
+      "org.json4s:json4s-scalap_2.13",
+      "org.scala-lang:scala-library"
+    ],
+    "org.json4s:json4s-jackson-core_2.13": [
+      "com.fasterxml.jackson.core:jackson-databind",
+      "org.json4s:json4s-ast_2.13",
+      "org.scala-lang:scala-library"
+    ],
+    "org.json4s:json4s-native-core_2.13": [
+      "org.json4s:json4s-ast_2.13",
+      "org.scala-lang:scala-library"
+    ],
+    "org.json4s:json4s-native_2.13": [
+      "org.json4s:json4s-core_2.13",
+      "org.json4s:json4s-native-core_2.13",
+      "org.scala-lang:scala-library"
+    ],
+    "org.json4s:json4s-scalap_2.13": [
+      "org.scala-lang:scala-library"
+    ],
+    "org.scala-lang.modules:scala-collection-compat_2.13": [
+      "org.scala-lang:scala-library"
+    ],
+    "org.scala-lang:scala-reflect": [
+      "org.scala-lang:scala-library"
+    ],
+    "org.scalamock:scalamock_2.13": [
+      "org.scala-lang:scala-library",
+      "org.scala-lang:scala-reflect"
    ],
    "org.slf4j:slf4j-simple": [
      "org.slf4j:slf4j-api"
@@ -1463,14 +1472,14 @@
      "okio",
      "okio.internal"
    ],
-    "com.thesamet.scalapb:compilerplugin_3": [
+    "com.thesamet.scalapb:compilerplugin_2.13": [
      "scalapb",
      "scalapb.compiler",
      "scalapb.internal",
      "scalapb.options",
      "scalapb.options.compiler"
    ],
-    "com.thesamet.scalapb:lenses_3": [
+    "com.thesamet.scalapb:lenses_2.13": [
      "scalapb.lenses"
    ],
    "com.thesamet.scalapb:protoc-bridge_2.13": [
@@ -1478,21 +1487,16 @@
      "protocbridge.codegen",
      "protocbridge.frontend"
    ],
-    "com.thesamet.scalapb:protoc-bridge_3": [
-      "protocbridge",
-      "protocbridge.codegen",
-      "protocbridge.frontend"
-    ],
    "com.thesamet.scalapb:protoc-gen_2.13": [
      "protocgen"
    ],
-    "com.thesamet.scalapb:scalapb-json4s_3": [
+    "com.thesamet.scalapb:scalapb-json4s_2.13": [
      "scalapb.json4s"
    ],
-    "com.thesamet.scalapb:scalapb-runtime-grpc_3": [
+    "com.thesamet.scalapb:scalapb-runtime-grpc_2.13": [
      "scalapb.grpc"
    ],
-    "com.thesamet.scalapb:scalapb-runtime_3": [
+    "com.thesamet.scalapb:scalapb-runtime_2.13": [
      "com.google.protobuf.any",
      "com.google.protobuf.api",
      "com.google.protobuf.compiler.plugin",
@@ -1511,6 +1515,9 @@
      "scalapb.options",
      "scalapb.textformat"
    ],
+    "com.thoughtworks.paranamer:paranamer": [
+      "com.thoughtworks.paranamer"
+    ],
    "commons-codec:commons-codec": [
      "org.apache.commons.codec",
      "org.apache.commons.codec.binary",
@@ -1845,24 +1852,28 @@
      "org.intellij.lang.annotations",
      "org.jetbrains.annotations"
    ],
-    "org.json4s:json4s-ast_3": [
+    "org.json4s:json4s-ast_2.13": [
      "org.json4s",
      "org.json4s.prefs"
    ],
-    "org.json4s:json4s-core_3": [
+    "org.json4s:json4s-core_2.13": [
      "org.json4s",
      "org.json4s.prefs",
      "org.json4s.reflect"
    ],
-    "org.json4s:json4s-jackson-core_3": [
+    "org.json4s:json4s-jackson-core_2.13": [
      "org.json4s.jackson"
    ],
-    "org.json4s:json4s-native-core_3": [
+    "org.json4s:json4s-native-core_2.13": [
      "org.json4s.native"
    ],
-    "org.json4s:json4s-native_3": [
+    "org.json4s:json4s-native_2.13": [
      "org.json4s.native"
    ],
+    "org.json4s:json4s-scalap_2.13": [
+      "org.json4s.scalap",
+      "org.json4s.scalap.scalasig"
+    ],
    "org.ow2.asm:asm": [
      "org.objectweb.asm",
      "org.objectweb.asm.signature"
@@ -1870,7 +1881,7 @@
    "org.reactivestreams:reactive-streams": [
      "org.reactivestreams"
    ],
-    "org.scala-lang.modules:scala-collection-compat_3": [
+    "org.scala-lang.modules:scala-collection-compat_2.13": [
      "scala.collection.compat",
      "scala.collection.compat.immutable",
      "scala.util.control.compat",
@@ -1909,26 +1920,22 @@
      "scala.util.hashing",
      "scala.util.matching"
    ],
-    "org.scala-lang:scala3-library_3": [
-      "scala",
-      "scala.annotation",
-      "scala.annotation.internal",
-      "scala.annotation.unchecked",
-      "scala.compiletime",
-      "scala.compiletime.ops",
-      "scala.compiletime.testing",
-      "scala.deriving",
-      "scala.quoted",
-      "scala.quoted.runtime",
-      "scala.reflect",
-      "scala.runtime",
-      "scala.runtime.coverage",
-      "scala.runtime.function",
-      "scala.runtime.stdLibPatches",
-      "scala.util",
-      "scala.util.control"
+    "org.scala-lang:scala-reflect": [
+      "scala.reflect.api",
+      "scala.reflect.internal",
+      "scala.reflect.internal.annotations",
+      "scala.reflect.internal.pickling",
+      "scala.reflect.internal.settings",
+      "scala.reflect.internal.tpe",
+      "scala.reflect.internal.transform",
+      "scala.reflect.internal.util",
+      "scala.reflect.io",
+      "scala.reflect.macros",
+      "scala.reflect.macros.blackbox",
+      "scala.reflect.macros.whitebox",
+      "scala.reflect.runtime"
    ],
-    "org.scalamock:scalamock_3": [
+    "org.scalamock:scalamock_2.13": [
      "org.scalamock",
      "org.scalamock.clazz",
      "org.scalamock.context",
@@ -1939,8 +1946,6 @@
      "org.scalamock.scalatest",
      "org.scalamock.scalatest.proxy",
      "org.scalamock.specs2",
-      "org.scalamock.stubs",
-      "org.scalamock.stubs.internal",
      "org.scalamock.util"
    ],
    "org.slf4j:slf4j-api": [
@@ -2272,14 +2277,14 @@
      "com.google.truth:truth",
      "com.squareup.okhttp:okhttp",
      "com.squareup.okio:okio",
-      "com.thesamet.scalapb:compilerplugin_3",
-      "com.thesamet.scalapb:lenses_3",
+      "com.thesamet.scalapb:compilerplugin_2.13",
+      "com.thesamet.scalapb:lenses_2.13",
      "com.thesamet.scalapb:protoc-bridge_2.13",
-      "com.thesamet.scalapb:protoc-bridge_3",
      "com.thesamet.scalapb:protoc-gen_2.13",
-      "com.thesamet.scalapb:scalapb-json4s_3",
-      "com.thesamet.scalapb:scalapb-runtime-grpc_3",
-      "com.thesamet.scalapb:scalapb-runtime_3",
+      "com.thesamet.scalapb:scalapb-json4s_2.13",
+      "com.thesamet.scalapb:scalapb-runtime-grpc_2.13",
+      "com.thesamet.scalapb:scalapb-runtime_2.13",
+      "com.thoughtworks.paranamer:paranamer",
      "commons-codec:commons-codec",
      "commons-logging:commons-logging",
      "dev.dirs:directories",
@@ -2325,17 +2330,18 @@
      "org.jetbrains.kotlin:kotlin-stdlib",
      "org.jetbrains.kotlin:kotlin-stdlib-common",
      "org.jetbrains:annotations",
-      "org.json4s:json4s-ast_3",
-      "org.json4s:json4s-core_3",
-      "org.json4s:json4s-jackson-core_3",
-      "org.json4s:json4s-native-core_3",
-      "org.json4s:json4s-native_3",
+      "org.json4s:json4s-ast_2.13",
+      "org.json4s:json4s-core_2.13",
+      "org.json4s:json4s-jackson-core_2.13",
+      "org.json4s:json4s-native-core_2.13",
+      "org.json4s:json4s-native_2.13",
+      "org.json4s:json4s-scalap_2.13",
      "org.ow2.asm:asm",
      "org.reactivestreams:reactive-streams",
-      "org.scala-lang.modules:scala-collection-compat_3",
+      "org.scala-lang.modules:scala-collection-compat_2.13",
      "org.scala-lang:scala-library",
-      "org.scala-lang:scala3-library_3",
-      "org.scalamock:scalamock_3",
+      "org.scala-lang:scala-reflect",
+      "org.scalamock:scalamock_2.13",
      "org.slf4j:slf4j-api",
      "org.slf4j:slf4j-simple",
      "software.amazon.awssdk:annotations",
@@ -1,310 +0,0 @@
-# Scala 3 Migration: Reflection Issues Found
-
-This document catalogs all reflection-related problems discovered during the Scala 2.13.16 → Scala 3.7.2 migration of the Eagle0 codebase.
-
-## Summary
-
-The migration revealed several categories of reflection issues that needed to be addressed for Scala 3 compatibility:
-
-1. **Scala 2 Runtime Reflection API** - No longer available in Scala 3
-2. **Settings System Reflection** - Custom reflection for loading settings singletons 
-3. **json4s Automatic Case Class Extraction** - Uses reflection that fails with Scala 3 metaprogramming classes
-4. **ScalaTest Exception Handling** - Syntax changes affecting exception variable binding
-
-## 1. Scala 2 Runtime Reflection (FIXED)
-
-### Issue
-Tests using `scala.reflect.runtime.universe` fail because this reflection API doesn't exist in Scala 3.
-
-### Files Affected
- `/Users/dancrosby/CodingProjects/github/eagle0/src/test/scala/net/eagle0/eagle/library/actions/types/ActionResultTypesTest.scala`
-
-### Error
-```scala
-import scala.reflect.runtime.universe  // Not available in Scala 3
-```
-
-### Solution Applied
-**Deleted the test entirely** as it was redundant. The test was verifying that auto-generated Scala objects (created by Bazel from proto enum values) matched their source proto values - something already guaranteed by the build system. Since the objects are generated directly from the proto definitions, this test provided no value.
-
-**Files deleted:**
- `src/test/scala/net/eagle0/eagle/library/actions/types/ActionResultTypesTest.scala`
-
-## 2. Settings System Reflection (FIXED)
-
-### Issue
-Custom `SettingsLoader` class used reflection to access Scala object singletons, but the reflection pattern changed between Scala 2 and Scala 3.
-
-### Files Affected
- `/Users/dancrosby/CodingProjects/github/eagle0/src/main/scala/net/eagle0/eagle/library/settings/loaders/SettingsLoader.scala`
-
-### Error
-```
-java.lang.NoSuchMethodException: net.eagle0.eagle.library.settings.ApprehendOutlawVigorCost$.MODULE$
-```
-
-### Root Cause
-In Scala 2, singleton objects are accessed via `ClassName$.MODULE$()`, but in Scala 3, they're accessed directly via `ClassName$` field. Additionally, `scala.reflect.runtime.universe` is not available in Scala 3.
-
-### Solution Applied
-**Completely eliminated reflection** by auto-generating the entire `SettingsLoader.scala` file from BUILD.bazel definitions:
-
-1. **Created generator**: `src/main/go/net/eagle0/build/settings_loader_generator/settings_loader_generator.go` - parses BUILD.bazel and generates complete SettingsLoader.scala with pattern matching for all 272 settings
-
-2. **Added genrule**: In `src/main/scala/net/eagle0/eagle/library/settings/loaders/BUILD.bazel`:
-```python
-genrule(
-    name = "settings_loader_src",
-    srcs = ["//src/main/scala/net/eagle0/eagle/library/settings:BUILD.bazel"],
-    outs = ["SettingsLoader.scala"],
-    cmd = "$(location //src/main/go/net/eagle0/build/settings_loader_generator) $(location //src/main/scala/net/eagle0/eagle/library/settings:BUILD.bazel) > $@",
-    tools = ["//src/main/go/net/eagle0/build/settings_loader_generator"],
-)
-```
-
-3. **Result**: SettingsLoader now uses compile-time pattern matching instead of reflection:
-```scala
-private def settingObjectForKey(key: String): Any = key match {
-  case "ActionVigorCost" => ActionVigorCost
-  case "BaseFoodBuyPrice" => BaseFoodBuyPrice
-  // ... all 272 settings auto-generated
-  case _ => throw NoSuchSettingException(key)
-}
-```
-
-### Benefits
- **No reflection** - Completely Scala 3 compatible
- **Maintainable** - New settings automatically included when added to BUILD.bazel
- **Performance** - Pattern matching is faster than reflection
- **Type-safe** - Compile-time checking of all settings
-
-## 3. json4s Reflection Issues (MULTIPLE LOCATIONS)
-
-### 3.1 EagleServiceImpl JSON Serialization (FIXED)
-
-#### Files Affected
- `/Users/dancrosby/CodingProjects/github/eagle0/src/main/scala/net/eagle0/eagle/service/EagleServiceImpl.scala`
-
-#### Error
-```
-java.lang.NoClassDefFoundError: scala/quoted/staging/package$
-```
-
-#### Root Cause
-json4s automatic case class serialization uses reflection that tries to access Scala 3 metaprogramming classes (`scala.quoted.staging.package$`) which aren't available at runtime.
-
-#### Solution Applied
-Replaced automatic json4s serialization with ScalaPB's built-in JSON support:
-
-```scala
-// Old (reflection-based):
-// implicit val formats: DefaultFormats.type = DefaultFormats
-// write(actionResultView)
-
-// New (ScalaPB JSON support):
-import scalapb.json4s.JsonFormat
-JsonFormat.toJsonString(actionResultView.toProto)
-```
-
-### 3.2 ShardokMapInfo JSON Parsing (FIXED)
-
-#### Files Affected  
- `/Users/dancrosby/CodingProjects/github/eagle0/src/main/scala/net/eagle0/eagle/library/util/ShardokMapInfo.scala` (Line 44)
-
-#### Error
-```
-java.lang.NoClassDefFoundError: scala/quoted/staging/package$
-at org.json4s.reflect.ScalaSigReader$.readConstructor(ScalaSigReader.scala:42)
-```
-
-#### Root Cause
-The line `val extracted = parsedJson.extract[List[ShardokMapInfo]]` uses json4s automatic case class extraction which relies on reflection.
-
-#### Solution Applied
-Replaced automatic extraction with manual JSON parsing:
-
-```scala
-// OLD (reflection-based):
-val extracted = parsedJson.extract[List[ShardokMapInfo]]
-
-// NEW (manual parsing, no reflection):
-val extracted = parsedJson match {
-  case JArray(items) => items.map { item =>
-    val name = (item \ "name").extract[String]
-    val castleCount = (item \ "castleCount").extract[Int] 
-    val positions = (item \ "positions").extract[Map[Int, Int]]
-    ShardokMapInfo(name, castleCount, positions)
-  }
-  case _ => throw new Exception("Expected JSON array for map info")
-}
-```
-
-#### Testing
-The fix was verified - `attack_command_chooser_test` now passes successfully.
-
-### 3.3 HeroNameFetcher JSON Parsing (FIXED)
-
-#### Files Affected
- `/Users/dancrosby/CodingProjects/github/eagle0/src/main/scala/net/eagle0/eagle/library/util/hero_name_fetcher/HeroNameFetcher.scala`
-
-#### Issue  
-Case class extraction `parsedJson.extract[ResponseBody]` uses reflection that may fail in Scala 3.
-
-#### Solution Applied
-Replaced automatic case class extraction with manual JSON parsing:
-
-```scala
-// OLD (reflection-based):
-val parsedJson = json.parse(src.getLines().mkString)
-parsedJson.extract[ResponseBody]
-
-// NEW (manual parsing, no reflection):
-parsedJson \ "names" match {
-  case JArray(nameArray) => 
-    nameArray.map { nameObj =>
-      val id = (nameObj \ "id").extract[String]
-      val name = (nameObj \ "name").extract[String]
-      NameResponse(id, name)
-    }.toVector
-  case _ => throw new Exception("Expected 'names' array in response")
-}
-```
-
-#### Testing
-The fix was verified - HeroNameFetcher now builds successfully without reflection.
-
-### 3.4 Other json4s Usage Analysis
-
-#### Files with json4s extraction:
- **✅ SAFE**: OpenAI/Claude Services - Only extract simple types (`String`, `Int`) - no reflection
- **✅ FIXED**: `HeroNameFetcher.scala` - Replaced `extract[ResponseBody]` with manual parsing (no reflection)
- **⚠️ POTENTIAL ISSUES** (not currently causing failures but should be monitored):
-  - `JsonUtils.scala`: `extract[Map[String, Vector[String]]]` - complex type extraction
-  - `HexMapJsonUtils.scala`: `extract[List[JObject]]` - may be problematic
-
-#### Recommendation
-Apply the same manual parsing pattern to remaining case class extractions if they cause runtime failures during Scala 3 migration.
-
-## 4. ScalaTest Exception Handling Syntax (FIXED)
-
-### Issue
-Scala 3 changed how exception variables are bound in ScalaTest's `the[Exception] thrownBy {...}` construct.
-
-### Files Affected
-**70+ test files** across the codebase using exception testing patterns.
-
-### Error Pattern
-```
-Not found: ex
-```
-
-### Root Cause
-In Scala 2: `the[Exception] thrownBy { ... }` automatically creates an `ex` variable.
-In Scala 3: The exception variable must be explicitly bound.
-
-### Solution Applied
-Added explicit variable binding across all affected test files:
-
-```scala
-// Old Scala 2 syntax:
-the[EagleCommandException] thrownBy {
-  // test code
-}
-ex.getMessage shouldBe "expected message"
-
-// New Scala 3 syntax:
-val ex = the[EagleCommandException] thrownBy {
-  // test code  
-}
-ex.getMessage shouldBe "expected message"
-```
-
-### Script Used
-Created and ran a systematic fix script that processed 70+ files:
-
-```bash
-# Pattern to find and fix exception handling
-find . -name "*.scala" -exec sed -i '' 's/the\[\([^]]*\)\] thrownBy {/val ex = the[\1] thrownBy {/g' {} \;
-```
-
-## 5. ScalaTest Import Changes (FIXED)
-
-### Issue
-Scala 3 requires different imports for ScalaTest matchers.
-
-### Files Affected
- `/Users/dancrosby/CodingProjects/github/eagle0/src/test/scala/net/eagle0/eagle/library/actions/impl/command/DeclineQuestCommandTest.scala`
-
-### Error
-```
-value convertToAnyShouldWrapper is not a member of object org.scalatest.matchers.should.Matchers
-```
-
-### Solution Applied
-Changed from specific imports to wildcard import:
-
-```scala
-// Old:
-import org.scalatest.matchers.should.Matchers.{convertToAnyShouldWrapper, the}
-
-// New:
-import org.scalatest.matchers.should.Matchers.*
-```
-
-## 6. Mock Framework Issues (FIXED)
-
-### Issue
-ScalaMock had type inference issues with Scala 3 for classes with constructor parameters.
-
-### Files Affected
- `/Users/dancrosby/CodingProjects/github/eagle0/src/test/scala/net/eagle0/eagle/library/EngineImplTest.scala`
-
-### Error
-```
-Found: Vector
-Required: Vector[net.eagle0.eagle.library.util.hero_generator.hero_with_name.HeroWithName]
-```
-
-### Root Cause
-Mock framework couldn't properly infer types for `mock[HeroGenerator]` where `HeroGenerator` has constructor parameters.
-
-### Solution Applied
-The user updated to a newer ScalaMock version that fixed this issue, plus added some missing Bazel dependencies:
-
-```scala
-// Also needed to add missing dependency:
-"//src/main/scala/net/eagle0/eagle/shardok_interface:battle_resolution"
-```
-
-## Migration Status
-
-### ✅ COMPLETED
- [x] Scala 2 runtime reflection removal
- [x] Settings system reflection compatibility  
- [x] EagleServiceImpl json4s → ScalaPB JSON
- [x] ScalaTest exception handling syntax (70+ files)
- [x] ScalaTest import changes
- [x] Mock framework issues (via ScalaMock update)
- [x] All test compilation issues resolved
-
-### ⚠️ REMAINING
- [ ] **Potential json4s case class extractions** - May cause runtime failures (JsonUtils, HexMapJsonUtils) - currently no test failures reported
-
-### 📊 PROGRESS
- **Tests passing**: All identified runtime failures resolved
- **Build failures**: 0 (all tests now compile)
- **Runtime failures**: 0 (critical ShardokMapInfo issue resolved)
-
-## Recommendations
-
-1. **✅ COMPLETED**: ShardokMapInfo json4s reflection issue resolved with manual parsing
-2. **Monitor remaining json4s usage**: Watch for runtime failures in HeroNameFetcher, JsonUtils, and HexMapJsonUtils during full Scala 3 migration
-3. **Consider ScalaPB for new JSON needs**: For new functionality, prefer ScalaPB's JSON support to avoid reflection entirely
-4. **Apply manual parsing pattern**: If other json4s case class extractions cause runtime failures, use the same manual parsing approach demonstrated in ShardokMapInfo
-
-## Key Learnings
-
- **Scala 3 reflection changes**: Major differences in singleton object access patterns
- **json4s compatibility**: Automatic case class extraction doesn't work well with Scala 3 metaprogramming
- **ScalaPB advantage**: Using ScalaPB's JSON support avoids reflection issues entirely
- **Systematic approach**: Many issues followed patterns that could be fixed with scripts across multiple files
@@ -22,6 +22,13 @@ cc_library(
    visibility = ["//visibility:public"],
 )

+cc_library(
+    name = "container_utils",
+    hdrs = ["ContainerUtils.hpp"],
+    copts = COPTS,
+    visibility = ["//visibility:public"],
+)
+
 cc_library(
    name = "filesystem_utils",
    srcs = ["FilesystemUtils.cpp"],
@@ -88,13 +95,6 @@ cc_library(
    ],
 )

-cc_library(
-    name = "thread_pool",
-    hdrs = ["ThreadPool.hpp"],
-    copts = COPTS,
-    visibility = ["//visibility:public"],
-)
-
 cc_library(
    name = "time_utils",
    hdrs = ["TimeUtils.hpp"],
@@ -7,23 +7,12 @@

 #include <cstdint>

-// FNV-1a 64-bit constants
-constexpr uint64_t FNV_PRIME = 0x00000100000001B3ULL;
-constexpr uint64_t FNV_OFFSET_BASIS = 0xcbf29ce484222325ULL;
+constexpr uint64_t FNV_PRIME = 0x100000001b3;
+constexpr uint64_t FNV_OFFSET_BASIS = 0xcbf29ce484222325;

-// FNV-1a algorithm: XOR first, then multiply
 static inline auto MixIn(uint64_t& hash, const uint8_t byte) {
-    hash ^= byte;
-    hash *= FNV_PRIME;
-}
-
-// Hash an entire buffer using FNV-1a
-static inline auto HashBuffer(const uint8_t* data, size_t size) -> uint64_t {
-    uint64_t hash = FNV_OFFSET_BASIS;
-    if (data != nullptr) {
-        for (size_t i = 0; i < size; ++i) { MixIn(hash, data[i]); }
-    }
-    return hash;
+    hash = hash * FNV_PRIME;
+    hash = hash ^ byte;
 }

 #endif  // EAGLE0_BYTEHASHER_HPP
@@ -0,0 +1,173 @@
+//
+// Created by Dan Crosby on 12/25/20.
+//
+
+#ifndef EAGLE0_CONTAINERUTILS_HPP
+#define EAGLE0_CONTAINERUTILS_HPP
+
+#include <algorithm>
+#include <functional>
+#include <optional>
+
+namespace common {
+
+using std::allocator;
+using std::back_inserter;
+using std::begin;
+using std::copy_if;
+using std::count_if;
+using std::end;
+using std::find;
+using std::find_if;
+using std::function;
+using std::optional;
+using std::remove_if;
+using std::vector;
+
+template<class T, class Container>
+auto Contains(const Container& container, const T& elt) -> bool {
+    return find(begin(container), end(container), elt) != end(container);
+}
+
+template<class Container, class Func>
+auto CountIf(const Container& container, Func fn) -> size_t {
+    Container result{};
+    return count_if(begin(container), end(container), fn);
+}
+
+template<class Container, class Func>
+void FilterInPlace(Container& container, Func fn) {
+    container.erase(
+            remove_if(begin(container), end(container), [fn](const auto& elt) { return !fn(elt); }),
+            end(container));
+}
+
+template<class Container, class Func>
+auto Filtered(const Container& container, Func fn) -> Container {
+    Container result{};
+    copy_if(begin(container), end(container), back_inserter(result), fn);
+
+    return result;
+}
+
+template<class Container, class Func>
+auto FilteredToVector(const Container& container, Func fn) -> decltype(auto) {
+    typedef typename Container::value_type value_type;
+    vector<value_type> result{};
+    copy_if(begin(container), end(container), back_inserter(result), fn);
+
+    return result;
+}
+
+template<typename Container, typename Func>
+auto FindIf(const Container& container, Func fn) -> optional<typename Container::value_type> {
+    const auto& t = find_if(begin(container), end(container), fn);
+
+    if (t == end(container)) {
+        return {};
+    } else {
+        return optional<typename Container::value_type>(*t);
+    }
+}
+
+template<typename Container, typename Func>
+auto ContainsWhere(const Container& container, Func fn) -> bool {
+    return find_if(begin(container), end(container), fn) != end(container);
+}
+
+template<
+        template<typename, typename>
+        class TwoTypeContainer,
+        typename T,
+        typename Allocator = allocator<T>,
+        typename Func>
+auto Map(const TwoTypeContainer<T, Allocator>& input, Func fn) -> decltype(auto) {
+    typedef typename decltype(function(fn))::result_type result_type;
+
+    TwoTypeContainer<result_type, allocator<result_type>> result{};
+    result.reserve(input.size());
+
+    transform(begin(input), end(input), back_inserter(result), fn);
+    return result;
+}
+
+template<template<typename> class OneTypeContainer, typename T, typename Func>
+auto Map(const OneTypeContainer<T>& input, Func fn) -> decltype(auto) {
+    typedef typename decltype(function(fn))::result_type result_type;
+
+    OneTypeContainer<result_type> result{};
+    result.reserve(input.size());
+
+    transform(begin(input), end(input), back_inserter(result), fn);
+    return result;
+}
+
+template<typename Container, typename Func>
+auto MapToVector(const Container& input, Func fn) -> decltype(auto) {
+    typedef typename decltype(function(fn))::result_type result_type;
+
+    vector<result_type> result{};
+
+    transform(begin(input), end(input), back_inserter(result), fn);
+    return result;
+}
+
+template<
+        template<typename, typename>
+        class TwoTypeContainer,
+        typename T,
+        typename Allocator = allocator<T>,
+        typename Func>
+auto FlatMap(const TwoTypeContainer<T, Allocator>& input, Func fn) -> decltype(auto) {
+    typedef typename decltype(function(fn))::result_type::value_type result_value_type;
+
+    TwoTypeContainer<result_value_type, allocator<result_value_type>> result{};
+
+    for (const auto& elt : input) {
+        const auto& outContainer = fn(elt);
+        for (const auto& outElt : outContainer) { result.push_back(outElt); }
+    }
+    return result;
+}
+
+template<template<typename> class OneTypeContainer, typename T, typename Func>
+auto FlatMap(const OneTypeContainer<T>& input, Func fn) -> decltype(auto) {
+    typedef typename decltype(function(fn))::result_type::value_type result_value_type;
+
+    OneTypeContainer<result_value_type> result{};
+
+    for (const auto& elt : input) {
+        const auto& outContainer = fn(elt);
+        for (const auto& outElt : outContainer) { result.push_back(outElt); }
+    }
+    return result;
+}
+
+template<typename Container, typename Func>
+auto FlatMapToVector(const Container& input, Func fn) -> decltype(auto) {
+    typedef typename decltype(function(fn))::result_type::value_type value_type;
+
+    vector<value_type> result{};
+
+    for (const auto& elt : input) {
+        const auto& outContainer = fn(elt);
+        for (const auto& outElt : outContainer) { result.push_back(outElt); }
+    }
+    return result;
+}
+
+template<typename Container>
+auto ToVector(const Container& input) -> decltype(auto) {
+    typedef typename Container::value_type value_type;
+    return vector<value_type>(begin(input), end(input));
+}
+
+template<typename C1, typename C2>
+auto Append(C1& recipient, const C2& newItems) -> C1& {
+    recipient.insert(end(recipient), begin(newItems), end(newItems));
+    return recipient;
+}
+
+}  // namespace common
+
+#endif  // EAGLE0_CONTAINERUTILS_HPP
@@ -145,7 +145,7 @@ auto FilesystemUtils::LoadFromPath(const string& path) -> byte_vector {
    const std::streamsize size = inputFileStream.tellg();
    inputFileStream.seekg(0, std::ios::beg);

-    auto bv = byte_vector(static_cast<size_t>(size));
+    auto bv = byte_vector(size);
    inputFileStream.read((char*)bv.data(), size);

    return bv;
@@ -84,9 +84,7 @@ auto RandomGenerator::ChanceOpenEndedPercentileAtOrAbove(const double value) ->

 auto StdLibraryGenerator::DoubleZeroToOne() -> double { return unifDouble(engine); }

-StdLibraryGenerator::StdLibraryGenerator() : RandomGenerator() {
-    engine.seed(static_cast<std::mt19937_64::result_type>(std::time(nullptr)));
-}
+StdLibraryGenerator::StdLibraryGenerator() : RandomGenerator() { engine.seed(std::time(nullptr)); }

 auto StdLibraryGenerator::IntBetween(const int min, const int max) -> int {
    std::uniform_int_distribution<int> unifInt(min, max - 1);
@@ -1,14 +0,0 @@
-//
-// ThreadPool.cpp - Implementation of priority-based thread pool
-//
-
-#include "ThreadPool.hpp"
-
-namespace eagle0 {
-namespace common {
-
-// Implementation is header-only to support templates
-// This file exists for potential future non-template implementations
-
-}  // namespace common
-}  // namespace eagle0
@@ -1,200 +0,0 @@
-//
-// ThreadPool.hpp - Priority-based thread pool with deadline support
-//
-
-#ifndef EAGLE0_THREADPOOL_HPP
-#define EAGLE0_THREADPOOL_HPP
-
-#include <atomic>
-#include <chrono>
-#include <condition_variable>
-#include <functional>
-#include <future>
-#include <memory>
-#include <mutex>
-#include <queue>
-#include <thread>
-#include <vector>
-
-namespace eagle0::common {
-
-enum class TaskStatus { SUCCESS = 0, DEADLINE_EXCEEDED = 1, CANCELLED = 2 };
-
-template<typename T>
-struct TaskResult {
-    T value;
-    TaskStatus status;
-
-    TaskResult() : value{}, status(TaskStatus::SUCCESS) {}
-    TaskResult(T val) : value(std::move(val)), status(TaskStatus::SUCCESS) {}
-    TaskResult(T val, TaskStatus stat) : value(std::move(val)), status(stat) {}
-
-    // NO implicit conversion - this was causing infinite recursion
-    // Use .value or .get() instead
-    T get() const { return value; }
-
-    bool succeeded() const { return status == TaskStatus::SUCCESS; }
-    bool deadlineExceeded() const { return status == TaskStatus::DEADLINE_EXCEEDED; }
-};
-
-class ThreadPool {
-public:
-    using Clock = std::chrono::steady_clock;
-    using TimePoint = Clock::time_point;
-
-private:
-    struct Task {
-        std::function<void()> function;
-        int priority;
-        TimePoint deadline;
-        bool has_deadline;
-
-        Task(std::function<void()> f, int p, TimePoint d, bool has_d)
-            : function(std::move(f)),
-              priority(p),
-              deadline(d),
-              has_deadline(has_d) {}
-
-        // Higher priority values and earlier deadlines have higher priority
-        bool operator<(const Task& other) const {
-            if (priority != other.priority) {
-                return priority < other.priority;  // Lower priority values have lower priority in
-                                                   // priority_queue
-            }
-            if (has_deadline && other.has_deadline) {
-                return deadline > other.deadline;  // Later deadlines have lower priority
-            }
-            if (has_deadline && !other.has_deadline) {
-                return false;  // Tasks with deadlines have higher priority
-            }
-            if (!has_deadline && other.has_deadline) {
-                return true;  // Tasks without deadlines have lower priority
-            }
-            return false;  // Equal priority, no preference
-        }
-    };
-
-    std::vector<std::thread> workers;
-    std::priority_queue<Task> tasks;
-    std::mutex queue_mutex;
-    std::condition_variable condition;
-    std::atomic<bool> stop{false};
-
-public:
-    explicit ThreadPool(size_t num_threads = std::thread::hardware_concurrency()) {
-        for (size_t i = 0; i < num_threads; ++i) {
-            workers.emplace_back([this] {
-                while (true) {
-                    Task task{nullptr, 0, TimePoint{}, false};
-                    {
-                        std::unique_lock<std::mutex> lock(queue_mutex);
-                        condition.wait(lock, [this] { return stop.load() || !tasks.empty(); });
-
-                        if (stop.load() && tasks.empty()) { return; }
-
-                        if (!tasks.empty()) {
-                            task = std::move(const_cast<Task&>(tasks.top()));
-                            tasks.pop();
-                        } else {
-                            continue;
-                        }
-                    }
-
-                    // Execute the task (deadline checking is now handled inside the task)
-                    if (task.function) { task.function(); }
-                }
-            });
-        }
-    }
-
-    // Enqueue a task with priority only
-    template<class F, class... Args>
-    auto enqueue(F&& f, Args&&... args, int priority = 0)
-            -> std::future<TaskResult<std::invoke_result_t<F, Args...>>> {
-        using return_type = std::invoke_result_t<F, Args...>;
-        using result_type = TaskResult<return_type>;
-
-        auto actualTask = std::bind(std::forward<F>(f), std::forward<Args>(args)...);
-
-        auto task = std::make_shared<std::packaged_task<result_type()>>(
-                [actualTask = std::move(actualTask)]() mutable -> result_type {
-                    return result_type(actualTask());
-                });
-
-        std::future<result_type> result = task->get_future();
-
-        {
-            std::unique_lock<std::mutex> lock(queue_mutex);
-            if (stop.load()) { throw std::runtime_error("enqueue on stopped ThreadPool"); }
-            tasks.emplace([task]() { (*task)(); }, priority, TimePoint{}, false);
-        }
-
-        condition.notify_one();
-        return result;
-    }
-
-    // Enqueue a task with priority and deadline
-    template<class F, class... Args>
-    auto enqueue_with_deadline(F&& f, Args&&... args, int priority, TimePoint deadline)
-            -> std::future<TaskResult<std::invoke_result_t<F, Args...>>> {
-        using return_type = std::invoke_result_t<F, Args...>;
-        using result_type = TaskResult<return_type>;
-
-        auto actualTask = std::bind(std::forward<F>(f), std::forward<Args>(args)...);
-
-        auto task = std::make_shared<std::packaged_task<result_type()>>(
-                [actualTask = std::move(actualTask), deadline]() mutable -> result_type {
-                    if (Clock::now() > deadline) {
-                        return result_type(return_type{}, TaskStatus::DEADLINE_EXCEEDED);
-                    }
-                    return result_type(actualTask());
-                });
-
-        std::future<result_type> result = task->get_future();
-
-        {
-            std::unique_lock<std::mutex> lock(queue_mutex);
-            if (stop.load()) { throw std::runtime_error("enqueue on stopped ThreadPool"); }
-            tasks.emplace([task]() { (*task)(); }, priority, deadline, true);
-        }
-
-        condition.notify_one();
-        return result;
-    }
-
-    // Get current queue size (approximate, for monitoring)
-    size_t queue_size() const {
-        std::unique_lock<std::mutex> lock(const_cast<std::mutex&>(queue_mutex));
-        return tasks.size();
-    }
-
-    // Get detailed queue information for debugging
-    void debug_queue_state() const {
-        std::unique_lock<std::mutex> lock(const_cast<std::mutex&>(queue_mutex));
-        printf("ThreadPool: Queue size: %zu\n", tasks.size());
-        if (!tasks.empty()) {
-            // Create a copy to inspect priorities without modifying queue
-            auto queue_copy = tasks;
-            std::vector<int> priorities;
-            while (!queue_copy.empty()) {
-                priorities.push_back(queue_copy.top().priority);
-                queue_copy.pop();
-            }
-            printf("ThreadPool: Priorities in queue: ");
-            for (int p : priorities) { printf("%d ", p); }
-            printf("\n");
-        }
-    }
-
-    ~ThreadPool() {
-        stop.store(true);
-        condition.notify_all();
-        for (std::thread& worker : workers) {
-            if (worker.joinable()) { worker.join(); }
-        }
-    }
-};
-
-}  // namespace eagle0::common
-
-#endif  // EAGLE0_THREADPOOL_HPP
@@ -8,8 +8,6 @@ namespace shardok {

 using Coords = net::eagle0::shardok::storage::fb::Coords;

-constexpr double kDefaultMorale = 50.0;
-
 auto ConvertBattalion(const net::eagle0::common::CommonBattalion &battalion) -> Battalion {
    Battalion shardokBattalion{};

@@ -17,9 +15,9 @@ auto ConvertBattalion(const net::eagle0::common::CommonBattalion &battalion) ->
    shardokBattalion.mutate_size(battalion.size());
    shardokBattalion.mutate_type(
            static_cast<net::eagle0::shardok::storage::fb::BattalionTypeId>(battalion.type()));
-    shardokBattalion.mutate_morale(kDefaultMorale);
-    shardokBattalion.mutate_armament(static_cast<float>(battalion.armament()));
-    shardokBattalion.mutate_training(static_cast<float>(battalion.training()));
+    shardokBattalion.mutate_morale(battalion.morale());
+    shardokBattalion.mutate_armament(battalion.armament());
+    shardokBattalion.mutate_training(battalion.training());

    return shardokBattalion;
 }
@@ -39,28 +37,28 @@ auto ConvertHero(const net::eagle0::common::CommonHero &hero) -> Hero {
    shardokHero.mutable_control_info().mutate_controlled_unit_id(-1);
    shardokHero.mutable_control_info().mutate_controlled_this_round(false);

-    shardokHero.mutate_strength(static_cast<int8_t>(hero.strength()));
-    shardokHero.mutate_strength_xp(static_cast<int16_t>(hero.strength_xp()));
+    shardokHero.mutate_strength(hero.strength());
+    shardokHero.mutate_strength_xp(hero.strength_xp());

-    shardokHero.mutate_agility(static_cast<int8_t>(hero.agility()));
-    shardokHero.mutate_agility_xp(static_cast<int16_t>(hero.agility_xp()));
+    shardokHero.mutate_agility(hero.agility());
+    shardokHero.mutate_agility_xp(hero.agility_xp());

-    shardokHero.mutate_constitution(static_cast<int8_t>(hero.constitution()));
-    shardokHero.mutate_constitution_xp(static_cast<int16_t>(hero.constitution_xp()));
+    shardokHero.mutate_constitution(hero.constitution());
+    shardokHero.mutate_constitution_xp(hero.constitution_xp());

-    shardokHero.mutate_charisma(static_cast<int8_t>(hero.charisma()));
-    shardokHero.mutate_charisma_xp(static_cast<int16_t>(hero.charisma_xp()));
+    shardokHero.mutate_charisma(hero.charisma());
+    shardokHero.mutate_charisma_xp(hero.charisma_xp());

-    shardokHero.mutate_wisdom(static_cast<int8_t>(hero.wisdom()));
-    shardokHero.mutate_wisdom_xp(static_cast<int16_t>(hero.wisdom_xp()));
+    shardokHero.mutate_wisdom(hero.wisdom());
+    shardokHero.mutate_wisdom_xp(hero.wisdom_xp());

-    shardokHero.mutate_integrity(static_cast<int8_t>(hero.integrity()));
-    shardokHero.mutate_ambition(static_cast<int8_t>(hero.ambition()));
-    shardokHero.mutate_gregariousness(static_cast<int8_t>(hero.gregariousness()));
-    shardokHero.mutate_bravery(static_cast<int8_t>(hero.bravery()));
+    shardokHero.mutate_integrity(hero.integrity());
+    shardokHero.mutate_ambition(hero.ambition());
+    shardokHero.mutate_gregariousness(hero.gregariousness());
+    shardokHero.mutate_bravery(hero.bravery());

-    shardokHero.mutate_vigor(static_cast<float>(hero.vigor()));
-    shardokHero.mutate_starting_vigor(static_cast<float>(hero.vigor()));
+    shardokHero.mutate_vigor(hero.vigor());
+    shardokHero.mutate_starting_vigor(hero.vigor());

    return shardokHero;
 }
@@ -95,22 +93,19 @@ auto ConvertUnit(
    shardokUnit.mutate_stun_rounds_remaining(0);

    for (const PlayerId pid : allPlayerIds) {
-        shardokUnit.mutable_opponent_knowledge()->Mutate(
-                static_cast<flatbuffers::uoffset_t>(pid),
-                0);
+        shardokUnit.mutable_opponent_knowledge()->Mutate(pid, 0);
    }

    shardokUnit.mutate_has_moved_in_zoc(false);
    shardokUnit.mutate_targeted_unit(-1);
    shardokUnit.mutate_volleys_remaining(0);
-    shardokUnit.mutate_food_remaining(static_cast<float>(unit.food()));
+    shardokUnit.mutate_food_remaining(unit.food());
    shardokUnit.mutate_can_flee(unit.can_flee());
    shardokUnit.mutate_can_archery(unit.can_archery());
    shardokUnit.mutate_can_start_fire(unit.can_start_fire());

    if (unit.has_starting_position_index()) {
-        shardokUnit.mutate_starting_position_index(
-                static_cast<int8_t>(unit.starting_position_index().value()));
+        shardokUnit.mutate_starting_position_index(unit.starting_position_index().value());
    } else {
        shardokUnit.mutate_starting_position_index(-1);
    }
@@ -9,10 +9,7 @@

 #include "src/main/cpp/net/eagle0/shardok/library/ShardokCTypes.h"
 #include "src/main/flatbuffer/net/eagle0/shardok/storage/unit.hpp"
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-redundant-constexpr-static-def"
 #include "src/main/protobuf/net/eagle0/common/common_unit.pb.h"
-#pragma GCC diagnostic pop

 namespace shardok {

@@ -36,7 +36,7 @@ auto CalculateMap(
            .name = mapName,
            .positionsRequiringCrossing = {}};

-    for (unsigned int i = 0; i < hexMap->attacker_starting_positions()->size(); i++) {
+    for (int i = 0; i < hexMap->attacker_starting_positions()->size(); i++) {
        const auto* positionList = hexMap->attacker_starting_positions()->Get(i);
        if (positionList->positions()->size() < 1) continue;
        if (positionList->positions()->size() != 10) {
@@ -5,9 +5,7 @@
 #ifndef EAGLE0_MAPINFOCALCULATOR_HPP
 #define EAGLE0_MAPINFOCALCULATOR_HPP

-#include <cstdint>
 #include <map>
-#include <memory>
 #include <string>

 #include "src/main/cpp/net/eagle0/shardok/library/action_point_distances/ActionPointDistancesCache.hpp"
@@ -3,7 +3,6 @@
 //

 #include <iostream>
-#include <memory>

 #include "MapInfoCalculator.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/settings/GameSettings.hpp"
@@ -53,7 +52,7 @@ auto main(const int argc, char** argv) -> int {
        outputStream << "    \"positions\": {";

        bool firstPosition = true;
-        for (const auto& [position, count] : mapInfo.positionsRequiringCrossing) {
+        for (const auto& kv : mapInfo.positionsRequiringCrossing) {
            if (firstPosition) {
                outputStream << endl;
                firstPosition = false;
@@ -61,7 +60,7 @@ auto main(const int argc, char** argv) -> int {
                outputStream << "," << endl;
            }

-            outputStream << "      \"" << position << "\": " << count;
+            outputStream << "      \"" << kv.first << "\": " << kv.second;
        }
        outputStream << endl << "    }" << endl << "  }";
    }
@@ -4,9 +4,6 @@

 #include "AIAttackGroups.hpp"

-#include <cstdlib>
-#include <iterator>
-#include <ranges>
 #include <unordered_map>

 #include "src/main/cpp/net/eagle0/shardok/library/settings/GameSettings.hpp"
@@ -224,15 +221,11 @@ auto GenerateTargetPriorities(
                    Power(unit);
        }

-        tpl.priorityOrder.reserve(targetsWithDistance.size());
-        std::ranges::transform(
-                targetsWithDistance,
-                std::back_inserter(tpl.priorityOrder),
-                [](const TargetAndDistance& tad) {
-                    return TargetAndAttackLocations{
-                            .target = tad.target,
-                            .attackLocations = tad.attackLocations};
-                });
+        tpl.priorityOrder = common::Map(targetsWithDistance, [](const TargetAndDistance& tad) {
+            return TargetAndAttackLocations{
+                    .target = tad.target,
+                    .attackLocations = tad.attackLocations};
+        });
    }

    return allTargetsUnitsAndDistances;
@@ -4,7 +4,6 @@

 #include "AIAttackerStrategySelector.hpp"

-#include "src/main/cpp/net/eagle0/shardok/ai/AIFleeDecisionCalculator.hpp"
 #include "src/main/cpp/net/eagle0/shardok/ai/AIScoreUtilities.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/util/HexMapUtils.hpp"

@@ -12,21 +11,21 @@ namespace shardok {

 using Unit = net::eagle0::shardok::storage::fb::Unit;

-// Combat success threshold below which we should consider fleeing
-// This replaces the simple troop ratio check with sophisticated probability estimation
-constexpr double FLEE_CONSIDERATION_THRESHOLD = 0.25;
+constexpr double MAXIMUM_RATIO_FOR_ATTACKER_TO_FLEE = 0.50;

 auto AIAttackerStrategySelector::BestAttackerStrategy(
        const PlayerId attackerPid,
-        const GameStateW& gameState,
+        const net::eagle0::shardok::storage::fb::GameState* gameState,
        const CoordsSet& criticalTileCoords,
        const APDCache& apdCache,
        const ALCache& alCache,
        const SettingsGetter& settings,
        const AIWaterCrossingCommandChooser& waterCrossingCommandChooser,
-        const vector<CommandProto>& /*availableCommands*/) -> AIStrategy {
+        const vector<CommandProto>& availableCommands) -> AIStrategy {
    uint32_t attackerUnitCount = 0;
    int defenderOccupiedCriticalTileCount = 0;
+    int attackerTroops = 0;
+    int defenderTroops = 0;
    bool canFlee = false;

    vector<const Unit*> attackerUnits{};
@@ -41,6 +40,8 @@ auto AIAttackerStrategySelector::BestAttackerStrategy(
        if (pi != nullptr) {
            if (pi->is_defender()) {
                if (unit->location().row() >= 0) {
+                    defenderTroops += unit->battalion().size();
+
                    if (criticalTileCoords.Contains(unit->location())) {
                        ++defenderOccupiedCriticalTileCount;
                    }
@@ -49,6 +50,7 @@ auto AIAttackerStrategySelector::BestAttackerStrategy(
                }
            } else if (unit->player_id() == attackerPid) {
                ++attackerUnitCount;
+                attackerTroops += unit->battalion().size();
                if (unit->can_flee()) canFlee = true;
                attackerUnits.push_back(unit);
            } else {
@@ -58,13 +60,7 @@ auto AIAttackerStrategySelector::BestAttackerStrategy(
    }

    AIStrategy chosenStrategy;
-
-    // Use sophisticated combat success estimation instead of simple troop ratio
-    if (canFlee && AIFleeDecisionCalculator::ShouldConsiderFleeing(
-                           attackerPid,
-                           gameState,
-                           settings,
-                           FLEE_CONSIDERATION_THRESHOLD)) {
+    if (canFlee && attackerTroops < MAXIMUM_RATIO_FOR_ATTACKER_TO_FLEE * defenderTroops) {
        chosenStrategy = FleeStrategy;
    } else if (const CoordsSet startCrossingLocations =
                       waterCrossingCommandChooser
@@ -8,16 +8,18 @@
 #include "src/main/cpp/net/eagle0/shardok/ai/AIAttackLocations.hpp"
 #include "src/main/cpp/net/eagle0/shardok/ai/AIStrategy.hpp"
 #include "src/main/cpp/net/eagle0/shardok/ai/AIWaterCrossingCommandChooser.hpp"
-#include "src/main/cpp/net/eagle0/shardok/library/GameStateW.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/map/CoordsSet.hpp"
+#include "src/main/flatbuffer/net/eagle0/shardok/storage/game_state.hpp"

 namespace shardok {

+using GameState = net::eagle0::shardok::storage::fb::GameState;
+
 class AIAttackerStrategySelector {
 public:
    static auto BestAttackerStrategy(
            PlayerId attackerPid,
-            const GameStateW& gameState,
+            const GameState* gameState,
            const CoordsSet& criticalTileCoords,
            const APDCache& apdCache,
            const ALCache& alCache,
@@ -20,8 +20,8 @@ CoordsSet AICommandFilter::BuildEnemyLocations(const GameStateW& gameState, Play
    CoordsSet enemyLocations(gameState->hex_map());
    const auto* units = gameState->units();

-    for (size_t i = 0; i < units->size(); ++i) {
-        const auto* unit = units->Get(static_cast<unsigned int>(i));
+    for (int i = 0; i < units->size(); ++i) {
+        const auto* unit = units->Get(i);
        if (unit->status() == net::eagle0::shardok::storage::fb::UnitStatus_NORMAL_UNIT &&
            unit->player_id() != pid && !unit->hidden() && unit->location().column() != -1) {
            enemyLocations.Add(unit->location());
@@ -486,12 +486,12 @@ bool AICommandFilter::IsWastefulMovement(
 }

 bool AICommandFilter::IsStrategicBlunder(
-        const ShardokCommand& /*cmd*/,
-        PlayerId /*pid*/,
-        bool /*isDefender*/,
-        const GameStateW& /*gameState*/,
-        const SettingsGetter& /*settings*/,
-        double /*minDistToEnemies*/) {
+        const ShardokCommand& cmd,
+        PlayerId pid,
+        bool isDefender,
+        const GameStateW& gameState,
+        const SettingsGetter& settings,
+        double minDistToEnemies) {
    // Simplified strategic blunder detection for now
    // TODO: Implement proper castle abandonment detection
    // TODO: Use minDistToEnemies for strategic blunder logic
@@ -506,8 +506,8 @@ double AICommandFilter::MinDistanceToEnemyUnits(
    double minDistance = std::numeric_limits<double>::max();
    const auto* units = gameState->units();

-    for (size_t i = 0; i < units->size(); ++i) {
-        const auto* playerUnit = units->Get(static_cast<unsigned int>(i));
+    for (int i = 0; i < units->size(); ++i) {
+        const auto* playerUnit = units->Get(i);
        if (playerUnit->status() == net::eagle0::shardok::storage::fb::UnitStatus_NORMAL_UNIT &&
            playerUnit->player_id() == pid) {
            const auto& playerCoords = playerUnit->location();
@@ -537,8 +537,8 @@ double AICommandFilter::MinDistanceToCastles(
    }

    // Find minimum hex distance from any player unit to any castle
-    for (size_t i = 0; i < units->size(); ++i) {
-        const auto* unit = units->Get(static_cast<unsigned int>(i));
+    for (int i = 0; i < units->size(); ++i) {
+        const auto* unit = units->Get(i);
        if (unit->status() == net::eagle0::shardok::storage::fb::UnitStatus_NORMAL_UNIT &&
            unit->player_id() == pid) {
            const auto& unitCoords = unit->location();
@@ -572,8 +572,8 @@ int AICommandFilter::CountPlayerUnits(const GameStateW& gameState, PlayerId pid)
    int count = 0;
    const auto* units = gameState->units();

-    for (size_t i = 0; i < units->size(); ++i) {
-        const auto* unit = units->Get(static_cast<unsigned int>(i));
+    for (int i = 0; i < units->size(); ++i) {
+        const auto* unit = units->Get(i);
        if (unit->status() == net::eagle0::shardok::storage::fb::UnitStatus_NORMAL_UNIT &&
            unit->player_id() == pid) {
            count++;
@@ -584,9 +584,9 @@ int AICommandFilter::CountPlayerUnits(const GameStateW& gameState, PlayerId pid)
 }

 bool AICommandFilter::WouldAbandonCriticalCastle(
-        const ShardokCommand& /*cmd*/,
-        PlayerId /*pid*/,
-        const GameStateW& /*gameState*/) {
+        const ShardokCommand& cmd,
+        PlayerId pid,
+        const GameStateW& gameState) {
    // Simplified implementation - return false for now
    // TODO: Implement proper castle abandonment detection when API is available
    return false;
@@ -4,9 +4,6 @@

 #include "AIDefenderStrategySelector.hpp"

-#include <algorithm>
-#include <ranges>
-
 #include "src/main/cpp/net/eagle0/shardok/ai/AIScoreUtilities.hpp"
 #include "src/main/cpp/net/eagle0/shardok/ai/AIWaterCrossingCalculator.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/util/HexMapUtils.hpp"
@@ -17,7 +14,7 @@ constexpr double MAXIMUM_RATIO_FOR_DEFENDER_TO_FLEE = 0.15;
 constexpr double MINIMUM_RATIO_FOR_DEFENDER_TO_HOLD = 0.60;

 auto AIDefenderStrategySelector::BestDefenderStrategy(
-        const GameStateW& gameState,
+        const GameState* gameState,
        const CoordsSet& criticalTileCoords,
        const APDCache& apdCache,
        const SettingsGetter& settings) -> AIStrategy {
@@ -60,9 +57,7 @@ auto AIDefenderStrategySelector::BestDefenderStrategy(
                    net::eagle0::shardok::storage::fb::BattalionTypeId_UNDEAD) {
                    ++attackerNonUndeadUnitCount;

-                    if (!std::ranges::contains(
-                                attackerUnitIdsRequiringWaterCrossing,
-                                unit->unit_id())) {
+                    if (!common::Contains(attackerUnitIdsRequiringWaterCrossing, unit->unit_id())) {
                        ++attackerNonUndeadUnitNotRequiringWaterCrossingCount;
                    }
                }
@@ -7,15 +7,16 @@

 #include "src/main/cpp/net/eagle0/shardok/ai/AIAttackLocations.hpp"
 #include "src/main/cpp/net/eagle0/shardok/ai/AIStrategy.hpp"
-#include "src/main/cpp/net/eagle0/shardok/library/GameStateW.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/map/CoordsSet.hpp"
 #include "src/main/flatbuffer/net/eagle0/shardok/storage/game_state.hpp"

 namespace shardok {
 class AIDefenderStrategySelector {
+    using GameState = net::eagle0::shardok::storage::fb::GameState;
+
 public:
    static auto BestDefenderStrategy(
-            const GameStateW& gameState,
+            const GameState* gameState,
            const CoordsSet& criticalTileCoords,
            const APDCache& apdCache,
            const SettingsGetter& settings) -> AIStrategy;
@@ -9,7 +9,6 @@
 #include "AIFleeDecisionCalculator.hpp"

 #include "src/main/cpp/net/eagle0/shardok/ai/AIScoreUtilities.hpp"
-#include "src/main/cpp/net/eagle0/shardok/ai/AIUnitScoreCalculator.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/util/HexMapUtils.hpp"

 namespace shardok {
@@ -22,18 +21,11 @@ auto AIFleeDecisionCalculator::GetFleeCommandIndex(

 auto AIFleeDecisionCalculator::EstimateCombatSuccess(
        PlayerId attackerPlayerId,
-        const GameStateW& gameState,
-        const SettingsGetter& settings) -> double {
-    if (gameState->status() == nullptr ||
-        gameState->status()->state() !=
-                net::eagle0::shardok::storage::fb::GameStatus_::State_GAME_RUNNING) {
-        return 1.0;  // we're still in set_up so we can't really evaluate
-    }
+        const GameStateW& guessedState,
+        const GameSettingsSPtr& settings) -> double {
+    // Combat success estimation based on troops, heroes, and capture dynamics

-    // Combat success estimation based on unit power, heroes, and capture dynamics
-    double attackerPower = 0.0;
-    double defenderPower = 0.0;
-    int attackerTroops = 0;  // Still track raw troops for special cases
+    int attackerTroops = 0;
    int defenderTroops = 0;
    int attackerUnits = 0;
    int defenderUnits = 0;
@@ -41,19 +33,17 @@ auto AIFleeDecisionCalculator::EstimateCombatSuccess(
    int defenderHeroes = 0;
    bool defenderHasVips = false;

-    // Calculate total power and count units/heroes for each side
-    for (const auto* unit : *gameState->units()) {
+    // Count troops, units, and heroes for each side
+    for (const auto* unit : *guessedState->units()) {
        if (unit->status() != net::eagle0::shardok::storage::fb::UnitStatus_NORMAL_UNIT) continue;

-        const auto* pi = PlayerInfoForPid(gameState, unit->player_id());
+        const auto* pi = PlayerInfoForPid(guessedState, unit->player_id());
        if (pi == nullptr) continue;

        const int unitTroops = unit->battalion().size();
        const bool hasHero = unit->has_attached_hero();
-        const double unitPower = ContextFreeUnitValue(unit);

        if (pi->is_defender()) {
-            defenderPower += unitPower;
            defenderTroops += unitTroops;
            defenderUnits++;
            if (hasHero) {
@@ -61,50 +51,46 @@ auto AIFleeDecisionCalculator::EstimateCombatSuccess(
                if (unit->attached_hero().is_vip()) { defenderHasVips = true; }
            }
        } else if (unit->player_id() == attackerPlayerId) {
-            attackerPower += unitPower;
            attackerTroops += unitTroops;
            attackerUnits++;
            if (hasHero) { attackerHeroes++; }
        }
    }

-    const int roundsRemaining = settings.Backing().max_rounds() - gameState->current_round();
+    const int roundsRemaining =
+            settings->GetGetter().Backing().max_rounds() - guessedState->current_round();

-    // Special case: Attacker has no heroes - automatic loss
-    if (attackerHeroes == 0) {
-        return 0.0;  // Cannot win without heroes
-    }
-
-    // Special case: Defender has no heroes - automatic win for attacker
-    if (defenderHeroes == 0) {
-        return 1.0;  // Guaranteed win
-    }
-
-    // Special case: Attacker has no troops (but has heroes)
+    // Special case: Attacker has no troops
    if (attackerTroops == 0) {
-        // Very difficult to win with heroes alone
-        return 0.05;  // Extremely low chance
+        // Even with heroes, attacker is extremely unlikely to win without troops
+        return 0.01;  // Near zero, but not absolute zero
    }

    // Special case: Defender has no troops but has heroes
-    if (defenderTroops == 0) {
-        // Defenders with only heroes are vulnerable to capture
-        // Only truly difficult if time is extremely limited
-        if (roundsRemaining <= 1) {
-            // Last round - very hard to capture all heroes
-            return 0.3;  // Low but not impossible
-        } else if (roundsRemaining <= 2) {
-            return 0.6;  // Still achievable
+    if (defenderTroops == 0 && defenderHeroes > 0) {
+        // Defender can win by running out the clock if attacker can't capture heroes
+        // Success depends heavily on remaining time and attacker's ability to capture
+        if (roundsRemaining <= 3) {
+            // Very hard for attacker to capture all heroes in time
+            return 0.15;  // Low chance
+        } else if (roundsRemaining <= 5) {
+            return 0.25;  // Still difficult
        } else {
-            // With 3+ rounds, capturing defenseless heroes is quite feasible
-            return 0.85;  // High probability of success
+            // More time available, but still challenging
+            return 0.35;
        }
    }

+    // Special case: Defender has neither troops nor heroes
+    if (defenderTroops == 0 && defenderHeroes == 0) {
+        return 0.95;  // Nearly guaranteed win
+    }
+
    // Normal case: Both sides have troops
-    // Base probability from power ratio (accounts for unit quality, not just quantity)
-    const double powerRatio = attackerPower / std::max(1.0, defenderPower);
-    double baseProbability = std::min(0.95, std::max(0.05, powerRatio * 0.5));
+    // Base probability from troop ratio
+    const double troopRatio =
+            static_cast<double>(attackerTroops) / static_cast<double>(defenderTroops);
+    double baseProbability = std::min(0.95, std::max(0.05, troopRatio * 0.5));

    // Adjust for time pressure - attackers need to win before time runs out
    if (roundsRemaining <= 1) {
@@ -133,7 +119,7 @@ auto AIFleeDecisionCalculator::EstimateCombatSuccess(

 auto AIFleeDecisionCalculator::EvaluateFleeVsFight(
        PlayerId playerId,
-        const SettingsGetter& settingsGetter,
+        const GameSettingsSPtr& settings,
        const GameStateW& guessedState,
        const vector<CommandProto>& availableCommands,
        const vector<CommandProto>::const_iterator& fleeCommand,
@@ -142,6 +128,7 @@ auto AIFleeDecisionCalculator::EvaluateFleeVsFight(
    const int fleeSuccessChance = fleeCommand->odds().success_chance();

    // Get thresholds from settings
+    const auto settingsGetter = settings->GetGetter();
    const int minimumFleeOddsThreshold = settingsGetter.Backing().ai_minimum_flee_odds_threshold();
    const int desperateFleeThreshold = settingsGetter.Backing().ai_desperate_flee_threshold();

@@ -163,10 +150,10 @@ auto AIFleeDecisionCalculator::EvaluateFleeVsFight(
    }

    // Low flee odds - evaluate if fighting might be better
-    const double combatWinChance = EstimateCombatSuccess(playerId, guessedState, settingsGetter);
+    const double combatWinChance = EstimateCombatSuccess(playerId, guessedState, settings);

    // If combat situation is hopeless, even bad flee odds are better than certain death
-    if (combatWinChance <= 0.05 && fleeSuccessChance >= desperateFleeThreshold) {
+    if (combatWinChance < 0.05 && fleeSuccessChance >= desperateFleeThreshold) {
        if (enableDebugLogging) {
            printf("AI FinalRound: Combat hopeless (%.1f%%), desperate flee attempt (%d%%)\n",
                   combatWinChance * 100,
@@ -212,17 +199,4 @@ auto AIFleeDecisionCalculator::EvaluateFleeVsFight(
    }
 }

-auto AIFleeDecisionCalculator::ShouldConsiderFleeing(
-        PlayerId attackerPlayerId,
-        const GameStateW& guessedState,
-        const SettingsGetter& settings,
-        double fleeConsiderationThreshold) -> bool {
-    // Get combat success probability
-    const double combatSuccessChance =
-            EstimateCombatSuccess(attackerPlayerId, guessedState, settings);
-
-    // Consider fleeing if combat success chance is below threshold
-    return combatSuccessChance < fleeConsiderationThreshold;
-}
-
 }  // namespace shardok
@@ -35,7 +35,7 @@ public:
    // Evaluate whether to flee or fight in the final round
    [[nodiscard]] static auto EvaluateFleeVsFight(
            PlayerId playerId,
-            const SettingsGetter& settings,
+            const GameSettingsSPtr& settings,
            const GameStateW& guessedState,
            const vector<CommandProto>& availableCommands,
            const vector<CommandProto>::const_iterator& fleeCommand,
@@ -45,15 +45,7 @@ public:
    [[nodiscard]] static auto EstimateCombatSuccess(
            PlayerId attackerPlayerId,
            const GameStateW& guessedState,
-            const SettingsGetter& settings) -> double;
-
-    // Determine if the attacker should consider fleeing based on combat odds
-    // Returns true if fleeing should be considered as an option
-    [[nodiscard]] static auto ShouldConsiderFleeing(
-            PlayerId attackerPlayerId,
-            const GameStateW& guessedState,
-            const SettingsGetter& settings,
-            double fleeConsiderationThreshold = 0.5) -> bool;
+            const GameSettingsSPtr& settings) -> double;

 private:
    // Helper to get flee command index
@@ -6,11 +6,8 @@

 #include <atomic>
 #include <chrono>
-#include <cmath>
-#include <cstdlib>
 #include <future>

-#include "TranspositionTable.hpp"
 #include "src/main/cpp/net/eagle0/common/SequenceRandomGenerator.hpp"
 #include "src/main/cpp/net/eagle0/shardok/ai/AIAttackGroups.hpp"
 #include "src/main/cpp/net/eagle0/shardok/ai/AIAttackLocations.hpp"
@@ -28,117 +25,6 @@

 namespace shardok {

-struct IndexAndScore {
-    size_t index;
-    CommandType type;
-    ScoreValue lookaheadScore;
-    ScoreValue immediateScore;
-};
-
-struct ImmediateAndLookaheadScore {
-    ScoreValue immediateScore;
-    future<ScoreValue> lookaheadScore;
-};
-
-[[nodiscard]] static auto BasicLookaheadCalculator(
-        PlayerId pid,
-        bool isDefender,
-        int remainingLookahead,
-        int maxRepeatCount,
-        const shared_ptr<ShardokEngine> &innerEngine,
-        ScoreValue currentUtility,
-        const AIStrategy &attackerStrategy,
-        const SettingsGetter &settingsGetter,
-        const CoordsSet &allCastleCoords,
-        const APDCache &apdCache,
-        const ALCache &alCache,
-        std::chrono::steady_clock::time_point deadline) -> std::future<ScoreValue>;
-
-[[nodiscard]] static auto BestCommandIndex(
-        PlayerId pid,
-        bool isDefender,
-        int remainingLookahead,
-        int maxRepeatCount,
-        const ShardokEngine &guessedEngine,
-        const AIStrategy &attackerStrategy,
-        ScoreValue currentUtility,
-        const SettingsGetter &settingsGetter,
-        const CoordsSet &allCastleCoords,
-        const APDCache &apdCache,
-        const ALCache &alCache,
-        std::chrono::steady_clock::time_point deadline) -> std::future<IndexAndScore>;
-
-[[nodiscard]] static auto CalcOne(
-        PlayerId pid,
-        bool isDefender,
-        uint32_t commandIndex,
-        int remainingLookahead,
-        int maxRepeatCount,
-        const std::shared_ptr<RandomGenerator> &randomGenerator,
-        const ShardokEngine &guessedEngine,
-        const AIStrategy &attackerStrategy,
-        const SettingsGetter &settingsGetter,
-        const CoordsSet &allCastleCoords,
-        const APDCache &apdCache,
-        const ALCache &alCache,
-        std::chrono::steady_clock::time_point deadline) -> ImmediateAndLookaheadScore;
-
-[[nodiscard]] static auto DefenderScatterStrategyScoreForState(
-        const GameStateW &gameState,
-        int roundsRemaining,
-        const SettingsGetter &settings,
-        const ALCache &alCache,
-        const APDCache &apdCache) -> ScoreValue;
-
-[[nodiscard]] static auto DefenderHoldCastlesStrategyScoreForState(
-        const GameStateW &gameState,
-        const CoordsSet &castleCoords,
-        int roundsRemaining,
-        const SettingsGetter &settings,
-        const ALCache &alCache,
-        const APDCache &apdCache) -> ScoreValue;
-
-[[nodiscard]] static auto FleeStrategyScoreForState(const GameStateW &gameState, PlayerId playerId)
-        -> ScoreValue;
-
-[[nodiscard]] static auto DefenderScoreForState(
-        const GameStateW &gameState,
-        const AIStrategy &defenderStrategy,
-        const CoordsSet &castleCoords,
-        int roundsRemaining,
-        const SettingsGetter &settings,
-        const ALCache &alCache,
-        const APDCache &apdCache) -> ScoreValue;
-
-[[nodiscard]] static auto AttackerScoreForState(
-        const GameStateW &gameState,
-        const AIStrategy &attackerStrategy,
-        const CoordsSet &castleCoords,
-        int roundsRemaining,
-        const SettingsGetter &settings,
-        const ALCache &alCache,
-        const APDCache &apdCache) -> ScoreValue;
-
-struct CommandEvaluationResult {
-    ScoreValue immediateScore;
-    future<ScoreValue> lookaheadScore;
-};
-
-[[nodiscard]] static auto EvaluateCommand(
-        PlayerId pid,
-        bool isDefender,
-        uint32_t commandIndex,
-        int remainingLookahead,
-        int maxRepeatCount,
-        const ShardokEngine &guessedEngine,
-        const AIStrategy &attackerStrategy,
-        ScoreValue currentUtility,
-        const SettingsGetter &settingsGetter,
-        const CoordsSet &allCastleCoords,
-        const APDCache &apdCache,
-        const ALCache &alCache,
-        std::chrono::steady_clock::time_point deadline) -> CommandEvaluationResult;
-
 #define LOGGING_ 0
 #define PERFORMANCE_LOGGING_ 0

@@ -251,7 +137,9 @@ using Unit = fb::Unit;
 static const std::vector _averageSequence = {0.5};
 static const auto _averageGenerator = std::make_shared<SequenceRandomGenerator>(_averageSequence);

-static auto CommandSorter(const IndexAndScore &l, const IndexAndScore &r) -> bool {
+static auto CommandSorter(
+        const AIScoreCalculator::IndexAndScore &l,
+        const AIScoreCalculator::IndexAndScore &r) -> bool {
    if (l.lookaheadScore < r.lookaheadScore) return true;
    if (l.lookaheadScore > r.lookaheadScore) return false;

@@ -373,13 +261,12 @@ auto AttackerUnitsScore(
        const APDCache &apdCache,
        const MapId &mapId) -> ScoreValue {
    // Cache frequently accessed FlatBuffer fields to avoid repeated offset calculations
-    const auto *gameStateRawPtr = gameState.Get();
-    const auto *cachedUnits = gameStateRawPtr->units();
-    const auto *cachedHexMap = gameStateRawPtr->hex_map();
-
+    const auto *cachedGameState = gameState.Get();
+    const auto *cachedUnits = cachedGameState->units();
+    const auto *cachedHexMap = cachedGameState->hex_map();
    const int16_t cachedRowCount = cachedHexMap->row_count();
    const int16_t cachedColumnCount = cachedHexMap->column_count();
-    const int cachedCurrentRound = gameStateRawPtr->current_round();
+    const int cachedCurrentRound = cachedGameState->current_round();

    bool isLateGame = cachedCurrentRound > 18;  // Inline IsLateGame for efficiency

@@ -402,7 +289,7 @@ auto AttackerUnitsScore(
    auto occupants = Occupants(*cachedUnits, cachedRowCount, cachedColumnCount);

    for (const Unit *unit : *cachedUnits) {
-        const auto *pi = PlayerInfoForPid(gameState, unit->player_id());
+        const auto *pi = PlayerInfoForPid(cachedGameState, unit->player_id());
        if (pi == nullptr) continue;

        switch (unit->status()) {
@@ -571,7 +458,9 @@ auto AttackerUnitsScore(

            // If the best we can do puts us very close to the enemy, and the unit is almost
            // destroyed, return a negative value; better to flee
-            if (unit->can_flee() && closestDistanceToEnemy < 5 && unit->battalion().size() < 10) {
+            if (unit->can_flee() && closestDistanceToEnemy < 5 &&
+                closestDistanceToEnemy != ActionPointDistances::IMPOSSIBLE &&
+                unit->battalion().size() < 10) {
                distanceMultiplier = -1;
            } else {
                DIST_T closestDistanceToFriendly = 1;
@@ -621,13 +510,12 @@ auto AttackerUnitsScore(
    return attackerUnitsValue - defenderUnitsValue;
 }

-auto FleeStrategyScoreForState(const GameStateW &gameState, const PlayerId playerId) -> ScoreValue {
+auto AIScoreCalculator::FleeStrategyScoreForState(
+        const GameStateW &gameState,
+        const PlayerId playerId) -> ScoreValue {
    ScoreValue scoreValue = 0.0;

-    const auto *gameStatePtr = gameState.Get();
-    const auto *units = gameStatePtr->units();
-
-    for (const auto *unit : *units) {
+    for (const auto *unit : *gameState->units()) {
        if (unit->status() != net::eagle0::shardok::storage::fb::UnitStatus_NORMAL_UNIT) continue;

        if (unit->player_id() == playerId &&
@@ -644,31 +532,27 @@ auto FleeStrategyScoreForState(const GameStateW &gameState, const PlayerId playe
    return scoreValue;
 }

-auto DefenderScatterStrategyScoreForState(
+auto AIScoreCalculator::DefenderScatterStrategyScoreForState(
        const GameStateW &gameState,
        const int roundsRemaining,
        const SettingsGetter &settings,
        const ALCache &alCache,
        const APDCache &apdCache) -> ScoreValue {
-    const auto *gameStatePtr = gameState.Get();
-    const auto *status = gameStatePtr->status();
-
-    if (status->state() == net::eagle0::shardok::storage::fb::GameStatus_::State_VICTORY) {
-        const auto *winningIds = status->winning_shardok_ids();
-        const auto *playerInfos = gameStatePtr->player_infos();
-
-        for (const PlayerId winningPid : *winningIds) {
+    if (gameState->status()->state() ==
+        net::eagle0::shardok::storage::fb::GameStatus_::State_VICTORY) {
+        for (const PlayerId winningPid : *gameState->status()->winning_shardok_ids()) {
            if (winningPid < 0) continue;
-            if (playerInfos->Get(winningPid)->is_defender()) return INT_MAX;
+            if (gameState->player_infos()->Get(winningPid)->is_defender()) return INT_MAX;
            return INT_MIN;
        }
        return INT_MAX;
    }
-    if (status->state() == net::eagle0::shardok::storage::fb::GameStatus_::State_DRAW) { return 0; }
+    if (gameState->status()->state() ==
+        net::eagle0::shardok::storage::fb::GameStatus_::State_DRAW) {
+        return 0;
+    }

-    const auto *hexMap = gameStatePtr->hex_map();
-
-    const auto mapId = ActionPointDistancesCache::GetMapId(hexMap);
+    const auto mapId = ActionPointDistancesCache::GetMapId(gameState->hex_map());

    const auto unitsTotal = -AttackerUnitsScore(
            gameState,
@@ -684,7 +568,7 @@ auto DefenderScatterStrategyScoreForState(
    return unitsTotal;
 }

-auto DefenderHoldCastlesStrategyScoreForState(
+auto AIScoreCalculator::DefenderHoldCastlesStrategyScoreForState(
        const GameStateW &gameState,
        const CoordsSet &castleCoords,
        const int roundsRemaining,
@@ -724,7 +608,7 @@ auto DefenderHoldCastlesStrategyScoreForState(
    return UNITS_BASE_MULTIPLIER * unitsMultiplier * unitsTotal + victoryConditionTotal;
 }

-auto DefenderScoreForState(
+auto AIScoreCalculator::DefenderScoreForState(
        const GameStateW &gameState,
        const AIStrategy &defenderStrategy,
        const CoordsSet &castleCoords,
@@ -780,7 +664,7 @@ auto DefenderScoreForState(
    throw ShardokInternalErrorException("Escaped AIStrategy switch");
 }

-auto AttackerScoreForState(
+auto AIScoreCalculator::AttackerScoreForState(
        const GameStateW &gameState,
        const AIStrategy &attackerStrategy,
        const CoordsSet &castleCoords,
@@ -908,7 +792,7 @@ void PrintCommand(
    printf("u%f\n", utility);
 }

-auto BasicLookaheadCalculator(
+auto AIScoreCalculator::BasicLookaheadCalculator(
        const PlayerId pid,
        const bool isDefender,
        const int remainingLookahead,
@@ -919,36 +803,12 @@ auto BasicLookaheadCalculator(
        const SettingsGetter &settingsGetter,
        const CoordsSet &allCastleCoords,
        const APDCache &apdCache,
-        const ALCache &alCache,
-        std::chrono::steady_clock::time_point deadline) -> std::future<ScoreValue> {
-    // Check transposition table before expensive computation
-    auto cachedScore =
-            g_transpositionTable.probe(innerEngine->GetCurrentGameState(), remainingLookahead, pid);
-
-    if (cachedScore.has_value()) {
-        // Return cached result immediately
-        std::promise<ScoreValue> p;
-        p.set_value(*cachedScore);
-        return p.get_future();
-    }
+        const ALCache &alCache) -> ScoreValue {
    const auto nextUtility = currentUtility;

-    // Check if we've reached the depth limit before making recursive calls
-    if (remainingLookahead <= 0) {
-        // Store the current utility in the transposition table and return it
-        // Note: Store with depth 1 since depth 0 indicates an empty entry in the transposition
-        // table
-        g_transpositionTable.store(innerEngine->GetCurrentGameState(), 1, pid, nextUtility);
-
-        std::promise<ScoreValue> p;
-        p.set_value(nextUtility);
-        return p.get_future();
-    }
-
    if (const CommandListSPtr nextCommands = innerEngine->GetAvailableCommandsForAIPlayer(pid);
        nextCommands && !nextCommands->empty()) {
-        // Get the future from BestCommandIndex without calling .get()
-        auto bestCommandFuture = BestCommandIndex(
+        const auto [index, type, lookaheadScore, immediateScore] = BestCommandIndex(
                pid,
                isDefender,
                remainingLookahead - 1,
@@ -959,51 +819,18 @@ auto BasicLookaheadCalculator(
                settingsGetter,
                allCastleCoords,
                apdCache,
-                alCache,
-                deadline);
+                alCache);

-        // Return a future that chains the best command evaluation
-        return std::async(
-                std::launch::deferred,
-                [bestCommandFuture = std::move(bestCommandFuture),
-                 innerEngine,
-                 pid,
-                 nextUtility,
-                 remainingLookahead]() mutable -> ScoreValue {
-                    const auto [index, type, lookaheadScore, immediateScore] =
-                            bestCommandFuture.get();
-
-                    ScoreValue resultScore;
-                    if (auto &nextCommand =
-                                innerEngine->GetAvailableCommandsForAIPlayer(pid)->at(index);
-                        nextCommand->GetCommandType() !=
-                        net::eagle0::shardok::common::END_TURN_COMMAND) {
-                        resultScore = immediateScore;
-                    } else {
-                        resultScore = nextUtility;
-                    }
-
-                    // Store in transposition table before returning
-                    g_transpositionTable.store(
-                            innerEngine->GetCurrentGameState(),
-                            remainingLookahead,
-                            pid,
-                            resultScore);
-
-                    return resultScore;
-                });
+        if (auto &nextCommand = innerEngine->GetAvailableCommandsForAIPlayer(pid)->at(index);
+            nextCommand->GetCommandType() != net::eagle0::shardok::common::END_TURN_COMMAND) {
+            return immediateScore;
+        }
    }

-    // No commands available, store and return the current utility as a future
-    g_transpositionTable
-            .store(innerEngine->GetCurrentGameState(), remainingLookahead, pid, nextUtility);
-
-    std::promise<ScoreValue> p;
-    p.set_value(nextUtility);
-    return p.get_future();
+    return nextUtility;
 }

-auto CalcOne(
+auto AIScoreCalculator::CalcOne(
        PlayerId pid,
        bool isDefender,
        uint32_t commandIndex,
@@ -1015,24 +842,13 @@ auto CalcOne(
        const SettingsGetter &settingsGetter,
        const CoordsSet &allCastleCoords,
        const APDCache &apdCache,
-        const ALCache &alCache,
-        std::chrono::steady_clock::time_point deadline) -> ImmediateAndLookaheadScore {
+        const ALCache &alCache) -> ImmediateAndLookaheadScore {
    ImmediateAndLookaheadScore returnValue{};

-    // Check if we've exceeded the deadline
-    if (std::chrono::steady_clock::now() > deadline) {
-        // Return with a default score and an empty future that resolves immediately
-        std::promise<ScoreValue> p;
-        p.set_value(0.0);  // Default timeout score
-        returnValue.immediateScore = 0.0;
-        returnValue.lookaheadScore = p.get_future();
-        return returnValue;
-    }
-
    auto innerEngine = std::make_shared<ShardokEngine>(guessedEngine, false);
    innerEngine->PostCommand(pid, commandIndex, randomGenerator);

-    auto innerUtility = AIScoreCalculator::GuessedStateScore(
+    auto innerUtility = GuessedStateScore(
            isDefender,
            innerEngine->GetCurrentGameState(),
            attackerStrategy,
@@ -1058,9 +874,8 @@ auto CalcOne(
                                &settingsGetter,
                                &allCastleCoords,
                                &apdCache,
-                                &alCache,
-                                deadline]() -> ScoreValue {
-            auto lookaheadFuture = BasicLookaheadCalculator(
+                                &alCache]() -> ScoreValue {
+            return BasicLookaheadCalculator(
                    pid,
                    isDefender,
                    remainingLookahead,
@@ -1071,14 +886,11 @@ auto CalcOne(
                    settingsGetter,
                    allCastleCoords,
                    apdCache,
-                    alCache,
-                    deadline);
-            return lookaheadFuture.get();
+                    alCache);
        };

 #if MULTITHREAD
-        auto launchPolicy = remainingLookahead == 1 ? std::launch::async : std::launch::deferred;
-        returnValue.lookaheadScore = std::async(launchPolicy, lookaheadLambda);
+        returnValue.lookaheadScore = std::async(std::launch::async, lookaheadLambda);
 #else
        std::promise<ScoreValue> p;
        returnValue.lookaheadScore = p.get_future();
@@ -1090,7 +902,7 @@ auto CalcOne(
    return returnValue;
 }

-[[nodiscard]] auto BestCommandIndex(
+[[nodiscard]] auto AIScoreCalculator::BestCommandIndex(
        const PlayerId pid,
        const bool isDefender,
        const int remainingLookahead,
@@ -1101,8 +913,7 @@ auto CalcOne(
        const SettingsGetter &settingsGetter,
        const CoordsSet &allCastleCoords,
        const APDCache &apdCache,
-        const ALCache &alCache,
-        std::chrono::steady_clock::time_point deadline) -> std::future<IndexAndScore> {
+        const ALCache &alCache) -> IndexAndScore {
    const CommandListSPtr guessedDescriptors = guessedEngine.GetAvailableCommandsForAIPlayer(pid);

    // Filter out obviously bad commands to reduce search space
@@ -1119,14 +930,12 @@ auto CalcOne(
    double minDistToEnemies = std::numeric_limits<double>::max();
    const auto *units = gameState->units();

-    for (size_t i = 0; i < units->size(); ++i) {
-        if (const auto *playerUnit = units->Get(static_cast<unsigned int>(i));
-            playerUnit->player_id() == pid) {
+    for (int i = 0; i < units->size(); ++i) {
+        if (const auto *playerUnit = units->Get(i); playerUnit->player_id() == pid) {
            const auto &playerCoords = playerUnit->location();

-            for (size_t j = 0; j < units->size(); ++j) {
-                if (const auto *enemyUnit = units->Get(static_cast<unsigned int>(j));
-                    enemyUnit->player_id() != pid) {
+            for (int j = 0; j < units->size(); ++j) {
+                if (const auto *enemyUnit = units->Get(j); enemyUnit->player_id() != pid) {
                    const auto &enemyCoords = enemyUnit->location();

                    // Proper hex distance calculation using cube coordinates
@@ -1163,29 +972,24 @@ auto CalcOne(

    const auto commandCount = filteredIndices.size();

-    // Structure to hold all command evaluation data
-    struct CommandEvaluation {
-        size_t index;
-        CommandType type;
-        ScoreValue immediateScore;
-        std::vector<std::future<ScoreValue>> lookaheadFutures;
-    };
+    vector<IndexAndScore> allIndices(commandCount);

-    std::vector<CommandEvaluation> commandEvaluations(commandCount);
+    // Primary index is the command index; vector may contain repeated attempts
+    vector<vector<future<ScoreValue>>> scoreFutures(commandCount);

    for (uint32_t index = 0; index < commandCount; index++) {
        const auto originalIndex = filteredIndices[index];
        const auto &guessedDescriptor = guessedDescriptors->at(originalIndex);
        const auto guessedCommandType = guessedDescriptor->GetCommandType();

-        commandEvaluations[index].index = originalIndex;
-        commandEvaluations[index].type = guessedCommandType;
+        allIndices[index].index = originalIndex;
+        allIndices[index].type = guessedCommandType;

        if (guessedCommandType == net::eagle0::shardok::common::END_TURN_COMMAND) {
            std::promise<ScoreValue> p;
-            commandEvaluations[index].lookaheadFutures.push_back(p.get_future());
+            scoreFutures[index].push_back(p.get_future());
            p.set_value(currentUtility);
-            commandEvaluations[index].immediateScore = currentUtility;
+            allIndices[index].immediateScore = currentUtility;
        } else if (IsDeterministic(guessedCommandType)) {
            auto [immediateScore, lookaheadScore] =
                    CalcOne(pid,
@@ -1199,11 +1003,10 @@ auto CalcOne(
                            settingsGetter,
                            allCastleCoords,
                            apdCache,
-                            alCache,
-                            deadline);
+                            alCache);

-            commandEvaluations[index].immediateScore = immediateScore;
-            commandEvaluations[index].lookaheadFutures.push_back(std::move(lookaheadScore));
+            allIndices[index].immediateScore = immediateScore;
+            scoreFutures[index].push_back(std::move(lookaheadScore));
        } else if (guessedDescriptor->HasOdds()) {
            const auto successChancePercentile = guessedDescriptor->GetOddsPercentile();
            const double successChance = static_cast<double>(successChancePercentile) / 100.0;
@@ -1223,8 +1026,7 @@ auto CalcOne(
                            settingsGetter,
                            allCastleCoords,
                            apdCache,
-                            alCache,
-                            deadline);
+                            alCache);

            // second attempt uses the average of (1 - successChance) and 0 as the roll (so 30%
            // chance -> rolling 15)
@@ -1241,15 +1043,14 @@ auto CalcOne(
                            settingsGetter,
                            allCastleCoords,
                            apdCache,
-                            alCache,
-                            deadline);
+                            alCache);

-            commandEvaluations[index].immediateScore =
+            allIndices[index].immediateScore =
                    std::lerp(failureImmediateScore, successImmediateScore, successChance);

            auto successSF = successLookaheadScore.share();
            auto failureSF = failureLookaheadScore.share();
-            commandEvaluations[index].lookaheadFutures.push_back(std::async(
+            scoreFutures[index].push_back(std::async(
                    std::launch::deferred,
                    [successSF, failureSF, successChance]() -> double {
                        return std::lerp(failureSF.get(), successSF.get(), successChance);
@@ -1273,47 +1074,26 @@ auto CalcOne(
                                settingsGetter,
                                allCastleCoords,
                                apdCache,
-                                alCache,
-                                deadline);
+                                alCache);

                sum += immediateScore;
-                commandEvaluations[index].lookaheadFutures.push_back(std::move(lookaheadScore));
+                scoreFutures[index].push_back(std::move(lookaheadScore));
            }
-            commandEvaluations[index].immediateScore = sum / maxRepeatCount;
+            allIndices[index].immediateScore = sum / maxRepeatCount;
        }
    }

-    // Return a future that will wait for all evaluations and find the best one
-    return std::async(
-            std::launch::deferred,
-            [commandEvaluations = std::move(commandEvaluations)]() mutable -> IndexAndScore {
-                std::vector<IndexAndScore> allResults;
-                allResults.reserve(commandEvaluations.size());
+    for (uint32_t i = 0; i < commandCount; i++) {
+        const auto count = static_cast<ScoreValue>(scoreFutures[i].size());
+        ScoreValue total = 0.0;
+        for (auto &oneFuture : scoreFutures[i]) { total += oneFuture.get(); }
+        allIndices[i].lookaheadScore = total / count;
+    }

-                // Wait for all futures and compute final scores
-                for (auto &eval : commandEvaluations) {
-                    ScoreValue totalLookaheadScore = 0.0;
-                    for (auto &future : eval.lookaheadFutures) {
-                        totalLookaheadScore += future.get();
-                    }
-                    ScoreValue avgLookaheadScore =
-                            eval.lookaheadFutures.empty()
-                                    ? eval.immediateScore
-                                    : totalLookaheadScore / eval.lookaheadFutures.size();
-
-                    allResults.push_back(IndexAndScore{
-                            .index = eval.index,
-                            .type = eval.type,
-                            .lookaheadScore = avgLookaheadScore,
-                            .immediateScore = eval.immediateScore});
-                }
-                // Find the best command using the existing sorter
-                auto bestIt = std::ranges::max_element(allResults, CommandSorter);
-                return *bestIt;
-            });
+    return *std::ranges::max_element(allIndices, CommandSorter);
 }

-auto EvaluateCommand(
+auto AIScoreCalculator::EvaluateCommand(
        const PlayerId pid,
        const bool isDefender,
        const uint32_t commandIndex,
@@ -1325,23 +1105,16 @@ auto EvaluateCommand(
        const SettingsGetter &settingsGetter,
        const CoordsSet &allCastleCoords,
        const APDCache &apdCache,
-        const ALCache &alCache,
-        std::chrono::steady_clock::time_point deadline) -> CommandEvaluationResult {
+        const ALCache &alCache) -> CommandEvaluationResult {
    const CommandListSPtr guessedDescriptors = guessedEngine.GetAvailableCommandsForAIPlayer(pid);

-    if (commandIndex >= guessedDescriptors->size()) {
-        std::promise<ScoreValue> p;
-        p.set_value(currentUtility);
-        return {currentUtility, p.get_future()};
-    }
+    if (commandIndex >= guessedDescriptors->size()) { return {currentUtility, currentUtility}; }

    const auto &guessedDescriptor = guessedDescriptors->at(commandIndex);

    if (const auto guessedCommandType = guessedDescriptor->GetCommandType();
        guessedCommandType == net::eagle0::shardok::common::END_TURN_COMMAND) {
-        std::promise<ScoreValue> p;
-        p.set_value(currentUtility);
-        return {currentUtility, p.get_future()};
+        return {currentUtility, currentUtility};
    } else if (IsDeterministic(guessedCommandType)) {
        auto [immediateScore, lookaheadScore] =
                CalcOne(pid,
@@ -1355,9 +1128,8 @@ auto EvaluateCommand(
                        settingsGetter,
                        allCastleCoords,
                        apdCache,
-                        alCache,
-                        deadline);
-        return {immediateScore, std::move(lookaheadScore)};
+                        alCache);
+        return {immediateScore, lookaheadScore.get()};
    } else if (guessedDescriptor->HasOdds()) {
        const auto successChancePercentile = guessedDescriptor->GetOddsPercentile();
        const double successChance = static_cast<double>(successChancePercentile) / 100.0;
@@ -1375,8 +1147,7 @@ auto EvaluateCommand(
                settingsGetter,
                allCastleCoords,
                apdCache,
-                alCache,
-                deadline);
+                alCache);

        // Failure attempt
        auto [failureImmediateScore, failureLookaheadScore] = CalcOne(
@@ -1391,24 +1162,15 @@ auto EvaluateCommand(
                settingsGetter,
                allCastleCoords,
                apdCache,
-                alCache,
-                deadline);
+                alCache);

        // Return weighted average of success and failure
-        auto successSF = successLookaheadScore.share();
-        auto failureSF = failureLookaheadScore.share();
        return {std::lerp(failureImmediateScore, successImmediateScore, successChance),
-                std::async(
-                        std::launch::deferred,
-                        [successSF, failureSF, successChance]() -> double {
-                            return std::lerp(failureSF.get(), successSF.get(), successChance);
-                        })};
+                std::lerp(failureLookaheadScore.get(), successLookaheadScore.get(), successChance)};
    } else {
        // For non-deterministic commands without odds, use multiple attempts
        ScoreValue totalImmediateScore = 0.0;
-        std::vector<std::future<ScoreValue>> lookaheadFutures;
-        lookaheadFutures.reserve(maxRepeatCount);
-
+        ScoreValue totalLookaheadScore = 0.0;
        for (int repeatIteration = 0; repeatIteration < maxRepeatCount; repeatIteration++) {
            auto sequence = std::vector{
                    static_cast<double>(repeatIteration) / static_cast<double>(maxRepeatCount - 1)};
@@ -1424,23 +1186,12 @@ auto EvaluateCommand(
                            settingsGetter,
                            allCastleCoords,
                            apdCache,
-                            alCache,
-                            deadline);
+                            alCache);

            totalImmediateScore += immediateScore;
-            lookaheadFutures.push_back(std::move(lookaheadScore));
+            totalLookaheadScore += lookaheadScore.get();
        }
-
-        // Return a future that computes the average when needed
-        return {totalImmediateScore / maxRepeatCount,
-                std::async(
-                        std::launch::deferred,
-                        [lookaheadFutures = std::move(lookaheadFutures),
-                         maxRepeatCount]() mutable -> double {
-                            ScoreValue total = 0.0;
-                            for (auto &future : lookaheadFutures) { total += future.get(); }
-                            return total / maxRepeatCount;
-                        })};
+        return {totalImmediateScore / maxRepeatCount, totalLookaheadScore / maxRepeatCount};
    }
 }

@@ -1456,9 +1207,8 @@ auto EvaluateCommand(
        const CoordsSet &allCastleCoords,
        const APDCache &apdCache,
        const ALCache &alCache,
-        const size_t commandIndex,
-        std::chrono::steady_clock::time_point deadline) -> std::future<ScoreValue> {
-    auto result = EvaluateCommand(
+        const size_t commandIndex) -> ScoreValue {
+    const auto result = EvaluateCommand(
            pid,
            isDefender,
            commandIndex,
@@ -1470,9 +1220,8 @@ auto EvaluateCommand(
            settingsGetter,
            allCastleCoords,
            apdCache,
-            alCache,
-            deadline);
-    return std::move(result.lookaheadScore);
+            alCache);
+    return result.lookaheadScore;
 }

 }  // namespace shardok
@@ -5,7 +5,6 @@
 #ifndef EAGLE0_AISCORECALCULATOR_HPP
 #define EAGLE0_AISCORECALCULATOR_HPP

-#include <chrono>
 #include <future>

 #include "src/main/cpp/net/eagle0/shardok/ai/AIAttackLocations.hpp"
@@ -31,8 +30,103 @@ using CommandProto = net::eagle0::shardok::api::CommandDescriptor;

 class AIScoreCalculator {
 public:
-    // Evaluate the score of a guessed game state based on the current AI strategy. DOES NOT perform
-    // or evaluate any commands.
+    struct IndexAndScore {
+        size_t index;
+        CommandType type;
+        ScoreValue lookaheadScore;
+        ScoreValue immediateScore;
+    };
+
+private:
+    [[nodiscard]] static auto DefenderScatterStrategyScoreForState(
+            const GameStateW &gameState,
+            int roundsRemaining,
+            const SettingsGetter &settings,
+            const ALCache &alCache,
+            const APDCache &apdCache) -> ScoreValue;
+
+    [[nodiscard]] static auto DefenderHoldCastlesStrategyScoreForState(
+            const GameStateW &gameState,
+            const CoordsSet &castleCoords,
+            int roundsRemaining,
+            const SettingsGetter &settings,
+            const ALCache &alCache,
+            const APDCache &apdCache) -> ScoreValue;
+
+    [[nodiscard]] static auto FleeStrategyScoreForState(
+            const GameStateW &gameState,
+            PlayerId playerId) -> ScoreValue;
+
+    [[nodiscard]] static auto DefenderScoreForState(
+            const GameStateW &gameState,
+            const AIStrategy &defenderStrategy,
+            const CoordsSet &castleCoords,
+            int roundsRemaining,
+            const SettingsGetter &settings,
+            const ALCache &alCache,
+            const APDCache &apdCache) -> ScoreValue;
+
+    [[nodiscard]] static auto AttackerScoreForState(
+            const GameStateW &gameState,
+            const AIStrategy &attackerStrategy,
+            const CoordsSet &castleCoords,
+            int roundsRemaining,
+            const SettingsGetter &settings,
+            const ALCache &alCache,
+            const APDCache &apdCache) -> ScoreValue;
+
+    struct ImmediateAndLookaheadScore {
+        ScoreValue immediateScore;
+        future<ScoreValue> lookaheadScore;
+    };
+
+    static auto BasicLookaheadCalculator(
+            PlayerId pid,
+            bool isDefender,
+            int remainingLookahead,
+            int maxRepeatCount,
+            const shared_ptr<ShardokEngine> &innerEngine,
+            ScoreValue currentUtility,
+            const AIStrategy &attackerStrategy,
+            const SettingsGetter &settingsGetter,
+            const CoordsSet &allCastleCoords,
+            const APDCache &apdCache,
+            const ALCache &alCache) -> ScoreValue;
+
+    static auto CalcOne(
+            PlayerId pid,
+            bool isDefender,
+            uint32_t commandIndex,
+            int remainingLookahead,
+            int maxRepeatCount,
+            const std::shared_ptr<RandomGenerator> &randomGenerator,
+            const ShardokEngine &guessedEngine,
+            const AIStrategy &attackerStrategy,
+            const SettingsGetter &settingsGetter,
+            const CoordsSet &allCastleCoords,
+            const APDCache &apdCache,
+            const ALCache &alCache) -> ImmediateAndLookaheadScore;
+
+    struct CommandEvaluationResult {
+        ScoreValue immediateScore;
+        ScoreValue lookaheadScore;
+    };
+
+    static auto EvaluateCommand(
+            PlayerId pid,
+            bool isDefender,
+            uint32_t commandIndex,
+            int remainingLookahead,
+            int maxRepeatCount,
+            const ShardokEngine &guessedEngine,
+            const AIStrategy &attackerStrategy,
+            ScoreValue currentUtility,
+            const SettingsGetter &settingsGetter,
+            const CoordsSet &allCastleCoords,
+            const APDCache &apdCache,
+            const ALCache &alCache) -> CommandEvaluationResult;
+
+public:
    [[nodiscard]] static auto GuessedStateScore(
            bool isDefender,
            const GameStateW &state,
@@ -42,7 +136,19 @@ public:
            const APDCache &apdCache,
            const ALCache &alCache) -> ScoreValue;

-    // Evaluates the score for a particular command index for the given player, using lookahead.
+    [[nodiscard]] static auto BestCommandIndex(
+            PlayerId pid,
+            bool isDefender,
+            int remainingLookahead,
+            int maxRepeatCount,
+            const ShardokEngine &guessedEngine,
+            const AIStrategy &attackerStrategy,
+            ScoreValue currentUtility,
+            const SettingsGetter &settingsGetter,
+            const CoordsSet &allCastleCoords,
+            const APDCache &apdCache,
+            const ALCache &alCache) -> IndexAndScore;
+
    [[nodiscard]] static auto CommandScore(
            PlayerId pid,
            bool isDefender,
@@ -55,8 +161,7 @@ public:
            const CoordsSet &allCastleCoords,
            const APDCache &apdCache,
            const ALCache &alCache,
-            size_t commandIndex,
-            std::chrono::steady_clock::time_point deadline) -> std::future<ScoreValue>;
+            size_t commandIndex) -> ScoreValue;
 };

 }  // namespace shardok
@@ -16,7 +16,7 @@ auto HasAttachedHeroWithProfession(
           unit->attached_hero().profession_info().profession() == profession;
 }

-auto CastleClaimCapableAttackerUnitCount(const GameStateW &gameState) -> int {
+auto CastleClaimCapableAttackerUnitCount(const GameState *gameState) -> int {
    int count = 0;

    for (const auto *unit : *gameState->units()) {
@@ -32,7 +32,7 @@ auto CastleClaimCapableAttackerUnitCount(const GameStateW &gameState) -> int {
    return count;
 }

-auto PlayerInfoForPid(const GameStateW &gs, const PlayerId pid) -> const PlayerInfo * {
+auto PlayerInfoForPid(const GameState *gs, const PlayerId pid) -> const PlayerInfo * {
    if (gs->player_infos()) {
        for (const auto &pi : *gs->player_infos()) {
            if (pi->player_id() == pid) return pi;
@@ -7,7 +7,6 @@

 #include <vector>

-#include "src/main/cpp/net/eagle0/shardok/library/GameStateW.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/ShardokCTypes.h"
 #include "src/main/flatbuffer/net/eagle0/shardok/storage/game_state.hpp"
 #include "src/main/flatbuffer/net/eagle0/shardok/storage/unit.hpp"
@@ -26,8 +25,8 @@ auto HasAttachedHeroWithProfession(
        const Unit *unit,
        net::eagle0::shardok::storage::fb::Profession profession) -> bool;

-auto CastleClaimCapableAttackerUnitCount(const GameStateW &gameState) -> int;
-auto PlayerInfoForPid(const GameStateW &, PlayerId pid) -> const PlayerInfo *;
+auto CastleClaimCapableAttackerUnitCount(const GameState *gameState) -> int;
+auto PlayerInfoForPid(const GameState *gs, PlayerId pid) -> const PlayerInfo *;

 }  // namespace shardok

@@ -32,8 +32,8 @@ auto CalculateTimeBudget(
    bool isClose = false;
    const auto *units = state->units();

-    for (size_t i = 0; i < units->size() && !isClose; ++i) {
-        const auto *myUnit = units->Get(static_cast<unsigned int>(i));
+    for (int i = 0; i < units->size() && !isClose; ++i) {
+        const auto *myUnit = units->Get(i);
        if (myUnit->player_id() != playerId) continue;

        const auto &myCoords = myUnit->location();
@@ -43,8 +43,8 @@ auto CalculateTimeBudget(
        const Cube myCube = OffsetToCube(myCoords);

        // Check distance to enemy units
-        for (size_t j = 0; j < units->size(); ++j) {
-            const auto *enemyUnit = units->Get(static_cast<unsigned int>(j));
+        for (int j = 0; j < units->size(); ++j) {
+            const auto *enemyUnit = units->Get(j);
            if (enemyUnit->player_id() == playerId) continue;

            const auto &enemyCoords = enemyUnit->location();
@@ -80,7 +80,7 @@ auto CalculateTimeBudget(
    const auto remainingBudget = std::chrono::duration_cast<std::chrono::milliseconds>(budget);

    // Get minimum depth requirement
-    const size_t minDepth = settingsGetter.Backing().min_lookahead_turns();
+    const int minDepth = settingsGetter.Backing().min_lookahead_turns();

    return AITimeBudget{
            .remainingBudget = remainingBudget,
@@ -31,7 +31,7 @@ public:
 // Configuration structure for iterative deepening time budget
 struct AITimeBudget {
    std::chrono::milliseconds remainingBudget;  // Time budget remaining (decremented as used)
-    size_t minDepthRequired;                    // Minimum depth from minLookaheadTurns
+    int minDepthRequired;                       // Minimum depth from minLookaheadTurns
    bool isCloseToEnemy;                        // Proximity flag for budget selection
 };

@@ -5,7 +5,6 @@
 #include "AIUnitScoreCalculator.hpp"

 #include <algorithm>
-#include <cstdlib>

 #include "AIAttackLocations.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/util/HexMapUtils.hpp"
@@ -89,8 +88,8 @@ auto ContextFreeUnitValue(const Unit *unit) -> ScoreValue {
            break;
    }

-    const double battalionValue = battalionTypeMultiplier * (1.0 + armament / 100.0) *
-                                  (1.0 + training / 100.0) * (0.5 + morale / 100.0) *
+    const double battalionValue = battalionTypeMultiplier * (0.5 + armament / 100.0) *
+                                  (0.5 + training / 100.0) * (0.5 + morale / 100.0) *
                                  unit->battalion().size();

    const double heroValue =
@@ -99,7 +98,7 @@ auto ContextFreeUnitValue(const Unit *unit) -> ScoreValue {
    return battalionValue + heroValue;
 }

-auto archeryValue(const Unit * /*unit*/) -> double {
+auto archeryValue(const Unit *unit) -> double {
    // TODO: make this depend on the value of the targets
    return kArcheryPossibleValue;
 }
@@ -114,7 +113,7 @@ auto reduceValue(const Unit *unit, const Terrain *unitTerrain) -> double {
        return 0.0;
 }

-auto fearValue(const Unit * /*unit*/) -> double {
+auto fearValue(const Unit *unit) -> double {
    // TODO: make this depend on the value of the targets
    return kFearPossibleValue;
 }
@@ -343,8 +342,7 @@ auto UnitValue(
            unit->battalion().type() == net::eagle0::shardok::storage::fb::BattalionTypeId_UNDEAD;

    const int coordsIndex = location.row() * map->column_count() + location.column();
-    const auto *terrain = map->terrain()->Get(coordsIndex);
-
+    const auto &terrain = map->terrain()->Get(coordsIndex);
    double castleMultiplier = 1.0;
    // Only give a multiplier for being in a castle if the castle is useful, and the unit is not
    // undead
@@ -360,8 +358,8 @@ auto UnitValue(
    {
        for (const auto adjacentCoords = HexMapUtils::GetAdjacentCoords(map, location);
             const auto &c : adjacentCoords) {
-            if (const auto *adjTerrain = GetTerrain(map, c);
-                adjTerrain && adjTerrain->modifier().fire().present()) {
+            if (const auto &adjTerrain = GetTerrain(map, c);
+                adjTerrain->modifier().fire().present()) {
                onFireMultiplier *= kAdjacentFireMultiplier;
            }
        }
@@ -416,7 +414,7 @@ auto UnitValue(
        if (const auto commandingUnitId = unit->commanding_unit_id(); commandingUnitId != -1) {
            const Unit *commandingUnit = nullptr;
            for (const Unit *attackerUnit : attackerUnits) {
-                if (attackerUnit && attackerUnit->unit_id() == commandingUnitId) {
+                if (attackerUnit->unit_id() == commandingUnitId) {
                    commandingUnit = attackerUnit;
                    break;
                }
@@ -424,7 +422,7 @@ auto UnitValue(

            if (commandingUnit == nullptr) {
                for (const Unit *defenderUnit : defenderUnits) {
-                    if (defenderUnit && defenderUnit->unit_id() == commandingUnitId) {
+                    if (defenderUnit->unit_id() == commandingUnitId) {
                        commandingUnit = defenderUnit;
                        break;
                    }
@@ -4,11 +4,9 @@

 #include "AIVictoryConditionScoreCalculator.hpp"

-#include <algorithm>
-#include <ranges>
-
 #include "AIAttackLocations.hpp"
 #include "AIDistanceDebuf.hpp"
+#include "src/main/cpp/net/eagle0/common/ContainerUtils.hpp"
 #include "src/main/cpp/net/eagle0/shardok/ai/AIAttackGroups.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/util/HexMapUtils.hpp"
 #include "src/main/flatbuffer/net/eagle0/shardok/storage/victory_condition.hpp"
@@ -124,12 +122,12 @@ auto AttackerDebufForDefenderOccupiedCriticalTile(
 }

 auto DefenderHoldsCriticalTilesVictoryScore(
-        const GameStateW& gameState,
+        const net::eagle0::shardok::storage::fb::GameState* gameState,
        const CoordsSet& criticalTileLocations,
        const PlayerInfo* player,
-        const APDCache& /*apdCache*/,
-        const ALCache& /*alCache*/,
-        const SettingsGetter& /*settings*/) -> ScoreValue {
+        const APDCache& apdCache,
+        const ALCache& alCache,
+        const SettingsGetter& settings) -> ScoreValue {
    ScoreValue total = 0.0;

    const auto rc = gameState->hex_map()->row_count();
@@ -154,7 +152,7 @@ auto DefenderHoldsCriticalTilesVictoryScore(
 }

 auto AttackerHoldsCriticalTilesVictoryScore(
-        const GameStateW& gameState,
+        const net::eagle0::shardok::storage::fb::GameState* gameState,
        const CoordsSet& criticalTileLocations,
        const PlayerInfo* player,
        const APDCache& apdCache,
@@ -248,12 +246,12 @@ auto AttackerHoldsCriticalTilesVictoryScore(
 }

 auto LastPlayerStandingVictoryScore(
-        const GameStateW& gameState,
+        const GameState* gameState,
        const PlayerInfo* player,
        const APDCache& apdCache,
        const ALCache& alCache,
        const SettingsGetter& settings) -> ScoreValue {
-    if (!std::ranges::contains(
+    if (!common::Contains(
                *player->victory_conditions(),
                net::eagle0::shardok::storage::fb::
                        VictoryCondition_VICTORY_CONDITION_LAST_PLAYER_STANDING)) {
@@ -9,7 +9,6 @@

 #include "src/main/cpp/net/eagle0/shardok/ai/AIAttackGroups.hpp"
 #include "src/main/cpp/net/eagle0/shardok/ai/AIAttackLocations.hpp"
-#include "src/main/cpp/net/eagle0/shardok/library/GameStateW.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/action_point_distances/ActionPointDistancesCache.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/map/CoordsSet.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/settings/GameSettings.hpp"
@@ -24,7 +23,7 @@ using std::vector;
 using ScoreValue = double;

 auto AttackerHoldsCriticalTilesVictoryScore(
-        const GameStateW& gameState,
+        const net::eagle0::shardok::storage::fb::GameState* gameState,
        const CoordsSet& criticalTileLocations,
        const PlayerInfo* player,
        const APDCache& apdCache,
@@ -32,7 +31,7 @@ auto AttackerHoldsCriticalTilesVictoryScore(
        const SettingsGetter& settings) -> ScoreValue;

 auto DefenderHoldsCriticalTilesVictoryScore(
-        const GameStateW& gameState,
+        const net::eagle0::shardok::storage::fb::GameState* gameState,
        const CoordsSet& criticalTileLocations,
        const PlayerInfo* player,
        const APDCache& apdCache,
@@ -40,7 +39,7 @@ auto DefenderHoldsCriticalTilesVictoryScore(
        const SettingsGetter& settings) -> ScoreValue;

 auto LastPlayerStandingVictoryScore(
-        const GameStateW& gameState,
+        const GameState* gameState,
        const PlayerInfo* player,
        const APDCache& apdCache,
        const ALCache& alCache,
@@ -11,7 +11,7 @@
 namespace shardok {

 auto UnitIdsRequiringWaterCrossing(
-        const GameStateW &gameState,
+        const GameState *gameState,
        const PlayerId pid,
        const CoordsSet &destinations,
        const APDCache &apdCache,
@@ -74,9 +74,9 @@ auto UnitIdsRequiringWaterCrossing(
 }

 auto UnitIdsToCreateWaterCrossing(
-        const GameStateW &gameState,
+        const GameState *gameState,
        const PlayerId pid,
-        const APDCache & /*apdCache*/,
+        const APDCache &apdCache,
        const SettingsGetter &settings) -> vector<UnitId> {
    vector<UnitId> unitIds{};

@@ -196,7 +196,7 @@ auto WaterCrossingTiles(

 // Returns the set of tiles that the attacker should try to approach in order to bridge/freeze
 auto IntendedCrossingStarts(
-        const GameStateW &gameState,
+        const GameState *gameState,
        const vector<UnitId> &unitIdsCreatingCrossing,
        const CoordsSet &tilesToStartCrossingFrom,
        const MapId &mapId,
@@ -5,7 +5,6 @@
 #ifndef EAGLE0_AIWATERCROSSINGCALCULATOR_HPP
 #define EAGLE0_AIWATERCROSSINGCALCULATOR_HPP

-#include "src/main/cpp/net/eagle0/shardok/library/GameStateW.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/action_point_distances/ActionPointDistancesCache.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/map/CoordsSet.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/settings/GameSettings.hpp"
@@ -30,7 +29,7 @@ static inline void AssertValid(const Coords& c, const HexMap* hexMap) {

 // Units that need a water crossing to reach at least one of the destinations
 auto UnitIdsRequiringWaterCrossing(
-        const GameStateW& gameState,
+        const GameState* gameState,
        PlayerId pid,
        const CoordsSet& destinations,
        const APDCache& apdCache,
@@ -38,7 +37,7 @@ auto UnitIdsRequiringWaterCrossing(

 // Units belonging to the player that are capable of creating water crossings
 auto UnitIdsToCreateWaterCrossing(
-        const GameStateW& gameState,
+        const GameState* gameState,
        PlayerId pid,
        const APDCache& apdCache,
        const SettingsGetter& settings) -> vector<UnitId>;
@@ -68,7 +67,7 @@ auto WaterCrossingTiles(

 // Returns the set of tiles that the attacker should try to approach in order to bridge/freeze
 auto IntendedCrossingStarts(
-        const GameStateW& gameState,
+        const GameState* gameState,
        const vector<UnitId>& unitIdsCreatingCrossing,
        const CoordsSet& tilesToStartCrossingFrom,
        const MapId& mapId,
@@ -4,10 +4,8 @@

 #include "AIWaterCrossingCommandChooser.hpp"

-#include <algorithm>
-#include <ranges>
-
 #include "AIMinimumDistanceAndTarget.hpp"
+#include "src/main/cpp/net/eagle0/common/ContainerUtils.hpp"
 #include "src/main/cpp/net/eagle0/shardok/ai/AIWaterCrossingCalculator.hpp"

 namespace shardok {
@@ -19,10 +17,10 @@ constexpr ScoreValue kNoCrossingCreatorsScore = std::numeric_limits<ScoreValue>:

 [[nodiscard]] auto AIWaterCrossingCommandChooser::WaterCrossingScore(
        const SettingsGetter &settingsGetter,
-        const GameStateW &gameState,
+        const GameState *gameState,
        const CoordsSet &castleCoords,
        const CoordsSet &startCrossingFrom) const -> ScoreValue {
-    uint32_t castleClaimCount = 0;
+    int castleClaimCount = 0;
    for (const auto *unit : *gameState->units()) {
        if (unit->player_id() != playerId) continue;
        const auto status = unit->status();
@@ -85,7 +83,7 @@ constexpr ScoreValue kNoCrossingCreatorsScore = std::numeric_limits<ScoreValue>:
    // a large penalty
    for (const UnitId uid : unitIdsRequiringCrossing) {
        // If this unit ID can also create a crossing, we already handled it
-        if (std::ranges::contains(unitIdsCreatingCrossing, uid)) continue;
+        if (common::Contains(unitIdsCreatingCrossing, uid)) continue;

        const Unit *unit = gameState->units()->Get(uid);
        const auto &battalionType = settingsGetter.GetBattalionType(unit->battalion().type());
@@ -121,11 +119,11 @@ constexpr ScoreValue kNoCrossingCreatorsScore = std::numeric_limits<ScoreValue>:

 auto AIWaterCrossingCommandChooser::StartCrossingFrom(
        const SettingsGetter &settingsGetter,
-        const GameStateW &gameState,
+        const GameState *gameState,
        const CoordsSet &castleCoords) const -> CoordsSet {
    CoordsSet startCrossingFrom(gameState->hex_map());

-    uint32_t castleClaimCount = 0;
+    int castleClaimCount = 0;
    for (const auto *unit : *gameState->units()) {
        if (unit->player_id() != playerId) continue;
        const auto status = unit->status();
@@ -8,7 +8,6 @@
 #include <utility>
 #include <vector>

-#include "src/main/cpp/net/eagle0/shardok/library/GameStateW.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/action_point_distances/ActionPointDistancesCache.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/fb_helpers/FlatbufferWrapper.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/map/CoordsSet.hpp"
@@ -35,12 +34,12 @@ public:

    auto StartCrossingFrom(
            const SettingsGetter &settingsGetter,
-            const GameStateW &gameState,
+            const GameState *gameState,
            const CoordsSet &castleCoords) const -> CoordsSet;

    [[nodiscard]] auto WaterCrossingScore(
            const SettingsGetter &settingsGetter,
-            const GameStateW &gameState,
+            const GameState *gameState,
            const CoordsSet &castleCoords,
            const CoordsSet &startCrossingFrom) const -> ScoreValue;
 };
@@ -11,7 +11,6 @@ cc_library(
    ],
    deps = [
        ":ai_attack_locations",
-        ":ai_flee_decision_calculator",
        ":ai_score_utilities",
        ":ai_strategy",
        ":ai_water_crossing_command_chooser",
@@ -71,7 +70,6 @@ cc_library(
        ":ai_score_utilities",
        ":ai_strategy",
        ":ai_water_crossing_calculator",
-        "//src/main/cpp/net/eagle0/shardok/library:game_state_w",
        "//src/main/cpp/net/eagle0/shardok/library/map:coords_set",
        "//src/main/cpp/net/eagle0/shardok/library/util:hex_map_utils",
        "//src/main/flatbuffer/net/eagle0/shardok/storage:game_state_cc_fbs",
@@ -122,32 +120,12 @@ cc_library(
        "//src/test/cpp/net/eagle0/shardok/ai:__pkg__",
    ],
    deps = [
-        "//src/main/cpp/net/eagle0/shardok/library:game_state_w",
        "//src/main/cpp/net/eagle0/shardok/library:shardok_c_types",
        "//src/main/flatbuffer/net/eagle0/shardok/storage:game_state_cc_fbs",
        "//src/main/flatbuffer/net/eagle0/shardok/storage:unit_cc_fbs",
    ],
 )

-cc_library(
-    name = "ai_flee_decision_calculator",
-    srcs = ["AIFleeDecisionCalculator.cpp"],
-    hdrs = ["AIFleeDecisionCalculator.hpp"],
-    copts = COPTS,
-    visibility = [
-        "//src/main/cpp/net/eagle0/shardok/ai_performance_runner:__pkg__",
-        "//src/test/cpp/net/eagle0/shardok/ai:__pkg__",
-    ],
-    deps = [
-        ":ai_score_utilities",
-        ":ai_unit_score_calculator",
-        "//src/main/cpp/net/eagle0/shardok/library:engine",
-        "//src/main/cpp/net/eagle0/shardok/library/settings:game_settings",
-        "//src/main/cpp/net/eagle0/shardok/library/util:hex_map_utils",
-        "//src/main/protobuf/net/eagle0/shardok/api:command_descriptor_cc_proto",
-    ],
-)
-
 cc_library(
    name = "ai_command_filter",
    srcs = ["AICommandFilter.cpp"],
@@ -168,20 +146,6 @@ cc_library(
    ],
 )

-cc_library(
-    name = "transposition_table",
-    srcs = ["TranspositionTable.cpp"],
-    hdrs = ["TranspositionTable.hpp"],
-    copts = COPTS,
-    visibility = [
-        "//src/main/cpp/net/eagle0/shardok/ai_performance_runner:__pkg__",
-        "//src/test/cpp/net/eagle0/shardok/ai:__pkg__",
-    ],
-    deps = [
-        "//src/main/cpp/net/eagle0/shardok/library:game_state_w",
-    ],
-)
-
 cc_library(
    name = "ai_score_calculator",
    srcs = ["AIScoreCalculator.cpp"],
@@ -196,7 +160,6 @@ cc_library(
        ":ai_command_filter",
        ":ai_unit_score_calculator",
        ":ai_victory_condition_score_calculator",
-        ":transposition_table",
        "//src/main/cpp/net/eagle0/common:sequence_random_generator",
        "//src/main/cpp/net/eagle0/shardok/library:engine",
        "//src/main/cpp/net/eagle0/shardok/library/view_filters:game_state_guesser",
@@ -247,7 +210,6 @@ cc_library(
        ":ai_attack_locations",
        ":ai_distance_debuf",
        ":ai_score_utilities",
-        "//src/main/cpp/net/eagle0/shardok/library:game_state_w",
        "//src/main/cpp/net/eagle0/shardok/library/action_point_distances",
        "//src/main/cpp/net/eagle0/shardok/library/action_point_distances:action_point_distances_cache",
        "//src/main/flatbuffer/net/eagle0/shardok/storage:game_state_cc_fbs",
@@ -265,7 +227,6 @@ cc_library(
    ],
    deps = [
        ":ai_minimum_distance_and_target",
-        "//src/main/cpp/net/eagle0/shardok/library:game_state_w",
        "//src/main/cpp/net/eagle0/shardok/library/action_point_distances",
        "//src/main/cpp/net/eagle0/shardok/library/action_point_distances:action_point_distances_cache",
        "//src/main/cpp/net/eagle0/shardok/library/fb_helpers:hex_map_helpers",
@@ -330,6 +291,24 @@ cc_library(
    ],
 )

+cc_library(
+    name = "ai_flee_decision_calculator",
+    srcs = ["AIFleeDecisionCalculator.cpp"],
+    hdrs = ["AIFleeDecisionCalculator.hpp"],
+    copts = COPTS,
+    visibility = [
+        "//src/main/cpp/net/eagle0/shardok/ai_performance_runner:__pkg__",
+        "//src/test/cpp/net/eagle0/shardok/ai:__pkg__",
+    ],
+    deps = [
+        ":ai_score_utilities",
+        "//src/main/cpp/net/eagle0/shardok/library:engine",
+        "//src/main/cpp/net/eagle0/shardok/library/settings:game_settings",
+        "//src/main/cpp/net/eagle0/shardok/library/util:hex_map_utils",
+        "//src/main/protobuf/net/eagle0/shardok/api:command_descriptor_cc_proto",
+    ],
+)
+
 cc_library(
    name = "shardok_ai_client",
    srcs = ["ShardokAIClient.cpp"],
@@ -11,7 +11,7 @@

 #include "AIAttackerStrategySelector.hpp"
 #include "AIScoreCalculator.hpp"
-#include "TranspositionTable.hpp"
+#include "src/main/cpp/net/eagle0/common/TimeUtils.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/ShardokEngine.hpp"

 namespace shardok {
@@ -43,11 +43,6 @@ auto IterativeDeepeningAI::IterativeSearch(
    const auto initialBudgetMs = initialBudget.remainingBudget;
    SearchResult result;

-    // Increment TT age for replacement strategy (new search)
-    g_transpositionTable.incrementAge();
-
-    // DEBUG: Clear TT to see if that's causing the suspicious depth reaching
-    // g_transpositionTable.clear();  // Uncomment to test without cross-search caching
    if (commands.empty()) {
 #if DEBUG_ITERATIVE_DEEPENING_TIMINGS
        printf("ID AI: Commands are empty, returning early\n");
@@ -56,12 +51,11 @@ auto IterativeDeepeningAI::IterativeSearch(
        return result;
    }

-    // Check if we're in SET_UP phase and enforce maximum depth limit
+    // Check if we're in SET_UP phase
    bool isSetupPhase =
            (state->status()->state() ==
             net::eagle0::shardok::storage::fb::GameStatus_::State_SET_UP);
-    // Limit depth to prevent thread pool exhaustion and keep search reasonable
-    size_t maxDepth = isSetupPhase ? 2 : 8;
+    int maxDepth = isSetupPhase ? 2 : std::numeric_limits<int>::max();

    // Calculate current utility and create engine once for all command evaluations
    const auto& settingsGetter = settings->GetGetter();
@@ -82,10 +76,10 @@ auto IterativeDeepeningAI::IterativeSearch(
    highestDepthCompleted.clear();
    highestDepthCompleted.resize(commands.size(), 0);

-    size_t currentDepth = 1;
+    int currentDepth = 1;
    size_t previousBestCommand = 0;  // Track best command from previous depth
    size_t evaluatedCountAtHighestDepth = 0;
-    auto completionReason = EvaluationCompletionReason::RAN_OUT_OF_TIME;
+    EvaluationCompletionReason completionReason = EvaluationCompletionReason::RAN_OUT_OF_TIME;

    // Main iterative deepening loop
    while ((currentDepth == 1 || !IsTimeExpired(timeBudget)) && currentDepth <= maxDepth) {
@@ -95,37 +89,27 @@ auto IterativeDeepeningAI::IterativeSearch(
                scoresByDepth,
                highestDepthCompleted);

-        size_t evaluatedCount = 0;
+        int evaluatedCount = 0;
        bool allEvaluated = true;
        bool allEndTurnCommands = true;  // Track if all commands are END_TURN

-        // Start all command evaluations for this depth
-        std::vector<std::pair<size_t, std::future<SearchResult>>> futures;
-        futures.reserve(sortedIndices.size());
-
+        // Try to evaluate all commands at this depth, within budget constraints
        for (size_t cmdIndex : sortedIndices) {
            if (currentDepth > 1 && IsTimeExpired(timeBudget)) {
                allEvaluated = false;
                break;
            }

-            auto future = SearchCommandAtDepthWithEngine(
+            auto cmdResult = SearchCommandAtDepthWithEngine(
                    guessedEngine,
                    settingsGetter,
                    maxRepeatCount,
                    commands,
                    cmdIndex,
-                    currentDepth,  // Pass current iteration depth as desired search depth
+                    currentDepth,
                    currentUtility,
                    timeBudget);

-            futures.emplace_back(cmdIndex, std::move(future));
-        }
-
-        // Now wait for all futures and collect results
-        for (auto& [cmdIndex, future] : futures) {
-            auto cmdResult = future.get();
-
            // Ensure scoresByDepth[cmdIndex] has enough space
            if (scoresByDepth[cmdIndex].size() <= currentDepth) {
                scoresByDepth[cmdIndex].resize(currentDepth + 1);
@@ -158,13 +142,13 @@ auto IterativeDeepeningAI::IterativeSearch(
            // Log if best command changed from previous depth
            if (currentDepth > 1 && currentBestCommand != previousBestCommand) {
 #if DEBUG_ITERATIVE_DEEPENING_TIMINGS
-                printf("ID AI: Best command changed at depth %lu:\n", currentDepth);
-                printf("  Depth %lu best: command %zu (score %.2f) - %s\n",
+                printf("ID AI: Best command changed at depth %d:\n", currentDepth);
+                printf("  Depth %d best: command %zu (score %.2f) - %s\n",
                       currentDepth - 1,
                       previousBestCommand,
                       scoresByDepth[previousBestCommand][currentDepth - 1],
                       commands[previousBestCommand].DebugString().c_str());
-                printf("  Depth %lu best: command %zu (score %.2f) - %s\n",
+                printf("  Depth %d best: command %zu (score %.2f) - %s\n",
                       currentDepth,
                       currentBestCommand,
                       currentBestScore,
@@ -191,12 +175,12 @@ auto IterativeDeepeningAI::IterativeSearch(
        // This indicates we've hit END_TURN in the lookahead
        if (currentDepth > 1 && evaluatedCount > 0) {
            bool scoresUnchanged = true;
-            size_t unchangedCount = 0;
+            int unchangedCount = 0;

            for (size_t i = 0; i < sortedIndices.size() && i < evaluatedCount; ++i) {
+                size_t cmdIndex = sortedIndices[i];
                // This command was evaluated at both current and previous depth
-                if (size_t cmdIndex = sortedIndices[i];
-                    scoresByDepth[cmdIndex].size() > currentDepth &&
+                if (scoresByDepth[cmdIndex].size() > currentDepth &&
                    scoresByDepth[cmdIndex].size() > currentDepth - 1) {
                    // Check if score changed between depth N-1 and depth N
                    if (std::abs(
@@ -220,11 +204,10 @@ auto IterativeDeepeningAI::IterativeSearch(
        // Check if we've used more than 50% of total budget
        auto totalElapsed = std::chrono::steady_clock::now() - startTime;
        auto totalElapsedMs = std::chrono::duration_cast<std::chrono::milliseconds>(totalElapsed);
-        double budgetUsedPercent = static_cast<double>(totalElapsedMs.count()) /
-                                   static_cast<double>(initialBudgetMs.count());
+        double budgetUsedPercent = (double)totalElapsedMs.count() / initialBudgetMs.count();

        if (budgetUsedPercent > 0.5) {
-            printf("ID AI: Stopping after depth %lu - used %.1f%% of time budget\n",
+            printf("ID AI: Stopping after depth %d - used %.1f%% of time budget\n",
                   currentDepth,
                   budgetUsedPercent * 100);
            completionReason = EvaluationCompletionReason::NOT_ENOUGH_TIME_TO_CONTINUE;
@@ -259,8 +242,6 @@ auto IterativeDeepeningAI::IterativeSearch(
               result.availableCommandCount);
    }

-    // Print TranspositionTable statistics
-    g_transpositionTable.printStats();
    return result;
 }

@@ -274,12 +255,12 @@ auto IterativeDeepeningAI::SearchCommandAtDepthWithEngine(
        const int maxRepeatCount,
        const std::vector<CommandProto>& commands,
        const size_t commandIndex,
-        const int desiredDepth,
+        const int depth,
        const ScoreValue currentUtility,
-        AITimeBudget& timeBudget) const -> std::future<SearchResult> {
+        AITimeBudget& timeBudget) const -> SearchResult {
    SearchResult result;
    result.bestCommandIndex = commandIndex;
-    result.depthAchieved = desiredDepth;
+    result.depthAchieved = depth;
    result.searchCompleted = true;
    result.minimumDepthCompleted = true;
    result.availableCommandCount = commands.size();
@@ -287,9 +268,7 @@ auto IterativeDeepeningAI::SearchCommandAtDepthWithEngine(

    if (commandIndex >= commands.size()) {
        result.bestScore = 0.0;
-        std::promise<SearchResult> p;
-        p.set_value(result);
-        return p.get_future();
+        return result;
    }

    try {
@@ -297,18 +276,11 @@ auto IterativeDeepeningAI::SearchCommandAtDepthWithEngine(
        AIEvaluationCounter counter;
        const auto startTime = std::chrono::steady_clock::now();

-        // Calculate deadline from remaining time budget
-        const auto deadline = startTime + timeBudget.remainingBudget;
-
-        // Get the future from CommandScore - don't wait yet
-        // Note: CommandScore expects remainingLookahead, not desiredDepth
-        // desiredDepth 1 = evaluate immediate (remainingLookahead 0)
-        // desiredDepth 2 = look 1 move ahead (remainingLookahead 1)
-        // desiredDepth N = look N-1 moves ahead (remainingLookahead N-1)
-        auto commandScoreFuture = AIScoreCalculator::CommandScore(
+        // Use CommandScore to evaluate the specific command at the given depth
+        const auto commandScore = AIScoreCalculator::CommandScore(
                playerId,
                isDefender,
-                desiredDepth - 1,  // Convert desiredDepth to remainingLookahead
+                depth,
                maxRepeatCount,
                guessedEngine,
                strategy,
@@ -317,15 +289,11 @@ auto IterativeDeepeningAI::SearchCommandAtDepthWithEngine(
                castleCoords,
                apdCache,
                alCache,
-                commandIndex,
-                deadline);
-
-        // Calculate time and adjust budget before waiting
-        // This is needed because we need to update timeBudget synchronously
-        const auto commandScore = commandScoreFuture.get();
+                commandIndex);

+        // Calculate time used and adjust based on concurrent evaluations
        const auto elapsed = std::chrono::steady_clock::now() - startTime;
-        const int concurrentCount = AIEvaluationCounter::GetCurrentCount();
+        const int concurrentCount = counter.GetCurrentCount();
        const auto adjustedElapsed = elapsed / std::max(1, concurrentCount);
        const auto adjustedElapsedMs =
                std::chrono::duration_cast<std::chrono::milliseconds>(adjustedElapsed);
@@ -342,15 +310,13 @@ auto IterativeDeepeningAI::SearchCommandAtDepthWithEngine(
        result.bestScore = 0.0;
    }

-    std::promise<SearchResult> p;
-    p.set_value(result);
-    return p.get_future();
+    return result;
 }

 auto IterativeDeepeningAI::GetCommandsSortedByPreviousDepth(
-        const size_t currentDepth,
+        int currentDepth,
        const std::vector<std::vector<ScoreValue>>& scoresByDepth,
-        const std::vector<size_t>& highestDepthCompleted) -> std::vector<size_t> {
+        const std::vector<int>& highestDepthCompleted) const -> std::vector<size_t> {
    std::vector<size_t> indices(scoresByDepth.size());
    std::iota(indices.begin(), indices.end(), 0);

@@ -360,21 +326,11 @@ auto IterativeDeepeningAI::GetCommandsSortedByPreviousDepth(
    }

    // Sort by score at previous depth
-    const size_t prevDepth = currentDepth - 1;
-    std::ranges::sort(indices, [&](const size_t a, const size_t b) {
-        // Bounds check - if indices are out of range, or inner vectors are too small, treat as not
-        // evaluated
-        if (a >= scoresByDepth.size() || b >= scoresByDepth.size() ||
-            a >= highestDepthCompleted.size() || b >= highestDepthCompleted.size()) {
-            return a < b;  // Maintain stable order for out-of-bounds indices
-        }
-
-        // Check if the scores for previous depth exist
+    int prevDepth = currentDepth - 1;
+    std::sort(indices.begin(), indices.end(), [&](size_t a, size_t b) {
+        // Only consider commands that were evaluated at previous depth
        if (highestDepthCompleted[a] >= prevDepth && highestDepthCompleted[b] >= prevDepth) {
-            // Additional safety check for inner vector size
-            if (scoresByDepth[a].size() > prevDepth && scoresByDepth[b].size() > prevDepth) {
-                return scoresByDepth[a][prevDepth] > scoresByDepth[b][prevDepth];
-            }
+            return scoresByDepth[a][prevDepth] > scoresByDepth[b][prevDepth];
        }
        // Commands not evaluated at prev depth go to the end
        return highestDepthCompleted[a] >= prevDepth;
@@ -385,7 +341,7 @@ auto IterativeDeepeningAI::GetCommandsSortedByPreviousDepth(

 auto IterativeDeepeningAI::SelectBestResult(
        const std::vector<std::vector<ScoreValue>>& scoresByDepth,
-        const std::vector<size_t>& highestDepthCompleted) -> SearchResult {
+        const std::vector<int>& highestDepthCompleted) const -> SearchResult {
    SearchResult result;
    result.bestScore = -std::numeric_limits<ScoreValue>::infinity();
    result.searchCompleted = false;
@@ -393,8 +349,9 @@ auto IterativeDeepeningAI::SelectBestResult(
    // Find the command with best score at its highest evaluated depth
    for (size_t i = 0; i < scoresByDepth.size(); ++i) {
        if (highestDepthCompleted[i] > 0) {
-            const size_t depth = highestDepthCompleted[i];
-            if (ScoreValue score = scoresByDepth[i][depth]; score > result.bestScore) {
+            int depth = highestDepthCompleted[i];
+            ScoreValue score = scoresByDepth[i][depth];
+            if (score > result.bestScore) {
                result.bestScore = score;
                result.bestCommandIndex = i;
                result.depthAchieved = depth;
@@ -6,7 +6,6 @@
 #define EAGLE0_ITERATIVEDEEPENINGAI_HPP

 #include <chrono>
-#include <future>
 #include <vector>

 #include "AIStrategy.hpp"
@@ -36,7 +35,7 @@ public:
    struct SearchResult {
        size_t bestCommandIndex;
        ScoreValue bestScore;
-        size_t depthAchieved;
+        int depthAchieved;
        std::chrono::milliseconds timeUsed;
        bool minimumDepthCompleted;
        bool searchCompleted;
@@ -68,7 +67,7 @@ public:
            const GameSettingsSPtr& settings,
            const GameStateW& state,
            const std::vector<CommandProto>& commands,
-            const AITimeBudget& initialBudget) const;
+            const AITimeBudget& timeBudget) const;

 private:
    PlayerId playerId;
@@ -80,29 +79,29 @@ private:

    // Reusable vectors to reduce memory allocations
    mutable std::vector<std::vector<ScoreValue>> scoresByDepth;
-    mutable std::vector<size_t> highestDepthCompleted;
+    mutable std::vector<int> highestDepthCompleted;
    mutable std::vector<size_t> reusableSortedIndices;

    [[nodiscard]] static bool IsTimeExpired(const AITimeBudget& budget);

-    [[nodiscard]] std::future<SearchResult> SearchCommandAtDepthWithEngine(
+    [[nodiscard]] SearchResult SearchCommandAtDepthWithEngine(
            const ShardokEngine& guessedEngine,
            const GameSettings::Getter& settingsGetter,
            int maxRepeatCount,
            const std::vector<CommandProto>& commands,
            size_t commandIndex,
-            int desiredDepth,
+            int depth,
            ScoreValue currentUtility,
            AITimeBudget& timeBudget) const;

-    [[nodiscard]] static std::vector<size_t> GetCommandsSortedByPreviousDepth(
-            size_t currentDepth,
+    [[nodiscard]] std::vector<size_t> GetCommandsSortedByPreviousDepth(
+            int currentDepth,
            const std::vector<std::vector<ScoreValue>>& scoresByDepth,
-            const std::vector<size_t>& highestDepthCompleted);
+            const std::vector<int>& highestDepthCompleted) const;

-    [[nodiscard]] static SearchResult SelectBestResult(
+    [[nodiscard]] SearchResult SelectBestResult(
            const std::vector<std::vector<ScoreValue>>& scoresByDepth,
-            const std::vector<size_t>& highestDepthCompleted);
+            const std::vector<int>& highestDepthCompleted) const;
 };

 }  // namespace shardok
@@ -30,7 +30,7 @@ using net::eagle0::shardok::api::GameStateView;

 static constexpr bool kPerformanceLogging = true;

-void ApplyUpdate(GameStateView & /*currentView*/, const ActionResultView & /*update*/) {}
+void ApplyUpdate(GameStateView &currentView, const ActionResultView &update) {}

 auto RoundsRemaining(const GameSettingsSPtr &settings, const GameStateView &gsv) -> int {
    const int maxRounds = settings->GetGetter().Backing().max_rounds();
@@ -100,7 +100,7 @@ auto ShardokAIClient::StandardChooseCommandIndex(
    const auto commandCount = guessedCommands.size();

    assert(commandCount == realAvailableCommands.size());
-    for (size_t i = 0; i < commandCount; i++) {
+    for (int i = 0; i < commandCount; i++) {
        CheckCommand(realAvailableCommands[i], guessedCommands[i]);
    }

@@ -192,7 +192,7 @@ auto ShardokAIClient::FinalRoundAttackerChooseCommandIndex(
    // Use the flee decision calculator
    const auto fleeDecision = AIFleeDecisionCalculator::EvaluateFleeVsFight(
            playerId,
-            settings->GetGetter(),
+            settings,
            guessedState,
            realAvailableCommands,
            fleeCommand,
@@ -1,113 +0,0 @@
-//
-// TranspositionTable.cpp - Implementation of game state evaluation cache
-//
-
-#include "TranspositionTable.hpp"
-
-#include <cstdio>
-#include <cstring>
-
-namespace shardok {
-
-// Global instance
-TranspositionTable g_transpositionTable;
-
-TranspositionTable::TranspositionTable() : table(TABLE_SIZE) {
-    // Initialize all entries to zero
-    clear();
-}
-
-uint64_t TranspositionTable::hashGameState(const GameStateW& state) const {
-    // The FlatBuffer is contiguous in memory and units are sorted by ID,
-    // so we can just hash the raw bytes for order-independent hashing
-    // Use ComputeFNV1aHash to avoid creating a string copy
-    return state.ComputeFNV1aHash();
-}
-
-std::optional<ScoreValue>
-TranspositionTable::probe(const GameStateW& state, int depth, PlayerId player) {
-    stats.probes++;
-
-    uint64_t hash = hashGameState(state);
-    size_t index = hash & INDEX_MASK;
-
-    const auto& entry = table[index];
-
-    // Check if this entry matches our position using FULL hash
-    uint64_t stored_hash = entry.hash_full.load(std::memory_order_relaxed);
-    uint8_t stored_depth = entry.depth.load(std::memory_order_relaxed);
-    uint8_t stored_player = entry.player_id.load(std::memory_order_relaxed);
-
-    if (stored_hash == hash && stored_depth >= depth && stored_player == player) {
-        stats.hits++;
-        float score = entry.score.load(std::memory_order_relaxed);
-        return static_cast<ScoreValue>(score);
-    }
-
-    // Track collisions (different position mapped to same index)
-    // Note: We use depth==0 to indicate empty entries, not hash==0
-    if (stored_depth != 0 && stored_hash != hash) { stats.collisions++; }
-
-    return std::nullopt;
-}
-
-void TranspositionTable::store(
-        const GameStateW& state,
-        int depth,
-        PlayerId player,
-        ScoreValue score) {
-    stats.stores++;
-
-    uint64_t hash = hashGameState(state);
-    size_t index = hash & INDEX_MASK;
-
-    auto& entry = table[index];
-
-    // Simple replacement strategy: always replace if:
-    // 1. Entry is from an older search (different age)
-    // 2. New search is deeper
-    // 3. Entry is empty (depth == 0)
-
-    uint16_t stored_age = entry.age.load(std::memory_order_relaxed);
-    uint8_t stored_depth = entry.depth.load(std::memory_order_relaxed);
-
-    bool should_replace = (stored_depth == 0) ||          // Empty entry (depth 0 means unused)
-                          (stored_age != current_age) ||  // Old entry
-                          (depth >= stored_depth);        // Deeper or equal search
-
-    if (should_replace) {
-        // Store all fields with relaxed ordering (TT races are benign)
-        entry.hash_full.store(hash, std::memory_order_relaxed);
-        entry.score.store(static_cast<float>(score), std::memory_order_relaxed);
-        entry.depth.store(static_cast<uint8_t>(depth), std::memory_order_relaxed);
-        entry.player_id.store(static_cast<uint8_t>(player), std::memory_order_relaxed);
-        entry.age.store(current_age, std::memory_order_relaxed);
-    }
-}
-
-void TranspositionTable::clear() {
-    // Reset all entries
-    for (auto& entry : table) {
-        entry.hash_full.store(0, std::memory_order_relaxed);
-        entry.score.store(0.0f, std::memory_order_relaxed);
-        entry.depth.store(0, std::memory_order_relaxed);
-        entry.player_id.store(0, std::memory_order_relaxed);
-        entry.age.store(0, std::memory_order_relaxed);
-    }
-
-    stats.reset();
-    current_age = 0;
-}
-
-void TranspositionTable::printStats() const {
-    printf("TranspositionTable Stats:\n");
-    printf("  Probes: %llu\n", stats.probes.load());
-    printf("  Hits: %llu (%.1f%%)\n", stats.hits.load(), stats.hitRate());
-    printf("  Stores: %llu\n", stats.stores.load());
-    printf("  Collisions: %llu\n", stats.collisions.load());
-    printf("  Table size: %zu entries (%.1f MB)\n",
-           TABLE_SIZE,
-           (TABLE_SIZE * sizeof(TTEntry)) / (1024.0 * 1024.0));
-}
-
-}  // namespace shardok
@@ -1,91 +0,0 @@
-//
-// TranspositionTable.hpp - Cache for game state evaluations to avoid redundant calculations
-//
-
-#ifndef EAGLE0_TRANSPOSITIONTABLE_HPP
-#define EAGLE0_TRANSPOSITIONTABLE_HPP
-
-#include <atomic>
-#include <cstdint>
-#include <optional>
-#include <vector>
-
-#include "src/main/cpp/net/eagle0/shardok/library/GameStateW.hpp"
-#include "src/main/cpp/net/eagle0/shardok/library/ShardokCTypes.h"
-
-namespace shardok {
-
-using ScoreValue = double;
-// PlayerId already defined in ShardokCTypes.h
-
-class TranspositionTable {
-public:
-    // Statistics for monitoring effectiveness
-    struct Stats {
-        std::atomic<uint64_t> probes{0};
-        std::atomic<uint64_t> hits{0};
-        std::atomic<uint64_t> stores{0};
-        std::atomic<uint64_t> collisions{0};
-
-        double hitRate() const {
-            uint64_t p = probes.load();
-            return p > 0 ? (100.0 * hits.load() / p) : 0.0;
-        }
-
-        void reset() {
-            probes = 0;
-            hits = 0;
-            stores = 0;
-            collisions = 0;
-        }
-    };
-
-private:
-    // Compact entry structure (actual size is greater than 16 bytes due to atomics and alignment)
-    struct TTEntry {
-        std::atomic<uint64_t> hash_full;  // Full hash for validation
-        std::atomic<float> score;         // Score as float to save space
-        std::atomic<uint8_t> depth;       // Search depth (0-255)
-        std::atomic<uint8_t> player_id;   // Player who is to move
-        std::atomic<uint16_t> age;        // For replacement strategy
-    };
-
-    static constexpr size_t TABLE_SIZE_BITS = 22;                  // 2^22 entries
-    static constexpr size_t TABLE_SIZE = 1ULL << TABLE_SIZE_BITS;  // 4M entries = 64MB
-    static constexpr size_t INDEX_MASK = TABLE_SIZE - 1;
-
-    std::vector<TTEntry> table;
-    Stats stats;
-    std::atomic<uint16_t> current_age{0};
-
-    // Hash function for FlatBuffer game state
-    uint64_t hashGameState(const GameStateW& state) const;
-
-public:
-    TranspositionTable();
-
-    // Probe the table for a cached evaluation
-    std::optional<ScoreValue> probe(const GameStateW& state, int depth, PlayerId player);
-
-    // Store an evaluation in the table
-    void store(const GameStateW& state, int depth, PlayerId player, ScoreValue score);
-
-    // Clear the entire table
-    void clear();
-
-    // Increment age for replacement strategy (call at start of each search)
-    void incrementAge() { current_age++; }
-
-    // Get statistics
-    const Stats& getStats() const { return stats; }
-
-    // Print statistics to stdout
-    void printStats() const;
-};
-
-// Global instance for the AI to use
-extern TranspositionTable g_transpositionTable;
-
-}  // namespace shardok
-
-#endif  // EAGLE0_TRANSPOSITIONTABLE_HPP
@@ -5,10 +5,7 @@
 #ifndef EAGLE0_GAMEUPDATERECEIVER_HPP
 #define EAGLE0_GAMEUPDATERECEIVER_HPP

-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-redundant-constexpr-static-def"
 #include "src/main/protobuf/net/eagle0/shardok/api/action_result_view.pb.h"
-#pragma GCC diagnostic pop

 namespace shardok {
 using std::vector;
@@ -8,11 +8,9 @@

 #include "ShardokGameController.hpp"

-#include <algorithm>
-#include <iterator>
-#include <ranges>
 #include <thread>

+#include "src/main/cpp/net/eagle0/common/ContainerUtils.hpp"
 #include "src/main/cpp/net/eagle0/shardok/ai/ShardokAIClient.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/ShardokEngine.hpp"
 #include "src/main/protobuf/net/eagle0/shardok/api/game_state_view.pb.h"
@@ -87,10 +85,10 @@ void ShardokGameController::LockedNotifyClients() const { updateCondition.notify

 auto ShardokGameController::LockedAIClientForPid(PlayerId pid) const
        -> shared_ptr<ShardokAIClient> {
-    const auto it = std::ranges::find_if(aiClients, [pid](const auto &client) {
-        return client->GetPlayerId() == pid;
-    });
-    return (it != aiClients.end()) ? *it : nullptr;
+    return common::FindIf(
+                   aiClients,
+                   [pid](const auto &client) { return client->GetPlayerId() == pid; })
+            .value_or(nullptr);
 }

 void ShardokGameController::DoAIThread() {
@@ -167,7 +165,7 @@ void ShardokGameController::PostCommand(

    CheckFactionId(engine, shardokPlayerId, eagleFactionId);

-    const auto expectedToken = static_cast<int64_t>(engine->GetUnfilteredHistoryCount());
+    const auto expectedToken = engine->GetUnfilteredHistoryCount();
    if (token < expectedToken) {
        printf("Double token in postCommand\n");
        // The client is missing some updates; probably it's a double-submit
@@ -195,7 +193,7 @@ void ShardokGameController::PostPlacementCommands(

        CheckFactionId(engine, shardokPlayerId, eagleFactionId);

-        const auto expectedToken = static_cast<int64_t>(engine->GetUnfilteredHistoryCount());
+        const auto expectedToken = engine->GetUnfilteredHistoryCount();
        if (token < expectedToken) {
            printf("Double token in postPlacementCommands\n");
            // The client is missing some updates; probably it's a double-submit
@@ -242,11 +240,9 @@ auto ShardokGameController::GetUpdates(const int64_t startingActionId) -> AllUpd
            incomingRegistrations--;
        }

-        updates.mainResults.reserve(awrs.size());
-        std::ranges::transform(
-                awrs,
-                std::back_inserter(updates.mainResults),
-                [](const ShardokActionWithResultingState &a) { return a.action_result(); });
+        updates.mainResults = common::Map(awrs, [](const ShardokActionWithResultingState &a) {
+            return a.action_result();
+        });

        const auto playerInfos = engine->GetPlayerInfos();
        updates.filteredResults.reserve(playerInfos.size() + 1);
@@ -8,9 +8,6 @@

 #include "AvailableCommandsFactory.hpp"

-#include <algorithm>
-#include <ranges>
-
 #include "src/main/cpp/net/eagle0/shardok/library/FireUtils.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/action_factories/PlayerSetupCommandFactory.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/action_result_applier/ActionResultApplier.hpp"
@@ -135,30 +132,30 @@ void AvailableCommandsFactoryImpl::AddAvailableCommandsForOneUnit(
    }
    if (battType->adjustsMorale &&
        unit->battalion().morale() < settings.Backing().minimum_morale_to_act()) {
-        std::erase_if(oneUnitCommands, [](const CommandSPtr &cmd) {
-            return !cmd->CanDoWithLowMorale();
+        common::FilterInPlace(oneUnitCommands, [](const CommandSPtr &cmd) {
+            return cmd->CanDoWithLowMorale();
        });
    }
    if (unit->stun_rounds_remaining() > 0) {
-        std::erase_if(oneUnitCommands, [](const CommandSPtr &cmd) {
-            return !cmd->CanDoWhileStunned();
+        common::FilterInPlace(oneUnitCommands, [](const CommandSPtr &cmd) {
+            return cmd->CanDoWhileStunned();
        });
    }
    if (hasHero && unit->attached_hero().vigor() < settings.Backing().minimum_vigor_to_act()) {
-        std::erase_if(oneUnitCommands, [](const CommandSPtr &cmd) {
-            return !cmd->CanDoWithLowVigor();
+        common::FilterInPlace(oneUnitCommands, [](const CommandSPtr &cmd) {
+            return cmd->CanDoWithLowVigor();
        });
    }
    if (unitMovedIntoZoc) {
-        std::erase_if(oneUnitCommands, [](const CommandSPtr &cmd) {
-            return !cmd->CanDoAfterMovingIntoZoc();
+        common::FilterInPlace(oneUnitCommands, [](const CommandSPtr &cmd) {
+            return cmd->CanDoAfterMovingIntoZoc();
        });
    }
-    if (std::ranges::any_of(oneUnitCommands, [](const CommandSPtr &cmd) {
+    if (common::ContainsWhere(oneUnitCommands, [](const CommandSPtr &cmd) {
            return cmd->IsRequiredToEndTurn();
        })) {
-        std::erase_if(oneUnitCommands, [](const CommandSPtr &cmd) {
-            return !cmd->IsRequiredToEndTurn();
+        common::FilterInPlace(oneUnitCommands, [](const CommandSPtr &cmd) {
+            return cmd->IsRequiredToEndTurn();
        });
    }

@@ -186,7 +183,7 @@ auto AvailableCommandsFactoryImpl::GetAvailableCommands(
                /* onlyFollowUps=*/false);
    }

-    if (!std::ranges::any_of(commands, [](const CommandSPtr &command) {
+    if (!common::ContainsWhere(commands, [](const CommandSPtr &command) {
            return command->IsRequiredToEndTurn();
        })) {
        commands.push_back(std::make_shared<EndTurnCommand>(playerId, gameState, settings));
@@ -8,6 +8,7 @@ cc_library(
    visibility = ["//visibility:public"],
    deps = [
        ":shardok_c_types",
+        "//src/main/cpp/net/eagle0/common:container_utils",
        "//src/main/cpp/net/eagle0/shardok/library/fb_helpers:flatbuffer_wrapper",
        "//src/main/flatbuffer/net/eagle0/shardok/storage:game_state_cc_fbs",
        "//src/main/flatbuffer/net/eagle0/shardok/storage:unit_cc_fbs",
@@ -4,8 +4,7 @@

 #include "GameStateW.hpp"

-#include <algorithm>
-#include <ranges>
+#include "src/main/cpp/net/eagle0/common/ContainerUtils.hpp"

 namespace shardok {

@@ -25,17 +24,13 @@ auto GameStateW::GetOccupant(const net::eagle0::shardok::storage::fb::Coords& co

    // Fast path: use bitfield cache if available
    if (state->occupied_tiles() && !state->occupied_tiles()->empty()) {
-        const size_t tileIndex =
-                static_cast<size_t>(coords.row()) * static_cast<size_t>(columnCount) +
-                static_cast<size_t>(coords.column());
-        const size_t expectedBitfieldSize =
-                (static_cast<size_t>(rowCount) * static_cast<size_t>(columnCount) + 7) /
-                8;  // Ceiling division
+        const size_t tileIndex = coords.row() * columnCount + coords.column();
+        const size_t expectedBitfieldSize = (rowCount * columnCount + 7) / 8;  // Ceiling division

        if (state->occupied_tiles()->size() == expectedBitfieldSize) {
            const size_t byteIndex = tileIndex / 8;
            const size_t bitOffset = tileIndex % 8;
-            const uint8_t byte = state->occupied_tiles()->Get(static_cast<unsigned int>(byteIndex));
+            const uint8_t byte = state->occupied_tiles()->Get(byteIndex);
            const bool isOccupied = (byte & (1 << bitOffset)) != 0;

            if (!isOccupied) {
@@ -48,8 +43,8 @@ auto GameStateW::GetOccupant(const net::eagle0::shardok::storage::fb::Coords& co
    // Used when bitfield not available OR when bitfield indicates occupation
    if (!state->units()) { return nullptr; }

-    for (size_t i = 0; i < state->units()->size(); ++i) {
-        const auto* unit = state->units()->Get(static_cast<unsigned int>(i));
+    for (int i = 0; i < state->units()->size(); ++i) {
+        const auto* unit = state->units()->Get(i);
        if (unit && unit->status() == net::eagle0::shardok::storage::fb::UnitStatus_NORMAL_UNIT &&
            unit->location().row() == coords.row() &&
            unit->location().column() == coords.column()) {
@@ -67,7 +62,7 @@ auto GameStateW::GetKnownEnemyOccupant(
    const auto* occupant = GetOccupant(coords);
    if (occupant) {
        if (!occupant->hidden() && occupant->player_id() != playerId &&
-            !std::ranges::contains(allyPids, occupant->player_id())) {
+            !common::Contains(allyPids, occupant->player_id())) {
            return occupant;
        }
    }
@@ -87,30 +82,26 @@ void GameStateW::UpdateOccupiedTile(
    // Clear old position in bitfield
    if (oldCoords.row() >= 0 && oldCoords.row() < rowCount && oldCoords.column() >= 0 &&
        oldCoords.column() < columnCount) {
-        const size_t tileIndex =
-                static_cast<size_t>(oldCoords.row()) * static_cast<size_t>(columnCount) +
-                static_cast<size_t>(oldCoords.column());
+        const size_t tileIndex = oldCoords.row() * columnCount + oldCoords.column();
        const size_t byteIndex = tileIndex / 8;
        const size_t bitOffset = tileIndex % 8;
        if (byteIndex < mutableOccupiedTiles->size()) {
-            uint8_t byte = mutableOccupiedTiles->Get(static_cast<unsigned int>(byteIndex));
+            uint8_t byte = mutableOccupiedTiles->Get(byteIndex);
            byte &= ~(1 << bitOffset);  // Clear the bit
-            mutableOccupiedTiles->Mutate(static_cast<unsigned int>(byteIndex), byte);
+            mutableOccupiedTiles->Mutate(byteIndex, byte);
        }
    }

    // Set new position in bitfield
    if (newCoords.row() >= 0 && newCoords.row() < rowCount && newCoords.column() >= 0 &&
        newCoords.column() < columnCount) {
-        const size_t tileIndex =
-                static_cast<size_t>(newCoords.row()) * static_cast<size_t>(columnCount) +
-                static_cast<size_t>(newCoords.column());
+        const size_t tileIndex = newCoords.row() * columnCount + newCoords.column();
        const size_t byteIndex = tileIndex / 8;
        const size_t bitOffset = tileIndex % 8;
        if (byteIndex < mutableOccupiedTiles->size()) {
-            uint8_t byte = mutableOccupiedTiles->Get(static_cast<unsigned int>(byteIndex));
+            uint8_t byte = mutableOccupiedTiles->Get(byteIndex);
            byte |= (1 << bitOffset);  // Set the bit
-            mutableOccupiedTiles->Mutate(static_cast<unsigned int>(byteIndex), byte);
+            mutableOccupiedTiles->Mutate(byteIndex, byte);
        }
    }
 }
@@ -124,8 +115,7 @@ auto GameStateW::GetOccupiedTilesBitfield() const -> const flatbuffers::Vector<u
    // Verify the bitfield size matches expected map size
    const int16_t rowCount = state->hex_map()->row_count();
    const int16_t columnCount = state->hex_map()->column_count();
-    const size_t expectedBitfieldSize =
-            (static_cast<size_t>(rowCount) * static_cast<size_t>(columnCount) + 7) / 8;
+    const size_t expectedBitfieldSize = (rowCount * columnCount + 7) / 8;

    if (state->occupied_tiles()->size() != expectedBitfieldSize) { return nullptr; }

@@ -5,8 +5,6 @@
 #ifndef EAGLE0_GAMESTATEW_HPP
 #define EAGLE0_GAMESTATEW_HPP

-#include <cstdint>
-
 #include "src/main/cpp/net/eagle0/shardok/library/ShardokCTypes.h"
 #include "src/main/cpp/net/eagle0/shardok/library/fb_helpers/FlatbufferWrapper.hpp"
 #include "src/main/flatbuffer/net/eagle0/shardok/storage/game_state.hpp"
@@ -12,10 +12,7 @@
 #include <string>
 #include <vector>

-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-redundant-constexpr-static-def"
 #include "src/main/protobuf/net/eagle0/shardok/storage/odds.pb.h"
-#pragma GCC diagnostic pop

 namespace shardok {
 typedef net::eagle0::shardok::storage::Odds PercentileRollOdds;
@@ -14,10 +14,7 @@
 #include "ShardokException.hpp"
 #include "src/main/cpp/net/eagle0/common/RandomGenerator.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/GameStateW.hpp"
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-redundant-constexpr-static-def"
 #include "src/main/protobuf/net/eagle0/shardok/storage/action_result.pb.h"
-#pragma GCC diagnostic pop

 namespace shardok {

@@ -45,9 +42,9 @@ private:
    }

    [[nodiscard]] virtual auto InternalExecuteWithRoll(
-            const GameStateW& /*currentState*/,
-            const std::shared_ptr<RandomGenerator>& /*generator*/,
-            std::optional<int32_t> /*roll*/) const -> std::vector<ActionResult> {
+            const GameStateW& currentState,
+            const std::shared_ptr<RandomGenerator>& generator,
+            std::optional<int32_t> roll) const -> std::vector<ActionResult> {
        throw ShardokClientErrorException("Roll not supported");
    }

@@ -46,7 +46,7 @@ public:
    [[nodiscard]] virtual auto HasOdds() const -> bool { return false; }
    [[nodiscard]] virtual auto GetOddsPercentile() const -> int32_t { return 0; }

-    virtual void AddFollowUpCommandTypes(const std::unordered_set<CommandType>& /*newTypes*/) {
+    virtual void AddFollowUpCommandTypes(const std::unordered_set<CommandType>& newTypes) {
        throw ShardokInternalErrorException("Can't add follow up commands to this type");
    }
 };
@@ -9,8 +9,6 @@
 #include "ShardokEngine.hpp"

 #include <algorithm>
-#include <optional>
-#include <ranges>
 #include <utility>
 #include <vector>

@@ -312,19 +310,21 @@ void ShardokEngine::PostPlacementCommands(
            availableCommandsFactory->GetPlayerSetupCommands(gameState, player);

    // first make sure they're all valid and there are no duplicates
-    for (size_t i = 0; i < placementInfos.size(); i++) {
+    for (int i = 0; i < placementInfos.size(); i++) {
        const UnitPlacementInfo &pi = placementInfos[i];

-        const auto it = std::ranges::find_if(*placementCommands, [pi](const CommandSPtr &cmd) {
-            return cmd->GetCommandProto().actor().value() == pi.unitId &&
-                   cmd->GetCommandProto().target() == pi.location;
-        });
-        if (it == placementCommands->end()) {
+        if (auto command = common::FindIf(
+                    *placementCommands,
+                    [pi](const CommandSPtr &cmd) {
+                        return cmd->GetCommandProto().actor().value() == pi.unitId &&
+                               cmd->GetCommandProto().target() == pi.location;
+                    });
+            !command.has_value()) {
            throw ShardokClientErrorException("No such placement info found");
        }

        // check that we're not double-filling any location or double-placing any unit
-        for (size_t j = i + 1; j < placementInfos.size(); j++) {
+        for (int j = i + 1; j < placementInfos.size(); j++) {
            const UnitPlacementInfo &other = placementInfos[j];

            if (pi.unitId == other.unitId)
@@ -339,11 +339,12 @@ void ShardokEngine::PostPlacementCommands(

    // now execute
    for (const auto &pi : placementInfos) {
-        const auto it = std::ranges::find_if(*placementCommands, [pi](const CommandSPtr &cmd) {
+        auto command = common::FindIf(*placementCommands, [pi](const CommandSPtr &cmd) {
            return cmd->GetCommandProto().actor().value() == pi.unitId &&
                   cmd->GetCommandProto().target() == pi.location;
        });
-        for (vector<ActionResult> onePlacementResults = (*it)->Execute(gameState, randomGenerator);
+        for (vector<ActionResult> onePlacementResults =
+                     (*command)->Execute(gameState, randomGenerator);
             const ActionResultProto &oneResult : onePlacementResults) {
            HandleActionResult(oneResult, randomGenerator);
        }
@@ -375,17 +376,17 @@ void ShardokEngine::PostFinishedPlacementCommand(
    const auto placementCommands =
            availableCommandsFactory->GetPlayerSetupCommands(gameState, player);

-    const auto it = std::ranges::find_if(*placementCommands, [](const CommandSPtr &cmd) {
+    const auto command = common::FindIf(*placementCommands, [](const CommandSPtr &cmd) {
        return cmd->GetCommandProto().type() ==
               net::eagle0::shardok::common::END_PLAYER_SETUP_COMMAND;
    });

-    if (it == placementCommands->end()) {
+    if (!command.has_value()) {
        throw ShardokClientErrorException("No finish placement command found");
    }
    cachedAvailableCommands = nullptr;

-    PostActionUnchecked(*it, randomGenerator, std::nullopt);
+    PostActionUnchecked(command.value(), randomGenerator, std::nullopt);
 }

 void ShardokEngine::PostCommand(
@@ -87,11 +87,11 @@ auto PlayerSetupCommandFactory::AddAvailablePlayerSetupCommands(
    if (placedUnits.size() >= 10) return;
    if (unplacedUnits.empty()) return;

-    for (const auto &[unitId, unit] : unplacedUnits) {
+    for (const auto &kv : unplacedUnits) {
        AddAvailablePlaceAndHideUnitCommandsForOneUnit(
                existingCommands,
                isDefender,
-                unit,
+                kv.second,
                gameState);
    }
 }
@@ -135,14 +135,14 @@ auto ActionPointDistancesCache::GetRaw(
            MakeCacheKey(mapId, battalionType, includeBravingWater, braveWaterActionPointCost);

    // Check the persistent map first
-    if (persistentCache.contains(cacheKey)) {
+    if (auto persistentIt = persistentCache.find(cacheKey); persistentIt != persistentCache.end()) {
 #if CACHE_STATS_LOGGING_
        cacheStats.persistentHits++;
        MaybePrintCacheStats();
 #endif
        // Return directly from persistent cache without TLS insertion
        // This avoids the overhead of thread-local storage operations on hot path
-        return persistentCache.at(cacheKey).rawPtr;
+        return persistentIt->second.rawPtr;
    }

 #if CACHE_STATS_LOGGING_
@@ -150,12 +150,12 @@ auto ActionPointDistancesCache::GetRaw(
 #endif

    // Check thread-local cache first (no locks needed!)
-    if (tlsCache.contains(cacheKey)) {
+    if (auto localIt = tlsCache.find(cacheKey); localIt != tlsCache.end()) {
 #if CACHE_STATS_LOGGING_
        cacheStats.localHits++;
        MaybePrintCacheStats();
 #endif
-        return tlsCache.at(cacheKey).rawPtr;  // Raw pointer - zero overhead access!
+        return localIt->second.rawPtr;  // Raw pointer - zero overhead access!
    }

 #if CACHE_STATS_LOGGING_
@@ -217,7 +217,7 @@ auto ActionPointDistancesCache::GetRaw(
    // Store in shared cache
    sharedDistances.lazy_emplace_l(
            cacheKey,
-            [](const auto& /*kv*/) { /* already checked above */ },
+            [](const auto& kv) { /* already checked above */ },
            [=](const auto& ctor) { ctor(cacheKey, result); });

    // Cache result locally for future lookups by this thread
@@ -26,7 +26,7 @@ void FixedActionPointDistances::SetCacheDirectory(const string& newDir) {

 static thread_local byte_vector _scratch;

-FixedActionPointDistances::FixedActionPointDistances(const HexMap* /*map*/, int columnCount)
+FixedActionPointDistances::FixedActionPointDistances(const HexMap* map, int columnCount)
    : ActionPointDistances(columnCount) {}

 auto FixedActionPointDistances::Create(
@@ -130,8 +130,8 @@ void ApplyResolvedUnit(
        }
    }

-    std::erase_if(inoutState.units, [unitId](const auto &unit) {
-        return unit.unit_id() == unitId;
+    common::FilterInPlace(inoutState.units, [unitId](const auto &unit) {
+        return unit.unit_id() != unitId;
    });
    inoutState.units[unitId] = *((Unit *)resolvedUnit.unit_bytes().data());
    inoutState.units[unitId].mutate_status(
@@ -161,7 +161,7 @@ void MutatingAddUnits(GameStateW &mutatingState, const ActionResultProto &result
        const auto *unit = (Unit *)unitBytes.data();
        maxChangedUnitId = std::max(maxChangedUnitId, unit->unit_id());

-        if (static_cast<unsigned int>(unit->unit_id()) >= mutatingState->units()->size()) {
+        if (unit->unit_id() >= mutatingState->units()->size()) {
            // Unit ID beyond vector size - must expand
            needsVectorExpansion = true;
            break;  // No point checking further
@@ -48,7 +48,7 @@ auto CopyWithExtraUnits(const GameStateW& original, int additionalCount) -> Game
        // Fallback: create new bitfield only if original doesn't have one
        const int16_t rowCount = endGST.hex_map->row_count;
        const int16_t columnCount = endGST.hex_map->column_count;
-        const size_t mapSize = static_cast<size_t>(rowCount) * static_cast<size_t>(columnCount);
+        const size_t mapSize = rowCount * columnCount;
        const size_t bitfieldSize = (mapSize + 7) / 8;  // Ceiling division
        endGST.occupied_tiles.resize(bitfieldSize, 0);  // Initialize all bits to 0 (empty)

@@ -58,9 +58,7 @@ auto CopyWithExtraUnits(const GameStateW& original, int additionalCount) -> Game
                const auto& location = unit.location();
                if (location.row() >= 0 && location.row() < rowCount && location.column() >= 0 &&
                    location.column() < columnCount) {
-                    const size_t tileIndex =
-                            static_cast<size_t>(location.row()) * static_cast<size_t>(columnCount) +
-                            static_cast<size_t>(location.column());
+                    const size_t tileIndex = location.row() * columnCount + location.column();
                    const size_t byteIndex = tileIndex / 8;
                    const size_t bitOffset = tileIndex % 8;
                    endGST.occupied_tiles[byteIndex] |= (1 << bitOffset);  // Set the bit
@@ -11,7 +11,7 @@
 namespace shardok {
 auto DefensiveAmbushAction::InternalExecute(
        const GameStateW& currentState,
-        const std::shared_ptr<RandomGenerator>& /*generator*/) const -> vector<ActionResult> {
+        const std::shared_ptr<RandomGenerator>& generator) const -> vector<ActionResult> {
    const auto results = CombatUtils::InternalPerformMelee(
            ActionCost(ActionCost::standard, 0),
            currentState->units()->Get(ambusherId),
@@ -23,7 +23,7 @@ FireOutAction::FireOutAction(
      fireOutOdds(std::move(odds)) {}

 auto FireOutAction::InternalExecute(
-        const GameStateW& /*currentState*/,
+        const GameStateW& currentState,
        const std::shared_ptr<RandomGenerator>& generator) const -> vector<ActionResult> {
    const auto fireOutRoll = generator->Percentile();

@@ -23,7 +23,7 @@ FireSpreadAction::FireSpreadAction(
      fireSpreadOdds(std::move(odds)) {}

 auto FireSpreadAction::InternalExecute(
-        const GameStateW& /*currentState*/,
+        const GameStateW& currentState,
        const std::shared_ptr<RandomGenerator>& generator) const -> vector<ActionResult> {
    const auto fireSpreadRoll = generator->Percentile();

@@ -71,8 +71,8 @@ public:
 };

 auto MeteorUnitDamageAction::InternalExecute(
-        const GameStateW & /*currentState*/,
-        const std::shared_ptr<RandomGenerator> & /*generator*/) const -> vector<ActionResultProto> {
+        const GameStateW &currentState,
+        const std::shared_ptr<RandomGenerator> &generator) const -> vector<ActionResultProto> {
    CombatDamage attackerDamage =
            CombatDamage::Builder()
                    .SetFire(attackerIntelligence * baseDamage * damageMultiplier)
@@ -131,8 +131,8 @@ public:
 };

 auto MeteorTileDamageAction::InternalExecute(
-        const GameStateW & /*currentState*/,
-        const std::shared_ptr<RandomGenerator> & /*generator*/) const -> vector<ActionResultProto> {
+        const GameStateW &currentState,
+        const std::shared_ptr<RandomGenerator> &generator) const -> vector<ActionResultProto> {
    auto tm = fb::ToTileModifierProto(terrain->modifier());

    MutatingAdjustBridgeIntegrity(&tm, integrityAdjustment);
@@ -154,7 +154,7 @@ auto MeteorTileDamageAction::InternalExecute(
 }

 auto MeteorCastAction::InternalExecute(
-        const GameStateW & /*currentState*/,
+        const GameStateW &currentState,
        const std::shared_ptr<RandomGenerator> &generator) const -> vector<ActionResultProto> {
    vector<ActionResultProto> allResults{};
    auto runningGameState = startingGameState;
@@ -97,7 +97,7 @@ auto BurnStructuresResult(const GameStateW &gameState, const SettingsGetter &set
 auto NewWeather(
        const net::eagle0::shardok::storage::fb::MonthlyWeather &monthlyWeather,
        const WeatherFb &oldWeather,
-        const SettingsGetter & /*settings*/,
+        const SettingsGetter &settings,
        const std::shared_ptr<RandomGenerator> &randomGenerator) -> Weather {
    const Weather::Conditions newConditions =
            ConditionsByMonth(monthlyWeather, randomGenerator->Percentile());
@@ -21,7 +21,7 @@ auto ChooseUndeadCommand(
        const std::shared_ptr<RandomGenerator> &randomGenerator) -> CommandSPtr;

 auto PerformUndeadCommandsAction::InternalExecute(
-        const GameStateW & /*currentState*/,
+        const GameStateW &currentState,
        const std::shared_ptr<RandomGenerator> &generator) const -> vector<ActionResultProto> {
    GameStateW runningGameState = startingGameState;
    vector<ActionResultProto> allResults{};
@@ -14,7 +14,7 @@ using net::eagle0::shardok::common::GameStatus;

 [[nodiscard]] auto PlaceHiddenUnitCommand::InternalExecute(
        const GameStateW& currentState,
-        const std::shared_ptr<RandomGenerator>& /*generator*/) const -> vector<ActionResult> {
+        const std::shared_ptr<RandomGenerator>& generator) const -> vector<ActionResult> {
    auto actorAfter = *currentState->units()->Get(actorId);
    actorAfter.mutable_location() = target;
    actorAfter.mutate_hidden(true);
@@ -12,8 +12,8 @@ using net::eagle0::shardok::common::ActionType;
 using net::eagle0::shardok::common::GameStatus;

 auto PlaceUnitCommand::InternalExecute(
-        const GameStateW& /*currentState*/,
-        const std::shared_ptr<RandomGenerator>& /*generator*/) const -> vector<ActionResult> {
+        const GameStateW& currentState,
+        const std::shared_ptr<RandomGenerator>& generator) const -> vector<ActionResult> {
    auto actorAfter = *actor;
    actorAfter.mutable_location() = target;

@@ -78,7 +78,7 @@ auto effectiveSnow(const TerrainProto& terr) -> double {
 }

 auto SnowAdjustmentAction::InternalExecute(
-        const GameStateW& /*currentState*/,
+        const GameStateW& currentState,
        const std::shared_ptr<RandomGenerator>& generator) const -> vector<ActionResult> {
    vector<ActionResult> results{};

@@ -17,8 +17,8 @@ static auto RequiredDailyFood(const Unit& unit, const SettingsGetter& settingsGe
 }

 auto StartPlayerTurnAction::InternalExecute(
-        const GameStateW& /*currentState*/,
-        const std::shared_ptr<RandomGenerator>& /*generator*/) const -> vector<ActionResult> {
+        const GameStateW& currentState,
+        const std::shared_ptr<RandomGenerator>& generator) const -> vector<ActionResult> {
    ActionResult result{};
    result.set_type(net::eagle0::shardok::common::ActionType::PLAYER_TURN_START);
    result.mutable_next_player()->set_value(newFactionId);
@@ -12,7 +12,7 @@ namespace shardok {

 auto UndeadChangeAction::InternalExecute(
        const GameStateW& currentState,
-        const std::shared_ptr<RandomGenerator>& /*generator*/) const -> vector<ActionResult> {
+        const std::shared_ptr<RandomGenerator>& generator) const -> vector<ActionResult> {
    if (undeadUnitIds.empty()) return {};

    const int maxGrowthPer = (int)(reinforceRate * bodyCount / (double)undeadUnitIds.size());
@@ -9,8 +9,8 @@
 namespace shardok {

 auto UndeadFrozenAction::InternalExecute(
-        const GameStateW& /*currentState*/,
-        const std::shared_ptr<RandomGenerator>& /*generator*/) const -> vector<ActionResult> {
+        const GameStateW& currentState,
+        const std::shared_ptr<RandomGenerator>& generator) const -> vector<ActionResult> {
    if (occupant->battalion().type() != net::eagle0::shardok::storage::fb::BattalionTypeId_UNDEAD)
        return {};

@@ -4,9 +4,6 @@

 #include "UpdateGameStatusAction.hpp"

-#include <algorithm>
-#include <ranges>
-
 #include "src/main/cpp/net/eagle0/shardok/library/util/ActionResultFlatbufferHelpers.hpp"
 #include "src/main/flatbuffer/net/eagle0/shardok/storage/game_status.hpp"
 #include "src/main/flatbuffer/net/eagle0/shardok/storage/player_info.hpp"
@@ -68,7 +65,7 @@ void UpdateGameStatusAction::ResolveHiddenLosers(ActionResult& actionResult) con
    for (const auto* unit : *gameState->units()) {
        if (unit->status() != net::eagle0::shardok::storage::fb::UnitStatus_NORMAL_UNIT) continue;

-        if (!std::ranges::contains(winningIds, unit->player_id()) && unit->hidden() &&
+        if (!common::Contains(winningIds, unit->player_id()) && unit->hidden() &&
            unit->can_flee() && unit->has_attached_hero() &&
            unit->attached_hero().vigor() >= settingsGetter.Backing().minimum_vigor_to_act()) {
            net::eagle0::shardok::storage::ResolvedUnit* fledRanger =
@@ -83,7 +80,7 @@ void UpdateGameStatusAction::ResolveHiddenLosers(ActionResult& actionResult) con

 auto UpdateGameStatusAction::InternalExecute(
        const GameStateW& currentState,
-        const std::shared_ptr<RandomGenerator>& /*generator*/) const -> vector<ActionResult> {
+        const std::shared_ptr<RandomGenerator>& generator) const -> vector<ActionResult> {
    vector<ActionResult> results{};

    // If the game has already ended, just return that state
@@ -151,7 +148,7 @@ auto UpdateGameStatusAction::InternalExecute(

            for (const PlayerId pid2 : survivors) {
                if (pid1 == pid2) continue;
-                if (!std::ranges::any_of(
+                if (!common::ContainsWhere(
                            *p1Info->allies(),
                            [pid2](const net::eagle0::shardok::storage::fb::AlliedPlayer*
                                           alliedPlayer) {
@@ -12,7 +12,7 @@ namespace shardok {

 auto UpdateOpponentKnowledgeAction::InternalExecute(
        const GameStateW &currentState,
-        const std::shared_ptr<RandomGenerator> & /*generator*/) const -> vector<ActionResult> {
+        const std::shared_ptr<RandomGenerator> &generator) const -> vector<ActionResult> {
    ActionResult result{};
    result.set_type(net::eagle0::shardok::common::ActionType::KNOWLEDGE_UPDATED);

@@ -31,7 +31,7 @@ auto UpdateOpponentKnowledgeAction::InternalExecute(

        for (PlayerId pid = 0; pid < 10; pid++) {
            if (pid == unitPid) continue;
-            if (static_cast<unsigned int>(pid) >= playerCount) continue;
+            if (pid >= playerCount) continue;
            int bump = PlayerIsDefender(currentState, pid) ? defenderKnowledgeGain
                                                           : attackerKnowledgeGain;
            MutatingBumpOpponentKnowledge(&unitAfter, pid, bump);
@@ -8,9 +8,6 @@

 #include "FleeCommandFactory.hpp"

-#include <algorithm>
-#include <ranges>
-
 #include "src/main/cpp/net/eagle0/shardok/library/commands/BecomeOutlawCommand.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/commands/FleeCommand.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/util/HexMapUtils.hpp"
@@ -44,7 +41,7 @@ void FleeCommandFactory::AddAvailableFleeCommands(
        for (const auto &adjTile : HexMapUtils::GetAdjacentTiles(map, unit->location())) {
            const auto *occupant = Occupant(allUnits, adjTile.coords);
            if (occupant && !occupant->hidden()) {
-                if (std::ranges::contains(allyPids, occupant->player_id())) {
+                if (common::Contains(allyPids, occupant->player_id())) {
                    adjacentFriendliesMod += perAdjacentFriendly;
                } else {
                    adjacentEnemiesMod += perAdjacentEnemy;
@@ -58,7 +55,7 @@ void FleeCommandFactory::AddAvailableFleeCommands(
        for (const auto &twoAwayCoords : TilesWithExactDistance(map, unit->location(), 2)) {
            const auto *occupant = Occupant(allUnits, twoAwayCoords);
            if (occupant && !occupant->hidden()) {
-                if (std::ranges::contains(allyPids, occupant->player_id())) {
+                if (common::Contains(allyPids, occupant->player_id())) {
                    adjacentFriendliesMod += int32_t(perAdjacentFriendly * adjustmentForTwoAway);
                } else {
                    adjacentEnemiesMod += int32_t(perAdjacentEnemy * adjustmentForTwoAway);
@@ -4,9 +4,6 @@

 #include "HideCommandFactory.hpp"

-#include <algorithm>
-#include <ranges>
-
 #include "src/main/cpp/net/eagle0/shardok/library/commands/HideCommand.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/util/HexMapUtils.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/util/ZoneOfControlCalculator.hpp"
@@ -29,7 +26,7 @@ auto HideCommandFactory::MakeHideCommand(const Unit *actor, const Coords &target

 auto HideCommandFactory::PositionIsHideable(
        const Unit *actor,
-        CommandList & /*existingCommands*/,
+        CommandList &existingCommands,
        const HexMap *hexMap,
        const Coords &target,
        const Units *units,
@@ -39,7 +36,7 @@ auto HideCommandFactory::PositionIsHideable(
    const auto occupant = Occupant(units, target);
    if (occupant) {
        if (occupant->player_id() == actor->player_id()) return false;
-        if (std::ranges::contains(allyPids, occupant->player_id())) return false;
+        if (common::Contains(allyPids, occupant->player_id())) return false;
        if (!occupant->hidden()) return false;
    }

@@ -8,6 +8,7 @@

 #include "HolyWaveCommandFactory.hpp"

+#include "src/main/cpp/net/eagle0/common/ContainerUtils.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/commands/HolyWaveCommand.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/util/HexMapUtils.hpp"

@@ -45,7 +46,7 @@ void HolyWaveCommandFactory::AddAvailableCommands(
    AddAvailableHolyWaveCommands(commands, params.unit, params.remainingActionPoints);
 }

-auto CanHolyWave(const SettingsGetter & /*settings*/, const Unit *unit) -> bool {
+auto CanHolyWave(const SettingsGetter &settings, const Unit *unit) -> bool {
    if (!unit->has_attached_hero()) return false;

    return unit->attached_hero().profession_info().profession() ==
@@ -21,9 +21,9 @@ void ScoutCommandFactory::AddAvailableScoutCommands(
        CommandList& commands,
        const Unit* unit,
        const ActionPoints remainingActionPoints,
-        const Coords& /*position*/,
+        const Coords& position,
        const HexMap* hexMap,
-        const Units* /*units*/) const {
+        const Units* units) const {
    if (CanScout(settings, unit)) {
        const auto& hero = unit->attached_hero();

@@ -13,7 +13,7 @@ using net::eagle0::shardok::common::ActionType;

 auto ControlCommand::InternalExecute(
        const GameStateW& currentState,
-        const std::shared_ptr<RandomGenerator>& /*generator*/) const -> vector<ActionResult> {
+        const std::shared_ptr<RandomGenerator>& generator) const -> vector<ActionResult> {
    const Unit* actor = currentState->units()->Get(actorId);
    if (!actor->has_attached_hero() ||
        actor->attached_hero().control_info().controlled_unit_id() == -1) {
@@ -38,7 +38,7 @@ auto ApplyAndAdd(
 }

 auto EndTurnCommand::InternalExecute(
-        const GameStateW & /*currentState*/,
+        const GameStateW &currentState,
        const std::shared_ptr<RandomGenerator> &generator) const -> vector<ActionResultProto> {
    if (GetPlayerId() != gameState->current_player()) {
        throw ShardokInternalErrorException(
@@ -73,8 +73,8 @@ auto EndTurnCommand::InternalExecute(
    // Any heroes in fire get burninated
    // Decrement stun counters, increment cast state
    const auto beforeFireUnitsCount = runningGameState->units()->size();
-    for (size_t i = 0; i < beforeFireUnitsCount; i++) {
-        const auto *beforeUnit = runningGameState->units()->Get(static_cast<unsigned int>(i));
+    for (int i = 0; i < beforeFireUnitsCount; i++) {
+        const auto *beforeUnit = runningGameState->units()->Get(i);
        if (beforeUnit->status() != net::eagle0::shardok::storage::fb::UnitStatus_NORMAL_UNIT)
            continue;
        if (beforeUnit->player_id() != GetPlayerId()) continue;
@@ -112,10 +112,10 @@ auto EndTurnCommand::InternalExecute(
    endTurnResult.mutable_next_player()->set_value(NextPlayerId(gameState, GetPlayerId()));

    const auto unitsAtEndOfRoundCount = runningGameState->units()->size();
-    for (size_t i = 0; i < unitsAtEndOfRoundCount; i++) {
+    for (int i = 0; i < unitsAtEndOfRoundCount; i++) {
        //  Grab the unit fresh because it might have been modified by a previous iteration of the
        //  loop
-        const auto *eorUnit = runningGameState->units()->Get(static_cast<unsigned int>(i));
+        const auto *eorUnit = runningGameState->units()->Get(i);
        if (eorUnit->status() != net::eagle0::shardok::storage::fb::UnitStatus_NORMAL_UNIT)
            continue;
        if (eorUnit->player_id() != GetPlayerId()) continue;
@@ -11,7 +11,7 @@ namespace shardok {

 auto FortifyCommand::InternalExecute(
        const GameStateW& currentState,
-        const std::shared_ptr<RandomGenerator>& /*generator*/) const -> vector<ActionResult> {
+        const std::shared_ptr<RandomGenerator>& generator) const -> vector<ActionResult> {
    ActionResult fortifyResult{};
    fortifyResult.set_type(net::eagle0::shardok::common::FORTIFIED);
    fortifyResult.mutable_player()->set_value(GetPlayerId());
@@ -4,8 +4,6 @@

 #include "HideCommand.hpp"

-#include <algorithm>
-#include <ranges>
 #include <utility>

 #include "src/main/cpp/net/eagle0/shardok/library/unit/Unit.hpp"
@@ -31,7 +29,7 @@ HideCommand::HideCommand(

 auto HideCommand::InternalExecute(
        const GameStateW &currentState,
-        const std::shared_ptr<RandomGenerator> & /*generator*/) const -> vector<ActionResult> {
+        const std::shared_ptr<RandomGenerator> &generator) const -> vector<ActionResult> {
    auto actorAfter = *currentState->units()->Get(actorId);
    MutatingSpendActionPoints(&actorAfter, cost);

@@ -62,7 +60,7 @@ auto HideCommand::InternalExecute(
            if (!oneOverOccupant) continue;
            PlayerId occupantPid = oneOverOccupant->player_id();
            if (occupantPid == GetPlayerId()) continue;
-            if (std::ranges::contains(alliedPids, occupantPid)) continue;
+            if (common::Contains(alliedPids, occupantPid)) continue;

            if (!oneOverOccupant->has_attached_hero()) continue;
            if (oneOverOccupant->attached_hero().profession_info().profession() ==
@@ -9,7 +9,6 @@
 #include "HolyWaveCommand.hpp"

 #include <algorithm>
-#include <ranges>
 #include <utility>

 #include "src/main/cpp/net/eagle0/shardok/library/action_result_applier/ActionResultApplier.hpp"
@@ -51,7 +50,7 @@ public:

 auto HolyWaveDamageAction::InternalExecute(
        const GameStateW &currentState,
-        const std::shared_ptr<RandomGenerator> & /*generator*/) const -> vector<ActionResult> {
+        const std::shared_ptr<RandomGenerator> &generator) const -> vector<ActionResult> {
    ActionResult resultProto;
    resultProto.mutable_player()->set_value(playerId);
    resultProto.mutable_actor()->set_value(actingUnitId);
@@ -132,7 +131,7 @@ public:

 auto HolyWaveInspireAction::InternalExecute(
        const GameStateW &currentState,
-        const std::shared_ptr<RandomGenerator> & /*generator*/) const -> vector<ActionResult> {
+        const std::shared_ptr<RandomGenerator> &generator) const -> vector<ActionResult> {
    ActionResult resultProto;
    resultProto.mutable_player()->set_value(playerId);
    resultProto.mutable_actor()->set_value(actingUnitId);
@@ -198,7 +197,7 @@ HolyWaveCommand::HolyWaveCommand(

 auto HolyWaveCommand::InternalExecute(
        const GameStateW &currentState,
-        const std::shared_ptr<RandomGenerator> & /*generator*/) const -> vector<ActionResult> {
+        const std::shared_ptr<RandomGenerator> &generator) const -> vector<ActionResult> {
    vector<ActionResult> results;

    const Unit *actorBefore = currentState->units()->Get(actorId);
@@ -238,7 +237,7 @@ auto HolyWaveCommand::InternalExecute(
                undeadIds.push_back(occupant->unit_id());
            } else if (
                    occupant->player_id() == GetPlayerId() ||
-                    std::ranges::contains(allyPids, GetPlayerId())) {
+                    common::Contains(allyPids, GetPlayerId())) {
                allFriendlyUnitIds.push_back(occupant->unit_id());
            }
        }
@@ -34,7 +34,7 @@ auto LightningBoltCommand::InternalExecute(
    return ExecuteWithRoll(currentState, attackerRoll);
 }

-auto LightningBoltCommand::ExecuteWithRoll(const GameStateW& currentState, double /*attackerRoll*/)
+auto LightningBoltCommand::ExecuteWithRoll(const GameStateW& currentState, double attackerRoll)
        const -> vector<ActionResult> {
    const Unit* attackerBefore = currentState->units()->Get(attackerId);
    if (!attackerBefore->has_attached_hero()) {
@@ -24,7 +24,7 @@ MeteorCancelCommand::MeteorCancelCommand(

 auto MeteorCancelCommand::InternalExecute(
        const GameStateW& currentState,
-        const std::shared_ptr<RandomGenerator>& /*generator*/) const -> vector<ActionResult> {
+        const std::shared_ptr<RandomGenerator>& generator) const -> vector<ActionResult> {
    const Unit* caster = currentState->units()->Get(casterId);
    auto casterAfter = *caster;

@@ -39,7 +39,7 @@ auto MeteorStartCommand::GetCommandProto() const -> CommandProto {

 auto MeteorStartCommand::InternalExecute(
        const GameStateW &currentState,
-        const std::shared_ptr<RandomGenerator> & /*generator*/) const -> vector<ActionResult> {
+        const std::shared_ptr<RandomGenerator> &generator) const -> vector<ActionResult> {
    const auto *caster = currentState->units()->Get(casterId);

    auto casterAfter = *caster;
@@ -14,7 +14,7 @@ namespace shardok {

 auto shardok::MeteorTargetCommand::InternalExecute(
        const GameStateW &currentState,
-        const std::shared_ptr<RandomGenerator> & /*generator*/) const -> vector<ActionResult> {
+        const std::shared_ptr<RandomGenerator> &generator) const -> vector<ActionResult> {
    const Unit *caster = currentState->units()->Get(casterId);
    auto casterAfter = *caster;

@@ -4,8 +4,6 @@

 #include "MoveCommand.hpp"

-#include <algorithm>
-#include <ranges>
 #include <utility>

 #include "src/main/cpp/net/eagle0/shardok/library/action_result_applier/ActionResultApplier.hpp"
@@ -99,7 +97,7 @@ auto shardok::MoveCommand::InternalExecute(
                    const auto* occupant = currentState.GetOccupant(adj);
                    if (!occupant) continue;
                    if (occupant->player_id() == mover.player_id()) continue;
-                    if (std::ranges::contains(allyPids, occupant->player_id())) continue;
+                    if (common::Contains(allyPids, occupant->player_id())) continue;
                    if (!occupant->has_attached_hero()) continue;
                    if (occupant->attached_hero().profession_info().profession() ==
                        net::eagle0::shardok::storage::fb::Profession_RANGER) {
@@ -115,7 +113,7 @@ auto shardok::MoveCommand::InternalExecute(
                    auto occupant = currentState.GetOccupant(adj);
                    if (!occupant) continue;
                    if (occupant->player_id() == mover.player_id()) continue;
-                    if (std::ranges::contains(allyPids, occupant->player_id())) continue;
+                    if (common::Contains(allyPids, occupant->player_id())) continue;
                    if (occupant->hidden()) {
                        auto occupantAfter = *occupant;
                        occupantAfter.mutate_hidden(false);
@@ -17,7 +17,7 @@ using net::eagle0::shardok::common::ActionType;

 auto ReinforceCommand::InternalExecute(
        const GameStateW& currentState,
-        const std::shared_ptr<RandomGenerator>& /*generator*/) const -> vector<ActionResult> {
+        const std::shared_ptr<RandomGenerator>& generator) const -> vector<ActionResult> {
    const Unit* actingUnit = currentState->units()->Get(actingUnitId);
    auto actorAfter = *actingUnit;
    MutatingSpendActionPoints(&actorAfter, cost);
@@ -21,7 +21,7 @@ auto ReleaseUnitCommand::GetCommandProto() const -> CommandProto {

 auto ReleaseUnitCommand::InternalExecute(
        const GameStateW& currentState,
-        const std::shared_ptr<RandomGenerator>& /*generator*/) const -> vector<ActionResult> {
+        const std::shared_ptr<RandomGenerator>& generator) const -> vector<ActionResult> {
    auto controllingUnitAfter = *currentState->units()->Get(actingUnitId);
    controllingUnitAfter.mutate_remaining_action_points(0);
    controllingUnitAfter.mutable_attached_hero().mutable_control_info().mutate_controlled_unit_id(
@@ -18,7 +18,7 @@ using net::eagle0::shardok::common::ActionType::REPAIR_FAILED;

 auto RepairCommand::InternalExecute(
        const GameStateW& currentState,
-        const std::shared_ptr<RandomGenerator>& /*generator*/) const -> vector<ActionResult> {
+        const std::shared_ptr<RandomGenerator>& generator) const -> vector<ActionResult> {
    const auto* actor = currentState->units()->Get(actorId);

    if (!actor->has_attached_hero()) { throw ActionRequiresHeroException("repair"); }
@@ -13,7 +13,7 @@
 namespace shardok {
 auto RetreatCommand::InternalExecute(
        const GameStateW& currentState,
-        const std::shared_ptr<RandomGenerator>& /*generator*/) const -> vector<ActionResult> {
+        const std::shared_ptr<RandomGenerator>& generator) const -> vector<ActionResult> {
    ActionResult result{};
    result.set_type(net::eagle0::shardok::common::ActionType::RETREATED);
    result.mutable_player()->set_value(GetPlayerId());
@@ -26,7 +26,7 @@ StartFireCommand::StartFireCommand(
      odds(std::move(odds)){};

 auto StartFireCommand::InternalExecute(
-        const GameStateW& /*currentState*/,
+        const GameStateW& currentState,
        const std::shared_ptr<RandomGenerator>& generator) const -> vector<ActionResult> {
    return ExecuteWithRoll(generator->Percentile());
 }
@@ -11,7 +11,7 @@ namespace shardok {

 auto UnitRestCommand::InternalExecute(
        const GameStateW& currentState,
-        const std::shared_ptr<RandomGenerator>& /*generator*/) const -> vector<ActionResult> {
+        const std::shared_ptr<RandomGenerator>& generator) const -> vector<ActionResult> {
    auto actorAfter = *currentState->units()->Get(actorId);

    if (actorAfter.has_attached_hero()) {
@@ -10,7 +10,7 @@ namespace shardok {

 auto UnitStopCommand::InternalExecute(
        const GameStateW& currentState,
-        const std::shared_ptr<RandomGenerator>& /*generator*/) const -> vector<ActionResult> {
+        const std::shared_ptr<RandomGenerator>& generator) const -> vector<ActionResult> {
    ActionResult result{};
    result.set_type(net::eagle0::shardok::common::ActionType::UNIT_STOP);
    result.mutable_player()->set_value(GetPlayerId());
@@ -10,7 +10,6 @@ cc_library(
        "//src/test/cpp/net/eagle0/shardok/library:__subpackages__",
    ],
    deps = [
-        "//src/main/cpp/net/eagle0/common:byte_hasher",
        "//src/main/cpp/net/eagle0/common:filesystem_utils",
        "@flatbuffers",
    ],
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
admin	72ba7949f6	it's too much	2025-07-31 22:24:41 -07:00
admin	8d37c07f24	two still failing	2025-07-31 22:12:25 -07:00
admin	44b3467306	a little cleanup	2025-07-31 21:35:01 -07:00
admin	5d66603e1b	another test	2025-07-31 21:29:24 -07:00
admin	96798a6ad5	another test	2025-07-31 21:29:24 -07:00
admin	9273fb0134	one more passing	2025-07-31 21:29:23 -07:00
admin	a874e973e2	progress	2025-07-31 21:29:23 -07:00
admin	46a88d17c1	more tests	2025-07-31 21:29:23 -07:00
admin	c391ce0a4b	handle province stats in client and fix some tests	2025-07-31 21:29:23 -07:00