feat: add castling rights revocation to processMove

Introduces applyRightsRevocation helper that revokes rights on castle
moves, king/rook departures from home squares, and enemy captures on
rook home squares. Six new tests verify all revocation paths.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

.claude/CLAUDE.MD

@@ -0,0 +1,120 @@
+# Claude Code – Working Agreement
+
+## Workflow: Plan → Write Tests → Implement → Verify
+
+### 1. Plan First
+Before writing any code, produce an explicit plan:
+- Restate the requirement in your own words to confirm understanding.
+- List every file you intend to create or modify.
+- Identify risks or unknowns upfront.
+- Wait for confirmation **only** when the plan reveals an ambiguity that cannot be resolved from context. Otherwise proceed immediately.
+
+### 2. Write Tests
+Before implementing, write tests that should cover the new behaviour.
+Only write tests for the new behaviour.
+
+### 3. Implement
+Follow the plan. Do not add scope beyond what was agreed.
+
+### 4. Verify Every Requirement
+After implementation, go through each requirement one-by-one and confirm it is satisfied:
+- Run the relevant tests (unit, integration, or build check) for every changed module.
+- If a requirement **cannot** be fulfilled, do **not** silently skip it — document it immediately (see *Unresolved Requirements* below).
+
+---
+
+## No Code Without Verification (Testing)
+
+- Every new behaviour must be covered by at least one automated test before the task is considered done.
+- Every bug fix must be accompanied by a regression test that fails before the fix and passes after.
+- Run `./gradlew :modules:<module>:test` (or the appropriate Gradle task) and confirm a green build before marking work complete.
+- If a test cannot be written for a legitimate reason, document it in `docs/unresolved.md` with an explanation.
+
+---
+
+## Automatic Bug Fixing
+
+- When a test or build step fails, attempt to fix the root cause immediately — do **not** ask for permission.
+- Apply the fix, re-run the verification, and continue until green.
+- If the same failure persists after **three** fix attempts, stop, log the issue in `docs/unresolved.md`, and surface a concise summary.
+
+---
+
+## Unresolved Requirements → `docs/unresolved.md`
+
+When a requirement or bug cannot be resolved, append an entry to `docs/unresolved.md`:
+
+```markdown
+## [YYYY-MM-DD] <Short title>
+
+**Requirement / Bug:**
+<What was requested or what failed>
+
+**Root Cause (if known):**
+<Why it cannot be resolved right now>
+
+**Attempted Fixes:**
+1. <What was tried>
+2. …
+
+**Suggested Next Step:**
+<What a human engineer should investigate>
+```
+
+Create the file if it does not exist. Never delete existing entries.
+
+---
+
+## Project Structure
+
+```
+.                        ← Repository root (multi-project Gradle setup)
+├── build.gradle.kts     ← Root build file (shared plugins, dependency versions)
+├── settings.gradle.kts  ← Gradle settings (declares all subprojects)
+├── modules/             ← One subdirectory per microservice
+│   └── <service>/
+│       ├── build.gradle.kts
+│       └── src/
+└── docs/                ← Architecture Decision Records, API docs, unresolved issues
+    └── unresolved.md
+```
+
+### Conventions
+- All microservices live under `modules/{service-name}`. Never place service code in the root.
+- Shared configuration (dependency versions, plugin setup) belongs in the **root** `build.gradle.kts` or in `buildSrc` / a version catalog.
+- `settings.gradle.kts` must include every module via `include(":modules:<service>")`.
+- Architecture decisions go in `docs/adr/` as numbered Markdown files (`ADR-001-<title>.md`).
+- API contracts live in `/docs/api/`.
+- Unit tests extend `AnyFunSuite with Matchers with JUnitSuiteLike` — no `@Test` annotations, no `: Unit` requirement
+- Integration tests use `@QuarkusTest` with JUnit 5 — `@Test` methods must be explicitly typed `: Unit`
+- Always exclude scala-library from Quarkus deps to avoid Scala 2 conflicts
+
+## Coverage Conventions
+- Branch coverage must be at least 90% - unless there is a good reason not to.
+- Line coverage must be at least 95% - unless there is a good reason not to.
+- Method coverage must be at least 90% - unless there is a good reason not to.
+- To check coverage use jacoco-reporter/scoverage_coverage_gaps.py modules/{service}/build/reports/scoverageTest/scoverage.xml
+- IMPORTANT: modules/{service}/build/reports/scoverage/scoverage.xml is not used for coverage TEST calculation. Do not use it.
+
+## Agent Routing Rules
+
+### Use agents in PARALLEL when:
+- Tasks touch different, independent microservices
+- No shared files or state between tasks
+- Example: "implement service-user AND service-orders simultaneously"
+
+### Use agents SEQUENTIALLY when:
+- Tasks have dependencies (architect → implementer → test-writer)
+- Shared API contracts are involved
+- Example: design API first, then implement, then test
+
+## Quick-Reference Checklist
+
+Before considering any task done, confirm:
+
+- [ ] Plan was written and requirements restated
+- [ ] All planned files were created / modified
+- [ ] Automated tests cover the new behaviour
+- [ ] `./gradlew build` (or scoped task) is green
+- [ ] Each requirement has been explicitly verified
+- [ ] Any unresolved items are logged in `docs/unresolved.md`

.claude/agents/code-reviewer.md

@@ -23,7 +23,7 @@ report findings to team-leader, who re-invokes scala-implementer for fixes.
 - `@QuarkusTest` methods (JUnit 5) must be explicitly typed `: Unit`
 
 ### Tests
-- Unit tests must extend `AnyFunSuite with Matchers`
+- Unit tests must extend `AnyFunSuite with Matchers with JUnitSuiteLike`, not plain JUnit 5
 - Integration tests use `@QuarkusTest` with JUnit 5 `@Test` methods
 - No raw `@Test` annotations on plain unit test classes
 

.claude/agents/scala-implementer.md

@@ -2,10 +2,9 @@
 name: scala-implementer
 description: "Implements Scala 3 + Quarkus REST services, domain logic, and persistence"
 tools: Read, Write, Edit, Bash, Glob
-model: inherit
+model: sonnet
 color: pink
 ---
-
 You do not have permissions to write tests, just source code.
 You are a Scala 3 expert specialising in Quarkus microservices.
 Always read the relevant /docs/api/ file before implementing.

.claude/agents/test-writer.md

@@ -2,10 +2,9 @@
 name: test-writer
 description: "Writes QuarkusTest unit and integration tests for a service. Invoke after scala-implementer has finished."
 tools: Read, Write, Edit, Bash, Glob, Grep, WebFetch, WebSearch, NotebookEdit
-model: haiku
+model: sonnet
 color: purple
 ---
-
 You do not have permissions to modify the source code, just write tests.
 You write tests for Scala 3 + Quarkus services.
 
@@ -13,11 +12,12 @@ You write tests for Scala 3 + Quarkus services.
 - Unit tests: `extends AnyFunSuite with Matchers` — use `test("description") { ... }` DSL, no `@Test` annotation, no `: Unit` return type needed.
 - Integration tests: `@QuarkusTest` with JUnit 5 — `@Test` methods MUST be explicitly typed `: Unit`.
 
-Target 100% conditional coverage if possible.
+Target 95%+ conditional coverage.
 
 When invoked BEFORE scala-implementer (no implementation exists yet):
   Use the contract-first-test-writing skill — write failing tests from docs/api/{service}.yaml.
 
 When invoked AFTER scala-implementer (implementation exists):
   Run python3 jacoco-reporter/jacoco_coverage_gaps.py modules/{service-name}/build/reports/jacoco/test/jacocoTestReport.xml --output agent
+  Use the jacoco-coverage-gaps skill — close coverage gaps revealed by the report.
   To regenerate the report run the tests first.

.claude/memory/MEMORY.md

@@ -1,9 +0,0 @@
-# Memory Index
-
-## Feedback
-- [feedback_keep_structure_updated.md](feedback_keep_structure_updated.md) — Update structure memory files whenever source files are added, removed, or changed
-
-## Project Structure
-- [project_structure_root.md](project_structure_root.md) — Top-level layout, modules list, VERSIONS map, navigation rules (skip `build/`, `.gradle/`, `.idea/`)
-- [project_structure_api.md](project_structure_api.md) — `modules/api`: all files and types (Board, Piece, Square, GameState, Move, ApiResponse, PlayerInfo)
-- [project_structure_core.md](project_structure_core.md) — `modules/core`: all files and types (GameContext, GameRules, MoveValidator, GameController, Parser, Renderer)

.claude/memory/feedback_keep_structure_updated.md

@@ -1,16 +0,0 @@
----
-name: keep-structure-memory-updated
-description: Always update the project structure memory files when adding, removing, or changing source files
-type: feedback
----
-
-After any change that adds, removes, renames, or significantly alters a source file, update the relevant structure memory file:
-
-- New/renamed/deleted file in `modules/api` → update `project_structure_api.md`
-- New/renamed/deleted file in `modules/core` → update `project_structure_core.md`
-- New module, dependency version change, or new top-level directory → update `project_structure_root.md`
-- New module added → create a new `project_structure_<module>.md` and add it to `MEMORY.md`
-
-**Why:** Structure memories are the primary navigation aid. Stale entries cause wasted exploration.
-
-**How to apply:** Treat the structure memory update as part of completing any implementation task — do it in the same session, not as a follow-up.

.claude/memory/project_structure_api.md

@@ -1,51 +0,0 @@
----
-name: module-api-structure
-description: File and type overview for the modules/api module (shared domain types)
-type: project
----
-
-# Module: `modules/api`
-
-**Purpose:** Shared domain model — pure data types with no game logic. Depended on by `modules/core`.
-
-**Gradle:** `id("scala")`, no `application` plugin. No Quarkus. Uses scoverage plugin.
-
-**Package root:** `de.nowchess.api`
-
-## Source files (`src/main/scala/de/nowchess/api/`)
-
-### `board/`
-| File | Contents |
-|------|----------|
-| `Board.scala` | `opaque type Board = Map[Square, Piece]` — extensions: `pieceAt`, `withMove`, `pieces`; `Board.initial` sets up start position |
-| `Color.scala` | `enum Color { White, Black }` — `.opposite`, `.label` |
-| `Piece.scala` | `case class Piece(color, pieceType)` — convenience vals `WhitePawn`…`BlackKing` |
-| `PieceType.scala` | `enum PieceType { Pawn, Knight, Bishop, Rook, Queen, King }` — `.label` |
-| `Square.scala` | `enum File { A–H }`, `enum Rank { R1–R8 }`, `case class Square(file, rank)` — `.toString` algebraic, `Square.fromAlgebraic(s)` |
-
-### `game/`
-| File | Contents |
-|------|----------|
-| `GameState.scala` | `case class CastlingRights(kingSide, queenSide)` + `.None`/`.Both`; `enum GameResult { WhiteWins, BlackWins, Draw }`; `enum GameStatus { NotStarted, InProgress, Finished(result) }`; `case class GameState(piecePlacement, activeColor, castlingWhite, castlingBlack, enPassantTarget, halfMoveClock, fullMoveNumber, status)` — FEN-compatible snapshot |
-
-### `move/`
-| File | Contents |
-|------|----------|
-| `Move.scala` | `enum PromotionPiece { Knight, Bishop, Rook, Queen }`; `enum MoveType { Normal, CastleKingside, CastleQueenside, EnPassant, Promotion(piece) }`; `case class Move(from, to, moveType = Normal)` |
-
-### `player/`
-| File | Contents |
-|------|----------|
-| `PlayerInfo.scala` | `opaque type PlayerId = String`; `case class PlayerInfo(id: PlayerId, displayName: String)` |
-
-### `response/`
-| File | Contents |
-|------|----------|
-| `ApiResponse.scala` | `sealed trait ApiResponse[+A]` → `Success[A](data)` / `Failure(errors)`; `case class ApiError(code, message, field?)`; `case class Pagination(page, pageSize, totalItems)` + `.totalPages`; `case class PagedResponse[A](items, pagination)` |
-
-## Test files (`src/test/scala/de/nowchess/api/`)
-Mirror of main structure — one `*Test.scala` per source file using `AnyFunSuite with Matchers`.
-
-## Notes
-- `GameState` is FEN-style but `Board` (in `core`) is a `Map[Square,Piece]` — the two are separate representations
-- `CastlingRights` is defined here in `api`; the castling logic lives in `core`

.claude/memory/project_structure_core.md

@@ -1,48 +0,0 @@
----
-name: module-core-structure
-description: File and type overview for the modules/core module (TUI chess engine)
-type: project
----
-
-# Module: `modules/core`
-
-**Purpose:** Standalone TUI chess application. All game logic, move validation, rendering. Depends on `modules/api`.
-
-**Gradle:** `id("scala")` + `application` plugin. Main class: `de.nowchess.chess.Main`. Uses scoverage plugin.
-
-**Package root:** `de.nowchess.chess`
-
-## Source files (`src/main/scala/de/nowchess/chess/`)
-
-### Root
-| File | Contents |
-|------|----------|
-| `Main.scala` | Entry point — prints welcome, starts `GameController.gameLoop(GameContext.initial, Color.White)` |
-
-### `controller/`
-| File | Contents |
-|------|----------|
-| `GameController.scala` | `sealed trait MoveResult` ADT: `Quit`, `InvalidFormat`, `NoPiece`, `WrongColor`, `IllegalMove`, `Moved`, `MovedInCheck`, `Checkmate`, `Stalemate`; `object GameController` — `processMove(ctx, turn, raw): MoveResult` (pure), `gameLoop(ctx, turn)` (I/O loop), `applyRightsRevocation(...)` (castling rights bookkeeping) |
-| `Parser.scala` | `object Parser` — `parseMove(input): Option[(Square, Square)]` parses coordinate notation e.g. `"e2e4"` |
-
-### `logic/`
-| File | Contents |
-|------|----------|
-| `GameContext.scala` | `enum CastleSide { Kingside, Queenside }`; `case class GameContext(board, whiteCastling, blackCastling)` — `.castlingFor(color)`, `.withUpdatedRights(color, rights)`; `GameContext.initial`; `extension (Board).withCastle(color, side)` moves king+rook atomically |
-| `GameRules.scala` | `enum PositionStatus { Normal, InCheck, Mated, Drawn }`; `object GameRules` — `isInCheck(board, color)`, `legalMoves(ctx, color): Set[(Square,Square)]`, `gameStatus(ctx, color): PositionStatus` |
-| `MoveValidator.scala` | `object MoveValidator` — `isLegal(board, from, to)`, `legalTargets(board, from): Set[Square]` (board-only, no castling), `legalTargets(ctx, from)` (context-aware, includes castling), `isCastle`, `castleSide`, `castlingTargets(ctx, color)` — full castling legality (empty squares, no check through transit) |
-
-### `view/`
-| File | Contents |
-|------|----------|
-| `Renderer.scala` | `object Renderer` — `render(board): String` outputs ANSI-colored board with file/rank labels |
-| `PieceUnicode.scala` | `extension (Piece).unicode: String` maps each piece to its Unicode chess symbol |
-
-## Test files (`src/test/scala/de/nowchess/chess/`)
-Mirror of main structure — one `*Test.scala` per source file using `AnyFunSuite with Matchers`.
-
-## Key design notes
-- `MoveValidator` has two overloaded `legalTargets`: one takes `Board` (geometry only), one takes `GameContext` (adds castling)
-- `GameRules.legalMoves` filters by check — it calls `MoveValidator.legalTargets(ctx, from)` then simulates each move
-- Castling rights revocation is in `GameController.applyRightsRevocation`, triggered after every move
-- No `@QuarkusTest` — this module is a plain Scala application, not a Quarkus service

.claude/memory/project_structure_root.md

@@ -1,55 +0,0 @@
----
-name: project-root-structure
-description: Top-level project structure, modules list, and navigation notes for NowChessSystems
-type: project
----
-
-# NowChessSystems — Root Structure
-
-## Directory layout (skip `build/`, `.gradle/`, `.idea/`)
-
-```
-NowChessSystems/
-├── build.gradle.kts          # Root: sonarqube plugin, VERSIONS map
-├── settings.gradle.kts       # include(":modules:core", ":modules:api")
-├── gradlew / gradlew.bat
-├── CLAUDE.md                 # Project instructions for Claude Code
-├── .claude/
-│   ├── CLAUDE.MD             # Working agreement (plan/verify/unresolved)
-│   ├── settings.json
-│   └── agents/               # architect, code-reviewer, gradle-builder, scala-implementer, test-writer
-├── docs/
-│   ├── Claude-Skills.md
-│   ├── Security.md
-│   └── unresolved.md
-├── jacoco-reporter/          # Python scripts for coverage gap reporting
-└── modules/
-    ├── api/                  # Shared domain types (no logic)
-    └── core/                 # TUI chess engine + game logic
-```
-
-## Modules
-
-| Module | Gradle path | Purpose |
-|--------|-------------|---------|
-| `api` | `:modules:api` | Shared domain model: Board, Piece, Move, GameState, ApiResponse |
-| `core` | `:modules:core` | TUI chess app: game logic, move validation, rendering |
-
-`core` depends on `api` via `implementation(project(":modules:api"))`.
-
-## VERSIONS (root `build.gradle.kts`)
-
-| Key | Value |
-|-----|-------|
-| `QUARKUS_SCALA3` | 1.0.0 |
-| `SCALA3` | 3.5.1 |
-| `SCALA_LIBRARY` | 2.13.18 |
-| `SCALATEST` | 3.2.19 |
-| `SCALATEST_JUNIT` | 0.1.11 |
-| `SCOVERAGE` | 2.1.1 |
-
-## Navigation rules
-- **Always skip** `build/`, `.gradle/`, `.idea/` when exploring — they are generated artifacts
-- Tests use `AnyFunSuite with Matchers` (ScalaTest), not JUnit `@Test`
-- No Quarkus in current modules — Quarkus is planned for future services
-- Agent workflow: architect → scala-implementer → test-writer → gradle-builder → code-reviewer

.idea/AndroidProjectSystem.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AndroidProjectSystem">
-    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
-  </component>
-</project>

.idea/gradle.xml

@@ -12,7 +12,6 @@
             <option value="$PROJECT_DIR$/modules" />
             <option value="$PROJECT_DIR$/modules/api" />
             <option value="$PROJECT_DIR$/modules/core" />
-            <option value="$PROJECT_DIR$/modules/ui" />
           </set>
         </option>
       </GradleProjectSettings>

.idea/misc.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="FrameworkDetectionExcludesConfiguration">

.idea/scala_compiler.xml

@@ -5,7 +5,7 @@
       <option name="deprecationWarnings" value="true" />
       <option name="uncheckedWarnings" value="true" />
     </profile>
-    <profile name="Gradle 2" modules="NowChessSystems.modules.core.main,NowChessSystems.modules.core.scoverage,NowChessSystems.modules.core.test,NowChessSystems.modules.ui.main,NowChessSystems.modules.ui.scoverage,NowChessSystems.modules.ui.test">
+    <profile name="Gradle 2" modules="NowChessSystems.modules.core.main,NowChessSystems.modules.core.scoverage,NowChessSystems.modules.core.test">
       <option name="deprecationWarnings" value="true" />
       <option name="uncheckedWarnings" value="true" />
       <parameters>

.idea/vcs.xml

@@ -6,17 +6,7 @@
       <inspection_tool class="CommitNamingConvention" enabled="true" level="WARNING" enabled_by_default="true" />
     </profile>
   </component>
-  <component name="IssueNavigationConfiguration">
-    <option name="links">
-      <list>
-        <IssueNavigationLink>
-          <option name="issueRegexp" value="(?x)\b(CORE|NCWF|BAC|FRO|K8S|ORG|NCI|NCS)-\d+\b#YouTrack" />
-          <option name="linkRegexp" value="https://knockoutwhist.youtrack.cloud/issue/$0" />
-        </IssueNavigationLink>
-      </list>
-    </option>
-  </component>
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

ARABIAN CHESS/license.txt

@@ -1,7 +0,0 @@
-YOU CAN:
-- Edit and use the asset in any commercial  or non commercial project 
-- Use the asset in any commercial  or non commercial project
-
-YOU CAN'T:
-- Resell or distribute the asset to others
-- Edit and resell the asset to others - - Credits required using This link: https://fatman200.itch.io/

CLAUDE.md

@@ -1,58 +1,58 @@
-# CLAUDE.md — NowChessSystems
+# CLAUDE.md
 
-## Stack
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
-Scala 3.5.x · Quarkus + quarkus-scala3 · Hibernate/Jakarta · Lanterna TUI · K8s + ArgoCD + Kargo · Frontend TBD (Vite/React/Angular/Vue)
 
-### Memory
+## Build & Test Commands
 
-Your memory is saved under .claude/memory/MEMORY.md.
-
-## Structure
-```
-build.gradle.kts / settings.gradle.kts   # root; include(":modules:<svc>") per service
-modules/<svc>/build.gradle.kts + src/
-docs/adr/  docs/api/  docs/unresolved.md
-```
-Versions in root `extra["VERSIONS"]`; modules read via `rootProject.extra["VERSIONS"] as Map<String,String>`.
-
-## Commands
 ```bash
+# Build everything
 ./gradlew build
-./gradlew :modules:<svc>:build|test
+
-./gradlew :modules:<svc>:test --tests "de.nowchess.<svc>.<Class>"
+# Build a single module
+./gradlew :modules:<service>:build
+
+# Run tests for a single module
+./gradlew :modules:<service>:test
+
+# Run a specific test class
+./gradlew :modules:<service>:test --tests "de.nowchess.<service>.<ClassName>"
 ```
 
-## Workflow
+The only current module is `core` (`modules/core`).
-1. **Plan** — restate requirement, list files, flag risks. Proceed unless genuine ambiguity.
-2. **Tests first** — cover only new behaviour.
-3. **Implement** — no scope creep.
-4. **Verify** — check each requirement; confirm green build.
 
-## Scala/Quarkus Rules
+## Architecture
-- `given`/`using` only (no `implicit`); `Option`/`Either`/`Try` (no `null`/`.get`)
-- `jakarta.*` only; reactive I/O (`Uni`/`Multi`), no blocking on event loop
-- Always exclude `org.scala-lang:scala-library` from Quarkus BOM
-- Unit tests: `extends AnyFunSuite with Matchers` — no `@Test`, no `: Unit`
-- Integration tests: `@QuarkusTest` + JUnit 5 — `@Test` methods need explicit `: Unit`
 
-## Coverage
+**NowChessSystems** is a chess platform built as a Scala 3 + Quarkus microservice system.
-Line = 100% · Branch = 100% · Method = 100% · Regression tests · document exceptions
-Check: `jacoco-reporter/scoverage_coverage_gaps.py modules/{svc}/build/reports/scoverageTest/scoverage.xml`
-⚠️ Use `scoverageTest/`, NOT `scoverage/`.
 
-## Bug Fixing
+- Multi-module Gradle project; every service lives under `modules/{service-name}`.
-Fix failures immediately without asking. After 3 failed attempts → log in `docs/unresolved.md` + surface summary.
+- Shared dependency versions live in the root `build.gradle.kts` under `extra["VERSIONS"]`.
+- Each module reads versions via `rootProject.extra["VERSIONS"] as Map<String, String>`.
+- `settings.gradle.kts` must `include(":modules:<service>")` for every module.
 
-## Agents (new service)
+### Stack (ADR-001)
-Sequential: architect → scala-implementer → test-writer → gradle-builder → code-reviewer (review only, no self-fix)
+| Layer | Technology |
-Parallel: only when services are fully independent (no shared contracts/state).
+|---|---|
+| Language | Scala 3.5.x |
+| Backend framework | Quarkus + `quarkus-scala3` extension |
+| Persistence | Hibernate / Jakarta Persistence |
+| Frontend (TBD) | Vite; React/Angular/Vue under evaluation |
+| TUI | Lanterna |
+| Container orchestration | Kubernetes + ArgoCD + Kargo |
 
-## Unresolved (`docs/unresolved.md`)
+### Key Scala 3 / Quarkus Rules
-Append only, never delete:
+- Use `given`/`using`, not `implicit` (no Scala 2 idioms).
-```
+- Use `Option`/`Either`/`Try`, never `null` or `.get`.
-## [YYYY-MM-DD] <title>
+- Jakarta annotations only (`jakarta.*`), never `javax.*`.
-**Requirement/Bug:** **Root Cause:** **Attempted Fixes:** **Next Step:**
+- Use reactive types (`Uni`, `Multi`) for I/O; no blocking calls on the event loop.
-```
+- **Always exclude `org.scala-lang:scala-library` from Quarkus BOM** to avoid Scala 2 conflicts.
+- **Unit tests use `extends AnyFunSuite with Matchers with JUnitSuiteLike`** — ScalaTest DSL, no `@Test` annotations needed.
+- **Integration tests use `@QuarkusTest` with JUnit 5** — explicit `: Unit` return type still required on `@Test` methods.
 
-## Done Checklist
+### Agent Workflow (for new services)
-- [ ] Plan written · files created/modified · tests green · requirements verified · unresolved logged
+1. **architect** → writes OpenAPI contract to `docs/api/{service}.yaml` and ADR to `docs/adr/`.
+2. **scala-implementer** → reads contract, implements service under `modules/{service}/`.
+3. **test-writer** → writes `@QuarkusTest` integration tests and `AnyFunSuite with Matchers with JUnitSuiteLike` unit tests.
+4. **gradle-builder** → resolves any build/dependency issues.
+5. **code-reviewer** → reviews; reports findings back without self-fixing.
+
+Detailed working agreement (plan/verify/unresolved workflow) is in `.claude/CLAUDE.MD`.

build.gradle.kts

@@ -1,6 +1,5 @@
 plugins {
     id("org.sonarqube") version "7.2.3.7755"
-    id("org.scoverage") version "8.1" apply false
 }
 
 group = "de.nowchess"
@@ -29,10 +28,7 @@ val versions = mapOf(
     "SCALA_LIBRARY"         to "2.13.18",
     "SCALATEST"             to "3.2.19",
     "SCALATEST_JUNIT"       to "0.1.11",
-    "SCOVERAGE"             to "2.1.1",
+    "SCOVERAGE"             to "2.1.1"
-    "SCALAFX"               to "21.0.0-R32",
-    "JAVAFX"                to "21.0.1",
-    "JUNIT_BOM"             to "5.13.4"
 )
 extra["VERSIONS"] = versions
 

clean

@@ -1,4 +0,0 @@
-#! /usr/bin/env bash
-set -euo pipefail
-
-./gradlew clean

compile

@@ -1,4 +0,0 @@
-#! /usr/bin/env bash
-set -euo pipefail
-
-./gradlew classes

coverage

@@ -1,10 +0,0 @@
-#! /usr/bin/env bash
-set -euo pipefail
-
-./gradlew test
-
-if [ "$#" -eq 0 ]; then
-  python3 jacoco-reporter/scoverage_coverage_gaps.py
-else
-  python3 jacoco-reporter/scoverage_coverage_gaps.py "modules/$1/build/reports/scoverageTest/scoverage.xml"
-fi

docs/adr/ADR-001-Stack.md

@@ -0,0 +1,43 @@
+# ADR-001: Technology Stack Selection
+
+## Status
+Accepted
+
+## Context
+The "NowChessSystems" project requires a modern, scalable,
+and maintainable technology stack to support web-based interfaces.
+The system is designed as a microservice architecture to allow for independent scaling and development of various components (e.g., engine, matchmaking, user management).
+
+## Decision
+We have decided to use the following technologies for the core system:
+
+### Backend
+- **Language:** [Scala 3](https://scala-lang.org/) for its powerful type system, functional programming capabilities, and seamless JVM integration.
+- **Framework:** [Quarkus](https://quarkus.io/) with the `io.quarkiverse.scala:quarkus-scala3` extension to leverage GraalVM native compilation and fast startup times.
+- **Persistence:** [Hibernate](https://hibernate.org/) and [Jakarta Persistence](https://jakarta.ee/specifications/persistence/) for standard-based ORM.
+
+### Frontend
+- **Build Tool:** [Vite](https://vitejs.dev/) for a fast development experience.
+- **Framework:** TBD (Evaluation between React, Angular, and Vue).
+- **Terminal UI:** [Lanterna](https://github.com/mabe02/lanterna) for a text-based user interface (TUI).
+
+### DevOps & Infrastructure
+- **Orchestration:** [Kubernetes](https://kubernetes.io/) for container orchestration.
+- **GitOps & Delivery:** [ArgoCD](https://argoproj.github.io/cd/) for continuous delivery and [Kargo](https://kargo.io/) for multi-stage lifecycle management.
+
+### AI-Assisted Development
+- [Claude Code Pro](https://claude.ai/) and [Claude Agent Teams](https://claude.ai/team) for coding and reviews.
+- [Google Stitch](https://stitch.google.com/) (Free) for UI design and prototyping.
+
+## Consequences
+
+### Positive
+- **High Performance:** Quarkus and GraalVM enable low memory footprint and fast startup.
+- **Developer Productivity:** Scala 3 and AI tools provide a high-level, expressive environment.
+- **Robustness:** Kubernetes and ArgoCD ensure reliable deployment and scaling.
+- **Accessibility:** Offering both a TUI and a web interface caters to different user preferences.
+
+### Negative / Risks
+- **Complexity:** Managing a microservices architecture with Kubernetes adds operational overhead.
+- **Learning Curve:** Scala 3 and the specific Quarkus-Scala integration may require training for new developers.
+- **Consistency:** Maintaining parity between the TUI and Web frontend functionality.

docs/adr/ADR-002-api-shared-models.md

@@ -0,0 +1,86 @@
+# ADR-002: Shared-Models Library (`modules/api`)
+
+## Status
+Accepted
+
+## Context
+
+NowChessSystems is a microservice platform. As soon as two or more services need to
+exchange data — whether through REST, messaging, or internal function calls — they must
+agree on common data types. Without a shared home for those types, the same case class
+(e.g. `Square`, `Move`, `GameState`) is duplicated in every module, diverges over time,
+and causes silent serialisation mismatches at runtime.
+
+The `core` module currently owns the chess engine logic. Future modules (matchmaking,
+game history, user management, notation export, etc.) will all need to refer to the
+same chess domain vocabulary. A cross-cutting place to hold that vocabulary is therefore
+required before any second service is built.
+
+## Decision
+
+We introduce `modules/api` as a **shared-models library**: a plain Scala 3 library
+(no Quarkus, no Jakarta, no persistence) that contains only:
+
+- Pure Scala 3 data types: `case class`, `sealed trait`, and `enum` definitions
+- Value objects that model the chess domain (pieces, colors, squares, moves, game state)
+- Cross-service API envelope types (`ApiResponse[A]`, `ApiError`, `Pagination`)
+- Minimal player/user identity stubs (IDs and display names only)
+
+Every service module that needs these types declares:
+
+```kotlin
+implementation(project(":modules:api"))
+```
+
+in its own `build.gradle.kts`. The `modules/api` module itself carries no runtime
+dependencies beyond the Scala 3 standard library.
+
+### Package layout
+
+```
+de.nowchess.api
+├── board          – Color, PieceType, Piece, File, Rank, Square
+├── game           – CastlingRights, GameState, GameResult, GameStatus
+├── move           – MoveType, Move, PromotionPiece
+├── player         – PlayerId, PlayerInfo
+└── response       – ApiResponse, ApiError, Pagination
+```
+
+## What belongs in `modules/api`
+
+| Belongs | Does NOT belong |
+|---|---|
+| `case class`, `sealed trait`, `enum` for chess domain | Quarkus `@ApplicationScoped` beans |
+| API envelope types (`ApiResponse`, `ApiError`) | Jakarta Persistence entities (`@Entity`) |
+| Player identity stubs (ID + display name) | REST resource classes |
+| FEN/board-state representation types | Business logic, engine algorithms |
+| Pure type aliases and value objects | Database queries or repositories |
+
+The rule of thumb: if a type carries a framework annotation or requires I/O to produce,
+it does not belong in `modules/api`.
+
+## How other modules depend on it
+
+1. `modules/api` is a regular Gradle subproject already declared in `settings.gradle.kts`.
+2. Consuming modules add `implementation(project(":modules:api"))` — nothing else.
+3. Because `modules/api` has no Quarkus BOM, consuming modules must not re-export Quarkus
+   transitive dependencies through it.
+4. If a future module needs JSON serialisation, it adds its own JSON library (e.g.
+   `circe`, `jsoniter-scala`) as a dependency and derives codecs for the shared types
+   there — codec derivation stays out of `modules/api`.
+
+## Consequences
+
+### Positive
+- Single source of truth for all chess domain vocabulary.
+- Adding a new microservice requires only one `implementation(project(":modules:api"))`
+  line — no copy-paste of types.
+- The library is fast to compile (no framework processing) and cheap to test in isolation.
+- Enforces a strict boundary: if a type needs a framework annotation it is forced into the
+  correct service module.
+
+### Negative / Risks
+- Any breaking change to a shared type (rename, field removal) is a cross-cutting change
+  that touches every consuming module simultaneously.
+- Developers must resist the temptation to add convenience methods or logic to these
+  types; discipline is required to keep the library pure.

docs/superpowers/plans/2026-03-22-scalatest-scoverage.md

@@ -0,0 +1,244 @@
+# ScalaTest + Scoverage Migration Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Replace JaCoCo with Scoverage and add ScalaTest (with its JUnit 5 bridge) as the test library across all modules.
+
+**Architecture:** Three build files are modified — the root for shared dependency versions, and each module for plugins, dependencies, and task wiring. No source files are created. The Scoverage Gradle plugin is applied per-module with its version hardcoded inline (Gradle resolves `plugins {}` before `rootProject.extra` is available).
+
+**Tech Stack:** Scala 3, Gradle (Kotlin DSL), ScalaTest 3.2.19, scalatestplus-junit-5-11 3.2.19.1, Scoverage Gradle plugin 8.1.
+
+---
+
+## File Map
+
+| File | Change |
+|---|---|
+| `build.gradle.kts` (root) | Add `SCALATEST` and `SCALATESTPLUS_JUNIT5` version entries |
+| `modules/core/build.gradle.kts` | Replace `jacoco` with `org.scoverage`; swap JUnit deps for ScalaTest; merge two `tasks.test {}` blocks |
+| `modules/api/build.gradle.kts` | Same as core; also add missing `useJUnitPlatform()` |
+
+---
+
+### Task 1: Add ScalaTest version entries to root build
+
+**Files:**
+- Modify: `build.gradle.kts` (root)
+
+- [ ] **Step 1: Add version entries**
+
+Open `build.gradle.kts` at the root. The `versions` map currently looks like:
+
+```kotlin
+val versions = mapOf(
+    "QUARKUS_SCALA3" to "1.0.0",
+    "SCALA3"         to "3.5.1",
+    "SCALA_LIBRARY"  to "2.13.18"
+)
+```
+
+Add two entries so it becomes:
+
+```kotlin
+val versions = mapOf(
+    "QUARKUS_SCALA3"        to "1.0.0",
+    "SCALA3"                to "3.5.1",
+    "SCALA_LIBRARY"         to "2.13.18",
+    "SCALATEST"             to "3.2.19",
+    "SCALATESTPLUS_JUNIT5"  to "3.2.19.1"
+)
+```
+
+- [ ] **Step 2: Verify the root build file parses**
+
+```bash
+./gradlew help --quiet
+```
+
+Expected: exits 0 with no errors.
+
+- [ ] **Step 3: Commit**
+
+```bash
+git add build.gradle.kts
+git commit -m "build: add ScalaTest version entries to root versions map"
+```
+
+---
+
+### Task 2: Migrate `modules/core` to ScalaTest + Scoverage
+
+**Files:**
+- Modify: `modules/core/build.gradle.kts`
+
+- [ ] **Step 1: Replace the `jacoco` plugin with `org.scoverage`**
+
+In the `plugins {}` block, replace:
+```kotlin
+jacoco
+```
+with:
+```kotlin
+id("org.scoverage") version "8.1"
+```
+
+The full plugins block should be:
+```kotlin
+plugins {
+    id("scala")
+    id("org.scoverage") version "8.1"
+    application
+}
+```
+
+- [ ] **Step 2: Swap JUnit dependencies for ScalaTest**
+
+In the `dependencies {}` block, remove:
+```kotlin
+testImplementation(platform("org.junit:junit-bom:5.10.0"))
+testImplementation("org.junit.jupiter:junit-jupiter")
+testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+```
+
+Add in their place:
+```kotlin
+testImplementation("org.scalatest:scalatest_3:${versions["SCALATEST"]!!}")
+testImplementation("org.scalatestplus:junit-5-11_3:${versions["SCALATESTPLUS_JUNIT5"]!!}")
+```
+
+- [ ] **Step 3: Merge the two `tasks.test {}` blocks and replace jacoco wiring**
+
+The file currently has two separate `tasks.test {}` blocks and a `tasks.jacocoTestReport {}` block. Delete all three. Add the following single merged block **after** the `dependencies {}` block:
+
+```kotlin
+tasks.test {
+    useJUnitPlatform()
+    finalizedBy(tasks.reportScoverage)
+}
+tasks.reportScoverage {
+    dependsOn(tasks.test)
+}
+```
+
+- [ ] **Step 4: Run the tests**
+
+```bash
+./gradlew :modules:core:test
+```
+
+Expected: BUILD SUCCESSFUL. (Zero tests is fine — there are no test files yet. The build must not fail with dependency resolution or plugin errors.)
+
+- [ ] **Step 5: Run the coverage report**
+
+```bash
+./gradlew :modules:core:reportScoverage
+```
+
+Expected: BUILD SUCCESSFUL. A report is generated under `modules/core/build/reports/scoverage/`.
+
+- [ ] **Step 6: Commit**
+
+```bash
+git add modules/core/build.gradle.kts
+git commit -m "build(core): replace JaCoCo with Scoverage, add ScalaTest dependencies"
+```
+
+---
+
+### Task 3: Migrate `modules/api` to ScalaTest + Scoverage
+
+**Files:**
+- Modify: `modules/api/build.gradle.kts`
+
+- [ ] **Step 1: Replace the `jacoco` plugin with `org.scoverage`**
+
+In the `plugins {}` block, replace:
+```kotlin
+jacoco
+```
+with:
+```kotlin
+id("org.scoverage") version "8.1"
+```
+
+The full plugins block should be:
+```kotlin
+plugins {
+    id("scala")
+    id("org.scoverage") version "8.1"
+}
+```
+
+- [ ] **Step 2: Swap JUnit dependencies for ScalaTest**
+
+In the `dependencies {}` block, remove:
+```kotlin
+testImplementation(platform("org.junit:junit-bom:5.10.0"))
+testImplementation("org.junit.jupiter:junit-jupiter")
+testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+```
+
+Add in their place:
+```kotlin
+testImplementation("org.scalatest:scalatest_3:${versions["SCALATEST"]!!}")
+testImplementation("org.scalatestplus:junit-5-11_3:${versions["SCALATESTPLUS_JUNIT5"]!!}")
+```
+
+- [ ] **Step 3: Merge the two `tasks.test {}` blocks and replace jacoco wiring**
+
+The `modules/api` file also has two `tasks.test {}` blocks and a `jacocoTestReport` block. Delete all three. Add the following merged block **after** the `dependencies {}` block:
+
+```kotlin
+tasks.test {
+    useJUnitPlatform()
+    finalizedBy(tasks.reportScoverage)
+}
+tasks.reportScoverage {
+    dependsOn(tasks.test)
+}
+```
+
+> Note: `modules/api` did not previously have `useJUnitPlatform()` — it is being **added** here, not preserved.
+
+- [ ] **Step 4: Run the tests**
+
+```bash
+./gradlew :modules:api:test
+```
+
+Expected: BUILD SUCCESSFUL.
+
+- [ ] **Step 5: Run the coverage report**
+
+```bash
+./gradlew :modules:api:reportScoverage
+```
+
+Expected: BUILD SUCCESSFUL. A report is generated under `modules/api/build/reports/scoverage/`.
+
+- [ ] **Step 6: Commit**
+
+```bash
+git add modules/api/build.gradle.kts
+git commit -m "build(api): replace JaCoCo with Scoverage, add ScalaTest dependencies"
+```
+
+---
+
+### Task 4: Full build verification
+
+- [ ] **Step 1: Run the full build**
+
+```bash
+./gradlew build
+```
+
+Expected: BUILD SUCCESSFUL with no errors across all modules.
+
+- [ ] **Step 2: Confirm no JaCoCo references remain**
+
+```bash
+grep -r "jacoco\|jacocoTestReport" --include="*.kts" .
+```
+
+Expected: no output (zero matches).

docs/superpowers/plans/2026-03-23-chess-check-checkmate-stalemate.md

@@ -0,0 +1,579 @@
+# Chess Check / Checkmate / Stalemate Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Add check detection, checkmate (win by opponent having no legal reply while in check), and stalemate (draw by opponent having no legal reply while not in check) to the chess game loop.
+
+**Architecture:** A new `GameRules` object owns all check-aware logic; the existing `MoveValidator` keeps its geometric-only contract unchanged. `GameController.processMove` calls `GameRules.gameStatus` after each move and returns new `MoveResult` variants (`MovedInCheck`, `Checkmate`, `Stalemate`). Terminal states reset the board.
+
+**Tech Stack:** Scala 3.5, ScalaTest (`AnyFunSuite with Matchers`), Gradle (`:modules:core:test`)
+
+---
+
+## File Map
+
+| File | Action | Responsibility |
+|---|---|---|
+| `modules/core/src/main/scala/de/nowchess/chess/logic/GameRules.scala` | **Create** | `isInCheck`, `legalMoves`, `gameStatus`, `PositionStatus` enum |
+| `modules/core/src/test/scala/de/nowchess/chess/logic/GameRulesTest.scala` | **Create** | Unit tests for all three `GameRules` methods |
+| `modules/core/src/main/scala/de/nowchess/chess/controller/GameController.scala` | **Modify** | Add `MovedInCheck`/`Checkmate`/`Stalemate` to `MoveResult`; wire `processMove` and `gameLoop` |
+| `modules/core/src/test/scala/de/nowchess/chess/controller/GameControllerTest.scala` | **Modify** | Add `processMove` and `gameLoop` tests for the three new results |
+
+---
+
+## Task 1: Create `GameRules` stub
+
+**Files:**
+- Create: `modules/core/src/main/scala/de/nowchess/chess/logic/GameRules.scala`
+
+- [ ] **Step 1: Create the stub file**
+
+```scala
+package de.nowchess.chess.logic
+
+import de.nowchess.api.board.*
+
+enum PositionStatus:
+  case Normal, InCheck, Mated, Drawn
+
+object GameRules:
+
+  /** True if `color`'s king is under attack on this board. */
+  def isInCheck(board: Board, color: Color): Boolean = false
+
+  /** All (from, to) moves for `color` that do not leave their own king in check. */
+  def legalMoves(board: Board, color: Color): Set[(Square, Square)] = Set.empty
+
+  /** Position status for the side whose turn it is (`color`). */
+  def gameStatus(board: Board, color: Color): PositionStatus = PositionStatus.Normal
+```
+
+- [ ] **Step 2: Verify the project compiles**
+
+```bash
+./gradlew :modules:core:compileScala
+```
+
+Expected: `BUILD SUCCESSFUL`
+
+- [ ] **Step 3: Commit**
+
+```bash
+git add modules/core/src/main/scala/de/nowchess/chess/logic/GameRules.scala
+git commit -m "feat: add GameRules stub with PositionStatus enum"
+```
+
+---
+
+## Task 2: Write `GameRulesTest` (all tests must fail)
+
+**Files:**
+- Create: `modules/core/src/test/scala/de/nowchess/chess/logic/GameRulesTest.scala`
+
+- [ ] **Step 1: Create the test file**
+
+```scala
+package de.nowchess.chess.logic
+
+import de.nowchess.api.board.*
+import org.scalatest.funsuite.AnyFunSuite
+import org.scalatest.matchers.should.Matchers
+
+class GameRulesTest extends AnyFunSuite with Matchers:
+
+  private def sq(f: File, r: Rank): Square = Square(f, r)
+  private def board(entries: (Square, Piece)*): Board = Board(entries.toMap)
+
+  // ──── isInCheck ──────────────────────────────────────────────────────
+
+  test("isInCheck: king attacked by enemy rook on same rank"):
+    // White King E1, Black Rook A1 — rook slides along rank 1 to E1
+    val b = board(
+      sq(File.E, Rank.R1) -> Piece.WhiteKing,
+      sq(File.A, Rank.R1) -> Piece.BlackRook
+    )
+    GameRules.isInCheck(b, Color.White) shouldBe true
+
+  test("isInCheck: king not attacked"):
+    // Black Rook A3 does not cover E1
+    val b = board(
+      sq(File.E, Rank.R1) -> Piece.WhiteKing,
+      sq(File.A, Rank.R3) -> Piece.BlackRook
+    )
+    GameRules.isInCheck(b, Color.White) shouldBe false
+
+  test("isInCheck: no king on board returns false"):
+    val b = board(sq(File.A, Rank.R1) -> Piece.BlackRook)
+    GameRules.isInCheck(b, Color.White) shouldBe false
+
+  // ──── legalMoves ─────────────────────────────────────────────────────
+
+  test("legalMoves: move that exposes own king to rook is excluded"):
+    // White King E1, White Rook E4 (pinned on E-file), Black Rook E8
+    // Moving the White Rook off the E-file would expose the king
+    val b = board(
+      sq(File.E, Rank.R1) -> Piece.WhiteKing,
+      sq(File.E, Rank.R4) -> Piece.WhiteRook,
+      sq(File.E, Rank.R8) -> Piece.BlackRook
+    )
+    val moves = GameRules.legalMoves(b, Color.White)
+    moves should not contain (sq(File.E, Rank.R4) -> sq(File.D, Rank.R4))
+
+  test("legalMoves: move that blocks check is included"):
+    // White King E1 in check from Black Rook E8; White Rook A5 can interpose on E5
+    val b = board(
+      sq(File.E, Rank.R1) -> Piece.WhiteKing,
+      sq(File.A, Rank.R5) -> Piece.WhiteRook,
+      sq(File.E, Rank.R8) -> Piece.BlackRook
+    )
+    val moves = GameRules.legalMoves(b, Color.White)
+    moves should contain(sq(File.A, Rank.R5) -> sq(File.E, Rank.R5))
+
+  // ──── gameStatus ──────────────────────────────────────────────────────
+
+  test("gameStatus: checkmate returns Mated"):
+    // White Qh8, Ka6; Black Ka8
+    // Qh8 attacks Ka8 along rank 8; all escape squares covered (spec-verified position)
+    val b = board(
+      sq(File.H, Rank.R8) -> Piece.WhiteQueen,
+      sq(File.A, Rank.R6) -> Piece.WhiteKing,
+      sq(File.A, Rank.R8) -> Piece.BlackKing
+    )
+    GameRules.gameStatus(b, Color.Black) shouldBe PositionStatus.Mated
+
+  test("gameStatus: stalemate returns Drawn"):
+    // White Qb6, Kc6; Black Ka8
+    // Black king has no legal moves and is not in check (spec-verified position)
+    val b = board(
+      sq(File.B, Rank.R6) -> Piece.WhiteQueen,
+      sq(File.C, Rank.R6) -> Piece.WhiteKing,
+      sq(File.A, Rank.R8) -> Piece.BlackKing
+    )
+    GameRules.gameStatus(b, Color.Black) shouldBe PositionStatus.Drawn
+
+  test("gameStatus: king in check with legal escape returns InCheck"):
+    // White Ra8 attacks Black Ke8 along rank 8; king can escape to d7, e7, f7
+    val b = board(
+      sq(File.A, Rank.R8) -> Piece.WhiteRook,
+      sq(File.E, Rank.R8) -> Piece.BlackKing
+    )
+    GameRules.gameStatus(b, Color.Black) shouldBe PositionStatus.InCheck
+
+  test("gameStatus: normal starting position returns Normal"):
+    GameRules.gameStatus(Board.initial, Color.White) shouldBe PositionStatus.Normal
+```
+
+- [ ] **Step 2: Run the tests and confirm they all fail**
+
+```bash
+./gradlew :modules:core:test --tests "de.nowchess.chess.logic.GameRulesTest"
+```
+
+Expected: all 8 tests FAIL (stubs always return `false` / `Set.empty` / `Normal`)
+
+- [ ] **Step 3: Commit**
+
+```bash
+git add modules/core/src/test/scala/de/nowchess/chess/logic/GameRulesTest.scala
+git commit -m "test: add failing GameRulesTest for check/checkmate/stalemate"
+```
+
+---
+
+## Task 3: Implement `GameRules`
+
+**Files:**
+- Modify: `modules/core/src/main/scala/de/nowchess/chess/logic/GameRules.scala`
+
+- [ ] **Step 1: Replace the stub bodies with real implementations**
+
+```scala
+package de.nowchess.chess.logic
+
+import de.nowchess.api.board.*
+
+enum PositionStatus:
+  case Normal, InCheck, Mated, Drawn
+
+object GameRules:
+
+  def isInCheck(board: Board, color: Color): Boolean =
+    board.pieces
+      .collectFirst { case (sq, Piece(`color`, PieceType.King)) => sq }
+      .exists { kingSq =>
+        board.pieces.exists { case (sq, piece) =>
+          piece.color != color &&
+          MoveValidator.legalTargets(board, sq).contains(kingSq)
+        }
+      }
+
+  def legalMoves(board: Board, color: Color): Set[(Square, Square)] =
+    board.pieces
+      .collect { case (from, piece) if piece.color == color => from }
+      .flatMap { from =>
+        MoveValidator.legalTargets(board, from)
+          .filter { to =>
+            val (newBoard, _) = board.withMove(from, to)
+            !isInCheck(newBoard, color)
+          }
+          .map(to => from -> to)
+      }
+      .toSet
+
+  def gameStatus(board: Board, color: Color): PositionStatus =
+    val moves   = legalMoves(board, color)
+    val inCheck = isInCheck(board, color)
+    if moves.isEmpty && inCheck then PositionStatus.Mated
+    else if moves.isEmpty       then PositionStatus.Drawn
+    else if inCheck             then PositionStatus.InCheck
+    else                             PositionStatus.Normal
+```
+
+- [ ] **Step 2: Run the GameRules tests and confirm they all pass**
+
+```bash
+./gradlew :modules:core:test --tests "de.nowchess.chess.logic.GameRulesTest"
+```
+
+Expected: all 8 tests PASS
+
+- [ ] **Step 3: Run the full test suite to make sure nothing regressed**
+
+```bash
+./gradlew :modules:core:test
+```
+
+Expected: `BUILD SUCCESSFUL`, all existing tests still pass
+
+- [ ] **Step 4: Commit**
+
+```bash
+git add modules/core/src/main/scala/de/nowchess/chess/logic/GameRules.scala
+git commit -m "feat: implement GameRules with isInCheck, legalMoves, gameStatus"
+```
+
+---
+
+## Task 4: Add new `MoveResult` variants and stub `processMove`
+
+**Files:**
+- Modify: `modules/core/src/main/scala/de/nowchess/chess/controller/GameController.scala`
+
+- [ ] **Step 1: Add three new variants to `MoveResult` and import `GameRules`**
+
+In `GameController.scala`, update the `MoveResult` object and `processMove`. The new variants go after `Moved`. The import of `GameRules`/`PositionStatus` is added at the top. The stub `processMove` calls `GameRules.gameStatus` but always maps to `Moved` — this makes it compile while the new tests will fail:
+
+```scala
+package de.nowchess.chess.controller
+
+import scala.io.StdIn
+import de.nowchess.api.board.{Board, Color, Piece}
+import de.nowchess.chess.logic.{MoveValidator, GameRules, PositionStatus}
+import de.nowchess.chess.view.Renderer
+
+// ---------------------------------------------------------------------------
+// Result ADT returned by the pure processMove function
+// ---------------------------------------------------------------------------
+
+sealed trait MoveResult
+object MoveResult:
+  case object Quit                                                                   extends MoveResult
+  case class  InvalidFormat(raw: String)                                             extends MoveResult
+  case object NoPiece                                                                extends MoveResult
+  case object WrongColor                                                             extends MoveResult
+  case object IllegalMove                                                            extends MoveResult
+  case class  Moved(newBoard: Board, captured: Option[Piece], newTurn: Color)       extends MoveResult
+  case class  MovedInCheck(newBoard: Board, captured: Option[Piece], newTurn: Color) extends MoveResult
+  case class  Checkmate(winner: Color)                                               extends MoveResult
+  case object Stalemate                                                              extends MoveResult
+
+// ---------------------------------------------------------------------------
+// Controller
+// ---------------------------------------------------------------------------
+
+object GameController:
+
+  def processMove(board: Board, turn: Color, raw: String): MoveResult =
+    raw.trim match
+      case "quit" | "q" =>
+        MoveResult.Quit
+      case trimmed =>
+        Parser.parseMove(trimmed) match
+          case None =>
+            MoveResult.InvalidFormat(trimmed)
+          case Some((from, to)) =>
+            board.pieceAt(from) match
+              case None =>
+                MoveResult.NoPiece
+              case Some(piece) if piece.color != turn =>
+                MoveResult.WrongColor
+              case Some(_) =>
+                if !MoveValidator.isLegal(board, from, to) then
+                  MoveResult.IllegalMove
+                else
+                  val (newBoard, captured) = board.withMove(from, to)
+                  MoveResult.Moved(newBoard, captured, turn.opposite) // stub — Task 6 will fix
+
+  def gameLoop(board: Board, turn: Color): Unit =
+    println()
+    print(Renderer.render(board))
+    println(s"${turn.label}'s turn. Enter move: ")
+    val input = Option(StdIn.readLine()).getOrElse("quit").trim
+    processMove(board, turn, input) match
+      case MoveResult.Quit =>
+        println("Game over. Goodbye!")
+      case MoveResult.InvalidFormat(raw) =>
+        println(s"Invalid move format '$raw'. Use coordinate notation, e.g. e2e4.")
+        gameLoop(board, turn)
+      case MoveResult.NoPiece =>
+        println(s"No piece on ${Parser.parseMove(input).map(_._1).fold("?")(_.toString)}.")
+        gameLoop(board, turn)
+      case MoveResult.WrongColor =>
+        println(s"That is not your piece.")
+        gameLoop(board, turn)
+      case MoveResult.IllegalMove =>
+        println(s"Illegal move.")
+        gameLoop(board, turn)
+      case MoveResult.Moved(newBoard, captured, newTurn) =>
+        val prevTurn = newTurn.opposite
+        captured.foreach: cap =>
+          val toSq = Parser.parseMove(input).map(_._2).fold("?")(_.toString)
+          println(s"${prevTurn.label} captures ${cap.color.label} ${cap.pieceType.label} on $toSq")
+        gameLoop(newBoard, newTurn)
+      case MoveResult.MovedInCheck(newBoard, captured, newTurn) => // stub — Task 6
+        gameLoop(newBoard, newTurn)
+      case MoveResult.Checkmate(winner) =>                         // stub — Task 6
+        gameLoop(Board.initial, Color.White)
+      case MoveResult.Stalemate =>                                 // stub — Task 6
+        gameLoop(Board.initial, Color.White)
+```
+
+- [ ] **Step 2: Confirm everything still compiles and existing tests pass**
+
+```bash
+./gradlew :modules:core:test
+```
+
+Expected: `BUILD SUCCESSFUL` — existing tests still pass, no compilation errors
+
+- [ ] **Step 3: Commit**
+
+```bash
+git add modules/core/src/main/scala/de/nowchess/chess/controller/GameController.scala
+git commit -m "feat: add MovedInCheck/Checkmate/Stalemate MoveResult variants (stub dispatch)"
+```
+
+---
+
+## Task 5: Write new `GameControllerTest` cases (all must fail)
+
+**Files:**
+- Modify: `modules/core/src/test/scala/de/nowchess/chess/controller/GameControllerTest.scala`
+
+- [ ] **Step 1: Append the following tests to the existing file**
+
+Add after the last existing test (the `gameLoop: capture` test). Add the `captureOutput` helper alongside `withInput`:
+
+```scala
+  // ──── helpers ────────────────────────────────────────────────────────
+
+  private def captureOutput(block: => Unit): String =
+    val out = java.io.ByteArrayOutputStream()
+    scala.Console.withOut(out)(block)
+    out.toString("UTF-8")
+
+  // ──── processMove: check / checkmate / stalemate ─────────────────────
+
+  test("processMove: legal move that delivers check returns MovedInCheck"):
+    // White Ra1, Ka3; Black Kh8 — White plays Ra1-Ra8, putting Kh8 in check
+    // (Ra8 attacks along rank 8: b8..h8; king escapes to g7/g8/h7 — InCheck, not Mated)
+    val b = Board(Map(
+      sq(File.A, Rank.R1) -> Piece.WhiteRook,
+      sq(File.A, Rank.R3) -> Piece.WhiteKing,
+      sq(File.H, Rank.R8) -> Piece.BlackKing
+    ))
+    GameController.processMove(b, Color.White, "a1a8") match
+      case MoveResult.MovedInCheck(_, _, newTurn) => newTurn shouldBe Color.Black
+      case other => fail(s"Expected MovedInCheck, got $other")
+
+  test("processMove: legal move that results in checkmate returns Checkmate"):
+    // White Qa1, Ka6; Black Ka8 — White plays Qa1-Qh8 (diagonal a1-h8)
+    // After Qh8: White Qh8 + Ka6 vs Black Ka8 = checkmate (spec-verified)
+    // Note: Qa1 does NOT currently attack Ka8 (path along file A is blocked by Ka6)
+    val b = Board(Map(
+      sq(File.A, Rank.R1) -> Piece.WhiteQueen,
+      sq(File.A, Rank.R6) -> Piece.WhiteKing,
+      sq(File.A, Rank.R8) -> Piece.BlackKing
+    ))
+    GameController.processMove(b, Color.White, "a1h8") match
+      case MoveResult.Checkmate(winner) => winner shouldBe Color.White
+      case other => fail(s"Expected Checkmate(White), got $other")
+
+  test("processMove: legal move that results in stalemate returns Stalemate"):
+    // White Qb1, Kc6; Black Ka8 — White plays Qb1-Qb6
+    // After Qb6: White Qb6 + Kc6 vs Black Ka8 = stalemate (spec-verified)
+    val b = Board(Map(
+      sq(File.B, Rank.R1) -> Piece.WhiteQueen,
+      sq(File.C, Rank.R6) -> Piece.WhiteKing,
+      sq(File.A, Rank.R8) -> Piece.BlackKing
+    ))
+    GameController.processMove(b, Color.White, "b1b6") match
+      case MoveResult.Stalemate => succeed
+      case other => fail(s"Expected Stalemate, got $other")
+
+  // ──── gameLoop: check / checkmate / stalemate ─────────────────────────
+
+  test("gameLoop: checkmate prints winner message and resets to new game"):
+    // Same position as checkmate processMove test above; after Qa1-Qh8 game resets
+    // Second move "quit" exits the new game cleanly
+    val b = Board(Map(
+      sq(File.A, Rank.R1) -> Piece.WhiteQueen,
+      sq(File.A, Rank.R6) -> Piece.WhiteKing,
+      sq(File.A, Rank.R8) -> Piece.BlackKing
+    ))
+    val output = captureOutput:
+      withInput("a1h8\nquit\n"):
+        GameController.gameLoop(b, Color.White)
+    output should include("Checkmate! White wins.")
+
+  test("gameLoop: stalemate prints draw message and resets to new game"):
+    val b = Board(Map(
+      sq(File.B, Rank.R1) -> Piece.WhiteQueen,
+      sq(File.C, Rank.R6) -> Piece.WhiteKing,
+      sq(File.A, Rank.R8) -> Piece.BlackKing
+    ))
+    val output = captureOutput:
+      withInput("b1b6\nquit\n"):
+        GameController.gameLoop(b, Color.White)
+    output should include("Stalemate! The game is a draw.")
+
+  test("gameLoop: MovedInCheck without capture prints check message"):
+    val b = Board(Map(
+      sq(File.A, Rank.R1) -> Piece.WhiteRook,
+      sq(File.A, Rank.R3) -> Piece.WhiteKing,
+      sq(File.H, Rank.R8) -> Piece.BlackKing
+    ))
+    val output = captureOutput:
+      withInput("a1a8\nquit\n"):
+        GameController.gameLoop(b, Color.White)
+    output should include("Black is in check!")
+
+  test("gameLoop: MovedInCheck with capture prints both capture and check message"):
+    // White Rook A1 captures Black Pawn on A8, putting Black King (H8) in check
+    // Ra8 attacks rank 8 → Black Kh8 is in check; king can escape to g7/g8/h7
+    val b = Board(Map(
+      sq(File.A, Rank.R1) -> Piece.WhiteRook,
+      sq(File.A, Rank.R3) -> Piece.WhiteKing,
+      sq(File.A, Rank.R8) -> Piece.BlackPawn,
+      sq(File.H, Rank.R8) -> Piece.BlackKing
+    ))
+    val output = captureOutput:
+      withInput("a1a8\nquit\n"):
+        GameController.gameLoop(b, Color.White)
+    output should include("captures")
+    output should include("Black is in check!")
+```
+
+- [ ] **Step 2: Run only the new tests and confirm they fail**
+
+```bash
+./gradlew :modules:core:test --tests "de.nowchess.chess.controller.GameControllerTest"
+```
+
+Expected: the 7 new tests FAIL; the existing 17 tests PASS
+
+- [ ] **Step 3: Commit**
+
+```bash
+git add modules/core/src/test/scala/de/nowchess/chess/controller/GameControllerTest.scala
+git commit -m "test: add failing GameControllerTest cases for check/checkmate/stalemate"
+```
+
+---
+
+## Task 6: Implement `processMove` dispatch and `gameLoop` branches
+
+**Files:**
+- Modify: `modules/core/src/main/scala/de/nowchess/chess/controller/GameController.scala`
+
+- [ ] **Step 1: Replace the stub `processMove` else-branch and the three stub `gameLoop` cases**
+
+Replace only the `else` branch inside `processMove` (keep everything else identical):
+
+```scala
+                else
+                  val (newBoard, captured) = board.withMove(from, to)
+                  GameRules.gameStatus(newBoard, turn.opposite) match
+                    case PositionStatus.Normal  => MoveResult.Moved(newBoard, captured, turn.opposite)
+                    case PositionStatus.InCheck => MoveResult.MovedInCheck(newBoard, captured, turn.opposite)
+                    case PositionStatus.Mated   => MoveResult.Checkmate(turn)
+                    case PositionStatus.Drawn   => MoveResult.Stalemate
+```
+
+Replace the three stub `gameLoop` cases:
+
+```scala
+      case MoveResult.MovedInCheck(newBoard, captured, newTurn) =>
+        val prevTurn = newTurn.opposite
+        captured.foreach: cap =>
+          val toSq = Parser.parseMove(input).map(_._2).fold("?")(_.toString)
+          println(s"${prevTurn.label} captures ${cap.color.label} ${cap.pieceType.label} on $toSq")
+        println(s"${newTurn.label} is in check!")
+        gameLoop(newBoard, newTurn)
+      case MoveResult.Checkmate(winner) =>
+        println(s"Checkmate! ${winner.label} wins.")
+        gameLoop(Board.initial, Color.White)
+      case MoveResult.Stalemate =>
+        println("Stalemate! The game is a draw.")
+        gameLoop(Board.initial, Color.White)
+```
+
+- [ ] **Step 2: Run all controller tests**
+
+```bash
+./gradlew :modules:core:test --tests "de.nowchess.chess.controller.GameControllerTest"
+```
+
+Expected: all 24 tests PASS
+
+- [ ] **Step 3: Run the full test suite**
+
+```bash
+./gradlew :modules:core:test
+```
+
+Expected: `BUILD SUCCESSFUL`, all tests pass
+
+- [ ] **Step 4: Commit**
+
+```bash
+git add modules/core/src/main/scala/de/nowchess/chess/controller/GameController.scala
+git commit -m "feat: wire check/checkmate/stalemate into processMove and gameLoop"
+```
+
+---
+
+## Task 7: Coverage check and final verification
+
+- [ ] **Step 1: Run the full build with coverage**
+
+```bash
+./gradlew :modules:core:test
+```
+
+Expected: `BUILD SUCCESSFUL`
+
+- [ ] **Step 2: Check coverage gaps**
+
+```bash
+python jacoco-reporter/scoverage_coverage_gaps.py modules/core/build/reports/scoverageTest/scoverage.xml
+```
+
+Review output. If any newly added method falls below the thresholds from `CLAUDE.md` (branch ≥ 90%, line ≥ 95%, method ≥ 90%), add targeted tests to close the gaps before considering the task done.
+
+- [ ] **Step 3: Commit coverage fixes (if any)**
+
+```bash
+git add -p
+git commit -m "test: improve coverage for GameRules and GameController"
+```

docs/superpowers/specs/2026-03-22-scalatest-scoverage-design.md

@@ -0,0 +1,85 @@
+# Design: Add ScalaTest + Replace JaCoCo with Scoverage
+
+**Date:** 2026-03-22
+**Status:** Approved
+
+## Summary
+
+Replace the current JUnit-only test setup and JaCoCo coverage with ScalaTest (via its JUnit 5 bridge) and Scoverage across both `modules/core` and `modules/api`.
+
+## Motivation
+
+- The CLAUDE.md working agreement prescribes `AnyFunSuite with Matchers with JUnitSuiteLike` as the unit test style, which requires ScalaTest.
+- Scoverage is the standard Scala code coverage tool and understands Scala semantics; JaCoCo's JVM bytecode instrumentation is less accurate for Scala code.
+
+## Scope
+
+Two modules are affected: `modules/core` and `modules/api`. The root `build.gradle.kts` is updated for shared dependency versions only.
+
+## Changes
+
+### Root `build.gradle.kts`
+
+Add to the `versions` map (dependency versions only — plugin version is hardcoded per module, see note below):
+- `SCALATEST` → `3.2.19`
+- `SCALATESTPLUS_JUNIT5` → `3.2.19.1`
+
+> **Note on plugin versioning:** Gradle resolves the `plugins {}` block before `rootProject.extra` is available, so the Scoverage plugin version (`8.1`) must be declared inline in each module's `plugins {}` block. It cannot be read from the root versions map.
+
+### `modules/core/build.gradle.kts` and `modules/api/build.gradle.kts`
+
+Both modules require the same set of changes. Both currently have **two separate `tasks.test {}` blocks** that must be merged into one.
+
+**Plugins block:**
+- Remove `jacoco`
+- Add `id("org.scoverage") version "8.1"`
+
+**Dependencies block:**
+- Remove `testImplementation(platform("org.junit:junit-bom:5.10.0"))`
+- Remove `testImplementation("org.junit.jupiter:junit-jupiter")`
+- Remove `testRuntimeOnly("org.junit.platform:junit-platform-launcher")`
+- Add `testImplementation("org.scalatest:scalatest_3:${versions["SCALATEST"]!!}")`
+- Add `testImplementation("org.scalatestplus:junit-5-11_3:${versions["SCALATESTPLUS_JUNIT5"]!!}")`
+
+**Task wiring — merge both `tasks.test {}` blocks into one and replace jacoco wiring:**
+
+Both `modules/core` and `modules/api` currently have two `tasks.test {}` blocks. Delete both and replace with the following single merged block placed **after** the `dependencies {}` block (conventional position):
+
+```kotlin
+tasks.test {
+    useJUnitPlatform()   // required — scalatestplus JUnit 5 bridge relies on this
+    finalizedBy(tasks.reportScoverage)
+}
+tasks.reportScoverage {
+    dependsOn(tasks.test)
+}
+```
+
+> Note: `modules/api` does not currently have `useJUnitPlatform()` — it must be **added** (not just kept) in the merged block.
+
+Remove the `jacocoTestReport` task block entirely from both modules.
+
+**Task name confirmation:** The Scoverage Gradle plugin 8.1 registers `reportScoverage` as the HTML report task.
+
+## Versions
+
+| Artifact | Version | Notes |
+|---|---|---|
+| `org.scalatest:scalatest_3` | 3.2.19 | Core ScalaTest for Scala 3 |
+| `org.scalatestplus:junit-5-11_3` | 3.2.19.1 | JUnit 5.11 runner bridge; `.1` = build 1 |
+| Scoverage Gradle plugin | 8.1 | Hardcoded inline in `plugins {}` block |
+
+## Testing the Change
+
+After applying:
+1. `./gradlew :modules:core:test` and `./gradlew :modules:api:test` must pass (green, even with zero test files).
+2. `./gradlew :modules:core:reportScoverage` must produce a coverage report.
+3. `./gradlew build` must be fully green.
+
+## Files Modified
+
+- `build.gradle.kts` (root) — add two version entries
+- `modules/core/build.gradle.kts` — plugin, deps, merge two `tasks.test` blocks, replace jacoco wiring
+- `modules/api/build.gradle.kts` — plugin, deps, merge two `tasks.test` blocks, add `useJUnitPlatform()`, replace jacoco wiring
+
+No new source files are created.

docs/superpowers/specs/2026-03-23-chess-check-checkmate-stalemate-design.md

@@ -0,0 +1,169 @@
+# Chess Check / Checkmate / Stalemate — Design Spec
+
+**Date:** 2026-03-23
+**Status:** Approved
+
+---
+
+## Scope
+
+Implement check detection, checkmate (win condition), and stalemate (draw) on top of the existing normal-move rules. En passant, castling, and pawn promotion are **out of scope** for this iteration.
+
+---
+
+## Architecture
+
+### New: `GameRules` object
+
+**File:** `modules/core/src/main/scala/de/nowchess/chess/logic/GameRules.scala`
+
+Owns all check-aware game logic. `MoveValidator` retains its documented geometric-only contract ("ignoring check/pin").
+
+```
+GameRules
+  isInCheck(board, color): Boolean
+  legalMoves(board, color): Set[(Square, Square)]
+  gameStatus(board, color): PositionStatus
+```
+
+#### `isInCheck(board, color)`
+
+Finds the king square for `color` by scanning `board.pieces` for a `Piece(color, PieceType.King)`. If no king is found (constructed/test boards), returns `false`.
+
+Then checks whether any enemy piece's `MoveValidator.legalTargets` contains that square. This works correctly for all piece types, including the king: `kingTargets` returns the squares the king can move to, which are identical to the squares the king attacks, so using `legalTargets` for attack detection is correct by design.
+
+Returns `true` if the king square is covered by at least one enemy piece.
+
+
+#### `legalMoves(board, color)`
+
+1. Filter `board.pieces` to entries where `piece.color == color`.
+2. For each such `(from, piece)`, call `MoveValidator.legalTargets(board, from)` to get geometric candidates.
+3. For each candidate `to`, apply `board.withMove(from, to)` to get `newBoard`.
+4. Keep only moves where `isInCheck(newBoard, color)` is `false` (i.e., the move does not leave own king in check).
+5. Return the full set of `(from, to)` pairs that survive this filter.
+
+#### `gameStatus(board, color)`
+
+Returns a `PositionStatus` enum value based on `legalMoves(board, color)` and `isInCheck(board, color)`:
+
+- `Mated`    — `legalMoves` is empty **and** king is in check → the side to move has been checkmated
+- `Drawn`    — `legalMoves` is empty **and** king is **not** in check → stalemate (draw)
+- `InCheck`  — `legalMoves` is non-empty **and** king is in check → game continues under check
+- `Normal`   — otherwise
+
+#### Local `PositionStatus` enum
+
+Defined in `GameRules.scala`. Names are intentionally distinct from `MoveResult` variants to avoid unqualified-name collisions in `GameController.scala`:
+
+```scala
+enum PositionStatus:
+  case Normal, InCheck, Mated, Drawn
+```
+
+---
+
+### Modified: `MoveResult` (in `GameController.scala`)
+
+Three new variants; existing variants are unchanged:
+
+| Variant | When used |
+|---|---|
+| `MovedInCheck(newBoard, captured, newTurn)` | Move was legal; opponent is now in check but has legal replies |
+| `Checkmate(winner: Color)` | Move was legal; opponent is `Mated` → `winner` is the side that just moved |
+| `Stalemate` | Move was legal; opponent is `Drawn` (no legal reply, not in check) |
+
+`Moved` continues to be used when `gameStatus` returns `Normal`.
+
+---
+
+### Modified: `GameController.processMove`
+
+After computing `(newBoard, captured)` from `board.withMove`:
+
+1. Call `GameRules.gameStatus(newBoard, newTurn)`.
+2. Map to the appropriate `MoveResult`:
+
+```
+PositionStatus.Normal   → Moved(newBoard, captured, newTurn)
+PositionStatus.InCheck  → MovedInCheck(newBoard, captured, newTurn)
+PositionStatus.Mated    → Checkmate(turn)   // turn = the side that just moved
+PositionStatus.Drawn    → Stalemate
+```
+
+---
+
+### Modified: `GameController.gameLoop`
+
+**New terminal branches** (both print a message then restart):
+
+- `Checkmate(winner)` → print `"Checkmate! {winner.label} wins."`, then recurse with `(Board.initial, Color.White)`
+- `Stalemate`         → print `"Stalemate! The game is a draw."`, then recurse with `(Board.initial, Color.White)`
+
+**New non-terminal branch:**
+
+- `MovedInCheck(newBoard, captured, newTurn)` → print the same optional capture message as `Moved` (when `captured.isDefined`), then print `"{newTurn.label} is in check!"`, then recurse with `(newBoard, newTurn)`
+
+**Restart vs. exit:** Checkmate and stalemate restart the game automatically (no prompt). This is intentionally asymmetric with `Quit`, which exits. `Quit` is an explicit user request to stop; Checkmate/Stalemate are natural game endings that should roll into a new game.
+
+---
+
+## Test Strategy
+
+All tests are unit tests extending `AnyFunSuite with Matchers with JUnitSuiteLike`.
+
+### `GameRulesTest` — new file
+
+| Scenario | Method | Expected |
+|---|---|---|
+| King attacked by enemy rook on same rank | `isInCheck` | `true` |
+| King not attacked (only own pieces nearby) | `isInCheck` | `false` |
+| No king on board (constructed board) | `isInCheck` | `false` |
+| Move that exposes own king to rook is excluded | `legalMoves` | does not contain that move |
+| Move that blocks check is included | `legalMoves` | contains the blocking move |
+| Checkmate: White Qh8, Ka6; Black Ka8 — Black king is in check (Qh8 along rank 8), cannot escape to a7 (Ka6), b7 (Ka6), or b8 (Qh8) | `gameStatus` | `Mated` |
+| Stalemate: White Qb6, Kc6; Black Ka8 — Black king has no legal moves (a7/b7/b8 all controlled by Qb6), not in check | `gameStatus` | `Drawn` |
+| King in check with at least one escape square | `gameStatus` | `InCheck` |
+| Normal midgame position, not in check, has moves | `gameStatus` | `Normal` |
+
+### `GameControllerTest` additions — new `processMove` cases
+
+| Scenario | Expected `MoveResult` |
+|---|---|
+| Move leaves opponent in check (has escape) | `MovedInCheck` |
+| Move results in checkmate | `Checkmate(winner)` where winner is the side that moved |
+| Move results in stalemate | `Stalemate` |
+
+### `GameControllerTest` additions — new `gameLoop` cases
+
+| Scenario | Expected output / behavior |
+|---|---|
+| `gameLoop` receives `Checkmate(White)` | Prints "Checkmate! White wins." and continues (new game) |
+| `gameLoop` receives `Stalemate` | Prints "Stalemate! The game is a draw." and continues (new game) |
+| `gameLoop` receives `MovedInCheck` with a capture | Prints capture message AND check message |
+| `gameLoop` receives `MovedInCheck` without a capture | Prints check message only |
+
+---
+
+## Development Workflow (TDD)
+
+1. Create `GameRules.scala` with empty/stub method bodies that compile but return placeholder values (`false`, `Set.empty`, `PositionStatus.Normal`).
+2. Write all `GameRulesTest` tests — they should **fail**.
+3. Implement `GameRules` logic until `GameRulesTest` is green.
+4. Add new `MoveResult` variants to `GameController.scala`; update `processMove` to call `GameRules.gameStatus` (stub the match arms initially).
+5. Write new `GameControllerTest` cases — they should **fail**.
+6. Implement `processMove` match arms and `gameLoop` new branches until all tests pass.
+7. Run `./gradlew :modules:core:test` — full green build required.
+
+---
+
+## Files Changed
+
+| File | Change |
+|---|---|
+| `modules/core/src/main/scala/de/nowchess/chess/logic/GameRules.scala` | New |
+| `modules/core/src/test/scala/de/nowchess/chess/logic/GameRulesTest.scala` | New |
+| `modules/core/src/main/scala/de/nowchess/chess/controller/GameController.scala` | Add `MoveResult` variants; update `processMove` and `gameLoop` |
+| `modules/core/src/test/scala/de/nowchess/chess/controller/GameControllerTest.scala` | Add new test cases |
+
+No changes to `modules/api` or `MoveValidator`.

docs/superpowers/specs/2026-03-24-castling-design.md

@@ -0,0 +1,255 @@
+# Castling Implementation Design
+
+**Date:** 2026-03-24
+**Status:** Approved (rev 2)
+**Branch:** castling
+
+---
+
+## Context
+
+The NowChessSystems chess engine currently operates on a raw `Board` (opaque `Map[Square, Piece]`) paired with a `Color` for turn tracking. Castling requires tracking whether the king and rooks have previously moved — state that does not exist in the current engine layer. The `CastlingRights` and `MoveType.Castle*` types are already defined in the `api` module but are not wired into the engine.
+
+---
+
+## Approach: `GameContext` Wrapper (Option B)
+
+Introduce a thin `GameContext` wrapper in `modules/core` that bundles `Board` with castling rights for both sides. This is the single seam through which the engine learns about castling availability without pulling in the full FEN-structured `GameState` type.
+
+---
+
+## Section 1 — `GameContext` Type
+
+**Location:** `modules/core/src/main/scala/de/nowchess/chess/logic/GameContext.scala`
+
+```scala
+case class GameContext(
+  board: Board,
+  whiteCastling: CastlingRights,
+  blackCastling: CastlingRights
+):
+  def castlingFor(color: Color): CastlingRights =
+    if color == Color.White then whiteCastling else blackCastling
+
+  def withUpdatedRights(color: Color, rights: CastlingRights): GameContext =
+    if color == Color.White then copy(whiteCastling = rights)
+    else copy(blackCastling = rights)
+```
+
+`GameContext.initial` wraps `Board.initial` with `CastlingRights.Both` for both sides.
+
+`gameLoop` and `processMove` replace `(board: Board, turn: Color)` with `(ctx: GameContext, turn: Color)`. All `MoveResult` variants that previously carried `newBoard: Board` now carry `newCtx: GameContext`. The `gameLoop` render call becomes `Renderer.render(ctx.board)`, and all `gameLoop` pattern match arms that destructure `MoveResult.Moved(newBoard, ...)` or `MoveResult.MovedInCheck(newBoard, ...)` must be updated to destructure `newCtx` and pass it to the recursive `gameLoop` call.
+
+---
+
+## Section 2 — `CastleSide` and Board Extension for Castle Moves
+
+### `CastleSide` enum
+
+`CastleSide` is a two-value engine-internal enum defined in `core` (not in `api`). It is co-located in `GameContext.scala` — there is no separate `CastleSide.scala` file.
+
+```scala
+enum CastleSide:
+  case Kingside, Queenside
+```
+
+### `withCastle` extension
+
+`Board.withMove(from, to)` moves a single piece. Castling moves two pieces atomically. To avoid a circular dependency (`api` must not import from `core`), `withCastle` is **not** added to `Board` in the `api` module. Instead it is defined as an extension method in `core`, co-located with `GameContext`:
+
+```scala
+// inside GameContext.scala or a BoardCastleOps.scala in core
+extension (b: Board)
+  def withCastle(color: Color, side: CastleSide): Board = ...
+```
+
+Post-castle square assignments:
+- **Kingside White:** King e1→g1, Rook h1→f1
+- **Queenside White:** King e1→c1, Rook a1→d1
+- **Kingside Black:** King e8→g8, Rook h8→f8
+- **Queenside Black:** King e8→c8, Rook a8→d8
+
+---
+
+## Section 3 — `MoveValidator` Castling Logic
+
+### Signature change
+
+`legalTargets` and `isLegal` are extended to accept `GameContext` when the caller has full game context. To avoid breaking `GameRules.isInCheck` (which uses `legalTargets` with only a `Board` for attacked-square detection), the implementation retains a **board-only private helper** for sliding/jump/normal king targets, and a **public overload** that additionally unions castling targets when a `GameContext` is provided:
+
+```scala
+// board-only (used internally by isInCheck)
+def legalTargets(board: Board, from: Square): Set[Square]
+
+// context-aware (used by legalMoves and processMove)
+def legalTargets(ctx: GameContext, from: Square): Set[Square]
+```
+
+The `GameContext` overload delegates to the `Board` overload for all piece types except King, where it additionally unions `castlingTargets(ctx, color)`.
+
+`isLegal` is likewise overloaded:
+
+```scala
+// board-only (retained for callers that have no castling context)
+def isLegal(board: Board, from: Square, to: Square): Boolean
+
+// context-aware (used by processMove)
+def isLegal(ctx: GameContext, from: Square, to: Square): Boolean
+```
+
+The context-aware `isLegal(ctx, from, to)` calls `legalTargets(ctx, from).contains(to)` — using the context-aware overload — so castling targets are included in the legality check.
+
+### `castlingTargets` method
+
+```scala
+def castlingTargets(ctx: GameContext, color: Color): Set[Square]
+```
+
+For each side (kingside, queenside), checks all six conditions in order (failing fast):
+
+1. `CastlingRights` flag is `true` for that side (`ctx.castlingFor(color)`)
+2. King is on its home square (e1 for White, e8 for Black)
+3. Relevant rook is on its home square (h-file for kingside, a-file for queenside)
+4. All squares between king and rook are empty
+5. King is **not currently in check** — calls `GameRules.isInCheck(ctx.board, color)` using the board-only path (no castling recursion)
+6. Each square the king **passes through and lands on** is not attacked — checks that no enemy `legalTargets(board, enemySq)` (board-only) covers those squares
+
+Transit and landing squares:
+- **Kingside:** f-file, g-file (White: f1, g1; Black: f8, g8)
+- **Queenside:** d-file, c-file (White: d1, c1; Black: d8, c8). Note: b1/b8 must be empty (condition 4) but the king does not pass through them, so they are not checked for attacks.
+
+---
+
+## Section 4 — `GameRules` Changes
+
+`GameRules.legalMoves` must accept `GameContext` (not just `Board`) so it can enumerate castling moves as part of the legal move set. This is required for correct stalemate and checkmate detection — a position where the only legal move is to castle must not be evaluated as stalemate.
+
+```scala
+def legalMoves(ctx: GameContext, color: Color): Set[(Square, Square)]
+```
+
+Internally it calls `MoveValidator.legalTargets(ctx, from)` (the context-aware overload) for all pieces of `color`, then filters to moves that do not leave the king in check.
+
+`isInCheck` retains its `(board: Board, color: Color)` signature — it does not need castling context.
+
+`gameStatus` is updated to accept `GameContext`:
+
+```scala
+def gameStatus(ctx: GameContext, color: Color): PositionStatus
+```
+
+---
+
+## Section 5 — `GameController` Changes
+
+### Move detection and execution
+
+`processMove` identifies a castling move by the king occupying its home square and moving exactly two files laterally:
+- White: e1→g1 (kingside) or e1→c1 (queenside)
+- Black: e8→g8 (kingside) or e8→c8 (queenside)
+
+Legality is confirmed via `MoveValidator.isLegal(ctx, from, to)` (the context-aware overload, which includes castling targets). When a castling move is legal and executed:
+1. Call `ctx.board.withCastle(color, side)` to move both pieces atomically.
+2. Revoke **both** castling rights for the moving color in the new `GameContext`.
+
+### Rights revocation rules (applied on every move)
+
+After every move `(from, to)` is applied, revoke rights based on both the **source square** and the **destination square**. Both tables are checked independently and all triggered revocations are applied.
+
+**Source square → revocation** (piece leaves its home square):
+
+| Source square | Rights revoked |
+|---------------|---------------|
+| `e1` | Both White castling rights |
+| `e8` | Both Black castling rights |
+| `a1` | White queenside |
+| `h1` | White kingside |
+| `a8` | Black queenside |
+| `h8` | Black kingside |
+
+**Destination square → revocation** (a piece — including an enemy piece — arrives on a rook home square, meaning a capture removed the rook):
+
+| Destination square | Rights revoked |
+|--------------------|---------------|
+| `a1` | White queenside |
+| `h1` | White kingside |
+| `a8` | Black queenside |
+| `h8` | Black kingside |
+
+This covers the following cases:
+- **King normal move** — source square e1/e8 fires; both rights revoked.
+- **King castle move** — the castle-specific step 2 revokes both rights for the moving color. Additionally, the source-square table fires (king departs e1/e8), revoking the same rights a second time. This double-revocation is idempotent and harmless. The king's destination (g1/c1/g8/c8) does not appear in the destination table, so no extra revocation fires there.
+- **Own rook move** — source square a1/h1/a8/h8 fires.
+- **Enemy capture on a rook home square** — destination square a1/h1/a8/h8 fires, revoking the side that lost the rook.
+
+`processMove` also calls `GameRules.gameStatus(newCtx, turn.opposite)` — note this call passes the full `GameContext`, not just a `Board`, because `gameStatus` now accepts `GameContext`.
+
+The revocation is applied to the `GameContext` that results from the move, before it is returned in `MoveResult`.
+
+### Signatures
+
+```scala
+def processMove(ctx: GameContext, turn: Color, raw: String): MoveResult
+def gameLoop(ctx: GameContext, turn: Color): Unit
+```
+
+`MoveResult.Moved` and `MoveResult.MovedInCheck` carry `newCtx: GameContext` instead of `newBoard: Board`. All `gameLoop` pattern match arms are updated to use `newCtx`. The render call uses `newCtx.board`.
+
+On checkmate/stalemate reset, `GameContext.initial` is used.
+
+---
+
+## Section 6 — Move Notation
+
+The player types standard coordinate notation:
+- `e1g1` → White kingside castle
+- `e1c1` → White queenside castle
+- `e8g8` → Black kingside castle
+- `e8c8` → Black queenside castle
+
+No parser changes required. The controller identifies castling by the king moving 2 files from the home square.
+
+---
+
+## Section 7 — Testing
+
+### `MoveValidatorTest`
+- Castling target (g1) is returned when all kingside conditions are met (White)
+- Castling target (c1) is returned when all queenside conditions are met (White)
+- Castling targets returned for Black kingside (g8) and queenside (c8)
+- Castling blocked when transit square is occupied (piece between king and rook)
+- Castling blocked when king is in check (condition 5)
+- Castling blocked when **transit square** is attacked (e.g., f1 attacked for White kingside)
+- Castling blocked when **landing square** is attacked (e.g., g1 attacked for White kingside)
+- Castling blocked when `kingSide = false` in `CastlingRights`
+- Castling blocked when `queenSide = false` in `CastlingRights`
+- Castling blocked when relevant rook is not on its home square
+
+### `GameControllerTest`
+- `processMove` with `e1g1` returns `Moved` with king on g1, rook on f1, and both White castling rights revoked in `newCtx`
+- `processMove` with `e1c1` returns `Moved` with king on c1, rook on d1, and both White castling rights revoked in `newCtx`
+- `processMove` castle attempt after king has moved returns `IllegalMove`
+- `processMove` castle attempt after rook has moved returns `IllegalMove`
+- Normal rook move from h1 revokes White kingside right in the returned `newCtx`
+- Normal king move from e1 revokes both White rights in the returned `newCtx`
+- Enemy capture on h1 (e.g., Black rook captures White rook on h1) revokes White kingside right in the returned `newCtx`
+
+### `GameRulesTest`
+- `legalMoves` includes castling destinations when available
+- `legalMoves` excludes castling when king is in check
+- `gameStatus` returns `Normal` (not `Drawn`) when the only legal move available is to castle — verifying that the `GameContext` signature change correctly prevents a false stalemate
+
+---
+
+## Files to Create / Modify
+
+| Action | File |
+|--------|------|
+| **Create** | `modules/core/src/main/scala/de/nowchess/chess/logic/GameContext.scala` — includes `CastleSide` enum and `withCastle` Board extension |
+| **Modify** | `modules/core/src/main/scala/de/nowchess/chess/logic/MoveValidator.scala` — add `castlingTargets`, board-only + context-aware `legalTargets`/`isLegal` overloads |
+| **Modify** | `modules/core/src/main/scala/de/nowchess/chess/logic/GameRules.scala` — update `legalMoves` and `gameStatus` to accept `GameContext` |
+| **Modify** | `modules/core/src/main/scala/de/nowchess/chess/controller/GameController.scala` — use `GameContext`; castling detection, execution, rights revocation |
+| **Modify** | `modules/core/src/main/scala/de/nowchess/chess/Main.scala` — use `GameContext.initial` |
+| **Modify** | `modules/core/src/test/scala/de/nowchess/chess/logic/MoveValidatorTest.scala` — new castling tests |
+| **Modify** | `modules/core/src/test/scala/de/nowchess/chess/controller/GameControllerTest.scala` — update signatures + new castling tests |
+| **Modify** | `modules/core/src/test/scala/de/nowchess/chess/logic/GameRulesTest.scala` — update signatures + new castling tests |

docs/unresolved.md

@@ -1,20 +1,23 @@
-## [2026-03-31] Unreachable code blocking 100% statement coverage
+# Unresolved Issues
 
-**Requirement/Bug:** Reach 100% statement coverage in core module.
+## [2026-03-24] JUnitSuiteLike mixin not available for ScalaTest 3.2.19 with Scala 3
 
-**Root Cause:** 4 remaining uncovered statements (99.6% coverage) are unreachable code:
+**Requirement / Bug:**
-1. **PgnParser.scala:160** (`case _ => None` in extractPromotion) - Regex `=([QRBN])` only matches those 4 characters; fallback case can never execute
+CLAUDE.md prescribes that all unit tests should extend `AnyFunSuite with Matchers with JUnitSuiteLike`. However, the `JUnitSuiteLike` trait cannot be resolved in the current build configuration.
-2. **GameHistory.scala:29** (`addMove$default$4` compiler-generated method) - Method overload 3 without defaults shadows the 4-param version, making promotionPiece default accessor unreachable
+
-3. **GameEngine.scala:201-202** (`case _` in completePromotion) - GameController.completePromotion always returns one of 4 expected MoveResult types; catch-all is defensive code
+**Root Cause (if known):**
+- ScalaTest 3.2.19 for Scala 3 does not provide `JUnitSuiteLike` in any public package.
+- The `co.helmethair:scalatest-junit-runner:0.1.11` dependency does not expose this trait.
+- There is no `org.scalatest:scalatest-junit_3` artifact available for version 3.2.19.
+- The trait may have been removed or changed in the ScalaTest 3.x → Scala 3 migration.
 
 **Attempted Fixes:**
-1. Added comprehensive PGN parsing tests (all 4 promotion types) - PgnParser improved from 95.8% to 99.4%
+1. Tried importing from `org.scalatest.junit.JUnitSuiteLike` — not found
-2. Added GameHistory tests using named parameters - hit `addMove$default$3` (castleSide) but not `$default$4` (promotionPiece)
+2. Tried importing from `org.scalatestplus.junit.JUnitSuiteLike` — not found
-3. Named parameter approach: `addMove(from=..., to=..., promotionPiece=...)` triggers 4-param with castleSide default ✓
+3. Tried importing from `co.helmethair.scalatest.junit.JUnitSuiteLike` — not found
-4. Positional approach: `addMove(f, t, None, None)` requires all 4 args (explicit, no defaults used) - doesn't hit $default$4
+4. Attempted to add `org.scalatest:scalatest-junit_3:3.2.19` dependency — artifact does not exist in Maven Central
-5. Root issue: Scala's overload resolution prefers more-specific non-default overloads (2-param, 3-param) over the 4-param with defaults
 
-**Recommendation:** 99.6% (1029/1033) is maximum achievable without refactoring method overloads. Unreachable code design patterns:
+**Suggested Next Step:**
-- **Pattern 1 (unreachable regex fallback):** Defensive pattern match against exhaustive regex
+1. Either find the correct ScalaTest artifact/import for Scala 3 JUnit integration, or
-- **Pattern 2 (overshadowed defaults):** Method overloads shadow default parameters in parent signature
+2. Update CLAUDE.md to reflect the actual constraint that unit tests should extend `AnyFunSuite with Matchers` (without `JUnitSuiteLike`), or
-- **Pattern 3 (defensive catch-all):** Error handling for impossible external API returns
+3. Investigate whether a different test runner or configuration is needed to achieve JUnit integration with ScalaTest 3 in Scala 3

jacoco-reporter/jacoco_coverage_gaps.py

@@ -0,0 +1,411 @@
+#!/usr/bin/env python3
+"""
+JaCoCo Coverage Gap Reporter
+Parses a JaCoCo XML report and outputs missing line & branch (conditional)
+coverage in a structured format that Claude Code agents can act on directly.
+
+Usage:
+    python jacoco_coverage_gaps.py <jacoco-report.xml> [--min-coverage 80]
+    python jacoco_coverage_gaps.py <jacoco-report.xml> --output json
+    python jacoco_coverage_gaps.py <jacoco-report.xml> --output markdown
+    python jacoco_coverage_gaps.py <jacoco-report.xml> --output agent   (default)
+"""
+
+import xml.etree.ElementTree as ET
+import sys
+import argparse
+import json
+from pathlib import Path
+from dataclasses import dataclass, field
+from typing import Optional
+
+
+# ---------------------------------------------------------------------------
+# Data classes
+# ---------------------------------------------------------------------------
+
+@dataclass
+class LineCoverage:
+    line_number: int
+    hits: int                   # 0 = not executed
+    branch_total: int = 0       # 0 = not a branch point
+    branch_covered: int = 0
+
+    @property
+    def is_uncovered(self) -> bool:
+        return self.hits == 0
+
+    @property
+    def is_partial_branch(self) -> bool:
+        return self.branch_total > 0 and self.branch_covered < self.branch_total
+
+
+@dataclass
+class MethodCoverage:
+    name: str
+    descriptor: str
+    first_line: Optional[int]
+    missed_instructions: int
+    covered_instructions: int
+    missed_branches: int
+    covered_branches: int
+    uncovered_lines: list[int] = field(default_factory=list)
+    partial_branch_lines: list[int] = field(default_factory=list)
+
+    @property
+    def total_branches(self) -> int:
+        return self.missed_branches + self.covered_branches
+
+    @property
+    def is_fully_covered(self) -> bool:
+        return self.missed_instructions == 0 and self.missed_branches == 0
+
+    @property
+    def branch_coverage_pct(self) -> float:
+        total = self.total_branches
+        return 100.0 * self.covered_branches / total if total else 100.0
+
+    @property
+    def line_coverage_pct(self) -> float:
+        total = self.missed_instructions + self.covered_instructions
+        return 100.0 * self.covered_instructions / total if total else 100.0
+
+
+@dataclass
+class ClassCoverage:
+    class_name: str             # e.g. com/example/Foo
+    source_file: Optional[str]
+    methods: list[MethodCoverage] = field(default_factory=list)
+    all_lines: list[LineCoverage] = field(default_factory=list)
+
+    @property
+    def java_class_name(self) -> str:
+        return self.class_name.replace("/", ".")
+
+    @property
+    def source_path(self) -> Optional[str]:
+        """Best-guess relative source path."""
+        if self.source_file:
+            package = "/".join(self.class_name.split("/")[:-1])
+            return f"src/main/java/{package}/{self.source_file}" if package else f"src/main/java/{self.source_file}"
+        return None
+
+    @property
+    def uncovered_lines(self) -> list[int]:
+        return sorted({l.line_number for l in self.all_lines if l.is_uncovered})
+
+    @property
+    def partial_branch_lines(self) -> list[int]:
+        return sorted({l.line_number for l in self.all_lines if l.is_partial_branch})
+
+    @property
+    def missed_branches(self) -> int:
+        return sum(max(l.branch_total - l.branch_covered, 0) for l in self.all_lines)
+
+    @property
+    def total_branches(self) -> int:
+        return sum(l.branch_total for l in self.all_lines)
+
+    @property
+    def covered_branches(self) -> int:
+        return self.total_branches - self.missed_branches
+
+    @property
+    def missed_lines(self) -> int:
+        return len(self.uncovered_lines)
+
+    @property
+    def total_lines(self) -> int:
+        return len(self.all_lines)
+
+    @property
+    def covered_lines(self) -> int:
+        return self.total_lines - self.missed_lines
+
+    @property
+    def has_gaps(self) -> bool:
+        return bool(self.uncovered_lines or self.partial_branch_lines)
+
+
+# ---------------------------------------------------------------------------
+# Parser
+# ---------------------------------------------------------------------------
+
+def parse_jacoco_xml(xml_path: str) -> list[ClassCoverage]:
+    """Parse a JaCoCo XML report into ClassCoverage objects."""
+    tree = ET.parse(xml_path)
+    root = tree.getroot()
+
+    results: list[ClassCoverage] = []
+
+    for package in root.iter("package"):
+        for cls_elem in package.findall("class"):
+            class_name = cls_elem.get("name", "")
+            source_file = cls_elem.get("sourcefilename")
+
+            # Build method map from <method> children
+            methods: list[MethodCoverage] = []
+            for m in cls_elem.findall("method"):
+                counters = {c.get("type"): c for c in m.findall("counter")}
+
+                def _missed(t): return int(counters[t].get("missed", 0)) if t in counters else 0
+                def _covered(t): return int(counters[t].get("covered", 0)) if t in counters else 0
+
+                methods.append(MethodCoverage(
+                    name=m.get("name", ""),
+                    descriptor=m.get("desc", ""),
+                    first_line=int(m.get("line")) if m.get("line") else None,
+                    missed_instructions=_missed("INSTRUCTION"),
+                    covered_instructions=_covered("INSTRUCTION"),
+                    missed_branches=_missed("BRANCH"),
+                    covered_branches=_covered("BRANCH"),
+                ))
+
+            cc = ClassCoverage(
+                class_name=class_name,
+                source_file=source_file,
+                methods=methods,
+            )
+
+            # Per-line data lives in the matching <sourcefile> element
+            source_file_elem = package.find(f"sourcefile[@name='{source_file}']") if source_file else None
+            if source_file_elem is not None:
+                for line_elem in source_file_elem.findall("line"):
+                    nr = int(line_elem.get("nr", 0))
+                    mi = int(line_elem.get("mi", 0))   # missed instructions
+                    ci = int(line_elem.get("ci", 0))   # covered instructions
+                    mb = int(line_elem.get("mb", 0))   # missed branches
+                    cb = int(line_elem.get("cb", 0))   # covered branches
+                    hits = ci  # ci > 0 means line was executed at least once
+                    cc.all_lines.append(LineCoverage(
+                        line_number=nr,
+                        hits=hits,
+                        branch_total=mb + cb,
+                        branch_covered=cb,
+                    ))
+
+            if cc.has_gaps:
+                results.append(cc)
+
+    return results
+
+
+# ---------------------------------------------------------------------------
+# Formatters
+# ---------------------------------------------------------------------------
+
+def _compact_ranges(numbers: list[int]) -> str:
+    """Turn [1,2,3,5,7,8,9] -> '1-3, 5, 7-9'"""
+    if not numbers:
+        return ""
+    ranges = []
+    start = prev = numbers[0]
+    for n in numbers[1:]:
+        if n == prev + 1:
+            prev = n
+        else:
+            ranges.append(f"{start}-{prev}" if start != prev else str(start))
+            start = prev = n
+    ranges.append(f"{start}-{prev}" if start != prev else str(start))
+    return ", ".join(ranges)
+
+
+def format_agent(classes: list[ClassCoverage]) -> str:
+    """
+    Output optimised for Claude Code agents:
+    – structured, machine-readable yet human-legible
+    – uses file paths and line numbers agents can act on
+    – groups by file, sorts by severity (most gaps first)
+    """
+    lines: list[str] = []
+    lines.append("# JaCoCo Coverage Gaps — Agent Action Report")
+    lines.append("")
+    lines.append("## Summary")
+    total_uncovered = sum(c.missed_lines for c in classes)
+    total_partial = sum(len(c.partial_branch_lines) for c in classes)
+    total_missed_branches = sum(c.missed_branches for c in classes)
+    lines.append(f"- Files with gaps : {len(classes)}")
+    lines.append(f"- Uncovered lines : {total_uncovered}")
+    lines.append(f"- Partial branches: {total_partial} lines affected")
+    lines.append(f"- Missed branches : {total_missed_branches} branch paths")
+    lines.append("")
+    lines.append("---")
+    lines.append("")
+    lines.append("## Files Requiring Tests")
+    lines.append("")
+    lines.append("> Each entry lists the SOURCE FILE PATH, the LINE NUMBERS that need")
+    lines.append("> coverage, and the METHODS that contain those gaps.")
+    lines.append("> Write or extend unit/integration tests to exercise these paths.")
+    lines.append("")
+
+    # Sort: most uncovered lines first
+    sorted_classes = sorted(classes, key=lambda c: -(c.missed_lines + len(c.partial_branch_lines)))
+
+    for cls in sorted_classes:
+        source = cls.source_path or f"(source unknown) {cls.java_class_name}"
+        lines.append(f"### `{source}`")
+        lines.append(f"**Class**: `{cls.java_class_name}`")
+        lines.append("")
+
+        if cls.uncovered_lines:
+            lines.append(f"#### ❌ Uncovered Lines")
+            lines.append(f"Lines not executed at all: `{_compact_ranges(cls.uncovered_lines)}`")
+            lines.append("")
+            lines.append("**Methods with uncovered lines:**")
+            for method in cls.methods:
+                uncov = [l for l in cls.uncovered_lines
+                         if method.first_line and l >= method.first_line]
+                # heuristic: only attribute if there are uncovered lines near the method start
+                if method.missed_instructions > 0:
+                    sig = f"`{method.name}{method.descriptor}`"
+                    pct = method.line_coverage_pct
+                    lines.append(f"  - {sig} — {pct:.0f}% instruction coverage")
+            lines.append("")
+
+        if cls.partial_branch_lines:
+            lines.append(f"#### ⚠️  Partial Branch Coverage (Missing Conditional Paths)")
+            lines.append(f"Lines where not all branches are taken: `{_compact_ranges(cls.partial_branch_lines)}`")
+            lines.append("")
+            lines.append("**Methods with branch gaps:**")
+            for method in cls.methods:
+                if method.missed_branches > 0:
+                    sig = f"`{method.name}{method.descriptor}`"
+                    pct = method.branch_coverage_pct
+                    missing = method.missed_branches
+                    lines.append(f"  - {sig} — {pct:.0f}% branch coverage ({missing} branch path(s) never taken)")
+            lines.append("")
+
+        lines.append("**Action**: Add tests that exercise the above lines/branches.")
+        lines.append("")
+        lines.append("---")
+        lines.append("")
+
+    lines.append("## Quick Reference: All Uncovered Locations")
+    lines.append("")
+    lines.append("Copy-paste friendly list for IDE navigation or grep:")
+    lines.append("")
+    lines.append("```")
+    for cls in sorted_classes:
+        src = cls.source_path or cls.java_class_name
+        if cls.uncovered_lines:
+            for ln in cls.uncovered_lines:
+                lines.append(f"{src}:{ln}  # uncovered line")
+        if cls.partial_branch_lines:
+            for ln in cls.partial_branch_lines:
+                lines.append(f"{src}:{ln}  # partial branch")
+    lines.append("```")
+
+    return "\n".join(lines)
+
+
+def format_json(classes: list[ClassCoverage]) -> str:
+    out = []
+    for cls in classes:
+        out.append({
+            "class": cls.java_class_name,
+            "source_path": cls.source_path,
+            "uncovered_lines": cls.uncovered_lines,
+            "partial_branch_lines": cls.partial_branch_lines,
+            "missed_branches": cls.missed_branches,
+            "methods": [
+                {
+                    "name": m.name,
+                    "descriptor": m.descriptor,
+                    "first_line": m.first_line,
+                    "line_coverage_pct": round(m.line_coverage_pct, 1),
+                    "branch_coverage_pct": round(m.branch_coverage_pct, 1),
+                    "missed_branches": m.missed_branches,
+                    "missed_instructions": m.missed_instructions,
+                }
+                for m in cls.methods
+                if not m.is_fully_covered
+            ],
+        })
+    return json.dumps(out, indent=2)
+
+
+def format_markdown(classes: list[ClassCoverage]) -> str:
+    lines: list[str] = []
+    lines.append("# JaCoCo Missing Coverage Report\n")
+    for cls in sorted(classes, key=lambda c: cls.java_class_name):
+        lines.append(f"## {cls.java_class_name}")
+        if cls.source_path:
+            lines.append(f"**File**: `{cls.source_path}`\n")
+        if cls.uncovered_lines:
+            lines.append(f"**Uncovered lines**: {_compact_ranges(cls.uncovered_lines)}\n")
+        if cls.partial_branch_lines:
+            lines.append(f"**Partial branches at lines**: {_compact_ranges(cls.partial_branch_lines)}\n")
+        lines.append("| Method | Line Coverage | Branch Coverage | Missed Branches |")
+        lines.append("|--------|--------------|-----------------|-----------------|")
+        for m in cls.methods:
+            if not m.is_fully_covered:
+                lines.append(
+                    f"| `{m.name}` | {m.line_coverage_pct:.0f}% | "
+                    f"{m.branch_coverage_pct:.0f}% | {m.missed_branches} |"
+                )
+        lines.append("")
+    return "\n".join(lines)
+
+
+# ---------------------------------------------------------------------------
+# Entry point
+# ---------------------------------------------------------------------------
+
+def main() -> None:
+    parser = argparse.ArgumentParser(
+        description="Report missing line & branch coverage from a JaCoCo XML report."
+    )
+    parser.add_argument("xml_file", help="Path to jacoco.xml report file")
+    parser.add_argument(
+        "--output", "-o",
+        choices=["agent", "json", "markdown"],
+        default="json",
+        help="Output format (default: agent)",
+    )
+    parser.add_argument(
+        "--min-coverage",
+        type=float,
+        default=0.0,
+        help="Only report classes below this %% line coverage (0 = report all gaps)",
+    )
+    parser.add_argument(
+        "--package-filter", "-p",
+        default=None,
+        help="Only report classes in this package prefix (e.g. com/example/service)",
+    )
+    args = parser.parse_args()
+
+    xml_path = Path(args.xml_file)
+    if not xml_path.exists():
+        print(f"ERROR: File not found: {xml_path}", file=sys.stderr)
+        sys.exit(1)
+
+    classes = parse_jacoco_xml(str(xml_path))
+
+    # Apply package filter
+    if args.package_filter:
+        prefix = args.package_filter.replace(".", "/")
+        classes = [c for c in classes if c.class_name.startswith(prefix)]
+
+    # Apply min-coverage filter
+    if args.min_coverage > 0:
+        def _line_pct(c: ClassCoverage) -> float:
+            total = c.total_lines
+            return 100.0 * c.covered_lines / total if total else 100.0
+
+        classes = [c for c in classes if _line_pct(c) < args.min_coverage]
+
+    if not classes:
+        print("✅ No coverage gaps found matching the given filters.")
+        return
+
+    if args.output == "agent":
+        print(format_agent(classes))
+    elif args.output == "json":
+        print(format_json(classes))
+    elif args.output == "markdown":
+        print(format_markdown(classes))
+
+
+if __name__ == "__main__":
+    main()

jacoco-reporter/scoverage_coverage_gaps.py

@@ -19,9 +19,6 @@ Usage:
     python scoverage_coverage_gaps.py <scoverage.xml> --output agent   (default)
     python scoverage_coverage_gaps.py <scoverage.xml> --package-filter de.nowchess.chess.controller
     python scoverage_coverage_gaps.py <scoverage.xml> --min-coverage 80
-    python scoverage_coverage_gaps.py                                 (default: scans ./modules)
-    python scoverage_coverage_gaps.py --modules-dir ./services
-    python scoverage_coverage_gaps.py <scoverage.xml>
 """
 
 import xml.etree.ElementTree as ET
@@ -29,8 +26,7 @@ import sys
 import argparse
 import json
 import re
-import glob
+from pathlib import Path, PureWindowsPath
-from pathlib import Path
 from dataclasses import dataclass, field
 from typing import Optional
 
@@ -116,6 +112,7 @@ class ClassGap:
     @property
     def uncovered_branch_lines(self) -> list[int]:
         """Lines that are branch points and have at least one uncovered branch statement."""
+        # Group branch statements by line; a line is "partial" if some covered, some not
         from collections import defaultdict
         by_line: dict[int, list[Statement]] = defaultdict(list)
         for s in self.statements:
@@ -123,7 +120,10 @@ class ClassGap:
                 by_line[s.line].append(s)
         partial = []
         for line, stmts in by_line.items():
-            if any(s.is_uncovered for s in stmts):
+            has_covered = any(s.is_covered for s in stmts)
+            has_uncovered = any(s.is_uncovered for s in stmts)
+            # Report line if any branch arm is uncovered
+            if has_uncovered:
                 partial.append(line)
         return sorted(partial)
 
@@ -169,10 +169,20 @@ class ClassGap:
 # ---------------------------------------------------------------------------
 
 def _normalise_source(raw: str) -> str:
+    """
+    Convert an absolute Windows or Unix source path from the XML into a
+    relative src/main/scala/… path for agent consumption.
+
+    Strategy:
+      1. Replace Windows backslashes.
+      2. Find the 'src/' anchor and take everything from there.
+      3. Fall back to the package-derived path if no anchor found.
+    """
     normalised = raw.replace("\\", "/")
     match = re.search(r"(src/(?:main|test)/scala/.+)", normalised)
     if match:
         return match.group(1)
+    # Fallback: just the filename portion
     return normalised.split("/")[-1]
 
 
@@ -180,10 +190,11 @@ def _normalise_source(raw: str) -> str:
 # Parser
 # ---------------------------------------------------------------------------
 
-def parse_scoverage_xml(xml_path: str) -> tuple[dict, list[ClassGap]]:
+def parse_scoverage_xml(xml_path: str) -> list[ClassGap]:
     tree = ET.parse(xml_path)
     root = tree.getroot()
 
+    # ── Authoritative project-level totals from <scoverage> root element ──────
     project_stats = {
         "total_statements":    int(root.get("statement-count", 0)),
         "covered_statements":  int(root.get("statements-invoked", 0)),
@@ -191,16 +202,17 @@ def parse_scoverage_xml(xml_path: str) -> tuple[dict, list[ClassGap]]:
         "branch_coverage_pct": float(root.get("branch-rate", 0.0)),
     }
     project_stats["missed_statements"] = (
-            project_stats["total_statements"] - project_stats["covered_statements"]
+        project_stats["total_statements"] - project_stats["covered_statements"]
     )
 
-    class_map: dict[str, ClassGap] = {}
+    class_map: dict[str, ClassGap] = {}   # full-class-name → ClassGap
 
     for package in root.findall("packages/package"):
         for cls_elem in package.findall("classes/class"):
             class_name = cls_elem.get("name", "")
             filename   = cls_elem.get("filename", "")
 
+            # Authoritative per-class totals from <class> attributes
             cls_total     = int(cls_elem.get("statement-count", 0))
             cls_invoked   = int(cls_elem.get("statements-invoked", 0))
             cls_stmt_rate = float(cls_elem.get("statement-rate", 0.0))
@@ -209,8 +221,11 @@ def parse_scoverage_xml(xml_path: str) -> tuple[dict, list[ClassGap]]:
             for method_elem in cls_elem.findall("methods/method"):
                 method_name = method_elem.get("name", "")
 
-                m_total   = int(method_elem.get("statement-count", 0))
+                # Authoritative per-method totals from <method> attributes
-                m_invoked = int(method_elem.get("statements-invoked", 0))
+                m_total     = int(method_elem.get("statement-count", 0))
+                m_invoked   = int(method_elem.get("statements-invoked", 0))
+                m_stmt_rate = float(method_elem.get("statement-rate", 0.0))
+                m_br_rate   = float(method_elem.get("branch-rate", 0.0))
 
                 for stmt_elem in method_elem.findall("statements/statement"):
                     raw_source = stmt_elem.get("source", filename)
@@ -242,6 +257,7 @@ def parse_scoverage_xml(xml_path: str) -> tuple[dict, list[ClassGap]]:
                         method=method_name,
                     ))
 
+                # Register method-level gap using authoritative XML stats
                 cg = next(
                     (v for v in class_map.values() if v.class_name == class_name),
                     None,
@@ -252,6 +268,7 @@ def parse_scoverage_xml(xml_path: str) -> tuple[dict, list[ClassGap]]:
                 uncov_lines        = sorted({s.line for s in active if s.is_uncovered})
                 uncov_branch_lines = sorted({s.line for s in active if s.is_branch and s.is_uncovered})
                 if uncov_lines or uncov_branch_lines:
+                    # Count branches from statement-level data (not in method XML attrs)
                     total_b = sum(1 for s in active if s.is_branch)
                     cov_b   = sum(1 for s in active if s.is_branch and s.is_covered)
                     mg = MethodGap(
@@ -265,6 +282,7 @@ def parse_scoverage_xml(xml_path: str) -> tuple[dict, list[ClassGap]]:
                     )
                     cg.method_gaps.append(mg)
 
+    # ── Project stats injected so formatters never recount from statements ────
     return project_stats, [cg for cg in class_map.values() if cg.has_gaps]
 
 
@@ -292,60 +310,103 @@ def _compact_ranges(numbers: list[int]) -> str:
 # Formatters
 # ---------------------------------------------------------------------------
 
-def format_agent(project_stats: dict, classes: list[ClassGap]) -> str:
+def _pct_bar(pct: float, width: int = 20) -> str:
-    """
+    """Render a compact ASCII progress bar, e.g. [████░░░░░░░░░░░░░░░░] 23.5%"""
-    Compact agent format — optimised for low token count.
+    filled = round(pct / 100 * width)
-    Emits only actionable gaps: file path, uncovered lines, branch-gap lines,
+    bar = "█" * filled + "░" * (width - filled)
-    and a per-method breakdown. No ASCII bars, no redundant tables.
+    return f"[{bar}] {pct:.1f}%"
-    """
-    lines: list[str] = []
 
-    total_stmts        = project_stats["total_statements"]
+
-    covered_stmts      = project_stats["covered_statements"]
+def format_agent(project_stats: dict, classes: list[ClassGap]) -> str:
-    missed_stmts       = project_stats["missed_statements"]
+    lines: list[str] = []
+    lines.append("# scoverage Coverage Gaps — Agent Action Report")
+    lines.append("")
+
+    # ---- Project-level totals (authoritative from <scoverage> root element) ----
+    total_stmts      = project_stats["total_statements"]
+    covered_stmts    = project_stats["covered_statements"]
+    missed_stmts     = project_stats["missed_statements"]
     overall_stmt_pct   = project_stats["stmt_coverage_pct"]
     overall_branch_pct = project_stats["branch_coverage_pct"]
-    total_branches     = sum(c.total_branches for c in classes)
+    total_branch_lines = sum(len(c.uncovered_branch_lines) for c in classes)
-    covered_branches   = sum(c.covered_branches for c in classes)
+    # Branch totals: count from statement data (scoverage root has no branch count attr)
-    missed_branches    = total_branches - covered_branches
+    total_branches   = sum(c.total_branches for c in classes)
+    covered_branches = sum(c.covered_branches for c in classes)
+    missed_branches  = sum(c.missed_branches for c in classes)
 
-    lines.append("# scoverage Coverage Gaps")
+    lines.append("## Project Coverage Summary")
-    lines.append(
+    lines.append("")
-        f"stmt: {overall_stmt_pct:.1f}% ({missed_stmts}/{total_stmts} missed) | "
+    lines.append(f"| Metric            | Covered | Total | Missed | Coverage |")
-        f"branches: {overall_branch_pct:.1f}% ({missed_branches}/{total_branches} missed) | "
+    lines.append(f"|-------------------|---------|-------|--------|----------|")
-        f"files with gaps: {len(classes)}"
+    lines.append(f"| Statements        | {covered_stmts:>7} | {total_stmts:>5} | {missed_stmts:>6} | {_pct_bar(overall_stmt_pct)} |")
-    )
+    lines.append(f"| Branch paths      | {covered_branches:>7} | {total_branches:>5} | {missed_branches:>6} | {_pct_bar(overall_branch_pct)} |")
+    lines.append(f"| Files with gaps   | {'—':>7} | {len(classes):>5} | {'—':>6} | {'—'} |")
+    lines.append(f"| Lines w/ br. gaps | {'—':>7} | {total_branch_lines:>5} | {'—':>6} | {'—'} |")
+    lines.append("")
+    lines.append("---")
+    lines.append("")
+    lines.append("## Files Requiring Tests")
+    lines.append("")
+    lines.append("> Each entry lists the SOURCE FILE PATH, uncovered LINE NUMBERS,")
+    lines.append("> and the METHODS that contain those gaps.")
+    lines.append("> Write or extend unit/integration tests to exercise these paths.")
     lines.append("")
 
     sorted_classes = sorted(classes, key=lambda c: -(c.missed_statements + c.missed_branches))
 
     for cls in sorted_classes:
-        uncov        = cls.all_uncovered_lines
+        lines.append(f"### `{cls.source_path}`")
-        branch_lines = cls.uncovered_branch_lines
+        lines.append(f"**Class**: `{cls.class_name}`")
+        lines.append("")
+        lines.append(f"| Metric       | Covered | Total | Missed | Coverage |")
+        lines.append(f"|--------------|---------|-------|--------|----------|")
+        lines.append(f"| Statements   | {cls.covered_statements:>7} | {cls.total_statements:>5} | {cls.missed_statements:>6} | {_pct_bar(cls.stmt_coverage_pct)} |")
+        if cls.total_branches:
+            lines.append(f"| Branch paths | {cls.covered_branches:>7} | {cls.total_branches:>5} | {cls.missed_branches:>6} | {_pct_bar(cls.branch_coverage_pct)} |")
+        lines.append("")
 
-        lines.append(f"## {cls.source_path}")
+        uncov = cls.all_uncovered_lines
-        lines.append(
-            f"stmt: {cls.stmt_coverage_pct:.1f}% ({cls.missed_statements} missed)"
-            + (f" | branches: {cls.branch_coverage_pct:.1f}% ({cls.missed_branches} missed)"
-               if cls.total_branches else "")
-        )
         if uncov:
-            lines.append(f"uncovered lines: {_compact_ranges(uncov)}")
+            lines.append("#### ❌ Uncovered Statements")
-        only_branch = [l for l in branch_lines if l not in cls.all_uncovered_lines]
+            lines.append(f"Lines never executed: `{_compact_ranges(uncov)}`")
-        if only_branch:
+            lines.append("")
-            lines.append(f"partial branches: {_compact_ranges(only_branch)}")
+
+        branch_lines = cls.uncovered_branch_lines
+        if branch_lines:
+            lines.append("#### ⚠️  Missing Branch Coverage (Conditional Paths)")
+            lines.append(f"Lines where not all conditional paths are taken: `{_compact_ranges(branch_lines)}`")
+            lines.append("")
 
         if cls.method_gaps:
-            lines.append("methods:")
+            lines.append("#### Methods with Gaps")
+            lines.append("")
+            lines.append("| Method | Stmt Coverage | Branch Coverage | Uncovered Lines | Branch Gap Lines |")
+            lines.append("|--------|--------------|-----------------|-----------------|------------------|")
             for mg in cls.method_gaps:
-                parts = [f"  {mg.short_name}"]
+                stmt_cell   = f"{_pct_bar(mg.stmt_coverage_pct, 10)} ({mg.total_statements - mg.covered_statements}/{mg.total_statements} missed)"
-                if mg.uncovered_lines:
+                branch_cell = f"{_pct_bar(mg.branch_coverage_pct, 10)} ({mg.missed_branches}/{mg.total_branches} missed)" if mg.total_branches else "n/a"
-                    parts.append(f"lines={_compact_ranges(mg.uncovered_lines)}")
+                uncov_cell  = f"`{_compact_ranges(mg.uncovered_lines)}`"        if mg.uncovered_lines        else "—"
-                if mg.uncovered_branch_lines:
+                br_cell     = f"`{_compact_ranges(mg.uncovered_branch_lines)}`" if mg.uncovered_branch_lines else "—"
-                    parts.append(f"branches={_compact_ranges(mg.uncovered_branch_lines)}")
+                lines.append(f"| `{mg.short_name}` | {stmt_cell} | {branch_cell} | {uncov_cell} | {br_cell} |")
-                lines.append(" ".join(parts))
+            lines.append("")
 
+        lines.append("**Action**: Add tests that exercise the lines/branches listed above.")
         lines.append("")
+        lines.append("---")
+        lines.append("")
+
+    lines.append("## Quick Reference: All Uncovered Locations")
+    lines.append("")
+    lines.append("Copy-paste friendly list for IDE navigation or grep:")
+    lines.append("")
+    lines.append("```")
+    for cls in sorted_classes:
+        for ln in cls.all_uncovered_lines:
+            lines.append(f"{cls.source_path}:{ln}  # uncovered statement")
+        for ln in cls.uncovered_branch_lines:
+            if ln not in cls.all_uncovered_lines:
+                lines.append(f"{cls.source_path}:{ln}  # partial branch")
+    lines.append("```")
 
     return "\n".join(lines)
 
@@ -450,87 +511,6 @@ def format_markdown(project_stats: dict, classes: list[ClassGap]) -> str:
     return "\n".join(lines)
 
 
-# ---------------------------------------------------------------------------
-# Scan-modules mode
-# ---------------------------------------------------------------------------
-
-# Candidate sub-paths within a module directory where scoverage.xml may live.
-_SCOVERAGE_SUBPATHS = [
-    # Gradle / default layout
-    "build/reports/scoverageTest/scoverage.xml",
-    # sbt default (scala version wildcard resolved via glob)
-    "target/scala-*/scoverage-report/scoverage.xml",
-    # Maven / flat layout
-    "target/scoverage-report/scoverage.xml",
-    # Already at root of module
-    "scoverage.xml",
-]
-
-
-def _find_scoverage_xml(module_dir: Path) -> Optional[Path]:
-    """Return the first scoverage.xml found inside *module_dir*, or None."""
-    for pattern in _SCOVERAGE_SUBPATHS:
-        hits = sorted(module_dir.glob(pattern))
-        if hits:
-            return hits[0]
-    return None
-
-
-def format_module_gaps(module_name: str, classes: list[ClassGap], stmt_pct: float) -> str:
-    """
-    One summary line per module. If coverage is not 100%, append an agent hint.
-    """
-    if not classes:
-        return f"[{module_name}] stmt: {stmt_pct:.1f}% ✅"
-
-    line = f"[{module_name}] stmt: {stmt_pct:.1f}%  files_with_gaps: {len(classes)}"
-    if stmt_pct < 100.0:
-        line += f"  # hint: run ./coverage {module_name} for details"
-    return line
-
-
-def run_scan_modules(modules_dir: str, package_filter: Optional[str], min_coverage: float) -> None:
-    base = Path(modules_dir)
-    if not base.is_dir():
-        print(f"ERROR: modules directory not found: {base}", file=sys.stderr)
-        sys.exit(1)
-
-    module_dirs = sorted(p for p in base.iterdir() if p.is_dir())
-    if not module_dirs:
-        print(f"No sub-directories found in {base}", file=sys.stderr)
-        sys.exit(1)
-
-    results: list[str] = []
-    missing: list[str] = []
-
-    for mod_dir in module_dirs:
-        if mod_dir.name.startswith("build"):
-            continue
-        xml_path = _find_scoverage_xml(mod_dir)
-        if xml_path is None:
-            missing.append(mod_dir.name)
-            continue
-
-        project_stats, classes = parse_scoverage_xml(str(xml_path))
-
-        if package_filter:
-            classes = [c for c in classes if c.class_name.startswith(package_filter)]
-        if min_coverage > 0:
-            classes = [c for c in classes if c.stmt_coverage_pct < min_coverage]
-
-        results.append(
-            format_module_gaps(mod_dir.name, classes, project_stats["stmt_coverage_pct"])
-        )
-
-    print("\n".join(results))
-
-    if missing:
-        print(
-            f"\n# Modules without scoverage.xml: {', '.join(missing)}",
-            file=sys.stderr,
-        )
-
-
 # ---------------------------------------------------------------------------
 # Entry point
 # ---------------------------------------------------------------------------
@@ -539,13 +519,7 @@ def main() -> None:
     parser = argparse.ArgumentParser(
         description="Report missing statement & branch coverage from a scoverage XML report."
     )
-
+    parser.add_argument("xml_file", help="Path to scoverage.xml report file")
-    # Positional xml_file is optional when --scan-modules is used
-    parser.add_argument(
-        "xml_file",
-        nargs="?",
-        help="Path to scoverage.xml report file (not required with --scan-modules)",
-    )
     parser.add_argument(
         "--output", "-o",
         choices=["agent", "json", "markdown"],
@@ -563,30 +537,8 @@ def main() -> None:
         default=None,
         help="Only report classes in this package prefix (e.g. de.nowchess.chess.controller)",
     )
-    # ── Scan-modules mode ──────────────────────────────────────────────────
-    parser.add_argument(
-        "--scan-modules",
-        action="store_true",
-        help=(
-            "Scan every sub-directory of --modules-dir for a scoverage.xml "
-            "and print a compact coverage-gaps summary per module."
-        ),
-    )
-    parser.add_argument(
-        "--modules-dir",
-        default="./modules",
-        help="Root directory that contains one sub-directory per module (default: ./modules)",
-    )
-
     args = parser.parse_args()
 
-    # ── Scan-modules path (explicit flag, or default when no xml_file given) ──
-    if args.scan_modules or not args.xml_file:
-        run_scan_modules(args.modules_dir, args.package_filter, args.min_coverage)
-        return
-
-    # ── Single-file path ──────────────────────────────────────────────────
-
     xml_path = Path(args.xml_file)
     if not xml_path.exists():
         print(f"ERROR: File not found: {xml_path}", file=sys.stderr)
@@ -613,4 +565,4 @@ def main() -> None:
 
 
 if __name__ == "__main__":
-    main()
+    main()

jacoco-reporter/test_gaps.py

@@ -1,288 +0,0 @@
-#!/usr/bin/env python3
-"""
-Test Gap Reporter
-Scans JUnit XML test results under modules/*/build/test-results/*.xml and
-outputs a minimal summary optimised for agent consumption.
-
-Usage:
-    python test_gaps.py                        # scan all modules (default)
-    python test_gaps.py --module chess         # single module
-    python test_gaps.py --module all           # explicit all
-    python test_gaps.py --modules-dir ./modules
-    python test_gaps.py --results-subdir build/test-results
-"""
-
-import xml.etree.ElementTree as ET
-import sys
-import argparse
-from pathlib import Path
-from dataclasses import dataclass, field
-from typing import Optional
-
-
-# ---------------------------------------------------------------------------
-# Data classes
-# ---------------------------------------------------------------------------
-
-@dataclass
-class TestCase:
-    classname: str
-    name: str
-    time: float
-    failure: Optional[str] = None   # message if failed
-    error: Optional[str]   = None   # message if errored
-    skipped: bool          = False
-
-    @property
-    def short_class(self) -> str:
-        return self.classname.split(".")[-1]
-
-    @property
-    def status(self) -> str:
-        if self.failure is not None:
-            return "FAIL"
-        if self.error is not None:
-            return "ERROR"
-        if self.skipped:
-            return "SKIP"
-        return "OK"
-
-
-@dataclass
-class SuiteResult:
-    name: str
-    total: int
-    failures: int
-    errors: int
-    skipped: int
-    time: float
-    cases: list[TestCase] = field(default_factory=list)
-
-    @property
-    def passed(self) -> int:
-        return self.total - self.failures - self.errors - self.skipped
-
-    @property
-    def is_clean(self) -> bool:
-        return self.failures == 0 and self.errors == 0
-
-    @property
-    def bad_cases(self) -> list[TestCase]:
-        return [c for c in self.cases if c.status in ("FAIL", "ERROR")]
-
-    @property
-    def skipped_cases(self) -> list[TestCase]:
-        return [c for c in self.cases if c.skipped]
-
-
-@dataclass
-class ModuleResult:
-    name: str
-    suites: list[SuiteResult] = field(default_factory=list)
-
-    @property
-    def total(self)    -> int: return sum(s.total    for s in self.suites)
-    @property
-    def failures(self) -> int: return sum(s.failures for s in self.suites)
-    @property
-    def errors(self)   -> int: return sum(s.errors   for s in self.suites)
-    @property
-    def skipped(self)  -> int: return sum(s.skipped  for s in self.suites)
-    @property
-    def passed(self)   -> int: return sum(s.passed   for s in self.suites)
-    @property
-    def is_clean(self) -> bool: return self.failures == 0 and self.errors == 0
-
-    @property
-    def bad_cases(self) -> list[TestCase]:
-        return [c for s in self.suites for c in s.bad_cases]
-
-    @property
-    def skipped_cases(self) -> list[TestCase]:
-        return [c for s in self.suites for c in s.skipped_cases]
-
-
-# ---------------------------------------------------------------------------
-# Parser
-# ---------------------------------------------------------------------------
-
-def parse_suite_xml(xml_path: Path) -> SuiteResult:
-    tree = ET.parse(xml_path)
-    root = tree.getroot()
-
-    # Handle both <testsuite> root and <testsuites> wrapper
-    suites = [root] if root.tag == "testsuite" else root.findall("testsuite")
-
-    # Merge multiple suites from one file into a single SuiteResult
-    total = failures = errors = skipped = 0
-    elapsed = 0.0
-    name = xml_path.stem
-    cases: list[TestCase] = []
-
-    for suite in suites:
-        total    += int(suite.get("tests",    0))
-        failures += int(suite.get("failures", 0))
-        errors   += int(suite.get("errors",   0))
-        skipped  += int(suite.get("skipped",  0))
-        elapsed  += float(suite.get("time",   0.0))
-        if suite.get("name"):
-            name = suite.get("name")
-
-        for tc in suite.findall("testcase"):
-            fail_el = tc.find("failure")
-            err_el  = tc.find("error")
-            skip_el = tc.find("skipped")
-            cases.append(TestCase(
-                classname=tc.get("classname", ""),
-                name=tc.get("name", ""),
-                time=float(tc.get("time", 0.0)),
-                failure=fail_el.get("message", fail_el.text or "") if fail_el is not None else None,
-                error=err_el.get("message",  err_el.text  or "") if err_el  is not None else None,
-                skipped=skip_el is not None,
-            ))
-
-    return SuiteResult(
-        name=name, total=total, failures=failures,
-        errors=errors, skipped=skipped, time=elapsed, cases=cases,
-    )
-
-
-def load_module(module_dir: Path, results_subdir: str) -> Optional[ModuleResult]:
-    results_dir = module_dir / results_subdir
-    if not results_dir.is_dir():
-        return None
-
-    xml_files = sorted(results_dir.glob("*.xml"))
-    if not xml_files:
-        return None
-
-    mod = ModuleResult(name=module_dir.name)
-    for xml_path in xml_files:
-        try:
-            mod.suites.append(parse_suite_xml(xml_path))
-        except ET.ParseError:
-            pass  # skip malformed files silently
-    return mod if mod.suites else None
-
-
-# ---------------------------------------------------------------------------
-# Formatter
-# ---------------------------------------------------------------------------
-
-def _truncate(text: str, max_len: int = 120) -> str:
-    text = " ".join(text.split())        # collapse whitespace
-    return text[:max_len] + "…" if len(text) > max_len else text
-
-
-def format_module(mod: ModuleResult) -> str:
-    parts = [f"[{mod.name}]"]
-
-    if mod.is_clean and mod.skipped == 0:
-        parts.append(f"tests: {mod.total} ✅")
-        return " ".join(parts)
-
-    parts.append(f"tests: {mod.total}")
-    if mod.failures:  parts.append(f"failed: {mod.failures}")
-    if mod.errors:    parts.append(f"errors: {mod.errors}")
-    if mod.skipped:   parts.append(f"skipped: {mod.skipped}")
-
-    # Agent hint only when there are actual failures/errors
-    if not mod.is_clean:
-        parts.append(f" # hint: run ./test {mod.name} for details")
-
-    lines = [" ".join(parts)]
-
-    # List each failed/errored test — this IS the actionable info
-    for tc in mod.bad_cases:
-        msg = tc.failure if tc.failure is not None else tc.error
-        label = f"  {tc.status}: {tc.short_class} > {tc.name}"
-        if msg:
-            label += f"  [{_truncate(msg, 80)}]"
-        lines.append(label)
-
-    # Skipped: compact, one line total
-    if mod.skipped_cases:
-        skipped_names = ", ".join(
-            f"{c.short_class}.{c.name}" for c in mod.skipped_cases[:5]
-        )
-        if len(mod.skipped_cases) > 5:
-            skipped_names += f" (+{len(mod.skipped_cases) - 5} more)"
-        lines.append(f"  SKIP: {skipped_names}")
-
-    return "\n".join(lines)
-
-
-# ---------------------------------------------------------------------------
-# Runner
-# ---------------------------------------------------------------------------
-
-def run(modules_dir: str, results_subdir: str, module_filter: Optional[str]) -> None:
-    base = Path(modules_dir)
-    if not base.is_dir():
-        print(f"ERROR: modules directory not found: {base}", file=sys.stderr)
-        sys.exit(1)
-
-    # Resolve which module dirs to scan
-    if module_filter and module_filter != "all":
-        mod_dir = base / module_filter
-        if not mod_dir.is_dir():
-            print(f"ERROR: module not found: {mod_dir}", file=sys.stderr)
-            sys.exit(1)
-        candidates = [mod_dir]
-    else:
-        candidates = sorted(p for p in base.iterdir() if p.is_dir())
-
-    results: list[str] = []
-    missing: list[str] = []
-
-    for mod_dir in candidates:
-        if mod_dir.name.startswith("build"):
-            continue
-        mod = load_module(mod_dir, results_subdir)
-        if mod is None:
-            missing.append(mod_dir.name)
-            continue
-        results.append(format_module(mod))
-
-    print("\n".join(results))
-
-    if missing:
-        print(
-            f"\n# Modules without test results: {', '.join(missing)}",
-            file=sys.stderr,
-        )
-
-
-# ---------------------------------------------------------------------------
-# Entry point
-# ---------------------------------------------------------------------------
-
-def main() -> None:
-    parser = argparse.ArgumentParser(
-        description="Minimal test-gap reporter for JUnit XML results across modules."
-    )
-    parser.add_argument(
-        "--module", "-m",
-        nargs="?",
-        const="all",
-        default="all",
-        help="Module name to scan, or 'all' (default: all)",
-    )
-    parser.add_argument(
-        "--modules-dir",
-        default="./modules",
-        help="Root directory containing one sub-directory per module (default: ./modules)",
-    )
-    parser.add_argument(
-        "--results-subdir",
-        default="build/test-results/test",
-        help="Sub-path inside each module dir where *.xml files live (default: build/test-results/test)",
-    )
-    args = parser.parse_args()
-
-    filter_ = None if args.module == "all" else args.module
-    run(args.modules_dir, args.results_subdir, filter_)
-
-
-if __name__ == "__main__":
-    main()

modules/api/CHANGELOG.md

@@ -1,8 +0,0 @@
-##  (2026-03-27)
-##  (2026-03-28)
-##  (2026-03-28)
-##  (2026-03-29)
-##  (2026-03-31)
-##  (2026-04-01)
-##  (2026-04-01)
-##  (2026-04-01)

modules/api/build.gradle.kts

@@ -49,17 +49,16 @@ dependencies {
 
     testImplementation(platform("org.junit:junit-bom:5.13.4"))
     testImplementation("org.junit.jupiter:junit-jupiter")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     testImplementation("org.scalatest:scalatest_3:${versions["SCALATEST"]!!}")
     testImplementation("co.helmethair:scalatest-junit-runner:${versions["SCALATEST_JUNIT"]!!}")
-
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 tasks.test {
     useJUnitPlatform {
         includeEngines("scalatest")
         testLogging {
-            events("skipped", "failed")
+            events("passed", "skipped", "failed")
         }
     }
     finalizedBy(tasks.reportScoverage)

modules/api/src/main/scala/de/nowchess/api/board/Board.scala

@@ -8,12 +8,10 @@ object Board:
 
   extension (b: Board)
     def pieceAt(sq: Square): Option[Piece] = b.get(sq)
-    def updated(sq: Square, piece: Piece): Board = b.updated(sq, piece)
-    def removed(sq: Square): Board = b.removed(sq)
     def withMove(from: Square, to: Square): (Board, Option[Piece]) =
       val captured = b.get(to)
-      val updatedBoard = b.removed(from).updated(to, b(from))
+      val updated  = b.removed(from).updated(to, b(from))
-      (updatedBoard, captured)
+      (updated, captured)
     def pieces: Map[Square, Piece] = b
 
   val initial: Board =

modules/api/src/test/scala/de/nowchess/api/board/BoardTest.scala

@@ -1,122 +0,0 @@
-package de.nowchess.api.board
-
-import org.scalatest.funsuite.AnyFunSuite
-import org.scalatest.matchers.should.Matchers
-
-class BoardTest extends AnyFunSuite with Matchers:
-
-  private val e2 = Square(File.E, Rank.R2)
-  private val e4 = Square(File.E, Rank.R4)
-  private val d7 = Square(File.D, Rank.R7)
-
-  test("pieceAt returns Some for occupied square") {
-    Board.initial.pieceAt(e2) shouldBe Some(Piece.WhitePawn)
-  }
-
-  test("pieceAt returns None for empty square") {
-    Board.initial.pieceAt(e4) shouldBe None
-  }
-
-  test("withMove moves piece and vacates origin") {
-    val (board, captured) = Board.initial.withMove(e2, e4)
-    captured shouldBe None
-    board.pieceAt(e4) shouldBe Some(Piece.WhitePawn)
-    board.pieceAt(e2) shouldBe None
-  }
-
-  test("withMove returns captured piece when destination is occupied") {
-    val from = Square(File.A, Rank.R1)
-    val to   = Square(File.A, Rank.R8)
-    val b    = Board(Map(from -> Piece.WhiteRook, to -> Piece.BlackRook))
-    val (board, captured) = b.withMove(from, to)
-    captured shouldBe Some(Piece.BlackRook)
-    board.pieceAt(to) shouldBe Some(Piece.WhiteRook)
-    board.pieceAt(from) shouldBe None
-  }
-
-  test("pieces returns the underlying map") {
-    val map = Map(e2 -> Piece.WhitePawn)
-    val b   = Board(map)
-    b.pieces shouldBe map
-  }
-
-  test("Board.apply constructs board from map") {
-    val map = Map(e2 -> Piece.WhitePawn)
-    val b   = Board(map)
-    b.pieceAt(e2) shouldBe Some(Piece.WhitePawn)
-  }
-
-  test("initial board has 32 pieces") {
-    Board.initial.pieces should have size 32
-  }
-
-  test("initial board has 16 white pieces") {
-    Board.initial.pieces.values.count(_.color == Color.White) shouldBe 16
-  }
-
-  test("initial board has 16 black pieces") {
-    Board.initial.pieces.values.count(_.color == Color.Black) shouldBe 16
-  }
-
-  test("initial board white pawns on rank 2") {
-    File.values.foreach { file =>
-      Board.initial.pieceAt(Square(file, Rank.R2)) shouldBe Some(Piece.WhitePawn)
-    }
-  }
-
-  test("initial board black pawns on rank 7") {
-    File.values.foreach { file =>
-      Board.initial.pieceAt(Square(file, Rank.R7)) shouldBe Some(Piece.BlackPawn)
-    }
-  }
-
-  test("initial board white back rank") {
-    val expectedBackRank = Vector(
-      PieceType.Rook, PieceType.Knight, PieceType.Bishop, PieceType.Queen,
-      PieceType.King, PieceType.Bishop, PieceType.Knight, PieceType.Rook
-    )
-    File.values.zipWithIndex.foreach { (file, i) =>
-      Board.initial.pieceAt(Square(file, Rank.R1)) shouldBe
-        Some(Piece(Color.White, expectedBackRank(i)))
-    }
-  }
-
-  test("initial board black back rank") {
-    val expectedBackRank = Vector(
-      PieceType.Rook, PieceType.Knight, PieceType.Bishop, PieceType.Queen,
-      PieceType.King, PieceType.Bishop, PieceType.Knight, PieceType.Rook
-    )
-    File.values.zipWithIndex.foreach { (file, i) =>
-      Board.initial.pieceAt(Square(file, Rank.R8)) shouldBe
-        Some(Piece(Color.Black, expectedBackRank(i)))
-    }
-  }
-
-  test("ranks 3-6 are empty on initial board") {
-    val emptyRanks = Seq(Rank.R3, Rank.R4, Rank.R5, Rank.R6)
-    for
-      rank <- emptyRanks
-      file <- File.values
-    do
-      Board.initial.pieceAt(Square(file, rank)) shouldBe None
-  }
-
-  test("updated adds or replaces piece at square") {
-    val b = Board(Map(e2 -> Piece.WhitePawn))
-    val updated = b.updated(e4, Piece.WhiteKnight)
-    updated.pieceAt(e2) shouldBe Some(Piece.WhitePawn)
-    updated.pieceAt(e4) shouldBe Some(Piece.WhiteKnight)
-  }
-
-  test("updated replaces existing piece") {
-    val b = Board(Map(e2 -> Piece.WhitePawn))
-    val updated = b.updated(e2, Piece.WhiteKnight)
-    updated.pieceAt(e2) shouldBe Some(Piece.WhiteKnight)
-  }
-
-  test("removed deletes piece from board") {
-    val b = Board(Map(e2 -> Piece.WhitePawn, e4 -> Piece.WhiteKnight))
-    val removed = b.removed(e2)
-    removed.pieceAt(e2) shouldBe None
-    removed.pieceAt(e4) shouldBe Some(Piece.WhiteKnight)
-  }

modules/api/src/test/scala/de/nowchess/api/board/ColorTest.scala

@@ -1,22 +0,0 @@
-package de.nowchess.api.board
-
-import org.scalatest.funsuite.AnyFunSuite
-import org.scalatest.matchers.should.Matchers
-
-class ColorTest extends AnyFunSuite with Matchers:
-
-  test("White.opposite returns Black") {
-    Color.White.opposite shouldBe Color.Black
-  }
-
-  test("Black.opposite returns White") {
-    Color.Black.opposite shouldBe Color.White
-  }
-
-  test("White.label returns 'White'") {
-    Color.White.label shouldBe "White"
-  }
-
-  test("Black.label returns 'Black'") {
-    Color.Black.label shouldBe "Black"
-  }

modules/api/src/test/scala/de/nowchess/api/board/PieceTest.scala

@@ -1,60 +0,0 @@
-package de.nowchess.api.board
-
-import org.scalatest.funsuite.AnyFunSuite
-import org.scalatest.matchers.should.Matchers
-
-class PieceTest extends AnyFunSuite with Matchers:
-
-  test("Piece holds color and pieceType") {
-    val p = Piece(Color.White, PieceType.Queen)
-    p.color    shouldBe Color.White
-    p.pieceType shouldBe PieceType.Queen
-  }
-
-  test("WhitePawn convenience constant") {
-    Piece.WhitePawn shouldBe Piece(Color.White, PieceType.Pawn)
-  }
-
-  test("WhiteKnight convenience constant") {
-    Piece.WhiteKnight shouldBe Piece(Color.White, PieceType.Knight)
-  }
-
-  test("WhiteBishop convenience constant") {
-    Piece.WhiteBishop shouldBe Piece(Color.White, PieceType.Bishop)
-  }
-
-  test("WhiteRook convenience constant") {
-    Piece.WhiteRook shouldBe Piece(Color.White, PieceType.Rook)
-  }
-
-  test("WhiteQueen convenience constant") {
-    Piece.WhiteQueen shouldBe Piece(Color.White, PieceType.Queen)
-  }
-
-  test("WhiteKing convenience constant") {
-    Piece.WhiteKing shouldBe Piece(Color.White, PieceType.King)
-  }
-
-  test("BlackPawn convenience constant") {
-    Piece.BlackPawn shouldBe Piece(Color.Black, PieceType.Pawn)
-  }
-
-  test("BlackKnight convenience constant") {
-    Piece.BlackKnight shouldBe Piece(Color.Black, PieceType.Knight)
-  }
-
-  test("BlackBishop convenience constant") {
-    Piece.BlackBishop shouldBe Piece(Color.Black, PieceType.Bishop)
-  }
-
-  test("BlackRook convenience constant") {
-    Piece.BlackRook shouldBe Piece(Color.Black, PieceType.Rook)
-  }
-
-  test("BlackQueen convenience constant") {
-    Piece.BlackQueen shouldBe Piece(Color.Black, PieceType.Queen)
-  }
-
-  test("BlackKing convenience constant") {
-    Piece.BlackKing shouldBe Piece(Color.Black, PieceType.King)
-  }

modules/api/src/test/scala/de/nowchess/api/board/PieceTypeTest.scala

@@ -1,30 +0,0 @@
-package de.nowchess.api.board
-
-import org.scalatest.funsuite.AnyFunSuite
-import org.scalatest.matchers.should.Matchers
-
-class PieceTypeTest extends AnyFunSuite with Matchers:
-
-  test("Pawn.label returns 'Pawn'") {
-    PieceType.Pawn.label shouldBe "Pawn"
-  }
-
-  test("Knight.label returns 'Knight'") {
-    PieceType.Knight.label shouldBe "Knight"
-  }
-
-  test("Bishop.label returns 'Bishop'") {
-    PieceType.Bishop.label shouldBe "Bishop"
-  }
-
-  test("Rook.label returns 'Rook'") {
-    PieceType.Rook.label shouldBe "Rook"
-  }
-
-  test("Queen.label returns 'Queen'") {
-    PieceType.Queen.label shouldBe "Queen"
-  }
-
-  test("King.label returns 'King'") {
-    PieceType.King.label shouldBe "King"
-  }

modules/api/src/test/scala/de/nowchess/api/board/SquareTest.scala

@@ -1,62 +0,0 @@
-package de.nowchess.api.board
-
-import org.scalatest.funsuite.AnyFunSuite
-import org.scalatest.matchers.should.Matchers
-
-class SquareTest extends AnyFunSuite with Matchers:
-
-  test("Square.toString produces lowercase file and rank number") {
-    Square(File.E, Rank.R4).toString shouldBe "e4"
-  }
-
-  test("Square.toString for a1") {
-    Square(File.A, Rank.R1).toString shouldBe "a1"
-  }
-
-  test("Square.toString for h8") {
-    Square(File.H, Rank.R8).toString shouldBe "h8"
-  }
-
-  test("fromAlgebraic parses valid square e4") {
-    Square.fromAlgebraic("e4") shouldBe Some(Square(File.E, Rank.R4))
-  }
-
-  test("fromAlgebraic parses valid square a1") {
-    Square.fromAlgebraic("a1") shouldBe Some(Square(File.A, Rank.R1))
-  }
-
-  test("fromAlgebraic parses valid square h8") {
-    Square.fromAlgebraic("h8") shouldBe Some(Square(File.H, Rank.R8))
-  }
-
-  test("fromAlgebraic is case-insensitive for file") {
-    Square.fromAlgebraic("E4") shouldBe Some(Square(File.E, Rank.R4))
-  }
-
-  test("fromAlgebraic returns None for empty string") {
-    Square.fromAlgebraic("") shouldBe None
-  }
-
-  test("fromAlgebraic returns None for string too short") {
-    Square.fromAlgebraic("e") shouldBe None
-  }
-
-  test("fromAlgebraic returns None for string too long") {
-    Square.fromAlgebraic("e42") shouldBe None
-  }
-
-  test("fromAlgebraic returns None for invalid file character") {
-    Square.fromAlgebraic("z4") shouldBe None
-  }
-
-  test("fromAlgebraic returns None for non-digit rank") {
-    Square.fromAlgebraic("ex") shouldBe None
-  }
-
-  test("fromAlgebraic returns None for rank 0") {
-    Square.fromAlgebraic("e0") shouldBe None
-  }
-
-  test("fromAlgebraic returns None for rank 9") {
-    Square.fromAlgebraic("e9") shouldBe None
-  }

modules/api/src/test/scala/de/nowchess/api/game/GameStateTest.scala

@@ -1,77 +0,0 @@
-package de.nowchess.api.game
-
-import de.nowchess.api.board.Color
-import org.scalatest.funsuite.AnyFunSuite
-import org.scalatest.matchers.should.Matchers
-
-class GameStateTest extends AnyFunSuite with Matchers:
-
-  test("CastlingRights.None has both flags false") {
-    CastlingRights.None.kingSide  shouldBe false
-    CastlingRights.None.queenSide shouldBe false
-  }
-
-  test("CastlingRights.Both has both flags true") {
-    CastlingRights.Both.kingSide  shouldBe true
-    CastlingRights.Both.queenSide shouldBe true
-  }
-
-  test("CastlingRights constructor sets fields") {
-    val cr = CastlingRights(kingSide = true, queenSide = false)
-    cr.kingSide  shouldBe true
-    cr.queenSide shouldBe false
-  }
-
-  test("GameResult cases exist") {
-    GameResult.WhiteWins shouldBe GameResult.WhiteWins
-    GameResult.BlackWins shouldBe GameResult.BlackWins
-    GameResult.Draw      shouldBe GameResult.Draw
-  }
-
-  test("GameStatus.NotStarted") {
-    GameStatus.NotStarted shouldBe GameStatus.NotStarted
-  }
-
-  test("GameStatus.InProgress") {
-    GameStatus.InProgress shouldBe GameStatus.InProgress
-  }
-
-  test("GameStatus.Finished carries result") {
-    val status = GameStatus.Finished(GameResult.Draw)
-    status shouldBe GameStatus.Finished(GameResult.Draw)
-    status match
-      case GameStatus.Finished(r) => r shouldBe GameResult.Draw
-      case _                      => fail("expected Finished")
-  }
-
-  test("GameState.initial has standard FEN piece placement") {
-    GameState.initial.piecePlacement shouldBe "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR"
-  }
-
-  test("GameState.initial active color is White") {
-    GameState.initial.activeColor shouldBe Color.White
-  }
-
-  test("GameState.initial white has full castling rights") {
-    GameState.initial.castlingWhite shouldBe CastlingRights.Both
-  }
-
-  test("GameState.initial black has full castling rights") {
-    GameState.initial.castlingBlack shouldBe CastlingRights.Both
-  }
-
-  test("GameState.initial en-passant target is None") {
-    GameState.initial.enPassantTarget shouldBe None
-  }
-
-  test("GameState.initial half-move clock is 0") {
-    GameState.initial.halfMoveClock shouldBe 0
-  }
-
-  test("GameState.initial full-move number is 1") {
-    GameState.initial.fullMoveNumber shouldBe 1
-  }
-
-  test("GameState.initial status is InProgress") {
-    GameState.initial.status shouldBe GameStatus.InProgress
-  }

modules/api/src/test/scala/de/nowchess/api/move/MoveTest.scala

@@ -1,56 +0,0 @@
-package de.nowchess.api.move
-
-import de.nowchess.api.board.{File, Rank, Square}
-import org.scalatest.funsuite.AnyFunSuite
-import org.scalatest.matchers.should.Matchers
-
-class MoveTest extends AnyFunSuite with Matchers:
-
-  private val e2 = Square(File.E, Rank.R2)
-  private val e4 = Square(File.E, Rank.R4)
-
-  test("Move defaults moveType to Normal") {
-    val m = Move(e2, e4)
-    m.moveType shouldBe MoveType.Normal
-  }
-
-  test("Move stores from and to squares") {
-    val m = Move(e2, e4)
-    m.from shouldBe e2
-    m.to   shouldBe e4
-  }
-
-  test("Move with CastleKingside moveType") {
-    val m = Move(e2, e4, MoveType.CastleKingside)
-    m.moveType shouldBe MoveType.CastleKingside
-  }
-
-  test("Move with CastleQueenside moveType") {
-    val m = Move(e2, e4, MoveType.CastleQueenside)
-    m.moveType shouldBe MoveType.CastleQueenside
-  }
-
-  test("Move with EnPassant moveType") {
-    val m = Move(e2, e4, MoveType.EnPassant)
-    m.moveType shouldBe MoveType.EnPassant
-  }
-
-  test("Move with Promotion to Queen") {
-    val m = Move(e2, e4, MoveType.Promotion(PromotionPiece.Queen))
-    m.moveType shouldBe MoveType.Promotion(PromotionPiece.Queen)
-  }
-
-  test("Move with Promotion to Knight") {
-    val m = Move(e2, e4, MoveType.Promotion(PromotionPiece.Knight))
-    m.moveType shouldBe MoveType.Promotion(PromotionPiece.Knight)
-  }
-
-  test("Move with Promotion to Bishop") {
-    val m = Move(e2, e4, MoveType.Promotion(PromotionPiece.Bishop))
-    m.moveType shouldBe MoveType.Promotion(PromotionPiece.Bishop)
-  }
-
-  test("Move with Promotion to Rook") {
-    val m = Move(e2, e4, MoveType.Promotion(PromotionPiece.Rook))
-    m.moveType shouldBe MoveType.Promotion(PromotionPiece.Rook)
-  }

modules/api/src/test/scala/de/nowchess/api/player/PlayerInfoTest.scala

@@ -1,23 +0,0 @@
-package de.nowchess.api.player
-
-import org.scalatest.funsuite.AnyFunSuite
-import org.scalatest.matchers.should.Matchers
-
-class PlayerInfoTest extends AnyFunSuite with Matchers:
-
-  test("PlayerId.apply wraps a string") {
-    val id = PlayerId("player-123")
-    id.value shouldBe "player-123"
-  }
-
-  test("PlayerId.value unwraps to original string") {
-    val raw = "abc-456"
-    PlayerId(raw).value shouldBe raw
-  }
-
-  test("PlayerInfo holds id and displayName") {
-    val id   = PlayerId("p1")
-    val info = PlayerInfo(id, "Magnus")
-    info.id.value      shouldBe "p1"
-    info.displayName   shouldBe "Magnus"
-  }

modules/api/src/test/scala/de/nowchess/api/response/ApiResponseTest.scala

@@ -1,62 +0,0 @@
-package de.nowchess.api.response
-
-import org.scalatest.funsuite.AnyFunSuite
-import org.scalatest.matchers.should.Matchers
-
-class ApiResponseTest extends AnyFunSuite with Matchers:
-
-  test("ApiResponse.Success carries data") {
-    val r = ApiResponse.Success(42)
-    r.data shouldBe 42
-  }
-
-  test("ApiResponse.Failure carries error list") {
-    val err = ApiError("CODE", "msg")
-    val r   = ApiResponse.Failure(List(err))
-    r.errors shouldBe List(err)
-  }
-
-  test("ApiResponse.error creates single-error Failure") {
-    val err = ApiError("NOT_FOUND", "not found")
-    val f   = ApiResponse.error(err)
-    f shouldBe ApiResponse.Failure(List(err))
-  }
-
-  test("ApiError holds code and message") {
-    val e = ApiError("CODE", "message")
-    e.code    shouldBe "CODE"
-    e.message shouldBe "message"
-    e.field   shouldBe None
-  }
-
-  test("ApiError holds optional field") {
-    val e = ApiError("INVALID", "bad value", Some("email"))
-    e.field shouldBe Some("email")
-  }
-
-  test("Pagination.totalPages with exact division") {
-    Pagination(page = 0, pageSize = 10, totalItems = 30).totalPages shouldBe 3
-  }
-
-  test("Pagination.totalPages rounds up") {
-    Pagination(page = 0, pageSize = 10, totalItems = 25).totalPages shouldBe 3
-  }
-
-  test("Pagination.totalPages is 0 when totalItems is 0") {
-    Pagination(page = 0, pageSize = 10, totalItems = 0).totalPages shouldBe 0
-  }
-
-  test("Pagination.totalPages is 0 when pageSize is 0") {
-    Pagination(page = 0, pageSize = 0, totalItems = 100).totalPages shouldBe 0
-  }
-
-  test("Pagination.totalPages is 0 when pageSize is negative") {
-    Pagination(page = 0, pageSize = -1, totalItems = 100).totalPages shouldBe 0
-  }
-
-  test("PagedResponse holds items and pagination") {
-    val pagination = Pagination(page = 1, pageSize = 5, totalItems = 20)
-    val pr         = PagedResponse(List("a", "b"), pagination)
-    pr.items      shouldBe List("a", "b")
-    pr.pagination shouldBe pagination
-  }

modules/api/versions.env

@@ -1,3 +0,0 @@
-MAJOR=0
-MINOR=0
-PATCH=8

modules/core/CHANGELOG.md

@@ -1,144 +0,0 @@
-##  (2026-03-27)
-
-### Features
-
-* add GameRules stub with PositionStatus enum ([76d4168](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/76d4168038de23e5d6083d4e8f0504fbf31d15a3))
-* add MovedInCheck/Checkmate/Stalemate MoveResult variants (stub dispatch) ([8b7ec57](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/8b7ec57e5ea6ee1615a1883848a426dc07d26364))
-* implement GameRules with isInCheck, legalMoves, gameStatus ([94a02ff](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/94a02ff6849436d9496c70a0f16c21666dae8e4e))
-* implement legal castling ([#1](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/1)) ([00d326c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/00d326c1ba67711fbe180f04e1100c3f01dd0254))
-* wire check/checkmate/stalemate into processMove and gameLoop ([5264a22](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/5264a225418b885c5e6ea6411b96f85e38837f6c))
-
-### Bug Fixes
-
-* add missing kings to gameLoop capture test board ([aedd787](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/aedd787b77203c2af934751dba7b784eaf165032))
-* correct test board positions and captureOutput/withInput interaction ([f0481e2](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/f0481e2561b779df00925b46ee281dc36a795150))
-* update main class path in build configuration and adjust VCS directory mapping ([7b1f8b1](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/7b1f8b117623d327232a1a92a8a44d18582e0189))
-##  (2026-03-28)
-
-### Features
-
-* add GameRules stub with PositionStatus enum ([76d4168](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/76d4168038de23e5d6083d4e8f0504fbf31d15a3))
-* add MovedInCheck/Checkmate/Stalemate MoveResult variants (stub dispatch) ([8b7ec57](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/8b7ec57e5ea6ee1615a1883848a426dc07d26364))
-* implement GameRules with isInCheck, legalMoves, gameStatus ([94a02ff](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/94a02ff6849436d9496c70a0f16c21666dae8e4e))
-* implement legal castling ([#1](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/1)) ([00d326c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/00d326c1ba67711fbe180f04e1100c3f01dd0254))
-* wire check/checkmate/stalemate into processMove and gameLoop ([5264a22](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/5264a225418b885c5e6ea6411b96f85e38837f6c))
-
-### Bug Fixes
-
-* add missing kings to gameLoop capture test board ([aedd787](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/aedd787b77203c2af934751dba7b784eaf165032))
-* correct test board positions and captureOutput/withInput interaction ([f0481e2](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/f0481e2561b779df00925b46ee281dc36a795150))
-* update main class path in build configuration and adjust VCS directory mapping ([7b1f8b1](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/7b1f8b117623d327232a1a92a8a44d18582e0189))
-##  (2026-03-29)
-
-### Features
-
-* add GameRules stub with PositionStatus enum ([76d4168](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/76d4168038de23e5d6083d4e8f0504fbf31d15a3))
-* add MovedInCheck/Checkmate/Stalemate MoveResult variants (stub dispatch) ([8b7ec57](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/8b7ec57e5ea6ee1615a1883848a426dc07d26364))
-* implement GameRules with isInCheck, legalMoves, gameStatus ([94a02ff](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/94a02ff6849436d9496c70a0f16c21666dae8e4e))
-* implement legal castling ([#1](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/1)) ([00d326c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/00d326c1ba67711fbe180f04e1100c3f01dd0254))
-* NCS-6 Implementing FEN & PGN ([#7](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/7)) ([f28e69d](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/f28e69dc181416aa2f221fdc4b45c2cda5efbf07))
-* wire check/checkmate/stalemate into processMove and gameLoop ([5264a22](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/5264a225418b885c5e6ea6411b96f85e38837f6c))
-
-### Bug Fixes
-
-* add missing kings to gameLoop capture test board ([aedd787](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/aedd787b77203c2af934751dba7b784eaf165032))
-* correct test board positions and captureOutput/withInput interaction ([f0481e2](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/f0481e2561b779df00925b46ee281dc36a795150))
-* update main class path in build configuration and adjust VCS directory mapping ([7b1f8b1](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/7b1f8b117623d327232a1a92a8a44d18582e0189))
-##  (2026-03-29)
-
-### Features
-
-* add GameRules stub with PositionStatus enum ([76d4168](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/76d4168038de23e5d6083d4e8f0504fbf31d15a3))
-* add MovedInCheck/Checkmate/Stalemate MoveResult variants (stub dispatch) ([8b7ec57](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/8b7ec57e5ea6ee1615a1883848a426dc07d26364))
-* implement GameRules with isInCheck, legalMoves, gameStatus ([94a02ff](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/94a02ff6849436d9496c70a0f16c21666dae8e4e))
-* implement legal castling ([#1](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/1)) ([00d326c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/00d326c1ba67711fbe180f04e1100c3f01dd0254))
-* NCS-6 Implementing FEN & PGN ([#7](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/7)) ([f28e69d](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/f28e69dc181416aa2f221fdc4b45c2cda5efbf07))
-* NCS-9 En passant implementation ([#8](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/8)) ([919beb3](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/919beb3b4bfa8caf2f90976a415fe9b19b7e9747))
-* wire check/checkmate/stalemate into processMove and gameLoop ([5264a22](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/5264a225418b885c5e6ea6411b96f85e38837f6c))
-
-### Bug Fixes
-
-* add missing kings to gameLoop capture test board ([aedd787](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/aedd787b77203c2af934751dba7b784eaf165032))
-* correct test board positions and captureOutput/withInput interaction ([f0481e2](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/f0481e2561b779df00925b46ee281dc36a795150))
-* update main class path in build configuration and adjust VCS directory mapping ([7b1f8b1](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/7b1f8b117623d327232a1a92a8a44d18582e0189))
-##  (2026-03-31)
-
-### Features
-
-* add GameRules stub with PositionStatus enum ([76d4168](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/76d4168038de23e5d6083d4e8f0504fbf31d15a3))
-* add MovedInCheck/Checkmate/Stalemate MoveResult variants (stub dispatch) ([8b7ec57](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/8b7ec57e5ea6ee1615a1883848a426dc07d26364))
-* implement GameRules with isInCheck, legalMoves, gameStatus ([94a02ff](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/94a02ff6849436d9496c70a0f16c21666dae8e4e))
-* implement legal castling ([#1](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/1)) ([00d326c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/00d326c1ba67711fbe180f04e1100c3f01dd0254))
-* NCS-16 Core Separation via Patterns ([#10](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/10)) ([1361dfc](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/1361dfc89553b146864fb8ff3526cf12cf3f293a))
-* NCS-6 Implementing FEN & PGN ([#7](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/7)) ([f28e69d](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/f28e69dc181416aa2f221fdc4b45c2cda5efbf07))
-* NCS-9 En passant implementation ([#8](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/8)) ([919beb3](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/919beb3b4bfa8caf2f90976a415fe9b19b7e9747))
-* wire check/checkmate/stalemate into processMove and gameLoop ([5264a22](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/5264a225418b885c5e6ea6411b96f85e38837f6c))
-
-### Bug Fixes
-
-* add missing kings to gameLoop capture test board ([aedd787](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/aedd787b77203c2af934751dba7b784eaf165032))
-* correct test board positions and captureOutput/withInput interaction ([f0481e2](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/f0481e2561b779df00925b46ee281dc36a795150))
-* update main class path in build configuration and adjust VCS directory mapping ([7b1f8b1](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/7b1f8b117623d327232a1a92a8a44d18582e0189))
-##  (2026-04-01)
-
-### Features
-
-* add GameRules stub with PositionStatus enum ([76d4168](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/76d4168038de23e5d6083d4e8f0504fbf31d15a3))
-* add MovedInCheck/Checkmate/Stalemate MoveResult variants (stub dispatch) ([8b7ec57](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/8b7ec57e5ea6ee1615a1883848a426dc07d26364))
-* implement GameRules with isInCheck, legalMoves, gameStatus ([94a02ff](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/94a02ff6849436d9496c70a0f16c21666dae8e4e))
-* implement legal castling ([#1](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/1)) ([00d326c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/00d326c1ba67711fbe180f04e1100c3f01dd0254))
-* NCS-10 Implement Pawn Promotion ([#12](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/12)) ([13bfc16](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/13bfc16cfe25db78ec607db523ca6d993c13430c))
-* NCS-16 Core Separation via Patterns ([#10](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/10)) ([1361dfc](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/1361dfc89553b146864fb8ff3526cf12cf3f293a))
-* NCS-6 Implementing FEN & PGN ([#7](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/7)) ([f28e69d](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/f28e69dc181416aa2f221fdc4b45c2cda5efbf07))
-* NCS-9 En passant implementation ([#8](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/8)) ([919beb3](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/919beb3b4bfa8caf2f90976a415fe9b19b7e9747))
-* wire check/checkmate/stalemate into processMove and gameLoop ([5264a22](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/5264a225418b885c5e6ea6411b96f85e38837f6c))
-
-### Bug Fixes
-
-* add missing kings to gameLoop capture test board ([aedd787](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/aedd787b77203c2af934751dba7b784eaf165032))
-* correct test board positions and captureOutput/withInput interaction ([f0481e2](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/f0481e2561b779df00925b46ee281dc36a795150))
-* update main class path in build configuration and adjust VCS directory mapping ([7b1f8b1](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/7b1f8b117623d327232a1a92a8a44d18582e0189))
-* update move validation to check for king safety ([#13](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/13)) ([e5e20c5](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/e5e20c566e368b12ca1dc59680c34e9112bf6762))
-##  (2026-04-01)
-
-### Features
-
-* add GameRules stub with PositionStatus enum ([76d4168](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/76d4168038de23e5d6083d4e8f0504fbf31d15a3))
-* add MovedInCheck/Checkmate/Stalemate MoveResult variants (stub dispatch) ([8b7ec57](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/8b7ec57e5ea6ee1615a1883848a426dc07d26364))
-* implement GameRules with isInCheck, legalMoves, gameStatus ([94a02ff](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/94a02ff6849436d9496c70a0f16c21666dae8e4e))
-* implement legal castling ([#1](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/1)) ([00d326c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/00d326c1ba67711fbe180f04e1100c3f01dd0254))
-* NCS-10 Implement Pawn Promotion ([#12](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/12)) ([13bfc16](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/13bfc16cfe25db78ec607db523ca6d993c13430c))
-* NCS-11 50-move rule ([#9](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/9)) ([412ed98](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/412ed986a95703a3b282276540153480ceed229d))
-* NCS-16 Core Separation via Patterns ([#10](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/10)) ([1361dfc](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/1361dfc89553b146864fb8ff3526cf12cf3f293a))
-* NCS-6 Implementing FEN & PGN ([#7](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/7)) ([f28e69d](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/f28e69dc181416aa2f221fdc4b45c2cda5efbf07))
-* NCS-9 En passant implementation ([#8](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/8)) ([919beb3](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/919beb3b4bfa8caf2f90976a415fe9b19b7e9747))
-* wire check/checkmate/stalemate into processMove and gameLoop ([5264a22](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/5264a225418b885c5e6ea6411b96f85e38837f6c))
-
-### Bug Fixes
-
-* add missing kings to gameLoop capture test board ([aedd787](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/aedd787b77203c2af934751dba7b784eaf165032))
-* correct test board positions and captureOutput/withInput interaction ([f0481e2](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/f0481e2561b779df00925b46ee281dc36a795150))
-* update main class path in build configuration and adjust VCS directory mapping ([7b1f8b1](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/7b1f8b117623d327232a1a92a8a44d18582e0189))
-* update move validation to check for king safety ([#13](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/13)) ([e5e20c5](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/e5e20c566e368b12ca1dc59680c34e9112bf6762))
-##  (2026-04-01)
-
-### Features
-
-* add GameRules stub with PositionStatus enum ([76d4168](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/76d4168038de23e5d6083d4e8f0504fbf31d15a3))
-* add MovedInCheck/Checkmate/Stalemate MoveResult variants (stub dispatch) ([8b7ec57](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/8b7ec57e5ea6ee1615a1883848a426dc07d26364))
-* implement GameRules with isInCheck, legalMoves, gameStatus ([94a02ff](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/94a02ff6849436d9496c70a0f16c21666dae8e4e))
-* implement legal castling ([#1](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/1)) ([00d326c](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/00d326c1ba67711fbe180f04e1100c3f01dd0254))
-* NCS-10 Implement Pawn Promotion ([#12](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/12)) ([13bfc16](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/13bfc16cfe25db78ec607db523ca6d993c13430c))
-* NCS-11 50-move rule ([#9](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/9)) ([412ed98](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/412ed986a95703a3b282276540153480ceed229d))
-* NCS-16 Core Separation via Patterns ([#10](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/10)) ([1361dfc](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/1361dfc89553b146864fb8ff3526cf12cf3f293a))
-* NCS-17 Implement basic ScalaFX UI ([#14](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/14)) ([3ff8031](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/3ff80318b4f16c59733a46498581a5c27f048287))
-* NCS-6 Implementing FEN & PGN ([#7](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/7)) ([f28e69d](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/f28e69dc181416aa2f221fdc4b45c2cda5efbf07))
-* NCS-9 En passant implementation ([#8](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/8)) ([919beb3](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/919beb3b4bfa8caf2f90976a415fe9b19b7e9747))
-* wire check/checkmate/stalemate into processMove and gameLoop ([5264a22](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/5264a225418b885c5e6ea6411b96f85e38837f6c))
-
-### Bug Fixes
-
-* add missing kings to gameLoop capture test board ([aedd787](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/aedd787b77203c2af934751dba7b784eaf165032))
-* correct test board positions and captureOutput/withInput interaction ([f0481e2](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/f0481e2561b779df00925b46ee281dc36a795150))
-* update main class path in build configuration and adjust VCS directory mapping ([7b1f8b1](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/7b1f8b117623d327232a1a92a8a44d18582e0189))
-* update move validation to check for king safety ([#13](https://git.janis-eccarius.de/NowChess/NowChessSystems/issues/13)) ([e5e20c5](https://git.janis-eccarius.de/NowChess/NowChessSystems/commit/e5e20c566e368b12ca1dc59680c34e9112bf6762))

modules/core/build.gradle.kts

@@ -23,7 +23,7 @@ scoverage {
 }
 
 application {
-    mainClass.set("de.nowchess.chess.Main")
+    mainClass.set("de.nowchess.chess.chessMain")
 }
 
 tasks.withType<ScalaCompile> {
@@ -52,17 +52,16 @@ dependencies {
 
     testImplementation(platform("org.junit:junit-bom:5.13.4"))
     testImplementation("org.junit.jupiter:junit-jupiter")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     testImplementation("org.scalatest:scalatest_3:${versions["SCALATEST"]!!}")
     testImplementation("co.helmethair:scalatest-junit-runner:${versions["SCALATEST_JUNIT"]!!}")
-
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 tasks.test {
     useJUnitPlatform {
         includeEngines("scalatest")
         testLogging {
-            events("skipped", "failed")
+            events("passed", "skipped", "failed")
         }
     }
     finalizedBy(tasks.reportScoverage)

modules/core/src/main/scala/de/nowchess/chess/Main.scala

@@ -0,0 +1,11 @@
+package de.nowchess.chess
+
+import de.nowchess.api.board.Color
+import de.nowchess.chess.controller.GameController
+import de.nowchess.chess.logic.GameContext
+
+object Main {
+  def main(args: Array[String]): Unit =
+    println("NowChess TUI — type moves in coordinate notation (e.g. e2e4). Type 'quit' to exit.")
+    GameController.gameLoop(GameContext.initial, Color.White)
+}

modules/core/src/main/scala/de/nowchess/chess/command/Command.scala

@@ -1,64 +0,0 @@
-package de.nowchess.chess.command
-
-import de.nowchess.api.board.{Square, Board, Color, Piece}
-import de.nowchess.chess.logic.GameHistory
-
-/** Marker trait for all commands that can be executed and undone.
- *  Commands encapsulate user actions and game state transitions.
- */
-trait Command:
-  /** Execute the command and return true if successful, false otherwise. */
-  def execute(): Boolean
-
-  /** Undo the command and return true if successful, false otherwise. */
-  def undo(): Boolean
-
-  /** A human-readable description of this command. */
-  def description: String
-
-/** Command to move a piece from one square to another.
- *  Stores the move result so undo can restore previous state.
- */
-case class MoveCommand(
-  from: Square,
-  to: Square,
-  moveResult: Option[MoveResult] = None,
-  previousBoard: Option[Board] = None,
-  previousHistory: Option[GameHistory] = None,
-  previousTurn: Option[Color] = None
-) extends Command:
-
-  override def execute(): Boolean =
-    moveResult.isDefined
-
-  override def undo(): Boolean =
-    previousBoard.isDefined && previousHistory.isDefined && previousTurn.isDefined
-
-  override def description: String = s"Move from $from to $to"
-
-// Sealed hierarchy of move outcomes (for tracking state changes)
-sealed trait MoveResult
-object MoveResult:
-  case class Successful(newBoard: Board, newHistory: GameHistory, newTurn: Color, captured: Option[Piece]) extends MoveResult
-  case object InvalidFormat extends MoveResult
-  case object InvalidMove extends MoveResult
-
-/** Command to quit the game. */
-case class QuitCommand() extends Command:
-  override def execute(): Boolean = true
-  override def undo(): Boolean = false
-  override def description: String = "Quit game"
-
-/** Command to reset the board to initial position. */
-case class ResetCommand(
-  previousBoard: Option[Board] = None,
-  previousHistory: Option[GameHistory] = None,
-  previousTurn: Option[Color] = None
-) extends Command:
-
-  override def execute(): Boolean = true
-
-  override def undo(): Boolean =
-    previousBoard.isDefined && previousHistory.isDefined && previousTurn.isDefined
-
-  override def description: String = "Reset board"

modules/core/src/main/scala/de/nowchess/chess/command/CommandInvoker.scala

@@ -1,73 +0,0 @@
-package de.nowchess.chess.command
-
-/** Manages command execution and history for undo/redo support. */
-class CommandInvoker:
-  private val executedCommands = scala.collection.mutable.ListBuffer[Command]()
-  private var currentIndex = -1
-
-  /** Execute a command and add it to history.
-   *  Discards any redo history if not at the end of the stack.
-   */
-  def execute(command: Command): Boolean = synchronized {
-    if command.execute() then
-      // Remove any commands after current index (redo stack is discarded)
-      while currentIndex < executedCommands.size - 1 do
-        executedCommands.remove(executedCommands.size - 1)
-      executedCommands += command
-      currentIndex += 1
-      true
-    else
-      false
-  }
-
-  /** Undo the last executed command if possible. */
-  def undo(): Boolean = synchronized {
-    if currentIndex >= 0 && currentIndex < executedCommands.size then
-      val command = executedCommands(currentIndex)
-      if command.undo() then
-        currentIndex -= 1
-        true
-      else
-        false
-    else
-      false
-  }
-
-  /** Redo the next command in history if available. */
-  def redo(): Boolean = synchronized {
-    if currentIndex + 1 < executedCommands.size then
-      val command = executedCommands(currentIndex + 1)
-      if command.execute() then
-        currentIndex += 1
-        true
-      else
-        false
-    else
-      false
-  }
-
-  /** Get the history of all executed commands. */
-  def history: List[Command] = synchronized {
-    executedCommands.toList
-  }
-
-  /** Get the current position in command history. */
-  def getCurrentIndex: Int = synchronized {
-    currentIndex
-  }
-
-  /** Clear all command history. */
-  def clear(): Unit = synchronized {
-    executedCommands.clear()
-    currentIndex = -1
-  }
-
-  /** Check if undo is available. */
-  def canUndo: Boolean = synchronized {
-    currentIndex >= 0
-  }
-
-  /** Check if redo is available. */
-  def canRedo: Boolean = synchronized {
-    currentIndex + 1 < executedCommands.size
-  }

modules/core/src/main/scala/de/nowchess/chess/controller/GameController.scala

@@ -1,8 +1,10 @@
 package de.nowchess.chess.controller
 
-import de.nowchess.api.board.{Board, Color, File, Piece, PieceType, Rank, Square}
+import scala.io.StdIn
-import de.nowchess.api.move.PromotionPiece
+import de.nowchess.api.board.{Board, Color, File, Piece, Rank, Square}
-import de.nowchess.chess.logic.*
+import de.nowchess.api.game.CastlingRights
+import de.nowchess.chess.logic.{GameContext, MoveValidator, GameRules, PositionStatus, CastleSide, withCastle}
+import de.nowchess.chess.view.Renderer
 
 // ---------------------------------------------------------------------------
 // Result ADT returned by the pure processMove function
@@ -15,16 +17,8 @@ object MoveResult:
   case object NoPiece                                                                   extends MoveResult
   case object WrongColor                                                                extends MoveResult
   case object IllegalMove                                                               extends MoveResult
-  case class  PromotionRequired(
+  case class  Moved(newCtx: GameContext, captured: Option[Piece], newTurn: Color)      extends MoveResult
-    from: Square,
+  case class  MovedInCheck(newCtx: GameContext, captured: Option[Piece], newTurn: Color) extends MoveResult
-    to: Square,
-    boardBefore: Board,
-    historyBefore: GameHistory,
-    captured: Option[Piece],
-    turn: Color
-  ) extends MoveResult
-  case class  Moved(newBoard: Board, newHistory: GameHistory, captured: Option[Piece], newTurn: Color)      extends MoveResult
-  case class  MovedInCheck(newBoard: Board, newHistory: GameHistory, captured: Option[Piece], newTurn: Color) extends MoveResult
   case class  Checkmate(winner: Color)                                                  extends MoveResult
   case object Stalemate                                                                 extends MoveResult
 
@@ -37,70 +31,106 @@ object GameController:
   /** Pure function: interprets one raw input line against the current game context.
    *  Has no I/O side effects — all output must be handled by the caller.
    */
-  def processMove(board: Board, history: GameHistory, turn: Color, raw: String): MoveResult =
+  def processMove(ctx: GameContext, turn: Color, raw: String): MoveResult =
     raw.trim match
-      case "quit" | "q" => MoveResult.Quit
+      case "quit" | "q" =>
+        MoveResult.Quit
       case trimmed =>
         Parser.parseMove(trimmed) match
-          case None              => MoveResult.InvalidFormat(trimmed)
+          case None =>
-          case Some((from, to))  => validateAndApply(board, history, turn, from, to)
+            MoveResult.InvalidFormat(trimmed)
+          case Some((from, to)) =>
+            ctx.board.pieceAt(from) match
+              case None =>
+                MoveResult.NoPiece
+              case Some(piece) if piece.color != turn =>
+                MoveResult.WrongColor
+              case Some(_) =>
+                if !MoveValidator.isLegal(ctx, from, to) then
+                  MoveResult.IllegalMove
+                else
+                  val castleOpt = if MoveValidator.isCastle(ctx.board, from, to)
+                                  then Some(MoveValidator.castleSide(from, to))
+                                  else None
+                  val (newBoard, captured) = castleOpt match
+                    case Some(side) => (ctx.board.withCastle(turn, side), None)
+                    case None       => ctx.board.withMove(from, to)
+                  val newCtx = applyRightsRevocation(
+                    ctx.copy(board = newBoard), turn, from, to, castleOpt
+                  )
+                  GameRules.gameStatus(newCtx, turn.opposite) match
+                    case PositionStatus.Normal  => MoveResult.Moved(newCtx, captured, turn.opposite)
+                    case PositionStatus.InCheck => MoveResult.MovedInCheck(newCtx, captured, turn.opposite)
+                    case PositionStatus.Mated   => MoveResult.Checkmate(turn)
+                    case PositionStatus.Drawn   => MoveResult.Stalemate
 
-  /** Apply a previously detected promotion move with the chosen piece.
+  private def applyRightsRevocation(
-   *  Called after processMove returned PromotionRequired.
+    ctx: GameContext,
-   */
+    turn: Color,
-  def completePromotion(
-    board: Board,
-    history: GameHistory,
     from: Square,
     to: Square,
-    piece: PromotionPiece,
+    castle: Option[CastleSide]
-    turn: Color
+  ): GameContext =
-  ): MoveResult =
+    // Step 1: Revoke all rights for a castling move (idempotent with step 2)
-    val (boardAfterMove, captured) = board.withMove(from, to)
+    val ctx0 = castle.fold(ctx)(_ => ctx.withUpdatedRights(turn, CastlingRights.None))
-    val promotedPieceType = piece match
-      case PromotionPiece.Queen  => PieceType.Queen
-      case PromotionPiece.Rook   => PieceType.Rook
-      case PromotionPiece.Bishop => PieceType.Bishop
-      case PromotionPiece.Knight => PieceType.Knight
-    val newBoard    = boardAfterMove.updated(to, Piece(turn, promotedPieceType))
-    // Promotion is always a pawn move → clock resets
-    val newHistory = history.addMove(from, to, None, Some(piece), wasPawnMove = true)
-    toMoveResult(newBoard, newHistory, captured, turn)
 
-  // ---------------------------------------------------------------------------
+    // Step 2: Source-square revocation
-  // Private helpers
+    val ctx1 = from match
-  // ---------------------------------------------------------------------------
+      case Square(File.E, Rank.R1) => ctx0.withUpdatedRights(Color.White, CastlingRights.None)
+      case Square(File.E, Rank.R8) => ctx0.withUpdatedRights(Color.Black, CastlingRights.None)
+      case Square(File.A, Rank.R1) => ctx0.withUpdatedRights(Color.White, ctx0.whiteCastling.copy(queenSide = false))
+      case Square(File.H, Rank.R1) => ctx0.withUpdatedRights(Color.White, ctx0.whiteCastling.copy(kingSide  = false))
+      case Square(File.A, Rank.R8) => ctx0.withUpdatedRights(Color.Black, ctx0.blackCastling.copy(queenSide = false))
+      case Square(File.H, Rank.R8) => ctx0.withUpdatedRights(Color.Black, ctx0.blackCastling.copy(kingSide  = false))
+      case _                       => ctx0
 
-  private def validateAndApply(board: Board, history: GameHistory, turn: Color, from: Square, to: Square): MoveResult =
+    // Step 3: Destination-square revocation (enemy captures a rook on its home square)
-    board.pieceAt(from) match
+    to match
-      case None                              => MoveResult.NoPiece
+      case Square(File.A, Rank.R1) => ctx1.withUpdatedRights(Color.White, ctx1.whiteCastling.copy(queenSide = false))
-      case Some(piece) if piece.color != turn => MoveResult.WrongColor
+      case Square(File.H, Rank.R1) => ctx1.withUpdatedRights(Color.White, ctx1.whiteCastling.copy(kingSide  = false))
-      case Some(_) =>
+      case Square(File.A, Rank.R8) => ctx1.withUpdatedRights(Color.Black, ctx1.blackCastling.copy(queenSide = false))
-        if !GameRules.legalMoves(board, history, turn).contains(from -> to) then MoveResult.IllegalMove
+      case Square(File.H, Rank.R8) => ctx1.withUpdatedRights(Color.Black, ctx1.blackCastling.copy(kingSide  = false))
-        else if MoveValidator.isPromotionMove(board, from, to) then
+      case _                       => ctx1
-          MoveResult.PromotionRequired(from, to, board, history, board.pieceAt(to), turn)
-        else applyNormalMove(board, history, turn, from, to)
 
-  private def applyNormalMove(board: Board, history: GameHistory, turn: Color, from: Square, to: Square): MoveResult =
+  /** Thin I/O shell: renders the board, reads a line, delegates to processMove,
-    val castleOpt              = Option.when(MoveValidator.isCastle(board, from, to))(MoveValidator.castleSide(from, to))
+   *  prints the outcome, and recurses until the game ends.
-    val isEP                   = EnPassantCalculator.isEnPassant(board, history, from, to)
+   */
-    val (newBoard, captured)   = castleOpt match
+  def gameLoop(ctx: GameContext, turn: Color): Unit =
-      case Some(side) => (board.withCastle(turn, side), None)
+    println()
-      case None =>
+    print(Renderer.render(ctx.board))
-        val (b, cap) = board.withMove(from, to)
+    println(s"${turn.label}'s turn. Enter move: ")
-        if isEP then
+    val input = Option(StdIn.readLine()).getOrElse("quit").trim
-          val capturedSq = EnPassantCalculator.capturedPawnSquare(to, turn)
+    processMove(ctx, turn, input) match
-          (b.removed(capturedSq), board.pieceAt(capturedSq))
+      case MoveResult.Quit =>
-        else (b, cap)
+        println("Game over. Goodbye!")
-    val pieceType   = board.pieceAt(from).map(_.pieceType).getOrElse(PieceType.Pawn)
+      case MoveResult.InvalidFormat(raw) =>
-    val wasPawnMove = pieceType == PieceType.Pawn
+        println(s"Invalid move format '$raw'. Use coordinate notation, e.g. e2e4.")
-    val wasCapture  = captured.isDefined
+        gameLoop(ctx, turn)
-    val newHistory  = history.addMove(from, to, castleOpt, wasPawnMove = wasPawnMove, wasCapture = wasCapture, pieceType = pieceType)
+      case MoveResult.NoPiece =>
-    toMoveResult(newBoard, newHistory, captured, turn)
+        println(s"No piece on ${Parser.parseMove(input).map(_._1).fold("?")(_.toString)}.")
-
+        gameLoop(ctx, turn)
-  private def toMoveResult(newBoard: Board, newHistory: GameHistory, captured: Option[Piece], turn: Color): MoveResult =
+      case MoveResult.WrongColor =>
-    GameRules.gameStatus(newBoard, newHistory, turn.opposite) match
+        println(s"That is not your piece.")
-      case PositionStatus.Normal  => MoveResult.Moved(newBoard, newHistory, captured, turn.opposite)
+        gameLoop(ctx, turn)
-      case PositionStatus.InCheck => MoveResult.MovedInCheck(newBoard, newHistory, captured, turn.opposite)
+      case MoveResult.IllegalMove =>
-      case PositionStatus.Mated   => MoveResult.Checkmate(turn)
+        println(s"Illegal move.")
-      case PositionStatus.Drawn   => MoveResult.Stalemate
+        gameLoop(ctx, turn)
+      case MoveResult.Moved(newCtx, captured, newTurn) =>
+        val prevTurn = newTurn.opposite
+        captured.foreach: cap =>
+          val toSq = Parser.parseMove(input).map(_._2).fold("?")(_.toString)
+          println(s"${prevTurn.label} captures ${cap.color.label} ${cap.pieceType.label} on $toSq")
+        gameLoop(newCtx, newTurn)
+      case MoveResult.MovedInCheck(newCtx, captured, newTurn) =>
+        val prevTurn = newTurn.opposite
+        captured.foreach: cap =>
+          val toSq = Parser.parseMove(input).map(_._2).fold("?")(_.toString)
+          println(s"${prevTurn.label} captures ${cap.color.label} ${cap.pieceType.label} on $toSq")
+        println(s"${newTurn.label} is in check!")
+        gameLoop(newCtx, newTurn)
+      case MoveResult.Checkmate(winner) =>
+        println(s"Checkmate! ${winner.label} wins.")
+        gameLoop(GameContext.initial, Color.White)
+      case MoveResult.Stalemate =>
+        println("Stalemate! The game is a draw.")
+        gameLoop(GameContext.initial, Color.White)

modules/core/src/main/scala/de/nowchess/chess/engine/GameEngine.scala

@@ -1,352 +0,0 @@
-package de.nowchess.chess.engine
-
-import de.nowchess.api.board.{Board, Color, Piece, Square}
-import de.nowchess.api.move.PromotionPiece
-import de.nowchess.chess.logic.{GameHistory, GameRules, PositionStatus}
-import de.nowchess.chess.controller.{GameController, Parser, MoveResult}
-import de.nowchess.chess.observer.*
-import de.nowchess.chess.command.{CommandInvoker, MoveCommand}
-import de.nowchess.chess.notation.{PgnExporter, PgnParser}
-
-/** Pure game engine that manages game state and notifies observers of state changes.
- *  This class is the single source of truth for the game state.
- *  All user interactions must go through this engine via Commands, and all state changes
- *  are communicated to observers via GameEvent notifications.
- */
-class GameEngine(
-  initialBoard: Board = Board.initial,
-  initialHistory: GameHistory = GameHistory.empty,
-  initialTurn: Color = Color.White,
-  completePromotionFn: (Board, GameHistory, Square, Square, PromotionPiece, Color) => MoveResult =
-    GameController.completePromotion
-) extends Observable:
-  private var currentBoard: Board = initialBoard
-  private var currentHistory: GameHistory = initialHistory
-  private var currentTurn: Color = initialTurn
-  private val invoker = new CommandInvoker()
-
-  /** Inner class for tracking pending promotion state */
-  private case class PendingPromotion(
-    from: Square, to: Square,
-    boardBefore: Board, historyBefore: GameHistory,
-    turn: Color
-  )
-
-  /** Current pending promotion, if any */
-  private var pendingPromotion: Option[PendingPromotion] = None
-
-  /** True if a pawn promotion move is pending and needs a piece choice. */
-  def isPendingPromotion: Boolean = synchronized { pendingPromotion.isDefined }
-
-  // Synchronized accessors for current state
-  def board: Board = synchronized { currentBoard }
-  def history: GameHistory = synchronized { currentHistory }
-  def turn: Color = synchronized { currentTurn }
-
-  /** Check if undo is available. */
-  def canUndo: Boolean = synchronized { invoker.canUndo }
-
-  /** Check if redo is available. */
-  def canRedo: Boolean = synchronized { invoker.canRedo }
-
-  /** Get the command history for inspection (testing/debugging). */
-  def commandHistory: List[de.nowchess.chess.command.Command] = synchronized { invoker.history }
-
-  /** Process a raw move input string and update game state if valid.
-   *  Notifies all observers of the outcome via GameEvent.
-   */
-  def processUserInput(rawInput: String): Unit = synchronized {
-    val trimmed = rawInput.trim.toLowerCase
-    trimmed match
-      case "quit" | "q" =>
-        // Client should handle quit logic; we just return
-        ()
-
-      case "undo" =>
-        performUndo()
-
-      case "redo" =>
-        performRedo()
-
-      case "draw" =>
-        if currentHistory.halfMoveClock >= 100 then
-          currentBoard   = Board.initial
-          currentHistory = GameHistory.empty
-          currentTurn    = Color.White
-          invoker.clear()
-          notifyObservers(DrawClaimedEvent(currentBoard, currentHistory, currentTurn))
-        else
-          notifyObservers(InvalidMoveEvent(
-            currentBoard, currentHistory, currentTurn,
-            "Draw cannot be claimed: the 50-move rule has not been triggered."
-          ))
-
-      case "" =>
-        val event = InvalidMoveEvent(
-          currentBoard,
-          currentHistory,
-          currentTurn,
-          "Please enter a valid move or command."
-        )
-        notifyObservers(event)
-
-      case moveInput =>
-        Parser.parseMove(moveInput) match
-          case None =>
-            notifyObservers(InvalidMoveEvent(
-              currentBoard, currentHistory, currentTurn,
-              s"Invalid move format '$moveInput'. Use coordinate notation, e.g. e2e4."
-            ))
-          case Some((from, to)) =>
-            handleParsedMove(from, to, moveInput)
-  }
-
-  private def handleParsedMove(from: Square, to: Square, moveInput: String): Unit =
-    val cmd = MoveCommand(
-      from = from,
-      to = to,
-      previousBoard = Some(currentBoard),
-      previousHistory = Some(currentHistory),
-      previousTurn = Some(currentTurn)
-    )
-    GameController.processMove(currentBoard, currentHistory, currentTurn, moveInput) match
-      case MoveResult.InvalidFormat(_) | MoveResult.NoPiece | MoveResult.WrongColor | MoveResult.IllegalMove | MoveResult.Quit =>
-        handleFailedMove(moveInput)
-
-      case MoveResult.Moved(newBoard, newHistory, captured, newTurn) =>
-        val updatedCmd = cmd.copy(moveResult = Some(de.nowchess.chess.command.MoveResult.Successful(newBoard, newHistory, newTurn, captured)))
-        invoker.execute(updatedCmd)
-        updateGameState(newBoard, newHistory, newTurn)
-        emitMoveEvent(from.toString, to.toString, captured, newTurn)
-        if currentHistory.halfMoveClock >= 100 then
-          notifyObservers(FiftyMoveRuleAvailableEvent(currentBoard, currentHistory, currentTurn))
-
-      case MoveResult.MovedInCheck(newBoard, newHistory, captured, newTurn) =>
-        val updatedCmd = cmd.copy(moveResult = Some(de.nowchess.chess.command.MoveResult.Successful(newBoard, newHistory, newTurn, captured)))
-        invoker.execute(updatedCmd)
-        updateGameState(newBoard, newHistory, newTurn)
-        emitMoveEvent(from.toString, to.toString, captured, newTurn)
-        notifyObservers(CheckDetectedEvent(currentBoard, currentHistory, currentTurn))
-        if currentHistory.halfMoveClock >= 100 then
-          notifyObservers(FiftyMoveRuleAvailableEvent(currentBoard, currentHistory, currentTurn))
-
-      case MoveResult.Checkmate(winner) =>
-        val updatedCmd = cmd.copy(moveResult = Some(de.nowchess.chess.command.MoveResult.Successful(Board.initial, GameHistory.empty, Color.White, None)))
-        invoker.execute(updatedCmd)
-        currentBoard = Board.initial
-        currentHistory = GameHistory.empty
-        currentTurn = Color.White
-        notifyObservers(CheckmateEvent(currentBoard, currentHistory, currentTurn, winner))
-
-      case MoveResult.Stalemate =>
-        val updatedCmd = cmd.copy(moveResult = Some(de.nowchess.chess.command.MoveResult.Successful(Board.initial, GameHistory.empty, Color.White, None)))
-        invoker.execute(updatedCmd)
-        currentBoard = Board.initial
-        currentHistory = GameHistory.empty
-        currentTurn = Color.White
-        notifyObservers(StalemateEvent(currentBoard, currentHistory, currentTurn))
-
-      case MoveResult.PromotionRequired(promFrom, promTo, boardBefore, histBefore, _, promotingTurn) =>
-        pendingPromotion = Some(PendingPromotion(promFrom, promTo, boardBefore, histBefore, promotingTurn))
-        notifyObservers(PromotionRequiredEvent(currentBoard, currentHistory, currentTurn, promFrom, promTo))
-
-  /** Undo the last move. */
-  def undo(): Unit = synchronized {
-    performUndo()
-  }
-
-  /** Redo the last undone move. */
-  def redo(): Unit = synchronized {
-    performRedo()
-  }
-
-  /** Apply a player's promotion piece choice.
-   *  Must only be called when isPendingPromotion is true.
-   */
-  def completePromotion(piece: PromotionPiece): Unit = synchronized {
-    pendingPromotion match
-      case None =>
-        notifyObservers(InvalidMoveEvent(currentBoard, currentHistory, currentTurn, "No promotion pending."))
-      case Some(pending) =>
-        pendingPromotion = None
-        val cmd = MoveCommand(
-          from = pending.from,
-          to = pending.to,
-          previousBoard = Some(pending.boardBefore),
-          previousHistory = Some(pending.historyBefore),
-          previousTurn = Some(pending.turn)
-        )
-        completePromotionFn(
-          pending.boardBefore, pending.historyBefore,
-          pending.from, pending.to, piece, pending.turn
-        ) match
-          case MoveResult.Moved(newBoard, newHistory, captured, newTurn) =>
-            val updatedCmd = cmd.copy(moveResult = Some(de.nowchess.chess.command.MoveResult.Successful(newBoard, newHistory, newTurn, captured)))
-            invoker.execute(updatedCmd)
-            updateGameState(newBoard, newHistory, newTurn)
-            emitMoveEvent(pending.from.toString, pending.to.toString, captured, newTurn)
-
-          case MoveResult.MovedInCheck(newBoard, newHistory, captured, newTurn) =>
-            val updatedCmd = cmd.copy(moveResult = Some(de.nowchess.chess.command.MoveResult.Successful(newBoard, newHistory, newTurn, captured)))
-            invoker.execute(updatedCmd)
-            updateGameState(newBoard, newHistory, newTurn)
-            emitMoveEvent(pending.from.toString, pending.to.toString, captured, newTurn)
-            notifyObservers(CheckDetectedEvent(currentBoard, currentHistory, currentTurn))
-
-          case MoveResult.Checkmate(winner) =>
-            val updatedCmd = cmd.copy(moveResult = Some(de.nowchess.chess.command.MoveResult.Successful(Board.initial, GameHistory.empty, Color.White, None)))
-            invoker.execute(updatedCmd)
-            currentBoard = Board.initial
-            currentHistory = GameHistory.empty
-            currentTurn = Color.White
-            notifyObservers(CheckmateEvent(currentBoard, currentHistory, currentTurn, winner))
-
-          case MoveResult.Stalemate =>
-            val updatedCmd = cmd.copy(moveResult = Some(de.nowchess.chess.command.MoveResult.Successful(Board.initial, GameHistory.empty, Color.White, None)))
-            invoker.execute(updatedCmd)
-            currentBoard = Board.initial
-            currentHistory = GameHistory.empty
-            currentTurn = Color.White
-            notifyObservers(StalemateEvent(currentBoard, currentHistory, currentTurn))
-
-          case _ =>
-            notifyObservers(InvalidMoveEvent(currentBoard, currentHistory, currentTurn, "Error completing promotion."))
-  }
-
-  /** Validate and load a PGN string.
-   *  Each move is replayed through the command system so undo/redo is available after loading.
-   *  Returns Right(()) on success; Left(error) if any move is illegal or the position impossible. */
-  def loadPgn(pgn: String): Either[String, Unit] = synchronized {
-    PgnParser.validatePgn(pgn) match
-      case Left(err) =>
-        Left(err)
-      case Right(game) =>
-        val initialBoardBeforeLoad = currentBoard
-        val initialHistoryBeforeLoad = currentHistory
-        val initialTurnBeforeLoad = currentTurn
-        
-        currentBoard = Board.initial
-        currentHistory = GameHistory.empty
-        currentTurn = Color.White
-        pendingPromotion = None
-        invoker.clear()
-
-        var error: Option[String] = None
-        import scala.util.control.Breaks._
-        breakable {
-          game.moves.foreach { move =>
-            handleParsedMove(move.from, move.to, s"${move.from}${move.to}")
-            move.promotionPiece.foreach(completePromotion)
-            
-            // If the move failed to execute properly, stop and report
-            // (validatePgn should have caught this, but we're being safe)
-            if pendingPromotion.isDefined && move.promotionPiece.isEmpty then
-              error = Some(s"Promotion required for move ${move.from}${move.to}")
-              break()
-          }
-        }
-        
-        error match
-          case Some(err) =>
-            currentBoard = initialBoardBeforeLoad
-            currentHistory = initialHistoryBeforeLoad
-            currentTurn = initialTurnBeforeLoad
-            Left(err)
-          case None =>
-            notifyObservers(PgnLoadedEvent(currentBoard, currentHistory, currentTurn))
-            Right(())
-  }
-
-  /** Load an arbitrary board position, clearing all history and undo/redo state. */
-  def loadPosition(board: Board, history: GameHistory, turn: Color): Unit = synchronized {
-    currentBoard = board
-    currentHistory = history
-    currentTurn = turn
-    pendingPromotion = None
-    invoker.clear()
-    notifyObservers(BoardResetEvent(currentBoard, currentHistory, currentTurn))
-  }
-
-  /** Reset the board to initial position. */
-  def reset(): Unit = synchronized {
-    currentBoard = Board.initial
-    currentHistory = GameHistory.empty
-    currentTurn = Color.White
-    invoker.clear()
-    notifyObservers(BoardResetEvent(
-      currentBoard,
-      currentHistory,
-      currentTurn
-    ))
-  }
-
-  // ──── Private Helpers ────
-
-  private def performUndo(): Unit =
-    if invoker.canUndo then
-      val cmd = invoker.history(invoker.getCurrentIndex)
-      (cmd: @unchecked) match
-        case moveCmd: MoveCommand =>
-          val notation = currentHistory.moves.lastOption.map(PgnExporter.moveToAlgebraic).getOrElse("")
-          moveCmd.previousBoard.foreach(currentBoard = _)
-          moveCmd.previousHistory.foreach(currentHistory = _)
-          moveCmd.previousTurn.foreach(currentTurn = _)
-          invoker.undo()
-          notifyObservers(MoveUndoneEvent(currentBoard, currentHistory, currentTurn, notation))
-    else
-      notifyObservers(InvalidMoveEvent(currentBoard, currentHistory, currentTurn, "Nothing to undo."))
-
-  private def performRedo(): Unit =
-    if invoker.canRedo then
-      val cmd = invoker.history(invoker.getCurrentIndex + 1)
-      (cmd: @unchecked) match
-        case moveCmd: MoveCommand =>
-          for case de.nowchess.chess.command.MoveResult.Successful(nb, nh, nt, cap) <- moveCmd.moveResult do
-            updateGameState(nb, nh, nt)
-            invoker.redo()
-            val notation    = nh.moves.lastOption.map(PgnExporter.moveToAlgebraic).getOrElse("")
-            val capturedDesc = cap.map(c => s"${c.color.label} ${c.pieceType.label}")
-            notifyObservers(MoveRedoneEvent(currentBoard, currentHistory, currentTurn, notation, moveCmd.from.toString, moveCmd.to.toString, capturedDesc))
-    else
-      notifyObservers(InvalidMoveEvent(currentBoard, currentHistory, currentTurn, "Nothing to redo."))
-
-  private def updateGameState(newBoard: Board, newHistory: GameHistory, newTurn: Color): Unit =
-    currentBoard = newBoard
-    currentHistory = newHistory
-    currentTurn = newTurn
-
-  private def emitMoveEvent(fromSq: String, toSq: String, captured: Option[Piece], newTurn: Color): Unit =
-    val capturedDesc = captured.map(c => s"${c.color.label} ${c.pieceType.label}")
-    notifyObservers(MoveExecutedEvent(
-      currentBoard,
-      currentHistory,
-      newTurn,
-      fromSq,
-      toSq,
-      capturedDesc
-    ))
-
-  private def handleFailedMove(moveInput: String): Unit =
-    (GameController.processMove(currentBoard, currentHistory, currentTurn, moveInput): @unchecked) match
-      case MoveResult.NoPiece =>
-        notifyObservers(InvalidMoveEvent(
-          currentBoard,
-          currentHistory,
-          currentTurn,
-          "No piece on that square."
-        ))
-      case MoveResult.WrongColor =>
-        notifyObservers(InvalidMoveEvent(
-          currentBoard,
-          currentHistory,
-          currentTurn,
-          "That is not your piece."
-        ))
-      case MoveResult.IllegalMove =>
-        notifyObservers(InvalidMoveEvent(
-          currentBoard,
-          currentHistory,
-          currentTurn,
-          "Illegal move."
-        ))
-

modules/core/src/main/scala/de/nowchess/chess/logic/CastleSide.scala

@@ -1,23 +0,0 @@
-package de.nowchess.chess.logic
-
-import de.nowchess.api.board.*
-
-enum CastleSide:
-  case Kingside, Queenside
-
-extension (b: Board)
-  def withCastle(color: Color, side: CastleSide): Board =
-    val rank = if color == Color.White then Rank.R1 else Rank.R8
-    val kingFrom = Square(File.E, rank)
-    val (kingTo, rookFrom, rookTo) = side match
-      case CastleSide.Kingside =>
-        (Square(File.G, rank), Square(File.H, rank), Square(File.F, rank))
-      case CastleSide.Queenside =>
-        (Square(File.C, rank), Square(File.A, rank), Square(File.D, rank))
-
-    val king = b.pieceAt(kingFrom).get
-    val rook = b.pieceAt(rookFrom).get
-
-    b.removed(kingFrom).removed(rookFrom)
-      .updated(kingTo, king)
-      .updated(rookTo, rook)

modules/core/src/main/scala/de/nowchess/chess/logic/CastlingRightsCalculator.scala

@@ -1,31 +0,0 @@
-package de.nowchess.chess.logic
-
-import de.nowchess.api.board.{Color, File, Rank, Square}
-import de.nowchess.api.game.CastlingRights
-
-/** Derives castling rights from move history. */
-object CastlingRightsCalculator:
-
-  def deriveCastlingRights(history: GameHistory, color: Color): CastlingRights =
-    val (kingRow, kingsideRookFile, queensideRookFile) = color match
-      case Color.White => (Rank.R1, File.H, File.A)
-      case Color.Black => (Rank.R8, File.H, File.A)
-
-    // Check if king has moved
-    val kingHasMoved = history.moves.exists: move =>
-      move.from == Square(File.E, kingRow) || move.castleSide.isDefined
-
-    if kingHasMoved then
-      CastlingRights.None
-    else
-      // Check if kingside rook has moved or was captured
-      val kingsideLost = history.moves.exists: move =>
-        move.from == Square(kingsideRookFile, kingRow) ||
-        move.to == Square(kingsideRookFile, kingRow)
-
-      // Check if queenside rook has moved or was captured
-      val queensideLost = history.moves.exists: move =>
-        move.from == Square(queensideRookFile, kingRow) ||
-        move.to == Square(queensideRookFile, kingRow)
-
-      CastlingRights(kingSide = !kingsideLost, queenSide = !queensideLost)

modules/core/src/main/scala/de/nowchess/chess/logic/EnPassantCalculator.scala

@@ -1,32 +0,0 @@
-package de.nowchess.chess.logic
-
-import de.nowchess.api.board.*
-
-object EnPassantCalculator:
-
-  /** Returns the en passant target square if the last move was a double pawn push.
-   *  The target is the square the pawn passed through (e.g. e2→e4 yields e3).
-   */
-  def enPassantTarget(board: Board, history: GameHistory): Option[Square] =
-    history.moves.lastOption.flatMap: move =>
-      val rankDiff = move.to.rank.ordinal - move.from.rank.ordinal
-      val isDoublePush = math.abs(rankDiff) == 2
-      val isPawn = board.pieceAt(move.to).exists(_.pieceType == PieceType.Pawn)
-      if isDoublePush && isPawn then
-        val midRankIdx = move.from.rank.ordinal + rankDiff / 2
-        Some(Square(move.to.file, Rank.values(midRankIdx)))
-      else None
-
-  /** True if moving from→to is an en passant capture. */
-  def isEnPassant(board: Board, history: GameHistory, from: Square, to: Square): Boolean =
-    board.pieceAt(from).exists(_.pieceType == PieceType.Pawn) &&
-    enPassantTarget(board, history).contains(to) &&
-    math.abs(to.file.ordinal - from.file.ordinal) == 1
-
-  /** Returns the square of the pawn to remove when an en passant capture lands on `to`.
-   *  White captures upward → captured pawn is one rank below `to`.
-   *  Black captures downward → captured pawn is one rank above `to`.
-   */
-  def capturedPawnSquare(to: Square, color: Color): Square =
-    val capturedRankIdx = to.rank.ordinal + (if color == Color.White then -1 else 1)
-    Square(to.file, Rank.values(capturedRankIdx))

modules/core/src/main/scala/de/nowchess/chess/logic/GameContext.scala

@@ -0,0 +1,47 @@
+package de.nowchess.chess.logic
+
+import de.nowchess.api.board.{Board, Color, File, Piece, PieceType, Rank, Square}
+import de.nowchess.api.game.CastlingRights
+
+enum CastleSide:
+  case Kingside, Queenside
+
+case class GameContext(
+  board: Board,
+  whiteCastling: CastlingRights,
+  blackCastling: CastlingRights
+):
+  def castlingFor(color: Color): CastlingRights =
+    if color == Color.White then whiteCastling else blackCastling
+
+  def withUpdatedRights(color: Color, rights: CastlingRights): GameContext =
+    if color == Color.White then copy(whiteCastling = rights)
+    else copy(blackCastling = rights)
+
+object GameContext:
+  /** Convenience constructor for test boards: no castling rights on either side. */
+  def apply(board: Board): GameContext =
+    GameContext(board, CastlingRights.None, CastlingRights.None)
+
+  val initial: GameContext =
+    GameContext(Board.initial, CastlingRights.Both, CastlingRights.Both)
+
+extension (b: Board)
+  def withCastle(color: Color, side: CastleSide): Board =
+    val (kingFrom, kingTo, rookFrom, rookTo) = (color, side) match
+      case (Color.White, CastleSide.Kingside)  =>
+        (Square(File.E, Rank.R1), Square(File.G, Rank.R1),
+         Square(File.H, Rank.R1), Square(File.F, Rank.R1))
+      case (Color.White, CastleSide.Queenside) =>
+        (Square(File.E, Rank.R1), Square(File.C, Rank.R1),
+         Square(File.A, Rank.R1), Square(File.D, Rank.R1))
+      case (Color.Black, CastleSide.Kingside)  =>
+        (Square(File.E, Rank.R8), Square(File.G, Rank.R8),
+         Square(File.H, Rank.R8), Square(File.F, Rank.R8))
+      case (Color.Black, CastleSide.Queenside) =>
+        (Square(File.E, Rank.R8), Square(File.C, Rank.R8),
+         Square(File.A, Rank.R8), Square(File.D, Rank.R8))
+    val king = Piece(color, PieceType.King)
+    val rook = Piece(color, PieceType.Rook)
+    Board(b.pieces.removed(kingFrom).removed(rookFrom)
+                  .updated(kingTo, king).updated(rookTo, rook))

modules/core/src/main/scala/de/nowchess/chess/logic/GameHistory.scala

@@ -1,49 +0,0 @@
-package de.nowchess.chess.logic
-
-import de.nowchess.api.board.{PieceType, Square}
-import de.nowchess.api.move.PromotionPiece
-
-/** A single move recorded in the game history. Distinct from api.move.Move which represents user intent. */
-case class HistoryMove(
-  from: Square,
-  to: Square,
-  castleSide: Option[CastleSide],
-  promotionPiece: Option[PromotionPiece] = None,
-  pieceType: PieceType = PieceType.Pawn,
-  isCapture: Boolean = false
-)
-
-/** Complete game history: ordered list of moves plus the half-move clock for the 50-move rule.
- *
- *  @param moves         moves played so far, oldest first
- *  @param halfMoveClock plies since the last pawn move or capture (FIDE 50-move rule counter)
- */
-case class GameHistory(moves: List[HistoryMove] = List.empty, halfMoveClock: Int = 0):
-
-  /** Add a raw HistoryMove record. Clock increments by 1.
-   *  Use the coordinate overload when you know whether the move is a pawn move or capture.
-   */
-  def addMove(move: HistoryMove): GameHistory =
-    GameHistory(moves :+ move, halfMoveClock + 1)
-
-  /** Add a move by coordinates.
-   *
-   *  @param wasPawnMove true when the moving piece is a pawn — resets the clock to 0
-   *  @param wasCapture  true when a piece was captured (including en passant) — resets the clock to 0
-   *
-   *  If neither flag is set the clock increments by 1.
-   */
-  def addMove(
-    from: Square,
-    to: Square,
-    castleSide: Option[CastleSide] = None,
-    promotionPiece: Option[PromotionPiece] = None,
-    wasPawnMove: Boolean = false,
-    wasCapture: Boolean = false,
-    pieceType: PieceType = PieceType.Pawn
-  ): GameHistory =
-    val newClock = if wasPawnMove || wasCapture then 0 else halfMoveClock + 1
-    GameHistory(moves :+ HistoryMove(from, to, castleSide, promotionPiece, pieceType, wasCapture), newClock)
-
-object GameHistory:
-  val empty: GameHistory = GameHistory()

modules/core/src/main/scala/de/nowchess/chess/logic/GameRules.scala

@@ -1,7 +1,7 @@
 package de.nowchess.chess.logic
 
 import de.nowchess.api.board.*
-import de.nowchess.chess.logic.GameHistory
+import de.nowchess.chess.logic.GameContext
 
 enum PositionStatus:
   case Normal, InCheck, Mated, Drawn
@@ -20,17 +20,17 @@ object GameRules:
       }
 
   /** All (from, to) moves for `color` that do not leave their own king in check. */
-  def legalMoves(board: Board, history: GameHistory, color: Color): Set[(Square, Square)] =
+  def legalMoves(ctx: GameContext, color: Color): Set[(Square, Square)] =
-    board.pieces
+    ctx.board.pieces
       .collect { case (from, piece) if piece.color == color => from }
       .flatMap { from =>
-        MoveValidator.legalTargets(board, history, from)           // context-aware: includes castling
+        MoveValidator.legalTargets(ctx, from)           // context-aware: includes castling
           .filter { to =>
             val newBoard =
-              if MoveValidator.isCastle(board, from, to) then
+              if MoveValidator.isCastle(ctx.board, from, to) then
-                board.withCastle(color, MoveValidator.castleSide(from, to))
+                ctx.board.withCastle(color, MoveValidator.castleSide(from, to))
               else
-                board.withMove(from, to)._1
+                ctx.board.withMove(from, to)._1
             !isInCheck(newBoard, color)
           }
           .map(to => from -> to)
@@ -38,9 +38,9 @@ object GameRules:
       .toSet
 
   /** Position status for the side whose turn it is (`color`). */
-  def gameStatus(board: Board, history: GameHistory, color: Color): PositionStatus =
+  def gameStatus(ctx: GameContext, color: Color): PositionStatus =
-    val moves   = legalMoves(board, history, color)
+    val moves   = legalMoves(ctx, color)
-    val inCheck = isInCheck(board, color)
+    val inCheck = isInCheck(ctx.board, color)
     if moves.isEmpty && inCheck then PositionStatus.Mated
     else if moves.isEmpty       then PositionStatus.Drawn
     else if inCheck             then PositionStatus.InCheck

modules/core/src/main/scala/de/nowchess/chess/logic/MoveValidator.scala

@@ -1,7 +1,7 @@
 package de.nowchess.chess.logic
 
 import de.nowchess.api.board.*
-import de.nowchess.chess.logic.{CastleSide, GameHistory}
+import de.nowchess.chess.logic.{GameContext, CastleSide}
 
 object MoveValidator:
 
@@ -73,7 +73,7 @@ object MoveValidator:
     val fi       = from.file.ordinal
     val ri       = from.rank.ordinal
     val dir      = if color == Color.White then 1 else -1
-    val startRank = if color == Color.White then Rank.R2.ordinal else Rank.R7.ordinal
+    val startRank = if color == Color.White then 1 else 6  // R2 = ordinal 1, R7 = ordinal 6
 
     val oneStep = squareAt(fi, ri + dir)
 
@@ -126,58 +126,42 @@ object MoveValidator:
   def castleSide(from: Square, to: Square): CastleSide =
     if to.file.ordinal > from.file.ordinal then CastleSide.Kingside else CastleSide.Queenside
 
-  def castlingTargets(board: Board, history: GameHistory, color: Color): Set[Square] =
+  def castlingTargets(ctx: GameContext, color: Color): Set[Square] =
-    val rights = CastlingRightsCalculator.deriveCastlingRights(history, color)
+    val rights = ctx.castlingFor(color)
     val rank   = if color == Color.White then Rank.R1 else Rank.R8
     val kingSq = Square(File.E, rank)
     val enemy  = color.opposite
 
-    if !board.pieceAt(kingSq).contains(Piece(color, PieceType.King)) ||
+    if ctx.board.pieceAt(kingSq) != Some(Piece(color, PieceType.King)) then return Set.empty
-       GameRules.isInCheck(board, color) then Set.empty
+    if GameRules.isInCheck(ctx.board, color) then return Set.empty
-    else
-      val kingsideSq = Option.when(
-        rights.kingSide &&
-        board.pieceAt(Square(File.H, rank)).contains(Piece(color, PieceType.Rook)) &&
-        List(Square(File.F, rank), Square(File.G, rank)).forall(s => board.pieceAt(s).isEmpty) &&
-        !List(Square(File.F, rank), Square(File.G, rank)).exists(s => isAttackedBy(board, s, enemy))
-      )(Square(File.G, rank))
 
-      val queensideSq = Option.when(
+    var result = Set.empty[Square]
-        rights.queenSide &&
-        board.pieceAt(Square(File.A, rank)).contains(Piece(color, PieceType.Rook)) &&
-        List(Square(File.B, rank), Square(File.C, rank), Square(File.D, rank)).forall(s => board.pieceAt(s).isEmpty) &&
-        !List(Square(File.D, rank), Square(File.C, rank)).exists(s => isAttackedBy(board, s, enemy))
-      )(Square(File.C, rank))
 
-      kingsideSq.toSet ++ queensideSq.toSet
+    if rights.kingSide then
+      val rookSq  = Square(File.H, rank)
+      val transit = List(Square(File.F, rank), Square(File.G, rank))
+      if ctx.board.pieceAt(rookSq).contains(Piece(color, PieceType.Rook)) &&
+         transit.forall(s => ctx.board.pieceAt(s).isEmpty) &&
+         !transit.exists(s => isAttackedBy(ctx.board, s, enemy)) then
+        result += Square(File.G, rank)
 
-  def legalTargets(board: Board, history: GameHistory, from: Square): Set[Square] =
+    if rights.queenSide then
-    board.pieceAt(from) match
+      val rookSq       = Square(File.A, rank)
+      val emptySquares = List(Square(File.B, rank), Square(File.C, rank), Square(File.D, rank))
+      val transitSqs   = List(Square(File.D, rank), Square(File.C, rank))
+      if ctx.board.pieceAt(rookSq).contains(Piece(color, PieceType.Rook)) &&
+         emptySquares.forall(s => ctx.board.pieceAt(s).isEmpty) &&
+         !transitSqs.exists(s => isAttackedBy(ctx.board, s, enemy)) then
+        result += Square(File.C, rank)
+
+    result
+
+  def legalTargets(ctx: GameContext, from: Square): Set[Square] =
+    ctx.board.pieceAt(from) match
       case Some(piece) if piece.pieceType == PieceType.King =>
-        legalTargets(board, from) ++ castlingTargets(board, history, piece.color)
+        legalTargets(ctx.board, from) ++ castlingTargets(ctx, piece.color)
-      case Some(piece) if piece.pieceType == PieceType.Pawn =>
-        pawnTargets(board, history, from, piece.color)
       case _ =>
-        legalTargets(board, from)
+        legalTargets(ctx.board, from)
 
-  private def pawnTargets(board: Board, history: GameHistory, from: Square, color: Color): Set[Square] =
+  def isLegal(ctx: GameContext, from: Square, to: Square): Boolean =
-    val existing = pawnTargets(board, from, color)
+    legalTargets(ctx, from).contains(to)
-    val fi  = from.file.ordinal
-    val ri  = from.rank.ordinal
-    val dir = if color == Color.White then 1 else -1
-    val epCapture: Set[Square] =
-      EnPassantCalculator.enPassantTarget(board, history).filter: target =>
-        squareAt(fi - 1, ri + dir).contains(target) || squareAt(fi + 1, ri + dir).contains(target)
-      .toSet
-    existing ++ epCapture
-
-  def isLegal(board: Board, history: GameHistory, from: Square, to: Square): Boolean =
-    legalTargets(board, history, from).contains(to)
-
-  /** Returns true if the piece on `from` is a pawn moving to its back rank (promotion). */
-  def isPromotionMove(board: Board, from: Square, to: Square): Boolean =
-    board.pieceAt(from) match
-      case Some(Piece(_, PieceType.Pawn)) =>
-        (from.rank == Rank.R7 && to.rank == Rank.R8) ||
-        (from.rank == Rank.R2 && to.rank == Rank.R1)
-      case _ => false

modules/core/src/main/scala/de/nowchess/chess/notation/FenExporter.scala

@@ -1,60 +0,0 @@
-package de.nowchess.chess.notation
-
-import de.nowchess.api.board.*
-import de.nowchess.api.game.{CastlingRights, GameState}
-import de.nowchess.api.board.Color
-
-object FenExporter:
-
-  /** Convert a Board to FEN piece-placement string (rank 8 to rank 1, separated by '/'). */
-  def boardToFen(board: Board): String =
-    Rank.values.reverse
-      .map(rank => buildRankString(board, rank))
-      .mkString("/")
-
-  /** Build the FEN representation for a single rank. */
-  private def buildRankString(board: Board, rank: Rank): String =
-    val rankSquares = File.values.map(file => Square(file, rank))
-    val rankChars = scala.collection.mutable.ListBuffer[Char]()
-    var emptyCount = 0
-
-    for square <- rankSquares do
-      board.pieceAt(square) match
-        case Some(piece) =>
-          if emptyCount > 0 then
-            rankChars += emptyCount.toString.charAt(0)
-            emptyCount = 0
-          rankChars += pieceToPgnChar(piece)
-        case None =>
-          emptyCount += 1
-
-    if emptyCount > 0 then rankChars += emptyCount.toString.charAt(0)
-    rankChars.mkString
-
-  /** Convert a GameState to a complete FEN string. */
-  def gameStateToFen(state: GameState): String =
-    val piecePlacement = state.piecePlacement
-    val activeColor = if state.activeColor == Color.White then "w" else "b"
-    val castling = castlingString(state.castlingWhite, state.castlingBlack)
-    val enPassant = state.enPassantTarget.map(_.toString).getOrElse("-")
-    s"$piecePlacement $activeColor $castling $enPassant ${state.halfMoveClock} ${state.fullMoveNumber}"
-
-  /** Convert castling rights to FEN notation. */
-  private def castlingString(white: CastlingRights, black: CastlingRights): String =
-    val wk = if white.kingSide then "K" else ""
-    val wq = if white.queenSide then "Q" else ""
-    val bk = if black.kingSide then "k" else ""
-    val bq = if black.queenSide then "q" else ""
-    val result = s"$wk$wq$bk$bq"
-    if result.isEmpty then "-" else result
-
-  /** Convert a Piece to its FEN character (uppercase = White, lowercase = Black). */
-  private def pieceToPgnChar(piece: Piece): Char =
-    val base = piece.pieceType match
-      case PieceType.Pawn   => 'p'
-      case PieceType.Knight => 'n'
-      case PieceType.Bishop => 'b'
-      case PieceType.Rook   => 'r'
-      case PieceType.Queen  => 'q'
-      case PieceType.King   => 'k'
-    if piece.color == Color.White then base.toUpper else base