Merge feature/deeper-combat into develop

Implements Plan 5: Deeper Combat.

Engine-side changes only:
- To-hit roll: 40 + (attack*3) - (defense+terrain) - flanking, floor 5, ceiling 95
- Crit: roll >= 95 (always hits, damage doubled before variance)
- Damage variance: random_int(85,115)/100 multiplier
- Action log: '(rolled X / needed Y) for Z damage' with miss/crit/concealed suffixes
- Forest concealment: independent 15% miss chance after to-hit
- Flanking: +15 per orthogonal ally, cap +30
- Water traversal: cost 3, ends turn via wadedThisTurn flag

Final review: 9 minor findings, all parked-as-is or already-resolved.
Per-task review verdicts: 6/6 approved.

256/256 tests pass (was 237/237 pre-Plan-5).
No new PHPCS warnings (baseline: 91-92).

.github/workflows/ci-e2e.yml

@@ -0,0 +1,29 @@
+name: CI E2E
+
+on:
+  pull_request:
+    branches:
+      - develop
+  schedule:
+    - cron: '0 6 * * *'
+
+permissions:
+  contents: read
+
+jobs:
+  php-e2e:
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    env:
+      BATTLEFORGE_E2E: '1'
+    steps:
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+        with:
+          persist-credentials: false
+      - uses: shivammathur/setup-php@b604ade2a87db23f8871b7182e69ec5e75effb45 # v2
+        with:
+          php-version: '8.3'
+          coverage: none
+          tools: composer:v2
+      - run: composer install --no-interaction --prefer-dist
+      - run: vendor/bin/phpunit tests/Integration/PostMatchActionSmokeTest.php

docs/superpowers/specs/2026-07-25-battle-interface-design.md

@@ -0,0 +1,267 @@
+# Plan 4: Battle Interface, Bundled Scenarios, and Release Hardening
+
+## Purpose
+
+Plan 4 of the four-plan BattleForge build. Replaces the deleted `match-stub.php` placeholder with a real, server-rendered hot-seat battle interface; ships three bundled scenarios that are playable without the editors; fixes the objective-round-trip gap in `ScenarioSerializer`; and adds a real end-to-end smoke test against the dev server.
+
+Plans 1–3c have already delivered the standalone PHP project, the rules engine, the curated content, the HTTP layer, the scenario editors, and the JavaScript surface. Plan 4 is the last plan of the MVP and turns the existing scaffold into a finished first release.
+
+## Success Criteria
+
+Plan 4 succeeds when a new user, without developer assistance, can:
+
+1. Open the home page, see the three bundled scenarios listed with summaries, and click one to start a match.
+2. Play the resulting match to a winner using a hot-seat battle interface that enforces alternating team turns and disables actions on the inactive team's units.
+3. Use move, attack, and the three curated abilities (heal, area damage, buff) during play, observing terrain modifiers, action-remaining counters, and per-round objective control where applicable.
+4. See the result of each action (unit damage, objective tally, action log) and the final winner banner with a "Return to home" link.
+5. Reload the page mid-match and resume from the same state.
+6. Watch the smoke test exercise a full match on a real `php -S` instance in CI.
+
+The combat remains a local hot-seat experience for two players on one device. Online play, accounts, AI opponents, and replay visualization are explicitly out of scope per the design spec.
+
+## In Scope
+
+### Server-Authoritative Match API
+
+Four new POST endpoints, one per player action, all routed under `/matches/current/`. The `current` segment identifies "the match in `localStorage`"; the `matchId` (a 16-char hex minted at `startMatch`) and the `MatchState` both live in the JSON body:
+
+- `POST /matches/current/move` — body `{matchId, match, unitId, x, y}`; runs `CombatEngine::move`; returns `{match, turnToken, winnerTeamId}`.
+- `POST /matches/current/attack` — body `{matchId, match, attackerId, targetId}`; runs `CombatEngine::attack`.
+- `POST /matches/current/ability` — body `{matchId, match, unitId, abilityId, x, y}`; the `x` and `y` are the target position (for `tile`-targeting abilities, the center; for `ally`/`enemy`/`self` targeting, the affected unit's position).
+- `POST /matches/current/end-turn` — body `{matchId, match}`; runs `CombatEngine::endTurn`.
+
+The `matchId` is required for turn-token verification on every action and is the only piece of state not derivable from the match JSON itself. The client persists it from the `PostStartMatch` response alongside the match in `match:current`.
+
+Each handler:
+
+1. Verifies the CSRF token against the `__csrf` cookie (existing pattern).
+2. Verifies the `X-Turn-Token` header against the supplied match state (see Turn Token below).
+3. Decodes the JSON body into a `MatchState` via `ScenarioSerializer::matchFromArray` (defense in depth; the engine would also reject malformed state, but a 400 here gives a clearer error).
+4. Calls the matching `CombatEngine` method.
+5. Computes a fresh `turnToken` for the new state and returns it alongside the serialized match and (if set) `winnerTeamId`.
+
+`PostStartMatch` is modified in Plan 4 to mint a `matchId` (16 random hex chars from `bin2hex(random_bytes(8))`) and a `turnToken` for the initial state, returning `{match, matchId, turnToken}` instead of just `{match}`. The same `BATTLEFORGE_SECRET` is used.
+
+Rejected actions are mapped to HTTP statuses by the rules-engine boundary:
+
+| Failure | HTTP | Body | Browser effect |
+|---|---|---|---|
+| CSRF mismatch | 403 | `{"error":"csrf"}` | "Session expired. Reload the page." banner |
+| Turn token mismatch | 409 | `{"error":"turn"}` | "Turn has changed" banner; client re-reads `localStorage` and re-renders |
+| Malformed `MatchState` | 400 | `{"errors":[...]}` | First error message as a toast; match unchanged |
+| `CombatException` (illegal action) | 409 | `{"error":"<reason>"}` | Reason as a toast; match unchanged |
+| Internal error | 500 | `{"error":"server"}` | "Something went wrong" banner; match unchanged |
+
+`localStorage` writes only happen on a 200 response. The in-browser state is recoverable by reload.
+
+### Turn Token
+
+A new `src/Application/TurnToken.php` value object with two static methods:
+
+```php
+public static function issue(string $secret, string $matchId, string $activeTeamId, int $round, int $lastActionIndex): string
+public static function verify(string $secret, string $matchId, string $activeTeamId, int $round, int $lastActionIndex, string $token): bool
+```
+
+The token is `hash_hmac('sha256', $secret, $matchId . '|' . $activeTeamId . '|' . $round . '|' . $lastActionIndex)` truncated to 32 hex chars. The handler reads `activeTeamId`, `round`, and `lastActionIndex` (i.e. `count($match->actionLog)`) from the *incoming* match, computes the expected token, and `hash_equals` it against the supplied header. The response carries a fresh token computed against the *new* state — i.e. the response's `turnToken` is `TurnToken::issue($secret, $matchId, $newState->activeTeamId, $newState->round, count($newState->actionLog))`. The first turn token of a match is the one minted in the `PostStartMatch` response.
+
+The token binding:
+
+- `matchId` is a per-match random hex set when `startMatch` returns and held in the match's `localStorage` envelope alongside the `MatchState` JSON.
+- `activeTeamId` and `round` are read from the incoming match.
+- `lastActionIndex` is `count($match->actionLog)`.
+
+A stale token (from a previous turn or a different round) fails verification. A tampered token fails verification. A missing token fails verification. The token is a defense-in-depth check; the engine's `assertCanAct` is the real authority.
+
+### Bundled Scenarios
+
+Three `Scenario` JSON fixtures committed under `public/assets/scenarios/`:
+
+- **`skirmish.json`** — 8×8 open battlefield, no terrain, no objectives. Two symmetric teams of 3 (Alpha: defender + striker + support; Bravo: striker + scout + support). Victory: `eliminate_all`. The "show me the game" scenario.
+- **`hold-the-line.json`** — 10×8 battlefield with a forest corridor down the center (Manhattan-cost 2, +1 defense). Alpha: 3 defenders in the corridor. Bravo: 2 strikers + 1 support + 1 scout approaching from the south. One objective marker at the center of the forest. Victory: `hold_objective`, `holdRoundsRequired: 3`.
+- **`last-stand.json`** — 12×12 battlefield with a mix of forest, rough, and water. Asymmetric: Alpha has 6 mixed units (defenders, supports, scouts); Bravo has 4 (3 strikers + 1 scout). Victory: `eliminate_all`. The larger end of the rules.
+
+Two new GET endpoints serve them:
+
+- `GET /scenarios/bundled` — reads the directory, validates each filename against `/^[a-z0-9-]+$/`, returns `[{id, name, summary}, ...]` sorted by id. The `name` and `summary` are read from a `manifest.json` in the same directory. The manifest is the single source of truth for display strings; the fixture filename is the `id`. The manifest shape is `{ "<id>": {"name": "...", "summary": "..."} }`. Any fixture without a manifest entry is filtered out of the response.
+- `GET /scenarios/bundled/{id}` — reads the fixture, runs it through `ScenarioSerializer::scenarioFromArray` and `ScenarioValidator::validate` (a fixture that fails validation is a bug; the endpoint returns 500 so CI catches it), returns the JSON. The returned JSON is the `Scenario` shape (same as `ScenarioSerializer::scenarioToArray`), not a `ScenarioDraft`.
+
+The home page renders a "Play bundled" list of the three fixtures with their summaries. Clicking a scenario fetches the full `Scenario` JSON via `GET /scenarios/bundled/{id}` and POSTs it to the existing `PostStartMatch` endpoint (no new route). `PostStartMatch` is modified in Plan 4 to return `{match, matchId, turnToken}` (it currently returns just `{match}`) so the JS can persist the new `matchId` and seed the next action's turn-token check.
+
+### Match View
+
+A single new `src/Views/match.php` template, served by `GetMatchView` at `GET /matches/current`. The template:
+
+1. Renders the shared layout with a CSRF meta tag and a `<script type="module" src="/js/match.js">` tag.
+2. Renders a server-rendered shell:
+   - Header bar: active team name, current round, End Turn button.
+   - `<div id="bf-grid" class="bf-grid" data-bf-width="..." data-bf-height="...">` (empty; JS fills it).
+   - `<aside id="bf-panel" class="bf-panel">` with three action buttons (Move, Attack, Ability) and a "selected unit" indicator.
+   - `<div id="bf-log" class="bf-log">` with the last 10 action log entries.
+   - `<div id="bf-result" class="bf-result" hidden>` with the winner banner and a "Return to home" link.
+3. The End Turn button is disabled when `winnerTeamId` is non-null.
+4. The active team's units are highlighted via a CSS class set by JS; the inactive team's units are visually dimmed and the action buttons on them are `disabled`.
+
+`public/js/match.js` is the third ESM file. It:
+
+1. On `DOMContentLoaded`, reads `match:current` from `localStorage` via `bfStorage.get('match:current')`. If absent, renders the "no match — pick a scenario" state.
+2. Renders the grid + units + panel from the snapshot. For the active unit, the action panel shows its `archetype.abilities` as radio buttons (since units may have 0–2 abilities).
+3. Clicking a friendly unit selects it (changes the panel's selected-unit indicator). Clicking an enemy unit is a no-op unless in attack mode.
+4. Clicking an empty tile in move-mode dispatches `POST /matches/current/move` with the latest match JSON, the new unit's destination, and the latest `turnToken`.
+5. Clicking an enemy unit in attack-mode dispatches `POST .../attack` with the attacker id and target id.
+6. Clicking a tile in ability-mode (after selecting an ability radio) dispatches `POST .../ability` with the unit id, ability id, and target position.
+7. End Turn is a single `POST .../end-turn` with the latest match JSON.
+8. Each request includes `X-CSRF-Token: <csrf meta>` and `X-Turn-Token: <latest>`.
+9. On 200, the JS overwrites `match:current` in `localStorage`, stores the new `turnToken` in module-local memory, and re-renders. On 409 (`winnerTeamId` is set), it switches to the result state and disables all action controls. On 409 (`turn` mismatch), it re-reads `localStorage` (the source) and re-renders. On 400/403/500, it shows a toast with the error and leaves `localStorage` alone.
+10. The action log panel updates from the latest snapshot.
+
+The disabled-vs-enabled rule: the engine's `assertCanAct` is the authority. The JS sets `disabled` on inactive-team unit buttons and on action buttons when the active unit has zero actions remaining, mirroring the engine's contract. The browser never decides legality.
+
+### ScenarioSerializer Objective Round-Trip Fix
+
+`src/Application/ScenarioSerializer.php` currently drops the `objectives` field on the way back from a serialized `MatchState` (`matchFromArray` passes `objectives: []`). Plan 4 fixes this:
+
+1. `matchToArray` adds `'objectives' => $objectivesArray` where `$objectivesArray` is built by iterating `$match->objectives` and calling `['id' => $objective->id, 'position' => self::positionToArray($objective->position)]`.
+2. `matchFromArray` builds the `ObjectiveMarker` map from `($data['objectives'] ?? [])` and passes it to the new `MatchState`.
+
+A new unit test in `tests/Unit/Application/ScenarioSerializerTest.php` exercises round-trip on a `HoldObjective` `MatchState` and asserts the objective's id and position survive. This is the foundation of the bundled Hold the Line scenario working end-to-end.
+
+### End-to-End Smoke Test
+
+A new `tests/Integration/PostMatchActionSmokeTest.php`:
+
+1. Boots `php -S 127.0.0.1:<free port> -t public/` in a background process.
+2. Reads the port from the boot output.
+3. Uses `stream_context_create` + `file_get_contents` (no new dependency) to walk the Skirmish scenario to a winner: GET `/`, GET `/scenarios/bundled`, GET `/scenarios/bundled/skirmish`, POST `/scenarios/skirmish/start`, then the four action verbs in sequence until `winnerTeamId` is set.
+4. Asserts the JSON shapes, the `turnToken` field is present on every action response, and a stale-token request returns 409 with the match unchanged.
+5. Smoke-loads `hold-the-line` and `last-stand` (start match only — these scenarios are heavier and don't need to be fully played).
+6. Tears down the server with `proc_terminate` in `tearDown`.
+
+The test is gated by the `BATTLEFORGE_E2E` env var. The default `composer check` run does *not* set it; the per-commit gate stays fast.
+
+A new `.github/workflows/ci-e2e.yml` runs on PRs to `develop` and nightly, sets `BATTLEFORGE_E2E=1`, and runs the smoke test with a 5-minute timeout. The existing `ci.yml` is unchanged.
+
+## Out of Scope (deferred)
+
+- Headless browser test (Playwright/Puppeteer). Out for the MVP per the design spec.
+- Replay visualization. The action log is captured and rendered in the panel; full replay is a later plan.
+- AI opponent. The spec explicitly excludes it.
+- Online multiplayer, accounts, cloud sync. The spec explicitly excludes them.
+- Mid-turn undo. The design decision is "no" — actions stand.
+- Cross-scenario match continuation. A match is bound to its starting scenario.
+
+## System Boundaries (unchanged from Plan 1)
+
+1. **Content library** (Domain, unchanged) — archetype catalog, ability catalog, terrain behaviors.
+2. **Scenario editor** (web, unchanged) — Plan 3a/3b shipped this.
+3. **Rules engine** (Domain, unchanged) — `CombatEngine` is the single authority; Plan 4 calls it from the new match-action handlers but does not modify it.
+4. **Battle interface** (web, new) — `src/Views/match.php` + `public/js/match.js` + the four action handlers. Renders match state and submits player intent; never independently decides whether an action is legal.
+
+The `Application` layer gains `TurnToken` (new) and a small extension to `ScenarioSerializer` (the objectives round-trip). The `Domain` layer is unchanged.
+
+## Data and Action Flow
+
+### Cold-start flow (unchanged from Plan 3)
+
+### Bundled scenario bootstrap
+
+1. User visits `GET /`.
+2. Home page renders a "Play bundled" list with the three scenarios' names and summaries (read via `GET /scenarios/bundled`).
+3. User clicks "Skirmish". JS fetches the full `Scenario` JSON via `GET /scenarios/bundled/skirmish`.
+4. JS POSTs that JSON to `POST /scenarios/skirmish/start` (the existing `PostStartMatch` handler, modified to return `{match, matchId, turnToken}`).
+5. JS stores the match in `match:current` as `{matchId, match}` and stores the `turnToken` in module-local memory, then navigates to `/matches/current`.
+
+If a user lands on `/matches/current` directly with no `match:current` in `localStorage` (recovery flow, e.g. opened in a new tab), the JS renders the "no match — pick a scenario" state with a link back to `/`. They do not start a match from this view.
+
+### Per-action flow
+
+1. User clicks a friendly unit to select it.
+2. User chooses an action mode (Move / Attack / Ability).
+3. User clicks a destination tile (or enemy unit, or selects an ability radio and clicks a target).
+4. JS reads the current match from in-memory state, builds the request body, and `fetch()`es the matching endpoint with `X-CSRF-Token` and `X-Turn-Token` headers.
+5. Server runs the engine, returns the new match and a fresh `turnToken`.
+6. JS replaces the in-memory state, writes `match:current` to `localStorage`, and re-renders.
+
+### End-of-match flow
+
+1. The engine's `attack`, `useAbility`, or `endTurn` returns a `MatchState` with `winnerTeamId` set.
+2. The handler returns `200` with `winnerTeamId` in the body (not 409 — the match is over, not rejected).
+3. The JS recognizes `winnerTeamId !== null`, switches the view to the result state, and disables all action controls.
+4. The "Return to home" link clears `match:current` from `localStorage` and navigates to `/`.
+
+## Validation and Failure Handling
+
+Inherited from the design spec:
+- A rejected action never partially changes match state or consumes resources.
+- Corrupt or incompatible saved data is rejected safely and cannot start a partially initialized match.
+- The CSRF token's invalid-or-missing case returns a generic 403.
+
+Plan 4-specific:
+- The turn token's invalid-or-stale case returns 409 with `{"error":"turn"}`. The browser re-reads `localStorage` and re-renders. The local copy is always the source of truth.
+- A malformed `MatchState` (somehow arriving at the server) returns 400 with the validator's error messages. The validator is the source of truth; the engine would also reject it, but a 400 here gives a clearer message.
+- A bundled scenario fixture that fails `ScenarioValidator::validate` makes the `GET /scenarios/bundled/{id}` endpoint return 500. CI catches it because the integration test fetches each fixture and asserts 200.
+- A bundled scenario file whose name doesn't match `/^[a-z0-9-]+$/` is rejected by `GET /scenarios/bundled` (it's not in the list) and by `GET /scenarios/bundled/{id}` (404). Path-traversal attempts are blocked.
+- The smoke test's `php -S` boot is wrapped in a try/finally that always tears the server down, even on test failure.
+
+## Security and Quality Requirements
+
+Inherited from the design spec:
+- Every state-changing form or request uses and verifies a nonce before mutation.
+- All rendered output is escaped for its output context.
+- PHP follows the repository PHPCS rules and passes PHPStan at level 6.
+- JavaScript passes ESLint using `airbnb/base` and Prettier checks.
+- Composer configuration passes `composer validate --strict`.
+
+Plan 4-specific:
+- The turn token is a 32-character hex HMAC-SHA256. The secret is the same `BATTLEFORGE_SECRET` env var or `var/secret.key` file already used for CSRF — no new secret material.
+- The `X-Turn-Token` is required on all four action endpoints. A missing header returns 409.
+- The match action handlers validate `matchId` against `/^[a-f0-9]{16,}$/` before computing the token, so a tampered matchId can't reach the HMAC input.
+- The bundled scenario endpoints validate filenames against `/^[a-z0-9-]+$/` and use `realpath` + `is_file` before reading, preventing path traversal.
+- `public/js/match.js` uses `textContent` and DOM construction; never `innerHTML` with user data. The match log entries are set with `textContent`.
+- The Content-Security-Policy header in `layout.php` is extended to allow `script-src 'self'` (already implied) and to remain restrictive on `style-src` and `img-src` (no change from Plan 3c).
+
+## Verification Strategy
+
+### Unit tests (`tests/Unit/Application/`)
+
+- **`TurnTokenTest`** — `issue` is deterministic for the same inputs; `verify` accepts a freshly-issued token, rejects mutated inputs, rejects tokens for a different `matchId`, rejects tokens for a different `activeTeamId`, rejects tokens for a different `round`, and rejects tokens for a different `lastActionIndex`.
+- **`ScenarioSerializerTest`** (modify) — adds a "match round-trips its objectives" case: build a `HoldObjective` `MatchState`, serialize, deserialize, assert the objective's id and position survive. Also asserts `matchToArray` includes the `objectives` key with the right shape.
+
+### Integration tests (`tests/Integration/`)
+
+- **`GetBundledScenariosTest`** — 200 with three entries; 200 with the right `id`/`name`/`summary` fields; sorted by id; rejects a directory entry with a non-conforming filename (via the test creating a `bad..json` file and asserting it's filtered out, then cleaned up).
+- **`GetBundledScenarioTest`** — 200 for each bundled id, with a `Scenario` that passes `ScenarioValidator::validate`; 404 for an unknown id; 500 for a fixture that fails validation (the test injects a deliberately-broken fixture and asserts the 500).
+- **`GetMatchViewTest`** — 200 with the `bf-match` container, the CSRF meta, the `match.js` script tag, and the security headers (CSP, `X-Content-Type-Options`, `Referrer-Policy`).
+- **`PostMatchActionTest`** — four sub-tests, one per verb. Each has a happy path (asserts `match`, `turnToken`, and (for end-turn after a winning attack) `winnerTeamId`) and a rejection path (asserts 409 + the engine's reason, asserts the response body's `match` equals the request's `match`).
+
+### End-to-end smoke test (`tests/Integration/PostMatchActionSmokeTest.php`)
+
+- Boots `php -S` on a free port.
+- Walks Skirmish to a winner (using the dev server's actual JSON responses and `X-Turn-Token`).
+- Smoke-loads `hold-the-line` and `last-stand` (start match only).
+- Asserts a stale turn token returns 409 with the match unchanged.
+- Tears down `php -S` in `tearDown`.
+
+Gated by `BATTLEFORGE_E2E=1`. The default `composer check` does not set it.
+
+### CI
+
+- `ci.yml` (existing) — per-commit gate. No change. PHPCS, PHPStan, PHPUnit, ESLint, Prettier all green.
+- `ci-e2e.yml` (new) — runs on PRs to `develop` and nightly. Sets `BATTLEFORGE_E2E=1`. Times out at 5 minutes.
+
+### Manual usability check
+
+A new tester with no BattleForge context can: open the dev URL, see the home page, click "Skirmish", play the match to completion (alternating with another person on the same device), see the winner banner, return home, click "Hold the Line", and play that match to completion — without leaving the browser or seeing any error that wasn't explained inline.
+
+## Release Boundary
+
+Plan 4 is releasable when:
+
+- Every in-scope capability and success criterion is met.
+- The verification suite is green: 196+ existing tests pass, all new tests pass, PHPCS/PHPStan/ESLint/Prettier are clean.
+- The smoke test passes against a real `php -S` instance in CI.
+- The bundled scenarios are playable end-to-end.
+- The `ScenarioSerializer` objective round-trip bug is fixed and covered by a test.
+- No out-of-scope capability is required to build or finish a local match.
+
+The MVP is complete. Feedback from this release will decide whether the next investment should deepen combat, expand creation tools, add an AI opponent, or introduce asynchronous online play.

docs/superpowers/specs/2026-07-26-deeper-combat-design.md

@@ -0,0 +1,236 @@
+# Plan 5: Deeper Combat Design Spec
+
+## Purpose
+
+The Plan 4 release delivered a playable MVP. Playtest feedback surfaced four combat-feel gaps: deterministic attacks (every click is a hit), no hit/miss randomness, terrain that doesn't reward positioning, and a small "every fight feels the same" effect from the above. Plan 5 deepens the combat layer — engine-only changes — without introducing new infrastructure, new storage, or new external dependencies.
+
+## Success Criteria
+
+Plan 5 succeeds when a new user, without developer assistance, can:
+
+1. Click the Attack button on an enemy unit and see a non-zero miss rate (roll-based, not always-hit).
+2. Read the action log entry and see the roll, the threshold, and the outcome (hit, miss, miss-with-concealment, crit).
+3. Position a unit in a forest and see the defender's miss rate increase.
+4. Position a unit in rough terrain and see only movement slowdown (no defensive bonus).
+5. Move a unit into water and see it spend the rest of its turn "wading" (no further actions).
+6. Surround a target with allies and see flanking bonuses.
+7. Win a match and feel that outcomes depend on positioning and randomness, not pure stat comparison.
+
+## In Scope
+
+### To-hit + damage model
+
+A successful attack is no longer guaranteed. The engine computes a per-attack threshold; the roll either meets it (hit) or doesn't (miss). Damage is rolled within ±15% variance on top of the deterministic base.
+
+- **To-hit threshold**:
+  `threshold = 40 + (attacker.attack * 3) - (target.defense + terrain.defenseBonus) - flankingBonus`
+  - 40 is the base (matches the "60% hit rate at parity" feel).
+  - `attacker.attack * 3` rewards higher-attack units.
+  - `(target.defense + terrain.defenseBonus)` rewards higher-defense units and favorable terrain.
+  - `flankingBonus` is +15 per ally in any of the 4 orthogonally-adjacent tiles of the target, capped at +30 (3+ allies = +30).
+  - Floor: 5 (always at least 5% chance to hit a target you can reach).
+  - Ceiling: 95 (always at least 5% chance to miss, so flanking has teeth).
+- **Roll**: `random_int(1, 100)`. Server-side, via the existing `random_int()`.
+- **Outcome**: `isHit = roll >= threshold`.
+- **Damage on hit**:
+  `damage = round( max(1, attacker.attack + attacker.attackBonus - (target.defense + terrain.defenseBonus)) * random_int(85, 115) / 100 )`
+  - Variance is ±15% on the deterministic damage floor.
+  - Floor: 1 damage (cannot deal 0 on a hit).
+- **Damage on miss**: 0. Logged as such for transparency.
+
+### Crits
+
+A `roll >= 95` is a crit (5% chance on any attack). On crit:
+
+- Damage is doubled before the variance multiplier (so a crit can deal substantially more than normal).
+- Log entry includes ` — crit`.
+
+Crits bypass the to-hit threshold (the roll is always >= 95, always >= any threshold up to 95). The threshold ceiling at 95 ensures a 5% crit window still exists.
+
+### Forest concealment
+
+A defender standing on forest gets an additional 15% miss chance. This is a *second* independent random roll (after the to-hit roll passes, the engine rolls `random_int(1, 100) > 15`; if that roll fails, the attack is a miss-with-concealment instead of a hit). Implementation:
+
+- Forest defender: `isHit = (roll >= threshold) AND (concealmentRoll = random_int(1, 100) > 15)`
+- Other terrain: `isHit = (roll >= threshold)` (no concealment roll).
+
+The action log entry for a forest miss includes ` — concealed`.
+
+This is independent of the to-hit roll. The flow:
+1. Roll to-hit. If miss, log miss, damage 0.
+2. If to-hit, roll concealment (only on forest). If concealment fails, log `miss — concealed`, damage 0.
+3. If hit, roll damage variance, log `hit` (or `crit` if roll was >= 95).
+
+The to-hit threshold formula does not include a concealment bonus; concealment is a separate roll on top of an already-passing to-hit. This is so the to-hit formula stays readable (one calculation) and the concealment is a clean, independent effect.
+
+### Flanking
+
+A unit attacking a target with one or more allies in the target's 4 orthogonally-adjacent tiles (N/S/E/W) gets a flanking bonus to its to-hit threshold. Specifically:
+
+- `flankingBonus = min(countAlliesAdjacentTo(target) * 15, 30)`
+- The flanking check counts any non-defeated ally of the attacker. Multiple allies stack up to 2 (cap 30).
+- Diagonal positions do not count (e.g., a unit at `(x+1, y+1)` relative to the target does not contribute).
+- The target itself does not contribute (obviously — it is the target).
+- Defeated allies do not contribute.
+
+### Water traversal
+
+Currently water tiles have `movementCost() === null` (impassable). Under Plan 5:
+
+- A unit can move INTO a water tile; the cost is 3 movement points.
+- After moving into water, the unit's `actionsRemaining` is forced to 0 (no further move, attack, or ability this turn).
+- The unit's `wadedThisTurn` flag is set to true.
+- `startTurn()` resets `wadedThisTurn` to false.
+- A unit on water can still attack from there (only the *entering* ends the turn; standing on water doesn't restrict attacks after the turn boundary).
+
+This makes water a tactical choice: pay 3 movement to get there, but your turn is over. The visual: a unit on a water tile gets a `bf-unit--wading` class (low opacity, slight blur) for the rest of its turn. `startTurn()` clears the class on the next turn's start.
+
+### Rough terrain
+
+No change to existing rules: cost 2 movement, no defense bonus, no concealment, no crit window. Rough slows approach but is not a defensive position.
+
+### Blocking
+
+No change. Impassable.
+
+## Out of Scope
+
+- New terrain types (e.g., high ground, walls, doors). Plan 5 keeps the existing 5 terrain types.
+- New unit archetypes. The 4 archetypes (defender, striker, support, scout) and their stat ranges are unchanged.
+- New stats (e.g., luck, precision). To-hit is derived from the existing attack/defense/speed stats; no new stat axis.
+- New abilities. The 3 abilities (heal, area_damage, buff) are unchanged.
+- New victory conditions. The 2 existing conditions (eliminate_all, hold_objective) are unchanged.
+- UI redesign. The match view's layout and interaction model are unchanged; only the action log gets longer strings.
+- A "fog of war" or hidden-information system. The engine is fully observable to both players in hot-seat mode; Plan 5 keeps that.
+- Per-turn re-rolling of starting positions. The starting position is what the scenario sets.
+
+## System Boundaries (unchanged from Plan 1)
+
+1. **Content library** (Domain) — owns archetypes, abilities, terrain, and now the new combat math.
+2. **Scenario editor** (web) — unchanged. Existing JSON shape; no new fields.
+3. **Rules engine** (Domain) — `CombatEngine` is the single authority. Plan 5 modifies `attack()` to add to-hit, concealment, variance, crits, and water-wade.
+4. **Battle interface** (web) — unchanged structurally. The JS renderer just reads the (now richer) action log strings.
+
+The Application layer is unchanged except for a small extension to `ScenarioSerializer` to round-trip `wadedThisTurn` in the `UnitState`. Web layer is unchanged. Storage layer is unchanged.
+
+## Data and Action Flow
+
+### Per-attack flow (modified)
+
+1. User clicks the Attack button on an enemy unit adjacent to one of their units.
+2. JS reads the current match state from `localStorage`, builds the action POST with `X-CSRF-Token` and `X-Turn-Token`, and POSTs to `/matches/current/attack`.
+3. Server: `PostMatchAttack::handle` calls `MatchActionSupport::verify` (existing CSRF/turn-token check).
+4. Server: `CombatEngine::attack(...)` runs:
+   a. Verifies the attacker can act, the target is a valid enemy, and the target is in attack range (existing checks).
+   b. Computes the to-hit threshold: `40 + attack*3 - (defense + terrainDefense) - flanking`.
+   c. Rolls `roll = random_int(1, 100)`.
+   d. If `roll < threshold`: log miss, return without state change to attacker (still spends the attack action).
+   e. If the target is on forest: roll `concealmentRoll = random_int(1, 100)`. If `concealmentRoll <= 15`: log `miss — concealed`, return.
+   f. Compute damage: `round(max(1, attack+bonus - defense-terrainDefense) * random_int(85, 115) / 100)`.
+   g. If `roll >= 95`: double the damage before rounding. Log `crit`.
+   h. Apply damage to the target. Log hit (or crit) with the roll and threshold.
+5. Server returns the new match state with the action log entry.
+6. JS replaces the local envelope, re-renders.
+
+### Per-turn flow (modified for water)
+
+1. End Turn: same as today.
+2. `CombatEngine::endTurn()` rotates the active team, refreshes the next team's units, and resets `actionsRemaining`, `hasAttacked`, `hasUsedAbility`, **and `wadedThisTurn`**.
+3. The new turn token is computed and returned to the JS as before.
+
+### Water-entry flow (new)
+
+1. JS sends a move action with destination on a water tile.
+2. `CombatEngine::move(...)` validates the destination is in attack range (1 step), is not blocking, and the unit has actions remaining.
+3. After moving, the engine sets `wadedThisTurn = true` on the unit and `actionsRemaining = 0`.
+4. The new `UnitState` is included in the response.
+5. JS renders the unit on the water tile with the `bf-unit--wading` class. No further action buttons are enabled for that unit this turn (the existing "actions remaining" UI gate already handles this).
+
+## Validation and Failure Handling
+
+- The to-hit formula is always evaluated; no random roll is skipped. Every attack produces an action log entry, even if the result is "miss."
+- Water-wade is enforced server-side. The JS cannot bypass it by simply not sending the wade flag — the flag is part of the `UnitState` and the engine sets it.
+- A 5% crit window always exists (threshold ceiling at 95). A 5% hit window always exists (threshold floor at 5).
+- The forest concealment is independent of to-hit. A unit in forest can still be hit (the concealment roll is a 15% miss chance, not a 100% miss chance).
+- The `random_int(1, 100)` call uses PHP's CSPRNG (`/dev/urandom` on Linux, `BCryptGenRandom` on Windows). No seeding; no reproducibility.
+
+## Security and Quality Requirements
+
+Inherited from the design spec:
+- Every state-changing form or request uses and verifies a CSRF token before mutation.
+- All rendered output is escaped for its output context.
+- PHP follows the repository PHPCS rules and passes PHPStan at level 6.
+- JavaScript passes ESLint using `airbnb/base` and Prettier checks.
+- Composer configuration passes `composer validate --strict`.
+
+Plan 5-specific:
+- The `random_int(1, 100)` calls are documented with their purpose at the call site (to-hit roll, concealment roll, damage variance).
+- The to-hit constants (40, 3, 15, 5, 95) are named constants in `CombatEngine`, not magic numbers, so they're easy to retune. Documentation at the constant declaration explains the choice.
+- The action log entry format is documented as a string contract; any deviation is a bug.
+- The Plan 5 changes do not introduce new PHPCS warnings. The `random_int` and to-hit math are short; the log format string is < 200 chars; no line-length regression.
+- Plan 5 changes are covered by unit tests at the engine level (hit, miss, crit, variance, flanking, terrain, water-wade) and by an integration test that asserts the action log entry format on a sample attack.
+
+## Verification Strategy
+
+### Unit tests
+
+- `tests/Unit/Domain/CombatEngineTest.php` (existing, extended):
+  - `testAttackRollsAboveThreshold` — attack with `attack=10, defense=0, no terrain` produces threshold 70, roll of 80 yields hit, damage within ±15% of base.
+  - `testAttackMissesWhenRollBelowThreshold` — same setup, roll of 30 yields miss, damage 0, log has ` — miss`.
+  - `testAttackCritsOnRollAtOrAbove95` — roll 95 yields crit, damage doubled.
+  - `testAttackForestDefenderRollsConcealment` — defender on forest, to-hit passes, concealment roll 10 yields ` — miss — concealed`.
+  - `testAttackForestDefenderPassesConcealmentMostOfTheTime` — repeated roll sample, 80%+ hits through concealment.
+  - `testAttackFlankingBonus` — ally in N/S/E/W of target reduces threshold by 15 (30 with 2+).
+  - `testAttackDoesNotFlankFromDiagonal` — ally at a corner does not contribute.
+  - `testAttackFlankingCapsAt30` — three allies give 30, not 45.
+  - `testAttackDamageVariance` — repeated runs, damage falls within `[floor*0.85, ceil*1.15]`.
+  - `testAttackThresholdFloorAt5` — very-low-attack vs very-high-defense never drops below 5.
+  - `testAttackThresholdCeilingAt95` — very-high-attack vs very-low-defense never exceeds 95.
+
+### Per-unit-state tests
+
+- `tests/Unit/Domain/UnitStateTest.php` (existing, extended):
+  - `testStartTurnResetsWadedFlag` — unit that waded has `wadedThisTurn = false` after `startTurn()`.
+  - `testWithWadedSetsFlag` — `withWaded(true)` returns a unit with the flag set.
+  - Round-trip via `ScenarioSerializer::unitToArray` / `unitFromArray` carries the flag.
+
+### Per-terrain tests
+
+- `tests/Unit/Domain/TerrainTest.php` (new):
+  - `testWaterIsTraversableWithCost3` — `Water->movementCost() === 3`.
+  - `testForestCostIs2` — `Forest->movementCost() === 2` (existing; regression).
+  - `testWaterIsNotBlocking` — `Water !== Blocking`.
+  - `testForestConcealmentConstantIs15` — a named constant `Forest::CONCEALMENT_MISS_CHANCE === 15`.
+
+### Integration tests
+
+- `tests/Integration/PostMatchActionTest.php` (existing, extended):
+  - `testAttackActionLogIncludesRollAndThreshold` — fresh attack, response body, assert `match.actionLog[-1]` matches `/^\S+ attacked \S+ \(rolled \d+ \/ needed \d+\) for \d+ damage/`.
+  - `testAttackActionLogFlagsMiss` — when a miss happens (force via seeded test), log entry contains ` — miss`.
+  - `testMoveIntoWaterEndsTurn` — fresh unit on dry tile, move to adjacent water tile, response carries `wadedThisTurn = true` and `actionsRemaining = 0`.
+  - `testStartTurnResetsWadedFlag` — end turn, next turn the unit's `wadedThisTurn` is back to false.
+
+### Scenario fixtures
+
+- `public/assets/scenarios/last-stand.json` — unchanged on disk; the validator's water-traversable rule allows units to START on water, and the editor's water traversal works the same. No JSON edits needed.
+- `public/assets/scenarios/skirmish.json` — unchanged (no water in this scenario).
+- `public/assets/scenarios/hold-the-line.json` — unchanged.
+
+### Manual usability check
+
+A tester with no BattleForge context can:
+1. Open the dev URL, click Play bundled → Skirmish.
+2. Move a unit next to an enemy, click Attack, see the action log entry show `rolled X / needed Y for Z damage` (or ` — miss`).
+3. Move a unit into forest, defend with it, see ` — concealed` in the log when an attack misses.
+4. Move a unit into water, see the rest of the turn's actions disabled and the wading visual.
+5. Surround an enemy with two allies, see the threshold drop and more hits land.
+
+## Release Boundary
+
+Plan 5 is releasable when:
+
+- Every in-scope capability above is implemented and the verification suite is green (PHPUnit, PHPStan, PHPCS, ESLint, Prettier).
+- A new playthrough of Skirmish and Hold the Line shows the action log entries in the documented format.
+- A playthrough of Last Stand (which has water tiles) shows the wade behavior.
+- The to-hit formula's constants (40, 3, 15, 5, 95) are documented as named constants and easy to retune.
+- The pre-existing PHPCS baseline (91 warnings across 18 files) is unchanged.

public/assets/scenarios/hold-the-line.json

@@ -0,0 +1,30 @@
+{
+  "id": "hold-the-line",
+  "name": "Hold the Line",
+  "battlefield": {
+    "width": 10,
+    "height": 8,
+    "terrain": {
+      "2:2": "forest", "2:3": "forest", "2:4": "forest", "2:5": "forest",
+      "3:2": "forest", "3:3": "forest"
+    }
+  },
+  "units": [
+    { "id": "alpha-1", "teamId": "alpha", "position": { "x": 2, "y": 3 }, "maxHealth": 14, "health": 14, "attack": 3, "defense": 5, "speed": 2, "archetype": "defender", "abilities": [] },
+    { "id": "alpha-2", "teamId": "alpha", "position": { "x": 2, "y": 4 }, "maxHealth": 14, "health": 14, "attack": 3, "defense": 5, "speed": 2, "archetype": "defender", "abilities": [] },
+    { "id": "alpha-3", "teamId": "alpha", "position": { "x": 2, "y": 5 }, "maxHealth": 14, "health": 14, "attack": 3, "defense": 5, "speed": 2, "archetype": "defender", "abilities": [] },
+    { "id": "bravo-1", "teamId": "bravo", "position": { "x": 9, "y": 1 }, "maxHealth": 8, "health": 8, "attack": 5, "defense": 2, "speed": 3, "archetype": "striker", "abilities": ["area_damage"] },
+    { "id": "bravo-2", "teamId": "bravo", "position": { "x": 9, "y": 3 }, "maxHealth": 8, "health": 8, "attack": 5, "defense": 2, "speed": 3, "archetype": "striker", "abilities": ["area_damage"] },
+    { "id": "bravo-3", "teamId": "bravo", "position": { "x": 9, "y": 7 }, "maxHealth": 7, "health": 7, "attack": 2, "defense": 2, "speed": 3, "archetype": "support", "abilities": ["heal"] },
+    { "id": "bravo-4", "teamId": "bravo", "position": { "x": 9, "y": 4 }, "maxHealth": 6, "health": 6, "attack": 3, "defense": 1, "speed": 5, "archetype": "scout", "abilities": [] }
+  ],
+  "deploymentZones": {
+    "alpha": { "teamId": "alpha", "positions": [{ "x": 2, "y": 3 }, { "x": 2, "y": 4 }, { "x": 2, "y": 5 }] },
+    "bravo": { "teamId": "bravo", "positions": [{ "x": 9, "y": 1 }, { "x": 9, "y": 3 }, { "x": 9, "y": 7 }, { "x": 9, "y": 4 }] }
+  },
+  "objectives": {
+    "objective-1": { "id": "objective-1", "position": { "x": 4, "y": 4 } }
+  },
+  "victoryCondition": "hold_objective",
+  "holdRoundsRequired": 3
+}

public/assets/scenarios/last-stand.json

@@ -0,0 +1,34 @@
+{
+  "id": "last-stand",
+  "name": "Last Stand",
+  "battlefield": {
+    "width": 12,
+    "height": 12,
+    "terrain": {
+      "2:2": "forest", "2:3": "forest", "2:8": "forest", "2:9": "forest",
+      "3:2": "forest", "3:3": "forest", "3:8": "forest", "3:9": "forest",
+      "5:5": "rough", "5:6": "rough", "6:5": "rough", "6:6": "rough",
+      "8:2": "water", "8:3": "water", "8:8": "water", "8:9": "water",
+      "9:2": "water", "9:3": "water", "9:8": "water", "9:9": "water"
+    }
+  },
+  "units": [
+    { "id": "alpha-1", "teamId": "alpha", "position": { "x": 0, "y": 0 }, "maxHealth": 14, "health": 14, "attack": 3, "defense": 5, "speed": 2, "archetype": "defender", "abilities": [] },
+    { "id": "alpha-2", "teamId": "alpha", "position": { "x": 0, "y": 3 }, "maxHealth": 14, "health": 14, "attack": 3, "defense": 5, "speed": 2, "archetype": "defender", "abilities": [] },
+    { "id": "alpha-3", "teamId": "alpha", "position": { "x": 0, "y": 6 }, "maxHealth": 14, "health": 14, "attack": 3, "defense": 5, "speed": 2, "archetype": "defender", "abilities": [] },
+    { "id": "alpha-4", "teamId": "alpha", "position": { "x": 0, "y": 9 }, "maxHealth": 7, "health": 7, "attack": 2, "defense": 2, "speed": 3, "archetype": "support", "abilities": ["heal"] },
+    { "id": "alpha-5", "teamId": "alpha", "position": { "x": 1, "y": 5 }, "maxHealth": 6, "health": 6, "attack": 3, "defense": 1, "speed": 5, "archetype": "scout", "abilities": [] },
+    { "id": "alpha-6", "teamId": "alpha", "position": { "x": 2, "y": 11 }, "maxHealth": 6, "health": 6, "attack": 3, "defense": 1, "speed": 5, "archetype": "scout", "abilities": [] },
+    { "id": "bravo-1", "teamId": "bravo", "position": { "x": 11, "y": 2 }, "maxHealth": 8, "health": 8, "attack": 5, "defense": 2, "speed": 3, "archetype": "striker", "abilities": ["area_damage"] },
+    { "id": "bravo-2", "teamId": "bravo", "position": { "x": 11, "y": 5 }, "maxHealth": 8, "health": 8, "attack": 5, "defense": 2, "speed": 3, "archetype": "striker", "abilities": ["area_damage"] },
+    { "id": "bravo-3", "teamId": "bravo", "position": { "x": 11, "y": 8 }, "maxHealth": 8, "health": 8, "attack": 5, "defense": 2, "speed": 3, "archetype": "striker", "abilities": ["area_damage"] },
+    { "id": "bravo-4", "teamId": "bravo", "position": { "x": 10, "y": 11 }, "maxHealth": 6, "health": 6, "attack": 3, "defense": 1, "speed": 5, "archetype": "scout", "abilities": [] }
+  ],
+  "deploymentZones": {
+    "alpha": { "teamId": "alpha", "positions": [{ "x": 0, "y": 0 }, { "x": 0, "y": 3 }, { "x": 0, "y": 6 }, { "x": 0, "y": 9 }, { "x": 1, "y": 5 }, { "x": 2, "y": 11 }] },
+    "bravo": { "teamId": "bravo", "positions": [{ "x": 11, "y": 2 }, { "x": 11, "y": 5 }, { "x": 11, "y": 8 }, { "x": 10, "y": 11 }] }
+  },
+  "objectives": {},
+  "victoryCondition": "eliminate_all",
+  "holdRoundsRequired": 1
+}

public/assets/scenarios/manifest.json

@@ -0,0 +1,14 @@
+{
+  "skirmish": {
+    "name": "Skirmish",
+    "summary": "8x8 open ground. Three units per side. Eliminate the enemy team."
+  },
+  "hold-the-line": {
+    "name": "Hold the Line",
+    "summary": "10x8 with a small forest cluster on the alpha side. Three defenders cover an open objective at (4,4); four bravo units push from the right edge. Hold the objective for three rounds."
+  },
+  "last-stand": {
+    "name": "Last Stand",
+    "summary": "12x12 with mixed terrain. Six defenders versus four strikers. Eliminate the enemy team."
+  }
+}

public/assets/scenarios/skirmish.json

@@ -0,0 +1,24 @@
+{
+  "id": "skirmish",
+  "name": "Skirmish",
+  "battlefield": {
+    "width": 8,
+    "height": 8,
+    "terrain": {}
+  },
+  "units": [
+    { "id": "alpha-1", "teamId": "alpha", "position": { "x": 0, "y": 1 }, "maxHealth": 12, "health": 12, "attack": 3, "defense": 4, "speed": 2, "archetype": "defender", "abilities": [] },
+    { "id": "alpha-2", "teamId": "alpha", "position": { "x": 0, "y": 3 }, "maxHealth": 8, "health": 8, "attack": 5, "defense": 2, "speed": 3, "archetype": "striker", "abilities": ["area_damage"] },
+    { "id": "alpha-3", "teamId": "alpha", "position": { "x": 0, "y": 6 }, "maxHealth": 7, "health": 7, "attack": 2, "defense": 2, "speed": 3, "archetype": "support", "abilities": ["heal"] },
+    { "id": "bravo-1", "teamId": "bravo", "position": { "x": 7, "y": 1 }, "maxHealth": 8, "health": 8, "attack": 5, "defense": 2, "speed": 3, "archetype": "striker", "abilities": ["area_damage"] },
+    { "id": "bravo-2", "teamId": "bravo", "position": { "x": 7, "y": 3 }, "maxHealth": 6, "health": 6, "attack": 3, "defense": 1, "speed": 5, "archetype": "scout", "abilities": [] },
+    { "id": "bravo-3", "teamId": "bravo", "position": { "x": 7, "y": 6 }, "maxHealth": 7, "health": 7, "attack": 2, "defense": 2, "speed": 3, "archetype": "support", "abilities": ["heal"] }
+  ],
+  "deploymentZones": {
+    "alpha": { "teamId": "alpha", "positions": [{ "x": 0, "y": 1 }, { "x": 0, "y": 3 }, { "x": 0, "y": 6 }] },
+    "bravo": { "teamId": "bravo", "positions": [{ "x": 7, "y": 1 }, { "x": 7, "y": 3 }, { "x": 7, "y": 6 }] }
+  },
+  "objectives": {},
+  "victoryCondition": "eliminate_all",
+  "holdRoundsRequired": 1
+}

public/assets/styles.css

@@ -18,4 +18,24 @@ table.bf-grid button[data-objective="1"] { outline: 3px solid #c00; }
 table.bf-grid button[data-zone="alpha"] { outline: 3px solid #00c; }
 table.bf-grid button[data-zone="bravo"] { outline: 3px solid #0c0; }
 .bf-errors { color: #c00; }
-.bf-toast { background: #dfd; padding: 0.5rem 1rem; margin: 0.5rem 0; }
+.bf-match { display: flex; gap: 1rem; }
+.bf-grid { display: grid; gap: 1px; background: #ddd; padding: 1px; width: max-content; grid-template-columns: repeat(var(--bf-cols, 8), 2.5rem); }
+.bf-tile { width: 2.5rem; height: 2.5rem; border: 0; background: #fff; padding: 0; position: relative; }
+.bf-tile[data-bf-terrain="forest"] { background: #cfc; }
+.bf-tile[data-bf-terrain="rough"] { background: #fec; }
+.bf-tile[data-bf-terrain="water"] { background: #cce; }
+.bf-tile[data-bf-terrain="blocking"] { background: #444; }
+.bf-unit { width: 100%; height: 100%; font-size: 0.7rem; border: 0; cursor: pointer; }
+.bf-unit--alpha { background: #cce5ff; }
+.bf-unit--bravo { background: #ffcccc; }
+.bf-unit--active { outline: 2px solid #060; }
+.bf-unit--inactive { opacity: 0.4; cursor: not-allowed; }
+.bf-unit--winner { outline: 3px solid #c00; }
+.bf-unit--wading { opacity: 0.55; filter: blur(0.4px); }
+.bf-action--active { font-weight: bold; }
+.bf-toast { background: #ffd; padding: 0.5rem 1rem; margin: 0.25rem 0; border: 1px solid #cc9; }
+.bf-log { max-height: 12rem; overflow: auto; background: #f4f4f4; padding: 0.5rem; margin-top: 1rem; }
+.bf-log-entry { margin: 0; font-family: monospace; font-size: 0.85rem; }
+.bf-empty { color: #777; font-style: italic; }
+.bf-result { margin-top: 1rem; padding: 1rem; background: #efe; border: 2px solid #393; }
+.bf-result[hidden] { display: none; }

public/index.php

@@ -5,10 +5,17 @@ declare(strict_types=1);
 use BattleForge\Http\CsrfToken;
 use BattleForge\Http\Handlers\GetAssets;
 use BattleForge\Http\Handlers\GetBattlefieldEditor;
+use BattleForge\Http\Handlers\GetBundledScenario;
+use BattleForge\Http\Handlers\GetBundledScenarios;
 use BattleForge\Http\Handlers\GetHomePage;
+use BattleForge\Http\Handlers\GetMatchView;
 use BattleForge\Http\Handlers\GetTeamEditor;
 use BattleForge\Http\Handlers\PostBattlefieldEditor;
 use BattleForge\Http\Handlers\PostImageUpload;
+use BattleForge\Http\Handlers\PostMatchAbility;
+use BattleForge\Http\Handlers\PostMatchAttack;
+use BattleForge\Http\Handlers\PostMatchEndTurn;
+use BattleForge\Http\Handlers\PostMatchMove;
 use BattleForge\Http\Handlers\PostStartMatch;
 use BattleForge\Http\Handlers\PostTeamEditor;
 use BattleForge\Http\Request;
@@ -18,8 +25,11 @@ use BattleForge\Http\Router;
 require __DIR__ . '/../vendor/autoload.php';
 
 // 1. Read the app secret.
-$secret = getenv('BATTLEFORGE_SECRET');
+// The app secret reads as the CSRF/turn-token HMAC key. The name below
-if ($secret === false || $secret === '') {
+// (kept for historical reasons) is just the variable label; the same
+// value is used for both the CSRF cookie HMAC and the turn-token HMAC.
+$csrfSecret = getenv('BATTLEFORGE_SECRET');
+if ($csrfSecret === false || $csrfSecret === '') {
     $secretFile = __DIR__ . '/../var/secret.key';
     if (!is_file($secretFile)) {
         if (!is_dir(dirname($secretFile))) {
@@ -28,19 +38,37 @@ if ($secret === false || $secret === '') {
         file_put_contents($secretFile, random_bytes(32));
         chmod($secretFile, 0600);
     }
-    $secret = file_get_contents($secretFile);
+    $csrfSecret = file_get_contents($secretFile);
-    if ($secret === false) {
+    if ($csrfSecret === false) {
         http_response_code(500);
         echo "Failed to read app secret.\n";
         return;
     }
 }
 
-// 2. Ensure the __csrf cookie is set. If absent, issue a fresh token.
+// 2. Ensure the __csrf cookie is set. If absent OR stale, issue a fresh
+//    token. A cookie pair is "stale" when both cookies are present but
+//    the HMAC (__csrf) does not match the raw token (__csrf_token) under
+//    the current secret. This can happen when a browser session predates
+//    a server restart with a fresh secret.key: the browser still has the
+//    old __csrf cookie, the new server's secret does not match it, and
+//    every CSRF check fails. By re-minting on first request, we recover
+//    the session without requiring the user to clear cookies manually.
+//    The double-submit pattern stores the raw token in a separate
+//    readable cookie so client code (meta tag, JS) can echo it back as
+//    the X-CSRF-Token header. The HMAC cookie is the verification
+//    oracle; the raw-token cookie rides parallel and is readable by
+//    document.cookie or the equivalent server-side read.
 $cookies = $_COOKIE;
 $existingCookie = (string) ($cookies['__csrf'] ?? '');
-if ($existingCookie === '') {
+$existingRawToken = (string) ($cookies['__csrf_token'] ?? '');
-    [$token, $cookie] = CsrfToken::issue($secret);
+$pairIsFresh = false;
+if ($existingCookie !== '' && $existingRawToken !== '') {
+    $expectedHmac = hash_hmac('sha256', $existingRawToken, $csrfSecret);
+    $pairIsFresh = hash_equals($expectedHmac, $existingCookie);
+}
+if ($existingCookie === '' || $existingRawToken === '' || !$pairIsFresh) {
+    [$token, $cookie] = CsrfToken::issue($csrfSecret);
     setcookie('__csrf', $cookie, [
         'expires' => time() + 86400,
         'path' => '/',
@@ -48,12 +76,27 @@ if ($existingCookie === '') {
         'httponly' => true,
         'samesite' => 'Lax',
     ]);
+    // The raw token rides in a readable cookie so server-side templates
+    // can echo it into the <meta name="csrf-token"> tag without keeping
+    // the raw token in `index.php` per-request state. HttpOnly off so the
+    // server can read it via the request cookie jar; security comes from
+    // the HMAC verification, not from hiding the raw token (which the
+    // browser would already see in the meta tag anyway).
+    setcookie('__csrf_token', $token, [
+        'expires' => time() + 86400,
+        'path' => '/',
+        'secure' => isset($_SERVER['HTTPS']),
+        'httponly' => false,
+        'samesite' => 'Lax',
+    ]);
     $existingCookie = $cookie;
+    $existingRawToken = $token;
     $cookies['__csrf'] = $cookie;
+    $cookies['__csrf_token'] = $token;
 }
 
 // 3. Compute the upload-endpoint user token (derived from the same secret).
-$uploadsToken = hash_hmac('sha256', $secret, 'bf-uploads');
+$uploadsToken = hash_hmac('sha256', $csrfSecret, 'bf-uploads');
 
 // 4. Determine the request method, path, and content type.
 $method = strtoupper((string) ($_SERVER['REQUEST_METHOD'] ?? 'GET'));
@@ -75,7 +118,7 @@ $rawBody = (string) ($_SERVER['__raw_body'] ?? file_get_contents('php://input'))
 // 6. Build a Request with the request data, the CSRF secret, and the upload token.
 $server = $_SERVER;
 if (!isset($server['__csrf_secret'])) {
-    $server['__csrf_secret'] = $secret;
+    $server['__csrf_secret'] = $csrfSecret;
 }
 $server['__uploads_token'] = $uploadsToken;
 
@@ -92,11 +135,15 @@ $request = new Request(
     rawBody: $rawBody,
 );
 
-// 7. Configure the router with the eight routes.
+// 7. Configure the router.
 $uploadsRoot = __DIR__ . '/../var/uploads';
 $placeholderDir = __DIR__ . '/assets/placeholders';
 
-$homePage = static fn (Request $r, array $p): Response => (new GetHomePage())->handle($r, $p);
+$scenariosDir = __DIR__ . '/assets/scenarios';
+
+$homePage = static function (Request $r, array $p) use ($scenariosDir): Response {
+    return (new GetHomePage($scenariosDir))->handle($r, $p);
+};
 $getTeam = static fn (Request $r, array $p): Response => (new GetTeamEditor())->handle($r, $p);
 $postTeam = static fn (Request $r, array $p): Response => (new PostTeamEditor())->handle($r, $p);
 $getBattlefield = static fn (Request $r, array $p): Response => (new GetBattlefieldEditor())->handle($r, $p);
@@ -113,9 +160,35 @@ $getUploadedAsset = static function (Request $r, array $p) use ($placeholderDir,
         ['kind' => 'uploads', 'userToken' => $p['userToken'] ?? '', 'filename' => $p['filename'] ?? ''],
     );
 };
+$getBundledList = static function (Request $r, array $p) use ($scenariosDir): Response {
+    return (new GetBundledScenarios($scenariosDir))->handle($r, $p);
+};
+$getBundledOne = static function (Request $r, array $p) use ($scenariosDir): Response {
+    return (new GetBundledScenario($scenariosDir))->handle($r, $p);
+};
+$getMatchView = static fn (Request $r, array $p): Response => (new GetMatchView())->handle($r, $p);
+$postMatchMove = static function (Request $r, array $p) use ($csrfSecret): Response {
+    return (new PostMatchMove($csrfSecret))->handle($r, $p);
+};
+$postMatchAttack = static function (Request $r, array $p) use ($csrfSecret): Response {
+    return (new PostMatchAttack($csrfSecret))->handle($r, $p);
+};
+$postMatchAbility = static function (Request $r, array $p) use ($csrfSecret): Response {
+    return (new PostMatchAbility($csrfSecret))->handle($r, $p);
+};
+$postMatchEndTurn = static function (Request $r, array $p) use ($csrfSecret): Response {
+    return (new PostMatchEndTurn($csrfSecret))->handle($r, $p);
+};
 
 $router = new Router();
 $router->add('GET', '/', $homePage);
+$router->add('GET', '/scenarios/bundled', $getBundledList);
+$router->add('GET', '/scenarios/bundled/{id}', $getBundledOne);
+$router->add('GET', '/matches/current', $getMatchView);
+$router->add('POST', '/matches/current/move', $postMatchMove);
+$router->add('POST', '/matches/current/attack', $postMatchAttack);
+$router->add('POST', '/matches/current/ability', $postMatchAbility);
+$router->add('POST', '/matches/current/end-turn', $postMatchEndTurn);
 $router->add('GET', '/scenarios/{id}/edit/team', $getTeam);
 $router->add('POST', '/scenarios/{id}/edit/team', $postTeam);
 $router->add('GET', '/scenarios/{id}/edit/battlefield', $getBattlefield);

public/js/match.js

@@ -0,0 +1,393 @@
+const CSRF_META = 'meta[name="csrf-token"]';
+const ACTIVE_TEAM_LABEL = { alpha: 'Alpha', bravo: 'Bravo' };
+
+function getCsrfToken() {
+  const meta = document.querySelector(CSRF_META);
+  return meta ? meta.getAttribute('content') : '';
+}
+
+function getEnvelope() {
+  const raw = localStorage.getItem('match:current');
+  if (raw === null) return null;
+  try {
+    const parsed = JSON.parse(raw);
+    if (!parsed || typeof parsed !== 'object' || !parsed.match || !parsed.matchId) return null;
+    return parsed;
+  } catch (e) {
+    return null;
+  }
+}
+
+function setEnvelope(envelope) {
+  localStorage.setItem('match:current', JSON.stringify(envelope));
+}
+
+function removeEnvelope() {
+  localStorage.removeItem('match:current');
+}
+
+function el(tag, attrs = {}, text = null) {
+  const node = document.createElement(tag);
+  Object.entries(attrs).forEach(([k, v]) => {
+    if (v !== null && v !== undefined) {
+      node.setAttribute(k, String(v));
+    }
+  });
+  if (text !== null) {
+    node.appendChild(document.createTextNode(String(text)));
+  }
+  return node;
+}
+
+function renderNoMatch(root) {
+  while (root.firstChild) root.removeChild(root.firstChild);
+  const empty = el('p', { class: 'bf-empty' }, 'No match in progress.');
+  const link = el('a', { href: '/' }, 'Return to home');
+  root.appendChild(empty);
+  root.appendChild(link);
+}
+
+function renderHeader(match) {
+  const header = document.getElementById('bf-match-header');
+  const team = document.getElementById('bf-active-team');
+  const round = document.getElementById('bf-round');
+  header.setAttribute('data-bf-active-team', match.activeTeamId);
+  header.setAttribute('data-bf-round', String(match.round));
+  while (team.firstChild) team.removeChild(team.firstChild);
+  team.appendChild(
+    document.createTextNode(ACTIVE_TEAM_LABEL[match.activeTeamId] || match.activeTeamId),
+  );
+  while (round.firstChild) round.removeChild(round.firstChild);
+  round.appendChild(document.createTextNode(String(match.round)));
+}
+
+function renderGrid(root, match) {
+  while (root.firstChild) root.removeChild(root.firstChild);
+  const { width, height, terrain } = match.battlefield;
+  root.setAttribute('data-bf-width', String(width));
+  root.setAttribute('data-bf-height', String(height));
+  // Set the column count via a CSS variable so the grid-template-columns
+  // declaration can read it portably (CSS attr() for non-content properties
+  // is not yet supported in Safari or Firefox as of mid-2026).
+  root.style.setProperty('--bf-cols', String(width));
+
+  const unitsByKey = {};
+  match.units.forEach((unit) => {
+    if (unit.health > 0) {
+      unitsByKey[`${unit.position.x}:${unit.position.y}`] = unit;
+    }
+  });
+
+  for (let y = 0; y < height; y += 1) {
+    for (let x = 0; x < width; x += 1) {
+      const key = `${x}:${y}`;
+      const terrainType = (terrain && terrain[key]) || 'open';
+      const tile = el('button', {
+        type: 'button',
+        class: 'bf-tile',
+        'data-bf-x': x,
+        'data-bf-y': y,
+        'data-bf-terrain': terrainType,
+      });
+      const unit = unitsByKey[key];
+      if (unit) {
+        const isActive = unit.teamId === match.activeTeamId;
+        const isWinner = match.winnerTeamId && unit.teamId === match.winnerTeamId;
+        const cls = ['bf-unit', `bf-unit--${unit.teamId}`];
+        if (isActive) cls.push('bf-unit--active');
+        else cls.push('bf-unit--inactive');
+        if (isWinner) cls.push('bf-unit--winner');
+        if (unit.wadedThisTurn) cls.push('bf-unit--wading');
+        const unitBtn = el(
+          'button',
+          {
+            type: 'button',
+            class: cls.join(' '),
+            'data-bf-unit-id': unit.id,
+            'data-bf-team': unit.teamId,
+          },
+          `${unit.id.split('-')[1] || unit.id} (${unit.health})`,
+        );
+        tile.appendChild(unitBtn);
+      }
+      root.appendChild(tile);
+    }
+  }
+}
+
+function renderLog(root, match) {
+  while (root.firstChild) root.removeChild(root.firstChild);
+  const log = Array.isArray(match.actionLog) ? match.actionLog.slice(-10) : [];
+  log.forEach((entry) => {
+    root.appendChild(el('p', { class: 'bf-log-entry' }, entry));
+  });
+}
+
+function renderResult(match) {
+  const result = document.getElementById('bf-result');
+  const winner = document.getElementById('bf-winner');
+  while (winner.firstChild) winner.removeChild(winner.firstChild);
+  winner.appendChild(
+    document.createTextNode(ACTIVE_TEAM_LABEL[match.winnerTeamId] || match.winnerTeamId),
+  );
+  result.removeAttribute('hidden');
+  const endBtn = document.getElementById('bf-end-turn');
+  if (endBtn) endBtn.setAttribute('disabled', 'disabled');
+  ['bf-action-move', 'bf-action-attack', 'bf-action-ability'].forEach((id) => {
+    const btn = document.getElementById(id);
+    if (btn) btn.setAttribute('disabled', 'disabled');
+  });
+}
+
+function renderState() {
+  const envelope = getEnvelope();
+  const grid = document.getElementById('bf-grid');
+  if (!envelope) {
+    renderNoMatch(grid);
+    return;
+  }
+  const { match } = envelope;
+  renderHeader(match);
+  renderGrid(grid, match);
+  renderLog(document.getElementById('bf-log'), match);
+  if (match.winnerTeamId) {
+    renderResult(match);
+  } else {
+    document.getElementById('bf-result').setAttribute('hidden', 'hidden');
+  }
+}
+
+function toast(message) {
+  const host = document.getElementById('bf-toast-host');
+  if (!host) return;
+  const node = el('div', { class: 'bf-toast' }, message);
+  host.appendChild(node);
+  setTimeout(() => node.remove(), 3000);
+}
+
+async function dispatch(verb, params) {
+  const envelope = getEnvelope();
+  if (!envelope) {
+    toast('No match in progress.');
+    return;
+  }
+  const body = { matchId: envelope.matchId, match: envelope.match, ...params };
+  try {
+    const response = await fetch(`/matches/current/${verb}`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'X-CSRF-Token': getCsrfToken(),
+        'X-Turn-Token': envelope.turnToken || '',
+      },
+      body: JSON.stringify(body),
+    });
+    const data = await response.json().catch(() => ({}));
+    if (response.status === 200) {
+      setEnvelope({
+        matchId: envelope.matchId,
+        match: data.match,
+        turnToken: data.turnToken,
+      });
+      renderState();
+      return;
+    }
+    if (response.status === 409) {
+      if (data.error === 'turn') {
+        const fresh = getEnvelope();
+        if (fresh) {
+          setEnvelope(fresh);
+          renderState();
+          toast('Turn has changed; resynced.');
+        } else {
+          renderNoMatch(document.getElementById('bf-grid'));
+        }
+        return;
+      }
+      if (data.match) {
+        setEnvelope({
+          matchId: envelope.matchId,
+          match: data.match,
+          turnToken: data.turnToken || envelope.turnToken,
+        });
+        renderState();
+      }
+      if (data.error) toast(data.error);
+      return;
+    }
+    if (data.error) {
+      toast(data.error);
+    } else {
+      toast(`Action failed: HTTP ${response.status}`);
+    }
+  } catch (e) {
+    toast(`Network error: ${e.message}`);
+  }
+}
+
+let activeMode = 'move';
+let selectedUnitId = null;
+
+function updateSelectedUnitIndicator() {
+  const node = document.getElementById('bf-selected-unit');
+  if (!node) return;
+  while (node.firstChild) node.removeChild(node.firstChild);
+  node.appendChild(document.createTextNode(selectedUnitId || 'none'));
+}
+
+function renderAbilityOptions() {
+  const host = document.getElementById('bf-ability-options');
+  if (!host) return;
+  while (host.firstChild) host.removeChild(host.firstChild);
+  if (activeMode !== 'ability' || !selectedUnitId) {
+    return;
+  }
+  const envelope = getEnvelope();
+  if (!envelope) return;
+  const unit = envelope.match.units.find((u) => u.id === selectedUnitId);
+  if (!unit || !Array.isArray(unit.abilities) || unit.abilities.length === 0) {
+    host.appendChild(el('p', { class: 'bf-empty' }, 'No abilities.'));
+    return;
+  }
+  unit.abilities.forEach((abilityId) => {
+    const radio = el('input', {
+      type: 'radio',
+      name: 'bf-ability',
+      value: abilityId,
+      id: `bf-ability-${abilityId}`,
+    });
+    const label = el('label', { for: `bf-ability-${abilityId}` }, abilityId);
+    const wrap = el('span', {});
+    wrap.appendChild(radio);
+    wrap.appendChild(label);
+    host.appendChild(wrap);
+  });
+}
+
+function setMode(mode) {
+  activeMode = mode;
+  ['move', 'attack', 'ability'].forEach((m) => {
+    const btn = document.getElementById(`bf-action-${m}`);
+    if (btn) {
+      if (m === mode) btn.classList.add('bf-action--active');
+      else btn.classList.remove('bf-action--active');
+      btn.removeAttribute('disabled');
+    }
+  });
+  renderAbilityOptions();
+}
+
+function onTileClick(event) {
+  const tile = event.target.closest('.bf-tile');
+  if (!tile) return;
+  const x = Number(tile.getAttribute('data-bf-x'));
+  const y = Number(tile.getAttribute('data-bf-y'));
+  const unitBtn = tile.querySelector('.bf-unit');
+  if (unitBtn) {
+    const unitId = unitBtn.getAttribute('data-bf-unit-id');
+    const team = unitBtn.getAttribute('data-bf-team');
+    const envelope = getEnvelope();
+    if (!envelope) return;
+    if (team !== envelope.match.activeTeamId) {
+      toast('That unit is not on the active team.');
+      return;
+    }
+    if (activeMode === 'attack') {
+      toast('Pick a friendly unit to attack with, then click an enemy.');
+      selectedUnitId = unitId;
+      updateSelectedUnitIndicator();
+      return;
+    }
+    selectedUnitId = unitId;
+    updateSelectedUnitIndicator();
+    return;
+  }
+  if (activeMode === 'move' && selectedUnitId) {
+    dispatch('move', { unitId: selectedUnitId, x, y });
+    return;
+  }
+  if (activeMode === 'attack' && selectedUnitId) {
+    const envelope = getEnvelope();
+    if (!envelope) return;
+    const attacker = envelope.match.units.find((u) => u.id === selectedUnitId);
+    if (!attacker) return;
+    const target = envelope.match.units.find(
+      (u) => u.position.x === x && u.position.y === y && u.teamId !== attacker.teamId,
+    );
+    if (!target) {
+      toast('No enemy on that tile.');
+      return;
+    }
+    dispatch('attack', { attackerId: selectedUnitId, targetId: target.id });
+    return;
+  }
+  if (activeMode === 'ability' && selectedUnitId) {
+    const radio = document.querySelector('input[name="bf-ability"]:checked');
+    if (!radio) {
+      toast('Pick an ability first.');
+      return;
+    }
+    dispatch('ability', {
+      unitId: selectedUnitId,
+      abilityId: radio.value,
+      x,
+      y,
+    });
+  }
+}
+
+function onUnitClick(event) {
+  const unitBtn = event.target.closest('.bf-unit');
+  if (!unitBtn) return;
+  const unitId = unitBtn.getAttribute('data-bf-unit-id');
+  const team = unitBtn.getAttribute('data-bf-team');
+  const envelope = getEnvelope();
+  if (!envelope) return;
+  if (activeMode === 'attack' && team !== envelope.match.activeTeamId) {
+    if (!selectedUnitId) {
+      toast('Pick a friendly attacker first.');
+      return;
+    }
+    dispatch('attack', { attackerId: selectedUnitId, targetId: unitId });
+    return;
+  }
+  if (team === envelope.match.activeTeamId) {
+    selectedUnitId = unitId;
+    updateSelectedUnitIndicator();
+    return;
+  }
+  toast('That unit is not on the active team.');
+}
+
+function wireEvents() {
+  document.getElementById('bf-grid').addEventListener('click', (event) => {
+    const unitBtn = event.target.closest('.bf-unit');
+    if (unitBtn) {
+      onUnitClick(event);
+    } else {
+      onTileClick(event);
+    }
+  });
+  ['move', 'attack', 'ability'].forEach((mode) => {
+    const btn = document.getElementById(`bf-action-${mode}`);
+    if (btn) btn.addEventListener('click', () => setMode(mode));
+  });
+  const endBtn = document.getElementById('bf-end-turn');
+  if (endBtn) {
+    endBtn.addEventListener('click', () => dispatch('end-turn', {}));
+  }
+  const returnHome = document.getElementById('bf-return-home');
+  if (returnHome) {
+    returnHome.addEventListener('click', (event) => {
+      event.preventDefault();
+      removeEnvelope();
+      window.location.href = '/';
+    });
+  }
+}
+
+document.addEventListener('DOMContentLoaded', () => {
+  wireEvents();
+  setMode('move');
+  renderState();
+});

public/js/storage.js

@@ -188,14 +188,63 @@ async function startMatch() {
   }
   const data = await res.json();
   if (data.match) {
-    setCurrentMatch(data.match);
+    setCurrentMatch({ matchId: data.matchId, match: data.match, turnToken: data.turnToken });
-    window.location.href = '/';
+    window.location.href = '/matches/current';
   } else {
     // eslint-disable-next-line no-alert
     alert(`Start match failed: ${data.errors ? data.errors.join(', ') : 'unknown'}`);
   }
 }
 
+async function startBundledMatch(id) {
+  if (typeof id !== 'string' || !/^[a-z0-9-]+$/.test(id)) {
+    return;
+  }
+  const csrf = getCsrfToken();
+  let manifest;
+  try {
+    const res = await fetch(`/scenarios/bundled/${encodeURIComponent(id)}`);
+    if (!res.ok) {
+      // eslint-disable-next-line no-alert
+      alert(`Could not load scenario: HTTP ${res.status}`);
+      return;
+    }
+    manifest = await res.json();
+  } catch (e) {
+    // eslint-disable-next-line no-alert
+    alert(`Network error: ${e.message}`);
+    return;
+  }
+  let response;
+  try {
+    response = await fetch(`/scenarios/${encodeURIComponent(id)}/start`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'X-CSRF-Token': csrf,
+      },
+      body: JSON.stringify(manifest),
+    });
+  } catch (e) {
+    // eslint-disable-next-line no-alert
+    alert(`Network error: ${e.message}`);
+    return;
+  }
+  if (!response.ok) {
+    // eslint-disable-next-line no-alert
+    alert(`Start match failed: HTTP ${response.status}`);
+    return;
+  }
+  const data = await response.json();
+  if (data.match && data.matchId && data.turnToken) {
+    setCurrentMatch({ matchId: data.matchId, match: data.match, turnToken: data.turnToken });
+    window.location.href = '/matches/current';
+  } else {
+    // eslint-disable-next-line no-alert
+    alert(`Start match failed: ${(data.errors || ['unknown']).join(', ')}`);
+  }
+}
+
 window.bfStorage = {
   load,
   save,
@@ -204,6 +253,7 @@ window.bfStorage = {
   currentMatch,
   setCurrentMatch,
   removeCurrentMatch,
+  startBundledMatch,
 };
 
 document.addEventListener('DOMContentLoaded', () => {
@@ -216,4 +266,12 @@ document.addEventListener('DOMContentLoaded', () => {
       startMatch();
     });
   }
+  document.querySelectorAll('[data-bf-bundle]').forEach((button) => {
+    button.addEventListener('click', () => {
+      const id = button.getAttribute('data-bf-bundle');
+      if (id) {
+        startBundledMatch(id);
+      }
+    });
+  });
 });

src/Application/ScenarioSerializer.php

@@ -130,6 +130,14 @@ final class ScenarioSerializer
             $units[] = self::unitToArray($unit);
         }
 
+        $objectives = [];
+        foreach ($match->objectives as $id => $objective) {
+            $objectives[(string) $id] = [
+                'id' => $objective->id,
+                'position' => self::positionToArray($objective->position),
+            ];
+        }
+
         return [
             'battlefield' => [
                 'width' => $match->battlefield->width,
@@ -141,6 +149,7 @@ final class ScenarioSerializer
             'round' => $match->round,
             'winnerTeamId' => $match->winnerTeamId,
             'actionLog' => $match->actionLog,
+            'objectives' => $objectives,
             'victoryCondition' => $match->victoryCondition->value,
             'holdRoundsRequired' => $match->holdRoundsRequired,
             'objectiveControl' => $match->objectiveControl,
@@ -166,6 +175,14 @@ final class ScenarioSerializer
             $units[] = self::unitFromArray($row);
         }
 
+        $objectives = [];
+        foreach (($data['objectives'] ?? []) as $id => $row) {
+            $objectives[(string) $id] = new ObjectiveMarker(
+                (string) $row['id'],
+                self::positionFromArray($row['position']),
+            );
+        }
+
         return new MatchState(
             battlefield: $battlefield,
             units: $units,
@@ -173,7 +190,7 @@ final class ScenarioSerializer
             round: (int) $data['round'],
             winnerTeamId: $data['winnerTeamId'] ?? null,
             actionLog: array_map(static fn (mixed $entry): string => (string) $entry, $data['actionLog'] ?? []),
-            objectives: [],
+            objectives: $objectives,
             victoryCondition: VictoryCondition::from((string) $data['victoryCondition']),
             holdRoundsRequired: (int) $data['holdRoundsRequired'],
             objectiveControl: $data['objectiveControl'] ?? [],
@@ -192,8 +209,11 @@ final class ScenarioSerializer
             'attack' => $unit->attack,
             'defense' => $unit->defense,
             'speed' => $unit->speed,
+            'actionsRemaining' => $unit->actionsRemaining,
+            'hasAttacked' => $unit->hasAttacked,
             'archetype' => $unit->archetype->value,
             'abilities' => $unit->abilities,
+            'wadedThisTurn' => $unit->wadedThisTurn,
         ];
     }
 
@@ -222,12 +242,13 @@ final class ScenarioSerializer
             attack: (int) $row['attack'],
             defense: (int) $row['defense'],
             speed: (int) $row['speed'],
-            actionsRemaining: 2,
+            actionsRemaining: (int) ($row['actionsRemaining'] ?? 2),
-            hasAttacked: false,
+            hasAttacked: (bool) ($row['hasAttacked'] ?? false),
             archetype: $archetype,
             abilities: $abilities ?? [],
             attackBonus: 0,
             hasUsedAbility: false,
+            wadedThisTurn: (bool) ($row['wadedThisTurn'] ?? false),
         );
     }
 

src/Application/TurnToken.php

@@ -0,0 +1,79 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BattleForge\Application;
+
+use InvalidArgumentException;
+
+final class TurnToken
+{
+    private const MATCH_ID_PATTERN = '/^[a-f0-9]{16,}$/';
+
+    public static function issue(
+        string $secret,
+        string $matchId,
+        string $activeTeamId,
+        int $round,
+        int $lastActionIndex
+    ): string {
+        self::assertValidInputs($matchId, $activeTeamId, $round, $lastActionIndex);
+
+        $payload = self::payload($matchId, $activeTeamId, $round, $lastActionIndex);
+
+        return substr(hash_hmac('sha256', $payload, $secret), 0, 32);
+    }
+
+    public static function verify(
+        string $secret,
+        string $matchId,
+        string $activeTeamId,
+        int $round,
+        int $lastActionIndex,
+        string $token
+    ): bool {
+        if (
+            $token === ''
+            || !self::isValidMatchId($matchId)
+            || $activeTeamId === ''
+            || $round < 1
+            || $lastActionIndex < 0
+        ) {
+            return false;
+        }
+
+        $expected = self::issue($secret, $matchId, $activeTeamId, $round, $lastActionIndex);
+
+        return hash_equals($expected, $token);
+    }
+
+    private static function assertValidInputs(
+        string $matchId,
+        string $activeTeamId,
+        int $round,
+        int $lastActionIndex
+    ): void {
+        if (!self::isValidMatchId($matchId)) {
+            throw new InvalidArgumentException('Match id must be 16+ lowercase hex characters.');
+        }
+        if ($activeTeamId === '') {
+            throw new InvalidArgumentException('Active team id cannot be empty.');
+        }
+        if ($round < 1) {
+            throw new InvalidArgumentException('Round must be at least 1.');
+        }
+        if ($lastActionIndex < 0) {
+            throw new InvalidArgumentException('Last action index cannot be negative.');
+        }
+    }
+
+    private static function isValidMatchId(string $matchId): bool
+    {
+        return preg_match(self::MATCH_ID_PATTERN, $matchId) === 1;
+    }
+
+    private static function payload(string $matchId, string $activeTeamId, int $round, int $lastActionIndex): string
+    {
+        return implode('|', [$matchId, $activeTeamId, (string) $round, (string) $lastActionIndex]);
+    }
+}

src/Domain/CombatEngine.php

@@ -8,6 +8,15 @@ use InvalidArgumentException;
 
 final class CombatEngine
 {
+    public const TO_HIT_BASE = 40;
+    public const TO_HIT_PER_ATTACK = 3;
+    public const TO_HIT_FLOOR = 5;
+    public const TO_HIT_CEILING = 95;
+    public const CRIT_THRESHOLD = 95;
+    public const DAMAGE_VARIANCE_MIN_PCT = 85;
+    public const DAMAGE_VARIANCE_MAX_PCT = 115;
+    public const FOREST_CONCEALMENT_MISS_CHANCE = 15;
+
     public function move(MatchState $match, string $unitId, Position $destination): MatchState
     {
         $this->assertMatchActive($match);
@@ -29,11 +38,27 @@ final class CombatEngine
             throw new CombatException('Destination is not reachable.');
         }
 
-        $movedUnit = $unit->moveTo($destination)->spendAction();
+        $moved = $unit->moveTo($destination);
-        $next = $match->withUnit($movedUnit);
+        $logParts = ["{$unit->id} moved to {$destination->key()}"];
-        $actionLog = [...$match->actionLog, "{$unit->id} moved to {$destination->key()}"];
 
-        return $next->copy(actionLog: $actionLog);
+        $updatedUnit = $moved;
+        if ($match->battlefield->terrainAt($moved->position) === Terrain::Water) {
+            // Water entry ends the turn: spend both actions to zero them out,
+            // then flag the wade. (UnitState::copy is private, so chain public
+            // spenders instead of editing fields directly.)
+            $updatedUnit = $moved
+                ->spendAction()
+                ->spendAction()
+                ->withWaded(true);
+            $logParts[] = '— wading';
+        } else {
+            $updatedUnit = $moved->spendAction();
+        }
+
+        $next = $match->withUnit($updatedUnit);
+        $next = $next->copy(actionLog: [...$next->actionLog, implode(' ', $logParts)]);
+
+        return $this->checkVictoryAfterAction($next, $unit->teamId);
     }
 
     public function attack(MatchState $match, string $attackerId, string $targetId): MatchState
@@ -53,19 +78,56 @@ final class CombatEngine
             throw new CombatException('Target must be an active enemy unit.');
         }
 
-        $distance = $attacker->position->distanceTo($target->position);
+        if ($attacker->position->distanceTo($target->position) !== 1) {
-
-        if ($distance !== 1) {
             throw new CombatException('Target is outside attack range.');
         }
 
         $terrainDefense = $match->battlefield->terrainAt($target->position)->defenseBonus();
-        $damage = max(1, $attacker->attack + $attacker->attackBonus - $target->defense - $terrainDefense);
+        $flanking = $this->flankingBonusFor($match, $attacker, $target);
+        $threshold = $this->thresholdFor($attacker, $target, $terrainDefense, $flanking);
+        $roll = random_int(1, 100);
+
+        $logParts = [
+            "{$attacker->id} attacked {$target->id}",
+            "(rolled {$roll} / needed {$threshold})",
+        ];
+
         $updatedAttacker = $attacker->markAttacked()->spendAction();
+
+        if ($roll < $threshold) {
+            // To-hit miss; log and return without applying damage.
+            $logParts[] = 'for 0 damage';
+            $logParts[] = '— miss';
+            $next = $match->withUnit($updatedAttacker);
+            return $next->copy(actionLog: [...$next->actionLog, implode(' ', $logParts)]);
+        }
+
+        // Forest concealment: independent 15% miss roll after to-hit passes.
+        $targetTerrain = $match->battlefield->terrainAt($target->position);
+        if ($targetTerrain === \BattleForge\Domain\Terrain::Forest) {
+            $concealmentRoll = random_int(1, 100);
+            if ($concealmentRoll <= self::FOREST_CONCEALMENT_MISS_CHANCE) {
+                $logParts[] = 'for 0 damage';
+                $logParts[] = '— miss — concealed';
+                $next = $match->withUnit($updatedAttacker);
+                return $next->copy(actionLog: [...$next->actionLog, implode(' ', $logParts)]);
+            }
+        }
+
+        $isCrit = $roll >= self::CRIT_THRESHOLD;
+        $base = max(1, ($attacker->attack + $attacker->attackBonus) - ($target->defense + $terrainDefense));
+        $damage = $this->applyDamage($base, $isCrit);
+
+        $logParts[] = "for {$damage} damage";
+        if ($isCrit) {
+            $logParts[] = '— crit';
+        }
+
         $updatedTarget = $target->takeDamage($damage);
-        $next = $match->withUnit($updatedAttacker)->withUnit($updatedTarget);
+        $next = $match
-        $actionLog = [...$match->actionLog, "{$attacker->id} attacked {$target->id} for {$damage} damage"];
+            ->withUnit($updatedAttacker)
-        $next = $next->copy(actionLog: $actionLog);
+            ->withUnit($updatedTarget);
+        $next = $next->copy(actionLog: [...$next->actionLog, implode(' ', $logParts)]);
 
         return $this->checkVictoryAfterAction($next, $attacker->teamId);
     }
@@ -344,6 +406,53 @@ final class CombatEngine
         }
     }
 
+    private function thresholdFor(UnitState $attacker, UnitState $target, int $terrainDefense, int $flankingBonus): int
+    {
+        $raw = self::TO_HIT_BASE
+            + ($attacker->attack * self::TO_HIT_PER_ATTACK)
+            - ($target->defense + $terrainDefense)
+            - $flankingBonus;
+        if ($raw < self::TO_HIT_FLOOR) {
+            return self::TO_HIT_FLOOR;
+        }
+        if ($raw > self::TO_HIT_CEILING) {
+            return self::TO_HIT_CEILING;
+        }
+        return $raw;
+    }
+
+    private function flankingBonusFor(MatchState $match, UnitState $attacker, UnitState $target): int
+    {
+        $count = $this->flankingAlliesCount($match, $attacker, $target);
+        return min($count * 15, 30);
+    }
+
+    private function flankingAlliesCount(MatchState $match, UnitState $attacker, UnitState $target): int
+    {
+        $count = 0;
+        foreach ($match->units as $other) {
+            if ($other->id === $attacker->id || $other->id === $target->id) {
+                continue;
+            }
+            if ($other->isDefeated() || $other->teamId !== $attacker->teamId) {
+                continue;
+            }
+            $dx = abs($other->position->x - $target->position->x);
+            $dy = abs($other->position->y - $target->position->y);
+            if (($dx === 1 && $dy === 0) || ($dx === 0 && $dy === 1)) {
+                $count += 1;
+            }
+        }
+        return $count;
+    }
+
+    private function applyDamage(int $base, bool $isCrit): int
+    {
+        $doubled = $isCrit ? $base * 2 : $base;
+        $pct = random_int(self::DAMAGE_VARIANCE_MIN_PCT, self::DAMAGE_VARIANCE_MAX_PCT);
+        return (int) round($doubled * $pct / 100);
+    }
+
     private function assertMatchActive(MatchState $match): void
     {
         if ($match->winnerTeamId !== null) {

src/Domain/Scenario.php

@@ -129,6 +129,7 @@ final readonly class Scenario
                 $unit->abilities,
                 0,
                 false,
+                false,
             );
         }
 

src/Domain/Terrain.php

@@ -17,7 +17,8 @@ enum Terrain: string
         return match ($this) {
             self::Open => 1,
             self::Forest, self::Rough => 2,
-            self::Water, self::Blocking => null,
+            self::Water => 3,
+            self::Blocking => null,
         };
     }
 

src/Domain/UnitState.php

@@ -24,6 +24,7 @@ final readonly class UnitState
         public array $abilities = [],
         public int $attackBonus = 0,
         public bool $hasUsedAbility = false,
+        public bool $wadedThisTurn = false,
     ) {
         if ($id === '') {
             throw new InvalidArgumentException('Unit id cannot be empty.');
@@ -135,6 +136,11 @@ final readonly class UnitState
         return $this->copy(attackBonus: $bonus);
     }
 
+    public function withWaded(bool $waded): self
+    {
+        return $this->copy(wadedThisTurn: $waded);
+    }
+
     public function startTurn(): self
     {
         if ($this->isDefeated()) {
@@ -146,6 +152,7 @@ final readonly class UnitState
             hasAttacked: false,
             attackBonus: 0,
             hasUsedAbility: false,
+            wadedThisTurn: false,
         );
     }
 
@@ -156,6 +163,7 @@ final readonly class UnitState
         ?bool $hasAttacked = null,
         ?int $attackBonus = null,
         ?bool $hasUsedAbility = null,
+        ?bool $wadedThisTurn = null,
     ): self {
         return new self(
             $this->id,
@@ -172,6 +180,7 @@ final readonly class UnitState
             $this->abilities,
             $attackBonus ?? $this->attackBonus,
             $hasUsedAbility ?? $this->hasUsedAbility,
+            wadedThisTurn: $wadedThisTurn ?? $this->wadedThisTurn,
         );
     }
 

src/Http/Handlers/GetBattlefieldEditor.php

@@ -12,7 +12,7 @@ final class GetBattlefieldEditor
     /** @param array<string, string> $params */
     public function handle(Request $request, array $params): Response
     {
-        $csrf = $request->cookies['__csrf'] ?? '';
+        $csrf = $request->cookies['__csrf_token'] ?? '';
         $scenarioId = $params['id'] ?? 'new';
         $width = 8;
         $height = 8;

src/Http/Handlers/GetBundledScenario.php

@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BattleForge\Http\Handlers;
+
+use BattleForge\Application\ScenarioSerializer;
+use BattleForge\Domain\ScenarioValidator;
+use BattleForge\Http\Request;
+use BattleForge\Http\Response;
+use InvalidArgumentException;
+
+final class GetBundledScenario
+{
+    private const ID_PATTERN = '/^[a-z0-9-]+$/';
+
+    public function __construct(private readonly string $scenariosDir)
+    {
+    }
+
+    /** @param array<string, string> $params */
+    public function handle(Request $request, array $params): Response
+    {
+        $id = (string) ($params['id'] ?? '');
+
+        if (preg_match(self::ID_PATTERN, $id) !== 1) {
+            return Response::json(404, ['error' => 'not found']);
+        }
+
+        $manifestPath = $this->scenariosDir . '/manifest.json';
+        $manifest = [];
+        if (is_file($manifestPath)) {
+            $decoded = json_decode((string) file_get_contents($manifestPath), true);
+            if (is_array($decoded)) {
+                $manifest = $decoded;
+            }
+        }
+
+        if (!isset($manifest[$id])) {
+            return Response::json(404, ['error' => 'not found']);
+        }
+
+        $fixturePath = $this->scenariosDir . '/' . $id . '.json';
+        $real = realpath($fixturePath);
+        $realDir = realpath($this->scenariosDir);
+        $insideBase = $real !== false
+            && $realDir !== false
+            && str_starts_with($real, $realDir . DIRECTORY_SEPARATOR);
+        if ($insideBase === false || !is_file($real)) {
+            return Response::json(404, ['error' => 'not found']);
+        }
+
+        $data = json_decode((string) file_get_contents($real), true, flags: JSON_THROW_ON_ERROR);
+        if (!is_array($data)) {
+            return Response::json(500, ['error' => 'fixture invalid', 'details' => ['Fixture JSON is not an object.']]);
+        }
+
+        try {
+            $scenario = ScenarioSerializer::scenarioFromArray($data);
+        } catch (InvalidArgumentException $exception) {
+            return Response::json(500, ['error' => 'fixture invalid', 'details' => [$exception->getMessage()]]);
+        }
+
+        $errors = ScenarioValidator::validate($scenario);
+        if ($errors !== []) {
+            return Response::json(500, ['error' => 'fixture invalid', 'details' => $errors]);
+        }
+
+        return Response::json(200, ScenarioSerializer::scenarioToArray($scenario));
+    }
+}

src/Http/Handlers/GetBundledScenarios.php

@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BattleForge\Http\Handlers;
+
+use BattleForge\Http\Request;
+use BattleForge\Http\Response;
+
+final class GetBundledScenarios
+{
+    private const FILENAME_PATTERN = '/^[a-z0-9-]+\.json$/';
+
+    public function __construct(private readonly string $scenariosDir)
+    {
+    }
+
+    /** @param array<string, string> $params */
+    public function handle(Request $request, array $params): Response
+    {
+        $manifestPath = $this->scenariosDir . '/manifest.json';
+        $manifest = [];
+        if (is_file($manifestPath)) {
+            $decoded = json_decode((string) file_get_contents($manifestPath), true);
+            if (is_array($decoded)) {
+                $manifest = $decoded;
+            }
+        }
+
+        $entries = [];
+        foreach (scandir($this->scenariosDir) ?: [] as $file) {
+            if (!preg_match(self::FILENAME_PATTERN, $file)) {
+                continue;
+            }
+            $id = substr($file, 0, -5);
+            $entry = $manifest[$id] ?? null;
+            if (!is_array($entry) || !isset($entry['name'], $entry['summary'])) {
+                continue;
+            }
+            $entries[] = [
+                'id' => $id,
+                'name' => (string) $entry['name'],
+                'summary' => (string) $entry['summary'],
+            ];
+        }
+
+        usort($entries, static fn (array $a, array $b): int => strcmp($a['id'], $b['id']));
+
+        return Response::json(200, $entries);
+    }
+}

src/Http/Handlers/GetHomePage.php

@@ -9,10 +9,15 @@ use BattleForge\Http\Response;
 
 final class GetHomePage
 {
+    public function __construct(private readonly string $scenariosDir = '')
+    {
+    }
+
     /** @param array<string, string> $params */
     public function handle(Request $request, array $params): Response
     {
-        $csrf = $request->cookies['__csrf'] ?? '';
+        $csrf = $request->cookies['__csrf_token'] ?? '';
+        $bundled = $this->loadBundledScenarios();
 
         ob_start();
         require_once __DIR__ . '/../../Views/layout.php';
@@ -21,4 +26,35 @@ final class GetHomePage
 
         return Response::html(200, $body);
     }
+
+    /** @return list<array{id: string, name: string, summary: string}> */
+    private function loadBundledScenarios(): array
+    {
+        if ($this->scenariosDir === '' || !is_file($this->scenariosDir . '/manifest.json')) {
+            return [];
+        }
+        $decoded = json_decode((string) file_get_contents($this->scenariosDir . '/manifest.json'), true);
+        if (!is_array($decoded)) {
+            return [];
+        }
+        $entries = [];
+        foreach ($decoded as $id => $entry) {
+            if (!is_string($id) || !preg_match('/^[a-z0-9-]+$/', $id) || !is_array($entry)) {
+                continue;
+            }
+            if (!isset($entry['name'], $entry['summary'])) {
+                continue;
+            }
+            if (!is_file($this->scenariosDir . '/' . $id . '.json')) {
+                continue;
+            }
+            $entries[] = [
+                'id' => $id,
+                'name' => (string) $entry['name'],
+                'summary' => (string) $entry['summary'],
+            ];
+        }
+        usort($entries, static fn (array $a, array $b): int => strcmp($a['id'], $b['id']));
+        return $entries;
+    }
 }

src/Http/Handlers/GetMatchView.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BattleForge\Http\Handlers;
+
+use BattleForge\Http\Request;
+use BattleForge\Http\Response;
+
+final class GetMatchView
+{
+    /** @param array<string, string> $params */
+    public function handle(Request $request, array $params): Response
+    {
+        $csrf = $request->cookies['__csrf_token'] ?? '';
+
+        ob_start();
+        require_once __DIR__ . '/../../Views/layout.php';
+        require __DIR__ . '/../../Views/match.php';
+        $body = (string) ob_get_clean();
+
+        return Response::html(200, $body);
+    }
+}

src/Http/Handlers/GetTeamEditor.php

@@ -12,7 +12,7 @@ final class GetTeamEditor
     /** @param array<string, string> $params */
     public function handle(Request $request, array $params): Response
     {
-        $csrf = $request->cookies['__csrf'] ?? '';
+        $csrf = $request->cookies['__csrf_token'] ?? '';
         $scenarioId = $params['id'] ?? 'new';
 
         $error = null;

src/Http/Handlers/PostMatchAbility.php

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BattleForge\Http\Handlers;
+
+use BattleForge\Domain\CombatEngine;
+use BattleForge\Domain\CombatException;
+use BattleForge\Domain\Position;
+use BattleForge\Http\MatchActionSupport;
+use BattleForge\Http\Request;
+use BattleForge\Http\Response;
+
+final class PostMatchAbility
+{
+    public function __construct(private readonly string $secret)
+    {
+    }
+
+    /** @param array<string, string> $params */
+    public function handle(Request $request, array $params): Response
+    {
+        $support = new MatchActionSupport($this->secret);
+        $result = $support->verify($request);
+        if ($result->response !== null) {
+            return $result->response;
+        }
+        $matchId = $result->matchIdAndMatch['matchId'];
+        $match = $result->matchIdAndMatch['match'];
+
+        $payload = json_decode($request->rawBody, true);
+        $unitId = (string) ($payload['unitId'] ?? '');
+        $abilityId = (string) ($payload['abilityId'] ?? '');
+        $x = (int) ($payload['x'] ?? -1);
+        $y = (int) ($payload['y'] ?? -1);
+
+        try {
+            $next = (new CombatEngine())->useAbility($match, $unitId, $abilityId, new Position($x, $y));
+        } catch (CombatException $exception) {
+            return PostMatchMove::rejectionResponse($this->secret, $matchId, $match, $exception->getMessage());
+        }
+
+        return Response::json(200, PostMatchMove::successResponse($this->secret, $matchId, $next));
+    }
+}

src/Http/Handlers/PostMatchAttack.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BattleForge\Http\Handlers;
+
+use BattleForge\Domain\CombatEngine;
+use BattleForge\Domain\CombatException;
+use BattleForge\Http\MatchActionSupport;
+use BattleForge\Http\Request;
+use BattleForge\Http\Response;
+
+final class PostMatchAttack
+{
+    public function __construct(private readonly string $secret)
+    {
+    }
+
+    /** @param array<string, string> $params */
+    public function handle(Request $request, array $params): Response
+    {
+        $support = new MatchActionSupport($this->secret);
+        $result = $support->verify($request);
+        if ($result->response !== null) {
+            return $result->response;
+        }
+        $matchId = $result->matchIdAndMatch['matchId'];
+        $match = $result->matchIdAndMatch['match'];
+
+        $payload = json_decode($request->rawBody, true);
+        $attackerId = (string) ($payload['attackerId'] ?? '');
+        $targetId = (string) ($payload['targetId'] ?? '');
+
+        try {
+            $next = (new CombatEngine())->attack($match, $attackerId, $targetId);
+        } catch (CombatException $exception) {
+            return PostMatchMove::rejectionResponse($this->secret, $matchId, $match, $exception->getMessage());
+        }
+
+        return Response::json(200, PostMatchMove::successResponse($this->secret, $matchId, $next));
+    }
+}

src/Http/Handlers/PostMatchEndTurn.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BattleForge\Http\Handlers;
+
+use BattleForge\Domain\CombatEngine;
+use BattleForge\Domain\CombatException;
+use BattleForge\Http\MatchActionSupport;
+use BattleForge\Http\Request;
+use BattleForge\Http\Response;
+
+final class PostMatchEndTurn
+{
+    public function __construct(private readonly string $secret)
+    {
+    }
+
+    /** @param array<string, string> $params */
+    public function handle(Request $request, array $params): Response
+    {
+        $support = new MatchActionSupport($this->secret);
+        $result = $support->verify($request);
+        if ($result->response !== null) {
+            return $result->response;
+        }
+        $matchId = $result->matchIdAndMatch['matchId'];
+        $match = $result->matchIdAndMatch['match'];
+
+        try {
+            $next = (new CombatEngine())->endTurn($match);
+        } catch (CombatException $exception) {
+            return PostMatchMove::rejectionResponse($this->secret, $matchId, $match, $exception->getMessage());
+        }
+
+        return Response::json(200, PostMatchMove::successResponse($this->secret, $matchId, $next));
+    }
+}

src/Http/Handlers/PostMatchMove.php

@@ -0,0 +1,76 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BattleForge\Http\Handlers;
+
+use BattleForge\Application\ScenarioSerializer;
+use BattleForge\Application\TurnToken;
+use BattleForge\Domain\CombatEngine;
+use BattleForge\Domain\CombatException;
+use BattleForge\Domain\Position;
+use BattleForge\Http\MatchActionSupport;
+use BattleForge\Http\Request;
+use BattleForge\Http\Response;
+
+final class PostMatchMove
+{
+    public function __construct(private readonly string $secret)
+    {
+    }
+
+    /** @param array<string, string> $params */
+    public function handle(Request $request, array $params): Response
+    {
+        $support = new MatchActionSupport($this->secret);
+        $result = $support->verify($request);
+        if ($result->response !== null) {
+            return $result->response;
+        }
+        $matchId = $result->matchIdAndMatch['matchId'];
+        $match = $result->matchIdAndMatch['match'];
+
+        $payload = json_decode($request->rawBody, true);
+        $unitId = (string) ($payload['unitId'] ?? '');
+        $x = (int) ($payload['x'] ?? -1);
+        $y = (int) ($payload['y'] ?? -1);
+
+        try {
+            $next = (new CombatEngine())->move($match, $unitId, new Position($x, $y));
+        } catch (CombatException $exception) {
+            return self::rejectionResponse($this->secret, $matchId, $match, $exception->getMessage());
+        }
+
+        return Response::json(200, self::successResponse($this->secret, $matchId, $next));
+    }
+
+    /** @return array<string, mixed> */
+    public static function successResponse(
+        string $secret,
+        string $matchId,
+        \BattleForge\Domain\MatchState $next
+    ): array {
+        $turnToken = TurnToken::issue($secret, $matchId, $next->activeTeamId, $next->round, count($next->actionLog));
+
+        return [
+            'match' => ScenarioSerializer::matchToArray($next),
+            'turnToken' => $turnToken,
+            'winnerTeamId' => $next->winnerTeamId,
+        ];
+    }
+
+    public static function rejectionResponse(
+        string $secret,
+        string $matchId,
+        \BattleForge\Domain\MatchState $match,
+        string $reason
+    ): Response {
+        $turnToken = TurnToken::issue($secret, $matchId, $match->activeTeamId, $match->round, count($match->actionLog));
+
+        return Response::json(409, [
+            'error' => $reason,
+            'match' => ScenarioSerializer::matchToArray($match),
+            'turnToken' => $turnToken,
+        ]);
+    }
+}

src/Http/Handlers/PostStartMatch.php

@@ -6,6 +6,7 @@ namespace BattleForge\Http\Handlers;
 
 use BattleForge\Application\ScenarioDraft;
 use BattleForge\Application\ScenarioSerializer;
+use BattleForge\Application\TurnToken;
 use BattleForge\Domain\ScenarioValidator;
 use BattleForge\Http\CsrfToken;
 use BattleForge\Http\Request;
@@ -26,8 +27,17 @@ final class PostStartMatch
 
         try {
             $payload = json_decode($request->rawBody, true, flags: JSON_THROW_ON_ERROR);
-            $draft = ScenarioDraft::fromPost($payload);
+            // Accept either the canonical `Scenario` shape (used by the bundled
-            $scenario = $draft->toScenario();
+            // scenario endpoint at /scenarios/bundled/{id}, where the JS POSTs
+            // the JSON it fetched verbatim) or the editor's `ScenarioDraft`
+            // shape (the form's denormalized fields). The presence of a
+            // nested `battlefield` object distinguishes the two.
+            if (is_array($payload) && is_array($payload['battlefield'] ?? null)) {
+                $scenario = ScenarioSerializer::scenarioFromArray($payload);
+            } else {
+                $draft = ScenarioDraft::fromPost($payload ?? []);
+                $scenario = $draft->toScenario();
+            }
             ScenarioValidator::validate($scenario);
             $match = $scenario->startMatch('alpha');
         } catch (\JsonException $exception) {
@@ -36,6 +46,20 @@ final class PostStartMatch
             return Response::json(400, ['errors' => [$exception->getMessage()]]);
         }
 
-        return Response::json(200, ['match' => ScenarioSerializer::matchToArray($match)]);
+        $matchId = bin2hex(random_bytes(8));
+        $matchArray = ScenarioSerializer::matchToArray($match);
+        $turnToken = TurnToken::issue(
+            $secret,
+            $matchId,
+            $match->activeTeamId,
+            $match->round,
+            count($match->actionLog),
+        );
+
+        return Response::json(200, [
+            'match' => $matchArray,
+            'matchId' => $matchId,
+            'turnToken' => $turnToken,
+        ]);
     }
 }

src/Http/MatchActionResult.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BattleForge\Http;
+
+use BattleForge\Domain\MatchState;
+
+/**
+ * @phpstan-type MatchIdAndMatch = array{matchId: string, match: MatchState}
+ */
+final readonly class MatchActionResult
+{
+    /**
+     * @param ?MatchIdAndMatch $matchIdAndMatch
+     */
+    public function __construct(
+        public ?Response $response,
+        public ?array $matchIdAndMatch,
+    ) {
+    }
+
+    /** @param MatchIdAndMatch $pair */
+    public static function ok(array $pair): self
+    {
+        return new self(null, $pair);
+    }
+
+    public static function reject(Response $response): self
+    {
+        return new self($response, null);
+    }
+}

src/Http/MatchActionSupport.php

@@ -0,0 +1,61 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BattleForge\Http;
+
+use BattleForge\Application\ScenarioSerializer;
+use BattleForge\Application\TurnToken;
+
+final class MatchActionSupport
+{
+    public function __construct(private readonly string $secret)
+    {
+    }
+
+    public function verify(Request $request): MatchActionResult
+    {
+        $submitted = (string) ($request->server['HTTP_X_CSRF_TOKEN'] ?? '');
+        $expected = (string) ($request->cookies['__csrf'] ?? '');
+        $secret = (string) ($request->server['__csrf_secret'] ?? '');
+
+        if ($secret === '' || $expected === '' || !CsrfToken::verify($submitted, $secret, $expected)) {
+            return MatchActionResult::reject(Response::json(403, ['error' => 'csrf']));
+        }
+
+        $payload = json_decode($request->rawBody, true);
+        if (!is_array($payload)) {
+            return MatchActionResult::reject(Response::json(400, ['errors' => ['Malformed JSON.']]));
+        }
+
+        $matchId = (string) ($payload['matchId'] ?? '');
+        $matchData = $payload['match'] ?? null;
+        if (!is_array($matchData)) {
+            return MatchActionResult::reject(Response::json(400, ['errors' => ['Match is required.']]));
+        }
+
+        try {
+            $match = ScenarioSerializer::matchFromArray($matchData);
+        } catch (\JsonException $exception) {
+            return MatchActionResult::reject(Response::json(400, ['errors' => ['Malformed JSON.']]));
+        } catch (\InvalidArgumentException $exception) {
+            return MatchActionResult::reject(Response::json(400, ['errors' => [$exception->getMessage()]]));
+        }
+
+        $supplied = (string) ($request->server['HTTP_X_TURN_TOKEN'] ?? '');
+        if (
+            !TurnToken::verify(
+                $this->secret,
+                $matchId,
+                $match->activeTeamId,
+                $match->round,
+                count($match->actionLog),
+                $supplied,
+            )
+        ) {
+            return MatchActionResult::reject(Response::json(409, ['error' => 'turn']));
+        }
+
+        return MatchActionResult::ok(['matchId' => $matchId, 'match' => $match]);
+    }
+}

src/Views/home.php

@@ -5,13 +5,24 @@ declare(strict_types=1);
 use BattleForge\Http\Escape;
 
 /** @var string $csrf Provided by the front controller. */
+/** @var list<array{id: string, name: string, summary: string}> $bundled Provided by GetHomePage. */
 ?><?php
-render_layout(static function () use ($csrf): void {
+render_layout(static function () use ($csrf, $bundled): void {
     $e = static fn (string $v): string => Escape::html($v);
     $a = static fn (string $v): string => Escape::attr($v);
     ?>
     <h1>BattleForge</h1>
     <p><a href="<?= $a('/scenarios/new/edit/team') ?>">New scenario</a></p>
+    <h2>Play bundled</h2>
+    <ul id="bf-bundled">
+    <?php foreach ($bundled as $entry) : ?>
+        <li>
+            <button type="button" data-bf-bundle="<?= $a($entry['id']) ?>">
+                <strong><?= $e($entry['name']) ?></strong> &mdash; <?= $e($entry['summary']) ?>
+            </button>
+        </li>
+    <?php endforeach; ?>
+    </ul>
     <h2>Recent scenarios</h2>
     <div id="recent"><p class="bf-empty">No saved scenarios yet.</p></div>
     <script type="module" src="<?= $a('/js/storage.js') ?>"></script>

src/Views/match.php

@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+use BattleForge\Http\Escape;
+
+/** @var string $csrf Provided by the front controller. */
+?><?php
+render_layout(static function (): void {
+    $a = static fn (string $v): string => Escape::attr($v);
+    ?>
+    <header id="bf-match-header" data-bf-active-team="" data-bf-round="0">
+        <h1>Battle</h1>
+        <p>
+            Active team: <strong id="bf-active-team">&mdash;</strong>
+            &middot; Round: <strong id="bf-round">0</strong>
+        </p>
+        <p>
+            <button id="bf-end-turn" type="button">End Turn</button>
+        </p>
+    </header>
+    <main>
+        <div id="bf-grid" class="bf-grid" data-bf-width="0" data-bf-height="0"></div>
+        <aside id="bf-panel" class="bf-panel">
+            <p>Selected: <span id="bf-selected-unit">none</span></p>
+            <p>
+                <button id="bf-action-move" type="button">Move</button>
+                <button id="bf-action-attack" type="button">Attack</button>
+                <button id="bf-action-ability" type="button">Ability</button>
+            </p>
+            <div id="bf-ability-options"></div>
+        </aside>
+    </main>
+    <section id="bf-log" class="bf-log" aria-label="Action log"></section>
+    <section id="bf-result" class="bf-result" hidden>
+        <h2>Match over</h2>
+        <p>Winner: <strong id="bf-winner"></strong></p>
+        <p><a id="bf-return-home" href="/">Return to home</a></p>
+    </section>
+    <div id="bf-toast-host"></div>
+    <script type="module" src="<?= $a('/js/match.js') ?>"></script>
+    <?php
+}, $csrf, 'Battle');

tests/Integration/FullFlowTest.php

@@ -37,6 +37,7 @@ final class FullFlowTest extends TestCase
 
             // Step 2: POST team editor.
             $_COOKIE['__csrf'] = $cookie;
+            $_COOKIE['__csrf_token'] = $token;
             $_SERVER['REQUEST_METHOD'] = 'POST';
             $_SERVER['REQUEST_URI'] = '/scenarios/demo/edit/team';
             $_SERVER['CONTENT_TYPE'] = 'application/x-www-form-urlencoded';
@@ -104,6 +105,7 @@ final class FullFlowTest extends TestCase
         try {
             [$token, $cookie] = CsrfToken::issue(self::SECRET);
             $_COOKIE['__csrf'] = $cookie;
+            $_COOKIE['__csrf_token'] = $token;
             $_SERVER['REQUEST_METHOD'] = 'POST';
             $_SERVER['REQUEST_URI'] = '/assets/upload';
             $_SERVER['CONTENT_TYPE'] = 'multipart/form-data; boundary=----test';

tests/Integration/GetBundledScenarioTest.php

@@ -0,0 +1,162 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BattleForge\Tests\Integration;
+
+use BattleForge\Http\Handlers\GetBundledScenario;
+use BattleForge\Http\Request;
+use PHPUnit\Framework\TestCase;
+
+final class GetBundledScenarioTest extends TestCase
+{
+    private string $tmpDir;
+
+    protected function setUp(): void
+    {
+        $this->tmpDir = sys_get_temp_dir() . '/bf-bundled-one-' . bin2hex(random_bytes(4));
+        mkdir($this->tmpDir, 0700, true);
+        file_put_contents(
+            $this->tmpDir . '/manifest.json',
+            json_encode(['valid' => ['name' => 'Valid', 'summary' => 'OK']], JSON_THROW_ON_ERROR),
+        );
+        $this->writeValidFixture();
+    }
+
+    protected function tearDown(): void
+    {
+        if (is_dir($this->tmpDir)) {
+            foreach (glob($this->tmpDir . '/*') ?: [] as $file) {
+                unlink($file);
+            }
+            rmdir($this->tmpDir);
+        }
+    }
+
+    public function testReturnsTheScenarioJsonForAKnownId(): void
+    {
+        $handler = new GetBundledScenario($this->tmpDir);
+        $response = $handler->handle(
+            new Request([], [], [], [], [], '', 'GET', '/scenarios/bundled/valid', null, ''),
+            ['id' => 'valid'],
+        );
+
+        self::assertSame(200, $response->status);
+        $body = json_decode($response->body, true);
+        self::assertSame('valid', $body['id'] ?? null);
+        self::assertSame('Valid', $body['name'] ?? null);
+        self::assertSame(8, $body['battlefield']['width'] ?? null);
+    }
+
+    public function testReturns404ForAnUnknownId(): void
+    {
+        $handler = new GetBundledScenario($this->tmpDir);
+        $response = $handler->handle(
+            new Request([], [], [], [], [], '', 'GET', '/scenarios/bundled/unknown', null, ''),
+            ['id' => 'unknown'],
+        );
+
+        self::assertSame(404, $response->status);
+    }
+
+    public function testReturns404ForAnIdThatFailsTheRegex(): void
+    {
+        $handler = new GetBundledScenario($this->tmpDir);
+        $response = $handler->handle(
+            new Request([], [], [], [], [], '', 'GET', '/scenarios/bundled/..', null, ''),
+            ['id' => '..'],
+        );
+
+        self::assertSame(404, $response->status);
+    }
+
+    public function testReturns500WhenTheFixtureFailsValidation(): void
+    {
+        $bad = [
+            'id' => 'broken',
+            'name' => 'Broken',
+            'battlefield' => ['width' => 8, 'height' => 8, 'terrain' => []],
+            'units' => [],
+            'deploymentZones' => [],
+            'objectives' => [],
+            'victoryCondition' => 'eliminate_all',
+            'holdRoundsRequired' => 1,
+        ];
+        file_put_contents($this->tmpDir . '/broken.json', json_encode($bad, JSON_THROW_ON_ERROR));
+        file_put_contents(
+            $this->tmpDir . '/manifest.json',
+            json_encode([
+                'valid' => ['name' => 'Valid', 'summary' => 'OK'],
+                'broken' => ['name' => 'Broken', 'summary' => 'Bad'],
+            ], JSON_THROW_ON_ERROR),
+        );
+
+        $handler = new GetBundledScenario($this->tmpDir);
+        $response = $handler->handle(
+            new Request([], [], [], [], [], '', 'GET', '/scenarios/bundled/broken', null, ''),
+            ['id' => 'broken'],
+        );
+
+        self::assertSame(500, $response->status);
+        $body = json_decode($response->body, true);
+        self::assertSame('fixture invalid', $body['error'] ?? null);
+        self::assertIsArray($body['details'] ?? null);
+        self::assertNotEmpty($body['details']);
+    }
+
+    private function writeValidFixture(): void
+    {
+        $fixture = [
+            'id' => 'valid',
+            'name' => 'Valid',
+            'battlefield' => ['width' => 8, 'height' => 8, 'terrain' => []],
+            'units' => [
+                $this->unit('a1', 'alpha', 0, 0),
+                $this->unit('a2', 'alpha', 1, 0),
+                $this->unit('a3', 'alpha', 2, 0),
+                $this->unit('b1', 'bravo', 7, 7),
+                $this->unit('b2', 'bravo', 6, 7),
+                $this->unit('b3', 'bravo', 5, 7),
+            ],
+            'deploymentZones' => [
+                'alpha' => $this->deploymentZone('alpha', [[0, 0], [1, 0], [2, 0]]),
+                'bravo' => $this->deploymentZone('bravo', [[7, 7], [6, 7], [5, 7]]),
+            ],
+            'objectives' => [],
+            'victoryCondition' => 'eliminate_all',
+            'holdRoundsRequired' => 1,
+        ];
+        file_put_contents($this->tmpDir . '/valid.json', json_encode($fixture, JSON_THROW_ON_ERROR));
+    }
+
+    /** @return array<string, mixed> */
+    private function unit(string $id, string $teamId, int $x, int $y): array
+    {
+        return [
+            'id' => $id,
+            'teamId' => $teamId,
+            'position' => ['x' => $x, 'y' => $y],
+            'maxHealth' => 10,
+            'health' => 10,
+            'attack' => 3,
+            'defense' => 3,
+            'speed' => 2,
+            'archetype' => 'defender',
+            'abilities' => [],
+        ];
+    }
+
+    /**
+     * @param list<array{0: int, 1: int}> $coords
+     * @return array<string, mixed>
+     */
+    private function deploymentZone(string $teamId, array $coords): array
+    {
+        $positions = [];
+        foreach ($coords as $coord) {
+            $positions[] = ['x' => $coord[0], 'y' => $coord[1]];
+        }
+
+        return ['teamId' => $teamId, 'positions' => $positions];
+    }
+}

tests/Integration/GetBundledScenariosTest.php

@@ -0,0 +1,102 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BattleForge\Tests\Integration;
+
+use BattleForge\Http\Handlers\GetBundledScenarios;
+use BattleForge\Http\Request;
+use PHPUnit\Framework\TestCase;
+
+final class GetBundledScenariosTest extends TestCase
+{
+    private string $tmpDir;
+
+    protected function setUp(): void
+    {
+        $this->tmpDir = sys_get_temp_dir() . '/bf-bundled-' . bin2hex(random_bytes(4));
+        mkdir($this->tmpDir, 0700, true);
+    }
+
+    protected function tearDown(): void
+    {
+        if (is_dir($this->tmpDir)) {
+            foreach (glob($this->tmpDir . '/*') ?: [] as $file) {
+                unlink($file);
+            }
+            rmdir($this->tmpDir);
+        }
+    }
+
+    public function testReturnsBundledScenariosFromTheConfiguredDirectory(): void
+    {
+        $this->writeManifest([
+            'skirmish' => ['name' => 'Skirmish', 'summary' => 'Open ground.'],
+            'hold-the-line' => ['name' => 'Hold the Line', 'summary' => 'Defend.'],
+        ]);
+        $this->writeFixture('skirmish', '{}');
+        $this->writeFixture('hold-the-line', '{}');
+
+        $handler = new GetBundledScenarios($this->tmpDir);
+        $response = $handler->handle(new Request([], [], [], [], [], '', 'GET', '/scenarios/bundled', null, ''), []);
+
+        self::assertSame(200, $response->status);
+        $body = json_decode($response->body, true);
+        self::assertSame(
+            [
+                ['id' => 'hold-the-line', 'name' => 'Hold the Line', 'summary' => 'Defend.'],
+                ['id' => 'skirmish', 'name' => 'Skirmish', 'summary' => 'Open ground.'],
+            ],
+            $body,
+        );
+    }
+
+    public function testFiltersOutFixturesWithoutAManifestEntry(): void
+    {
+        $this->writeManifest(['skirmish' => ['name' => 'Skirmish', 'summary' => 'Open ground.']]);
+        $this->writeFixture('skirmish', '{}');
+        $this->writeFixture('rogue', '{}');
+
+        $handler = new GetBundledScenarios($this->tmpDir);
+        $response = $handler->handle(new Request([], [], [], [], [], '', 'GET', '/scenarios/bundled', null, ''), []);
+
+        $body = json_decode($response->body, true);
+        self::assertCount(1, $body);
+        self::assertSame('skirmish', $body[0]['id']);
+    }
+
+    public function testIgnoresFilesWithDisallowedFilenames(): void
+    {
+        $this->writeManifest(['skirmish' => ['name' => 'Skirmish', 'summary' => 'Open ground.']]);
+        $this->writeFixture('skirmish', '{}');
+        $this->writeFixture('bad..json', '{}');
+        $this->writeFixture('README', 'plain text');
+
+        $handler = new GetBundledScenarios($this->tmpDir);
+        $response = $handler->handle(new Request([], [], [], [], [], '', 'GET', '/scenarios/bundled', null, ''), []);
+
+        $body = json_decode($response->body, true);
+        self::assertCount(1, $body);
+        self::assertSame('skirmish', $body[0]['id']);
+    }
+
+    public function testReturnsEmptyArrayWhenManifestIsMissing(): void
+    {
+        $handler = new GetBundledScenarios($this->tmpDir);
+        $response = $handler->handle(new Request([], [], [], [], [], '', 'GET', '/scenarios/bundled', null, ''), []);
+
+        self::assertSame(200, $response->status);
+        self::assertSame([], json_decode($response->body, true));
+    }
+
+    /** @param array<string, array{name: string, summary: string}> $entries */
+    private function writeManifest(array $entries): void
+    {
+        file_put_contents($this->tmpDir . '/manifest.json', json_encode($entries, JSON_THROW_ON_ERROR));
+    }
+
+    private function writeFixture(string $name, string $body): void
+    {
+        file_put_contents($this->tmpDir . '/' . $name . '.json', $body);
+    }
+}

tests/Integration/GetHomePageTest.php

@@ -23,4 +23,37 @@ final class GetHomePageTest extends TestCase
         self::assertStringContainsString('default-src', $response->headers['Content-Security-Policy']);
         self::assertStringContainsString('<a href="/scenarios/new/edit/team">', $response->body);
     }
+
+    public function testItRendersTheBundledScenariosListFromTheManifest(): void
+    {
+        $tmpDir = sys_get_temp_dir() . '/bf-home-bundled-' . bin2hex(random_bytes(4));
+        mkdir($tmpDir, 0700, true);
+        file_put_contents(
+            $tmpDir . '/manifest.json',
+            json_encode([
+                'skirmish' => ['name' => 'Skirmish', 'summary' => 'Open ground.'],
+                'hold-the-line' => ['name' => 'Hold the Line', 'summary' => 'Defend.'],
+            ], JSON_THROW_ON_ERROR),
+        );
+        foreach (['skirmish.json', 'hold-the-line.json'] as $file) {
+            file_put_contents($tmpDir . '/' . $file, '{}');
+        }
+
+        $handler = new GetHomePage($tmpDir);
+        $request = new Request([], [], [], [], [], '', 'GET', '/', 'text/html', '');
+        $response = $handler->handle($request, []);
+
+        self::assertSame(200, $response->status);
+        self::assertStringContainsString('id="bf-bundled"', $response->body);
+        self::assertStringContainsString('data-bf-bundle="skirmish"', $response->body);
+        self::assertStringContainsString('data-bf-bundle="hold-the-line"', $response->body);
+        self::assertStringContainsString('Open ground.', $response->body);
+        self::assertStringContainsString('Defend.', $response->body);
+
+        unlink($tmpDir . '/manifest.json');
+        foreach (['skirmish.json', 'hold-the-line.json'] as $file) {
+            unlink($tmpDir . '/' . $file);
+        }
+        rmdir($tmpDir);
+    }
 }

tests/Integration/GetMatchViewTest.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BattleForge\Tests\Integration;
+
+use BattleForge\Http\Handlers\GetMatchView;
+use BattleForge\Http\Request;
+use PHPUnit\Framework\TestCase;
+
+final class GetMatchViewTest extends TestCase
+{
+    public function testItRendersTheMatchShellWithSecurityHeaders(): void
+    {
+        $handler = new GetMatchView();
+        $request = new Request([], [], [], [], [], '', 'GET', '/matches/current', 'text/html', '');
+        $response = $handler->handle($request, []);
+
+        self::assertSame(200, $response->status);
+        self::assertStringContainsString('text/html', $response->headers['Content-Type'] ?? '');
+        self::assertSame('nosniff', $response->headers['X-Content-Type-Options']);
+        self::assertStringContainsString('default-src', $response->headers['Content-Security-Policy']);
+
+        self::assertStringContainsString('id="bf-match-header"', $response->body);
+        self::assertStringContainsString('id="bf-end-turn"', $response->body);
+        self::assertStringContainsString('id="bf-grid"', $response->body);
+        self::assertStringContainsString('id="bf-panel"', $response->body);
+        self::assertStringContainsString('id="bf-action-move"', $response->body);
+        self::assertStringContainsString('id="bf-action-attack"', $response->body);
+        self::assertStringContainsString('id="bf-action-ability"', $response->body);
+        self::assertStringContainsString('id="bf-selected-unit"', $response->body);
+        self::assertStringContainsString('id="bf-log"', $response->body);
+        self::assertStringContainsString('id="bf-result"', $response->body);
+        self::assertStringContainsString('id="bf-winner"', $response->body);
+        self::assertStringContainsString('id="bf-return-home"', $response->body);
+        self::assertStringContainsString('src="/js/match.js"', $response->body);
+        self::assertStringContainsString('name="csrf-token"', $response->body);
+    }
+}

tests/Integration/PostBattlefieldEditorTest.php

@@ -30,7 +30,7 @@ final class PostBattlefieldEditorTest extends TestCase
         $request = $this->buildRequest(
             rawBody: json_encode($this->validBattlefield(), JSON_THROW_ON_ERROR),
             csrfHeader: $token,
-            cookies: ['__csrf' => $cookie],
+            cookies: ['__csrf' => $cookie, '__csrf_token' => $token],
             server: ['__csrf_secret' => self::SECRET],
         );
         $response = $handler->handle($request, ['id' => 'demo']);
@@ -48,7 +48,7 @@ final class PostBattlefieldEditorTest extends TestCase
         $request = $this->buildRequest(
             rawBody: json_encode(['this' => 'is not a valid scenario'], JSON_THROW_ON_ERROR),
             csrfHeader: $token,
-            cookies: ['__csrf' => $cookie],
+            cookies: ['__csrf' => $cookie, '__csrf_token' => $token],
             server: ['__csrf_secret' => self::SECRET],
         );
         $response = $handler->handle($request, ['id' => 'demo']);

tests/Integration/PostImageUploadTest.php

@@ -52,7 +52,7 @@ final class PostImageUploadTest extends TestCase
             get: [],
             post: ['_csrf' => $token],
             files: ['image' => ['name' => 'a.png', 'tmp_name' => $tmp, 'error' => 0, 'size' => 70, 'type' => 'image/png']],
-            cookies: ['__csrf' => $cookie],
+            cookies: ['__csrf' => $cookie, '__csrf_token' => $token],
             server: ['__csrf_secret' => self::SECRET],
             queryString: '',
             method: 'POST',
@@ -78,7 +78,7 @@ final class PostImageUploadTest extends TestCase
             get: [],
             post: ['_csrf' => $token],
             files: ['image' => ['name' => 'a.png', 'tmp_name' => $tmp, 'error' => 0, 'size' => 12, 'type' => 'image/png']],
-            cookies: ['__csrf' => $cookie],
+            cookies: ['__csrf' => $cookie, '__csrf_token' => $token],
             server: ['__csrf_secret' => self::SECRET],
             queryString: '',
             method: 'POST',

tests/Integration/PostMatchActionSmokeTest.php

@@ -0,0 +1,368 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BattleForge\Tests\Integration;
+
+use BattleForge\Application\TurnToken;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * End-to-end smoke test. Boots a real `php -S` dev server and walks the
+ * Skirmish bundled scenario to a winner. Gated by BATTLEFORGE_E2E=1 so the
+ * per-commit CI does not pay its cost.
+ */
+final class PostMatchActionSmokeTest extends TestCase
+{
+    private const SECRET = 'e2e-smoke-secret';
+    private const BASE_URL = 'http://127.0.0.1:8765';
+    private const CSRF_COOKIE_NAME = '__csrf';
+
+    /** @var resource|null */
+    private $serverProcess = null;
+    private string $csrfToken = '';
+    private string $csrfCookie = '';
+
+    protected function setUp(): void
+    {
+        if (getenv('BATTLEFORGE_E2E') !== '1') {
+            self::markTestSkipped('Set BATTLEFORGE_E2E=1 to run the end-to-end smoke test.');
+        }
+        $this->serverProcess = $this->bootServer();
+        $this->primeCsrf();
+    }
+
+    protected function tearDown(): void
+    {
+        if (is_resource($this->serverProcess)) {
+            proc_terminate($this->serverProcess, 9);
+            proc_close($this->serverProcess);
+        }
+        @unlink(__DIR__ . '/../../var/secret.key');
+    }
+
+    public function testHomePageReturnsTheBundledScenariosList(): void
+    {
+        $body = $this->get('/');
+        self::assertStringContainsString('id="bf-bundled"', $body);
+        self::assertStringContainsString('data-bf-bundle="skirmish"', $body);
+    }
+
+    public function testSkirmishScenarioStartsAndCanBePlayedToAWinner(): void
+    {
+        $scenario = $this->getJson('/scenarios/bundled/skirmish');
+        self::assertSame('skirmish', $scenario['id'] ?? null);
+
+        $startResponse = $this->postJson('/scenarios/skirmish/start', $scenario);
+        self::assertSame(200, $startResponse['status']);
+        $match = $startResponse['body']['match'] ?? null;
+        $matchId = $startResponse['body']['matchId'] ?? null;
+        $turnToken = $startResponse['body']['turnToken'] ?? null;
+        self::assertIsArray($match);
+        self::assertIsString($matchId);
+        self::assertMatchesRegularExpression('/^[a-f0-9]{16}$/', $matchId);
+        self::assertMatchesRegularExpression('/^[a-f0-9]{32}$/', $turnToken);
+
+        for ($i = 0; $i < 200; $i += 1) {
+            if (!empty($match['winnerTeamId'])) {
+                break;
+            }
+            $action = $this->pickAction($match, $matchId);
+            $response = $this->postJson("/matches/current/{$action['verb']}", $action['body']);
+            $errMsg = "Step {$i} verb={$action['verb']} failed: " . ($response['body']['error'] ?? '');
+            self::assertSame(200, $response['status'], $errMsg);
+            $match = $response['body']['match'];
+            $turnToken = $response['body']['turnToken'];
+        }
+        self::assertNotNull($match['winnerTeamId'] ?? null, 'Skirmish did not produce a winner within 200 actions.');
+    }
+
+    public function testStaleTurnTokenReturns409(): void
+    {
+        $scenario = $this->getJson('/scenarios/bundled/skirmish');
+        $startResponse = $this->postJson('/scenarios/skirmish/start', $scenario);
+        self::assertSame(200, $startResponse['status']);
+        $match = $startResponse['body']['match'];
+        $matchId = $startResponse['body']['matchId'];
+        $staleToken = TurnToken::issue(self::SECRET, $matchId, 'alpha', 99, 0);
+
+        $response = $this->postJson('/matches/current/end-turn', [
+            'matchId' => $matchId,
+            'match' => $match,
+        ], $staleToken);
+
+        self::assertSame(409, $response['status']);
+        self::assertSame('turn', $response['body']['error'] ?? null);
+    }
+
+    public function testBundledHoldTheLineAndLastStandStartMatches(): void
+    {
+        foreach (['hold-the-line', 'last-stand'] as $id) {
+            $scenario = $this->getJson("/scenarios/bundled/{$id}");
+            $response = $this->postJson("/scenarios/{$id}/start", $scenario);
+            self::assertSame(200, $response['status'], "Failed to start {$id}");
+            self::assertSame(
+                'alpha',
+                $response['body']['match']['activeTeamId'] ?? null,
+                "{$id} did not start with alpha",
+            );
+            self::assertNotEmpty($response['body']['matchId']);
+            self::assertNotEmpty($response['body']['turnToken']);
+        }
+    }
+
+    /** @return resource */
+    private function bootServer()
+    {
+        $this->writeSecret();
+        $descriptors = [
+            0 => ['pipe', 'r'],
+            1 => ['pipe', 'w'],
+            2 => ['pipe', 'w'],
+        ];
+        $env = [
+            'PATH' => getenv('PATH') ?: '',
+            'BATTLEFORGE_SECRET' => self::SECRET,
+        ];
+        $process = proc_open(
+            ['php', '-S', '127.0.0.1:8765', '-t', __DIR__ . '/../../public'],
+            $descriptors,
+            $pipes,
+            __DIR__ . '/../..',
+            $env,
+        );
+        if (!is_resource($process)) {
+            self::fail('Failed to start php -S');
+        }
+        // Wait for the server to print "PHP X.Y.Z Development Server (...) started"
+        $start = microtime(true);
+        while (microtime(true) - $start < 5.0) {
+            $line = fgets($pipes[1]);
+            if ($line !== false && str_contains($line, 'started')) {
+                break;
+            }
+            usleep(50_000);
+        }
+        return $process;
+    }
+
+    private function writeSecret(): void
+    {
+        @unlink(__DIR__ . '/../../var/secret.key');
+        $dir = __DIR__ . '/../../var';
+        if (!is_dir($dir)) {
+            mkdir($dir, 0700, true);
+        }
+        // We don't need an actual random secret because BATTLEFORGE_SECRET env wins.
+        // Just touch the file to make sure the dir exists.
+        file_put_contents($dir . '/secret.key', 'unused-because-env-wins');
+    }
+
+    private function primeCsrf(): void
+    {
+        $ctx = stream_context_create(['http' => ['ignore_errors' => true, 'header' => '']]);
+        $body = (string) file_get_contents(self::BASE_URL . '/', false, $ctx);
+        $headers = (string) ($http_response_header[0] ?? '');
+        foreach ($http_response_header as $line) {
+            if (preg_match('/^Set-Cookie:\\s*' . self::CSRF_COOKIE_NAME . '=([^;]+)/i', $line, $m)) {
+                $this->csrfCookie = $m[1];
+                $this->csrfToken = $this->csrfCookie;
+                return;
+            }
+        }
+        self::fail('Could not prime CSRF cookie: ' . $body);
+    }
+
+    /** @return array<string, mixed> */
+    private function getJson(string $path): array
+    {
+        $ctx = stream_context_create([
+            'http' => [
+                'method' => 'GET',
+                'header' => 'Cookie: ' . self::CSRF_COOKIE_NAME . '=' . $this->csrfCookie . "\r\n",
+                'ignore_errors' => true,
+            ],
+        ]);
+        $body = (string) file_get_contents(self::BASE_URL . $path, false, $ctx);
+        $data = json_decode($body, true);
+        if (!is_array($data)) {
+            self::fail("GET {$path} did not return JSON: {$body}");
+        }
+        return $data;
+    }
+
+    private function get(string $path): string
+    {
+        $ctx = stream_context_create([
+            'http' => [
+                'method' => 'GET',
+                'header' => 'Cookie: ' . self::CSRF_COOKIE_NAME . '=' . $this->csrfCookie . "\r\n",
+                'ignore_errors' => true,
+            ],
+        ]);
+        return (string) file_get_contents(self::BASE_URL . $path, false, $ctx);
+    }
+
+    /**
+     * @param array<string, mixed> $body
+     * @return array{status: int, body: array<string, mixed>}
+     */
+    private function postJson(string $path, array $body, ?string $turnToken = null): array
+    {
+        $headers = [
+            'Content-Type: application/json',
+            'X-CSRF-Token: ' . $this->csrfToken,
+            'Cookie: ' . self::CSRF_COOKIE_NAME . '=' . $this->csrfCookie,
+        ];
+        if ($turnToken !== null) {
+            $headers[] = 'X-Turn-Token: ' . $turnToken;
+        } elseif (isset($body['match'])) {
+            $match = $body['match'];
+            $matchId = (string) ($body['matchId'] ?? '');
+            $turnToken = TurnToken::issue(
+                self::SECRET,
+                $matchId,
+                (string) ($match['activeTeamId'] ?? 'alpha'),
+                (int) ($match['round'] ?? 1),
+                count((array) ($match['actionLog'] ?? [])),
+            );
+            $headers[] = 'X-Turn-Token: ' . $turnToken;
+        }
+        $ctx = stream_context_create([
+            'http' => [
+                'method' => 'POST',
+                'header' => implode("\r\n", $headers),
+                'content' => json_encode($body, JSON_THROW_ON_ERROR),
+                'ignore_errors' => true,
+            ],
+        ]);
+        $response = (string) file_get_contents(self::BASE_URL . $path, false, $ctx);
+        $status = 0;
+        foreach ($http_response_header as $line) {
+            if (preg_match('#^HTTP/\S+\s+(\d+)#', $line, $m)) {
+                $status = (int) $m[1];
+                break;
+            }
+        }
+        $decoded = json_decode($response, true);
+        return ['status' => $status, 'body' => is_array($decoded) ? $decoded : ['raw' => $response]];
+    }
+
+    /**
+     * Pick a sensible action for the current match. The strategy:
+     *  - if any active unit is adjacent to an enemy, attack.
+     *  - otherwise move toward the nearest enemy.
+     *  - if no enemy is reachable this turn, end the turn.
+     *
+     * @param array<string, mixed> $match
+     * @param string $matchId
+     * @return array{verb: string, body: array<string, mixed>}
+     */
+    private function pickAction(array $match, string $matchId): array
+    {
+        $units = $match['units'];
+        $active = $match['activeTeamId'];
+        $enemy = $active === 'alpha' ? 'bravo' : 'alpha';
+        foreach ($units as $unit) {
+            if ($unit['teamId'] !== $active || $unit['health'] <= 0) {
+                continue;
+            }
+            foreach ($units as $other) {
+                if ($other['teamId'] !== $enemy || $other['health'] <= 0) {
+                    continue;
+                }
+                $dist = abs($unit['position']['x'] - $other['position']['x'])
+                    + abs($unit['position']['y'] - $other['position']['y']);
+                if ($dist === 1 && $unit['actionsRemaining'] > 0 && empty($unit['hasAttacked'])) {
+                    return [
+                        'verb' => 'attack',
+                        'body' => [
+                            'matchId' => $matchId,
+                            'match' => $match,
+                            'attackerId' => $unit['id'],
+                            'targetId' => $other['id'],
+                        ],
+                    ];
+                }
+            }
+        }
+        foreach ($units as $unit) {
+            if ($unit['teamId'] !== $active || $unit['health'] <= 0 || $unit['actionsRemaining'] === 0) {
+                continue;
+            }
+            $bestTarget = null;
+            $bestDist = PHP_INT_MAX;
+            foreach ($units as $other) {
+                if ($other['teamId'] !== $enemy || $other['health'] <= 0) {
+                    continue;
+                }
+                $dist = abs($unit['position']['x'] - $other['position']['x'])
+                    + abs($unit['position']['y'] - $other['position']['y']);
+                if ($dist < $bestDist) {
+                    $bestDist = $dist;
+                    $bestTarget = $other;
+                }
+            }
+            if ($bestTarget) {
+                $dx = $bestTarget['position']['x'] - $unit['position']['x'];
+                $dy = $bestTarget['position']['y'] - $unit['position']['y'];
+                $stepX = $dx === 0 ? 0 : ($dx > 0 ? 1 : -1);
+                $stepY = $dy === 0 ? 0 : ($dy > 0 ? 1 : -1);
+                $candidates = [];
+                if ($stepX !== 0) {
+                    $candidates[] = [
+                        'x' => $unit['position']['x'] + $stepX,
+                        'y' => $unit['position']['y'],
+                    ];
+                }
+                if ($stepY !== 0) {
+                    $candidates[] = [
+                        'x' => $unit['position']['x'],
+                        'y' => $unit['position']['y'] + $stepY,
+                    ];
+                }
+                $candidates[] = [
+                    'x' => $unit['position']['x'] + ($stepX ?: 0),
+                    'y' => $unit['position']['y'] + ($stepY ?: 0),
+                ];
+                foreach ($candidates as $c) {
+                    $inBounds = $c['x'] >= 0 && $c['x'] < $match['battlefield']['width']
+                        && $c['y'] >= 0 && $c['y'] < $match['battlefield']['height'];
+                    if (!$inBounds) {
+                        continue;
+                    }
+                    $occupied = false;
+                    foreach ($units as $other) {
+                        if ($other['id'] === $unit['id'] || $other['health'] <= 0) {
+                            continue;
+                        }
+                        if ($other['position']['x'] === $c['x'] && $other['position']['y'] === $c['y']) {
+                            $occupied = true;
+                            break;
+                        }
+                    }
+                    if ($occupied) {
+                        continue;
+                    }
+                    return [
+                        'verb' => 'move',
+                        'body' => [
+                            'matchId' => $matchId,
+                            'match' => $match,
+                            'unitId' => $unit['id'],
+                            'x' => $c['x'],
+                            'y' => $c['y'],
+                        ],
+                    ];
+                }
+            }
+        }
+        return [
+            'verb' => 'end-turn',
+            'body' => [
+                'matchId' => $matchId,
+                'match' => $match,
+            ],
+        ];
+    }
+}

tests/Integration/PostMatchActionTest.php

@@ -0,0 +1,432 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BattleForge\Tests\Integration;
+
+use BattleForge\Application\ScenarioSerializer;
+use BattleForge\Application\TurnToken;
+use BattleForge\Domain\Archetype;
+use BattleForge\Domain\Battlefield;
+use BattleForge\Domain\MatchState;
+use BattleForge\Domain\Position;
+use BattleForge\Domain\UnitState;
+use BattleForge\Http\CsrfToken;
+use BattleForge\Http\Handlers\PostMatchAbility;
+use BattleForge\Http\Handlers\PostMatchAttack;
+use BattleForge\Http\Handlers\PostMatchEndTurn;
+use BattleForge\Http\Handlers\PostMatchMove;
+use BattleForge\Http\Request;
+use PHPUnit\Framework\TestCase;
+
+final class PostMatchActionTest extends TestCase
+{
+    private const SECRET = 'match-action-test-secret';
+    private const MATCH_ID = '0123456789abcdef';
+    private const HEAL = ['heal'];
+
+    public function testMoveHappyPathReturnsTheUpdatedMatchAndAFreshTurnToken(): void
+    {
+        $match = $this->freshMatch();
+        $token = $this->tokenFor($match);
+        [$csrf, $cookie] = CsrfToken::issue(self::SECRET);
+
+        $response = (new PostMatchMove(self::SECRET))->handle(
+            $this->buildRequest(
+                match: $match,
+                csrf: $csrf,
+                turnToken: $token,
+                cookies: ['__csrf' => $cookie, '__csrf_token' => $token],
+                body: [
+                    'matchId' => self::MATCH_ID,
+                    'match' => ScenarioSerializer::matchToArray($match),
+                    'unitId' => 'alpha-1',
+                    'x' => 1,
+                    'y' => 0,
+                ],
+            ),
+            [],
+        );
+
+        self::assertSame(200, $response->status);
+        $body = json_decode($response->body, true);
+        $posKey = $body['match']['units'][0]['position']['x'] . ':' . $body['match']['units'][0]['position']['y'];
+        self::assertSame('1:0', $posKey);
+        self::assertMatchesRegularExpression('/^[a-f0-9]{32}$/', $body['turnToken']);
+        self::assertNull($body['winnerTeamId']);
+    }
+
+    public function testMoveRejectsAnUnreachableDestinationAndDoesNotMutateTheMatch(): void
+    {
+        $match = $this->freshMatch();
+        $token = $this->tokenFor($match);
+        [$csrf, $cookie] = CsrfToken::issue(self::SECRET);
+
+        $response = (new PostMatchMove(self::SECRET))->handle(
+            $this->buildRequest(
+                match: $match,
+                csrf: $csrf,
+                turnToken: $token,
+                cookies: ['__csrf' => $cookie, '__csrf_token' => $token],
+                body: [
+                    'matchId' => self::MATCH_ID,
+                    'match' => ScenarioSerializer::matchToArray($match),
+                    'unitId' => 'alpha-1',
+                    'x' => 0,
+                    'y' => 0,
+                ],
+            ),
+            [],
+        );
+
+        self::assertSame(409, $response->status);
+        $body = json_decode($response->body, true);
+        self::assertStringContainsString('not reachable', $body['error']);
+        $posKey = $body['match']['units'][0]['position']['x'] . ':' . $body['match']['units'][0]['position']['y'];
+        self::assertSame('0:0', $posKey);
+    }
+
+    public function testAttackHappyPathReducesTargetHealth(): void
+    {
+        $match = $this->freshMatch();
+        $matchArray = ScenarioSerializer::matchToArray($match);
+        $matchArray['units'][0]['position'] = ['x' => 6, 'y' => 7];
+        $match = ScenarioSerializer::matchFromArray($matchArray);
+
+        // Loop until a hit lands; the to-hit roll can miss.
+        $bravo = null;
+        for ($i = 0; $i < 200; $i += 1) {
+            $match = $this->freshMatch();
+            $matchArray = ScenarioSerializer::matchToArray($match);
+            $matchArray['units'][0]['position'] = ['x' => 6, 'y' => 7];
+            $match = ScenarioSerializer::matchFromArray($matchArray);
+            $token = $this->tokenFor($match);
+            [$csrf, $cookie] = CsrfToken::issue(self::SECRET);
+
+            $response = (new PostMatchAttack(self::SECRET))->handle(
+                $this->buildRequest(
+                    match: $match,
+                    csrf: $csrf,
+                    turnToken: $token,
+                    cookies: ['__csrf' => $cookie, '__csrf_token' => $token],
+                    body: [
+                        'matchId' => self::MATCH_ID,
+                        'match' => ScenarioSerializer::matchToArray($match),
+                        'attackerId' => 'alpha-1',
+                        'targetId' => 'bravo-1',
+                    ],
+                ),
+                [],
+            );
+
+            self::assertSame(200, $response->status);
+            $body = json_decode($response->body, true);
+            $bravo = null;
+            foreach ($body['match']['units'] as $unit) {
+                if ($unit['id'] === 'bravo-1') {
+                    $bravo = $unit;
+                    break;
+                }
+            }
+            if ($bravo !== null && $bravo['health'] < 10) {
+                break;
+            }
+        }
+
+        self::assertNotNull($bravo);
+        self::assertLessThan(10, $bravo['health']);
+    }
+
+    public function testAttackRejectsAnOutOfRangeTarget(): void
+    {
+        $match = $this->freshMatch();
+        $token = $this->tokenFor($match);
+        [$csrf, $cookie] = CsrfToken::issue(self::SECRET);
+
+        $response = (new PostMatchAttack(self::SECRET))->handle(
+            $this->buildRequest(
+                match: $match,
+                csrf: $csrf,
+                turnToken: $token,
+                cookies: ['__csrf' => $cookie, '__csrf_token' => $token],
+                body: [
+                    'matchId' => self::MATCH_ID,
+                    'match' => ScenarioSerializer::matchToArray($match),
+                    'attackerId' => 'alpha-1',
+                    'targetId' => 'bravo-1',
+                ],
+            ),
+            [],
+        );
+
+        self::assertSame(409, $response->status);
+    }
+
+    public function testAbilityHappyPathHealsAnAlly(): void
+    {
+        $match = $this->freshMatch();
+        $matchArray = ScenarioSerializer::matchToArray($match);
+        foreach ($matchArray['units'] as &$unit) {
+            if ($unit['id'] === 'alpha-3') {
+                $unit['archetype'] = 'support';
+                $unit['abilities'] = ['heal'];
+            }
+        }
+        unset($unit);
+        foreach ($matchArray['units'] as &$unit) {
+            if ($unit['id'] === 'alpha-2') {
+                $unit['health'] = 2;
+            }
+        }
+        unset($unit);
+        $match = ScenarioSerializer::matchFromArray($matchArray);
+        $token = $this->tokenFor($match);
+        [$csrf, $cookie] = CsrfToken::issue(self::SECRET);
+
+        $response = (new PostMatchAbility(self::SECRET))->handle(
+            $this->buildRequest(
+                match: $match,
+                csrf: $csrf,
+                turnToken: $token,
+                cookies: ['__csrf' => $cookie, '__csrf_token' => $token],
+                body: [
+                    'matchId' => self::MATCH_ID,
+                    'match' => ScenarioSerializer::matchToArray($match),
+                    'unitId' => 'alpha-3',
+                    'abilityId' => 'heal',
+                    'x' => 0,
+                    'y' => 1,
+                ],
+            ),
+            [],
+        );
+
+        self::assertSame(200, $response->status);
+        $body = json_decode($response->body, true);
+        $healed = null;
+        foreach ($body['match']['units'] as $unit) {
+            if ($unit['id'] === 'alpha-2') {
+                $healed = $unit;
+                break;
+            }
+        }
+        self::assertGreaterThan(2, $healed['health']);
+    }
+
+    public function testAbilityRejectsATargetOutsideRange(): void
+    {
+        $match = $this->freshMatch();
+        $matchArray = ScenarioSerializer::matchToArray($match);
+        foreach ($matchArray['units'] as &$unit) {
+            if ($unit['id'] === 'alpha-3') {
+                $unit['archetype'] = 'support';
+                $unit['abilities'] = ['heal'];
+            }
+        }
+        unset($unit);
+        $match = ScenarioSerializer::matchFromArray($matchArray);
+        $token = $this->tokenFor($match);
+        [$csrf, $cookie] = CsrfToken::issue(self::SECRET);
+
+        $response = (new PostMatchAbility(self::SECRET))->handle(
+            $this->buildRequest(
+                match: $match,
+                csrf: $csrf,
+                turnToken: $token,
+                cookies: ['__csrf' => $cookie, '__csrf_token' => $token],
+                body: [
+                    'matchId' => self::MATCH_ID,
+                    'match' => ScenarioSerializer::matchToArray($match),
+                    'unitId' => 'alpha-3',
+                    'abilityId' => 'heal',
+                    'x' => 7,
+                    'y' => 7,
+                ],
+            ),
+            [],
+        );
+
+        self::assertSame(409, $response->status);
+    }
+
+    public function testMoveIntoWaterEndsTurn(): void
+    {
+        // Build a match where alpha-1 is on dry ground next to a water tile;
+        // alpha-2 and alpha-3 are parked out of the way so the move path is
+        // clear, and the move target (0,1) becomes a water tile whose cost (3)
+        // matches alpha-1's speed budget.
+        $match = $this->freshMatch();
+        $matchArray = ScenarioSerializer::matchToArray($match);
+        $matchArray['units'][0]['position'] = ['x' => 0, 'y' => 0];
+        $matchArray['units'][0]['speed'] = 3;
+        $matchArray['units'][1]['position'] = ['x' => 0, 'y' => 3]; // alpha-2 clear of alpha-1's path
+        $matchArray['units'][2]['position'] = ['x' => 0, 'y' => 2]; // alpha-3 clear of alpha-1's path
+        $matchArray['units'][3]['position'] = ['x' => 7, 'y' => 7]; // bravo-1 stays put
+        $matchArray['units'][4]['position'] = ['x' => 6, 'y' => 7]; // bravo-2
+        $matchArray['units'][5]['position'] = ['x' => 5, 'y' => 7]; // bravo-3
+        $matchArray['battlefield']['terrain'] = ['0:1' => 'water'];
+        $match = ScenarioSerializer::matchFromArray($matchArray);
+
+        $token = $this->tokenFor($match);
+        [$csrf, $cookie] = CsrfToken::issue(self::SECRET);
+
+        $response = (new PostMatchMove(self::SECRET))->handle(
+            $this->buildRequest(
+                match: $match,
+                csrf: $csrf,
+                turnToken: $token,
+                cookies: ['__csrf' => $cookie, '__csrf_token' => $token],
+                body: [
+                    'matchId' => self::MATCH_ID,
+                    'match' => ScenarioSerializer::matchToArray($match),
+                    'unitId' => 'alpha-1',
+                    'x' => 0,
+                    'y' => 1,
+                ],
+            ),
+            [],
+        );
+
+        self::assertSame(200, $response->status);
+
+        $body = json_decode($response->body, true);
+        $moved = null;
+        foreach ($body['match']['units'] as $u) {
+            if ($u['id'] === 'alpha-1') {
+                $moved = $u;
+            }
+        }
+        self::assertNotNull($moved);
+        self::assertSame(['x' => 0, 'y' => 1], $moved['position']);
+        self::assertSame(0, $moved['actionsRemaining'], 'wading ends the turn');
+        self::assertTrue($moved['wadedThisTurn'], 'wade flag is set after water entry');
+    }
+
+    public function testEndTurnHappyPathSwitchesTheActiveTeamAndIncrementsTheRoundAfterBothSides(): void
+    {
+        $match = $this->freshMatch();
+        $token = $this->tokenFor($match);
+        [$csrf, $cookie] = CsrfToken::issue(self::SECRET);
+
+        $response = (new PostMatchEndTurn(self::SECRET))->handle(
+            $this->buildRequest(
+                match: $match,
+                csrf: $csrf,
+                turnToken: $token,
+                cookies: ['__csrf' => $cookie, '__csrf_token' => $token],
+                body: [
+                    'matchId' => self::MATCH_ID,
+                    'match' => ScenarioSerializer::matchToArray($match),
+                ],
+            ),
+            [],
+        );
+
+        self::assertSame(200, $response->status);
+        $body = json_decode($response->body, true);
+        self::assertSame('bravo', $body['match']['activeTeamId']);
+        self::assertSame(1, $body['match']['round']);
+    }
+
+    public function testEndTurnRejectsARequestWithAStaleTurnToken(): void
+    {
+        $match = $this->freshMatch();
+        $stale = TurnToken::issue(self::SECRET, self::MATCH_ID, 'alpha', 99, 0);
+        $wrongRound = TurnToken::issue(self::SECRET, self::MATCH_ID, 'alpha', 2, 0);
+        $good = $this->tokenFor($match);
+        [$csrf, $cookie] = CsrfToken::issue(self::SECRET);
+
+        $staleResponse = (new PostMatchEndTurn(self::SECRET))->handle(
+            $this->buildRequest(
+                match: $match,
+                csrf: $csrf,
+                turnToken: $stale,
+                cookies: ['__csrf' => $cookie, '__csrf_token' => $token],
+                body: [
+                    'matchId' => self::MATCH_ID,
+                    'match' => ScenarioSerializer::matchToArray($match),
+                ],
+            ),
+            [],
+        );
+        self::assertSame(409, $staleResponse->status);
+        $body = json_decode($staleResponse->body, true);
+        self::assertSame('turn', $body['error'] ?? null);
+
+        $wrongRoundResponse = (new PostMatchEndTurn(self::SECRET))->handle(
+            $this->buildRequest(
+                match: $match,
+                csrf: $csrf,
+                turnToken: $wrongRound,
+                cookies: ['__csrf' => $cookie, '__csrf_token' => $token],
+                body: [
+                    'matchId' => self::MATCH_ID,
+                    'match' => ScenarioSerializer::matchToArray($match),
+                ],
+            ),
+            [],
+        );
+        self::assertSame(409, $wrongRoundResponse->status);
+    }
+
+    private function freshMatch(): MatchState
+    {
+        $support = new UnitState(
+            'alpha-3',
+            'alpha',
+            new Position(1, 1),
+            10,
+            10,
+            3,
+            3,
+            2,
+            2,
+            false,
+            Archetype::Support,
+            self::HEAL,
+        );
+
+        return new MatchState(
+            new Battlefield(8, 8),
+            [
+                new UnitState('alpha-1', 'alpha', new Position(0, 0), 10, 10, 3, 3, 2, 2, false, Archetype::Defender),
+                new UnitState('alpha-2', 'alpha', new Position(0, 1), 10, 10, 3, 3, 2, 2, false, Archetype::Defender),
+                $support,
+                new UnitState('bravo-1', 'bravo', new Position(7, 7), 10, 10, 3, 3, 2, 2, false, Archetype::Striker),
+                new UnitState('bravo-2', 'bravo', new Position(6, 6), 10, 10, 3, 3, 2, 2, false, Archetype::Striker),
+                new UnitState('bravo-3', 'bravo', new Position(5, 7), 10, 10, 3, 3, 2, 2, false, Archetype::Striker),
+            ],
+            'alpha',
+        );
+    }
+
+    private function tokenFor(MatchState $match): string
+    {
+        return TurnToken::issue(
+            self::SECRET,
+            self::MATCH_ID,
+            $match->activeTeamId,
+            $match->round,
+            count($match->actionLog),
+        );
+    }
+
+    /**
+     * @param array<string, string> $cookies
+     * @param array<string, mixed>  $body
+     */
+    private function buildRequest(
+        MatchState $match,
+        string $csrf,
+        string $turnToken,
+        array $cookies,
+        array $body
+    ): Request {
+        return new Request([], [], [], $cookies, [
+            'HTTP_X_CSRF_TOKEN' => $csrf,
+            'HTTP_X_TURN_TOKEN' => $turnToken,
+            '__csrf_secret' => self::SECRET,
+            'CONTENT_TYPE' => 'application/json',
+        ], '', 'POST', '/matches/current/test', 'application/json', json_encode($body, JSON_THROW_ON_ERROR));
+    }
+}

tests/Integration/PostStartMatchTest.php

@@ -29,7 +29,7 @@ final class PostStartMatchTest extends TestCase
         $request = $this->buildRequest(
             rawBody: json_encode($this->validScenario(), JSON_THROW_ON_ERROR),
             csrfHeader: $token,
-            cookies: ['__csrf' => $cookie],
+            cookies: ['__csrf' => $cookie, '__csrf_token' => $token],
         );
         $response = $handler->handle($request, ['id' => 'demo']);
 
@@ -38,6 +38,10 @@ final class PostStartMatchTest extends TestCase
         self::assertSame('alpha', $body['match']['activeTeamId'] ?? null);
         self::assertSame(1, $body['match']['round'] ?? null);
         self::assertCount(6, $body['match']['units'] ?? []);
+        self::assertIsString($body['matchId'] ?? null);
+        self::assertMatchesRegularExpression('/^[a-f0-9]{16}$/', $body['matchId']);
+        self::assertIsString($body['turnToken'] ?? null);
+        self::assertMatchesRegularExpression('/^[a-f0-9]{32}$/', $body['turnToken']);
     }
 
     public function testItReturns400OnAnInvalidScenario(): void
@@ -47,13 +51,40 @@ final class PostStartMatchTest extends TestCase
         $request = $this->buildRequest(
             rawBody: json_encode(['this' => 'is not a valid scenario'], JSON_THROW_ON_ERROR),
             csrfHeader: $token,
-            cookies: ['__csrf' => $cookie],
+            cookies: ['__csrf' => $cookie, '__csrf_token' => $token],
         );
         $response = $handler->handle($request, ['id' => 'demo']);
 
         self::assertSame(400, $response->status);
     }
 
+    public function testItReturnsATurnTokenValidForTheInitialMatchState(): void
+    {
+        [$token, $cookie] = CsrfToken::issue(self::SECRET);
+        $handler = new PostStartMatch();
+        $request = $this->buildRequest(
+            rawBody: json_encode($this->validScenario(), JSON_THROW_ON_ERROR),
+            csrfHeader: $token,
+            cookies: ['__csrf' => $cookie, '__csrf_token' => $token],
+        );
+        $response = $handler->handle($request, ['id' => 'demo']);
+
+        self::assertSame(200, $response->status);
+        $body = json_decode($response->body, true);
+        $matchId = $body['matchId'];
+        $turnToken = $body['turnToken'];
+        $lastActionIndex = count($body['match']['actionLog'] ?? []);
+
+        self::assertTrue(\BattleForge\Application\TurnToken::verify(
+            self::SECRET,
+            $matchId,
+            $body['match']['activeTeamId'],
+            $body['match']['round'],
+            $lastActionIndex,
+            $turnToken,
+        ));
+    }
+
     /** @param array<string, string> $cookies */
     private function buildRequest(string $rawBody, string $csrfHeader, array $cookies = []): Request
     {

tests/Integration/PostTeamEditorTest.php

@@ -39,7 +39,7 @@ final class PostTeamEditorTest extends TestCase
         $handler = new PostTeamEditor();
         $request = $this->buildRequest(
             post: $this->validPost($token),
-            cookies: ['__csrf' => $cookie],
+            cookies: ['__csrf' => $cookie, '__csrf_token' => $token],
             server: ['__csrf_secret' => self::SECRET],
         );
         $response = $handler->handle($request, ['id' => 'demo']);
@@ -57,7 +57,7 @@ final class PostTeamEditorTest extends TestCase
         $post['teamA']['units'][0]['maxHealth'] = '9999';
         $request = $this->buildRequest(
             post: $post,
-            cookies: ['__csrf' => $cookie],
+            cookies: ['__csrf' => $cookie, '__csrf_token' => $token],
             server: ['__csrf_secret' => self::SECRET],
         );
         $response = $handler->handle($request, ['id' => 'demo']);
@@ -75,7 +75,7 @@ final class PostTeamEditorTest extends TestCase
         $post['id'] = '</script><script>alert(1)</script>';
         $request = $this->buildRequest(
             post: $post,
-            cookies: ['__csrf' => $cookie],
+            cookies: ['__csrf' => $cookie, '__csrf_token' => $token],
             server: ['__csrf_secret' => self::SECRET],
         );
         $response = $handler->handle($request, ['id' => $post['id']]);

tests/Integration/StaleCookieRotationTest.php

@@ -0,0 +1,175 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BattleForge\Tests\Integration;
+
+use BattleForge\Http\CsrfToken;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Verifies that the front controller detects a stale CSRF cookie pair
+ * (one minted under a different secret.key) and re-mints a fresh pair on
+ * the next request. Without this, a browser session that predates a
+ * server restart with a fresh secret would have every action return 403
+ * until the user manually cleared cookies.
+ *
+ * The test boots the front controller in-process (matching the pattern
+ * in FullFlowTest) and reads the re-minted raw token from the meta tag
+ * in the response body. The HMAC verification of the new pair against
+ * the current SECRET can then be asserted in pure PHP without needing
+ * to inspect response Set-Cookie headers.
+ */
+final class StaleCookieRotationTest extends TestCase
+{
+    private const SECRET_A = 'unit-test-secret-A';
+    private const SECRET_B = 'unit-test-secret-B';
+
+    private int $lastStatus = 0;
+
+    protected function setUp(): void
+    {
+        // Reset superglobals between requests.
+        $_GET = [];
+        $_POST = [];
+        $_FILES = [];
+        $_COOKIE = [];
+        $_SERVER = [];
+    }
+
+    protected function tearDown(): void
+    {
+        // Clear the env override set by individual tests so other tests
+        // do not see a polluted environment.
+        putenv('BATTLEFORGE_SECRET');
+    }
+
+    public function testStaleCookiesAreReplacedOnNextRequest(): void
+    {
+        // 1. Boot the front controller under SECRET_A to mint a cookie pair.
+        //    We don't pre-mint a token via CsrfToken::issue because the test
+        //    would then have to align it with what the controller mints; the
+        //    controller's mint uses random_bytes(32) so the test's mint and
+        //    the controller's mint would differ. Instead, we just observe
+        //    that the controller minted *something* under SECRET_A.
+        putenv('BATTLEFORGE_SECRET=' . self::SECRET_A);
+        $this->primeGet('/');
+        $bodyA = $this->runFrontController();
+        self::assertSame(200, $this->lastStatus);
+        $tokenA = $this->extractMetaToken($bodyA);
+
+        // 2. Now simulate a server restart with SECRET_B. The browser
+        //    still has the old cookies (minted under SECRET_A). We capture
+        //    them from the first request's response by re-running a request
+        //    with the same env: but since we cannot read Set-Cookie headers
+        //    from a captured PHP test, we re-derive them using the same
+        //    secret + the raw token the controller issued.
+        $cookieA = hash_hmac('sha256', $tokenA, self::SECRET_A);
+
+        // 3. Send a second request with the stale cookies but SECRET_B
+        //    active. The front controller should detect the mismatch and
+        //    re-mint a fresh pair.
+        putenv('BATTLEFORGE_SECRET=' . self::SECRET_B);
+        $_COOKIE['__csrf'] = $cookieA;
+        $_COOKIE['__csrf_token'] = $tokenA;
+        $this->primeGet('/');
+        $bodyB = $this->runFrontController();
+
+        // 4. The response should now carry a meta tag with a different
+        //    raw token, and that token should HMAC under SECRET_B.
+        $tokenB = $this->extractMetaToken($bodyB);
+        self::assertNotSame($tokenA, $tokenB, 'raw token should be re-minted under SECRET_B');
+
+        $hmacUnderB = hash_hmac('sha256', $tokenB, self::SECRET_B);
+        self::assertSame(64, strlen($hmacUnderB), 'HMAC under SECRET_B should be 64 hex chars');
+    }
+
+    public function testValidCookiesAreNotReIssuedOnNextRequest(): void
+    {
+        // Mint a fresh pair under SECRET_A and capture both the raw token
+        // and the corresponding HMAC. The test sends these as the browser's
+        // cookie jar on the second request; the controller should recognise
+        // them as fresh and re-use the existing pair (no re-mint).
+        putenv('BATTLEFORGE_SECRET=' . self::SECRET_A);
+        [$tokenA, $cookieA] = CsrfToken::issue(self::SECRET_A);
+
+        // 1. First request: no cookies, controller mints a fresh pair.
+        $this->primeGet('/');
+        $bodyA = $this->runFrontController();
+        self::assertSame(200, $this->lastStatus);
+        $tokenAController = $this->extractMetaToken($bodyA);
+        $cookieAController = hash_hmac('sha256', $tokenAController, self::SECRET_A);
+
+        // 2. Second request: pre-mint the cookies that match the test's
+        //    expectation. The controller should recognise the pair is fresh
+        //    and re-use it (meta tag carries the same token, no re-mint).
+        $_COOKIE['__csrf'] = $cookieA;
+        $_COOKIE['__csrf_token'] = $tokenA;
+        $this->primeGet('/');
+        $bodyB = $this->runFrontController();
+        $tokenB = $this->extractMetaToken($bodyB);
+
+        // Both bodies have valid tokens; the test's "no re-mint" claim is
+        // that $tokenA (the test's mint) is the same as $tokenB (the
+        // controller's reuse). The controller's mint and the test's mint
+        // are different only when the controller re-mints, so the
+        // identity proves the controller re-used the existing pair.
+        self::assertSame($tokenA, $tokenB, 'controller should re-use the existing token when cookies are valid');
+    }
+
+    public function testMissingTokenCookieIsFilledInOnNextRequest(): void
+    {
+        // 1. Boot under SECRET_A so the controller mints a pair.
+        putenv('BATTLEFORGE_SECRET=' . self::SECRET_A);
+        $this->primeGet('/');
+        $bodyA = $this->runFrontController();
+        $tokenA = $this->extractMetaToken($bodyA);
+
+        // 2. Browser has the __csrf cookie but is missing __csrf_token
+        //    (a partial-clear scenario, e.g. user cleared just one).
+        putenv('BATTLEFORGE_SECRET=' . self::SECRET_B);
+        $_COOKIE['__csrf'] = hash_hmac('sha256', $tokenA, self::SECRET_A);
+        // __csrf_token is intentionally missing.
+        $this->primeGet('/');
+        $bodyB = $this->runFrontController();
+        $tokenB = $this->extractMetaToken($bodyB);
+        self::assertNotSame($tokenA, $tokenB, 'missing __csrf_token should trigger re-mint');
+    }
+
+    private function primeGet(string $path): void
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+        $_SERVER['REQUEST_URI'] = $path;
+        $_SERVER['CONTENT_TYPE'] = null;
+    }
+
+    private function extractMetaToken(string $body): string
+    {
+        $regex = '/<meta name="csrf-token" content="([a-f0-9]{64})">/';
+        if (!preg_match($regex, $body, $m)) {
+            self::fail('response body did not contain a 64-char hex <meta name="csrf-token">; first 500 chars: ' . substr($body, 0, 500));
+        }
+        return $m[1];
+    }
+
+    private function runFrontController(): string
+    {
+        $this->lastStatus = 0;
+        $body = $this->captureOutput(function (): void {
+            $this->lastStatus = (require __DIR__ . '/../../public/index.php') ?? http_response_code();
+        });
+        return $body;
+    }
+
+    /** @param callable(): void $fn */
+    private function captureOutput(callable $fn): string
+    {
+        ob_start();
+        try {
+            $fn();
+        } finally {
+            $output = (string) ob_get_clean();
+        }
+        return $output;
+    }
+}

tests/Unit/Application/ScenarioSerializerTest.php

@@ -135,4 +135,41 @@ final class ScenarioSerializerTest extends TestCase
             // missing 'name', 'battlefield', 'units', etc.
         ]);
     }
+
+    public function testMatchRoundTripsItsObjectives(): void
+    {
+        $battlefield = new Battlefield(10, 8);
+        $units = [
+            new UnitState('a1', 'alpha', new Position(0, 0), 10, 10, 3, 3, 2, 2, false),
+            new UnitState('a2', 'alpha', new Position(1, 0), 10, 10, 3, 3, 2, 2, false),
+            new UnitState('a3', 'alpha', new Position(2, 0), 10, 10, 3, 3, 2, 2, false),
+            new UnitState('b1', 'bravo', new Position(9, 7), 10, 10, 3, 3, 2, 2, false),
+            new UnitState('b2', 'bravo', new Position(8, 7), 10, 10, 3, 3, 2, 2, false),
+            new UnitState('b3', 'bravo', new Position(7, 7), 10, 10, 3, 3, 2, 2, false),
+        ];
+        $objective = new ObjectiveMarker('objective-1', new Position(5, 4));
+        $original = new MatchState(
+            battlefield: $battlefield,
+            units: $units,
+            activeTeamId: 'alpha',
+            objectives: ['objective-1' => $objective],
+            victoryCondition: VictoryCondition::HoldObjective,
+            holdRoundsRequired: 3,
+        );
+
+        $array = ScenarioSerializer::matchToArray($original);
+        self::assertArrayHasKey('objectives', $array);
+        self::assertSame(
+            ['id' => 'objective-1', 'position' => ['x' => 5, 'y' => 4]],
+            $array['objectives']['objective-1'] ?? null,
+        );
+
+        $rebuilt = ScenarioSerializer::matchFromArray($array);
+        self::assertArrayHasKey('objective-1', $rebuilt->objectives);
+        self::assertSame('objective-1', $rebuilt->objectives['objective-1']->id);
+        self::assertSame(5, $rebuilt->objectives['objective-1']->position->x);
+        self::assertSame(4, $rebuilt->objectives['objective-1']->position->y);
+        self::assertSame(VictoryCondition::HoldObjective, $rebuilt->victoryCondition);
+        self::assertSame(3, $rebuilt->holdRoundsRequired);
+    }
 }

tests/Unit/Application/TurnTokenTest.php

@@ -0,0 +1,88 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BattleForge\Tests\Unit\Application;
+
+use BattleForge\Application\TurnToken;
+use InvalidArgumentException;
+use PHPUnit\Framework\TestCase;
+
+final class TurnTokenTest extends TestCase
+{
+    private const SECRET = 'turn-token-test-secret';
+
+    public function testIssueIsDeterministicForTheSameInputs(): void
+    {
+        $a = TurnToken::issue(self::SECRET, '0123456789abcdef', 'alpha', 1, 0);
+        $b = TurnToken::issue(self::SECRET, '0123456789abcdef', 'alpha', 1, 0);
+
+        self::assertSame($a, $b);
+        self::assertSame(32, strlen($a));
+        self::assertMatchesRegularExpression('/^[a-f0-9]{32}$/', $a);
+    }
+
+    public function testVerifyAcceptsAFreshlyIssuedToken(): void
+    {
+        $token = TurnToken::issue(self::SECRET, '0123456789abcdef', 'alpha', 1, 0);
+
+        self::assertTrue(TurnToken::verify(self::SECRET, '0123456789abcdef', 'alpha', 1, 0, $token));
+    }
+
+    public function testVerifyRejectsAMutatedToken(): void
+    {
+        $token = TurnToken::issue(self::SECRET, '0123456789abcdef', 'alpha', 1, 0);
+        $tampered = substr($token, 0, -1) . '0';
+
+        self::assertFalse(TurnToken::verify(self::SECRET, '0123456789abcdef', 'alpha', 1, 0, $tampered));
+    }
+
+    public function testVerifyRejectsATokenFromADifferentMatch(): void
+    {
+        $token = TurnToken::issue(self::SECRET, '0123456789abcdef', 'alpha', 1, 0);
+
+        self::assertFalse(TurnToken::verify(self::SECRET, 'fedcba9876543210', 'alpha', 1, 0, $token));
+    }
+
+    public function testVerifyRejectsATokenFromADifferentTeam(): void
+    {
+        $token = TurnToken::issue(self::SECRET, '0123456789abcdef', 'alpha', 1, 0);
+
+        self::assertFalse(TurnToken::verify(self::SECRET, '0123456789abcdef', 'bravo', 1, 0, $token));
+    }
+
+    public function testVerifyRejectsATokenFromADifferentRound(): void
+    {
+        $token = TurnToken::issue(self::SECRET, '0123456789abcdef', 'alpha', 1, 0);
+
+        self::assertFalse(TurnToken::verify(self::SECRET, '0123456789abcdef', 'alpha', 2, 0, $token));
+    }
+
+    public function testVerifyRejectsATokenFromADifferentLastActionIndex(): void
+    {
+        $token = TurnToken::issue(self::SECRET, '0123456789abcdef', 'alpha', 1, 0);
+
+        self::assertFalse(TurnToken::verify(self::SECRET, '0123456789abcdef', 'alpha', 1, 1, $token));
+    }
+
+    public function testIssueRejectsAMalformedMatchId(): void
+    {
+        $this->expectException(InvalidArgumentException::class);
+
+        TurnToken::issue(self::SECRET, 'not-hex!', 'alpha', 1, 0);
+    }
+
+    public function testIssueRejectsAnEmptyActiveTeamId(): void
+    {
+        $this->expectException(InvalidArgumentException::class);
+
+        TurnToken::issue(self::SECRET, '0123456789abcdef', '', 1, 0);
+    }
+
+    public function testIssueRejectsANegativeRound(): void
+    {
+        $this->expectException(InvalidArgumentException::class);
+
+        TurnToken::issue(self::SECRET, '0123456789abcdef', 'alpha', 0, 0);
+    }
+}

tests/Unit/Domain/CombatEngineTest.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace BattleForge\Tests\Unit\Domain;
 
+use BattleForge\Application\ScenarioSerializer;
+use BattleForge\Application\TurnToken;
 use BattleForge\Domain\Archetype;
 use BattleForge\Domain\Battlefield;
 use BattleForge\Domain\CombatEngine;
@@ -14,6 +16,9 @@ use BattleForge\Domain\Position;
 use BattleForge\Domain\Terrain;
 use BattleForge\Domain\UnitState;
 use BattleForge\Domain\VictoryCondition;
+use BattleForge\Http\CsrfToken;
+use BattleForge\Http\Handlers\PostMatchAttack;
+use BattleForge\Http\MatchActionSupport;
 use InvalidArgumentException;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
@@ -226,28 +231,40 @@ final class CombatEngineTest extends TestCase
     {
         $attacker = $this->unit('alpha-1', 'alpha', new Position(0, 0));
         $target = $this->unit('bravo-1', 'bravo', new Position(1, 0));
-        $match = new MatchState(
+        $buildMatch = static fn (): MatchState => new MatchState(
             new Battlefield(8, 8, ['1:0' => Terrain::Forest]),
             [$attacker, $target],
             'alpha',
             actionLog: ['match started'],
         );
 
-        $next = (new CombatEngine())->attack($match, 'alpha-1', 'bravo-1');
+        // Loop until a non-crit hit lands; a crit would double the base 1 damage to 2,
+        // which would mask the variance behavior this test exercises.
+        $next = $buildMatch();
+        for ($i = 0; $i < 200; $i += 1) {
+            $fresh = $buildMatch();
+            $next = (new CombatEngine())->attack($fresh, 'alpha-1', 'bravo-1');
+            $entry = $next->actionLog[0] ?? '';
+            if (str_contains($entry, 'for ') && !str_contains($entry, ' — crit') && !str_contains($entry, ' — miss')) {
+                break;
+            }
+        }
 
+        // Original match state must not have been mutated by the loop's iterations.
         self::assertSame(10, $target->health);
         self::assertSame(2, $attacker->actionsRemaining);
         self::assertFalse($attacker->hasAttacked);
-        self::assertSame(10, $match->unit('bravo-1')->health);
+
-        self::assertSame(2, $match->unit('alpha-1')->actionsRemaining);
+        self::assertGreaterThanOrEqual(9, $next->unit('bravo-1')->health);
-        self::assertFalse($match->unit('alpha-1')->hasAttacked);
+        self::assertLessThanOrEqual(10, $next->unit('bravo-1')->health);
-        self::assertSame(['match started'], $match->actionLog);
-        self::assertSame(9, $next->unit('bravo-1')->health);
         self::assertSame(1, $next->unit('alpha-1')->actionsRemaining);
         self::assertTrue($next->unit('alpha-1')->hasAttacked);
-        self::assertSame(
+        // With attack=4, defense=2, +1 forest defense: base = max(1, 4-2-1) = 1.
-            ['match started', 'alpha-1 attacked bravo-1 for 1 damage'],
+        // On hit, damage = 1 (variance leaves it at 1). On miss, damage = 0.
-            $next->actionLog,
+        $log = $next->actionLog[1] ?? '';
+        self::assertMatchesRegularExpression(
+            '/^alpha-1 attacked bravo-1 \(rolled \d+ \/ needed \d+\) for \d+ damage( — (miss|crit|concealed)( .+)?)?$/',
+            $log,
         );
     }
 
@@ -270,17 +287,50 @@ final class CombatEngineTest extends TestCase
 
     public function testAttackDefeatingLastEnemyAwardsVictory(): void
     {
-        $match = new MatchState(
+        $buildMatch = static function (): MatchState {
-            new Battlefield(8, 8),
+            return new MatchState(
-            [
+                new Battlefield(8, 8),
-                $this->unit('alpha-1', 'alpha', new Position(0, 0), attack: 20),
+                [
-                $this->unit('bravo-1', 'bravo', new Position(1, 0)),
+                    new UnitState(
-            ],
+                        'alpha-1',
-            'alpha',
+                        'alpha',
-        );
+                        new Position(0, 0),
+                        10,
+                        10,
+                        20,
+                        2,
+                        4,
+                        2,
+                        false,
+                    ),
+                    new UnitState(
+                        'bravo-1',
+                        'bravo',
+                        new Position(1, 0),
+                        10,
+                        10,
+                        3,
+                        2,
+                        4,
+                        2,
+                        false,
+                    ),
+                ],
+                'alpha',
+            );
+        };
 
-        $next = (new CombatEngine())->attack($match, 'alpha-1', 'bravo-1');
+        $match = $buildMatch();
 
+        // The new to-hit roll can miss; loop until we find a hit that defeats the target.
+        $next = $match;
+        for ($i = 0; $i < 200; $i += 1) {
+            $fresh = $buildMatch();
+            $next = (new CombatEngine())->attack($fresh, 'alpha-1', 'bravo-1');
+            if ($next->unit('bravo-1')->health === 0) {
+                break;
+            }
+        }
         self::assertSame(0, $next->unit('bravo-1')->health);
         self::assertSame('alpha', $next->winnerTeamId);
         self::assertNull($match->winnerTeamId);
@@ -423,54 +473,168 @@ final class CombatEngineTest extends TestCase
 
     public function testAttackDealsCalculatedOpenTerrainDamage(): void
     {
-        $target = $this->unit('bravo-1', 'bravo', new Position(1, 0), defense: 3);
+        $buildMatch = static function (): MatchState {
-        $match = new MatchState(
+            $target = new UnitState(
-            new Battlefield(8, 8),
+                'bravo-1',
-            [
+                'bravo',
-                $this->unit('alpha-1', 'alpha', new Position(0, 0), attack: 8),
+                new Position(1, 0),
-                $target,
+                10,
-            ],
+                10,
-            'alpha',
+                3,
-        );
+                3,
+                4,
+                2,
+                false,
+            );
+            return new MatchState(
+                new Battlefield(8, 8),
+                [
+                    new UnitState(
+                        'alpha-1',
+                        'alpha',
+                        new Position(0, 0),
+                        10,
+                        10,
+                        8,
+                        2,
+                        4,
+                        2,
+                        false,
+                    ),
+                    $target,
+                ],
+                'alpha',
+            );
+        };
 
-        $next = (new CombatEngine())->attack($match, 'alpha-1', 'bravo-1');
+        // Loop until a non-crit hit lands; the test verifies the base variance on a hit.
-
+        $match = $buildMatch();
-        self::assertSame(10, $target->health);
+        $next = $match;
-        self::assertSame(5, $next->unit('bravo-1')->health);
+        for ($i = 0; $i < 500; $i += 1) {
-        self::assertSame(['alpha-1 attacked bravo-1 for 5 damage'], $next->actionLog);
+            $fresh = $buildMatch();
+            $next = (new CombatEngine())->attack($fresh, 'alpha-1', 'bravo-1');
+            $entry = $next->actionLog[0];
+            if (str_contains($entry, 'for ') && !str_contains($entry, ' — crit') && !str_contains($entry, ' — miss')) {
+                break;
+            }
+        }
+        $damage = 10 - $next->unit('bravo-1')->health;
+        // Base = max(1, 8-3) = 5. Variance 85-115% = 4-6 (rounded).
+        self::assertGreaterThanOrEqual(4, $damage);
+        self::assertLessThanOrEqual(6, $damage);
     }
 
     public function testAttackAlwaysDealsAtLeastOneDamage(): void
     {
-        $match = new MatchState(
+        $buildMatch = static function (): MatchState {
-            new Battlefield(8, 8, ['1:0' => Terrain::Forest]),
+            return new MatchState(
-            [
+                new Battlefield(8, 8, ['1:0' => Terrain::Forest]),
-                $this->unit('alpha-1', 'alpha', new Position(0, 0), attack: 0),
+                [
-                $this->unit('bravo-1', 'bravo', new Position(1, 0), defense: 20),
+                    new UnitState(
-            ],
+                        'alpha-1',
-            'alpha',
+                        'alpha',
-        );
+                        new Position(0, 0),
-
+                        10,
-        $next = (new CombatEngine())->attack($match, 'alpha-1', 'bravo-1');
+                        10,
+                        0,
+                        2,
+                        4,
+                        2,
+                        false,
+                    ),
+                    new UnitState(
+                        'bravo-1',
+                        'bravo',
+                        new Position(1, 0),
+                        10,
+                        10,
+                        3,
+                        20,
+                        4,
+                        2,
+                        false,
+                    ),
+                ],
+                'alpha',
+            );
+        };
 
+        // Loop until a non-crit hit lands; then verify the damage is at least 1.
+        $match = $buildMatch();
+        $next = $match;
+        for ($i = 0; $i < 500; $i += 1) {
+            $fresh = $buildMatch();
+            $next = (new CombatEngine())->attack($fresh, 'alpha-1', 'bravo-1');
+            $entry = $next->actionLog[0];
+            if (str_contains($entry, 'for ') && !str_contains($entry, ' — crit') && !str_contains($entry, ' — miss')) {
+                break;
+            }
+        }
+        // Base = max(1, 0-20-1) = 1. Variance 85-115% rounds to 1.
         self::assertSame(9, $next->unit('bravo-1')->health);
-        self::assertSame(['alpha-1 attacked bravo-1 for 1 damage'], $next->actionLog);
+        self::assertMatchesRegularExpression(
+            '/^alpha-1 attacked bravo-1 \(rolled \d+ \/ needed \d+\) for 1 damage$/',
+            $next->actionLog[0],
+        );
     }
 
     public function testAttackDoesNotAwardVictoryWhileAnotherEnemyLives(): void
     {
-        $match = new MatchState(
+        $buildMatch = static function (): MatchState {
-            new Battlefield(8, 8),
+            return new MatchState(
-            [
+                new Battlefield(8, 8),
-                $this->unit('alpha-1', 'alpha', new Position(0, 0), attack: 20),
+                [
-                $this->unit('bravo-1', 'bravo', new Position(1, 0)),
+                    new UnitState(
-                $this->unit('bravo-2', 'bravo', new Position(7, 7)),
+                        'alpha-1',
-            ],
+                        'alpha',
-            'alpha',
+                        new Position(0, 0),
-        );
+                        10,
-
+                        10,
-        $next = (new CombatEngine())->attack($match, 'alpha-1', 'bravo-1');
+                        20,
+                        2,
+                        4,
+                        2,
+                        false,
+                    ),
+                    new UnitState(
+                        'bravo-1',
+                        'bravo',
+                        new Position(1, 0),
+                        10,
+                        10,
+                        3,
+                        2,
+                        4,
+                        2,
+                        false,
+                    ),
+                    new UnitState(
+                        'bravo-2',
+                        'bravo',
+                        new Position(7, 7),
+                        10,
+                        10,
+                        3,
+                        2,
+                        4,
+                        2,
+                        false,
+                    ),
+                ],
+                'alpha',
+            );
+        };
 
+        // Loop until we find a hit that defeats bravo-1.
+        $match = $buildMatch();
+        $next = $match;
+        for ($i = 0; $i < 200; $i += 1) {
+            $fresh = $buildMatch();
+            $next = (new CombatEngine())->attack($fresh, 'alpha-1', 'bravo-1');
+            if ($next->unit('bravo-1')->health === 0) {
+                break;
+            }
+        }
         self::assertSame(0, $next->unit('bravo-1')->health);
         self::assertSame(10, $next->unit('bravo-2')->health);
         self::assertNull($next->winnerTeamId);
@@ -1036,4 +1200,549 @@ final class CombatEngineTest extends TestCase
         self::assertSame([], $next->objectiveControl);
         self::assertNull($next->winnerTeamId);
     }
+
+    public function testAttackRollsAboveThresholdAndDamageStaysWithinVariance(): void
+    {
+        $buildPayload = static function (): array {
+            $match = new MatchState(
+                new Battlefield(8, 8),
+                [
+                    new UnitState(
+                        'alpha-1',
+                        'alpha',
+                        new Position(0, 0),
+                        10,
+                        10,
+                        10,
+                        0,
+                        4,
+                        2,
+                        false,
+                    ),
+                    new UnitState(
+                        'bravo-1',
+                        'bravo',
+                        new Position(1, 0),
+                        10,
+                        10,
+                        3,
+                        0,
+                        4,
+                        2,
+                        false,
+                    ),
+                ],
+                'alpha',
+            );
+            $matchArray = ScenarioSerializer::matchToArray($match);
+            $matchArray['units'][0]['position'] = ['x' => 0, 'y' => 0]; // alpha-1
+            $matchArray['units'][0]['attack'] = 10;
+            $matchArray['units'][0]['defense'] = 0;
+            $matchArray['units'][1]['position'] = ['x' => 1, 'y' => 0]; // bravo-1 (the target)
+            $matchArray['units'][1]['attack'] = 3;
+            $matchArray['units'][1]['defense'] = 0;
+            $match = ScenarioSerializer::matchFromArray($matchArray);
+
+            return [
+                'match' => $match,
+                'matchArray' => $matchArray,
+            ];
+        };
+
+        $token = TurnToken::issue('s', '0123456789abcdef', 'alpha', 1, 0);
+        $log = null;
+        // Loop until we find a hit; the to-hit roll can miss.
+        for ($i = 0; $i < 200; $i += 1) {
+            $payload = $buildPayload();
+            $req = $this->buildRequest($payload['match'], $token, $this->attackBody($payload['matchArray']));
+            $result = (new PostMatchAttack('s'))->handle($req, []);
+            self::assertSame(200, $result->status);
+            $body = json_decode($result->body, true);
+            $log = $body['match']['actionLog'][0];
+            if (!str_contains($log, ' — miss')) {
+                break;
+            }
+        }
+        self::assertNotNull($log);
+        $pattern = '/^alpha-1 attacked bravo-1 \(rolled \d+ \/ needed \d+\) for \d+ damage( — crit)?$/';
+        self::assertMatchesRegularExpression($pattern, $log);
+        preg_match('/rolled (\d+) \/ needed (\d+)\) for (\d+)/', $log, $m);
+        $threshold = (int) ($m[2] ?? 0);
+        $roll = (int) ($m[1] ?? 0);
+        $damage = (int) ($m[3] ?? 0);
+        self::assertGreaterThanOrEqual(5, $threshold, 'threshold should be at least the floor of 5');
+        self::assertLessThanOrEqual(95, $threshold, 'threshold should be at most the ceiling of 95');
+        self::assertGreaterThanOrEqual(1, $damage);
+    }
+
+    public function testAttackActionLogUsesNewFormat(): void
+    {
+        $match = $this->freshMatch();
+        $matchArray = ScenarioSerializer::matchToArray($match);
+        $matchArray['units'][0]['position'] = ['x' => 0, 'y' => 0];
+        $matchArray['units'][1]['position'] = ['x' => 1, 'y' => 0];
+        $match = ScenarioSerializer::matchFromArray($matchArray);
+
+        $token = TurnToken::issue('s', '0123456789abcdef', 'alpha', 1, 0);
+        $req = $this->buildRequest($match, $token, $this->attackBody($matchArray));
+        $result = (new PostMatchAttack('s'))->handle($req, []);
+        self::assertSame(200, $result->status);
+
+        $body = json_decode($result->body, true);
+        $log = $body['match']['actionLog'];
+        $entry = $log[0];
+        // Has the new shape: "{attacker} attacked {target} (rolled X / needed Y) for Z damage"
+        $pattern = '/^alpha-1 attacked bravo-1 \(rolled \d+ \/ needed \d+\) for \d+ damage( — .+)?$/';
+        self::assertMatchesRegularExpression($pattern, $entry);
+    }
+
+    public function testAttackThresholdFloorsAt5AndCeilingsAt95(): void
+    {
+        // Very low attack vs very high defense: threshold should clamp to 5.
+        $low = $this->buildAttackWithStats(attackerAttack: 1, targetDefense: 20, flanking: 0, terrain: 'open');
+        self::assertGreaterThanOrEqual(5, $low);
+        self::assertLessThanOrEqual(95, $low);
+
+        // Very high attack vs very low defense: threshold should clamp to 95.
+        $high = $this->buildAttackWithStats(attackerAttack: 50, targetDefense: 0, flanking: 0, terrain: 'open');
+        self::assertGreaterThanOrEqual(5, $high);
+        self::assertLessThanOrEqual(95, $high);
+    }
+
+    public function testAttackDamageRollsWithinVarianceBounds(): void
+    {
+        // Run the attack 100 times against an isolated target, recording damage each time.
+        $damages = [];
+        for ($i = 0; $i < 100; $i += 1) {
+            $match = $this->freshMatch();
+            $matchArray = ScenarioSerializer::matchToArray($match);
+            $matchArray['units'][0]['position'] = ['x' => 0, 'y' => 0];
+            $matchArray['units'][0]['attack'] = 5;
+            $matchArray['units'][0]['defense'] = 1;
+            $matchArray['units'][1]['position'] = ['x' => 1, 'y' => 0];
+            $matchArray['units'][1]['attack'] = 3;
+            $matchArray['units'][1]['defense'] = 1;
+            $match = ScenarioSerializer::matchFromArray($matchArray);
+
+            $token = TurnToken::issue('s', '0123456789abcdef', 'alpha', 1, 0);
+            $req = $this->buildRequest($match, $token, $this->attackBody($matchArray));
+            $result = (new PostMatchAttack('s'))->handle($req, []);
+            $body = json_decode($result->body, true);
+            $log = $body['match']['actionLog'];
+            // Skip misses and crits; this test verifies the base variance only.
+            if (str_contains($log[0], ' — miss') || str_contains($log[0], ' — crit')) {
+                continue;
+            }
+            preg_match('/for (\d+) damage/', $log[0], $m);
+            if (isset($m[1])) {
+                $damages[] = (int) $m[1];
+            }
+        }
+        // Filter out misses (damage 0).
+        $damages = array_filter($damages, static fn (int $d): bool => $d > 0);
+        self::assertGreaterThan(0, count($damages), 'at least one hit expected across 100 rolls');
+        // Floor damage: max(1, 5-1) = 4. Variance: 85%-115% of 4 = 3-5.
+        foreach ($damages as $d) {
+            self::assertGreaterThanOrEqual(3, $d);
+            self::assertLessThanOrEqual(5, $d);
+        }
+    }
+
+    public function testAttackCritLogCarriesCritMarker(): void
+    {
+        // We can't easily force a crit from a test (it's a 5% event), so this test
+        // asserts the log-format contract: any attack log entry whose damage is
+        // >= 2x the base expectation is a crit and must carry " — crit".
+        // We force by directly inspecting the CombatEngine internals via a
+        // test helper: roll with a high attack and many trials.
+        $critsSeen = false;
+        for ($i = 0; $i < 200; $i += 1) {
+            $match = $this->freshMatch();
+            $matchArray = ScenarioSerializer::matchToArray($match);
+            $matchArray['units'][0]['position'] = ['x' => 0, 'y' => 0];
+            $matchArray['units'][0]['attack'] = 50;
+            $matchArray['units'][0]['defense'] = 0;
+            $matchArray['units'][1]['position'] = ['x' => 1, 'y' => 0];
+            $matchArray['units'][1]['attack'] = 1;
+            $matchArray['units'][1]['defense'] = 0;
+            $match = ScenarioSerializer::matchFromArray($matchArray);
+
+            $token = TurnToken::issue('s', '0123456789abcdef', 'alpha', 1, 0);
+            $req = $this->buildRequest($match, $token, $this->attackBody($matchArray));
+            $result = (new PostMatchAttack('s'))->handle($req, []);
+            $body = json_decode($result->body, true);
+            $log = $body['match']['actionLog'];
+            if (str_contains($log[0], ' — crit')) {
+                $critsSeen = true;
+                self::assertStringContainsString('(rolled', $log[0]);
+                self::assertStringContainsString('/ needed', $log[0]);
+                break;
+            }
+        }
+        self::assertTrue($critsSeen, 'expected at least one crit in 200 trials of high-attack vs low-defense');
+    }
+
+    public function testAttackCritDamageIsDoubledBeforeVariance(): void
+    {
+        // A crit doubles damage before the variance roll. For attack=10 vs defense=0,
+        // base damage = max(1, 10-0) = 10. Crit damage before variance = 20.
+        // After ±15% variance, the range is 17-23.
+        $crits = [];
+        for ($i = 0; $i < 200; $i += 1) {
+            $match = $this->freshMatch();
+            $matchArray = ScenarioSerializer::matchToArray($match);
+            $matchArray['units'][0]['position'] = ['x' => 0, 'y' => 0];
+            $matchArray['units'][0]['attack'] = 10;
+            $matchArray['units'][0]['defense'] = 0;
+            $matchArray['units'][1]['position'] = ['x' => 1, 'y' => 0];
+            $matchArray['units'][1]['attack'] = 1;
+            $matchArray['units'][1]['defense'] = 0;
+            $match = ScenarioSerializer::matchFromArray($matchArray);
+
+            $token = TurnToken::issue('s', '0123456789abcdef', 'alpha', 1, 0);
+            $req = $this->buildRequest($match, $token, $this->attackBody($matchArray));
+            $result = (new PostMatchAttack('s'))->handle($req, []);
+            $body = json_decode($result->body, true);
+            $log = $body['match']['actionLog'];
+            if (str_contains($log[0], ' — crit')) {
+                preg_match('/for (\d+) damage/', $log[0], $m);
+                $crits[] = (int) $m[1];
+                if (count($crits) >= 5) {
+                    break;
+                }
+            }
+        }
+        self::assertGreaterThan(0, count($crits), 'expected crits in 200 trials');
+        foreach ($crits as $d) {
+            // Base 10 doubled = 20, ±15% = 17-23.
+            self::assertGreaterThanOrEqual(17, $d);
+            self::assertLessThanOrEqual(23, $d);
+        }
+    }
+
+    public function testAttackMissCarriesMissMarker(): void
+    {
+        // Run 200 attacks with low attack vs high defense; expect at least
+        // one miss. The miss log entry must include " — miss".
+        $missSeen = false;
+        for ($i = 0; $i < 200; $i += 1) {
+            $match = $this->freshMatch();
+            $matchArray = ScenarioSerializer::matchToArray($match);
+            $matchArray['units'][0]['position'] = ['x' => 0, 'y' => 0];
+            $matchArray['units'][0]['attack'] = 1;
+            $matchArray['units'][0]['defense'] = 0;
+            $matchArray['units'][1]['position'] = ['x' => 1, 'y' => 0];
+            $matchArray['units'][1]['attack'] = 1;
+            $matchArray['units'][1]['defense'] = 20;
+            $match = ScenarioSerializer::matchFromArray($matchArray);
+
+            $token = TurnToken::issue('s', '0123456789abcdef', 'alpha', 1, 0);
+            $req = $this->buildRequest($match, $token, $this->attackBody($matchArray));
+            $result = (new PostMatchAttack('s'))->handle($req, []);
+            $body = json_decode($result->body, true);
+            $log = $body['match']['actionLog'];
+            if (str_contains($log[0], ' — miss') && !str_contains($log[0], ' — crit')) {
+                $missSeen = true;
+                preg_match('/for (\d+) damage/', $log[0], $m);
+                self::assertSame('0', $m[1], 'miss should record 0 damage');
+                break;
+            }
+        }
+        self::assertTrue($missSeen, 'expected at least one miss in 200 trials of low-attack vs high-defense');
+    }
+
+    /** @return int */
+    private function buildAttackWithStats(int $attackerAttack, int $targetDefense, int $flanking, string $terrain): int
+    {
+        // Returns the to-hit threshold the engine computes for the given stats.
+        // We compute it locally and assert it's in the [5, 95] range.
+        $threshold = CombatEngine::TO_HIT_BASE
+            + ($attackerAttack * CombatEngine::TO_HIT_PER_ATTACK)
+            - $targetDefense
+            - $flanking;
+        if ($threshold < CombatEngine::TO_HIT_FLOOR) {
+            $threshold = CombatEngine::TO_HIT_FLOOR;
+        }
+        if ($threshold > CombatEngine::TO_HIT_CEILING) {
+            $threshold = CombatEngine::TO_HIT_CEILING;
+        }
+        return $threshold;
+    }
+
+    /** @param array<string, mixed> $body */
+    private function buildRequest(MatchState $match, string $token, array $body): \BattleForge\Http\Request
+    {
+        [$csrf, $cookie] = CsrfToken::issue('s');
+        return new \BattleForge\Http\Request(
+            get: [],
+            post: [],
+            files: [],
+            cookies: ['__csrf' => $cookie, '__csrf_token' => $token],
+            server: [
+                'HTTP_X_CSRF_TOKEN' => $csrf,
+                'HTTP_X_TURN_TOKEN' => $token,
+                '__csrf_secret' => 's',
+                'CONTENT_TYPE' => 'application/json',
+            ],
+            queryString: '',
+            method: 'POST',
+            path: '/matches/current/attack',
+            contentType: 'application/json',
+            rawBody: json_encode($body, JSON_THROW_ON_ERROR),
+        );
+    }
+
+    /**
+     * @param array<string, mixed> $matchArray
+     * @return array<string, mixed>
+     */
+    private function attackBody(array $matchArray): array
+    {
+        return [
+            'matchId' => '0123456789abcdef',
+            'match' => $matchArray,
+            'attackerId' => 'alpha-1',
+            'targetId' => 'bravo-1',
+        ];
+    }
+
+    private function freshMatch(): MatchState
+    {
+        return new MatchState(
+            new Battlefield(8, 8),
+            [
+                $this->unit('alpha-1', 'alpha', new Position(0, 0)),
+                $this->unit('bravo-1', 'bravo', new Position(1, 0)),
+            ],
+            'alpha',
+        );
+    }
+
+    public function testFlankingBonusFromOneOrthogonalAlly(): void
+    {
+        // Build a match: attacker alpha-1 at (0, 0), target bravo-1 at (0, 1),
+        // ally alpha-2 at (1, 1) (orthogonal to target), and bravo-2 filler at (2, 0).
+        // One orthogonal ally should produce a flanking bonus of +15, so the
+        // to-hit threshold becomes 40 + 3*attack - defense - 15 = 34.
+        $counts = [];
+        for ($i = 0; $i < 200; $i += 1) {
+            $match = $this->freshMatch();
+            $matchArray = ScenarioSerializer::matchToArray($match);
+            $matchArray['units'][0]['position'] = ['x' => 0, 'y' => 0];
+            $matchArray['units'][0]['attack'] = 3;
+            $matchArray['units'][0]['defense'] = 0;
+            // Rename the existing bravo-1 (units[1]) to alpha-2 and move it to (1, 1).
+            $matchArray['units'][1]['id'] = 'alpha-2';
+            $matchArray['units'][1]['teamId'] = 'alpha';
+            $matchArray['units'][1]['position'] = ['x' => 1, 'y' => 1];
+            // Insert bravo-1 as the target at (0, 1) by copying the alpha-2 row above.
+            $matchArray['units'][2] = $matchArray['units'][1];
+            $matchArray['units'][2]['id'] = 'bravo-1';
+            $matchArray['units'][2]['teamId'] = 'bravo';
+            $matchArray['units'][2]['position'] = ['x' => 0, 'y' => 1];
+            $matchArray['units'][2]['defense'] = 0; // brief's threshold 34 requires target defense = 0
+            // Add bravo-2 as a far-away filler so the match has two full teams.
+            $matchArray['units'][3] = $matchArray['units'][1];
+            $matchArray['units'][3]['id'] = 'bravo-2';
+            $matchArray['units'][3]['teamId'] = 'bravo';
+            $matchArray['units'][3]['position'] = ['x' => 2, 'y' => 0];
+            $match = ScenarioSerializer::matchFromArray($matchArray);
+
+            $token = TurnToken::issue('s', '0123456789abcdef', 'alpha', 1, 0);
+            $req = $this->buildRequest($match, $token, [
+                'matchId' => '0123456789abcdef',
+                'match' => $matchArray,
+                'attackerId' => 'alpha-1',
+                'targetId' => 'bravo-1',
+            ]);
+            $result = (new PostMatchAttack('s'))->handle($req, []);
+            $body = json_decode($result->body, true);
+            $log = $body['match']['actionLog'];
+            if (preg_match('/\/ needed (\d+)\)/', $log[0], $m)) {
+                $counts[] = (int) $m[1];
+            }
+        }
+        $unique = array_unique($counts);
+        self::assertContains(34, $unique, 'one ally should produce a threshold of 34');
+    }
+
+    public function testFlankingDiagonalsDoNotContribute(): void
+    {
+        // Same setup as testFlankingBonusFromOneOrthogonalAlly, but the ally sits at (1, 2),
+        // which is diagonal to the target bravo-1 at (0, 1). Diagonal neighbours should
+        // not contribute, so the flanking bonus is 0 and the threshold stays at 40 + 9 - 0 = 49.
+        $counts = [];
+        for ($i = 0; $i < 100; $i += 1) {
+            $match = $this->freshMatch();
+            $matchArray = ScenarioSerializer::matchToArray($match);
+            $matchArray['units'][0]['position'] = ['x' => 0, 'y' => 0];
+            $matchArray['units'][0]['attack'] = 3;
+            $matchArray['units'][0]['defense'] = 0;
+            $matchArray['units'][1]['id'] = 'alpha-2';
+            $matchArray['units'][1]['teamId'] = 'alpha';
+            $matchArray['units'][1]['position'] = ['x' => 1, 'y' => 2]; // diagonal "ally"
+            $matchArray['units'][2] = $matchArray['units'][1];
+            $matchArray['units'][2]['id'] = 'bravo-1';
+            $matchArray['units'][2]['teamId'] = 'bravo';
+            $matchArray['units'][2]['position'] = ['x' => 0, 'y' => 1];
+            $matchArray['units'][2]['defense'] = 0; // target -- brief's threshold 49 requires target defense = 0
+            $matchArray['units'][3] = $matchArray['units'][1];
+            $matchArray['units'][3]['id'] = 'bravo-2';
+            $matchArray['units'][3]['teamId'] = 'bravo';
+            $matchArray['units'][3]['position'] = ['x' => 2, 'y' => 0];
+            $match = ScenarioSerializer::matchFromArray($matchArray);
+
+            $token = TurnToken::issue('s', '0123456789abcdef', 'alpha', 1, 0);
+            $req = $this->buildRequest($match, $token, [
+                'matchId' => '0123456789abcdef',
+                'match' => $matchArray,
+                'attackerId' => 'alpha-1',
+                'targetId' => 'bravo-1',
+            ]);
+            $result = (new PostMatchAttack('s'))->handle($req, []);
+            $body = json_decode($result->body, true);
+            $log = $body['match']['actionLog'];
+            if (preg_match('/\/ needed (\d+)\)/', $log[0], $m)) {
+                $counts[] = (int) $m[1];
+            }
+        }
+        $unique = array_unique($counts);
+        self::assertContains(49, $unique, 'no orthogonal ally should produce threshold of 40 + 9 - 0 = 49');
+    }
+
+    public function testFlankingCapsAt30WithThreeOrMoreAllies(): void
+    {
+        // Three orthogonal allies should still cap at +30, not produce +45.
+        // Layout (all coordinates on the 8x8 grid):
+        //   alpha-1 (attacker) at (1, 0)
+        //   bravo-1 (target)    at (1, 1)
+        //   alpha-2 (ally 1)    at (0, 1)  -- orthogonal (left)
+        //   alpha-3 (ally 2)    at (2, 1)  -- orthogonal (right)
+        //   alpha-4 (ally 3)    at (1, 2)  -- orthogonal (down)
+        // Three orthogonal allies => flanking bonus min(3 * 15, 30) = 30,
+        // threshold = 40 + 9 - 0 - 30 = 19.
+        $counts = [];
+        for ($i = 0; $i < 50; $i += 1) {
+            $match = $this->freshMatch();
+            $matchArray = ScenarioSerializer::matchToArray($match);
+            $matchArray['units'][0]['position'] = ['x' => 1, 'y' => 0];
+            $matchArray['units'][0]['attack'] = 3;
+            $matchArray['units'][0]['defense'] = 0;
+            $matchArray['units'][1]['id'] = 'alpha-2';
+            $matchArray['units'][1]['teamId'] = 'alpha';
+            $matchArray['units'][1]['position'] = ['x' => 0, 'y' => 1]; // ally 1 (orthogonal)
+            $matchArray['units'][2] = $matchArray['units'][1];
+            $matchArray['units'][2]['id'] = 'bravo-1';
+            $matchArray['units'][2]['teamId'] = 'bravo';
+            $matchArray['units'][2]['position'] = ['x' => 1, 'y' => 1]; // target
+            $matchArray['units'][2]['defense'] = 0; // brief's threshold 19 requires target defense = 0
+            $matchArray['units'][3] = $matchArray['units'][1];
+            $matchArray['units'][3]['id'] = 'alpha-3';
+            $matchArray['units'][3]['teamId'] = 'alpha';
+            $matchArray['units'][3]['position'] = ['x' => 2, 'y' => 1]; // ally 2 (orthogonal)
+            $matchArray['units'][4] = $matchArray['units'][1];
+            $matchArray['units'][4]['id'] = 'alpha-4';
+            $matchArray['units'][4]['teamId'] = 'alpha';
+            $matchArray['units'][4]['position'] = ['x' => 1, 'y' => 2]; // ally 3 (orthogonal)
+            $match = ScenarioSerializer::matchFromArray($matchArray);
+
+            $token = TurnToken::issue('s', '0123456789abcdef', 'alpha', 1, 0);
+            $req = $this->buildRequest($match, $token, [
+                'matchId' => '0123456789abcdef',
+                'match' => $matchArray,
+                'attackerId' => 'alpha-1',
+                'targetId' => 'bravo-1',
+            ]);
+            $result = (new PostMatchAttack('s'))->handle($req, []);
+            $body = json_decode($result->body, true);
+            $log = $body['match']['actionLog'];
+            if (preg_match('/\/ needed (\d+)\)/', $log[0], $m)) {
+                $counts[] = (int) $m[1];
+            }
+        }
+        $unique = array_unique($counts);
+        self::assertContains(19, $unique, 'three allies should cap at +30 flanking, threshold 19');
+        self::assertNotContains(4, $unique, 'flanking should not exceed +30');
+    }
+
+    public function testAttackForestDefenderCarriesConcealedMissOnLowRoll(): void
+    {
+        // Force a concealment miss: target is on forest. Run 200 attacks; the
+        // engine rolls the concealment die; we observe at least one log entry
+        // containing " — miss — concealed" and confirm the damage is 0.
+        $concealSeen = false;
+        for ($i = 0; $i < 200; $i += 1) {
+            $match = $this->freshMatch();
+            $matchArray = ScenarioSerializer::matchToArray($match);
+            $matchArray['units'][0]['position'] = ['x' => 0, 'y' => 0];
+            $matchArray['units'][0]['attack'] = 3;
+            $matchArray['units'][0]['defense'] = 0;
+            $matchArray['units'][1]['position'] = ['x' => 1, 'y' => 0];
+            $matchArray['units'][1]['attack'] = 1;
+            $matchArray['units'][1]['defense'] = 1;
+            // (no-op, kept for clarity)
+            $match = ScenarioSerializer::matchFromArray($matchArray);
+            // Stamp forest terrain on the target's tile.
+            $matchArray['battlefield']['terrain'] = ['1:0' => 'forest'];
+            $match = ScenarioSerializer::matchFromArray($matchArray);
+
+            // Brief uses 'm' for matchId; TurnToken requires 16+ lowercase hex chars.
+            // Use a valid matchId (the smallest deviation).
+            $matchId = '0123456789abcdef';
+            $token = TurnToken::issue('s', $matchId, 'alpha', 1, 0);
+            $req = $this->buildRequest($match, $token, [
+                'matchId' => $matchId,
+                'match' => $matchArray,
+                'attackerId' => 'alpha-1',
+                'targetId' => 'bravo-1',
+            ]);
+            $result = (new PostMatchAttack('s'))->handle($req, []);
+            $body = json_decode($result->body, true);
+            $log = $body['match']['actionLog'];
+            if (str_contains($log[0], ' — miss — concealed')) {
+                $concealSeen = true;
+                preg_match('/for (\d+) damage/', $log[0], $m);
+                self::assertSame('0', $m[1], 'concealed miss should record 0 damage');
+                break;
+            }
+        }
+        self::assertTrue($concealSeen, 'expected at least one concealed miss in 200 trials against a forest defender');
+    }
+
+    public function testAttackNonForestTerrainDoesNotRollConcealment(): void
+    {
+        // Same as above but target is on rough terrain (cost 2, no concealment).
+        // No log entry should contain " — concealed" in 200 trials.
+        $concealSeen = false;
+        for ($i = 0; $i < 200; $i += 1) {
+            $match = $this->freshMatch();
+            $matchArray = ScenarioSerializer::matchToArray($match);
+            $matchArray['units'][0]['position'] = ['x' => 0, 'y' => 0];
+            $matchArray['units'][0]['attack'] = 3;
+            $matchArray['units'][0]['defense'] = 0;
+            $matchArray['units'][1]['position'] = ['x' => 1, 'y' => 0];
+            $matchArray['units'][1]['attack'] = 1;
+            $matchArray['units'][1]['defense'] = 1;
+            $match = ScenarioSerializer::matchFromArray($matchArray);
+            $matchArray['battlefield']['terrain'] = ['1:0' => 'rough'];
+            $match = ScenarioSerializer::matchFromArray($matchArray);
+
+            $matchId = '0123456789abcdef';
+            $token = TurnToken::issue('s', $matchId, 'alpha', 1, 0);
+            $req = $this->buildRequest($match, $token, [
+                'matchId' => $matchId,
+                'match' => $matchArray,
+                'attackerId' => 'alpha-1',
+                'targetId' => 'bravo-1',
+            ]);
+            $result = (new PostMatchAttack('s'))->handle($req, []);
+            $body = json_decode($result->body, true);
+            $log = $body['match']['actionLog'];
+            if (str_contains($log[0], ' — concealed')) {
+                $concealSeen = true;
+                break;
+            }
+        }
+        self::assertFalse($concealSeen, 'rough terrain should never produce a concealed-miss log entry');
+    }
 }

tests/Unit/Domain/MatchStateTest.php

@@ -56,7 +56,6 @@ final class MatchStateTest extends TestCase
      */
     public static function impassableTerrainProvider(): iterable
     {
-        yield 'water' => [Terrain::Water];
         yield 'blocking' => [Terrain::Blocking];
     }
 

tests/Unit/Domain/ScenarioValidatorTest.php

@@ -28,7 +28,7 @@ final class ScenarioValidatorTest extends TestCase
     public function testItRejectsAnObjectiveOnImpassableTerrain(): void
     {
         $scenario = $this->validScenario(
-            terrain: ['4:4' => Terrain::Water],
+            terrain: ['4:4' => Terrain::Blocking],
             objectivePosition: new Position(4, 4),
         );
 
@@ -81,7 +81,7 @@ final class ScenarioValidatorTest extends TestCase
     public function testItRejectsDeploymentPositionsOnImpassableTerrain(): void
     {
         $units = $this->unitSet();
-        $battlefield = new Battlefield(8, 8, ['0:0' => Terrain::Water]);
+        $battlefield = new Battlefield(8, 8, ['0:0' => Terrain::Blocking]);
         $scenario = new Scenario(
             id: 'demo',
             name: 'Demo',

tests/Unit/Domain/TerrainTest.php

@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BattleForge\Tests\Unit\Domain;
+
+use BattleForge\Domain\Terrain;
+use PHPUnit\Framework\TestCase;
+
+final class TerrainTest extends TestCase
+{
+    public function testOpenCostsOne(): void
+    {
+        self::assertSame(1, Terrain::Open->movementCost());
+        self::assertSame(0, Terrain::Open->defenseBonus());
+    }
+
+    public function testForestCostsTwoAndGivesOneDefense(): void
+    {
+        self::assertSame(2, Terrain::Forest->movementCost());
+        self::assertSame(1, Terrain::Forest->defenseBonus());
+    }
+
+    public function testRoughCostsTwoAndGivesNoDefense(): void
+    {
+        self::assertSame(2, Terrain::Rough->movementCost());
+        self::assertSame(0, Terrain::Rough->defenseBonus());
+    }
+
+    public function testWaterCostsThreeAndGivesNoDefense(): void
+    {
+        self::assertSame(3, Terrain::Water->movementCost());
+        self::assertSame(0, Terrain::Water->defenseBonus());
+    }
+
+    public function testBlockingIsImpassable(): void
+    {
+        self::assertNull(Terrain::Blocking->movementCost());
+    }
+}

tests/Unit/Domain/UnitStateTest.php

@@ -229,12 +229,32 @@ final class UnitStateTest extends TestCase
         self::assertFalse($started->hasUsedAbility);
     }
 
+    public function testStartTurnResetsWadedFlag(): void
+    {
+        $unit = $this->unit(wadedThisTurn: true);
+        $started = $unit->startTurn();
+        self::assertFalse($started->wadedThisTurn);
+    }
+
+    public function testWithWadedSetsAndClearsFlag(): void
+    {
+        $unit = $this->unit();
+        self::assertFalse($unit->wadedThisTurn);
+
+        $wading = $unit->withWaded(true);
+        self::assertTrue($wading->wadedThisTurn);
+
+        $dry = $wading->withWaded(false);
+        self::assertFalse($dry->wadedThisTurn);
+    }
+
     private function unit(
         int $health = 10,
         int $actionsRemaining = 2,
         bool $hasAttacked = false,
         int $attackBonus = 0,
         bool $hasUsedAbility = false,
+        bool $wadedThisTurn = false,
     ): UnitState {
         return new UnitState(
             'unit-1',

tests/Unit/Http/MatchActionSupportTest.php

@@ -0,0 +1,184 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BattleForge\Tests\Unit\Http;
+
+use BattleForge\Application\TurnToken;
+use BattleForge\Domain\Archetype;
+use BattleForge\Domain\Battlefield;
+use BattleForge\Domain\MatchState;
+use BattleForge\Domain\Position;
+use BattleForge\Domain\UnitState;
+use BattleForge\Http\CsrfToken;
+use BattleForge\Http\MatchActionSupport;
+use BattleForge\Http\Request;
+use PHPUnit\Framework\TestCase;
+
+final class MatchActionSupportTest extends TestCase
+{
+    private const SECRET = 'support-test-secret';
+
+    public function testItRejectsARequestWithAMissingCsrfToken(): void
+    {
+        $support = new MatchActionSupport(self::SECRET);
+        $request = $this->buildRequest(
+            match: $this->validMatchArray(),
+            csrf: '',
+            turnToken: 'irrelevant',
+        );
+
+        $result = $support->verify($request);
+
+        self::assertNotNull($result->response);
+        self::assertSame(403, $result->response->status);
+        self::assertNull($result->matchIdAndMatch);
+    }
+
+    public function testItRejectsARequestWithABadTurnToken(): void
+    {
+        [$csrf, $cookie] = CsrfToken::issue(self::SECRET);
+        $match = $this->validMatch();
+        $matchId = '0123456789abcdef';
+        $badToken = TurnToken::issue(self::SECRET, $matchId, 'bravo', 1, 0);
+
+        $support = new MatchActionSupport(self::SECRET);
+        $request = $this->buildRequest(
+            match: $this->validMatchArray(),
+            csrf: $csrf,
+            turnToken: $badToken,
+            cookies: ['__csrf' => $cookie, '__csrf_token' => $token],
+        );
+
+        $result = $support->verify($request);
+
+        self::assertNotNull($result->response);
+        self::assertSame(409, $result->response->status);
+        $body = json_decode($result->response->body, true);
+        self::assertSame('turn', $body['error'] ?? null);
+    }
+
+    public function testItRejectsAMalformedMatchState(): void
+    {
+        [$csrf, $cookie] = CsrfToken::issue(self::SECRET);
+        $support = new MatchActionSupport(self::SECRET);
+        $request = $this->buildRequest(
+            match: ['this' => 'is not a match'],
+            csrf: $csrf,
+            turnToken: 'whatever',
+            cookies: ['__csrf' => $cookie, '__csrf_token' => $token],
+        );
+
+        $result = $support->verify($request);
+
+        self::assertNotNull($result->response);
+        self::assertSame(400, $result->response->status);
+    }
+
+    public function testItReturnsTheValidatedPairForAValidRequest(): void
+    {
+        $match = $this->validMatch();
+        $matchArray = $this->validMatchArray();
+        $matchId = '0123456789abcdef';
+        $token = TurnToken::issue(
+            self::SECRET,
+            $matchId,
+            $match->activeTeamId,
+            $match->round,
+            count($match->actionLog)
+        );
+        [$csrf, $cookie] = CsrfToken::issue(self::SECRET);
+
+        $support = new MatchActionSupport(self::SECRET);
+        $body = json_encode(['matchId' => $matchId, 'match' => $matchArray], JSON_THROW_ON_ERROR);
+        $request = new Request(
+            [],
+            [],
+            [],
+            ['__csrf' => $cookie],
+            [
+                'HTTP_X_CSRF_TOKEN' => $csrf,
+                'HTTP_X_TURN_TOKEN' => $token,
+                '__csrf_secret' => self::SECRET,
+                'CONTENT_TYPE' => 'application/json',
+            ],
+            '',
+            'POST',
+            '/matches/current/move',
+            'application/json',
+            $body
+        );
+
+        $result = $support->verify($request);
+
+        self::assertNull($result->response);
+        self::assertNotNull($result->matchIdAndMatch);
+        self::assertSame($matchId, $result->matchIdAndMatch['matchId']);
+        self::assertInstanceOf(MatchState::class, $result->matchIdAndMatch['match']);
+    }
+
+    private function validMatch(): MatchState
+    {
+        return new MatchState(
+            new Battlefield(8, 8),
+            [
+                $this->makeUnit('alpha-1', 'alpha', 0, 0, Archetype::Defender),
+                $this->makeUnit('alpha-2', 'alpha', 1, 0, Archetype::Defender),
+                $this->makeUnit('alpha-3', 'alpha', 2, 0, Archetype::Defender),
+                $this->makeUnit('bravo-1', 'bravo', 7, 7, Archetype::Striker),
+                $this->makeUnit('bravo-2', 'bravo', 6, 7, Archetype::Striker),
+                $this->makeUnit('bravo-3', 'bravo', 5, 7, Archetype::Striker),
+            ],
+            'alpha',
+        );
+    }
+
+    private function makeUnit(string $id, string $teamId, int $x, int $y, Archetype $archetype): UnitState
+    {
+        return new UnitState(
+            $id,
+            $teamId,
+            new Position($x, $y),
+            10,
+            10,
+            3,
+            3,
+            2,
+            2,
+            false,
+            $archetype,
+        );
+    }
+
+    /** @return array<string, mixed> */
+    private function validMatchArray(): array
+    {
+        return \BattleForge\Application\ScenarioSerializer::matchToArray($this->validMatch());
+    }
+
+    /**
+     * @param array<string, mixed> $match
+     * @param array<string, string> $cookies
+     */
+    private function buildRequest(array $match, string $csrf, string $turnToken, array $cookies = []): Request
+    {
+        $body = json_encode(['matchId' => '0123456789abcdef', 'match' => $match], JSON_THROW_ON_ERROR);
+        return new Request(
+            [],
+            [],
+            [],
+            $cookies,
+            [
+                'HTTP_X_CSRF_TOKEN' => $csrf,
+                'HTTP_X_TURN_TOKEN' => $turnToken,
+                '__csrf_secret' => self::SECRET,
+                'CONTENT_TYPE' => 'application/json',
+            ],
+            '',
+            'POST',
+            '/matches/current/move',
+            'application/json',
+            $body
+        );
+    }
+}