ci: bump version with Build-142

fix(official-bots): play only own tournament games with correct color
The tournament stream broadcasts a gameStart per color for every pairing in the round, without a player id. The bot latched the first color it saw and played games it was not part of, submitting moves for the wrong color that the server rejected. Now it fetches game detail and matches its botId against white/black to resolve its real color, skipping games it is not in. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-23 08:52:12 +00:00 · 2026-06-23 10:37:28 +02:00 · 2026-06-23 10:30:55 +02:00
6 changed files with 129 additions and 71 deletions
@@ -623,3 +623,45 @@
 ### Reverts

 * Revert "refactor: update metrics paths formatting in application.yml for clarity" ([3870566](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/38705663498d5f47c40dafe2f26198589ede8656))
+##  (2026-06-23)
+
+### Features
+
+* add initialization metrics for various services ([d438e97](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/d438e97f32bdde0bfc63c1b4a8cc810cdd093166))
+* add OpenTelemetry trace configuration with parentbased sampler ([3904d5a](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/3904d5ad8ad4930ddee65287a7bfab785a6148f5))
+* **analytics:** add Spark batch analytics module ([#70](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/70)) ([39f1657](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/39f1657e1db6e84889af338c43be8cb5c03c3ec3))
+* **config:** update application.yml for PostgreSQL and remove staging/production configurations ([2404e61](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/2404e6164c3b50ffccbea5238d636060d6abe4d6))
+* **config:** update application.yml for staging and production environments ([6113432](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/6113432a14c476a3a0dfc0d449e17d023697f2ba))
+* configure logging and add OpenTelemetry support ([#49](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/49)) ([d57c488](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/d57c4886612d1d92da0e1b79209fc83e6ef537a1))
+* **docker:** add .dockerignore and .gitignore files for build exclusions ([c987d8e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/c987d8e258c0e6c4cfbdaa8381c64c410d7a2b83))
+* **docker:** add Dockerfiles for building Quarkus application in native and JVM modes ([3f2d2bb](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/3f2d2bb4c97fa8cddba66e1da4427c54236dfeed))
+* **docker:** add Dockerfiles for Quarkus application in JVM and native modes ([34b9933](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/34b993304670cf2aa62cd2f6460cee7b9864b08e))
+* **events:** migrate game-creation and bot flows to Redis Streams NCS-89 ([#62](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/62)) ([a24924c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/a24924c23057db3d700a75dbc4333557789cd991))
+* NCS-78 Add Traceability to the Applications ([#46](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/46)) ([649566e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/649566eb3fcf38f91c8896a739f74ea318af312d))
+* NCS-78 Add Traceability to the Applications ([#47](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/47)) ([87dfc6c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/87dfc6c2bcce7f7d58fc641bd8d468a2e584c108))
+* NCS-82 add Swiss-system tournament module ([#55](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/55)) ([c5661de](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/c5661de4a0ebf4b33211f5a391840dcf744656b7))
+* **official-bots:** consume GameOver stream for bot cleanup ([#67](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/67)) ([db9d153](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/db9d1533912f4b41c4d1ca80ccffdde5d23d6ff6))
+* **official-bots:** make HybridBot veto actionable and use it for expert ([1df29cf](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/1df29cf3a6e21af3f396b2b7a6da67d978f941ae))
+* **official-bots:** park expert bot on tournament server at startup ([#75](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/75)) ([30295a4](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/30295a4bb95855ee8261c92278bb9ebc80ee12ee))
+* **official-bots:** resolve tournament bot token from Redis and account service ([386ddc5](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/386ddc5c19f8f893b16c6422aa5393b54c872e45))
+* **tournament:** auto-join external tournaments and publish created ones ([#77](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/77)) ([9978b7e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/9978b7ea78eb658a225a461b9cd339386c0c14f3))
+* **tournament:** federate tournaments across clusters with DB replication ([5b000a6](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/5b000a6e5f04ea6770d1c7ab6bfdaded77a99172))
+* **tournament:** seed external server registry from env var on startup ([845dc9c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/845dc9c2935c8bc1be42541dfaf31c9a861d3272))
+* true-microservices ([#40](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/40)) ([5909242](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/590924254e8a2754de661a57a03e43f89ceb6299))
+
+### Bug Fixes
+
+* enable official bots to connect to external tournament server ([#71](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/71)) ([688d30e](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/688d30e2b10026923372be5fca3c63eaaee2de2a))
+* **official-bots:** configure JWT verification ([#72](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/72)) ([98c64fc](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/98c64fc0d56dc542beb31c75f4b9056d91de03cd))
+* **official-bots:** correct parkOn path from /api/bots to /api/account/bots ([1be9949](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/1be9949c0b5c6a1db535696620d77735050d6c93))
+* **official-bots:** make botToken optional, fall back to env, fix 502 status ([f43d193](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/f43d1930d80670d810c57b54eaa3789854fa082c))
+* **official-bots:** NCS-70-auto-register official bots with account service ([#59](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/59)) ([7117a93](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/7117a93376272094d0b1a6abf2121254ce396684))
+* **official-bots:** park on external tournament servers using correct endpoint and token ([3188241](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/31882417377468b41bbe3ff94506aa4928024450))
+* **official-bots:** play only own tournament games with correct color ([4651bb7](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/4651bb796f07a21bd013d9521b2dfe2e1078cebb))
+* **official-bots:** prioritize Redis token over stale env var in joinTournament ([83dd2d4](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/83dd2d4335ca48eb3e5aa234a75367574276ba63))
+* **official-bots:** register with tournament server directly to get correct token ([64b5d55](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/64b5d5567f110c2fe152558c7de275a1e0b30e21))
+* **official-bots:** sync bots before token fetch on first startup after DB wipe ([b0ddb27](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/b0ddb274d23bca8b1b3f691ce0d643f33e0b54cd))
+
+### Reverts
+
+* Revert "refactor: update metrics paths formatting in application.yml for clarity" ([3870566](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/38705663498d5f47c40dafe2f26198589ede8656))
@@ -1,14 +1,17 @@
 package de.nowchess.bot

-import de.nowchess.bot.bots.ClassicalBot
+import de.nowchess.bot.bots.{ClassicalBot, HybridBot}
 import jakarta.enterprise.context.ApplicationScoped
+import org.jboss.logging.Logger

 object BotController:
+  private val log = Logger.getLogger(classOf[BotController])
+
  private val bots: Map[String, Bot] = Map(
    "easy"   -> ClassicalBot(BotDifficulty.Easy),
    "medium" -> ClassicalBot(BotDifficulty.Medium),
    "hard"   -> ClassicalBot(BotDifficulty.Hard),
-    "expert" -> ClassicalBot(BotDifficulty.Expert),
+    "expert" -> HybridBot(BotDifficulty.Expert, vetoReporter = log.debug(_)),
  )

  def getBot(name: String): Option[Bot] = bots.get(name.toLowerCase)
@@ -24,16 +24,24 @@ object HybridBot:
    val search = AlphaBetaSearch(rules, TranspositionTable(), classicalEvaluation)
    context =>
      val blockedMoves = BotMoveRepetition.blockedMoves(context)
+
+      def nnueScore(move: Move): Int      = nnueEvaluation.evaluate(rules.applyMove(context)(move))
+      def classicalScore(move: Move): Int = classicalEvaluation.evaluate(rules.applyMove(context)(move))
+
+      def refine(move: Move): Move =
+        val moveNnue = nnueScore(move)
+        if (classicalScore(move) - moveNnue).abs <= Config.VETO_THRESHOLD then move
+        else
+          search
+            .bestMoveWithTime(context, Config.TIME_LIMIT_MS, blockedMoves + move)
+            .filterNot(blockedMoves.contains)
+            .filter(alt => nnueScore(alt) < moveNnue)
+            .map { alt =>
+              vetoReporter(f"[Veto] ${move.from}->${move.to} replaced by ${alt.from}->${alt.to} — NNUE prefers it")
+              alt
+            }
+            .getOrElse(move)
+
      book.flatMap(_.probe(context)).filterNot(blockedMoves.contains).orElse {
-        search.bestMoveWithTime(context, Config.TIME_LIMIT_MS, blockedMoves).map { move =>
-          val next       = rules.applyMove(context)(move)
-          val staticNnue = nnueEvaluation.evaluate(next)
-          val classical  = classicalEvaluation.evaluate(next)
-          val diff       = (classical - staticNnue).abs
-          if diff > Config.VETO_THRESHOLD then
-            vetoReporter(
-              f"[Veto] ${move.from}->${move.to}: nnue=$staticNnue  classical=$classical  diff=$diff — flagged but trusted (deep search)",
-            )
-          move
-        }
+        search.bestMoveWithTime(context, Config.TIME_LIMIT_MS, blockedMoves).map(refine)
      }
@@ -283,12 +283,35 @@ class TournamentBotGamePlayer:
      forEachLine(response.readEntity(classOf[InputStream])): line =>
        parse(line).foreach: node =>
          if node.path("type").asText() == "gameStart" then
-            onGameStart(cfg, node.path("gameId").asText(), node.path("color").asText())
+            onGameStart(cfg, node.path("gameId").asText())

-  private def onGameStart(cfg: TournamentBotConfig, gameId: String, color: String): Unit =
-    if gameId.nonEmpty && color.nonEmpty && activeGames.add(gameId) then
-      workers.submit(new Runnable { def run(): Unit = playGame(cfg, gameId, color) })
-      ()
+  private def onGameStart(cfg: TournamentBotConfig, gameId: String): Unit =
+    if gameId.isEmpty then ()
+    else
+      resolveColor(cfg, gameId) match
+        case None => log.debugf("Ignoring game %s — bot %s is not a participant", gameId, cfg.botId)
+        case Some(color) =>
+          if activeGames.add(gameId) then
+            workers.submit(new Runnable { def run(): Unit = playGame(cfg, gameId, color) })
+            ()
+
+  private def resolveColor(cfg: TournamentBotConfig, gameId: String): Option[String] =
+    fetchGame(cfg, gameId).flatMap { node =>
+      val whiteId = node.path("white").path("id").asText()
+      val blackId = node.path("black").path("id").asText()
+      if whiteId == cfg.botId then Some("white")
+      else if blackId == cfg.botId then Some("black")
+      else None
+    }
+
+  private def fetchGame(cfg: TournamentBotConfig, gameId: String): Option[JsonNode] =
+    Try {
+      val response = authed(cfg, target(cfg).path("game").path(gameId)).get()
+      try
+        if response.getStatus == 200 then Some(objectMapper.readTree(response.readEntity(classOf[String])))
+        else { log.warnf("Game detail %s returned status %d", gameId, response.getStatus); None }
+      finally response.close()
+    }.getOrElse(None)

  private def playGame(cfg: TournamentBotConfig, gameId: String, color: String): Unit =
    Try {
@@ -80,76 +80,58 @@ class HybridBotTest extends AnyFunSuite with Matchers:
      bot.apply(ctx) should be(Some(Move(Square(File.E, Rank.R2), Square(File.E, Rank.R4), MoveType.Normal())))
    finally Files.deleteIfExists(tempFile)

-  test("HybridBot reports veto when classical and NNUE differ above threshold"):
-    val forcedMove = Move(Square(File.E, Rank.R2), Square(File.E, Rank.R3), MoveType.Normal())
-    val oneMoveRules = new RuleSet:
-      def candidateMoves(context: GameContext)(square: Square): List[Move] = List(forcedMove)
-      def legalMoves(context: GameContext)(square: Square): List[Move]     = List(forcedMove)
-      def allLegalMoves(context: GameContext): List[Move]                  = List(forcedMove)
-      def isCheck(context: GameContext): Boolean                           = false
-      def isCheckmate(context: GameContext): Boolean                       = false
-      def isStalemate(context: GameContext): Boolean                       = false
-      def isInsufficientMaterial(context: GameContext): Boolean            = false
-      def isFiftyMoveRule(context: GameContext): Boolean                   = false
-      def isThreefoldRepetition(context: GameContext): Boolean             = false
-      def applyMove(context: GameContext)(move: Move): GameContext =
-        context.copy(turn = context.turn.opposite, moves = context.moves :+ move)
+  // Classical search picks mateMove (delivers mate); NNUE distrusts it and prefers altMove.
+  private val mateMove = Move(Square(File.E, Rank.R2), Square(File.E, Rank.R4), MoveType.Normal())
+  private val altMove  = Move(Square(File.E, Rank.R2), Square(File.E, Rank.R3), MoveType.Normal())

-    object LowNnue extends Evaluation:
-      val CHECKMATE_SCORE: Int                = 10_000_000
-      val DRAW_SCORE: Int                     = 0
-      def evaluate(context: GameContext): Int = 0
+  private def vetoRules: RuleSet = new RuleSet:
+    private def fresh(ctx: GameContext): Boolean                          = ctx.moves.isEmpty
+    def candidateMoves(context: GameContext)(square: Square): List[Move]  = Nil
+    def legalMoves(context: GameContext)(square: Square): List[Move]      = Nil
+    def allLegalMoves(context: GameContext): List[Move]                   =
+      if fresh(context) then List(mateMove, altMove) else Nil
+    def isCheck(context: GameContext): Boolean                            = false
+    def isCheckmate(context: GameContext): Boolean                        = context.moves.lastOption.contains(mateMove)
+    def isStalemate(context: GameContext): Boolean                        = context.moves.lastOption.contains(altMove)
+    def isInsufficientMaterial(context: GameContext): Boolean             = false
+    def isFiftyMoveRule(context: GameContext): Boolean                    = false
+    def isThreefoldRepetition(context: GameContext): Boolean              = false
+    def applyMove(context: GameContext)(move: Move): GameContext =
+      context.copy(turn = context.turn.opposite, moves = context.moves :+ move)

-    object HighClassic extends Evaluation:
-      val CHECKMATE_SCORE: Int                = 10_000_000
-      val DRAW_SCORE: Int                     = 0
-      def evaluate(context: GameContext): Int = 10_000
+  // NNUE rates the mate move worse for us (higher = better for opponent) than the alternative.
+  private object DistrustfulNnue extends Evaluation:
+    val CHECKMATE_SCORE: Int                = 10_000_000
+    val DRAW_SCORE: Int                     = 0
+    def evaluate(context: GameContext): Int = if context.moves.lastOption.contains(mateMove) then 5_000 else 0

+  private object HighClassic extends Evaluation:
+    val CHECKMATE_SCORE: Int                = 10_000_000
+    val DRAW_SCORE: Int                     = 0
+    def evaluate(context: GameContext): Int = if context.moves.lastOption.contains(mateMove) then 10_000 else 0
+
+  test("HybridBot switches to NNUE's preferred move and reports veto when evals diverge"):
    val reported = AtomicBoolean(false)
    val bot = HybridBot(
      BotDifficulty.Easy,
-      rules = oneMoveRules,
-      nnueEvaluation = LowNnue,
+      rules = vetoRules,
+      nnueEvaluation = DistrustfulNnue,
      classicalEvaluation = HighClassic,
      vetoReporter = _ => reported.set(true),
    )

-    bot.apply(GameContext.initial) should be(Some(forcedMove))
+    bot.apply(GameContext.initial) should be(Some(altMove))
    reported.get should be(true)

  test("HybridBot default veto reporter prints when threshold is exceeded"):
-    val forcedMove = Move(Square(File.E, Rank.R2), Square(File.E, Rank.R3), MoveType.Normal())
-    val oneMoveRules = new RuleSet:
-      def candidateMoves(context: GameContext)(square: Square): List[Move] = List(forcedMove)
-      def legalMoves(context: GameContext)(square: Square): List[Move]     = List(forcedMove)
-      def allLegalMoves(context: GameContext): List[Move]                  = List(forcedMove)
-      def isCheck(context: GameContext): Boolean                           = false
-      def isCheckmate(context: GameContext): Boolean                       = false
-      def isStalemate(context: GameContext): Boolean                       = false
-      def isInsufficientMaterial(context: GameContext): Boolean            = false
-      def isFiftyMoveRule(context: GameContext): Boolean                   = false
-      def isThreefoldRepetition(context: GameContext): Boolean             = false
-      def applyMove(context: GameContext)(move: Move): GameContext =
-        context.copy(turn = context.turn.opposite, moves = context.moves :+ move)
-
-    object LowNnue extends Evaluation:
-      val CHECKMATE_SCORE: Int                = 10_000_000
-      val DRAW_SCORE: Int                     = 0
-      def evaluate(context: GameContext): Int = 0
-
-    object HighClassic extends Evaluation:
-      val CHECKMATE_SCORE: Int                = 10_000_000
-      val DRAW_SCORE: Int                     = 0
-      def evaluate(context: GameContext): Int = 10_000
-
    val bot = HybridBot(
      BotDifficulty.Easy,
-      rules = oneMoveRules,
-      nnueEvaluation = LowNnue,
+      rules = vetoRules,
+      nnueEvaluation = DistrustfulNnue,
      classicalEvaluation = HighClassic,
    )

    val printed = Console.withOut(new java.io.ByteArrayOutputStream()) {
      bot.apply(GameContext.initial)
    }
-    printed should be(Some(forcedMove))
+    printed should be(Some(altMove))
@@ -1,3 +1,3 @@
 MAJOR=0
-MINOR=28
+MINOR=29
 PATCH=0