v0.4.9g — a caboose is not a load, a Day that says it ended, and a train you may throw away

The v0.7.1 bugfix set ported to the playtest line: Gitea#8, #10, #9 and #2. Reasoning, and what
differs from main, in CHANGELOG.md.

- Gitea#8: X22 Pee-Dee refused every caboose, including the one it was made up with. A caboose
  carries the crew, not freight, so it is never a load.
- Gitea#10: a dialog when the Day rolls over, carrying the standings, the Days left and your Revenue
  against the target with the pace. Suppressed on the first frame, on Undo stepping back across a
  rollover, and on the Day the game ends.
- Gitea#9, superseding Gitea#6 from v0.4.9f: a Timetabled train may be discarded, an Extra may not.
  This line takes the plain rule — main has it as a New Game setting.
- Gitea#2: the shortage stays, by Jesse's ruling. A blocked platform now gives its reason instead of
  simply having no button.

Three things are written for this line rather than ported: the Timetabled discard has no setting and
no URL parameter, the Day-end dialog reads f.objective (this line's per-player target) where main
reads its combined victory dials, and Frame gained the viewer index the dialog needs to mark your
row. 636 tests pass; no published replay was retired.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01FLnYR4XtXQNamYJXGYT8oC

.gitignore

@@ -15,7 +15,6 @@ Thumbs.db
 # "tsc: not found" and 20 tests failed for a reason that had nothing to do with the code.
 node_modules
 dist/
-dist-test/
 build/
 target/
 __pycache__/
@@ -41,18 +40,3 @@ __pycache__/
 # website's replay viewer. It was therefore never committed, and a fresh clone was missing a page
 # the build copies unconditionally. Only the throwaway files this directory collects are ignored.
 /replay*.html
-
-# Playtest saves — somebody's game, attached to a bug report.
-#
-# ANCHORED, and with the README exempted: the directory has to exist and say what it is for, while
-# nothing that lands in it is ever committed. A save is a seed plus the moves made, it belongs to
-# whoever sent it, and it goes stale the moment the rules move. `public/replays/` is the place for
-# one that is worth publishing.
-/playtests/*
-!/playtests/README.md
-
-# The Jitsi harness is NOT scrubbed — four of its files carry a real domain and real
-# participant names (workspace AGENTS.local.md). Ignored so that a `git add -A` cannot sweep it
-# into a history that would be permanently exposed if this repo is ever made public. When it is
-# promoted in Phase 1, scrub it FIRST, then `git add -f tools/`.
-tools/

README.md

@@ -10,69 +10,29 @@ train into an occupied Subdivision. Get that wrong and two trains meet at speed.
 
 ## Status
 
-**Solitaire is playable in a browser and multiplayer runs against a server.** The solitaire game runs
-entirely client-side — the engine is pure, imports nothing outside itself, and never touches
-`Math.random`, so a static host is all it needs. Multiplayer adds an authoritative server for the
-seats a shared game requires.
+**v0.4.8 — solitaire is playable in a browser.** The whole game runs client-side: the engine is pure,
+imports nothing outside itself, and never touches `Math.random`, so a static host is all it needs.
 
-The current version is in [`package.json`](package.json), and every page stamps it with the commit
-and build date, so what is deployed can always be identified from the page itself. This section
-deliberately no longer names one: it went stale for six releases.
-
-- **Rules** — specified. Thirteen gaps in the original prototype rules were found and closed, and the
-  three that came after were all settled in v0.5.0: a coach may be set out at the Office (§A.4),
-  Poling stays out of the deck at zero copies since the source records its effect only as "TBD", and
-  **a Heavy Grade's orientation is rolled from the seed, never chosen by a player** — see
-  [`docs/rules/implications.md`](docs/rules/implications.md) §10 for each ruling and its reasoning.
+- **Rules** — specified, with **three open questions** left. Thirteen gaps in the original prototype
+  rules were found and closed; three more came after, and are in `TODO.md`: where the Local's coach
+  stands while its engine works (a §A.4 question), Poling — the one card in the deck with no defined
+  behaviour — and whether a Heavy Grade's orientation is rolled or chosen at setup.
 - **Card faces** — every card's printed values specified.
 - **Architecture** — seven documents, including a 20-component build plan and the multiplayer plan.
-- **Code** — the engine, the bot, the balance harness, the replay viewer, the playable page, and the
-  server. A game can be saved, shared, replayed and stepped back through.
-- **Multiplayer — built and running.** `src/server/` serves a lobby (create, join, preview, leave,
-  add a bot, start, and a stream), turn submission, per-session state and persistence, with its own
-  tests under `test/server/`. Games survive a release rather than being destroyed by one. A player
-  weighing a join reads the **whole rule set before taking a seat**; a seat survives a browser
-  reload; anybody may leave and the host may clear a chair; and the four transient signals that make
-  a game feel alive — sound, the timetable flash, an announcement, the badge on the card you just
-  drew — reach a remote client, which they did not before v0.7.0. What is still open is in `TODO.md`
-  under Multiplayer — chiefly that a lost
-  session token still locks someone out of a running game from a genuinely fresh browser.
-- **Watching the table — v0.8.0.** Every accepted move, and every automatic phase that does
-  anything, becomes an ordered **presentation step**: the board replays other people's turns instead
-  of arriving already rearranged. This is what closes "a player cannot see what the others did",
-  which stood open through v0.7.x. A bot's whole switching turn used to land in one push, because
-  `driveBots()` plays it out before the push goes back; now it arrives as a run of steps, the
-  district panel follows whoever is acting, and a `[N behind] … [Skip]` row says how far the board is
-  from the game. Dwell is assigned **by kind** — a switching move holds the screen, turn bookkeeping
-  costs nothing — and is tunable per viewer without a rebuild. Solitaire runs the same path, which is
-  where its automatic phases finally get a visible beat.
+- **Code** — the engine, the bot, the balance harness, the replay viewer and the playable page. A
+  game can be saved, shared, replayed and stepped back through.
+- **Not built** — the multiplayer server (Phases 0 and 1 of the plan are done: seat and player are
+  separate, turn state is per player, and the page talks to a `Session` rather than to the engine, so
+  a remote one drops in without the page changing — but there is no server, no turn submission and no
+  per-player push), the 22 opponent-directed cards, and real audio.
 
-  **The caption and the history panel are not the same list**, since 2026-09-17. Switching is logged
-  in full; a move from the middle of a turn writes its line as tone `trace`, so the step still
-  carries it — the board captions the move and earns its dwell, and `dwellForStep` pays nothing for a
-  step that said nothing — while the history panel filters the tone out. What the panel draws is the
-  line saying somebody switched, the FIRST move, work at an **industry**, the Small Yard sort, and a
-  closing summary. The last move rides in that summary rather than being kept in place: nothing knows
-  a move was the last until the turn is over, by which time the line has been written and streamed to
-  every client, so it cannot be revised.
-  **Not yet checked in a browser:** the mechanism is proven server-side against a live SSE stream and
-  the page is proven not to throw, but nobody has watched a bot switch on screen.
-- **Not built** — the opponent-directed cards (the Action and Space-use categories, held out of every
-  deck until they have an implementation, along with the defensive cards whose only purpose is to
-  answer them), and real audio. No screen offers a control for the opponent cards any more: the
-  toggle could not do anything, so both screens state the fact in words instead.
-
-Balance is *not* where it should be, and this file no longer quotes a figure for it. It used to say
-"the developer bot averages 7.0 Revenue against a target of 20", which stopped being true the moment
-the transit rule it names was defaulted to off — that rule was worth ~5.4 of the 7.0, for traffic
-nobody had to work. Measured at the current defaults the bot meant about **zero** until it began
-planning its switching turns (2026-09-14), which put it near **2.8**.
-
-The three rates — passenger per coach, freight per load, train per transit — are **settings fixed when
-the game is dealt**, along with the opening hand and where an Extra may start, so the economy can be
-read on its own and the alternatives played rather than argued about. Run
-`node src/sim/harness.ts 400 standard` for today's number rather than trusting one written here;
-`TODO.md` says which of the gap is the bot and which is the deck.
+Balance is *not* where it should be: the developer bot averaged 7.0 Revenue against a target of 20 —
+of which ~5.4 was the "one Revenue per train that completes its run" rule, so the working freight and
+passenger economy is still only ~2. That rule is now a **setting that defaults to off**, along with
+the passenger and freight rates and the opening hand, so the economy can be read on its own and the
+alternatives can be played rather than argued about. Nothing in this file or in `TODO.md` has been
+re-measured at the new defaults; `TODO.md` says why, and says which of it is the bot and which is the
+deck.
 
 Versions follow the convention at the top of [`CHANGELOG.md`](CHANGELOG.md): third digit for fixes,
 second for a set of features, 1.0 for the first release that deserves the name.
@@ -86,18 +46,14 @@ station-master/
 ├── docs/
 │   ├── rules/          ← the ruleset, card reference, glossary, decision record
 │   ├── architecture/   ← how it is built, and what the pieces are
-│   ├── plans/          ← worked plans for a single change, kept for the reasoning
 │   └── design/         ← board layout studies and rendering samples
-├── public/
-│   ├── replays/        ← saved games published to the site's replay directory
-│   └── images/         ← art the build copies into the site
+├── public/replays/     ← saved games published to the site's replay directory
 ├── scripts/            ← build and deploy the static site
 ├── src/
 │   ├── engine/         ← pure rules engine: no I/O, no clock, deterministic from a seed
-│   ├── server/         ← the authoritative multiplayer server: lobby, sessions, persistence
 │   ├── sim/            ← bot, harness, replay, board rendering
-│   └── web/            ← the playable site: splash, game, lobby, replay viewer
-└── test/               ← including test/server/ for the server's own suite
+│   └── web/            ← the playable site: splash, game, replay viewer
+└── test/
 ```
 
 Start with [`docs/design.md`](docs/design.md) — it indexes everything. Commit messages stay high
@@ -106,14 +62,11 @@ level; [`CHANGELOG.md`](CHANGELOG.md) carries the reasoning and the measurements
 
 ## Development
 
-Requires **Node 22.18+**, which runs TypeScript directly by type stripping — so there is no compile
-step, and the engine, the bot and the tests all run straight from source. (`npm run build:web` is a
-separate thing: it assembles the static SITE into `dist/`.)
+Requires **Node 22.18+**, which runs TypeScript directly by type stripping. There is no build step.
 
 ```sh
 npm install
-npm test          # node --test, everything except the bot simulations — run after every change
-npm run test:sim  # test/sim.test.ts, the bot simulations (~7 min) — run after a bot or balance change
+npm test          # node --test
 npm run typecheck # tsc --noEmit
 ```
 
@@ -151,68 +104,16 @@ is the thing this machinery exists to prevent.
   `fromSave` replays it exactly — that one property gives save, share, undo, restart recovery and
   post-game replay. Events are a DERIVED stream: they narrate what happened and drive the display,
   and they do not reconstruct the position. The phase driver mutates state and then describes it, so
-  roughly a third of the event types are never reduced at all. Anything that needs to rebuild a game
+  fourteen of the forty-six event types are never reduced. Anything that needs to rebuild a game
   replays the intents.
-- **A save is only guaranteed to replay on the version that wrote it.** This is the cost of the
-  property above and is not a bug to be fixed case by case: a save is a list of moves, so it reopens
-  by being *re-played through the current rules*. Any rules change that makes a once-legal move
-  illegal will stop an older save at that move — **a change to the deck is the likeliest breaker**,
-  since a history that names a card the deck no longer deals has no legal answer at all, but any
-  narrowing of what is permitted does it. It fails safe in every case: the load is declined, the
-  offending move is named, and the file is left untouched, so nothing a player has is destroyed.
-  Assume an older save may not open, tell players so wherever a build is announced, and read "this
-  save will not load" in a bug report as this before treating it as a fault. **Versioned, migratable
-  replays are a post-1.0 question** — deliberately not worth the effort while the rules are still
-  moving this fast, since every migration would have to be written against rules that changed again
-  next release.
 - **Never call `Math.random()`.** One ambient random call silently breaks replay.
-- **The Mainline Phase can stop and ask, and there are three questions it asks.** §8.1's clearance
-  ruling goes to the Superintendent; the Yard Office offer and the Red Flag prompt go to the owner of
-  the district a train is arriving at. `pendingDecision` is a discriminated union and `decisionActor`
-  is the single place that maps a question to whoever must answer it — a new question adds a case
-  there and nowhere else. **Ask before the move is committed:** returning `needsClearance` unwinds
-  the whole phase and the driver re-enters from the top, so anything already mutated is applied
-  twice or left half-done.
-- **A game ends by PAUSING, and the first ending is the real one.** Running out of Days, or closing
-  short of the combined Revenue floor, puts the game in `awaitingExtension` rather than `finished`:
-  the table is asked whether to play one more Day, unanimously, and asked again at the end of every
-  Day it grants. `state.official` is written at the first ending and never rewritten, so the winner
-  is always the one decided at `config.days` however long play carries on — `config.days` itself
-  never moves, and `state.extraDays` counts the borrowed ones. A §3.4 collision breach is the
-  exception and finishes outright, during an extended Day exactly as during the scheduled game.
-  Because a save is a replay, the vote is an intent (`game.extend`), and it is the one intent that
-  **carries its own player**: every seat may vote in any order, so a replay cannot derive who did.
-- **Statistics are folded, not recorded.** `state.tally` counts what the event stream says happened —
-  trains through the Division and how many of them did any switching, loads made up and broken — and
-  is hooked
-  at the two boundaries every event crosses exactly once, `applyIntent` and `advance`. It is not
-  hooked in `reduce`, which never sees the phase driver's events at all. Nothing in the rules reads
-  it, so adding a counter is always safe; it rides the `Frame`, so a multiplayer client gets the same
-  numbers as solitaire from one implementation. **What it cannot count is anything the events do not
-  say.** `trainStoodStill` fires once per game for the X18 Circus alone, so "the longest an engine sat
-  on a siding" has no signal behind it — see `TODO.md` #36 rather than assuming an event means what
-  its name suggests.
-- **A game is one of four TYPES, and a type is a set of defaults rather than a ruleset.** Co-op,
-  Competitive, Cutthroat and Solitaire (`src/web/presets.ts`) each name an opening hand, an Extra
-  rule, three revenue rates and the victory conditions; picking one fills the form, and changing any
-  of them selects **Custom**, which keeps the scoring of the type it came from. The type is *derived*
-  from the numbers rather than stored, so a saved game carries no name that can disagree with what it
-  actually is. Both screens that deal a game — the lobby and the New Game dialog — ask the same
-  eleven questions through one shared block (`src/web/settings-form.ts`), because for two releases
-  they each had a question the other lacked. What separates the types: Co-op alone pays for a
-  transit, Cutthroat alone lets an Extra be planted in another player's district and has no shared
-  failure condition at all beyond three collisions in a Day, and the Revenue floor is a formula in
-  the table size and the length (3 per player per Day in Co-op, 2 in Competitive) rather than a
-  number.
-- **Track is a deck card, but the opening district is dealt.** Track is the largest category in the
-  deck by a distance — so a district is built from what you draw, and building it costs you the
-  industry or train you drew instead. The opening hand is the exception, and it is **chosen when the
-  game is dealt**: three random cards (the prototype rule), six random cards, or three track and
-  three other from two separately shuffled piles. The last of those is the only one that guarantees
-  you a district to build; deal six and you open over the limit of three, so the first turn is spent
-  choosing. **Every game type now deals six** (Jesse’s call, v0.7.0) — the engine's own fallback,
-  `SOLO_CONFIG`, deliberately did not move with it, because every sim measurement is taken against
-  that. See `TODO.md`.
+- **Track is a deck card, but the opening district is dealt.** 96 of the 235 cards are track — the
+  largest category — so a district is built from what you draw, and building it costs you the
+  industry or train you drew instead. The opening hand is the exception, and it is now **chosen when
+  the game is dealt**: three random cards (the default, and the prototype rule), six random cards, or
+  three track and three other from two separately shuffled piles. The last of those is the only one
+  that guarantees you a district to build; deal six and you open over the limit of three, so the
+  first turn is spent choosing. See `TODO.md`.
 - **What the work pays is a setting too.** Passenger revenue per coach, freight revenue per load and
   train revenue per transit each run 0–5 and are fixed when the game is dealt. The first two default
   to 1 and pay at both ends of a movement — boarding *and* detraining, loading *and* unloading. The

docs/StationMaster-Mainline-Deck-v0.4.5.md

@@ -38,7 +38,7 @@ The PDF art labels this card “Yard”; this reference uses the implementation
 | Plains | 60 mph; one Stage for Fast, two for Slow. The implementation has one Plains *type* rather than the PDF’s two physical copies. |
 | Curves | 30 mph; two Stages for Fast, three for Slow. |
 | Hilly | Passenger train: 60 mph. Freight-only train: 30 mph. Add one Stage if Slow. |
-| Heavy Grade | Starts at 30 mph; two Stages for Fast, three for Slow. The card prints “Player sets orientation”; **the game deliberately overrides that and rolls the uphill direction from the seed** — settled in v0.5.0 and re-confirmed 2026-08-23, see the note below. Grade modifiers can reduce the time, to a minimum of one Stage. |
+| Heavy Grade | Starts at 30 mph; two Stages for Fast, three for Slow. The card requires the player to select its uphill direction; v0.4.5 instead selects that direction from the game seed during setup. Grade modifiers can reduce the time, to a minimum of one Stage. |
 | Double Track | 60 mph. Printed capability: trains may pass. The traffic-resolution rule is in Rules §4.5. |
 | Uncontrolled Siding | 60 mph. Printed capability: trains may pass. The traffic-resolution rule is in Rules §4.5. |
 | Tunnel | 30 mph. |
@@ -70,16 +70,6 @@ For the grade cards, “uphill” should be the direction selected by the player
 
 ## What is not implemented
 
-- There is no player choice or physical placement interaction for Mainline cards; setup deals them automatically from the seeded random stream. There **is** a finite draw pile as of v0.6.2 — the deck above, dealt without replacement, so no Division can hold two of a card printed once.
+- There is no finite draw pile, player choice, or physical placement interaction for Mainline cards; setup selects their types automatically from the seeded random stream.
 - Interchange is catalogued as a “sort cars” card, but v0.4.5 has no operation that reorders a train on the Interchange. The Small Yard in an Office Area is the implemented sorting mechanism.
-- Interchange now has one player-facing use: an Extra Train may be **started** there, made up in its yard and highballing onto the Mainline when the Subdivision is clear (§7, v0.6.2). Car sorting remains unimplemented.
-
-## Heavy Grade orientation is settled, not missing
-
-Heavy Grade orientation is rolled from the seed rather than chosen by a player. **This is a decision, not a gap, and it is not awaiting a player-selection step.**
-
-The card prints “(Up)” and “Player sets orientation”, which assumes the card has an owner. This one does not: `buildDivision` lays the Division as `DP · Mainline · Office · Mainline · … · DP`, so a Heavy Grade always sits **between two districts**, or beyond an end Division Point next to one — never inside a single player’s own district.
-
-Orientation is not cosmetic: Brakeman and Airbrakes each take a Stage off a train running **downhill**, Helpers takes one off a train running **uphill**, and odd-numbered trains run west while even run east. Turning the card around therefore decides which of those modifier cards are worth anything and which direction of traffic is favoured — permanently, for the whole game. Handing that to one of the two neighbours advantages them over the other, and no player has a fair claim to it.
-
-**Re-opened and closed again on 2026-08-23**, when the option of giving the choice to the Superintendent was considered and rejected. Jesse’s call: v0.5.0’s ruling stands. Rolling from the seed is deterministic, roughly even (51/49 east/west over 400 games), identical for solitaire and multiplayer, and keeps setup non-interactive — the game has no setup phase, so the question would have to interrupt play before the first Local Operations, in the minority of games that deal the card at all (20% at one player, rising to 50% at four).
+- Heavy Grade orientation is seeded automatically rather than chosen by a player. The implementation needs a player-selection step to match the card.

docs/architecture/lobby-and-sessions.md

@@ -36,34 +36,6 @@ and `<ip>:<port>` are both expected — and browser storage is scoped to the ori
 at one address must come back to that address, or they are a stranger with no token. Say so in the
 UI at join time rather than letting someone discover it when they cannot get back in.
 
-**A lost token is recoverable, administratively** (Gitea#33). Everything above makes the token the
-single point of failure: it lives in one browser's storage, and a cleared profile, a private window or
-a different browser ends the seat with the game still running and the session still on disk. Seen at a
-real table — the returning player met an empty lobby while their token sat intact in `sessions.json`,
-and the only way back was an administrator reading the file off the volume and the player pasting it
-into a devtools console.
-
-So there is a supported path, in two halves that are gated differently on purpose:
-
-```
-POST /api/games/<id>/claim  { player }   →  { code, expiresAt, … }   admin secret
-POST /api/claim             { code }     →  { token, gameId, player, gameCode }
-```
-
-**The link carries the code, never the token** — which is the rule three paragraphs up, applied. A
-recovery link is exactly the sort of thing that gets pasted into a chat, so what travels in the URL is
-single-use and expires in thirty minutes (`server/claims.ts`), and the page trades it for the real
-token over a POST as it loads (`?claim=` in `web/main.ts`, which strips it from the address bar either
-way). A leaked code is worthless once spent; a leaked token is the seat for the rest of the game.
-
-**Minting is administrative; spending is not.** Deciding that a particular person has lost a
-particular seat is a judgement no route can make safely — anyone able to mint their own code could
-take any chair at the table. Spending needs no secret because the player following the link is the one
-person in the story who holds none; the code *is* the authorisation, and it is the same shape
-(unguessable, one-time) as the token it hands back. The codes are held in memory: they are minted on
-demand and spent within minutes, so a restart dropping them is the right failure, and persisting them
-would put a credential-equivalent on the volume to solve a problem measured in seconds.
-
 Real accounts can be layered on later without touching the rules engine, which is exactly why
 [`overview.md`](overview.md) keeps that boundary sharp.
 
@@ -72,10 +44,8 @@ Real accounts can be layered on later without touching the rules engine, which i
 ## 2. Creating and joining
 
 ```
-Lobby.Create  { secret, config, displayName, players, seed }  →  { gameId, gameCode, token, player }
-Lobby.Preview { secret, gameCode }                            →  { gameCode, hostName, config, players, seated }
-Lobby.Join    { secret, gameCode, displayName }               →  { gameId, gameCode, token, player }
-Lobby.Leave   { token, seat? }                                →  { ok, closed? }
+Lobby.Create { secret, config }            →  { gameId, gameCode, token }
+Lobby.Join   { secret, gameCode, displayName }  →  { token, player }
 ```
 
 **These four messages are the one family with no types behind them**, because the engine has no
@@ -90,28 +60,7 @@ per-origin, alongside the token.
 
 A **game code** — short, human-speakable, e.g. `RAIL-4471` — is the discovery mechanism *inside* the
 door. No matchmaking, no browsing, no public game list. Players are already talking to each other; the
-code just needs to survive being read aloud. The seating screen also offers it as an invite **link**
-(`…/play.html?lobby&code=RAIL-4471`), which is what a chat message wants — the link carries the code
-and never the join secret, because the secret is the door key and travels out of band by design.
-
-**A player reads the rules before taking a chair.** `Lobby.Preview` answers the same join secret with
-the whole config, the host's name and who is seated, and takes no seat — added 2026-08-23, when the
-alternative was sitting down blind and (until the same pass) having no way back out. **It never
-carries the seed**: the seed decides every shuffle and every roll in the game, so it belongs to the
-host alone.
-
-**Two players may not share a display name.** The name labels the district on the Division map, it is
-what the turn chart means by "waiting on Jesse", and `record()` puts it in front of every line that
-player causes — so two of them make all three ambiguous, and the names lock at `Lobby.Start`. A
-clashing join is refused (`NAME_TAKEN`, compared trimmed and case-insensitively) rather than silently
-suffixed: a player should play under the name they chose, or be asked for another.
-
-**Anybody may leave, and the host may clear a chair.** `Lobby.Leave` frees the seat, drops the token
-from `joinOrder`, and passes host rights on exactly as a dropped connection does. Naming somebody
-else's `seat` is host-only. When the last human leaves, the lobby is deleted outright — code, file and
-index row — rather than left as a table of bots waiting for a host who no longer exists. Before this
-existed a mis-join or a player who wandered off wedged the whole table, since Start needs every chair
-filled and a bot may not be dropped onto an occupied seat.
+code just needs to survive being read aloud.
 
 **One game at a time per person is expected usage and is deliberately not enforced** (`multiplayer.md`
 §10). Enforcing it needs cross-game state whose only job is deciding when to release someone, and
@@ -139,27 +88,15 @@ The cap is about what has been played, not about what the game can do.
 
 ## 3. Configuration, and when it locks
 
-Set before start, immutable after — the whole of `GameConfig` (`state.ts`), which the host fills in
-by choosing a **game type** and then editing whatever they like:
+Set before start, immutable after:
 
 ```
-mode              : solitaire | competitive | coop
-days              : how long the game runs
-minCombinedRevenue, maxCollisionsPerDay, maxCollisionsTotal   (0 = that condition is off)
-pvpCardsAllowed   : a property of the type, not a control — the cards are unbuilt (setup.ts)
-optionalRules     : { reducedVisibility, employeeRotation, emergencyToolbox }
-houseRules        : { startingHand, extraStart, revenue }
+mode          : solitaire | competitive | coop
+victory       : firstToTarget | highestAfterDays
+length        : short | standard | campaign
+optionalRules : { reducedVisibility, sisterTrains, employeeRotation, emergencyToolbox }
 ```
 
-**The four game types** (`src/web/presets.ts`, Jesse's design 2026-08-23) are Co-op, Competitive,
-Cutthroat and Solitaire, plus **Custom** — which is not a fifth type but the state of having edited
-one, and is scored as whichever type it was edited away from. The type is *derived* by comparing a
-config against the four, never stored, so a saved game carries no label that can disagree with its own
-numbers. Seed, player count and Day count sit ABOVE the type on both screens as **parameters**: the
-types are formulas in the table size and the length (the Revenue floor is 3 per player per Day in
-Co-op, 2 in Competitive, nothing in Cutthroat), so changing one re-derives rather than making the game
-Custom.
-
 These must lock at `Lobby.Start`. Changing `length` mid-game would move the finish line; changing
 `mode` would switch which failure floors apply (§3.4, §3.5). Neither has a coherent meaning
 mid-game, so the server should refuse rather than try.
@@ -204,12 +141,6 @@ to hide it. Show the chain forming.
 **Solitaire is unchanged and must stay so:** one player is one seat, seating is trivially `[0]`, and
 every published replay depends on that.
 
-**What a seat is told as the game begins** (2026-08-23). The board used to simply appear, mid-Local
-Operations, with a log already several bot turns deep and nothing marking where the game began. The
-page now holds a deliberate beat on a handoff curtain, announces the game and its type, marks the top
-of the log, and shows the code and the type in the header for the rest of the game — none of which is
-new *data*, only the first time any of it was drawn.
-
 **Employee Rotation** (Appendix B), if enabled, moves every player one seat left at the end of each
 Day, carrying their Revenue and the Fedora with them. **The model supports this as of v0.4.0**:
 offices and districts are keyed by seat, hands and Revenue and the Fedora by player, and `seating[]`
@@ -232,16 +163,6 @@ if it was their turn. Broadcast a disconnect notice so everyone else can see why
 server-layer news about a *connection*, not about the game, so it belongs with the transport rather
 than in `GameEvent`, which must stay replayable from a seed.
 
-**On connect, a client is told about every other seat at once** (2026-08-23). A change notice alone
-answered "who just left", never "who is here" — so a player arriving at a table where two people had
-not opened the game yet was told nothing about them at all, which is precisely the question at the
-moment a game starts. Each entry carries `seen`, separating **was here and dropped** from **has never
-opened the game**: the first will probably be back, the second needs somebody to send them the link.
-`seen` is remembered only for as long as the process runs, so after a restart every absent seat reads
-as "not here yet" — the more cautious of the two. **Bot seats are never reported**: a bot holds no
-connection and never will, and listing one puts "waiting on Bot 1" on every screen for the whole game
-(found by playing a three-seat game, not by reading the code).
-
 **On reconnect:** the client presents its token and the server replies with a **full current view**.
 Not an event tail — a returning client needs the position, not the history of how it got there, and
 the server can always produce the position because it holds the game

docs/architecture/multiplayer.md

@@ -245,31 +245,9 @@ special handling: `pump` stops, and the next push simply carries a `Menu` contai
 POST /api/lobby/create, /api/lobby/join      lobby
 POST /api/intent          { gameId, seq, intent }
 GET  /api/stream          EventSource — per-seat frames, with Last-Event-ID resume
-GET  /api/health          { ok, service, engineVersion, games } — unauthenticated; see below
-GET  /api/games           every game and lobby, summarised          ┐
-GET  /api/games/<id>/save the save, for keeping or replaying        ├ ADMIN_SECRET
-DELETE /api/games/<id>    ends a game, and returns its save         ┘
 GET  /                    the client
 ```
 
-`/api/health` exists because the client cannot otherwise tell a server from a static host. The same
-`dist/` is served both ways and the bundle is identical (D4), and every other route 404s an unknown
-path exactly as a static host does — so the splash asks, and closes its multiplayer door only when
-nothing names itself in reply. It is unauthenticated on purpose: it reveals that a Station Master
-server is answering and nothing else, no game and no seat. Its `games` field — `{ active, lobby }`
-— is what the StartOS package's health check reports as "3 games in progress".
-
-**The three administrative routes are gated by `ADMIN_SECRET`, which is deliberately not the join
-secret.** Every player holds the join secret, so gating a delete with it would let anyone at the
-table destroy anyone else's game; this one belongs to whoever runs the server. It arrives in an
-`x-admin-secret` header rather than the query string, so it stays out of logs and referrers. When
-the variable is unset the routes answer 404 exactly as any unknown path does, so a server that was
-never given an administrator does not advertise that it has one.
-
-**A delete returns the deleted game's save.** The intents are the game (D5), so what comes back is
-the whole thing and not a summary of it — the record survives even though the game does not, and
-nothing is destroyed without being handed to whoever destroyed it first.
-
 Chosen over WebSocket because this game is **idle most of the time** — turn-based with human
 think-time means a connection sits silent for minutes, exactly when proxies reap sockets. SSE's
 reconnection and `Last-Event-ID` resume are handled by the browser, and it needs no `Upgrade` support
@@ -360,7 +338,7 @@ all it needs.
 | **D15** | **Build to `deployment.md`'s five portability rules; package as an `.s9pk`** | This is a StartOS packaging workspace and the toolchain is on disk. |
 | **D16** | **The server serves the client** | Required for same-origin, which is what makes multiple access addresses work without CORS. |
 | **D17** | **Undo is solitaire-only** | Other players have seen the result. |
-| **D18** | **Player cap 2-4** for competitive/coop (solitaire is 1) | Per `lobby-and-sessions.md` §2 — sized to what is actually exercised (`test/multiplayer.test.ts` plays 2, 3 and 4 to a finish), not to a guess. This entry read "6" until Phase 4 (v0.5.1); that number was never implemented or tested anywhere and the two docs had drifted apart. Raise it once somebody has played a bigger game and reported back, not before. |
+| **D18** | **Player cap 6** | Per `lobby-and-sessions.md` §2. |
 | **D19** | **Per-player turn state now; parallel turns deferred** | The model change is behaviour-neutral and cheap today. Whether local work should run off-cursor depends on how often humans choose to switch — 13% for the bot, and the benefit ranges from ~8 minutes to ~27 off an hour-long game between 13% and 50%. Measure with real players, then flip one function. |
 | **D20** | **Replay reveals everything once the game ends** | Most useful for learning and for arguing about it afterwards; costs nothing extra to retain. |
 

docs/architecture/protocol.md

@@ -103,17 +103,6 @@ Two consequences worth knowing before adding an event:
 - **Events are not what goes over the wire.** The server applies the intent and pushes the resulting
   `Frame` (`multiplayer.md` D2/D3). Events are narration and cues, not the protocol — and a reconnect
   gets a fresh `Frame` rather than the tail it missed.
-- **What events EARN does go over the wire, as four transient signals** (2026-08-23): the sound cues,
-  the timetable slot a D12 just filled, a one-line announcement, and the id of the card that just came
-  into this seat's hand. They ride beside the `Frame` rather than on it because they mark a *moment*
-  and are consumed — putting them on the Frame would re-fire them on every redraw. Before this a
-  remote client got none of them, so multiplayer had no sound at all, no flash and no announcements
-  while solitaire had all three. The first three are shared and identical in every seat's push; the
-  fourth is **not** — `game.justDrawn` is one field for the whole game and does not say whose card it
-  is, so the server remembers who drew and sends it to that seat alone
-  (`test/server/session.test.ts`, "the four transient signals"). A reconnect gets none of the shared
-  three: a fresh connection is drawing a state, and replaying the sounds of everything it missed is a
-  burst of noise about the past.
 
 ---
 

docs/rules/as-built.md

@@ -1,260 +0,0 @@
-# Station Master — the cards as built
-
-> **Generated from `src/engine/content.ts` by `scripts/build-card-reference.ts`. Do not edit by
-> hand** — `npm run build:cards` rewrites it, and `test/card-reference.test.ts` fails if this file
-> and the code disagree.
-
-This is the one file in `docs/rules/` that describes the game **as it currently is**. Everything
-else in this directory is a historical record and marked as such: [`rules-v0.1.md`](rules-v0.1.md)
-transcribes the prototype PDFs, [`open-questions.md`](open-questions.md) tracks how the gaps in
-them were decided, and [`rules-v0.2.md`](rules-v0.2.md) and
-[`card-reference.md`](card-reference.md) both describe superseded card sets. Read those for the
-reasoning; read this for the numbers.
-
-The engine instantiates from the same constants this is emitted from, so a disagreement between
-this page and the game is a bug in the generator, not a stale table.
-
-**No card counts appear here, deliberately** (TODO #15a, Jesse 2026-08-22): the counts move with
-play balance, so a document that prints them is answering a question that will have a different
-answer next retune. Where a count matters it is a yes/no — whether the deck deals the card at
-all — which is a fact about the design rather than about the current tuning.
-
----
-
-## Trains
-
-12 timetabled and 10 Extras, 22 in all.
-Odd numbers run west, even run east; a pair shares a class and is the same card face in two
-directions. A Crew Tray holds four pieces and a caboose counts toward the four, which is why no
-train with a caboose carries more than three revenue cars.
-
-### Timetabled
-
-| # | Class | Speed | Runs | Consist | Printed rules |
-| ---: | --- | --- | --- | --- | --- |
-| 1 | Crack Limited | fast | west | 2 coaches (2 pieces) | terminals only; no switching; expedite; *"Stop at Terminals only."* |
-| 2 | Crack Limited | fast | east | 2 coaches (2 pieces) | terminals only; no switching; expedite; *"Stop at Terminals only."* |
-| 3 | Express | fast | west | 2 freight (2 pieces) | one freight per location; expedite; *"May drop or pick up one freight car at every location."* |
-| 4 | Express | fast | east | 2 freight (2 pieces) | one freight per location; expedite; *"May drop or pick up one freight car at every location."* |
-| 5 | The Sparrow | fast | west | 3 coaches (3 pieces) | no switching; expedite |
-| 6 | The Sparrow | fast | east | 3 coaches (3 pieces) | no switching; expedite |
-| 7 | Local | slow | west | 1 freight + 1 coach (2 pieces) | coach stays on station track; *"Maximum one freight, one coach."* |
-| 8 | Local | slow | east | 1 freight + 1 coach (2 pieces) | coach stays on station track; *"Maximum one freight, one coach."* |
-| 9 | Heavy Freight | slow | west | 3 freight + 1 caboose (4 pieces) | — |
-| 10 | Heavy Freight | slow | east | 3 freight + 1 caboose (4 pieces) | — |
-| 11 | Drag Freight | slow | west | 2 freight + 1 caboose (3 pieces) | — |
-| 12 | Drag Freight | slow | east | 2 freight + 1 caboose (3 pieces) | — |
-
-### Extras
-
-| # | Class | Speed | Runs | Consist | Printed rules |
-| ---: | --- | --- | --- | --- | --- |
-| X13 | Appleseed Extra | slow | player's choice | 3 freight + 1 caboose (4 pieces), empties only | drop only; *"May drop MTs but not pick up anything."* |
-| X14 | Fruit Growers Express | fast | player's choice | 2 reefers + 1 caboose (3 pieces) | expedite; *"Reefers only. May pick up one extra loaded reefer."* |
-| X15 | Yard Xfer | slow | player's choice | 2 freight + 1 caboose (3 pieces) | — |
-| X16 | Light Engine Move | fast | player's choice | engine only | no switching; *"No cars at all."* |
-| X17 | Campaign Train | fast | player's choice | 1 coach (1 piece) | no switching; stop then expedite; stop earns point; must run loaded; *"One turn at station (speeches) then expedite. Earns a point per Office Area if the candidate is aboard."* |
-| X18 | Circus Train | slow | player's choice | 2 freight + 1 coach + 1 caboose (4 pieces) | no switching; stop earns point; must run loaded; *"One turn stopped in an Office Area (circus set-up) earns 1 point, once per Area, if fully loaded."* |
-| X19 | Military Train | slow | player's choice | 1 freight + 2 coaches (3 pieces) | no switching; no passenger work; expedite; must run loaded; *"Troops and materiel: runs loaded where the yard can supply it."* |
-| X20 | Director's private car | slow | player's choice | 2 freight + 1 coach (3 pieces) | no passenger work |
-| X21 | Freight Extra | slow | player's choice | 3 freight + 1 caboose (4 pieces) | — |
-| X22 | Pee-Dee | slow | player's choice | 1 caboose (1 piece) | pick up empties only; *"Per-diem train. May only pick up MTs."* |
-
----
-
-## Mainline cards
-
-A card is divided into **regions**, and a train advances one region per Stage — so the regions a
-card prints are what it costs to cross. Where a train *enters* is what the rules move: a fast
-train on Hilly, a Heavy Grade with Helpers, or a card whose back region is a siding rather than
-part of the road all change the entry point rather than the card's length.
-
-| Card | Regions | Default entry | Fast / slow entry | Trains may pass | Sorts cars |
-| --- | ---: | ---: | --- | :---: | :---: |
-| Plains | 1 | 0 | — | — | — |
-| Curves | 2 | 0 | — | — | — |
-| Hilly | 2 | 0 | 1 / 0 | — | — |
-| Heavy Grade | 3 | 0 | — | — | — |
-| Double Track | 1 | 0 | — | yes | — |
-| Uncontrolled Siding | 2 | 1 | — | — | — |
-| Tunnel | 2 | 0 | — | — | — |
-| Trestle | 1 | 0 | — | — | — |
-| Interchange | 2 | 1 | — | — | yes |
-
-The Mainline deck is 10 cards; the two Division Points are the fixed ends of
-the Division and are not dealt. What each card does, in the words the game uses on screen:
-
-- **Plains** — 1 region — one Stage each. · 1 Stage for every train. · One train at a time — anything following has to wait for it to clear.
-- **Curves** — 2 regions — one Stage each. · 2 Stages for every train. · One train at a time — anything following has to wait for it to clear.
-- **Hilly** — 2 regions — one Stage each. · This card reads the train's FAST/SLOW rating: a fast train starts further along and crosses in 1 Stage, a slow one in 2 Stages. No other card cares which it is. · One train at a time — anything following has to wait for it to clear.
-- **Heavy Grade** — 3 regions — one Stage each. · A grade, climbing eastward. 3 Stages to climb it and 3 Stages to run down, before help. Helpers start an UPHILL train a region further on; Brakeman does the same DOWNHILL and Airbrakes another again, and Airbrakes cannot be played without Brakeman. Never less than one Stage. · One train at a time — anything following has to wait for it to clear.
-- **Double Track** — 1 region — one Stage each. · 1 Stage for every train. · TRAINS MAY PASS — two trains may stand on this card at once, so a following train is not held behind a slower one.
-- **Uncontrolled Siding** — 2 regions — one Stage each. · A train with the card to itself starts past the back region and is across in 1 Stage. · UNCONTROLLED SIDING — arrive to find a train already here and you take the siding, a region behind it. You are not in the same place, so you do not run into it; it costs you the extra Stage instead. · One train at a time — anything following has to wait for it to clear.
-- **Tunnel** — 2 regions — one Stage each. · 2 Stages for every train. · One train at a time — anything following has to wait for it to clear.
-- **Trestle** — 1 region — one Stage each. · 1 Stage for every train. · One train at a time — anything following has to wait for it to clear.
-- **Interchange** — 2 regions — one Stage each. · A train with the card to itself starts past the back region and is across in 1 Stage. · An Extra beginning its run here starts in the back region and takes the extra Stage. · One train at a time — anything following has to wait for it to clear. · Cars may be sorted into any new order here.
-
----
-
-## Office cards
-
-Upgrades are strictly sequential — no skipping a tier — so a Terminal needs all three cards in
-order. Green slots are outbound passengers, red are inbound, and the design gives slots **equal**
-to Porters rather than one more.
-
-| Office | Control point | Passenger facility | A/D tracks | Porters | Green | Red |
-| --- | :---: | :---: | ---: | ---: | ---: | ---: |
-| Whistle Post | — | — | 1 | 0 | 0 | 0 |
-| Depot | yes | yes | 2 | 1 | 1 | 1 |
-| Station | yes | yes | 3 | 2 | 2 | 2 |
-| Terminal | yes | yes | 4 | 3 | 3 | 3 |
-
-Whistle Posts are a fixed supply of 4 outside the deck, and Limits signs a
-supply of 8.
-
----
-
-## Freight facilities
-
-Each lists the car types it works, which way its traffic flows, and the industries it may not sit
-beside. **Every lockout pair is a producer and the consumer of the same commodity** — you may
-build one end of a chain or the other, never both, which is what forces traffic to run between
-districts rather than in circles inside one. No two of the same industry may share an Office Area,
-and that rule is enforced for every kind rather than repeated in each row.
-
-| Industry | Cars | Flow | Green | Red | Laborers | Locked out with |
-| --- | --- | --- | ---: | ---: | ---: | --- |
-| Freight House | boxcar | both | 1 | 1 | 1 | Grocer's Warehouse |
-| Mine Tipple | hopper | outbound | 1 | 0 | 1 | Power Plant |
-| Refinery | tank | outbound | 1 | 0 | 1 | Power Plant |
-| Power Plant | hopper, tank | inbound | 0 | 1 | 1 | Mine Tipple, Refinery |
-| Packing Sheds | reefer | outbound | 1 | 0 | 1 | Grocer's Warehouse |
-| Grocer's Warehouse | boxcar, reefer | inbound | 0 | 1 | 1 | Packing Sheds, Freight House |
-
----
-
-## Modifier cards
-
-Each sits beside a host and raises one of its capacities. `office` as a host means any Passenger
-Facility — so a modifier that adds a green slot to an Office adds nothing to a Whistle Post, which
-is not one.
-
-| Modifier | Hosts | +Green | +Red | +Laborers | +Porters |
-| --- | --- | ---: | ---: | ---: | ---: |
-| Waiting area | any Passenger Facility | 1 | — | — | 1 |
-| Restaurant | any Passenger Facility | 1 | — | — | 1 |
-| Hotel | any Passenger Facility | 1 | — | — | 1 |
-| Truck dock | Freight House, Packing Sheds, Grocer's Warehouse | — | 1 | — | — |
-| Railroad Express Agency | Freight House | 1 | — | 1 | — |
-| Forklifts | Freight House, Packing Sheds | 1 | — | 1 | — |
-| Prep Plant | Mine Tipple | 1 | — | 1 | — |
-| Coal Piles | Mine Tipple | 1 | — | 1 | — |
-| Conveyor Belts | Mine Tipple | 1 | — | 1 | — |
-| Pipelines | Refinery | 1 | — | 1 | — |
-| Oil Depot | Refinery | 1 | — | 1 | — |
-| Viscosity breakers | Refinery | 1 | — | 1 | — |
-| Transmission lines | Power Plant | — | — | 1 | — |
-| Rotary Dumps | Power Plant | — | — | 1 | — |
-| Steam Turbines | Power Plant | — | — | 1 | — |
-| Ice House | Packing Sheds, Grocer's Warehouse | 1 | — | 1 | — |
-| Local small groceries | Grocer's Warehouse | — | — | 1 | — |
-
----
-
-## Track cards
-
-Track is **in the Home Office deck** and is drawn and played like any other card — not a separate
-per-player supply. Operational Rail is the flag that says a train may stop on the card; a turnout
-may be run through but not stopped on.
-
-| Track | Geometry | Hand | Operational rail | Move cost | Dealt |
-| --- | --- | --- | :---: | ---: | :---: |
-| Straight track | straight | none | yes | 1 | yes |
-| Curved track (right) | curved | right | yes | 1 | yes |
-| Curved track (left) | curved | left | yes | 1 | yes |
-| Sharp Curved Track (right) | sharpCurved | right | yes | 2 | no |
-| Sharp Curved Track (left) | sharpCurved | left | yes | 2 | no |
-| Turnout (right) | turnout | right | — | 1 | yes |
-| Turnout (left) | turnout | left | — | 1 | yes |
-
-A row marked "no" is a shape the engine understands but the deck does not currently print.
-
----
-
-## Enhancements
-
-The column that only the implementation can fill in: **whether the printed effect actually
-resolves yet.** `live` is read during play; `dormantSolo` is implemented at the point of attack
-but the attack is an opponent-directed card held out of every deck, so nothing reaches it in a
-solitaire game; `unbuilt` means the effect is recorded and nothing reads it. A transcription
-cannot carry this column, which is the argument for generating the page rather than writing it.
-
-| Enhancement | Placement | Requires | Effect resolves |
-| --- | --- | --- | :---: |
-| Interlocking | runningTrackStraight | — | **live** |
-| Facing Point Locks | onCard | interlocking in the district | **dormantSolo** |
-| Yard office | secondaryTrackStraight | — | **live** |
-| Small yard | secondaryTrackStraight | — | **live** |
-| Water column | runningTrackStraight | — | **dormantSolo** |
-| Overpass | onCard | — | **unbuilt** |
-| Telegraph | runningTrackStraight | — | **live** |
-| Telephone | onCard | telegraph on the same card | **live** |
-| Radio | onCard | telephone on the same card | **live** |
-| ABS Signals | mainlineCard | — | **live** |
-
----
-
-## Opponent-directed cards, and what answers them
-
-**None of these is dealt in any deck today.** A card that can only be played at another player
-has no legal target in a solitaire game, and a defence with nothing to defend against is as dead
-a draw as the attack — so both halves are held out until the attacks are implemented. They are
-listed because they are the design, and because what a defence answers is the only record of why
-it exists.
-
-### Action cards — opponent-directed
-
-| Card | Played on | Effect | Answers |
-| --- | --- | --- | --- |
-| Derail | a moving train in the Local Phase | That train must stop for the remainder of the turn. | — |
-| Broken coupler | a moving train in the Mainline Phase | That train must stop and not move. | — |
-| Railroad crossing | any Secondary Track Straight | May not be used as a stop point for switching. May not become an Industry. | — |
-| Per Diem inventory | another player | Lose one point per 2 empty cars on Secondary Tracks. | — |
-| Demurrage charge | another player | Lose one point per 2 loaded freight cars on Secondary Tracks. | — |
-| Customer complaints | another player | Lose one point per 2 coaches in loading boxes. | — |
-| Vandalism | another player | A train passing a Hobo Jungle has a boxcar looted (converted to empty). | — |
-| Hotbox | another player | A train just arrived must set one car (chooser’s pick) onto Secondary Track until it departs. | — |
-| Outlawed | another player | A train just arrived may not depart for one turn — the crew’s hours have expired. | — |
-
-### Space-use cards — opponent-directed
-
-| Card | Played on | Effect | Answers |
-| --- | --- | --- | --- |
-| Bean house | adjacent to any straight, curve, turnout, Limit | Burns tablespace. | — |
-| Flop house | adjacent to any straight, curve, turnout | Burns tablespace. | — |
-| Watertower | adjacent to any straight, turnout on Running Track | Burns tablespace. | — |
-| Hobo Jungle | adjacent to any straight, turnout, Limit on Running Track | Burns tablespace. Vandalism can loot a boxcar passing it. | — |
-| Section House | adjacent to any straight, curve, turnout | Burns tablespace. | — |
-| City blocks | adjacent to any straight, curve, turnout, Limit | Burns tablespace. | — |
-| Engine Shops | adjacent to any straight, curve, turnout | Burns tablespace. | — |
-| Tenderloin District | adjacent to any straight, curve, turnout, Limit | Burns tablespace. | — |
-| Engineer cemetery | adjacent to any straight, curve, turnout, Limit | Burns tablespace. | — |
-
-### Maneuver cards
-
-| Card | Played on | Effect | Answers |
-| --- | --- | --- | --- |
-| Red Flags | any time | A stopped train is prevented from being hit; the approaching train is prevented from moving. | — |
-| Flying Switch | any time | Break a cut of cars away from behind the engine and roll them into an industry. | — |
-| Poling | any time | TBD in the source. | — |
-
-Mainline modifier cards, for completeness — these ARE dealt:
-
-| Card | Played on | Effect | Answers |
-| --- | --- | --- | --- |
-| Brakeman | a GRADE Mainline card | Faster passage downhill. | — |
-| Airbrakes | a GRADE Mainline card | Faster passage downhill. Brakeman must be in effect. | — |
-| Helpers | a GRADE Mainline card | Faster passage uphill. | — |
-| Realignment | a Mainline card | Convert one Mainline type to another. Not while a train is on it. | — |
-| Facing Point Locks | adjacent to Interlocking | Prevents Derail being played on you. | Derail |
-

docs/rules/card-reference.md

@@ -4,11 +4,6 @@
 > 2026-07-30 in `docs/Deck cards2.xlsx`, `Trains3.pdf` and `Mainline Cards.pdf`, and is transcribed
 > in `src/engine/content.ts`. See [`implications.md`](implications.md) for the full comparison.
 >
-> **For what the cards say today, read [`as-built.md`](as-built.md)** — generated from
-> `content.ts` and checked against it by the test suite, so it cannot fall behind the way this file
-> did. For several releases `content.ts` named *this* page as the current reference while the banner
-> here said otherwise, and a reader following the code landed on the v0.4.5 deck.
->
 > Kept for the reasoning it records — the economy analysis in §7 was how we knew what questions to
 > ask the design. **Do not use its numbers.**
 
@@ -47,37 +42,33 @@ Operational Rail wheel icon, an industry track of the stated length, Laborer ico
 | --- | --- | --- | ---: | ---: | ---: | ---: | ---: |
 | Mine Tipple | Hopper | Outbound only | 3 | 3 | — | 4 | 2 |
 | Produce Shed | Reefer | Outbound only | 2 | 2 | — | 3 | 2 |
-| Grocer's Warehouse | Boxcar or reefer | Inbound only | 1 | — | 1 | 3 | 3 |
-| Oil Refinery | Tank car | Outbound only | 1 | 1 | — | 4 | 3 |
-| Power Plant | Hopper or tank car | Inbound only | 3 | — | 3 | 4 | 2 |
-| Freight House | Boxcar | Both | 1 | 1 | 1 | — | 6 |
+| Grocer's Warehouse | Boxcar | Inbound only | 2 | — | 2 | 3 | 2 |
+| Oil Refinery | Tank car | Outbound only | 3 | 2 | — | 4 | 2 |
+| Power Plant | Hopper | Inbound only | 3 | — | 3 | 4 | 2 |
 
 Directions follow the commodity: coal originates at a Mine Tipple and is consumed at a Power Plant;
 produce ships out; a warehouse receives. This gives §9 all three of its cases — outbound-only,
 inbound-only, and both — with the **Freight House the one card that does both**.
 
-**"Freight House" IS a card** (corrected v0.5.0) — a sixth industry, dealt 6 copies, one Laborer and
-one slot each direction. An earlier pass here read §9.3/Appendix A's "Passenger Facilities and
-Freight Houses permit cars to move each direction" as meaning "Freight House" was only ever a
-*collective term* for the Grocer's Warehouse and the Oil Refinery, never a card of its own — that
-reading was wrong; the engine deals it as a real sixth industry (`content.ts`'s `freightHouse`
-profile) and this table follows the engine.
+**The Grocer's Warehouse and the Oil Refinery are ONE-WAY** (corrected v0.4.9e, from gameplay
+testing): "Grocer's Warehouse should be receive only, does not ship anything out"; "Refinery: only
+ships out tanks, does not receive anything" (Jesse). The Direction column read "Both" for both, on the
+reading below that "Freight House" named exactly those two.
 
-**The Grocer's Warehouse and the Oil Refinery are ONE-WAY** (corrected v0.4.9e). The Direction column
-read "Both" for both of them, and that was the *other half* of the same mistaken reading: if "Freight
-House" named those two, §9.3 had to be describing them, so they had to be two-way. Once the Freight
-House is its own card the argument evaporates, and playtesting settled it — "Grocer's Warehouse
-should be receive only, does not ship anything out"; "Refinery: only ships out tanks, does not
-receive anything" (Jesse). `StationMaster-Home-Deck-v0.4.5.md` prints both that way, and the modifier
-set agrees: all three Refinery modifiers (Pipelines, Oil Depot, Viscosity Breakers) grant **+1
-outbound**, which would be an odd card set for a facility that receives half the time.
-<!-- TODO v0.5.0: Mine Tipple, Produce Shed and Power Plant above (3/3/4, 2/2/3, 3/3/4) were NOT
-     re-verified against the engine in this pass — only Grocer's Warehouse, Oil Refinery and Freight
-     House were. `mineTipple` and `powerPlant` in `content.ts` are also base 1/1/1, same as the three
-     corrected here, so these three rows and the "Throughput" reasoning below (built on the OLD
-     2–3-Laborer numbers) may be stale too. Flagged in TODO.md rather than silently rewritten — this
-     needs the same kind of decision Jesse made for Grocer's/Refinery/Freight House, not an assumption
-     that the same correction applies. -->
+**And that reading is wrong.** §9.3/Appendix A's "Passenger Facilities and Freight Houses permit cars
+to move each direction" names a CARD: the engine deals a `freightHouse` industry, 6 copies, one
+Laborer and one slot each direction (`content.ts`), and has since before v0.4.9. This paragraph used
+to read "'Freight House' is not a card — it is the collective term for a freight facility that loads
+*and* unloads, the Grocer's Warehouse and the Oil Refinery", and that premise is what made those two
+two-way. `StationMaster-Home-Deck-v0.4.5.md` prints them one-way, and the modifier set agrees: all
+three Refinery modifiers (Pipelines, Oil Depot, Viscosity Breakers) grant **+1 outbound**, which would
+be an odd card set for a facility that receives half the time.
+
+<!-- The Laborer and capacity numbers in the rows above were NOT re-verified against the engine in
+     this pass — only the Direction column was, which is what playtesting reported on. `content.ts`
+     gives every industry base 1 out / 1 in / 1 Laborer, so the table's 2s and 3s and the "Throughput"
+     reasoning built on them are likely stale. Flagged rather than silently rewritten: Laborer counts
+     are a balance question, not only a docs one. -->
 
 ### Throughput — why these Laborer counts
 

docs/rules/glossary.md

@@ -25,7 +25,7 @@ Every defined term, alphabetized for lookup. The core comes from the Definitions
 | **Extra Train** | A one-and-done train; its card returns to the Salvage Yard on completion. Head-on card image, so the drawing player picks its direction. Numbered with an "X" prefix; the following number gives its seniority, and it yields to the Timetabled train of that number. | §2.3, §8 |
 | **Facility** | A business which loads/unloads cargo and freight. | §2.5 |
 | **Freight Facility** | Mine Tipples, Produce Sheds, Grocer's Warehouses, Oil Refineries, Power Plants, Freight Houses. Some allow only outbound, some only inbound, some both. Per-card values in §12.5. | §9, §12.5 |
-| **Freight House** | A sixth Freight Facility card (corrected v0.5.0 — an earlier pass here read it as a collective term for the Grocer's Warehouse and the Oil Refinery rather than a card of its own; it is dealt like any other industry). **The only industry that permits both directions** — the Grocer's Warehouse receives and the Oil Refinery ships, one way each (v0.4.9e). | §9.3, §12.5 |
+| **Freight House** | A sixth Freight Facility card, dealt like any other industry (`content.ts`) — this entry used to read "not a card, the collective term for the Grocer's Warehouse and the Oil Refinery", which the engine never agreed with. **The only industry that permits both directions**: the Grocer's Warehouse receives and the Oil Refinery ships, one way each (v0.4.9e). | §9.3, §12.5 |
 | **Highball** | When a train holding at an Office automatically departs. | §2.4 |
 | **Home Office** | The primary face-down deck cards are drawn from. 52 cards. | §2.6, §12.1 |
 | **Hopper** | Coal rolling stock (brown = loaded, white = empty). | §2.2 |

docs/rules/implications.md

@@ -40,9 +40,8 @@ All nine answers are implemented, **170 tests passing**:
 
 | Answer | Implemented as |
 | --- | --- |
-| ~~Q1 crossing time~~ | **SUPERSEDED 2026-08-26 — see Q1a below.** Was: a 60 card takes 1 Stage, a 30 takes 2. |
-| ~~Q2 Fast/Slow~~ | **SUPERSEDED 2026-08-26 — see Q1a below.** Was: Slow adds one Stage to every card; Hilly reads the consist. |
-| Q1a crossing time | `crossingStages()` — a card costs one Stage per **region printed on it**, and where a train STARTS is what varies. Plains 1, Double Track 1, Trestle 1, Curves 2, Tunnel 2, Heavy Grade 3. The printed mph are scenery. Fast/Slow is read on Hilly and nowhere else. |
+| Q1 crossing time | `crossingStages()` — a 60 card takes 1 Stage, a 30 takes 2. Mainline nodes now carry a **terrain type** dealt at setup, and trains count down Stages instead of stepping through regions. The `Region` model is gone. |
+| Q2 Fast/Slow | Slow adds one Stage to every card. Hilly reads the consist (any coach = passenger). |
 | Q3 Expedite | An expedited train departs the Stage it arrives — it gets a second `moveTrain` in the same Mainline Phase, still subject to §8.1 clearance. |
 | Q4 Lockouts | `isLockedOut()` rejects the placement with `FACILITY_LOCKED`. |
 | Q5 Run-around | Nothing to do — reachability is geometric, so a built bypass already works. |
@@ -77,73 +76,16 @@ Crossing time never falls below one Stage — a train cannot cross in no time.
 there is nothing to build. A test asserts it remains TBD, to stop anyone "fixing" it by inventing
 an effect; a silent no-op would be worse than a rejection.
 
-**Q1a, answered by RAR 2026-08-26 (Gitea#3), and it replaces Q1 and Q2 together.**
-
-> "Ignore speed signs. They are just graphics. Regions shown on cards indicate how many stages it
-> takes to cross. Plains is 1. Double track is 1, tunnel is 2, curves is 2, heavy grade is 3 unless
-> you have help… Some cards say fast / slow. This is an indication that if on the train card, the
-> train is listed as fast or slow, that's starting position / how many stages it takes to traverse
-> the card. Fast / Slow does not apply to every card — just those that say fast / slow on them.
-> Currently this is only hilly."
-
-What this changes, against what was recorded before:
-
-- **The printed 60/30 mean nothing.** Q1 read them as crossing time; they are ambiance.
-- **Fast/Slow is not a global penalty.** Q2 added a Stage to every card for a Slow train, which is
-  what made a Slow train take two Stages to clear Double Track — the report that opened the issue.
-  It now applies on Hilly alone, where a fast train starts in the second region.
-- **Hilly no longer reads the consist.** RAR: "I notice that you are basing stages in mainline cards
-  off coach/non-coach. Actually, all trains are rated as FAST and SLOW."
-- **Heavy Grade is three regions, not two**, and the modifiers move the START rather than cutting the
-  clock: Helpers start an uphill train a region on, Brakeman a downhill one, Airbrakes another again.
-- **The Uncontrolled Siding and the Interchange print a back region** that is not part of the road. A
-  train running through starts past it; a train arriving to find the siding occupied takes it and
-  runs a region behind, which is what keeps the two apart, and an Extra beginning its run at an
-  Interchange starts there too.
-- **ABS holds a train off the card** rather than letting it collide, on any Mainline card.
-
-Measured consequence, replacing the one recorded under Q2: on a **3-player Division the Mainline
-cards themselves now cost a fast train ~5.6 Stages and a slow train ~6.0**, against ~5.4 and ~9.4
-before. Fast traffic is unchanged; **slow traffic is about a third quicker**, and the Fast/Slow gap
-across a whole Division collapses from roughly four Stages to less than one. The Q2 note that "every
-Slow train is still on the road when the next Day begins, holding its Crew Tray" no longer holds, so
-the `players + 3` tray count is due a re-examination — RAR's own closing worry: "been worried about
-the time it takes to cross the division. More thunking on this is needed."
-
 **Q11, answered from the source.** The Heavy Grade card prints **"(Up)"** and **"Player sets
 orientation"**, so which way it climbs is a property of the placed card, not a fixed compass
 direction. `DivisionNode.gradeUp` records the direction a train travels when **climbing**; a train
 going the other way is descending. Brakeman and Airbrakes apply to the descent, Helpers to the
 climb, so turning the card around swaps which trains each card helps.
 
-**Settled (v0.5.0): orientation is never a player choice, and this overrides the card's own printed
-"Player sets orientation."** A Heavy Grade sits on the shared west-to-east Division chain, between
-two players (§4.2) or beyond an end Division Point next to one — never inside a single player's own
-district — so whichever direction climbs advantages one neighbour over the other, and no one player
-has a fair claim to the decision. Orientation is **rolled** from the seed instead — deterministic,
-and roughly even (51/49 east/west across 400 games) — identically for solitaire and multiplayer.
-
-**Re-opened and closed again, 2026-08-23.** The question came back as "did we ever fix Heavy Grade
-to allow user placement of direction?", and the option of handing the choice to the **Superintendent**
-— the neutral office, which rotates with the Fedora every three Stages — was considered and rejected.
-Jesse's call: v0.5.0's ruling stands. What the re-examination surfaced, worth recording so this is not
-asked a third time:
-
-- **The advantage is permanent; the office is not.** Orientation decides which modifier cards pay for
-  the whole game (Brakeman and Airbrakes on the descent, Helpers on the climb) and therefore which
-  direction of traffic is favoured — and odd trains run west while even run east. A rotating office
-  making a one-way, once-and-for-all call does not dissolve the fairness problem, it just moves it.
-- **There is no setup phase to ask in.** `createGame` is pure and synchronous and the game opens at
-  Day 1, Stage 1, Local Operations. The question would have to interrupt play before the first turn,
-  and `clock.pendingDecision` is typed for clearance alone (`SuperintendentClearance | null`, read in
-  19 places), so a second decision kind would be most of the work.
-- **Most games never meet the card.** Since v0.6.2 deals the Mainline deck without replacement there
-  is at most one Heavy Grade in ten cards, drawn `players + 1` times: **20%** of solitaire games,
-  rising to 50% at four players. A pre-game interrupt for a rule four games in five never see.
-
-The docs were the actual defect. `README.md` still listed it among three open rules questions (all
-three closed in v0.5.0) and `StationMaster-Mainline-Deck-v0.4.5.md` still said "the implementation
-needs a player-selection step to match the card". Both now say settled, and why.
+One gap remains, and it is a **setup** gap rather than a rules one: `createGame` is synchronous and
+returns a ready state, so there is no point at which a player can be asked. Orientation is currently
+**rolled** — deterministic from the seed, and roughly even (51/49 east/west across 400 games) — and
+should become a real player choice when setup gains an interactive phase.
 
 **Still not implemented**: the Action (10) and Space-use (12) cards, which are genuinely
 multiplayer-only. Playing them is rejected with `NOT_IMPLEMENTED`.
@@ -598,7 +540,7 @@ We modelled a Mainline card as **2 regions, uniform**. The design has **ten dist
 | Plains | 60 | |
 | Curves | 30 | |
 | Hilly | **P60 / F30** | different speeds for passenger and freight |
-| Heavy Grade (Up) | **G** | player sets orientation †; Brakeman/Airbrakes/Helpers unlock better start positions |
+| Heavy Grade (Up) | **G** | player sets orientation; Brakeman/Airbrakes/Helpers unlock better start positions |
 | Double Track | 60 | **trains may pass** |
 | Uncontrolled Siding | 60 | trains may pass; separate "no pass" and "passing" starts |
 | Tunnel | 30 | |
@@ -606,10 +548,6 @@ We modelled a Mainline card as **2 regions, uniform**. The design has **ten dist
 | Interchange | 60 | **sort cars into any new order**; has a Yard Limit. Printed "Yard" on the prototype card and renamed after play — it shared a word with the Division Yard, the Classification Yard, the Salvage Yard, the Yard Office and the Small Yard, and is none of them |
 | East / West Division Point | — | the ends |
 
-† **"Player sets orientation" is deliberately NOT implemented** — the table records what the card
-prints, which is what this section is for. The game rolls the uphill direction from the seed instead;
-settled v0.5.0, re-confirmed 2026-08-23, reasoning in §10 Q11 above.
-
 Each card shows **Start positions** — where a train enters depending on direction, train type, and
 which modifier cards are in play. The Heavy Grade card has five distinct starts (plain, brakemen,
 airbrakes, plain, helpers), so playing Brakeman literally moves your entry point further along.

docs/rules/open-questions.md

@@ -723,12 +723,10 @@ leave no way at all to speed up a slow facility. Section Gang is the sole worker
 keeps that power scarce. Capacity modifiers are stronger than they sound, since banking room rather
 than worker count is what limits output.
 
-**Sub-decision — what a "Freight House" is. SUPERSEDED (v0.5.0).** §9.3 and Appendix A refer to
-Freight Houses, but §9's facility list never defines one. This originally concluded it was **not a
-card** — the collective term for a freight facility that both loads and unloads, under 10a the
-Grocer's Warehouse and the Oil Refinery. That reading was wrong: it **is** a card, a sixth Freight
-Facility dealt 6 copies (`content.ts`'s `freightHouse` profile), which the engine has implemented
-all along. Left here for the reasoning; do not read this entry as current.
+**Sub-decision — what a "Freight House" is.** §9.3 and Appendix A refer to Freight Houses, but §9's
+facility list never defines one. It is **not a card**: it is the collective term for a freight
+facility that both loads and unloads — under 10a, the Grocer's Warehouse and the Oil Refinery. This
+reconciles every reference without adding a card type or disturbing Gap 4a's deck composition.
 
 ### 10e — Revenue/Day revalidated, and the Gap 6 targets revised
 

docs/rules/rules-v0.2.md

@@ -452,10 +452,9 @@ Loading and unloading of Rolling Stock (passengers and freight) takes place in t
   (§11). A Whistle Post is not a Passenger Facility, so a player who has not upgraded has no
   passenger business at all.
 - **Freight Facilities:** Mine Tipples, Produce Sheds, Grocer's Warehouses, Oil Refineries, Power
-  Plants, Freight Houses. Per-card values in §12.5.
-- **Freight House:** a Freight Facility card in its own right (corrected v0.5.0 — **[Gap 10d]**
-  previously read this as a collective term for the Grocer's Warehouse and the Oil Refinery rather
-  than a card of its own). Permits both directions, the same as those two.
+  Plants. Per-card values in §12.5.
+- **Freight House:** **[Gap 10d]** not a facility type of its own, but the collective term for a
+  freight facility permitting both directions — the Grocer's Warehouse and the Oil Refinery.
 - **Modifier Facilities:** Cards that, placed adjacent (on any of the nine nearby spots), increase a
   passenger or freight facility's capacities. If two Facilities are adjacent to the Modifier, its
   effects may only be used on one Facility per **Stage** **[Gap 7]**.
@@ -754,11 +753,11 @@ Modifier effects, and track geometries — is catalogued in
 | Extra Platform | +1 green and +1 red slot (passenger) |
 | Section Gang | +1 Laborer or +1 Porter |
 
-**"Freight House"** (§9.3, Appendix A) is a Freight Facility card (corrected v0.5.0 — previously
-read as not a card, only a collective term for a facility that both loads and unloads). It is the
-**only** industry that permits both directions: the Grocer's Warehouse receives and the Oil Refinery
-ships, one way each (corrected v0.4.9e from playtesting — the "Both" reading was the other half of
-the same mistake about what "Freight House" meant).
+**"Freight House"** (§9.3, Appendix A) is a Freight Facility card, dealt like any other industry —
+this used to read "not a card, only the collective term for a facility that both loads and unloads",
+which the engine never agreed with. It is the **only** industry that permits both directions: the
+Grocer's Warehouse receives and the Oil Refinery ships, one way each (corrected v0.4.9e from gameplay
+testing — the "Both" reading was the other half of the same mistake about what "Freight House" meant).
 
 ---
 

docs/station-master-seed116956197-day2.json

@@ -1,301 +0,0 @@
-{
- "seed": 116956197,
- "history": [
-  {
-   "type": "localOps.choose",
-   "option": "draw"
-  },
-  {
-   "type": "draw.fromDepartment",
-   "slot": 0
-  },
-  {
-   "type": "card.play",
-   "cardId": "c27"
-  },
-  {
-   "type": "card.play",
-   "cardId": "c30"
-  },
-  {
-   "type": "card.play",
-   "cardId": "c4"
-  },
-  {
-   "type": "card.play",
-   "cardId": "c2"
-  },
-  {
-   "type": "draw.end"
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "draw"
-  },
-  {
-   "type": "draw.fromDepartment",
-   "slot": 2
-  },
-  {
-   "type": "card.play",
-   "cardId": "c197",
-   "placement": {
-    "row": 0,
-    "col": -1
-   },
-   "variant": 1
-  },
-  {
-   "type": "draw.end"
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "draw"
-  },
-  {
-   "type": "draw.fromDepartment",
-   "slot": 2
-  },
-  {
-   "type": "card.play",
-   "cardId": "c163",
-   "placement": {
-    "row": 1,
-    "col": -1
-   },
-   "variant": 0
-  },
-  {
-   "type": "card.play",
-   "cardId": "c41",
-   "placement": {
-    "row": 1,
-    "col": 0
-   },
-   "variant": 0
-  },
-  {
-   "type": "draw.end"
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "draw"
-  },
-  {
-   "type": "draw.fromDepartment",
-   "slot": 0
-  },
-  {
-   "type": "card.play",
-   "cardId": "c127",
-   "placement": {
-    "row": 0,
-    "col": 1
-   },
-   "variant": 0
-  },
-  {
-   "type": "draw.end"
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "draw"
-  },
-  {
-   "type": "draw.fromHomeOffice"
-  },
-  {
-   "type": "card.play",
-   "cardId": "c183",
-   "placement": {
-    "row": 0,
-    "col": 2
-   },
-   "variant": 1
-  },
-  {
-   "type": "card.play",
-   "cardId": "c150",
-   "placement": {
-    "row": 1,
-    "col": 2
-   },
-   "variant": 0
-  },
-  {
-   "type": "draw.end"
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "draw"
-  },
-  {
-   "type": "draw.fromDepartment",
-   "slot": 1
-  },
-  {
-   "type": "card.play",
-   "cardId": "c136",
-   "placement": {
-    "row": 1,
-    "col": 1
-   },
-   "variant": 0
-  },
-  {
-   "type": "draw.end"
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "draw"
-  },
-  {
-   "type": "draw.fromDepartment",
-   "slot": 0
-  },
-  {
-   "type": "draw.end"
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "draw"
-  },
-  {
-   "type": "draw.fromHomeOffice"
-  },
-  {
-   "type": "draw.end"
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "draw"
-  },
-  {
-   "type": "draw.fromHomeOffice"
-  },
-  {
-   "type": "card.discard",
-   "cardId": "c77",
-   "toSlot": 1
-  },
-  {
-   "type": "draw.end"
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "draw"
-  },
-  {
-   "type": "draw.fromHomeOffice"
-  },
-  {
-   "type": "card.discard",
-   "cardId": "c171",
-   "toSlot": 0
-  },
-  {
-   "type": "draw.end"
-  },
-  {
-   "type": "newTrain.placeCar",
-   "trayId": "tray3",
-   "carType": "boxcar",
-   "loaded": false
-  },
-  {
-   "type": "newTrain.placeCar",
-   "trayId": "tray3",
-   "carType": "boxcar",
-   "loaded": true
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "draw"
-  },
-  {
-   "type": "draw.fromHomeOffice"
-  },
-  {
-   "type": "card.discard",
-   "cardId": "c153",
-   "toSlot": 1
-  },
-  {
-   "type": "draw.end"
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "draw"
-  },
-  {
-   "type": "draw.fromHomeOffice"
-  },
-  {
-   "type": "card.play",
-   "cardId": "c9"
-  },
-  {
-   "type": "draw.end"
-  },
-  {
-   "type": "newTrain.placeCar",
-   "trayId": "tray2",
-   "carType": "coach",
-   "loaded": true
-  },
-  {
-   "type": "newTrain.placeCar",
-   "trayId": "tray2",
-   "carType": "coach",
-   "loaded": true
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "switch"
-  }
- ],
- "rules": {
-  "startingHand": "sixRandom",
-  "revenue": {
-   "passengerPerCoach": 1,
-   "freightPerLoad": 1,
-   "trainPerTransit": 0
-  }
- }
-}

docs/station-master-seed116956197-day2b.json

@@ -1,714 +0,0 @@
-{
- "seed": 116956197,
- "history": [
-  {
-   "type": "localOps.choose",
-   "option": "draw"
-  },
-  {
-   "type": "draw.fromDepartment",
-   "slot": 0
-  },
-  {
-   "type": "card.play",
-   "cardId": "c27"
-  },
-  {
-   "type": "card.play",
-   "cardId": "c30"
-  },
-  {
-   "type": "card.play",
-   "cardId": "c4"
-  },
-  {
-   "type": "card.play",
-   "cardId": "c2"
-  },
-  {
-   "type": "draw.end"
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "draw"
-  },
-  {
-   "type": "draw.fromDepartment",
-   "slot": 2
-  },
-  {
-   "type": "card.play",
-   "cardId": "c197",
-   "placement": {
-    "row": 0,
-    "col": -1
-   },
-   "variant": 1
-  },
-  {
-   "type": "draw.end"
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "draw"
-  },
-  {
-   "type": "draw.fromDepartment",
-   "slot": 2
-  },
-  {
-   "type": "card.play",
-   "cardId": "c163",
-   "placement": {
-    "row": 1,
-    "col": -1
-   },
-   "variant": 0
-  },
-  {
-   "type": "card.play",
-   "cardId": "c41",
-   "placement": {
-    "row": 1,
-    "col": 0
-   },
-   "variant": 0
-  },
-  {
-   "type": "draw.end"
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "draw"
-  },
-  {
-   "type": "draw.fromDepartment",
-   "slot": 0
-  },
-  {
-   "type": "card.play",
-   "cardId": "c127",
-   "placement": {
-    "row": 0,
-    "col": 1
-   },
-   "variant": 0
-  },
-  {
-   "type": "draw.end"
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "draw"
-  },
-  {
-   "type": "draw.fromHomeOffice"
-  },
-  {
-   "type": "card.play",
-   "cardId": "c183",
-   "placement": {
-    "row": 0,
-    "col": 2
-   },
-   "variant": 1
-  },
-  {
-   "type": "card.play",
-   "cardId": "c150",
-   "placement": {
-    "row": 1,
-    "col": 2
-   },
-   "variant": 0
-  },
-  {
-   "type": "draw.end"
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "draw"
-  },
-  {
-   "type": "draw.fromDepartment",
-   "slot": 1
-  },
-  {
-   "type": "card.play",
-   "cardId": "c136",
-   "placement": {
-    "row": 1,
-    "col": 1
-   },
-   "variant": 0
-  },
-  {
-   "type": "draw.end"
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "draw"
-  },
-  {
-   "type": "draw.fromDepartment",
-   "slot": 0
-  },
-  {
-   "type": "draw.end"
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "draw"
-  },
-  {
-   "type": "draw.fromHomeOffice"
-  },
-  {
-   "type": "draw.end"
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "draw"
-  },
-  {
-   "type": "draw.fromHomeOffice"
-  },
-  {
-   "type": "card.discard",
-   "cardId": "c77",
-   "toSlot": 1
-  },
-  {
-   "type": "draw.end"
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "draw"
-  },
-  {
-   "type": "draw.fromHomeOffice"
-  },
-  {
-   "type": "card.discard",
-   "cardId": "c171",
-   "toSlot": 0
-  },
-  {
-   "type": "draw.end"
-  },
-  {
-   "type": "newTrain.placeCar",
-   "trayId": "tray3",
-   "carType": "boxcar",
-   "loaded": false
-  },
-  {
-   "type": "newTrain.placeCar",
-   "trayId": "tray3",
-   "carType": "boxcar",
-   "loaded": true
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "draw"
-  },
-  {
-   "type": "draw.fromHomeOffice"
-  },
-  {
-   "type": "card.discard",
-   "cardId": "c153",
-   "toSlot": 1
-  },
-  {
-   "type": "draw.end"
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "draw"
-  },
-  {
-   "type": "draw.fromHomeOffice"
-  },
-  {
-   "type": "card.play",
-   "cardId": "c9"
-  },
-  {
-   "type": "draw.end"
-  },
-  {
-   "type": "newTrain.placeCar",
-   "trayId": "tray2",
-   "carType": "coach",
-   "loaded": true
-  },
-  {
-   "type": "newTrain.placeCar",
-   "trayId": "tray2",
-   "carType": "coach",
-   "loaded": true
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "switch"
-  },
-  {
-   "type": "switch.move",
-   "trayId": "tray3",
-   "to": {
-    "row": 0,
-    "col": -2
-   },
-   "reverse": false
-  },
-  {
-   "type": "switch.move",
-   "trayId": "tray3",
-   "to": {
-    "row": 1,
-    "col": 0
-   },
-   "reverse": true
-  },
-  {
-   "type": "switch.dropCars",
-   "trayId": "tray3",
-   "count": 1
-  },
-  {
-   "type": "switch.move",
-   "trayId": "tray3",
-   "to": {
-    "row": 0,
-    "col": -2
-   },
-   "reverse": false
-  },
-  {
-   "type": "switch.move",
-   "trayId": "tray3",
-   "to": {
-    "row": 0,
-    "col": 0
-   },
-   "reverse": true
-  },
-  {
-   "type": "switch.end"
-  },
-  {
-   "type": "laborer.beginUnload",
-   "at": {
-    "row": 1,
-    "col": 0
-   },
-   "carIndex": 0
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "draw"
-  },
-  {
-   "type": "draw.fromHomeOffice"
-  },
-  {
-   "type": "card.discard",
-   "cardId": "c162",
-   "toSlot": 2
-  },
-  {
-   "type": "draw.end"
-  },
-  {
-   "type": "porter.detrain",
-   "at": {
-    "row": 0,
-    "col": 0
-   }
-  },
-  {
-   "type": "porter.detrain",
-   "at": {
-    "row": 0,
-    "col": 0
-   }
-  },
-  {
-   "type": "laborer.advanceLoad",
-   "at": {
-    "row": 1,
-    "col": 0
-   },
-   "box": 2
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "freightAgent"
-  },
-  {
-   "type": "freightAgent.clearInbound",
-   "at": {
-    "row": 0,
-    "col": 0
-   },
-   "index": 0
-  },
-  {
-   "type": "laborer.advanceLoad",
-   "at": {
-    "row": 1,
-    "col": 0
-   },
-   "box": 1
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "freightAgent"
-  },
-  {
-   "type": "freightAgent.clearInbound",
-   "at": {
-    "row": 0,
-    "col": 0
-   },
-   "index": 0
-  },
-  {
-   "type": "laborer.advanceLoad",
-   "at": {
-    "row": 1,
-    "col": 0
-   },
-   "box": 0
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "freightAgent"
-  },
-  {
-   "type": "freightAgent.stockOutbound",
-   "at": {
-    "row": 1,
-    "col": 0
-   },
-   "carType": "boxcar"
-  },
-  {
-   "type": "laborer.startLoad",
-   "at": {
-    "row": 1,
-    "col": 0
-   }
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "freightAgent"
-  },
-  {
-   "type": "freightAgent.stockOutbound",
-   "at": {
-    "row": 0,
-    "col": 0
-   },
-   "carType": "coach"
-  },
-  {
-   "type": "newTrain.placeCar",
-   "trayId": "tray2",
-   "carType": "boxcar",
-   "loaded": true
-  },
-  {
-   "type": "newTrain.placeCar",
-   "trayId": "tray2",
-   "carType": "boxcar",
-   "loaded": true
-  },
-  {
-   "type": "newTrain.placeCar",
-   "trayId": "tray2",
-   "carType": "boxcar",
-   "loaded": true
-  },
-  {
-   "type": "newTrain.placeCar",
-   "trayId": "tray2",
-   "carType": "caboose",
-   "loaded": true
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "freightAgent"
-  },
-  {
-   "type": "freightAgent.clearInbound",
-   "at": {
-    "row": 1,
-    "col": 0
-   },
-   "index": 0
-  },
-  {
-   "type": "laborer.advanceLoad",
-   "at": {
-    "row": 1,
-    "col": 0
-   },
-   "box": 0
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "freightAgent"
-  },
-  {
-   "type": "freightAgent.stockOutbound",
-   "at": {
-    "row": 0,
-    "col": 0
-   },
-   "carType": "coach"
-  },
-  {
-   "type": "laborer.advanceLoad",
-   "at": {
-    "row": 1,
-    "col": 0
-   },
-   "box": 1
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "draw"
-  },
-  {
-   "type": "draw.fromHomeOffice"
-  },
-  {
-   "type": "card.discard",
-   "cardId": "c50",
-   "toSlot": 0
-  },
-  {
-   "type": "draw.end"
-  },
-  {
-   "type": "laborer.advanceLoad",
-   "at": {
-    "row": 1,
-    "col": 0
-   },
-   "box": 2
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "switch"
-  },
-  {
-   "type": "switch.move",
-   "trayId": "tray2",
-   "to": {
-    "row": 0,
-    "col": -2
-   },
-   "reverse": true
-  },
-  {
-   "type": "switch.dropCars",
-   "trayId": "tray2",
-   "count": 1
-  },
-  {
-   "type": "switch.move",
-   "trayId": "tray2",
-   "to": {
-    "row": 0,
-    "col": 3
-   },
-   "reverse": false,
-   "via": {
-    "row": 0,
-    "col": 0
-   }
-  },
-  {
-   "type": "switch.move",
-   "trayId": "tray2",
-   "to": {
-    "row": 1,
-    "col": 0
-   },
-   "reverse": true
-  },
-  {
-   "type": "switch.move",
-   "trayId": "tray2",
-   "to": {
-    "row": 0,
-    "col": 3
-   },
-   "reverse": false
-  },
-  {
-   "type": "switch.move",
-   "trayId": "tray2",
-   "to": {
-    "row": 0,
-    "col": 1
-   },
-   "reverse": true
-  },
-  {
-   "type": "switch.dropCars",
-   "trayId": "tray2",
-   "count": 1
-  },
-  {
-   "type": "switch.move",
-   "trayId": "tray2",
-   "to": {
-    "row": 0,
-    "col": 3
-   },
-   "reverse": false
-  },
-  {
-   "type": "newTrain.placeCar",
-   "trayId": "tray3",
-   "carType": "tank",
-   "loaded": false
-  },
-  {
-   "type": "newTrain.placeCar",
-   "trayId": "tray3",
-   "carType": "tank",
-   "loaded": false
-  },
-  {
-   "type": "loadUnload.end"
-  },
-  {
-   "type": "localOps.choose",
-   "option": "switch"
-  },
-  {
-   "type": "switch.move",
-   "trayId": "tray2",
-   "to": {
-    "row": 1,
-    "col": 0
-   },
-   "reverse": true
-  },
-  {
-   "type": "switch.dropCars",
-   "trayId": "tray2",
-   "count": 3
-  },
-  {
-   "type": "switch.move",
-   "trayId": "tray2",
-   "to": {
-    "row": 0,
-    "col": 3
-   },
-   "reverse": false
-  },
-  {
-   "type": "switch.move",
-   "trayId": "tray2",
-   "to": {
-    "row": 0,
-    "col": -2
-   },
-   "reverse": true,
-   "via": {
-    "row": 0,
-    "col": 1
-   }
-  },
-  {
-   "type": "switch.move",
-   "trayId": "tray2",
-   "to": {
-    "row": 0,
-    "col": 0
-   },
-   "reverse": false
-  },
-  {
-   "type": "switch.end"
-  }
- ],
- "rules": {
-  "startingHand": "sixRandom",
-  "revenue": {
-   "passengerPerCoach": 1,
-   "freightPerLoad": 1,
-   "trainPerTransit": 0
-  }
- }
-}

docs/testing/0.5.0-test-plan.md

@@ -1,195 +0,0 @@
-# Station Master 0.5.0 — Test Plan
-
-Written 2026-08-21, against an uncommitted working tree. Covers only the changes made in this
-session's work — victory-condition unification, the New Train phase fix, and the multiplayer server
-(Phases 2-3). Nothing here is committed yet; see the Coordination Note below before running any of it
-against a tree that has since moved.
-
-## Coordination note — shared working tree
-
-Another thread is bug-fixing the 0.4.9 series **in this same uncommitted working tree**, concurrently.
-`git status` shows changes I did not make in: `apply.ts`, `events.ts`, `track.ts`, `board-svg.ts`,
-`docs/rules/*.md`, `package-lock.json`, `scripts/build-web.ts`, `.gitignore`, plus new
-`docs/station-master-seed*.json` files still appearing as of this writing. **This plan does not cover
-any of that** — it is scoped to the files below, which are the ones I actually touched.
-
-Practical implications:
-- Before running this plan, confirm the files under "Files this plan covers" still read the way this
-  document describes them — the other thread's commits could in principle touch the same functions
-  (`apply.ts`'s `check()` is used directly by `src/server/session.ts`, for instance).
-- Run the full regression gate (`npm run typecheck && npm test`) fresh, not from a memory of an earlier
-  green run — both threads are editing live.
-- The two bodies of work are unrelated in intent (0.4.9 patch fixes vs. 0.5.0 multiplayer groundwork)
-  but share a tree, so a clean split into separate commits before either is finalized is worth doing
-  deliberately rather than by accident.
-
-### Files this plan covers
-
-```
-Engine:  src/engine/advance.ts, src/engine/content.ts, src/engine/setup.ts, src/engine/state.ts
-Web:     src/web/game.ts, src/web/main.ts, src/web/play.html, src/web/session.ts
-Sim:     src/sim/view.ts, src/sim/frame-delta.ts (new), src/sim/compare.ts, src/sim/harness.ts,
-         src/sim/replay.ts
-Server:  src/server/ (new — index.ts, http.ts, session.ts, persistence.ts)
-Tests:   test/advance.test.ts, test/multiplayer.test.ts, test/web.test.ts, test/setup.test.ts,
-         test/redaction.test.ts (new), test/frame-delta.test.ts (new), test/server/ (new)
-Docs:    TODO.md, package.json (test script only)
-```
-
----
-
-## 0. Automated regression gate — run first, every time
-
-```
-npm run typecheck
-npm test
-```
-
-Expected: typecheck clean, **all tests passing** (632 at the time this plan was written — the exact
-number will drift as the other thread's work lands; what matters is zero failures). If either command
-is red, stop and diagnose before doing anything below — a red gate means the manual steps are testing
-against a broken build.
-
-**If you only have time for one thing before the break ends, run this.** Everything else in this
-document is either already covered by it, or is the manual/live verification that can't be — flagged
-per-section below.
-
----
-
-## 1. Regression baseline — solitaire must play exactly as before
-
-The engine and dialog changes touch shared code paths solitaire also uses. None of this should have
-changed solitaire's actual behavior.
-
-| # | Test | Steps | Expected |
-|---|---|---|---|
-| 1.1 | Fresh deal | `npm run serve:web`, open `/play.html`, no URL params | A new random-seed solitaire game deals normally, board and hand render |
-| 1.2 | Full game to completion | Play (or let a bot/harness play) a solitaire game to Day 5 | Game ends with a win/loss exactly as it would have before — `minCombinedRevenue` defaults to `collectiveRevenueFloor(1,5)=15`, not the old fixed `20`; a game scoring 15-19 that used to lose now wins (**intentional** — see §3, not a bug) |
-| 1.3 | Save / restore | Play a few turns, reload the page (auto-restores from `localStorage`) | Game resumes exactly where it left off, house rules and victory dials intact |
-| 1.4 | Save file download | Click "Save replay" mid-game | Downloads a small JSON; re-opening it in the replay viewer plays back identically |
-| 1.5 | Undo | Play a few turns, click Undo repeatedly to the start | Each step back is clean; log never shows a move that "un-happened" |
-| 1.6 | Existing published replays | Open each file under `public/replays/` in the replay viewer | All three still play back — `LEGACY_HOUSE_RULES` fallback for saves with no `houseRules` field is unaffected by this session's changes |
-
-Automated coverage: `test/advance.test.ts`, `test/web.test.ts`, `test/session.test.ts` already assert
-most of this at the unit level. §1 is about confirming nothing *visibly* changed for a solitaire
-player, which only a live playthrough shows.
-
----
-
-## 2. New Train phase car-placement rotation (engine fix)
-
-**What changed:** the Superintendent used to place every car of every train alone, even in
-competitive mode, against §7's written rule. Now the round rotates Superintendent-then-left, one car
-per player, per `tray.consist.length`.
-
-Automated: `test/multiplayer.test.ts`, "the New Train phase car-placement round rotates (§7, Gap 9)" —
-asserts the exact actor sequence for 2p (wraps: 0,1,0) and 3p (no wrap: 0,1,2) against a real train
-profile.
-
-| # | Test | Steps | Expected |
-|---|---|---|---|
-| 2.1 | Manual multi-seat check | Drive a 3-4 player competitive game via the bot harness (`node src/sim/harness.ts`) or by hand through `src/server/`, and watch a Timetabled train get made up | Car-placement decisions visibly move between seats rather than one player filling the whole consist |
-| 2.2 | Solitaire unaffected | Play any solitaire game where a train is made up | No visible change — one player, nothing to rotate, `tray.consist.length % 1 === 0` always |
-
-Not covered, flagged in `TODO.md` (do not re-test, it's expected to be unreachable): `newTrain.passCar`
-still has a dormant `check()`/`reduce()` gap, harmless because `trainNeedingCars` never offers a tray
-with nothing suitable in the yard.
-
----
-
-## 3. Victory conditions unified (`GameConfig` dials)
-
-**What changed:** `days`, `minCombinedRevenue`, `maxCollisionsPerDay`, `maxCollisionsTotal`,
-`pvpCardsAllowed` replace the old `length`-preset/`target`/flat collision constant, across all three
-modes. Automated coverage: `test/advance.test.ts`'s "victory conditions (§3, Gap 10e) — unified
-2026-08-20" describe block (8 tests) covers every case below at the engine level already. This section
-is for confirming the *dialog* actually produces the numbers the engine then honors.
-
-| # | Test | Steps | Expected |
-|---|---|---|---|
-| 3.1 | `minCombinedRevenue` — loss | New Game, set it to a number higher than achievable, play to Day N | Loss, reason `revenueFloor`, regardless of individual score |
-| 3.2 | `minCombinedRevenue` — win | Set it to 0, play to Day N with any score | Win — `0` genuinely disables the floor |
-| 3.3 | `maxCollisionsPerDay` — **new solitaire behavior** | Set to 1, deliberately cause 1 collision (e.g. leave every A/D track occupied on an arrival) | Game ends **immediately**, mid-Stage, loss, reason `collisionFloor` — solitaire could never lose this way before this change |
-| 3.4 | `maxCollisionsTotal` | Set `maxCollisionsPerDay=0` (off), `maxCollisionsTotal=2`, cause 2 collisions across different Days | Game ends on the 2nd collision, whichever Day it falls on |
-| 3.5 | Both collision caps at 0 | Set both to 0, cause several collisions | Game does **not** end early — same as pre-change solitaire (collisions still cost Revenue, just don't end the game) |
-| 3.6 | Mode radio defaults | Open New Game, click Competitive | `minCombinedRevenue` suggests `3 × 4 × days` (nominal 4-player assumption — no lobby yet to ask real seat count), `pvpCardsAllowed` checks and enables, Deal disables with a "needs a server" note |
-| 3.7 | Mode radio — Co-op | Click Co-op | `pvpCardsAllowed` unchecks and **greys out** (forced off, not just defaulted off — no valid target when everyone's on one side), Deal disables |
-| 3.8 | Mode radio — back to Solitaire | Click Solitaire again | Deal re-enables, `pvpCardsAllowed` unchecks and greys, all four dials show the numbers the *currently playing* game actually has (not the preset) |
-| 3.9 | URL round-trip | Deal a game with non-default `days`/`minrev`/`colday`/`coltotal`, copy the URL, open it in a new tab | Identical settings — all four now travel via `?days=&minrev=&colday=&coltotal=` alongside the existing `?hand=&passenger=&freight=&transit=` |
-
-**Not yet clicked through in a real browser** (no browser binary in the sandbox this was built in —
-verified only via a simulated-DOM test harness, `test/web.test.ts`'s "the New Game dialog" describe
-block, which drives the actual compiled bundle). §3.6-3.9 specifically should get a real click-through
-before calling this done.
-
----
-
-## 4. Multiplayer server — Phase 2 (session core)
-
-New in this release: `src/server/` (session host, HTTP/SSE, static serving), `src/web/session.ts`'s
-`createRemoteSession`, `src/sim/frame-delta.ts`. Automated: `test/server/session.test.ts` (12 cases,
-pure logic, no sockets), `test/redaction.test.ts` (4 cases — the exhaustive "no seat sees another
-seat's secrets" check), `test/frame-delta.test.ts` (5 cases).
-
-| # | Test | Steps | Expected |
-|---|---|---|---|
-| 4.1 | Boot | `JOIN_SECRET=x PORT=8081 node src/server/index.ts` | Starts, logs the bind address and `dist/` path |
-| 4.2 | Join secret gate | `curl -X POST localhost:8081/api/game` (no `?secret=`) | `403 bad or missing secret` |
-| 4.3 | Create game | `POST /api/game?secret=x` with `{config, playerNames}` | `200 {ok:true, playerCount:N}`; a second call while a game exists → `409` |
-| 4.4 | Per-seat SSE | Open `/api/stream?seat=0` and `?seat=1` for a 2-player game | Only the current actor's push has a non-null `menu`; the other seat's is `null` |
-| 4.5 | Turn enforcement | `POST /api/intent` as the **non-acting** seat | `{ok:false, code:"NOT_YOUR_TURN"}`, no broadcast, no state change |
-| 4.6 | Accept + broadcast | `POST /api/intent` as the acting seat, a legal intent | `{ok:true}`; **both** SSE streams receive a push with fresh narration |
-| 4.7 | Idempotent resend | Submit the same `{seq, intent}` twice | Second call: `{ok:true}`, **no** new SSE push (already applied, silently ignored) |
-| 4.8 | Illegal intent | Submit something `check()` would reject | `{ok:false, code:"<real RejectionCode>"}`; the rejection text does **not** appear in the *other* seat's narration (private feedback, §session.ts's design note) |
-| 4.9 | Board delta | Submit an intent that doesn't move anything on the board (e.g. `localOps.choose`) | The next push's `frame.division`/`frame.cells` are `null` (unchanged-since-last-push-to-this-seat) |
-| 4.10 | Heartbeat | Hold an SSE connection open >20s idle | A `: ping` comment line appears (EventSource ignores it; keeps a proxy from reaping the socket) |
-| 4.11 | **Real browser — not yet done** | Two actual browser tabs, `?seat=0` and `?seat=1`, playing a shared game by clicking | Confirm the whole loop works through the actual UI, not just curl: turn indicator, disabled controls for the non-acting seat, board updates on both sides, a rejected action shows *something* sensible on screen rather than silently doing nothing |
-
-§4.1-4.10 were run live against a real server process during this session (not just unit-tested) — see
-the session transcript for the actual curl commands and captured output. §4.11 genuinely was not done;
-no browser was available in the environment this was built in.
-
----
-
-## 5. Multiplayer server — Phase 3 (persistence and resumption)
-
-New: `src/server/persistence.ts`, `game.ts`'s `fromMultiplayerSave`, `session.ts`'s `exportSave`/
-`resumeSession`/turn-timing tracking. Automated: `test/server/persistence.test.ts` (6 cases),
-`test/server/session.test.ts`'s "turn timings" and "persistence hooks" describe blocks.
-
-| # | Test | Steps | Expected |
-|---|---|---|---|
-| 5.1 | Immediate persistence | `POST /api/game`, then check `DATA_DIR/game.json` | Exists immediately, empty `history`, correct `engineVersion` (= `package.json`'s `version`) |
-| 5.2 | History grows | Submit a few intents | `game.json`'s `history` array grows by one entry per accepted intent, in order |
-| 5.3 | Turn timings recorded | Submit enough intents to cross a full turn (player/phase/day/stage change) | `DATA_DIR/turn-timings.json` gains an entry: `{player, phase, day, stage, startedAt, endedAt}`, `endedAt >= startedAt` |
-| 5.4 | **Restart and resume** (the actual "done when" for Phase 3) | Kill the server process mid-game, restart it against the same `DATA_DIR` | Log line: `"Resumed a saved game... N intents replayed"`; reconnecting both `?seat=` streams shows the exact same Day/Stage/phase/whose-turn as before the kill, correct narration attribution ("Player X chose to...", not anonymous) |
-| 5.5 | Version-mismatch refusal | Hand-edit `game.json`'s `engineVersion` to a bogus value, restart | Log line refusing to load, naming both versions; server starts with **no** active game (confirm via `POST /api/game` succeeding, not `409`ing); the file is **not** deleted or modified |
-| 5.6 | Atomic writes, no stray temp files | After several intents, check `DATA_DIR` | Only `game.json`/`turn-timings.json` present — no leftover `.tmp` files from an interrupted write |
-
-§5.1-5.6 were all run live during this session (kill-and-restart included) — see the transcript. This
-is the most thoroughly live-verified section of the whole plan.
-
----
-
-## 6. Things this session found but did *not* fix — verify they're still correctly deferred
-
-These are logged in `TODO.md`, not bugs to chase here — listed so a tester doesn't rediscover them and
-assume something regressed.
-
-| Item | Where | Current state to confirm |
-|---|---|---|
-| `fromSave`'s replay loses "Player X" narration attribution | `src/web/game.ts` | Still present in `fromSave` (untouched, out of scope); **fixed** in the new `fromMultiplayerSave` — §5.4's narration check is what confirms the fix landed where it needed to |
-| `newTrain.passCar`'s `check()`/`reduce()` gap | `src/engine/apply.ts` | Still dormant/unreachable — confirm no new caller has started exercising it (would only matter if the *other* thread's 0.4.9 work touches this area) |
-| No real browser click-through | This session | §3.6-3.9, §4.11 — the two gaps a human still needs to close |
-
----
-
-## Summary checklist
-
-- [ ] §0 automated gate green
-- [ ] §1 solitaire regression (six checks)
-- [ ] §2 New Train rotation, manual multi-seat check
-- [ ] §3 victory conditions, especially §3.6-3.9 (dialog, not yet browser-verified)
-- [ ] §4 server core, especially §4.11 (real browser, not yet done)
-- [ ] §5 persistence — already live-verified this session; worth a second independent run
-- [ ] §6 confirm the three known-and-deferred items are still exactly as described

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "station-master",
-  "version": "0.7.0",
+  "version": "0.4.8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "station-master",
-      "version": "0.7.0",
+      "version": "0.4.8",
       "devDependencies": {
         "@types/node": "^26.1.2",
         "typescript": "^7.0.2"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "station-master",
-  "version": "0.8.0.14",
+  "version": "0.4.9g",
   "private": true,
   "type": "module",
   "description": "Station Master — a railroad operations game",
@@ -9,14 +9,10 @@
   },
   "scripts": {
     "typecheck": "tsc --noEmit",
-    "pretest": "tsc --noEmit && node scripts/build-web.ts",
-    "test": "node --test $(ls test/*.test.ts test/**/*.test.ts | grep -v '^test/sim.test.ts$')",
-    "pretest:sim": "tsc --noEmit",
-    "test:sim": "node --test test/sim.test.ts",
+    "test": "node --test test/**/*.test.ts",
     "build:web": "node scripts/build-web.ts",
     "serve:web": "node scripts/build-web.ts && npx --yes http-server dist -p 8080 -c-1",
-    "deploy:web": "node scripts/deploy-web.ts",
-    "build:cards": "node scripts/build-card-reference.ts"
+    "deploy:web": "node scripts/deploy-web.ts"
   },
   "devDependencies": {
     "@types/node": "^26.1.2",

playtests/README.md

@@ -1,28 +0,0 @@
-# Playtest saves
-
-Save files that came in with a bug report, or that were kept from a session worth re-reading.
-
-**Nothing in here is committed** — `.gitignore` keeps the directory empty as far as git is
-concerned, except for this file. They are somebody's game, not part of the project, and they go
-stale the moment the rules move.
-
-## What a save is
-
-A seed and the list of moves made — a few hundred bytes of JSON. That is enough to rebuild the
-whole game, which is why a replay can be emailed like a text file. Written by **Save replay** on the
-play screen; a multiplayer game's copy lives on the server, under its data directory.
-
-## How to open one
-
-Open `replays.html` on the site (or a local `npm run serve:web`) and use **Open a save file** at the
-bottom of the page — it takes a file straight off disk, no upload anywhere. Step through it frame by
-frame to find the position being reported.
-
-A save replays only under the rules it was dealt with; every save records them, and one written
-before a rules change may stop part-way. That is expected, and it is why these are kept beside a
-report rather than in the repository.
-
-## Publishing one
-
-A replay worth keeping for everyone goes in `public/replays/` instead, where the build publishes it
-into the site's replay directory with an index entry.

scripts/build-card-reference.ts

@@ -1,268 +0,0 @@
-/**
- * Generate `docs/rules/as-built.md` — what the cards say, as the code actually has them.
- *
- * WHY THIS IS GENERATED RATHER THAN WRITTEN.
- *
- * Every other file in `docs/rules/` is a historical record and says so: `rules-v0.1.md` is a
- * faithful transcription of the prototype PDFs, `open-questions.md` is the gap tracker,
- * `rules-v0.2.md` and `card-reference.md` both carry SUPERSEDED banners. None of them describes the
- * game as built, and none of them should be edited to — the record is worth more intact than
- * patched.
- *
- * So there was no current reference at all, and `content.ts` spent several releases pointing at
- * `card-reference.md` as "the place that now carries what the cards say" while that file's own
- * banner said "do not use its numbers". A reader following the code's advice landed on the v0.4.5
- * deck: twelve numbered trains, "3 / 4 Mail-Express, 3 coaches", against a `content.ts` whose train
- * 3 is the Express with two freight cars and a per-location freight rule.
- *
- * A HAND-WRITTEN REPLACEMENT WOULD HAVE DRIFTED THE SAME WAY, and for the same reason: nothing
- * fails when a table falls behind a constant. So the reference is emitted from the same exported
- * catalogues the engine instantiates from, and `test/card-reference.test.ts` re-runs this generator
- * and asserts the checked-in file matches byte for byte. Change a card face and the suite goes red
- * until the doc is regenerated — which is the only mechanism this project has found that keeps a
- * document honest.
- *
- * `npm run build:cards` writes it. Nothing at runtime reads it; it is for people.
- */
-
-import { writeFileSync } from 'node:fs';
-import { dirname, join } from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-import {
-  ACTION_CARDS, ALL_TRAINS, ENHANCEMENT_CARDS, ENHANCEMENT_RULES, EXTRA_TRAINS, INDUSTRY_PROFILES,
-  LIMITS_SUPPLY, MAINLINE_DECK, MAINLINE_MODIFIER_CARDS, MAINLINE_PROFILES, MANEUVER_CARDS,
-  MODIFIER_PROFILES, OFFICE_PROFILES, SPACE_USE_CARDS, TIMETABLED_TRAINS, TRACK_CARDS,
-  WHISTLE_POST_SUPPLY, consistSize, isOpponentOnly, mainlineDescription,
-} from '../src/engine/content.ts';
-import type { ConsistSpec, SimpleCard, TrainProfile, TrainRules } from '../src/engine/content.ts';
-
-const root = join(dirname(fileURLToPath(import.meta.url)), '..');
-
-/** Title Case a camelCase key, so `oneFreightPerLocation` reads as a rule rather than an identifier. */
-const words = (k: string): string => k.replace(/([A-Z])/g, ' $1').toLowerCase().trim();
-
-const consistOf = (c: ConsistSpec): string => {
-  const parts: string[] = [];
-  if (c.freight > 0) {
-    const kinds = c.freightTypes ? c.freightTypes.join(' or ') : 'freight';
-    parts.push(`${c.freight} ${kinds}${c.freight === 1 ? '' : c.freightTypes ? 's' : ''}`);
-  }
-  if (c.coach > 0) parts.push(`${c.coach} coach${c.coach === 1 ? '' : 'es'}`);
-  if (c.caboose > 0) parts.push(`${c.caboose} caboose`);
-  if (!parts.length) return 'engine only';
-  const n = consistSize(c);
-  // "Empties only" qualifies the whole consist rather than adding to it, so it reads after the count.
-  return `${parts.join(' + ')} (${n} piece${n === 1 ? '' : 's'})${c.emptiesOnly ? ', empties only' : ''}`;
-};
-
-const rulesOf = (r: TrainRules): string => {
-  const out: string[] = [];
-  for (const [k, v] of Object.entries(r)) {
-    if (k === 'note' || v === false || v === undefined) continue;
-    out.push(words(k));
-  }
-  if (typeof r.note === 'string') out.push(`*"${r.note}"*`);
-  return out.length ? out.join('; ') : '—';
-};
-
-const trainRow = (t: TrainProfile): string =>
-  `| ${t.isExtra ? 'X' : ''}${t.number} | ${t.name} | ${t.speed} | ` +
-  `${t.direction === 'playerChoice' ? "player's choice" : t.direction} | ${consistOf(t.consist)} | ${rulesOf(t.rules)} |`;
-
-const lines: string[] = [];
-const w = (s = ''): void => void lines.push(s);
-
-w('# Station Master — the cards as built');
-w();
-w('> **Generated from `src/engine/content.ts` by `scripts/build-card-reference.ts`. Do not edit by');
-w('> hand** — `npm run build:cards` rewrites it, and `test/card-reference.test.ts` fails if this file');
-w('> and the code disagree.');
-w();
-w('This is the one file in `docs/rules/` that describes the game **as it currently is**. Everything');
-w('else in this directory is a historical record and marked as such: [`rules-v0.1.md`](rules-v0.1.md)');
-w('transcribes the prototype PDFs, [`open-questions.md`](open-questions.md) tracks how the gaps in');
-w('them were decided, and [`rules-v0.2.md`](rules-v0.2.md) and');
-w('[`card-reference.md`](card-reference.md) both describe superseded card sets. Read those for the');
-w('reasoning; read this for the numbers.');
-w();
-w('The engine instantiates from the same constants this is emitted from, so a disagreement between');
-w('this page and the game is a bug in the generator, not a stale table.');
-w();
-w('**No card counts appear here, deliberately** (TODO #15a, Jesse 2026-08-22): the counts move with');
-w('play balance, so a document that prints them is answering a question that will have a different');
-w('answer next retune. Where a count matters it is a yes/no — whether the deck deals the card at');
-w('all — which is a fact about the design rather than about the current tuning.');
-w();
-w('---');
-w();
-
-w('## Trains');
-w();
-w(`${TIMETABLED_TRAINS.length} timetabled and ${EXTRA_TRAINS.length} Extras, ${ALL_TRAINS.length} in all.`);
-w('Odd numbers run west, even run east; a pair shares a class and is the same card face in two');
-w('directions. A Crew Tray holds four pieces and a caboose counts toward the four, which is why no');
-w('train with a caboose carries more than three revenue cars.');
-w();
-w('### Timetabled');
-w();
-w('| # | Class | Speed | Runs | Consist | Printed rules |');
-w('| ---: | --- | --- | --- | --- | --- |');
-for (const t of TIMETABLED_TRAINS) w(trainRow(t));
-w();
-w('### Extras');
-w();
-w('| # | Class | Speed | Runs | Consist | Printed rules |');
-w('| ---: | --- | --- | --- | --- | --- |');
-for (const t of EXTRA_TRAINS) w(trainRow(t));
-w();
-w('---');
-w();
-
-w('## Mainline cards');
-w();
-w('A card is divided into **regions**, and a train advances one region per Stage — so the regions a');
-w('card prints are what it costs to cross. Where a train *enters* is what the rules move: a fast');
-w('train on Hilly, a Heavy Grade with Helpers, or a card whose back region is a siding rather than');
-w('part of the road all change the entry point rather than the card\'s length.');
-w();
-w('| Card | Regions | Default entry | Fast / slow entry | Trains may pass | Sorts cars |');
-w('| --- | ---: | ---: | --- | :---: | :---: |');
-for (const m of MAINLINE_PROFILES) {
-  const ss = m.speedStarts ? `${m.speedStarts.fast} / ${m.speedStarts.slow}` : '—';
-  w(`| ${m.name} | ${m.regions} | ${m.defaultStart} | ${ss} | ${m.trainsMayPass ? 'yes' : '—'} | ${m.sortsCars ? 'yes' : '—'} |`);
-}
-w();
-w(`The Mainline deck is ${MAINLINE_DECK.length} cards; the two Division Points are the fixed ends of`);
-w('the Division and are not dealt. What each card does, in the words the game uses on screen:');
-w();
-for (const m of MAINLINE_PROFILES) w(`- **${m.name}** — ${mainlineDescription(m.kind)}`);
-w();
-w('---');
-w();
-
-w('## Office cards');
-w();
-w('Upgrades are strictly sequential — no skipping a tier — so a Terminal needs all three cards in');
-w('order. Green slots are outbound passengers, red are inbound, and the design gives slots **equal**');
-w('to Porters rather than one more.');
-w();
-w('| Office | Control point | Passenger facility | A/D tracks | Porters | Green | Red |');
-w('| --- | :---: | :---: | ---: | ---: | ---: | ---: |');
-for (const o of OFFICE_PROFILES) {
-  w(`| ${o.name} | ${o.isControlPoint ? 'yes' : '—'} | ${o.isPassengerFacility ? 'yes' : '—'} | ` +
-    `${o.adTracks} | ${o.porters} | ${o.passengerOut} | ${o.passengerIn} |`);
-}
-w();
-w(`Whistle Posts are a fixed supply of ${WHISTLE_POST_SUPPLY} outside the deck, and Limits signs a`);
-w(`supply of ${LIMITS_SUPPLY}.`);
-w();
-w('---');
-w();
-
-w('## Freight facilities');
-w();
-w('Each lists the car types it works, which way its traffic flows, and the industries it may not sit');
-w('beside. **Every lockout pair is a producer and the consumer of the same commodity** — you may');
-w('build one end of a chain or the other, never both, which is what forces traffic to run between');
-w('districts rather than in circles inside one. No two of the same industry may share an Office Area,');
-w('and that rule is enforced for every kind rather than repeated in each row.');
-w();
-w('| Industry | Cars | Flow | Green | Red | Laborers | Locked out with |');
-w('| --- | --- | --- | ---: | ---: | ---: | --- |');
-for (const f of INDUSTRY_PROFILES) {
-  const lo = f.lockouts.length
-    ? f.lockouts.map((k) => INDUSTRY_PROFILES.find((p) => p.kind === k)?.name ?? k).join(', ')
-    : '—';
-  w(`| ${f.name} | ${f.carTypes.join(', ')} | ${f.flow} | ${f.baseOut} | ${f.baseIn} | ${f.baseLoaders} | ${lo} |`);
-}
-w();
-w('---');
-w();
-
-w('## Modifier cards');
-w();
-w('Each sits beside a host and raises one of its capacities. `office` as a host means any Passenger');
-w('Facility — so a modifier that adds a green slot to an Office adds nothing to a Whistle Post, which');
-w('is not one.');
-w();
-w('| Modifier | Hosts | +Green | +Red | +Laborers | +Porters |');
-w('| --- | --- | ---: | ---: | ---: | ---: |');
-for (const m of MODIFIER_PROFILES) {
-  const hosts = m.hosts
-    .map((h) => (h === 'office' ? 'any Passenger Facility' : INDUSTRY_PROFILES.find((p) => p.kind === h)?.name ?? h))
-    .join(', ');
-  w(`| ${m.name} | ${hosts} | ${m.addOut || '—'} | ${m.addIn || '—'} | ${m.addLoaders || '—'} | ${m.addPorters || '—'} |`);
-}
-w();
-w('---');
-w();
-
-w('## Track cards');
-w();
-w('Track is **in the Home Office deck** and is drawn and played like any other card — not a separate');
-w('per-player supply. Operational Rail is the flag that says a train may stop on the card; a turnout');
-w('may be run through but not stopped on.');
-w();
-w('| Track | Geometry | Hand | Operational rail | Move cost | Dealt |');
-w('| --- | --- | --- | :---: | ---: | :---: |');
-for (const t of TRACK_CARDS) {
-  w(`| ${t.name} | ${t.geometry} | ${t.hand} | ${t.isOperationalRail ? 'yes' : '—'} | ${t.moveCost} | ${t.copiesInDeck ? 'yes' : 'no'} |`);
-}
-w();
-w('A row marked "no" is a shape the engine understands but the deck does not currently print.');
-w();
-w('---');
-w();
-
-w('## Enhancements');
-w();
-w('The column that only the implementation can fill in: **whether the printed effect actually');
-w('resolves yet.** `live` is read during play; `dormantSolo` is implemented at the point of attack');
-w('but the attack is an opponent-directed card held out of every deck, so nothing reaches it in a');
-w('solitaire game; `unbuilt` means the effect is recorded and nothing reads it. A transcription');
-w('cannot carry this column, which is the argument for generating the page rather than writing it.');
-w();
-w('| Enhancement | Placement | Requires | Effect resolves |');
-w('| --- | --- | --- | :---: |');
-for (const r of ENHANCEMENT_RULES) {
-  const card = ENHANCEMENT_CARDS.find((c) => c.key === r.key);
-  const needs = r.requiresOnSameCard
-    ? `${r.requiresOnSameCard} on the same card`
-    : r.requiresInDistrict
-      ? `${r.requiresInDistrict} in the district`
-      : '—';
-  w(`| ${card?.name ?? r.key} | ${r.placement} | ${needs} | **${r.effect}** |`);
-}
-w();
-w('---');
-w();
-
-w('## Opponent-directed cards, and what answers them');
-w();
-w('**None of these is dealt in any deck today.** A card that can only be played at another player');
-w('has no legal target in a solitaire game, and a defence with nothing to defend against is as dead');
-w('a draw as the attack — so both halves are held out until the attacks are implemented. They are');
-w('listed because they are the design, and because what a defence answers is the only record of why');
-w('it exists.');
-w();
-const pvp = (title: string, cards: readonly SimpleCard[], category: string): void => {
-  w(`### ${title}${isOpponentOnly(category) ? ' — opponent-directed' : ''}`);
-  w();
-  w('| Card | Played on | Effect | Answers |');
-  w('| --- | --- | --- | --- |');
-  for (const c of cards) w(`| ${c.name} | ${c.placement} | ${c.effect} | ${c.answers ?? '—'} |`);
-  w();
-};
-pvp('Action cards', ACTION_CARDS, 'action');
-pvp('Space-use cards', SPACE_USE_CARDS, 'spaceUse');
-pvp('Maneuver cards', MANEUVER_CARDS, 'maneuver');
-w('Mainline modifier cards, for completeness — these ARE dealt:');
-w();
-w('| Card | Played on | Effect | Answers |');
-w('| --- | --- | --- | --- |');
-for (const c of MAINLINE_MODIFIER_CARDS) w(`| ${c.name} | ${c.placement} | ${c.effect} | ${c.answers ?? '—'} |`);
-w();
-
-writeFileSync(join(root, 'docs/rules/as-built.md'), `${lines.join('\n')}\n`);
-console.log(`built -> docs/rules/as-built.md (${lines.length} lines)`);

scripts/build-web.ts

@@ -15,13 +15,7 @@ import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
 const root = join(dirname(fileURLToPath(import.meta.url)), '..');
-/**
- * Overridable so a test can point the build at an isolated directory instead of the shared
- * `dist/` the rest of the suite reads — see `test/web.test.ts`'s "builds, and needs nothing but a
- * static host". Must be a sibling of `dist/`, not nested inside it: this script's own `rmSync`
- * below wipes the whole directory it is given, so nesting one inside the other would still race.
- */
-const dist = join(root, process.env['BUILD_DIST_DIR'] ?? 'dist');
+const dist = join(root, 'dist');
 
 rmSync(dist, { recursive: true, force: true });
 mkdirSync(dist, { recursive: true });
@@ -60,27 +54,7 @@ execFileSync(
  */
 function buildStamp(): string {
   const pkg = JSON.parse(readFileSync(join(root, 'package.json'), 'utf8')) as { version: string };
-  /**
-   * THE FALLBACK HAS TO BE UNIQUE PER BUILD, because this string is also the cache-bust key.
-   *
-   * It used to be the literal `nogit`, which is exactly what the `.s9pk` build produces — the
-   * Dockerfile copies the working tree in without `.git`, so `git rev-parse` fails there every time.
-   * Every packaged release therefore published `?v=nogit`, byte-identical to the release before it,
-   * and a returning player's browser had no reason to refetch a single module. v0.7.5's setup screen
-   * and v0.7.6's fix to it both shipped correctly to `phoenix.local` and neither reached the browser
-   * that asked for them (Jesse, twice, 2026-08-29 — "setup did not work").
-   *
-   * A marker plus the build's own timestamp is always distinct, needs nothing from the environment,
-   * and stays honest: two builds of the same commit ARE two deploys, and a cache key that says so
-   * costs one refetch, while one that lies costs a release nobody receives.
-   *
-   * NOT THE VERSION, which is what this used to lead with. The stamp below already begins with
-   * `v${pkg.version}`, so on exactly the builds that take this path — every `.s9pk`, which has no
-   * `.git` — the header read "v0.8.0.10 · 0.8.0.10-mfq2p1 · …" and the version appeared twice
-   * (Jesse, playtest 2026-09-16). The timestamp alone carries the uniqueness; the version is
-   * already said once, properly, at the front.
-   */
-  let git = `nogit-${Date.now().toString(36)}`;
+  let git = 'nogit';
   try {
     const sha = execFileSync('git', ['rev-parse', '--short', 'HEAD'], { cwd: root })
       .toString()

src/engine/apply.ts

@@ -16,6 +16,7 @@
 
 import {
   FREIGHT_PROFILES,
+  HAND_LIMIT,
   LABORER_ACTIONS_PER_LOAD,
   MAX_CONSIST,
   REALIGNMENTS,
@@ -51,16 +52,12 @@ import type {
   TrayId,
   TurnoutOrientation,
 } from './state.ts';
-import { tallyEvent } from './tally.ts';
 import { createRng } from './rng.ts';
 import {
   carsOn,
   coordKey,
   cutTowards,
-  decisionActor,
-  officeNodeFor,
   isOperationalRail,
-  overHandLimit,
   playerAtSeat,
   pooled,
   railFacingOf,
@@ -80,7 +77,6 @@ import {
   facilityVariants,
   opposite,
   reachableDestinations,
-  rowEndAt,
   variantsFor,
   withinLimits,
 } from './track.ts';
@@ -126,12 +122,7 @@ function trayCoord(s: GameState, trayId: TrayId): GridCoord | null {
 }
 
 /** A tray sitting on the Office card occupies an A/D track (§2.1). */
-/**
- * Exported for `advance.ts`'s Yard Office walk (Gitea#5), which has to ask the SAME occupancy
- * question a switching move asks — a second copy would be free to drift into a different answer
- * about which cards are free.
- */
-export function occupancyFor(s: GameState, player: PlayerIndex, self: TrayId): Occupancy {
+function occupancyFor(s: GameState, player: PlayerIndex, self: TrayId): Occupancy {
   const area = areaOf(s, player);
   return {
     trayAt: (c) => {
@@ -340,15 +331,6 @@ function checkTurnoutUpgrade(existing: TrackCard, proto: TrackCard): RejectionCo
 
   if (existing.standing.length > 0) return 'UPGRADE_OCCUPIED';
   if (existing.enhancements.length > 0) return 'UPGRADE_ENHANCED';
-  /**
-   * NOTHING IS ASKED ABOUT THE NEIGHBOURS, deliberately (Gitea#15).
-   *
-   * A turnout adds a 45° leg the card underneath did not have, and that leg may well point into an
-   * occupied square with nothing to meet it. That is legal: RAR ruled (2026-08-26) that a rail may
-   * stop dead against its neighbour, and an upgrade is no different from laying the piece there in
-   * the first place. What must hold either way is that no train can cross the gap, which is
-   * `exploreMoves`' business and is tested in `track.test.ts`.
-   */
   return null;
 }
 
@@ -607,8 +589,7 @@ function freightWorkedKey(trayId: TrayId, at: GridCoord): string {
   return `${trayId}@${coordKey(at)}`;
 }
 
-/** Exported so the Blocked panel counts a freight car the same way the reducers do (Gitea#21). */
-export const isFreight = (c: RollingStock): boolean => c.type !== 'coach' && c.type !== 'caboose';
+const isFreight = (c: RollingStock): boolean => c.type !== 'coach' && c.type !== 'caboose';
 
 /**
  * IS THIS CAR CARRYING A LOAD? A CABOOSE NEVER IS, whatever its `loaded` flag says.
@@ -658,20 +639,6 @@ function switchingRefusal(tray: CrewTray): RejectionCode | null {
   return rulesOf(tray).noSwitching ? 'NO_SWITCHING' : null;
 }
 
-/**
- * WHETHER TRAINS 3/4's PRINTED RULE IS WHAT IS STOPPING THIS CREW WHERE IT STANDS (Gitea#21).
- *
- * Exported for the Blocked panel, which needs to say so — and asks `freightBudgetLeft`, the same
- * predicate the reducer refuses on, rather than rebuilding the key for itself. `narrate.ts` cannot
- * then drift from the rule it is describing, which is the whole premise of that panel.
- */
-export function freightRuleSpentHere(s: GameState, player: PlayerIndex, trayId: TrayId): boolean {
-  const tray = s.trays.get(trayId);
-  if (!tray || !rulesOf(tray).oneFreightPerLocation) return false;
-  if (tray.position.at !== 'grid') return false;
-  return !freightBudgetLeft(s, player, tray, tray.position.coord, 1);
-}
-
 /**
  * Charge freight cars against this train's per-location budget (trains 3/4).
  *
@@ -792,64 +759,16 @@ export function passengerRefusal(
 // ---------------------------------------------------------------------------
 
 export function check(s: GameState, player: PlayerIndex, i: Intent): RejectionCode | null {
-  /**
-   * §3.3, EXTENDED PLAY (Gitea#11) — asked ABOVE the status guard, because the whole point of the
-   * vote is that it is the one thing the rules will take from a game that has stopped.
-   *
-   * Out of turn like `mainline.clearance` below, and unlike it open to every seat at once: it is a
-   * table decision rather than a ruling, so there is no actor to be.
-   */
-  if (i.type === 'game.extend') {
-    if (s.status !== 'awaitingExtension') return 'NOT_AWAITING_EXTENSION';
-    // The intent NAMES its voter so that a save can be replayed (`intents.ts`), which makes it a
-    // claim until it is checked against the seat the caller authenticated. One seat may not vote
-    // for another.
-    if (i.player !== player) return 'NOT_YOUR_TURN';
-    if (s.extensionVotes[player] !== null) return 'ALREADY_VOTED';
-    return null;
-  }
-
   if (s.status !== 'active') return 'WRONG_PHASE';
 
   // The clearance ruling is the one intent that arrives out of turn order: it interrupts the
   // automatic Mainline Phase and goes to the Superintendent (§8.1, fourth condition).
   if (i.type === 'mainline.clearance') {
-    if (s.clock.pendingDecision?.kind !== 'clearance') return 'NO_PENDING_DECISION';
+    if (s.clock.pendingDecision === null) return 'NO_PENDING_DECISION';
     if (s.clock.superintendent !== player) return 'NOT_SUPERINTENDENT';
     return null;
   }
 
-  /**
-   * §Q (Gitea#19) — the Red Flag prompt, the third interruption of the Mainline Phase.
-   *
-   * Only ever raised for a player who holds the card, so `flag: true` can always be paid for; the
-   * card is checked again here because `check` is the authority and a hand can change between the
-   * prompt being raised and answered.
-   */
-  if (i.type === 'mainline.redFlag') {
-    if (s.clock.pendingDecision?.kind !== 'redFlag') return 'NO_RED_FLAG_PROMPT';
-    if (decisionActor(s) !== player) return 'NOT_YOUR_TURN';
-    if (!i.flag) return null;
-    const held = (s.decks.hands.get(player) ?? []).find((id) => {
-      const c = s.cards.get(id);
-      return c?.kind.kind === 'maneuver' && c.kind.key === 'redFlags';
-    });
-    if (!held) return 'NO_SUCH_CARD';
-    return null;
-  }
-
-  /**
-   * §11 (Gitea#5) — the Yard Office offer, the second interruption of the Mainline Phase.
-   *
-   * Goes to the district's owner rather than the Superintendent, which is the whole reason
-   * `pendingDecision` became a union. `decisionActor` is the single place that mapping lives.
-   */
-  if (i.type === 'mainline.yardOffice') {
-    if (s.clock.pendingDecision?.kind !== 'yardOffice') return 'NO_YARD_OFFICE_OFFER';
-    if (decisionActor(s) !== player) return 'NOT_YOUR_TURN';
-    return null;
-  }
-
   if (!isActor(s, player)) return 'NOT_YOUR_TURN';
 
   switch (i.type) {
@@ -936,24 +855,25 @@ export function check(s: GameState, player: PlayerIndex, i: Intent): RejectionCo
         ? tray.consist.slice(0, i.count)
         : tray.consist.slice(tray.consist.length - i.count);
       const dropRules = rulesOf(tray);
-      const dropArea = areaOf(s, player);
-      const atOffice = here.row === dropArea.officeCoord.row && here.col === dropArea.officeCoord.col;
       /**
-       * Trains 7/8 Local — "coach must remain on station track if switching" — the coach may never
-       * be set out anywhere ELSE while switching. §A.4 now carries an exception for the Office
-       * square (v0.5.0, Jesse's call): any train may cut a coach loose there, which is exactly what
-       * "station track" meant on the card all along. So the coach is refused everywhere except the
-       * Office, rather than everywhere.
+       * Trains 7/8 Local — "coach must remain on station track if switching", i.e. the coach is
+       * never set out during switching at all.
+       *
+       * The intended reading was "set out only at the Office", but §A.4 makes that unimplementable:
+       * `canDropCarsAt` refuses the Office square outright — "the Office track is Operational Rail,
+       * but Rolling Stock may not be left there" — so "only at the Office" and "nowhere" are the same
+       * rule. What is left is the effect that matters: the Local may shunt its freight car around the
+       * district, and may not abandon its coach at an industry or on a siding while it does.
+       * Flagged in `TODO.md` in case the station track is meant to become a real place to leave one.
        */
-      if (dropRules.coachStaysOnStationTrack && cut.some((c) => c.type === 'coach') && !atOffice) {
+      if (dropRules.coachStaysOnStationTrack && cut.some((c) => c.type === 'coach')) {
         return 'COACH_MUST_STAY';
       }
       const droppedFreight = cut.filter(isFreight).length;
       if (droppedFreight > 0 && !freightBudgetLeft(s, player, tray, here, droppedFreight)) {
         return 'FREIGHT_WORKED_HERE';
       }
-      const coachesOnly = cut.every((c) => c.type === 'coach');
-      return canDropCarsAt(dropArea, here, i.count, coachesOnly) ? null : 'CANNOT_DROP_HERE';
+      return canDropCarsAt(areaOf(s, player), here, i.count) ? null : 'CANNOT_DROP_HERE';
     }
 
     case 'switch.sortConsist': {
@@ -974,16 +894,6 @@ export function check(s: GameState, player: PlayerIndex, i: Intent): RejectionCo
       const seen = new Set(i.order);
       if (seen.size !== i.order.length) return 'CONSIST_ORDER';
       if (i.order.some((n) => n < 0 || n >= tray.consist.length)) return 'CONSIST_ORDER';
-      /**
-       * The engine may finish anywhere in the train, including with cars ahead of it (Jesse,
-       * 2026-09-17). `engineAt` indexes the SORTED consist, so `consist.length` is legal and means
-       * the engine on the tail with everything ahead of it — the shoving case a Small Yard exists to
-       * set up. Refused outside that range rather than clamped: a clamp would silently build a
-       * different train from the one the player asked for.
-       */
-      if (i.engineAt !== undefined && (i.engineAt < 0 || i.engineAt > tray.consist.length)) {
-        return 'CONSIST_ORDER';
-      }
       return null;
     }
 
@@ -1053,7 +963,7 @@ export function check(s: GameState, player: PlayerIndex, i: Intent): RejectionCo
       if (!node || node.kind !== 'mainline') return 'NO_PLACEMENT';
       const on = node.modifiers ?? [];
       if (on.includes(rule.key)) return 'OPTION_ALREADY_CHOSEN';
-      if (rule.gradeOnly && node.card !== 'heavyGrade') return 'NOT_A_GRADE';
+      if (rule.gradeOnly && mainlineProfile(node.card).speed.kind !== 'grade') return 'NOT_A_GRADE';
       if (rule.requiresOnCard && !on.includes(rule.requiresOnCard)) return 'NOT_CONNECTED';
       // "Not while a train is on it" — realigning under a moving train is exactly the situation the
       // restriction exists to prevent. A train standing in the Interchange's yard counts: it is on
@@ -1069,9 +979,14 @@ export function check(s: GameState, player: PlayerIndex, i: Intent): RejectionCo
       const card = s.cards.get(i.cardId);
       if (!card || !(s.decks.hands.get(player) ?? []).includes(i.cardId)) return 'NO_SUCH_CARD';
       if (card.kind.kind !== 'maneuver' || card.kind.key !== 'redFlags') return 'WRONG_INTENT';
-      // §Q (Gitea#19) — a flag goes on your OWN Limits. There is no target train to name and no
-      // placement to find: the district is yours, and the only question is which side.
-      if (officeNodeFor(s, seatOf(s, player))?.redFlag === i.side) return 'ALREADY_FLAGGED';
+      const tray = s.trays.get(i.trayId);
+      if (!tray) return 'NO_SUCH_TRAY';
+      // "A STOPPED train is prevented from being hit" — it protects a train that is standing on a
+      // Mainline card, which is the only place a rear-ender can happen.
+      if (tray.position.at !== 'mainline') return 'NO_PLACEMENT';
+      const node = s.division.nodes[tray.position.index];
+      if (!node || node.kind !== 'mainline') return 'NO_PLACEMENT';
+      if ((node.redFlagged ?? []).includes(i.trayId)) return 'OPTION_ALREADY_CHOSEN';
       return null;
     }
 
@@ -1109,9 +1024,10 @@ export function check(s: GameState, player: PlayerIndex, i: Intent): RejectionCo
     case 'draw.end': {
       if (!inPhase(s, 'localOps')) return 'WRONG_PHASE';
       if (turnOf(s, player).option !== 'draw') return 'OPTION_NOT_CHOSEN';
-      // §6.2 — "the player must reduce his hand to no more than three cards". `overHandLimit`
-      // (state.ts) is the one copy of that test; the Frame and the page ask the same function.
-      return overHandLimit(s, player) ? 'HAND_LIMIT' : null;
+      // §6.2 — "the player must reduce his hand to no more than three cards".
+      const hand = s.decks.hands.get(player) ?? [];
+      const limit = s.decks.redFlags.get(player) ? HAND_LIMIT + 1 : HAND_LIMIT;
+      return hand.length > limit ? 'HAND_LIMIT' : null;
     }
 
     // -- Freight Agent --------------------------------------------------------
@@ -1177,11 +1093,7 @@ export function check(s: GameState, player: PlayerIndex, i: Intent): RejectionCo
     // -- New Train ------------------------------------------------------------
     case 'newTrain.startExtra': {
       if (!inPhase(s, 'newTrain')) return 'WRONG_PHASE';
-      const pending = s.pendingExtras.find((x) => x.trainNumber === i.trainNumber);
-      if (!pending) return 'NO_EXTRA_PENDING';
-      // §7 — "the player who played the card MAY place the Crew Tray": it is theirs to place, and
-      // nobody else's to place for them.
-      if (pending.player !== player) return 'NOT_YOUR_EXTRA';
+      if (!s.pendingExtras.includes(i.trainNumber)) return 'NO_EXTRA_PENDING';
       if (s.freeTrays.length === 0) return 'NO_FREE_TRAY';
       const where = resolveExtraStart(s, player, i);
       if (typeof where === 'string') return where;
@@ -1216,7 +1128,7 @@ export function check(s: GameState, player: PlayerIndex, i: Intent): RejectionCo
       // This was not enforced at all: any car could be added in any quantity, so Train 9 "Heavy
       // Freight" — a card calling for 3 freight AND a caboose — was made up with four hoppers and
       // no caboose. Fewer is allowed; more, or of the wrong category, is not.
-      return acceptsCar(tray, i.carType, i.loaded, s.yards.divisionYard) ? null : 'NO_SUITABLE_CAR';
+      return acceptsCar(tray, i.carType) ? null : 'NO_SUITABLE_CAR';
     }
 
     case 'newTrain.secondSection': {
@@ -1436,30 +1348,17 @@ function checkPlay(
       if (!placement) return 'NO_PLACEMENT';
       if (area.grid.has(coordKey(placement))) return 'NOT_CONNECTED';
       /**
-       * NEITHER ON THE RUNNING TRACK ROW NOR OUTSIDE THE LIMITS — Jesse's call, both halves, the
-       * second REVERSED on 2026-09-17 after a Day 3 playtest.
+       * NOT ON THE RUNNING TRACK ROW — AND NOT BOUNDED BY THE LIMITS EITHER. Jesse's call, both
+       * halves.
        *
-       * It used to read the other way: a Modifier is not track (§9), so unlike a siding it could
-       * hang outside the Limits, because a Facility standing at the limit has three of its nine
-       * spots out there and refusing them would make the card unplayable exactly where the district
-       * ends. What that argument missed is what the board then shows — Transmission Lines at (-2,4)
-       * with the sign at column 3 — which reads as building outside your own territory, and §8.1 and
-       * §10 both reason about what lies inside a player's Limits.
-       *
-       * THE UNPLAYABLE CASE WAS CHECKED ON THE REPORTED MOVE, not assumed away: the Power Plant was
-       * at (-1,3) against a sign at column 3, and (-2,2) and (-2,3) were free, legal and inside. Six
-       * of the nine spots survive a Facility at the limit, and the sign moves outward as the Running
-       * Track grows (§2.1, Gap 4a), so the ground arrives with the district.
-       *
-       * The Running Track row stays barred for its own reason: inside the Limits that row is always
-       * full, so it bit only beyond the sign, where a Modifier would block the sign from moving
-       * outward with nothing on screen to warn you. That ground is now out of bounds anyway, which
-       * makes this the narrower rule rather than a redundant one — the row is barred INSIDE the
-       * Limits too, where a square can fall vacant if the main is rebuilt around it.
+       * A Modifier is not track (§9), so unlike a siding it may hang outside the Limits: a Facility
+       * standing at the limit has three of its nine spots out there, and refusing them would make
+       * the card unplayable exactly where the district ends. What it may NOT do is stand in the row
+       * the Running Track grows along. Inside the Limits that row is always full, so this bites only
+       * beyond the sign — which is the ground the main extends onto, and a Modifier parked there
+       * would block your own sign from moving outward (§2.1) with nothing on screen to warn you.
        */
       if (placement.row === area.runningRow) return 'ON_RUNNING_TRACK';
-      // §2.1 — a district's cards belong inside its own sign, Modifiers included since 2026-09-17.
-      if (!withinLimits(area, placement)) return 'OUTSIDE_LIMITS';
       // One of a kind per Office Area, as with industries (Q4) — no district gets two Ice Houses.
       if (hasModifierInArea(area, card.kind.modifier)) return 'FACILITY_LOCKED';
       // §9 — a Modifier is not track. It must sit adjacent to a Facility THAT CAN HOST IT (one of
@@ -1531,48 +1430,17 @@ export function selectDestination(
   return chosen ?? atTo[0];
 }
 
-/**
- * ROUTES, WALKED ONCE PER POSITION.
- *
- * A route walk (`reachableDestinations`) was a third of all simulation time, and most of it was the
- * same walk repeated: `legal.ts` walks a tray's routes to list its moves, then `check` walks them again
- * for every one of those moves, and `applyIntent` walks the chosen one a third time in `execute`.
- * Profiled 2026-09-14 with inlining off: `reachableDestinations` 34% inclusive, garbage collection 34%.
- *
- * So while one position is being examined — a legal-action listing, or the check and execute of one
- * intent — a walk is kept and reused. Both scopes read the state and never write it, the key names
- * everything the walk depends on besides that state, and the cache is keyed to the state OBJECT and
- * cleared when the scope ends, so a hit returns exactly what a fresh walk would have. Nothing may
- * mutate a returned route; nothing does.
- */
-let routeCache: { state: GameState; routes: Map<string, MoveDestination[]> } | null = null;
-
-export function withRouteCache<T>(s: GameState, fn: () => T): T {
-  if (routeCache) return fn();
-  routeCache = { state: s, routes: new Map() };
-  try {
-    return fn();
-  } finally {
-    routeCache = null;
-  }
-}
-
 function destinationsFor(
   s: GameState,
   player: PlayerIndex,
   trayId: TrayId,
   from: GridCoord,
   reverse: boolean,
-): MoveDestination[] {
-  const cache = routeCache?.state === s ? routeCache.routes : null;
-  const key = cache ? `${player}|${trayId}|${from.row},${from.col}|${reverse ? 1 : 0}` : '';
-  const hit = cache?.get(key);
-  if (hit) return hit;
-
+) {
   const tray = s.trays.get(trayId)!;
   const facing = facingPort(s, trayId);
   const exit: Port = reverse ? reversePort(s, player, from, facing) : facing;
-  const routes = reachableDestinations(
+  return reachableDestinations(
     {
       area: areaOf(s, player),
       occupancy: occupancyFor(s, player, trayId),
@@ -1582,8 +1450,6 @@ function destinationsFor(
     from,
     exit,
   );
-  cache?.set(key, routes);
-  return routes;
 }
 
 /**
@@ -1601,7 +1467,7 @@ export function ownCutFor(s: GameState, player: PlayerIndex, trayId: TrayId, rev
   const facing = facingPort(s, trayId);
   const exit: Port = reverse ? reversePort(s, player, here, facing) : facing;
   const card = areaOf(s, player).grid.get(coordKey(here)) ?? emptyCard();
-  return cutTowards(card, carsOn(card), rowEndAt(card, exit));
+  return cutTowards(card, carsOn(card), exit);
 }
 
 /**
@@ -1653,33 +1519,6 @@ export function movesFor(
 
 function execute(s: GameState, player: PlayerIndex, i: Intent): GameEvent[] {
   switch (i.type) {
-    /**
-     * §3.3, EXTENDED PLAY (Gitea#11) — the vote, and what it settles.
-     *
-     * Decided HERE rather than in `reduce` because the answer depends on the votes as they stand
-     * BEFORE this one lands, and `execute` is the half that still sees that. Three outcomes:
-     *
-     *   - a refusal ends it immediately. Unanimity means one "no" is decisive, so nobody is made to
-     *     wait on a player who has already said no (Jesse's call, 2026-08-28);
-     *   - the last outstanding "yes" grants the Day — ONE Day, and the question is put again at the
-     *     end of it;
-     *   - anything else is just a vote recorded, and the table waits.
-     */
-    case 'game.extend': {
-      const vote: GameEvent = { type: 'extensionVoted', player, agree: i.agree };
-      if (!i.agree) return [vote, { type: 'playConcluded', declinedBy: player }];
-      const after = s.extensionVotes.map((v, p) => (p === player ? true : v));
-      return after.every((v) => v === true)
-        ? [vote, { type: 'dayExtended', day: s.config.days + s.extraDays + 1 }]
-        : [vote];
-    }
-
-    case 'mainline.yardOffice': {
-      const pending = s.clock.pendingDecision;
-      const trainId = pending?.kind === 'yardOffice' ? pending.train : '';
-      return [{ type: 'yardOfficeRuled', player, trainId, take: i.take }];
-    }
-
     case 'localOps.choose':
       return [{ type: 'localOpsOptionChosen', player, option: i.option }];
 
@@ -1698,14 +1537,10 @@ function execute(s: GameState, player: PlayerIndex, i: Intent): GameEvent[] {
       const events: GameEvent[] = [
         {
           type: 'trayMoved',
-          player,
           trayId: i.trayId,
           from,
           to: i.to,
           movesRemaining: turnOf(s, player).movesRemaining - 1,
-          // "3 of 6" was written with the 6 hardcoded in the narrator, which is wrong on a night
-          // Stage under Reduced Visibility, where a turn gets five. The turn knows; the event carries.
-          movesAllowed: turnOf(s, player).movesAllowed,
           /**
            * A TRAIN THAT BACKS UP HAS NOT TURNED AROUND — AND A CURVE IS NOT A STRAIGHT.
            *
@@ -1750,23 +1585,20 @@ function execute(s: GameState, player: PlayerIndex, i: Intent): GameEvent[] {
          */
         const grid = areaOf(s, player).grid;
         const startCard = grid.get(coordKey(from)) ?? emptyCard();
-        const startCut = cutTowards(startCard, carsOn(startCard), rowEndAt(startCard, exitPort));
+        const startCut = cutTowards(startCard, carsOn(startCard), exitPort);
         const lifted = [
           ...(startCut.length > 0 ? [from] : []),
           ...dest.path.map((step) => step.coord),
           i.to,
         ].filter((c) => carsOn(grid.get(coordKey(c)) ?? emptyCard()).length > 0);
         const sides = standingSides(startCard, carsOn(startCard));
-        // The OTHER end's cut, which stays behind — so it is the other end of the row, not the
-        // other port. A 45° leg is an end of the row too (`rowEndAt`, Gitea#17).
-        const stayed = rowEndAt(startCard, exitPort) === 'e' ? sides.west : sides.east;
+        const stayed = exitPort === 'e' ? sides.west : exitPort === 'w' ? sides.east : [];
         // §A.3 — "engines also have couplers on the front end, so a train can pick cars up onto
         // its nose". Running forward the engine meets cars head-on and takes them in front; backing
         // up, they couple behind. Which end they land on is the whole point of a run-around: it
         // decides which car is next to come off.
         events.push({
           type: 'carsCoupled',
-          player,
           trayId: i.trayId,
           at: i.to,
           stock: dest.couples,
@@ -1787,7 +1619,7 @@ function execute(s: GameState, player: PlayerIndex, i: Intent): GameEvent[] {
       const stock = i.fromNose
         ? tray.consist.slice(0, i.count)
         : tray.consist.slice(tray.consist.length - i.count);
-      return [{ type: 'carsDropped', player, trayId: i.trayId, at: here, stock, ...(i.fromNose ? { fromNose: true } : {}) }];
+      return [{ type: 'carsDropped', trayId: i.trayId, at: here, stock, ...(i.fromNose ? { fromNose: true } : {}) }];
     }
 
     case 'switch.sortConsist': {
@@ -1796,34 +1628,15 @@ function execute(s: GameState, player: PlayerIndex, i: Intent): GameEvent[] {
       return [
         {
           type: 'consistSorted',
-          player,
           trayId: i.trayId,
           at: here,
           before: tray.consist.map((c) => ({ ...c })),
           after: i.order.map((n) => ({ ...tray.consist[n]! })),
-          // Absent means the nose, which is what every sort did before 2026-09-17 — so an older save
-          // replays to exactly the train it built.
-          engineAt: i.engineAt ?? 0,
         },
       ];
     }
 
-    /**
-     * The closing summary comes BEFORE `phaseEnded`, so the history reads as the turn ending rather
-     * than as a postscript to it. Split out of the shared case below for that one line.
-     */
-    case 'switch.end': {
-      const turn = turnOf(s, player);
-      const ended: GameEvent = {
-        type: 'switchingEnded',
-        player,
-        movesUsed: turn.movesAllowed - turn.movesRemaining,
-        movesAllowed: turn.movesAllowed,
-        ...(turn.lastMove ? { lastMove: turn.lastMove } : {}),
-      };
-      return [ended, { type: 'phaseEnded', player, phase: 'localOps' }];
-    }
-
+    case 'switch.end':
     case 'draw.end':
     case 'freightAgent.end':
       return [{ type: 'phaseEnded', player, phase: 'localOps' }];
@@ -1933,37 +1746,14 @@ function execute(s: GameState, player: PlayerIndex, i: Intent): GameEvent[] {
           ? REALIGNMENTS.find((r) => r.from === node.card)?.to
           : undefined;
       return [
-        {
-          type: 'mainlineModified',
-          player,
-          cardId: i.cardId,
-          node: i.node,
-          key,
-          ...(node?.kind === 'mainline' ? { from: node.card } : {}),
-          ...(became ? { became } : {}),
-        },
+        { type: 'mainlineModified', player, cardId: i.cardId, node: i.node, key, ...(became ? { became } : {}) },
       ];
     }
 
-    case 'maneuver.redFlags':
-      return [{ type: 'redFlagsSet', player, cardId: i.cardId, seat: seatOf(s, player), side: i.side }];
-
-    case 'mainline.redFlag': {
-      const pending = s.clock.pendingDecision;
-      const trainId = pending?.kind === 'redFlag' ? pending.train : '';
-      const seat = pending?.kind === 'redFlag' ? pending.seat : 0;
-      const side = pending?.kind === 'redFlag' ? pending.from : 'east';
-      if (!i.flag) return [{ type: 'redFlagRuled', player, trainId, flag: false }];
-      const cardId =
-        i.cardId ??
-        (s.decks.hands.get(player) ?? []).find((id) => {
-          const c = s.cards.get(id);
-          return c?.kind.kind === 'maneuver' && c.kind.key === 'redFlags';
-        })!;
-      return [
-        { type: 'redFlagsSet', player, cardId, seat, side },
-        { type: 'redFlagRuled', player, trainId, flag: true },
-      ];
+    case 'maneuver.redFlags': {
+      const tray = s.trays.get(i.trayId)!;
+      const index = tray.position.at === 'mainline' ? tray.position.index : -1;
+      return [{ type: 'redFlagsSet', player, cardId: i.cardId, trayId: i.trayId, node: index }];
     }
 
     case 'maneuver.flyingSwitch': {
@@ -2000,41 +1790,18 @@ function execute(s: GameState, player: PlayerIndex, i: Intent): GameEvent[] {
       ];
     }
 
-    /**
-     * THE TRAIN'S NUMBER RIDES ALONG (playtest, 2026-09-16: "I did not see anything in the history
-     * about making up train 10 and how each person added each car to it").
-     *
-     * It was all there — a MADE UP line and one line per car — but every one of those lines read
-     * "the train being made up", so a player scanning the history for train 10 found nothing under
-     * that name. The tray id is no use to a reader and the narrator has no state to look it up in,
-     * so the number travels with the event, exactly as `owner` does on `trainArrived`.
-     */
-    case 'newTrain.placeCar': {
-      const placeTray = s.trays.get(i.trayId);
+    case 'newTrain.placeCar':
       return [
         {
           type: 'carPlacedOnTrain',
           player,
           trayId: i.trayId,
           stock: { type: i.carType, loaded: i.loaded },
-          trainNumber: placeTray?.trainNumber ?? null,
-          isExtra: placeTray?.trainIsExtra ?? false,
         },
       ];
-    }
 
-    case 'newTrain.passCar': {
-      const passTray = s.trays.get(i.trayId);
-      return [
-        {
-          type: 'carPassed',
-          player,
-          trayId: i.trayId,
-          trainNumber: passTray?.trainNumber ?? null,
-          isExtra: passTray?.trainIsExtra ?? false,
-        },
-      ];
-    }
+    case 'newTrain.passCar':
+      return [{ type: 'carPassed', player, trayId: i.trayId }];
 
     case 'newTrain.secondSection':
       return [{ type: 'secondSectionOrdered', player, trainNumber: i.trainNumber }];
@@ -2160,37 +1927,6 @@ function findTimetableSlot(s: GameState, from: number): number | null {
 
 export function reduce(s: GameState, e: GameEvent): void {
   switch (e.type) {
-    // -- §3.3, extended play (Gitea#11)
-    case 'extensionVoted':
-      s.extensionVotes[e.player] = e.agree;
-      break;
-
-    /**
-     * One more Day, and the votes are wiped: agreeing once does not agree to the rest of the game.
-     *
-     * `config.days` is deliberately untouched. It is what the OFFICIAL result was decided at
-     * (`state.ts`'s `FinalReport`), so leaving it alone is what makes "the winner is decided at the
-     * original game length" a fact about the code rather than a comment on it. `outcome` is left
-     * alone too — it is the last evaluation, and it is what the results screen shows while the extra
-     * Day is played.
-     */
-    case 'dayExtended':
-      s.extraDays += 1;
-      s.extensionVotes = s.players.map(() => null);
-      s.status = 'active';
-      break;
-
-    case 'playConcluded':
-      s.status = 'finished';
-      break;
-
-    // §11 (Gitea#5) — the same shape as `clearanceGiven`: clear the question, record the answer for
-    // the arriving train to consume, or the driver asks again for ever.
-    case 'yardOfficeRuled':
-      s.clock.pendingDecision = null;
-      s.clock.decisionAnswer = { kind: 'yardOffice', train: e.trainId, take: e.take };
-      break;
-
     case 'localOpsOptionChosen':
       turnOf(s, e.player).option = e.option;
       break;
@@ -2208,10 +1944,7 @@ export function reduce(s: GameState, e: GameEvent): void {
       }
       // Only the player sitting in this district can be switching this tray, so the Moves come off
       // their turn. The event carries no player of its own.
-      const mover = turnOf(s, playerAtSeat(s, seat));
-      mover.movesRemaining = e.movesRemaining;
-      // Where the crew was left, for the line that closes the turn — see `switchingEnded`.
-      mover.lastMove = { trayId: e.trayId, to: e.to };
+      turnOf(s, playerAtSeat(s, seat)).movesRemaining = e.movesRemaining;
 
       const area = areaAtSeat(s, seat);
 
@@ -2289,18 +2022,9 @@ export function reduce(s: GameState, e: GameEvent): void {
     case 'consistSorted': {
       const tray = s.trays.get(e.trayId)!;
       tray.consist = e.after.map((c) => ({ ...c }));
-      /**
-       * WHERE THE SORT PUT THE ENGINE — 0 on every sort before 2026-09-17, and on most of them
-       * since, because putting the engine back on the nose is what a Small Yard is usually for:
-       * §8.2 will not let a train leave the Office with cars in front of its engine.
-       *
-       * It is no longer forced. The design source (`implications.md`) has always said a train here
-       * "may sort itself into any order, INCLUDING cars ahead of the engine", against a v0.4.5 card
-       * text that says the engine ends at the nose; Jesse settled it for the source. A numbered
-       * train left nose-loaded is held at the Office by §8.2 until it sorts again — see
-       * `departureRefusal`.
-       */
-      tray.engineAt = e.engineAt;
+      // A Small Yard re-makes the train, and putting the engine back on the nose is the whole reason
+      // to use one: §8.2 will not let a train leave the Office with cars in front of its engine.
+      tray.engineAt = 0;
       // "Spends one move in the yard" — the sort costs a Move.
       const sorter = turnOf(s, playerAtSeat(s, trayySeat(tray)));
       sorter.movesRemaining = Math.max(0, sorter.movesRemaining - 1);
@@ -2362,8 +2086,7 @@ export function reduce(s: GameState, e: GameEvent): void {
       // Everything swept comes back as ONE pile, then §4.6-4.7's opening is re-run: three cards
       // turned face up as the Departments, the rest face down as the Home Office deck. The
       // Departments start one deep again, exactly as at setup.
-      // The spent trains stay where they are; everything else in the Yard has just been swept up.
-      s.decks.salvageYard = s.decks.salvageYard.filter((id) => isSpentTimetabledTrain(s, id));
+      s.decks.salvageYard = [];
       s.decks.departments = [[], [], []];
       const order = [...e.order];
       for (const pile of s.decks.departments) {
@@ -2428,23 +2151,14 @@ export function reduce(s: GameState, e: GameEvent): void {
     }
 
     case 'redFlagsSet': {
-      const node = officeNodeFor(s, e.seat);
-      if (node) node.redFlag = e.side;
+      const node = s.division.nodes[e.node];
+      if (node?.kind === 'mainline') {
+        node.redFlagged = [...(node.redFlagged ?? []), e.trayId];
+      }
       spendCard(s, e.player, e.cardId);
       break;
     }
 
-    /**
-     * §Q (Gitea#19) — `redFlagSpent` is NOT reduced, deliberately. It is emitted only by the phase
-     * driver, which mutates state itself and then describes it (`advance.ts`'s `spendFlag`), so a
-     * case here would be dead code that reads as the live one.
-     */
-
-    case 'redFlagRuled':
-      s.clock.pendingDecision = null;
-      s.clock.decisionAnswer = { kind: 'redFlag', train: e.trainId, flag: e.flag };
-      break;
-
     case 'flyingSwitch': {
       const tray = s.trays.get(e.trayId);
       const area = areaOf(s, e.player);
@@ -2583,8 +2297,7 @@ export function reduce(s: GameState, e: GameEvent): void {
     }
 
     case 'extraQueued':
-      // §7 hands this train to the player who played the card, so the queue records them.
-      s.pendingExtras.push({ trainNumber: e.trainNumber, player: e.player });
+      s.pendingExtras.push(e.trainNumber);
       break;
 
     case 'secondSectionOrdered':
@@ -2594,15 +2307,7 @@ export function reduce(s: GameState, e: GameEvent): void {
     case 'trainScheduled':
       s.timetable[e.slot] = e.trainNumber;
       s.rngState = e.rngState;
-      /**
-       * THE CARD IS ALREADY IN THE SALVAGE YARD — `cardPlayed` put it there, by its real id.
-       *
-       * This used to push a second, SYNTHETIC `train-<number>` beside it, so scheduling four trains
-       * left eight entries in a pile holding four cards. Nothing ever read that id: it inflated the
-       * pile's depth, it displayed as "a card" because no such card exists, and
-       * `reshuffleIfDepleted` would have swept it into the draw deck to be drawn as an id with
-       * nothing behind it. Removed 2026-09-10 (Gitea#23).
-       */
+      s.decks.salvageYard.push(`train-${e.trainNumber}`);
       break;
 
     case 'carPlacedOnTrain': {
@@ -2622,14 +2327,11 @@ export function reduce(s: GameState, e: GameEvent): void {
      */
     case 'extraStarted': {
       const trayId = s.freeTrays.pop()!;
-      s.pendingExtras = s.pendingExtras.filter((x) => x.trainNumber !== e.trainNumber);
+      s.pendingExtras = s.pendingExtras.filter((n) => n !== e.trainNumber);
       const { direction } = e;
       const base = {
         id: trayId, trainNumber: e.trainNumber, trainIsExtra: true, engineAt: 0,
         consist: [] as RollingStock[], direction, movesUsed: 0,
-        // The queue is emptied here, before a single car goes on, so the tray carries the owner
-        // from now on — §7 lets the player who played it load the consist as they choose.
-        builtBy: e.player,
       };
       // Which way the tray physically points, for the cards it will pick up. A Division Point start
       // does not set it: those trays have never carried a facing and `enterMainline` does not read
@@ -2809,7 +2511,7 @@ export function reduce(s: GameState, e: GameEvent): void {
     case 'clearanceGiven':
       s.clock.pendingDecision = null;
       // Recorded for the asking train to consume; otherwise the driver asks again forever.
-      s.clock.decisionAnswer = { kind: 'clearance', train: e.trainId, allow: e.allow };
+      s.clock.clearanceRuling = { train: e.trainId, allow: e.allow };
       break;
 
     default:
@@ -2822,8 +2524,7 @@ export function reduce(s: GameState, e: GameEvent): void {
  * index is out of range, which `check` reports rather than silently defaulting — a wrong
  * orientation is a different card, not a detail.
  */
-/** Exported for the same reason as `extendLimitsIfNeeded`: the bot builds the card a lay would place exactly as the reducer does. */
-export function protoCard(
+function protoCard(
   kind: { kind: string; geometry?: string; facility?: string; hand?: string },
   variant: number | undefined,
 ): TrackCard | null {
@@ -3060,34 +2761,9 @@ function spendCard(s: GameState, player: PlayerIndex, cardId: CardId): void {
  * that has genuinely used every card ends on `DECK_EMPTY` rather than reshuffling an empty pile.
  * Cards played onto the board are NOT recovered: they are on the table, which is where they belong.
  */
-/**
- * §6.2, AND THE RULING THAT SETTLES IT — Jesse, 2026-09-10 (Gitea#23).
- *
- * "Once you've played a regularly scheduled train and it's in the salvage deck, that train is
- * already on the timetable. It does not make sense to put that back into a reshuffled home deck to
- * get played again. By contrast, a regularly scheduled train that's in a discard pile could
- * potentially get reused later, and so should have that capability. Extras run one time and then
- * they're done — if they are in the Salvage deck, they should get shuffled back in so that they
- * could get run again."
- *
- * So the test is WHERE the card is, not only what it is. A timetabled train in the SALVAGE YARD was
- * played: its number is on the timetable and cannot be scheduled twice, so the card is spent and
- * stays out. The same card sitting in a DEPARTMENT was discarded, never played, and its slot is
- * still open — so it comes back with everything else. An Extra is a single run rather than a
- * standing slot, so a played one is free to be run again.
- */
-function isSpentTimetabledTrain(s: GameState, id: CardId): boolean {
-  return s.cards.get(id)?.kind.kind === 'timetabledTrain';
-}
-
 function reshuffleIfDepleted(s: GameState, taking: number): GameEvent | null {
   if (s.decks.homeOffice.length > taking) return null;
-  const collected = [
-    // The Salvage Yard, less the trains whose slots are already filled — see above.
-    ...s.decks.salvageYard.filter((id) => !isSpentTimetabledTrain(s, id)),
-    // Every Department in full: a discarded train was never played, so it is still runnable.
-    ...s.decks.departments.flat(),
-  ];
+  const collected = [...s.decks.salvageYard, ...s.decks.departments.flat()];
   if (collected.length === 0) return null;
   const rng = createRng(s.rngState);
   return { type: 'deckReshuffled', order: rng.shuffle(collected), rngState: rng.getState() };
@@ -3214,8 +2890,7 @@ function applyModifier(area: OfficeArea, coord: GridCoord, modifier: ModifierKin
  * §8.1 and §10 both reason about "the track between the train and the Limits", Interlocking holds
  * an arrival AT the Limits, and running past a player's Limits is what makes a collision his fault.
  */
-/** Exported so the bot can score a lay on a copy of the district by the engine's own rule, not a copy of it. */
-export function extendLimitsIfNeeded(area: OfficeArea, placed: GridCoord): void {
+function extendLimitsIfNeeded(area: OfficeArea, placed: GridCoord): void {
   if (placed.row !== area.runningRow) return;
 
   if (placed.col <= area.limitsWest.col) {
@@ -3239,20 +2914,7 @@ export function extendLimitsIfNeeded(area: OfficeArea, placed: GridCoord): void
  * this. A second copy stalled the game outright: the phase believed a car could be added while
  * `check` rejected every option, so the Stage never completed.
  */
-export function acceptsCar(
-  tray: CrewTray,
-  carType: CarType,
-  /**
-   * Whether the car being offered is loaded, and what the Division Yard still holds.
-   *
-   * Both optional so that a caller asking the SHAPE question — "does this card take a car of this
-   * category at all?" — need not answer the loading question. `trainNeedingCars` asks the shape
-   * question of every car in the yard; `check` asks the full one about a specific car a player has
-   * named. Omitting them skips the loading rules rather than guessing at them.
-   */
-  loaded?: boolean,
-  yard?: readonly RollingStock[],
-): boolean {
+export function acceptsCar(tray: CrewTray, carType: CarType): boolean {
   const profile = trainProfile(tray.trainNumber ?? 0, tray.trainIsExtra);
   if (!profile) return true;
 
@@ -3275,40 +2937,6 @@ export function acceptsCar(
   const types = profile.consist.freightTypes;
   if (adding === 'freight' && types && !types.includes(carType)) return false;
 
-  if (loaded === undefined) return true;
-
-  /**
-   * X13 APPLESEED — "may drop MTs but not pick up anything", and its consist prints EMPTIES ONLY.
-   *
-   * `emptiesOnly` was declared on the card, RENDERED to the player as "(empties only)" by both
-   * `web/game.ts` and `sim/view.ts`, and enforced by nothing: the Appleseed could be made up with
-   * loaded cars while its own card said it could not. Found while building Gitea#13, which is the
-   * same rule pointing the other way, and fixed with it rather than left as the odd one out.
-   *
-   * A caboose is exempt. Every caboose in `ROLLING_STOCK_SUPPLY` is `loaded: true` — there is no
-   * such thing as an empty one — so applying this to the caboose would bar the Appleseed from the
-   * caboose its own consist calls for.
-   */
-  if (profile.consist.emptiesOnly && loaded && adding !== 'caboose') return false;
-
-  /**
-   * MUST RUN LOADED (Gitea#13) — a preference order, not a flat requirement.
-   *
-   * "If not loaded, then empty, and if none available, run without." So an EMPTY is refused only
-   * while the yard can still supply a loaded car this train would accept; once it cannot, the empty
-   * becomes legal and the train may also simply depart short. Asked of the yard rather than
-   * remembered on the tray, because the yard is what the rule is about and it changes under the
-   * train as other consists are built.
-   *
-   * The caboose is exempt for the same reason as above.
-   */
-  if (profile.rules.mustRunLoaded && !loaded && adding !== 'caboose' && yard) {
-    const loadedAvailable = yard.some(
-      (c) => c.loaded && cat(c.type) === adding && acceptsCar(tray, c.type),
-    );
-    if (loadedAvailable) return false;
-  }
-
   return true;
 }
 
@@ -3349,21 +2977,11 @@ export function isBeingMadeUp(tray: CrewTray): boolean {
 export function trainNeedingCars(s: GameState): TrayId | null {
   for (const [id, tray] of s.trays) {
     if (!isBeingMadeUp(tray)) continue;
-    /**
-     * Consists are specified by CATEGORY — "Freight (2)" is any two freight cars — so any car in
-     * the yard is potentially suitable unless the card narrows it. Ask the SAME predicate `check`
-     * uses: a separate copy of this test stalled the game, because the phase believed a car could
-     * be added while `check` rejected every option, so the Stage never ended.
-     *
-     * ASKED PER CAR, WITH ITS LOADED STATE, since Gitea#13. The shape question alone is no longer
-     * the same question `check` answers: an `emptiesOnly` train looking at a yard of nothing but
-     * loaded cars, or a `mustRunLoaded` train offered only empties while loaded ones remain, would
-     * both be told a car was available and then refused every one of them — the very stall this
-     * comment was written about.
-     */
-    if (s.yards.divisionYard.some((c) => acceptsCar(tray, c.type, c.loaded, s.yards.divisionYard))) {
-      return id;
-    }
+    // Consists are specified by CATEGORY — "Freight (2)" is any two freight cars — so any car in
+    // the yard is potentially suitable unless the card narrows it. Ask the SAME predicate `check`
+    // uses: a separate copy of this test stalled the game, because the phase believed a car could
+    // be added while `check` rejected every option, so the Stage never ended.
+    if (s.yards.divisionYard.some((c) => acceptsCar(tray, c.type))) return id;
   }
   return null;
 }
@@ -3409,35 +3027,13 @@ function limitsCard(): TrackCard {
 // Public entry point
 // ---------------------------------------------------------------------------
 
-/**
- * THE FIRST HALF OF `applyIntent`: decide, without changing anything.
- *
- * `check` and `execute` read the same unchanged position, so its routes are walked once between them
- * (`withRouteCache`). Never writes `s`. Split out for a caller that decides many intents against ONE
- * position and applies each to a COPY of it — the switching planner — which can then share that
- * position's routes across every candidate instead of re-walking them on each copy.
- */
-export function prepareIntent(s: GameState, player: PlayerIndex, i: Intent): ApplyResult {
-  const prepared = withRouteCache(s, (): { code: RejectionCode } | { events: GameEvent[] } => {
-    const code = check(s, player, i);
-    return code ? { code } : { events: execute(s, player, i) };
-  });
-  if ('code' in prepared) return { ok: false, code: prepared.code, message: `${i.type} rejected: ${prepared.code}` };
-  return { ok: true, events: prepared.events };
-}
-
-/** THE SECOND HALF: fold events `prepareIntent` produced into a state equal to the one it read. */
-export function commitEvents(s: GameState, events: readonly GameEvent[]): void {
-  for (const e of events) reduce(s, e);
-  // Gitea#16 — the intent half of the fold; `advance` does the phase driver's half. See `tally.ts`
-  // for why it cannot simply live inside `reduce`.
-  for (const e of events) tallyEvent(s, e);
-}
-
 export function applyIntent(s: GameState, player: PlayerIndex, i: Intent): ApplyResult {
-  const r = prepareIntent(s, player, i);
-  if (r.ok) commitEvents(s, r.events);
-  return r;
+  const code = check(s, player, i);
+  if (code) return { ok: false, code, message: `${i.type} rejected: ${code}` };
+
+  const events = execute(s, player, i);
+  for (const e of events) reduce(s, e);
+  return { ok: true, events };
 }
 
 export { isOperationalRail, destinationsFor };

src/engine/content.ts

@@ -72,26 +72,6 @@ export type TrackProfile = {
  * from `docs/Deck cards2.xlsx`, a fixed document, and stay here as the audit trail for the
  * transcription — they are not claims about what the game deals today.
  *
- * THE COUNTS BELOW NOW COME FROM `docs/Deck cards5.xlsx` (Gitea#14), which HALVES every track row
- * against sheet 2: straight 32 → 16, each curve 16 → 8, each turnout 16 → 8. Track is the only
- * section of that sheet whose numbers moved — every station, industry, modifier and train row is
- * character-for-character what sheet 2 said — so this is the whole of the deck change it asks for.
- *
- * Sheet 5 also deals the sharp curves ZERO, which is where they already were: Jesse took them out
- * for the reason below, and RAR arrived at the same number independently. Nothing to do, but worth
- * recording that the two agree rather than leaving it looking like a coincidence.
- *
- * IT LANDS ON RAR'S OWN TARGETS, which is the check that matters — the top right of sheet 5 states
- * the draw rates he is designing to. Against his denominators (start cards counted for track, only
- * the non-track deck counted for trains): he wants track 48/167 = **28.7%** and trains 22/107 =
- * **20.6%**; this deck gives 48/170 = **28.2%** and 22/110 = **20.0%**.
- *
- * THAT MATCH IS PARTLY A CANCELLATION, and whoever retunes next should know it. The engine holds
- * ~25 more office and industry cards than the sheet (doubled and tripled, below) and is missing the
- * ~33 Safety, Event, Inspection and Space-use cards sheet 5 lists, which Gitea#14 defers. The two
- * errors are opposite and nearly equal today. Build the deferred categories and they stop
- * cancelling, so the ratios have to be re-measured then rather than assumed to have held.
- *
  * It matters well beyond bookkeeping. Track competes for the draw with industry, trains and
  * enhancements, so building a district is paid for in cards you did not draw instead — and the
  * hand-of-three is the real constraint on how fast a railroad grows.
@@ -106,9 +86,9 @@ export type TrackProfile = {
  * published replay still plays. Reordering to look tidy would silently re-deal every saved game.
  */
 export const TRACK_CARDS: readonly TrackProfile[] = [
-  { geometry: 'straight', hand: 'none', name: 'Straight track', copiesInDeck: 16, isOperationalRail: true, moveCost: 1 },
-  { geometry: 'curved', hand: 'right', name: 'Curved track (right)', copiesInDeck: 8, isOperationalRail: true, moveCost: 1 },
-  { geometry: 'curved', hand: 'left', name: 'Curved track (left)', copiesInDeck: 8, isOperationalRail: true, moveCost: 1 },
+  { geometry: 'straight', hand: 'none', name: 'Straight track', copiesInDeck: 32, isOperationalRail: true, moveCost: 1 },
+  { geometry: 'curved', hand: 'right', name: 'Curved track (right)', copiesInDeck: 16, isOperationalRail: true, moveCost: 1 },
+  { geometry: 'curved', hand: 'left', name: 'Curved track (left)', copiesInDeck: 16, isOperationalRail: true, moveCost: 1 },
   /**
    * SHARP CURVES ARE DEALT ZERO COPIES — Jesse's call, and the same treatment as Poling.
    *
@@ -123,8 +103,8 @@ export const TRACK_CARDS: readonly TrackProfile[] = [
    */
   { geometry: 'sharpCurved', hand: 'right', name: 'Sharp Curved Track (right)', copiesInDeck: 0, isOperationalRail: true, moveCost: 2 },
   { geometry: 'sharpCurved', hand: 'left', name: 'Sharp Curved Track (left)', copiesInDeck: 0, isOperationalRail: true, moveCost: 2 },
-  { geometry: 'turnout', hand: 'right', name: 'Turnout (right)', copiesInDeck: 8, isOperationalRail: false, moveCost: 1 },
-  { geometry: 'turnout', hand: 'left', name: 'Turnout (left)', copiesInDeck: 8, isOperationalRail: false, moveCost: 1 },
+  { geometry: 'turnout', hand: 'right', name: 'Turnout (right)', copiesInDeck: 16, isOperationalRail: false, moveCost: 1 },
+  { geometry: 'turnout', hand: 'left', name: 'Turnout (left)', copiesInDeck: 16, isOperationalRail: false, moveCost: 1 },
 ];
 
 /** Summed from `copiesInDeck` above, never written down — it moves whenever the deck is retuned. */
@@ -163,39 +143,29 @@ export type OfficeProfile = {
  * passenger modifier cards (Waiting Area, Restaurant, Hotel).
  */
 /**
- * Office cards, at `docs/Deck cards5.xlsx`'s counts exactly: Depot 4, Station 2, Terminal 1.
+ * Office cards. Every tier's `copiesInDeck` was **doubled** against the recovered design — Q12.
  *
- * THE Q12 DOUBLING IS GONE (Gitea#14). Every tier used to be dealt at twice the sheet, to remove a
- * 25% chance of an unwinnable opening deal: players always start at a Whistle Post, which has ONE
- * A/D track, so a second arrival is an automatic collision (§8.3, Gap 2a), and measured at the
- * sheet's density 25 of 100 games never drew a Depot and never escaped — averaging **−6.0** revenue
- * against **−0.4** for games that upgraded at least once, with 25 of 26 collisions at a Whistle
- * Post.
- *
- * That measurement was taken against a deck with 96 track cards in it, and the failure it describes
- * does not survive the halving of track. RE-MEASURED at the sheet's counts, 100 games: **43 of 100**
- * never upgrade off a Whistle Post, up from 25 — but they average **−0.2** revenue against **+1.4**
- * for games that do upgrade, where the gap used to be −6.0 against −0.4. Collisions fell from 26 per
- * 100 games to **6**, and only 3 of those are in games that never upgraded, against 25 of 26 before.
- *
- * So staying at a Whistle Post is now common and survivable rather than rare and fatal, which is the
- * opposite of the shape Q12 was answering: with fewer trains reaching an Office, a single A/D track
- * is seldom contested. The doubling was the blunt instrument its own note called it, and at the
- * sheet's deck size it costs more than it buys — see `TRACK_CARDS` for the whole comparison and
- * `INDUSTRY_PROFILES` for the other half of the same decision.
+ * Players always start at a Whistle Post, which has ONE A/D track, so a second arrival is an
+ * automatic collision (§8.3, Gap 2a). Measured at the original density, 25 of 100 games never drew
+ * a Depot and never escaped: they averaged **−6.0** revenue against **−0.4** for games that
+ * upgraded at least once, and 25 of 26 collisions happened at Whistle Post.
  *
  * Upgrades are strictly sequential (Gap 3b, no skipping), so Station and Terminal are rarer than
- * their raw counts imply — Terminal needs all three cards in order.
+ * their raw counts imply — Terminal needs all three cards in order. Station and Terminal were
+ * doubled with Depot to keep that ladder in proportion rather than making Depot a special case.
  *
- * IF THE OPENING BITES AGAIN, the fix is not to re-double this. The note it replaces already listed
- * the better options: fewer Terminals, a cheaper first upgrade, or more A/D capacity at a Whistle
- * Post. Any of those answers the collision without diluting every other category to do it.
+ * PROVISIONAL — re-evaluate. This was chosen to remove a 25% chance of an unwinnable opening deal,
+ * not from the recovered design, and it is a blunt instrument: it lifts the whole office ladder and
+ * dilutes every other category slightly. Revisit once the victory target is settled and freight is
+ * carrying its intended share; the right answer may instead be fewer Terminals, a cheaper first
+ * upgrade, or more A/D capacity at Whistle Post. The counts themselves are in the rows below, which
+ * is the only place they should be read from.
  */
 export const OFFICE_PROFILES: readonly OfficeProfile[] = [
   { tier: 'whistlePost', name: 'Whistle Post', isControlPoint: false, isPassengerFacility: false, adTracks: 1, porters: 0, passengerOut: 0, passengerIn: 0, copiesInDeck: 0 },
-  { tier: 'depot', name: 'Depot', isControlPoint: true, isPassengerFacility: true, adTracks: 2, porters: 1, passengerOut: 1, passengerIn: 1, copiesInDeck: 4 },
-  { tier: 'station', name: 'Station', isControlPoint: true, isPassengerFacility: true, adTracks: 3, porters: 2, passengerOut: 2, passengerIn: 2, copiesInDeck: 2 },
-  { tier: 'terminal', name: 'Terminal', isControlPoint: true, isPassengerFacility: true, adTracks: 4, porters: 3, passengerOut: 3, passengerIn: 3, copiesInDeck: 1 },
+  { tier: 'depot', name: 'Depot', isControlPoint: true, isPassengerFacility: true, adTracks: 2, porters: 1, passengerOut: 1, passengerIn: 1, copiesInDeck: 8 },
+  { tier: 'station', name: 'Station', isControlPoint: true, isPassengerFacility: true, adTracks: 3, porters: 2, passengerOut: 2, passengerIn: 2, copiesInDeck: 4 },
+  { tier: 'terminal', name: 'Terminal', isControlPoint: true, isPassengerFacility: true, adTracks: 4, porters: 3, passengerOut: 3, passengerIn: 3, copiesInDeck: 2 },
 ];
 
 export const OFFICE_ORDER: readonly OfficeTier[] = ['whistlePost', 'depot', 'station', 'terminal'];
@@ -232,24 +202,15 @@ export type IndustryProfile = {
 };
 
 /**
- * Industry density, at `docs/Deck cards5.xlsx`'s counts exactly (Gitea#14).
+ * Industry density (Gap 12). The recovered sheet lists 9 industries in a 115-card deck; the
+ * prototype ran 10 in 52. At the sheet's density a game saw 1.6 Freight Facilities, freight was 10%
+ * of gross revenue, and `carsCoupled` fired 4 times per 100 games — the freight loop, which is the
+ * point of the game, effectively never ran.
  *
- * THE GAP-12 TRIPLING IS GONE. The recovered sheet listed 9 industries in a 115-card deck and the
- * prototype ran 10 in 52; at that density a game saw 1.6 Freight Facilities, freight was 10% of
- * gross revenue, and `carsCoupled` fired 4 times per 100 games, so the freight loop effectively
- * never ran. Tripling every kind restored roughly the prototype's ratio.
- *
- * ALL OF THAT WAS MEASURED AGAINST A DECK WITH 96 TRACK CARDS. Sheet 5 halves the track, and the
- * tripling then works backwards: the deck keeps dealing industries while the district stays too
- * small to reach them. Measured over 300 bot games on identical seeds — 96 track with the multiplier
- * / 48 track with it / 48 track without — reefer cars set out by a crew went **49 / 0 / 39** and
- * mean revenue **−0.20 / +0.22 / +0.27**. The middle column is the tripling meeting the halved
- * deck: it wipes out the reefer chain completely. The sheet's own density is the best of the three
- * on both counts.
- *
- * The sheet's proportions were always preserved by the multiplier, since every kind scaled by the
- * same factor — so removing it changes the density and nothing else. The outbound/inbound balance
- * and the lockout structure below are the sheet's, as they always were.
+ * Each industry's `copies` is TRIPLED against the sheet, which restores roughly the prototype's
+ * ratio while preserving the sheet's proportions exactly: the outbound/inbound balance and the
+ * lockout structure are unchanged, because every kind scales by the same factor. The multiplier is
+ * the decision; the resulting totals are in the rows below and move with every retune.
  */
 /**
  * LOCKOUTS, from the sheet's "Lockouts" column verbatim:
@@ -272,8 +233,8 @@ export type IndustryProfile = {
  * enforced for every kind in `isLockedOut`, not repeated in each row here.
  */
 export const INDUSTRY_PROFILES: readonly IndustryProfile[] = [
-  { kind: 'freightHouse', name: 'Freight House', carTypes: ['boxcar'], flow: 'both', baseOut: 1, baseIn: 1, baseLoaders: 1, lockouts: ['grocersWarehouse'], copies: 2 },
-  { kind: 'mineTipple', name: 'Mine Tipple', carTypes: ['hopper'], flow: 'outbound', baseOut: 1, baseIn: 0, baseLoaders: 1, lockouts: ['powerPlant'], copies: 2 },
+  { kind: 'freightHouse', name: 'Freight House', carTypes: ['boxcar'], flow: 'both', baseOut: 1, baseIn: 1, baseLoaders: 1, lockouts: ['grocersWarehouse'], copies: 6 },
+  { kind: 'mineTipple', name: 'Mine Tipple', carTypes: ['hopper'], flow: 'outbound', baseOut: 1, baseIn: 0, baseLoaders: 1, lockouts: ['powerPlant'], copies: 6 },
   /**
    * OUTBOUND ONLY. A Refinery ships oil out and receives nothing; reported from playtesting and
    * confirmed by Jesse (v0.4.9e): "only ships out tanks, does not receive anything".
@@ -291,9 +252,9 @@ export const INDUSTRY_PROFILES: readonly IndustryProfile[] = [
    * the game with no way to raise the direction it is supposed to use half its capacity on.
    * `StationMaster-Home-Deck-v0.4.5.md` prints it "Outbound, 1 out / 0 in".
    */
-  { kind: 'refinery', name: 'Refinery', carTypes: ['tank'], flow: 'outbound', baseOut: 1, baseIn: 0, baseLoaders: 1, lockouts: ['powerPlant'], copies: 1 },
-  { kind: 'powerPlant', name: 'Power Plant', carTypes: ['hopper', 'tank'], flow: 'inbound', baseOut: 0, baseIn: 1, baseLoaders: 1, lockouts: ['mineTipple', 'refinery'], copies: 2 },
-  { kind: 'packingSheds', name: 'Packing Sheds', carTypes: ['reefer'], flow: 'outbound', baseOut: 1, baseIn: 0, baseLoaders: 1, lockouts: ['grocersWarehouse'], copies: 1 },
+  { kind: 'refinery', name: 'Refinery', carTypes: ['tank'], flow: 'outbound', baseOut: 1, baseIn: 0, baseLoaders: 1, lockouts: ['powerPlant'], copies: 3 },
+  { kind: 'powerPlant', name: 'Power Plant', carTypes: ['hopper', 'tank'], flow: 'inbound', baseOut: 0, baseIn: 1, baseLoaders: 1, lockouts: ['mineTipple', 'refinery'], copies: 6 },
+  { kind: 'packingSheds', name: 'Packing Sheds', carTypes: ['reefer'], flow: 'outbound', baseOut: 1, baseIn: 0, baseLoaders: 1, lockouts: ['grocersWarehouse'], copies: 3 },
   /**
    * INBOUND ONLY — the mirror of the Refinery above, and the same correction. Reported from
    * playtesting and confirmed by Jesse (v0.4.9e): "Grocer's Warehouse should be receive only, does
@@ -306,7 +267,7 @@ export const INDUSTRY_PROFILES: readonly IndustryProfile[] = [
    * other example. The Truck Dock (+1 inbound) and Local Small Groceries (+1 Laborer) are the two
    * that do work here.
    */
-  { kind: 'grocersWarehouse', name: "Grocer's Warehouse", carTypes: ['boxcar', 'reefer'], flow: 'inbound', baseOut: 0, baseIn: 1, baseLoaders: 1, lockouts: ['packingSheds', 'freightHouse'], copies: 1 },
+  { kind: 'grocersWarehouse', name: "Grocer's Warehouse", carTypes: ['boxcar', 'reefer'], flow: 'inbound', baseOut: 0, baseIn: 1, baseLoaders: 1, lockouts: ['packingSheds', 'freightHouse'], copies: 3 },
 ];
 
 /** Legacy alias; the engine still reads FREIGHT_PROFILES in places. */
@@ -434,19 +395,6 @@ export type TrainRules = {
   /** X17 Campaign, X18 Circus: a scheduled stop that does something. */
   stopEarnsPoint?: boolean;
   stopThenExpedite?: boolean;
-  /**
-   * MUST RUN LOADED (Gitea#13) — X17 Campaign, X18 Circus, X19 Military.
-   *
-   * "I've redefined some of the extra trains that they have to run full boxcars (not just any crazy
-   * stuff) — military trains, circus trains, etc. If not loaded, then empty, and if none available,
-   * run without." So it is a PREFERENCE ORDER enforced at make-up, not a flat requirement: a loaded
-   * car of an acceptable type must be taken while one is in the Division Yard; only once none is
-   * left may an empty be taken; and a train may still depart short (§8.2 already allows fewer cars
-   * than the card lists).
-   *
-   * Distinct from `ConsistSpec.emptiesOnly`, which is the opposite rule for X13 Appleseed.
-   */
-  mustRunLoaded?: boolean;
   /**
    * `copiesNextScheduled` was here and is DELETED. No train card ever carried it: a Second Section
    * is a Maneuver card played on a train that is due out, and it has its own intent
@@ -481,11 +429,8 @@ export const TIMETABLED_TRAINS: readonly TrainProfile[] = [
    * COACH COUNTS ON 1/2 AND 5/6 WERE SWAPPED BY JESSE (Gitea#7, v0.4.9e playtest): the Crack Limited
    * drops from three coaches to two, and The Sparrow rises from two to three. A change to the card
    * faces themselves, not a transcription fix — `Trains3.pdf` and the tables that transcribe it
-   * still print the old numbers, so `docs/rules/as-built.md` is the place that now carries what
-   * the cards say — GENERATED from the constants below by `scripts/build-card-reference.ts`, with
-   * `test/card-reference.test.ts` failing if the two disagree. This comment used to name
-   * `card-reference.md`, which describes the v0.4.5 deck and carries a banner saying not to use its
-   * numbers; the code sent readers to a table it had itself superseded.
+   * still print the old numbers, so `docs/rules/card-reference.md` is the place that now carries
+   * what the cards say.
    */
   ...pair(1, 'Crack Limited', 'fast', { freight: 0, coach: 2, caboose: 0 },
     { terminalsOnly: true, noSwitching: true, expedite: true, note: 'Stop at Terminals only.' }),
@@ -508,9 +453,9 @@ export const EXTRA_TRAINS: readonly TrainProfile[] = [
   { number: 14, isExtra: true, name: 'Fruit Growers Express', speed: 'fast', direction: 'playerChoice', consist: { freight: 2, coach: 0, caboose: 1, freightTypes: ['reefer'] }, rules: { expedite: true, note: 'Reefers only. May pick up one extra loaded reefer.' } },
   { number: 15, isExtra: true, name: 'Yard Xfer', speed: 'slow', direction: 'playerChoice', consist: { freight: 2, coach: 0, caboose: 1 }, rules: {} },
   { number: 16, isExtra: true, name: 'Light Engine Move', speed: 'fast', direction: 'playerChoice', consist: { freight: 0, coach: 0, caboose: 0 }, rules: { noSwitching: true, note: 'No cars at all.' } },
-  { number: 17, isExtra: true, name: 'Campaign Train', speed: 'fast', direction: 'playerChoice', consist: { freight: 0, coach: 1, caboose: 0 }, rules: { noSwitching: true, stopThenExpedite: true, stopEarnsPoint: true, mustRunLoaded: true, note: 'One turn at station (speeches) then expedite. Earns a point per Office Area if the candidate is aboard.' } },
-  { number: 18, isExtra: true, name: 'Circus Train', speed: 'slow', direction: 'playerChoice', consist: { freight: 2, coach: 1, caboose: 1 }, rules: { noSwitching: true, stopEarnsPoint: true, mustRunLoaded: true, note: 'One turn stopped in an Office Area (circus set-up) earns 1 point, once per Area, if fully loaded.' } },
-  { number: 19, isExtra: true, name: 'Military Train', speed: 'slow', direction: 'playerChoice', consist: { freight: 1, coach: 2, caboose: 0 }, rules: { noSwitching: true, noPassengerWork: true, expedite: true, mustRunLoaded: true, note: 'Troops and materiel: runs loaded where the yard can supply it.' } },
+  { number: 17, isExtra: true, name: 'Campaign Train', speed: 'fast', direction: 'playerChoice', consist: { freight: 0, coach: 1, caboose: 0 }, rules: { noSwitching: true, stopThenExpedite: true, note: 'One turn at station (speeches) then expedite.' } },
+  { number: 18, isExtra: true, name: 'Circus Train', speed: 'slow', direction: 'playerChoice', consist: { freight: 2, coach: 1, caboose: 1 }, rules: { noSwitching: true, stopEarnsPoint: true, note: 'One turn stopped on any track (circus set-up) earns 1 point.' } },
+  { number: 19, isExtra: true, name: 'Military Train', speed: 'slow', direction: 'playerChoice', consist: { freight: 1, coach: 2, caboose: 0 }, rules: { noSwitching: true, noPassengerWork: true, expedite: true } },
   { number: 20, isExtra: true, name: "Director's private car", speed: 'slow', direction: 'playerChoice', consist: { freight: 2, coach: 1, caboose: 0 }, rules: { noPassengerWork: true } },
   { number: 21, isExtra: true, name: 'Freight Extra', speed: 'slow', direction: 'playerChoice', consist: { freight: 3, coach: 0, caboose: 1 }, rules: {} },
   { number: 22, isExtra: true, name: 'Pee-Dee', speed: 'slow', direction: 'playerChoice', consist: { freight: 0, coach: 0, caboose: 1 }, rules: { pickUpEmptiesOnly: true, note: 'Per-diem train. May only pick up MTs.' } },
@@ -559,35 +504,22 @@ export type MainlineKind =
   | 'uncontrolledSiding' | 'tunnel' | 'trestle' | 'interchange';
 
 /**
- * THE PRINTED SPEEDS ARE GRAPHICS. RAR, 2026-08-26 (Gitea#3): "please ignore the speed signs I put
- * on the cards — those are nothing but scene-setting graphics that mimic the speed you are
- * travelling. It's just ambiance, nothing more."
+ * Speed as printed. `60` and `30` appear on the cards; Hilly prints P60/F30, and Heavy Grade
+ * prints "G" with the player setting orientation.
  *
- * They used to decide everything: a `MainlineSpeed` of 60 meant one Stage and a 30 meant two, plus
- * one more for a Slow train. Both rules are gone. **What crosses a card is REGIONS** — the boxes
- * printed on it — one per Stage, and where a train STARTS decides how many it has left to run.
+ * WHAT THESE NUMBERS MEAN IS NOT YET SETTLED — see implications.md §10 Q2. Transcribed as data so
+ * the answer can be applied without re-reading the cards.
  */
+export type MainlineSpeed =
+  | { kind: 'uniform'; value: number }
+  | { kind: 'byTrainType'; passenger: number; freight: number }
+  | { kind: 'grade' };
+
 export type MainlineProfile = {
   kind: MainlineKind;
   name: string;
-  /** Regions printed on the card. A train advances one per Stage, so a full run costs `regions`. */
-  regions: number;
-  /**
-   * The region an ordinary train enters at. Zero on nearly everything — but the Uncontrolled Siding
-   * and the Interchange print a back region that is a siding or a holding spur rather than part of
-   * the road, so a train running straight through starts past it and crosses in one Stage.
-   */
-  defaultStart: number;
-  /**
-   * Cards that print a FAST and a SLOW start, and the region each begins at. "Some cards say fast /
-   * slow. This is an indication that if on the train card, the train is listed as fast or slow,
-   * that's starting position / how many stages it takes to traverse the card. Fast / Slow does not
-   * apply to every card — just those that say fast / slow on them. Currently this is only hilly."
-   *
-   * So the train's rating is read HERE and nowhere else. It used to add a Stage to every card.
-   */
-  speedStarts?: { fast: number; slow: number };
-  /** Double Track: "Trains may pass". */
+  speed: MainlineSpeed;
+  /** Double Track and Uncontrolled Siding: "Trains may pass". */
   trainsMayPass: boolean;
   /** Interchange: "Sort cars in new order". */
   sortsCars: boolean;
@@ -596,56 +528,22 @@ export type MainlineProfile = {
 };
 
 export const MAINLINE_PROFILES: readonly MainlineProfile[] = [
-  { kind: 'plains', name: 'Plains', regions: 1, defaultStart: 0, trainsMayPass: false, sortsCars: false, entryPoints: ['start'] },
-  { kind: 'curves', name: 'Curves', regions: 2, defaultStart: 0, trainsMayPass: false, sortsCars: false, entryPoints: ['start'] },
+  { kind: 'plains', name: 'Plains', speed: { kind: 'uniform', value: 60 }, trainsMayPass: false, sortsCars: false, entryPoints: ['start'] },
+  { kind: 'curves', name: 'Curves', speed: { kind: 'uniform', value: 30 }, trainsMayPass: false, sortsCars: false, entryPoints: ['start'] },
+  { kind: 'hilly', name: 'Hilly', speed: { kind: 'byTrainType', passenger: 60, freight: 30 }, trainsMayPass: false, sortsCars: false, entryPoints: ['passenger', 'freight'] },
+  { kind: 'heavyGrade', name: 'Heavy Grade', speed: { kind: 'grade' }, trainsMayPass: false, sortsCars: false, entryPoints: ['start', 'brakemen', 'airbrakes', 'helpers'] },
+  { kind: 'doubleTrack', name: 'Double Track', speed: { kind: 'uniform', value: 60 }, trainsMayPass: true, sortsCars: false, entryPoints: ['start'] },
+  { kind: 'uncontrolledSiding', name: 'Uncontrolled Siding', speed: { kind: 'uniform', value: 60 }, trainsMayPass: true, sortsCars: false, entryPoints: ['noPass', 'passingTrains'] },
+  { kind: 'tunnel', name: 'Tunnel', speed: { kind: 'uniform', value: 30 }, trainsMayPass: false, sortsCars: false, entryPoints: ['start'] },
+  { kind: 'trestle', name: 'Trestle', speed: { kind: 'uniform', value: 60 }, trainsMayPass: false, sortsCars: false, entryPoints: ['start'] },
   /**
-   * THE ONLY CARD THAT READS A TRAIN'S FAST/SLOW RATING. A fast train starts in the second region
-   * and is across in one Stage; a slow one starts at the beginning and takes two.
-   *
-   * It used to read the CONSIST instead — any coach aboard made the train "passenger" for this card
-   * — off the printed P60/F30. RAR corrected that directly: "I notice that you are basing stages in
-   * mainline cards off coach/non-coach. Actually, all trains are rated as FAST and SLOW."
+   * RENAMED FROM "Yard" after play. The card is unchanged — same 60, same "sort cars in new
+   * order", same entry points, same art — but "Yard" collided with the Division Yard, the
+   * Classification Yard, the Salvage Yard, the Yard Office and the Small Yard, none of which are
+   * this. Its own key is renamed with it, so the two never drift apart. Those OTHER yards are
+   * deliberately left alone: they are different things that merely shared a word.
    */
-  { kind: 'hilly', name: 'Hilly', regions: 2, defaultStart: 0, speedStarts: { fast: 1, slow: 0 }, trainsMayPass: false, sortsCars: false, entryPoints: ['fast', 'slow'] },
-  /**
-   * THREE REGIONS, AND THE MODIFIERS MOVE THE START RATHER THAN CUTTING THE TIME — which comes to
-   * the same number of Stages and is how the card is actually printed and played. "If you play the
-   * home deck card 'helpers' against the mainline card heavy grade, it remains there the rest of the
-   * game and helps all trains going up hill by starting 1 region easier — so 2 to traverse, not 3.
-   * Other cards help the other direction, similar idea. Airbrakes is an upgrade from brakemen (which
-   * must be played first)."
-   *
-   * So: Helpers moves an UPHILL train up one region; Brakeman moves a DOWNHILL train up one, and
-   * Airbrakes another on top of it. A fully-equipped grade is one Stage downhill and two up.
-   */
-  { kind: 'heavyGrade', name: 'Heavy Grade', regions: 3, defaultStart: 0, trainsMayPass: false, sortsCars: false, entryPoints: ['start', 'brakemen', 'airbrakes', 'helpers'] },
-  { kind: 'doubleTrack', name: 'Double Track', regions: 1, defaultStart: 0, trainsMayPass: true, sortsCars: false, entryPoints: ['start'] },
-  /**
-   * TWO REGIONS, AND THE BACK ONE IS THE SIDING. A train with the card to itself starts past it and
-   * crosses in one Stage. "Uncontrolled siding: if a train already exists when you arrive, you go in
-   * the second stage back (you are in the siding and are one behind the other train). This prevents
-   * a collision — since you are not in same exact location."
-   *
-   * `trainsMayPass` is FALSE here, and used to be true. Two trains fit, but not by passing: the
-   * second one takes the siding and sits a region behind, which is what keeps them apart. Leaving it
-   * true skipped the collision test altogether and made the siding do nothing at all.
-   */
-  { kind: 'uncontrolledSiding', name: 'Uncontrolled Siding', regions: 2, defaultStart: 1, trainsMayPass: false, sortsCars: false, entryPoints: ['through', 'siding'] },
-  { kind: 'tunnel', name: 'Tunnel', regions: 2, defaultStart: 0, trainsMayPass: false, sortsCars: false, entryPoints: ['start'] },
-  { kind: 'trestle', name: 'Trestle', regions: 1, defaultStart: 0, trainsMayPass: false, sortsCars: false, entryPoints: ['start'] },
-  /**
-   * RENAMED FROM "Yard" after play. The card is unchanged — same "sort cars in new order", same art
-   * — but "Yard" collided with the Division Yard, the Classification Yard, the Salvage Yard, the
-   * Yard Office and the Small Yard, none of which are this. Its own key is renamed with it, so the
-   * two never drift apart. Those OTHER yards are deliberately left alone: they are different things
-   * that merely shared a word.
-   *
-   * TWO REGIONS, the back one a holding spur, exactly as the Uncontrolled Siding: "interchange has
-   * new extras show up in second region (like uncontrolled siding)", and earlier, "Plains is 1 stage
-   * for ALL trains. So are interlockings, with a second stage for incoming extras to hold at." A
-   * train running through crosses in one Stage; an Extra beginning its run here starts at the back.
-   */
-  { kind: 'interchange', name: 'Interchange', regions: 2, defaultStart: 1, trainsMayPass: false, sortsCars: true, entryPoints: ['through', 'extraStart'] },
+  { kind: 'interchange', name: 'Interchange', speed: { kind: 'uniform', value: 60 }, trainsMayPass: false, sortsCars: true, entryPoints: ['start', 'sortCars'] },
 ];
 
 /**
@@ -672,63 +570,44 @@ export const MAINLINE_DECK: readonly MainlineKind[] = [
 ];
 
 /**
- * WHERE A TRAIN ENTERS A MAINLINE CARD, and therefore how long it takes to cross (Gitea#3).
+ * How many Stages a train needs to cross a Mainline card.
  *
- * "Regions shown on cards indicate how many stages it takes to cross. Plains is 1. Double track is
- * 1, tunnel is 2, curves is 2, heavy grade is 3 unless you have help." A train advances one region
- * per Stage, so the whole of crossing time is `regions - startRegion`.
+ * Q1 — the printed 60/30 are miles per hour expressed as crossing time: a 60 card takes one Stage,
+ * a 30 card takes two. The cells drawn on the cards are decoration.
+ * Q2 — a Slow train adds one Stage to every card.
  *
- * FOUR THINGS MOVE THE START, and nothing else does:
- *
- *   1. the card's own `defaultStart` — the Uncontrolled Siding and the Interchange print a back
- *      region that is not part of the road, so a train running through begins past it;
- *   2. `speedStarts`, on a card that prints a Fast and a Slow start. Only Hilly does;
- *   3. the permanent Heavy Grade modifiers, which move a train one region up the hill each;
- *   4. `takesSiding` / `startsAtBack`, the two occupancy cases below.
- *
- * WHAT NO LONGER MOVES IT: the printed mph, which is now scenery, and a train's Fast/Slow rating on
- * any card but Hilly. That rating used to add a Stage to EVERY card, which is what made a Slow train
- * cross Double Track in two Stages and produced the report this issue opened with.
+ * Hilly prints P60/F30, so it reads the consist rather than the speed class: a train carrying any
+ * coach is "passenger" for this purpose.
  */
-export type MainlineEntry = {
-  trainSpeed: TrainSpeed;
-  direction: Direction;
-  gradeUp: Direction;
-  modifiers: readonly string[];
-  /**
-   * The Uncontrolled Siding with a train already on it: this one takes the siding and sits a region
-   * behind, which is what keeps them out of the same place. Also the Interchange, where an Extra
-   * beginning its run starts in the holding region rather than on the road.
-   */
-  startsAtBack?: boolean;
-};
+export function crossingStages(
+  kind: MainlineKind,
+  trainSpeed: TrainSpeed,
+  carriesPassengers: boolean,
+  modifiers: readonly string[] = [],
+  direction: Direction = 'east',
+  gradeUp: Direction = 'east',
+): number {
+  const profile = MAINLINE_PROFILES.find((m) => m.kind === kind);
+  if (!profile) throw new Error(`unknown mainline card: ${kind}`);
 
-export function startRegion(kind: MainlineKind, entry: MainlineEntry): number {
-  const profile = mainlineProfile(kind);
-  if (entry.startsAtBack) return 0;
-
-  const base = profile.speedStarts
-    ? profile.speedStarts[entry.trainSpeed]
-    : profile.defaultStart;
-
-  const climbing = entry.direction === entry.gradeUp;
-  let help = 0;
-  if (kind === 'heavyGrade') {
-    if (climbing) {
-      if (entry.modifiers.includes('helpers')) help++;
-    } else {
-      // Airbrakes is an upgrade on Brakeman and cannot be played without it, so this counts both.
-      if (entry.modifiers.includes('brakeman')) help++;
-      if (entry.modifiers.includes('airbrakes')) help++;
-    }
+  let mph: number;
+  switch (profile.speed.kind) {
+    case 'uniform':
+      mph = profile.speed.value;
+      break;
+    case 'byTrainType':
+      mph = carriesPassengers ? profile.speed.passenger : profile.speed.freight;
+      break;
+    case 'grade':
+      // Heavy Grade has no printed number; the modifier cards are what improve it, so it is a 30
+      // until one is placed.
+      mph = 30;
+      break;
   }
-  // Never past the last region: a card always costs at least one Stage to cross.
-  return Math.min(profile.regions - 1, base + help);
-}
 
-/** How many Stages a train needs to cross a Mainline card — the regions it has left to run. */
-export function crossingStages(kind: MainlineKind, entry: MainlineEntry): number {
-  return mainlineProfile(kind).regions - startRegion(kind, entry);
+  const base = mph >= 60 ? 1 : 2;
+  const stages = base + (trainSpeed === 'slow' ? 1 : 0);
+  return Math.max(1, stages - gradeReduction(profile, modifiers, direction, gradeUp));
 }
 
 /**
@@ -746,60 +625,35 @@ export function crossingStages(kind: MainlineKind, entry: MainlineEntry): number
 export function mainlineDescription(kind: MainlineKind, gradeUp: Direction = 'east'): string {
   const p = mainlineProfile(kind);
   const stages = (n: number): string => `${n} Stage${n === 1 ? '' : 's'}`;
-  const run = (entry: Partial<MainlineEntry>): number =>
-    crossingStages(kind, { trainSpeed: 'fast', direction: 'east', gradeUp, modifiers: [], ...entry });
   const parts: string[] = [];
 
-  parts.push(`${p.regions} region${p.regions === 1 ? '' : 's'} — one Stage each.`);
-
-  if (p.speedStarts) {
+  if (p.speed.kind === 'byTrainType') {
+    // Hilly. The split is by CONSIST, not by the train's speed class: anything with a coach on it
+    // takes the passenger figure.
     parts.push(
-      `This card reads the train's FAST/SLOW rating: a fast train starts further along and crosses ` +
-        `in ${stages(run({ trainSpeed: 'fast' }))}, a slow one in ${stages(run({ trainSpeed: 'slow' }))}. ` +
-        `No other card cares which it is.`,
+      `P${p.speed.passenger} / F${p.speed.freight} — a train carrying ANY coach crosses as a ` +
+        `${p.speed.passenger} (${stages(crossingStages(kind, 'fast', true))} for a fast train), and a ` +
+        `freight-only train as a ${p.speed.freight} (${stages(crossingStages(kind, 'fast', false))}). ` +
+        `A slow train adds one Stage either way.`,
     );
-  } else if (kind === 'heavyGrade') {
+  } else if (p.speed.kind === 'grade') {
     parts.push(
-      `A grade, climbing ${gradeUp === 'east' ? 'eastward' : 'westward'}. ` +
-        `${stages(run({ direction: gradeUp }))} to climb it and ${stages(run({ direction: gradeUp === 'east' ? 'west' : 'east' }))} to run down, ` +
-        `before help. Helpers start an UPHILL train a region further on; Brakeman does the same ` +
-        `DOWNHILL and Airbrakes another again, and Airbrakes cannot be played without Brakeman. ` +
-        `Never less than one Stage.`,
-    );
-  } else if (p.defaultStart > 0) {
-    parts.push(
-      `A train with the card to itself starts past the back region and is across in ` +
-        `${stages(run({}))}.`,
+      `A grade, climbing ${gradeUp === 'east' ? 'eastward' : 'westward'}. It crosses as a 30 — ` +
+        `${stages(crossingStages(kind, 'fast', false, [], gradeUp, gradeUp))} for a fast train, and one ` +
+        `more for a slow one. Brakeman and Airbrakes each take a Stage off a train running DOWNHILL; ` +
+        `Helpers takes one off a train running UPHILL. Never below one Stage.`,
     );
   } else {
-    /**
-     * NOT A WORD ABOUT SPEED HERE — Jesse, playtest 2026-09-16.
-     *
-     * This read "the printed speed is scenery", which sent a player hunting the card for a number
-     * that is not drawn on it. The first rewrite said "fast or slow alike", which is true but raises
-     * the question on thirteen cards in order to answer it. **Exactly one card reads FAST/SLOW**:
-     * Hilly, the only profile with `speedStarts` (see the note above it). So the explanation belongs
-     * on that card, where the branch above already gives it, and everywhere else says nothing —
-     * silence is the honest answer when the rating genuinely does not apply.
-     */
-    parts.push(`${stages(run({}))} for every train.`);
-  }
-
-  if (kind === 'uncontrolledSiding') {
     parts.push(
-      'UNCONTROLLED SIDING — arrive to find a train already here and you take the siding, a region ' +
-        'behind it. You are not in the same place, so you do not run into it; it costs you the ' +
-        'extra Stage instead.',
+      `${p.speed.value} — ${stages(crossingStages(kind, 'fast', false))} for a fast train, ` +
+        `${stages(crossingStages(kind, 'slow', false))} for a slow one.`,
     );
   }
-  if (kind === 'interchange') {
-    parts.push('An Extra beginning its run here starts in the back region and takes the extra Stage.');
-  }
 
   if (p.trainsMayPass) {
     parts.push(
       'TRAINS MAY PASS — two trains may stand on this card at once, so a following train is not held ' +
-        'behind a slower one.',
+        'behind a slower one. Only this and the Double Track allow it.',
     );
   } else {
     parts.push('One train at a time — anything following has to wait for it to clear.');
@@ -809,7 +663,31 @@ export function mainlineDescription(kind: MainlineKind, gradeUp: Direction = 'ea
   return parts.join(' · ');
 }
 
-
+/**
+ * Q11, answered: the Heavy Grade card prints "(Up)" and "Player sets orientation", so which way it
+ * climbs is a property of the placed card, not a constant. `gradeUp` is the direction a train is
+ * travelling when it goes UPHILL; a train heading the other way is descending.
+ *
+ * Each applicable card takes a Stage off, never below one: a train cannot cross in no time.
+ * Airbrakes only counts when Brakeman is already there, which the placement rule enforces.
+ */
+function gradeReduction(
+  profile: MainlineProfile,
+  modifiers: readonly string[],
+  direction: Direction,
+  gradeUp: Direction,
+): number {
+  if (profile.speed.kind !== 'grade') return 0;
+  const downhill = direction !== gradeUp;
+  let n = 0;
+  if (downhill) {
+    if (modifiers.includes('brakeman')) n++;
+    if (modifiers.includes('airbrakes')) n++;
+  } else if (modifiers.includes('helpers')) {
+    n++;
+  }
+  return n;
+}
 
 export function mainlineProfile(kind: MainlineKind): MainlineProfile {
   const p = MAINLINE_PROFILES.find((m) => m.kind === kind);
@@ -870,8 +748,7 @@ export const SPACE_USE_CARDS: readonly SimpleCard[] = [
   { key: 'flopHouse', name: 'Flop house', copies: 1, placement: 'adjacent to any straight, curve, turnout', effect: 'Burns tablespace.' },
   { key: 'watertower', name: 'Watertower', copies: 1, placement: 'adjacent to any straight, turnout on Running Track', effect: 'Burns tablespace.' },
   { key: 'hoboJungle', name: 'Hobo Jungle', copies: 1, placement: 'adjacent to any straight, turnout, Limit on Running Track', effect: 'Burns tablespace. Vandalism can loot a boxcar passing it.' },
-  // Not in sheet 5 — dealt 0 copies (Jesse, 2026-08-26), the same treatment as the ladder.
-  { key: 'sectionHouse', name: 'Section House', copies: 0, placement: 'adjacent to any straight, curve, turnout', effect: 'Burns tablespace.' },
+  { key: 'sectionHouse', name: 'Section House', copies: 1, placement: 'adjacent to any straight, curve, turnout', effect: 'Burns tablespace.' },
   { key: 'cityBlocks', name: 'City blocks', copies: 4, placement: 'adjacent to any straight, curve, turnout, Limit', effect: 'Burns tablespace.' },
   { key: 'engineShops', name: 'Engine Shops', copies: 1, placement: 'adjacent to any straight, curve, turnout', effect: 'Burns tablespace.' },
   { key: 'tenderloin', name: 'Tenderloin District', copies: 1, placement: 'adjacent to any straight, curve, turnout, Limit', effect: 'Burns tablespace.' },
@@ -978,32 +855,16 @@ export function enhancementRule(key: string): EnhancementRule | null {
 }
 
 export const ENHANCEMENT_CARDS: readonly SimpleCard[] = [
-  { key: 'interlocking', name: 'Interlocking', copies: 1, placement: 'any Running Track Straight', effect: 'May stop an inbound train on the Limit Track.' },
-  // Not in sheet 5 — dealt 0 copies (Jesse, 2026-08-26). It answers Derail, which is itself an
-  // Event held out until built, so at zero it defends against nothing that can be dealt anyway.
-  { key: 'facingPointLocks', name: 'Facing Point Locks', copies: 0, placement: 'adjacent to Interlocking', effect: 'Must have Interlocking. Prevents Derail being played on you.', answers: 'Derail' },
+  { key: 'interlocking', name: 'Interlocking', copies: 2, placement: 'any Running Track Straight', effect: 'May stop an inbound train on the Limit Track.' },
+  { key: 'facingPointLocks', name: 'Facing Point Locks', copies: 2, placement: 'adjacent to Interlocking', effect: 'Must have Interlocking. Prevents Derail being played on you.', answers: 'Derail' },
   { key: 'yardOffice', name: 'Yard office', copies: 1, placement: 'any Secondary Track Straight', effect: 'An inbound train with no coaches that can reach the yard office in one move may arrive there instead of the Train Order Office.' },
   { key: 'smallYard', name: 'Small yard', copies: 1, placement: 'any Secondary Track Straight', effect: 'A train that spends one move in the yard may sort itself into ANY order, including cars ahead of the engine.' },
-  { key: 'waterColumn', name: 'Water column', copies: 1, placement: 'any Running Track Straight', effect: 'Lets you remove any Watertower in your district.', answers: 'Watertower' },
+  { key: 'waterColumn', name: 'Water column', copies: 2, placement: 'any Running Track Straight', effect: 'Lets you remove any Watertower in your district.', answers: 'Watertower' },
   { key: 'overpass', name: 'Overpass', copies: 1, placement: 'any Railroad Crossing', effect: 'Removes the restrictions of a played Railroad Crossing.', answers: 'Railroad crossing' },
-  /**
-   * THE DISPATCHING LADDER IS OUT OF THE DECK, at 0 copies rather than deleted — the treatment
-   * Poling and the sharp curves already get, and for the same reason.
-   *
-   * `docs/Deck cards5.xlsx` does not list Telegraph, Telephone or Radio at any count, and **Jesse
-   * confirmed (2026-08-26) that the removal is deliberate, not a row that failed to carry across**
-   * from sheet 2. So no copy is dealt, which is what the sheet asks for.
-   *
-   * The rows and `ENHANCEMENT_RULES`' `dispatchBonus` chain stay exactly where they are. The rule
-   * is implemented and tested — `advance.ts` reads the ladder when the Superintendent dispatches
-   * facing trains, best device first — and deleting working machinery to express a count of zero
-   * would throw away the only record of how it worked. At zero copies the code is unreachable: no
-   * card is ever dealt, so nothing ever places one, so the bonus never applies.
-   */
-  { key: 'telegraph', name: 'Telegraph', copies: 0, placement: 'any Running Track Straight', effect: 'Once a day, when dispatching facing trains, add +4 to the other train’s number.' },
-  { key: 'telephone', name: 'Telephone', copies: 0, placement: 'on Telegraph', effect: 'Once a day, add +8 to the other train’s number.' },
-  { key: 'radio', name: 'Radio', copies: 0, placement: 'on Telephone', effect: 'Once a day, add +12 to the other train’s number.' },
-  { key: 'absSignals', name: 'ABS Signals', copies: 1, placement: 'any Mainline card', effect: 'Trains on this card will not rear-end each other; they stop short of a collision.' },
+  { key: 'telegraph', name: 'Telegraph', copies: 3, placement: 'any Running Track Straight', effect: 'Once a day, when dispatching facing trains, add +4 to the other train’s number.' },
+  { key: 'telephone', name: 'Telephone', copies: 2, placement: 'on Telegraph', effect: 'Once a day, add +8 to the other train’s number.' },
+  { key: 'radio', name: 'Radio', copies: 2, placement: 'on Telephone', effect: 'Once a day, add +12 to the other train’s number.' },
+  { key: 'absSignals', name: 'ABS Signals', copies: 2, placement: 'any Mainline card', effect: 'Trains on this card will not rear-end each other; they stop short of a collision.' },
 ];
 
 export const MAINLINE_MODIFIER_CARDS: readonly SimpleCard[] = [
@@ -1011,8 +872,7 @@ export const MAINLINE_MODIFIER_CARDS: readonly SimpleCard[] = [
   { key: 'airbrakes', name: 'Airbrakes', copies: 1, placement: 'a GRADE Mainline card', effect: 'Faster passage downhill. Brakeman must be in effect.' },
   { key: 'helpers', name: 'Helpers', copies: 1, placement: 'a GRADE Mainline card', effect: 'Faster passage uphill.' },
   { key: 'realignment', name: 'Realignment', copies: 2, placement: 'a Mainline card', effect: 'Convert one Mainline type to another. Not while a train is on it.' },
-  // Not in sheet 5 — dealt 0 copies (Jesse, 2026-08-26); see the Enhancement of the same name.
-  { key: 'facingPointLocksMainline', name: 'Facing Point Locks', copies: 0, placement: 'adjacent to Interlocking', effect: 'Prevents Derail being played on you.', answers: 'Derail' },
+  { key: 'facingPointLocksMainline', name: 'Facing Point Locks', copies: 2, placement: 'adjacent to Interlocking', effect: 'Prevents Derail being played on you.', answers: 'Derail' },
 ];
 
 /**
@@ -1023,9 +883,8 @@ export const MAINLINE_MODIFIER_CARDS: readonly SimpleCard[] = [
 export const SECOND_SECTION = { key: 'secondSection', name: 'Second Section', copies: 1 };
 
 export const MANEUVER_CARDS: readonly SimpleCard[] = [
-  { key: 'redFlags', name: 'Red Flags', copies: 3, placement: 'any time', effect: 'A stopped train is prevented from being hit; the approaching train is prevented from moving.' },
-  // Not in sheet 5 — dealt 0 copies (Jesse, 2026-08-26). The reducer stays; nothing can reach it.
-  { key: 'flyingSwitch', name: 'Flying Switch', copies: 0, placement: 'any time', effect: 'Break a cut of cars away from behind the engine and roll them into an industry.' },
+  { key: 'redFlags', name: 'Red Flags', copies: 5, placement: 'any time', effect: 'A stopped train is prevented from being hit; the approaching train is prevented from moving.' },
+  { key: 'flyingSwitch', name: 'Flying Switch', copies: 1, placement: 'any time', effect: 'Break a cut of cars away from behind the engine and roll them into an industry.' },
   // POLING IS OUT OF THE DECK, at 0 copies rather than deleted.
   //
   // It is the one card whose effect the source records as "TBD", so there is nothing to implement
@@ -1042,8 +901,7 @@ export const ACTION_CARDS: readonly SimpleCard[] = [
   { key: 'perDiemInventory', name: 'Per Diem inventory', copies: 1, placement: 'another player', effect: 'Lose one point per 2 empty cars on Secondary Tracks.' },
   { key: 'demurrageCharge', name: 'Demurrage charge', copies: 1, placement: 'another player', effect: 'Lose one point per 2 loaded freight cars on Secondary Tracks.' },
   { key: 'customerComplaints', name: 'Customer complaints', copies: 1, placement: 'another player', effect: 'Lose one point per 2 coaches in loading boxes.' },
-  // Not in sheet 5 — dealt 0 copies (Jesse, 2026-08-26).
-  { key: 'vandalism', name: 'Vandalism', copies: 0, placement: 'another player', effect: 'A train passing a Hobo Jungle has a boxcar looted (converted to empty).' },
+  { key: 'vandalism', name: 'Vandalism', copies: 1, placement: 'another player', effect: 'A train passing a Hobo Jungle has a boxcar looted (converted to empty).' },
   { key: 'hotbox', name: 'Hotbox', copies: 1, placement: 'another player', effect: 'A train just arrived must set one car (chooser’s pick) onto Secondary Track until it departs.' },
   { key: 'outlawed', name: 'Outlawed', copies: 1, placement: 'another player', effect: 'A train just arrived may not depart for one turn — the crew’s hours have expired.' },
 ];
@@ -1082,17 +940,12 @@ export function mainlineCardCount(players: number): number {
   return players + 1;
 }
 
-/**
- * Sourced, not provisional: `rules-v0.2.md`:339, "There are only a limited number of Crew Trays
- * and engine pieces [Gap 4b: player count + 3]." The rules tie Crew Trays and engine pieces
- * together as ONE combined resource, not two independently-tracked supplies — an engine is never
- * conjured separately from the tray it rides in, and the game has no state for "an engine with no
- * tray" or "a tray with no engine". `state.ts`'s `freeTrays` pool already IS the engine supply.
- */
+/** Provisional; not in the recovered files. */
 export function crewTrayCount(players: number): number {
   return players + 3;
 }
 
+export const REGIONS_PER_MAINLINE_CARD = 2; // provisional, pending §10 Q2
 export const STAGES_PER_DAY = 12;
 export const STAGES_PER_SHIFT = 3;
 export const HAND_LIMIT = 3;
@@ -1284,11 +1137,7 @@ export const MOVES_PER_LOCAL_OPS = 6;
 export const MOVES_PER_LOCAL_OPS_NIGHT = 5;
 export const LABORER_ACTIONS_PER_LOAD = 4;
 export const COLLISION_PENALTY = 5;
-/** Suggested defaults for `GameConfig`'s collision floors — see `state.ts`'s `GameConfig` doc. */
-export const DEFAULT_MAX_COLLISIONS_PER_DAY = 3;
-export const DEFAULT_MAX_COLLISIONS_TOTAL = 5;
-/** Suggested default for `GameConfig.days`, all modes. */
-export const DEFAULT_DAYS = 5;
+export const COLLISION_FLOOR_PER_DAY = 3;
 /**
  * Q3 — an expedited train left parked off the Office when a Mainline Phase begins is a Station
  * Master fault: the train was not kept ready to highball the moment the Subdivision allowed it.
@@ -1296,27 +1145,18 @@ export const DEFAULT_DAYS = 5;
  */
 export const EXPEDITE_FAULT_PENALTY = 1;
 
-/**
- * The suggested default for `GameConfig.minCombinedRevenue` — a caller computes this before
- * submitting a config; the engine itself never calls it (`state.ts`'s `GameConfig` doc explains why).
- */
 export function collectiveRevenueFloor(players: number, days: number): number {
   return 3 * players * days;
 }
 
-/**
- * `GameLength` IS NOT PART OF `GameConfig` ANY MORE (2026-08-20) — `days` is a free variable there
- * now, replacing the old `target`-bearing preset. This survives only as a convenience for sim/CLI
- * tooling (`harness.ts`, `compare.ts`, `replay.ts`) that still wants a `short`/`standard`/`campaign`
- * argument instead of a raw day count; `lengthProfile()` just resolves that argument to `days`.
- */
 export type GameLength = 'short' | 'standard' | 'campaign';
-export type LengthProfile = { length: GameLength; days: number };
+export type LengthProfile = { length: GameLength; target: number; days: number };
 
+/** Provisional and now unvalidated — the balance run they came from used a placeholder ruleset. */
 export const LENGTH_PROFILES: readonly LengthProfile[] = [
-  { length: 'short', days: 3 },
-  { length: 'standard', days: 5 },
-  { length: 'campaign', days: 10 },
+  { length: 'short', target: 10, days: 3 },
+  { length: 'standard', target: 20, days: 5 },
+  { length: 'campaign', target: 45, days: 10 },
 ];
 
 export function lengthProfile(length: GameLength): LengthProfile {

src/engine/events.ts

@@ -26,17 +26,6 @@ import type { CardId, GridCoord, PlayerIndex, RollingStock, SeatIndex, TrayId }
 export type GameEvent =
   // -- clock
   | { type: 'stageBegan'; day: number; stage: number }
-  /** Employee Rotation (Appendix B) — every player has moved one chair left for the new Day. */
-  | { type: 'seatsRotated'; day: number; seating: PlayerIndex[] }
-  /**
-   * §5 — the Fedora passed, at the end of Stage 3, 6, 9 or 12.
-   *
-   * ITS OWN EVENT RATHER THAN THE `actorChanged` THIS USED TO RIDE ON. That one is turn bookkeeping,
-   * fired every time the cursor moves, and `record()` drops it on the floor as noise — so the one
-   * moment it carried that a player actually needed to see went past in silence. Reported from the
-   * table (2026-09-16): the Supervisor Shift appears in the history and the handover never does.
-   */
-  | { type: 'superintendentChanged'; player: PlayerIndex; stage: number }
   | { type: 'phaseBegan'; phase: string }
   | { type: 'actorChanged'; player: PlayerIndex | null }
   // -- local operations
@@ -46,10 +35,9 @@ export type GameEvent =
    * more than one legal route to `to`, so the history can say which one ran rather than leaving a
    * choice the player made invisible in their own log.
    */
-  | { type: 'trayMoved'; player: PlayerIndex; trayId: TrayId; from: GridCoord; to: GridCoord; movesRemaining: number; movesAllowed: number; facing?: 'n' | 's' | 'e' | 'w'; via?: GridCoord }
+  | { type: 'trayMoved'; trayId: TrayId; from: GridCoord; to: GridCoord; movesRemaining: number; facing?: 'n' | 's' | 'e' | 'w'; via?: GridCoord }
   | {
       type: 'carsCoupled';
-      player: PlayerIndex;
       trayId: TrayId;
       at: GridCoord;
       stock: RollingStock[];
@@ -81,40 +69,8 @@ export type GameEvent =
        */
       recoupled?: { at: GridCoord; stock: RollingStock[] };
     }
-  | { type: 'carsDropped'; player: PlayerIndex; trayId: TrayId; at: GridCoord; stock: RollingStock[]; fromNose?: boolean }
-  | {
-      type: 'consistSorted';
-      player: PlayerIndex;
-      trayId: TrayId;
-      at: GridCoord;
-      before: RollingStock[];
-      after: RollingStock[];
-      /**
-       * Where the engine ends up in `after`, counted as an index into it — 0 is the nose.
-       *
-       * The Small Yard used to put the engine back on the front unconditionally, which is what the
-       * v0.4.5 card text says ("reorder its entire consist and put the engine at the nose").
-       * `implications.md` records the design source saying the opposite — "may sort itself into any
-       * order, INCLUDING cars ahead of the engine" — and Jesse settled it that way on 2026-09-17.
-       */
-      engineAt: number;
-    }
-  /**
-   * A player finished their switching turn: what it cost, and where the crew was left.
-   *
-   * The history panel keeps a switching turn's FIRST move and drops the ones in the middle, so the
-   * closing line is where "and it ended up here" has to come from. It cannot be recovered by
-   * revealing the last `trayMoved` after the fact: the log streams to clients as it is written
-   * (`server/session.ts` § linesSince), and nobody knows a move was the last one until the turn is
-   * already over and that line has been sent.
-   */
-  | {
-      type: 'switchingEnded';
-      player: PlayerIndex;
-      movesUsed: number;
-      movesAllowed: number;
-      lastMove?: { trayId: TrayId; to: GridCoord };
-    }
+  | { type: 'carsDropped'; trayId: TrayId; at: GridCoord; stock: RollingStock[]; fromNose?: boolean }
+  | { type: 'consistSorted'; trayId: TrayId; at: GridCoord; before: RollingStock[]; after: RollingStock[] }
   | { type: 'cardDrawn'; player: PlayerIndex; source: 'homeOffice' | 'department'; slot?: number; cardId: CardId }
   /**
    * §6.2 — the Home Office deck ran out, so the Salvage Yard and all three Department decks were
@@ -128,19 +84,8 @@ export type GameEvent =
   | { type: 'deckReshuffled'; order: CardId[]; rngState: number }
   /** `variant` is the chosen orientation (Gap 11); it must be replayable, so it rides the event. */
   | { type: 'cardPlayed'; player: PlayerIndex; cardId: CardId; placement?: GridCoord; variant?: number }
-  /**
-    * `from` is the card's kind BEFORE the change, carried so the log can say what was realigned
-    * rather than only what it turned into (playtest, 2026-09-15: "it should state that the mainline
-    * card 3 curves was converted to plains"). Events are derived by replaying a save, never stored,
-    * so widening one strands nothing on disk.
-    */
-  | { type: 'mainlineModified'; player: PlayerIndex; cardId: CardId; node: number; key: string; from?: string; became?: string }
-  /** §Q (Gitea#19) — a flag planted on one side of a district's Limits. */
-  | { type: 'redFlagsSet'; player: PlayerIndex; cardId: CardId; seat: SeatIndex; side: Direction }
-  /** §Q (Gitea#19) — the flag stopped a train and came down with it. One card, one train. */
-  | { type: 'redFlagSpent'; seat: SeatIndex; side: Direction; trainNumber: number }
-  /** §Q (Gitea#19) — the district's owner answered the out-of-phase "flag against this train?". */
-  | { type: 'redFlagRuled'; player: PlayerIndex; trainId: TrayId; flag: boolean }
+  | { type: 'mainlineModified'; player: PlayerIndex; cardId: CardId; node: number; key: string; became?: string }
+  | { type: 'redFlagsSet'; player: PlayerIndex; cardId: CardId; trayId: TrayId; node: number }
   | {
       type: 'trainsDestroyed';
       player: PlayerIndex;
@@ -200,13 +145,7 @@ export type GameEvent =
    * switched normally like any other arrival, but it has to be back on the Office square before the
    * next Mainline Phase begins, or `expediteFault` fires.
    */
-  /**
-   * `owner` is WHOSE Office it reached — the district's player, not whoever is acting. The Mainline
-   * Phase has no actor, so nothing else in the line could name the seat, and the narration said only
-   * "ARRIVED at the Whistle Post" — every seat's Office has a tier, and at a four-seat table three of
-   * them are somebody else's (Jesse, playtest 2026-09-16).
-   */
-  | { type: 'trainArrived'; trainNumber: number; consist: RollingStock[]; office: string; owner: PlayerIndex; expedited: boolean }
+  | { type: 'trainArrived'; trainNumber: number; consist: RollingStock[]; office: string; expedited: boolean }
   | { type: 'trainDiverted'; trainNumber: number; to: string; reason: string }
   /**
    * The train ran the length of the Division and left it. `side` is the Division Point it left by,
@@ -227,36 +166,8 @@ export type GameEvent =
       at: ExtraStart;
       direction: Direction;
     }
-  | { type: 'carPlacedOnTrain'; player: PlayerIndex; trayId: TrayId; stock: RollingStock; trainNumber: number | null; isExtra: boolean }
-  | { type: 'carPassed'; player: PlayerIndex; trayId: TrayId; trainNumber: number | null; isExtra: boolean }
-  /**
-   * A train was made up and the round could give it NOTHING THE CARD CALLS FOR — the Division Yard
-   * holds no car of a category it still wants (§7, §8.2 "may depart with fewer").
-   *
-   * ITS OWN EVENT BECAUSE THE SILENCE WAS THE BUG (playtest, 2026-09-16: "train 5, the sparrow, has
-   * no coaches, which seems strange"). `trainNeedingCars` returns null in exactly this case, so the
-   * phase never stops, nobody is asked for a car, and the only trace was a MADE UP line promising
-   * "now taking cars" with nothing after it. The train then ran the whole Division empty.
-   *
-   * CARRIES WHY, not just that. The shortage is a standing condition rather than a moment — §2.2
-   * returns the Classification Yard only when the Division Yard runs bare — so the counts that
-   * explain it have to travel with the event: what is still wanted, how many such cars are waiting
-   * in Classification, and how far the Division Yard is from empty.
-   */
-  | {
-      type: 'makeUpShort';
-      trainNumber: number;
-      isExtra: boolean;
-      /** How many cars it got, out of what the card calls for. */
-      placed: number;
-      wanted: number;
-      /** The categories the card still wants and the Division Yard cannot supply. */
-      missing: ('freight' | 'coach' | 'caboose')[];
-      /** Cars of those categories sitting in the Classification Yard. */
-      waiting: number;
-      /** §2.2 — Classification comes back only when this reaches zero. */
-      divisionYardHolds: number;
-    }
+  | { type: 'carPlacedOnTrain'; player: PlayerIndex; trayId: TrayId; stock: RollingStock }
+  | { type: 'carPassed'; player: PlayerIndex; trayId: TrayId }
   | { type: 'dispatchBonusUsed'; key: string; bonus: number; trainNumber: number; againstTrain: number }
   | { type: 'clearanceRequested'; trainId: TrayId; occupiedBy: TrayId }
   | { type: 'clearanceGiven'; trainId: TrayId; allow: boolean }
@@ -282,25 +193,6 @@ export type GameEvent =
   | { type: 'unloadBegan'; player: PlayerIndex; at: GridCoord; carType: CarType; carIndex: number }
   // -- consequences
   | { type: 'revenueChanged'; player: PlayerIndex; delta: number; total: number; reason: string }
-  | { type: 'phaseEnded'; player: PlayerIndex; phase: string }
-  // -- §3.3, extended play (Gitea#11)
-  /**
-   * One seat's answer to "play one more Day?". Every seat votes; the vote is unanimous, and one
-   * refusal ends it. In the log so that a table can see who is still being waited on, and who
-   * called time.
-   */
-  | { type: 'extensionVoted'; player: PlayerIndex; agree: boolean }
-  /** The table agreed. `day` is the Day the extra one becomes — `config.days + extraDays`. */
-  | { type: 'dayExtended'; day: number }
-  /**
-   * Play is over for good — somebody declined the extension.
-   *
-   * Distinct from the ending itself, which `checkVictory` already announced by way of the result: an
-   * ending that COULD have been played past and was not is a decision the table made, and the log
-   * should say so rather than simply stopping.
-   */
-  | { type: 'playConcluded'; declinedBy: PlayerIndex }
-  /** §11 (Gitea#5) — the district's owner answered the Yard Office offer. */
-  | { type: 'yardOfficeRuled'; player: PlayerIndex; trainId: TrayId; take: boolean };
+  | { type: 'phaseEnded'; player: PlayerIndex; phase: string };
 
 export type EventType = GameEvent['type'];

src/engine/intents.ts

@@ -47,19 +47,7 @@ export type Intent =
    * order, including cars in front of the engine". This is the designed answer to §A.3's
    * come-off-in-seated-order constraint, which is what makes facing-point work possible.
    */
-  /**
-   * §Enhancements, Small Yard — one Move to re-make a train standing on the yard.
-   *
-   * `order` is a permutation of the current consist, nose first. `engineAt` is where the LOCOMOTIVE
-   * ends up in it: 0 puts it back on the front, which is what the v0.4.5 card text describes and
-   * what this action did unconditionally until 2026-09-17. `implications.md` records the design
-   * source saying a train here "may sort itself into any order, including cars ahead of the engine",
-   * and Jesse ruled that way — so it is a number now, and a train left nose-loaded is one §8.2 will
-   * not let out of the Office until it is sorted again.
-   *
-   * Optional, defaulting to 0, so every save written before this replays exactly as it did.
-   */
-  | { type: 'switch.sortConsist'; trayId: TrayId; order: number[]; engineAt?: number }
+  | { type: 'switch.sortConsist'; trayId: TrayId; order: number[] }
   | { type: 'switch.end' }
   // -- draw (§6.2)
   | { type: 'draw.fromHomeOffice' }
@@ -132,24 +120,10 @@ export type Intent =
    */
   | { type: 'mainline.modify'; cardId: CardId; node: number }
   /**
-   * §Q, RED FLAGS (Gitea#19) — plant a flag on one side of your own district.
-   *
-   * "If played, asked FLAG EAST or FLAG WEST. That stops all trains from entering your limits from
-   * that direction (i.e. Flag East holds westbound trains). You can do this if you see a problem or
-   * wish to complete switching."
-   *
-   * `side` names the side of the district the flag goes on, so a train arriving from that side is
-   * held. It REPLACES the old rule, which was played on a stopped train out on the Mainline and
-   * protected it from a rear-ender: measured at 4,212 offers and 4 plays across 600 games, a
-   * mechanic nobody used. ABS Signals already protects a train standing on a Mainline card.
+   * Red Flags — protect a stopped train. The flagged train cannot be hit; an approaching train is
+   * held instead of colliding.
    */
-  | { type: 'maneuver.redFlags'; cardId: CardId; side: Direction }
-  /**
-   * The same card, played OUT OF PHASE at the moment of danger (Gitea#19) — "COLLISION RISK! FLAG
-   * AGAINST T2?". Answers a pending `redFlag` decision; `flag: false` declines and lets the
-   * collision happen. The side is not asked for: the train is already coming from one.
-   */
-  | { type: 'mainline.redFlag'; flag: boolean; cardId?: CardId }
+  | { type: 'maneuver.redFlags'; cardId: CardId; trayId: TrayId }
   /**
    * Flying Switch — cut cars off behind the engine and roll them into an adjacent industry, without
    * the engine entering it.
@@ -173,37 +147,7 @@ export type Intent =
   | { type: 'laborer.startLoad'; at: GridCoord }
   | { type: 'laborer.advanceLoad'; at: GridCoord; box: number }
   | { type: 'laborer.beginUnload'; at: GridCoord; carIndex: number }
-  | { type: 'loadUnload.end' }
-  /**
-   * §3.3, EXTENDED PLAY (Gitea#11) — one vote on whether to play one more Day.
-   *
-   * ARRIVES OUT OF TURN, like `mainline.clearance`, and unlike it goes to EVERY seat rather than to
-   * the Superintendent: it is a table decision, not a ruling. Unanimous, and one `agree: false`
-   * ends the game immediately — nobody waits on a player who has already refused.
-   *
-   * It is an intent, rather than a button the client handles by itself, because a save is
-   * `{ seed, config, history }` replayed through the engine: a decision that is not in the history
-   * did not happen, and an extended game would evaporate on the next reload, Undo, or server
-   * restart. This is the record of the table agreeing.
-   *
-   * CARRIES ITS VOTER, uniquely among intents, and it has to. A saved history is a flat `Intent[]`
-   * with no seat recorded against each move: the replay DERIVES who acted from the turn order
-   * (`fromMultiplayerSave`). That works for every other intent, including `mainline.clearance`,
-   * because there is exactly one seat it could have been. Here there is not — every seat may vote,
-   * in any order — so a vote whose voter is not written down cannot be replayed at all, and a
-   * resumed server would refuse the save with `NO_ACTOR`. The server checks this against the seat
-   * it authenticated (`NOT_YOUR_TURN`), so it is a record, never a claim.
-   */
-  | { type: 'game.extend'; player: PlayerIndex; agree: boolean }
-  /**
-   * §11 (Gitea#5) — take the Yard Office, or the standard Office.
-   *
-   * Interrupts the Mainline Phase like `mainline.clearance`, and like it goes to one named player:
-   * whoever sits in the district the train is arriving at. Offered only when a route exists, so
-   * `take: true` always has somewhere to go — though it may still meet cars on the lead and crash,
-   * which is the point of the rule.
-   */
-  | { type: 'mainline.yardOffice'; take: boolean };
+  | { type: 'loadUnload.end' };
 
 export type IntentType = Intent['type'];
 
@@ -314,8 +258,6 @@ export type RejectionCode =
   | 'NO_EMPTY_COACH_IN_YARD'
   | 'NOT_A_CONTROL_POINT'
   | 'NO_EXTRA_PENDING'
-  /** §7 gives an Extra to the player who played the card; another seat may not place it for them. */
-  | 'NOT_YOUR_EXTRA'
   | 'NO_FREE_TRAY'
   | 'NO_FREE_AD_TRACK'
   // -- §7, where an Extra may be started (`resolveExtraStart`)
@@ -332,17 +274,7 @@ export type RejectionCode =
    * §6.2, Jesse's ruling (Gitea#6) — a train card is never discarded. Hold it as long as you like;
    * the only way it leaves your hand is onto the timetable.
    */
-  | 'TRAINS_ARE_NEVER_DISCARDED'
-  /** §3.3 (Gitea#11) — `game.extend` when the game is not waiting on an extension vote. */
-  | 'NOT_AWAITING_EXTENSION'
-  /** §3.3 (Gitea#11) — this seat has already voted on this extension. */
-  | 'ALREADY_VOTED'
-  /** §11 (Gitea#5) — answering a Yard Office offer that is not open. */
-  | 'NO_YARD_OFFICE_OFFER'
-  /** §Q (Gitea#19) — answering a Red Flag prompt that is not open. */
-  | 'NO_RED_FLAG_PROMPT'
-  /** §Q (Gitea#19) — this district already has a flag on that side. */
-  | 'ALREADY_FLAGGED';
+  | 'TRAINS_ARE_NEVER_DISCARDED';
 
 export type Rejection = { code: RejectionCode; message: string };
 

src/engine/legal.ts

@@ -14,7 +14,7 @@
 
 import type { CarType, Hand, TrackGeometry } from './content.ts';
 import { enhancementRule, mainlineProfile } from './content.ts';
-import { check, areaOf, destinationsFor, withRouteCache } from './apply.ts';
+import { check, areaOf, destinationsFor } from './apply.ts';
 import type { Intent } from './intents.ts';
 import type { GameState, GridCoord, PlayerIndex } from './state.ts';
 import { coordKey, seatOf } from './state.ts';
@@ -53,18 +53,64 @@ const CAR_TYPES: readonly CarType[] = ['coach', 'boxcar', 'reefer', 'hopper', 't
 
 /** Every intent `player` may legally submit right now. */
 export function legalActions(s: GameState, player: PlayerIndex): Intent[] {
-  // One position, examined many times over: its routes are walked once (`withRouteCache`).
-  return withRouteCache(s, () => candidates(s, player).filter((i) => check(s, player, i) === null));
+  return candidates(s, player).filter((i) => check(s, player, i) === null);
+}
+
+export function isLegal(s: GameState, player: PlayerIndex, i: Intent): boolean {
+  return check(s, player, i) === null;
 }
 
 /**
- * §6.1 — the switching half of the Local Operations candidates, in the order `legalActions` offers
- * them. Split out so the switching planner (`sim/switch-planner.ts`) can ask for just these without
- * `check` running over every draw and Freight Agent candidate at each of the thousands of positions it
- * tries — that was about a quarter of all planning time. Still no rules here: `check` decides.
+ * Candidate generation. Over-generates freely — `check` is the authority, so a candidate that
+ * turns out to be illegal simply gets filtered. Being generous here is what stops this module
+ * from quietly acquiring rules.
  */
-function switchCandidates(s: GameState, player: PlayerIndex): Intent[] {
+function candidates(s: GameState, player: PlayerIndex): Intent[] {
   const out: Intent[] = [];
+
+  // The clearance ruling arrives out of turn order and goes to the Superintendent (§8.1).
+  if (s.clock.pendingDecision !== null) {
+    out.push({ type: 'mainline.clearance', allow: true });
+    out.push({ type: 'mainline.clearance', allow: false });
+  }
+
+  switch (s.clock.phase) {
+    case 'localOps':
+      out.push(...localOpsCandidates(s, player));
+      break;
+    case 'newTrain':
+      out.push(...newTrainCandidates(s));
+      break;
+    case 'loadUnload':
+      out.push(...loadUnloadCandidates(s, player));
+      break;
+    default:
+      break;
+  }
+
+  // Red Flags — "any time", so they are candidates in every phase, on any train standing out on
+  // the Mainline (the player's own or another's: protecting a train is not an attack).
+  for (const cardId of s.decks.hands.get(player) ?? []) {
+    const k = s.cards.get(cardId)?.kind;
+    if (k?.kind !== 'maneuver' || k.key !== 'redFlags') continue;
+    for (const [trayId] of s.trays) out.push({ type: 'maneuver.redFlags', cardId, trayId });
+  }
+
+  out.push({ type: 'redFlag.play' });
+  return out;
+}
+
+function localOpsCandidates(s: GameState, player: PlayerIndex): Intent[] {
+  const out: Intent[] = [];
+
+  // §6 — the three-way exclusive choice.
+  out.push({ type: 'localOps.choose', option: 'switch' });
+  out.push({ type: 'localOps.choose', option: 'draw' });
+  out.push({ type: 'localOps.choose', option: 'freightAgent' });
+
+  const area = areaOf(s, player);
+
+  // -- switch (§6.1)
   for (const [trayId, tray] of s.trays) {
     if (tray.position.at !== 'grid' || tray.position.seat !== seatOf(s, player)) continue;
     const from = tray.position.coord;
@@ -91,79 +137,17 @@ function switchCandidates(s: GameState, player: PlayerIndex): Intent[] {
       // that shoved a cut, and therefore the only way an engine buried mid-train reaches an end.
       out.push({ type: 'switch.dropCars', trayId, count: n, fromNose: true });
     }
-    /**
-     * Small Yard: enumerating every permutation would explode, so offer the useful ones — bringing
-     * each car to the droppable end, plus a full reversal. `check` validates any order, so a UI may
-     * submit an arbitrary permutation.
-     *
-     * NOTHING THAT RE-ORDERS NOTHING. Bringing the LAST car to the end is the identity, and a
-     * two-car train's reversal repeats its only real option — so the menu carried a move that spent
-     * one of six Moves to leave the train exactly as it was, beside a duplicate of the move next to
-     * it. Both were invisible while the labels were index lists (playtest, 2026-09-17); both are
-     * plainly wrong once the label reads as a train. Filtered by the ORDER rather than by the case
-     * that produced it, so a new generator cannot reintroduce either.
-     */
+    // Small Yard: enumerating every permutation would explode, so offer the useful ones —
+    // bringing each car to the droppable end, plus a full reversal. `check` validates any order,
+    // so a UI may submit an arbitrary permutation.
     const n = tray.consist.length;
-    const identity = [...Array(n).keys()];
     if (n > 1) {
-      const orders: number[][] = [];
       for (let k = 0; k < n; k++) {
-        const order = identity.filter((x) => x !== k);
+        const order = [...Array(n).keys()].filter((x) => x !== k);
         order.push(k);
-        orders.push(order);
-      }
-      orders.push([...identity].reverse());
-      // Nothing that re-orders nothing: the current train is the one thing on offer that costs a
-      // Move and changes the board not at all. Keyed by (order, engine position) together, since
-      // since 2026-09-17 the same car order at a different engine position is a different train.
-      const seen = new Set<string>([`${identity.join(',')}|${tray.engineAt}`]);
-      const offer = (order: number[], engineAt: number): void => {
-        const key = `${order.join(',')}|${engineAt}`;
-        if (seen.has(key)) return;
-        seen.add(key);
-        out.push({ type: 'switch.sortConsist', trayId, order, engineAt });
-      };
-      // The car orders, each leaving the engine on the nose — the Small Yard's ordinary use.
-      for (const order of orders) offer(order, 0);
-      /**
-       * A MADE-UP ORDER IS ALWAYS AMONG THESE, which is worth saying because it looks as though it
-       * might not be (Jesse, 2026-09-17: "trains with a caboose have to offer the caboose at the
-       * back").
-       *
-       * A yard sort serves two errands — pulling one car out to an end so it can be spotted, and
-       * putting the train back together to leave — and the orders above are written for the first.
-       * They cover the second as a by-product: "bring car k to the tail" is enumerated for EVERY car,
-       * so bringing the CABOOSE to the tail is always one of them, and with the engine on the nose
-       * that is a train §8.2 will let out of the Office.
-       *
-       * An explicit "make it up to leave" option was written here and deleted: it produced exactly
-       * the k-is-the-caboose order and was dropped by the dedupe every time. The one case where no
-       * made-up order appears is a train that is ALREADY made up, where such an option would be the
-       * identity — and the labels say which is which, so a player can see that every offer would
-       * break a train that is currently fit to run.
-       */
-    }
-    /**
-     * WHERE THE ENGINE GOES, as its own short list rather than multiplied through the one above
-     * (Jesse's call, 2026-09-17: "a separate engine control").
-     *
-     * Offering every car order at every engine position is the honest enumeration and it is
-     * unreadable: a four-car consist would go from four options to twenty, which is the labelling
-     * problem that prompted all of this. So the engine positions are offered against the consist AS
-     * IT STANDS — pick an order, or pick where the engine sits, each one Move. A player who wants
-     * both spends two, which is the same price the yard charges for any second sort.
-     *
-     * OFFERED FOR A ONE-CAR TRAIN TOO, unlike the car orders: a single car ahead of the engine or
-     * behind it is exactly the difference between shoving it into a facing industry and pulling it.
-     */
-    if (n >= 1) {
-      const seenEngine = new Set<string>([`${identity.join(',')}|${tray.engineAt}`]);
-      for (let k = 0; k <= n; k++) {
-        const key = `${identity.join(',')}|${k}`;
-        if (seenEngine.has(key)) continue;
-        seenEngine.add(key);
-        out.push({ type: 'switch.sortConsist', trayId, order: identity, engineAt: k });
+        out.push({ type: 'switch.sortConsist', trayId, order });
       }
+      out.push({ type: 'switch.sortConsist', trayId, order: [...Array(n).keys()].reverse() });
     }
   }
   // Flying Switch — roll a cut into an ADJACENT industry without the engine entering it.
@@ -183,97 +167,6 @@ function switchCandidates(s: GameState, player: PlayerIndex): Intent[] {
     }
   }
   out.push({ type: 'switch.end' });
-  return out;
-}
-
-/** The switching intents `player` may legally submit right now — exactly `legalActions`' switching subset. */
-export function legalSwitchingActions(s: GameState, player: PlayerIndex): Intent[] {
-  return withRouteCache(s, () => switchCandidates(s, player).filter((i) => check(s, player, i) === null));
-}
-
-export function isLegal(s: GameState, player: PlayerIndex, i: Intent): boolean {
-  return check(s, player, i) === null;
-}
-
-/**
- * Candidate generation. Over-generates freely — `check` is the authority, so a candidate that
- * turns out to be illegal simply gets filtered. Being generous here is what stops this module
- * from quietly acquiring rules.
- */
-function candidates(s: GameState, player: PlayerIndex): Intent[] {
-  const out: Intent[] = [];
-
-  /**
-   * §3.3, EXTENDED PLAY (Gitea#11) — the only thing on offer when the timetable has run out and the
-   * table is being asked whether to play on.
-   *
-   * Returned EARLY rather than added to the list, because nothing else is legal in this state and
-   * the phase switch below would otherwise generate a boardful of candidates for `check` to reject
-   * one at a time. It also puts the vote in front of the bot driver through the ordinary path, which
-   * is what lets a bot seat answer without the engine having to know which seats are bots.
-   */
-  if (s.status === 'awaitingExtension') {
-    if (s.extensionVotes[player] === null) {
-      out.push({ type: 'game.extend', player, agree: true });
-      out.push({ type: 'game.extend', player, agree: false });
-    }
-    return out;
-  }
-
-  // The two interruptions of the Mainline Phase. Each goes to one named player — `check` is the
-  // authority on which — so both are generated here and filtered there.
-  if (s.clock.pendingDecision?.kind === 'clearance') {
-    out.push({ type: 'mainline.clearance', allow: true });
-    out.push({ type: 'mainline.clearance', allow: false });
-  }
-  if (s.clock.pendingDecision?.kind === 'yardOffice') {
-    out.push({ type: 'mainline.yardOffice', take: true });
-    out.push({ type: 'mainline.yardOffice', take: false });
-  }
-  if (s.clock.pendingDecision?.kind === 'redFlag') {
-    out.push({ type: 'mainline.redFlag', flag: true });
-    out.push({ type: 'mainline.redFlag', flag: false });
-  }
-
-  switch (s.clock.phase) {
-    case 'localOps':
-      out.push(...localOpsCandidates(s, player));
-      break;
-    case 'newTrain':
-      out.push(...newTrainCandidates(s, player));
-      break;
-    case 'loadUnload':
-      out.push(...loadUnloadCandidates(s, player));
-      break;
-    default:
-      break;
-  }
-
-  // Red Flags — "any time", so they are candidates in every phase, on any train standing out on
-  // the Mainline (the player's own or another's: protecting a train is not an attack).
-  for (const cardId of s.decks.hands.get(player) ?? []) {
-    const k = s.cards.get(cardId)?.kind;
-    if (k?.kind !== 'maneuver' || k.key !== 'redFlags') continue;
-    // §Q (Gitea#19) — a flag goes on one side of your own district, so the only choice is which.
-    for (const side of ['east', 'west'] as const) out.push({ type: 'maneuver.redFlags', cardId, side });
-  }
-
-  out.push({ type: 'redFlag.play' });
-  return out;
-}
-
-function localOpsCandidates(s: GameState, player: PlayerIndex): Intent[] {
-  const out: Intent[] = [];
-
-  // §6 — the three-way exclusive choice.
-  out.push({ type: 'localOps.choose', option: 'switch' });
-  out.push({ type: 'localOps.choose', option: 'draw' });
-  out.push({ type: 'localOps.choose', option: 'freightAgent' });
-
-  const area = areaOf(s, player);
-
-  // -- switch (§6.1)
-  out.push(...switchCandidates(s, player));
 
   // -- draw (§6.2)
   out.push({ type: 'draw.fromHomeOffice' });
@@ -364,7 +257,7 @@ function localOpsCandidates(s: GameState, player: PlayerIndex): Intent[] {
   return out;
 }
 
-function newTrainCandidates(s: GameState, player: PlayerIndex): Intent[] {
+function newTrainCandidates(s: GameState): Intent[] {
   const out: Intent[] = [];
   for (const [trayId] of s.trays) {
     for (const carType of CAR_TYPES) {
@@ -386,9 +279,7 @@ function newTrainCandidates(s: GameState, player: PlayerIndex): Intent[] {
    * is placed. In the middle of the railroad — an Interchange, a Control Point — both ways are real
    * runs, so those are offered twice, once per direction.
    */
-  // Only the player who played it is offered anywhere to put it (§7) — `check` refuses anyone else
-  // with NOT_YOUR_EXTRA, and offering options that are certain to be refused is how a menu lies.
-  for (const { trainNumber } of s.pendingExtras.filter((x) => x.player === player)) {
+  for (const trainNumber of s.pendingExtras) {
     for (const side of ['west', 'east'] as const) {
       out.push({ type: 'newTrain.startExtra', trainNumber, start: { kind: 'divisionPoint', side } });
     }

src/engine/setup.ts

@@ -43,7 +43,7 @@ import type {
   TrackCard,
   TrayId,
 } from './state.ts';
-import { coordKey, emptyTally, freshTurns } from './state.ts';
+import { coordKey, freshTurns } from './state.ts';
 
 export type SetupOptions = {
   id: string;
@@ -53,16 +53,13 @@ export type SetupOptions = {
 };
 
 /** Builds the 52-card Home Office deck (§12.1). Unshuffled; caller shuffles with the seeded RNG. */
-export function buildDeck(mode: GameConfig['mode'] = 'competitive', pvpCardsAllowed = false): Card[] {
+export function buildDeck(mode: GameConfig['mode'] = 'competitive'): Card[] {
   /**
-   * THE 22 OPPONENT-DIRECTED CARDS ARE OUT OF EVERY DECK REGARDLESS OF `pvpCardsAllowed`, for now.
+   * THE 22 OPPONENT-DIRECTED CARDS ARE OUT OF EVERY DECK FOR NOW, not just the solitaire one.
    *
    * Q6 took them out of solitaire because they have no legal target in a one-player game. They are
    * out of the competitive deck too because `checkPlay` answers both categories `NOT_IMPLEMENTED`:
    * leaving them in would make ~9% of draws reject outright, which is worse than not dealing them.
-   * `pvpCardsAllowed` (`GameConfig`, wired 2026-08-20) is the player-facing toggle, but ANDing it
-   * with `cardsImplemented` keeps it inert until Phase 5 actually builds the cards — flipping
-   * `pvpCardsAllowed` on today must not turn a working game into one where ~9% of draws reject.
    *
    * AND SO ARE THE SEVEN CARDS THAT ANSWER THEM — see below. They used to be dealt and sit dormant,
    * which is the same dead draw by another name. Recorded in TODO.md as multiplayer work.
@@ -71,8 +68,7 @@ export function buildDeck(mode: GameConfig['mode'] = 'competitive', pvpCardsAllo
    * for these two categories today.
    */
   void mode;
-  const cardsImplemented = false;
-  const opponentCardsInDeck = pvpCardsAllowed && cardsImplemented;
+  const opponentCardsInDeck = false;
   const cards: Card[] = [];
   let n = 0;
   const push = (kind: Card['kind']): void => {
@@ -246,19 +242,17 @@ function buildDivision(players: number, rng: Rng): DivisionNode[] {
     if (deck.length === 0) throw new Error('the Mainline deck ran out — too many players for it');
     const card = deck.splice(rng.nextInt(deck.length), 1)[0]!;
     const node: DivisionNode = { kind: 'mainline', card, transits: [] };
-    if (card === 'heavyGrade') {
+    // The Heavy Grade card says "Player sets orientation", but setup has no decision point yet —
+    // createGame is synchronous and returns a ready state. Rolled for now so the orientation is at
+    // least deterministic and varies between games; it should become a real player choice when
+    // setup gains an interactive phase. See implications.md §10 Q11.
+    if (mainlineProfile(card).speed.kind === 'grade') {
       /**
-       * SETTLED, not provisional (v0.5.0, Jesse's call) — this overrides the card's own printed
-       * "Player sets orientation". A Heavy Grade sits on the shared west-to-east chain BETWEEN two
-       * players (§4.2), or beyond an end Division Point next to one — never inside one player's own
-       * district — so whichever direction climbs advantages one neighbour over the other, and there
-       * is no single player who owns that call fairly. Orientation is rolled from the seed instead,
-       * identically for solitaire and multiplayer, and this is not expected to change when setup
-       * eventually gains an interactive phase for other decisions.
-       *
-       * RE-CONFIRMED 2026-08-23, when the question was raised again and giving the choice to the
-       * Superintendent was considered and rejected — the office rotates every three Stages, the
-       * advantage it would hand out does not. See implications.md §10 Q11.
+       * TEMPORARY, and flagged in TODO. The card prints "(Up)" and "Player sets orientation", so
+       * which way a Heavy Grade climbs is the player's decision — but it is dealt during setup, and
+       * setup has no decision point at all. Rolled from the seed until it gains one, because the
+       * orientation MATTERS: it decides which direction climbs, and therefore what a Brakeman or
+       * Helpers card is worth.
        */
       node.gradeUp = rng.nextInt(2) === 0 ? 'east' : 'west';
     }
@@ -339,7 +333,7 @@ export function createGame(opts: SetupOptions): GameState {
    */
   const rules = houseRules(config);
   const deal = OPENING_DEALS[rules.startingHand];
-  const deck = buildDeck(config.mode, config.pvpCardsAllowed);
+  const deck = buildDeck(config.mode);
   const cards = new Map<CardId, Card>();
   for (const c of deck) cards.set(c.id, c);
 
@@ -424,21 +418,15 @@ export function createGame(opts: SetupOptions): GameState {
       phase: 'localOps',
       currentActor: superintendent,
       pendingDecision: null,
-      decisionAnswer: null,
+      clearanceRuling: null,
       superintendent,
       actorOffset: 0,
     },
     turns: freshTurns(playerCount, MOVES_PER_LOCAL_OPS),
     movedThisPhase: new Set(),
     collisionsToday: 0,
-    collisionsPrevDay: 0,
-    collisionsTotal: 0,
     status: 'active',
     outcome: null,
-    extraDays: 0,
-    extensionVotes: players.map(() => null),
-    official: null,
-    tally: emptyTally(playerCount),
   };
 }
 

src/engine/state.ts

@@ -12,12 +12,13 @@ import type {
   Hand,
   MainlineKind,
   FreightKind,
+  GameLength,
   HouseRuleOverrides,
   ModifierKind,
   OfficeTier,
   TrackGeometry,
 } from './content.ts';
-import { HAND_LIMIT, MAX_CONSIST, officeProfile } from './content.ts';
+import { MAX_CONSIST, officeProfile } from './content.ts';
 
 // ---------------------------------------------------------------------------
 // Identifiers
@@ -371,15 +372,6 @@ export type CrewTray = {
    * bug `isBeingMadeUp` was tightened to kill, and an arriving train never carries this.
    */
   beingMadeUp?: boolean;
-  /**
-   * WHOSE TRAIN THIS IS TO BUILD, for an Extra only.
-   *
-   * §7's Extra is loaded by the player who played the card, not by the Superintendent-first round
-   * that fills a Timetabled train — so the tray has to remember them: `pendingExtras` is emptied the
-   * moment the Extra starts, which is before a single car goes on. Undefined on every Timetabled
-   * train, where the round decides instead.
-   */
-  builtBy?: PlayerIndex;
   /**
    * WHERE THE ENGINE SITS IN THE TRAY, as an index into `consist`.
    *
@@ -391,12 +383,6 @@ export type CrewTray = {
    *
    * The engine is NOT one of the `consist` entries: §8.2 counts the consist as Rolling Stock, and
    * the four-car limit (§A.4) is a limit on cars, not on the locomotive hauling them.
-   *
-   * This only records POSITION, not a supply — and that is not a gap. `rules-v0.2.md`:339 (Gap 4b)
-   * ties Crew Trays and engine pieces together as one combined resource, `player count + 3`
-   * (`crewTrayCount` in `content.ts`), so engine scarcity IS tray scarcity: `freeTrays` running out
-   * already blocks a new train exactly when the engine supply would. There is no state for "a tray
-   * with no engine" because the rules never separate the two.
    */
   engineAt: number;
   /**
@@ -445,27 +431,20 @@ export type CrewTray = {
   position: NodeRef;
   movesUsed: number;
   /**
-   * X18 Circus / X17 Campaign — Office Areas this train has already been paid for setting up in
-   * (Gitea#13).
+   * X18 Circus Train — "one turn stopped on any track (circus set-up) earns 1 point", claimed once.
    *
-   * "Once per stop in an office area. In a multiplayer game, each player could score if the circus
-   * stops in their area" (Jesse, 2026-08-29). So the claim is per SEAT, not per train: a Circus
-   * touring three districts is paid three times, and one that parks in the same district for six
-   * Stages is paid once.
-   *
-   * Recorded on the tray, which also gives the other half of Jesse's ruling for free — "if the
-   * circus train gets recycled and played a second time as a second extra, then it could again
-   * score points later too". A train is made up onto a FRESH tray object every time, so a re-played
-   * Extra starts with an empty list and no reset code is needed.
+   * Recorded on the tray rather than the player because it is the TRAIN that sets up, and an Extra
+   * runs once and is gone; there is no second visit to claim it on.
    */
-  stopPointSeats?: SeatIndex[];
+  stopPointClaimed?: boolean;
   /**
    * X17 Campaign Train — "one turn at station (speeches) then expedite".
    *
    * It makes its speech at the first Office it reaches: that arrival is an ordinary stop, and from
    * then on the train is expedited — it may be switched normally, but it faults (Q3) if it is left
    * off the Office square when a Mainline Phase begins. Recorded on the tray for the same reason as
-   * `stopPointSeats` — it is the TRAIN that stops, and a re-played Extra gets a fresh tray.
+   * `stopPointClaimed` — it is the TRAIN that stops, and an Extra runs once, so there is no later
+   * visit to hang it on.
    */
   speechMade?: boolean;
 };
@@ -525,23 +504,10 @@ export type DivisionNode =
        * "Player sets orientation", so the direction is chosen when the card is placed.
        */
       gradeUp?: Direction;
+      /** Red Flags protecting a stopped train here, by tray. */
+      redFlagged?: TrayId[];
     }
-  | {
-      kind: 'office';
-      seat: SeatIndex;
-      /**
-       * §Q, RED FLAGS (Gitea#19) — the side of this district a flag is planted on.
-       *
-       * "If played, asked FLAG EAST or FLAG WEST. That stops all trains from entering your limits
-       * from that direction (i.e. Flag East holds westbound trains)." So the value names the SIDE,
-       * and a train arriving from that side is held: a westbound train comes from the east.
-       *
-       * SPENT ON THE TRAIN IT STOPS (Jesse's ruling, 2026-08-29). One card, one train — the flag
-       * comes down as it is used, so there is no lifting action to build, nothing to forget, and a
-       * flag cannot quietly strangle the Division.
-       */
-      redFlag?: Direction;
-    };
+  | { kind: 'office'; seat: SeatIndex };
 
 /** Ordered west to east. For N players: N Office nodes and N+1 Mainline cards. */
 export type Division = { nodes: DivisionNode[] };
@@ -605,42 +571,10 @@ export type Yards = {
 export type Phase = 'localOps' | 'newTrain' | 'mainline' | 'loadUnload' | 'shiftChange';
 
 /** §8.1 fourth condition — the Superintendent rules on a following train. */
-/**
- * AN INTERRUPTION TO THE AUTOMATIC MAINLINE PHASE — a question the driver cannot answer itself.
- *
- * There was one of these and it was hardcoded to one question asked of one player: the §8.1
- * clearance ruling, always to the Superintendent. Gitea#5 and Gitea#19 each need to stop the same
- * phase and ask a DIFFERENT player something different, so the shape is a union and `decisionActor`
- * below decides who answers.
- *
- * Every member names the `train` the question is about, because the answer has to be matched back
- * to it — see `DecisionAnswer`.
- */
-export type PendingDecision =
-  /** §8.1 — a following train in the same Subdivision. The Superintendent rules. */
-  | { kind: 'clearance'; train: TrayId; occupiedBy: TrayId }
-  /**
-   * §11 (Gitea#5) — an inbound freight may take the Yard Office instead of the Train Order Office.
-   * Asked of whoever sits in `seat`, on the Mainline Phase the train arrives.
-   */
-  | { kind: 'yardOffice'; train: TrayId; seat: SeatIndex }
-  /**
-   * §Q (Gitea#19) — a train is about to enter this district into a collision, and its owner holds a
-   * Red Flags card. "You can play the card normally or out of phase, but only if you need it."
-   */
-  | { kind: 'redFlag'; train: TrayId; seat: SeatIndex; from: Direction };
-
-/**
- * The answer, waiting to be consumed by the train that asked.
- *
- * Without this the driver would re-evaluate the same train, ask the same question, and never
- * advance. Keyed by `kind` as well as `train` so an answer can never be mistaken for the reply to a
- * different question about the same train.
- */
-export type DecisionAnswer =
-  | { kind: 'clearance'; train: TrayId; allow: boolean }
-  | { kind: 'yardOffice'; train: TrayId; take: boolean }
-  | { kind: 'redFlag'; train: TrayId; flag: boolean };
+export type SuperintendentClearance = {
+  train: TrayId;
+  occupiedBy: TrayId;
+};
 
 export type Clock = {
   day: number;
@@ -649,10 +583,13 @@ export type Clock = {
   phase: Phase;
   /** Exactly one player may act at a time. Null during automatic Mainline movement. */
   currentActor: PlayerIndex | null;
-  /** Interrupts the Mainline Phase to ask a player something (§8.1, §11). */
-  pendingDecision: PendingDecision | null;
-  /** The answer to `pendingDecision`, waiting to be consumed by the train that asked. */
-  decisionAnswer: DecisionAnswer | null;
+  /** Interrupts the Mainline Phase to ask the Superintendent (§8.1). */
+  pendingDecision: SuperintendentClearance | null;
+  /**
+   * The Superintendent's answer, waiting to be consumed by the train that asked. Without this the
+   * driver would re-evaluate the same train and ask the same question forever.
+   */
+  clearanceRuling: { train: TrayId; allow: boolean } | null;
   superintendent: PlayerIndex;
   /**
    * How far round the table the current phase has got. Acting order starts at the Superintendent
@@ -674,44 +611,15 @@ export type Player = {
 };
 
 export type GameMode = 'solitaire' | 'competitive' | 'coop';
+export type VictoryCondition = 'firstToTarget' | 'highestAfterDays';
 
-/**
- * VICTORY CONDITIONS — designed 2026-08-20, unified across all three modes.
- *
- * Replaces the old `length`-preset lookup (`LENGTH_PROFILES.target`) and the dead
- * `VictoryCondition: 'firstToTarget'` (grepped: never selected anywhere in the codebase). Winner is
- * whoever has the most Revenue when `days` run out — solitaire's own player counts as "everyone" —
- * unless `minCombinedRevenue` was missed, in which case everyone loses. Coop keeps summing every
- * player's Revenue into one table score, now against a configurable floor instead of
- * `profile.target * players.length`.
- *
- * `0` means "off" for every numeric field below. `minCombinedRevenue`'s natural default is
- * `collectiveRevenueFloor(players, days)` (`content.ts`), computed by whoever authors the config —
- * the engine only ever reads a concrete number here, never resolves one lazily, because player count
- * is not always known at config-authoring time (a lobby, a CLI flag, a dialog).
- *
- * `maxCollisionsPerDay`/`maxCollisionsTotal` are deliberately FLAT, not scaled by player count: more
- * players means more independent chances to collide, not a bigger shared budget, so a multiplayer
- * table is genuinely riskier than solitaire at the same default (Jesse's call).
- */
 export type GameConfig = {
   mode: GameMode;
-  /** How many Days the game runs. */
-  days: number;
-  /** Everyone loses if the table's total Revenue is below this when `days` run out. 0 = off. */
-  minCombinedRevenue: number;
-  /** Everyone loses immediately, mid-game, once collisions in one Day reach this. 0 = off. */
-  maxCollisionsPerDay: number;
-  /** Same, summed across the whole game, never reset. 0 = off. */
-  maxCollisionsTotal: number;
-  /**
-   * Whether the 22 opponent-directed cards are in the deck (`setup.ts`'s `buildDeck`). Forced off in
-   * `solitaire` and `coop` — neither has a valid target for them — on by default in `competitive`.
-   * Has no effect until those cards are built (Phase 5); see `TODO.md`.
-   */
-  pvpCardsAllowed: boolean;
+  victory: VictoryCondition;
+  length: GameLength;
   optionalRules: {
     reducedVisibility: boolean;
+    sisterTrains: boolean;
     employeeRotation: boolean;
     emergencyToolbox: boolean;
   };
@@ -725,7 +633,11 @@ export type GameConfig = {
   houseRules?: HouseRuleOverrides;
 };
 
-export type OutcomeReason = 'daysElapsed' | 'collisionFloor' | 'revenueFloor';
+export type OutcomeReason =
+  | 'targetReached'
+  | 'daysElapsed'
+  | 'collisionFloor'
+  | 'revenueFloor';
 
 export type Outcome = {
   result: 'win' | 'loss';
@@ -733,139 +645,6 @@ export type Outcome = {
   reason: OutcomeReason;
 };
 
-/**
- * §3.3, EXTENDED PLAY (Gitea#11) — which endings may be played past.
- *
- * Both days-based endings offer another Day: running out of timetable, and closing short of the
- * combined Revenue floor, are the same event seen twice — the last Day ended and this is what the
- * books say. A `collisionFloor` ending is NOT extendable, and neither is a collision breach that
- * happens during an extended Day: §3.4 stopped the game because the railroad was declared unsafe,
- * and carrying on regardless would contradict the rule that stopped it (Jesse's call, 2026-08-28).
- */
-export function isExtendable(reason: OutcomeReason): boolean {
-  return reason === 'daysElapsed' || reason === 'revenueFloor';
-}
-
-/**
- * Running counts of everything interesting that has happened, tallied from the event stream
- * (Gitea#16).
- *
- * WHY IT LIVES ON `GameState` rather than being computed by whoever happens to want it. Three
- * reasons, in ascending order of how much they cost to work around:
- *
- *   1. `snapshot()` already takes a `GameState`, so every number here reaches a MULTIPLAYER client
- *      through the `Frame` it is already being sent — no new server route, no new `Push` field, no
- *      new `Session` method, and no second implementation that can disagree with the first.
- *   2. It is REPLAY-EXACT. A save is `{ seed, config, history }` replayed through the engine
- *      (`web/game.ts`'s `fromSave`), so a tally folded from the events that replay emits is rebuilt
- *      identically every time — which is what makes Undo and a server restart correct here for free.
- *   3. The official result freezes a COPY of this at the moment the timetable ran out (`official`
- *      below), and a frozen copy has to be taken from something that already exists.
- *
- * Aggregate counts only. Nothing here is seat-secret — no card ids, no hands — which is why
- * `test/redaction.test.ts` stays green with the whole thing on the Frame.
- *
- * NOT SCORING. Nothing in here feeds a rule; it is read by the results screen and by the badge work
- * that Gitea#16 leaves to a second pass. Adding a counter is always safe.
- */
-export type Tally = {
-  /** §8.3 — a train that ran the length of the Division and left it. */
-  trainsCompleted: number;
-  /**
-   * Of those, how many did some switching between being made up and leaving.
-   *
-   * The join Gitea#16 asks for by name ("a player who completes an entire game where every train
-   * that passed through did some switching on"). Counted as the train completes, against whether
-   * that tray has coupled or dropped anything since it was made up — which is why `switchedSince`
-   * below exists rather than this being derivable afterwards.
-   */
-  trainsCompletedWithWork: number;
-  /** §10 — trains lost to a collision, and the cars that went with them. */
-  trainsDestroyed: number;
-  carsDestroyed: number;
-  /** §6 — switching volume, both directions. */
-  carsCoupled: number;
-  carsDropped: number;
-  /** §9.1 — the MEN | AT | WORK pipeline: begun, and carried all the way through. */
-  loadsStarted: number;
-  loadsCompleted: number;
-  unloadsBegun: number;
-  unloadsCompleted: number;
-  /** §9.2 — passenger work. */
-  passengersBoarded: number;
-  passengersDetrained: number;
-  /** Colour, and the vocabulary the badge pass will draw on. */
-  flyingSwitches: number;
-  officeUpgrades: number;
-  dispatchBonusesUsed: number;
-  facilitiesUnjammed: number;
-  expediteFaults: number;
-  trainsHeld: number;
-  trainsDiverted: number;
-  secondSections: number;
-  extrasStarted: number;
-  cardsDrawn: number;
-  cardsPlayed: number;
-  cardsDiscarded: number;
-  clearancesRequested: number;
-  /** §8.1 — rulings that let the other train through. A refusal is a ruling too, but not this one. */
-  clearancesAllowed: number;
-  /**
-   * X18 CIRCUS SET-UPS — a train that spent a Stage standing still and was paid for it (§X18).
-   *
-   * NOT "the longest an engine sat on a siding", which is what Gitea#16 asks for and what the
-   * comment on that issue assumed this was. `trainStoodStill` is emitted ONCE IN A GAME PER SUCH
-   * TRAIN — only for a train whose profile has `stopEarnsPoint`, and `advance.ts` sets
-   * `stopPointClaimed` so it can never fire twice. There is no per-Stage "this train did not move"
-   * signal in the engine at all, so a longest-stand streak cannot be folded from the event stream:
-   * it needs an engine-side signal that does not exist yet. Recorded in `TODO.md` for the badge
-   * pass rather than shipped as a statistic that would read "1 Stage" for ever.
-   */
-  circusStops: { trainNumber: number; where: string }[];
-  /**
-   * Train numbers that have coupled or dropped something since they were made up, for
-   * `trainsCompletedWithWork`. Cleared when the train is made up and when it leaves the Division.
-   */
-  switchedSince: number[];
-  /** Indexed by PLAYER. Only events that name a player reach these. */
-  byPlayer: PlayerTally[];
-};
-
-export type PlayerTally = {
-  loads: number;
-  unloads: number;
-  passengersBoarded: number;
-  passengersDetrained: number;
-  cardsPlayed: number;
-  /** §10 — collisions this player was faulted for, not collisions they were caught in. */
-  collisions: number;
-  /** Revenue gained and Revenue lost, kept apart: the net is already on `players[i].revenue`. */
-  revenueGained: number;
-  revenueLost: number;
-};
-
-/**
- * THE OFFICIAL RESULT, frozen at the moment the timetable ran out (Gitea#11).
- *
- * "The winner is based upon the original game length. In a five-day game, even if it's extended to
- * eight or nine days, the winner and the official answer is the winner at the end of five days"
- * (Jesse, 2026-08-28). So this is written ONCE, at the first ending, and never overwritten —
- * including by a §3.4 collision breach during an extended Day, which ends play without touching it.
- *
- * `state.outcome` keeps moving: it is always the CURRENT evaluation, which is what the live game
- * wants. Once `official` exists, everything after it is informational.
- */
-export type FinalReport = {
-  /** The Day the game was scheduled to end on — always `config.days`. */
-  day: number;
-  outcome: Outcome;
-  /** Every player's Revenue at that moment, in player order. */
-  revenues: number[];
-  collisionsTotal: number;
-  /** The Tally as it stood when the timetable ran out. */
-  tally: Tally;
-};
-
 /**
  * Per-Stage transient bookkeeping for the acting player. Reset when the actor changes.
  *
@@ -875,25 +654,6 @@ export type FinalReport = {
 export type TurnState = {
   option: 'switch' | 'draw' | 'freightAgent' | null;
   movesRemaining: number;
-  /**
-   * What `movesRemaining` started at this Stage — six, or five under Reduced Visibility at night.
-   *
-   * CARRIED RATHER THAN ASSUMED. Every reader of `movesRemaining` that wanted to say "3 of 6" had
-   * hardcoded the 6, which is simply wrong on a night Stage, and the only other way to recover it is
-   * to re-derive `movesForStage` outside the phase driver that owns it. It also makes "is this the
-   * FIRST move of the turn?" a comparison rather than a guess, which is what the history panel needs
-   * to keep the opening move of a switching turn and drop the ones in the middle.
-   */
-  movesAllowed: number;
-  /**
-   * The last square this player's crew moved to this Stage, and which crew it was.
-   *
-   * Switching ends with a summary line, and "where did the train end up" is the half of it a player
-   * actually wants. It cannot be recovered from the log: the line naming the last move is written
-   * before anyone knows it was the last, and the log streams to clients as it is written, so a line
-   * already sent cannot be revised afterwards.
-   */
-  lastMove?: { trayId: TrayId; to: GridCoord };
   drawnThisTurn: boolean;
   freightAgentUsed: boolean;
   /**
@@ -927,66 +687,6 @@ export function freshTurns(players: number, moves: number): Map<PlayerIndex, Tur
   return turns;
 }
 
-/** A Tally with everything at zero — the state every game starts in (Gitea#16). */
-export function emptyTally(players: number): Tally {
-  return {
-    trainsCompleted: 0,
-    trainsCompletedWithWork: 0,
-    trainsDestroyed: 0,
-    carsDestroyed: 0,
-    carsCoupled: 0,
-    carsDropped: 0,
-    loadsStarted: 0,
-    loadsCompleted: 0,
-    unloadsBegun: 0,
-    unloadsCompleted: 0,
-    passengersBoarded: 0,
-    passengersDetrained: 0,
-    flyingSwitches: 0,
-    officeUpgrades: 0,
-    dispatchBonusesUsed: 0,
-    facilitiesUnjammed: 0,
-    expediteFaults: 0,
-    trainsHeld: 0,
-    trainsDiverted: 0,
-    secondSections: 0,
-    extrasStarted: 0,
-    cardsDrawn: 0,
-    cardsPlayed: 0,
-    cardsDiscarded: 0,
-    clearancesRequested: 0,
-    clearancesAllowed: 0,
-    circusStops: [],
-    switchedSince: [],
-    byPlayer: Array.from({ length: players }, () => ({
-      loads: 0,
-      unloads: 0,
-      passengersBoarded: 0,
-      passengersDetrained: 0,
-      cardsPlayed: 0,
-      collisions: 0,
-      revenueGained: 0,
-      revenueLost: 0,
-    })),
-  };
-}
-
-/**
- * A deep copy, for freezing the official result (`FinalReport`).
- *
- * Written out rather than reached for via `structuredClone` because a Tally is a flat bag of numbers
- * with two containers in it, and spelling the copy out means a field added later that needs deep
- * copying is a compile error here rather than a shared reference discovered in a results screen.
- */
-export function cloneTally(t: Tally): Tally {
-  return {
-    ...t,
-    circusStops: t.circusStops.map((c) => ({ ...c })),
-    switchedSince: [...t.switchedSince],
-    byPlayer: t.byPlayer.map((p) => ({ ...p })),
-  };
-}
-
 /**
  * WHICH WAY TO DRAW THE ENGINE — east or west, for every train, everywhere.
  *
@@ -1032,25 +732,22 @@ export function standingSides(
 }
 
 /**
- * The cut a train would run into if it left this card by the `exit` END OF THE ROW — the cars
- * between it and that end. Returned in the order the train MEETS them, nearest first, which is what
- * `carsCoupled` wants.
+ * The cut a train would run into if it left this card through `exit` — the cars between it and that
+ * end of the card.
  *
- * `exit` IS AN END OF THE ROW, NOT A PORT. It used to be a raw `Port`, and answered "you meet
- * nothing" for north and south on the reasoning that a leg leaving through an edge is not running
- * along the west-to-east row. It is: a `sw` curve's south leg IS the east end of that row, so a
- * crew standing on the curve pulled out through the leg and drove away leaving the cars beside it
- * standing, against §A.4's mandatory coupling (Gitea#17). Callers resolve the leg with `rowEndAt`
- * (`track.ts`), which lives there because only the card's arc can say which end a leg is — and the
- * narrowed type is what makes every caller do it.
+ * Only 'e' and 'w' can hold a cut: the array is a west-to-east row, so a train leaving north or
+ * south off a curve or a spur is not running along it and meets nothing. Returned in the order the
+ * train MEETS them, nearest first, which is what `carsCoupled` wants.
  */
 export function cutTowards(
   tray: { standingWest?: number | undefined },
   cars: readonly RollingStock[],
-  exit: 'e' | 'w',
+  exit: 'n' | 's' | 'e' | 'w',
 ): RollingStock[] {
   const { west, east } = standingSides(tray, cars);
-  return exit === 'e' ? east : [...west].reverse();
+  if (exit === 'e') return east;
+  if (exit === 'w') return [...west].reverse();
+  return [];
 }
 
 export function turnOf(s: GameState, player: PlayerIndex): TurnState {
@@ -1059,24 +756,10 @@ export function turnOf(s: GameState, player: PlayerIndex): TurnState {
   return t;
 }
 
-/**
- * §6.2 — IS THIS PLAYER HOLDING MORE THAN THEY MAY? Three cards, or four while a Red Flag is held.
- *
- * ONE answer, because there were three of them: `check('draw.end')` refused on it, `snapshot()`
- * recomputed it inline for the Frame, and `web/game.ts` kept a third for the page. All three agreed
- * — which is the state a disagreement starts from, and #96 is what that costs when the two halves
- * are a screen and the server that refuses what the screen offered.
- */
-export function overHandLimit(s: GameState, player: PlayerIndex): boolean {
-  const hand = s.decks.hands.get(player) ?? [];
-  return hand.length > (s.decks.redFlags.get(player) ? HAND_LIMIT + 1 : HAND_LIMIT);
-}
-
 export function freshTurn(moves: number): TurnState {
   return {
     option: null,
     movesRemaining: moves,
-    movesAllowed: moves,
     drawnThisTurn: false,
     freightAgentUsed: false,
     freightWorked: {},
@@ -1118,15 +801,8 @@ export type GameState = {
   /**
    * §7 — Extra Trains played from hand, waiting for a free Crew Tray. An Extra is not scheduled:
    * it runs once, immediately, then its card goes to the Salvage Yard (§2.3).
-   *
-   * CARRIES WHO PLAYED IT (2026-08-23, Jesse's call). §7 gives an Extra to the player who played the
-   * card — "may place the Crew Tray at either Division Point ... and may load the consist as he
-   * chooses" — which is a different rule from the Timetabled make-up round, where the table goes
-   * round starting at the Superintendent. This was a bare `number[]`, so the engine could not tell
-   * whose Extra it was and asked whoever the acting order happened to be on: correct in solitaire,
-   * where there is only one player, and wrong at every table.
    */
-  pendingExtras: { trainNumber: number; player: PlayerIndex }[];
+  pendingExtras: number[];
   /**
    * Q9 — train numbers ordered to run a second section. The next New Train Phase makes up an
    * identical train behind the first, if a Crew Tray is free.
@@ -1137,52 +813,10 @@ export type GameState = {
   turns: Map<PlayerIndex, TurnState>;
   /** Transient: trains already moved in the current Mainline Phase. Cleared when it ends. */
   movedThisPhase: Set<TrayId>;
-  /** §3.4 — resets at the start of each Day; checked against `config.maxCollisionsPerDay`. */
+  /** §3.4 — resets at the start of each Day. */
   collisionsToday: number;
-  /**
-   * What `collisionsToday` held for the Day that just ENDED — captured at the rollover, immediately
-   * before the reset.
-   *
-   * The Day-end dialog exists to report the Day that finished, and it is drawn from the frame AFTER
-   * the rollover, because that is the frame whose `day` went up. So it read `collisionsToday` as 0 no
-   * matter what had happened: Jesse, 2026-09-09, at the end of a Day 1 with two collisions in it —
-   * "it shows a total of two collisions, but zero today ... that does seem to be a contradiction".
-   *
-   * NOT DERIVABLE ON THE CLIENT. A Day turns over inside the phases that run themselves, so in
-   * multiplayer the push that reports the new Day is the same push that reports the reset — a client
-   * may never see the ended Day's final count to remember it.
-   */
-  collisionsPrevDay: number;
-  /** §3.4 — never reset; checked against `config.maxCollisionsTotal`. */
-  collisionsTotal: number;
-  /**
-   * `awaitingExtension` is Gitea#11: the timetable has run out, the result is recorded, and the
-   * table is being asked whether to play one more Day. It is a PAUSE, not an ending — `advance`
-   * reports `needsInput` there, the server resumes it like any live game, and the only intent the
-   * rules will accept is `game.extend`.
-   */
-  status: 'setup' | 'active' | 'awaitingExtension' | 'finished';
-  /** The CURRENT evaluation, re-decided at the end of every Day including extended ones. */
+  status: 'setup' | 'active' | 'finished';
   outcome: Outcome | null;
-  /**
-   * §3.3 (Gitea#11) — Days granted beyond `config.days`, one vote at a time.
-   *
-   * `config.days` is deliberately never touched: it is what the official result was decided at, so
-   * leaving it alone is what makes "the winner is decided at the original game length" a fact about
-   * the code rather than a comment on it.
-   */
-  extraDays: number;
-  /**
-   * Per PLAYER, while `awaitingExtension`. `null` means they have not voted yet.
-   *
-   * Unanimous, and one refusal is decisive: nobody is made to wait on a player who has already said
-   * no (Jesse's call, 2026-08-28). Solitaire is the same code with one voter.
-   */
-  extensionVotes: (boolean | null)[];
-  /** Frozen at the FIRST ending and never overwritten. See `FinalReport`. */
-  official: FinalReport | null;
-  /** Gitea#16. Folded from the event stream; see `Tally`. */
-  tally: Tally;
 };
 
 // ---------------------------------------------------------------------------
@@ -1227,40 +861,6 @@ export function playerAtSeat(state: GameState, seat: SeatIndex): PlayerIndex {
   return p;
 }
 
-/** This seat's node on the Division — where its Limits, and any Red Flag on them, live. */
-export function officeNodeFor(
-  state: GameState,
-  seat: SeatIndex,
-): Extract<DivisionNode, { kind: 'office' }> | null {
-  for (const n of state.division.nodes) if (n.kind === 'office' && n.seat === seat) return n;
-  return null;
-}
-
-/**
- * WHO MUST ANSWER the interruption, or null when nothing is pending.
- *
- * The one place that knows which player each kind of question goes to. §8.1's clearance is the
- * Superintendent's ruling wherever it happens; the Yard Office is offered to whoever sits in the
- * district the train is arriving at, because it is their card and their yard.
- */
-export function decisionActor(state: GameState): PlayerIndex | null {
-  const d = state.clock.pendingDecision;
-  if (!d) return null;
-  return d.kind === 'clearance' ? state.clock.superintendent : playerAtSeat(state, d.seat);
-}
-
-/**
- * WHOSE MOVE IT IS RIGHT NOW — a pending interruption's owner if there is one, else the phase's
- * own actor.
- *
- * Written out six times across the engine, the sim, the web client and the tests as
- * `pendingDecision !== null ? superintendent : currentActor`, which stopped being right the moment
- * a second kind of question existed. One copy now, so a new decision kind cannot be half-adopted.
- */
-export function actingPlayer(state: GameState): PlayerIndex | null {
-  return decisionActor(state) ?? state.clock.currentActor;
-}
-
 /** Where this player is sitting, and therefore which Office Area is theirs. */
 /**
  * The player `n` seats to the LEFT of this one, wrapping round the table.

src/engine/tally.ts

@@ -1,201 +0,0 @@
-/**
- * The event tally — Gitea#16's statistics, folded from the event stream into `GameState.tally`.
- *
- * WHERE IT IS HOOKED, and why it is not in `reduce`. `apply.ts`'s `reduce` sees only the events an
- * INTENT produced; `advance.ts` mutates state directly and pushes its events without reducing them
- * at all — and `advance` is where `trainCompleted`, `trainsDestroyed` and `trainStoodStill` come
- * from, which are exactly the numbers this issue asks for. So the fold is hooked at the two places
- * every event in the game passes through exactly once on its way to a caller:
- *
- *   - `applyIntent` (`apply.ts`), beside its `reduce` loop;
- *   - `advance` (`advance.ts`), which now wraps the phase driver and folds what it returns.
- *
- * Exactly once matters in both directions: an event folded twice inflates a count, and an event
- * folded nowhere is a statistic that silently reads zero. `test/tally.test.ts` pins both by playing
- * real games and checking the tally against an independent count over the same event array.
- *
- * NOTHING HERE IS A RULE. The tally is read by the results screen and by the badge work Gitea#16
- * leaves to a second pass; no engine decision consults it. That is what makes adding a counter
- * always safe.
- *
- * WHAT IS NOT COUNTED PER PLAYER, and why. `carsCoupled` and `carsDropped` carry a `trayId` and no
- * `player` — switching is done BY a crew, and the event says which crew rather than which person.
- * Rather than guess an owner from whose turn it happened to be, those two are table totals only.
- * The events that do name a player (`loadCompleted`, `passengersBoarded`, `cardPlayed`,
- * `revenueChanged`, `trainsDestroyed`) are the ones `byPlayer` reports.
- */
-
-import type { GameEvent } from './events.ts';
-import type { GameState } from './state.ts';
-
-/**
- * Fold one event into `s.tally`.
- *
- * The switch is deliberately not exhaustive — most of the 49 event types say nothing a player would
- * want counted, and listing them all to `break` would bury the ones that do. A `default` that does
- * nothing is the honest shape.
- */
-export function tallyEvent(s: GameState, e: GameEvent): void {
-  const t = s.tally;
-  const mine = 'player' in e && typeof e.player === 'number' ? t.byPlayer[e.player] : undefined;
-
-  switch (e.type) {
-    /**
-     * §X18 — the Circus train set up and was paid for the Stage it spent standing.
-     *
-     * NOT a "longest stand" streak, which is what Gitea#16 wants and what its comment assumed this
-     * event was. It fires once in a game per such train: only trains whose profile sets
-     * `stopEarnsPoint` emit it at all, and `advance.ts` claims it once with `stopPointClaimed`. So
-     * there is nothing to count a run of, and the honest thing to report is the event itself.
-     */
-    case 'trainStoodStill':
-      t.circusStops.push({ trainNumber: e.trainNumber, where: e.where });
-      break;
-
-    /**
-     * DID THIS TRAIN DO ANY SWITCHING — Gitea#16's "switching master" join, kept as it happens
-     * rather than reconstructed afterwards.
-     *
-     * The two halves of the join are in different currencies: switching events name a `trayId` and
-     * completion names a `trainNumber`, and no event carries both. The tray is looked up in LIVE
-     * state, which is sound precisely here — a crew that has just coupled or dropped is still on the
-     * board — where re-deriving it at completion time would not be, the tray having been released by
-     * then. A lookup that misses costs one train its mark on a statistic; it cannot affect a rule.
-     */
-    case 'carsCoupled':
-      t.carsCoupled += e.stock.length;
-      markSwitched(s, e.trayId);
-      break;
-
-    case 'carsDropped':
-      t.carsDropped += e.stock.length;
-      markSwitched(s, e.trayId);
-      break;
-
-    case 'flyingSwitch':
-      t.flyingSwitches += 1;
-      markSwitched(s, e.trayId);
-      break;
-
-    // A tray is reused run after run, so a fresh train starts with a clean sheet.
-    case 'trainMadeUp':
-      t.switchedSince = t.switchedSince.filter((n) => n !== e.trainNumber);
-      break;
-
-    case 'trainCompleted':
-      t.trainsCompleted += 1;
-      if (t.switchedSince.includes(e.trainNumber)) t.trainsCompletedWithWork += 1;
-      t.switchedSince = t.switchedSince.filter((n) => n !== e.trainNumber);
-      break;
-
-    case 'trainsDestroyed':
-      t.trainsDestroyed += e.trains.length;
-      for (const train of e.trains) t.carsDestroyed += train.consist.length;
-      if (mine) mine.collisions += 1;
-      break;
-
-    case 'officeUpgraded':
-      t.officeUpgrades += 1;
-      break;
-
-    case 'dispatchBonusUsed':
-      t.dispatchBonusesUsed += 1;
-      break;
-
-    case 'facilityUnjammed':
-      t.facilitiesUnjammed += 1;
-      break;
-
-    case 'expediteFault':
-      t.expediteFaults += 1;
-      break;
-
-    case 'trainHeld':
-      t.trainsHeld += 1;
-      break;
-
-    case 'trainDiverted':
-      t.trainsDiverted += 1;
-      break;
-
-    case 'secondSectionOrdered':
-      t.secondSections += 1;
-      break;
-
-    case 'extraStarted':
-      t.extrasStarted += 1;
-      break;
-
-    case 'cardDrawn':
-      t.cardsDrawn += 1;
-      break;
-
-    case 'cardPlayed':
-      t.cardsPlayed += 1;
-      if (mine) mine.cardsPlayed += 1;
-      break;
-
-    case 'cardDiscarded':
-      t.cardsDiscarded += 1;
-      break;
-
-    case 'clearanceRequested':
-      t.clearancesRequested += 1;
-      break;
-
-    // §8.1 — a ruling is given either way; only a YES let the other train through.
-    case 'clearanceGiven':
-      if (e.allow) t.clearancesAllowed += 1;
-      break;
-
-    case 'loadStarted':
-      t.loadsStarted += 1;
-      break;
-
-    case 'loadCompleted':
-      t.loadsCompleted += 1;
-      if (mine) mine.loads += 1;
-      break;
-
-    case 'unloadBegan':
-      t.unloadsBegun += 1;
-      break;
-
-    case 'unloadCompleted':
-      t.unloadsCompleted += 1;
-      if (mine) mine.unloads += 1;
-      break;
-
-    case 'passengersBoarded':
-      t.passengersBoarded += 1;
-      if (mine) mine.passengersBoarded += 1;
-      break;
-
-    case 'passengersDetrained':
-      t.passengersDetrained += 1;
-      if (mine) mine.passengersDetrained += 1;
-      break;
-
-    /**
-     * Gained and lost are kept APART because the net is already on `players[i].revenue`. What the
-     * results screen cannot otherwise say is how much of a modest final score was earned and then
-     * handed back at a grade crossing — which is the whole difference between a quiet game and an
-     * eventful one.
-     */
-    case 'revenueChanged':
-      if (mine) {
-        if (e.delta >= 0) mine.revenueGained += e.delta;
-        else mine.revenueLost += -e.delta;
-      }
-      break;
-
-    default:
-      break;
-  }
-}
-
-function markSwitched(s: GameState, trayId: string): void {
-  const n = s.trays.get(trayId)?.trainNumber;
-  if (n === undefined || n === null) return;
-  if (!s.tally.switchedSince.includes(n)) s.tally.switchedSince.push(n);
-}

src/engine/track.ts

@@ -188,40 +188,6 @@ export function joins(a: TrackCard, p: Port, b: TrackCard): boolean {
   return slopeAt(a, p) === slopeAt(b, opposite(p));
 }
 
-/**
- * WHICH END OF THE WEST-TO-EAST ROW A PORT SITS AT.
- *
- * `TrackCard.standing` is ordered west to east (§A.3), so whether a train meets the row front to
- * back or back to front depends on which end it enters by — and a port is not always at one of
- * those two extremes. Every 45° leg leaves through the MIDDLE of its north or south edge, so its
- * end of the run is whichever end the arc does NOT reach: a `sw` curve's south leg is the EAST end
- * of the row, and an `se` curve's south leg is the WEST end. Same port, opposite answers, which is
- * why this has to ask the card rather than read the port.
- *
- * Gitea#17 is what both callers looked like without it. `exploreMoves` reversed the row for an 'e'
- * entry and for nothing else, so backing into a cut through a `sw` curve's south leg coupled it up
- * back to front — the caboose came out next to the engine, which §8.2 then calls badly made up.
- * `cutTowards` answered "you meet nothing" for a north or south exit, so a crew standing on a curve
- * pulled out through the leg and left the cars beside it standing, which §A.4 forbids.
- *
- * There is no north-south straight anywhere on the printed sheet (see the module comment), so a run
- * touching a 45° leg always has an east or west port at its other end and the answer is never
- * undefined. A TURNOUT is the one card whose row has three ends rather than two — and it is also
- * the one card no cut can ever stand on, since a train may not stop there (§A.1) and so never sets
- * anything out there. Its stem answers for it.
- */
-export function rowEndAt(card: TrackCard, p: Port): 'e' | 'w' {
-  if (p === 'e' || p === 'w') return p;
-  for (const [a, b] of connectionsFor(card)) {
-    const other = a === p ? b : b === p ? a : null;
-    if (other === 'e') return 'w';
-    if (other === 'w') return 'e';
-  }
-  // Not a card the printed sheet can produce. Reading the leg as the west end leaves the row in the
-  // order it is stored rather than inventing a reversal on a card nothing knows the shape of.
-  return 'w';
-}
-
 // ---------------------------------------------------------------------------
 // Orientation (Gap 11)
 // ---------------------------------------------------------------------------
@@ -377,7 +343,7 @@ export function reachableDestinations(
   start: GridCoord,
   initialExit: Port,
 ): MoveDestination[] {
-  return exploreMoves(ctx, start, initialExit, false).destinations;
+  return exploreMoves(ctx, start, initialExit).destinations;
 }
 
 /**
@@ -434,19 +400,12 @@ export function exploreMoves(
   ctx: MoveContext,
   start: GridCoord,
   initialExit: Port,
-  /**
-   * False when only the destinations are wanted (`reachableDestinations`, every legality check): the
-   * rejections are then not recorded at all. They never change a destination, and building them was
-   * pure allocation on the hottest path in the engine.
-   */
-  collectBlocks = true,
 ): { destinations: MoveDestination[]; blocked: MoveBlock[] } {
   const { area, occupancy } = ctx;
   const results: MoveDestination[] = [];
   const blocked: MoveBlock[] = [];
   const noted = new Set<string>();
   const block = (coord: GridCoord, kind: MoveBlockKind, why: string): void => {
-    if (!collectBlocks) return;
     const k = coordKey(coord);
     if (noted.has(k)) return;
     noted.add(k);
@@ -466,25 +425,10 @@ export function exploreMoves(
     couples: RollingStock[];
     /** Coord key each entry in `couples` came off, aligned by index — see `routeOutcomeKey`. */
     origins: string[];
-  };
-
-  /**
-   * Has THIS route already used `to`? Per-path, not global — see the doc comment on
-   * `MAX_ENUMERATED_FRONTIER` for why a global set would forbid the very routes this walk exists to
-   * find.
-   *
-   * Read off the route's own `path` instead of a Set copied at every step, which was a large share of
-   * the walk's garbage. It answers exactly as that Set did: the start square, then every square
-   * enqueued along the route AFTER the first hop, including this node's own — the first hop's square
-   * was never added, and `path[0]` is that square, so the scan begins at 1.
-   */
-  const onRoute = (node: Frontier, to: GridCoord): boolean => {
-    if (sameCoord(to, start)) return true;
-    if (node.path.length > 0 && sameCoord(to, node.coord)) return true;
-    for (let k = 1; k < node.path.length; k++) {
-      if (sameCoord(node.path[k]!.coord, to)) return true;
-    }
-    return false;
+    /** Cards visited on THIS route, start included. A per-path set, not a global one — see the
+     * module doc comment on `MAX_ENUMERATED_FRONTIER` for why a global one would forbid the very
+     * routes this walk exists to find. */
+    visited: Set<string>;
   };
 
   // The very first hop is checked here because `start`'s card is not itself enqueued; every later
@@ -506,7 +450,7 @@ export function exploreMoves(
    *
    * Ordered nearest-first like every other card's, so it simply seeds the accumulator.
    */
-  const ownCut = cutTowards(startCard, carsOn(startCard), rowEndAt(startCard, initialExit));
+  const ownCut = cutTowards(startCard, carsOn(startCard), initialExit);
   const startKey = coordKey(start);
   const queue: Frontier[] = [
     {
@@ -515,14 +459,13 @@ export function exploreMoves(
       path: [],
       couples: ownCut,
       origins: ownCut.map(() => startKey),
+      visited: new Set([startKey]),
     },
   ];
   let enumerated = 1;
 
-  // FIFO by index rather than `shift()`, which re-packs the array on every pop. Same order.
-  let head = 0;
-  while (head < queue.length) {
-    const node = queue[head++]!;
+  while (queue.length > 0) {
+    const node = queue.shift()!;
     const card = cardAt(area, node.coord);
     if (!card) continue;
 
@@ -559,15 +502,12 @@ export function exploreMoves(
      * overfill the tray is illegal, not a move that picks up fewer cars.
      *
      * NEAREST FIRST ALONG THE DIRECTION OF TRAVEL. `carsOn` runs west to east, so a train entering
-     * at the row's EAST end meets them back to front and the row has to be reversed. Without this
-     * the same parked cut produced an identical consist whichever way it was approached, when the
-     * two must mirror — which is the difference between a run-around being worth a Move and being
-     * pointless.
-     *
-     * `rowEndAt` rather than `node.entry === 'e'`: a 45° leg is an end of the row too, and which
-     * end it is depends on the card's arc (Gitea#17).
+     * through the card's EAST port meets them back to front and the row has to be reversed. Without
+     * this the same parked cut produced an identical consist whichever way it was approached, when
+     * the two must mirror — which is the difference between a run-around being worth a Move and
+     * being pointless.
      */
-    const met = rowEndAt(card, node.entry) === 'e' ? [...carsOn(card)].reverse() : carsOn(card);
+    const met = node.entry === 'e' ? [...carsOn(card)].reverse() : carsOn(card);
     const couples = [...node.couples, ...met];
     const nodeKey = coordKey(node.coord);
     const origins = [...node.origins, ...met.map(() => nodeKey)];
@@ -615,15 +555,17 @@ export function exploreMoves(
       // direction; it never says without repeating ground, but a train cannot occupy the same
       // track twice at once either). Per-path, not global — a DIFFERENT route may legitimately
       // pass through a card this one already used.
-      if (onRoute(node, to)) continue;
+      const toKey = coordKey(to);
+      if (node.visited.has(toKey)) continue;
       if (enumerated >= MAX_ENUMERATED_FRONTIER) break;
       enumerated++;
       const step: MoveStep = { coord: node.coord, entry: node.entry, exit };
-      queue.push({ coord: to, entry: opposite(exit), path: [...node.path, step], couples, origins });
+      const visited = new Set(node.visited);
+      visited.add(toKey);
+      queue.push({ coord: to, entry: opposite(exit), path: [...node.path, step], couples, origins, visited });
     }
   }
 
-  if (!collectBlocks) return { destinations: results, blocked };
   // A card that turned out to be reachable after all is not a blocker: the walk may meet a square
   // from a bad angle first and a good one later.
   const reached = new Set(results.map((r) => coordKey(r.coord)));
@@ -684,19 +626,10 @@ export function carriesThroughTrack(card: TrackCard): boolean {
  * buildable column and break §11.3's promise that both Secondary rows, and the nine-spot Modifier
  * neighbourhood, are usable from the first Stage.
  *
- * MODIFIERS ARE SUBJECT TO THIS TOO, since 2026-09-17 — REVERSING an earlier call of Jesse's that
- * exempted them. The exemption reasoned that §9 places a Modifier on any of the nine spots around a
- * Facility, so a Facility standing at the limit has three of its nine outside them and bounding the
- * card would make it unplayable exactly where a district ends. Play showed the cost of that the
- * other way round: a Transmission Lines card went down at (-2,4) with the sign at column 3, which
- * reads at the table as building outside your own territory, and §8.1 and §10 both reason about
- * what is inside a player's Limits.
- *
- * THE FEARED CASE DID NOT ARISE, and was measured on the move that prompted the change rather than
- * argued: the Power Plant sat at (-1,3) against a sign at 3, and (-2,2) and (-2,3) were both free,
- * legal and inside. A Facility at the limit keeps six of its nine spots, and the Limits move outward
- * as the Running Track grows (§2.1, Gap 4a), so the ground for a Modifier arrives with the district.
- * `check` bars them from the Running Track ROW as well, which is the ground the main grows onto.
+ * MODIFIERS ARE NOT SUBJECT TO THIS, and are not track: §9 places one on any of the nine spots
+ * around a Facility, and a Facility standing at the limit has three of its nine outside them.
+ * Jesse's call. `check` bars them from the Running Track ROW instead, which is the ground the main
+ * grows onto.
  */
 export function withinLimits(area: OfficeArea, coord: GridCoord): boolean {
   return coord.col >= area.limitsWest.col && coord.col <= area.limitsEast.col;
@@ -725,26 +658,6 @@ export function canPlaceAt(area: OfficeArea, coord: GridCoord, card: TrackCard):
   // into a stub and cutting the Office off from the Limits.
   if (coord.row === area.runningRow && !carriesThroughTrack(card)) return false;
 
-  /**
-   * ONE NEIGHBOUR MUST JOIN. THE OTHERS NEED NOT — AND THIS RULE HAS BEEN BOTH WAYS (Gitea#15).
-   *
-   * A card may be laid with an exit facing a card that has nothing to meet it. The rail stops dead
-   * at that edge, and that is legal.
-   *
-   * The issue was filed the other way round — "if a card is placed in that space, it MUST connect" —
-   * against a right-hand curve laid with its north leg against an Ice House and the turnout below it
-   * pointing at its portless south edge. **RAR reversed it on review (2026-08-26): placing it is
-   * fine, and a stub like that is useful — a siding to park cars on.**
-   *
-   * WHAT MATTERS INSTEAD IS THAT NOTHING CAN DRIVE ACROSS THE GAP, so the real requirement is on
-   * MOVEMENT rather than on placement: two cards touching are not connected, and `exploreMoves` must
-   * refuse the hop. It does — every step is gated on `joins`, never on a bare pair of `hasPort`
-   * calls — and `track.test.ts` pins the reported geometry against exactly that.
-   *
-   * SO DO NOT ADD A PER-EDGE CHECK HERE. One was written and taken out again when the ruling
-   * arrived. What survives is the weaker rule that was always here: the piece must touch the network
-   * SOMEWHERE, which is what stops orphaned track being laid in an empty corner of the board.
-   */
   const ports: Port[] = ['n', 's', 'e', 'w'];
   for (const p of ports) {
     const neighbourCard = cardAt(area, neighbour(coord, p));
@@ -754,19 +667,12 @@ export function canPlaceAt(area: OfficeArea, coord: GridCoord, card: TrackCard):
 }
 
 /**
- * §A.4 — the Office track is Operational Rail, but Rolling Stock may not be left there — WITH ONE
- * EXCEPTION (Jesse's call, v0.5.0): any train may set out one or more coaches at the Office. It is
- * the one car type a passenger platform is meant to hold, and it is what makes the ENGINE-boxcar-
- * coach Local arrangement workable — the coach drops here while the engine and freight car switch
- * freely. Freight and cabooses stay banned at the Office for every train, no exception.
- *
+ * §A.4 — the Office track is Operational Rail, but Rolling Stock may not be left there.
  * An industry track also has a finite length (§9.3), so it can be full.
  */
-export function canDropCarsAt(area: OfficeArea, coord: GridCoord, count = 1, coachesOnly = false): boolean {
+export function canDropCarsAt(area: OfficeArea, coord: GridCoord, count = 1): boolean {
+  if (sameCoord(coord, area.officeCoord)) return false;
   const card = cardAt(area, coord);
-  if (sameCoord(coord, area.officeCoord)) {
-    return coachesOnly && !!card && isOperationalRail(card) && spaceOn(card) >= count;
-  }
   if (!card || !isOperationalRail(card)) return false;
   return spaceOn(card) >= count;
 }

src/server/claims.ts

@@ -1,83 +0,0 @@
-/**
- * SEAT RECOVERY CODES — Gitea#33.
- *
- * A session token is the only identity the game has (`lobby-and-sessions.md` §1) and it lives in
- * exactly one place the player controls: their browser's `localStorage`, scoped to the origin they
- * joined at. Lose that — a different browser, a cleared profile, a private window — and the seat is
- * unreachable, because there is nothing else on the server that will accept a claim to it. Seen at a
- * real table on 2026-09-16: the joining player came back to an empty lobby while their token sat
- * intact in `sessions.json`, and the only way in was an administrator reading the file off the data
- * volume and the player pasting it into a devtools console.
- *
- * THE CODE IS NOT THE TOKEN, AND THAT IS THE WHOLE POINT. §1 says to keep the token out of URLs so it
- * is not shoulder-surfed or pasted into a chat — and a recovery link is exactly the kind of thing
- * that gets pasted into a chat. So an administrator mints a SHORT-LIVED, SINGLE-USE code, the player
- * opens a link carrying that, and the page trades it for the real token over the same connection it
- * would have used anyway. A code that leaks after it is spent is worth nothing; a token that leaks is
- * worth the seat for the rest of the game.
- *
- * PURE ON PURPOSE, like `lobby.ts` beside it: no sockets, no filesystem, no clock of its own. `now`
- * is passed in so expiry is testable without faking timers, which is the only reason this file can be
- * tested at all — nothing in this repo stands an HTTP server up to make requests against it.
- *
- * IN MEMORY, NOT ON DISK, which is a deliberate limit rather than an oversight. A restart drops every
- * outstanding code, and that is the right failure: the codes are minted on demand and spent within
- * minutes, the administrator is by definition present, and persisting them would put a credential-
- * equivalent on the volume to solve a problem measured in seconds.
- */
-
-import { randomUUID } from 'node:crypto';
-
-/**
- * Long enough to walk to the other room and read it out; short enough that a link left in a chat
- * window is useless by the time anyone scrolls back to it.
- */
-export const CLAIM_TTL_MS = 30 * 60 * 1000;
-
-export type ClaimStore = {
-  /** Mint a code for one seat's token. Returns the code and when it stops working. */
-  mint(token: string, gameId: string, now: number, ttlMs?: number): { code: string; expiresAt: number };
-  /**
-   * Spend a code. Returns the seat it names, or null when the code is unknown, already spent or
-   * expired — deliberately one answer for all three, so a caller cannot probe which it was.
-   */
-  redeem(code: string, now: number): { token: string; gameId: string } | null;
-  /** Outstanding, unexpired codes. For tests and for anything that wants to report the store's size. */
-  outstanding(now: number): number;
-};
-
-export function createClaimStore(): ClaimStore {
-  const claims = new Map<string, { token: string; gameId: string; expiresAt: number }>();
-
-  /** Expiry is lazy: there is no timer to own, start, stop or leak across a server's lifetime. */
-  const prune = (now: number): void => {
-    for (const [code, claim] of claims) if (claim.expiresAt <= now) claims.delete(code);
-  };
-
-  return {
-    mint(token, gameId, now, ttlMs = CLAIM_TTL_MS) {
-      prune(now);
-      // The same primitive the session tokens themselves use (`lobby.ts`), for the same reason: it
-      // has to be unguessable, and inventing a second scheme here would be inventing a weaker one.
-      const code = randomUUID();
-      const expiresAt = now + ttlMs;
-      claims.set(code, { token, gameId, expiresAt });
-      return { code, expiresAt };
-    },
-
-    redeem(code, now) {
-      prune(now);
-      const claim = claims.get(code);
-      if (!claim) return null;
-      // SINGLE USE. Deleted before the caller can do anything with it, so two browsers racing on the
-      // same link cannot both be seated — and a link that stays in someone's history is spent.
-      claims.delete(code);
-      return { token: claim.token, gameId: claim.gameId };
-    },
-
-    outstanding(now) {
-      prune(now);
-      return claims.size;
-    },
-  };
-}

src/server/http.ts

@@ -1,842 +0,0 @@
-/**
- * The HTTP/SSE wiring — Phase 2 of `docs/architecture/multiplayer.md` (§8-9, §12 steps 8 and 12),
- * extended for Phase 4 (§12 steps 17-20) to a lobby and more than one game.
- *
- * Plain `node:http`, no framework: the project has zero runtime dependencies
- * (`package.json`), and `scripts/build-web.ts` already shells out to `tsc` directly rather than
- * reaching for a bundler — this matches that everywhere-else choice rather than introducing the
- * first framework dependency for one route table.
- *
- * All the game logic lives in `session.ts` and `lobby.ts`; this file is deliberately thin — routing,
- * the join-secret gate on the DOOR (create/join), token resolution once a player is through it, SSE
- * mechanics, and static file serving for the built client (`dist/`, D16: the server serves the
- * client, which is what makes same-origin work with no CORS).
- *
- * TOKENS REPLACE `?seat=&secret=` ON THE RUNNING-GAME ROUTES. `lobby-and-sessions.md` §1: the token
- * already proves "I am the player who was in this game," which is the only identity claim `/api/stream`
- * and `/api/intent` need — the join secret's job ends at the lobby door.
- */
-
-import { createServer } from 'node:http';
-import type { IncomingMessage, ServerResponse } from 'node:http';
-import { createReadStream } from 'node:fs';
-import { stat } from 'node:fs/promises';
-import { extname, join, normalize } from 'node:path';
-
-import type { Intent } from '../engine/intents.ts';
-import type { GameConfig, PlayerIndex } from '../engine/state.ts';
-import {
-  appendTiming,
-  deleteGame,
-  deleteLobby,
-  gameDir,
-  readIndex,
-  removeIndexEntry,
-  upsertIndexEntry,
-  writeGame,
-  writeLobby,
-  writeSessions,
-} from './persistence.ts';
-import { createClaimStore } from './claims.ts';
-import { createSession } from './session.ts';
-import type { GameSession, Push } from './session.ts';
-import {
-  createLobby,
-  leaveLobby,
-  freshGameCode,
-  playerCountAllowed,
-  joinLobby,
-  reassignHost,
-  setBotSeat,
-  startLobby,
-} from './lobby.ts';
-import type { Lobby, PlayerSession } from './lobby.ts';
-
-export type ServerOptions = {
-  port: number;
-  bindAddress: string;
-  /** D14 — a server-wide secret, passed out of band. Gates lobby creation and joining — the door;
-   * once a player is through it and holds a token, the token alone authenticates them. */
-  joinSecret: string;
-  /** The built client (`npm run build:web`'s `dist/`), served at `/` (D16). */
-  distDir: string;
-  /** Where every game's files live, one subdirectory per `gameId` (`persistence.ts`'s `gameDir`). */
-  dataDir: string;
-  /** `package.json`'s version — stamped onto every write, checked on every load (§12 step 15). */
-  engineVersion: string;
-  /**
-   * Gates the administrative routes — listing, exporting and deleting games — and is DELIBERATELY
-   * not the join secret. Every player holds that one, so gating a delete with it would let anyone
-   * at the table destroy anyone else's game. This is held by whoever runs the server and nobody
-   * else. When it is unset the admin routes do not exist at all (404, the same answer as any other
-   * unknown path), so a server that was never given one cannot be administered by guessing.
-   */
-  adminSecret?: string | undefined;
-  /** Reconstructed by `index.ts`'s load-on-start. Empty maps for a fresh server. */
-  initialGames: Map<string, GameSession>;
-  initialLobbies: Map<string, Lobby>;
-  initialSessions: Map<string, PlayerSession>;
-};
-
-const MIME: Record<string, string> = {
-  '.html': 'text/html; charset=utf-8',
-  '.js': 'text/javascript; charset=utf-8',
-  '.css': 'text/css; charset=utf-8',
-  '.json': 'application/json; charset=utf-8',
-  '.png': 'image/png',
-  '.svg': 'image/svg+xml',
-};
-
-const HEARTBEAT_MS = 20_000;
-
-async function readJson(req: IncomingMessage): Promise<unknown> {
-  const chunks: Buffer[] = [];
-  for await (const chunk of req) chunks.push(chunk as Buffer);
-  const text = Buffer.concat(chunks).toString('utf8');
-  return text.trim() === '' ? {} : JSON.parse(text);
-}
-
-function sendJson(res: ServerResponse, status: number, body: unknown): void {
-  const text = JSON.stringify(body);
-  res.writeHead(status, { 'Content-Type': 'application/json; charset=utf-8', 'Content-Length': Buffer.byteLength(text) });
-  res.end(text);
-}
-
-async function serveStatic(
-  distDir: string,
-  urlPath: string,
-  res: ServerResponse,
-  /** The request's `?v=` build tag, when it has one — see the `Cache-Control` note below. */
-  buildTagged = false,
-): Promise<void> {
-  const rel = urlPath === '/' ? '/index.html' : urlPath;
-  // `normalize` collapses `..`, and the join is then checked to still be inside `distDir` — a request
-  // for `/../../etc/passwd` must not escape the one directory this is allowed to read from.
-  const full = join(distDir, normalize(rel));
-  if (!full.startsWith(distDir)) {
-    sendJson(res, 400, { error: 'bad path' });
-    return;
-  }
-  try {
-    const info = await stat(full);
-    if (!info.isFile()) throw new Error('not a file');
-    /**
-     * ONLY A URL CARRYING A BUILD TAG MAY BE CACHED, AND NOTHING ELSE MAY BE.
-     *
-     * Nothing here sent a `Cache-Control` at all before, so a browser applied its own heuristic to
-     * the pages as much as the modules. The pages are the one thing that CANNOT be versioned in
-     * their own URL — a player types the address or follows a bookmark — so a cached `play.html`
-     * pins that player to the entire build it names, including every `?v=` tag inside it. That is
-     * half of why v0.7.5 and v0.7.6 did not reach the browser that asked for them; `build-web.ts`
-     * publishing `?v=nogit` on every packaged release was the other half, and neither is enough on
-     * its own.
-     *
-     * `?v=` is the exact condition rather than "not HTML": `build-web.ts` tags the modules and the
-     * script tags that load them, and tags NOTHING else. An untagged URL — an image, the replay
-     * manifest — has no way to announce a change, so a year of `immutable` on one would outlive
-     * several releases of whatever it holds.
-     */
-    res.writeHead(200, {
-      'Content-Type': MIME[extname(full)] ?? 'application/octet-stream',
-      'Content-Length': info.size,
-      'Cache-Control': buildTagged ? 'public, max-age=31536000, immutable' : 'no-cache',
-    });
-    createReadStream(full).pipe(res);
-  } catch {
-    res.writeHead(404, { 'Content-Type': 'text/plain' });
-    res.end('not found');
-  }
-}
-
-/**
- * What a lobby SSE push carries — the whole `Lobby`, since the seat list is small and a delta
- * mechanism buys nothing at this size (`session.ts`'s `Push` deltas the BOARD, which is not this).
- *
- * `started` rides on the FINAL push of a lobby's life, sent the instant before the connection is
- * closed at `Lobby.Start` — without it, the client's only signal that the game began is the stream
- * simply ending, indistinguishable from a network hiccup that `EventSource` would otherwise retry.
- */
-type LobbyPush = { lobby: Lobby; you: PlayerIndex; started: boolean };
-/** What `/api/lobby/preview` answers with — everything a player weighing a join needs, and nothing
- * that would spoil the game. THE SEED IS NOT IN IT: it decides every shuffle and every roll. */
-type LobbyPreview = {
-  gameCode: string;
-  hostName: string;
-  config: GameConfig;
-  players: number;
-  seated: { seat: number; who: string | null; bot: boolean }[];
-};
-
-export function startServer(opts: ServerOptions): void {
-  const games = opts.initialGames;
-  const lobbies = opts.initialLobbies;
-  const sessions = opts.initialSessions;
-  /**
-   * Outstanding seat recovery codes — Gitea#33, `claims.ts`.
-   *
-   * In memory and not on the volume, deliberately: a code is minted on demand and spent within
-   * minutes with the administrator standing right there, so a restart dropping them all is the right
-   * failure. Persisting them would put a credential-equivalent on disk to solve a problem measured
-   * in seconds.
-   */
-  const claims = createClaimStore();
-  const gameCodes = new Map<string, string>(); // gameCode -> gameId, for /api/lobby/join
-  for (const [gameId, lobby] of lobbies) gameCodes.set(lobby.gameCode, gameId);
-
-  // One open SSE response per (gameId, seat) for a running game, and per (gameId, token) for a
-  // lobby still being seated — a second connection from the same seat/token replaces the first
-  // rather than fanning out to both (no concept yet of "the same seat from two tabs").
-  const gameConnections = new Map<string, Map<PlayerIndex, ServerResponse>>();
-  const gameEventIds = new Map<string, Map<PlayerIndex, number>>();
-  const lobbyConnections = new Map<string, Map<string, ServerResponse>>();
-  /** Which seats of a game have ever held a connection in THIS process — see `presenceOfOthers`. */
-  const everConnected = new Map<string, Set<PlayerIndex>>();
-
-  function writeSse(res: ServerResponse, id: number, data: unknown): void {
-    res.write(`id: ${id}\ndata: ${JSON.stringify(data)}\n\n`);
-  }
-
-  function nextEventId(gameId: string, seat: PlayerIndex): number {
-    const ids = gameEventIds.get(gameId) ?? new Map<PlayerIndex, number>();
-    const id = (ids.get(seat) ?? 0) + 1;
-    ids.set(seat, id);
-    gameEventIds.set(gameId, ids);
-    return id;
-  }
-
-  function broadcastGame(gameId: string, pushes: Map<PlayerIndex, Push>): void {
-    const conns = gameConnections.get(gameId);
-    if (!conns) return;
-    for (const [seat, push] of pushes) {
-      const res = conns.get(seat);
-      if (res) writeSse(res, nextEventId(gameId, seat), push);
-    }
-  }
-
-  /**
-   * Presence is transport-layer news about a CONNECTION, never a `GameEvent` — it does not go
-   * through `session.ts` at all (`lobby-and-sessions.md` §5). Sent to every OTHER currently
-   * connected seat of the same game as a presence-only push (an empty board delta, no menu, no new
-   * lines) rather than inventing a second SSE event type — one message shape for the client to parse.
-   */
-  function broadcastPresence(gameId: string, seat: PlayerIndex, connected: boolean): void {
-    const conns = gameConnections.get(gameId);
-    if (!conns) return;
-    for (const [other, res] of conns) {
-      if (other === seat) continue;
-      const push: Push = { menu: null, lines: [], presence: [{ seat, connected, seen: true }] };
-      writeSse(res, nextEventId(gameId, other), push);
-    }
-  }
-
-  /**
-   * EVERY OTHER SEAT'S STATE, for a client that has just connected.
-   *
-   * `broadcastPresence` only ever reports a CHANGE, so a player arriving at a table where two people
-   * had not opened the game yet was told nothing about them at all — and "is everyone here?" is the
-   * question at the moment a game starts. `seen` separates a seat that was here and dropped from one
-   * that has never connected; it is remembered only for as long as this process runs, so after a
-   * restart every absent seat reads as "not here yet", which is the more cautious of the two.
-   */
-  function presenceOfOthers(
-    gameId: string,
-    seat: PlayerIndex,
-    session: GameSession,
-  ): NonNullable<Push['presence']> {
-    const conns = gameConnections.get(gameId);
-    const ever = everConnected.get(gameId) ?? new Set<PlayerIndex>();
-    const out: NonNullable<Push['presence']> = [];
-    for (let other = 0 as PlayerIndex; other < session.playerCount; other++) {
-      // A bot holds no connection and never will, so reporting it would put "waiting on Bot 1 — not
-      // here yet" on every screen for the whole game. Found by playing a real 3-seat game.
-      if (other === seat || session.isBot(other)) continue;
-      out.push({ seat: other, connected: conns?.has(other) === true, seen: ever.has(other) });
-    }
-    return out;
-  }
-
-  function broadcastLobby(gameId: string): void {
-    const lobby = lobbies.get(gameId);
-    const conns = lobbyConnections.get(gameId);
-    if (!lobby || !conns) return;
-    for (const [token, res] of conns) {
-      const ps = sessions.get(token);
-      if (!ps) continue;
-      writeSse(res, 0, { lobby, you: ps.player, started: false } satisfies LobbyPush);
-    }
-  }
-
-  async function persistLobby(lobby: Lobby): Promise<void> {
-    lobbies.set(lobby.gameId, lobby);
-    gameCodes.set(lobby.gameCode, lobby.gameId);
-    await writeLobby(opts.dataDir, lobby);
-    await upsertIndexEntry(opts.dataDir, { gameId: lobby.gameId, gameCode: lobby.gameCode, status: 'lobby' });
-  }
-
-  async function persistSession(ps: PlayerSession): Promise<void> {
-    sessions.set(ps.token, ps);
-    const all = [...sessions.values()].filter((s) => s.gameId === ps.gameId);
-    await writeSessions(opts.dataDir, ps.gameId, all);
-  }
-
-  const server = createServer((req, res) => {
-    void (async () => {
-      const url = new URL(req.url ?? '/', `http://${req.headers.host ?? 'localhost'}`);
-
-      // -- Is anyone home? --------------------------------------------------------------------
-
-      /**
-       * THE ONE ROUTE THAT EXISTS TO BE FAILED.
-       *
-       * The same `dist/` is served two ways: by this server, and as a plain static upload with no
-       * server behind it at all (`scripts/deploy-web.ts`). The bundle is byte-identical either way
-       * — one client, mode decided at runtime (D4) — so the page cannot know from its own build
-       * which it is, and every other route here answers a 404 for a path it does not have, exactly
-       * as a static host would. Nothing distinguished them until this did.
-       *
-       * Unauthenticated on purpose: it says only that a Station Master server is answering, which
-       * is what the client is about to offer the player anyway. It reveals no game and no seat.
-       */
-      if (url.pathname === '/api/health' && req.method === 'GET') {
-        // `summary()` rather than `exportSave()`: this is polled on a timer, and the save copies
-        // every intent of every game to answer a question about none of them.
-        let active = 0;
-        for (const g of games.values()) if (g.summary().status === 'active') active++;
-        sendJson(res, 200, {
-          ok: true,
-          service: 'station-master',
-          engineVersion: opts.engineVersion,
-          games: { active, lobby: lobbies.size },
-        });
-        return;
-      }
-
-      // -- Administration: listing, exporting and deleting games ------------------------------
-
-      if (url.pathname === '/api/games' || url.pathname.startsWith('/api/games/')) {
-        // Unset means the routes are not here — indistinguishable from any other unknown path, so
-        // nothing advertises an administrative surface to someone probing for one.
-        if (!opts.adminSecret) {
-          await serveStatic(opts.distDir, url.pathname, res, url.searchParams.has('v'));
-          return;
-        }
-        if (req.headers['x-admin-secret'] !== opts.adminSecret) {
-          sendJson(res, 403, { error: 'bad or missing admin secret' });
-          return;
-        }
-
-        const codes = new Map((await readIndex(opts.dataDir)).map((e) => [e.gameId, e.gameCode]));
-
-        if (url.pathname === '/api/games' && req.method === 'GET') {
-          const running = [...games.entries()].map(([gameId, g]) => ({
-            gameId,
-            gameCode: codes.get(gameId) ?? null,
-            state: 'running' as const,
-            /**
-             * WHICH SEATS A PERSON IS SITTING IN — Gitea#33.
-             *
-             * `playerNames` cannot answer it: a bot's name is just a name, and telling the two apart
-             * by matching "Bot 1" would be guessing at a label. `sessions` holds humans and only
-             * humans, so this is the fact rather than an inference — and it is what lets the seat
-             * recovery action offer real players instead of chairs no token was ever issued for.
-             */
-            seatedPlayers: [...sessions.values()]
-              .filter((s) => s.gameId === gameId)
-              .map((s) => s.player),
-            ...g.summary(),
-          }));
-          // A lobby has no game to summarize yet — it is reported as what it is, so an
-          // administrator sees a table that never started rather than nothing at all.
-          const waiting = [...lobbies.values()].map((l) => ({
-            gameId: l.gameId,
-            gameCode: l.gameCode,
-            state: 'lobby' as const,
-            playerCount: l.seats.length,
-            playerNames: l.seats.map((seat) =>
-              seat === null ? '(empty)' : seat.kind === 'bot' ? 'Bot' : seat.displayName,
-            ),
-            createdAt: l.createdAt,
-          }));
-          sendJson(res, 200, { games: [...running, ...waiting] });
-          return;
-        }
-
-        const match = /^\/api\/games\/([^/]+)(\/save|\/claim)?$/.exec(url.pathname);
-        const gameId = match?.[1];
-        // Compared explicitly rather than tested for truthiness: with two suffixes in the group, a
-        // bare `match?.[2]` would let a GET on `/claim` fall into the `/save` branch below.
-        const suffix = match?.[2];
-        if (!gameId) {
-          sendJson(res, 404, { error: 'no such route' });
-          return;
-        }
-
-        /**
-         * MINT A SEAT RECOVERY CODE FOR ONE PLAYER — Gitea#33.
-         *
-         * The token is the only identity this game has and it lives in one browser's `localStorage`;
-         * lose it and the seat is unreachable, because nothing else here will accept a claim to it.
-         * This is the supported way back, and it is administrative on purpose: whoever runs the
-         * server decides that a particular player has lost their seat, which is a judgement no
-         * automated route can make safely.
-         *
-         * IT HANDS BACK A CODE, NOT THE TOKEN. §1 says keep the token out of URLs, and the code is
-         * going into one. Short-lived and single-use (`claims.ts`), so a link left in a chat window
-         * is worth nothing by the time anyone finds it.
-         */
-        if (suffix === '/claim' && req.method === 'POST') {
-          const body = (await readJson(req)) as { player?: number };
-          const ps = [...sessions.values()].find((s) => s.gameId === gameId && s.player === body.player);
-          if (!ps) {
-            sendJson(res, 404, { error: 'no such seat' });
-            return;
-          }
-          const { code, expiresAt } = claims.mint(ps.token, gameId, Date.now());
-          sendJson(res, 200, {
-            code,
-            expiresAt,
-            player: ps.player,
-            displayName: ps.displayName,
-            gameCode: codes.get(gameId) ?? null,
-          });
-          return;
-        }
-
-        if (suffix === '/save' && req.method === 'GET') {
-          const session = games.get(gameId);
-          if (!session) {
-            sendJson(res, 404, { error: 'no such game' });
-            return;
-          }
-          sendJson(res, 200, { gameCode: codes.get(gameId) ?? null, save: session.exportSave() });
-          return;
-        }
-
-        if (req.method === 'DELETE') {
-          const session = games.get(gameId);
-          const lobby = lobbies.get(gameId);
-          if (!session && !lobby) {
-            sendJson(res, 404, { error: 'no such game' });
-            return;
-          }
-          // The save goes back with the deletion, so a game can never be destroyed without its
-          // record being handed to whoever destroyed it — the intents ARE the game (D5), so this
-          // is the whole thing, replayable later, not a summary of it.
-          const save = session?.exportSave() ?? null;
-
-          // Everyone watching is told the game is gone before its files are, rather than being
-          // left on a stream that will never push again.
-          for (const [, watcher] of gameConnections.get(gameId) ?? []) watcher.end();
-          gameConnections.delete(gameId);
-          for (const [, watcher] of lobbyConnections.get(gameId) ?? []) watcher.end();
-          lobbyConnections.delete(gameId);
-
-          games.delete(gameId);
-          lobbies.delete(gameId);
-          gameEventIds.delete(gameId);
-          const code = lobby?.gameCode ?? codes.get(gameId);
-          if (code) gameCodes.delete(code);
-          for (const [token, ps] of [...sessions]) if (ps.gameId === gameId) sessions.delete(token);
-
-          await removeIndexEntry(opts.dataDir, gameId);
-          await deleteGame(opts.dataDir, gameId);
-          sendJson(res, 200, { ok: true, gameCode: code ?? null, save });
-          return;
-        }
-
-        sendJson(res, 405, { error: 'method not allowed' });
-        return;
-      }
-
-      // -- Lobby: creating and joining (the door — join-secret gated) --------------------------
-
-      if (url.pathname === '/api/lobby/create' && req.method === 'POST') {
-        const body = (await readJson(req)) as {
-          secret?: string;
-          config?: GameConfig;
-          displayName?: string;
-          players?: number;
-          seed?: number | null;
-        };
-        if (body.secret !== opts.joinSecret) {
-          sendJson(res, 403, { error: 'bad or missing secret' });
-          return;
-        }
-        if (!body.config || typeof body.displayName !== 'string' || body.displayName.trim() === '') {
-          sendJson(res, 400, { error: 'expected { secret, config, displayName, players }' });
-          return;
-        }
-        // The table size is the host's to choose and is fixed from here on, so it is validated at
-        // the door rather than at Start — `createLobby` builds the seats array from it.
-        const players = body.players ?? 0;
-        if (!Number.isInteger(players) || !playerCountAllowed(body.config.mode, players)) {
-          sendJson(res, 400, { error: 'BAD_PLAYER_COUNT' });
-          return;
-        }
-        const gameCode = freshGameCode((code) => gameCodes.has(code));
-        const seed = typeof body.seed === 'number' && Number.isFinite(body.seed) ? Math.trunc(body.seed) : null;
-        const { lobby, session } = createLobby(body.config, body.displayName.trim(), gameCode, players, seed);
-        await persistLobby(lobby);
-        await persistSession(session);
-        sendJson(res, 200, { gameId: lobby.gameId, gameCode: lobby.gameCode, token: session.token, player: session.player });
-        return;
-      }
-
-      if (url.pathname === '/api/lobby/join' && req.method === 'POST') {
-        const body = (await readJson(req)) as { secret?: string; gameCode?: string; displayName?: string };
-        if (body.secret !== opts.joinSecret) {
-          sendJson(res, 403, { error: 'bad or missing secret' });
-          return;
-        }
-        if (typeof body.gameCode !== 'string' || typeof body.displayName !== 'string' || body.displayName.trim() === '') {
-          sendJson(res, 400, { error: 'expected { secret, gameCode, displayName }' });
-          return;
-        }
-        const gameId = gameCodes.get(body.gameCode.trim().toUpperCase());
-        const lobby = gameId ? lobbies.get(gameId) : undefined;
-        if (!lobby) {
-          // A game code that already started is no longer in `lobbies` at all — same NOT_FOUND a
-          // typo gets, which tells a latecomer "that game is gone" without leaking which case it was.
-          sendJson(res, 404, { error: 'no open lobby with that code' });
-          return;
-        }
-        const result = joinLobby(lobby, body.displayName.trim());
-        if (!result.ok) {
-          sendJson(res, 409, { error: result.code });
-          return;
-        }
-        await persistLobby(result.lobby);
-        await persistSession(result.session);
-        broadcastLobby(lobby.gameId);
-        sendJson(res, 200, {
-          gameId: lobby.gameId,
-          gameCode: lobby.gameCode,
-          token: result.session.token,
-          player: result.session.player,
-        });
-        return;
-      }
-
-      // -- Lobby: seating, once inside (token-authenticated) ------------------------------------
-
-      if (url.pathname === '/api/lobby/bot' && req.method === 'POST') {
-        const body = (await readJson(req)) as { token?: string; seat?: number; filled?: boolean };
-        const ps = typeof body.token === 'string' ? sessions.get(body.token) : undefined;
-        const lobby = ps ? lobbies.get(ps.gameId) : undefined;
-        if (!ps || !lobby) {
-          sendJson(res, 404, { error: 'no such lobby' });
-          return;
-        }
-        if (lobby.hostToken !== ps.token) {
-          sendJson(res, 403, { error: 'NOT_HOST' });
-          return;
-        }
-        if (typeof body.seat !== 'number' || typeof body.filled !== 'boolean') {
-          sendJson(res, 400, { error: 'expected { token, seat, filled }' });
-          return;
-        }
-        const updated = setBotSeat(lobby, body.seat as PlayerIndex, body.filled);
-        await persistLobby(updated);
-        broadcastLobby(lobby.gameId);
-        sendJson(res, 200, { ok: true });
-        return;
-      }
-
-      /**
-       * GIVING UP A SEAT — the player's own, or (host only) somebody else's.
-       *
-       * There was no door out of a lobby before this: a mis-join or a player who wandered off left a
-       * chair that could not be freed, and a table that cannot start until every chair is taken.
-       * The host's "remove" and a player's "Leave" are the same act from opposite ends, so they are
-       * one route — `seat` names somebody else's chair and is refused to anyone but the host.
-       */
-      if (url.pathname === '/api/lobby/leave' && req.method === 'POST') {
-        const body = (await readJson(req)) as { token?: string; seat?: number };
-        const ps = typeof body.token === 'string' ? sessions.get(body.token) : undefined;
-        const lobby = ps ? lobbies.get(ps.gameId) : undefined;
-        if (!ps || !lobby) {
-          sendJson(res, 404, { error: 'no such lobby' });
-          return;
-        }
-        const seat = typeof body.seat === 'number' ? (body.seat as PlayerIndex) : undefined;
-        if (seat !== undefined && seat !== ps.player && lobby.hostToken !== ps.token) {
-          sendJson(res, 403, { error: 'NOT_HOST' });
-          return;
-        }
-        const result = leaveLobby(lobby, ps.token, seat);
-        if (result.empty) {
-          // Nobody human is left to start it. Everything about this lobby goes, including the code,
-          // so it cannot be joined into a game that will never begin.
-          lobbies.delete(lobby.gameId);
-          gameCodes.delete(lobby.gameCode);
-          for (const [, watcher] of lobbyConnections.get(lobby.gameId) ?? []) watcher.end();
-          lobbyConnections.delete(lobby.gameId);
-          await deleteLobby(opts.dataDir, lobby.gameId);
-          // The row goes with the lobby rather than being marked: a game that never started is not a
-          // game an administrator has any use for a record of.
-          await removeIndexEntry(opts.dataDir, lobby.gameId);
-          sendJson(res, 200, { ok: true, closed: true });
-          return;
-        }
-        await persistLobby(result.lobby);
-        broadcastLobby(lobby.gameId);
-        sendJson(res, 200, { ok: true });
-        return;
-      }
-
-      /**
-       * WHAT AM I ABOUT TO JOIN? Read-only, takes no seat, and gated by the same join secret the
-       * door itself is.
-       *
-       * A player used to have to take a chair before they could see a single rule of the game they
-       * were sitting down to — and until 2026-08-23 there was then no way back out of it.
-       */
-      if (url.pathname === '/api/lobby/preview' && req.method === 'GET') {
-        if (url.searchParams.get('secret') !== opts.joinSecret) {
-          sendJson(res, 403, { error: 'bad or missing secret' });
-          return;
-        }
-        const code = (url.searchParams.get('gameCode') ?? '').trim().toUpperCase();
-        const gameId = gameCodes.get(code);
-        const lobby = gameId ? lobbies.get(gameId) : undefined;
-        if (!lobby) {
-          sendJson(res, 404, { error: 'no open lobby with that code' });
-          return;
-        }
-        const hostSeat = lobby.seats.find((seat) => seat?.kind === 'human' && seat.token === lobby.hostToken);
-        const preview: LobbyPreview = {
-          gameCode: lobby.gameCode,
-          hostName: hostSeat?.kind === 'human' ? hostSeat.displayName : 'unknown',
-          config: lobby.config,
-          players: lobby.seats.length,
-          seated: lobby.seats.map((seat, i) => ({
-            seat: i,
-            who: seat?.kind === 'human' ? seat.displayName : null,
-            bot: seat?.kind === 'bot',
-          })),
-        };
-        sendJson(res, 200, preview);
-        return;
-      }
-
-      if (url.pathname === '/api/lobby/start' && req.method === 'POST') {
-        const body = (await readJson(req)) as { token?: string };
-        const ps = typeof body.token === 'string' ? sessions.get(body.token) : undefined;
-        const lobby = ps ? lobbies.get(ps.gameId) : undefined;
-        if (!ps || !lobby) {
-          sendJson(res, 404, { error: 'no such lobby' });
-          return;
-        }
-        const result = startLobby(lobby, ps.token);
-        if (!result.ok) {
-          sendJson(res, 409, { error: result.code });
-          return;
-        }
-        // The host's seed if they named one; otherwise a fresh random deal.
-        const session = createSession(
-          lobby.seed ?? Math.floor(Math.random() * 1e9),
-          lobby.config,
-          result.playerNames,
-          result.botSeats,
-        );
-        games.set(lobby.gameId, session);
-        lobbies.delete(lobby.gameId);
-        // Every SSE watcher on the LOBBY stream is done — the game stream is what carries the game
-        // forward from here. `started: true` on one last message, THEN close, is what lets a
-        // still-open lobby tab tell "the game began" apart from a network hiccup `EventSource`
-        // would otherwise silently retry through.
-        for (const [watcherToken, watcherRes] of lobbyConnections.get(lobby.gameId) ?? []) {
-          const watcherPs = sessions.get(watcherToken);
-          if (watcherPs) writeSse(watcherRes, 0, { lobby, you: watcherPs.player, started: true } satisfies LobbyPush);
-          watcherRes.end();
-        }
-        lobbyConnections.delete(lobby.gameId);
-
-        await writeGame(gameDir(opts.dataDir, lobby.gameId), session.exportSave(), opts.engineVersion);
-        await upsertIndexEntry(opts.dataDir, { gameId: lobby.gameId, gameCode: lobby.gameCode, status: 'active' });
-        await deleteLobby(opts.dataDir, lobby.gameId);
-        sendJson(res, 200, { ok: true });
-        return;
-      }
-
-      if (url.pathname === '/api/lobby/stream' && req.method === 'GET') {
-        const token = url.searchParams.get('token') ?? '';
-        const ps = sessions.get(token);
-        const lobby = ps ? lobbies.get(ps.gameId) : undefined;
-        if (!ps || !lobby) {
-          sendJson(res, 404, { error: 'no such lobby' });
-          return;
-        }
-        res.writeHead(200, { 'Content-Type': 'text/event-stream', 'Cache-Control': 'no-cache', Connection: 'keep-alive' });
-        const conns = lobbyConnections.get(lobby.gameId) ?? new Map<string, ServerResponse>();
-        conns.set(token, res);
-        lobbyConnections.set(lobby.gameId, conns);
-        writeSse(res, 0, { lobby, you: ps.player, started: false } satisfies LobbyPush);
-        const heartbeat = setInterval(() => res.write(': ping\n\n'), HEARTBEAT_MS);
-        req.on('close', () => {
-          clearInterval(heartbeat);
-          const live = lobbyConnections.get(lobby.gameId);
-          if (live?.get(token) === res) live.delete(token);
-          // `lobby-and-sessions.md` §2 — host rights pass to the earliest-joined remaining player
-          // if the host's connection closes before start. `lobbies.get` again, not the captured
-          // `lobby`, because it may have changed (another join, another bot toggle) since connect.
-          const current = lobbies.get(lobby.gameId);
-          if (current && current.hostToken === token) {
-            void persistLobby(reassignHost(current, token)).then(() => broadcastLobby(lobby.gameId));
-          }
-        });
-        return;
-      }
-
-      // -- The running game (token-authenticated) ------------------------------------------------
-
-      /**
-       * IS THIS TOKEN STILL GOOD FOR ANYTHING?
-       *
-       * A browser remembers its session in `localStorage` and re-enters the game on the next load
-       * without asking, which is what makes reconnection seamless — and what leaves it stranded
-       * when the game is gone. `EventSource` cannot report a status code and retries a 404
-       * silently forever, so the client needs somewhere cheap to ask a yes/no question. Two ways a
-       * game legitimately disappears under a player: an engine-version bump refuses to resume it
-       * (D7), and an administrator ends it (`DELETE /api/games/<id>`).
-       */
-      if (url.pathname === '/api/session' && req.method === 'GET') {
-        const ps = sessions.get(url.searchParams.get('token') ?? '');
-        const live = ps ? games.get(ps.gameId) : undefined;
-        if (!ps || !live) {
-          sendJson(res, 404, { error: 'no such game' });
-          return;
-        }
-        sendJson(res, 200, { gameId: ps.gameId, player: ps.player });
-        return;
-      }
-
-      /**
-       * SPEND A SEAT RECOVERY CODE — Gitea#33, the other half of `/api/games/<id>/claim`.
-       *
-       * NOT GATED BY THE ADMIN SECRET, and it must not be: the player following the link is the one
-       * person in this story who holds no secret at all. The code IS the authorisation — unguessable,
-       * single-use and short-lived — which is the same shape as the session token it hands back, and
-       * why minting one is the administrative act rather than spending one.
-       *
-       * The token travels in the response BODY of a POST, never in a URL (`lobby-and-sessions.md`
-       * §1). One answer for unknown, spent and expired codes, so this cannot be used to probe which.
-       */
-      if (url.pathname === '/api/claim' && req.method === 'POST') {
-        const body = (await readJson(req)) as { code?: string };
-        const claimed = typeof body.code === 'string' ? claims.redeem(body.code, Date.now()) : null;
-        const ps = claimed ? sessions.get(claimed.token) : undefined;
-        const live = ps ? games.get(ps.gameId) : undefined;
-        if (!claimed || !ps || !live) {
-          sendJson(res, 404, { error: 'no such claim' });
-          return;
-        }
-        const codes = new Map((await readIndex(opts.dataDir)).map((e) => [e.gameId, e.gameCode]));
-        sendJson(res, 200, {
-          token: ps.token,
-          gameId: ps.gameId,
-          player: ps.player,
-          gameCode: codes.get(ps.gameId) ?? '',
-        });
-        return;
-      }
-
-      /**
-       * THIS SEAT'S OWN GAME, AS A SAVE (playtest, 2026-09-15: "most of the time, I want to go ahead and
-       * just save it as a JSON file in my Downloads folder").
-       *
-       * The administrative export at `/api/games/<id>/save` is gated on the admin secret, which a player
-       * does not have and should not need: a save is the seed and the moves, and every one of those moves
-       * is already on this player's screen. So the seat's own session token is the gate, exactly as it is
-       * for `/api/stream` and `/api/intent` — it proves which game and which chair, and nothing else is
-       * disclosed. The page turns the JSON into a file (`main.ts`'s `downloadSave`).
-       */
-      if (url.pathname === '/api/save' && req.method === 'GET') {
-        const ps = sessions.get(url.searchParams.get('token') ?? '');
-        const session = ps ? games.get(ps.gameId) : undefined;
-        if (!ps || !session) {
-          sendJson(res, 404, { error: 'no such game' });
-          return;
-        }
-        sendJson(res, 200, { gameId: ps.gameId, save: session.exportSave() });
-        return;
-      }
-
-      if (url.pathname === '/api/stream' && req.method === 'GET') {
-        const token = url.searchParams.get('token') ?? '';
-        const ps = sessions.get(token);
-        const session = ps ? games.get(ps.gameId) : undefined;
-        if (!ps || !session) {
-          sendJson(res, 404, { error: 'no such game' });
-          return;
-        }
-        const { gameId, player: seat } = ps;
-        res.writeHead(200, { 'Content-Type': 'text/event-stream', 'Cache-Control': 'no-cache', Connection: 'keep-alive' });
-        const conns = gameConnections.get(gameId) ?? new Map<PlayerIndex, ServerResponse>();
-        conns.set(seat, res);
-        gameConnections.set(gameId, conns);
-        const ever = everConnected.get(gameId) ?? new Set<PlayerIndex>();
-        ever.add(seat);
-        everConnected.set(gameId, ever);
-        // The board, and who else is at the table — the second half used to be missing entirely.
-        const first = session.connect(seat);
-        first.presence = presenceOfOthers(gameId, seat, session);
-        writeSse(res, nextEventId(gameId, seat), first);
-        broadcastPresence(gameId, seat, true);
-        // Idle for minutes at a time is the expected shape of this game (multiplayer.md §9) — a
-        // silent SSE connection is exactly what a proxy in the path may reap. A comment line is not a
-        // real event (EventSource ignores lines starting with `:`), so it costs the client nothing.
-        const heartbeat = setInterval(() => res.write(': ping\n\n'), HEARTBEAT_MS);
-        req.on('close', () => {
-          clearInterval(heartbeat);
-          const live = gameConnections.get(gameId);
-          if (live?.get(seat) === res) live.delete(seat);
-          broadcastPresence(gameId, seat, false);
-        });
-        return;
-      }
-
-      if (url.pathname === '/api/intent' && req.method === 'POST') {
-        // Token comes from the QUERY STRING, matching `/api/stream` and matching what
-        // `web/session.ts`'s `RemoteSession.submit` actually sends (`fetch('/api/intent?token=…')`)
-        // — the body carries only what changes per call, `{ seq, intent }`.
-        const token = url.searchParams.get('token') ?? '';
-        const ps = sessions.get(token);
-        const session = ps ? games.get(ps.gameId) : undefined;
-        if (!ps || !session) {
-          sendJson(res, 404, { error: 'no such game' });
-          return;
-        }
-        const body = (await readJson(req)) as { seq?: number; intent?: Intent };
-        if (typeof body.seq !== 'number' || !body.intent) {
-          sendJson(res, 400, { error: 'expected { seq, intent }' });
-          return;
-        }
-        const result = session.intent(ps.player, body.seq, body.intent);
-        if (result.accepted) {
-          // Persisted BEFORE the response goes out — "accepted" should mean "durably on disk" at
-          // this scale, not just "applied in memory" (§12 step 14).
-          const dir = gameDir(opts.dataDir, ps.gameId);
-          await writeGame(dir, session.exportSave(), opts.engineVersion);
-          if (result.timing) await appendTiming(dir, result.timing);
-          if (session.exportSave().status === 'finished') {
-            // `upsertIndexEntry` replaces the WHOLE row for this `gameId`, so the code has to be
-            // carried forward here rather than left blank — `gameCodes` is the only place still
-            // holding it once a lobby's own record is gone.
-            const gameCode = [...gameCodes.entries()].find(([, id]) => id === ps.gameId)?.[0] ?? '';
-            await upsertIndexEntry(opts.dataDir, { gameId: ps.gameId, gameCode, status: 'finished' });
-          }
-        }
-        sendJson(res, 200, result.accepted ? { ok: true } : { ok: false, code: result.code });
-        if (result.accepted) broadcastGame(ps.gameId, result.pushes);
-        return;
-      }
-
-      await serveStatic(opts.distDir, url.pathname, res, url.searchParams.has('v'));
-    })().catch((err: unknown) => {
-      sendJson(res, 500, { error: err instanceof Error ? err.message : 'internal error' });
-    });
-  });
-
-  server.listen(opts.port, opts.bindAddress);
-}

src/server/index.ts

@@ -1,107 +0,0 @@
-/**
- * Process bootstrap — Phase 2 §12 step 8, extended for Phase 3 (§12 steps 14-15) load-on-start and
- * Phase 4 (§12 steps 17-20) to resume every saved game and lobby, not just one.
- *
- * Run with:  node src/server/index.ts
- *
- * Env-configured, no config file — matches how the rest of this project's dev-side tooling reads
- * `process.env` directly (`scripts/build-web.ts`'s `BUILD_DIST_DIR`).
- */
-
-import { readFileSync } from 'node:fs';
-import { dirname, join, resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
-import { startServer } from './http.ts';
-import { gameDir, loadGame, readIndex, readLobby, readSessions } from './persistence.ts';
-import { tryResumeSession } from './session.ts';
-import type { GameSession } from './session.ts';
-import type { Lobby, PlayerSession } from './lobby.ts';
-
-const port = Number(process.env['PORT'] ?? 8081);
-const bindAddress = process.env['BIND_ADDRESS'] ?? '0.0.0.0';
-const joinSecret = process.env['JOIN_SECRET'];
-/**
- * Optional, unlike `JOIN_SECRET`: a server with no administrator is a perfectly good server, and
- * refusing to boot without one would break every existing deployment and every dev run. Unset
- * simply means the admin routes are not there (`http.ts`), which is the safe default — the
- * capability has to be granted, never merely left ungated.
- */
-const adminSecret = process.env['ADMIN_SECRET'];
-const distDir = resolve(process.env['DIST_DIR'] ?? 'dist');
-const dataDir = resolve(process.env['DATA_DIR'] ?? 'data');
-
-if (!joinSecret) {
-  console.error('JOIN_SECRET must be set — a server-wide secret, passed out of band (D14).');
-  process.exit(1);
-}
-
-// `package.json`'s version IS `engineVersion` (§12 step 15) — the same reading `scripts/build-web.ts`'s
-// `buildStamp()` already does, just from `src/server/` rather than the repo root script directory.
-const root = join(dirname(fileURLToPath(import.meta.url)), '..', '..');
-const engineVersion = (JSON.parse(readFileSync(join(root, 'package.json'), 'utf8')) as { version: string }).version;
-
-const initialGames = new Map<string, GameSession>();
-const initialLobbies = new Map<string, Lobby>();
-const initialSessions = new Map<string, PlayerSession>();
-
-const index = await readIndex(dataDir);
-// Said before the loop, not after it: replaying is the reason a restart pauses before the port
-// opens, and a log that only reports each game once it is done gives no warning of how much is
-// still to come.
-const resumable = index.filter((e) => e.status !== 'finished').length;
-if (resumable > 0) console.log(`Resuming ${resumable} saved game(s)…`);
-for (const entry of index) {
-  const sessions = await readSessions(dataDir, entry.gameId);
-  for (const s of sessions) initialSessions.set(s.token, s);
-
-  if (entry.status === 'lobby') {
-    const lobby = await readLobby(dataDir, entry.gameId);
-    if (lobby) initialLobbies.set(entry.gameId, lobby);
-    continue;
-  }
-
-  const loaded = await loadGame(gameDir(dataDir, entry.gameId));
-  if (loaded.found) {
-    const resumed = tryResumeSession(loaded.saved);
-    if (resumed.ok) {
-      initialGames.set(entry.gameId, resumed.session);
-      console.log(`Resumed ${entry.gameId} (${entry.gameCode}) — ${loaded.saved.history.length} intents replayed.`);
-    } else {
-      /**
-       * The save does not replay under these rules, which is the only thing that has ever actually
-       * mattered — and now the only thing asked. Says which move it choked on, because "some
-       * version differs" was never enough to act on: the file is left untouched, so an operator who
-       * wants the game back can put the previous version on and finish it.
-       */
-      const f = resumed.failure;
-      console.error(
-        `Refusing to resume ${entry.gameId} (${entry.gameCode}): move ${f.stoppedAt + 1} of ${f.of} ` +
-          `(${f.intent}) is rejected by the current rules with ${f.code}. Saved under engine ` +
-          `version ${loaded.storedVersion}, this server is running ${engineVersion}. The file is ` +
-          `left untouched.`,
-      );
-    }
-  }
-  // `entry.status === 'finished'` games are not resumed into memory at all — nothing plays them
-  // forward, and their files stay on disk for post-game replay (`lobby-and-sessions.md` §6).
-}
-
-startServer({
-  port,
-  bindAddress,
-  joinSecret,
-  adminSecret,
-  distDir,
-  dataDir,
-  engineVersion,
-  initialGames,
-  initialLobbies,
-  initialSessions,
-});
-console.log(
-  `Station Master multiplayer server on ${bindAddress}:${port}, serving ${distDir} — ` +
-    `${initialGames.size} game(s) and ${initialLobbies.size} lobby(ies) resumed.`,
-);
-if (!adminSecret) {
-  console.log('ADMIN_SECRET is unset — the /api/games administration routes are disabled.');
-}

src/server/lobby.ts

@@ -1,254 +0,0 @@
-/**
- * The lobby — Phase 4 of `docs/architecture/multiplayer.md` (§12 steps 17-20), fully specified in
- * `docs/architecture/lobby-and-sessions.md`.
- *
- * Pure logic, no sockets, no filesystem, no in-memory registry — same split `session.ts` already
- * draws (`http.ts` wires connections and persistence to this; `persistence.ts` is the only thing
- * that touches disk). A `Lobby` exists only BEFORE `Lobby.Start`: once the config locks and the
- * `GameSession` is built, this module is done with that game — everything after is `session.ts`.
- *
- * WHY A SEPARATE FILE FROM `session.ts`. `session.ts` is already the "running game" module and is
- * large; a lobby's concerns — seating, host rights, the join secret's door versus a game code's
- * discovery, config locking — share almost no code with running a Stage clock, and mixing them would
- * make both harder to read for no reuse gained.
- */
-
-import { randomUUID } from 'node:crypto';
-
-import type { GameConfig, PlayerIndex } from '../engine/state.ts';
-
-/** `lobby-and-sessions.md` §1 — names the PLAYER, not the seat. Issued once, at join, and never
- * reissued: it is what makes reconnection work, so it must outlive the connection that first used
- * it. */
-export type PlayerSession = {
-  token: string;
-  gameId: string;
-  player: PlayerIndex;
-  displayName: string;
-};
-
-export type LobbySeat = { kind: 'human'; token: string; displayName: string } | { kind: 'bot' } | null;
-
-/** A game that has not started. `hostToken` ends its meaning at `Lobby.Start` — nothing here
- * survives into the running game except the seat list and the locked `config`. */
-export type Lobby = {
-  gameId: string;
-  gameCode: string;
-  hostToken: string;
-  config: GameConfig;
-  seats: LobbySeat[];
-  /** Tokens in the order they joined — human seats only, host first — so a departed host's
-   * replacement is unambiguous (`lobby-and-sessions.md` §2: "earliest-joined remaining player"). */
-  joinOrder: string[];
-  createdAt: number;
-  /**
-   * The seed the host asked for, or null for one picked at `Lobby.Start`. Chosen here rather than
-   * at start because the same seed and the same settings deal the same railroad — which is only
-   * useful if the person setting the game up can name it.
-   */
-  seed: number | null;
-};
-
-export type CreateResult = { lobby: Lobby; session: PlayerSession };
-export type JoinResult =
-  | { ok: true; lobby: Lobby; session: PlayerSession }
-  | { ok: false; code: 'LOBBY_FULL' | 'ALREADY_STARTED' | 'NAME_TAKEN' };
-/** `empty` when the last human has gone — the caller drops the lobby rather than leaving a table of
- * bots waiting for a host who no longer exists. */
-export type LeaveResult = { lobby: Lobby; empty: boolean };
-export type StartResult = { ok: true; playerNames: string[]; botSeats: PlayerIndex[] } | { ok: false; code: 'NOT_HOST' | 'BAD_PLAYER_COUNT' };
-
-/**
- * `lobby-and-sessions.md` §2 — short and speakable, not an account name and not a UUID. A small
- * fixed word list rather than a dictionary: this is read aloud across a table or a call, not typed
- * from memory, so a handful of unambiguous railroad words serve better than a large random one.
- */
-const CODE_WORDS = [
-  'RAIL', 'YARD', 'DEPOT', 'COAL', 'MAIL', 'CABOOSE', 'SIGNAL', 'FREIGHT',
-  'TRESTLE', 'HOPPER', 'TENDER', 'SIDING', 'GRADE', 'SPUR', 'WHISTLE', 'TROLLEY',
-];
-
-function randomCode(): string {
-  const word = CODE_WORDS[Math.floor(Math.random() * CODE_WORDS.length)]!;
-  const digits = Math.floor(Math.random() * 10_000)
-    .toString()
-    .padStart(4, '0');
-  return `${word}-${digits}`;
-}
-
-/** Collision-checked against whatever codes the caller already knows about — `http.ts` holds the
- * live registry, so the check lives there rather than this module owning a set of its own. */
-export function freshGameCode(taken: (code: string) => boolean): string {
-  let code = randomCode();
-  while (taken(code)) code = randomCode();
-  return code;
-}
-
-/** `lobby-and-sessions.md` §2 — solitaire is exactly 1, competitive/coop are 2-4. Not a rules
- * limit: the engine will build a Division for any seat count. This is the lobby judgment, sized to
- * what has actually been played and tested (`test/multiplayer.test.ts` exercises 2, 3 and 4). */
-export function playerCountAllowed(mode: GameConfig['mode'], count: number): boolean {
-  return mode === 'solitaire' ? count === 1 : count >= 2 && count <= 4;
-}
-
-/** The creating player is the host and takes seat 0 (`lobby-and-sessions.md` §2). */
-/**
- * THE TABLE SIZE IS FIXED WHEN THE GAME IS CREATED, and `seats.length` is it.
- *
- * The host says how many are playing, so the seats array is built at full length with the host in
- * chair 0 and the rest empty. Nothing ever grows or shrinks it, which is what makes a gap
- * impossible to express rather than merely illegal — and that matters more than it looks: seats
- * used to be appended as people joined, so a bot dropped into a later chair padded the array with
- * a hole that silently blocked Start. It also removes any need to compact the seats at
- * `Lobby.Start`, and compaction would have shifted the `player` index every `PlayerSession`
- * already carries (`joinLobby` stamps it at join time, and `/api/stream` and `/api/intent` route
- * by it) — quietly handing a player somebody else's railroad.
- *
- * Knowing the count this early has one more consequence, and it is a bug fix: the config's
- * `minCombinedRevenue` is derived from the player count, and the lobby previously had to guess it
- * as 4 before anyone had sat down.
- */
-export function createLobby(
-  config: GameConfig,
-  hostDisplayName: string,
-  gameCode: string,
-  players: number,
-  seed: number | null = null,
-): CreateResult {
-  const gameId = randomUUID();
-  const token = randomUUID();
-  const session: PlayerSession = { token, gameId, player: 0, displayName: hostDisplayName };
-  const seats: LobbySeat[] = Array.from({ length: players }, (_, i) =>
-    i === 0 ? { kind: 'human', token, displayName: hostDisplayName } : null,
-  );
-  const lobby: Lobby = {
-    gameId,
-    gameCode,
-    hostToken: token,
-    config,
-    seats,
-    joinOrder: [token],
-    createdAt: Date.now(),
-    seed,
-  };
-  return { lobby, session };
-}
-
-/** Joins the first empty seat, or extends the seat list if every seat so far is filled and the
- * mode's cap allows one more (`lobby-and-sessions.md` §2's 2-4 is enforced at `Lobby.Start`, not
- * here — a 5th join before anyone starts is refused outright since there is no seat it could ever
- * play in, but the running count is checked against `playerCountAllowed` at every join too, so a
- * lobby can never grow the seats array past what could legally start). */
-export function joinLobby(lobby: Lobby, displayName: string): JoinResult {
-  // The table was sized at creation, so joining takes an empty chair or none at all — there is no
-  // longer an "append another seat" path for a late arrival to grow the game through.
-  const seatIndex = lobby.seats.findIndex((s) => s === null);
-  if (seatIndex < 0) return { ok: false, code: 'LOBBY_FULL' };
-
-  /**
-   * TWO PLAYERS CANNOT SHARE A NAME (2026-08-23).
-   *
-   * The name is not decoration: it labels the district on the Division map, it is what the turn
-   * chart means by "waiting on Jesse", and `record()` puts it in front of every line that player
-   * causes. Two identical names make all three ambiguous, and there is no way to fix it once the
-   * game starts — the names are locked into the session at `Lobby.Start`. Refused rather than
-   * silently suffixed: a player should play under the name they chose, or be told to choose again.
-   */
-  const wanted = displayName.trim().toLowerCase();
-  const clash = lobby.seats.some((s) => s?.kind === 'human' && s.displayName.trim().toLowerCase() === wanted);
-  if (clash) return { ok: false, code: 'NAME_TAKEN' };
-
-  const token = randomUUID();
-  const session: PlayerSession = { token, gameId: lobby.gameId, player: seatIndex, displayName };
-  const seats = [...lobby.seats];
-  seats[seatIndex] = { kind: 'human', token, displayName };
-  return {
-    ok: true,
-    lobby: { ...lobby, seats, joinOrder: [...lobby.joinOrder, token] },
-    session,
-  };
-}
-
-/**
- * GIVING UP A SEAT — a player leaving, or the host clearing somebody out of a chair.
- *
- * There was no way out of a lobby at all before 2026-08-23: a mis-join or a player who wandered off
- * wedged the table, because Start needs every chair filled and `setBotSeat` refuses to touch an
- * occupied human seat. One function serves both, since they differ only in whose seat is named, and
- * `http.ts` is what checks that a caller naming somebody else's seat is the host.
- *
- * Host rights move exactly as they do on a dropped connection (`reassignHost`), and the caller is
- * told when the last human has gone so the lobby can be dropped rather than left orphaned.
- */
-export function leaveLobby(lobby: Lobby, token: string, seat?: PlayerIndex): LeaveResult {
-  const index =
-    seat === undefined ? lobby.seats.findIndex((s) => s?.kind === 'human' && s.token === token) : seat;
-  const occupant = index >= 0 ? (lobby.seats[index] ?? null) : null;
-  if (index < 0 || occupant?.kind !== 'human') return { lobby, empty: false };
-
-  const seats = [...lobby.seats];
-  seats[index] = null;
-  const departing = occupant.token;
-  const withoutThem: Lobby = {
-    ...lobby,
-    seats,
-    joinOrder: lobby.joinOrder.filter((t) => t !== departing),
-  };
-  const empty = !seats.some((s) => s?.kind === 'human');
-  return { lobby: reassignHost(withoutThem, departing), empty };
-}
-
-/** Host-only in effect (`http.ts` checks the caller's token against `hostToken` before calling
- * this) — marks an empty seat as bot-filled, or clears one back to empty. Never touches an occupied
- * human seat; the host removes a person by them leaving, not by overwriting their seat. */
-export function setBotSeat(lobby: Lobby, seat: PlayerIndex, filled: boolean): Lobby {
-  const seats = [...lobby.seats];
-  // No padding: a seat outside the table the host chose is not a seat, and inventing one is how
-  // the old array grew holes in it.
-  if (seat < 0 || seat >= seats.length) return lobby;
-  if (filled) {
-    if (seats[seat] !== null) return lobby;
-    seats[seat] = { kind: 'bot' };
-  } else {
-    if (seats[seat]?.kind !== 'bot') return lobby;
-    seats[seat] = null;
-  }
-  return { ...lobby, seats };
-}
-
-/**
- * The host's connection closed before `Lobby.Start`. `lobby-and-sessions.md` §2: rights pass to the
- * earliest-joined remaining player — remaining means still occupying a seat, not necessarily still
- * connected, since a momentary drop should not also cost the NEXT person the host chair. Returns
- * the lobby unchanged if the departing token was not the host, or if no other human seat exists.
- */
-export function reassignHost(lobby: Lobby, departingToken: string): Lobby {
-  if (lobby.hostToken !== departingToken) return lobby;
-  const stillSeated = new Set(
-    lobby.seats.flatMap((s) => (s?.kind === 'human' ? [s.token] : [])),
-  );
-  const next = lobby.joinOrder.find((t) => t !== departingToken && stillSeated.has(t));
-  return next ? { ...lobby, hostToken: next } : lobby;
-}
-
-/**
- * Locks the config, checks the player count, and hands back exactly what `session.ts`'s
- * `createSession` needs — this function does not call it, so `lobby.ts` never depends on
- * `session.ts` (the dependency runs the other way: `http.ts` calls both).
- */
-export function startLobby(lobby: Lobby, callerToken: string): StartResult {
-  if (callerToken !== lobby.hostToken) return { ok: false, code: 'NOT_HOST' };
-  // Every chair at the table must be taken. The size itself was validated at creation and cannot
-  // have moved since, so this is only ever waiting on the last empty seat to fill.
-  if (lobby.seats.some((s) => s === null) || !playerCountAllowed(lobby.config.mode, lobby.seats.length)) {
-    return { ok: false, code: 'BAD_PLAYER_COUNT' };
-  }
-  // Seat index IS player index — no compaction, because there is nothing to compact past.
-  const taken = lobby.seats as Exclude<LobbySeat, null>[];
-  // Bots are numbered rather than all being called "Bot": two of them at one table are two
-  // different railroads, and a map labelling both the same cannot say which is which.
-  let botNumber = 0;
-  const playerNames = taken.map((s) => (s.kind === 'human' ? s.displayName : `Bot ${++botNumber}`));
-  const botSeats = taken.flatMap((s, i) => (s.kind === 'bot' ? [i as PlayerIndex] : []));
-  return { ok: true, playerNames, botSeats };
-}

src/server/persistence.ts

@@ -1,183 +0,0 @@
-/**
- * Persistence — Phase 3 of `docs/architecture/multiplayer.md` (§12 steps 14-15), extended for
- * Phase 4 (§12 steps 17-20) to more than one game (`lobby-and-sessions.md` §6 specifies both
- * shapes and the reasoning behind them).
- *
- * ONE DIRECTORY PER GAME (`games/<gameId>/`), plus one top-level `index.json` naming every game so
- * `index.ts` can find and resume them all on boot without scanning the filesystem. Every write is
- * still a full-file atomic rewrite (write to `.tmp`, `rename` over the real path) rather than true
- * on-disk appending — §6 says the storage mechanism is genuinely open as long as the LOGICAL history
- * is never rewritten or reordered, which a full rewrite of an always-growing array satisfies, and at
- * the measured scale (~350 intents, a few hundred bytes per game) there is nothing to optimize yet.
- */
-
-import { mkdir, readFile, rename, rm, unlink, writeFile } from 'node:fs/promises';
-import { join } from 'node:path';
-import type { SavedGame, TurnTiming } from './session.ts';
-import type { Lobby, PlayerSession } from './lobby.ts';
-
-const GAME_FILE = 'game.json';
-const TIMINGS_FILE = 'turn-timings.json';
-const LOBBY_FILE = 'lobby.json';
-const SESSIONS_FILE = 'sessions.json';
-const INDEX_FILE = 'index.json';
-
-type PersistedGame = SavedGame & { engineVersion: string };
-
-async function atomicWrite(path: string, text: string): Promise<void> {
-  const tmp = `${path}.tmp`;
-  await writeFile(tmp, text);
-  await rename(tmp, path);
-}
-
-export async function writeGame(dataDir: string, saved: SavedGame, engineVersion: string): Promise<void> {
-  await mkdir(dataDir, { recursive: true });
-  const payload: PersistedGame = { engineVersion, ...saved };
-  await atomicWrite(join(dataDir, GAME_FILE), JSON.stringify(payload, null, 1));
-}
-
-export type LoadResult =
-  | { found: false }
-  /** The version that wrote the file, for diagnostics — it is no longer what decides. */
-  | { found: true; saved: SavedGame; storedVersion: string };
-
-/**
- * READS THE SAVE. DOES NOT JUDGE IT.
- *
- * This used to refuse any save whose `engineVersion` was not an exact match for the running one,
- * on the reasoning that a move legal under old rules may not be legal under new ones (D7). The
- * reasoning is sound and the test was not: the stamp is the PACKAGE version, which moves for
- * reasons that have nothing to do with the rules, so four consecutive releases destroyed every
- * game in progress — one of them a release that changed only how the board is drawn.
- *
- * Whether a save still replays is a question with an exact answer, so it is now asked directly:
- * `tryResumeSession` replays the intents and reports the first one the engine refuses, if any.
- * The version is kept and reported because it is useful in a failure, but it decides nothing.
- */
-export async function loadGame(dataDir: string): Promise<LoadResult> {
-  let text: string;
-  try {
-    text = await readFile(join(dataDir, GAME_FILE), 'utf8');
-  } catch {
-    return { found: false };
-  }
-  const payload = JSON.parse(text) as PersistedGame;
-  const { engineVersion, ...saved } = payload;
-  return { found: true, saved, storedVersion: engineVersion };
-}
-
-/** Appended once per closed turn span (`GameSession.intent`'s `timing` result) — read-modify-write at
- * this scale rather than real appending, same reasoning as `writeGame`. */
-export async function appendTiming(dataDir: string, timing: TurnTiming): Promise<void> {
-  await mkdir(dataDir, { recursive: true });
-  const path = join(dataDir, TIMINGS_FILE);
-  let existing: TurnTiming[];
-  try {
-    existing = JSON.parse(await readFile(path, 'utf8')) as TurnTiming[];
-  } catch {
-    existing = [];
-  }
-  existing.push(timing);
-  await atomicWrite(path, JSON.stringify(existing, null, 1));
-}
-
-// ---------------------------------------------------------------------------
-// Phase 4 — more than one game
-// ---------------------------------------------------------------------------
-
-export type GameIndexEntry = { gameId: string; gameCode: string; status: 'lobby' | 'active' | 'finished' };
-
-/** Where one game's own files live. Every function below takes a `gameId` and joins it under here
- * itself; `writeGame`/`loadGame`/`appendTiming` above do not, and take a directory directly, so a
- * caller wanting one specific game's `game.json` passes `gameDir(dataDir, gameId)` to those. */
-export function gameDir(dataDir: string, gameId: string): string {
-  return join(dataDir, 'games', gameId);
-}
-
-export async function readIndex(dataDir: string): Promise<GameIndexEntry[]> {
-  try {
-    return JSON.parse(await readFile(join(dataDir, INDEX_FILE), 'utf8')) as GameIndexEntry[];
-  } catch {
-    return [];
-  }
-}
-
-async function writeIndex(dataDir: string, entries: GameIndexEntry[]): Promise<void> {
-  await mkdir(dataDir, { recursive: true });
-  await atomicWrite(join(dataDir, INDEX_FILE), JSON.stringify(entries, null, 1));
-}
-
-/**
- * Adds or updates exactly one game's row, by `gameId` — every caller that changes one game's status
- * (created, started, finished) wants precisely this, not "replace the whole index", which would
- * silently drop every other game's row the moment two writes happened close together.
- */
-export async function upsertIndexEntry(dataDir: string, entry: GameIndexEntry): Promise<void> {
-  const entries = await readIndex(dataDir);
-  const i = entries.findIndex((e) => e.gameId === entry.gameId);
-  if (i >= 0) entries[i] = entry;
-  else entries.push(entry);
-  await writeIndex(dataDir, entries);
-}
-
-/**
- * Removes a game from the index. Paired with `deleteGame` — the directory holds the game, the
- * index says the game exists, and a delete that did one without the other would either resurrect
- * it on the next boot or leave `index.json` pointing at nothing.
- */
-export async function removeIndexEntry(dataDir: string, gameId: string): Promise<void> {
-  const entries = await readIndex(dataDir);
-  await writeIndex(
-    dataDir,
-    entries.filter((e) => e.gameId !== gameId),
-  );
-}
-
-/** Deletes a game's whole directory — its save, its turn timings, its sessions, its lobby file. */
-export async function deleteGame(dataDir: string, gameId: string): Promise<void> {
-  await rm(gameDir(dataDir, gameId), { recursive: true, force: true });
-}
-
-export async function writeLobby(dataDir: string, lobby: Lobby): Promise<void> {
-  const dir = gameDir(dataDir, lobby.gameId);
-  await mkdir(dir, { recursive: true });
-  await atomicWrite(join(dir, LOBBY_FILE), JSON.stringify(lobby, null, 1));
-}
-
-export async function readLobby(dataDir: string, gameId: string): Promise<Lobby | null> {
-  try {
-    return JSON.parse(await readFile(join(gameDir(dataDir, gameId), LOBBY_FILE), 'utf8')) as Lobby;
-  } catch {
-    return null;
-  }
-}
-
-/**
- * Removed once a game starts — a `Lobby` and a running `SavedGame` are mutually exclusive for one
- * `gameId`, and leaving the file behind would let a restart resurrect a lobby for a game already
- * under way. Missing already is not an error; `Lobby.Start` calls this exactly once, in the same
- * request that writes `game.json`.
- */
-export async function deleteLobby(dataDir: string, gameId: string): Promise<void> {
-  try {
-    await unlink(join(gameDir(dataDir, gameId), LOBBY_FILE));
-  } catch {
-    // Already gone — nothing to do.
-  }
-}
-
-/** Session tokens for one game — `lobby-and-sessions.md` §6: persisted so a token still works after
- * a server restart, the same reason `game.json` itself is persisted. */
-export async function writeSessions(dataDir: string, gameId: string, sessions: PlayerSession[]): Promise<void> {
-  const dir = gameDir(dataDir, gameId);
-  await mkdir(dir, { recursive: true });
-  await atomicWrite(join(dir, SESSIONS_FILE), JSON.stringify(sessions, null, 1));
-}
-
-export async function readSessions(dataDir: string, gameId: string): Promise<PlayerSession[]> {
-  try {
-    return JSON.parse(await readFile(join(gameDir(dataDir, gameId), SESSIONS_FILE), 'utf8')) as PlayerSession[];
-  } catch {
-    return [];
-  }
-}

src/server/session.ts

@@ -1,548 +0,0 @@
-/**
- * The game session host — Phases 2 and 3 of `docs/architecture/multiplayer.md` (§8, §12 steps 9,
- * 14-16).
- *
- * Pure logic, no sockets, no filesystem — `src/server/http.ts` is the thin wiring that calls into
- * this, and `src/server/persistence.ts` is what actually reads/writes disk. One `GameSession` per
- * in-memory game (Phase 2 is one game per process; Phase 4 generalizes to many).
- *
- * REUSES `src/web/game.ts`'s `Game`/`submit`/`drain`/`currentActor`/`actionMenu` wholesale — all pure
- * logic already, with no DOM dependency, exactly as `LocalSession` uses them client-side. Building a
- * second copy of "apply an intent, narrate it, compute the Menu" here would drift from what solitaire
- * already does and is tested against.
- *
- * ONE THING `game.ts`'s `submit` DOES NOT DO: verify who is calling it. `submit(game, intent)` reads
- * `currentActor(game)` itself and applies the intent AS that player, regardless of who asked — safe
- * for `LocalSession` (there is only ever one possible caller: the one browser). A server has more than
- * one seat submitting, so THIS file is where "is `seat` actually allowed to act right now?" has to be
- * checked, before `submit` is ever called — see `intent()` below.
- */
-
-import { check } from '../engine/apply.ts';
-import { legalActions } from '../engine/legal.ts';
-import type { Intent } from '../engine/intents.ts';
-import type { GameConfig, PlayerIndex } from '../engine/state.ts';
-import { actionMenu, currentActor, fromMultiplayerSave, isOutOfTurn, newMultiplayerGame, submit } from '../web/game.ts';
-import type { Game, Menu } from '../web/game.ts';
-import { deltaFrame } from '../sim/frame-delta.ts';
-import type { FrameDelta } from '../sim/frame-delta.ts';
-import { publicSnapshot, snapshot, seatLabel } from '../sim/view.ts';
-import type { Frame, PublicFrame } from '../sim/view.ts';
-import { takeSteps } from '../sim/display-step.ts';
-import type { DisplayStep } from '../sim/display-step.ts';
-import { developerBot } from '../sim/bot.ts';
-
-export type Push = {
-  /**
-   * Absent on a presence-only push (below) — there is no board delta to send when nothing about the
-   * GAME changed, and computing one just to say "unchanged" would mean tracking a last-sent frame
-   * for a seat that may not even be in this game's connection table (a lobby-stage notice has none).
-   */
-  frame?: FrameDelta;
-  /** Non-null only for the seat that may currently act — never guess otherwise (`game.ts`'s `actionMenu` guards this too, but the host must still only compute/send it for the actor). */
-  menu: Menu | null;
-  /** Narration since the LAST push to this specific seat, not the whole game's log. */
-  lines: { text: string; tone: string }[];
-  /**
-   * Connection news about OTHER seats — never this push's own recipient. `lobby-and-sessions.md`
-   * §5: a disconnect is server-layer news about a connection, not a `GameEvent`, so it must not go
-   * through the engine or the shared narration log (which must stay replayable from a seed). Built
-   * and broadcast entirely by `http.ts`, which already owns the connection table; `session.ts` never
-   * sets this field itself — every `Push` `session.ts` builds carries a real `frame` and no
-   * `presence`, and `http.ts`'s presence notices carry no `frame` and no `menu`.
-   *
-   * A LIST, since 2026-08-23: a connecting client is told about every other seat at once. It used to
-   * learn of a seat only when that seat disconnected AFTER it connected, so a player arriving at a
-   * table where two people had not shown up yet was told nothing at all. `seen` distinguishes "was
-   * here and dropped" from "has never opened the game".
-   */
-  presence?: { seat: PlayerIndex; connected: boolean; seen: boolean }[];
-  /**
-   * THE FOUR TRANSIENT SIGNALS (2026-08-23) — what solitaire has always drawn and multiplayer never
-   * did: sound cues, the timetable slot a D12 just filled, a one-line announcement, and the card
-   * that just came into this seat's hand.
-   *
-   * The first three are SHARED — a collision anywhere on the Division, the Stage bell, a train
-   * running off the end pays everyone — so they are identical in every seat's push and drained once
-   * per broadcast. `justDrawn` is not: it goes ONLY to the seat that drew it (`game.justDrawn` is
-   * one field for the whole game and does not say whose). `test/redaction.test.ts` is the guard.
-   */
-  cues?: string[];
-  scheduled?: number | null;
-  announcement?: string | null;
-  justDrawn?: string | null;
-  /**
-   * ORDERED PRESENTATION STEPS — v0.8.0, TODO #13.
-   *
-   * A field on `Push` rather than a second SSE event type, following `presence`'s precedent and for
-   * its stated reason (`http.ts`): one message shape for the client to parse. `http.ts` therefore
-   * needs no change at all — `broadcastGame` forwards whatever this file builds.
-   *
-   * IDENTICAL IN EVERY SEAT'S PUSH, because a step carries the PUBLIC board and nothing else. A
-   * player's own hand, menu and objective are not animated: they arrive on the same push, already
-   * coalesced, exactly as they always have. That is what keeps the redaction surface at zero new
-   * area — `test/redaction.test.ts` guards the projection these are built from.
-   */
-  steps?: DisplayStep[];
-  /**
-   * The public board to start a step queue from — sent on a CONNECT, never on an update.
-   *
-   * Steps carry deltas against one chain shared by the whole table, so a client that has just
-   * arrived (or come back) has nothing to merge the next delta onto and `applyPublicDelta` would
-   * rightly throw. This is that baseline: the exact frame the chain has reached, so the next step
-   * lands on it. A reconnecting client resets rather than replaying what it missed — the history
-   * panel is what carries the words, and it is already sent whole on connect (#97).
-   */
-  publicReset?: PublicFrame;
-};
-
-/**
- * `lobby-and-sessions.md` §5 — "wall-clock at the start of a turn, wall-clock at the intent that
- * ends it, per player per phase." Computed entirely here, never touching the engine (which has no
- * clock and must stay deterministic) and never stored inside `history` (a replay must reproduce a
- * game from decisions alone).
- */
-export type TurnTiming = {
-  player: PlayerIndex;
-  phase: string;
-  day: number;
-  stage: number;
-  startedAt: number;
-  endedAt: number;
-};
-
-/** Everything `persistence.ts` needs to write `game.json` and rebuild a session from it later. */
-export type SavedGame = {
-  seed: number;
-  config: GameConfig;
-  playerNames: string[];
-  history: Intent[];
-  status: 'active' | 'finished';
-  createdAt: number;
-  /**
-   * Seats `developerBot` plays for, filled at `Lobby.Start` (D8 — bots fill EMPTY seats at lobby
-   * time only, never mid-game). Persisted so a bot seat is still a bot after a server restart —
-   * `resumeSession` has no other way to know, and re-deriving it from `playerNames` would mean
-   * guessing from a display name rather than reading a fact.
-   */
-  botSeats: PlayerIndex[];
-  /**
-   * Wall-clock of the last accepted intent, so "has this game stalled?" survives a restart.
-   *
-   * Optional because it postdates the format, and defaulted to `createdAt` when absent — a game
-   * whose last move is unrecorded reads as untouched since it began, which is the honest answer
-   * rather than a fabricated one. Kept OUT of `history`, like the turn timings and for the same
-   * reason: a replay must reproduce a game from decisions alone, and wall-clock is not a decision.
-   */
-  lastMoveAt?: number;
-};
-
-/** What an administrator needs to see about a game without replaying it themselves. */
-export type GameSummary = {
-  playerCount: number;
-  playerNames: string[];
-  botSeats: PlayerIndex[];
-  status: 'active' | 'finished';
-  createdAt: number;
-  lastMoveAt: number;
-  day: number;
-  stage: number;
-  phase: string;
-  /**
-   * Whose move it is, or `null` — which is not an error state: the Mainline Phase runs itself, and
-   * a finished game waits on nobody.
-   */
-  waitingOn: { seat: PlayerIndex; name: string } | null;
-};
-
-export type IntentResult =
-  | { accepted: true; pushes: Map<PlayerIndex, Push>; timing: TurnTiming | null }
-  | { accepted: false; code: string };
-
-export type GameSession = {
-  readonly playerCount: number;
-  isBot(seat: PlayerIndex): boolean;
-  /** A new SSE connection (or a reconnect) for `seat` — always a full Frame, never a delta. */
-  connect(seat: PlayerIndex): Push;
-  intent(seat: PlayerIndex, seq: number, i: Intent): IntentResult;
-  /** Everything needed to persist this game and, later, rebuild it via `resumeSession`. */
-  exportSave(): SavedGame;
-  /**
-   * A cheap description of where this game has got to. Deliberately does not copy `history` the
-   * way `exportSave` must — the health check polls this on a timer, and an administrator listing
-   * games wants the state of each, not a copy of every intent in all of them.
-   */
-  summary(): GameSummary;
-};
-
-type OpenSpan = { player: PlayerIndex; phase: string; day: number; stage: number; startedAt: number };
-
-function buildSession(
-  game: Game,
-  playerNames: string[],
-  createdAt: number,
-  botSeats: Set<PlayerIndex>,
-  lastMoveAtInit: number,
-): GameSession {
-  let lastMoveAt = lastMoveAtInit;
-  /** Who drew the card `game.justDrawn` names. The engine records WHICH card came into hand but not
-   * whose hand it went into, and that is the whole difference between a badge and a leak. */
-  let lastDraw: { seat: PlayerIndex; cardId: string } | null = null;
-  const lastSeq = new Map<PlayerIndex, number>();
-  const lastFrame = new Map<PlayerIndex, Frame>();
-  const sentLines = new Map<PlayerIndex, number>();
-
-  const openSpanFor = (now: number): OpenSpan | null => {
-    const actor = currentActor(game);
-    if (actor === null) return null;
-    return { player: actor, phase: game.state.clock.phase, day: game.state.clock.day, stage: game.state.clock.stage, startedAt: now };
-  };
-  let open: OpenSpan | null = openSpanFor(Date.now());
-
-  /**
-   * A seat's full Frame, with `lines` deliberately EMPTY (#97).
-   *
-   * Narration reaches a client by ONE path — `Push.lines` — because `RemoteSession`
-   * (`web/session.ts`) accumulates from that field alone and its `lines()` returns the accumulator.
-   * Passing `game.log` here serialised the entire log into every frame for every seat, where it grew
-   * all game and was thrown away on arrival, while `linesSince` correctly sent the same text beside
-   * it. The duplicate was not merely waste: it masked the reconnect bug `connect` fixes below.
-   */
-  function frameFor(seat: PlayerIndex): Frame {
-    return snapshot(game.state, [], null, null, null, false, seat);
-  }
-
-  function linesSince(seat: PlayerIndex): { text: string; tone: string }[] {
-    const already = sentLines.get(seat) ?? 0;
-    sentLines.set(seat, game.log.length);
-    return game.log.slice(already);
-  }
-
-  function menuFor(seat: PlayerIndex): Menu | null {
-    return seat === currentActor(game) ? actionMenu(game, seat) : null;
-  }
-
-  /** What the last batch of events earned, drained from the game exactly once and then handed to
-   * every seat. `null` on a (re)connect: a fresh connection is drawing a STATE, and replaying the
-   * sounds of everything it missed would be a burst of noise about the past. */
-  type Moment = { cues: string[]; scheduled: number | null; announcement: string | null };
-
-  function takeMoment(): Moment {
-    const cues = game.cues.splice(0, game.cues.length);
-    const scheduled = game.scheduled;
-    game.scheduled = null;
-    const announcement = game.announced;
-    game.announced = null;
-    return { cues, scheduled, announcement };
-  }
-
-  function pushFor(seat: PlayerIndex, moment: Moment | null, steps: DisplayStep[] = []): Push {
-    const frame = frameFor(seat);
-    const delta = deltaFrame(lastFrame.get(seat) ?? null, frame);
-    lastFrame.set(seat, frame);
-    const push: Push = { frame: delta, menu: menuFor(seat), lines: linesSince(seat) };
-    if (steps.length > 0) push.steps = steps;
-    if (moment) {
-      if (moment.cues.length > 0) push.cues = moment.cues;
-      if (moment.scheduled !== null) push.scheduled = moment.scheduled;
-      if (moment.announcement !== null) push.announcement = moment.announcement;
-    }
-    // The drawer's own card, and nobody else's — on a reconnect too, so the badge survives a refresh.
-    if (lastDraw !== null && lastDraw.seat === seat) push.justDrawn = lastDraw.cardId;
-    return push;
-  }
-
-  function pushesForAll(): Map<PlayerIndex, Push> {
-    const moment = takeMoment();
-    // Drained ONCE for the whole broadcast, not per seat: the steps are public and identical, and
-    // `takeSteps` empties the collector, so draining inside the loop would give them to seat 0 and
-    // an empty list to everybody else.
-    const steps = takeSteps(game.display);
-    const out = new Map<PlayerIndex, Push>();
-    for (let seat = 0; seat < playerNames.length; seat++) {
-      out.set(seat as PlayerIndex, pushFor(seat as PlayerIndex, moment, steps));
-    }
-    return out;
-  }
-
-  /**
-   * Closes the open span if the acting player, phase, Day or Stage moved since it opened, and opens
-   * the next one (or none, in the automatic Mainline Phase). Returns the just-closed span, if any,
-   * for the caller to persist — a "turn" here is exactly the contiguous stretch where none of those
-   * four things changed, which can span several intents (draw, then play, then end) as one span.
-   */
-  function settleTiming(): TurnTiming | null {
-    const now = Date.now();
-    const next = openSpanFor(now);
-    const same =
-      open !== null &&
-      next !== null &&
-      open.player === next.player &&
-      open.phase === next.phase &&
-      open.day === next.day &&
-      open.stage === next.stage;
-    if (same) return null;
-    const closed: TurnTiming | null = open === null ? null : { ...open, endedAt: now };
-    open = next;
-    return closed;
-  }
-
-  /**
-   * PLAY EVERY BOT SEAT FORWARD until a human is due, or the game ends.
-   *
-   * `developerBot` (D8, `lobby-and-sessions.md` §2) fills EMPTY seats at lobby time only — it never
-   * takes over for a disconnected human, so this loop only ever touches seats `botSeats` named at
-   * `Lobby.Start`. Uses `submit` directly rather than the public `intent()` path: a bot is not a
-   * client with a `seq` to dedupe against, and its choice is by construction always legal (`check`
-   * would only ever confirm what `legalActions` already promised).
-   *
-   * Intermediate bot-turn spans are swept through `settleTiming()` but their result is discarded —
-   * `lobby-and-sessions.md` §5's turn clock exists to learn how long HUMANS take, and a bot decides
-   * in zero wall-clock time by definition. Called once at construction (a resume could land exactly
-   * on a bot's turn) and once after every accepted human intent.
-   */
-/**
-   * §3.3, EXTENDED PLAY (Gitea#11) — the bots' half of a unanimous vote.
-   *
-   * "Bots will not disagree with the human. Humans get to vote first. If all humans vote yes, then
-   * bots vote yes too. If a human votes no, it's not unanimous, it ends right then. If only bots are
-   * playing, they never vote to extend" (Jesse, 2026-08-28).
-   *
-   * Which makes a bot's vote a formality rather than a policy decision, performed once the humans
-   * have already settled it, so that the unanimity the engine checks is a real unanimity rather than
-   * a special case carved into the rules for absent players.
-   *
-   * THE ALL-BOT TABLE IS THE CASE TO GET RIGHT, and getting it wrong hung the game. `driveBots`
-   * cannot reach the vote — it loops on `currentActor`, which is null the moment the game stops —
-   * so if this returns early with no humans to follow, nobody votes at all and a bot-only game sits
-   * on the question for ever. It happened: an all-bot session never reached `finished`. With nobody
-   * to follow, the bots' own answer stands, and it is no.
-   */
-  function driveBotVotes(): void {
-    if (game.state.status !== 'awaitingExtension') return;
-    const humans = [...Array(playerNames.length).keys()].filter((p) => !botSeats.has(p));
-    // A human who has voted `false` has already ended the game, so reaching here with humans still
-    // outstanding means the table is genuinely waiting on a person. Bots wait with it.
-    if (humans.length > 0 && !humans.every((p) => game.state.extensionVotes[p] === true)) return;
-    const agree = humans.length > 0;
-    for (const seat of botSeats) {
-      if (game.state.extensionVotes[seat] === null) {
-        submit(game, { type: 'game.extend', player: seat, agree }, seat);
-      }
-    }
-  }
-
-  /**
-   * Bots play, bots vote, and an agreed extension puts them back to playing — so the two drivers
-   * alternate rather than running once each. Bounded because every pass must consume something: a
-   * turn, or a vote that cannot be cast twice.
-   */
-  function driveBotTurns(): void {
-    for (let pass = 0; pass < 1_000; pass++) {
-      const before = game.history.length;
-      driveBots();
-      driveBotVotes();
-      if (game.history.length === before) return;
-    }
-    throw new Error('driveBotTurns: probable infinite loop');
-  }
-
-  function driveBots(): void {
-    let guard = 0;
-    for (;;) {
-      const actor = currentActor(game);
-      if (actor === null || !botSeats.has(actor)) return;
-      if (++guard > 10_000) throw new Error(`driveBots: probable infinite loop at seat ${actor}`);
-      const options = legalActions(game.state, actor);
-      if (options.length === 0) return;
-      const choice = developerBot.choose(game.state, actor, options);
-      const drawnBefore = game.justDrawn;
-      const ok = submit(game, choice);
-      if (game.justDrawn !== drawnBefore && game.justDrawn !== null) {
-        lastDraw = { seat: actor, cardId: game.justDrawn };
-      }
-      /* c8 ignore next -- `options` came from `legalActions`, so `choice` is always legal. */
-      if (!ok) throw new Error(`driveBots: developerBot chose an illegal action for seat ${actor}`);
-      settleTiming();
-    }
-  }
-  driveBotTurns();
-  // Whatever the opening bot turns earned belongs to a game nobody was connected to yet — dropped
-  // here rather than fired at the first client to arrive. (It also stops `game.cues` growing without
-  // bound on a server, which nothing was draining before this.)
-  takeMoment();
-  /**
-   * THE PRESENTATION STEPS THOSE TURNS PRODUCED GO WITH THEM (v0.8.0).
-   *
-   * Left in the collector they would be delivered on the FIRST broadcast after somebody connects —
-   * but that client's `publicReset` is the board as it stands AFTER these very moves, so replaying
-   * them onto it would draw positions the game had already left. The plan says as much: opening bot
-   * moves need no replay, and a later display simply receives the final reset.
-   *
-   * This is the only moment the collector holds anything outside an intent. `pushesForAll()` drains
-   * it synchronously at the end of every `intent()`, so between moves it is always empty — which is
-   * what makes dropping here safe rather than a race with a seat that has not been sent them yet.
-   */
-  takeSteps(game.display);
-
-  return {
-    playerCount: playerNames.length,
-    isBot: (seat) => botSeats.has(seat),
-
-    connect(seat) {
-      // A (re)connect always starts from a clean slate — no cache to trust across a lost connection
-      // (or a server restart, Phase 3) — so the honest thing is a full Frame, not a delta.
-      lastFrame.delete(seat);
-      // ...and the NARRATION watermark with it (#97). The browser this answers has just reloaded
-      // from an empty accumulator, so a seat told "nothing new since your last push" came back to a
-      // blank history panel mid-game, with the server holding the whole log. `Push.lines` on a
-      // connect IS the history, which is what lets the Frame stop carrying a second copy.
-      sentLines.delete(seat);
-      const push = pushFor(seat, null);
-      /**
-       * The baseline for this client's step queue (v0.8.0). `game.display.last` is the exact frame
-       * the shared delta chain has reached, so the next step merges onto it; before any step has
-       * been collected there is no chain yet and a fresh projection is the same thing.
-       */
-      push.publicReset = game.display.last ?? publicSnapshot(game.state);
-      return push;
-    },
-
-    intent(seat, seq, i) {
-      // Idempotent resend (protocol.md §5): a repeat of an ALREADY-APPLIED seq is a no-op success,
-      // with no pushes to re-broadcast. A repeat after a REJECTION is not remembered here — it was
-      // never applied, so it is worth trying again (see the `lastSeq.set` below: only on success).
-      if (lastSeq.get(seat) === seq) return { accepted: true, pushes: new Map(), timing: null };
-
-      /**
-       * §3.3, EXTENDED PLAY (Gitea#11) — the vote is the one intent with no actor to be.
-       *
-       * `currentActor` is null once the timetable has run out, so this guard would refuse every
-       * vote with NOT_YOUR_TURN. Every seat may vote, and `check` is still the authority on whether
-       * this particular seat may vote right now (it has voted already; the game is not waiting on a
-       * vote at all), so skipping the turn test here gives nothing away.
-       */
-      if (!isOutOfTurn(i) && seat !== currentActor(game)) {
-        return { accepted: false, code: 'NOT_YOUR_TURN' };
-      }
-
-      // Checked directly, rather than via `submit`'s boolean, for two reasons: `submit` writes a
-      // "that is not allowed" line into the SHARED `game.log` on rejection, which would otherwise
-      // broadcast one seat's illegal attempt to the whole table on their next push (rejection
-      // feedback is private, to the submitter only); and calling `check` first means an intent
-      // already known to be illegal never touches the engine at all.
-      const code = check(game.state, seat, i);
-      if (code) return { accepted: false, code };
-
-      const drawnBefore = game.justDrawn;
-      const applied = submit(game, i, isOutOfTurn(i) ? seat : null);
-      if (game.justDrawn !== drawnBefore && game.justDrawn !== null) {
-        lastDraw = { seat, cardId: game.justDrawn };
-      }
-      /* c8 ignore next -- `check` above already proved this intent is legal; `submit` cannot then refuse it. */
-      if (!applied) return { accepted: false, code: 'REJECTED' };
-
-      lastSeq.set(seat, seq);
-      lastMoveAt = Date.now();
-      const timing = settleTiming();
-      // Any bot due to act now plays out entirely before this push goes back — the delta mechanism
-      // diffs against whatever was last sent, so it captures the bots' moves along with the human's
-      // in one push regardless of how many turns that took. Votes included, since Gitea#11: a human
-      // agreeing to another Day is exactly the move the bots are waiting on to agree themselves.
-      driveBotTurns();
-      return { accepted: true, pushes: pushesForAll(), timing };
-    },
-
-    exportSave() {
-      return {
-        seed: game.seed,
-        config: game.state.config,
-        playerNames: [...playerNames],
-        history: [...game.history],
-        // `awaitingExtension` is a game waiting on its table, not a game that is over — so it maps
-        // to 'active' and `server/index.ts` resumes it on a restart like any other (Gitea#11).
-        status: game.state.status === 'finished' ? 'finished' : 'active',
-        createdAt,
-        botSeats: [...botSeats],
-        lastMoveAt,
-      };
-    },
-
-    summary() {
-      const actor = currentActor(game);
-      return {
-        playerCount: playerNames.length,
-        playerNames: [...playerNames],
-        botSeats: [...botSeats],
-        // `awaitingExtension` is a game waiting on its table, not a game that is over — so it maps
-        // to 'active' and `server/index.ts` resumes it on a restart like any other (Gitea#11).
-        status: game.state.status === 'finished' ? 'finished' : 'active',
-        createdAt,
-        lastMoveAt,
-        day: game.state.clock.day,
-        stage: game.state.clock.stage,
-        phase: game.state.clock.phase,
-        waitingOn: actor === null ? null : { seat: actor, name: playerNames[actor] ?? `Seat ${seatLabel(actor)}` },
-      };
-    },
-  };
-}
-
-export function createSession(
-  seed: number,
-  config: GameConfig,
-  playerNames: string[],
-  botSeats: PlayerIndex[] = [],
-): GameSession {
-  const now = Date.now();
-  return buildSession(newMultiplayerGame(seed, config, playerNames), playerNames, now, new Set(botSeats), now);
-}
-
-/**
- * Phase 3 — rebuild a session from a persisted `SavedGame` (`persistence.ts`). The engine-version
- * check happens before this is ever called; by the time `saved.history` reaches here it is already
- * known to have been recorded under the currently-running rules.
- */
-/**
- * A resume that could not complete, and exactly where it gave up. `index.ts` turns this into the
- * refusal it logs, so the operator is told which move the current rules will not accept rather
- * than only that some version string differs.
- */
-export type ResumeFailure = { stoppedAt: number; of: number; intent: string; code: string };
-
-export function tryResumeSession(saved: SavedGame): { ok: true; session: GameSession } | { ok: false; failure: ResumeFailure } {
-  const { game, stopped } = fromMultiplayerSave(saved.seed, saved.config, saved.playerNames, saved.history);
-  if (stopped) {
-    return {
-      ok: false,
-      failure: { stoppedAt: stopped.index, of: saved.history.length, intent: stopped.intent.type, code: stopped.code },
-    };
-  }
-  return { ok: true, session: build(game, saved) };
-}
-
-/**
- * Throws on a save the current rules will not replay. Kept for callers that have already
- * established the save is good — the server boots through `tryResumeSession`, which answers
- * instead of throwing.
- */
-export function resumeSession(saved: SavedGame): GameSession {
-  const r = tryResumeSession(saved);
-  if (!r.ok) {
-    throw new Error(
-      `save does not replay under the current rules: intent ${r.failure.stoppedAt + 1} of ` +
-        `${r.failure.of} (${r.failure.intent}) was rejected with ${r.failure.code}`,
-    );
-  }
-  return r.session;
-}
-
-function build(game: Game, saved: SavedGame): GameSession {
-  return buildSession(
-    game,
-    saved.playerNames,
-    saved.createdAt,
-    new Set(saved.botSeats),
-    saved.lastMoveAt ?? saved.createdAt,
-  );
-}

src/sim/board-svg.ts

@@ -28,29 +28,7 @@ export type BoardTrain = { label: string; consist: string[] };
  * The Division as a dispatcher would see it: one continuous line per running track, sections
  * separated by thin seams, capacity legible because the lines can be counted.
  */
-/**
- * Who is at the table, so an Office can be labelled with its owner rather than only its tier.
- *
- * Passed in rather than read off the nodes because a `DivisionView` knows its seat and nothing
- * about people — the roster lives on the `Frame`, keyed by player, and `seat` is what joins them.
- * Optional so the standalone replay (`replay.ts`, which serialises this function by `toString()`)
- * keeps working unchanged.
- */
-export type DivisionRoster = {
-  players: { index: number; seat: number; name: string }[];
-  /** The player whose move it is, or null in an automatic phase. A PLAYER index, not a seat. */
-  actor: number | null;
-  /** The player this map is being drawn for. */
-  viewer: number;
-  /**
-   * Division nodes to flash — a Mainline card that has just become a different card (Realignment).
-   * Playtest, 2026-09-15: the log said a card had been converted and the map said nothing, so the one
-   * play that changes the Division itself was invisible on the map of it.
-   */
-  flash?: readonly number[];
-};
-
-export function divisionSvg(nodes: DivisionView[], roster?: DivisionRoster | null): string {
+export function divisionSvg(nodes: DivisionView[]): string {
   /**
    * THE WHOLE DIVISION, west to east, as one continuous route.
    *
@@ -61,41 +39,17 @@ export function divisionSvg(nodes: DivisionView[], roster?: DivisionRoster | nul
    *
    *   West DP · Mainline · [Limits … Office … Limits] · Mainline · [ … ] · Mainline · East DP
    *
-   * ONE ROW AT EVERY SEAT COUNT (Gitea#18). It used to be laid out the way players sit — two rows
-   * facing, a horseshoe of three, a square of four — and the reasoning for dropping that is at the
-   * layout itself below. The Division is a LINE and not a loop — trains enter at one Division Point
-   * and leave at the other — so the row is deliberately left open, with the two ends drawn as
-   * buffer stops facing outward. Closing it into a ring would promise a connection the rules do
-   * not have.
+   * SEATING. Players sit around a table, so the route is laid out the way they do: one row alone,
+   * two rows facing, a horseshoe of three, a square of four. The Division is a LINE and not a loop
+   * — trains enter at one Division Point and leave at the other — so the shape is deliberately left
+   * open, with the two ends drawn as buffer stops facing each other across a marked gap. Closing it
+   * into a ring would promise a connection the rules do not have.
    *
    * Self-contained on purpose: the replay embeds this by `toString()`, so it may not reach for
    * anything outside its own body.
    */
   const CW = { dp: 118, ml: 152, run: 78 };
-  /**
-   * TALL ENOUGH FOR TWO REGISTERS OF CHIPS, on every cell so the rail runs level across the row.
-   * Was 58, when a cell held one row of trains.
-   */
-  const CH = 76;
-  /**
-   * EVERY DISTRICT THE SAME WIDTH, sized for four chips two-by-two and NOT for its A/D count.
-   *
-   * Measured over 60 games: one office area holds at most 4 distinct trains, and up to 3 of those
-   * can be crews switching below the Running Track — which do not occupy A/D tracks at all. So a
-   * Whistle Post, with its single A/D track, can still have four trains to show, and sizing the cell
-   * by capacity would overflow it. Sizing by OCCUPANCY is worse still: that is what "The Roster
-   * Pass" fixed, because the cell then resizes as trains come and go and shoves the rest of the map
-   * sideways. A fixed two-by-two block holds the map still all game, upgrades included.
-   */
-  const OFFICE_W = 2 * 54 + 12;
-  /**
-   * THE VERTICAL ANATOMY OF A CELL, so the two chip registers and the rail cannot drift apart.
-   * The rail sits above centre; A/D chips straddle it, and the district register hangs below —
-   * which is where those trains are on the real board (Gitea#18).
-   */
-  const RAIL_Y = 34;
-  const CHIP_Y = RAIL_Y - 10;
-  const BELOW_Y = RAIL_Y + 13;
+  const CH = 58;
   const GAP = 6;
   /**
    * ONE FIXED SLOT PER A/D TRACK, so the Office Running Track cell is drawn wide enough to hold
@@ -115,6 +69,7 @@ export function divisionSvg(nodes: DivisionView[], roster?: DivisionRoster | nul
    * this is back to what a buffer stop actually needs.
    */
   const PAD = 22;
+  const SIDE_GAP = 34;
 
   const esc = (t: string): string =>
     String(t).replace(/[&<>"]/g, (c) => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;' })[c] ?? c);
@@ -137,128 +92,62 @@ export function divisionSvg(nodes: DivisionView[], roster?: DivisionRoster | nul
       region?: number;
       direction?: string;
       stagesLeft?: number;
-      /** Being made up at a Division Point right now, so the map can mark the train you are loading. */
-      beingMadeUp?: boolean;
     }[];
     cap: number | null;
     tip: string;
-    /** Set on a card that has just changed under the players' feet — drawn with a brief pulse. */
-    flash?: boolean;
     /** Which SEAT's district this cell belongs to, or null for Mainline and Division Points. */
     seat: number | null;
-    /** Set on an Office cell when a roster was supplied: whose district this is. */
-    owner?: { name: string; isTurn: boolean; isYou: boolean } | null;
-    /**
-     * Office cells only: trains in the district that are NOT holding an A/D track — a crew switching
-     * below the Running Track, or a train standing on it away from the Office. Drawn in a second
-     * register under the rail (Gitea#18).
-     */
-    below?: Cell['trains'];
-    /**
-     * Office cells only: a Red Flag standing at this Office's Limits, and which approach it guards
-     * (#94). A token set out ON the board that holds the next train arriving from that side, so it
-     * is drawn like the other things standing on the map rather than left to the log.
-     */
-    redFlag?: string | null;
     /** Mainline cards only: §2.1 divides one into two regions. 0 elsewhere — no bars are drawn. */
     regions: number;
-    /**
-     * Which way a Heavy Grade climbs, or null on every other card. Drawn as a wedge, because the
-     * tooltip said "climbs east" and the card itself showed nothing — so the one card whose
-     * orientation the PLAYER chooses was the one card you had to hover to read (Jesse, 2026-08-30).
-     */
-    gradeUp?: string | null;
     w: number;
     x: number;
     y: number;
   };
   const cells: Cell[] = [];
+  const sides: number[][] = [];
+  let side: number[] = [];
 
   const push = (c: Omit<Cell, 'x' | 'y'>): void => {
+    side.push(cells.length);
     cells.push({ ...c, x: 0, y: 0 });
   };
 
-  // The node's own index, so a cell can be matched against `roster.flash`. `continue` below skips the
-  // rest of the body, never this.
-  let nodeIndex = -1;
   for (const n of nodes) {
-    nodeIndex++;
     if (n.kind === 'office') {
       const cap = n.capacity;
       const ad = n.trains.flat();
-      /**
-       * THE NAME IS THE HEADLINE, the tier is the detail.
-       *
-       * "Where does Bob sit?" is the question this map could not answer: an Office was labelled
-       * with its tier, which every player's Office also has, so four districts read the same. The
-       * owner's name takes the headline and the tier moves down beside the A/D count, because the
-       * name is what is being looked for and the tier is what is being referred to once found.
-       */
-      const seatOwner =
-        roster && n.seat !== null ? (roster.players.find((p) => p.seat === n.seat) ?? null) : null;
-      const owner = seatOwner
-        ? {
-            name: seatOwner.name,
-            isTurn: roster!.actor === seatOwner.index,
-            isYou: roster!.viewer === seatOwner.index,
-          }
-        : null;
-
-      /**
-       * ONE CELL PER DISTRICT — NO OFFICE-AREA DETAIL ON THIS MAP (Gitea#18).
-       *
-       * An Office used to expand into its whole Running Track, Limits to Limits, so this map carried
-       * every straight, turnout, facility and Limits sign of every district. Two things were wrong
-       * with that. It is the OFFICE map's job, and it draws all of it properly, with the rails; and
-       * it made the Division map grow sideways as districts were built, shoving everything east of a
-       * district along every time somebody laid a card.
-       *
-       * TRAINS STAY. "Trains within the office area should definitely be represented on the division
-       * map" — at a glance the number and which way it is pointing, and the consist on the tooltip.
-       * They are split into two registers, because a train holding an A/D track and a crew switching
-       * in the district are not the same thing: A/D occupancy is a hard capacity that causes
-       * collisions, switching is not. The split is drawn as POSITION rather than colour — A/D on the
-       * rail, the rest below it — which is where those trains actually are.
-       */
-      const seen = new Set(ad.map((t) => t.label));
-      const below: typeof ad = [];
-      for (const t of [...(n.running ?? []).flatMap((rc) => rc.trains), ...(n.switching ?? [])]) {
-        if (seen.has(t.label)) continue;
-        seen.add(t.label);
-        below.push(t);
+      for (const rc of n.running ?? []) {
+        const isOffice = rc.kind === 'office';
+        push({
+          kind: 'run',
+          label: rc.label,
+          sub: isOffice ? (cap === null ? '' : `A/D ${ad.length}/${cap}`) : '',
+          /**
+           * A train standing at the Office occupies an A/D track, which is where it is — but it is
+           * ALSO standing on the Office grid card, so it arrives here in both lists and used to be
+           * drawn twice. Reported as two T10 chips on one Office.
+           */
+          trains: isOffice
+            ? [...rc.trains, ...ad.filter((t) => !rc.trains.some((r) => r.label === t.label))]
+            : rc.trains,
+          cap: isOffice ? cap : null,
+          tip: `${rc.label} — ${rc.kind === 'limits' ? 'the end of this district; the Running Track runs between the Limits' : 'Running Track'}`,
+          seat: n.seat ?? null,
+          // No regions inside a district: a crew moves by Moves there, not by Stages, so it
+          // occupies a card outright rather than a part of one.
+          regions: 0,
+          w: isOffice && cap !== null ? Math.max(CW.run, cap * CHIP_W + 12) : CW.run,
+        });
       }
-      const adLabel = cap === null ? '' : `A/D ${ad.length}/${cap}`;
-      push({
-        kind: 'run',
-        label: owner ? owner.name : n.label,
-        owner,
-        sub: [owner ? n.label : '', adLabel, below.length > 0 ? `${below.length} switching` : '']
-          .filter(Boolean)
-          .join(' \u00b7 '),
-        trains: ad,
-        below,
-        cap,
-        tip:
-          (owner ? `${owner.name}'s ${n.label}` : n.label) +
-          (owner?.isYou ? ' — this is your railroad' : '') +
-          // "their move" is wrong when the reader is the one being waited on.
-          (owner?.isTurn ? (owner.isYou ? ' — it is your move' : ' — it is their move') : '') +
-          // #94 — first, and in full, because it is the one thing here that CHANGES what a train
-          // may do. Everything below it describes the cell; this describes a rule in force.
-          (n.redFlag === 'east' || n.redFlag === 'west'
-            ? `\n\nRED FLAG set out at the ${n.redFlag === 'east' ? 'East' : 'West'} Limits — the ` +
-              `next train arriving from the ${n.redFlag} is held short, and the flag is spent doing it.`
-            : '') +
-          `\n\nThe district itself is drawn on the Office map — this cell is the whole of it, with the ` +
-          `trains standing in it: those holding an A/D track on the rail, and any crew switching in ` +
-          `the district below it.`,
-        seat: n.seat ?? null,
-        redFlag: n.redFlag ?? null,
-        // No regions in a district: a crew moves by Moves there, not by Stages, so it occupies a
-        // card outright rather than a part of one.
-        regions: 0,
-        w: OFFICE_W,
-      });
+      // A crew below the Running Track has no position ON it, so it is reported against the
+      // district rather than drawn somewhere it is not.
+      const below = n.switching ?? [];
+      if (below.length > 0) {
+        const last = cells[cells.length - 1];
+        if (last) last.sub = `${below.length} switching below`;
+      }
+      sides.push(side);
+      side = [];
       continue;
     }
     const dp = n.kind === 'dp';
@@ -275,7 +164,6 @@ export function divisionSvg(nodes: DivisionView[], roster?: DivisionRoster | nul
     push({
       kind: dp ? 'dp' : 'ml',
       label: n.label,
-      ...(roster?.flash?.includes(nodeIndex) ? { flash: true } : {}),
       sub: n.capacity === null
         ? 'no limit — trains queue'
         : [free, inYard.length > 0 ? `${inYard.length} in the yard` : ''].filter(Boolean).join(' · '),
@@ -293,35 +181,61 @@ export function divisionSvg(nodes: DivisionView[], roster?: DivisionRoster | nul
       seat: null,
       // A Division Point is one region — the queue trains enter and leave the Division through.
       regions: dp ? 1 : (n.regions ?? 0),
-      gradeUp: dp ? null : (n.gradeUp ?? null),
       w: dp ? CW.dp : CW.ml,
     });
   }
+  if (side.length > 0) sides.push(side);
 
-  /**
-   * ONE ROW, WEST TO EAST (Gitea#18). The West Division Point is at the far left, the East at the
-   * far right, and nothing wraps.
-   *
-   * IT USED TO BE LAID OUT AROUND A TABLE — one row for a single seat, two facing rows for two, a
-   * horseshoe for three, a square for four — on the reasoning that players sit around a table so the
-   * route should too. That cost more than it bought, and three separate reports came out of it: the
-   * buffer stops pointed the wrong way once the route turned a corner, and, the one that decided it,
-   * **east stopped being to the right**. A player's east could be drawn south, west or north
-   * depending on which lane their district landed in, on a map whose whole job is saying which way
-   * a train is going.
-   *
-   * A row is wider than a square — roughly 1,580px at four players against 842 — and that is
-   * accepted: the map scrolls and zooms, and being able to rely on east meaning right is worth the
-   * scroll.
-   */
-  let x = PAD;
-  for (const c of cells) {
-    c.x = x;
-    c.y = PAD;
-    x += c.w + GAP;
-  }
-  const boardW = x - GAP + PAD;
-  const boardH = PAD * 2 + CH + 30;
+  // Each player's side carries their district and the Mainline card leading into it; whatever is
+  // left over (the last Mainline and the East DP) joins the final side.
+  const seats = Math.max(1, Math.min(4, nodes.filter((n) => n.kind === 'office').length));
+  const lanes: number[][] = [];
+  for (let i = 0; i < seats; i++) lanes.push([]);
+  sides.forEach((grp, i) => {
+    const target = Math.min(i, seats - 1);
+    for (const idx of grp) lanes[target]!.push(idx);
+  });
+
+  // -- lay the sides out around the table -------------------------------------------------------
+  // top → right → bottom (reversed) → left (reversed), which gives a row, two facing rows, a
+  // horseshoe open to the west, and a square broken at the same place.
+  const dir: ('top' | 'right' | 'bottom' | 'left')[] =
+    seats === 1 ? ['top'] : seats === 2 ? ['top', 'bottom'] : seats === 3 ? ['top', 'right', 'bottom'] : ['top', 'right', 'bottom', 'left'];
+
+  const runLen = (idxs: number[]): number =>
+    idxs.reduce((n, i) => n + cells[i]!.w + GAP, -GAP);
+  const widest = Math.max(...lanes.map((l) => runLen(l)), 200);
+  const tall = lanes.length > 1 ? Math.max(...lanes.map((l) => l.length), 1) * (CH + GAP) : CH;
+
+  const vertCount = dir.filter((d) => d === 'right' || d === 'left').length;
+  const boardW = PAD * 2 + widest + (vertCount > 0 ? CW.run + SIDE_GAP : 0);
+  const boardH = PAD * 2 + (dir.includes('bottom') ? CH * 2 + SIDE_GAP + (vertCount ? tall : 0) : CH) + 30;
+
+  lanes.forEach((idxs, i) => {
+    const d = dir[i]!;
+    if (d === 'top' || d === 'bottom') {
+      const y = d === 'top' ? PAD : boardH - PAD - CH - 22;
+      const order = d === 'bottom' ? [...idxs].reverse() : idxs;
+      let x = PAD;
+      for (const idx of order) {
+        const c = cells[idx]!;
+        c.x = x;
+        c.y = y;
+        x += c.w + GAP;
+      }
+    } else {
+      const x = d === 'right' ? boardW - PAD - CW.run : PAD;
+      const order = d === 'left' ? [...idxs].reverse() : idxs;
+      let y = PAD + CH + SIDE_GAP;
+      for (const idx of order) {
+        const c = cells[idx]!;
+        c.x = x;
+        c.y = y;
+        c.w = CW.run;
+        y += CH + GAP;
+      }
+    }
+  });
 
   // -- draw -------------------------------------------------------------------------------------
   const rail = (x1: number, y: number, x2: number): string => {
@@ -336,29 +250,20 @@ export function divisionSvg(nodes: DivisionView[], roster?: DivisionRoster | nul
     return o;
   };
 
-  /**
-   * DRAWN AT ITS OWN SIZE, SO IT SCROLLS RATHER THAN SHRINKING (Gitea#18).
-   *
-   * An SVG has a viewBox and a drawn size, and the browser scales one to the other. `.bs` is
-   * `width:100%`, so the map is drawn at whatever the panel is wide — which was harmless while the
-   * Division was 842px and wrapped around a table, and is not now that a single row is 1,580px. At
-   * that width in an 800px panel every label renders at half size, on the map that needs reading
-   * most. Setting the width to the viewBox width makes one unit one pixel, and the containers
-   * already scroll (`#division`, `#vdivision`).
-   *
-   * THE PLAYABLE PAGE DOES NOT NEED THIS — `applyZoom` (`main.ts`) sets exactly the same width from
-   * the same viewBox after every render, and overrides this when the zoom is not 100%. THE REPLAYS
-   * DO: neither `replays.ts` nor the standalone `replay.ts` calls it, so without this they get the
-   * `width:100%` shrink. It is inline rather than in `BOARD_CSS` because only this function knows
-   * how wide the row came out.
-   *
-   * `flex:none` because `#division` is a flex container and a flex item may be shrunk below an
-   * explicit width; there is no point pinning it and then letting the panel squeeze it anyway.
-   */
-  let out =
-    `<svg class="bs bs-div" viewBox="0 0 ${Math.ceil(boardW)} ${Math.ceil(boardH)}" ` +
-    `style="width:${Math.ceil(boardW)}px;flex:none" ` +
-    `preserveAspectRatio="xMinYMin meet">`;
+  // The same rail turned through ninety degrees, for the sides of the table.
+  const railV = (x: number, y1: number, y2: number): string => {
+    let o =
+      `<line class="bs-rail" x1="${x - 2.5}" y1="${y1}" x2="${x - 2.5}" y2="${y2}"/>` +
+      `<line class="bs-rail" x1="${x + 2.5}" y1="${y1}" x2="${x + 2.5}" y2="${y2}"/>`;
+    const n = Math.max(2, Math.floor(Math.abs(y2 - y1) / 9));
+    for (let i = 0; i <= n; i++) {
+      const ty = y1 + ((y2 - y1) * i) / n;
+      o += `<line class="bs-tie" x1="${x - 4.5}" y1="${ty}" x2="${x + 4.5}" y2="${ty}"/>`;
+    }
+    return o;
+  };
+
+  let out = `<svg class="bs bs-div" viewBox="0 0 ${Math.ceil(boardW)} ${Math.ceil(boardH)}" preserveAspectRatio="xMinYMin meet">`;
 
   // The joins between consecutive cells, drawn as rail so a connection is rail meeting rail. A join
   // that crosses from one player's side to the next is drawn heavier and labelled: that boundary is
@@ -366,121 +271,39 @@ export function divisionSvg(nodes: DivisionView[], roster?: DivisionRoster | nul
   for (let i = 0; i + 1 < cells.length; i++) {
     const a = cells[i]!;
     const b = cells[i + 1]!;
-    out += rail(a.x + a.w, a.y + RAIL_Y, b.x);
+    const sameRow = Math.abs(a.y - b.y) < 1;
+    const sameCol = Math.abs(a.x - b.x) < 1;
+    if (sameRow && b.x > a.x) out += rail(a.x + a.w, a.y + CH / 2, b.x);
+    else if (sameRow && b.x < a.x) out += rail(b.x + b.w, a.y + CH / 2, a.x);
+    else if (sameCol) {
+      // Stacked down one side of the table: still one straight run of track, not a turn.
+      const top = Math.min(a.y + CH, b.y + CH);
+      const bot = Math.max(a.y, b.y);
+      out += railV(a.x + a.w / 2, top, bot);
+    } else {
+      // A turn between sides: an elbow, so the route is visibly continuous around the table.
+      const ax = a.x + a.w / 2;
+      const bx = b.x + b.w / 2;
+      const ay = a.y + CH;
+      const by = b.y;
+      out += `<path class="bs-turn" d="M${ax} ${ay} L${ax} ${(ay + by) / 2} L${bx} ${(ay + by) / 2} L${bx} ${by}"/>`;
+    }
   }
 
   cells.forEach((c) => {
     const full = c.cap !== null && c.trains.length >= c.cap;
-    out += `<g class="bs-dcell bs-d${c.kind}${full ? ' bs-full' : ''}${c.flash ? ' bs-changed' : ''}" data-tip="${esc(c.tip)}">`;
+    out += `<g class="bs-dcell bs-d${c.kind}${full ? ' bs-full' : ''}" data-tip="${esc(c.tip)}">`;
     out += `<rect x="${c.x}" y="${c.y}" width="${c.w}" height="${CH}" rx="5"/>`;
-    /**
-     * WHOSE IS IT, IS IT THEIR MOVE, AND IS IT MINE — answered by colour and one suffix rather
-     * than by a legend. Amber is the same "it is happening here" the action panel uses; "(you)"
-     * is spelled out because a colour alone cannot say which of four railroads is the reader's,
-     * and that is the first thing anybody wants to know at a table they just sat down at.
-     */
-    const mark = c.owner ? ` bs-owner${c.owner.isTurn ? ' bs-turn' : ''}${c.owner.isYou ? ' bs-you' : ''}` : '';
-    const suffix = c.owner?.isYou ? ' (you)' : '';
-    out += `<text class="bs-name${mark}" x="${c.x + 7}" y="${c.y + 14}">${esc(c.label + suffix)}</text>`;
-    out += rail(c.x + 6, c.y + RAIL_Y, c.x + c.w - 6);
+    out += `<text class="bs-name" x="${c.x + 7}" y="${c.y + 14}">${esc(c.label)}</text>`;
+    out += rail(c.x + 6, c.y + 32, c.x + c.w - 6);
     if (c.sub) out += `<text class="bs-cap" x="${c.x + 7}" y="${c.y + CH - 6}">${esc(c.sub)}</text>`;
 
-    // REGIONS. A Mainline card is 1 to 3 of them (Gitea#3) and a train advances one per Stage. The
-    // bars are the card's DISTANCE and never vary; where a train STARTS is what does.
+    // REGIONS. §2.1 divides a Mainline card into two, and §8.2 moves a train one region per Stage.
+    // The bars are the card's DISTANCE and never vary; what varies is how fast a train covers them,
+    // so a 60 card is crossed in one Stage and a slow train on a 30 takes three.
     const RW = c.regions > 0 ? (c.w - 12) / c.regions : 0;
     for (let r = 0; r < c.regions; r++) {
-      out += `<line class="bs-region" x1="${c.x + 6 + RW * r}" y1="${c.y + RAIL_Y - 14}" x2="${c.x + 6 + RW * r}" y2="${c.y + RAIL_Y + 10}"/>`;
-    }
-
-    /**
-     * A RED FLAG STANDING AT THE LIMITS (#94).
-     *
-     * Drawn at the END IT GUARDS — west on the left, east on the right, since east is right on this
-     * map — because which approach it covers is the whole of the information. A flag in the middle
-     * of the cell would say a flag is out and leave the reader to hover for the half that decides
-     * whether to run a train.
-     *
-     * A staff with a pennant, at rail height, standing clear of the chips: it is beside the rail,
-     * which is where a flag is. Red is otherwise unused on this map (`bs-full` tints a cell, it does
-     * not draw), so the mark does not compete with anything for meaning.
-     */
-    if (c.redFlag === 'east' || c.redFlag === 'west') {
-      const west = c.redFlag === 'west';
-      const fx = west ? c.x + 9 : c.x + c.w - 9;
-      const top = c.y + RAIL_Y - 22;
-      const dir = west ? 1 : -1;
-      out += `<g class="bs-flag">`;
-      out += `<line x1="${fx}" y1="${top}" x2="${fx}" y2="${c.y + RAIL_Y + 4}"/>`;
-      // The pennant flies INTO the cell, so it can never overhang the card edge at either end.
-      out += `<polygon points="${fx},${top} ${fx + dir * 13},${top + 5} ${fx},${top + 10}"/>`;
-      out += `</g>`;
-    }
-
-    /**
-     * WHICH WAY A HEAVY GRADE CLIMBS, drawn rather than only said.
-     *
-     * The tooltip has said "climbs east" since the Frame carried `gradeUp`, and the card showed
-     * nothing — so the one Mainline card whose orientation the PLAYER sets, and the one where a
-     * Helpers or Brakeman modifier means opposite things at opposite ends, was the one you had to
-     * hover to read (Jesse, 2026-08-30).
-     *
-     * A wedge rising toward the climb, with an arrow up its slope. Two cues rather than one: the
-     * wedge alone asks the reader to judge which end is taller, which at eleven pixels of rise is a
-     * comparison rather than a glance. Bottom-right, clear of the left-aligned capacity line and
-     * below the region bars, so it never lands under a train chip.
-     *
-     * `east` is RIGHT on this map and always has been (Gitea#18) — that is what makes a wedge
-     * readable without a compass, and it is why the row layout is worth its width.
-     */
-    if (c.gradeUp === 'east' || c.gradeUp === 'west') {
-      const s = c.gradeUp === 'east' ? 1 : -1;
-      const GW = 58;
-      const RISE = 24;
-      const gx1 = c.x + c.w - 9 - GW;
-      const gx2 = c.x + c.w - 9;
-      const yb = c.y + CH - 6;
-      const peakX = s === 1 ? gx2 : gx1;
-      out += `<polygon class="bs-grade" points="${gx1},${yb} ${gx2},${yb} ${peakX},${yb - RISE}"/>`;
-
-      /**
-       * THE ARROW LIES ALONG THE WEDGE'S OWN SLOPE, CENTRED IN IT (Jesse, 2026-08-30).
-       *
-       * Parallel to the hypotenuse is the shape that fits: the perpendicular gap to the slope is
-       * then CONSTANT along the whole arrow, instead of closing at one end the way a steeper line
-       * does. The earlier 30° pass had to be tucked into the fat half to survive, because 30° is
-       * steeper than this wedge climbs — at 58×24 the slope is 22.5°, and the arrow simply lies on
-       * it.
-       *
-       * Centred on the TRIANGLE'S CENTROID (2/3 along the base, 1/3 up), which is the balance point
-       * of the form rather than of its bounding box — centring on the box would push the arrow into
-       * the thin corner where there is no height for it.
-       *
-       * The wedge grew 50×22 → 58×24 to pay for that: the centroid sits only ~7px from the
-       * hypotenuse, so a centred arrow has less room than an off-centre one and needs a bigger form
-       * to keep it. Sizes are the best fit found by search, clearing every edge by 2.88px;
-       * `web.test.ts` re-derives it and fails under 2px.
-       *
-       * Worked in the wedge's own frame — `u` along the base from the thin corner, `h` up from it —
-       * so a westward climb is one sign on `u` rather than a second set of coordinates.
-       */
-      const L = 20;
-      const HL = 6;
-      const HW = 3.5;
-      const T = 1.4;
-      const A = Math.atan2(RISE, GW);
-      const cos = Math.cos(A);
-      const sin = Math.sin(A);
-      const cu = (2 * GW) / 3;
-      const ch = RISE / 3;
-      const pt = (lx: number, ly: number): string => {
-        const u = cu + lx * cos - ly * sin;
-        const h = ch + lx * sin + ly * cos;
-        return `${s === 1 ? gx1 + u : gx2 - u},${yb - h}`;
-      };
-      const H = L / 2;
-      out +=
-        `<polygon class="bs-gradeup" points="${pt(-H, -T)} ${pt(H - HL, -T)} ${pt(H - HL, -HW)} ` +
-        `${pt(H, 0)} ${pt(H - HL, HW)} ${pt(H - HL, T)} ${pt(-H, T)}"/>`;
+      out += `<line class="bs-region" x1="${c.x + 6 + RW * r}" y1="${c.y + 20}" x2="${c.x + 6 + RW * r}" y2="${c.y + 44}"/>`;
     }
 
     /**
@@ -495,101 +318,53 @@ export function divisionSvg(nodes: DivisionView[], roster?: DivisionRoster | nul
      * So this keeps the two things the Division map is actually for — where a train is and which way
      * it is going — and leaves the cars to the tooltip and to the district.
      */
-    /**
-     * A TRAIN IS A CHIP — its number, which way it points, and how many cars.
-     *
-     * It was drawn as a full consist here, matching the Office Area card, and reported as too large
-     * and hard to read. The Office card is where a consist is worth drawing, because that is where
-     * the switching decisions are made and where there is room to read it. So this keeps the two
-     * things the Division map is for — where a train is and which way it is going — and leaves the
-     * cars to the tooltip and to the district.
-     */
-    /**
-     * THE REGION NUMBER IS A PLACE ON THE MAP, NOT A DISTANCE RUN (Gitea#22).
-     *
-     * `view.ts` mirrors a westbound train before it gets here, so this counts boxes west to east
-     * for every train regardless of which way it is going — and the tooltip says so, because
-     * "region 2 of 2" beside "2 Stages still to run" reads as a contradiction otherwise. It is the
-     * second box from the west end; a westbound train in it has its whole crossing ahead of it.
-     */
-    const chip = (t: NonNullable<Cell['trains']>[number], tx: number, ty: number, w: number): void => {
+    c.trains.forEach((t, k) => {
       const cars = t.cars ?? [];
       const arrow = t.facing === 'w' ? '\u25c0' : '\u25b6';
       const loaded = cars.filter((x) => /^loaded/.test(x) || /caboose/.test(x)).length;
       const label = cars.length === 0 ? `${t.label} ${arrow}` : `${t.label} ${arrow}${cars.length}`;
-      // THE TRAIN THE MAKE-UP PANEL IS TALKING ABOUT. Amber, because that is what the rest of the
-      // page uses for "this is the thing you are acting on" (Jesse, playtest 2026-09-16).
-      const building = t.beingMadeUp === true;
+
+      /**
+       * THE OFFICE RUNNING CELL GETS FIXED SLOTS, ONE PER A/D TRACK — never a centre spread.
+       *
+       * Centred spreading pushes its outer chips outward as MORE trains arrive, and the cell was
+       * sized for the cards it holds, not for its trains — so two chips at a Station used to land at
+       * x 215–267 and 271–316 inside a cell spanning only 230–308, spilling onto the Limits cards
+       * either side. A fixed slot per A/D track cannot overflow the cell at any occupancy, because
+       * the cell was sized for exactly that many slots (see `CHIP_W` above).
+       */
+      const isOfficeRun = c.kind === 'run' && c.cap !== null && c.cap > 0;
+      const slotW = isOfficeRun ? (c.w - 12) / c.cap! : 0;
+      const w = isOfficeRun ? Math.min(slotW - 4, label.length * 6.6 + 12) : Math.min(c.w - 8, label.length * 6.6 + 12);
+      // A train on a Mainline card sits in ITS region; anywhere else it just sits on the card.
       const inRegion = c.regions > 1 && typeof t.region === 'number';
+      const tx = isOfficeRun
+        ? c.x + 6 + slotW * (k + 0.5)
+        : (inRegion ? c.x + 6 + RW * (t.region ?? 0) + RW / 2 : c.x + c.w / 2) +
+          (inRegion ? 0 : (k - (c.trains.length - 1) / 2) * (w + 4));
       const dir = t.direction === 'west' ? ' \u25c0 west' : t.direction === 'east' ? ' east \u25b6' : '';
       const stages =
         typeof t.stagesLeft === 'number'
-          ? ` \u00b7 ${t.stagesLeft} Stage${t.stagesLeft === 1 ? '' : 's'} still to run across this card`
+          ? ` \u00b7 ${t.stagesLeft} Stage${t.stagesLeft === 1 ? '' : 's'} still to run across this card` +
+            ' (Stages, not regions: a card is two regions of fixed distance, and how many Stages a' +
+            ' train takes over them depends on the card speed and the train)'
           : '';
-      out += `<g class="bs-train${building ? ' bs-building' : ''}" data-tip="${esc(t.label)}${
-        building ? ' \u2014 BEING MADE UP NOW: add cars from the Division Yard' : ''
-      } \u2014 carrying ${esc(cars.join(', ') || 'no cars')}${
+      out += `<g class="bs-train" data-tip="${esc(t.label)} \u2014 carrying ${esc(cars.join(', ') || 'no cars')}${
         cars.length ? ` (${loaded} loaded)` : ''
-      }${inRegion ? ` \u00b7 region ${(t.region ?? 0) + 1} of ${c.regions}, counted west to east${dir}` : ''}${esc(stages)}${
+      }${inRegion ? ` \u00b7 region ${(t.region ?? 0) + 1} of ${c.regions}${dir}` : ''}${esc(stages)}${
         // What the card prints. A train on the Mainline is exactly where "why did that leave without
         // me?" gets asked, and EXPEDITED is the answer more often than not.
         t.what ? `\n\n${esc(t.what)}` : ''
       }">` +
-        `<rect x="${tx - w / 2}" y="${ty}" width="${w}" height="19" rx="3"/>` +
-        `<text class="bs-tlab" x="${tx}" y="${ty + 13}" text-anchor="middle">${esc(label)}</text>`;
+        `<rect x="${tx - w / 2}" y="${c.y + 22}" width="${w}" height="19" rx="3"/>` +
+        `<text class="bs-tlab" x="${tx}" y="${c.y + 35}" text-anchor="middle">${esc(label)}</text>`;
       out += '</g>';
-    };
-
-    const textW = (t: NonNullable<Cell['trains']>[number]): number =>
-      (`${t.label} \u25b6${(t.cars ?? []).length || ''}`).length * 6.6 + 12;
-
-    /**
-     * TWO CHIPS TO A REGISTER ON A DISTRICT, in fixed slots — never a centre spread.
-     *
-     * Centred spreading pushes its outer chips outward as more trains arrive, which is how two chips
-     * at a Station once landed outside the cell that held them. Fixed slots cannot overflow, because
-     * the cell was sized for exactly that many (`OFFICE_W`).
-     */
-    const isDistrict = c.kind === 'run';
-    const SLOTS = 2;
-    const slotW = (c.w - 12) / SLOTS;
-    c.trains.forEach((t, k) => {
-      if (isDistrict) {
-        // Row-major within the A/D register: two across, then wrap under. A district can hold four
-        // trains and only two fit across it.
-        const col = k % SLOTS;
-        const row = Math.floor(k / SLOTS);
-        chip(t, c.x + 6 + slotW * (col + 0.5), c.y + CHIP_Y + row * 21, Math.min(slotW - 4, textW(t)));
-        return;
-      }
-      // A train on a Mainline card sits in ITS region; anywhere else it just sits on the card.
-      const inRegion = c.regions > 1 && typeof t.region === 'number';
-      const w = Math.min(c.w - 8, textW(t));
-      const tx = (inRegion ? c.x + 6 + RW * (t.region ?? 0) + RW / 2 : c.x + c.w / 2) +
-        (inRegion ? 0 : (k - (c.trains.length - 1) / 2) * (w + 4));
-      chip(t, tx, c.y + CHIP_Y, w);
     });
-
-    /**
-     * THE SECOND REGISTER, under the rail: trains in the district that hold no A/D track (Gitea#18).
-     *
-     * A crew switching below the Running Track and a train standing at an A/D track are different
-     * things — A/D occupancy is a hard capacity that causes collisions, switching is not — and the
-     * difference is drawn as POSITION rather than as a colour to learn, because below the rail is
-     * where those trains actually are.
-     */
-    (c.below ?? []).forEach((t, k) => {
-      const col = k % SLOTS;
-      const row = Math.floor(k / SLOTS);
-      chip(t, c.x + 6 + slotW * (col + 0.5), c.y + BELOW_Y + row * 21, Math.min(slotW - 4, textW(t)));
-    });
-
     out += '</g>';
   });
 
-  // THE ENDS. The route stops at both Division Points, and the buffer stops say so — a Division is
-  // a LINE, not a loop. With a single row (Gitea#18) they simply face outward at the two ends, west
-  // on the left and east on the right, which is the bug reported twice against the wrapped layout.
+  // THE ENDS. The route stops at both Division Points; drawing buffer stops and naming the gap is
+  // what stops a seated layout being read as a loop.
   const first = cells[0];
   const last = cells[cells.length - 1];
   /**
@@ -689,17 +464,7 @@ export function officeSvg(
   const c0 = Math.min(...cols);
   const c1 = Math.max(...cols);
   const width = (c1 - c0 + 1) * (W + PAD);
-  /**
-   * A BAND BENEATH THE BOTTOM ROW FOR THE LIMITS LABELS, and only when there are labels to put in it.
-   *
-   * The bottom card's lower edge lands at `height - 7`, and the label's baseline was `height - 4` —
-   * so its 8px glyphs spanned `height - 12` to `height - 4` and the card's own border ran straight
-   * through the middle of the word (Jesse, playtest 2026-09-16: *"the text is split by the bottom
-   * border of the limits card… it should be printed directly beneath the card"*). Raising the text
-   * instead would have pushed it onto the card, over the rails; the room has to be made below.
-   */
-  const limitBand = limits ? 14 : 0;
-  const height = (r1 - r0 + 1) * (H + PAD) + 4 + limitBand;
+  const height = (r1 - r0 + 1) * (H + PAD) + 4;
 
   // Screen position of a card. Rows count DOWN from the top row, so the Running Track sits highest
   // and the district hangs beneath it, as the rules describe it.
@@ -724,65 +489,6 @@ export function officeSvg(
     return out;
   };
 
-  /**
-   * A 45° LEG, drawn as a smooth curve rather than two straight segments meeting at a hard corner.
-   *
-   * It is an EASEMENT, not an arbitrary curve: tangent to horizontal at `p0` (the east or west edge),
-   * so an abutting straight card's through-rail still reads as one unbroken line, and tangent to
-   * exactly 45° at `p3` (the north or south edge), so two stacked curves still read as one continuous
-   * diagonal and the edge-crossing angle the matching rule depends on is unchanged. `p1`/`p2` are
-   * cubic-Bezier control points chosen to hit those two tangents — see the call site.
-   *
-   * Sampled as a short polyline rather than left as one SVG path command, because the two parallel
-   * rails and the tie marks all need points evenly spaced ALONG THE CURVE with the local tangent at
-   * each one — `rail()`'s straight-line version does the same sampling, just on a line.
-   */
-  const curvedRail = (
-    p0: { x: number; y: number },
-    p1: { x: number; y: number },
-    p2: { x: number; y: number },
-    p3: { x: number; y: number },
-  ): string => {
-    const at = (t: number): { x: number; y: number } => {
-      const u = 1 - t;
-      return {
-        x: u * u * u * p0.x + 3 * u * u * t * p1.x + 3 * u * t * t * p2.x + t * t * t * p3.x,
-        y: u * u * u * p0.y + 3 * u * u * t * p1.y + 3 * u * t * t * p2.y + t * t * t * p3.y,
-      };
-    };
-    const tangentAt = (t: number): { x: number; y: number } => {
-      const u = 1 - t;
-      return {
-        x: 3 * u * u * (p1.x - p0.x) + 6 * u * t * (p2.x - p1.x) + 3 * t * t * (p3.x - p2.x),
-        y: 3 * u * u * (p1.y - p0.y) + 6 * u * t * (p2.y - p1.y) + 3 * t * t * (p3.y - p2.y),
-      };
-    };
-    const N = 24;
-    const left: string[] = [];
-    const right: string[] = [];
-    let ties = '';
-    for (let i = 0; i <= N; i++) {
-      const t = i / N;
-      const pt = at(t);
-      const tan = tangentAt(t);
-      const tlen = Math.hypot(tan.x, tan.y) || 1;
-      const nx = (-tan.y / tlen) * 2.5;
-      const ny = (tan.x / tlen) * 2.5;
-      left.push(`${pt.x + nx} ${pt.y + ny}`);
-      right.push(`${pt.x - nx} ${pt.y - ny}`);
-      // Every third sample — the same rough 9px spacing `rail()` uses for a straight run of similar
-      // length, not tied to `N` itself.
-      if (i % 3 === 0) {
-        ties += `<line class="bs-tie" x1="${pt.x + nx * 1.8}" y1="${pt.y + ny * 1.8}" x2="${pt.x - nx * 1.8}" y2="${pt.y - ny * 1.8}"/>`;
-      }
-    }
-    return (
-      `<path class="bs-rail" fill="none" d="M${left.join(' L')}"/>` +
-      `<path class="bs-rail" fill="none" d="M${right.join(' L')}"/>` +
-      ties
-    );
-  };
-
   // Where each port meets the card edge. East and west sit at the rail height — the card's middle —
   // so a straight run stays straight across the whole row; north and south are centred on the edge.
   const port = (p: string): { x: number; y: number } => {
@@ -843,23 +549,19 @@ export function officeSvg(
         out += rail(port(from).x, port(from).y, port(to).x, port(to).y);
       } else {
         /**
-         * A 45° LEG — drawn as a smooth curve (v0.5.0) that still passes through the same FROG the
-         * old two-segment version bent at, so the underlying geometry (and the `frog` position used
-         * elsewhere for the actual joining/matching rules) is unchanged; only the picture is.
+         * A 45° LEG, drawn as the card prints it: along the centre line from the east or west edge
+         * to the FROG, then out at exactly 45° through the middle of the north or south edge.
          *
          * The frog is `H/2` from the centre because a 45° run climbing half the card's height
-         * travels half its height sideways. The control points sit halfway from each endpoint to the
-         * frog, which is what gives the curve a horizontal tangent at the e/w edge (matching an
-         * abutting straight card's through-rail) and an exact 45° tangent at the n/s edge (matching
-         * the card above or below) — see `curvedRail`.
+         * travels half its height sideways. This used to be a fixed elbow at (W/2, RAIL+(H-RAIL)/2)
+         * — below the rail on the assumption everything diverged downward — which drew a leg
+         * reaching north as a hook that dropped past the rail and came back up, and drew nothing at
+         * any angle the matching rule cares about.
          */
         const side = vertical === from ? to : from;
         const frog = { x: W / 2 + (side === 'e' ? H / 2 : -H / 2), y: RAIL };
-        const start = port(side);
         const edge = port(vertical);
-        const c1 = { x: start.x + 0.5 * (frog.x - start.x), y: start.y };
-        const c2 = { x: edge.x + 0.5 * (frog.x - edge.x), y: edge.y + 0.5 * (frog.y - edge.y) };
-        out += curvedRail(start, c1, c2, edge);
+        out += rail(port(side).x, port(side).y, frog.x, frog.y) + rail(frog.x, frog.y, edge.x, edge.y);
       }
     }
 
@@ -1128,18 +830,9 @@ export function officeSvg(
       // card, the old y = H-46 baseline printed the label straight along the rail itself.
       // Hover text per enhancement, from the card catalogue — an Interlocking used to be a bare word
       // on the card with nothing to say what it did, or that it does not do it yet.
-      // A SPENT dispatch device is struck through (#101). Telegraph/Telephone/Radio are "once a
-      // day", and the label said the same thing before and after the Superintendent spent one — so
-      // the card advertised a +12 that was not there. Per-`tspan` rather than per-`text` so the
-      // names still read as one row, and `?? []` because `piecePreview` builds a cell literal by
-      // hand and has no flags.
-      const spentFlags = cell.enhancementsSpent ?? [];
-      const names = cell.enhancements
-        .map((n, i) => (spentFlags[i] ? `<tspan class="bs-enh-spent">${esc(n)}</tspan>` : esc(n)))
-        .join(' · ');
       out += `<text class="bs-enh" x="6" y="26" data-tip="${esc(
         (cell.enhancementsWhat ?? []).join(' · '),
-      )}">${names}</text>`;
+      )}">${esc(cell.enhancements.join(' · '))}</text>`;
     }
     if (selectedTrain) {
       /**
@@ -1235,9 +928,7 @@ export function officeSvg(
   if (limits) {
     const edge = (x: number, side: string): string =>
       `<line class="bs-limitline" x1="${x}" y1="0" x2="${x}" y2="${height}"/>` +
-      // Baseline inside the band below the cards: the glyphs run from `height - 19` to `height - 11`
-      // and the bottom row's edge is at `height - 21`, so the whole word clears the card border.
-      `<text class="bs-limitlab" x="${x + (side === 'w' ? 4 : -4)}" y="${height - 11}" ` +
+      `<text class="bs-limitlab" x="${x + (side === 'w' ? 4 : -4)}" y="${height - 4}" ` +
       `text-anchor="${side === 'w' ? 'start' : 'end'}">LIMITS</text>`;
     out += edge(px(limits.west) - PAD / 2, 'w') + edge(px(limits.east) + W + PAD / 2, 'e');
   }
@@ -1280,29 +971,9 @@ export const BOARD_CSS = `
    and leave at the other, and a seated layout must not be read as a ring. */
 .bs-stop line{stroke:#e0a060;stroke-width:2.6;stroke-linecap:round}
 .bs-end{fill:#e0a060;font:10px ui-monospace,monospace;letter-spacing:.03em}
-/* A card that has just BECOME a different card (Realignment). The same amber the rest of the page
-   spends on "it is happening here", pulsing only while the step that did it is on screen — so the
-   change is seen on the map rather than only read in the log. */
-.bs-dcell.bs-changed rect{stroke:#e0a060;stroke-width:2.4;animation:bs-changed-pulse 1.1s ease-in-out infinite}
-@keyframes bs-changed-pulse{0%,100%{stroke-opacity:1}50%{stroke-opacity:.35}}
-@media (prefers-reduced-motion: reduce){.bs-dcell.bs-changed rect{animation:none}}
-/* The vertical bars a Mainline card is divided into (§2.1). They are the ruler the train is measured
-   against, not something to look at instead of the train — but they were drawn so faint they could
-   not be made out at all (Jesse, playtest 2026-09-16: "the dividing line is barely visible"). A
-   ruler you cannot read is not restraint, so this is lifted to the tie colour and given a longer
-   dash: still quieter than the rail, and now actually there. */
-.bs-region{stroke:#98a3b2;stroke-width:1.6;stroke-dasharray:4 2}
-/* #94 — the one red mark on the Division map, so it reads as a stop rather than as decoration. */
-.bs-flag line{stroke:#9aa3b0;stroke-width:1.6}
-.bs-flag polygon{fill:#d2453f;stroke:#7d211d;stroke-width:0.8}
-/* THE HEAVY GRADE WEDGE. Terrain, so it is coloured as terrain rather than as a warning.
-   SOLID BROWN, fill and border the same (Jesse, 2026-08-30) — the first pass paired a desaturated
-   fill with an amber arrow and the pair read reddish, which on a map that spends amber on "it is
-   happening here" made a fixed piece of landscape look like a live alert. One flat brown recedes
-   into scenery; the arrow is bone so the DIRECTION, which is the fact being reported, is the part
-   that carries. */
-.bs-grade{fill:#6b5334;stroke:#6b5334;stroke-width:1}
-.bs-gradeup{fill:#f2e8d5}
+/* The vertical bars a Mainline card is divided into (§2.1). Drawn faint: they are the ruler the
+   train is measured against, not something to look at instead of the train. */
+.bs-region{stroke:#4a5361;stroke-width:1.2;stroke-dasharray:3 3}
 .bs-slot{fill:none;stroke:#5f6b7a;stroke-width:1.1;stroke-dasharray:3 2}
 .bs-slot.bs-occ{stroke-dasharray:none;stroke-width:1.6}
 /* CAR TYPE BY COLOUR, LOAD STATE BY FILL — the SAME distinction the train tray draws, because they
@@ -1324,10 +995,6 @@ export const BOARD_CSS = `
 .bs-slot.bs-car-cch.bs-loaded{fill:rgba(90,169,230,.85)}
 .bs-slot.bs-car-cab.bs-loaded{fill:rgba(192,90,90,.85)}
 .bs-train rect{fill:#2f6b3d;stroke:#8fd6a0;stroke-width:1.2}
-/* The train the New Train phase is loading, in the page's action amber, so the make-up panel on the
-   right and the train on the map at the top left are visibly the same subject. */
-.bs-train.bs-building rect{fill:#4a3a1c;stroke:#c8912f;stroke-width:2}
-.bs-train.bs-building .bs-tlab{fill:#f2d49a}
 .bs-crew rect{fill:#8a6d1f;stroke:#e0c060;stroke-width:1.2}
 /* Each car in the train, in the order it is seated. Loaded is solid, empty is hollow, and the
    engine is the one that carries the arrow — which is what makes "reverse" mean something. */
@@ -1374,26 +1041,13 @@ export const BOARD_CSS = `
 .bs-arrow{fill:#5f6b7a;font:10px ui-monospace,monospace}
 .bs-cn{fill:#e6e9ee;font:600 11px ui-monospace,monospace}
 .bs-coord{fill:#5f6b7a;font:9px ui-monospace,monospace}
-/* stroke:none (Gitea#24). A name takes the class \`bs-turn\` while it is that player's move, and \`.bs-turn\` is
-   also the turn ARROW's rule, which strokes its shape 2.4px grey. Declared after it, this keeps that
-   outline off the letters, which it smeared into an unreadable blur. */
-.bs-name{fill:#e6e9ee;stroke:none;font:600 11px ui-monospace,monospace}
-.bs-name.bs-you{fill:#5aa9e6}
-/* Their move — wins over .bs-you when both apply, because whose turn it is changes every few
-   seconds and which railroad is yours never does.
-
-   NO WEIGHT BUMP. This was 700 and the name came out fuzzy to the point of being unreadable: the
-   base is already 600, so at 11px a monospace face has to be synthesised the rest of the way, and
-   the extra ink lands as blur rather than as weight. Amber against #e6e9ee is the distinction; it
-   does not need help. */
-.bs-name.bs-turn{fill:#f0b64a}
+.bs-name{fill:#e6e9ee;font:600 11px ui-monospace,monospace}
 .bs-cap{fill:#8b94a3;font:10px ui-monospace,monospace}
 .bs-cap.bs-full{fill:#e0a060;font-weight:600}
 .bs-grade{fill:#e08060;font:10px ui-monospace,monospace}
 .bs-mod{font:10px ui-monospace,monospace}
 text.bs-mod{fill:#c8a04a}
 .bs-enh{fill:#7fb0e6;font:9px ui-monospace,monospace}
-.bs-enh-spent{fill:#5b6b7d;text-decoration:line-through}
 .bs-rowlab{fill:#5f6b7a;font:600 9px ui-monospace,monospace;letter-spacing:.1em}
 /* THE EDGE OF THE DISTRICT. Deliberately quiet — it is a boundary, not an action — and dashed, so it
    reads as a line on the table rather than as rail. Nothing is laid outside it (§2.1). */

src/sim/bot.ts

@@ -22,9 +22,6 @@
 import {
   applyIntent,
   areaOf,
-  extendLimitsIfNeeded,
-  isLockedOut,
-  protoCard,
   canAdvanceLoad,
   destinationsFor,
   facilityCarTypes,
@@ -32,15 +29,14 @@ import {
   ownCutFor,
 } from '../engine/apply.ts';
 import { MAX_CONSIST, nextOfficeTier, officeProfile } from '../engine/content.ts';
-import type { CarType, FreightKind, Hand, TrackGeometry } from '../engine/content.ts';
+import type { CarType, Hand, TrackGeometry } from '../engine/content.ts';
 import type { GameEvent } from '../engine/events.ts';
 import type { Intent } from '../engine/intents.ts';
 import { legalActions } from '../engine/legal.ts';
-import { canPlaceAt, connectionsFor, exitsFrom, facilityVariants, hasPort, joins, neighbour, opposite, variantsFor } from '../engine/track.ts';
+import { connectionsFor, exitsFrom, facilityVariants, hasPort, joins, neighbour, opposite, variantsFor } from '../engine/track.ts';
 import type { Port } from '../engine/track.ts';
-import { actingPlayer, coordKey, turnOf } from '../engine/state.ts';
+import { coordKey, turnOf } from '../engine/state.ts';
 import type { Facility, GameState, GridCoord, OfficeArea, PlayerIndex, RollingStock, TrackCard } from '../engine/state.ts';
-import { planSwitchingTurn, switchFingerprint } from './switch-planner.ts';
 
 export type BotPolicy = {
   name: string;
@@ -110,8 +106,7 @@ function because(reason: string, intent: Intent): Intent {
  * Every flag here turns something OFF. That is the opposite of how this started — the tweaks were
  * candidates to switch on — and it is the right shape once a candidate has been adopted: what a
  * measured heuristic needs afterwards is a way to ask "is this still worth it?" when the deck or
- * the rules move under it. The first two were worth about +1.5 revenue together when adopted, and
- * planning the switching turn (`noPlanSwitching`) +2.89 on its own; if a
+ * the rules move under it. Both of these were worth about +1.5 revenue together when adopted; if a
  * rebalance changes the economy, that is a claim to re-test rather than to assume.
  *
  * The candidates that did NOT survive are gone rather than left switched off: preferring coaches at
@@ -126,78 +121,9 @@ export type BotTweaks = {
   noTrainCap?: boolean;
   /** Draw whenever nothing is urgent, as the bot did before it preferred operating. */
   noOperateFirst?: boolean;
-  /**
-   * Choose switching Moves one at a time from the rule ladder, as the bot did before it planned the
-   * whole turn (`switch-planner.ts`). Measured at adoption, 2026-09-14: planning was worth
-   * +2.89 ± 0.18 revenue a game (t = 15.79) over 1600 paired seeds, 733 better against 21 worse.
-   */
-  noPlanSwitching?: boolean;
-  /**
-   * Take a face-up train or industry card whether or not it could be played, as the bot did before
-   * 2026-09-14. It then took 20.1 trains and 11.9 industries a game off the Departments and discarded
-   * 20.2 and 11.8, retaking the same card 28.8 times a game. Asking first measured +1.52 ± 0.10
-   * (t = 15.59) over 1600 paired seeds — this ablation was worse on 880 of them and better on 211.
-   */
-  noPlayableTakes?: boolean;
-  /**
-   * Choose where track goes by `bestTrackLay`'s piece rules and the fallback's first legal square, as the
-   * bot did before 2026-09-15, instead of by what the district can DO afterwards (`bestValuedLay`).
-   * Scoring the layout measured +0.118 ± 0.029 (t = 4.14) over 6400 paired seeds, and closed run-arounds
-   * in 22 of 60 districts against 9.
-   */
-  noValueLays?: boolean;
-  /**
-   * Let the New Train phase's fallback take `options[0]`, as the bot did before 2026-09-15. Because
-   * `legalActions` lists `newTrain.secondSection` ahead of the Extra starts, all 26 Second Sections the
-   * bot ran in 60 games were that accident, and 6 of the 20 collisions followed one. Taking a car, a pass
-   * or the Extra's start instead measured +0.32 ± 0.09 (t = 3.64) over 400 paired seeds.
-   */
-  noDeliberateNewTrain?: boolean;
+
 };
 
-/**
- * A switching turn planned once and then played a step per decision.
- *
- * Keyed by the tweaks object, because that is what one policy owns — the server shares a single
- * `developerBot` across every bot seat, so the plan inside it is kept per player. Each step is
- * submitted only while the position still matches the fingerprint the plan expected there; anything
- * else replans. A switching turn has no randomness, so in practice a plan is made once a turn.
- */
-type ActivePlan = { steps: Intent[]; keys: string[]; next: number; summary: string };
-const activePlans = new WeakMap<BotTweaks, Map<PlayerIndex, ActivePlan>>();
-
-function plannedSwitch(s: GameState, player: PlayerIndex, options: Intent[], tweaks: BotTweaks): Intent | null {
-  let mine = activePlans.get(tweaks);
-  if (!mine) activePlans.set(tweaks, (mine = new Map()));
-  const here = switchFingerprint(s, player);
-  let active = mine.get(player);
-  if (!active || active.keys[active.next] !== here) {
-    const p = planSwitchingTurn(s, player);
-    active = {
-      steps: p.steps,
-      keys: p.keys,
-      next: 0,
-      summary:
-        `position ${p.rootScore.toFixed(2)} → ${p.score.toFixed(2)} over ${p.expanded} positions` +
-        (p.complete ? '' : ', search budget reached'),
-    };
-    mine.set(player, active);
-  }
-  if (active.next >= active.steps.length) {
-    mine.delete(player);
-    const end = options.find((i) => i.type === 'switch.end');
-    return end ? because(`planned switching turn complete — ${active.summary}`, end) : null;
-  }
-  const want = JSON.stringify(active.steps[active.next]);
-  const match = options.find((i) => JSON.stringify(i) === want);
-  if (!match) {
-    mine.delete(player);
-    return null;
-  }
-  active.next++;
-  return because(`step ${active.next} of ${active.steps.length} of a planned switching turn — ${active.summary}`, match);
-}
-
 /** The bot as it plays today. Every knob off. */
 export const developerBot: BotPolicy = makeDeveloperBot({});
 
@@ -212,39 +138,13 @@ export function makeDeveloperBot(tweaks: BotTweaks): BotPolicy {
 
   choose(s, player, options) {
     lastReason = 'no specific reason — first legal option';
-
-    /**
-     * §3.3, EXTENDED PLAY (Gitea#11) — a bot never asks for another Day.
-     *
-     * "If only bots are playing, they never vote to extend" (Jesse, 2026-08-28), which is what keeps
-     * the balance harness and every bot-only game ending at the timetable it was dealt with. It also
-     * makes this the SAFE DEFAULT everywhere else: a bot's agreement in a game with humans in it is
-     * decided by `server/session.ts`, which votes on the bots' behalf only once every human has
-     * already said yes, and never reaches this policy at all.
-     */
-    const extend = options.find((i) => i.type === 'game.extend' && i.agree === false);
-    if (extend) return because('a bot plays the timetable it was dealt and no more', extend);
-
     const clearance = ruleOnClearance(options);
-    if (clearance) return because('the Superintendent must rule on a following train', clearance);
-
-    /**
-     * §11 (Gitea#5) — the bot keeps its trains at the Train Order Office.
-     *
-     * A deliberate policy, not an oversight, and the cautious half of a real choice: the Yard Office
-     * frees an A/D track, which is worth something on a busy district, but the lead into it may be
-     * fouled and the bot does not read its own yard well enough to tell (`TODO.md`, Bot
-     * Performance — it cannot spot a car at a stub industry either). Declining is always safe, and
-     * it keeps the balance harness comparable with every measurement taken before this rule existed.
-     * Worth revisiting when the bot can judge the lead.
-     */
-    const yardOffice = options.find((i) => i.type === 'mainline.yardOffice' && i.take === false);
-    if (yardOffice) return because('the bot does not judge the lead into a yard, so it stays at the Office', yardOffice);
+    if (clearance) return because('the Superintendent must rule on a following train (§8.1)', clearance);
 
     // Red Flags come before anything else — protection is only worth playing at the moment the
     // collision is actually pending, and that moment passes.
     const flags = worthFlagging(s, options);
-    if (flags) return because('the engine says this arrival collides, and we hold a Red Flag — now or never', flags);
+    if (flags) return because('a train of ours is stopped on a Mainline card with another train on it — Red Flags now or not at all', flags);
 
     // --- Load/Unload: spend every worker, then end. Each is a point, or a step toward one.
     //
@@ -283,13 +183,6 @@ export function makeDeveloperBot(tweaks: BotTweaks): BotPolicy {
         );
         if (match) return because(`the ${w.loaded ? 'loaded' : 'empty'} ${w.type} is what a facility is short of`, match);
       }
-      if (!tweaks.noDeliberateNewTrain) {
-        const move =
-          pickFirst(options, 'newTrain.placeCar', 'newTrain.passCar', 'newTrain.startExtra') ??
-          options.find((i) => i.type !== 'newTrain.secondSection' && i.type !== 'maneuver.redFlags') ??
-          options[0]!;
-        return because('no car on offer is one our facilities need', move);
-      }
       return because('no car on offer is one our facilities need', pickFirst(options, 'newTrain.placeCar', 'newTrain.passCar') ?? options[0]!);
     }
 
@@ -519,7 +412,7 @@ function topOfDepartment(s: GameState, slot: number): string | undefined {
  * In a competitive game the same call reads the other way round — burying a card a rival wants is an
  * attack — which is why the choice belongs to the discarding player and not to the rules.
  */
-function bestDiscard(s: GameState, player: PlayerIndex, options: Intent[], tweaks: BotTweaks): Intent | null {
+function bestDiscard(s: GameState, player: PlayerIndex, options: Intent[]): Intent | null {
   let best: Intent | null = null;
   let bestScore = -Infinity;
   for (const i of options) {
@@ -529,7 +422,7 @@ function bestDiscard(s: GameState, player: PlayerIndex, options: Intent[], tweak
     // two showing whatever they happened to start with. Measured over 100 games — spreading 2.87
     // revenue, concentrating on the deepest 2.67, indifferent 2.67.
     const top = topOfDepartment(s, i.toSlot);
-    const wanted = isWorthTaking(s, player, i.toSlot, tweaks);
+    const wanted = isWorthTaking(s, player, i.toSlot);
     const depth = s.decks.departments[i.toSlot]?.length ?? 0;
     const score = (top === undefined ? 6 : wanted ? -10 : 2) - Math.min(depth, 4) * 0.5;
     if (score > bestScore) {
@@ -541,39 +434,10 @@ function bestDiscard(s: GameState, player: PlayerIndex, options: Intent[], tweak
 }
 
 /** A face-up card worth spending the draw on rather than gambling on the deck. */
-function isWorthTaking(s: GameState, player: PlayerIndex, slot: number, tweaks: BotTweaks): boolean {
-  return takingRank(s, player, slot, tweaks) > 0;
+function isWorthTaking(s: GameState, player: PlayerIndex, slot: number): boolean {
+  return takingRank(s, player, slot) > 0;
 }
 
-/**
- * Could an industry of this kind be laid anywhere right now? Asked of the engine's own placement
- * rule (`canPlaceAt`) and lockout (`isLockedOut`) rather than a copy: an industry is plain east-west
- * track, so the only squares worth asking about are empty ones east or west of a card already down.
- */
-function industrySiteExists(s: GameState, player: PlayerIndex, kind: FreightKind): boolean {
-  const area = areaOf(s, player);
-  if (isLockedOut(area, kind)) return false;
-  const probe = {
-    geometry: { kind: 'facility', facility: kind },
-    baseOperationalRail: true,
-    standing: [],
-    standingWest: 0,
-    facility: null,
-    modifiers: [],
-    enhancements: [],
-  } as unknown as TrackCard;
-  for (const key of area.grid.keys()) {
-    const [row, col] = key.split(',').map(Number);
-    for (const dc of [1, -1]) {
-      const at = { row: row!, col: col! + dc };
-      if (at.row === area.runningRow || area.grid.has(coordKey(at))) continue;
-      if (canPlaceAt(area, at, probe)) return true;
-    }
-  }
-  return false;
-}
-
-
 /**
  * HOW BADLY the face-up card is wanted. 0 means not worth the draw.
  *
@@ -581,18 +445,14 @@ function industrySiteExists(s: GameState, player: PlayerIndex, kind: FreightKind
  * happened to be scanned first — a coin flip on the card that decides whether the district ever
  * becomes a Passenger Facility at all.
  */
-function takingRank(s: GameState, player: PlayerIndex, slot: number, tweaks: BotTweaks): number {
+function takingRank(s: GameState, player: PlayerIndex, slot: number): number {
   const id = topOfDepartment(s, slot);
   if (!id) return 0;
   const k = s.cards.get(id)?.kind;
   if (!k) return 0;
   if (k.kind === 'office') return nextOfficeTier(areaOf(s, player).tier) === k.tier ? 3 : 0;
-  if (k.kind === 'timetabledTrain' || k.kind === 'extraTrain') {
-    return !tweaks.noPlayableTakes && trainWouldOverfillTheOffice(s, player, tweaks) ? 0 : 2;
-  }
-  if (k.kind === 'freightFacility') {
-    return !tweaks.noPlayableTakes && !industrySiteExists(s, player, k.facility) ? 0 : 1;
-  }
+  if (k.kind === 'timetabledTrain' || k.kind === 'extraTrain') return 2;
+  if (k.kind === 'freightFacility') return 1;
   return 0;
 }
 
@@ -855,104 +715,6 @@ function bestFacilityPlay(s: GameState, player: PlayerIndex, options: Intent[]):
   return best;
 }
 
-/**
- * WHAT A DISTRICT'S TRACK IS WORTH FOR WHAT IT LETS HAPPEN NEXT — the default since 2026-09-15;
- * `noValueLays` turns it off.
- *
- * `bestTrackLay` scores the PIECE — its shape and where it sits — and cannot tell one that opens an
- * industry site or closes a run-around from one that merely fills a square. This scores the LAYOUT the
- * piece would leave, so a lay is worth the difference it makes. Every term is something the rules turn
- * into play: a site is somewhere a held industry can go; a run-around lets a crew pass its own cars
- * (§A.5); a way off the main is the only road to either; a Running Track straight is what Interlocking
- * needs. The weights are a starting point to measure, not a result.
- */
-function layoutValue(area: OfficeArea): number {
-  let v = 0;
-  const reachable = reachableOffMain(area);
-  v += Math.min(reachable.size, 12) * 0.2;
-
-  let ways = 0;
-  let loops = 0;
-  for (const side of SIDES) {
-    for (const col of waysOff(area, side)) {
-      ways++;
-      if (descendFrom(area, col, side).rejoins.size > 0) loops++;
-    }
-  }
-  v += [0, 1.5, 2, 2.5][Math.min(ways, 3)]!;
-  if (loops > 0) v += 6 + Math.min(loops - 1, 1) * 2;
-
-  // Squares an industry could legally be laid on, joined to track a crew can reach.
-  const probe = protoCard({ kind: 'freightFacility', facility: 'mineTipple' }, 0)!;
-  const tried = new Set<string>();
-  let sites = 0;
-  for (const key of reachable) {
-    const [row, col] = key.split(',').map(Number);
-    for (const dc of [1, -1]) {
-      const at = { row: row!, col: col! + dc };
-      const k = coordKey(at);
-      if (tried.has(k) || area.grid.has(k) || at.row === area.runningRow) continue;
-      tried.add(k);
-      if (canPlaceAt(area, at, probe)) sites++;
-    }
-  }
-  v += [0, 2, 3, 3.5][Math.min(sites, 3)]!;
-
-  let mainStraight = false;
-  for (const [key, card] of area.grid) {
-    if (Number(key.split(',')[0]) !== area.runningRow || card.geometry.kind !== 'track') continue;
-    if (card.geometry.geometry === 'straight') mainStraight = true;
-    // A turnout on the main whose leg joins nothing is a hole in the Running Track with no road behind it.
-    if (card.geometry.geometry === 'turnout') {
-      const col = Number(key.split(',')[1]);
-      for (const side of SIDES) {
-        if (!hasPort(card, legPort(side))) continue;
-        const beyond = area.grid.get(`${area.runningRow + side},${col}`);
-        if (!beyond || !joins(card, legPort(side), beyond)) v -= 0.5;
-      }
-    }
-  }
-  if (mainStraight) v += 1.5;
-  return v;
-}
-
-/**
- * The track lay worth most by `layoutValue`, placed on a copy of the district exactly as the reducer
- * places it (`protoCard`, `extendLimitsIfNeeded`). With `mustBuild`, only a lay that gains something is
- * offered, which is the slot `bestTrackLay` fills; without it, the best of whatever is legal, which is
- * the slot the "play what is in hand" fallback fills. Ties go to the square nearer the Office.
- */
-function bestValuedLay(s: GameState, player: PlayerIndex, options: Intent[], mustBuild: boolean): Intent | null {
-  const area = areaOf(s, player);
-  const base = layoutValue(area);
-  let best: Intent | null = null;
-  let bestScore = -Infinity;
-  for (const i of options) {
-    if (i.type !== 'card.play' || i.placement === undefined) continue;
-    const kind = s.cards.get(i.cardId)?.kind;
-    if (kind?.kind !== 'track') continue;
-    const built = protoCard(kind, i.variant);
-    if (!built) continue;
-    const after: OfficeArea = {
-      ...area,
-      grid: new Map(area.grid),
-      limitsWest: { ...area.limitsWest },
-      limitsEast: { ...area.limitsEast },
-    };
-    after.grid.set(coordKey(i.placement), built);
-    extendLimitsIfNeeded(after, i.placement);
-    const gain = layoutValue(after) - base;
-    if (mustBuild && gain <= 0.1) continue;
-    const distance = Math.abs(i.placement.row - area.officeCoord.row) * 2 + Math.abs(i.placement.col - area.officeCoord.col);
-    const score = gain - distance * 0.01;
-    if (score > bestScore) {
-      bestScore = score;
-      best = i;
-    }
-  }
-  return best;
-}
-
 function bestTrackLay(s: GameState, player: PlayerIndex, options: Intent[]): Intent | null {
   const area = areaOf(s, player);
 
@@ -1255,20 +1017,19 @@ function facilityWantsAt(
 }
 
 /**
- * §Q, RED FLAGS (Gitea#19) — spent only at the moment of danger.
- *
- * The card was redefined: it plants a directional flag on your own Limits rather than protecting a
- * stopped train out on the Mainline, so the old heuristic ("is a train of ours sharing a Mainline
- * card") no longer describes anything the card does.
- *
- * The bot now flags ONLY through the out-of-phase prompt, which the engine raises exactly when an
- * arrival would collide (`redFlagStop`). That is a better policy than the old one and a much
- * simpler one: the engine has already established the danger, so there is nothing for the bot to
- * judge. It never plants a flag speculatively — it cannot tell whether it wants time to switch, and
- * a flag spent early is a flag not there when a train is actually bearing down.
+ * Red Flags — "any time". Worth spending only when a train of ours is stopped out on the Mainline
+ * with another train on the same card, which is the situation that becomes a rear-ender.
  */
-function worthFlagging(_s: GameState, options: Intent[]): Intent | null {
-  return options.find((i) => i.type === 'mainline.redFlag' && i.flag === true) ?? null;
+function worthFlagging(s: GameState, options: Intent[]): Intent | null {
+  for (const i of options) {
+    if (i.type !== 'maneuver.redFlags') continue;
+    const tray = s.trays.get(i.trayId);
+    if (!tray || tray.position.at !== 'mainline') continue;
+    const node = s.division.nodes[tray.position.index];
+    if (node?.kind !== 'mainline') continue;
+    if (node.transits.length > 1) return i;
+  }
+  return null;
 }
 
 /** A one-line account of which Load/Unload action was taken, and why it ranked first. */
@@ -1425,7 +1186,7 @@ function followThrough(
       if (!turnOf(s, player).drawnThisTurn) {
         const piles = options.filter(
           (i): i is Extract<Intent, { type: 'draw.fromDepartment' }> =>
-            i.type === 'draw.fromDepartment' && isWorthTaking(s, player, i.slot, tweaks),
+            i.type === 'draw.fromDepartment' && isWorthTaking(s, player, i.slot),
         );
         // Best-ranked pile rather than the first that qualifies: an Office card and a train card
         // both "qualify", and only one of them stops the collisions.
@@ -1433,7 +1194,7 @@ function followThrough(
         // and a train card are face up together 1.6 decisions a game — but ranking them is what the
         // ranking function is for, and a coin flip on the card that decides whether the district
         // ever becomes a Passenger Facility is not worth keeping for its own sake.
-        const useful = piles.sort((a, b) => takingRank(s, player, b.slot, tweaks) - takingRank(s, player, a.slot, tweaks))[0];
+        const useful = piles.sort((a, b) => takingRank(s, player, b.slot) - takingRank(s, player, a.slot))[0];
         if (useful) return because('a face-up card is worth more than a blind draw right now', useful);
         const blind = options.find((i) => i.type === 'draw.fromHomeOffice');
         if (blind) return because('no face-up card is worth taking — gamble on the deck', blind);
@@ -1494,7 +1255,7 @@ function followThrough(
       // STRAIGHTS that Enhancements require, and no Freight Facility has anywhere to go until a
       // district exists. Measured with track absent, the hand held a playable Enhancement on 4,778
       // turns and could legally place one on 33.
-      const track = !tweaks.noValueLays ? bestValuedLay(s, player, options, true) : bestTrackLay(s, player, options);
+      const track = bestTrackLay(s, player, options);
       if (track) return because('lay track — nothing else creates the straights Enhancements need or the spurs freight needs', track);
 
       // Then real development: a card actually laid into the grid. Freight facilities are scored —
@@ -1519,27 +1280,17 @@ function followThrough(
           s.cards.get(i.cardId)?.kind.kind !== 'track',
       );
       if (placed) return because('develop the district with a card that goes on the board', placed);
-      const play = !tweaks.noValueLays
-        ? options.find((i) => i.type === 'card.play' && s.cards.get(i.cardId)?.kind.kind !== 'track') ??
-          bestValuedLay(s, player, options, false)
-        : options.find((i) => i.type === 'card.play');
+      const play = options.find((i) => i.type === 'card.play');
       if (play) return because('play what is in hand', play);
       const end = options.find((i) => i.type === 'draw.end');
       if (end) return because('nothing in hand can be played anywhere legal', end);
       return because(
         'nothing playable — discard onto the Department whose face-up card is least worth keeping reachable',
-        bestDiscard(s, player, options, tweaks) ?? pickFirst(options, 'card.discard') ?? options[0]!,
+        bestDiscard(s, player, options) ?? pickFirst(options, 'card.discard') ?? options[0]!,
       );
     }
 
     case 'switch': {
-      // The planner decides the whole turn; the rules below are its fallback if the position is ever
-      // not the one it planned for, and the whole of switching under `noPlanSwitching`.
-      if (!tweaks.noPlanSwitching) {
-        const planned = plannedSwitch(s, player, options, tweaks);
-        if (planned) return planned;
-      }
-
       /**
        * A MOVE THAT DRAGS THE CREW'S OWN CUT BACK ON IS A WASTED MOVE, so take those off the table
        * before any heuristic gets to choose one.
@@ -2110,37 +1861,8 @@ export function playGame(
     tally(pumpFn(s));
     if (s.status === 'finished') break;
 
-    /**
-     * §3.3, EXTENDED PLAY (Gitea#11) — a simulated game plays the timetable it was dealt.
-     *
-     * DECIDED BY THE DRIVER, not by the policy, and that distinction is the whole point. A bot that
-     * is merely handed the two votes among its legal options will sometimes take another Day —
-     * `randomBot` does so half the time — and since the table can go on granting Days for ever, the
-     * game then runs until `maxTurns`. That is not a hypothetical: it turned `test/sim.test.ts` from
-     * under a second into an unbounded hang, because every seeded game in the harness suddenly played
-     * fifty thousand turns instead of two hundred.
-     *
-     * The harness exists to measure games of a configured length against a configured floor, so
-     * "would you like more Days?" has one answer here whatever the policy. `developerBot` declines on
-     * its own account too, which is what the server relies on when a table is all bots; this is the
-     * guarantee that holds for every OTHER policy, including ones not written yet.
-     */
-    if (s.status === 'awaitingExtension') {
-      const voter = s.extensionVotes.findIndex((v) => v === null);
-      if (voter < 0) break;
-      const decline: Intent = { type: 'game.extend', player: voter, agree: false };
-      intents.push(decline.type);
-      history.push(decline);
-      const declined = applyIntent(s, voter, decline);
-      // A broken invariant, not a game ending early: the status says a vote is pending and `voter` is
-      // a seat that has not cast one. Thrown rather than broken out of, matching the illegal-action
-      // check below — silently returning a short game is how a dead replay looks like a real one.
-      if (!declined.ok) throw new Error(`the extension vote was refused with ${declined.code}`);
-      tally(declined.events);
-      continue;
-    }
-
-    const actor = actingPlayer(s);
+    const actor =
+      s.clock.pendingDecision !== null ? s.clock.superintendent : s.clock.currentActor;
     if (actor === null) break;
 
     const options = legalActions(s, actor);

src/sim/compare.ts

@@ -23,7 +23,6 @@
  * Run with:
  *   node src/sim/compare.ts 1600 noTrainCap=1        — what the A/D cap is worth today
  *   node src/sim/compare.ts 1600 noOperateFirst=1    — what operating before drawing is worth
- *   node src/sim/compare.ts 1600 noPlanSwitching=1   — what planning the switching turn is worth
  *
  * The flags are ABLATIONS: they turn off heuristics the bot already plays, so a negative delta is
  * the heuristic earning its place. That is what a measured bot needs going forward — the question
@@ -32,12 +31,6 @@
 
 import { pump } from '../engine/advance.ts';
 import { createGame } from '../engine/setup.ts';
-import {
-  DEFAULT_MAX_COLLISIONS_PER_DAY,
-  DEFAULT_MAX_COLLISIONS_TOTAL,
-  collectiveRevenueFloor,
-  lengthProfile,
-} from '../engine/content.ts';
 import type { GameLength } from '../engine/content.ts';
 import type { GameConfig, GameMode } from '../engine/state.ts';
 import type { BotPolicy, BotTweaks } from './bot.ts';
@@ -63,23 +56,17 @@ export type PairedResult = {
   variantStats: GameStats[];
 };
 
-// Always one bot (`runOne` below), so the revenue floor is `collectiveRevenueFloor(1, days)`.
-const SOLO = (length: GameLength, mode: GameMode): GameConfig => {
-  const days = lengthProfile(length).days;
-  return {
-    mode,
-    days,
-    minCombinedRevenue: collectiveRevenueFloor(1, days),
-    maxCollisionsPerDay: DEFAULT_MAX_COLLISIONS_PER_DAY,
-    maxCollisionsTotal: DEFAULT_MAX_COLLISIONS_TOTAL,
-    pvpCardsAllowed: false,
-    optionalRules: {
-      reducedVisibility: false,
-      employeeRotation: false,
-      emergencyToolbox: false,
-    },
-  };
-};
+const SOLO = (length: GameLength, mode: GameMode): GameConfig => ({
+  mode,
+  victory: 'highestAfterDays',
+  length,
+  optionalRules: {
+    reducedVisibility: false,
+    sisterTrains: false,
+    employeeRotation: false,
+    emergencyToolbox: false,
+  },
+});
 
 /**
  * One game, one seed, one policy.
@@ -222,7 +209,7 @@ export function formatPaired(r: PairedResult): string {
  * against itself and report a confident zero, which is the most expensive way this tool could fail.
  */
 export const NUMERIC_TWEAKS = new Set<string>([]);
-export const BOOLEAN_TWEAKS = new Set(['noTrainCap', 'noOperateFirst', 'noPlanSwitching', 'noPlayableTakes', 'noValueLays', 'noDeliberateNewTrain']);
+export const BOOLEAN_TWEAKS = new Set(['noTrainCap', 'noOperateFirst']);
 
 export function parseTweaks(args: string[]): BotTweaks {
   const tweaks: Record<string, number | boolean> = {};

src/sim/display-step.ts

@@ -1,134 +0,0 @@
-/**
- * THE DISPLAY-STEP COLLECTOR — v0.8.0, `docs/plans/jitsi-common-board.md` § v0.8.0 §§ 1-3.
- *
- * One ordered, watchable presentation step per accepted intent, so a player can see what everyone
- * else did instead of finding the board already rearranged. TODO #13: *"It's not fun to do my turn
- * and have magic happen in the background and then have to figure out what others did."*
- *
- * ONE HOOK, NOT TWO. The design anticipated wiring this into `GameSession.intent()` and
- * `GameSession.driveBots()` separately, with `LocalSession` doing its own thing for solitaire. It
- * does not need to: `src/server/session.ts` imports `submit` from `src/web/game.ts`, so solitaire,
- * live multiplayer and every bot turn already funnel through ONE function. Collecting there is what
- * makes solitaire a special case of multiplayer rather than a second implementation, which is the
- * standing design direction for this codebase.
- *
- * AND REPLAY IS INERT FOR FREE. `fromSave` and `fromMultiplayerSave` rebuild a game by calling
- * `applyIntent` + `record` + `drain` directly rather than `submit`, so a resumed server or a rebuilt
- * undo does NOT re-emit the whole game as steps. That was expected to need an explicit guard — the
- * plan calls it out as the same class of bug as #97, a mechanism firing on a path nobody pictured
- * it running on. It needs none, but the property is load-bearing: **if a replay path is ever moved
- * onto `submit()`, this becomes a real bug**, and `test/watchable.test.ts` pins it.
- *
- * WHAT A STEP IS. One accepted intent, or ONE AUTOMATIC PHASE — never one per `GameEvent`, because
- * the event list is not a complete reducer and a receiver could not rebuild state from it. It gets a
- * projected frame instead.
- *
- * PHASES EARN THEIR OWN STEPS, and that is TODO #18. `pump()` runs every automatic phase between one
- * click and the next and `drain()` records the whole batch at once, so New Train, the Mainline and
- * the shift change "look like they are being skipped entirely" — trains cross the Division in one
- * jump. Folding them into the triggering intent's step reproduces exactly that. So `submit()` steps
- * `advance()` one call at a time instead, and collects a step for each phase that actually DID
- * something. A phase that did nothing adds no narration and therefore produces no step at all, which
- * is Jesse's own rule (2026-09-09): "if nothing happens during a phase then we shouldn't lose time
- * to it."
- *
- * `drain()` is deliberately NOT changed. Replay, undo and `fromSave` all use it, and the
- * replay-inertness property below depends on their staying off this path. The stepped version lives
- * in `submit()` and makes the same `advance()` calls in the same order, so the resulting state is
- * identical — only the collection differs.
- */
-
-import type { Intent } from '../engine/intents.ts';
-import type { GameState, PlayerIndex, SeatIndex } from '../engine/state.ts';
-import { seatOf } from '../engine/state.ts';
-import { publicSnapshot } from './view.ts';
-import type { PublicFrame } from './view.ts';
-import { deltaPublicFrame } from './public-delta.ts';
-import type { PublicFrameDelta } from './public-delta.ts';
-
-/**
- * The wire format's version, on the ENVELOPE rather than on the projection.
- *
- * The plan's original sketch put `protocolVersion` inside `PublicFrame`. It does not belong there:
- * `PublicFrame` is a projection of the game and its property list is an allow-list that
- * `test/redaction.test.ts` enumerates, so a transport concern living in it would have to be
- * allow-listed as public game state, which it is not. The step is the message; the message carries
- * the version.
- */
-export const DISPLAY_PROTOCOL_VERSION = 1;
-
-/** What produced a step: somebody's intent, or the Division advancing a phase by itself. */
-export type StepCause = Intent['type'] | 'phase';
-
-/** One watchable thing that happened, in order. */
-export type DisplayStep = {
-  protocolVersion: typeof DISPLAY_PROTOCOL_VERSION;
-  /** Monotonic per game. 0.8.1's reconnecting display stream needs it to detect a gap; a queue only needs the order. */
-  seq: number;
-  /**
-   * Who acted — NULL for an automatic phase, which nobody did.
-   *
-   * Both are carried because Employee Rotation makes "which seat" and "which player" different
-   * questions.
-   */
-  player: PlayerIndex | null;
-  seat: SeatIndex | null;
-  /** What caused it — the input to pacing's kind classification. */
-  cause: StepCause;
-  /** The public board after this intent and everything it drained, against the previous step. */
-  frame: PublicFrameDelta;
-  /** The narration this intent added, in order, including any phase lines drained behind it. */
-  lines: { text: string; tone: string }[];
-};
-
-/**
- * Per-game collector state.
- *
- * Held on `Game` beside `log`, `cues` and `announced` and drained the same way, which is the
- * established convention in this codebase for "the model accumulated something, the view takes it".
- */
-export type DisplayCollector = {
-  /** Undrained steps, oldest first. */
-  steps: DisplayStep[];
-  /** The last public frame a step was built against, so the next delta has something to diff. */
-  last: PublicFrame | null;
-  /** Next sequence number to assign. */
-  seq: number;
-};
-
-export function newCollector(): DisplayCollector {
-  return { steps: [], last: null, seq: 0 };
-}
-
-/**
- * Record one accepted intent as a step.
- *
- * Called from `submit()` AFTER `record()` and `drain()`, so `state` is the position the intent
- * finally produced and `lines` is everything it caused to be said. The frame is projected
- * immediately and never from a retained `GameState` reference — a retained reference would resolve
- * to the FINAL state of a whole bot run, which is exactly the teleporting this exists to prevent.
- */
-export function collectStep(
-  collector: DisplayCollector,
-  state: GameState,
-  player: PlayerIndex | null,
-  cause: StepCause,
-  lines: { text: string; tone: string }[],
-): void {
-  const next = publicSnapshot(state);
-  collector.steps.push({
-    protocolVersion: DISPLAY_PROTOCOL_VERSION,
-    seq: collector.seq++,
-    player,
-    seat: player === null ? null : seatOf(state, player),
-    cause,
-    frame: deltaPublicFrame(collector.last, next),
-    lines,
-  });
-  collector.last = next;
-}
-
-/** Take everything collected so far, leaving the collector empty — `takeMoment()`'s pattern. */
-export function takeSteps(collector: DisplayCollector): DisplayStep[] {
-  return collector.steps.splice(0, collector.steps.length);
-}

src/sim/frame-delta.ts

@@ -1,53 +0,0 @@
-/**
- * Live per-seat Frame delta — Phase 2 of `docs/architecture/multiplayer.md`.
- *
- * `src/sim/replay.ts`'s `compress()` looked like the thing to reuse here (D2/D3's "2.9 KB per push
- * with the board omitted when unchanged" cites it) but it solves a different problem: it interns
- * card/description strings across a WHOLE recorded array of frames, which only pays off when
- * bundling many frames into one replay file. A live server pushes one frame at a time and has
- * nothing to intern against. The part that genuinely carries over is much smaller — a one-step-back
- * "null if unchanged since the last thing sent to THIS seat" check on the three fields that make up
- * almost all of a Frame's size: `cells`, `facilities`, `division` (`replay.ts`'s own `keys` array).
- *
- * Node-free by design, unlike `replay.ts` (which imports `node:fs`) — both the server and a browser
- * `RemoteSession` import this file directly.
- */
-
-import type { CellView, DivisionView, FacilityView, Frame } from './view.ts';
-
-/** A `Frame` with the three board-shaped fields replaced by `null` where unchanged since `previous`. */
-export type FrameDelta = Omit<Frame, 'cells' | 'facilities' | 'division'> & {
-  cells: CellView[] | null;
-  facilities: FacilityView[] | null;
-  division: DivisionView[] | null;
-};
-
-const BOARD_KEYS = ['cells', 'facilities', 'division'] as const;
-
-/**
- * `previous` is the last Frame actually sent to THIS seat, or `null` for a first connect / a
- * reconnect after a gap — Phase 2 has no persistence to replay a gap against (Phase 3), so a
- * reconnect always gets a full Frame here rather than a delta.
- */
-export function deltaFrame(previous: Frame | null, next: Frame): FrameDelta {
-  const out = { ...next } as unknown as FrameDelta;
-  for (const key of BOARD_KEYS) {
-    const unchanged = previous !== null && JSON.stringify(previous[key]) === JSON.stringify(next[key]);
-    (out as Record<string, unknown>)[key] = unchanged ? null : next[key];
-  }
-  return out;
-}
-
-/** The receiving side: merges a delta back onto the last full Frame this seat actually has. */
-export function applyDelta(previous: Frame | null, delta: FrameDelta): Frame {
-  const out = { ...delta } as unknown as Frame;
-  for (const key of BOARD_KEYS) {
-    if (delta[key] === null) {
-      if (previous === null) {
-        throw new Error(`deltaFrame said "${key}" is unchanged, but there is no previous Frame to merge onto`);
-      }
-      (out as Record<string, unknown>)[key] = previous[key];
-    }
-  }
-  return out;
-}

src/sim/harness.ts

@@ -12,12 +12,7 @@
  */
 
 import { pump } from '../engine/advance.ts';
-import {
-  DEFAULT_MAX_COLLISIONS_PER_DAY,
-  DEFAULT_MAX_COLLISIONS_TOTAL,
-  collectiveRevenueFloor,
-  lengthProfile,
-} from '../engine/content.ts';
+import { collectiveRevenueFloor, lengthProfile } from '../engine/content.ts';
 import { createGame } from '../engine/setup.ts';
 import type { GameLength } from '../engine/content.ts';
 import type { GameConfig, GameMode } from '../engine/state.ts';
@@ -65,17 +60,14 @@ function statsOf(xs: number[]): Stats {
   };
 }
 
-function configFor(mode: GameMode, length: GameLength, players: number): GameConfig {
-  const days = lengthProfile(length).days;
+function configFor(mode: GameMode, length: GameLength): GameConfig {
   return {
     mode,
-    days,
-    minCombinedRevenue: collectiveRevenueFloor(players, days),
-    maxCollisionsPerDay: DEFAULT_MAX_COLLISIONS_PER_DAY,
-    maxCollisionsTotal: DEFAULT_MAX_COLLISIONS_TOTAL,
-    pvpCardsAllowed: false,
+    victory: 'highestAfterDays',
+    length,
     optionalRules: {
       reducedVisibility: false,
+      sisterTrains: false,
       employeeRotation: false,
       emergencyToolbox: false,
     },
@@ -91,7 +83,7 @@ export function simulate(opts: SimOptions): SimReport {
     const s = createGame({
       id: `sim-${i}`,
       seed,
-      config: configFor(opts.mode, opts.length, opts.players.length),
+      config: configFor(opts.mode, opts.length),
       playerNames: opts.players,
     });
     // The probe watches the game as it is played: the funnel gates are conditions at a moment, not
@@ -162,7 +154,7 @@ export function formatReport(r: SimReport, length: GameLength, players: number):
 
   // The provisional numbers this exists to test.
   out.push('\n  against the provisional targets:');
-  out.push(`    ${profile.days} Days`);
+  out.push(`    target ${profile.target} over ${profile.days} Days`);
   out.push(
     `    predicted ~5-6 revenue/player/Day steady state; observed mean ` +
       `${r.revenuePerPlayerPerDay.mean.toFixed(1)}`,

src/sim/narrate.ts

@@ -15,13 +15,11 @@
  * panel cannot drift from the rules.
  */
 
-import { MAINLINE_PROFILES, MAX_CONSIST, crewTrayCount } from '../engine/content.ts';
+import { MAX_CONSIST } from '../engine/content.ts';
 import { adTrackCount, coordKey, seatOf, turnOf } from '../engine/state.ts';
 import type { GameState, GridCoord, PlayerIndex, RollingStock, SeatIndex, TrayId } from '../engine/state.ts';
-import { areaOf, canAdvanceLoad, canBoard, canDetrain, canStartLoad, facilityCarType, facilityCarTypes, freightRuleSpentHere, isFreight, laborersLeft, movesFor, passengerRefusal, portersLeft } from '../engine/apply.ts';
+import { areaOf, canAdvanceLoad, canBoard, canDetrain, canStartLoad, facilityCarType, facilityCarTypes, laborersLeft, movesFor, passengerRefusal, portersLeft } from '../engine/apply.ts';
 import type { GameEvent } from '../engine/events.ts';
-import { badlyMadeUp } from '../engine/advance.ts';
-import type { CrewTray } from '../engine/state.ts';
 
 // ---------------------------------------------------------------------------
 // Small formatters
@@ -52,23 +50,6 @@ export function carLabel(c: RollingStock, homeSeat?: SeatIndex): string {
   return homeSeat !== undefined && c.origin === homeSeat ? `${label} (loaded here)` : label;
 }
 
-/**
- * "a loaded boxcar", "an empty tank" — the article the word actually takes.
- *
- * The make-up line hard-coded "a" and produced "a empty tank" at the table. Vowel-initial is the
- * whole rule here: every car word is ordinary English ('empty', 'loaded', and the car types), so
- * there is no 'an hour' case to special-case and inventing one would be the more fragile choice.
- */
-export function indefinite(label: string): string {
-  return `${/^[aeiou]/i.test(label) ? 'an' : 'a'} ${label}`;
-}
-
-/** "Train 10" / "Extra X18" — one spelling of a train's name for every line that mentions one. */
-export function trainLabel(trainNumber: number | null, isExtra: boolean): string {
-  if (trainNumber === null) return 'the local crew';
-  return isExtra ? `Extra X${trainNumber}` : `Train ${trainNumber}`;
-}
-
 export function carsLabel(cars: RollingStock[]): string {
   if (cars.length === 0) return 'nothing';
   return cars.map(carLabel).join(', ');
@@ -122,53 +103,16 @@ export type NarrateContext = {
    * game, phrased in internal identifiers.
    */
   trainName?: (trayId: TrayId) => string;
-  /**
-   * Resolves a player index to their display name. Optional like the rest: an engine test narrating
-   * events has no roster, and "Player 2" is a truthful fallback rather than a broken one.
-   */
-  playerName?: (player: PlayerIndex) => string;
-  /**
-   * Names the Facility standing on one of a player's squares, or null where there is none.
-   *
-   * Switching lines used to give the bare coordinate — "Set out a loaded hopper at (-1,1)" — which
-   * is the grid's own notation and means nothing at a table where people are looking at cards. The
-   * industry is the whole point of the move, so it is what the line should say.
-   */
-  facilityAt?: (player: PlayerIndex, at: GridCoord) => string | null;
 };
 
 export function narrate(e: GameEvent, ctx: NarrateContext = {}): Narration {
   const card = (id: string): string => ctx.cardName?.(id) ?? 'a card';
   const train = (id: TrayId): string => ctx.trainName?.(id) ?? String(id);
-  // The industry on a square when there is one, and the coordinate when there is not — a crew works
-  // plain track too, and "at nowhere" would be worse than the notation.
-  const place = (player: PlayerIndex, c: GridCoord): string => ctx.facilityAt?.(player, c) ?? at(c);
 
   switch (e.type) {
     // -- clock
     case 'stageBegan':
       return { tone: 'clock', text: `── Day ${e.day}, Stage ${e.stage} — ${clockTime(e.stage)} ──` };
-    case 'seatsRotated':
-      // Named players rather than seat numbers: the rule is that everyone MOVED, and a list of
-      // indices does not say who is now next to whom.
-      return {
-        tone: 'clock',
-        text: `Employee Rotation — everyone moves one chair left. West to East: ${e.seating
-          .map((p) => ctx.playerName?.(p) ?? `Player ${p + 1}`)
-          .join(' → ')}`,
-      };
-    case 'superintendentChanged':
-      /**
-       * The Fedora is the only thing in the game that changes hands on a clock rather than because
-       * somebody did something, so it is the one handover nobody at the table watches happen.
-       */
-      return {
-        tone: 'clock',
-        text:
-          `SUPERINTENDENT — the Fedora passes to ${ctx.playerName?.(e.player) ?? 'the next player'} ` +
-          `at the end of Stage ${e.stage}. They rule on clearances, take the Yard Office and Red Flag ` +
-          `questions, and every round that goes round the table now starts with them.`,
-      };
     case 'phaseBegan':
       // Its own tone, not `quiet`. A phase marker sat in the same grey as the events inside it, so
       // the log read as one undifferentiated column and you could not see where a phase began.
@@ -176,7 +120,7 @@ export function narrate(e: GameEvent, ctx: NarrateContext = {}): Narration {
     case 'actorChanged':
       return {
         tone: 'quiet',
-        text: e.player === null ? 'No player acts — automatic phase' : 'to act',
+        text: e.player === null ? 'No player acts — automatic phase' : `Player ${e.player} to act`,
       };
 
     // -- local operations
@@ -197,11 +141,7 @@ export function narrate(e: GameEvent, ctx: NarrateContext = {}): Narration {
       return {
         tone: 'plain',
         where: e.to,
-        // NO TUTORIAL TAIL. "The crew chip on the grid carries the whole train with it" was appended
-        // to EVERY move — six times a turn, and the opener (`localOpsOptionChosen`) already says it
-        // once. It also pushed the useful half of the line out of the caption row, which shows one
-        // step at a time and is the place a player reads a move as it happens.
-        text: `Moved ${train(e.trayId)} ${at(e.from)} → ${place(e.player, e.to)}${e.via ? ` via ${at(e.via)}` : ''} — ${e.movesRemaining} of ${e.movesAllowed} Moves left`,
+        text: `CREW moved ${at(e.from)} → ${at(e.to)}${e.via ? ` via ${at(e.via)}` : ''} — ${e.movesRemaining} of 6 Moves left. The crew chip on the grid carries the whole train with it.`,
       };
     case 'carsCoupled': {
       /**
@@ -213,59 +153,22 @@ export function narrate(e: GameEvent, ctx: NarrateContext = {}): Narration {
       const own = e.recoupled?.stock.length ?? 0;
       const found = e.stock.length - own;
       const parts: string[] = [];
-      // `a loaded tank` for one, a bare list for several — "took loaded tank" reads as a telegram.
-      const some = (cars: RollingStock[]): string =>
-        cars.length === 1 ? indefinite(carLabel(cars[0]!)) : carsLabel(cars);
-      if (own > 0) parts.push(`picked its own ${some(e.recoupled!.stock)} back up off ${at(e.recoupled!.at)} on the way out`);
-      if (found > 0) parts.push(`took ${some(e.stock.slice(own))} standing there`);
+      if (own > 0) parts.push(`picked its own ${carsLabel(e.recoupled!.stock)} back up off ${at(e.recoupled!.at)} on the way out`);
+      if (found > 0) parts.push(`coupled ${carsLabel(e.stock.slice(own))} standing on the line`);
       return {
         tone: 'plain',
         where: e.at,
         text:
-          // "1 car(s)" was the plural of a machine. The count is already implied by the cars named
-          // in `parts`, so the sentence leads with where and which end instead.
-          `Coupled at ${place(e.player, e.at)}, ${e.toNose ? 'ONTO THE NOSE' : 'behind the train'}` +
+          `Coupled ${e.stock.length} car(s) at ${at(e.at)} ${e.toNose ? 'ONTO THE NOSE' : 'behind the train'}` +
           ` — ${parts.join(', and ')}`,
       };
     }
-    case 'consistSorted': {
-      /**
-       * WHERE THE ENGINE ENDED UP, and whether the train can still run.
-       *
-       * ASKED OF `badlyMadeUp` RATHER THAN RE-DECIDED HERE, which matters because the obvious guess
-       * is wrong: §8.2 is enforced direction-free, so a train with its WHOLE consist ahead of the
-       * engine is a pushing train and perfectly fit to leave. What it may not be is broken-backed,
-       * with the engine buried among its own cars. A copy of that rule in the narrator would have
-       * told a player their pushing train was stranded when it was not.
-       */
-      const ahead = e.engineAt;
-      const unfit = badlyMadeUp({ consist: e.after, engineAt: e.engineAt } as CrewTray);
-      const where =
-        ahead === 0
-          ? 'so the right car is now on the end and can be spotted'
-          : unfit === null
-            ? `with the whole consist AHEAD of the engine — it runs as a pushing train`
-            : `with ${ahead} car${ahead === 1 ? '' : 's'} ahead of the engine — ${unfit}, so it is held at the Office until it is sorted again (§8.2)`;
+    case 'consistSorted':
       return {
         tone: 'good',
         where: e.at,
-        text: `Used the SMALL YARD — consist re-ordered from [${carsLabel(e.before)}] to [${carsLabel(e.after)}], ${where}`,
+        text: `SMALL YARD — consist re-ordered from [${carsLabel(e.before)}] to [${carsLabel(e.after)}], so the right car is now on the end and can be spotted`,
       };
-    }
-    case 'switchingEnded': {
-      /**
-       * The line that closes a switching turn, and the only one the history keeps from the middle of
-       * it: what it cost, and where the crew was left standing.
-       */
-      const used = `${e.movesUsed} of ${e.movesAllowed} Move${e.movesAllowed === 1 ? '' : 's'} used`;
-      if (e.movesUsed === 0) return { tone: 'quiet', text: 'Finished switching without moving a car' };
-      if (!e.lastMove) return { tone: 'plain', text: `Finished switching — ${used}` };
-      return {
-        tone: 'plain',
-        where: e.lastMove.to,
-        text: `Finished switching — ${used}, leaving ${train(e.lastMove.trayId)} at ${place(e.player, e.lastMove.to)}`,
-      };
-    }
     case 'carsDropped':
       // WHICH END. A cut comes off an outer end (§A.3) and the end decides everything that follows:
       // the train may pull away from cars set out behind it and must couple back up to cars set out
@@ -274,7 +177,7 @@ export function narrate(e: GameEvent, ctx: NarrateContext = {}): Narration {
         tone: 'plain',
         where: e.at,
         text:
-          `Set out ${carsLabel(e.stock)} at ${place(e.player, e.at)}, off the ${e.fromNose ? 'NOSE — ahead of the engine, so pulling forward will couple them again' : 'TAIL — behind the engine, so it may pull away and leave them'}`,
+          `Set out ${carsLabel(e.stock)} at ${at(e.at)}, off the ${e.fromNose ? 'NOSE — ahead of the engine, so pulling forward will couple them again' : 'TAIL — behind the engine, so it may pull away and leave them'}`,
       };
 
     // -- cards
@@ -294,32 +197,17 @@ export function narrate(e: GameEvent, ctx: NarrateContext = {}): Narration {
           ? `Played ${card(e.cardId)} onto ${at(e.placement)}`
           : `Played ${card(e.cardId)}`,
       };
-    case 'mainlineModified': {
-      // WHICH CARD, NOT JUST WHICH WAY IT WENT. "Mainline card 3 converted to plains" left the reader
-      // to remember what card 3 had been (playtest, 2026-09-15), and the card it WAS is the half that
-      // says what the play was worth.
-      const kindName = (k: string | undefined): string =>
-        MAINLINE_PROFILES.find((m) => m.kind === k)?.name ?? k ?? 'that card';
+    case 'mainlineModified':
       return {
         tone: 'plain',
         text: e.became
-          ? `Realignment: Mainline card ${e.node}, ${kindName(e.from)}, converted to ${kindName(e.became)}`
-          : `Played ${e.key} on Mainline card ${e.node}${e.from ? ` (${kindName(e.from)})` : ''}`,
+          ? `Realignment: Mainline card ${e.node} converted to ${e.became}`
+          : `Played ${e.key} on Mainline card ${e.node}`,
       };
-    }
-    case 'redFlagSpent':
-      return {
-        tone: 'good',
-        text: `RED FLAG — Train ${e.trainNumber} stopped short of the ${e.side === 'east' ? 'Eastern' : 'Western'} Limits. The flag comes down with it.`,
-      };
-    case 'redFlagRuled':
-      return e.flag
-        ? { tone: 'plain', text: 'Flagged the approaching train' }
-        : { tone: 'plain', text: 'Waved the train through' };
     case 'redFlagsSet':
       return {
         tone: 'good',
-        text: `RED FLAGS set out on the ${e.side === 'east' ? 'Eastern' : 'Western'} Limits — the next train from that way is held short`,
+        text: `Red Flags set out to protect train ${e.trayId} on Mainline card ${e.node} — an approaching train must stop`,
       };
     case 'flyingSwitch':
       return {
@@ -365,7 +253,7 @@ export function narrate(e: GameEvent, ctx: NarrateContext = {}): Narration {
     case 'secondSectionOrdered':
       return {
         tone: 'bad',
-        text: `SECOND SECTION ordered on Train ${e.trainNumber} — an identical train will run right behind it, which forces the Superintendent to rule on a following train`,
+        text: `SECOND SECTION ordered on Train ${e.trainNumber} — an identical train will run right behind it, which forces the Superintendent to rule on a following train (§8.1)`,
       };
     /**
      * WHERE THE PLAYER PUT IT, not where its number would have sent it.
@@ -426,25 +314,12 @@ export function narrate(e: GameEvent, ctx: NarrateContext = {}): Narration {
        * arrival; the only difference is what happens if it is left on Secondary Track when the next
        * Mainline Phase begins (`expediteFault`).
        */
-      /**
-       * WHOSE OFFICE, AND WHOSE TRAIN TO WORK — Jesse, playtest 2026-09-16.
-       *
-       * This said "ARRIVED at the Whistle Post" and then "You can work it in Cargo now". Both halves
-       * are wrong at a table of four: every seat has an Office, so the tier alone does not say which
-       * district the train is standing in, and the reader is usually NOT its Station Master — the
-       * line was telling three players they could work a train they cannot touch.
-       */
-      {
-        const name = ctx.playerName?.(e.owner) ?? null;
-        const whose = name === null ? `the ${e.office}` : `${name}'s ${e.office}`;
-        const worker = name === null ? 'Its Station Master' : name;
-        return {
-          tone: 'plain',
-          text: e.expedited
-            ? `Train ${e.trainNumber} ARRIVED at ${whose} carrying ${carsLabel(e.consist)} — its card prints EXPEDITE, so it must stay on the Office square: parked anywhere else in that district when the next Mainline Phase begins costs a Revenue point. It works and switches normally in the meantime.`
-            : `Train ${e.trainNumber} ARRIVED at ${whose} carrying ${carsLabel(e.consist)} — it stands there for the rest of this Stage. ${worker} can work it in Cargo now and switch it in the NEXT Stage's Local Operations, and it departs in that Stage's Mainline Phase.`,
-        };
-      }
+      return {
+        tone: 'plain',
+        text: e.expedited
+          ? `Train ${e.trainNumber} ARRIVED at the ${e.office} carrying ${carsLabel(e.consist)} — its card prints EXPEDITE, so keep it on the Office square: parked anywhere else in the district when the next Mainline Phase begins costs a Revenue point. It works and switches normally in the meantime.`
+          : `Train ${e.trainNumber} ARRIVED at the ${e.office} carrying ${carsLabel(e.consist)} — it stands here for the rest of this Stage. You can work it in Cargo now, switch it in the NEXT Stage's Local Operations, and it departs in that Stage's Mainline Phase.`,
+      };
     case 'expediteFault':
       return {
         tone: 'bad',
@@ -493,44 +368,14 @@ export function narrate(e: GameEvent, ctx: NarrateContext = {}): Narration {
       return {
         tone: 'good',
         text: bumped
-          ? `Train ${e.trainNumber} SCHEDULED at Stage ${e.slot + 1} — rolled ${e.roll}, but Stage ${e.roll} was already taken, so it moved down the column to the next free Stage`
+          ? `Train ${e.trainNumber} SCHEDULED at Stage ${e.slot + 1} — rolled ${e.roll}, but Stage ${e.roll} was already taken, so it moved down the column to the next free Stage (§7)`
           : `Train ${e.trainNumber} SCHEDULED to depart at Stage ${e.slot + 1} (rolled ${e.roll}) — it will run at this time EVERY Day from now on`,
       };
     }
     case 'carPlacedOnTrain':
-      // NAMES THE TRAIN. "the train being made up" was true and useless: a player looking back for
-      // what happened to train 10 found four lines that never said 10 (playtest, 2026-09-16).
-      return {
-        tone: 'plain',
-        text: `Added ${indefinite(carLabel(e.stock))} to ${trainLabel(e.trainNumber, e.isExtra)}`,
-      };
+      return { tone: 'plain', text: `Added a ${carLabel(e.stock)} to the train being made up` };
     case 'carPassed':
-      return {
-        tone: 'quiet',
-        text: `Passed on ${trainLabel(e.trainNumber, e.isExtra)} — no suitable car in the Division Yard`,
-      };
-    case 'makeUpShort': {
-      // What it wanted, in the words the card uses, so the line can be checked against the card.
-      const names: Record<'freight' | 'coach' | 'caboose', string> = {
-        freight: 'freight car',
-        coach: 'coach',
-        caboose: 'caboose',
-      };
-      const wants = e.missing.map((m) => names[m]).join(' or ');
-      const got = e.placed === 0 ? 'NO CARS AT ALL' : `only ${e.placed} of the ${e.wanted} its card calls for`;
-      // §2.2 is the whole explanation and it is not guessable from the board: the cars are visible
-      // in the Classification Yard, and why they will not come back is not.
-      const why =
-        e.waiting > 0
-          ? ` ${e.waiting} sit in the Classification Yard, which comes back only when the Division Yard is bare — and it still holds ${e.divisionYardHolds} cars.`
-          : ' There are none in the Classification Yard either.';
-      return {
-        tone: 'bad',
-        text:
-          `${trainLabel(e.trainNumber, e.isExtra).toUpperCase()} WAS MADE UP WITH ${got} — the ` +
-          `Division Yard holds no ${wants} it can take, so nobody was asked for one.${why}`,
-      };
-    }
+      return { tone: 'quiet', text: 'Passed — no suitable car in the Division Yard' };
     case 'dispatchBonusUsed':
       return {
         tone: 'good',
@@ -541,38 +386,19 @@ export function narrate(e: GameEvent, ctx: NarrateContext = {}): Narration {
       // player the score had changed and nothing else.
       const why =
         e.reason === 'no free A/D track'
-          ? `it arrived at ${e.where} with every A/D track already occupied — there was nowhere to put it`
+          ? `it arrived at ${e.where} with every A/D track already occupied — there was nowhere to put it (§8.3)`
           : e.reason === 'cars fouling the Running Track'
-            ? `it ran into cars left standing on ${e.where} between the Limits and the Office`
+            ? `it ran into cars left standing on ${e.where} between the Limits and the Office (§8.3)`
             : e.reason;
       const wrecked = e.trains
         .map((t) => `${t.label} (${t.consist.length ? carsLabel(t.consist) : 'no cars'})`)
         .join(' and ');
-      /**
-       * WHOSE OFFICE, AND WHO PAYS (playtest, 2026-09-16: "it doesn't say who suffers the revenue
-       * loss… we need to know which player received the penalty and why").
-       *
-       * `player` is the seat at fault, and for everything that happens inside a district that is the
-       * district's owner — so it names the place as well as the payer. A Mainline collision is the
-       * Superintendent's by rule (§10), which is a different sentence: it happened on open road, not
-       * in anybody's Office. The 5 points ride in a separate `revenueChanged`, which is why the line
-       * never mentioned them; a player should not have to add two log entries together.
-       */
-      const who = ctx.playerName?.(e.player) ?? null;
-      const mainline = e.where === 'the Mainline';
-      const place = who === null || mainline ? e.where : `${who}'s ${e.where.replace(/^the /, '')}`;
-      const cost =
-        who === null
-          ? ' 5 Revenue is lost.'
-          : mainline
-            ? ` ${who} loses 5 Revenue: §10 makes a Mainline collision the Superintendent's fault.`
-            : ` ${who} loses 5 Revenue — it happened in their district.`;
       return {
         tone: 'bad',
         text:
-          `COLLISION at ${place} — ${wrecked} destroyed: ${why}.${cost} Engines and cabooses go back ` +
-          `to the Division Yard, all other cars to the Classification Yard. A Timetabled train card ` +
-          `returns to its slot and runs again next Day; an Extra is gone for good.`,
+          `COLLISION — ${wrecked} destroyed: ${why}. Engines and cabooses go back to the Division ` +
+          `Yard, all other cars to the Classification Yard (§10). A Timetabled train card returns ` +
+          `to its slot and runs again next Day; an Extra is gone for good.`,
       };
     }
 
@@ -580,7 +406,7 @@ export function narrate(e: GameEvent, ctx: NarrateContext = {}): Narration {
       return {
         tone: 'bad',
         text:
-          `SUPERINTENDENT MUST RULE: ${train(e.trainId)} wants to enter the Mainline card ` +
+          `SUPERINTENDENT MUST RULE (§8.1): ${train(e.trainId)} wants to enter the Mainline card ` +
           `that ${train(e.occupiedBy)} is still crossing. Allow it and ${train(e.trainId)} may run ` +
           `into the back of ${train(e.occupiedBy)} — a collision costs 5 Revenue. Hold it and it ` +
           `waits where it is, losing time but safe.`,
@@ -600,13 +426,13 @@ export function narrate(e: GameEvent, ctx: NarrateContext = {}): Narration {
       return {
         tone: 'good',
         where: e.at,
-        text: `Porter boarded passengers at ${at(e.at)} — one coach per Porter per Stage`,
+        text: `Porter boarded passengers at ${at(e.at)} — one coach per Porter per Stage (§9.2)`,
       };
     case 'passengersDetrained':
       return {
         tone: 'good',
         where: e.at,
-        text: `Porter de-trained passengers at ${at(e.at)} — one coach per Porter per Stage`,
+        text: `Porter de-trained passengers at ${at(e.at)} — one coach per Porter per Stage (§9.2)`,
       };
 
     // -- freight pipeline
@@ -647,23 +473,7 @@ export function narrate(e: GameEvent, ctx: NarrateContext = {}): Narration {
         ? { tone: 'bad', text: `${e.reason.toUpperCase()} · ${e.delta} Revenue (now ${e.total})` }
         : { tone: 'good', text: `+${e.delta} Revenue (now ${e.total}) — ${e.reason}` };
     case 'phaseEnded':
-      return { tone: 'quiet', text: `Finished ${phaseLabel(e.phase)}` };
-
-    // -- §3.3, extended play (Gitea#11)
-    case 'extensionVoted':
-      return e.agree
-        ? { tone: 'plain', text: 'Would play one more Day' }
-        : { tone: 'plain', text: 'Called time — the game ends here' };
-    case 'dayExtended':
-      return { tone: 'clock', text: `── The table plays on: Day ${e.day} is added to the timetable ──` };
-    case 'playConcluded':
-      return { tone: 'clock', text: '── The railroad is put to bed. Final results stand. ──' };
-
-    // -- §11, the Yard Office (Gitea#5)
-    case 'yardOfficeRuled':
-      return e.take
-        ? { tone: 'plain', text: `Sent ${train(e.trainId)} into the Yard Office` }
-        : { tone: 'plain', text: `Kept ${train(e.trainId)} at the Train Order Office` };
+      return { tone: 'quiet', text: `Player ${e.player} finished ${phaseLabel(e.phase)}` };
   }
 }
 
@@ -792,38 +602,6 @@ export function impediments(s: GameState, player: PlayerIndex = 0): Impediment[]
      * that actually refused rather than a second guess at it.
      */
     if (f.kind === 'passenger') {
-      /**
-       * NOBODY TO PUT ON THE PLATFORM, AND NO WAY TO SEE WHY (playtest, 2026-09-16).
-       *
-       * "He would like to have two passengers waiting in his depot… but the only option he had was
-       * bringing a tank load into the refinery." His Depot had a Restaurant and a Hotel beside it and
-       * three outbound slots — capacity was never the problem. §6.3 stocking takes a LOADED car of
-       * the facility's type out of the Division Yard, and there was not a loaded coach in it: six
-       * were sitting in Classification, which §2.2 returns only when the Division Yard runs bare.
-       *
-       * Jesse's ruling (2026-09-16) is the same one Gitea#2 got: the shortage stays, because running
-       * out is part of the game. What must not stay is the silence — an action with no legal target
-       * is simply absent from the menu, so the player is left to guess whether they misunderstood the
-       * rules or the game is broken.
-       */
-      if (f.allows.outbound && f.outboundBox.length < f.capacity.outbound) {
-        const loadedCoaches = s.yards.divisionYard.filter((c) => c.type === 'coach' && c.loaded).length;
-        if (loadedCoaches === 0) {
-          const waiting = s.yards.classificationYard.filter((c) => c.type === 'coach' && c.loaded).length;
-          out.push({
-            where: `${name} ${key}`,
-            why:
-              `room for ${f.capacity.outbound - f.outboundBox.length} more passenger` +
-              `${f.capacity.outbound - f.outboundBox.length === 1 ? '' : 's'} to wait, but no loaded ` +
-              `coach in the Division Yard for the Freight Agent to bring over` +
-              (waiting > 0
-                ? ` — ${waiting} ${waiting === 1 ? 'is' : 'are'} in the Classification Yard, which comes ` +
-                  'back only when the Division Yard is bare'
-                : ''),
-            severity: 'waiting',
-          });
-        }
-      }
       if (portersLeft(f) > 0) {
         const coord = uncoordKey(key);
         // Passengers standing on the platform with nothing carrying them away.
@@ -880,7 +658,7 @@ export function impediments(s: GameState, player: PlayerIndex = 0): Impediment[]
         why: blockedByBox
           ? 'green box has a load but MEN is occupied'
           : `a load is staged but no empty ${want} is spotted on this industry's track — it stays ` +
-            'in the green box until a crew sets one out here',
+            'in the green box until a crew sets one out here (§9.3)',
         severity: blockedByBox ? 'waiting' : 'stuck',
       });
     }
@@ -901,7 +679,7 @@ export function impediments(s: GameState, player: PlayerIndex = 0): Impediment[]
         why: spotted
           ? 'green box empty — nothing to load (needs a Freight Agent action)'
           : `green box empty — the Freight Agent can stage a load now, but no empty ${want} is ` +
-            'spotted here, so a crew must set one out before Laborers can work it',
+            'spotted here, so a crew must set one out before Laborers can work it (§9.3)',
         severity: 'waiting',
       });
     }
@@ -929,42 +707,6 @@ export function impediments(s: GameState, player: PlayerIndex = 0): Impediment[]
    * Only while switching, and only the cards actually in the crew's way: `movesFor` reports the
    * squares the movement walk reached and refused, not every square on the board.
    */
-  /**
-   * WHY A CAR WILL NOT COME OFF (Gitea#21).
-   *
-   * "I dropped the first tank car, but that was all I was allowed to do" — and this panel, asked
-   * why, talked about the refinery's green box. The rule that actually refused is printed on the
-   * train: trains 3/4, the Express, "may drop or pick up one freight car at every location". The
-   * refusal was correct. Nothing said it.
-   *
-   * That is a worse failure than a missing button, because the panel did not stay silent — it
-   * offered a true statement about the FACILITY, which sent the player to spend a Freight Agent
-   * action that could not have helped. The rule was on the train card's tooltip, which is not
-   * where anyone looks when a button they expected is simply absent.
-   *
-   * Only when the crew has a freight car it could otherwise set out. A budget spent by a train
-   * with nothing left to drop is not blocking anything, and this panel earns its keep by being
-   * short enough to read.
-   */
-  const turnNow = turnOf(s, player);
-  if (s.clock.phase === 'localOps' && turnNow.option === 'switch') {
-    for (const [id, tray] of s.trays) {
-      if (tray.position.at !== 'grid' || tray.position.seat !== seatOf(s, player)) continue;
-      if (!tray.consist.some(isFreight)) continue;
-      if (!freightRuleSpentHere(s, player, id)) continue;
-      const { row, col } = tray.position.coord;
-      out.push({
-        where: `Train ${tray.trainNumber} at (${col},${row})`,
-        why:
-          'ONE FREIGHT CAR PER LOCATION — this train has already worked a freight car on this ' +
-          'square, so no more come off or on here until next turn. It may still work one at the ' +
-          'next square it reaches.',
-        // The printed rule doing its job, and it lifts by itself. Amber, not red.
-        severity: 'waiting',
-      });
-    }
-  }
-
   const turn = turnOf(s, player);
   if (s.clock.phase === 'localOps' && turn.option === 'switch' && turn.movesRemaining > 0) {
     for (const [id, tray] of s.trays) {
@@ -1022,7 +764,7 @@ export function impediments(s: GameState, player: PlayerIndex = 0): Impediment[]
 
       if (pf.porters < 1) {
         say(
-          'this Office has NO Porters — a Whistle Post is not a Passenger Facility and cannot ' +
+          'this Office has NO Porters — a Whistle Post is not a Passenger Facility (§9) and cannot ' +
             'work passengers at all. Upgrade it to a Depot or better.',
           'stuck',
         );
@@ -1045,75 +787,19 @@ export function impediments(s: GameState, player: PlayerIndex = 0): Impediment[]
           );
         }
         if (loadedOnTrain && !s.yards.divisionYard.some((c) => c.type === 'coach' && !c.loaded)) {
-          say('no EMPTY coach in the Division Yard to swap into the train — one is required');
+          say('no EMPTY coach in the Division Yard to swap into the train (§9.2 requires one)');
         }
       }
     }
   }
 
-  /**
-   * TRAINS HELD FOR WANT OF A CREW TRAY (§7) — the scarcity mechanic, made visible (#98).
-   *
-   * This covered the TIMETABLED train due out this Stage and nothing else, which meant the two
-   * other things that queue for the same pool reported nothing at all. A player who spent a card on
-   * an Extra, or ordered a second section, got an EMPTY panel while their train sat behind an
-   * exhausted pool — and each had been announced once in the log in a line that promised a future
-   * event ("as soon as a Crew Tray frees up") which nothing then confirmed.
-   *
-   * All three are one condition, so they are written as one block: no free tray, and something
-   * waiting for one. The count rides along because "no free Crew Tray" reads like a permanent fact
-   * about the game rather than a state that will pass.
-   */
-  // `crewTrayCount` is the pool's size, asked rather than re-derived. `trays.size + freeTrays.length`
-  // gives the same number in play — `retireTrain` moves a tray back — but it is a second way to know
-  // one fact, which is the shape of every bug this release fixed.
-  const trays = `${s.freeTrays.length} of ${crewTrayCount(s.players.length)} Crew Trays free`;
-  if (s.freeTrays.length === 0) {
-    const due = s.timetable[s.clock.stage - 1];
-    if (due !== null && due !== undefined) {
-      out.push({
-        where: `Train ${due}`,
-        why: `due to depart but HELD — no free Crew Tray (${trays})`,
-        severity: 'stuck',
-      });
-    }
-
-    // An Extra belongs to the player who played the card (§7), so it is their errand and it is
-    // reported to them. A second section is the table's, like any Timetabled train.
-    for (const x of s.pendingExtras) {
-      if (x.player !== player) continue;
-      out.push({
-        where: `Extra X${x.trainNumber}`,
-        why: `played and waiting to be made up — no free Crew Tray (${trays})`,
-        severity: 'stuck',
-      });
-    }
-
-    for (const n of s.pendingSecondSections) {
-      out.push({
-        where: `Train ${n}`,
-        why: `second section ordered and waiting to be made up — no free Crew Tray (${trays})`,
-        severity: 'stuck',
-      });
-    }
-  }
-
-  /**
-   * A TRAIN HELD AT THE LIMITS BY AN INTERLOCKING (#99).
-   *
-   * It is inside the player's Limits, not on an A/D track, and it takes the first track that frees
-   * ahead of any newcomer. The map now draws it on the Limits square; this says what it is waiting
-   * for, which is the Office emptying rather than anything the held train itself can do.
-   */
-  for (const id of area.heldAtLimits) {
-    const t = s.trays.get(id);
-    if (!t) continue;
+  // Trains held for want of a Crew Tray (§7) — the scarcity mechanic, made visible.
+  const due = s.timetable[s.clock.stage - 1];
+  if (due !== null && due !== undefined && s.freeTrays.length === 0) {
     out.push({
-      where: `Train ${t.trainIsExtra ? 'X' : ''}${t.trainNumber ?? '—'}`,
-      why:
-        'held at your Limits by the Interlocking instead of colliding — it takes the first A/D ' +
-        'track that frees, ahead of any train arriving after it',
-      severity: 'waiting',
+      where: `Train ${due}`,
+      why: 'due to depart but HELD — no free Crew Tray',
+      severity: 'stuck',
     });
   }
 

src/sim/pacing.ts

@@ -1,256 +0,0 @@
-/**
- * HOW LONG EACH STEP IS SHOWN — v0.8.0, `docs/plans/jitsi-common-board.md` § v0.8.0 § 5.
- *
- * Shared rather than living in `src/web/`, so the 0.8.1 seatless board paces identically to a
- * player's own screen. Two views of one game that disagreed about how fast it looks would be worse
- * than either alone.
- *
- * WHY BY KIND RATHER THAN BY BUDGET. The obvious scheme is to give the whole backlog a time budget
- * and divide it by the queue length. Measured against real games, that does exactly the wrong
- * thing. From `public/replays/`: ~60 stages per game and ~5 intents per player per stage, so a
- * four-player table produces ~15 other-player steps per stage — but 44 of a 307-intent game are
- * `draw.end` and 60 are `loadUnload.end`, bookkeeping nobody wants to watch, while the thing that
- * is worth watching is rare and clustered. Two of the three published replays contain no
- * `switch.move` at all; the third has bursts of 14, 6, 6 and 6, and `trayMoved`'s own narration says
- * "N of 6 Moves left" because six is the engine's cap per crew. So a uniform budget spends the
- * player's attention on `draw.end` and rushes the switching.
- *
- * Assigning dwell by kind and letting the total fall out costs ~40s of animation across a whole
- * 60-stage game, against ~3.6 minutes for a flat 700ms — better switching visibility for a fifth of
- * the time. Jesse, 2026-09-09, on what matters: *"I definitely want to watch other players struggle
- * with the switching exercises … I don't think reading the switching in the log will be anywhere
- * nearly as interesting as watching the trains actually move on the board."*
- *
- * PACING IS CLIENT-SIDE ONLY. The server emits steps as fast as it likes and the client decides how
- * to show them, which is what keeps Gitea#20's "do not slow the authoritative game" true.
- */
-
-import type { StepCause } from './display-step.ts';
-
-export type StepKind = 'switching' | 'action' | 'phase' | 'bookkeeping';
-
-/**
- * THE TUNING TABLE — dwell in milliseconds per kind.
- *
- * Start generous and tune down by playing; Jesse, 2026-09-09: *"start at 1s and tune down."* This is
- * the committed default and changing it needs a web rebuild, which in the `.s9pk` is a release — so
- * it is deliberately not the only way to change the pacing. A viewer's own `pace` multiplier
- * (`Settings`, `localStorage`) and a `?pace=` URL parameter both scale these without one, and
- * `pace = 0` turns the animation off entirely, which is also TODO #18's "a player who has seen it a
- * hundred times will want it off". **Multipliers above 1 are supported and expected** — Jesse asked
- * for 2 and 3 explicitly after the first play — up to `MAX_PACE`, and every tier scales together so
- * their relative weighting survives.
- *
- * NOT IN GAME-CREATION SETTINGS, on Jesse's call 2026-09-09: dwell is presentation, not a rule, and
- * `config` rides along in saves and replays. If it ever moves there, the config field supplies this
- * table's multiplier — the table, the classification and the queue do not change.
- */
-export const DWELL: Record<StepKind, number> = {
-  /** A train physically moving on the board. The thing worth watching, and protected accordingly. */
-  switching: 1000,
-  /**
-   * A card, a car or a load changing hands somewhere visible — and the announcement of what a
-   * player is about to do.
-   *
-   * WAS 250ms, WHICH WAS WRONG, and wrong in the way that mattered most: an early-game bot turn has
-   * no switching in it at all, so it was six steps of 250ms and 0ms — **750ms for a whole turn**.
-   * Jesse, from the first real play on the test server: *"bot play was way too fast. I briefly saw
-   * that it was the bot's office area then their turn was done."* His instruction had been "start at
-   * 1s and tune down", and that was applied only to switching while this number was invented.
-   */
-  action: 700,
-  /**
-   * An automatic phase that DID something — TODO #18.
-   *
-   * Only reached when the phase actually narrated: `submit()` collects no step for a phase that
-   * changed nothing, so this is never spent on the empty ones Jesse is content to guess at. Between
-   * an ordinary action and a switching move, because the Mainline phase moves trains the length of
-   * the Division and is the clearest case of "stuff just happened without being able to see how".
-   */
-  phase: 600,
-  /** Turn and phase bookkeeping. Nothing moved; do not spend the player's attention on it. */
-  bookkeeping: 0,
-};
-
-/**
- * Which kind an intent is.
- *
- * Exhaustive over `Intent['type']` on purpose — a `default` would silently drop a newly added intent
- * into whatever tier the fallback names, and the failure mode is invisible (a move that never gets
- * a beat, or bookkeeping that stalls the queue for a second). `test/pacing.test.ts` walks every
- * member of the union so a new intent cannot land here unclassified.
- */
-export function kindOf(cause: StepCause): StepKind {
-  switch (cause) {
-    // The Division advancing itself — New Train, the Mainline, the shift change (TODO #18).
-    case 'phase':
-      return 'phase';
-
-    // The crew and its train moving, coupling, setting out and re-ordering — §6.1 and Appendix A.
-    case 'switch.move':
-    case 'switch.dropCars':
-    case 'switch.sortConsist':
-    case 'maneuver.flyingSwitch':
-    case 'maneuver.redFlags':
-      return 'switching';
-
-    // Something visible changed hands or position, but no train drove anywhere.
-    case 'card.play':
-    case 'card.discard':
-    case 'draw.fromHomeOffice':
-    case 'draw.fromDepartment':
-    case 'newTrain.placeCar':
-    case 'newTrain.passCar':
-    case 'newTrain.secondSection':
-    case 'newTrain.startExtra':
-    case 'porter.board':
-    case 'porter.detrain':
-    case 'laborer.startLoad':
-    case 'laborer.advanceLoad':
-    case 'laborer.beginUnload':
-    case 'freightAgent.stockOutbound':
-    case 'freightAgent.clearInbound':
-    case 'freightAgent.unjam':
-    case 'mainline.clearance':
-    case 'mainline.modify':
-    case 'mainline.redFlag':
-    case 'mainline.yardOffice':
-    case 'redFlag.play':
-      return 'action';
-
-    /**
-     * `localOps.choose` IS AN ANNOUNCEMENT, NOT BOOKKEEPING — moved out 2026-09-09 after the first
-     * real play. It is the line that reads "Player Bot 1 chose to SWITCH — six Moves to shunt cars
-     * around the yard": the heading for everything that follows, and at zero dwell nobody ever saw
-     * it, so a bot's turn began with no indication of what it was about to do.
-     */
-    case 'localOps.choose':
-      return 'action';
-
-    // Ending a phase or a turn, and voting. Nothing to see: the consequences were the thing, and
-    // there are more of these than of anything else.
-    case 'loadUnload.end':
-    case 'draw.end':
-    case 'switch.end':
-    case 'freightAgent.end':
-    case 'game.extend':
-      return 'bookkeeping';
-  }
-}
-
-/**
- * The widest multiplier that is a speed rather than a mistake.
- *
- * `pace` has no lower surprise — 0 means off — but an unbounded upper one does: `?pace=300` from
- * somebody typing 3.00, or a corrupt `localStorage` value, would give a switching move a five-minute
- * dwell and look exactly like a frozen board. Twenty is far past any speed anyone would choose and
- * well short of unusable.
- *
- * RAISED FROM TEN 2026-09-10, because the ceiling turned out not to be theoretical: Jesse played at
- * 10× — the top of the ladder — and reported it *"still a bit fast, but followable"*. A control whose
- * slowest setting is not slow enough for the person using it has the wrong ceiling, not the right one
- * held firmly.
- */
-export const MAX_PACE = 20;
-
-/**
- * The speeds the on-screen control offers, slowest last.
- *
- * `0` is off: every move is drawn at once, as it was before v0.8.0 — TODO #18's "a player who has
- * seen it a hundred times will want it off". The ladder runs well past 1 because that is what the
- * first real play asked for: Jesse reached for 7×, and although the `?pace=` he used never took
- * effect (the splash replaces the query string, so the play page only ever saw `?lobby`), the wish
- * was real. Watching a bot shunt cars is the point of this feature, and it is worth as long as it
- * takes.
- */
-export const PACE_LEVELS = [0, 0.5, 1, 2, 3, 5, 7, 10, 15, 20] as const;
-
-/**
- * How long to show one step, in ms, at a given speed.
- *
- * `pace` scales every tier by the same factor, so **the tiers stay in proportion at any speed** — a
- * switching move outlasts an ordinary action at 0.5× and at 3× alike. That is deliberate: the
- * relative weighting is the design (a train moving is worth more attention than a card changing
- * hands), and the multiplier is only how fast the whole thing runs. `0` means do not animate at all.
- */
-export function dwellFor(cause: StepCause, pace = 1): number {
-  return Math.round(DWELL[kindOf(cause)] * Math.min(MAX_PACE, Math.max(0, pace)));
-}
-
-/**
- * How much of the speed control a PHASE gets — damped, not the full multiplier.
- *
- * Phases were pinned at their tabled beat in v0.8.0.3, because scaling them with everything else put
- * a wall of clock-ticking after a player's own move. That was right about the cost and wrong about
- * the need: at 10× the caption row goes past faster than the sentence on it can be read. Jesse,
- * 2026-09-10: *"phases displayed on the upper line go by too quickly still. Should be 4 times as
- * long — at a guess. Maybe use the speed multiplier for that too?"*
- *
- * So they scale, at a third of the rate. That lands exactly on his guess — 10× gives a phase four
- * times its tabled beat — while leaving 1× untouched, and it stays affordable because phase beats
- * cluster rather than accumulate: measured over 60 pushes, a push carries **1.0 phase beat on
- * average and 4 at worst**, so the wait after a move goes to ~2.4s typical and ~10s at its very
- * worst rather than the minutes a full multiplier would have cost.
- *
- * Below 1× it simply follows the multiplier: somebody asking for everything faster means the phases
- * too.
- */
-function phaseSpeed(pace: number): number {
-  return pace <= 1 ? pace : 1 + (pace - 1) / 3;
-}
-
-/**
- * How long to show one STEP — the form the queue actually uses.
- *
- * A step that said nothing gets no dwell, whatever caused it. That is one rule covering two cases
- * arrived at separately: a phase where nothing happened (Jesse, 2026-09-09 — *"if nothing happens
- * during a phase then we shouldn't lose time to it"*), and a phase that only handed the turn on,
- * which changes the board but has nothing on it to look at. Structurally typed so this file does not
- * have to import `DisplayStep` back from the module that imports `StepCause` from it.
- */
-export function dwellForStep(
-  step: { cause: StepCause; player: number | null; lines: readonly unknown[]; frame: { table: object } },
-  pace = 1,
-): number {
-  // Off means off, for the clock as much as for anybody's move.
-  if (pace <= 0) return 0;
-  /**
-   * THE SPEED CONTROL IS ABOUT OTHER PEOPLE, NOT ABOUT THE CLOCK.
-   *
-   * A phase keeps its tabled beat at every speed. Measured over 40 turns of a real 3-seat game, the
-   * waiting split almost evenly — 21.0s of other players against 21.0s of phases turning over — so
-   * scaling both put 105 seconds of clock-ticking into a 5× game, all of it after the player's own
-   * move and none of it anything to watch. Jesse, from that game: *"after my turn, when I actually
-   * execute my turn, I'm still subject to that same delay before it moves on. That makes no sense."*
-   *
-   * The phase still gets its beat (TODO #18) — it just does not get longer because somebody wanted
-   * to watch a bot shunt cars.
-   */
-  const speed = step.player === null ? phaseSpeed(pace) : pace;
-  if (step.lines.length > 0) return dwellFor(step.cause, speed);
-  /**
-   * A SILENT STEP EARNS A BEAT ONLY WHEN THE CLOCK TURNED OVER — which is TODO #18 exactly: "give
-   * every phase a visible beat", for New Train, the Mainline and the shift change.
-   *
-   * Measured, because the obvious rule was wrong twice. "No narration, no dwell" looked right and
-   * silently killed #18: a phase can move trains without saying anything, and those steps were being
-   * flashed past. "Anything that changed the board" is wrong the other way: `submit()` steps
-   * `advance()` about 4.6 times per intent and most of those merely hand the turn on, so beating on
-   * all of them would cost a quarter of an hour a game.
-   */
-  const table = step.frame.table as Record<string, unknown>;
-  const turned = 'phase' in table || 'phaseKey' in table || 'stage' in table || 'day' in table;
-  return turned ? dwellFor(step.cause, speed) : 0;
-}
-
-/**
- * How many steps in a queue are actually going to be WATCHED.
- *
- * This is the number the "N behind" counter shows, and it is deliberately not `queue.length`. With
- * bookkeeping dwelling at zero, a backlog of 17 where 12 are `*.end` would read "17", plummet to 5
- * the instant it started, and then crawl — which is not the steady countdown the counter is for.
- * Thirteen dwelling steps means thirteen things you are going to see.
- */
-export function watchableCount(causes: readonly StepCause[], pace = 1): number {
-  return causes.filter((c) => dwellFor(c, pace) > 0).length;
-}

src/sim/public-delta.ts

@@ -1,194 +0,0 @@
-/**
- * Delta for the SEATLESS public frame — v0.8.0, `docs/plans/jitsi-common-board.md` § v0.8.0 § 3.
- *
- * `frame-delta.ts` solves the same-shaped problem for a seated player's `Frame` and does NOT carry
- * over, which is worth saying plainly because reusing it looks obvious and is wrong. It nulls three
- * TOP-LEVEL keys — `cells`, `facilities`, `division` — and a `PublicFrame` has only the last of
- * those. Its `cells` and `facilities` live one level down, inside `districts[]`, one entry per seat,
- * and that is where nearly all of the bytes are.
- *
- * **So the districts are deltaed PER SEAT rather than as one array.** One accepted intent changes
- * one district; comparing the whole array as a unit would resend every other player's board on
- * every step, which is exactly the cost this exists to avoid. On a four-player table that is three
- * boards of waste per step, and a step is emitted for every bot move as well as every human one.
- *
- * It is also a TRUE PARTIAL rather than a full frame with holes in it, which is the other place
- * `frame-delta.ts` does not carry over. See `PublicFrameDelta` below for the measurement that forced
- * that; in short, most steps change one field and shipping the other thirty-four cost 16.7 MB a game.
- *
- * The convention that does carry over, kept identical so a reader of one file can read the other:
- * an absent or `null` field means "unchanged since the last thing sent to this receiver", and the
- * receiving side merges against the last full frame it actually holds. A first connect or a
- * reconnect after a gap sends a full frame instead — the display stream resets rather than replaying
- * (§ v0.8.0).
- *
- * Node-free by design, like `frame-delta.ts`: the server and the browser both import this directly.
- */
-
-import type { CellView, DivisionView, FacilityView, PublicDistrict, PublicFrame } from './view.ts';
-
-/**
- * One district with its two heavy fields nulled when unchanged.
- *
- * `seat` is the identity and is always present — it is what the receiver matches on. `player` and
- * `name` are always sent too, and deliberately: Employee Rotation moves players between districts,
- * so the pairing of seat to player is itself news, and it costs two small fields to never have to
- * reason about whether a relabelling was missed.
- */
-export type PublicDistrictDelta = Omit<PublicDistrict, 'cells' | 'facilities'> & {
-  cells: CellView[] | null;
-  facilities: FacilityView[] | null;
-};
-
-/** The shared-table half of a `PublicFrame` — everything that is not the Division or a district. */
-type PublicTable = Omit<PublicFrame, 'division' | 'districts'>;
-
-/**
- * A `PublicFrame` reduced to WHAT CHANGED.
- *
- * **Partial, not a full frame with holes**, and that distinction was measured rather than assumed.
- * The first version of this spread `...next` and nulled only the board fields, so every step shipped
- * all 35 top-level properties even when the sole change was whose turn it was. Once TODO #18 gave
- * automatic phases their own steps, most steps became exactly that — a turn handed on, nothing to
- * look at — and a full 6-day game cost **19.4 MB**, of which **16.7 MB was those silent steps at
- * ~11 KB each**. As a partial they are a few dozen bytes.
- */
-export type PublicFrameDelta = {
-  /** Only the shared-table fields whose value differs from the previous frame. */
-  table: Partial<PublicTable>;
-  /** The Division, only when it changed. */
-  division: DivisionView[] | null;
-  /** Only the districts that changed, each carrying only the board fields that changed. */
-  districts: PublicDistrictDelta[];
-};
-
-const same = (a: unknown, b: unknown): boolean => JSON.stringify(a) === JSON.stringify(b);
-
-const TABLE_KEYS = (frame: PublicFrame): (keyof PublicTable)[] =>
-  (Object.keys(frame) as (keyof PublicFrame)[]).filter(
-    (k): k is keyof PublicTable => k !== 'division' && k !== 'districts',
-  );
-
-/**
- * `previous` is the last public frame actually sent to THIS receiver, or `null` for a first connect
- * or a reset — in which case everything is sent in full.
- */
-export function deltaPublicFrame(previous: PublicFrame | null, next: PublicFrame): PublicFrameDelta {
-  const before = new Map(previous?.districts.map((d) => [d.seat, d]) ?? []);
-  const table: Partial<PublicTable> = {};
-  for (const key of TABLE_KEYS(next)) {
-    if (previous === null || !same(previous[key], next[key])) {
-      (table as Record<string, unknown>)[key] = next[key];
-    }
-  }
-  const districts: PublicDistrictDelta[] = [];
-  for (const d of next.districts) {
-    const was = before.get(d.seat);
-    const cells = was && same(was.cells, d.cells) ? null : d.cells;
-    const facilities = was && same(was.facilities, d.facilities) ? null : d.facilities;
-    // A district with nothing new is left out entirely rather than sent as a row of nulls: on a
-    // four-player table three of them are unchanged on every single step.
-    if (was && cells === null && facilities === null && same(was, d)) continue;
-    districts.push({ ...d, cells, facilities });
-  }
-  return {
-    table,
-    division: previous !== null && same(previous.division, next.division) ? null : next.division,
-    districts,
-  };
-}
-
-/** The receiving side: merges a delta back onto the last full public frame this receiver holds. */
-export function applyPublicDelta(previous: PublicFrame | null, delta: PublicFrameDelta): PublicFrame {
-  const base = previous ?? (delta.table as PublicTable);
-  const merged = { ...base, ...delta.table } as PublicTable;
-  const bySeat = new Map((previous?.districts ?? []).map((d) => [d.seat, d]));
-  for (const d of delta.districts) {
-    const was = bySeat.get(d.seat);
-    bySeat.set(d.seat, {
-      ...d,
-      cells: d.cells ?? need(was?.cells, `districts[seat ${d.seat}].cells`),
-      facilities: d.facilities ?? need(was?.facilities, `districts[seat ${d.seat}].facilities`),
-    });
-  }
-  return {
-    ...merged,
-    division: delta.division ?? need(previous?.division, 'division'),
-    districts: [...bySeat.values()].sort((a, b) => a.seat - b.seat),
-  };
-}
-
-/**
- * A delta that says "unchanged" against a receiver that has nothing to merge onto is a bug in the
- * SENDER's bookkeeping, not a recoverable state — it means the two sides disagree about what has
- * been delivered, and quietly producing a frame with a missing board would put a blank district in
- * front of a player. `frame-delta.ts` throws in the same situation and for the same reason.
- */
-function need<T>(value: T | undefined, what: string): T {
-  if (value === undefined) {
-    throw new Error(`deltaPublicFrame said "${what}" is unchanged, but there is no previous frame to merge onto`);
-  }
-  return value;
-}
-
-/** A face-up or face-down pile a card can move to or from, as the display addresses it. */
-export type PileKey = 'home' | 'salvage' | `dept${number}`;
-
-/**
- * WHICH PILES A STEP MOVED — derived, never sent.
- *
- * The receiver already holds the frame before a step and the frame after it, so which pile changed
- * is a diff rather than something the wire has to carry. That matters twice over: nothing is added
- * to the protocol, and it cannot drift out of step with the projection the way a hand-maintained
- * hint would.
- *
- * WHY IT IS NEEDED AT ALL. A player watching somebody else draw a card sees seven seconds of an
- * unchanged board — the step holds the screen, and the only thing that moved is a number in a panel
- * they were not looking at. Jesse, playing v0.8.0.4 at 10×: *"many operations still occurred too fast
- * for me to see"*, which was never about duration. Lighting the pile is what tells the eye where.
- *
- * WHAT EACH ACTION MOVES, measured across four seeds rather than reasoned about:
- *
- * | intent                  | piles                                                    |
- * | ----------------------- | -------------------------------------------------------- |
- * | `draw.fromHomeOffice`   | `home` — the COUNT only; the card itself stays private    |
- * | `draw.fromDepartment`   | that `dept`, and `home` too when the pile refills from it |
- * | `card.discard`          | that `dept`                                               |
- * | `card.play`             | `salvage`, or nothing here when it lands on the board      |
- * | switching, new trains   | nothing here — those show on the board itself             |
- */
-/**
- * Mainline cards that became a different card between two public boards — a Realignment, which is the
- * one play that changes the Division itself.
- *
- * Playtest, 2026-09-15: *"is it possible to flash the mainline card when it gets changed by realignment?
- * This would be more obvious to see what's happening on the map."* Detected the same way `changedPiles`
- * detects a pile moving — by comparing the two boards the queue already holds — rather than by reading
- * the event, so the flash lands with the step that shows it and not when the intent arrived.
- */
-export function changedDivisionCards(before: PublicFrame | null, after: PublicFrame): number[] {
-  if (before === null) return [];
-  const out: number[] = [];
-  after.division.forEach((node, i) => {
-    const was = before.division[i];
-    if (was && was.kind === 'ml' && node.kind === 'ml' && was.label !== node.label) out.push(i);
-  });
-  return out;
-}
-
-export function changedPiles(before: PublicFrame | null, after: PublicFrame): PileKey[] {
-  if (before === null) return [];
-  const out: PileKey[] = [];
-  if (before.deck !== after.deck) out.push('home');
-  after.departmentDepth.forEach((depth, i) => {
-    // The TOP as well as the depth: taking the face-up card and replacing it leaves the count alone
-    // and changes the card everybody can see, which is the half that matters to a watcher.
-    if (before.departmentDepth[i] !== depth || before.departments[i] !== after.departments[i]) {
-      out.push(`dept${i}`);
-    }
-  });
-  if (before.salvage.depth !== after.salvage.depth || before.salvage.top !== after.salvage.top) {
-    out.push('salvage');
-  }
-  return out;
-}

src/sim/replay.ts

@@ -21,21 +21,12 @@ import { writeFileSync } from 'node:fs';
 import { advance } from '../engine/advance.ts';
 import { applyIntent, areaOf, facilityCarType, laborersLeft, portersLeft } from '../engine/apply.ts';
 import type { GameLength } from '../engine/content.ts';
-import {
-  DEFAULT_MAX_COLLISIONS_PER_DAY,
-  DEFAULT_MAX_COLLISIONS_TOTAL,
-  MAINLINE_PROFILES,
-  collectiveRevenueFloor,
-  lengthProfile,
-  officeProfile,
-} from '../engine/content.ts';
+import { MAINLINE_PROFILES, lengthProfile, officeProfile } from '../engine/content.ts';
 import type { GameEvent } from '../engine/events.ts';
 import type { Intent } from '../engine/intents.ts';
 import { legalActions } from '../engine/legal.ts';
 import { createGame } from '../engine/setup.ts';
 import type { Facility, GameConfig, GameState } from '../engine/state.ts';
-import { actingPlayer } from '../engine/state.ts';
-import { reasonSentence } from '../web/panels.ts';
 import { developerBot, lastChoiceReason } from './bot.ts';
 import { carLabel, cuesFor, idleNote, isVisible, narrate } from './narrate.ts';
 // The view-model lives in its own module so the browser build can import it without dragging in
@@ -60,16 +51,13 @@ import { playCue } from '../web/sound.ts';
 export type Recording = { seed: number; length: GameLength; frames: Frame[]; outcome: string };
 
 export function record(seed: number, length: GameLength, maxSteps = 100_000): Recording {
-  const days = lengthProfile(length).days;
   const config: GameConfig = {
     mode: 'solitaire',
-    days,
-    minCombinedRevenue: collectiveRevenueFloor(1, days),
-    maxCollisionsPerDay: DEFAULT_MAX_COLLISIONS_PER_DAY,
-    maxCollisionsTotal: DEFAULT_MAX_COLLISIONS_TOTAL,
-    pvpCardsAllowed: false,
+    victory: 'highestAfterDays',
+    length,
     optionalRules: {
       reducedVisibility: false,
+      sisterTrains: false,
       employeeRotation: false,
       emergencyToolbox: false,
     },
@@ -79,8 +67,6 @@ export function record(seed: number, length: GameLength, maxSteps = 100_000): Re
   const narrateCtx = {
     cardName: (id: string) => cardName(s, id),
     trainName: (id: string) => trainName(s, id),
-    // A player index is not a seat index, so the fallback names no number at all — see `web/game.ts`.
-    playerName: (p: number) => s.players[p]?.name ?? 'another player',
   };
 
   // Tracks whether a phase did anything, so an empty one can say so rather than ending silently.
@@ -139,7 +125,7 @@ export function record(seed: number, length: GameLength, maxSteps = 100_000): Re
     if (s.status === 'finished') break;
     if (!r.needsInput) continue;
 
-    const actor = actingPlayer(s);
+    const actor = s.clock.pendingDecision !== null ? s.clock.superintendent : s.clock.currentActor;
     if (actor === null) break;
     const options = legalActions(s, actor);
     if (options.length === 0) break;
@@ -151,26 +137,12 @@ export function record(seed: number, length: GameLength, maxSteps = 100_000): Re
     push(applied.events);
   }
 
-  /**
-   * IN WORDS, NOT AS AN ENUM (`TODO.md` #34). This heading read `loss — revenueFloor`, which is
-   * exactly the defect Gitea#16 was filed about on the playable page — it just outlived the fix
-   * here, because nothing player-facing pointed at it. `reasonSentence` is shared rather than
-   * reimplemented, so the replay and the results screen cannot end up explaining the same ending
-   * two different ways.
-   *
-   * Fed the LAST frame, which is the state the outcome was decided in and is already recorded.
-   * Tags are stripped: this lands in an `<h1>` and in a console line, neither of which wants markup.
-   */
   const o = s.outcome;
-  const last = frames[frames.length - 1];
-  const why = o && last ? reasonSentence(last, o, last.day).replace(/<[^>]+>/g, '') : '';
   return {
     seed,
     length,
     frames,
-    outcome: o
-      ? `${o.result === 'win' ? 'won' : 'lost'} — ${why} Final Revenue ${s.players[0]?.revenue ?? 0}.`
-      : 'unfinished',
+    outcome: o ? `${o.result} — ${o.reason} · final Revenue ${s.players[0]?.revenue ?? 0}` : 'unfinished',
   };
 }
 
@@ -232,7 +204,7 @@ export function compress(frames: Frame[]): Packed {
       const fi = c.facility ? f.facilities.indexOf(c.facility) : -1;
       // `trains` rides whole rather than being interned: it changes almost every frame, so a table
       // of them would be as long as the frames are and buy nothing.
-      return [ci, wi, c.enhancements, c.cars, fi, c.trains, c.adTracks, c.enhancementsWhat, c.standingWest, c.enhancementsSpent];
+      return [ci, wi, c.enhancements, c.cars, fi, c.trains, c.adTracks, c.enhancementsWhat, c.standingWest];
     });
     return { ...f, cells } as unknown as Frame;
   });
@@ -266,7 +238,7 @@ export function rehydrateCells(
   facs: unknown[],
 ): unknown[] {
   return packed.map((row) => {
-    const p = row as [number, number, string[], string[], number, unknown, unknown, string[], number, boolean[]];
+    const p = row as [number, number, string[], string[], number, unknown, unknown, string[], number];
     const c = cards[p[0]] as [number, number, string, string, boolean, string[]];
     // Tolerant the same way `standingWest` below is: an array rides through as-is, a lone object
     // (an older recording's singular `train`) is wrapped into a one-train roster, and null or
@@ -286,16 +258,12 @@ export function rehydrateCells(
       // cut ahead of or behind the engine exactly as the live board does. Absent in older recordings,
       // which read as 0 — the whole cut east of the engine, which is what they used to draw anyway.
       standingWest: p[8] ?? 0,
-      // Which dispatch devices were spent (#101), so a replay strikes a used Radio through exactly
-      // as the live board does. Absent in recordings made before it existed, which read as no
-      // device spent — the same thing they drew at the time, so an old replay is unchanged.
-      enhancementsSpent: p[9] ?? [],
     };
   });
 }
 
 export function renderHtml(rec: Recording): string {
-  const profile = lengthProfile(rec.length);
+  const target = lengthProfile(rec.length);
   return `<!doctype html>
 <html lang="en"><head><meta charset="utf-8">
 <meta name="viewport" content="width=device-width,initial-scale=1">
@@ -392,7 +360,7 @@ kbd{background:#2a3038;border:1px solid var(--line);border-radius:3px;padding:0
 </style></head><body>
 
 <header>
-  <h1>Station Master — replay · seed ${rec.seed} · ${rec.length} (${profile.days} Days) · ${esc(rec.outcome)}</h1>
+  <h1>Station Master — replay · seed ${rec.seed} · ${rec.length} (target ${target.target} over ${target.days} Days) · ${esc(rec.outcome)}</h1>
   <div class="bar">
     <span class="dim">fedora <span id="super">—</span></span>
     <span>revenue <b class="big" id="rev">0</b></span>
@@ -514,11 +482,7 @@ function boxes(items, cap, cls) {
 
 function render() {
   const f = FRAMES[i];
-  $('turnchart').innerHTML = turnChartHtml(
-    f,
-    f.actor === null ? null : 'Player ' + (f.actor + 1),
-    f.players.length > 1 ? 'Player ' + (f.superintendent + 1) : null,
-  );
+  $('turnchart').innerHTML = turnChartHtml(f, f.actor === null ? null : 'Player ' + (f.actor + 1));
   $('super').textContent = 'P' + f.superintendent;
   $('rev').textContent = f.revenue;
   $('rev').className = 'big ' + (f.revenue < 0 ? 't-bad' : f.revenue > 0 ? 't-good' : '');
@@ -538,10 +502,7 @@ function render() {
 
   const CELLS = cellsAt(i), FACS = carry(i, 'facilities'), DIV = carry(i, 'division');
 
-  // players, actor and viewer are not among the delta'd keys (see compress), so they ride whole on
-  // every frame and the replay names the districts exactly as the live page does. No backticks in
-  // this comment: it is inside the generated-page template literal, which they would terminate.
-  $('division').innerHTML = divisionSvg(DIV, { players: f.players, actor: f.actor, viewer: f.viewer });
+  $('division').innerHTML = divisionSvg(DIV);
   // The same office renderer the playable app uses, so replay and game draw one board.
   $('grid').innerHTML = officeSvg(CELLS, f.runningRow, [], [], f.limits);
 

src/sim/save-replay.ts

@@ -52,21 +52,6 @@ export type PlayedGame = {
 export function playForReplay(seed: number, policy: BotPolicy, maxTurns = 50_000): PlayedGame {
   const game = newGame(seed);
   for (let t = 0; t < maxTurns; t++) {
-    /**
-     * §3.3, EXTENDED PLAY (Gitea#11) — a recorded replay is a game played to its end.
-     *
-     * The timetable running out leaves the game on "play one more Day?", where `currentActor` is
-     * null and this loop would otherwise stop — recording a file that replays to a question nobody
-     * answered rather than to a finished game. A recording bot plays the timetable it was dealt, the
-     * same rule `playGame` follows, so it declines and the file ends where a real game would.
-     */
-    if (game.state.status === 'awaitingExtension') {
-      const voter = game.state.extensionVotes.findIndex((v) => v === null);
-      if (voter < 0) break;
-      if (!submit(game, { type: 'game.extend', player: voter, agree: false }, voter)) break;
-      continue;
-    }
-
     const actor = currentActor(game);
     if (actor === null) break;
     const options = legalActions(game.state, actor);

src/sim/switch-planner.ts

@@ -1,347 +0,0 @@
-/**
- * Component 17b — planning a whole switching turn before making the first Move.
- *
- * Dev-side, like the rest of the bot. The developer bot's switching branch chooses ONE move at a time
- * from a ladder of rules, and its own comment names what that cannot do: "a strong player would use
- * the six Moves to re-order the consist — that is the game's central switching puzzle, and this bot
- * does not attempt it." This attempts it, for one turn at a time.
- *
- * WHY SEARCH IS FAIR HERE. A switching turn draws no card and rolls no die, so trying sequences on a
- * copy of the game is exactly what a player does by looking at the board. The score below reads only
- * what a player can see — the district, the cars on the trains, the facilities — and never the deck.
- *
- * WHY NOT EVERY SEQUENCE. Measured 2026-09-14 over 30 switching turns from bot games: a median turn
- * reaches 229 distinct positions, but 11 of 30 passed 20,000, because setting cars out is free and a
- * crew can leave them in a great many places. So the search keeps the best `beam` positions at each
- * step and stops at `budget` positions tried. Small turns are searched completely inside that.
- *
- * THE SCORE IS OF WHERE THE TURN ENDS, not of what it did, and it starts from Jesse's ruling
- * (2026-09-14): "players will attempt to deliver / pick up cars even if it delays trains." So a car
- * put where it can be worked is worth a point, and a train left away from the Office costs a quarter
- * of one. The weights are a starting point to measure, not a result.
- */
-
-import { areaAtSeat, areaOf, commitEvents, facilityCarTypes, prepareIntent, withRouteCache } from '../engine/apply.ts';
-import { badlyMadeUp, isExpedited } from '../engine/advance.ts';
-import { MAX_CONSIST } from '../engine/content.ts';
-import type { Intent } from '../engine/intents.ts';
-import { legalSwitchingActions } from '../engine/legal.ts';
-import { cloneTally, coordKey, seatOf, turnOf } from '../engine/state.ts';
-import type { Facility, GameState, GridCoord, PlayerIndex, RollingStock, TrackCard } from '../engine/state.ts';
-
-export const SWITCH_WEIGHTS = {
-  /** A car standing where its industry can load or unload it — the point of switching. */
-  spot: 1.0,
-  /** The same, past what the industry's boxes can work at once. */
-  spotBeyondCapacity: 0.25,
-  /** A car the industry cannot work, taking room on its track. */
-  junkOnIndustry: -0.5,
-  /** A finished car — loaded at a shipper, emptied at a receiver — still waiting to be lifted. */
-  finishedLeft: -0.15,
-  /** A car on one of this district's trains that some industry here would work. */
-  carriedWanted: 0.35,
-  /** The same car left on ordinary track, where a later turn can fetch it. */
-  stagedWanted: 0.2,
-  /** A coach kept with its train, or parked at the Office where §A.4 allows it. */
-  coachWithTrain: 0.3,
-  /** A coach left anywhere else, where no Porter can work it. */
-  coachStranded: -0.3,
-  /** Anything but a coach standing on the Office square — the next arrival collides (§8.3). */
-  fouling: -3,
-  /** A train that ends the turn away from the Office and so cannot highball next Mainline Phase. */
-  trainAway: -0.25,
-  /** On top of that, an expedited train — Q3 charges a Revenue point every Phase it is away. */
-  expeditedAway: -1.0,
-  /** A train that could not leave even from the Office — engine buried, caboose mid-train (§8.2). */
-  notMadeUp: -0.6,
-  /** Tie-breaks, so equal outcomes prefer the plan that does less. */
-  perMove: -0.02,
-  perSetOut: -0.005,
-  /** A maneuver card spent — Flying Switch — so the planner plays one only when it buys something. */
-  cardSpent: -0.1,
-} as const;
-
-export type PlanOptions = {
-  budget: number;
-  beam: number;
-  /**
-   * Search Flying Switch alongside Moves, set-outs and sorts. On by default but UNMEASURED: the card
-   * is dealt 0 copies (Jesse, 2026-08-26), so over 400 paired seeds turning it on changed nothing —
-   * it is here so the planner can use the card the day it is dealt again.
-   */
-  flyingSwitch?: boolean;
-};
-/**
- * Measured 2026-09-14, paired over 400 seeds against 3000/48: 2000/32 cost −0.02 ± 0.01 (t = −1.68,
- * inside the noise) at half the time per turn; 1000/24 cost −0.06 ± 0.02 (t = −2.65) for little more.
- */
-export const DEFAULT_PLAN: PlanOptions = { budget: 2000, beam: 32, flyingSwitch: true };
-
-export type SwitchPlan = {
-  /** The intents to submit, in order. Empty when nothing beats stopping where the crew stands. */
-  steps: Intent[];
-  /** `switchFingerprint` before each step, and after the last — so a caller can tell it is on plan. */
-  keys: string[];
-  rootScore: number;
-  score: number;
-  /** Positions tried. */
-  expanded: number;
-  /** False when the budget ran out before the search did. */
-  complete: boolean;
-};
-
-/**
- * A copy of the game that a switching intent can be applied to without touching the original.
- *
- * NOT `structuredClone`, of the state or even of the district. A switching intent writes only the
- * cars standing on cards, the industry tracks, the district's A/D and held lists, the consist and
- * position of the trays standing in it, this player's turn and the tally — so exactly those arrays are
- * copied and everything else is shared by reference. Measured 2026-09-14, deep-cloning the district
- * was 44% of all planning time.
- *
- * `test/switch-planner.test.ts` proves across real games that planning leaves the original
- * byte-identical — which is what fails first if a reducer ever starts writing somewhere new, or
- * starts mutating a car or a card in place instead of replacing it.
- */
-export function forkForSwitching(s: GameState, player: PlayerIndex): GameState {
-  const seat = seatOf(s, player);
-  const area = areaAtSeat(s, seat);
-  const grid = new Map<string, TrackCard>();
-  for (const [key, card] of area.grid) {
-    const f = card.facility;
-    grid.set(key, {
-      ...card,
-      standing: [...card.standing],
-      facility: f ? { ...f, industryTrack: { cars: [...f.industryTrack.cars] } } : f,
-    });
-  }
-  const officeAreas = new Map(s.officeAreas);
-  officeAreas.set(seat, {
-    ...area,
-    grid,
-    adOccupancy: [...area.adOccupancy],
-    heldAtLimits: [...area.heldAtLimits],
-    dispatchUsedToday: [...area.dispatchUsedToday],
-  });
-  const trays = new Map(s.trays);
-  for (const [id, t] of s.trays) {
-    if (t.position.at === 'grid' && t.position.seat === seat) trays.set(id, { ...t, consist: [...t.consist] });
-  }
-  const turns = new Map(s.turns);
-  const turn = s.turns.get(player)!;
-  turns.set(player, { ...turn, freightWorked: { ...turn.freightWorked } });
-  // Flying Switch spends its card (`spendCard`): the hand map is rewritten and the Salvage Yard grows.
-  const decks = { ...s.decks, hands: new Map(s.decks.hands), salvageYard: [...s.decks.salvageYard] };
-  return { ...s, officeAreas, trays, turns, decks, tally: cloneTally(s.tally) };
-}
-
-const carList = (xs: readonly RollingStock[]): string =>
-  xs.map((c) => `${c.type}${c.loaded ? '+' : '-'}${c.origin ?? ''}`).join(',');
-
-/**
- * Everything a switching intent can change, as a string — two positions with the same fingerprint
- * are the same position as far as the rest of the turn is concerned. Identical cars are not told
- * apart, which is right: no intent names a car.
- */
-export function switchFingerprint(s: GameState, player: PlayerIndex): string {
-  const seat = seatOf(s, player);
-  const parts: string[] = [];
-  for (const [id, t] of s.trays) {
-    if (t.position.at !== 'grid' || t.position.seat !== seat) continue;
-    const { row, col } = t.position.coord;
-    parts.push(`${id}@${row},${col}/${t.facing}/${t.railFacing ?? ''}/${t.engineAt}:${carList(t.consist)}`);
-  }
-  for (const [key, card] of areaOf(s, player).grid) {
-    const track = card.facility?.kind === 'freight' ? card.facility.industryTrack.cars : null;
-    if (card.standing.length === 0 && card.standingWest === 0 && (track?.length ?? 0) === 0) continue;
-    parts.push(`${key}=${carList(card.standing)}|${card.standingWest}|${track ? carList(track) : ''}`);
-  }
-  const turn = turnOf(s, player);
-  parts.push(`m${turn.movesRemaining}`, JSON.stringify(turn.freightWorked), `h${(s.decks.hands.get(player) ?? []).join(',')}`);
-  return parts.join(';');
-}
-
-/**
- * §9.3 — an outbound industry loads EMPTY cars of its commodity, an inbound one unloads LOADED ones —
- * but never a load that was made in this same district (v0.4.9e, `LOADED_IN_THIS_DISTRICT`).
- */
-function works(f: Facility, c: RollingStock, seat: number): boolean {
-  if (f.kind !== 'freight' || !facilityCarTypes(f).includes(c.type)) return false;
-  return (!c.loaded && f.allows.outbound) || (c.loaded && f.allows.inbound && c.origin !== seat);
-}
-
-/**
- * The car an industry has finished with. Only decidable at a one-way industry: at one that both
- * ships and receives, a loaded car may be a delivery still waiting to be unloaded.
- */
-function finished(f: Facility, c: RollingStock): boolean {
-  if (f.kind !== 'freight' || !facilityCarTypes(f).includes(c.type)) return false;
-  if (f.allows.outbound && !f.allows.inbound) return c.loaded;
-  if (f.allows.inbound && !f.allows.outbound) return !c.loaded;
-  return false;
-}
-
-const same = (a: GridCoord, b: GridCoord): boolean => a.row === b.row && a.col === b.col;
-
-/** How good this district's position is for the rest of the game, in rough Revenue points. */
-export function evaluateSwitching(s: GameState, player: PlayerIndex): number {
-  const W = SWITCH_WEIGHTS;
-  const area = areaOf(s, player);
-  const seat = seatOf(s, player);
-  const officeKey = coordKey(area.officeCoord);
-  const passengerOffice = area.grid.get(officeKey)?.facility?.kind === 'passenger';
-  let v = 0;
-
-  const withRoom: Facility[] = [];
-  for (const card of area.grid.values()) {
-    const f = card.facility;
-    if (!f || f.kind !== 'freight') continue;
-    if (f.industryTrack.cars.length < MAX_CONSIST) withRoom.push(f);
-    const cap = Math.max(1, f.capacity.outbound + f.capacity.inbound);
-    let working = 0;
-    for (const c of f.industryTrack.cars) {
-      if (works(f, c, seat)) v += ++working <= cap ? W.spot : W.spotBeyondCapacity;
-      else if (finished(f, c)) v += W.finishedLeft;
-      else v += W.junkOnIndustry;
-    }
-  }
-  const wanted = (c: RollingStock): boolean => withRoom.some((f) => works(f, c, seat));
-
-  for (const [key, card] of area.grid) {
-    if (card.facility?.kind === 'freight') continue;
-    const atOffice = key === officeKey;
-    for (const c of card.standing) {
-      if (c.type === 'coach') v += atOffice && passengerOffice ? W.coachWithTrain : W.coachStranded;
-      else if (atOffice) v += W.fouling;
-      else if (wanted(c)) v += W.stagedWanted;
-    }
-  }
-
-  for (const t of s.trays.values()) {
-    if (t.position.at !== 'grid' || t.position.seat !== seat) continue;
-    for (const c of t.consist) {
-      if (c.type === 'coach') v += passengerOffice ? W.coachWithTrain : 0;
-      else if (wanted(c)) v += W.carriedWanted;
-    }
-    if (t.trainNumber === null) continue;
-    if (!same(t.position.coord, area.officeCoord)) {
-      v += W.trainAway;
-      if (isExpedited(t)) v += W.expeditedAway;
-    }
-    if (badlyMadeUp(t)) v += W.notMadeUp;
-  }
-  return v;
-}
-
-/**
- * For ORDERING the beam only, never for choosing the plan: a Move toward an industry changes nothing
- * the score can see until the car is set out, so without this the beam would drop the approach in
- * favour of positions that merely look tidy.
- */
-function approach(s: GameState, player: PlayerIndex): number {
-  const area = areaOf(s, player);
-  const seat = seatOf(s, player);
-  const targets: { at: GridCoord; f: Facility }[] = [];
-  for (const [key, card] of area.grid) {
-    const f = card.facility;
-    if (!f || f.kind !== 'freight' || f.industryTrack.cars.length >= MAX_CONSIST) continue;
-    const [row, col] = key.split(',').map(Number);
-    targets.push({ at: { row: row!, col: col! }, f });
-  }
-  let bonus = 0;
-  for (const t of s.trays.values()) {
-    if (t.position.at !== 'grid' || t.position.seat !== seat) continue;
-    const here = t.position.coord;
-    for (const c of t.consist) {
-      let nearest = Infinity;
-      for (const { at, f } of targets) {
-        if (works(f, c, seat)) nearest = Math.min(nearest, Math.abs(at.row - here.row) + Math.abs(at.col - here.col));
-      }
-      if (nearest !== Infinity) bonus += 0.1 / (1 + nearest);
-    }
-  }
-  return bonus;
-}
-
-const SEARCHED = new Set<Intent['type']>(['switch.move', 'switch.dropCars', 'switch.sortConsist']);
-
-type Node = {
-  s: GameState;
-  steps: Intent[];
-  keys: string[];
-  moves: number;
-  setOuts: number;
-  cards: number;
-  score: number;
-  rank: number;
-};
-
-/** The best way found to spend what is left of this switching turn. Never mutates `s`. */
-export function planSwitchingTurn(
-  s: GameState,
-  player: PlayerIndex,
-  opts: PlanOptions = DEFAULT_PLAN,
-): SwitchPlan {
-  const W = SWITCH_WEIGHTS;
-  const scoreOf = (st: GameState, moves: number, setOuts: number, cards: number): number =>
-    evaluateSwitching(st, player) + moves * W.perMove + setOuts * W.perSetOut + cards * W.cardSpent;
-  const searched = (type: Intent['type']): boolean =>
-    SEARCHED.has(type) || (opts.flyingSwitch === true && type === 'maneuver.flyingSwitch');
-
-  const rootKey = switchFingerprint(s, player);
-  const rootScore = scoreOf(s, 0, 0, 0);
-  const root: Node = { s, steps: [], keys: [rootKey], moves: 0, setOuts: 0, cards: 0, score: rootScore, rank: rootScore };
-  let best = root;
-  const seen = new Set([rootKey]);
-  let frontier: Node[] = [root];
-  let expanded = 0;
-  let complete = true;
-
-  search: while (frontier.length > 0) {
-    const next: Node[] = [];
-    for (const node of frontier) {
-      const movesLeft = turnOf(node.s, player).movesRemaining;
-      // Every candidate is decided against THIS position, inside one route cache, and only then applied
-      // to its own copy: deciding on the copy would re-walk routes the listing had just walked.
-      const decided = withRouteCache(node.s, () =>
-        legalSwitchingActions(node.s, player)
-          .filter((i) => searched(i.type) && (i.type === 'switch.dropCars' || movesLeft >= 1))
-          .map((i) => ({ i, r: prepareIntent(node.s, player, i) })),
-      );
-      for (const { i, r } of decided) {
-        if (expanded >= opts.budget) {
-          complete = false;
-          break search;
-        }
-        expanded++;
-        if (!r.ok) continue;
-        const f = forkForSwitching(node.s, player);
-        commitEvents(f, r.events);
-        const key = switchFingerprint(f, player);
-        if (seen.has(key)) continue;
-        seen.add(key);
-        const setOut = i.type === 'switch.dropCars';
-        const moves = node.moves + (setOut ? 0 : 1);
-        const setOuts = node.setOuts + (setOut ? 1 : 0);
-        const cards = node.cards + (i.type === 'maneuver.flyingSwitch' ? 1 : 0);
-        const score = scoreOf(f, moves, setOuts, cards);
-        const child: Node = {
-          s: f,
-          steps: [...node.steps, i],
-          keys: [...node.keys, key],
-          moves,
-          setOuts,
-          cards,
-          score,
-          rank: score + approach(f, player),
-        };
-        if (score > best.score + 1e-9) best = child;
-        next.push(child);
-      }
-    }
-    // A stable sort, so equal ranks keep `legalActions` order and the bot stays deterministic.
-    frontier = next.length > opts.beam ? next.sort((a, b) => b.rank - a.rank).slice(0, opts.beam) : next;
-  }
-
-  return { steps: best.steps, keys: best.keys, rootScore, score: best.score, expanded, complete };
-}

src/sim/turnchart.ts

@@ -19,8 +19,6 @@ export type TurnChartFrame = {
   phase: string;
   phaseKey: string;
   actor: number | null;
-  /** What the game has stopped to ask, when it has. Null while a phase is simply running. */
-  awaiting?: { asks: string; train: string } | null;
 };
 
 /**
@@ -29,18 +27,7 @@ export type TurnChartFrame = {
  * The first three are the rules text; Cargo and Supervisor Shift are written from what the engine
  * does, since the recovered sheet does not spell them out.
  */
-/**
- * `superName` is the player holding the Fedora, or null for a table where saying so is noise — one
- * seat, where it is always you.
- *
- * REPORTED BY JESSE 2026-08-23, from a two-player game on StartOS: seat 1 played a train card and
- * seat 2 was asked to build the train, "what's the rule for WHICH player builds a train?" The engine
- * was right — §7 makes up a consist "starting with the Superintendent and working left" — but the
- * board did not name the Superintendent ANYWHERE, so the question could not be answered from the
- * screen. `Frame` has carried `superintendent` all along and the standalone replay printed it; the
- * live game never did.
- */
-export function turnChartHtml(f: TurnChartFrame, actorName: string | null, superName: string | null = null): string {
+export function turnChartHtml(f: TurnChartFrame, actorName: string | null): string {
   const PHASES: { key: string; label: string; tip: string; icon: string }[] = [
     {
       key: 'localOps',
@@ -52,10 +39,7 @@ export function turnChartHtml(f: TurnChartFrame, actorName: string | null, super
     {
       key: 'newTrain',
       label: 'New Train',
-      // Says WHO builds, which is the question this phase actually raises at a table: the round
-      // starts with the Superintendent and works left, one car each, repeating (§7, Gap 9) — not
-      // with whoever played the card. An Extra is the exception: its player loads it as they choose.
-      tip: 'Timetabled trains for this Stage are built: each player adds ONE car at a time, starting with the Superintendent and working eastward, repeating until the consist is full or the Division Yard has nothing suitable. New timetabled trains are rolled onto the timetable. Held trains are built. An Extra is loaded by the player who played it.',
+      tip: 'Timetabled trains for this Stage are built. New timetabled trains are randomly placed on the timetable. Held trains are built. Extra trains are built.',
       // a locomotive being made up
       icon: '<rect class="ic" x="2" y="6" width="9" height="7" rx="1"/><path class="ic" d="M11 9h4v4h-4"/><circle class="icf" cx="5" cy="15" r="1.5"/><circle class="icf" cx="13" cy="15" r="1.5"/>',
     },
@@ -95,55 +79,15 @@ export function turnChartHtml(f: TurnChartFrame, actorName: string | null, super
     );
   }).join('');
 
-  /**
-   * WAITING ON WHOM, AND FOR WHAT.
-   *
-   * "nobody — the Division is running itself" is true of an automatic phase and was being printed
-   * over the top of three interruptions that are emphatically waiting on a person: §8.1's clearance
-   * ruling, the Yard Office offer and the Red Flag prompt. The Frame carried the phase's actor,
-   * which is null throughout the Mainline Phase, so a game stopped on a named player's decision
-   * reported that nobody was holding it up (Jesse, 2026-08-30). `Frame.actor` is `actingPlayer` now
-   * and answers who; `awaiting` says what, because "waiting on Bob" with no more than that is a
-   * game that looks stuck to everyone except Bob.
-   */
-  /**
-   * AN AUTOMATIC PHASE WAITS ON NOBODY, so it says what it is DOING instead of apologising.
-   *
-   * "nobody — the Division is running itself" reached the answer by negation, and left a player
-   * reading a line whose subject was an absence (Jesse, playtest 2026-09-16: it should say "waiting
-   * on <player>", or describe what the engine is doing — "the Division is moving trains during the
-   * mainline phase"). The phase's NAME is already printed on the line directly above this one, so
-   * these describe the work rather than repeating the label.
-   */
-  const DOING: Record<string, string> = {
-    mainline: 'the Division is moving trains',
-    newTrain: "the Division is building this Stage's trains",
-    loadUnload: 'the Division is working cargo',
-    shiftChange: 'the Division is changing shifts',
-  };
-  // Local Operations always has an actor, so its entry is the fallback rather than a case.
-  const who = actorName ?? DOING[f.phaseKey] ?? 'the Division is running itself';
-  // Only a person is WAITED ON. The Division is not waiting; it is working.
-  const waiting = actorName === null ? '' : 'waiting on ';
-  const asked = f.awaiting
-    ? ` <span class="tc-asks">${esc(f.awaiting.asks)} · ${esc(f.awaiting.train)}</span>`
-    : '';
-  const fedora =
-    superName === null
-      ? ''
-      : `<div class="tc-super" data-tip="The Superintendent holds the Fedora. Every third Stage — 3, 6, 9 and 12 — it passes one seat to the left. The office rules on whether a following train may depart, and every round that goes round the table starts here: the New Train make-up round, and the acting order within a phase." tabindex="0">` +
-        `<span aria-hidden="true">🎩</span> Superintendent <b>${esc(superName)}</b></div>`;
+  // An automatic phase is waiting on nobody, and saying so is more use than a blank.
+  const who = actorName ?? 'nobody — the Division is running itself';
 
   return (
     `<div class="tc-when"><b>Day ${f.day}</b><span>Stage ${f.stage} of 12</span>` +
     `<span class="dim">${esc(f.clock)}</span></div>` +
     `<div class="tc-now">phase <b>${esc(f.phase)}</b></div>` +
-    `<div class="tc-who">${waiting}<b>${esc(who)}</b>${asked}</div>` +
-    // THE FEDORA RIDES AT THE END OF THE PHASE ROW (`TODO.md` #29, Jesse). It sat on its own line
-    // between the phases and everything above them, which put a thing that changes every third
-    // Stage in the middle of the things that change every Stage. The row it belongs beside is the
-    // one whose last chip is Supervisor Shift — the phase that passes it.
-    `<div class="tc-row"><ol class="tc-phases">${chips}</ol>${fedora}</div>`
+    `<div class="tc-who">waiting on <b>${esc(who)}</b></div>` +
+    `<ol class="tc-phases">${chips}</ol>`
   );
 }
 
@@ -166,19 +110,8 @@ export const TURNCHART_CSS = `
    says "Player Solitaire", so the chart should agree. In multiplayer this is the thing a table
    glances at most often, so it gets its own chip rather than hiding in the phase text. */
 .tc-who{display:flex;align-items:center;gap:6px;font-size:12px;color:#8b94a3}
-.tc-asks{color:#a99ac4;font-style:italic}
 .tc-who b{color:#b98cf0;background:rgba(150,110,230,.16);border:1px solid #8b6ad0;
   border-radius:11px;padding:1px 9px;font-size:12px}
-/* WHO HOLDS THE FEDORA. Violet like the rest of the chart — this is "where you are" news, not
-   something to press — but unfilled, so the eye still lands on "waiting on" first: that is the one
-   that changes every turn, while this changes four times a Day. */
-/* The phase row and the Fedora on one line, the hat pushed to the far end (TODO.md #29): the row
-   is the Stage, and the Superintendent is who holds it. Wraps under the phases on a narrow screen
-   rather than squeezing the chips. */
-.tc-row{display:flex;align-items:center;gap:12px;flex-wrap:wrap}
-.tc-row ol.tc-phases{flex:1 1 auto}
-.tc-super{margin-left:auto;display:flex;align-items:center;gap:6px;font-size:12px;color:#8b94a3;cursor:help}
-.tc-super b{color:#cbb6f2;border:1px solid #6b5a94;border-radius:11px;padding:1px 9px;font-size:12px}
 ol.tc-phases{display:flex;gap:6px;list-style:none;margin:0;padding:0;flex-wrap:wrap}
 .tc-phase{display:flex;align-items:center;gap:6px;border:1px solid #2c333d;border-radius:14px;
   padding:3px 10px 3px 7px;font-size:11px;color:#8b94a3;background:#1a1f26;cursor:help}

src/web/game.ts

@@ -23,24 +23,20 @@
  * folding events does not rebuild a game — `protocol.md` §3.)
  */
 
-import { advance, pump } from '../engine/advance.ts';
+import { pump } from '../engine/advance.ts';
 import { applyIntent } from '../engine/apply.ts';
 import type { GameEvent } from '../engine/events.ts';
 import type { Intent } from '../engine/intents.ts';
 import { legalActions } from '../engine/legal.ts';
 import { createGame } from '../engine/setup.ts';
-import type { CardId, GameConfig, GameState, GridCoord, PlayerIndex } from '../engine/state.ts';
-import { overHandLimit as overHandLimitOf } from '../engine/state.ts';
+import type { CardId, GameConfig, GameState, PlayerIndex } from '../engine/state.ts';
 import { playerAtSeat } from '../engine/state.ts';
 import { cuesFor, narrate } from '../sim/narrate.ts';
-import { collectStep, newCollector } from '../sim/display-step.ts';
-import type { DisplayCollector } from '../sim/display-step.ts';
 // Import from the view module, NOT replay.ts — replay.ts writes files and reads process.argv,
 // which would pull node:fs into a browser bundle.
 import {
   cardDescription,
   cardName,
-  currentActorOfState,
   describeIntent,
   geometryLabel,
   snapshot,
@@ -48,14 +44,10 @@ import {
   variantLabel,
 } from '../sim/view.ts';
 import {
-  DEFAULT_DAYS,
   DEFAULT_HOUSE_RULES,
-  DEFAULT_MAX_COLLISIONS_PER_DAY,
-  DEFAULT_MAX_COLLISIONS_TOTAL,
+  HAND_LIMIT,
   LEGACY_HOUSE_RULES,
-  collectiveRevenueFloor,
   houseRules,
-  industryProfile,
   mainlineProfile,
   trainProfile,
 } from '../engine/content.ts';
@@ -65,21 +57,13 @@ import { connectionsFor, joins, neighbour, variantsFor } from '../engine/track.t
 import { areaOf, destinationsFor, selectDestination, trainNeedingCars } from '../engine/apply.ts';
 import type { Frame } from '../sim/view.ts';
 
-/**
- * The canonical "what does a fresh solitaire game look like" config — also what the New Game
- * dialog's solitaire defaults are drawn from (`main.ts`). One player, so `minCombinedRevenue` uses
- * `collectiveRevenueFloor(1, DEFAULT_DAYS)` — the same formula multiplayer configs use, just at
- * player count 1.
- */
 export const SOLO_CONFIG: GameConfig = {
   mode: 'solitaire',
-  days: DEFAULT_DAYS,
-  minCombinedRevenue: collectiveRevenueFloor(1, DEFAULT_DAYS),
-  maxCollisionsPerDay: DEFAULT_MAX_COLLISIONS_PER_DAY,
-  maxCollisionsTotal: DEFAULT_MAX_COLLISIONS_TOTAL,
-  pvpCardsAllowed: false,
+  victory: 'highestAfterDays',
+  length: 'standard',
   optionalRules: {
     reducedVisibility: false,
+    sisterTrains: false,
     employeeRotation: false,
     emergencyToolbox: false,
   },
@@ -88,79 +72,9 @@ export const SOLO_CONFIG: GameConfig = {
   houseRules: DEFAULT_HOUSE_RULES,
 };
 
-/**
- * The lobby's (`lobby.ts`) starting point for a Competitive or Co-op `Lobby.Create` — same formula
- * `SOLO_CONFIG` uses, at a nominal player count. `minCombinedRevenue` is necessarily a guess at
- * create time: nobody is seated yet, so there is no real headcount to size it against. It stays a
- * guess rather than being fixed up at `Lobby.Start`, matching what the New Game dialog already told
- * players before there was a lobby at all ("assumes a 4-player table until there's a lobby to ask
- * who's actually seated") — Phase 5 or a follow-up can revisit sizing it to the seats actually
- * filled once that is worth the complexity.
- */
-export function defaultMultiplayerConfig(mode: 'competitive' | 'coop', players = 4): GameConfig {
-  return {
-    mode,
-    days: DEFAULT_DAYS,
-    minCombinedRevenue: collectiveRevenueFloor(players, DEFAULT_DAYS),
-    maxCollisionsPerDay: DEFAULT_MAX_COLLISIONS_PER_DAY,
-    maxCollisionsTotal: DEFAULT_MAX_COLLISIONS_TOTAL,
-    pvpCardsAllowed: mode === 'competitive',
-    optionalRules: {
-      reducedVisibility: false,
-      employeeRotation: false,
-      emergencyToolbox: false,
-    },
-    houseRules: DEFAULT_HOUSE_RULES,
-  };
-}
-
-/**
- * Everything the New Game dialog can set for a solitaire game — the opening deal and the three
- * revenue rates (`houseRules`, unchanged), plus the four victory-condition dials added 2026-08-20.
- * Solitaire's `pvpCardsAllowed` is not here: it is forced off (`SOLO_CONFIG`), never a player choice.
- */
-export type NewGameOptions = {
-  houseRules?: HouseRuleOverrides;
-  days?: number;
-  minCombinedRevenue?: number;
-  maxCollisionsPerDay?: number;
-  maxCollisionsTotal?: number;
-  /**
-   * Appendix B's three, added 2026-08-23 when the New Game dialog gained them.
-   *
-   * The lobby has offered these since v0.6.0 and the solitaire dialog could not, which meant a
-   * solitaire game could never be played under Employee Rotation or the Emergency Toolbox at all.
-   * Partial like `houseRules`: a caller names only what it is setting.
-   */
-  optionalRules?: Partial<GameConfig['optionalRules']>;
-};
-
 /** The same config with the New Game dialog's answers in it. */
-export function configWith(opts: NewGameOptions): GameConfig {
-  const days = opts.days ?? SOLO_CONFIG.days;
-  return {
-    ...SOLO_CONFIG,
-    days,
-    /**
-     * DERIVED FROM THE DAYS ACTUALLY IN PLAY, not from `SOLO_CONFIG`'s five-Day constant.
-     *
-     * It fell back to the constant until 2026-08-30, so `configWith({ days: 1 })` asked a one-Day
-     * game to clear **15** — a floor a five-Day game averages barely half of — and
-     * `configWith({ days: 10 })` asked for the same 15 a five-Day game does. The two fields silently
-     * disagreed, which is the one thing a "build me a config" helper must not let happen.
-     *
-     * Not a live fault when it was found: `createLocalSession` is the only caller, and the page
-     * always writes `minCombinedRevenue` itself (`solitaireDefaults` re-derives it from the preset).
-     * Found by a throwaway probe that passed only `days` — which is exactly how the next caller
-     * would use this. At the default day count the answer is unchanged, since `SOLO_CONFIG`'s own
-     * floor is this same formula at `DEFAULT_DAYS`.
-     */
-    minCombinedRevenue: opts.minCombinedRevenue ?? collectiveRevenueFloor(1, days),
-    maxCollisionsPerDay: opts.maxCollisionsPerDay ?? SOLO_CONFIG.maxCollisionsPerDay,
-    maxCollisionsTotal: opts.maxCollisionsTotal ?? SOLO_CONFIG.maxCollisionsTotal,
-    optionalRules: { ...SOLO_CONFIG.optionalRules, ...(opts.optionalRules ?? {}) },
-    houseRules: houseRules(opts.houseRules ? { houseRules: opts.houseRules } : {}),
-  };
+export function configWith(rules: HouseRuleOverrides): GameConfig {
+  return { ...SOLO_CONFIG, houseRules: houseRules({ houseRules: rules }) };
 }
 
 /** A group of legal actions of one kind, ready to put on screen. */
@@ -248,6 +162,7 @@ export type Game = {
    * had already been played and the hand held three or fewer. Derived from the hand each render, so
    * it cannot drift out of step with what is actually held.
    */
+  mustPlayCard: boolean;
   /**
    * Sounds the last batch of events earned, for the page to play and clear.
    *
@@ -279,22 +194,11 @@ export type Game = {
    * having taken a turn to cause it.
    */
   announced: string | null;
-  /**
-   * ORDERED PRESENTATION STEPS — v0.8.0, TODO #13. One per accepted intent, so a player can WATCH
-   * what everyone else did rather than find the board already rearranged.
-   *
-   * Accumulated here beside `log`, `cues` and `announced` and drained the same way, because that is
-   * how this file already hands things to whatever is displaying the game. Filled by `submit()`
-   * alone, which is what makes it identical for solitaire and multiplayer and inert during replay —
-   * see `sim/display-step.ts`.
-   */
-  display: DisplayCollector;
 };
 
 /** How each intent kind is introduced in the action list, in the order they should appear. */
 const GROUP_ORDER: readonly { prefix: string; title: string }[] = [
   { prefix: 'mainline.clearance', title: 'Superintendent — rule on this train' },
-  { prefix: 'mainline.yardOffice', title: 'Where does this train arrive?' },
   { prefix: 'localOps.choose', title: 'Local Operations — choose ONE' },
   { prefix: 'switch.', title: 'Switching' },
   // Specific before general: `startsWith` means a bare `draw.` would swallow all three, and the
@@ -324,7 +228,7 @@ export const SOLO_PLAYER = 'Solitaire';
 
 export function newGame(seed: number, config: GameConfig = SOLO_CONFIG): Game {
   const state = createGame({ id: `web-${seed}`, seed, config, playerNames: [SOLO_PLAYER] });
-  const game: Game = { state, seed, history: [], log: [], cues: [], scheduled: null, justDrawn: null, announced: null, display: newCollector() };
+  const game: Game = { state, seed, history: [], log: [], mustPlayCard: false, cues: [], scheduled: null, justDrawn: null, announced: null };
   // A history that opens mid-Stage reads as though something was missed. Say what the game IS
   // first, then let the clock take over.
   game.log.push({ text: 'Game Begins', tone: 'start' });
@@ -333,37 +237,6 @@ export function newGame(seed: number, config: GameConfig = SOLO_CONFIG): Game {
   return game;
 }
 
-/**
- * `newGame`'s multi-player sibling — the server session host (Phase 2) needs a `Game` wrapper for
- * more than one seat, and `newGame` hardcodes `[SOLO_PLAYER]`. Kept as a separate function rather
- * than a shared parametrized helper: `newGame` is exercised by every solitaire test and save, and
- * reordering its log-then-drain sequence to share code with this risks nothing for a marginal DRY
- * gain. `submit`/`drain`/`actionMenu`/`currentActor` all work on either unchanged, since none of them
- * know or care how many players a `Game` has.
- */
-export function newMultiplayerGame(seed: number, config: GameConfig, playerNames: string[]): Game {
-  const state = createGame({ id: `mp-${seed}`, seed, config, playerNames });
-  const game: Game = { state, seed, history: [], log: [], cues: [], scheduled: null, justDrawn: null, announced: null, display: newCollector() };
-  game.log.push({ text: 'Game Begins', tone: 'start' });
-  /**
-   * NO SEED AT A TABLE WITH MORE THAN ONE SEAT (Gitea#20 step 1).
-   *
-   * `game.log` is one shared list and `linesSince(seat)` (`server/session.ts`) slices it with no
-   * per-seat filter, so every line here reaches every player. Announcing the seed therefore handed
-   * each of them the whole future of the deal — every card order, every die — in the opening line
-   * of the game. Found while planning the public common board; it is a multiplayer leak with or
-   * without that display, which is why it is fixed here rather than waiting for it.
-   *
-   * `newGame` still records it, deliberately: a solitaire table has nobody to leak to, and the seed
-   * in the log is what a bug report quotes. The rule is "do not tell the OTHER seats", not "write
-   * less down". The seed remains in `game.seed`, in every save (`session.ts` persistence) and in the
-   * lobby record, so nothing administrative or replayable loses it.
-   */
-  game.log.push({ text: `${config.mode} · ${playerNames.length} players`, tone: 'quiet' });
-  drain(game);
-  return game;
-}
-
 /**
  * Run the engine forward until it needs a decision.
  *
@@ -374,18 +247,12 @@ export function drain(game: Game): void {
   record(game, pump(game.state));
 }
 
-/**
- * Whose turn it is, or null if the game is over or waiting on nothing.
- *
- * `currentActorOfState` (sim/view.ts) IS this, taking the state rather than the `Game` — so this is
- * the adapter and not a second copy. It used to be the second copy: it carried the status guard and
- * the view's version did not, which is #96 — the turn chart named the last seat to move all the way
- * through the §3.3 vote, while this function correctly refused every intent that seat could send.
- * Two functions that agree until they don't are worse than one, because the disagreement surfaces
- * as a screen nobody can square with the server.
- */
+/** Whose turn it is, or null if the game is over or waiting on nothing. */
 export function currentActor(game: Game): PlayerIndex | null {
-  return currentActorOfState(game.state);
+  if (game.state.status !== 'active') return null;
+  return game.state.clock.pendingDecision !== null
+    ? game.state.clock.superintendent
+    : game.state.clock.currentActor;
 }
 
 /** Every legal action right now, grouped for display. Empty when there is nothing to decide. */
@@ -514,26 +381,13 @@ export function actionGroups(game: Game): { options: Intent[]; groups: ActionGro
        */
       if (prefix === 'mainline.clearance') {
         const pending = game.state.clock.pendingDecision;
-        if (pending?.kind === 'clearance') {
+        if (pending) {
           headed =
             `Superintendent — may ${trainName(game.state, pending.train)} follow ` +
             `${trainName(game.state, pending.occupiedBy)} onto the same Mainline card?`;
         }
       }
 
-      /**
-       * §11 (Gitea#5) — the Yard Office offer interrupts the Mainline Phase, so it arrives with no
-       * context around it: the player was not thinking about this train a moment ago.
-       */
-      if (prefix === 'mainline.yardOffice') {
-        const pending = game.state.clock.pendingDecision;
-        if (pending?.kind === 'yardOffice') {
-          headed =
-            `${trainName(game.state, pending.train)} is arriving with no coaches — ` +
-            'take it into the Yard Office, or hold it at the Train Order Office?';
-        }
-      }
-
       /**
        * A PENDING EXTRA IS ITS OWN QUESTION, and its own heading.
        *
@@ -664,14 +518,6 @@ export type Menu = {
   makeUp: {
     trayId: string;
     title: string;
-    /**
-     * What the card still wants, after what is already coupled up — "1 boxcar/hopper + 1 caboose".
-     *
-     * The title says what the card CALLS FOR and never changes as cars go on, so a player had to
-     * diff it against the consist drawn on the Division map, in the other column. Null when the
-     * train is complete and only the send-it-out button is left.
-     */
-    needs: string | null;
     cars: MakeUpAction[];
     pass: number | null;
     /**
@@ -684,16 +530,7 @@ export type Menu = {
 
 /** The action list as the page shows it: direct actions, plus subject-then-location for the rest. */
 export function actionMenu(game: Game, seat: PlayerIndex = 0): Menu {
-  /**
-   * SEAT-SAFETY. `actionGroups`/`legalActions` answer for `currentActor(game)`, not for `seat` — there
-   * is exactly one acting player at a time, so a Menu built for anyone else must show no actions at
-   * all, only their own hand (found the hard way: calling this for a non-acting seat used to hand
-   * back the ACTOR's legal moves paired with the WRONG seat's cards). Emptying `options`/`groups` here
-   * degrades every downstream computation (`direct`, `placeable`, `makeUp`) to empty for free — the
-   * hand section below still reads `seat`'s own cards correctly either way.
-   */
-  const isActor = seat === currentActor(game);
-  const { options, groups } = isActor ? actionGroups(game) : { options: [] as Intent[], groups: [] as ActionGroup[] };
+  const { options, groups } = actionGroups(game);
   const direct: ActionGroup[] = [];
   const placeableByTitle = new Map<string, Map<string, Placeable>>();
 
@@ -812,7 +649,6 @@ export function actionMenu(game: Game, seat: PlayerIndex = 0): Menu {
       ? {
           trayId: filling,
           title: consistTitle(game, filling) ?? 'Making up the train',
-          needs: consistNeeds(game, filling),
           cars: makeUpCars,
           pass,
           advice: makeUpAdvice(game, filling, makeUpCars),
@@ -965,40 +801,6 @@ function consistTitle(game: Game, trayId: string): string | null {
   return trainCardTitle(tray.trainNumber ?? 0, tray.trainIsExtra);
 }
 
-/**
- * WHAT THE TRAIN STILL WANTS — the card's demand minus what is already on it.
- *
- * The heading says "its card calls for 3 boxcar/hopper + 1 caboose" and goes on saying it whether
- * you have added none or three; the cars themselves are drawn on the Division map, in the other
- * column. So the one question a player actually has while clicking — what is left? — was the one
- * thing on screen that had to be worked out by eye, across two panels (Jesse, playtest 2026-09-16).
- *
- * BY CATEGORY, exactly as `acceptsCar` counts them, so this cannot promise a car the engine would
- * then refuse. Null when nothing is outstanding.
- */
-function consistNeeds(game: Game, trayId: string): string | null {
-  const tray = game.state.trays.get(trayId);
-  if (!tray) return null;
-  const p = trainProfile(tray.trainNumber ?? 0, tray.trainIsExtra);
-  if (!p) return null;
-
-  const cat = (t: string): 'coach' | 'caboose' | 'freight' =>
-    t === 'coach' ? 'coach' : t === 'caboose' ? 'caboose' : 'freight';
-  const have = (k: 'coach' | 'caboose' | 'freight'): number =>
-    tray.consist.filter((c) => cat(c.type) === k).length;
-
-  const parts: string[] = [];
-  const freight = p.consist.freight - have('freight');
-  const coach = p.consist.coach - have('coach');
-  const caboose = p.consist.caboose - have('caboose');
-  if (freight > 0) {
-    parts.push(`${freight} ${p.consist.freightTypes?.join('/') ?? 'freight'}${p.consist.emptiesOnly ? ' (empties only)' : ''}`);
-  }
-  if (coach > 0) parts.push(`${coach} coach${coach > 1 ? 'es' : ''}`);
-  if (caboose > 0) parts.push(`${caboose} caboose`);
-  return parts.length > 0 ? parts.join(' + ') : null;
-}
-
 /**
  * "Making up Extra X22 “Pee-Dee”: its card calls for 1 caboose — Per-diem train…"
  *
@@ -1114,45 +916,14 @@ function makeUpAdvice(
  * button with a reason instead of hiding a move that has simply become illegal.
  */
 export function overHandLimit(game: Game, seat: PlayerIndex = 0): boolean {
-  return overHandLimitOf(game.state, seat);
+  const hand = game.state.decks.hands.get(seat) ?? [];
+  const limit = game.state.decks.redFlags.get(seat) ? HAND_LIMIT + 1 : HAND_LIMIT;
+  return hand.length > limit;
 }
 
-/**
- * Intents any seat may send regardless of whose turn it is — and, for `game.extend`, regardless of
- * whether the game is still running at all (§3.3, Gitea#11).
- *
- * `currentActor` is null once the timetable has run out, which is correct for everything else and
- * exactly wrong for the vote on playing another Day. Rather than teach `currentActor` about a state
- * where EVERY seat may act at once — which it has no way to express — callers name the seat.
- */
-export function isOutOfTurn(intent: Intent): intent is Extract<Intent, { type: 'game.extend' }> {
-  return intent.type === 'game.extend';
-}
-
-/**
- * WHO ACTED, when replaying a saved history.
- *
- * A save is a flat `Intent[]` with no seat written beside each move, so a replay normally derives
- * the actor from the turn order — the same order the live game went round in, reproduced exactly.
- * That breaks for exactly one intent: the extension vote, which every seat may cast in any order,
- * and which `currentActor` answers `null` for because the game has stopped. Replaying such a save
- * used to fail outright with `NO_ACTOR`, which is to say an extended game could not be resumed at
- * all — found by `test/server/session.test.ts`'s resume test, and the reason `game.extend` carries
- * its voter (`intents.ts`).
- */
-function replayActor(game: Game, intent: Intent): PlayerIndex | null {
-  return isOutOfTurn(intent) ? intent.player : currentActor(game);
-}
-
-/**
- * Submit an action. Returns false and changes nothing if the engine rejects it.
- *
- * `as` names the seat for an out-of-turn intent (see `isOutOfTurn`). It cannot be used to smuggle an
- * ordinary move past the turn order: `check` is still the authority and still asks `isActor`, so a
- * named seat that is not the actor is refused exactly as it would have been.
- */
-export function submit(game: Game, intent: Intent, as: PlayerIndex | null = null): boolean {
-  const actor = as ?? currentActor(game);
+/** Submit an action. Returns false and changes nothing if the engine rejects it. */
+export function submit(game: Game, intent: Intent): boolean {
+  const actor = currentActor(game);
   if (actor === null) return false;
 
   const result = applyIntent(game.state, actor, intent);
@@ -1161,69 +932,12 @@ export function submit(game: Game, intent: Intent, as: PlayerIndex | null = null
     return false;
   }
   game.history.push(intent);
-  /**
-   * THE HIGH-WATER MARK FOR THIS STEP'S NARRATION (v0.8.0).
-   *
-   * Taken here rather than read from `session.ts`'s `sentLines`, which is per-seat and is MUTATED
-   * by `linesSince()` as a side effect of building a push — so it cannot answer "what did this one
-   * intent say?". `submit` brackets the whole thing, `record` and `drain` below are the only things
-   * that append, and the slice after them is exactly this intent's narration including whatever
-   * automatic phases it drained.
-   */
-  const saidFrom = game.log.length;
   record(game, result.events, actor);
-  collectStep(game.display, game.state, actor, intent.type, game.log.slice(saidFrom));
-  drainStepping(game);
+  game.mustPlayCard = overHandLimit(game);
+  drain(game);
   return true;
 }
 
-/**
- * `drain()`'s STEPPED TWIN — TODO #18, and the reason this is not just `drain(game)`.
- *
- * `pump()` runs every automatic phase between one click and the next and `drain()` records the whole
- * batch at once, so New Train, the Mainline and the shift change are never drawn at all: trains
- * cross the Division in a single jump. Stepping `advance()` one call at a time and collecting after
- * each is what gives those phases a visible beat, which is exactly what TODO Reference · #18 says is
- * needed — *"a minimum dwell time on its own therefore fixes nothing"*.
- *
- * IDENTICAL BEHAVIOUR TO `drain()`, deliberately. The same `advance()` calls in the same order
- * produce the same state; `record()` is called per phase rather than per batch, which is equivalent
- * because `cuesFor` is a pure per-event map with no cross-event state and `record`'s other outputs
- * (`scheduled`, `justDrawn`, `announced`) are last-wins in event order either way.
- *
- * A PHASE THAT DID NOTHING PRODUCES NO STEP. Jesse, 2026-09-09: *"if nothing happens during a phase
- * then we shouldn't lose time to it."* Narrating nothing is the test for that — an empty phase adds
- * no lines, so it is skipped rather than given a dwell to sit through.
- *
- * `drain()` itself is untouched, and must stay that way: `fromSave`, `fromMultiplayerSave` and
- * `undo` all use it, and the collector staying off those paths is what keeps a replay from
- * re-emitting a whole game as steps.
- */
-function drainStepping(game: Game): void {
-  for (let i = 0; i < 10_000; i++) {
-    const from = game.log.length;
-    const r = advance(game.state);
-    record(game, r.events);
-    /**
-     * THE TEST IS THE EVENT LIST, NOT THE LOG — and getting that wrong drifted the board.
-     *
-     * `record()` deliberately drops `actorChanged` before narrating, so a phase whose only effect is
-     * handing the turn to the next player grows no lines at all. Collecting only when the log grew
-     * therefore skipped those, and the last step's frame was then a position behind the real one:
-     * the animated board ended a turn out of step with the game (`actor: 2` where the game said 1).
-     *
-     * A step whose narration is empty still carries the board. It simply costs no time to show —
-     * `dwellForStep` gives a silent step a dwell of zero — which is the same rule that collapses an
-     * empty phase, arrived at from the other direction.
-     */
-    if (r.events.length > 0) {
-      collectStep(game.display, game.state, null, 'phase', game.log.slice(from));
-    }
-    if (r.needsInput || game.state.status === 'finished') return;
-  }
-  throw new Error('phase driver failed to settle — probable infinite loop');
-}
-
 /**
  * Which cards in hand can be played RIGHT NOW, in hand order.
  *
@@ -1252,99 +966,6 @@ export function view(game: Game, seat: PlayerIndex = 0): Frame {
   return snapshot(game.state, [], null, null, null, false, seat);
 }
 
-/**
- * Fold a narration's opening word into the middle of a sentence — "Chose to draw" after a name has
- * to read "Player Bob chose to draw".
- *
- * ONLY A SENTENCE-CASED WORD, which is the whole point. It used to be a flat
- * `text.charAt(0).toLowerCase()`, so every line opening with an all-caps keyword came out mangled:
- * `EXTRA X18 started…` rendered as `Player Solitaire eXTRA X18 started…`, and the same happened to
- * `TRAIN 1 MADE UP` and `COLLISION`. Those words are shouted deliberately.
- *
- * `^[A-Z][a-z]` is the test — a capital followed by a lower-case letter is an ordinary word that was
- * capitalised because it began a sentence, and nothing else is. It leaves all-caps keywords alone,
- * and it also leaves alone a word whose second character is a digit or a hyphen (`X22 Pee-Dee`),
- * which a naive "is it uppercase?" check would get wrong because `'2'.toUpperCase() === '2'`.
- */
-function uncapitalise(text: string): string {
-  return /^[A-Z][a-z]/.test(text) ? text.charAt(0).toLowerCase() + text.slice(1) : text;
-}
-
-/**
- * The Facility on one of a player's squares, or null — for naming the place a switching line is
- * about. Shared by the narrator and the filter below, so both agree on what counts as an industry.
- */
-function facilityOn(game: Game, player: PlayerIndex, at: GridCoord): string | null {
-  const card = areaOf(game.state, player).grid.get(`${at.row},${at.col}`);
-  const f = card?.facility;
-  // The name printed on the card, not the internal key: `industryProfile` is the one place that
-  // knows "grocersWarehouse" reads as "Grocer's Warehouse".
-  if (f) return f.subtype === 'office' ? 'the Office' : `the ${industryProfile(f.subtype).name}`;
-  /**
-   * A SMALL YARD IS A PLACE TOO, though it is an enhancement on a plain card rather than a Facility.
-   *
-   * It is the one square in a district a crew goes to ON PURPOSE without working an industry — the
-   * whole point of the trip is to arrive there and re-make the train — so "leaving Train 10 at
-   * (-1,1)" was the one line most in need of a name. Only this enhancement: the others change what a
-   * square DOES without being somewhere a player aims a crew at.
-   */
-  return card?.enhancements.includes('smallYard') ? 'the Small Yard' : null;
-}
-
-/**
- * HOW MUCH SWITCHING REACHES THE HISTORY PANEL (Jesse, 2026-09-17).
- *
- * All of it did. A six-Move turn wrote a line per move — "Moved Train 10 (0,3) → (-1,-3) — 4 of 6
- * Moves left" — plus one per mandatory coupling, so two players shunting filled the panel with
- * coordinates and pushed everything else off the top. His ruling, asked as a question from the
- * table: a line saying somebody switched, the cars they set out at or picked up from an INDUSTRY,
- * and the Small Yard sort. Not every move, and not every coupling.
- *
- * WHAT STAYS, and why each one earns its line: `localOpsOptionChosen` already says who is switching
- * and is left alone; work at an industry is the point of switching and changes what can be loaded
- * next; and `consistSorted` spends a Move and changes what the train can do. A plain move along
- * one's own track changes nothing anybody needs to read back.
- *
- * THE LINE IS STILL WRITTEN, MARKED `trace`, AND THAT IS NOT A DETAIL. Dropping these events on the
- * floor was the first attempt and the suite caught it: `dwellForStep` gives a step NO dwell when it
- * produced no narration, so a switching move with no line became a silent step and the board stopped
- * replaying switching altogether — it would have snapped through the very thing v0.8.0 was built to
- * let the table watch. The line still rides with its display step and still captions the board as
- * the move goes up; only the history panel skips it.
- *
- * THE REPLAY VIEWER IS UNAFFECTED for the same reason, and it renders through `narrate` directly.
- */
-function inHistory(game: Game, e: GameEvent): boolean {
-  const industry = (player: PlayerIndex, ...coords: GridCoord[]): boolean =>
-    coords.some((c) => facilityOn(game, player, c) !== null);
-  switch (e.type) {
-    /**
-     * THE FIRST MOVE OF A TURN IS KEPT (Jesse, 2026-09-17: "also keep the first and last move").
-     *
-     * It says a crew set off and from where, which is the half of "somebody switched" that the
-     * opener does not carry. The LAST move cannot be kept the same way — nothing knows a move was
-     * the last until the turn is over, and by then the line has already been written and streamed to
-     * every client (`server/session.ts` § linesSince), so it cannot be revised. `switchingEnded`
-     * carries it instead, as the line that closes the turn.
-     *
-     * Recognised by the MOVE COUNT rather than by tracking state: the first move of a turn is the
-     * one that leaves `movesAllowed - 1` behind it, which the event now carries so this holds on a
-     * five-Move night Stage too.
-     */
-    case 'trayMoved':
-      return e.movesRemaining === e.movesAllowed - 1;
-    // Coupling is mandatory when a crew runs over cars (§A.4), so most of these happen to a player
-    // rather than being chosen. The ones worth reading are where cars left or joined an industry —
-    // `from` names the cards the cars were actually lifted off, which is where they had been spotted.
-    case 'carsCoupled':
-      return industry(e.player, e.at, ...e.from);
-    case 'carsDropped':
-      return industry(e.player, e.at);
-    default:
-      return true;
-  }
-}
-
 function record(game: Game, events: GameEvent[], actor: PlayerIndex | null = null): void {
   const who = actor === null ? null : (game.state.players[actor]?.name ?? null);
   for (const e of events) {
@@ -1353,53 +974,12 @@ function record(game: Game, events: GameEvent[], actor: PlayerIndex | null = nul
     const n = narrate(e, {
       cardName: (id) => cardName(game.state, id),
       trainName: (id) => trainName(game.state, id),
-      facilityAt: (player, at) => facilityOn(game, player, at),
-      // Whose district a train reached is not the actor — the Mainline Phase has none — so the
-      // narration resolves the name itself rather than being prefixed with one by the code below.
-      // NO NUMBER IN THE FALLBACK. This is a PLAYER index, and a player is not a seat — seats rotate
-      // under Employee Rotation, which is why `seatOf` exists — so "Seat 3" here would be a wrong
-      // number dressed as a right one, and `session.test.ts` rightly refuses any raw index shown to
-      // a person. Every caller passes real names; an unnamed player is anonymous rather than mislabelled.
-      playerName: (p) => game.state.players[p]?.name ?? 'another player',
     });
-    /**
-     * A BLIND DRAW IS PUBLIC; WHICH CARD CAME UP IS NOT (Gitea#20 step 1).
-     *
-     * Everybody at the table sees a hand go to the Home Office deck, so the draw itself belongs in
-     * the shared log. The card's NAME does not: the deck is face down, and this log goes to every
-     * seat unfiltered, so naming it told three opponents exactly what the fourth was holding.
-     *
-     * A DEPARTMENT SLOT IS NOT THE SAME and stays named. Those piles are face up — a discard goes
-     * onto one precisely so a rival can take it — so the card was public before it was drawn, and
-     * hiding it would lose real information for no gain.
-     *
-     * The drawing seat still learns what it got. `justDrawn` below is the owner-only channel and
-     * `session.ts` sends it to that seat alone, so this costs the drawer nothing. Solitaire keeps
-     * the name for the same reason it keeps the seed: a one-seat table has nobody to leak to, and
-     * a solo player's history naming their own draw is the record rather than a leak.
-     */
-    const blindDraw = e.type === 'cardDrawn' && e.source === 'homeOffice' && game.state.players.length > 1;
-    const said = blindDraw ? 'Drew a card from the Home Office deck' : n.text;
     // "Chose to DRAW a card" does not say WHO, which is unreadable the moment there is more than
     // one seat. Only events the player caused are attributed; the Division running itself is not.
-    /**
-     * A RULING IS MADE AS SUPERINTENDENT, NOT AS YOURSELF (playtest, 2026-09-15: "maybe it could say
-     * 'Superintendent Player Tom', so it's clear they got the move because they're Superintendent").
-     * These three are the only moves a player makes out of turn, by holding the office: §8.1's
-     * clearance, §11's Yard Office offer and §Q's Red Flag prompt. `clearanceGiven` carries no
-     * player at all — the office made it, whoever holds it — so the actor is what names it.
-     */
-    const RULINGS = ['clearanceGiven', 'yardOfficeRuled', 'redFlagRuled'];
-    const ruling = RULINGS.includes(e.type) && who !== null;
     const mine = who !== null && 'player' in e;
-    const text = ruling
-      ? `Superintendent Player ${who} ${uncapitalise(said)}`
-      : mine
-        ? `Player ${who} ${uncapitalise(said)}`
-        : said;
-    // `trace` is a tone the history panel does not draw — see `inHistory`. The line exists so the
-    // step that caused it has narration to caption the board with, and a dwell to be watched for.
-    game.log.push({ text, tone: inHistory(game, e) ? (mine || ruling ? 'act' : n.tone) : 'trace' });
+    const text = mine ? `Player ${who} ${n.text.charAt(0).toLowerCase()}${n.text.slice(1)}` : n.text;
+    game.log.push({ text, tone: mine ? 'act' : n.tone });
 
   }
   game.cues.push(...cuesFor(events));
@@ -1416,18 +996,6 @@ function record(game: Game, events: GameEvent[], actor: PlayerIndex | null = nul
         `Train ${e.isExtra ? 'X' : ''}${e.trainNumber} has completed its run, leaving via the ` +
         `${e.side === 'east' ? 'Eastern' : 'Western'} Division Point. All players get 1 Revenue.`;
     }
-    /**
-     * THE FEDORA MOVING IS ANNOUNCED, NOT JUST LOGGED (playtest, 2026-09-16).
-     *
-     * It is the one thing in the game that changes hands on the clock rather than because somebody
-     * did something, so nobody is watching for it — and it decides who rules on clearances and who
-     * every round starts with. A line in the history is where you find it afterwards; this is what
-     * tells the table as it happens, the same treatment a completed run already gets.
-     */
-    if (e.type === 'superintendentChanged') {
-      const name = game.state.players[e.player]?.name ?? 'the next player';
-      game.announced = `${name} is now the Superintendent — the Fedora passed at the end of Stage ${e.stage}.`;
-    }
   }
   // Keep the log bounded; the full history lives in `history` and can be replayed.
   if (game.log.length > 400) game.log.splice(0, game.log.length - 400);
@@ -1484,15 +1052,10 @@ function configFor(save: Save, config: GameConfig): GameConfig {
  *
  * Returns null when there is nothing to undo, so the caller can leave the button disabled.
  */
-export function undo(game: Game, config: GameConfig = game.state.config): Game | null {
+export function undo(game: Game, config: GameConfig = SOLO_CONFIG): Game | null {
   if (game.history.length === 0) return null;
   // `toSave` first, so the rules this game was dealt under come with it. Rebuilding the save by hand
   // here dropped them, and undo re-dealt the game under the defaults instead of its own settings.
-  //
-  // THE VICTORY DIALS COME FROM THE GAME ITSELF for the same reason (2026-08-23). `Save` carries only
-  // the house rules, so defaulting this parameter to `SOLO_CONFIG` meant undoing a game dealt over
-  // eight Days replayed it as a five-Day game — the length, the Revenue floor and both collision
-  // caps all quietly reverting to the defaults.
   return fromSave({ ...toSave(game), history: game.history.slice(0, -1) }, config);
 }
 
@@ -1506,81 +1069,13 @@ export function undo(game: Game, config: GameConfig = game.state.config): Game |
 export function fromSave(save: Save, config: GameConfig = SOLO_CONFIG): Game {
   const game = newGame(save.seed, configFor(save, config));
   for (const intent of save.history) {
-    const actor = replayActor(game, intent);
+    const actor = currentActor(game);
     if (actor === null) break;
     const result = applyIntent(game.state, actor, intent);
     if (!result.ok) break;
     game.history.push(intent);
-    /**
-     * `actor` IS PASSED HERE, so a replayed game narrates exactly as the live one did.
-     *
-     * It was omitted, and the omission was invisible in solitaire for a reason worth keeping: the
-     * only test that compares logs ("leaves nothing in the log describing a move that was taken
-     * back") compares one `fromSave`-built log against ANOTHER, so the missing attribution cancelled
-     * out on both sides. Live play attributes (`submit` passes `actor`) and so does multiplayer's
-     * replay (`fromMultiplayerSave`) — this was the one path of the three that did not, which meant
-     * a restored save, an undone game (undo rebuilds through here) and the replay viewer all
-     * described the same moves in different words from the game that produced them.
-     */
-    record(game, result.events, actor);
+    record(game, result.events);
     drain(game);
   }
   return game;
 }
-
-/**
- * `fromSave`'s multi-player sibling — Phase 3 (`docs/architecture/multiplayer.md`): "a mid-game
- * server restart is a replay rather than a recovery" (`lobby-and-sessions.md` §6). Built on
- * `newMultiplayerGame` instead of `newGame` since a saved multiplayer game did not deal to
- * `[SOLO_PLAYER]`. The engine-version check belongs to the caller (`src/server/persistence.ts`) —
- * this function only ever reconstructs from history that is already known to have been recorded
- * under the currently-running rules.
- *
- * LIKE `fromSave`'s loop, this passes `actor` to `record()` (matching `submit`'s own call,
- * `game.ts` above) — found while testing Phase 3's resume path: without it, every replayed line loses
- * its "Player X" attribution and reads as anonymous "Chose to..." narration, which `record`'s own
- * comment calls "unreadable the moment there is more than one seat" — exactly the multiplayer case a
- * resumed game hits every time.
- *
- * `fromSave` HAD THE SAME GAP AND NO LONGER DOES (fixed 2026-08-30). It predated multiplayer, and
- * nothing ever compared its output against a LIVE-played log: `undo`'s rebuilt game is itself
- * `fromSave`-built, so `test/web.test.ts`'s replay-fidelity test only ever compared one unattributed
- * replay against another and the gap cancelled out on both sides. The test that now pins it plays a
- * game live, restores it from its own save, and asserts the two logs are identical — which is the
- * comparison that had been missing rather than a new requirement.
- */
-/**
- * Why the intent a replay stopped at is reported rather than swallowed.
- *
- * The loop below has always stopped at the first intent the engine will not accept, and used to do
- * it in silence — which is the one outcome nobody can afford to guess at, because the result is a
- * game that looks fine and is short of where it should be. That silence was survivable only
- * because `loadGame` refused any save whose engine version was not an exact match, so a replay
- * that could fail was never attempted. Refusing on the version is a proxy question, though, and it
- * answered "no" for four releases running that changed no rules at all — so the real question gets
- * asked instead, and its answer has to be legible.
- */
-export type ReplayStop = { index: number; intent: Intent; code: string };
-
-export function fromMultiplayerSave(
-  seed: number,
-  config: GameConfig,
-  playerNames: string[],
-  history: Intent[],
-): { game: Game; stopped: ReplayStop | null } {
-  const game = newMultiplayerGame(seed, config, playerNames);
-  for (const [index, intent] of history.entries()) {
-    const actor = replayActor(game, intent);
-    if (actor === null) {
-      return { game, stopped: { index, intent, code: 'NO_ACTOR' } };
-    }
-    const result = applyIntent(game.state, actor, intent);
-    if (!result.ok) {
-      return { game, stopped: { index, intent, code: result.code } };
-    }
-    game.history.push(intent);
-    record(game, result.events, actor);
-    drain(game);
-  }
-  return { game, stopped: null };
-}

src/web/index.html

@@ -29,8 +29,6 @@ a.door:hover{border-color:#4d6fa8;background:#1f2733;transform:translateY(-1px)}
 .door p{margin:0;color:var(--dim);font-size:13px;line-height:1.5}
 .door .go{display:inline-block;margin-top:11px;font-size:12px;color:#5aa9e6}
 .door.disabled .go{color:var(--dim)}
-a.door.disabled{pointer-events:none}
-a.door.disabled:hover{border-color:var(--line);background:var(--panel);transform:none}
 .lightbox{position:fixed;inset:0;background:rgba(8,10,13,.92);display:flex;
   align-items:center;justify-content:center;padding:32px;z-index:10;cursor:zoom-out}
 .lightbox[hidden]{display:none}
@@ -71,21 +69,21 @@ footer{margin-top:26px;color:var(--dim);font-size:11px;display:flex;gap:18px;fle
   </div>
 
   <div class="doors">
-    <a class="door" id="door-multiplayer" href="./play.html?lobby">
+    <div class="door disabled">
       <h2>Play multiplayer</h2>
-      <p id="door-multiplayer-blurb">Play with your friends across the internet. You each run your
-         own office area within the entire division. You can play a normal game, or choose co-op or
-         cutthroat.</p>
-      <span class="go" id="door-multiplayer-go">Set up a game &rarr;</span>
-    </a>
+      <p>Play with your friends across the internet. You each run your own office area within the
+         entire division. You can play a normal game, or choose co-op or cutthroat. This requires
+         a Station Master server to be running.</p>
+      <span class="go">Coming soon</span>
+    </div>
 
-    <a class="door" href="./play.html?solitaire">
+    <a class="door" href="./play.html">
       <h2>Play solitaire</h2>
-      <p>Play by yourself and run the entire division for five full days. Clear the Revenue floor of
-         15 by the end or the game is a loss. Your game data is saved in your browser &mdash; if you close the tab and reopen this site
+      <p>Play by yourself and run the entire division for five full days. Your goal is 20 Revenue.
+         Your game data is saved in your browser &mdash; if you close the tab and reopen this site
          without clearing your cache, your game is preserved and you can continue automatically.
          During the game you can also explicitly save your progress for later replay.</p>
-      <span class="go">Set up a game &rarr;</span>
+      <span class="go">Start a game &rarr;</span>
     </a>
 
     <a class="door" href="./replays.html">
@@ -100,7 +98,7 @@ footer{margin-top:26px;color:var(--dim);font-size:11px;display:flex;gap:18px;fle
 
   <footer>
     <span>build <span id="build">__BUILD__</span></span>
-    <span>Multiplayer runs on StartOS server. Solitaire runs entirely in your browser.</span>
+    <span>solitaire runs entirely in your browser &mdash; no server code required</span>
   </footer>
 </main>
 

src/web/lobby.ts

@@ -1,628 +0,0 @@
-/**
- * The lobby screen — Phase 4 of `docs/architecture/multiplayer.md` (§12 steps 17-20), rebuilt
- * 2026-08-23 (Jesse's cleanup pass).
- *
- * Everything in `#lobby` (`play.html`) is owned here: the join-secret gate, the two doors (join a
- * game, create one), the read-only preview a player reads BEFORE taking a seat, and the seating
- * screen up to `Lobby.Start`.
- *
- * WHAT CHANGED, and why each one was worth changing:
- *   - JOINING CAME FIRST. It used to be a heading below the whole create form — fifteen fields a
- *     player who was handed a code has no use for.
- *   - A SEAT SURVIVES A RELOAD. The token was held in a closure and only written to `localStorage`
- *     at `Lobby.Start`, so a refresh before the host started orphaned the chair: the player could
- *     not get back and the seat could not be freed. `onSeated` hands it to `main.ts` immediately.
- *   - THERE IS A WAY OUT. `/api/lobby/leave` frees a seat, so a mis-join or a player who wanders off
- *     no longer wedges a table that cannot start until every chair is taken.
- *   - THE STREAM CAN FAIL OUT LOUD. `onmessage` was the only handler; a dropped connection left the
- *     seating screen frozen and silent.
- *   - THE RULES ARE VISIBLE TO EVERYONE, not just the host who typed them.
- *
- * MIRRORS SERVER TYPES RATHER THAN IMPORTING THEM, same choice `web/session.ts` already made for
- * `Push`: this file must never depend on anything under `src/server/`, even at the type level, since
- * it ships to the browser and the server does not.
- */
-
-import type { GameConfig, PlayerIndex } from '../engine/state.ts';
-import {
-  closestPreset,
-  configFromSettings,
-  gameTypeLabel,
-  preset,
-  presetSettings,
-} from './presets.ts';
-import type { GameType, PresetName } from './presets.ts';
-import { rulesListHtml, settingsForm } from './settings-form.ts';
-import { seatLabel } from '../sim/view.ts';
-
-export type LobbyReady = { token: string; gameId: string; seat: PlayerIndex; gameCode: string };
-
-/** What the page must do with a seat this screen takes or gives up. `main.ts` owns the storage; this
- * module owns the moments. */
-export type LobbyHandlers = {
-  /** The game has begun — tear this screen down and build a `RemoteSession`. Called at most once. */
-  onReady: (r: LobbyReady) => void;
-  /** A seat is now held. Called before the game starts, so a reload can come back to it. */
-  onSeated: (s: { token: string; gameId: string; gameCode: string }) => void;
-  /** The seat is gone — left, removed, or the lobby closed under us. Forget the stored record. */
-  onLeft: (gameId?: string) => void;
-  /** Every game this browser still holds a seat in — the page owns the storage, this screen only
-   * draws it. */
-  known?: () => { gameId: string; gameCode: string; stage: 'lobby' | 'game' }[];
-  /** Re-enter one of them. */
-  rejoin?: (gameId: string) => void;
-  /** Give one up for good: the token is the only proof of identity, so this cannot be undone. */
-  forget?: (gameId: string) => void;
-};
-
-type LobbySeat = { kind: 'human'; token: string; displayName: string } | { kind: 'bot' } | null;
-type Lobby = {
-  gameId: string;
-  gameCode: string;
-  hostToken: string;
-  config: GameConfig;
-  seats: LobbySeat[];
-  joinOrder: string[];
-  createdAt: number;
-};
-type LobbyPush = { lobby: Lobby; you: PlayerIndex; started: boolean };
-type Preview = {
-  gameCode: string;
-  hostName: string;
-  config: GameConfig;
-  players: number;
-  seated: { seat: number; who: string | null; bot: boolean }[];
-};
-
-/** Per-origin, same reasoning `lobby-and-sessions.md` §1 gives for the session token itself — a
- * secret typed at one address means nothing at another. */
-const SECRET_KEY = 'stationmaster-joinsecret';
-/** The name is not a credential; it is remembered for the same reason the secret is — nobody should
- * retype what they typed last time. */
-const NAME_KEY = 'stationmaster-displayname';
-
-const $ = <T extends HTMLElement = HTMLElement>(id: string): T => document.getElementById(id) as T;
-const has = (id: string): boolean => document.getElementById(id) !== null;
-
-/**
- * A server code turned into a sentence.
- *
- * `LOBBY_FULL` and `BAD_PLAYER_COUNT` used to be printed at the player exactly as the server said
- * them. The codes are the server's vocabulary, not the table's.
- */
-function explain(code: unknown, fallback: string): string {
-  const messages: Record<string, string> = {
-    LOBBY_FULL: 'That table is already full — every chair is taken.',
-    ALREADY_STARTED: 'That game has already started.',
-    BAD_PLAYER_COUNT: 'That table size cannot start a game — 2 to 4 players.',
-    NOT_HOST: 'Only the host can do that.',
-    NAME_TAKEN: 'Somebody at that table is already using that name — pick another.',
-    'bad or missing secret': 'That join secret was not accepted by this server.',
-    // What a lobby answers once it has become a GAME — most often seen by a host pressing Start
-    // twice, and by a tab left open on a lobby that started somewhere else.
-    'no such lobby': 'That game is no longer waiting to start — it has either begun or been closed.',
-    'no open lobby with that code': 'No game is waiting under that code. Check it, or ask for a new one — a game that has already started cannot be joined.',
-  };
-  const key = typeof code === 'string' ? code : '';
-  return messages[key] ?? (key !== '' ? key : fallback);
-}
-
-/** Exported for `main.ts`'s seat-recovery path (Gitea#33), so there is one JSON POST on this page. */
-export async function postJson(path: string, body: unknown): Promise<{ status: number; body: Record<string, unknown> }> {
-  const res = await fetch(path, {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify(body),
-  });
-  return { status: res.status, body: (await res.json()) as Record<string, unknown> };
-}
-
-async function getJson(path: string): Promise<{ status: number; body: Record<string, unknown> }> {
-  const res = await fetch(path);
-  return { status: res.status, body: (await res.json().catch(() => ({}))) as Record<string, unknown> };
-}
-
-/**
- * Shows `#lobby` and drives it. `resume` re-enters the seating screen for a browser that already
- * holds a seat (a reload before the host started) rather than starting at the doors.
- */
-export function runLobby(handlers: LobbyHandlers, resume?: { token: string; gameId: string; gameCode: string }): void {
-  // Nothing below exists on a page that is not `play.html` — and `main.ts` is imported by tests that
-  // stub only part of the DOM. Bail rather than throwing through the module's caller.
-  if (!has('lobby') || !has('lb-choice-section')) return;
-  $('lobby').hidden = false;
-
-  const form = settingsForm('lb-');
-  let source: EventSource | null = null;
-  let done = false;
-
-  /**
-   * THE GAMES THIS BROWSER IS ALREADY IN.
-   *
-   * Rejoining is what the stored token is FOR, and until now the only thing that ever used one was a
-   * bare page load — so a player who left a game, or who joined a second, had no way to get back to
-   * the first. Drawn from the page's own storage (`main.ts`), never from this module.
-   */
-  function renderKnown(): void {
-    if (!has('lb-known')) return;
-    const games = handlers.known?.() ?? [];
-    $('lb-known').hidden = games.length === 0;
-    if (games.length === 0) return;
-    $('lb-known-list').innerHTML = games
-      .map(
-        (g) =>
-          `<div class="lb-known-row"><span class="code">${escapeHtml(g.gameCode || g.gameId.slice(0, 8))}</span>` +
-          `<span class="dim">${g.stage === 'lobby' ? 'waiting to start' : 'in play'}</span>` +
-          `<button class="lb-rejoin" data-game="${escapeHtml(g.gameId)}">Rejoin</button>` +
-          `<button class="lb-forget ghost" data-game="${escapeHtml(g.gameId)}">Forget</button></div>`,
-      )
-      .join('');
-    for (const btn of Array.from($('lb-known-list').querySelectorAll<HTMLButtonElement>('.lb-rejoin'))) {
-      btn.onclick = () => handlers.rejoin?.(btn.dataset['game'] ?? '');
-    }
-    for (const btn of Array.from($('lb-known-list').querySelectorAll<HTMLButtonElement>('.lb-forget'))) {
-      btn.onclick = () => {
-        // Confirmed, because it is not recoverable from this browser: the token IS the identity
-        // (`lobby-and-sessions.md` §1), and nothing else on this server will accept a claim to that
-        // seat.
-        const code = btn.previousElementSibling?.previousElementSibling?.textContent ?? 'that game';
-        if (!confirm(`Forget ${code}? This browser will not be able to rejoin it — your seat stays in the game, and only whoever runs the server could let you back in.`)) return;
-        handlers.forget?.(btn.dataset['game'] ?? '');
-        renderKnown();
-      };
-    }
-  }
-  renderKnown();
-
-  // -- the join secret ------------------------------------------------------------------------
-
-  function showSecret(saved: boolean): void {
-    $('lb-secret-saved').hidden = !saved;
-    $('lb-secret-ask').hidden = saved;
-  }
-  const storedSecret = localStorage.getItem(SECRET_KEY) ?? '';
-  $<HTMLInputElement>('lb-secret').value = storedSecret;
-  showSecret(storedSecret !== '');
-  $<HTMLButtonElement>('lb-secret-change').onclick = () => showSecret(false);
-
-  function secret(): string {
-    const value = $<HTMLInputElement>('lb-secret').value;
-    localStorage.setItem(SECRET_KEY, value);
-    return value;
-  }
-
-  /** A rejected secret re-opens the field it is about — the error used to appear a screen away from
-   * the box that caused it. */
-  function secretRejected(status: number): boolean {
-    if (status !== 403) return false;
-    showSecret(false);
-    $<HTMLInputElement>('lb-secret').focus();
-    return true;
-  }
-
-  // -- display name ---------------------------------------------------------------------------
-
-  const nameField = $<HTMLInputElement>('lb-name');
-  nameField.value = localStorage.getItem(NAME_KEY) ?? '';
-  function displayName(): string {
-    const value = nameField.value.trim();
-    if (value !== '') localStorage.setItem(NAME_KEY, value);
-    return value;
-  }
-
-  // -- the two doors --------------------------------------------------------------------------
-
-  function door(which: 'join' | 'create'): void {
-    $('lb-join-panel').hidden = which !== 'join';
-    $('lb-create-panel').hidden = which !== 'create';
-    $('lb-door-join').classList.toggle('active', which === 'join');
-    $('lb-door-create').classList.toggle('active', which === 'create');
-  }
-  $<HTMLButtonElement>('lb-door-join').onclick = () => door('join');
-  $<HTMLButtonElement>('lb-door-create').onclick = () => door('create');
-
-  // -- the create form ------------------------------------------------------------------------
-
-  /** The named type the form is currently measured against — and, for a Custom game, the type it is
-   * scored as. Custom is only ever reached FROM one of these, so there is always an answer. */
-  let base: PresetName = 'coop';
-  let type: GameType = 'coop';
-  /** Once the host types a Revenue floor it is theirs; players and days stop re-deriving it. */
-  let floorTyped = false;
-
-  const players = (): number => Number($<HTMLSelectElement>('lb-players').value) || 4;
-  const days = (): number => {
-    const raw = Number($<HTMLInputElement>('lb-days').value);
-    return Number.isFinite(raw) && raw >= 1 ? Math.round(raw) : 5;
-  };
-
-  function typeRadios(): HTMLInputElement[] {
-    return Array.from(document.querySelectorAll<HTMLInputElement>('input[name="lb-type"]'));
-  }
-
-  /** Reset every rule to a named type. Seed, players and days are parameters, and are left alone. */
-  function selectPreset(name: PresetName): void {
-    base = name;
-    type = name;
-    floorTyped = false;
-    const values = presetSettings(name, players(), days());
-    form.write(values, values);
-    form.setEmployeeRotationAvailable(true);
-    refresh();
-  }
-
-  function refresh(): void {
-    const differing = form.mark(base, players(), days());
-    if (differing.length > 0) type = 'custom';
-    else if (type === 'custom') type = base;
-    for (const r of typeRadios()) r.checked = r.value === type;
-
-    /**
-     * NO SENTENCE UNDER THE RADIOS since 2026-08-30 — it restated the type just chosen to the person
-     * who had just chosen it, and the row is already labelled and already carries its own
-     * description (Jesse: "There's no need to repeat it below"). `form.mark` still puts a hint on
-     * each row that actually differs, which is where a Custom game's differences can be acted on.
-     */
-    // A Custom game is nobody's default: open the block that says how it differs.
-    if (type === 'custom') $<HTMLDetailsElement>('lb-settings').open = true;
-  }
-
-  for (const r of typeRadios()) {
-    // Solitaire is on this screen so the two screens read as one list, but there is nothing here to
-    // deal it with. Dimmed and left to speak for itself: the heading says "Game type
-    // (multi-player)", which is the explanation (Jesse, 2026-08-30).
-    if (r.value === 'solitaire') markUnavailable(r);
-    r.onchange = () => {
-      if (!r.checked) return;
-      if (r.value === 'custom') {
-        // Clicking Custom keeps everything as it stands, and keeps the scoring of the type it came
-        // from (Jesse, 2026-08-23) — it is only ever reached from one of the named types.
-        type = 'custom';
-        refresh();
-        return;
-      }
-      selectPreset(r.value as PresetName);
-    };
-  }
-
-  form.onEdit((key) => {
-    // The floor is derived until somebody sets it; ticking the condition off counts as setting it.
-    if (key === 'minCombinedRevenue') floorTyped = true;
-    type = 'custom';
-    refresh();
-  });
-
-  /** Players and days are parameters, not settings: they re-derive the floor and never make a game
-   * Custom by themselves. */
-  function paramsChanged(): void {
-    if (!floorTyped) {
-      const values = form.read();
-      const want = presetSettings(base, players(), days());
-      form.write({ ...values, minCombinedRevenue: want.minCombinedRevenue }, want);
-    }
-    refresh();
-  }
-  $<HTMLSelectElement>('lb-players').onchange = paramsChanged;
-  $<HTMLInputElement>('lb-days').oninput = paramsChanged;
-
-  selectPreset('coop');
-  door('join');
-
-  // -- creating -------------------------------------------------------------------------------
-
-  $<HTMLButtonElement>('lb-create').onclick = () => {
-    const name = displayName();
-    if (name === '') {
-      $('lb-create-err').textContent = 'Enter a display name first.';
-      return;
-    }
-    const asked = $<HTMLInputElement>('lb-seed').value.trim();
-    // Blank or unparseable both mean "surprise me", which is what leaving the box alone asks for.
-    const seed = asked === '' || !Number.isFinite(Number(asked)) ? null : Math.trunc(Number(asked));
-    const config = configFromSettings(form.read(), preset(base).scoring, days(), preset(base).pvpCards);
-
-    $('lb-create-err').textContent = '';
-    void postJson('/api/lobby/create', {
-      secret: secret(),
-      config,
-      displayName: name,
-      players: players(),
-      seed,
-    }).then(({ status, body }) => {
-      if (status !== 200) {
-        secretRejected(status);
-        $('lb-create-err').textContent = explain(body['error'], 'Could not create the game.');
-        return;
-      }
-      enterSeating(body['gameId'] as string, body['token'] as string, body['gameCode'] as string);
-    });
-  };
-
-  // -- joining --------------------------------------------------------------------------------
-
-  let previewed: Preview | null = null;
-
-  function showPreview(p: Preview): void {
-    previewed = p;
-    $('lb-preview').hidden = false;
-    $('lb-preview-code').textContent = p.gameCode;
-    const near = closestPreset(p.config, p.players, p.config.days);
-    const label = gameTypeLabel(
-      near.differing.length === 0 ? near.name : 'custom',
-      p.config.mode,
-    );
-    $('lb-preview-type').textContent =
-      near.differing.length === 0
-        ? label
-        : `${label} · ${near.differing.length} ${near.differing.length === 1 ? 'setting differs' : 'settings differ'} from ${preset(near.name).label}`;
-    const taken = p.seated.filter((s) => s.who !== null || s.bot).length;
-    const names = p.seated
-      .map((s) => (s.bot ? 'a bot' : (s.who ?? 'empty')))
-      .join(', ');
-    $('lb-preview-who').textContent = `Host: ${p.hostName} · ${taken} of ${p.players} seats taken — ${names}`;
-    $('lb-preview-rules').innerHTML = rulesListHtml(p.config, p.players, p.config.days);
-  }
-
-  $<HTMLButtonElement>('lb-look').onclick = () => {
-    const code = $<HTMLInputElement>('lb-code').value.trim().toUpperCase();
-    $('lb-preview').hidden = true;
-    if (code === '') {
-      $('lb-join-err').textContent = 'Enter the game code you were given.';
-      return;
-    }
-    $('lb-join-err').textContent = '';
-    void getJson(
-      `/api/lobby/preview?gameCode=${encodeURIComponent(code)}&secret=${encodeURIComponent(secret())}`,
-    ).then(({ status, body }) => {
-      if (status !== 200) {
-        secretRejected(status);
-        $('lb-join-err').textContent = explain(body['error'], 'Could not look up that game.');
-        return;
-      }
-      showPreview(body as unknown as Preview);
-    });
-  };
-
-  $<HTMLButtonElement>('lb-join').onclick = () => {
-    const name = displayName();
-    const code = previewed?.gameCode ?? $<HTMLInputElement>('lb-code').value.trim().toUpperCase();
-    if (name === '') {
-      $('lb-join-err').textContent = 'Enter a display name first.';
-      return;
-    }
-    $('lb-join-err').textContent = '';
-    void postJson('/api/lobby/join', { secret: secret(), gameCode: code, displayName: name }).then(
-      ({ status, body }) => {
-        if (status !== 200) {
-          secretRejected(status);
-          $('lb-join-err').textContent = explain(body['error'], 'Could not join that game.');
-          return;
-        }
-        enterSeating(body['gameId'] as string, body['token'] as string, code);
-      },
-    );
-  };
-
-  // -- seating --------------------------------------------------------------------------------
-
-  function renderSeating(lobby: Lobby, you: PlayerIndex, token: string): void {
-    $('lb-gamecode').textContent = lobby.gameCode;
-    const isHost = lobby.hostToken === token;
-
-    let html = '';
-    // Bots are numbered here exactly as `startLobby` numbers them at the moment the game starts, so
-    // the table you set up is the table that appears on the board.
-    let botNumber = 0;
-    for (let seat = 0; seat < lobby.seats.length; seat++) {
-      const occupant = lobby.seats[seat] ?? null;
-      const isYou = occupant?.kind === 'human' && occupant.token === token;
-      const isSeatHost = occupant?.kind === 'human' && occupant.token === lobby.hostToken;
-      if (occupant?.kind === 'bot') botNumber++;
-      const who =
-        occupant === null
-          ? '<span class="dim">— waiting —</span>'
-          : occupant.kind === 'bot'
-            ? `Bot ${botNumber}`
-            : `${escapeHtml(occupant.displayName)}${isYou ? ' (you)' : ''}${isSeatHost ? ' — host' : ''}`;
-      let action = '';
-      if (isHost) {
-        if (occupant === null) action = `<button class="lb-bot-add" data-seat="${seat}">+ bot</button>`;
-        else if (occupant.kind === 'bot') action = `<button class="lb-bot-remove" data-seat="${seat}">remove bot</button>`;
-        else if (!isYou) action = `<button class="lb-kick" data-seat="${seat}">remove</button>`;
-      }
-      html += `<div class="lb-seat"><span class="dim">Seat ${seatLabel(seat)}</span><span class="who">${who}</span>${action}</div>`;
-    }
-    $('lb-seats').innerHTML = html;
-
-    /**
-     * The code is the whole invitation, so it has to leave this screen by some route other than
-     * being read off it and retyped. Two buttons because they are two different acts: the CODE is
-     * what you read aloud on a call and works at whatever address each player reaches the box by;
-     * the LINK is what you paste into a chat, and only works for someone who can reach this address.
-     * Neither carries the join secret — that is the door key, and it travels out of band.
-     *
-     * `navigator.clipboard` is unavailable on an insecure origin and can be refused outright, so a
-     * failure says the code is there to be selected rather than silently doing nothing.
-     */
-    const say = (m: string): void => {
-      $('lb-copied').textContent = m;
-      setTimeout(() => ($('lb-copied').textContent = ''), 4000);
-    };
-    const copy = (text: string, ok: string): void => {
-      void navigator.clipboard
-        ?.writeText(text)
-        .then(() => say(ok))
-        .catch(() => say('Could not copy — select the code above instead.'));
-    };
-    $<HTMLButtonElement>('lb-copy').onclick = () => copy(lobby.gameCode, 'Code copied.');
-    $<HTMLButtonElement>('lb-copylink').onclick = () =>
-      copy(
-        `${location.origin}${location.pathname}?lobby&code=${encodeURIComponent(lobby.gameCode)}`,
-        'Invite link copied — the join secret is not in it.',
-      );
-
-    for (const btn of Array.from($('lb-seats').querySelectorAll<HTMLButtonElement>('.lb-bot-add'))) {
-      btn.onclick = () => void postJson('/api/lobby/bot', { token, seat: Number(btn.dataset['seat']), filled: true });
-    }
-    for (const btn of Array.from($('lb-seats').querySelectorAll<HTMLButtonElement>('.lb-bot-remove'))) {
-      btn.onclick = () => void postJson('/api/lobby/bot', { token, seat: Number(btn.dataset['seat']), filled: false });
-    }
-    for (const btn of Array.from($('lb-seats').querySelectorAll<HTMLButtonElement>('.lb-kick'))) {
-      btn.onclick = () => {
-        void postJson('/api/lobby/leave', { token, seat: Number(btn.dataset['seat']) }).then(({ status, body }) => {
-          if (status !== 200) $('lb-start-note').textContent = explain(body['error'], 'Could not clear that seat.');
-        });
-      };
-    }
-
-    // What everyone at the table is about to play — the host chose it, and until now nobody else
-    // could see any of it.
-    const near = closestPreset(lobby.config, lobby.seats.length, lobby.config.days);
-    const label = gameTypeLabel(near.differing.length === 0 ? near.name : 'custom', lobby.config.mode);
-    $('lb-seating-type').textContent =
-      near.differing.length === 0
-        ? label
-        : `${label} · ${near.differing.length} ${near.differing.length === 1 ? 'setting differs' : 'settings differ'} from ${preset(near.name).label}`;
-    $('lb-seating-rules').innerHTML = rulesListHtml(lobby.config, lobby.seats.length, lobby.config.days);
-
-    const waiting = lobby.seats.filter((s) => s === null).length;
-    const startBtn = $<HTMLButtonElement>('lb-start');
-    startBtn.hidden = !isHost;
-    startBtn.disabled = waiting > 0;
-    startBtn.textContent = 'Start game';
-    $('lb-start-note').textContent = '';
-    const waitNote = $('lb-stream-note');
-    if (waitNote.dataset['reason'] !== 'stream') {
-      waitNote.hidden = waiting === 0 && isHost;
-      waitNote.textContent = isHost
-        ? waiting === 0
-          ? ''
-          : `Waiting on ${waiting} more ${waiting === 1 ? 'player' : 'players'} — add a bot to any empty chair to start now.`
-        : 'Waiting for the host to start the game.';
-      waitNote.hidden = waitNote.textContent === '';
-    }
-    startBtn.onclick = () => {
-      // No busy state used to mean a second press posted a second start, whose 409 landed on screen
-      // as a raw code.
-      startBtn.disabled = true;
-      startBtn.textContent = 'Starting…';
-      void postJson('/api/lobby/start', { token }).then(({ status, body }) => {
-        if (status !== 200) {
-          startBtn.disabled = false;
-          startBtn.textContent = 'Start game';
-          $('lb-start-note').textContent = explain(body['error'], 'Could not start the game.');
-        }
-      });
-    };
-  }
-
-  function streamNote(message: string): void {
-    const el = $('lb-stream-note');
-    el.dataset['reason'] = message === '' ? '' : 'stream';
-    el.textContent = message;
-    el.hidden = message === '';
-  }
-
-  function enterSeating(gameId: string, token: string, gameCode: string): void {
-    handlers.onSeated({ token, gameId, gameCode });
-    $('lb-choice-section').hidden = true;
-    $('lb-seating-section').hidden = false;
-
-    $<HTMLButtonElement>('lb-leave').onclick = () => {
-      void postJson('/api/lobby/leave', { token }).then(() => {
-        source?.close();
-        handlers.onLeft(gameId);
-        $('lb-seating-section').hidden = true;
-        $('lb-choice-section').hidden = false;
-        renderKnown();
-        notice('');
-      });
-    };
-
-    source = new EventSource(`/api/lobby/stream?token=${encodeURIComponent(token)}`);
-    source.onmessage = (ev: MessageEvent<string>) => {
-      streamNote('');
-      const push = JSON.parse(ev.data) as LobbyPush;
-      if (push.started) {
-        source?.close();
-        if (done) return;
-        done = true;
-        handlers.onReady({ token, gameId, seat: push.you, gameCode: push.lobby.gameCode });
-        return;
-      }
-      renderSeating(push.lobby, push.you, token);
-    };
-
-    /**
-     * A DEAD LOBBY AND A BLIP LOOK IDENTICAL HERE, so ask — the same shape `session.ts` already uses
-     * for the game stream, which the lobby never got.
-     *
-     * Three answers matter. The game may have STARTED while we were disconnected (the `started` push
-     * is sent once and then the connection closes, so a drop at the wrong moment loses it) —
-     * `/api/session` knows, and we go straight in. The lobby may still be there, in which case
-     * `EventSource` is already retrying and the note is all that is needed. Or it is gone, and
-     * sitting on a frozen seating screen is the one thing that must not happen.
-     */
-    source.onerror = () => {
-      if (done) return;
-      streamNote('Connection lost — retrying. You can leave and rejoin if this does not clear.');
-      void getJson(`/api/session?token=${encodeURIComponent(token)}`).then(({ status, body }) => {
-        if (done) return;
-        if (status === 200) {
-          done = true;
-          source?.close();
-          handlers.onReady({ token, gameId, seat: body['player'] as PlayerIndex, gameCode });
-          return;
-        }
-        void getJson(
-          `/api/lobby/preview?gameCode=${encodeURIComponent(gameCode)}&secret=${encodeURIComponent(secret())}`,
-        ).then(({ status: lobbyStatus }) => {
-          if (done || lobbyStatus === 200) return;
-          source?.close();
-          handlers.onLeft(gameId);
-          $('lb-seating-section').hidden = true;
-          $('lb-choice-section').hidden = false;
-          renderKnown();
-          streamNote('');
-          notice('That game is no longer waiting on this server — it was ended, or the last player left.');
-        });
-      });
-    };
-  }
-
-  if (resume) enterSeating(resume.gameId, resume.token, resume.gameCode);
-}
-
-/** The lobby-wide message slot: why you are looking at this screen, when it was not your own click. */
-export function notice(message: string): void {
-  const el = document.getElementById('lb-notice');
-  if (!el) return;
-  el.textContent = message;
-  el.hidden = message === '';
-}
-
-/** Prefills the code from an invite link and opens the join door on it. */
-export function prefillCode(code: string): void {
-  const field = document.getElementById('lb-code') as HTMLInputElement | null;
-  if (field) field.value = code.toUpperCase();
-}
-
-/**
- * A CHOICE THAT CANNOT BE TAKEN HAS TO SAY SO.
- *
- * Reported by Jesse 2026-08-23: "solitaire is disabled, but really hard to tell." A bare `disabled`
- * on a radio leaves the whole row at full strength — the dot simply refuses the click, which reads
- * as a broken control rather than an unavailable one.
- *
- * The dimming is the whole signal now. It used to append a reason to the row as well, and dropped
- * that in 2026-08-30 along with the same text on the solitaire screen: one heading naming which
- * game the screen deals says it once, where three dimmed rows each said it again.
- */
-function markUnavailable(radio: HTMLInputElement): void {
-  radio.disabled = true;
-  radio.closest('label')?.classList.add('disabled');
-}
-
-function escapeHtml(s: string): string {
-  return s.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
-}

src/web/panels.ts

@@ -33,8 +33,9 @@ export function cardRow(name: string, why: string, playable: boolean | null): st
 export function handHtml(f: Frame, canPlay: (boolean | null)[] = []): string {
   // §6.2 — say so on the card itself. A player who cannot discard a train needs to read that on the
   // train, not deduce it from a button that is not there. The sentence comes off the Frame
-  // (`handKeepWhy`) rather than being written here, because since Gitea#9 there are two of them and
-  // which one applies depends on the card AND the game's rules.
+  // (`handKeepWhy`) rather than being written here: since Gitea#9 the answer depends on the card,
+  // and this line's rule (an Extra never, a Timetabled train always) is not main's, where it also
+  // depends on a New Game setting. One panel, whichever rule the game is playing.
   return f.hand.length
     ? f.hand
         .map((h, i) => {
@@ -52,61 +53,25 @@ export function handHtml(f: Frame, canPlay: (boolean | null)[] = []): string {
  * Only the top card may ever be drawn, so the depth is a count and not a hint: everything below it
  * is out of reach, and choosing where to discard is choosing what to put there.
  */
-export function pilesHtml(f: Frame, lit: readonly string[] = []): string {
-  const pile = (
-    key: string,
-    label: string,
-    top: string,
-    depth: number,
-    why: string,
-    extra = '',
-    slot = -1,
-    faceDown = false,
-  ): string => {
+export function pilesHtml(f: Frame): string {
+  const pile = (label: string, top: string, depth: number, why: string, extra = '', slot = -1): string => {
     const tip = [why, extra].filter(Boolean).join(' · ');
     // A Department is a DROP TARGET for a discard. The attribute is always emitted; only the play
     // page binds a click to it, and only while a card is waiting to be discarded — so the replay
     // viewer draws exactly the same markup and nothing there is clickable.
     const target = slot >= 0 ? ` data-dept="${slot}"` : '';
-    // `lit` marks the pile the move being watched just touched — see `changedPiles`.
-    const cls = `handcard${faceDown ? ' facedown' : ''}${lit.includes(key) ? ' pilelit' : ''}`;
     return (
-      `<div class="${cls}"${target}${tip ? ` data-tip="${esc(tip)}"` : ''} tabindex="0">` +
+      `<div class="handcard"${target}${tip ? ` data-tip="${esc(tip)}"` : ''} tabindex="0">` +
       `<div class="pilehd"><span>${esc(label)}</span><span class="depth">${depth}</span></div>` +
       `<b>${esc(top)}</b></div>`
     );
   };
   return (
-    /**
-     * THE HOME OFFICE DECK, which the screen had never drawn.
-     *
-     * `f.deck` has carried the face-down count since the Frame existed and nothing read it — the
-     * exact shape of display gap `test/display-gaps.test.ts` was written to sweep for, surviving in
-     * the panel that draws every OTHER pile. Asked for by Jesse 2026-09-10 for a second reason: a
-     * player drawing from it is the commonest move nobody can see, so it needs somewhere to flash.
-     *
-     * FIRST, because that is the order a card travels: out of here, into a hand, then onto a
-     * Department or the Salvage Yard. Face down, so the card slot says so rather than naming a card
-     * — the whole point of this pile is that nobody knows what is on top.
-     */
-    pile(
-      'home',
-      'Home Office',
-      'face down',
-      f.deck,
-      'The draw deck. Face down — nobody sees what is on top, and a card drawn from here is private ' +
-        'to whoever drew it. When it runs out, the Salvage Yard and the Departments are swept back ' +
-        'into it.',
-      '',
-      -1,
-      true,
-    ) +
     f.departments
       .map((d, i) => {
         const depth = f.departmentDepth[i] ?? 0;
         const under = depth - 1;
         return pile(
-          `dept${i}`,
           `Dept ${i + 1}`,
           d,
           depth,
@@ -117,7 +82,6 @@ export function pilesHtml(f: Frame, lit: readonly string[] = []): string {
       })
       .join('') +
     pile(
-      'salvage',
       'Salvage',
       f.salvage.top,
       f.salvage.depth,
@@ -202,356 +166,47 @@ export function timetableHtml(f: Frame, justSet: number | null): string {
  * It is written from the FRAME AFTER the rollover, so `f.day` is the Day about to start and the one
  * that ended is the Day before it. Standings are in Revenue order rather than seat order: the
  * question at the end of a Day is who is ahead.
+ *
+ * THE GOAL COMES OFF `f.objective`, WHICH ALREADY RESOLVES IT. This line scores each player against
+ * a per-player target read from the game LENGTH (`lengthProfile`), and `objectiveOf` has always
+ * worked out both that target and whether the viewer is keeping up with the clock. Recomputing
+ * either here would be a second implementation of the same rule, one dialog away from disagreeing
+ * with the status block that shows it every turn. (Main computes a COMBINED floor instead, from
+ * dials this line does not have — same dialog, different question, so this half is written per line
+ * rather than ported.)
  */
 export function dayEndHtml(f: Frame): string {
   const ended = f.day - 1;
-  const left = f.days + f.extraDays - ended;
+  const left = f.objective.daysLeft;
+  const standings = [...f.players]
+    .sort((a, b) => b.revenue - a.revenue || a.seat - b.seat)
+    .map(
+      (p) =>
+        `<tr${p.index === f.viewer ? ' class="you"' : ''}><td>${esc(p.name)}` +
+        `${p.index === f.viewer ? ' <span class="dim">(you)</span>' : ''}</td>` +
+        `<td class="num">${p.revenue}</td></tr>`,
+    )
+    .join('');
+
+  // The viewer's own Revenue against the viewer's own target, because that is what `objective` is
+  // scoped to — `f.revenue` and `f.objective` are drawn for the same player. A target of 0 would be
+  // a game with no goal, and printing "0" there would read as one already met.
+  const target =
+    f.objective.target > 0
+      ? `<p>Revenue <b>${f.revenue}</b> against a target of <b>${f.objective.target}</b> — ` +
+        `${f.objective.onPace ? 'on pace' : 'behind pace'}.</p>`
+      : '';
 
   const ahead =
     left <= 0
       ? '<p>That was the last Day on the timetable.</p>'
-      : `<p><b>Day ${f.day} of ${f.days + f.extraDays}</b> begins now — ${left} ${left === 1 ? 'Day' : 'Days'} left to run.</p>`;
+      : `<p><b>Day ${f.day} of ${f.objective.days}</b> begins now — ${left} ${left === 1 ? 'Day' : 'Days'} left to run.</p>`;
 
   return (
     `<h3 class="dayend-h">Day ${ended} has ended</h3>` +
     ahead +
-    standingsHtml(f) +
-    targetHtml(f) +
-    collisionsHtml(f, ended)
-  );
-}
-
-// ---------------------------------------------------------------------------
-// Shared between the Day-end dialog and the end-of-game results screen.
-//
-// Gitea#16 asked for the results screen and Gitea#10's dialog had already assembled most of it. The
-// three blocks below are the overlap, factored out rather than written twice: the two screens report
-// the same numbers about the same game, and the one thing they must never do is disagree.
-// ---------------------------------------------------------------------------
-
-/**
- * Every player in Revenue order, the viewer marked.
- *
- * `winner` rings the player the OFFICIAL result named, which is not always the player at the top:
- * in an extended game the standings keep moving after the result is settled, and showing the leader
- * without saying who actually won would be the screen contradicting itself.
- */
-function standingsHtml(f: Frame, winner: number | null = null): string {
-  const rows = [...f.players]
-    .sort((a, b) => b.revenue - a.revenue || a.seat - b.seat)
-    .map((p) => {
-      const marks =
-        (p.index === f.viewer ? ' <span class="dim">(you)</span>' : '') +
-        (p.index === winner ? ' <span class="wins">— winner</span>' : '');
-      return (
-        `<tr${p.index === f.viewer ? ' class="you"' : ''}><td>${esc(p.name)}${marks}</td>` +
-        `<td class="num">${p.revenue}</td></tr>`
-      );
-    })
-    .join('');
-  return `<table class="dayend-t"><tbody>${rows}</tbody></table>`;
-}
-
-/**
- * The target is a COMBINED floor in every mode that sets one, so it is reported against the whole
- * table's Revenue rather than the viewer's — showing one player's score against a four-player
- * target reads as a hopeless position when the table may be comfortably ahead.
- */
-function targetHtml(f: Frame): string {
-  if (f.minCombinedRevenue <= 0) return '';
-  const combined = f.players.reduce((n, p) => n + p.revenue, 0);
-  const met = combined >= f.minCombinedRevenue;
-  return (
-    `<p>Combined Revenue <b>${combined}</b> against a target of <b>${f.minCombinedRevenue}</b>` +
-    `${met ? ' — cleared.' : ' — short.'}</p>`
-  );
-}
-
-/**
- * Only when the game is actually scored on collisions.
- *
- * Two conditions, both of them `advance.ts`'s own: `0` on a dial turns that check off, and the
- * checks run in COMPETITIVE AND CO-OP ONLY (§3.4). A solitaire game carries the default dials on
- * its config and enforces neither, so reporting a collision budget there would put a rule on
- * screen that this game does not have.
- */
-function collisionsHtml(f: Frame, endedDay?: number): string {
-  const scoredOnCollisions =
-    (f.mode === 'competitive' || f.mode === 'coop') &&
-    (f.maxCollisionsTotal > 0 || f.maxCollisionsPerDay > 0);
-  if (!scoredOnCollisions) return '';
-  /**
-   * "TODAY" IS THE WRONG WORD IN A DAY-END DIALOG, and it read as a contradiction.
-   *
-   * That dialog is drawn from the frame whose `day` went UP — which is the same frame in which
-   * `collisionsToday` was reset — so it reported 0 however many there had been. Jesse, 2026-09-09,
-   * at the end of a Day 1 with two collisions in it: "it shows a total of two collisions, but zero
-   * today ... that does seem to be a contradiction."
-   *
-   * So when the caller knows which Day just ended it says so by name, and reads the count captured at
-   * the rollover. The end-of-game results screen passes nothing and keeps "today", where the Day has
-   * not turned over and the word is accurate.
-   */
-  const [count, when] =
-    endedDay === undefined
-      ? [f.collisionsToday, 'today']
-      : [f.collisionsPrevDay, `on Day ${endedDay}`];
-  return `<p>Collisions: <b>${count}</b> ${when}, <b>${f.collisionsTotal}</b> in all.</p>`;
-}
-
-/**
- * WHY THE GAME ENDED, as a sentence (Gitea#16).
- *
- * The page used to interpolate `outcome.reason` straight into the DOM, so a player who finished a
- * game read the words `GAME OVER — revenueFloor`: an internal enum value, printed at the one moment
- * the game has the player's whole attention. Each reason gets a sentence that says what actually
- * happened, with this game's own numbers in it.
- *
- * EXPORTED for the developer replay recorder (`sim/replay.ts`), which was still printing
- * `loss — revenueFloor` into its own heading a release after this was written — the same defect the
- * issue was filed about, surviving in the one place nobody had looked (`TODO.md` #34). One
- * implementation, so the two cannot say the game ended for different reasons.
- */
-export function reasonSentence(f: Frame, o: NonNullable<Frame['outcome']>, day: number): string {
-  const combined = f.players.reduce((n, p) => n + p.revenue, 0);
-  switch (o.reason) {
-    case 'daysElapsed':
-      return `Day ${day} was the last on the timetable, and it ran out.`;
-    case 'revenueFloor':
-      return (
-        `The Division closed short: <b>${combined}</b> Revenue between everyone, against a floor of ` +
-        `<b>${f.minCombinedRevenue}</b>. §3.3 — miss the floor and the whole table loses, whoever ` +
-        `earned the most.`
-      );
-    case 'collisionFloor':
-      return (
-        `Too many collisions — <b>${f.collisionsToday}</b> in one Day and <b>${f.collisionsTotal}</b> ` +
-        `in all, against limits of ${f.maxCollisionsPerDay || '—'} and ${f.maxCollisionsTotal || '—'}. ` +
-        `§3.4 — the railroad was declared unsafe and the game was stopped.`
-      );
-  }
-}
-
-/** The rules this game was actually dealt under — Gitea#16's "what the rules of the game were". */
-function rulesHtml(f: Frame): string {
-  const mode =
-    f.mode === 'coop' ? 'Co-op — the table scores together' :
-    f.mode === 'competitive' ? 'Competitive — highest Revenue wins' :
-    'Solitaire';
-  const optional = [
-    f.optionalRules.employeeRotation ? 'Employee Rotation' : null,
-    f.optionalRules.reducedVisibility ? 'Reduced Visibility' : null,
-    f.optionalRules.emergencyToolbox ? 'Emergency Toolbox' : null,
-  ].filter((x): x is string => x !== null);
-  const r = f.houseRules.revenue;
-
-  const rows: [string, string][] = [
-    ['Scoring', mode],
-    ['Timetable', f.extraDays > 0
-      ? `${f.days} Days, extended by ${f.extraDays} more`
-      : `${f.days} Day${f.days === 1 ? '' : 's'}`],
-    ['Revenue floor', f.minCombinedRevenue > 0 ? `${f.minCombinedRevenue} combined` : 'none'],
-    ['Collision limits', f.maxCollisionsPerDay > 0 || f.maxCollisionsTotal > 0
-      ? `${f.maxCollisionsPerDay || '—'} per Day, ${f.maxCollisionsTotal || '—'} in all`
-      : 'not scored'],
-    ['Pay rates', `${r.freightPerLoad} per load, ${r.passengerPerCoach} per coach, ${r.trainPerTransit} per transit`],
-    ['Extras start', f.houseRules.extraStart === 'divisionPointsOnly' ? 'Division Points and the Interchange'
-      : f.houseRules.extraStart === 'ownOffice' ? 'those, plus your own Control Point'
-      : 'those, plus any Control Point'],
-    ['Timetabled trains', f.houseRules.discardTimetabled ? 'may be discarded' : 'are never discarded'],
-    ['Optional rules', optional.length ? optional.join(', ') : 'none'],
-  ];
-
-  return `<h4 class="res-h">The rules in play</h4>${factTable(rows)}`;
-}
-
-/**
- * A two-column table of plain-text facts.
- *
- * BOTH HALVES ESCAPED, exactly once, which is the only reason this is a shared helper rather than a
- * template repeated twice. The rows it is given today are numbers and fixed phrases, but they are
- * assembled from the Frame — and the day somebody adds a row carrying a player's name, or a facility
- * label, the escaping has to already be here rather than be remembered.
- */
-function factTable(rows: [string, string][]): string {
-  return (
-    '<table class="res-t"><tbody>' +
-    rows.map(([k, v]) => `<tr><td>${esc(k)}</td><td>${esc(v)}</td></tr>`).join('') +
-    '</tbody></table>'
-  );
-}
-
-/**
- * THE RAILROAD — what actually happened out there, from `GameState.tally` (Gitea#16).
- *
- * Rows that would read zero for a reason (no passenger work in a game that had none, no collisions
- * in a clean one) are dropped rather than printed as `0`: a screen of zeroes reads as a bug, and the
- * absence of a line is the same information more quietly. A zero that is genuinely interesting —
- * trains through the Division — stays.
- */
-function tallyHtml(t: Frame['tally']): string {
-  const rows: [string, string][] = [['Trains through the Division', String(t.trainsCompleted)]];
-
-  if (t.trainsCompleted > 0) {
-    rows.push([
-      'Of those, worked en route',
-      `${t.trainsCompletedWithWork} of ${t.trainsCompleted}` +
-        (t.trainsCompletedWithWork === t.trainsCompleted ? ' — every one' : ''),
-    ]);
-  }
-  const push = (label: string, n: number, detail = ''): void => {
-    if (n > 0) rows.push([label, `${n}${detail}`]);
-  };
-  push('Loads made up', t.loadsCompleted);
-  push('Loads broken', t.unloadsCompleted);
-  /**
-   * BOTH HALVES OF THE MEN | AT | WORK PIPELINE, not just the loading one.
-   *
-   * §9.1 makes loading and unloading the same shape — begun, then carried through — and the Tally
-   * has counted both since it was written. The screen reported only the loading side, so a player
-   * with three unloads part-finished at the final whistle was told nothing about them while the
-   * equivalent loads were listed. Found 2026-08-30 auditing which Frame fields nothing reads:
-   * `unloadsBegun` was one of four, and the only one whose absence was visible on screen.
-   */
-  push('Loads still in the pipeline', t.loadsStarted - t.loadsCompleted);
-  push('Unloads still in the pipeline', t.unloadsBegun - t.unloadsCompleted);
-  push('Passengers boarded', t.passengersBoarded);
-  push('Passengers detrained', t.passengersDetrained);
-  push('Cars coupled', t.carsCoupled);
-  push('Cars set out', t.carsDropped);
-  push('Extras run', t.extrasStarted);
-  push('Second sections ordered', t.secondSections);
-  push('Flying switches', t.flyingSwitches);
-  push('Offices upgraded', t.officeUpgrades);
-  push('Facilities unjammed', t.facilitiesUnjammed);
-  push('Trains held', t.trainsHeld);
-  push('Trains diverted', t.trainsDiverted);
-  push('Expedite faults', t.expediteFaults);
-  push('Dispatch bonuses used', t.dispatchBonusesUsed);
-  if (t.clearancesRequested > 0) {
-    rows.push(['Clearances', `${t.clearancesAllowed} allowed of ${t.clearancesRequested} asked`]);
-  }
-  if (t.trainsDestroyed > 0) {
-    rows.push([
-      'Trains destroyed',
-      `${t.trainsDestroyed}, taking ${t.carsDestroyed} car${t.carsDestroyed === 1 ? '' : 's'} with them`,
-    ]);
-  }
-  // §X18 only — the one card in the deck that pays a train for standing still. Reported as what it
-  // is rather than as "the longest an engine sat on a siding", which the engine cannot answer (see
-  // `Tally.circusStops`).
-  if (t.circusStops.length > 0) {
-    rows.push([
-      'Circus set-ups',
-      t.circusStops.map((c) => `Train ${c.trainNumber} at ${c.where}`).join(', '),
-    ]);
-  }
-  push('Cards drawn', t.cardsDrawn);
-  push('Cards played', t.cardsPlayed);
-  // Gitea#9 made throwing a Timetabled train away a legal and deliberate move, so a discard is a
-  // CHOICE the player made rather than an accident of the hand limit — and the engine has counted
-  // it all along while the screen listed only draws and plays beside it.
-  push('Cards discarded', t.cardsDiscarded);
-
-  return `<h4 class="res-h">The railroad</h4>${factTable(rows)}`;
-}
-
-/** Per-player work, for a table that wants to know who did what rather than only who won. */
-function perPlayerHtml(f: Frame): string {
-  const t = f.tally;
-  if (f.players.length < 2) return '';
-  const head =
-    '<tr><th></th><th class="num">Rev</th><th class="num">Loads</th><th class="num">Unloads</th>' +
-    '<th class="num">Pass.</th><th class="num">Cards</th><th class="num">Crashes</th></tr>';
-  const rows = [...f.players]
-    .sort((a, b) => b.revenue - a.revenue || a.seat - b.seat)
-    .map((p) => {
-      const q = t.byPlayer[p.index];
-      if (!q) return '';
-      return (
-        `<tr${p.index === f.viewer ? ' class="you"' : ''}><td>${esc(p.name)}</td>` +
-        `<td class="num">${p.revenue}</td><td class="num">${q.loads}</td>` +
-        `<td class="num">${q.unloads}</td>` +
-        `<td class="num">${q.passengersBoarded + q.passengersDetrained}</td>` +
-        `<td class="num">${q.cardsPlayed}</td><td class="num">${q.collisions}</td></tr>`
-      );
-    })
-    .join('');
-  return `<h4 class="res-h">Who did what</h4><table class="res-t res-wide"><tbody>${head}${rows}</tbody></table>`;
-}
-
-/**
- * THE END-OF-GAME RESULTS SCREEN — Gitea#16, first pass.
- *
- * Everything the Frame already knew plus everything the event tally counted, in the order a player
- * asks for it: what happened, who won, by how much, under what rules, and then what the railroad
- * actually did all game. Badges and the "what would make this exciting" brainstorm are the second
- * pass the issue asks for and are deliberately not here.
- *
- * THE OFFICIAL RESULT IS THE ONE AT THE TOP, always. In an extended game (Gitea#11) the standings go
- * on moving after the winner is settled, so this screen reports the frozen result first and puts
- * everything that happened afterwards in its own section, marked as informational. "In a five-day
- * game, even if it's extended to eight or nine days, the winner and the official answer is the
- * winner at the end of five days" (Jesse, 2026-08-28).
- */
-export function resultsHtml(f: Frame): string {
-  // `official` is written by the engine the moment any game ends, so it is present on every finished
-  // game. The fallback keeps this rendering something sane for a Frame that predates it — a replay
-  // of a save recorded before this release, which the replay viewer will happily hand us.
-  const report = f.official;
-  const o = report?.outcome ?? f.outcome;
-  if (!o) return '<p class="dim">This game has not ended.</p>';
-
-  const officialDay = report?.day ?? f.days;
-  const winnerName =
-    o.winner === null ? null : (f.players.find((p) => p.index === o.winner)?.name ?? null);
-
-  const headline =
-    o.result === 'loss'
-      ? 'The Division failed'
-      : winnerName === null
-        ? 'The Division ran'
-        : `${esc(winnerName)} takes the Division`;
-
-  /**
-   * The result is reported against the standings AS THEY WERE at the official ending, not as they
-   * are now — in an extended game those are different numbers, and the winner has to be shown
-   * winning. `revenues` is frozen alongside the outcome for exactly this.
-   */
-  const frozen = report
-    ? { ...f, players: f.players.map((p) => ({ ...p, revenue: report.revenues[p.index] ?? p.revenue })) }
-    : f;
-
-  const result =
-    o.result === 'loss'
-      ? '<p>Nobody wins this one.</p>'
-      : o.winner === null
-        ? '<p>The table clears it together — a Co-op game has no individual winner.</p>'
-        : `<p><b>${esc(winnerName ?? '')}</b> finishes ahead on Revenue.</p>`;
-
-  const extended =
-    f.extraDays > 0
-      ? '<h4 class="res-h">After the timetable</h4>' +
-        `<p>The table played on for ${f.extraDays} more Day${f.extraDays === 1 ? '' : 's'}, ` +
-        `through Day ${f.days + f.extraDays}. None of it changed the result above — it is recorded ` +
-        'here because it happened.</p>' +
-        standingsHtml(f) +
-        targetHtml(f) +
-        collisionsHtml(f) +
-        tallyHtml(f.tally)
-      : '';
-
-  return (
-    `<h3 class="dayend-h res-${o.result}">${headline}</h3>` +
-    `<p>${reasonSentence(frozen, o, officialDay)}</p>` +
-    result +
-    standingsHtml(frozen, o.winner) +
-    targetHtml(frozen) +
-    collisionsHtml(frozen) +
-    perPlayerHtml(frozen) +
-    rulesHtml(f) +
-    tallyHtml(report?.tally ?? f.tally) +
-    extended
+    `<table class="dayend-t"><tbody>${standings}</tbody></table>` +
+    target
   );
 }
 
@@ -693,7 +348,7 @@ export function facilitiesHtml(f: Frame): string {
               : '') +
             `<div class="fstat ${x.jammed ? 'bad' : x.canFinish ? 'good' : 'idle'}" data-tip="${
               x.jammed
-                ? 'A load is sitting on MEN|AT|WORK with no spotted car to receive it. That locks the industry track, which blocks the very car that would clear it.'
+                ? 'A load is sitting on MEN|AT|WORK with no spotted car to receive it. That locks the industry track, which blocks the very car that would clear it (§9.3).'
                 : x.canFinish
                   ? 'A matching empty car is spotted on this industry\'s track, so a load worked here can come off onto it.'
                   : 'No matching car is spotted. Starting a load here would park it on WORK and jam the facility.'
@@ -713,30 +368,6 @@ h3{font-size:11px;text-transform:uppercase;letter-spacing:.07em;color:#8b94a3;ma
 .handcard:focus{outline:2px solid #4d6fa8;outline-offset:1px}
 .cardrow.ref .handcard{background:#1c2129;border-style:dashed;border-color:#39424e;color:#b6bec9}
 .handcard.unplayable{color:#7d8794;border-color:#39424e}
-/* THE HOME OFFICE DECK. Face down, so its card slot names no card — it says so instead, in the
-   dimmed voice the rest of the panel uses for "nothing to read here". */
-.handcard.facedown > b{color:#6f7885;font-style:italic;font-weight:400}
-/* THE PILE A WATCHED MOVE JUST TOUCHED (v0.8.1).
-   A STATE, NOT A FLASH, and that is the whole point. The .tt-slot.fresh rule above animates for a fixed
-   1.5s, which is right for a die roll nobody is waiting on — but a step can hold the screen for
-   seven seconds at 10x, so a fixed animation would be over long before the pause it belongs to and
-   the player would be back to staring at an unchanged board. The flash-in marks the moment; the lit
-   border and background stay for exactly as long as the step is up, because the class is on the
-   element only while that step is the one being shown. */
-.handcard.pilelit{border-color:#8fd6a0;background:#1d3327;box-shadow:0 0 0 2px #2f6b47,0 0 14px rgba(143,214,160,.55);
-  animation:pilepulse 1.15s ease-in-out infinite}
-/* A PULSE FOR THE WHOLE DWELL, not one flash at the start. Measured: at 10x a pile stays lit for
-   just under seven seconds, so the highlight was never brief — but a single 0.45s flash-in and a
-   dark green fill were easy to miss entirely while watching the district. Jesse: "caught one flash
-   deck light up for just a very brief moment, but couldn't see that with what bot was doing in
-   office area and history and catch up area all at same time." Something still moving keeps drawing
-   the eye for as long as the move is up; a state that settles stops asking to be looked at. */
-@keyframes pilepulse{0%,100%{background:#1d3327;box-shadow:0 0 0 2px #2f6b47,0 0 14px rgba(143,214,160,.45)}
-  50%{background:#2f6b47;box-shadow:0 0 0 3px #8fd6a0,0 0 22px rgba(143,214,160,.85)}}
-/* Motion is the point here, so the reduced-motion fallback has to be loud in a different way rather
-   than simply not moving: a solid ring and a brighter fill, held. */
-@media(prefers-reduced-motion:reduce){
-  .handcard.pilelit{animation:none;background:#2f6b47;box-shadow:0 0 0 3px #8fd6a0}}
 .handcard.unplayable::after{content:"";position:absolute;inset:0;border-radius:5px;pointer-events:none;
   background:repeating-linear-gradient(45deg,transparent 0 5px,rgba(150,160,175,.20) 5px 6px)}
 /* THE CARD JUST DRAWN. It sits first in the row, and this says which one that is — three cards that
@@ -777,18 +408,9 @@ h3{font-size:11px;text-transform:uppercase;letter-spacing:.07em;color:#8b94a3;ma
 /* And the piles that are NOT targets step back while a discard is being aimed, so the three that
    are stand out from the Salvage Yard beside them. */
 .cardrow.aiming .handcard:not(.target){opacity:.4}
-/* A CAR YOU MAY ADD IS AN ACTION, SO IT WEARS THE ACTION COLOUR — Jesse, playtest 2026-09-16: the
-   highlight was "just a small bold and basically the same color as everything else", which is the
-   whole difficulty with making the yard chip the button. #c8912f is the border colour that the
-   action buttons themselves use, so a clickable car looks like every other thing inviting a click,
-   rather than like a number that happens to be outlined.
-
-   THE LOADED/EMPTY TEXT COLOURS ARE LEFT ALONE. Green and blue-grey are what say which of the two
-   numbers is which; the amber answers "may I click this", which is a different question, and
-   painting over the first to answer the second would cost real information. */
-.stock .ld.addable,.stock .mt.addable{cursor:pointer;border-radius:3px;padding:0 4px;font-weight:700;
-  outline:2px solid #c8912f;background:rgba(200,145,47,.20);box-shadow:0 0 0 2px rgba(200,145,47,.16)}
-.stock .ld.addable:hover,.stock .mt.addable:hover{background:rgba(200,145,47,.38)}
+.stock .ld.addable,.stock .mt.addable{cursor:pointer;border-radius:3px;padding:0 4px;
+  outline:1px solid #5aa9e6;background:rgba(90,169,230,.16)}
+.stock .ld.addable:hover,.stock .mt.addable:hover{background:rgba(90,169,230,.34)}
 /* Twelve Stages across, so a Day is one glance. The current Stage is lit, Stages already gone are
    dimmed, and a slot the die has just filled flashes once. */
 .tt{display:flex;gap:3px;flex-wrap:wrap}
@@ -850,20 +472,4 @@ ul.blocked{margin:0;padding-left:18px}
 .dayend-t tr:first-child td{border-top:0}
 .dayend-t .num{text-align:right;font-variant-numeric:tabular-nums;font-weight:700;padding-right:0}
 .dayend-t .you td{color:#8fd6a0}
-.dayend-t .wins{color:#e8c56a;font-weight:700}
-
-/* END-OF-GAME RESULTS (Gitea#16). Same family as the Day-end dialog above, which is the point —
-   the two screens share their standings/target/collision blocks and should look like each other. */
-.res-h{font-size:12px;text-transform:uppercase;letter-spacing:.08em;color:#8b95a3;
-  margin:16px 0 6px;border-top:1px solid #2c333d;padding-top:10px}
-.res-win{color:#8fd6a0}
-.res-loss{color:#d98f8f}
-.res-t{border-collapse:collapse;margin:4px 0;width:100%}
-.res-t td,.res-t th{padding:3px 12px 3px 0;border-top:1px solid #232a33;vertical-align:top}
-.res-t tr:first-child td{border-top:0}
-.res-t td:first-child{color:#8b95a3;white-space:nowrap}
-.res-t th{color:#6d7783;font-weight:600;font-size:11px;text-transform:uppercase;letter-spacing:.05em}
-.res-t .num{text-align:right;font-variant-numeric:tabular-nums}
-.res-wide td:first-child{color:#e6e9ee}
-.res-t .you td{color:#8fd6a0}
 `;

src/web/play.html

@@ -33,16 +33,6 @@ header button:hover{border-color:#4d6fa8}
    stops inviting the press. */
 header button:disabled{opacity:.45;cursor:not-allowed;border-color:#2c333d}
 header button:disabled:hover{border-color:#2c333d}
-.zoom{display:inline-flex;align-items:center;gap:4px}
-.zoom button{padding:3px 9px;line-height:1}
-.lb-invite{display:flex;align-items:center;gap:12px;flex-wrap:wrap;margin:0 0 10px;
-  background:#1e242c;border:1px solid var(--line);border-radius:7px;padding:10px 12px}
-.lb-invite-label{font-size:11px;color:var(--dim)}
-.lb-invite-code{font-size:22px;font-weight:700;letter-spacing:.08em;color:#f2e6cf}
-#lb-settings{margin:10px 0;border:1px solid var(--line);border-radius:7px;padding:8px 12px;background:#171c23}
-#lb-settings summary{cursor:pointer;font-size:13px;color:#9fb6d8}
-#lb-settings h3{font-size:12px;margin:12px 0 4px;color:#9fb6d8}
-.zoom #zoomlabel{font-size:11px;color:var(--dim);min-width:32px;text-align:center;display:inline-block}
 .build{margin-left:auto;font-size:10px;opacity:.55;white-space:nowrap}
 .home{color:inherit;text-decoration:none;border-bottom:1px dotted #5f6b7a}
 .home:hover{color:#5aa9e6}
@@ -76,57 +66,10 @@ dialog input:focus{outline:none;border-color:#4d6fa8}
   padding:5px 14px;cursor:pointer;font:inherit;font-size:13px}
 .ng-buttons button:hover{border-color:#4d6fa8}
 #ng-deal{background:#31527f;border-color:#4d6fa8}
-/* The save warning is the one thing on this screen that describes something IRREVERSIBLE, and it
-   sat in `.ng-note` — the same dim 11px grey as the twenty explanatory notes above it, which is
-   where the eye has already learned there is nothing to act on. Sized and coloured to be read
-   (Jesse, 2026-08-30). Amber rather than red: losing a saved game is a real cost, not a danger, and
-   red here would outrank the actual rules of the game sitting above it. */
-#ss-saved-note{font-size:15px;font-weight:500;line-height:1.55;color:#ffcf70;background:#332a15;
-  border:1px solid #b8912c;border-left:5px solid #e0a83c;border-radius:5px;padding:12px 14px;
-  margin:18px 0 0}
-#ss-saved-note b{color:#ffe3a6}
-/* Two live choices, so neither is the quiet one: `Create new game` keeps the primary blue it has when
-   it is the only button, and `Continue` is given the same weight rather than reading as a cancel. */
-#ss-deal{background:#31527f;border-color:#4d6fa8}
-#ss-resume{background:#2f5340;border-color:#4f8a68}
 main{display:grid;grid-template-columns:minmax(0,1fr) 400px;gap:14px;padding:14px;align-items:start}
 @media(max-width:1100px){main{grid-template-columns:1fr}}
 section{background:var(--panel);border:1px solid var(--line);border-radius:7px;
   padding:10px 12px;margin-bottom:12px}
-#lobby,#solitairesetup{max-width:1040px;margin:0 auto;padding:14px}
-/* The create form is two short lists, not one long one: what game this is on the left, what its
-   rules are on the right. Collapses to one column where there is no room for two. */
-.lb-two{display:grid;grid-template-columns:minmax(0,1fr) minmax(0,1.1fr);gap:22px;align-items:start}
-@media(max-width:860px){.lb-two{grid-template-columns:1fr;gap:0}}
-.lb-col{min-width:0}
-.lb-span{grid-column:1/-1;min-width:0}
-/* The rules in as many columns as the width allows — one in the New Game dialog, which is narrow. */
-.set-groups{display:grid;grid-template-columns:repeat(auto-fit,minmax(290px,1fr));gap:0 26px;align-items:start}
-.set-group{min-width:0;break-inside:avoid}
-.set-group h3:first-child{margin-top:4px}
-/* A DISABLED CHOICE HAS TO LOOK DISABLED. Reported by Jesse: Solitaire is not selectable in the
-   lobby and nothing on it said so — a radio that silently refuses reads as a broken radio. */
-.ng-radio.disabled{opacity:.45;cursor:not-allowed}
-.ng-radio.disabled:hover{background:none}
-#lobby h2,#solitairesetup h2{margin-top:0}
-#lobby h3,#solitairesetup h3{margin-bottom:2px}
-.lb-seat{display:flex;align-items:center;gap:8px;padding:5px 0;border-bottom:1px solid var(--line)}
-.lb-seat:last-child{border-bottom:none}
-.lb-seat .who{flex:1}
-#presence{color:#e0b060;font-size:12px;padding:0 14px;empty-cells:hide}
-/* WHAT YOU ARE WATCHING — v0.8.0, TODO #13/#15. An IN-FLOW row rather than a floating banner like
-   #phasenote and #announce: those announce a moment and fade, this one stands for as long as the
-   board is behind and has a button you have to be able to hit. Amber on the button because amber
-   already means clickable everywhere else on this page; the row itself stays quiet so it does not
-   compete with the three banners it sits under. */
-#watching{display:flex;align-items:center;gap:10px;padding:4px 14px;font-size:12px;color:#9aa0b4}
-#watching[hidden]{display:none}
-#watching-what{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
-.wbehind{font-variant-numeric:tabular-nums;font-weight:700;color:#c9cee0;
-  background:#22263a;border:1px solid #343a52;border-radius:10px;padding:1px 8px;white-space:nowrap}
-#watching-skip,#watching-pause{font-size:11px;padding:2px 10px;border-color:#e0b060;color:#e0b060;flex:none}
-#watching-who{color:#c9cee0;font-weight:700}
-#presence:empty{display:none}
 /* division strip */
 #division{display:flex;gap:7px;overflow-x:auto;padding-bottom:4px}
 .node{border:1px solid var(--line);border-radius:6px;padding:6px 9px;min-width:112px;flex:0 0 auto}
@@ -184,14 +127,6 @@ button.cardact.discard{color:#d6b48a}
 .scheduled{display:block;font-size:11.5px;margin:0 0 7px;padding:3px 9px;border-radius:5px;
   background:rgba(40,140,60,.22);border:1px solid #2f6b47;color:#bfe8cd;font-weight:600}
 .makeup-note{font-size:11px;margin:0 0 5px}
-/* WHAT THE TRAIN STILL WANTS. Deliberately NOT amber: amber means "you can click this" everywhere
-   else on this page, and this line is the REASON for clicking rather than a thing to click — the
-   cars in the Division Yard are. Brighter than the note beneath it, because it answers the question
-   the player actually has while looking at it. `done` goes green like `.scheduled`: a complete
-   consist is good news, not an instruction. */
-.makeup-needs{font-size:12px;margin:0 0 5px;color:#e6e9ee}
-.makeup-needs b{color:#f2e6cf}
-.makeup-needs.done{color:#bfe8cd}
 /* WHICH TRAIN AM I SWITCHING. A row of crews rather than a stacked list — they are alternatives,
    and the chosen one is the crew whose squares the board is drawing, so it wears the same violet
    "you are here" the rest of the page uses. */
@@ -213,21 +148,12 @@ button.act.crew.on{border-color:var(--now);background:rgba(185,140,240,.18);colo
 /* actions */
 #actions{max-height:none}
 .grp{margin-bottom:6px}
-/* What a role is for, under its heading — a sentence a player reads once and stops re-asking. Sized
-   below the buttons so it explains without competing with the thing being chosen. */
-.grp .scope{margin:2px 0 4px;font-size:11.5px;line-height:1.35}
 /* THESE ARE THE THINGS YOU CAN DO. An action carried the same grey border as every other panel
    on the page, so the one region that is clickable did not look it. Amber border and a lit face,
    used nowhere else, so "this is a move" is answered before the label is read. */
 button{background:#2a3038;color:var(--fg);border:1px solid var(--line);border-radius:5px;
   padding:5px 9px;margin:2px 3px 2px 0;cursor:pointer;font:inherit;font-size:12px;text-align:left}
 button:hover{background:#39424e;border-color:#4d6fa8}
-/* GENERIC, and it was not. `header button:disabled` and `#actions button:disabled` were the only
-   disabled styles on the page, so a disabled button anywhere else — #lb-start being the one that
-   mattered — kept its normal face AND still lit up under the cursor from the rule above. It was
-   advertising a click it would refuse. */
-button:disabled{opacity:.45;cursor:not-allowed}
-button:disabled:hover{background:#2a3038;border-color:var(--line)}
 #actions button{background:#2b3444;border:2px solid #c8912f;box-shadow:0 0 0 1px rgba(200,145,47,.18);
   color:#f2e6cf;font-weight:600}
 #actions button:hover{background:#3a4a63;border-color:#f0b64a;box-shadow:0 0 0 3px rgba(240,182,74,.20)}
@@ -238,17 +164,6 @@ button.act{display:inline-block}
 button.ghost{background:#222831;border:1px solid #4a5361;color:#c6ccd6;font-size:11px;
   padding:2px 9px;margin-left:10px;text-transform:none;letter-spacing:0;vertical-align:middle}
 button.ghost:hover{border-color:#4d6fa8;color:var(--fg)}
-/* A SEGMENTED CONTROL, BECAUSE A CYCLE COULD NOT REACH EVERY STATE (TODO #16).
-   One button that steps auto -> pinned -> auto can only ever offer the pin OPPOSITE to whatever
-   auto is doing at that moment, which depends on the phase — so "always hidden" was unreachable
-   from "always showing" without waiting for the right phase in between. Three controls, one per
-   mode, and the current one is lit. The buttons still say what they DO rather than what the panel
-   is doing, which was the earlier fix and is worth keeping. */
-.seg{display:inline-flex;margin-left:10px;vertical-align:middle;border-radius:4px;overflow:hidden;
-  border:1px solid #4a5361}
-.seg button.ghost{margin:0;border:0;border-radius:0;border-left:1px solid #4a5361}
-.seg button.ghost:first-child{border-left:0}
-.seg button.ghost[aria-pressed="true"]{background:#2f3a4a;color:var(--fg);font-weight:600}
 #district.folded #grid{display:none}
 #district.folded .districtrule{display:none}
 /* Said once, quietly, beside the thing it governs — a rule a player needs on their first district
@@ -258,16 +173,6 @@ button.ghost:hover{border-color:#4d6fa8;color:var(--fg)}
 .districtrule b{color:#cfd6e0}
 #district.folded #districtsummary{display:block;padding:2px 0 1px;font-size:12px}
 #districtsummary{display:none}
-/* The This Game card folds the same way the district does, and for the same reason: a panel that
-   vanishes entirely reads as broken, so the summary line is what a folded card still says. */
-#gamecard.folded #gamecardbody{display:none}
-#gamecard #gamecardsummary{display:none}
-#gamecard.folded #gamecardsummary{display:block;padding:2px 0 1px;font-size:12px}
-#gamecardbody dl{display:grid;grid-template-columns:auto 1fr;gap:2px 10px;margin:4px 0 10px}
-#gamecardbody dt{color:#8b94a3;font-size:11px}
-#gamecardbody dd{margin:0;font-size:12px;color:#cfd6e0}
-#gamecardbody dd.changed{color:#f0b64a}
-#gamecardbody h4{margin:8px 0 0;font-size:11px;text-transform:uppercase;letter-spacing:.06em;color:#8b94a3}
 /* An action you cannot take yet keeps its place but drops its light — the amber means "press me",
    so a disabled button must not wear it. */
 #actions button.blocked,#actions button:disabled{background:#232830;border:1px dashed #4a5361;
@@ -278,14 +183,6 @@ h3.actions-hd{font-size:13px;text-transform:none;letter-spacing:.01em;color:#cfe
 .over{padding:9px;border-radius:5px;font-weight:700;margin-bottom:8px}
 .over.win{background:rgba(40,140,60,.35)}
 .over.loss{background:rgba(160,60,60,.3)}
-/* THE EXTENSION VOTE (Gitea#11) — unanimous, so who has not answered yet is the useful half. */
-.vote-tally{display:flex;flex-wrap:wrap;gap:4px 12px;margin:0 0 9px;font-size:12px}
-.vote.yes{color:#8fd6a0}
-.vote.no{color:#d98f8f}
-.vote.wait{color:var(--dim)}
-/* Wider than the New Game dialog: the results carry a seven-column per-player table (Gitea#16). */
-#resultsdlg{max-width:640px}
-#resultsdlg table{max-width:100%}
 /* cards, log, blocked */
 .card.gone{opacity:.35;text-decoration:line-through}
 .subj{display:block;width:100%;margin:2px 0}
@@ -306,553 +203,10 @@ h3.actions-hd{font-size:13px;text-transform:none;letter-spacing:.01em;color:#cfe
 ul.blocked{list-style:none;margin:0;padding:0;font-size:12px}
 ul.blocked li{padding:2px 0}
 .sev-warn{color:#e0b060}.sev-stop{color:#e58080}
-/* THE RULES BLOCK, shared by the lobby and the New Game dialog (`settings-form.ts`).
-   `.changed` is the one signal that says "this game is not the type it claims" — amber, the palette's
-   attention colour, never red: a changed rule is a choice, not an error. */
-.set-row{padding:3px 0}
-.set-row.changed{border-left:3px solid #e0b060;padding-left:9px;margin-left:-12px;
-  background:rgba(224,176,96,.08);border-radius:0 4px 4px 0}
-.set-hint{display:block;font-size:11px;color:var(--dim);margin:2px 0 0}
-/* The line under the type radios when a game is no longer the type it started as. */
-.changed-note{color:#e0b060}
-.set-row.changed .set-hint{color:#e0b060}
-.set-row.unavailable{opacity:.5}
-.ng-gate{display:flex;align-items:center;gap:8px;flex-wrap:wrap;padding:3px 0}
-.ng-gate input[type=checkbox]{flex:none}
-.gate-num{width:82px}
-.ng-gate input:disabled{opacity:.45}
-.lb-params{display:flex;gap:14px;flex-wrap:wrap;align-items:end;margin:8px 0}
-.lb-params .ng-num{flex:1 1 150px}
-/* An error a player must not scroll past. The grey `.dim` line this replaced was routinely missed —
-   it looked like the note above it. Red is the palette's `.sev-stop`. */
-.lb-error{color:#e58080;font-size:14px;font-weight:600;margin:8px 0;padding:8px 11px;
-  border-left:3px solid #e58080;background:rgba(229,128,128,.12);border-radius:0 5px 5px 0;
-  empty-cells:hide}
-.lb-error:empty{display:none}
-.lb-warn{color:#e0b060;font-size:13px;margin:8px 0}
-.lb-doors{display:flex;gap:9px;margin:14px 0 12px}
-.lb-door{flex:1;background:#222831;color:var(--fg);border:1px solid var(--line);border-radius:7px;
-  padding:9px 12px;cursor:pointer;font:inherit;font-size:14px}
-.lb-door:hover{border-color:#4d6fa8}
-.lb-door.active{background:#2f3a4b;border-color:#6f8fc8;color:#cfe0f5;font-weight:600}
-.lb-saved{display:flex;align-items:center;gap:10px}
-.lb-known-row{display:flex;align-items:center;gap:10px;padding:6px 0;border-bottom:1px solid var(--line)}
-.lb-known-row:last-child{border-bottom:none}
-.lb-known-row .code{font-weight:700;letter-spacing:.06em;color:#f2e6cf;flex:1}
-.lb-type{font-size:15px;font-weight:600;color:#cfe0f5;margin:2px 0 8px}
-.lb-preview-head{background:#1e242c;border:1px solid var(--line);border-radius:7px;padding:10px 12px;margin:0 0 10px}
-/* The read-only rule set — what a joining player reads before sitting down, and what the seating
-   screen keeps showing afterwards. Generated, never a form: nobody but the host may change these. */
-.rules-list{border:1px solid var(--line);border-radius:7px;background:#171c23;padding:4px 12px;margin:0 0 12px}
-.rules-list dl{display:grid;grid-template-columns:minmax(140px,auto) 1fr;gap:2px 14px;margin:8px 0}
-.rules-list dt{color:var(--dim);font-size:12px}
-.rules-list dd{margin:0;font-size:13px}
-.rules-list dd.changed{color:#e0b060}
-.rules-list h4{font-size:11px;text-transform:uppercase;letter-spacing:.07em;color:var(--dim);margin:10px 0 0}
-/* THE HANDOFF. Between the host pressing Start and the first Frame arriving there is nothing to
-   draw — and a blank board is what a broken game looks like too. */
-#handoff{position:fixed;inset:0;z-index:20;display:none;align-items:center;justify-content:center;
-  background:rgba(18,21,26,.94);text-align:center;padding:20px}
-#handoff.shown{display:flex}
-#handoff .hand-inner{max-width:460px}
-#handoff h2{font-size:15px;text-transform:none;letter-spacing:.01em;color:#cfe0f5}
-#handoff .hand-note{color:var(--dim);font-size:13px;margin-top:8px}
 </style>
 </head>
 <body>
 
-<!-- THE LOBBY (Phase 4) — shown instead of the game UI whenever there is no game yet to play: no
-     stored session token, or a token whose game hasn't started. `lobby.ts` owns everything in here;
-     `main.ts` only decides whether THIS div, `#solitairesetup` or `#gameui` is the one visible.
-     `#solitairesetup` asks the same questions of a solitaire player, through the same shared module
-     (`settings-form.ts`) — the two blocks are generated from one template, and since 2026-08-30
-     they are the ONLY two: the in-game dialog that was a third copy is gone. -->
-<div id="lobby" hidden>
-  <header><b><a href="./index.html" class="home">Station Master</a></b> — <span class="dim">Multiplayer</span></header>
-
-  <!-- Whatever brought the player here when it was not their own click: a game that was ended under
-       them, or a lobby that closed. Never a field-level error — those sit with their fields. -->
-  <p class="lb-error" id="lb-notice" role="alert" hidden></p>
-
-  <section id="lb-secret-section">
-    <h2>Join secret</h2>
-    <!-- Saved: one line, not a password field asking to be filled in again. `lobby.ts` swaps these
-         two, and re-opens the ask automatically when the server answers 403. -->
-    <div id="lb-secret-saved" class="lb-saved" hidden>
-      <span class="dim">Join secret · saved in this browser</span>
-      <button id="lb-secret-change" class="ghost" type="button">Change</button>
-    </div>
-    <div id="lb-secret-ask">
-      <p class="ng-note">Whoever is running this server gave you a secret out of band (a chat message, not a public page). It is kept in this browser only, never shown back, and sent with every lobby request.</p>
-      <label class="ng-num"><span>Join secret</span><input id="lb-secret" type="password" autocomplete="off"></label>
-    </div>
-  </section>
-
-  <!-- EVERY GAME THIS BROWSER IS IN. `localStorage` used to hold exactly ONE multiplayer session, so
-       joining a second silently overwrote the first and locked that seat out for good. Keyed by game
-       now, and this is where they are picked between — and forgotten deliberately rather than by
-       accident. -->
-  <section id="lb-known" hidden>
-    <h2>Games you are in</h2>
-    <p class="ng-note">This browser holds a seat in these. Rejoining needs the token kept here, so
-       <b>Forget</b> is the one thing that cannot be undone from this screen.</p>
-    <div id="lb-known-list"></div>
-  </section>
-
-  <section id="lb-choice-section">
-    <label class="ng-num"><span>Your display name</span><input id="lb-name" type="text" autocomplete="off" maxlength="40"></label>
-
-    <!-- TWO DOORS, one panel at a time. Joining used to be a heading at the BOTTOM of the create
-         form: someone sent a code had to scroll past fifteen fields they had no use for. -->
-    <div class="lb-doors">
-      <button id="lb-door-join" class="lb-door active" type="button">Join a game</button>
-      <button id="lb-door-create" class="lb-door" type="button">Create a game</button>
-    </div>
-
-    <section id="lb-join-panel">
-      <h2>Join a game</h2>
-      <p class="ng-note">Ask whoever created the game for its code. You will see the whole rule set
-         before you take a seat.</p>
-      <label class="ng-num"><span>Game code</span><input id="lb-code" type="text" autocomplete="off" placeholder="RAIL-1234"></label>
-      <button id="lb-look" type="button">Look up game</button>
-      <p class="lb-error" id="lb-join-err" role="alert"></p>
-
-      <!-- Filled by `/api/lobby/preview` — the config, who is seated, and nothing else. The SEED is
-           never in that response: it decides every shuffle in the game. -->
-      <div id="lb-preview" hidden>
-        <h3>Before you sit down</h3>
-        <div class="lb-preview-head">
-          <div class="lb-invite-code" id="lb-preview-code"></div>
-          <div id="lb-preview-type" class="lb-type"></div>
-          <div id="lb-preview-who" class="dim"></div>
-        </div>
-        <div id="lb-preview-rules" class="rules-list"></div>
-        <button id="lb-join" type="button">Join this game</button>
-      </div>
-    </section>
-
-    <section id="lb-create-panel" hidden>
-      <h2>Create a new game</h2>
-      <p class="ng-note">You become the host — you choose the game type and, once everyone is seated, start the game. 2 to 4 players.</p>
-
-      <!-- TWO COLUMNS WHERE THERE IS ROOM. One 640px-wide column made this form a very long scroll
-           for what is really two short lists: what game this is, and what its rules are. -->
-      <div class="lb-two">
-      <div class="lb-col">
-
-      <!-- THE PARAMETERS, above the type. Changing one of these does NOT make the game Custom: the
-           types are formulas in the table size and the length, so the Revenue floor re-derives and
-           "Co-op, 3 players, 8 days" is still Co-op. -->
-      <div class="lb-params">
-        <label class="ng-num"><span>Seed</span>
-          <input id="lb-seed" type="text" inputmode="numeric" autocomplete="off" placeholder="blank for a random seed"></label>
-        <label class="ng-num"><span>Players at the table</span>
-          <select id="lb-players">
-            <option value="2">2</option>
-            <option value="3">3</option>
-            <option value="4" selected>4</option>
-          </select></label>
-        <label class="ng-num"><span>Days</span>
-          <input id="lb-days" type="number" min="1" max="20" step="1" value="5"></label>
-      </div>
-      <p class="ng-note">The same seed and the same settings always deal the same railroad, so a game
-         can be shared, compared or replayed. Leave it blank for a random one.</p>
-      <!-- WITH THE TABLE SIZE IT IS ABOUT, not below the rules block — reported by Jesse, who found
-           it separated from the control it explains by fifteen settings. -->
-      <p class="ng-note">Every chair must be filled before the game can start. For solitaire,
-         there&rsquo;s only one player. For multiplayer, that must be filled by a person or a
-         bot. The number of players cannot be changed once the game is created.</p>
-      </div>
-
-      <div class="lb-col">
-      <h3>Game type (multi-player)</h3>
-    <div class="set-row" id="lb-type-row">
-      <label class="ng-radio"><input type="radio" name="lb-type" value="solitaire">
-        <span><b>Solitaire</b><br><span class="dim">One railroad, one player. The whole Division is yours to run.</span></span></label>
-      <label class="ng-radio"><input type="radio" name="lb-type" value="coop" checked>
-        <span><b>Co-op</b><br><span class="dim">Everyone&#8217;s Revenue is one table score. You win together or lose together.</span></span></label>
-      <label class="ng-radio"><input type="radio" name="lb-type" value="competitive">
-        <span><b>Competitive</b><br><span class="dim">Highest Revenue wins — unless the table misses its combined minimum, and then everyone loses.</span></span></label>
-      <label class="ng-radio"><input type="radio" name="lb-type" value="cutthroat">
-        <span><b>Cutthroat</b><br><span class="dim">Highest Revenue wins, and nothing is shared — the only way everyone loses is three collisions in one Day.</span></span></label>
-      <label class="ng-radio"><input type="radio" name="lb-type" value="custom">
-        <span><b>Custom</b><br><span class="dim">Whatever you set below. Selected for you the moment you change a rule; it is scored as the type you started from.</span></span></label>
-    </div>
-
-      
-      </div>
-
-      <!-- FULL WIDTH WHEN IT OPENS. Reported by Jesse: opened inside the right-hand column it made a
-           very long scroll with the left column standing empty beside it. It is a grid child of its
-           own now, spanning both, and its five groups flow into as many columns as fit. -->
-      <details id="lb-settings" class="lb-span">
-        <summary>Game settings</summary>
-        <p class="ng-note">Every rule the game type sets, and every one of them yours to change.
-           Changing any of them selects <b>Custom</b>, which keeps the scoring of the type you
-           started from; changing the game type resets all of them back to it. They are fixed when the
-           game is created and cannot be changed once it starts.</p>
-      <div class="set-groups">
-
-      <div class="set-group">
-      <h3>Starting hand</h3>
-      <p class="ng-note">What each player is dealt before the first turn. The hand limit is three
-         either way — deal six and the first turn is spent choosing which of them to keep.</p>
-      <div class="set-row" id="lb-hand-row">
-        <label class="ng-radio"><input type="radio" name="lb-hand" value="threeRandom">
-          <span><b>Three random cards</b><br><span class="dim">The original rule. At the hand limit already, and no guarantee of track.</span></span></label>
-        <label class="ng-radio"><input type="radio" name="lb-hand" value="sixRandom" checked>
-          <span><b>Six random cards</b><br><span class="dim">Twice the choice, still no guaranteed track — the first turn is a discard.</span></span></label>
-        <label class="ng-radio"><input type="radio" name="lb-hand" value="threeTrackThreeOther">
-          <span><b>Three random track and three random non-track cards</b><br><span class="dim">Dealt from two piles, so the district you can build is dealt rather than waited for.</span></span></label>
-        <span class="set-hint" id="lb-hand-hint"></span>
-      </div>
-      </div>
-
-      <div class="set-group">
-      <h3>Where an Extra may start</h3>
-      <p class="ng-note">The player who plays an Extra Train card chooses where its Crew Tray goes,
-         and the place decides which way it runs — a Division Point sends it away from itself; in the
-         middle of the railroad the player picks east or west. The Division Points and the Interchange
-         belong to nobody and are always available. Starting one inside a district is the part that
-         favours a seat, so it is set here. An Office must be a Control Point whatever this says: a
-         Whistle Post never qualifies.</p>
-      <div class="set-row" id="lb-extra-row">
-        <label class="ng-radio"><input type="radio" name="lb-extra" value="divisionPointsOnly">
-          <span><b>Division Points and the Interchange only</b><br><span class="dim">The strictest reading. Every Extra begins on shared ground.</span></span></label>
-        <label class="ng-radio"><input type="radio" name="lb-extra" value="ownOffice">
-          <span><b>Also the playing player&#8217;s own Control Point</b><br><span class="dim">You may start one at home, but not in somebody else&#8217;s district.</span></span></label>
-        <label class="ng-radio"><input type="radio" name="lb-extra" value="anyOffice">
-          <span><b>Also any player&#8217;s Control Point</b><br><span class="dim">The most permissive — an Extra may be planted in another player&#8217;s district.</span></span></label>
-        <span class="set-hint" id="lb-extra-hint"></span>
-      </div>
-      </div>
-
-      <div class="set-group">
-      <h3>Revenue</h3>
-      <p class="ng-note">What each piece of work pays, 0 to 5. A coach pays when it is boarded and
-         again when it is detrained; a load pays when it is made up and again when it is broken. Zero
-         switches an economy off so the others can be read.</p>
-      <div class="set-row" id="lb-passenger-row">
-        <label class="ng-num"><span>Passenger revenue per coach</span>
-          <input id="lb-passenger" type="number" min="0" max="5" step="1" value="1"></label>
-        <span class="set-hint" id="lb-passenger-hint"></span>
-      </div>
-      <div class="set-row" id="lb-freight-row">
-        <label class="ng-num"><span>Freight revenue per load</span>
-          <input id="lb-freight" type="number" min="0" max="5" step="1" value="1"></label>
-        <span class="set-hint" id="lb-freight-hint"></span>
-      </div>
-      <div class="set-row" id="lb-transit-row">
-        <label class="ng-num"><span>Train revenue per transit</span>
-          <input id="lb-transit" type="number" min="0" max="5" step="1" value="0"></label>
-        <span class="set-hint" id="lb-transit-hint"></span>
-      </div>
-      <p class="ng-note">A transit pays every player, once, when a train runs off the end of the
-         Division — the one thing nobody has to work for.</p>
-      </div>
-
-      <div class="set-group">
-      <h3>Victory conditions</h3>
-      <p class="ng-note">The ways this game can end badly. Each one is switched on or off in its own
-         right; how long the game runs is set above, with the table size.</p>
-      <div class="set-row" id="lb-minrev-row">
-        <label class="ng-gate"><input type="checkbox" id="lb-minrev-on" checked>
-          <span>Everyone loses if combined Revenue at the end is under</span>
-          <input id="lb-minrev" type="number" min="0" step="1" class="gate-num"></label>
-        <span class="set-hint" id="lb-minrev-hint"></span>
-      </div>
-      <div class="set-row" id="lb-colday-row">
-        <label class="ng-gate"><input type="checkbox" id="lb-colday-on" checked>
-          <span>The game ends immediately and results in a loss if collisions in one Day reach</span>
-          <input id="lb-colday" type="number" min="0" step="1" class="gate-num"></label>
-        <span class="set-hint" id="lb-colday-hint"></span>
-      </div>
-      <div class="set-row" id="lb-coltotal-row">
-        <label class="ng-gate"><input type="checkbox" id="lb-coltotal-on" checked>
-          <span>The game ends immediately and results in a loss after this many collisions in the whole game</span>
-          <input id="lb-coltotal" type="number" min="0" step="1" class="gate-num"></label>
-        <span class="set-hint" id="lb-coltotal-hint"></span>
-      </div>
-      <p class="ng-note">The opponent-directed cards — Derail, Watertower, Hobo Jungle and the
-         nineteen others, along with the seven that answer them — are not implemented yet, so no game
-         type deals them whatever else is set here.</p>
-      </div>
-
-      <div class="set-group">
-      <h3>Optional rules</h3>
-      <p class="ng-note">Each one changes how the game plays.</p>
-      <div class="set-row" id="lb-visibility-row">
-        <label class="ng-num"><span>Reduced Visibility — five switching Moves instead of six in the
-          night Stages (1&ndash;3 and 11&ndash;12)</span>
-          <input id="lb-visibility" type="checkbox"></label>
-        <span class="set-hint" id="lb-visibility-hint"></span>
-      </div>
-      <div class="set-row" id="lb-rotation-row">
-        <label class="ng-num"><span>Employee Rotation — at the end of each Day everyone moves one
-          chair left and takes over the next station up the line. Your Revenue and the Fedora go with
-          you; the district stays where it is</span>
-          <input id="lb-rotation" type="checkbox"></label>
-        <span class="set-hint" id="lb-rotation-hint"></span>
-      </div>
-      <div class="set-row" id="lb-toolbox-row">
-        <label class="ng-num"><span>Emergency Toolbox — everyone starts holding a Red Flag, so a hand
-          of four; play or discard down to three on the first turn</span>
-          <input id="lb-toolbox" type="checkbox"></label>
-        <span class="set-hint" id="lb-toolbox-hint"></span>
-      </div>
-      <div class="set-row" id="lb-tossloco-row">
-        <label class="ng-num"><span>A Timetabled train may be discarded — toss it face-up to a
-          Department slot, where a rival may pick it up. Turn this off and a train card can only ever
-          be played onto the timetable. An Extra is never discardable either way</span>
-          <input id="lb-tossloco" type="checkbox"></label>
-        <span class="set-hint" id="lb-tossloco-hint"></span>
-      </div>
-      </div>
-
-      </div>
-      </details>
-
-      <div class="lb-span">
-        <button id="lb-create" type="button">Create new game</button>
-        <p class="lb-error" id="lb-create-err" role="alert"></p>
-      </div>
-      </div>
-    </section>
-  </section>
-
-  <!-- Shown once created or joined, in place of the choice above, until the host starts the game. -->
-  <section id="lb-seating-section" hidden>
-    <h2>Seating</h2>
-    <div class="lb-invite">
-      <div>
-        <div class="lb-invite-label">Send this to your players</div>
-        <div class="lb-invite-code" id="lb-gamecode"></div>
-      </div>
-      <button id="lb-copy" class="ghost" type="button">Copy code</button>
-      <button id="lb-copylink" class="ghost" type="button">Copy invite link</button>
-      <span class="ng-note" id="lb-copied"></span>
-    </div>
-    <p class="ng-note">They enter the code under <b>Join a game</b>, along with the same join secret
-       you used — the link carries the code, never the secret.</p>
-    <p class="ng-note">The host may fill an empty seat with a bot or clear an occupied one, and
-       starts the game once every seat is either a player or a bot. <b>These chairs are not the
-       running order</b> — who sits where along the Division is decided by a D12 roll when the game
-       starts, and the map shows the result.</p>
-    <div id="lb-seats"></div>
-    <p class="lb-warn" id="lb-stream-note" role="status" hidden></p>
-    <button id="lb-start" disabled>Start game</button>
-    <button id="lb-leave" class="ghost" type="button">Leave</button>
-    <p class="lb-error" id="lb-start-note" role="alert"></p>
-
-    <h3>The game you are in</h3>
-    <div id="lb-seating-type" class="lb-type"></div>
-    <div id="lb-seating-rules" class="rules-list"></div>
-  </section>
-</div>
-
-<!-- ===================================================================
-     SOLITAIRE SETUP — the same question multiplayer already asks first,
-     now asked here too (Jesse, 2026-08-29): a genuinely fresh visit deals
-     nothing until this screen's own Deal button is pressed. A saved game,
-     an explicit `?seed=`, or a URL already carrying a Deal's answers (any
-     of the shared block's fields — `hand` names the one always written)
-     all skip straight past this screen, exactly as `?lobby` already skips
-     past it into the lobby: those are not "no plan yet", they are a
-     choice already made, elsewhere.
-
-     THE SAME BLOCK THE DIALOG AND THE LOBBY USE, same shared module
-     (`settings-form.ts`), same order — three screens are one design now
-     instead of two. Only Solitaire can be dealt from here, so the other
-     four types are shown exactly as the in-game dialog shows them: present,
-     disabled, with a note pointing at the Multiplayer door instead.
-     ==================================================================== -->
-<div id="solitairesetup" hidden>
-  <header><b><a href="./index.html" class="home">Station Master</a></b> — <span class="dim">Solitaire</span></header>
-
-  <section>
-    <h2>New solitaire game</h2>
-    <p class="ng-note">One railroad, one player, five full days by default — everything below is
-       yours to change before you deal. Clearing the Revenue floor wins; falling short loses.</p>
-
-    <!-- THE SAME THREE PARAMETERS THE LOBBY ASKS, in the same order, with the same note under them
-         (Jesse, 2026-08-30: "everything beneath that should be the same"). The table size is here
-         rather than hidden because it is one of the three things that describe a game, and leaving
-         it out made this screen a different form that happened to share a rules block. It is LOCKED
-         at one: a `LocalSession` runs the engine in this browser and a table needs a server, which
-         is the same reason the four multiplayer game types are shown disabled below. -->
-    <div class="lb-params">
-      <label class="ng-num"><span>Seed</span>
-        <input id="ss-seed" type="text" inputmode="numeric" autocomplete="off" placeholder="blank for a random seed"></label>
-      <label class="ng-num"><span>Players at the table</span>
-        <select id="ss-players" disabled>
-          <option value="1" selected>1</option>
-        </select></label>
-      <label class="ng-num"><span>Days</span>
-        <input id="ss-days" type="number" min="1" max="20" step="1" value="5"></label>
-    </div>
-    <p class="ng-note">The same seed and the same settings always deal the same railroad, so a game
-       can be shared, compared or replayed. Leave it blank for a random one.</p>
-    <p class="ng-note">Every chair must be filled before the game can start. For solitaire,
-       there&rsquo;s only one player. For multiplayer, that must be filled by a person or a
-       bot. The number of players cannot be changed once the game is created.</p>
-
-    <h3>Game type (solitaire)</h3>
-    <div class="set-row" id="ss-type-row">
-      <label class="ng-radio"><input type="radio" name="ss-type" value="solitaire" checked>
-        <span><b>Solitaire</b><br><span class="dim">One railroad, one player. The whole Division is yours to run.</span></span></label>
-      <label class="ng-radio"><input type="radio" name="ss-type" value="coop">
-        <span><b>Co-op</b><br><span class="dim">Everyone&#8217;s Revenue is one table score. You win together or lose together.</span></span></label>
-      <label class="ng-radio"><input type="radio" name="ss-type" value="competitive">
-        <span><b>Competitive</b><br><span class="dim">Highest Revenue wins — unless the table misses its combined minimum, and then everyone loses.</span></span></label>
-      <label class="ng-radio"><input type="radio" name="ss-type" value="cutthroat">
-        <span><b>Cutthroat</b><br><span class="dim">Highest Revenue wins, and nothing is shared — the only way everyone loses is three collisions in one Day.</span></span></label>
-      <label class="ng-radio"><input type="radio" name="ss-type" value="custom">
-        <span><b>Custom</b><br><span class="dim">Whatever you set below. Selected for you the moment you change a rule; it is scored as the type you started from.</span></span></label>
-    </div>
-
-    
-
-    <details id="ss-settings" open>
-      <summary>Game settings</summary>
-      <p class="ng-note">Every rule the game type sets, and every one of them yours to change.
-         Changing any of them selects <b>Custom</b>, which keeps the scoring of the type you
-         started from; changing the game type resets all of them back to it. They are fixed when the
-         game is created and cannot be changed once it starts.</p>
-      <div class="set-groups">
-
-      <div class="set-group">
-      <h3>Starting hand</h3>
-      <p class="ng-note">What each player is dealt before the first turn. The hand limit is three
-         either way — deal six and the first turn is spent choosing which of them to keep.</p>
-      <div class="set-row" id="ss-hand-row">
-        <label class="ng-radio"><input type="radio" name="ss-hand" value="threeRandom">
-          <span><b>Three random cards</b><br><span class="dim">The original rule. At the hand limit already, and no guarantee of track.</span></span></label>
-        <label class="ng-radio"><input type="radio" name="ss-hand" value="sixRandom" checked>
-          <span><b>Six random cards</b><br><span class="dim">Twice the choice, still no guaranteed track — the first turn is a discard.</span></span></label>
-        <label class="ng-radio"><input type="radio" name="ss-hand" value="threeTrackThreeOther">
-          <span><b>Three random track and three random non-track cards</b><br><span class="dim">Dealt from two piles, so the district you can build is dealt rather than waited for.</span></span></label>
-        <span class="set-hint" id="ss-hand-hint"></span>
-      </div>
-      </div>
-
-      <div class="set-group">
-      <h3>Where an Extra may start</h3>
-      <p class="ng-note">The player who plays an Extra Train card chooses where its Crew Tray goes,
-         and the place decides which way it runs — a Division Point sends it away from itself; in the
-         middle of the railroad the player picks east or west. The Division Points and the Interchange
-         belong to nobody and are always available. Starting one inside a district is the part that
-         favours a seat, so it is set here. An Office must be a Control Point whatever this says: a
-         Whistle Post never qualifies.</p>
-      <div class="set-row" id="ss-extra-row">
-        <label class="ng-radio"><input type="radio" name="ss-extra" value="divisionPointsOnly">
-          <span><b>Division Points and the Interchange only</b><br><span class="dim">The strictest reading. Every Extra begins on shared ground.</span></span></label>
-        <label class="ng-radio"><input type="radio" name="ss-extra" value="ownOffice">
-          <span><b>Also the playing player&#8217;s own Control Point</b><br><span class="dim">You may start one at home, but not in somebody else&#8217;s district.</span></span></label>
-        <label class="ng-radio"><input type="radio" name="ss-extra" value="anyOffice">
-          <span><b>Also any player&#8217;s Control Point</b><br><span class="dim">The most permissive — an Extra may be planted in another player&#8217;s district.</span></span></label>
-        <span class="set-hint" id="ss-extra-hint"></span>
-      </div>
-      </div>
-
-      <div class="set-group">
-      <h3>Revenue</h3>
-      <p class="ng-note">What each piece of work pays, 0 to 5. A coach pays when it is boarded and
-         again when it is detrained; a load pays when it is made up and again when it is broken. Zero
-         switches an economy off so the others can be read.</p>
-      <div class="set-row" id="ss-passenger-row">
-        <label class="ng-num"><span>Passenger revenue per coach</span>
-          <input id="ss-passenger" type="number" min="0" max="5" step="1" value="1"></label>
-        <span class="set-hint" id="ss-passenger-hint"></span>
-      </div>
-      <div class="set-row" id="ss-freight-row">
-        <label class="ng-num"><span>Freight revenue per load</span>
-          <input id="ss-freight" type="number" min="0" max="5" step="1" value="1"></label>
-        <span class="set-hint" id="ss-freight-hint"></span>
-      </div>
-      <div class="set-row" id="ss-transit-row">
-        <label class="ng-num"><span>Train revenue per transit</span>
-          <input id="ss-transit" type="number" min="0" max="5" step="1" value="0"></label>
-        <span class="set-hint" id="ss-transit-hint"></span>
-      </div>
-      <p class="ng-note">A transit pays every player, once, when a train runs off the end of the
-         Division — the one thing nobody has to work for.</p>
-      </div>
-
-      <div class="set-group">
-      <h3>Victory conditions</h3>
-      <p class="ng-note">The ways this game can end badly. Each one is switched on or off in its own
-         right; how long the game runs is set above, with the table size.</p>
-      <div class="set-row" id="ss-minrev-row">
-        <label class="ng-gate"><input type="checkbox" id="ss-minrev-on" checked>
-          <span>You lose if Revenue at the end is under</span>
-          <input id="ss-minrev" type="number" min="0" step="1" class="gate-num"></label>
-        <span class="set-hint" id="ss-minrev-hint"></span>
-      </div>
-      <div class="set-row" id="ss-colday-row">
-        <label class="ng-gate"><input type="checkbox" id="ss-colday-on" checked>
-          <span>The game ends immediately and results in a loss if collisions in one Day reach</span>
-          <input id="ss-colday" type="number" min="0" step="1" class="gate-num"></label>
-        <span class="set-hint" id="ss-colday-hint"></span>
-      </div>
-      <div class="set-row" id="ss-coltotal-row">
-        <label class="ng-gate"><input type="checkbox" id="ss-coltotal-on" checked>
-          <span>The game ends immediately and results in a loss after this many collisions in the whole game</span>
-          <input id="ss-coltotal" type="number" min="0" step="1" class="gate-num"></label>
-        <span class="set-hint" id="ss-coltotal-hint"></span>
-      </div>
-      <p class="ng-note">The opponent-directed cards — Derail, Watertower, Hobo Jungle and the
-         nineteen others, along with the seven that answer them — are not implemented yet, so no game
-         type deals them whatever else is set here.</p>
-      </div>
-
-      <div class="set-group">
-      <h3>Optional rules</h3>
-      <p class="ng-note">Each one changes how the game plays.</p>
-      <div class="set-row" id="ss-visibility-row">
-        <label class="ng-num"><span>Reduced Visibility — five switching Moves instead of six in the
-          night Stages (1&ndash;3 and 11&ndash;12)</span>
-          <input id="ss-visibility" type="checkbox"></label>
-        <span class="set-hint" id="ss-visibility-hint"></span>
-      </div>
-      <div class="set-row" id="ss-rotation-row">
-        <label class="ng-num"><span>Employee Rotation — not applicable for solitaire</span>
-          <input id="ss-rotation" type="checkbox" disabled></label>
-        <span class="set-hint" id="ss-rotation-hint"></span>
-      </div>
-      <div class="set-row" id="ss-toolbox-row">
-        <label class="ng-num"><span>Emergency Toolbox — start holding a Red Flag, so a hand of four;
-          play or discard down to three on the first turn</span>
-          <input id="ss-toolbox" type="checkbox"></label>
-        <span class="set-hint" id="ss-toolbox-hint"></span>
-      </div>
-      <div class="set-row" id="ss-tossloco-row">
-        <label class="ng-num"><span>A Timetabled train may be discarded — toss it face-up to a
-          Department slot. Turn this off and a train card can only ever be played onto the timetable.
-          An Extra is never discardable either way</span>
-          <input id="ss-tossloco" type="checkbox"></label>
-        <span class="set-hint" id="ss-tossloco-hint"></span>
-      </div>
-      </div>
-
-      </div>
-    </details>
-
-    <!-- Shown only when `station-master.save.v1` holds a game. Dealing from this screen CLEARS that
-         save (`commitNewGame` calls `clearSave`), so without a way back the door would be a way to
-         lose a game in progress — and the door is reached by clicking "Play solitaire", which nobody
-         reads as "discard what I was playing". -->
-    <p id="ss-saved-note" hidden><b>You have a solitaire game in progress.</b> Creating a new game
-       replaces it permanently &mdash; there is no undo. Choose <b>Continue saved game</b> to pick it
-       up where you left off.</p>
-
-    <menu class="ng-buttons">
-      <button id="ss-resume" type="button" hidden>Continue saved game</button>
-      <button id="ss-deal" type="button">Create new game</button>
-    </menu>
-  </section>
-</div>
-
-<div id="gameui" hidden>
 <div class="topbar">
 <header>
   <b><a href="./index.html" class="home">Station Master</a></b>
@@ -860,48 +214,16 @@ ul.blocked li{padding:2px 0}
   <!-- The objective, and nothing else: score, target, Days left. The "behind the pace" chip and the
        engine's guess at what your score ought to be were noise on the one line that must not wrap. -->
   <span id="objective" class="pace">—</span>
-  <!-- THE COLLISION COUNTS, WHICH ARE A LIVE SCORE AND NOT A SETTING (TODO #28). The Frame has
-       carried `collisionsToday` and `collisionsTotal` since v0.7.0 and nothing on the board drew
-       them, so the one victory condition that can end a game early was invisible while it ran.
-       Empty and collapsed when both limits are 0 — a game that cannot end this way should not be
-       counting towards it. The limits themselves live in the This Game card; this is progress. -->
-  <span class="dim" id="collisions" title=""></span>
-  <!-- THE GAME CODE SURVIVES THE LOBBY. It used to end at `Lobby.Start` — the code was never carried
-       into `LobbyReady` — so a seated player could not say which game they were in, could not match
-       it against the administrator's Games in Progress list, and could not pass it to a latecomer.
-       Empty (and collapsed) in solitaire, where there is no code. -->
-  <span class="dim" id="gamecode" title="The code this game was created under. The administrator's Games in Progress list uses it, and it is how you say which game you mean."></span>
-  <!-- The seed, the seat, the game type and every house rule MOVED TO THE THIS GAME CARD, 2026-08-30
-       (TODO #28). Jesse: "we can give complete information about all the game options and not take
-       up valuable real estate at the top of the screen… it is not something that they're likely to
-       need all the time." What stays here is what is glanced at every turn — Revenue, the objective,
-       the collision counts — plus the game code, which is identity rather than settings: it is how
-       you say WHICH game you are in, out loud, without opening anything. -->
+  <span class="dim">seed <span id="seed">—</span></span>
+  <!-- WHICH RULES THIS GAME IS BEING PLAYED UNDER. The settings are chosen when the game is dealt
+       and then never mentioned again, which makes a playtest note ("scored 4") unreadable a week
+       later: at 0 revenue per transit that is a different game from the same seed at 5. Short enough
+       to keep the header on one line; the tooltip spells it out. -->
+  <span class="dim" id="houserules" title="">—</span>
   <button id="sound" title="Whistle at the end of each Stage, the crossing bell at the end of each Day, and the conductor when a train is built. Currently synthesised, not recorded.">🔇 muted</button>
-  <!-- BOARD ZOOM. Applies to the Division map and the Office Area grid alike — both already scroll
-       horizontally (`#division`, `#grid`) when they run wide, so this only ever needs to resize the
-       rendered SVG's own pixel dimensions; the existing scrollbar keeps doing the panning. -->
-  <span class="zoom" title="Zoom the Division map and your Office Area. Both already scroll — this only changes their size.">
-    <button id="zoomout" aria-label="Zoom out">−</button><span id="zoomlabel">100%</span><button id="zoomin" aria-label="Zoom in">+</button>
-  </span>
-  <!-- HOW FAST OTHER PLAYERS' TURNS PLAY BACK — v0.8.0.3, TODO #13.
-       A CONTROL RATHER THAN ONLY A URL PARAMETER. `?pace=` shipped first and is unreachable through
-       the front door: `index.html`'s two doors are `play.html?lobby` and `play.html?solitaire`, so
-       arriving from the splash REPLACES the query string and any pace with it. Jesse played a whole
-       game believing he was at 7x when he was at 1x. -->
-  <span class="zoom" title="How long another player's or a bot's move is held on screen before the next one. Your own moves are never delayed — only theirs. Starts at 1×, which holds a switching move for one second; the slowest setting, 20×, holds it for twenty. Off draws every move at once.">
-    <button id="paceslower" aria-label="Slower playback">−</button><span id="pacelabel">1×</span><button id="pacefaster" aria-label="Faster playback">+</button>
-  </span>
   <button id="undo" title="Take the last action back. The save is the seed plus the moves made, so this replays the game without the last one — as far back as you like.">Undo</button>
   <button id="savefile" title="Download this game as a save file you can replay or share">Save replay</button>
-  <button id="newgame" title="Set up a fresh game — the seed, the table, the opening hand and what the three economies pay. Opens the same screen a new solitaire game starts from, with your current rules filled in; your game in progress is kept until you press Deal, and Continue puts it straight back.">New game</button>
-  <button id="multiplayer" title="Create or join a Competitive or Co-op game on this server, with other players.">Multiplayer</button>
-  <!-- LEAVING A RUNNING GAME. Reported by Jesse 2026-08-23: "if I'm a player in the middle of the
-       game and I need to leave, how do I leave the game, clear the token from my browser so I can
-       play a different game later?" There was no way at all — the page rejoined the same game on
-       every load and nothing let go of it. This keeps your seat — the table waits for you — and
-       your token, and puts you back at the lobby, which lists every game this browser is in. -->
-  <button id="leavegame" hidden title="Go back to the lobby. Your seat is kept and the game waits for you — the lobby lists it under Games you are in, so you can come back or hand the browser to a different game.">Leave game</button>
+  <button id="newgame" title="Deal a fresh game. You choose the seed, the opening hand and what the three economies pay. Undo steps back one action at a time; this throws the whole game away, so download the replay first if you want to keep it.">New game</button>
   <a class="home" href="./replays.html" style="font-size:12px">replays</a>
   <span class="dim build" title="what is actually deployed">__BUILD__</span>
 </header>
@@ -916,40 +238,14 @@ ul.blocked li{padding:2px 0}
      what you miss when the automatic phases run between two clicks. -->
 <div id="phasenote"></div>
 <div id="announce"></div>
-<!-- `lobby-and-sessions.md` §5 — a disconnect keeps the seat and the game simply waits; this is
-     what says WHY, instead of the table watching nothing happen with no explanation. Empty and
-     collapsed whenever everyone connected is still connected — a `LocalSession` never fills it. -->
-<div id="presence"></div>
-
-<!-- WHAT YOU ARE WATCHING, and how far behind the board is — v0.8.0, TODO #13/#15.
-     One row rather than three additions: the countdown, the caption naming the action being shown,
-     and Skip. Empty and collapsed whenever the board is level with the game, which in solitaire is
-     almost always. -->
-<div id="watching" hidden>
-  <!-- SKIP FIRST, on the left. It sat on the far right and a player's eye is on the countdown, not at
-       the other end of the row — Jesse, 2026-09-09: "the skip button should be on the far left, in
-       front of where it says [the count], so it's always close to where people are looking." -->
-  <button id="watching-skip" class="ghost" type="button" title="Stop animating and jump the board to where the game actually is. Nothing is lost — every line is already in the History panel.">Skip</button>
-  <!-- PAUSE BESIDE SKIP, not instead of it: they are opposite answers to "that went past too fast".
-       Skip gives up the animation to reach the game; Pause holds the board on the step being shown
-       for as long as you want to look at it, and gives the step back the dwell it still had. -->
-  <button id="watching-pause" class="ghost" type="button" title="Hold the board on the move being shown. Nothing is lost and nothing is hurried — press again to carry on from the same step.">Pause</button>
-  <span id="watching-behind" class="wbehind"></span>
-  <span id="watching-what"></span>
-</div>
 
 <main>
   <div>
-    <section><h2>The Division — west to east</h2><div id="division"></div>
-      <p class="ng-note" id="seating-chain"></p></section>
+    <section><h2>The Division — west to east</h2><div id="division"></div></section>
     <section id="district">
-      <h2><span id="districtwho">Your Office Area</span>
+      <h2>Your Office Area
         <span class="dim" style="text-transform:none;letter-spacing:0">— hover any card for the full explanation</span>
-        <span id="districttoggle" class="seg" role="group" aria-label="When to show your Office Area"><button id="dm-auto" class="ghost" type="button" title="Open during Local Operations and Cargo — the phases that change the district — and folded otherwise.">Auto-hide</button><button id="dm-open" class="ghost" type="button" title="Keep the Office Area open in every phase.">Always show</button><button id="dm-closed" class="ghost" type="button" title="Keep the Office Area folded in every phase. The summary line stays, so it reads as folded rather than missing.">Always hide</button></span>
-        <!-- LOOK AT ANOTHER PLAYER'S OFFICE AREA. Filled by `renderDistrict` with one button per
-             opponent, and collapsed at a table of one. The look is read-only and lasts a single
-             render on purpose — see `peekPlayer` in `main.ts`. -->
-        <span id="districtpeek" class="seg" role="group" aria-label="Look at another player's Office Area"></span>
+        <button id="districttoggle" class="ghost" title="Auto-hide keeps the district open during Local Operations and Cargo — the phases that change it — and folds it otherwise. Click to pin it open or hidden instead.">auto-hide: on</button>
       </h2>
       <div id="districtsummary" class="dim"></div>
       <!-- THE RULE THAT SHAPES EVERY DISTRICT, said once where the district is.
@@ -993,33 +289,64 @@ ul.blocked li{padding:2px 0}
     </section>
     <section><h2>Blocked — why nothing is moving</h2><ul class="blocked" id="blocked"></ul></section>
     <section><h2>Facilities</h2><div id="facs"></div></section>
-    <!-- THIS GAME — the settings it was dealt under, off the top line and out of the way (TODO #28).
-         Last in the column and folded by default because it is looked up, not watched: "Oh wait,
-         what did we set that to?" The body is `rulesListHtml`, the same renderer the join preview
-         and the seating screen draw, so what you agreed to in the lobby and what you can read
-         mid-game cannot drift apart. -->
-    <section id="gamecard" class="folded"><h2>This Game
-        <button id="gamecardtoggle" class="ghost" type="button" title="The seed, the seat, the game type and every rule this game was dealt under.">show</button>
-      </h2>
-      <div id="gamecardsummary" class="dim"></div>
-      <div id="gamecardbody"></div>
-    </section>
   </div>
 </main>
 
-<!-- THE IN-GAME "NEW GAME" BUTTON GOES TO THE SOLITAIRE SETUP SCREEN — there is no second
-     dialog any more (Jesse, 2026-08-30: "it should not go to a separate screen. We should reuse the
-     Solitaire New Game Screen… in general we should reuse what we already have").
+<!-- ===================================================================
+     NEW GAME — the seed, the opening hand, and what the three economies pay.
 
-     `#newgamedlg` was a third copy of the same questions, and the one that drifted: it kept the
-     multiplayer wording ("Everyone loses if COMBINED Revenue…") on a screen only ever shown to a
-     solitaire player, and explained Employee Rotation in full beside a control it had disabled.
-     Deleting it removes the drift rather than re-wording it.
+     It was a `prompt()` asking for a seed. Two of the three things that decide what kind of game
+     you are about to play had no way in at all: the opening hand had been changed twice with no
+     way back to the earlier rule, and the revenue rates were constants in the source. Balance is
+     the open question in this game (`TODO.md`), and the way to settle it is to deal several games
+     at different settings — which needs a dialog, not a rebuild.
 
-     Nothing is lost by navigating away mid-game: `render()` calls `save()` on every frame, so the
-     game in progress is always on disk, and the setup screen offers "Continue saved game"
-     to come straight back to it. -->
-</div><!-- /gameui -->
+     Every control has a default that is the recommended answer, so DEAL with nothing touched is a
+     complete, sensible game. The settings ride in the URL alongside the seed, because a seed alone
+     no longer names a game: `?seed=430` with a different opening hand is a different railroad.
+     ==================================================================== -->
+<dialog id="newgamedlg" aria-labelledby="ng-title">
+  <form method="dialog" id="newgameform">
+    <h2 class="big" id="ng-title">New game</h2>
+
+    <h3>Seed</h3>
+    <p class="ng-note">The same seed and the same settings always deal the same railroad, so a game can be shared, compared or replayed. Leave it blank for a random one.</p>
+    <input id="ng-seed" type="text" inputmode="numeric" autocomplete="off" placeholder="blank for a random seed">
+
+    <h3>Starting hand</h3>
+    <p class="ng-note">What each player is dealt before the first turn. The hand limit is three either way — deal six and the first turn is spent choosing which of them to keep.</p>
+    <label class="ng-radio"><input type="radio" name="ng-hand" value="threeRandom" checked>
+      <span><b>Three random cards</b><br><span class="dim">The original rule. At the hand limit already, and no guarantee of track.</span></span></label>
+    <label class="ng-radio"><input type="radio" name="ng-hand" value="sixRandom">
+      <span><b>Six random cards</b><br><span class="dim">Twice the choice, still no guaranteed track — the first turn is a discard.</span></span></label>
+    <label class="ng-radio"><input type="radio" name="ng-hand" value="threeTrackThreeOther">
+      <span><b>Three random track and three random non-track cards</b><br><span class="dim">Dealt from two piles, so the district you can build is dealt rather than waited for.</span></span></label>
+
+    <h3>Where an Extra may start</h3>
+    <p class="ng-note">The player who plays an Extra Train card chooses where its Crew Tray goes, and the place decides which way it runs — a Division Point sends it away from itself; in the middle of the railroad the player picks east or west. The Division Points and the Interchange belong to nobody and are always available. Starting one inside a district is the part that favours a seat, so it is set here. An Office must be a Control Point whatever this says: a Whistle Post never qualifies.</p>
+    <label class="ng-radio"><input type="radio" name="ng-extra" value="divisionPointsOnly">
+      <span><b>Division Points and the Interchange only</b><br><span class="dim">The strictest reading of §7. Every Extra begins on shared ground.</span></span></label>
+    <label class="ng-radio"><input type="radio" name="ng-extra" value="ownOffice">
+      <span><b>Also the playing player’s own Control Point</b><br><span class="dim">You may start one at home, but not in somebody else’s district.</span></span></label>
+    <label class="ng-radio"><input type="radio" name="ng-extra" value="anyOffice" checked>
+      <span><b>Also any player’s Control Point</b><br><span class="dim">The most permissive, and what the game did before this setting existed.</span></span></label>
+
+    <h3>Revenue</h3>
+    <p class="ng-note">What each piece of work pays, 0 to 5. A coach pays when it is boarded and again when it is detrained; a load pays when it is made up and again when it is broken. Zero switches an economy off so the others can be read.</p>
+    <label class="ng-num"><span>Passenger revenue per coach</span>
+      <input id="ng-passenger" type="number" min="0" max="5" step="1" value="1"></label>
+    <label class="ng-num"><span>Freight revenue per load</span>
+      <input id="ng-freight" type="number" min="0" max="5" step="1" value="1"></label>
+    <label class="ng-num"><span>Train revenue per transit</span>
+      <input id="ng-transit" type="number" min="0" max="5" step="1" value="0"></label>
+    <p class="ng-note">A transit pays every player, once, when a train runs off the end of the Division — the one thing nobody has to work for. It defaults to 0 for that reason.</p>
+
+    <menu class="ng-buttons">
+      <button value="cancel" id="ng-cancel" type="submit" formnovalidate>Cancel</button>
+      <button value="deal" id="ng-deal" type="submit">Deal</button>
+    </menu>
+  </form>
+</dialog>
 
 <!-- THE DAY ROLLING OVER (Gitea#10). A Day turns inside the automatic phases, so it happens
      between one click and the next; the phase banner and the announcement flash both fade before
@@ -1034,39 +361,6 @@ ul.blocked li{padding:2px 0}
   </form>
 </dialog>
 
-<!-- THE END-OF-GAME RESULTS (Gitea#16). Filled by `resultsHtml` and opened from `renderEnding`,
-     which puts it up once per ending unasked and leaves a button to reopen it. Reopenable matters:
-     Gitea#11 lets a table play past the end, and continuing must not cost you the results screen. -->
-<!-- THE EXTENSION QUESTION IS ASKED HERE, not only behind this dialog (Gitea#11 + #16).
-     This opens ITSELF at every ending, and it is modal — so `renderEnding`'s "play one more Day"
-     buttons, which it writes into `#actions`, sit underneath it. A player saw a results screen whose
-     only control was Close and reasonably concluded the game was over: reported by Jesse
-     2026-08-30, "Solitaire game ended. I did not have an option to extend the game by a day."
-     Gitea#11 was verified over the HTTP API, which renders no dialog, so the browser never was.
-     The two extension buttons are hidden unless the game is actually awaiting a vote. -->
-<dialog id="resultsdlg" aria-labelledby="rs-title">
-  <form method="dialog">
-    <div id="resultsbody"></div>
-    <menu class="ng-buttons">
-      <button value="extend-yes" id="rs-extend-yes" type="submit" hidden>Play One More Day</button>
-      <button value="extend-no" id="rs-extend-no" type="submit" hidden>End the Game Here</button>
-      <button value="ok" id="rs-ok" type="submit">Close</button>
-    </menu>
-  </form>
-</dialog>
-
-<!-- THE HANDOFF, between `Lobby.Start` and the first Frame.
-     `beginRemote` used to write "… connecting to the game" into `#presence` — the DISCONNECT banner,
-     whose job is `⚠ waiting on Alice`. It worked only because the first render overwrote it, and it
-     had nothing to say when the first push never came. This is its own state: it opens on the way
-     into a game, holds a deliberate beat so the game visibly begins, and closes on the first Frame. -->
-<div id="handoff">
-  <div class="hand-inner">
-    <h2 id="handoff-title">Dealing the railroad…</h2>
-    <div id="handoff-note" class="hand-note"></div>
-  </div>
-</div>
-
 <script type="module" src="./web/main.js"></script>
 </body>
 </html>

src/web/presets.ts

@@ -1,371 +0,0 @@
-/**
- * THE FOUR GAME TYPES, and what "Custom" means.
- *
- * Jesse's design, 2026-08-23. A game type is not a mode and not a ruleset — it is a NAMED SET OF
- * DEFAULTS that the host may then edit. Editing any of them selects `custom`, which keeps the
- * values and inherits the scoring of the type it was edited away from; clicking a named type again
- * resets every rule back to it.
- *
- * WHY THIS FILE EXISTS RATHER THAN A CONSTANT IN EACH SCREEN. The lobby (`lobby.ts`) and the
- * solitaire New Game dialog (`main.ts`) ask the same questions, and they had already drifted apart
- * before this was written: the dialog had "where an Extra may start" and no optional rules, the
- * lobby had the optional rules and no Extra rule — so a multiplayer game silently played the most
- * permissive Extra rule and nobody was ever asked. One description of the defaults, imported by
- * both, is what stops that happening a third time.
- *
- * PARAMETERS ARE NOT SETTINGS. Seed, player count and Day count sit ABOVE the type radios on both
- * screens and never select `custom`: the presets are formulas in players and days, so "Co-op, 3
- * players, 8 days" is still Co-op and its Revenue floor re-derives. Everything below the radios is
- * a rule, and changing one is what makes a game Custom.
- */
-
-import {
-  DEFAULT_MAX_COLLISIONS_PER_DAY,
-  DEFAULT_MAX_COLLISIONS_TOTAL,
-  collectiveRevenueFloor,
-  houseRules,
-} from '../engine/content.ts';
-import type { ExtraStartRule, RevenueRules, StartingHand } from '../engine/content.ts';
-import type { GameConfig, GameMode } from '../engine/state.ts';
-
-export type PresetName = 'solitaire' | 'coop' | 'competitive' | 'cutthroat';
-/** What the radio group answers: one of the four named types, or the state of having edited one. */
-export type GameType = PresetName | 'custom';
-
-/**
- * Every rule a game type sets, flattened to one value per control.
- *
- * Flat rather than shaped like `GameConfig` because this is what the FORM compares against: each key
- * is one field on screen, so "which fields differ from the preset" is a key-by-key comparison rather
- * than a walk through nested objects. `configFromSettings` puts the shape back.
- */
-export type Settings = {
-  startingHand: StartingHand;
-  extraStart: ExtraStartRule;
-  passengerPerCoach: number;
-  freightPerLoad: number;
-  trainPerTransit: number;
-  /** 0 means the condition is off — the engine's convention (`state.ts`). The form draws a checkbox. */
-  minCombinedRevenue: number;
-  maxCollisionsPerDay: number;
-  maxCollisionsTotal: number;
-  reducedVisibility: boolean;
-  employeeRotation: boolean;
-  emergencyToolbox: boolean;
-  /** §6.2 (Gitea#9) — may a Timetabled train be thrown away? An Extra never may, whatever this says. */
-  discardTimetabled: boolean;
-};
-
-export const SETTING_KEYS: readonly (keyof Settings)[] = [
-  'startingHand',
-  'extraStart',
-  'passengerPerCoach',
-  'freightPerLoad',
-  'trainPerTransit',
-  'minCombinedRevenue',
-  'maxCollisionsPerDay',
-  'maxCollisionsTotal',
-  'reducedVisibility',
-  'employeeRotation',
-  'emergencyToolbox',
-  'discardTimetabled',
-];
-
-export type Preset = {
-  name: PresetName;
-  label: string;
-  /** One line under the radio, saying what winning and losing mean in this type. */
-  blurb: string;
-  /** The engine mode this type is scored under — what a `custom` game inherits. */
-  scoring: GameMode;
-  /**
-   * Whether the 22 opponent-directed cards would be dealt, once they exist. Not a form control any
-   * more: it is a property of the type (`TODO.md` — the cards are unbuilt, so `buildDeck` holds them
-   * out regardless, and a checkbox that cannot do anything is worse than a sentence saying so).
-   */
-  pvpCards: boolean;
-  /**
-   * The Revenue floor this type asks for, as a function of the table and the length. Co-op keeps the
-   * engine's own `collectiveRevenueFloor` (3 per player per Day); Competitive asks two thirds of it,
-   * because a table racing each other is not also pulling in one direction; Cutthroat asks nothing.
-   */
-  revenueFloor: (players: number, days: number) => number;
-  rules: Omit<Settings, 'minCombinedRevenue'>;
-};
-
-const NO_OPTIONAL_RULES = {
-  reducedVisibility: false,
-  employeeRotation: false,
-  emergencyToolbox: false,
-  /**
-   * ON in every type (Gitea#9). Jesse's ruling is the rule now, and the setting exists so a table
-   * can put Gitea#6's pressure back rather than so a type can choose for them — the reasoning is
-   * about how long a game runs, which is a dial the table already sets for itself.
-   */
-  discardTimetabled: true,
-} as const;
-
-/** Every type deals six now (Jesse, 2026-08-23) — the hand limit is three, so the first turn is a
- * discard whichever three you keep. Solitaire moved with the rest so the two screens agree. */
-const SIX: StartingHand = 'sixRandom';
-
-export const PRESETS: readonly Preset[] = [
-  {
-    name: 'solitaire',
-    label: 'Solitaire',
-    blurb: 'One railroad, one player. The whole Division is yours to run.',
-    scoring: 'solitaire',
-    pvpCards: false,
-    revenueFloor: (players, days) => collectiveRevenueFloor(players, days),
-    rules: {
-      startingHand: SIX,
-      /**
-       * Nobody else's district exists, so "any Control Point" and "your own" are the same rule —
-       * `apply.ts` only ever rejects `ownOffice` when `start.seat !== seatOf(s, player)`, which
-       * cannot happen at one seat. It said `anyOffice` until 2026-08-30, which was true and read
-       * wrong: a solitaire player has no "any player" to contrast themselves with, so the permissive
-       * label described a permission nobody was being granted. Jesse's call; no gameplay effect.
-       */
-      extraStart: 'ownOffice',
-      passengerPerCoach: 1,
-      freightPerLoad: 1,
-      trainPerTransit: 0,
-      maxCollisionsPerDay: DEFAULT_MAX_COLLISIONS_PER_DAY,
-      maxCollisionsTotal: DEFAULT_MAX_COLLISIONS_TOTAL,
-      ...NO_OPTIONAL_RULES,
-    },
-  },
-  {
-    name: 'coop',
-    label: 'Co-op',
-    blurb: 'Everyone’s Revenue is one table score. You win together or lose together.',
-    scoring: 'coop',
-    // Never, even once the cards are built: there is no opponent to point them at when the table is
-    // one side.
-    pvpCards: false,
-    revenueFloor: (players, days) => collectiveRevenueFloor(players, days),
-    rules: {
-      startingHand: SIX,
-      extraStart: 'ownOffice',
-      passengerPerCoach: 1,
-      freightPerLoad: 1,
-      // The one economy that pays every player at once, for work nobody had to do — which is the
-      // co-operative one, so it is the type that switches it on.
-      trainPerTransit: 1,
-      maxCollisionsPerDay: DEFAULT_MAX_COLLISIONS_PER_DAY,
-      maxCollisionsTotal: DEFAULT_MAX_COLLISIONS_TOTAL,
-      ...NO_OPTIONAL_RULES,
-    },
-  },
-  {
-    name: 'competitive',
-    label: 'Competitive',
-    blurb: 'Highest Revenue wins — unless the table misses its combined minimum, and then everyone loses.',
-    scoring: 'competitive',
-    pvpCards: true,
-    revenueFloor: (players, days) => 2 * players * days,
-    rules: {
-      startingHand: SIX,
-      extraStart: 'ownOffice',
-      passengerPerCoach: 1,
-      freightPerLoad: 1,
-      trainPerTransit: 0,
-      maxCollisionsPerDay: DEFAULT_MAX_COLLISIONS_PER_DAY,
-      maxCollisionsTotal: DEFAULT_MAX_COLLISIONS_TOTAL,
-      ...NO_OPTIONAL_RULES,
-    },
-  },
-  {
-    name: 'cutthroat',
-    label: 'Cutthroat',
-    blurb: 'Highest Revenue wins, and nothing is shared — the only way everyone loses is three collisions in one Day.',
-    scoring: 'competitive',
-    pvpCards: true,
-    // Off. Cutthroat has no collective obligation of any kind.
-    revenueFloor: () => 0,
-    rules: {
-      startingHand: SIX,
-      // The one type that lets you plant an Extra in somebody else's district.
-      extraStart: 'anyOffice',
-      passengerPerCoach: 1,
-      freightPerLoad: 1,
-      trainPerTransit: 0,
-      maxCollisionsPerDay: DEFAULT_MAX_COLLISIONS_PER_DAY,
-      // Off, with the per-Day check left standing: a table can bleed collisions all game, but three
-      // in one Day still ends it.
-      maxCollisionsTotal: 0,
-      ...NO_OPTIONAL_RULES,
-    },
-  },
-];
-
-export function preset(name: PresetName): Preset {
-  const found = PRESETS.find((p) => p.name === name);
-  if (!found) throw new Error(`no such preset: ${name}`);
-  return found;
-}
-
-/** Every rule a named type sets, at the table size and length the form currently shows. */
-export function presetSettings(name: PresetName, players: number, days: number): Settings {
-  const p = preset(name);
-  return { ...p.rules, minCombinedRevenue: p.revenueFloor(players, days) };
-}
-
-/** The settings a config is actually carrying — the other half of every comparison below. */
-export function settingsOf(config: GameConfig): Settings {
-  const rules = houseRules(config);
-  return {
-    startingHand: rules.startingHand,
-    extraStart: rules.extraStart,
-    passengerPerCoach: rules.revenue.passengerPerCoach,
-    freightPerLoad: rules.revenue.freightPerLoad,
-    trainPerTransit: rules.revenue.trainPerTransit,
-    minCombinedRevenue: config.minCombinedRevenue,
-    maxCollisionsPerDay: config.maxCollisionsPerDay,
-    maxCollisionsTotal: config.maxCollisionsTotal,
-    reducedVisibility: config.optionalRules.reducedVisibility,
-    employeeRotation: config.optionalRules.employeeRotation,
-    emergencyToolbox: config.optionalRules.emergencyToolbox,
-    discardTimetabled: rules.discardTimetabled,
-  };
-}
-
-/** Which controls differ from a named type — what the form paints amber and counts in its summary. */
-export function differencesFrom(
-  name: PresetName,
-  settings: Settings,
-  players: number,
-  days: number,
-): (keyof Settings)[] {
-  const want = presetSettings(name, players, days);
-  return SETTING_KEYS.filter((k) => settings[k] !== want[k]);
-}
-
-/**
- * WHICH TYPE IS THIS, derived rather than stored.
- *
- * Nothing writes a type name into `GameConfig` — a saved game is its numbers, and a name in the save
- * would be one more thing that can disagree with them. So the screens ask this instead, which means
- * a hand-tuned game that happens to match Competitive exactly reads as Competitive, and that is the
- * honest answer: it IS one.
- *
- * `mode` is part of the comparison, so a Co-op game whose dials happen to equal Competitive's is
- * still not Competitive.
- */
-export function presetOf(config: GameConfig, players: number, days: number): GameType {
-  const settings = settingsOf(config);
-  const match = PRESETS.find(
-    (p) => p.scoring === config.mode && differencesFrom(p.name, settings, players, days).length === 0,
-  );
-  return match?.name ?? 'custom';
-}
-
-/**
- * A `Frame`'s copy of the config, as a `GameConfig` the functions above can read.
- *
- * The page has a Frame, never a `GameState` — a remote client holds no game — and the Frame carries
- * every field these comparisons need. Structurally typed rather than importing `Frame` so this
- * module stays free of `sim/view.ts`.
- */
-export function configFromFrame(f: {
-  mode: GameMode;
-  days: number;
-  minCombinedRevenue: number;
-  maxCollisionsPerDay: number;
-  maxCollisionsTotal: number;
-  optionalRules: GameConfig['optionalRules'];
-  houseRules: { startingHand: StartingHand; extraStart: ExtraStartRule; revenue: RevenueRules; discardTimetabled: boolean };
-}): GameConfig {
-  return {
-    mode: f.mode,
-    days: f.days,
-    minCombinedRevenue: f.minCombinedRevenue,
-    maxCollisionsPerDay: f.maxCollisionsPerDay,
-    maxCollisionsTotal: f.maxCollisionsTotal,
-    // Never shown from a Frame — the cards are unbuilt, and the type carries the answer.
-    pvpCardsAllowed: false,
-    optionalRules: f.optionalRules,
-    houseRules: {
-      startingHand: f.houseRules.startingHand,
-      extraStart: f.houseRules.extraStart,
-      // Carried like the rest: this path describes SOMEONE ELSE'S game to a joiner, so a setting
-      // dropped here shows them a rule the table is not playing (§6.2, Gitea#9).
-      discardTimetabled: f.houseRules.discardTimetabled,
-      revenue: f.houseRules.revenue,
-    },
-  };
-}
-
-/**
- * The named type a config is NEAREST to, for a screen that has to describe someone else's game.
- *
- * The create form always knows which type was clicked, so it compares against that. A join preview
- * and the seating screen do not — they are handed a finished config and nothing else — and "Custom"
- * on its own tells a player nothing about what they are joining. Comparing against the same-scoring
- * type with the fewest differences answers the question they actually have: how far from a normal
- * game is this, and which normal game?
- */
-export function closestPreset(
-  config: GameConfig,
-  players: number,
-  days: number,
-): { name: PresetName; differing: (keyof Settings)[] } {
-  const settings = settingsOf(config);
-  const candidates = PRESETS.filter((p) => p.scoring === config.mode);
-  const scored = (candidates.length > 0 ? candidates : PRESETS).map((p) => ({
-    name: p.name,
-    differing: differencesFrom(p.name, settings, players, days),
-  }));
-  return scored.reduce((best, c) => (c.differing.length < best.differing.length ? c : best));
-}
-
-/**
- * The label a screen shows for the current state of the form — including what a Custom game is being
- * scored as, which is the one thing a player cannot see from the dials.
- */
-export function gameTypeLabel(type: GameType, scoring: GameMode): string {
-  if (type !== 'custom') return preset(type).label;
-  const named = PRESETS.find((p) => p.scoring === scoring && p.name !== 'cutthroat');
-  return `Custom — scored as ${named?.label ?? scoring}`;
-}
-
-/** Assembles the config a form's answers describe. `players` reaches the caller separately: it sizes
- * the lobby's seat array rather than being part of the rules. */
-export function configFromSettings(
-  settings: Settings,
-  scoring: GameMode,
-  days: number,
-  pvpCards: boolean,
-): GameConfig {
-  return {
-    mode: scoring,
-    days,
-    minCombinedRevenue: settings.minCombinedRevenue,
-    maxCollisionsPerDay: settings.maxCollisionsPerDay,
-    maxCollisionsTotal: settings.maxCollisionsTotal,
-    // Inert until the cards are built (`setup.ts`'s `buildDeck` ANDs it with `cardsImplemented`),
-    // and no longer a control on any screen — it is a property of the game type.
-    pvpCardsAllowed: pvpCards,
-    optionalRules: {
-      reducedVisibility: settings.reducedVisibility,
-      employeeRotation: settings.employeeRotation,
-      emergencyToolbox: settings.emergencyToolbox,
-    },
-    houseRules: {
-      startingHand: settings.startingHand,
-      extraStart: settings.extraStart,
-      discardTimetabled: settings.discardTimetabled,
-      revenue: {
-        passengerPerCoach: settings.passengerPerCoach,
-        freightPerLoad: settings.freightPerLoad,
-        trainPerTransit: settings.trainPerTransit,
-      },
-    },
-  };
-}
-
-/** The whole config a named type produces, with nothing edited. */
-export function configFromPreset(name: PresetName, players: number, days: number): GameConfig {
-  const p = preset(name);
-  return configFromSettings(presetSettings(name, players, days), p.scoring, days, p.pvpCards);
-}

src/web/replays.ts

@@ -26,7 +26,6 @@ import { createGame } from '../engine/setup.ts';
 import { snapshot } from '../sim/view.ts';
 import type { Intent } from '../engine/intents.ts';
 import { SOLO_CONFIG } from './game.ts';
-import { actingPlayer } from '../engine/state.ts';
 
 type Save = { seed: number; history: Intent[] };
 type Entry = { file: string; title: string; note?: string; seed?: number };
@@ -56,12 +55,7 @@ type Step = {
 function rebuild(save: Save): { steps: Step[]; stoppedEarly: boolean } {
   const s = createGame({ id: `replay-${save.seed}`, seed: save.seed, config: SOLO_CONFIG, playerNames: ['player'] });
   const steps: Step[] = [];
-  const ctx = {
-    cardName: (id: string) => cardName(s, id),
-    trainName: (id: string) => trainName(s, id),
-    // A player index is not a seat index, so the fallback names no number at all — see `game.ts`.
-    playerName: (p: number) => s.players[p]?.name ?? 'another player',
-  };
+  const ctx = { cardName: (id: string) => cardName(s, id), trainName: (id: string) => trainName(s, id) };
   const push = (events: ReturnType<typeof pump>): void => {
     const lines = events
       .filter((e) => e.type !== 'actorChanged')
@@ -75,7 +69,7 @@ function rebuild(save: Save): { steps: Step[]; stoppedEarly: boolean } {
   push(pump(s));
   let stoppedEarly = false;
   for (const intent of save.history) {
-    const actor = actingPlayer(s);
+    const actor = s.clock.pendingDecision !== null ? s.clock.superintendent : s.clock.currentActor;
     if (actor === null || s.status !== 'active') break;
     const r = applyIntent(s, actor, intent);
     if (!r.ok) {
@@ -123,10 +117,7 @@ function show(i: number): void {
   // A replay carries the seat names in the frame's own lines rather than a player table, so the
   // solitaire seat is named directly; a multi-player replay reports the index it has.
   const actorName = f.actor === null ? null : `Player ${f.actor + 1}`;
-  // A replay of a multi-player game gets the Fedora too — it is the answer to "why is it asking
-  // THEM", which a replay raises exactly as a live game does.
-  const superName = f.players.length > 1 ? `Player ${f.superintendent + 1}` : null;
-  $('turnchart').innerHTML = turnChartHtml(f, actorName, superName);
+  $('turnchart').innerHTML = turnChartHtml(f, actorName);
   $('vrev').textContent = String(f.revenue);
   $('vpos').textContent = `${at} / ${steps.length - 1}`;
   ($('vscrub') as HTMLInputElement).value = String(at);

src/web/session.ts

@@ -16,22 +16,18 @@
  */
 
 import type { Intent } from '../engine/intents.ts';
-import type { Frame, PublicFrame } from '../sim/view.ts';
-import { publicSnapshot } from '../sim/view.ts';
-import { takeSteps } from '../sim/display-step.ts';
-import type { DisplayStep } from '../sim/display-step.ts';
+import type { Frame } from '../sim/view.ts';
 import type { PlayerIndex } from '../engine/state.ts';
-import { applyDelta } from '../sim/frame-delta.ts';
-import type { FrameDelta } from '../sim/frame-delta.ts';
-import type { Game, Menu, NewGameOptions, Save } from './game.ts';
+import type { HouseRuleOverrides } from '../engine/content.ts';
+import type { Game, Menu, Save } from './game.ts';
 import {
   actionMenu,
   configWith,
   currentActor,
   fromSave,
   handPlayable,
-  isOutOfTurn,
   newGame,
+  overHandLimit,
   submit,
   toSave,
   undo,
@@ -60,6 +56,8 @@ export type Session = {
   seat(): PlayerIndex;
   /** Whose turn it is, or null when the game is over or waiting on nothing. */
   actor(): PlayerIndex | null;
+  /** True when the hand is over §6.2's limit and the turn cannot be ended. */
+  overHandLimit(): boolean;
   /** Which cards in hand are playable right now, in hand order. */
   handPlayable(): boolean[];
   /**
@@ -94,51 +92,6 @@ export type Session = {
   takeAnnouncement(): string | null;
   /** The card most recently drawn into this seat's hand. Persists until another draw replaces it. */
   justDrawn(): string | null;
-  /**
-   * Which OTHER seats are currently connected, as last reported by the server — always empty for a
-   * `LocalSession` (there is nobody else to track). `lobby-and-sessions.md` §5: a disconnect keeps
-   * the seat and waits; this is what lets the page say why, instead of going quiet with no
-   * explanation. Reflects the last presence push for each seat the server has ever mentioned, not
-   * only the ones currently disconnected — a seat that reconnects updates its own entry rather than
-   * disappearing.
-   *
-   * `seen` is what separates the two absences the page must not conflate: a seat that has connected
-   * at some point and dropped, against one that has never opened the game at all. The server now
-   * reports every other seat on connect (2026-08-23), so this is answerable at the moment a game
-   * starts — which is exactly when "is everyone here?" is the question.
-   */
-  presence(): { seat: PlayerIndex; connected: boolean; seen: boolean }[];
-  /**
-   * ORDERED PRESENTATION STEPS — v0.8.0, TODO #13. What everyone else did, in order, so it can be
-   * WATCHED rather than discovered.
-   *
-   * On the interface rather than on `LocalSession`, which is the whole point: solitaire drains its
-   * own collector and a remote session reads the same steps off `Push.steps`, so the page animates
-   * one queue and cannot tell which it has. That is what makes TODO #18 (solitaire's phases flying
-   * past) and TODO #13 (multiplayer's invisible turns) the same code path.
-   *
-   * NOT `steps()` — `LocalSession.steps()` already exists and counts submitted intents for the Undo
-   * button. Different thing entirely, hence the longer name.
-   */
-  takeDisplaySteps(): DisplayStep[];
-  /**
-   * A public frame to start the queue from, once — draining, and non-null only when the queue must
-   * be RESET rather than advanced.
-   *
-   * Steps carry deltas against a chain, so a client with no baseline cannot merge the next one. That
-   * happens on a first connect, on a reconnect, and locally after an undo or a restore — all of
-   * which rebuild from scratch. A reset means "throw away what is queued and draw this".
-   */
-  takeDisplayReset(): PublicFrame | null;
-  /**
-   * Stop listening, for good.
-   *
-   * Only a remote session has anything to close, and only one caller needs it: a player LEAVING a
-   * running game (2026-08-23). Without it the page went back to the lobby with its `EventSource`
-   * still open, so the server — and therefore every other seat — went on reporting them as present
-   * at a table they had walked away from.
-   */
-  close?(): void;
 };
 
 /**
@@ -162,20 +115,14 @@ export type LocalSession = Session & {
  * `Game` is mutated in place by `submit`, so the wrapper keeps a mutable reference rather than
  * copying — `undo` and `restore` replace the whole game, which is why `game` is a getter.
  *
- * It takes `NewGameOptions` rather than a whole `GameConfig` because DEALING is the only thing on the
- * far side of this that the page is allowed to decide. A config carries the mode and the optional
- * rules — table settings a lobby owns — and handing main.ts a `GameConfig` to build meant importing
- * the engine's own defaults into the page, which is the boundary `session.test.ts` guards. The seed,
- * the house rules and the victory-condition dials are what a player picks when they press New game.
+ * It takes `rules` rather than a whole `GameConfig` because DEALING is the only thing on the far
+ * side of this that the page is allowed to decide. A config carries the mode, the victory condition
+ * and the optional rules — table settings a lobby owns — and handing main.ts a `GameConfig` to build
+ * meant importing the engine's own defaults into the page, which is the boundary `session.test.ts`
+ * guards. The seed and the house rules are the two things a player picks when they press New game.
  */
-export function createLocalSession(seed: number, options?: NewGameOptions): LocalSession {
-  let game: Game = options ? newGame(seed, configWith(options)) : newGame(seed);
-  /**
-   * The baseline the step queue starts from. Set here, and again whenever the game is REPLACED —
-   * `undo` and `restore` rebuild by replaying history, which (by design) collects no steps, so the
-   * queue has to be told to start over rather than left holding a chain that no longer continues.
-   */
-  let pendingReset: PublicFrame | null = publicSnapshot(game.state);
+export function createLocalSession(seed: number, rules?: HouseRuleOverrides): LocalSession {
+  let game: Game = rules ? newGame(seed, configWith(rules)) : newGame(seed);
   const listeners = new Set<() => void>();
   const changed = (): void => {
     for (const fn of [...listeners]) fn();
@@ -189,11 +136,10 @@ export function createLocalSession(seed: number, options?: NewGameOptions): Loca
     menu: () => actionMenu(game),
     seat: () => 0,
     actor: () => currentActor(game),
+    overHandLimit: () => overHandLimit(game),
     handPlayable: () => handPlayable(game),
     submit: async (intent: Intent) => {
-      // Seat 0 is the solitaire player, and the extension vote (Gitea#11) is the one intent that
-      // arrives when `currentActor` is null — so it has to name its seat. See `isOutOfTurn`.
-      const ok = submit(game, intent, isOutOfTurn(intent) ? 0 : null);
+      const ok = submit(game, intent);
       if (ok) changed();
       return ok;
     },
@@ -216,15 +162,6 @@ export function createLocalSession(seed: number, options?: NewGameOptions): Loca
       return text;
     },
     justDrawn: () => game.justDrawn,
-    presence: () => [],
-    // Solitaire's own steps, from the same collector `submit()` fills for every seat of a
-    // multiplayer game. No separate code path — see `sim/display-step.ts`.
-    takeDisplaySteps: () => takeSteps(game.display),
-    takeDisplayReset: () => {
-      const reset = pendingReset;
-      pendingReset = null;
-      return reset;
-    },
 
     seed: () => game.seed,
     save: () => toSave(game),
@@ -238,8 +175,6 @@ export function createLocalSession(seed: number, options?: NewGameOptions): Loca
       back.scheduled = null;
       back.justDrawn = null;
       back.announced = null;
-      // The rebuilt game has an empty collector and a chain that starts over, so the queue must too.
-      pendingReset = publicSnapshot(back.state);
       changed();
       return true;
     },
@@ -248,210 +183,7 @@ export function createLocalSession(seed: number, options?: NewGameOptions): Loca
       // Restoring replays the whole history and re-records every draw; none of it is news.
       game.justDrawn = null;
       game.announced = null;
-      pendingReset = publicSnapshot(game.state);
       changed();
     },
   };
 }
-
-/** The push envelope `src/server/session.ts` sends over SSE — mirrored here rather than imported,
- * so this file never depends on anything under `src/server/` even at the type level. */
-type Push = {
-  frame?: FrameDelta;
-  menu: Menu | null;
-  lines: { text: string; tone: string }[];
-  /** One entry for a change; every other seat at once on the connect push. */
-  presence?: { seat: PlayerIndex; connected: boolean; seen: boolean }[];
-  /** Ordered presentation steps — v0.8.0, identical in every seat's push because they are public. */
-  steps?: DisplayStep[];
-  /** The baseline for the step queue, sent on a connect only. */
-  publicReset?: PublicFrame;
-  /**
-   * THE FOUR TRANSIENT SIGNALS, added 2026-08-23.
-   *
-   * A remote session used to return nothing for any of them, so multiplayer had no sound at all, no
-   * timetable flash when the D12 filled a slot, no announcement when a completed run paid the table,
-   * and no highlight on the card you had just drawn — four things solitaire has had all along, and
-   * most of why a multiplayer game felt inert.
-   *
-   * `cues` and `announcement` are SHARED events (a collision anywhere, the Stage bell, a train
-   * leaving the Division) and reach every seat; `justDrawn` is the recipient's own card and nobody
-   * else's — `test/redaction.test.ts` covers exactly that.
-   */
-  cues?: string[];
-  scheduled?: number | null;
-  announcement?: string | null;
-  justDrawn?: string | null;
-};
-
-/**
- * A session backed by a server (Phase 2, extended Phase 4). Holds no authoritative state — no deck
- * order, no other seat's hand — only the last `Frame`/`Menu` a push actually told it. `capabilities`
- * are all `false`: undo would have to un-see what other players already saw, a local save is
- * meaningless when the server is the store, and dealing a new game is the lobby's job.
- *
- * `token` is `lobby-and-sessions.md` §1's session token, issued at `Lobby.Create`/`Lobby.Join` and
- * stored by the caller (`main.ts`, in `localStorage`) — it alone proves identity to `/api/stream`
- * and `/api/intent`, so this function no longer takes a join secret at all; that gate belongs to
- * the lobby endpoints only. `seat` still has to be passed in rather than learned from a push,
- * because the very FIRST thing this session needs — `seat()` — has to answer before any push has
- * necessarily arrived; the caller already knows it from the join/create/start response.
- *
- * Construction is synchronous (the `Session` interface has no async surface), but the first real
- * `Frame` only exists once the SSE connection's first push arrives — `main.ts` accounts for this by
- * not rendering until `subscribe`'s callback fires at least once for a session whose `capabilities`
- * are all `false` (a `LocalSession` always has data the instant it is constructed; this does not).
- */
-export function createRemoteSession(
-  token: string,
-  seat: PlayerIndex,
-  /**
-   * Called once when this session's game is established to be gone for good, so the page can stop
-   * waiting for it. Without this the only symptom is a blank screen: `EventSource` retries a 404
-   * forever and reports nothing, and `frame` never becomes non-null.
-   */
-  onGone?: () => void,
-): Session {
-  let frame: Frame | null = null;
-  let menu: Menu | null = null;
-  let lines: { text: string; tone: string }[] = [];
-  const presence = new Map<PlayerIndex, { connected: boolean; seen: boolean }>();
-  let displaySteps: DisplayStep[] = [];
-  let displayReset: PublicFrame | null = null;
-  let cues: string[] = [];
-  let scheduled: number | null = null;
-  let announcement: string | null = null;
-  let justDrawnCard: string | null = null;
-  let nextSeq = 1;
-  const listeners = new Set<() => void>();
-  const changed = (): void => {
-    for (const fn of [...listeners]) fn();
-  };
-
-  const qs = `token=${encodeURIComponent(token)}`;
-  const source = new EventSource(`/api/stream?${qs}`);
-
-  /**
-   * A DROPPED CONNECTION AND A DEAD GAME LOOK IDENTICAL HERE, so ask before giving up.
-   *
-   * `EventSource` fires `error` for both a transient blip — which it recovers from by itself, and
-   * which is the expected shape of a game that sits idle for minutes (multiplayer.md §9) — and a
-   * 404 it will nonetheless retry forever. It exposes no status code either way. `/api/session` is
-   * the cheap question that separates them: only a definite 404 closes the stream and reports the
-   * game gone, so a flaky network still self-heals.
-   */
-  let reportedGone = false;
-  source.onerror = () => {
-    if (reportedGone) return;
-    void fetch(`/api/session?${qs}`)
-      .then((r) => {
-        if (r.status !== 404 || reportedGone) return;
-        reportedGone = true;
-        source.close();
-        onGone?.();
-      })
-      .catch(() => {
-        // The probe itself failed, so this says nothing about the game — leave the retry running.
-      });
-  };
-  source.onmessage = (ev: MessageEvent<string>) => {
-    const push = JSON.parse(ev.data) as Push;
-    // A presence-only push (no `frame`) carries `menu: null` too, but that is not news about this
-    // seat's turn — only a push that actually came from the game (always carries a real `frame`,
-    // per `session.ts`'s `Push`) updates the board or the menu.
-    if (push.frame) {
-      frame = applyDelta(frame, push.frame);
-      menu = push.menu;
-    }
-    lines = [...lines, ...push.lines];
-    for (const p of push.presence ?? []) presence.set(p.seat, { connected: p.connected, seen: p.seen });
-    // Accumulated rather than replaced: two pushes can arrive between two renders, and a cue that
-    // was earned is a cue that should be heard.
-    if (push.cues) cues = [...cues, ...push.cues];
-    if (push.scheduled !== undefined && push.scheduled !== null) scheduled = push.scheduled;
-    if (push.announcement !== undefined && push.announcement !== null) announcement = push.announcement;
-    // Persists until another draw replaces it, matching the local session's own `justDrawn`.
-    if (push.justDrawn !== undefined) justDrawnCard = push.justDrawn;
-    /**
-     * A RESET DISCARDS WHAT WAS QUEUED, rather than arriving alongside it.
-     *
-     * `publicReset` comes on a connect, which is also a RECONNECT — and a reconnecting client's
-     * queue holds steps whose deltas chain off a baseline the server has since moved past. Merging
-     * them onto the new baseline would draw a board that never existed. The history panel is what
-     * carries what was missed; the animation does not replay it (§ v0.8.0).
-     */
-    if (push.publicReset) {
-      displayReset = push.publicReset;
-      displaySteps = [];
-    }
-    // Accumulated, like cues: two pushes can land between two renders and every step is one thing
-    // that happened.
-    if (push.steps) displaySteps = [...displaySteps, ...push.steps];
-    changed();
-  };
-
-  const need = (): Frame => {
-    if (frame === null) throw new Error('RemoteSession.view() called before the first Frame arrived');
-    return frame;
-  };
-
-  return {
-    view: need,
-    menu: () => menu ?? { options: [], direct: [], placeable: [], hand: [], makeUp: null },
-    seat: () => seat,
-    actor: () => need().actor,
-    handPlayable: () => (menu?.hand ?? []).map((h) => h.playNow !== null),
-    async submit(intent: Intent): Promise<boolean> {
-      const seq = nextSeq++;
-      const res = await fetch(`/api/intent?${qs}`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ seq, intent }),
-      });
-      const result = (await res.json()) as { ok: boolean; code?: string };
-      // The visible update arrives via the SSE push (broadcast to every seat, including this one),
-      // not from this response — this only reports whether the rules accepted it.
-      return result.ok;
-    },
-    subscribe(fn: () => void) {
-      listeners.add(fn);
-      return () => listeners.delete(fn);
-    },
-    capabilities: { undo: false, saveLocal: false, newGame: false },
-
-    lines: () => lines,
-    // Draining, exactly as the local session's are: each of these marks a moment, so it plays once
-    // and is gone by the next render rather than re-firing on every redraw.
-    takeCues: () => {
-      const out = cues;
-      cues = [];
-      return out;
-    },
-    takeScheduled: () => {
-      const out = scheduled;
-      scheduled = null;
-      return out;
-    },
-    takeAnnouncement: () => {
-      const out = announcement;
-      announcement = null;
-      return out;
-    },
-    justDrawn: () => justDrawnCard,
-    presence: () => [...presence].map(([seat, p]) => ({ seat, connected: p.connected, seen: p.seen })),
-    takeDisplaySteps: () => displaySteps.splice(0, displaySteps.length),
-    takeDisplayReset: () => {
-      const reset = displayReset;
-      displayReset = null;
-      return reset;
-    },
-    close() {
-      // `reportedGone` first: closing the stream fires `onerror`, and this is a deliberate exit, not
-      // a game that vanished — `onGone` must not be called and land the page in "that game is no
-      // longer on this server".
-      reportedGone = true;
-      source.close();
-      listeners.clear();
-    },
-  };
-}

src/web/settings-form.ts

@@ -1,358 +0,0 @@
-/**
- * THE RULES BLOCK, driven identically on both screens.
- *
- * The lobby (`lobby.ts`) and the solitaire New Game dialog (`main.ts`) ask the same twelve questions.
- * They used to ask them in two hand-written copies and had already drifted — the dialog had "where
- * an Extra may start" and no optional rules, the lobby the reverse — so this module owns reading,
- * writing, comparing and annotating the block, and each screen supplies only the id prefix its
- * markup uses (`lb-` or `ng-`).
- *
- * THE MARKUP ITSELF STAYS STATIC IN `play.html`, deliberately. Generating it here would be less
- * duplication, but `test/web.test.ts` drives the emitted bundle against a hand-built DOM stub with
- * no HTML parser in it (there is no jsdom in this project, and adding one to test a form is a poor
- * trade), and the ids in that stub come from scanning the real `play.html`. A test in the same suite
- * asserts both screens carry every key below, which is the drift guard the shared markup would have
- * been.
- */
-
-import { REVENUE_MAX, REVENUE_MIN } from '../engine/content.ts';
-import type { ExtraStartRule, StartingHand } from '../engine/content.ts';
-import { closestPreset, differencesFrom, presetOf, presetSettings, settingsOf } from './presets.ts';
-import type { PresetName, Settings } from './presets.ts';
-import type { GameConfig } from '../engine/state.ts';
-
-/**
- * How each rule is asked on screen.
- *
- * `gated` is the pair introduced 2026-08-23: a checkbox that says whether the condition applies at
- * all, plus the number it applies at. The engine's convention is that `0` switches these off, which
- * is exact but unreadable — a Cutthroat game showed two zeroes and left the player to know the
- * convention. Unchecked still WRITES 0, so nothing under this changed.
- */
-type Field =
-  | { key: keyof Settings; kind: 'radio'; id: string }
-  | { key: keyof Settings; kind: 'number'; id: string }
-  | { key: keyof Settings; kind: 'checkbox'; id: string }
-  | { key: keyof Settings; kind: 'gated'; id: string };
-
-export const FIELDS: readonly Field[] = [
-  { key: 'startingHand', kind: 'radio', id: 'hand' },
-  { key: 'extraStart', kind: 'radio', id: 'extra' },
-  { key: 'passengerPerCoach', kind: 'number', id: 'passenger' },
-  { key: 'freightPerLoad', kind: 'number', id: 'freight' },
-  { key: 'trainPerTransit', kind: 'number', id: 'transit' },
-  { key: 'minCombinedRevenue', kind: 'gated', id: 'minrev' },
-  { key: 'maxCollisionsPerDay', kind: 'gated', id: 'colday' },
-  { key: 'maxCollisionsTotal', kind: 'gated', id: 'coltotal' },
-  { key: 'reducedVisibility', kind: 'checkbox', id: 'visibility' },
-  { key: 'employeeRotation', kind: 'checkbox', id: 'rotation' },
-  { key: 'emergencyToolbox', kind: 'checkbox', id: 'toolbox' },
-  { key: 'discardTimetabled', kind: 'checkbox', id: 'tossloco' },
-];
-
-/**
- * What `play.html` must contain for a screen to be able to ask all twelve questions — the exact
- * attribute text, so `test/web.test.ts` can assert it against the built page.
- *
- * THIS IS THE DRIFT GUARD. The two blocks are generated from one template today; this is what says
- * so tomorrow, when someone edits one of them by hand.
- */
-export function fieldSelectors(prefix: string): string[] {
-  const out: string[] = [];
-  for (const f of FIELDS) {
-    // A radio group is addressed by NAME — there is no one element carrying the field's id.
-    out.push(f.kind === 'radio' ? `name="${prefix}${f.id}"` : `id="${prefix}${f.id}"`);
-    if (f.kind === 'gated') out.push(`id="${prefix}${f.id}-on"`);
-    out.push(`id="${prefix}${f.id}-row"`, `id="${prefix}${f.id}-hint"`);
-  }
-  return out;
-}
-
-/** The label each field goes under in the read-only view below. */
-const FIELD_LABELS: Record<keyof Settings, string> = {
-  startingHand: 'Starting hand',
-  extraStart: 'An Extra may start at',
-  discardTimetabled: 'A Timetabled train may be discarded',
-  passengerPerCoach: 'Passenger per coach',
-  freightPerLoad: 'Freight per load',
-  trainPerTransit: 'Train per transit',
-  minCombinedRevenue: 'Combined Revenue floor',
-  maxCollisionsPerDay: 'Collisions in one Day',
-  maxCollisionsTotal: 'Collisions in the game',
-  reducedVisibility: 'Reduced Visibility',
-  employeeRotation: 'Employee Rotation',
-  emergencyToolbox: 'Emergency Toolbox',
-};
-
-const esc = (s: string): string =>
-  s.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
-
-/**
- * THE WHOLE RULE SET, READ-ONLY — what a player weighing a join reads before taking a seat, and what
- * the seating screen keeps showing afterwards.
- *
- * Generated rather than a fourth copy of the form: nobody may change these, so form controls would
- * be a lie, and a `<dl>` says "this is what you are joining" in a third of the space. Fields that
- * differ from the nearest named type are amber here for the same reason they are amber in the form —
- * a non-standard game should never be a surprise.
- */
-export function rulesListHtml(config: GameConfig, players: number, days: number): string {
-  const settings = settingsOf(config);
-  const type = presetOf(config, players, days);
-  const near = closestPreset(config, players, days);
-  const differing = type === 'custom' ? near.differing : [];
-
-  const rows = (keys: (keyof Settings)[]): string =>
-    keys
-      .map((k) => {
-        const changed = differing.includes(k) ? ' class="changed"' : '';
-        return `<dt>${esc(FIELD_LABELS[k])}</dt><dd${changed}>${esc(describe(k, settings[k]))}</dd>`;
-      })
-      .join('');
-
-  const head =
-    `<dl><dt>Players</dt><dd>${players}</dd><dt>Days</dt><dd>${days}</dd>` +
-    `<dt>Opponent-directed cards</dt><dd>not implemented yet</dd></dl>`;
-
-  return (
-    head +
-    `<h4>Opening</h4><dl>${rows(['startingHand', 'extraStart'])}</dl>` +
-    `<h4>Train cards</h4><dl>${rows(['discardTimetabled'])}</dl>` +
-    `<h4>Revenue</h4><dl>${rows(['passengerPerCoach', 'freightPerLoad', 'trainPerTransit'])}</dl>` +
-    `<h4>Victory conditions</h4><dl>${rows(['minCombinedRevenue', 'maxCollisionsPerDay', 'maxCollisionsTotal'])}</dl>` +
-    `<h4>Optional rules</h4><dl>${rows(['reducedVisibility', 'employeeRotation', 'emergencyToolbox'])}</dl>`
-  );
-}
-
-/** What a value looks like beside its label — "Co-op default: 75", "Co-op default: six random cards". */
-function describe(key: keyof Settings, value: Settings[keyof Settings]): string {
-  if (typeof value === 'boolean') return value ? 'on' : 'off';
-  if (key === 'startingHand') {
-    const words: Record<StartingHand, string> = {
-      threeRandom: 'three random',
-      sixRandom: 'six random',
-      threeTrackThreeOther: 'three track and three other',
-    };
-    return words[value as StartingHand];
-  }
-  if (key === 'extraStart') {
-    const words: Record<ExtraStartRule, string> = {
-      divisionPointsOnly: 'Division Points only',
-      ownOffice: 'your own Control Point',
-      anyOffice: 'any Control Point',
-    };
-    return words[value as ExtraStartRule];
-  }
-  // A victory condition at 0 is not "0" on screen, it is a condition that does not apply.
-  if (value === 0 && (key === 'minCombinedRevenue' || key === 'maxCollisionsPerDay' || key === 'maxCollisionsTotal')) {
-    return 'off';
-  }
-  return String(value);
-}
-
-export type SettingsForm = {
-  read(): Settings;
-  /** `suggestions` fills the placeholder of a switched-off condition, so ticking it back on has a
-   * number to offer rather than an empty box. */
-  write(values: Settings, suggestions: Settings): void;
-  /**
-   * Paint the block against a named type: every field that differs goes amber and every field gets
-   * its "<Type> default: x" hint. Returns what differs, for the summary line the screen draws.
-   */
-  mark(name: PresetName, players: number, days: number): (keyof Settings)[];
-  /** Custom with no named baseline to compare against — clears the paint rather than lying. */
-  clearMarks(): void;
-  /** Called whenever the player changes any rule; the screen answers by selecting Custom. */
-  onEdit(fn: (key: keyof Settings) => void): void;
-  /** Read-only for the join preview and the seating screen: shown in full, changeable by nobody. */
-  setEditable(on: boolean): void;
-  /** Employee Rotation is meaningless at one player — disabled with a note rather than hidden, so
-   * the two screens still read the same. */
-  setEmployeeRotationAvailable(on: boolean): void;
-};
-
-const $ = <T extends HTMLElement = HTMLElement>(id: string): T | null =>
-  document.getElementById(id) as T | null;
-
-export function settingsForm(prefix: string): SettingsForm {
-  const el = <T extends HTMLElement = HTMLElement>(id: string): T | null => $<T>(`${prefix}${id}`);
-  const radios = (name: string): HTMLInputElement[] =>
-    Array.from(document.querySelectorAll<HTMLInputElement>(`input[name="${prefix}${name}"]`));
-  const checkedRadio = (name: string): string | null =>
-    radios(name).find((r) => r.checked)?.value ?? null;
-
-  let editHandler: ((key: keyof Settings) => void) | null = null;
-  let editable = true;
-
-  function num(id: string, fallback: number): number {
-    const raw = el<HTMLInputElement>(id)?.value ?? '';
-    return raw.trim() === '' || !Number.isFinite(Number(raw)) ? fallback : Math.round(Number(raw));
-  }
-
-  function readGated(id: string): number {
-    // Unchecked IS zero — the engine's "off". The number in the box is kept so re-ticking restores it.
-    if (el<HTMLInputElement>(`${id}-on`)?.checked !== true) return 0;
-    return Math.max(0, num(id, 0));
-  }
-
-  function read(): Settings {
-    return {
-      startingHand: (checkedRadio('hand') ?? 'sixRandom') as StartingHand,
-      extraStart: (checkedRadio('extra') ?? 'anyOffice') as ExtraStartRule,
-      passengerPerCoach: clampRevenue(num('passenger', 1)),
-      freightPerLoad: clampRevenue(num('freight', 1)),
-      trainPerTransit: clampRevenue(num('transit', 0)),
-      minCombinedRevenue: readGated('minrev'),
-      maxCollisionsPerDay: readGated('colday'),
-      maxCollisionsTotal: readGated('coltotal'),
-      reducedVisibility: el<HTMLInputElement>('visibility')?.checked === true,
-      employeeRotation: el<HTMLInputElement>('rotation')?.checked === true,
-      emergencyToolbox: el<HTMLInputElement>('toolbox')?.checked === true,
-      discardTimetabled: el<HTMLInputElement>('tossloco')?.checked === true,
-    };
-  }
-
-  function write(values: Settings, suggestions: Settings): void {
-    for (const r of radios('hand')) r.checked = r.value === values.startingHand;
-    for (const r of radios('extra')) r.checked = r.value === values.extraStart;
-    setNumber('passenger', values.passengerPerCoach);
-    setNumber('freight', values.freightPerLoad);
-    setNumber('transit', values.trainPerTransit);
-    writeGated('minrev', values.minCombinedRevenue, suggestions.minCombinedRevenue);
-    writeGated('colday', values.maxCollisionsPerDay, suggestions.maxCollisionsPerDay);
-    writeGated('coltotal', values.maxCollisionsTotal, suggestions.maxCollisionsTotal);
-    setChecked('visibility', values.reducedVisibility);
-    setChecked('rotation', values.employeeRotation);
-    setChecked('toolbox', values.emergencyToolbox);
-    setChecked('tossloco', values.discardTimetabled);
-  }
-
-  function setNumber(id: string, value: number): void {
-    const input = el<HTMLInputElement>(id);
-    if (input) input.value = String(value);
-  }
-
-  function setChecked(id: string, on: boolean): void {
-    const input = el<HTMLInputElement>(id);
-    if (input) input.checked = on;
-  }
-
-  function writeGated(id: string, value: number, suggestion: number): void {
-    const box = el<HTMLInputElement>(`${id}-on`);
-    const input = el<HTMLInputElement>(id);
-    if (box) box.checked = value > 0;
-    if (input) {
-      // A switched-off condition shows an empty box with the suggestion as its placeholder, rather
-      // than a `0` the player has to decode.
-      input.value = value > 0 ? String(value) : '';
-      input.placeholder = String(suggestion);
-      input.disabled = !editable || value === 0;
-    }
-  }
-
-  function mark(name: PresetName, players: number, days: number): (keyof Settings)[] {
-    const want = presetSettings(name, players, days);
-    const differing = differencesFrom(name, read(), players, days);
-    const label = presetLabelOf(name);
-    for (const f of FIELDS) {
-      const row = el(`${f.id}-row`);
-      const hint = el(`${f.id}-hint`);
-      const off = differing.includes(f.key);
-      row?.classList.toggle('changed', off);
-      if (hint) hint.textContent = `${label} default: ${describe(f.key, want[f.key])}`;
-    }
-    return differing;
-  }
-
-  function clearMarks(): void {
-    for (const f of FIELDS) {
-      el(`${f.id}-row`)?.classList.remove('changed');
-      const hint = el(`${f.id}-hint`);
-      if (hint) hint.textContent = '';
-    }
-  }
-
-  function setEditable(on: boolean): void {
-    editable = on;
-    for (const f of FIELDS) {
-      if (f.kind === 'radio') {
-        for (const r of radios(f.id)) r.disabled = !on;
-        continue;
-      }
-      const input = el<HTMLInputElement>(f.id);
-      if (input) {
-        // A gated number stays disabled when its own condition is off, whatever the block's state.
-        const gatedOff = f.kind === 'gated' && el<HTMLInputElement>(`${f.id}-on`)?.checked !== true;
-        input.disabled = !on || gatedOff;
-      }
-      if (f.kind === 'gated') {
-        const box = el<HTMLInputElement>(`${f.id}-on`);
-        if (box) box.disabled = !on;
-      }
-    }
-  }
-
-  function setEmployeeRotationAvailable(on: boolean): void {
-    const input = el<HTMLInputElement>('rotation');
-    if (input) {
-      input.disabled = !on || !editable;
-      if (!on) input.checked = false;
-    }
-    el('rotation-row')?.classList.toggle('unavailable', !on);
-  }
-
-  /** One change handler for every control — the screens all answer it the same way (select Custom). */
-  for (const f of FIELDS) {
-    const fire = (): void => editHandler?.(f.key);
-    if (f.kind === 'radio') {
-      for (const r of radios(f.id)) r.onchange = fire;
-      continue;
-    }
-    const input = el<HTMLInputElement>(f.id);
-    if (input) {
-      input.oninput = fire;
-      input.onchange = fire;
-    }
-    if (f.kind === 'gated') {
-      const box = el<HTMLInputElement>(`${f.id}-on`);
-      if (box) {
-        box.onchange = () => {
-          const number = el<HTMLInputElement>(f.id);
-          if (number) {
-            number.disabled = !box.checked || !editable;
-            // Ticking a condition back on with an empty box takes the suggestion showing in it,
-            // so "on" never means "on, at zero".
-            if (box.checked && number.value.trim() === '') number.value = number.placeholder;
-          }
-          fire();
-        };
-      }
-    }
-  }
-
-  return {
-    read,
-    write,
-    mark,
-    clearMarks,
-    onEdit: (fn) => void (editHandler = fn),
-    setEditable,
-    setEmployeeRotationAvailable,
-  };
-}
-
-function clampRevenue(n: number): number {
-  return Math.max(REVENUE_MIN, Math.min(REVENUE_MAX, n));
-}
-
-/** Kept local rather than imported from `presets.ts`'s `preset()`, which would drag the whole table
- * in for one word — and this is the only place a hint needs it. */
-function presetLabelOf(name: PresetName): string {
-  const labels: Record<PresetName, string> = {
-    solitaire: 'Solitaire',
-    coop: 'Co-op',
-    competitive: 'Competitive',
-    cutthroat: 'Cutthroat',
-  };
-  return labels[name];
-}

src/web/splash.ts

@@ -26,69 +26,3 @@ if (heroImage && lightbox) {
     if (e instanceof KeyboardEvent && e.key === 'Escape') close();
   });
 }
-
-/**
- * Is a Station Master server actually behind this page?
- *
- * The same `dist/` ships two ways — served by `src/server/`, or uploaded as flat files with no
- * server at all (`scripts/deploy-web.ts`) — and the bundle is identical in both, so the only
- * honest way to answer is to ask. `/api/health` is the one route that exists to be failed.
- *
- * THE DOOR STARTS OPEN AND ONLY EVER CLOSES. Getting this wrong in the "no server" direction is
- * the bug this whole change exists to fix: a disabled door is invisible and leaves a player who
- * DOES have a server with no way in, and nothing on screen to explain it. Getting it wrong the
- * other way costs a click and a lobby that says it cannot reach a server — which is legible, and
- * recoverable. So a slow or flaky probe leaves the door alone; only a definite answer closes it.
- */
-/**
- * CARRY `?pace=` THROUGH THE DOORS — v0.8.0.3.
- *
- * Both doors are static hrefs that REPLACE the query string (`play.html?lobby`,
- * `play.html?solitaire`), so a `pace` typed on this page was silently dropped on the way in: Jesse
- * played a whole game believing he was at 7× when the play page had only ever seen `?lobby`. The
- * durable answer is the speed control on the play screen, which persists per viewer — this keeps the
- * URL lever honest for handing two playtesters different speeds, which is the only thing it was ever
- * for.
- */
-try {
-  const pace = new URLSearchParams(location.search).get('pace');
-  if (pace !== null) {
-    for (const door of Array.from(document.querySelectorAll('a.door'))) {
-      const href = door.getAttribute('href');
-      // Only the doors into the game, and only ones that have not been disabled above.
-      if (href?.startsWith('./play.html?')) door.setAttribute('href', `${href}&pace=${encodeURIComponent(pace)}`);
-    }
-  }
-} catch {
-  // A door that keeps its own href is the status quo, not a broken page.
-}
-
-const mpDoor = document.getElementById('door-multiplayer');
-if (mpDoor) {
-  const close = (): void => {
-    mpDoor.classList.add('disabled');
-    mpDoor.removeAttribute('href');
-    const go = document.getElementById('door-multiplayer-go');
-    if (go) go.textContent = 'Requires a Station Master server';
-    const blurb = document.getElementById('door-multiplayer-blurb');
-    if (blurb) {
-      blurb.textContent =
-        'Play with your friends across the internet, each running your own office area within the ' +
-        'entire division. This copy of the game is a plain website with no server behind it, so ' +
-        'there is nowhere to host a table — multiplayer needs a Station Master server.';
-    }
-  };
-
-  // Relative, never absolute: the page must work at whatever address it is reached by, and the
-  // server is always the origin that served it (D16).
-  void fetch('./api/health')
-    .then((r) => (r.ok ? (r.json() as Promise<unknown>) : null))
-    .then((body) => {
-      // A static host that answers unknown paths with 200 and its own index page would sail past
-      // an `r.ok` check, so the body has to name itself before the door is believed.
-      const named =
-        typeof body === 'object' && body !== null && (body as { service?: unknown }).service === 'station-master';
-      if (!named) close();
-    })
-    .catch(() => close());
-}

src/web/step-queue.ts

@@ -1,260 +0,0 @@
-/**
- * THE ANIMATION QUEUE — v0.8.0, `docs/plans/jitsi-common-board.md` § v0.8.0 §§ 4-6.
- *
- * Holds the public board the screen is currently showing, which is not always the board the game is
- * actually on. Steps arrive faster than a person can follow — a bot's whole switching turn lands in
- * ONE push, because `driveBots()` plays it out before the push goes back — so this is what turns a
- * burst into something watchable. TODO #13.
- *
- * TRANSPORT-AGNOSTIC ON PURPOSE. It takes `DisplayStep`s and does not care whether they came from
- * the engine in this tab or off an SSE stream, which is what lets solitaire (#18: phases that are
- * never drawn) and multiplayer (#13: turns you never see) run one implementation. Nothing here
- * imports the DOM either, so it is testable without one.
- *
- * NO TIMERS OF ITS OWN. The caller drives it with `advance(now)` from whatever loop it already has
- * — a `requestAnimationFrame`, a test's fake clock. A queue that owned a `setInterval` would need
- * starting, stopping and cleaning up on every game replacement, and would be untestable without
- * faking timers.
- */
-
-import type { PublicFrame } from '../sim/view.ts';
-import type { DisplayStep } from '../sim/display-step.ts';
-import { applyPublicDelta, changedDivisionCards, changedPiles } from '../sim/public-delta.ts';
-import type { PileKey } from '../sim/public-delta.ts';
-import { dwellForStep } from '../sim/pacing.ts';
-
-export type StepQueue = {
-  /** Throw away what is queued and show this board — a first connect, a reconnect, an undo. */
-  reset(frame: PublicFrame): void;
-  /** Queue steps to be shown in order. */
-  push(steps: readonly DisplayStep[]): void;
-  /**
-   * Show as much as `now` allows. Returns true if the displayed board changed, so a caller can skip
-   * a redraw when nothing did.
-   */
-  advance(now: number): boolean;
-  /** Show everything immediately. Returns true if anything was skipped. */
-  skip(): boolean;
-  /** The board to draw, or null before any reset has arrived. */
-  current(): PublicFrame | null;
-  /**
-   * How many queued steps the player is still going to WATCH — the number the "N behind" counter
-   * shows. Not the queue length: see `watchableCount` in `sim/pacing.ts`.
-   */
-  behind(): number;
-  /** The last step actually shown, for the caption line (#15). Null before anything has been shown. */
-  showing(): DisplayStep | null;
-  /**
-   * The piles the step now on screen moved, for the display to light.
-   *
-   * Here because this is the only place that holds both the frame before a step and the frame after
-   * it — deriving it anywhere else would mean keeping a second copy of the board in step.
-   */
-  lit(): readonly PileKey[];
-  /** True while there is anything left to show. */
-  busy(): boolean;
-  /**
-   * How many narrated lines belong to steps NOT yet shown.
-   *
-   * The log and the board are two different moments while the queue is behind: a push carries its
-   * narration and its steps together, so every line of a bot's turn is in the history panel before the
-   * board has drawn a single move of it (playtest, 2026-09-15: *"is it possible to stall history so it
-   * stays in sync with the number behind?"*). Those lines are the TAIL of the log — they arrived last —
-   * so the caller holds back exactly this many and reveals each as its step goes up.
-   */
-  pendingLines(): number;
-  /** Division nodes whose card changed in the step now on screen, for the map to flash. */
-  flashing(): readonly number[];
-  /**
-   * HOLD THE PLAYBACK ON THE STEP NOW SHOWING — Jesse, playtest 2026-09-16, asking for a pause
-   * beside Skip.
-   *
-   * Skip is the only control the row has had, and it is one-way and total: the way to look harder at
-   * a move that just went past was to not be too slow about it. Pause is the opposite lever — the
-   * board stops where it is and nothing is consumed, so a player can read the caption, look at the
-   * district and then carry on from exactly that step.
-   *
-   * TAKES `now` BECAUSE THE QUEUE OWNS NO CLOCK (see the note at the top of this file). The dwell
-   * still owing is preserved across the hold rather than being spent while nobody was watching:
-   * `resume` pushes the deadline out by however long the pause lasted, so a step paused with 200ms
-   * left resumes with 200ms left instead of vanishing on the next frame.
-   *
-   * Returns false when there is nothing to hold, or nothing being held.
-   */
-  pause(now: number): boolean;
-  resume(now: number): boolean;
-  paused(): boolean;
-};
-
-/**
- * WHOSE MOVE THE SCREEN IS SHOWING (Gitea#25).
- *
- * The game and the board on screen are two different moments. The server plays every bot move the
- * instant a human's turn ends (`driveBots`), so the LIVE game is nearly always waiting on the human —
- * while this queue is still replaying the bots, step by step. The turn chart and the Division map's
- * move marker read the live actor, so a table of one person and three bots said "waiting on" that
- * person throughout, against a playback row naming the bot actually moving.
- *
- * While the queue is behind or still showing a step, the answer is that step's player — `null` for an
- * automatic phase, which is "the Division is running itself". Otherwise it is the live actor, and
- * `replaying` is false so a caller can keep live-only detail, such as a ruling the game is waiting on,
- * off a screen that has not caught up with it yet.
- */
-export function actorOnScreen(
-  queue: Pick<StepQueue, 'behind' | 'busy' | 'showing'>,
-  live: number | null,
-): { actor: number | null; replaying: boolean } {
-  if (queue.behind() === 0 && !queue.busy()) return { actor: live, replaying: false };
-  const shown = queue.showing();
-  return shown === null ? { actor: live, replaying: false } : { actor: shown.player, replaying: true };
-}
-
-/**
- * `pace` is read on every step rather than captured, so changing the setting takes effect at once.
- *
- * `viewer` says which seat is watching, so THIS PLAYER'S OWN MOVES COST NO TIME. They are already on
- * screen: a seated player's own board is drawn from their authoritative `Frame`, not from the queue,
- * so holding their click for a dwell shows them nothing and delays the thing they actually want to
- * watch — the 700ms before a bot's turn starts animating is 700ms of their own move being replayed
- * at them. The step is still APPLIED, because the delta chain runs through it.
- *
- * Automatic phases have no player and are unaffected, which is what keeps TODO #18 working in
- * solitaire where every intent is the viewer's own.
- */
-export function createStepQueue(
-  pace: () => number = () => 1,
-  viewer: () => number | null = () => null,
-): StepQueue {
-  let shown: PublicFrame | null = null;
-  let last: DisplayStep | null = null;
-  let litPiles: readonly PileKey[] = [];
-  let flashedCards: readonly number[] = [];
-  let pending: DisplayStep[] = [];
-  /** When the step now on screen is due to give way. Null when nothing is waiting. */
-  let dueAt: number | null = null;
-  /** When the player pressed Pause, so `resume` can give the current step back the time it had. */
-  let pausedAt: number | null = null;
-
-  /** How long this step holds the screen — zero for the viewer's own moves; see above. */
-  const dwell = (step: DisplayStep): number =>
-    step.player !== null && step.player === viewer() ? 0 : dwellForStep(step, pace());
-
-  /** Applies one step to the displayed board. A step's delta chains off the previous step's frame. */
-  const show = (step: DisplayStep): void => {
-    const before = shown;
-    shown = applyPublicDelta(shown, step.frame);
-    last = step;
-    /**
-     * NOT FOR YOUR OWN MOVES. You drew that card; you do not need the deck flashed at you. Same rule
-     * that gives your own steps no dwell — the display is for watching everybody else.
-     */
-    litPiles = step.player !== null && step.player === viewer() ? [] : changedPiles(before, shown);
-    // A Realignment changes the Division under everyone, so it is flashed for the player who did it
-    // too — unlike a pile, which only tells the drawer what they already know.
-    flashedCards = changedDivisionCards(before, shown);
-  };
-
-  return {
-    reset(frame) {
-      shown = frame;
-      pending = [];
-      dueAt = null;
-      // A reconnect, an undo or a fresh deal replaces the board outright; a hold on the playback that
-      // no longer exists would leave the row stuck reading "paused" with nothing behind it.
-      pausedAt = null;
-      // Nothing was watched arriving at this board, so nothing on it is lit.
-      litPiles = [];
-      flashedCards = [];
-      // `last` deliberately survives: a reconnect should not blank the caption line, and the
-      // sentence describing the most recent action is still true.
-    },
-
-    push(steps) {
-      pending.push(...steps);
-    },
-
-    advance(now) {
-      // Held. Nothing is shown and, crucially, nothing is CONSUMED — `dueAt` is left where it was
-      // and `resume` moves it, so the hold costs the current step none of its dwell.
-      if (pausedAt !== null) return false;
-      if (pending.length === 0) {
-        // The LAST step of a burst still owes its dwell. Clearing `dueAt` here reported the queue
-        // idle the instant that step was shown, which snapped the district panel home before anyone
-        // could look at it — see `busy()`.
-        if (dueAt !== null && now >= dueAt) dueAt = null;
-        return false;
-      }
-      // First step of a burst: show it immediately rather than waiting out a dwell for a board the
-      // player has not been shown yet.
-      if (dueAt === null) {
-        const first = pending.shift()!;
-        show(first);
-        dueAt = now + dwell(first);
-        return true;
-      }
-      let drew = false;
-      /**
-       * A LOOP, not a single step. A dwell of zero means "do not spend the player's attention on
-       * this" — bookkeeping, and phases where nothing happened (TODO #18) — so a run of them must
-       * collapse within one call instead of costing a frame each. The board still passes through
-       * every state in order; nobody is shown a state that never existed.
-       */
-      while (pending.length > 0 && now >= dueAt) {
-        const next = pending.shift()!;
-        show(next);
-        dueAt = dueAt + dwell(next);
-        drew = true;
-      }
-      if (pending.length === 0 && now >= dueAt) dueAt = null;
-      return drew;
-    },
-
-    skip() {
-      // Skipping while held is a decision to stop watching, so it also lifts the hold — otherwise the
-      // board would jump to the game and then sit there paused, with a Resume button that does nothing.
-      pausedAt = null;
-      if (pending.length === 0) return false;
-      for (const step of pending) show(step);
-      pending = [];
-      dueAt = null;
-      return true;
-    },
-
-    pause(now) {
-      if (pausedAt !== null) return false;
-      // Nothing on screen owes any time and nothing is queued: there is no playback to hold.
-      if (pending.length === 0 && dueAt === null) return false;
-      pausedAt = now;
-      return true;
-    },
-
-    resume(now) {
-      if (pausedAt === null) return false;
-      // Give the step on screen back exactly the dwell it was holding when the player pressed Pause.
-      if (dueAt !== null) dueAt += now - pausedAt;
-      pausedAt = null;
-      return true;
-    },
-
-    paused: () => pausedAt !== null,
-
-    current: () => shown,
-    behind: () => pending.filter((s) => dwell(s) > 0).length,
-    showing: () => last,
-    lit: () => litPiles,
-    /**
-     * STILL SHOWING SOMETHING, not just still holding something back.
-     *
-     * This was `pending.length > 0`, which went false the moment the last step of a burst was
-     * shown — so the animation loop stopped and the district panel snapped back to the viewer's own
-     * board without that step ever being visible. Reported from real play: "I briefly saw that it was
-     * the bot's office area, then their turn was done and it pointed back to my office area."
-     *
-     * `dueAt` is non-null exactly while the step on screen has time left, so the two together mean
-     * "there is more to come, or what is up has not had its moment yet".
-     */
-    pendingLines: () => pending.reduce((n, s) => n + s.lines.length, 0),
-    flashing: () => flashedCards,
-    busy: () => pending.length > 0 || dueAt !== null,
-  };
-}

test/advance.test.ts

@@ -7,9 +7,9 @@
 import { describe, it } from 'node:test';
 import assert from 'node:assert/strict';
 
-import { advance, badlyMadeUp, pump } from '../src/engine/advance.ts';
+import { advance, pump } from '../src/engine/advance.ts';
 import { applyIntent, areaOf, check, isBeingMadeUp } from '../src/engine/apply.ts';
-import { EXPEDITE_FAULT_PENALTY, HAND_LIMIT, MAX_CONSIST, STAGES_PER_DAY, TOTAL_ROLLING_STOCK } from '../src/engine/content.ts';
+import { EXPEDITE_FAULT_PENALTY, HAND_LIMIT, MAX_CONSIST, STAGES_PER_DAY, lengthProfile, TOTAL_ROLLING_STOCK } from '../src/engine/content.ts';
 import { legalActions } from '../src/engine/legal.ts';
 import { createGame } from '../src/engine/setup.ts';
 import { developerBot } from '../src/sim/bot.ts';
@@ -18,13 +18,11 @@ import { coordKey, railFacingOf } from '../src/engine/state.ts';
 
 const baseConfig = (over: Partial<GameConfig> = {}): GameConfig => ({
   mode: 'solitaire',
-  days: 3,
-  minCombinedRevenue: 0,
-  maxCollisionsPerDay: 0,
-  maxCollisionsTotal: 0,
-  pvpCardsAllowed: false,
+  victory: 'highestAfterDays',
+  length: 'short',
   optionalRules: {
     reducedVisibility: false,
+    sisterTrains: false,
     employeeRotation: false,
     emergencyToolbox: false,
   },
@@ -66,21 +64,6 @@ function playToCompletion(s: GameState, seed = 1, maxTurns = 20_000): PlayStats
     tally(pump(s));
     if (s.status === 'finished') break;
 
-    /**
-     * §3.3, EXTENDED PLAY (Gitea#11) — this harness plays the timetable it was dealt.
-     *
-     * It picks at random among legal options, and one of the two options here is "play another
-     * Day" — so left alone it would extend the game forever and terminate only on `maxTurns`. That
-     * is not a bug in the feature: a game genuinely does not end now until somebody says stop, and
-     * `developerBot` says stop for exactly this reason. Said explicitly here rather than folded
-     * into the random pick, because "how does this loop terminate" deserves an answer in the loop.
-     */
-    if (s.status === 'awaitingExtension') {
-      const r = applyIntent(s, 0, { type: 'game.extend', player: 0, agree: false });
-      assert.ok(r.ok, 'a solitaire player could not decline an extension');
-      break;
-    }
-
     const actor = s.clock.pendingDecision !== null ? s.clock.superintendent : s.clock.currentActor;
     if (actor === null) break;
 
@@ -344,75 +327,6 @@ describe('collisions are automatic (Gap 2)', () => {
     assert.ok(!s.trays.has(id), 'the train is removed');
   });
 
-  it('does not collide when a coach is legally parked at the Office (v0.5.0 §A.4 exception)', () => {
-    // A coach may now be set out at the Office (§A.4's carve-out). It must not become a hazard to
-    // the next train in — that would punish exactly the thing the rule was written to allow.
-    const s = game();
-    const area = s.officeAreas.get(0)!;
-    area.adOccupancy = []; // an A/D track is free — only the fouling check is under test
-    const officeCard = area.grid.get(coordKey(area.officeCoord))!;
-    officeCard.standing = [{ type: 'coach', loaded: false }];
-
-    const id = 'inbound';
-    s.trays.set(id, {
-      id,
-      trainNumber: 2,
-      trainIsExtra: false,
-      engineAt: 0,
-      consist: [{ type: 'coach', loaded: true }],
-      direction: 'east',
-      position: { at: 'mainline', index: 1 },
-      movesUsed: 0,
-    });
-    const ml = s.division.nodes[1];
-    if (ml?.kind === 'mainline') {
-      ml.card = 'plains';
-      ml.transits.push({ tray: id, stagesRemaining: 1, stagesTotal: 1, direction: 'east' });
-    }
-
-    s.clock.phase = 'mainline';
-    s.movedThisPhase = new Set();
-    advance(s);
-
-    assert.equal(s.collisionsToday, 0, 'a legally parked coach is not a hazard to the next arrival');
-    assert.ok(s.trays.has(id), 'the train is not written off');
-  });
-
-  it('still collides when a non-coach car is left fouling the Office track', () => {
-    // Reachable only by poking state directly — `canDropCarsAt` already refuses every non-coach
-    // drop at the Office, so this backstops the collision check itself, not a state a legal game
-    // can reach.
-    const s = game();
-    const area = s.officeAreas.get(0)!;
-    area.adOccupancy = [];
-    const officeCard = area.grid.get(coordKey(area.officeCoord))!;
-    officeCard.standing = [{ type: 'boxcar', loaded: false }];
-
-    const id = 'inbound';
-    s.trays.set(id, {
-      id,
-      trainNumber: 2,
-      trainIsExtra: false,
-      engineAt: 0,
-      consist: [{ type: 'coach', loaded: true }],
-      direction: 'east',
-      position: { at: 'mainline', index: 1 },
-      movesUsed: 0,
-    });
-    const ml = s.division.nodes[1];
-    if (ml?.kind === 'mainline') {
-      ml.card = 'plains';
-      ml.transits.push({ tray: id, stagesRemaining: 1, stagesTotal: 1, direction: 'east' });
-    }
-
-    s.clock.phase = 'mainline';
-    s.movedThisPhase = new Set();
-    advance(s);
-
-    assert.equal(s.collisionsToday, 1);
-    assert.ok(!s.trays.has(id), 'the train is removed');
-  });
-
   it('returns cabooses to the Division Yard and other stock to Classification (Gap 2c)', () => {
     const s = game();
     s.officeAreas.get(0)!.adOccupancy = ['blocker'];
@@ -495,7 +409,7 @@ describe('the Superintendent clearance interrupt (§8.1)', () => {
     assert.equal(r.needsInput, true, 'the phase must stop and ask');
     assert.notEqual(s.clock.pendingDecision, null);
     assert.equal(s.clock.pendingDecision!.train, 'behind');
-    assert.equal((s.clock.pendingDecision as { occupiedBy: string }).occupiedBy, 'ahead');
+    assert.equal(s.clock.pendingDecision!.occupiedBy, 'ahead');
   });
 
   it('does not ask when the train ahead is coming the other way — that is an absolute bar', () => {
@@ -541,7 +455,7 @@ describe('the Superintendent clearance interrupt (§8.1)', () => {
   it('clears the decision once the Superintendent rules', () => {
     const s = game();
     s.clock.phase = 'mainline';
-    s.clock.pendingDecision = { kind: 'clearance', train: 'a', occupiedBy: 'b' };
+    s.clock.pendingDecision = { train: 'a', occupiedBy: 'b' };
     const r = applyIntent(s, 0, { type: 'mainline.clearance', allow: false });
     assert.ok(r.ok);
     assert.equal(s.clock.pendingDecision, null);
@@ -550,142 +464,39 @@ describe('the Superintendent clearance interrupt (§8.1)', () => {
 
 // ---------------------------------------------------------------------------
 
-describe('victory conditions (§3, Gap 10e) — unified 2026-08-20', () => {
-  it('loses a timed Solitaire game that misses minCombinedRevenue', () => {
-    // minCombinedRevenue doubles as a MINIMUM in Solitaire: below it you lose regardless of score.
-    const s = game(1, { minCombinedRevenue: 10 });
-    s.clock.day = s.config.days + 1;
+describe('victory conditions (§3, Gap 10e)', () => {
+  it('loses a timed Solitaire game that misses the target', () => {
+    // The target doubles as a MINIMUM in Solitaire: below it you lose regardless of score.
+    const s = game(1);
+    s.clock.day = lengthProfile('short').days + 1;
     s.clock.stage = STAGES_PER_DAY;
     s.clock.phase = 'shiftChange';
     s.players[0]!.revenue = 0;
     advance(s);
-    // PAUSES rather than finishes since Gitea#11: a days-based ending offers another Day, and the
-    // result is recorded either way. `official` is the frozen answer; `status` is only where play
-    // has got to. The two collision tests at the foot of this block are the contrast.
-    assert.equal(s.status, 'awaitingExtension');
-    assert.equal(s.outcome!.result, 'loss');
-    assert.equal(s.outcome!.reason, 'revenueFloor');
-    assert.equal(s.official!.outcome.reason, 'revenueFloor');
-  });
-
-  it('wins a timed Solitaire game that clears minCombinedRevenue', () => {
-    const s = game(1, { minCombinedRevenue: 10 });
-    s.clock.day = s.config.days + 1;
-    s.clock.stage = STAGES_PER_DAY;
-    s.clock.phase = 'shiftChange';
-    s.players[0]!.revenue = 10;
-    advance(s);
-    assert.equal(s.status, 'awaitingExtension');
-    assert.equal(s.outcome!.result, 'win');
-  });
-
-  it('minCombinedRevenue = 0 disables the floor — any score wins once days run out', () => {
-    const s = game(1, { minCombinedRevenue: 0 });
-    s.clock.day = s.config.days + 1;
-    s.clock.stage = STAGES_PER_DAY;
-    s.clock.phase = 'shiftChange';
-    s.players[0]!.revenue = 0;
-    advance(s);
-    assert.equal(s.status, 'awaitingExtension');
-    assert.equal(s.outcome!.result, 'win');
-  });
-
-  it('everyone loses in Competitive when the TABLE misses minCombinedRevenue, whoever scored best', () => {
-    const s = createGame({
-      id: 'g', seed: 2, config: baseConfig({ mode: 'competitive', minCombinedRevenue: 20 }),
-      playerNames: ['A', 'B'],
-    });
-    s.clock.day = s.config.days + 1;
-    s.clock.stage = STAGES_PER_DAY;
-    s.clock.phase = 'shiftChange';
-    s.players[0]!.revenue = 5; // best individual score...
-    s.players[1]!.revenue = 3; // ...but combined (8) still misses the floor (20).
-    advance(s);
-    assert.equal(s.status, 'awaitingExtension');
+    assert.equal(s.status, 'finished');
     assert.equal(s.outcome!.result, 'loss');
     assert.equal(s.outcome!.reason, 'revenueFloor');
   });
 
-  it('Co-op wins as one table score (summed Revenue), winner stays null', () => {
-    const s = createGame({
-      id: 'g', seed: 3, config: baseConfig({ mode: 'coop', minCombinedRevenue: 10 }),
-      playerNames: ['A', 'B'],
-    });
-    s.clock.day = s.config.days + 1;
+  it('wins a timed Solitaire game that clears the target', () => {
+    const s = game(1);
+    s.clock.day = lengthProfile('short').days + 1;
     s.clock.stage = STAGES_PER_DAY;
     s.clock.phase = 'shiftChange';
-    s.players[0]!.revenue = 4;
-    s.players[1]!.revenue = 6; // combined 10 clears the floor, neither alone would.
+    s.players[0]!.revenue = lengthProfile('short').target;
     advance(s);
-    assert.equal(s.status, 'awaitingExtension');
+    assert.equal(s.status, 'finished');
     assert.equal(s.outcome!.result, 'win');
-    assert.equal(s.outcome!.winner, null, 'Co-op names an individual winner instead of a shared one');
   });
 
-  it('ends immediately, mid-Stage, when collisions reach maxCollisionsPerDay', () => {
-    // Competitive/coop only, and immediate — not gated on the day boundary the way the revenue
-    // floor is. Stage 1, well short of STAGES_PER_DAY, proves it fires mid-day.
-    const s = game(1, { mode: 'competitive', maxCollisionsPerDay: 2 });
-    s.collisionsToday = 2;
-    s.clock.stage = 1;
+  it('ends a first-to-target game the moment the target is reached', () => {
+    const s = game(1, { victory: 'firstToTarget' });
+    s.players[0]!.revenue = lengthProfile('short').target;
+    s.clock.stage = STAGES_PER_DAY;
     s.clock.phase = 'shiftChange';
     advance(s);
     assert.equal(s.status, 'finished');
-    assert.equal(s.outcome!.result, 'loss');
-    assert.equal(s.outcome!.reason, 'collisionFloor');
-  });
-
-  it('ends immediately when the running total reaches maxCollisionsTotal, even under the per-day cap', () => {
-    const s = game(1, { mode: 'coop', maxCollisionsPerDay: 0, maxCollisionsTotal: 3 });
-    s.collisionsTotal = 3;
-    s.clock.stage = 1;
-    s.clock.phase = 'shiftChange';
-    advance(s);
-    assert.equal(s.status, 'finished');
-    assert.equal(s.outcome!.reason, 'collisionFloor');
-  });
-
-  it('maxCollisionsPerDay = 0 and maxCollisionsTotal = 0 disable the collision floor entirely', () => {
-    const s = game(1, { mode: 'competitive', maxCollisionsPerDay: 0, maxCollisionsTotal: 0 });
-    s.collisionsToday = 99;
-    s.collisionsTotal = 99;
-    s.clock.stage = 1;
-    s.clock.phase = 'shiftChange';
-    advance(s);
-    assert.notEqual(s.status, 'finished');
-  });
-
-  it('solitaire checks the collision floor too, like every other mode', () => {
-    /**
-     * REVERSED 2026-08-30, and this test previously asserted the opposite ("solitaire never checks
-     * the collision floor, whatever the counts").
-     *
-     * The exclusion was never a stated rule — §3.4 does not carve solitaire out — and nothing on
-     * screen reflected it: `SOLO_CONFIG` carried both limits, the New Game dialog offered them as
-     * live settings, and the text beside them said the game would end in a loss. A solitaire player
-     * could set a limit of 1 and crash all game. Found reviewing that screen's wording; Jesse's
-     * ruling is that the settings do what they say.
-     */
-    const s = game(1, { mode: 'solitaire', maxCollisionsPerDay: 1, maxCollisionsTotal: 1 });
-    s.collisionsToday = 99;
-    s.collisionsTotal = 99;
-    s.clock.stage = 1;
-    s.clock.phase = 'shiftChange';
-    advance(s);
-    assert.equal(s.status, 'finished');
-    assert.equal(s.outcome!.reason, 'collisionFloor');
-  });
-
-  it('still lets a solitaire game switch the collision floor off with 0', () => {
-    // The disable path is what a player who does not want the new ending reaches for, so it has to
-    // work at one seat exactly as it does at four.
-    const s = game(1, { mode: 'solitaire', maxCollisionsPerDay: 0, maxCollisionsTotal: 0 });
-    s.collisionsToday = 99;
-    s.collisionsTotal = 99;
-    s.clock.stage = 1;
-    s.clock.phase = 'shiftChange';
-    advance(s);
-    assert.notEqual(s.status, 'finished');
+    assert.equal(s.outcome!.reason, 'targetReached');
   });
 });
 
@@ -772,156 +583,43 @@ describe('MILESTONE: a full solitaire game runs headless', () => {
   });
 });
 
-describe('X18 Circus / X17 Campaign — a point for setting up (Gitea#13)', () => {
-  /**
-   * REPORTED originally: "Circus train TX18 was stopped on a siding for a full Stage and I did not
-   * get my Revenue point." It never could: `stopEarnsPoint` was declared on the profile and read
-   * NOWHERE, along with eight other special-train rules.
-   *
-   * REDEFINED by Gitea#13 (Jesse, 2026-08-29), and these tests carry the three parts of that
-   * ruling: the point is paid ONCE PER OFFICE AREA rather than once per game, only when the train
-   * is FULLY LOADED, and only in an Office Area at all.
-   */
-  const circusAt = (s: GameState, seat: number, coord: { row: number; col: number }, consist: unknown[]) => {
+describe('X18 Circus Train — a point for standing still', () => {
+  it('pays once for a Stage spent stopped, and never again', () => {
+    /**
+     * REPORTED: "Circus train TX18 was stopped on a siding for a full Stage and I did not get my
+     * Revenue point." It never could: `stopEarnsPoint` was declared on the profile and read
+     * NOWHERE, along with eight other special-train rules. The one card in the deck that pays for
+     * standing still paid nothing.
+     */
+    const s = game();
     s.clock.phase = 'mainline';
     s.trays.set('circus', {
       id: 'circus', trainNumber: 18, trainIsExtra: true, engineAt: 0,
-      consist, direction: 'east',
-      position: { at: 'grid', seat, coord },
+      consist: [], direction: 'east',
+      position: { at: 'grid', seat: 0, coord: { row: -1, col: 0 } },
       movesUsed: 0,
     } as never);
     // A card under it, so the crew is somewhere real rather than off the grid.
-    areaOf(s, seat as never).grid.set(`${coord.row},${coord.col}`, {
+    areaOf(s, 0).grid.set('-1,0', {
       geometry: { kind: 'track', geometry: 'straight' },
       baseOperationalRail: true, standing: [], facility: null, modifiers: [], enhancements: [],
     } as never);
-  };
 
-  const loaded = [
-    { type: 'boxcar', loaded: true },
-    { type: 'boxcar', loaded: true },
-    { type: 'coach', loaded: true },
-    { type: 'caboose', loaded: true },
-  ];
-
-  const runPhase = (s: GameState) => {
-    s.clock.phase = 'mainline';
-    s.movedThisPhase = new Set();
-    return pump(s);
-  };
-
-  it('pays a fully loaded Circus for a Stage spent set up', () => {
-    const s = game();
-    circusAt(s, 0, { row: -1, col: 0 }, loaded);
     const before = s.players[0]!.revenue;
+    const first = pump(s);
     assert.ok(
-      pump(s).some((e) => e.type === 'trainStoodStill' && e.trainNumber === 18),
+      first.some((e) => e.type === 'trainStoodStill' && e.trainNumber === 18),
       'the Circus Train stood still for a Stage and earned nothing',
     );
     assert.equal(s.players[0]!.revenue, before + 1, 'the point was not paid');
-  });
 
-  it('pays once per Office Area, however long it parks there', () => {
-    // "Once per stop in an office area" — a train that goes on standing in the same district does
-    // not keep earning. This is the half that was already true, for a different reason.
-    const s = game();
-    circusAt(s, 0, { row: -1, col: 0 }, loaded);
-    pump(s);
-    assert.ok(!runPhase(s).some((e) => e.type === 'trainStoodStill'),
-      'the Circus collected twice for the same set-up');
-    assert.ok(!runPhase(s).some((e) => e.type === 'trainStoodStill'),
-      'the Circus collected a third time for the same set-up');
-  });
-
-  it('pays AGAIN in a different district — each player can be visited', () => {
-    /**
-     * The half that is new. "In a multiplayer game, each player could score if the circus stops in
-     * their area" — so the claim is per seat, and a touring Circus is paid by each district it sets
-     * up in. Before Gitea#13 this paid once per GAME and the second district got nothing.
-     */
-    const s = createGame({
-      id: 'g', seed: 5, config: baseConfig({ mode: 'competitive' }), playerNames: ['A', 'B'],
-    });
-    circusAt(s, 0, { row: -1, col: 0 }, loaded);
-    pump(s);
-    const paidFirst = s.players.map((p) => p.revenue);
-
-    // The same train, moved into the other player's district.
-    const tray = s.trays.get('circus')!;
-    areaOf(s, 1 as never).grid.set('-1,0', {
-      geometry: { kind: 'track', geometry: 'straight' },
-      baseOperationalRail: true, standing: [], facility: null, modifiers: [], enhancements: [],
-    } as never);
-    tray.position = { at: 'grid', seat: 1, coord: { row: -1, col: 0 } } as never;
-
-    assert.ok(runPhase(s).some((e) => e.type === 'trainStoodStill'),
-      'the Circus set up in a second district and earned nothing');
-    const owner = s.seating[1]!;
-    assert.equal(
-      s.players[owner]!.revenue,
-      paidFirst[owner]! + 1,
-      'the point did not go to whoever sits in the district it stopped in',
-    );
-  });
-
-  it('pays nothing when the cars are empty — "not much of a circus"', () => {
-    const s = game();
-    circusAt(s, 0, { row: -1, col: 0 }, [
-      { type: 'boxcar', loaded: false },
-      { type: 'coach', loaded: true },
-      { type: 'caboose', loaded: true },
-    ]);
-    const before = s.players[0]!.revenue;
-    assert.ok(!pump(s).some((e) => e.type === 'trainStoodStill'),
-      'an empty car aboard still collected the set-up point');
-    assert.equal(s.players[0]!.revenue, before, 'Revenue moved for a train that was not full');
-  });
-
-  it('pays nothing to a train carrying nothing at all', () => {
-    // `every` on an empty list is vacuously true, so the emptiest train of the lot is exactly the
-    // one a careless test would pay.
-    const s = game();
-    circusAt(s, 0, { row: -1, col: 0 }, []);
-    assert.ok(!pump(s).some((e) => e.type === 'trainStoodStill'),
-      'a Circus carrying nothing was paid for setting up');
-  });
-
-  it('pays nothing for standing out on the Mainline', () => {
-    /**
-     * It used to, and it misattributed the point: `playerAtSeat` needs a seat, there is none off
-     * the grid, and the fallback handed it to PLAYER 0 wherever the train was standing. Jesse's
-     * ruling scopes the rule to Office Areas, which removes the bug rather than patching it.
-     */
-    const s = game();
-    s.clock.phase = 'mainline';
-    const index = s.division.nodes.findIndex((n) => n.kind === 'mainline');
-    s.trays.set('circus', {
-      id: 'circus', trainNumber: 18, trainIsExtra: true, engineAt: 0,
-      consist: loaded, direction: 'east',
-      position: { at: 'mainline', index },
-      movesUsed: 0,
-    } as never);
-    const before = s.players[0]!.revenue;
-    pump(s);
-    assert.equal(s.players[0]!.revenue, before, 'a Mainline set-up paid a point');
-  });
-
-  it('pays the Campaign Train only when its candidate is aboard', () => {
-    // X17 carries one coach and no freight, so "fully loaded" is exactly "the coach is occupied".
-    // It earned nothing at all before Gitea#13 — it had `stopThenExpedite` and no scoring rule.
-    const occupied = game();
-    circusAt(occupied, 0, { row: -1, col: 0 }, [{ type: 'coach', loaded: true }]);
-    occupied.trays.get('circus')!.trainNumber = 17;
-    const beforeOccupied = occupied.players[0]!.revenue;
-    pump(occupied);
-    assert.equal(occupied.players[0]!.revenue, beforeOccupied + 1, 'a full Campaign Train earned nothing');
-
-    const empty = game();
-    circusAt(empty, 0, { row: -1, col: 0 }, [{ type: 'coach', loaded: false }]);
-    empty.trays.get('circus')!.trainNumber = 17;
-    const beforeEmpty = empty.players[0]!.revenue;
-    pump(empty);
-    assert.equal(empty.players[0]!.revenue, beforeEmpty, 'an empty Campaign Train was paid for its speech');
+    // "One turn stopped" — once. A train that goes on standing there does not keep earning.
+    const paidAgain = () => {
+      s.clock.phase = 'mainline';
+      s.movedThisPhase = new Set();
+      return pump(s).some((e) => e.type === 'trainStoodStill');
+    };
+    assert.ok(!paidAgain(), 'the Circus Train collected a second time for the same set-up');
   });
 });
 
@@ -1010,7 +708,7 @@ describe('the history says WHY a train moved, and says it truthfully', () => {
    * which deadlocks the moment Local Operations wants an option chosen before it can be ended.
    */
   const phasesWith = (trainNumber: number): { localOps: number; loadUnload: number; leftIn: string } => {
-    const s = game(7, { days: 5 });
+    const s = game(7, { length: 'standard' });
     for (const n of s.division.nodes) if (n.kind === 'mainline') n.card = 'plains';
     /**
      * A DIVISION WITH NOTHING ELSE ON IT. §8.1 can still hold any train, Expedited or not, on a
@@ -1101,7 +799,7 @@ describe('the history says WHY a train moved, and says it truthfully', () => {
     // What Expedite actually restricts now: not WHEN the train leaves, but WHERE it may be left
     // standing in the meantime. Parked on Secondary Track — cleared there to make way for other
     // switching, say — it must not still be there when the next Mainline Phase begins.
-    const s = game(7, { days: 5 });
+    const s = game(7, { length: 'standard' });
     const area = areaOf(s, 0);
     const id = 'expedited';
     const secondary = { row: area.officeCoord.row, col: area.officeCoord.col + 1 };
@@ -1129,7 +827,7 @@ describe('the history says WHY a train moved, and says it truthfully', () => {
   it('does not fault an Expedited train legitimately held at the station itself', () => {
     // A train sitting on the Office square is not "left" anywhere — including one §8.1 is holding
     // for a same-direction meet, which is an ordinary hold, not a Station Master failure.
-    const s = game(7, { days: 5 });
+    const s = game(7, { length: 'standard' });
     const area = areaOf(s, 0);
     const id = 'expedited';
     s.trays.set(id, {
@@ -1141,12 +839,7 @@ describe('the history says WHY a train moved, and says it truthfully', () => {
 
     // A train ahead of it in the same Subdivision, running the SAME way — §8.1's fourth condition,
     // which is the Superintendent's call rather than an absolute bar.
-    //
-    // AHEAD MEANS EAST OF THE OFFICE for this eastbound train. This used to take the FIRST Mainline card
-    // in the Division, which is west of the Office — behind the train — and still expected a ruling,
-    // which is exactly the fault Gitea#26 reported. The card is now one the train would actually follow.
-    const office = s.division.nodes.findIndex((n) => n.kind === 'office' && n.seat === 0);
-    const ahead = s.division.nodes.findIndex((n, i) => i > office && n.kind === 'mainline');
+    const ahead = s.division.nodes.findIndex((n) => n.kind === 'mainline');
     const node = s.division.nodes[ahead];
     assert.equal(node?.kind, 'mainline');
     s.trays.set('ahead', {
@@ -1196,8 +889,7 @@ describe('an Extra starts where the player puts it (Gitea#4)', () => {
    */
   const pending = (trainNumber: number, tier?: 'depot' | 'station'): GameState => {
     const s = game(11);
-    // Queued by seat 0, who is therefore the one §7 lets place it.
-    s.pendingExtras = [{ trainNumber, player: 0 }];
+    s.pendingExtras = [trainNumber];
     s.timetable = s.timetable.map(() => null);
     if (tier) s.officeAreas.get(0)!.tier = tier;
     s.clock.phase = 'newTrain';
@@ -1432,7 +1124,7 @@ describe('an Extra starts where the player puts it (Gitea#4)', () => {
       const r = advance(s);
       assert.equal(r.needsInput, true, 'the phase must stop and ask');
       assert.equal(s.clock.pendingDecision?.train, tray.id);
-      assert.equal((s.clock.pendingDecision as { occupiedBy: string } | null)?.occupiedBy, 'ahead');
+      assert.equal(s.clock.pendingDecision?.occupiedBy, 'ahead');
 
       // HOLD keeps it in the yard.
       assert.ok(applyIntent(s, s.clock.superintendent, { type: 'mainline.clearance', allow: false }).ok);
@@ -1516,187 +1208,3 @@ describe('an Extra starts where the player puts it (Gitea#4)', () => {
     assert.equal(check(s, 0, at), 'NO_EXTRA_PENDING');
   });
 });
-
-// ---------------------------------------------------------------------------
-
-describe('§8.1 counts only trains AHEAD of the one departing (Gitea#26)', () => {
-  /**
-   * REPORTED from playtesting v0.8.0.9: two westbound Extras, X15 at an Office and X18 still crossing
-   * the card to its EAST. The Superintendent was asked to rule on X15 against X18 — a train behind it —
-   * and holding X15 kept the Whistle Post's only A/D track full, so X18 arrived into it and was
-   * destroyed. Reproduced by replaying the exported save; the positions below are that situation in a
-   * one-seat Division, where every Office is a Whistle Post and the Subdivision spans them all.
-   */
-  const setup = (occupant: { direction: 'east' | 'west'; side: 'east' | 'west'; number: number }) => {
-    const s = game(7, { days: 5 });
-    const area = areaOf(s, 0);
-    const office = s.division.nodes.findIndex((n) => n.kind === 'office' && n.seat === 0);
-    s.trays.set('departing', {
-      id: 'departing', trainNumber: 15, trainIsExtra: true, engineAt: 0, consist: [],
-      direction: 'west', facing: 'w',
-      position: { at: 'grid', seat: 0, coord: area.officeCoord }, movesUsed: 0,
-    });
-    area.adOccupancy.push('departing');
-    const card = s.division.nodes.findIndex((n, i) =>
-      n.kind === 'mainline' && (occupant.side === 'east' ? i > office : i < office));
-    const node = s.division.nodes[card];
-    assert.equal(node?.kind, 'mainline');
-    s.trays.set('other', {
-      id: 'other', trainNumber: occupant.number, trainIsExtra: true, engineAt: 0, consist: [],
-      direction: occupant.direction, facing: occupant.direction === 'east' ? 'e' : 'w',
-      position: { at: 'mainline', index: card }, movesUsed: 0,
-    });
-    if (node?.kind === 'mainline') {
-      node.transits.push({ tray: 'other', stagesRemaining: 2, stagesTotal: 2, direction: occupant.direction });
-    }
-    s.clock.phase = 'mainline';
-    return s;
-  };
-
-  it('does not put a same-direction train BEHIND the departing one to the Superintendent', () => {
-    const s = setup({ direction: 'west', side: 'east', number: 18 });
-    const r = advance(s);
-    assert.ok(!r.events.some((e) => e.type === 'clearanceRequested'), 'a train behind was put to the Superintendent');
-    assert.ok(
-      r.events.some((e) => e.type === 'trainHighballed' && e.trainNumber === 15),
-      'the departing train did not highball with nothing ahead of it',
-    );
-    assert.ok(!r.events.some((e) => e.type === 'trainsDestroyed'), 'a train was destroyed');
-  });
-
-  it('does not bar a departure over an opposite-direction train BEHIND it, which is moving away', () => {
-    const s = setup({ direction: 'east', side: 'east', number: 18 });
-    const r = advance(s);
-    assert.ok(
-      r.events.some((e) => e.type === 'trainHighballed' && e.trainNumber === 15),
-      'a train moving away behind it held the departure',
-    );
-  });
-
-  it('still puts a same-direction train AHEAD to the Superintendent', () => {
-    const s = setup({ direction: 'west', side: 'west', number: 18 });
-    const r = advance(s);
-    assert.ok(
-      r.events.some((e) => e.type === 'clearanceRequested' && e.trainId === 'departing'),
-      'a train the departing one would follow was not put to the Superintendent',
-    );
-  });
-});
-
-// ---------------------------------------------------------------------------
-
-/**
- * §7's make-up round is silent about what it could NOT do, and that silence was reported from a
- * table (2026-09-16): "train 5, the sparrow, has no coaches, which seems strange."
- *
- * The Sparrow's card calls for three coaches and nothing else. Every coach in that game had ended
- * up in the Classification Yard, which §2.2 returns only when the Division Yard runs bare — and the
- * Division Yard still held 46 freight cars, so it never would. `trainNeedingCars` therefore answered
- * "nothing to ask for" exactly as it answers "everything is full", the phase moved on, and the train
- * ran the length of the Division empty with no line anywhere saying why.
- */
-describe('a train the Division Yard cannot supply says so', () => {
-  /** Puts one train in the yard-filling state, with a yard holding only `types`. */
-  const readyToFill = (yard: { type: string; loaded: boolean }[]) => {
-    const s = game();
-    // Stage 1's train is 1/2, the Crack Limited — coaches only, which is the shape that goes short.
-    s.timetable = Array(STAGES_PER_DAY).fill(null);
-    s.timetable[0] = 1;
-    s.yards.divisionYard = yard as never;
-    s.yards.classificationYard = [{ type: 'coach', loaded: false }] as never;
-    s.clock.stage = 1;
-    s.clock.phase = 'newTrain';
-    return s;
-  };
-
-  it('reports the shortfall, with the cars, the waiting pile and why it will not come back', () => {
-    // A yard of pure freight: nothing the Crack Limited will take.
-    const s = readyToFill([
-      { type: 'boxcar', loaded: true },
-      { type: 'hopper', loaded: false },
-    ]);
-    const { events } = advance(s);
-    const short = events.find((e) => e.type === 'makeUpShort');
-    assert.ok(short, 'a train that could be given nothing reported nothing');
-    assert.equal(short.type === 'makeUpShort' && short.placed, 0);
-    assert.ok(
-      short.type === 'makeUpShort' && short.missing.includes('coach'),
-      'the report did not name the category the yard could not supply',
-    );
-    assert.ok(
-      short.type === 'makeUpShort' && short.waiting === 1,
-      'the report did not count the cars waiting in the Classification Yard',
-    );
-    assert.ok(
-      short.type === 'makeUpShort' && short.divisionYardHolds === 2,
-      'the report did not say how far the Division Yard is from bare, which is what §2.2 turns on',
-    );
-  });
-
-  it('says nothing when the round can still be asked for a car', () => {
-    // The same train, with coaches available: the phase must STOP for them rather than report.
-    const s = readyToFill([
-      { type: 'coach', loaded: true },
-      { type: 'coach', loaded: true },
-    ]);
-    const { events, needsInput } = advance(s);
-    assert.equal(needsInput, true, 'the phase should be waiting for a car to be placed');
-    assert.equal(
-      events.some((e) => e.type === 'makeUpShort'),
-      false,
-      'a train that can still be filled was reported short',
-    );
-  });
-});
-
-// ---------------------------------------------------------------------------
-
-/**
- * §8.2 and the Small Yard's nose sort, together — Jesse's ruling of 2026-09-17 was "any train may
- * sort to the nose, and it is held if it cannot depart".
- *
- * The holding half already existed and needed no new code, which is worth pinning precisely because
- * it is easy to assume otherwise: `badlyMadeUp` is deliberately DIRECTION-FREE, so a train with its
- * whole consist ahead of the engine is a PUSHING train and fit to run. What §8.2 refuses is a
- * broken-backed train — the engine buried among its own cars — and a caboose anywhere but the end
- * away from the engine.
- */
-describe('a train sorted to the nose is judged by §8.2, not by where the engine is', () => {
-  const tray = (consist: { type: string; loaded: boolean }[], engineAt: number) =>
-    ({ consist, engineAt }) as unknown as CrewTray;
-
-  it('lets a pushing train run — the whole consist ahead of the engine is made up', () => {
-    const pushing = tray([{ type: 'caboose', loaded: true }, { type: 'boxcar', loaded: true }], 2);
-    assert.equal(
-      badlyMadeUp(pushing),
-      null,
-      'a pushing train was refused; §8.2 is enforced direction-free on purpose',
-    );
-  });
-
-  it('holds a train whose engine is buried among its own cars', () => {
-    const buried = tray(
-      [{ type: 'boxcar', loaded: true }, { type: 'hopper', loaded: true }, { type: 'caboose', loaded: true }],
-      1,
-    );
-    const why = badlyMadeUp(buried);
-    assert.ok(why !== null, 'a broken-backed train was allowed to leave the Office');
-    assert.match(why, /engine is buried/, `the hold did not say why: ${why}`);
-  });
-
-  it('holds a train whose caboose is not at the end away from the engine', () => {
-    // Exactly the arrangement asked for at the table: caboose second from the rear.
-    const wanted = tray(
-      [
-        { type: 'hopper', loaded: true },
-        { type: 'tank', loaded: false },
-        { type: 'caboose', loaded: true },
-        { type: 'boxcar', loaded: true },
-      ],
-      0,
-    );
-    const why = badlyMadeUp(wanted);
-    assert.ok(why !== null, 'a train with its caboose mid-consist was allowed to leave');
-    assert.match(why, /caboose must be at the rear/, `the hold did not say why: ${why}`);
-  });
-});

test/apply.test.ts

@@ -18,13 +18,11 @@ import { cardDescription, snapshot } from '../src/sim/view.ts';
 
 const config: GameConfig = {
   mode: 'solitaire',
-  days: 5,
-  minCombinedRevenue: 0,
-  maxCollisionsPerDay: 0,
-  maxCollisionsTotal: 0,
-  pvpCardsAllowed: false,
+  victory: 'highestAfterDays',
+  length: 'standard',
   optionalRules: {
     reducedVisibility: false,
+    sisterTrains: false,
     employeeRotation: false,
     emergencyToolbox: false,
   },
@@ -159,60 +157,6 @@ describe('Local Operations: drawing (§6.2)', () => {
     assert.notEqual(s.decks.departments[1]![0], target, 'refilled with the same card');
   });
 
-  it('a PLAYED timetabled train never comes back, but a discarded one does — Gitea#23', () => {
-    /**
-     * Jesse's ruling, 2026-09-10: *"Once you've played a regularly scheduled train and it's in the
-     * salvage deck, that train is already on the timetable. It does not make sense to put that back
-     * into a reshuffled home deck to get played again. By contrast, a regularly scheduled train
-     * that's in a discard pile could potentially get reused later, and so should have that
-     * capability. Extras run one time and then they're done — if they are in the Salvage deck, they
-     * should get shuffled back in so that they could get run again."*
-     *
-     * So the test is WHERE the card is, not only what it is: the same card is spent in the Salvage
-     * Yard and still runnable in a Department. That is what this pins, because it is the kind of rule
-     * a later tidy-up would happily "simplify" into filtering by card kind everywhere.
-     */
-    const s = game();
-    const kindOfCard = (id: string): string => s.cards.get(id)?.kind.kind ?? '?';
-    const pool = [...s.decks.homeOffice];
-    const trains = pool.filter((id) => kindOfCard(id) === 'timetabledTrain');
-    const extras = pool.filter((id) => kindOfCard(id) === 'extraTrain');
-    const others = pool.filter((id) => !['timetabledTrain', 'extraTrain'].includes(kindOfCard(id)));
-    assert.ok(trains.length >= 2 && extras.length >= 1 && others.length >= 5, 'the deal lacks the cards this needs');
-
-    const spentTrain = trains[0]!;      // played: in the Salvage Yard, its slot taken
-    const discardedTrain = trains[1]!;  // never played: sitting in a Department
-    const playedExtra = extras[0]!;     // a single run, free to run again
-
-    s.decks.salvageYard = [spentTrain, playedExtra, ...others.slice(0, 3)];
-    s.decks.departments = [[discardedTrain], [others[3]!], [others[4]!]];
-    s.decks.homeOffice = [others[5]!];
-
-    applyIntent(s, 0, { type: 'localOps.choose', option: 'draw' });
-    const r = applyIntent(s, 0, { type: 'draw.fromHomeOffice' });
-    assert.ok(r.ok);
-    assert.ok(r.events.some((e) => e.type === 'deckReshuffled'), 'no reshuffle was emitted');
-
-    const recovered = new Set([...s.decks.homeOffice, ...s.decks.departments.flat()]);
-    const hands = new Set([...s.decks.hands.values()].flat());
-
-    // THE RULING, both halves.
-    assert.ok(!recovered.has(spentTrain), 'a played timetabled train was shuffled back in');
-    assert.ok(!hands.has(spentTrain), 'a played timetabled train was dealt back into a hand');
-    assert.ok(
-      s.decks.salvageYard.includes(spentTrain),
-      'a played timetabled train should stay in the Salvage Yard, not vanish',
-    );
-    assert.ok(
-      recovered.has(discardedTrain) || hands.has(discardedTrain),
-      'a DISCARDED timetabled train must come back — it was never played, so its slot is open',
-    );
-    assert.ok(
-      recovered.has(playedExtra) || hands.has(playedExtra),
-      'a played Extra must come back — an Extra is one run, not a standing slot',
-    );
-  });
-
   it('reshuffles the Salvage Yard and Departments back in when the deck runs out', () => {
     // §6.2 — "If drawing a card has depleted the Home Office deck, immediately collect all cards
     // from the Salvage Yard and three Department decks, reshuffle, and reestablish the Home Office
@@ -236,11 +180,7 @@ describe('Local Operations: drawing (§6.2)', () => {
     assert.ok(r.ok);
     assert.ok(r.events.some((e) => e.type === 'deckReshuffled'), 'no reshuffle was emitted');
 
-    // Swept EXCEPT the trains whose slots are already on the timetable — see the ruling test below.
-    assert.ok(
-      s.decks.salvageYard.every((id) => s.cards.get(id)?.kind.kind === 'timetabledTrain'),
-      'the Salvage Yard must be swept apart from spent timetabled trains',
-    );
+    assert.equal(s.decks.salvageYard.length, 0, 'the Salvage Yard must be swept');
     assert.ok(s.decks.homeOffice.length > 0, 'the deck must be re-established');
     assert.ok(
       s.decks.departments.every((p) => p.length === 1),
@@ -1014,7 +954,7 @@ describe('the Superintendent clearance ruling (§8.1)', () => {
     const s = game();
     s.clock.phase = 'mainline';
     s.clock.currentActor = null; // nobody's turn — yet the Superintendent must still rule
-    s.clock.pendingDecision = { kind: 'clearance', train: 'tray0', occupiedBy: 'tray1' };
+    s.clock.pendingDecision = { train: 'tray0', occupiedBy: 'tray1' };
     const r = applyIntent(s, 0, { type: 'mainline.clearance', allow: false });
     assert.ok(r.ok);
     assert.equal(s.clock.pendingDecision, null);
@@ -1022,7 +962,7 @@ describe('the Superintendent clearance ruling (§8.1)', () => {
 
   it('is refused to a player who is not the Superintendent', () => {
     const s = game();
-    s.clock.pendingDecision = { kind: 'clearance', train: 'tray0', occupiedBy: 'tray1' };
+    s.clock.pendingDecision = { train: 'tray0', occupiedBy: 'tray1' };
     s.clock.superintendent = 1;
     assert.equal(check(s, 0, { type: 'mainline.clearance', allow: true }), 'NOT_SUPERINTENDENT');
   });
@@ -1361,10 +1301,6 @@ describe('the Limits bound the district, and the nine spots reach round a Facili
     const under = district(s);
     buildFacility(s, 'packingSheds', under);
     const cardId = modifierOf(s, 'iceHouse');
-    // `district` leaves the host ON the sign's column, which since 2026-09-17 puts its three eastern
-    // spots outside the Limits. The question here is whether DIAGONALS are offered at all, so the
-    // sign goes out one more column and the host keeps all nine.
-    areaOf(s, 0).limitsEast = at(areaOf(s, 0).runningRow, under.col + 1);
 
     const offered = legalActions(s, 0)
       .filter((i) => i.type === 'card.play' && i.cardId === cardId && i.placement !== undefined)
@@ -1379,18 +1315,13 @@ describe('the Limits bound the district, and the nine spots reach round a Facili
     assert.equal(check(s, 0, { type: 'card.play', cardId, placement: southEast }), null);
   });
 
-  it('keeps a Modifier inside the Limits, and out of the Running Track row', () => {
+  it('lets a Modifier hang outside the Limits, but never in the Running Track row', () => {
     /**
-     * Jesse's call, both halves — and the FIRST half reversed on 2026-09-17 after a Day 3 playtest
-     * put Transmission Lines at (-2,4) with the sign at column 3. It used to read the other way: a
-     * Modifier is not track (§9), so a host at the limit kept all nine of its spots, because
-     * refusing the outer three looked like it would make the card unplayable where the district
-     * ends. What decided it was the board — a card standing outside your own sign, in territory
-     * §8.1 and §10 reason about — and a count of what is actually lost: six of the nine spots
-     * survive, and the sign moves outward as the Running Track grows (§2.1, Gap 4a).
-     *
-     * The Running Track ROW stays barred for its own reason: it is the ground the main grows onto,
-     * and a Modifier parked there would block the player's own sign from moving outward.
+     * Jesse's call, both halves. A Modifier is not track (§9), so a host standing at the limit keeps
+     * all nine of its spots — refusing the outer three would make the card unplayable exactly where
+     * the district ends. The Running Track ROW is the exception: inside the Limits that row is
+     * always full, so this bites only beyond the sign, and that is the ground the main grows onto —
+     * a Modifier parked there would block the player's own sign from moving outward (§2.1).
      */
     const s = game();
     const under = district(s);
@@ -1399,16 +1330,9 @@ describe('the Limits bound the district, and the nine spots reach round a Facili
     const area = areaOf(s, 0);
 
     assert.equal(
-      check(s, 0, { type: 'card.play', cardId, placement: at(under.row, area.limitsEast.col + 1) }),
-      'OUTSIDE_LIMITS',
-      'a Modifier was allowed to stand outside the district it belongs to',
-    );
-    // The spot inside the sign, beside the same host, is the one a player actually has — free,
-    // adjacent, and on the sign's own column, which `withinLimits` includes.
-    assert.equal(
-      check(s, 0, { type: 'card.play', cardId, placement: at(under.row - 1, under.col) }),
+      check(s, 0, { type: 'card.play', cardId, placement: at(under.row, under.col + 1) }),
       null,
-      'a Modifier was refused a free, connected spot inside the Limits',
+      'a Modifier beside a host at the limit was refused the spot outside it',
     );
     assert.equal(
       check(s, 0, { type: 'card.play', cardId, placement: at(area.runningRow, under.col + 1) }),
@@ -1441,11 +1365,6 @@ describe("a Modifier grants only what its host's flow can use", () => {
     const area = areaOf(s, 0);
     const at = { row: -1, col: 4 };
     area.grid.set(coordKey(at), withFacility(kind, out, into) as never);
-    // This test is about what a Modifier GRANTS, not about where it may stand, and it arranges a
-    // host well east of the opening sign. Modifiers have been bounded by the Limits since
-    // 2026-09-17, so the district has to reach the square the fixture uses or every case here would
-    // fail as OUTSIDE_LIMITS and prove nothing about flow.
-    area.limitsEast = { row: area.runningRow, col: at.col + 2 };
     applyIntent(s, 0, { type: 'localOps.choose', option: 'draw' });
 
     const card = [...s.cards.entries()].find(
@@ -1758,7 +1677,7 @@ describe('the Crew Tray is a train, and must be made up to leave (§8.2, Appendi
     const build = (toNose: boolean): string[] => {
       const s = game();
       const id = placeTray(s, at(0, 0), [car('boxcar')] as never);
-      reduce(s, { type: 'carsCoupled', player: 0, trayId: id, at: at(0, 0), stock: [car('hopper')] as never, from: [], toNose });
+      reduce(s, { type: 'carsCoupled', trayId: id, at: at(0, 0), stock: [car('hopper')] as never, from: [], toNose });
       return s.trays.get(id)!.consist.map((c) => c.type);
     };
     assert.deepEqual(build(true), ['hopper', 'boxcar'], 'running forward takes cars on the nose');
@@ -1773,11 +1692,11 @@ describe('the Crew Tray is a train, and must be made up to leave (§8.2, Appendi
     const tray = s.trays.get(id)!;
     tray.engineAt = 0;
 
-    reduce(s, { type: 'carsCoupled', player: 0, trayId: id, at: at(0, 0), stock: [car('hopper')] as never, from: [], toNose: true });
+    reduce(s, { type: 'carsCoupled', trayId: id, at: at(0, 0), stock: [car('hopper')] as never, from: [], toNose: true });
     assert.equal(tray.engineAt, 1, 'the engine should now have a car ahead of it');
     assert.deepEqual(tray.consist.map((c) => c.type), ['hopper', 'boxcar']);
 
-    reduce(s, { type: 'carsDropped', player: 0, trayId: id, at: at(0, 0), stock: [car('hopper')] as never, fromNose: true });
+    reduce(s, { type: 'carsDropped', trayId: id, at: at(0, 0), stock: [car('hopper')] as never, fromNose: true });
     assert.equal(tray.engineAt, 0, 'setting out the nose cars puts the engine back in front');
     assert.deepEqual(tray.consist.map((c) => c.type), ['boxcar']);
   });
@@ -1902,7 +1821,7 @@ describe('the engine is drawn pointing east or west, whatever track it is standi
    * So `facing` stays a PORT (movement needs one) and `railFacingOf` is what the board draws.
    */
   const moved = (id: string, facing: 'n' | 's' | 'e' | 'w') =>
-    ({ type: 'trayMoved', player: 0, trayId: id, from: at(0, 0), to: at(0, 0), movesRemaining: 3, movesAllowed: 6, facing }) as const;
+    ({ type: 'trayMoved', trayId: id, from: at(0, 0), to: at(0, 0), movesRemaining: 3, facing }) as const;
 
   it('carries the east-west sense across north-south track', () => {
     const s = game();

test/card-reference.test.ts

@@ -1,54 +0,0 @@
-/**
- * The card reference must not drift from the cards.
- *
- * `docs/rules/card-reference.md` spent several releases describing the v0.4.5 deck — twelve numbered
- * trains, "3 / 4 Mail-Express, 3 coaches" — while `content.ts` had train 3 as the Express with two
- * freight cars and a per-location freight rule. Worse, `content.ts` named that file as "the place
- * that now carries what the cards say", so the code sent readers to a table its own banner told them
- * not to trust. Nothing failed, because nothing checked.
- *
- * `docs/rules/as-built.md` is emitted from the same exported catalogues the engine instantiates
- * from, and this re-runs the generator and compares. Change a card face without regenerating and
- * this goes red — which is the whole point: a document nothing verifies is a document that will be
- * wrong, and this project's own history is the evidence.
- */
-
-import { describe, it } from 'node:test';
-import assert from 'node:assert/strict';
-
-import { execFileSync } from 'node:child_process';
-import { readFileSync } from 'node:fs';
-import { dirname, join } from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const root = join(dirname(fileURLToPath(import.meta.url)), '..');
-const doc = join(root, 'docs/rules/as-built.md');
-
-describe('docs/rules/as-built.md is generated, and current', () => {
-  it('matches what the generator emits from content.ts today', () => {
-    const before = readFileSync(doc, 'utf8');
-    execFileSync(process.execPath, [join(root, 'scripts/build-card-reference.ts')], { cwd: root });
-    const after = readFileSync(doc, 'utf8');
-    assert.equal(
-      after,
-      before,
-      'the checked-in card reference is stale — run `npm run build:cards` and commit the result',
-    );
-  });
-
-  it('carries the current train catalogue, not the v0.4.5 deck', () => {
-    // The specific drift that went unnoticed for several releases, asserted by name so a future
-    // regeneration against an old content.ts cannot quietly reintroduce it.
-    const md = readFileSync(doc, 'utf8');
-    assert.match(md, /Crack Limited/);
-    assert.match(md, /\| 3 \| Express \|/);
-    assert.ok(!/Mail-Express/.test(md), 'the superseded v0.4.5 train names are back');
-    assert.ok(!/Manifest Freight/.test(md), 'the superseded v0.4.5 train names are back');
-  });
-
-  it('says it is generated, so nobody edits it by hand', () => {
-    const md = readFileSync(doc, 'utf8');
-    assert.match(md, /Generated from `src\/engine\/content\.ts`/);
-    assert.match(md, /Do not edit by/);
-  });
-});

test/cut-ordering.test.ts

@@ -12,22 +12,17 @@ import { describe, it } from 'node:test';
 import assert from 'node:assert/strict';
 
 import { applyIntent, areaOf, check } from '../src/engine/apply.ts';
-import { legalActions } from '../src/engine/legal.ts';
-import { describeIntent } from '../src/sim/view.ts';
-import { badlyMadeUp } from '../src/engine/advance.ts';
 import { createGame } from '../src/engine/setup.ts';
-import type { CrewTray, GameConfig, GameState, GridCoord, RollingStock, TrackArc, TrackCard } from '../src/engine/state.ts';
+import type { CrewTray, GameConfig, GameState, GridCoord, RollingStock, TrackCard } from '../src/engine/state.ts';
 import { carsOn, coordKey, turnOf } from '../src/engine/state.ts';
 
 const config: GameConfig = {
   mode: 'solitaire',
-  days: 5,
-  minCombinedRevenue: 0,
-  maxCollisionsPerDay: 0,
-  maxCollisionsTotal: 0,
-  pvpCardsAllowed: false,
+  victory: 'highestAfterDays',
+  length: 'standard',
   optionalRules: {
     reducedVisibility: false,
+    sisterTrains: false,
     employeeRotation: false,
     emergencyToolbox: false,
   },
@@ -56,18 +51,12 @@ function row(s: GameState, n: number): void {
   for (let c = 0; c < n; c++) addCard(s, at(1, c), straight());
 }
 
-/**
- * `facing` is the PORT the engine points out through, which is not always an east-west one: a train
- * standing on a curve points along its 45° leg. `railFacing` carries the east-west sense the train
- * arrived with, so it keeps a straight answer whatever port the nose is on (`railFacingOf`).
- */
 function placeTray(
   s: GameState,
   coord: GridCoord,
   consist: RollingStock[],
-  facing: 'n' | 's' | 'e' | 'w',
+  facing: 'e' | 'w',
   engineAt = 0,
-  railFacing: 'e' | 'w' = facing === 'w' ? 'w' : 'e',
 ): string {
   const id = s.freeTrays.pop()!;
   s.trays.set(id, {
@@ -76,9 +65,9 @@ function placeTray(
     trainIsExtra: false,
     engineAt,
     consist,
-    direction: railFacing === 'w' ? 'west' : 'east',
+    direction: facing === 'w' ? 'west' : 'east',
     facing,
-    railFacing,
+    railFacing: facing,
     position: { at: 'grid', seat: 0, coord },
     movesUsed: 0,
   } as CrewTray);
@@ -382,243 +371,3 @@ describe('taking your own cut back is undoing the drop, not a fresh pick-up', ()
     );
   });
 });
-
-// ---------------------------------------------------------------------------
-
-describe('a 45° leg is part of the west-to-east row, not outside it (Gitea#17)', () => {
-  /**
-   * Reported: "Cars were West to East Caboose, Loaded boxcar, Loaded boxcar, Loaded boxcar. After
-   * backing into that square cars were attached to the train Loaded boxcar, Loaded boxcar, Loaded
-   * boxcar, Caboose, Engine." The caboose came back next to the engine instead of at the far end,
-   * which also leaves the train badly made up under §8.2.
-   *
-   * The square was a `sw` CURVE and the train backed in through its SOUTH leg. `standing` runs west
-   * to east, and the two places that walk it both asked the PORT which end of the row they were at:
-   * `exploreMoves` reversed the row for an 'e' entry and for nothing else, and `cutTowards` answered
-   * "you meet nothing" for a north or south exit. Neither is a property of the port.
-   *
-   * A 45° leg leaves through the MIDDLE of its edge, so its end of the run is whichever end the arc
-   * does not reach: the south leg of a `sw` curve is the row's EAST end, and the south leg of an
-   * `se` curve is its WEST end. Same port, opposite answers — which is why `rowEndAt` has to ask the
-   * card.
-   */
-  const curve = (arc: TrackArc, standing: RollingStock[] = [], standingWest = 0): TrackCard => ({
-    geometry: { kind: 'track', geometry: 'curved', arc, hand: 'right' },
-    baseOperationalRail: true,
-    standing,
-    standingWest,
-    facility: null,
-    modifiers: [],
-    enhancements: [],
-  });
-
-  /**
-   * The reported board, minimally: a `sw` curve holding the cut, and an `ne` curve below it for the
-   * train to run from. Both legs lie on the `ne_sw` diagonal, so the two cards actually join.
-   */
-  function board(standing: RollingStock[], standingWest = standing.length): GameState {
-    const s = game();
-    addCard(s, at(1, 0), curve('sw', standing, standingWest));
-    addCard(s, at(0, 0), curve('ne'));
-    switching(s);
-    return s;
-  }
-
-  it('backs into a cut through the south leg and meets the EAST end of the row first', () => {
-    const s = board([car('caboose', true), car('boxcar', true), car('boxcar', true), car('boxcar', true)]);
-    // Facing east on the `ne` curve, so reversing pulls out through its north leg and into the
-    // curve above through that card's south leg — the move in the reported save.
-    const id = placeTray(s, at(0, 0), [], 'e');
-    const r = applyIntent(s, 0, { type: 'switch.move', trayId: id, to: at(1, 0), reverse: true });
-    assert.ok(r.ok, `the reverse move was refused: ${r.ok ? '' : r.code}`);
-    // Coupled behind the engine nearest-car-first, and the nearest car is the one at the south end
-    // — the LAST of a west-to-east row on a `sw` curve. The caboose was westmost, so it ends up
-    // furthest from the engine, which is where §8.2 needs it.
-    assert.deepEqual(types(s.trays.get(id)!.consist), ['boxcar', 'boxcar', 'boxcar', 'caboose']);
-  });
-
-  it('meets the WEST end of the row first where the same leg belongs to an `se` curve', () => {
-    // The mirror, and the reason the port alone cannot answer: an `se` curve's south leg is the
-    // west end of its row, so the same reverse move meets the caboose first.
-    const s = game();
-    addCard(s, at(1, 0), curve('se', [car('caboose', true), car('boxcar', true)], 2));
-    addCard(s, at(0, 0), curve('nw'));
-    switching(s);
-    const id = placeTray(s, at(0, 0), [], 'w');
-    const r = applyIntent(s, 0, { type: 'switch.move', trayId: id, to: at(1, 0), reverse: true });
-    assert.ok(r.ok, `the reverse move was refused: ${r.ok ? '' : r.code}`);
-    assert.deepEqual(types(s.trays.get(id)!.consist), ['caboose', 'boxcar']);
-  });
-
-  it('takes its own cut back with it when it pulls out through the south leg (§A.4)', () => {
-    // The other half of the same assumption: `cutTowards` said a train leaving north or south meets
-    // nothing, so a crew standing on a curve drove away and left the cars beside it standing —
-    // exactly what mandatory coupling forbids.
-    const s = board([car('boxcar', true)], 0);
-    // `standingWest` 0 puts the boxcar EAST of the train, which on a `sw` curve is between it and
-    // the south leg it is about to leave by.
-    const id = placeTray(s, at(1, 0), [], 's');
-    const r = applyIntent(s, 0, { type: 'switch.move', trayId: id, to: at(0, 0), reverse: false });
-    assert.ok(r.ok, `the move off the curve was refused: ${r.ok ? '' : r.code}`);
-    assert.deepEqual(types(s.trays.get(id)!.consist), ['boxcar'], 'the cut beside the train was left standing');
-    assert.deepEqual(standingAt(s, at(1, 0)), [], 'the cars should have come off the card');
-  });
-});
-
-// ---------------------------------------------------------------------------
-
-/**
- * The Small Yard's re-order menu, reported from Day 3 of the 2026-09-17 playtest.
- *
- * Jesse had train 10 on his Small Yard — nose first, `[loaded boxcar, loaded hopper, empty tank,
- * caboose]` — wanted the boxcar on the tail, and could not tell which button did it: every option
- * read `re-order consist [1,2,3,0]`, the engine's own array indices offered to a person. The move he
- * wanted was the FIRST of the five. One of the other four re-ordered nothing at all and would still
- * have spent one of his six Moves.
- */
-describe('the Small Yard says what each re-order would build', () => {
-  const smallYard = (standing: RollingStock[] = []): TrackCard => ({
-    ...straight(standing),
-    enhancements: ['smallYard'],
-  });
-
-  /** Train 10's consist as it actually stood, on a card carrying a Small Yard. */
-  const onTheYard = (): { s: GameState; trayId: string } => {
-    const s = game();
-    row(s, 3);
-    addCard(s, at(1, 1), smallYard());
-    const trayId = placeTray(s, at(1, 1), [car('boxcar', true), car('hopper', true), car('tank'), car('caboose', true)], 'e');
-    switching(s);
-    return { s, trayId };
-  };
-
-  it('never offers a sort that changes nothing', () => {
-    /**
-     * THE PAIR IS WHAT COUNTS, since the engine position became part of a sort (2026-09-17). The
-     * identity car order is now a perfectly good option when it moves the ENGINE — that is the whole
-     * of the separate engine control — so what must never be offered is the pair that reproduces the
-     * train already standing there, and no pair may appear twice.
-     */
-    const { s, trayId } = onTheYard();
-    const tray = s.trays.get(trayId)!;
-    const offered = legalActions(s, 0)
-      .filter((i) => i.type === 'switch.sortConsist')
-      .map((i) => {
-        const sort = i as { order: number[]; engineAt?: number };
-        return `${sort.order.join(',')}|${sort.engineAt ?? 0}`;
-      });
-    assert.ok(offered.length > 0, 'no sort was offered at all, so this proved nothing');
-    const unchanged = `${[...tray.consist.keys()].join(',')}|${tray.engineAt}`;
-    assert.ok(
-      !offered.includes(unchanged),
-      'the menu offered the train as it already stands — a Move spent to change nothing',
-    );
-    assert.equal(new Set(offered).size, offered.length, 'the menu offered the same sort twice');
-  });
-
-  it('offers the engine every position, including ahead of its own cars', () => {
-    // Jesse's ruling, 2026-09-17, following `implications.md` against the v0.4.5 card text: a train
-    // in a Small Yard "may sort itself into any order, INCLUDING cars ahead of the engine".
-    const { s, trayId } = onTheYard();
-    const n = s.trays.get(trayId)!.consist.length;
-    const positions = legalActions(s, 0)
-      .filter((i) => i.type === 'switch.sortConsist')
-      .map((i) => (i as { engineAt?: number }).engineAt ?? 0);
-    for (let k = 1; k <= n; k++) {
-      assert.ok(positions.includes(k), `the engine was never offered position ${k} of ${n}`);
-    }
-  });
-
-  it('always offers a made-up order to a train that is not in one', () => {
-    /**
-     * Jesse, 2026-09-17: "trains with a caboose have to offer the caboose at the back… sorting all
-     * the cars back in, ready to leave the station."
-     *
-     * A train with its caboose mid-consist is one §8.2 will not let out of the Office, so at least
-     * one offer has to put it right. It comes out of the ordinary curated set — "bring car k to the
-     * tail" is enumerated for every car, and the caboose is one of them.
-     */
-    const s = game();
-    row(s, 3);
-    addCard(s, at(1, 1), smallYard());
-    const trayId = placeTray(s, at(1, 1), [car('boxcar', true), car('caboose', true), car('hopper', true)], 'e');
-    const tray = s.trays.get(trayId)!;
-    tray.trainNumber = 10;
-    switching(s);
-
-    const fit = legalActions(s, 0)
-      .filter((i) => i.type === 'switch.sortConsist')
-      .filter((i) => {
-        const sort = i as { order: number[]; engineAt?: number };
-        const after = sort.order.map((n) => tray.consist[n]!);
-        return badlyMadeUp({ ...tray, consist: after, engineAt: sort.engineAt ?? 0 }) === null;
-      });
-    assert.ok(
-      fit.length > 0,
-      'a train that cannot leave the Office was offered no sort that would make it up',
-    );
-    // And the one that does it says so on the button, rather than leaving it to be discovered.
-    assert.ok(
-      fit.some((i) => describeIntent(s, i).includes('MADE UP, ready to leave')),
-      'the sort that makes the train up does not say so',
-    );
-  });
-
-  it('lays the train out west to east, with the engine where it will be', () => {
-    /**
-     * "You specify above that the order is front to back, but on the screen, if it's eastbound or
-     * westbound, it may look different" — Jesse, 2026-09-17.
-     *
-     * `board-svg.ts` draws the crew strip west on the left, reversing a consist for an east-facing
-     * train so its nose lands at the east end. The button has to read the same way or it describes a
-     * different train from the one on the board.
-     */
-    const s = game();
-    row(s, 3);
-    addCard(s, at(1, 1), smallYard());
-    // Engine points WEST: the consist is stored nose first, so west to east reads engine first.
-    const west = placeTray(s, at(1, 1), [car('boxcar', true), car('hopper', true)], 'w');
-    switching(s);
-    const westLabel = legalActions(s, 0)
-      .filter((i) => i.type === 'switch.sortConsist')
-      .map((i) => describeIntent(s, i))
-      .find((l) => l.startsWith('re-order'));
-    assert.ok(westLabel, 'no re-order was offered for the west-facing train');
-    assert.match(westLabel, /west to east: ◀ ENGINE · /, `a west-facing engine was not drawn leading: ${westLabel}`);
-
-    // The same train pointing EAST puts the engine at the far end of the same sentence.
-    s.trays.get(west)!.railFacing = 'e';
-    s.trays.get(west)!.facing = 'e';
-    const eastLabel = legalActions(s, 0)
-      .filter((i) => i.type === 'switch.sortConsist')
-      .map((i) => describeIntent(s, i))
-      .find((l) => l.startsWith('re-order'));
-    assert.ok(eastLabel, 'no re-order was offered for the east-facing train');
-    assert.match(eastLabel, / · ENGINE ▶($| ·)/, `an east-facing engine was not drawn at the east end: ${eastLabel}`);
-  });
-
-  it('labels each option with the train it would make, not with array indices', () => {
-    const { s } = onTheYard();
-    const labels = legalActions(s, 0)
-      .filter((i) => i.type === 'switch.sortConsist')
-      .map((i) => describeIntent(s, i));
-
-    assert.ok(
-      labels.every((l) => !/\[\d(,\d)*\]/.test(l)),
-      `a re-order option still reads as a permutation: ${labels.find((l) => /\[\d(,\d)*\]/.test(l))}`,
-    );
-    /**
-     * The one Jesse wanted, written the way the board draws it: this crew faces EAST, so the strip
-     * runs west to east and the engine sits at the east end with the boxcar now furthest west.
-     */
-    assert.ok(
-      labels.includes('re-order — west to east: loaded boxcar · caboose · empty tank · loaded hopper · ENGINE ▶'),
-      `the move that puts the boxcar on the tail was not offered in words — got: ${labels.join(' | ')}`,
-    );
-    // And the engine's own positions read as what they do, not as an index.
-    assert.ok(
-      labels.some((l) => l.startsWith('put the whole consist ahead of the engine —')),
-      `the shoving sort was not offered in words — got: ${labels.join(' | ')}`,
-    );
-  });
-});

test/display-gaps.test.ts

@@ -1,437 +0,0 @@
-/**
- * WHAT THE ENGINE KNOWS AND THE SCREEN DOES NOT — the 2026-09-07 sweep.
- *
- * Gitea#21, Gitea#22, #94 and #96 were four instances of one fault in a row: the engine gained a
- * thing that changes what a train may do, and nothing drew it. Each was found by a player hitting
- * it. So rather than wait for the fifth, every field of `GameState` and its nested types was
- * enumerated and checked for a reader in `sim/view.ts`, `src/web/` and `sim/narrate.ts`, and the
- * survivors were then verified by running the engine rather than by trusting the grep.
- *
- * Four fields had no reader anywhere. `movedThisPhase` is set and cleared inside one `advance` call
- * and is genuinely nobody's business. The other three are these tests. The bookkeeping fields whose
- * EFFECT is already visible as legality — `freightWorked`, `drawnThisTurn`, `freightAgentUsed`,
- * `movesUsed` (its complement `movesRemaining` is on the Frame), `switchedSince` — are deliberately
- * not here: a field is not a display gap merely because no one renders it.
- *
- * The method is worth more than the three fixes, and is written down in TODO Reference · #98.
- */
-
-import { describe, it } from 'node:test';
-import assert from 'node:assert/strict';
-
-import { createGame } from '../src/engine/setup.ts';
-import { crewTrayCount, enhancementText } from '../src/engine/content.ts';
-import { areaOf } from '../src/engine/apply.ts';
-import { impediments } from '../src/sim/narrate.ts';
-import { projectDistrict, projectSharedTable, publicSnapshot, trainRules } from '../src/sim/view.ts';
-import type { CrewTray, GameConfig, GameState, PlayerIndex, SeatIndex } from '../src/engine/state.ts';
-import { seatOf } from '../src/engine/state.ts';
-
-const config: GameConfig = {
-  mode: 'competitive',
-  days: 3,
-  minCombinedRevenue: 0,
-  maxCollisionsPerDay: 0,
-  maxCollisionsTotal: 0,
-  pvpCardsAllowed: false,
-  optionalRules: { reducedVisibility: false, employeeRotation: false, emergencyToolbox: false },
-};
-
-const game = (): GameState => {
-  const s = createGame({ id: 'g', seed: 4242, config, playerNames: ['Ann', 'Bob'] });
-  s.status = 'active';
-  return s;
-};
-
-/**
- * THE CREW TRAY POOL IS A MECHANIC, AND IT WAS INVISIBLE (#98).
- *
- * `state.ts` calls tray scarcity "an explicit mechanic": there are fewer trays than there are trains
- * wanting one, and which trains get held is the whole of §7. The engine knows three things about it
- * — how many trays are free, which Extras are queued for one, and which second sections are — and
- * the view read none of them.
- *
- * The panel that answers "why is nothing moving?" had exactly one tray rule, keyed off the train due
- * out THIS Stage (`s.timetable[stage - 1]`). So a player who spent a card on an Extra, or ordered a
- * second section, got a blocked panel that was completely EMPTY while their train sat behind an
- * exhausted pool — and both had been announced once in the log, in a line that promised a future
- * event ("as soon as a Crew Tray frees up") which nothing then confirmed.
- */
-describe('the Crew Tray pool is a mechanic the player can see (#98)', () => {
-  /** A table whose trays are all out, with one Extra and one second section queued behind them. */
-  const jammed = (): GameState => {
-    const s = game();
-    s.freeTrays = [];
-    s.pendingExtras.push({ trainNumber: 17, player: 0 as PlayerIndex });
-    s.pendingSecondSections.push(8);
-    return s;
-  };
-
-  it('reports how many Crew Trays are free, and how many there are', () => {
-    const s = game();
-    const total = crewTrayCount(2);
-    assert.equal(s.freeTrays.length, total, 'the premise is gone: trays were already out at setup');
-    assert.deepEqual(projectSharedTable(s).crewTrays, { free: total, total });
-
-    s.freeTrays = s.freeTrays.slice(0, 1);
-    assert.deepEqual(
-      projectSharedTable(s).crewTrays,
-      { free: 1, total },
-      'the pool emptied and the shared table did not notice',
-    );
-  });
-
-  it('names the trains queued for a tray, so a promise made in the log is kept on the board', () => {
-    const q = projectSharedTable(jammed()).queued;
-    assert.deepEqual(q.extras, [{ trainNumber: 17, player: 0 }], 'a played Extra is waiting nowhere visible');
-    assert.deepEqual(q.secondSections, [8], 'an ordered second section is waiting nowhere visible');
-  });
-
-  it('tells the player who played the Extra that it is held for want of a crew', () => {
-    const blocked = impediments(jammed(), 0 as PlayerIndex);
-    const extra = blocked.find((b) => /X17/.test(b.where));
-    assert.ok(extra, 'the blocked panel said nothing about an Extra held for want of a Crew Tray');
-    assert.match(extra.why, /Crew Tray/, 'it was listed without naming the thing it is waiting for');
-    assert.equal(extra.severity, 'stuck');
-    // The POOL SIZE, not a second derivation of it. Written as `trays.size + freeTrays.length`
-    // first, which reads 0 of 0 for any state where a tray is neither free nor carrying a train.
-    assert.match(
-      extra.why,
-      new RegExp(`0 of ${crewTrayCount(2)} Crew Trays free`),
-      'the panel reported the wrong pool size',
-    );
-  });
-
-  it('says the same for a second section, which waits on the identical pool', () => {
-    const blocked = impediments(jammed(), 0 as PlayerIndex);
-    const second = blocked.find((b) => /Train 8\b/.test(b.where) && /second section/i.test(b.why));
-    assert.ok(second, 'an ordered second section was queued invisibly');
-    assert.match(second.why, /Crew Tray/);
-  });
-
-  it('says none of it once a tray is free, because then nothing is being waited on', () => {
-    const s = jammed();
-    s.freeTrays = ['tray0'];
-    const blocked = impediments(s, 0 as PlayerIndex);
-    assert.equal(
-      blocked.filter((b) => /Crew Tray/.test(b.why)).length,
-      0,
-      'a free tray still reported trains held for want of one',
-    );
-  });
-
-  it('is on the common board too — the pool is on the table, not in a hand', () => {
-    const pub = publicSnapshot(jammed()) as unknown as Record<string, unknown>;
-    assert.ok('crewTrays' in pub, 'a spectator cannot see the scarcity everyone at the table can');
-    assert.ok('queued' in pub);
-  });
-});
-
-/**
- * A TRAIN HELD AT THE LIMITS IS STILL ON THE BOARD (#99).
- *
- * The Interlocking enhancement is the designed answer to a full Office: instead of the automatic
- * collision of Gap 2d, "may stop an inbound train on the Limit Track" — the train is held inside the
- * player's Limits, and takes the first A/D track that frees, ahead of any newcomer.
- *
- * It was drawn NOWHERE. `arriveAtOffice` removes the tray from the Mainline node's `transits`
- * (advance.ts) and the Interlocking branch pushes it onto `area.heldAtLimits` without assigning
- * `tray.position` — so the map, which draws mainline nodes from `transits` and district squares from
- * `position.at === 'grid'`, has nothing to draw it from in either place. The train vanished off the
- * board on arrival and reappeared in the Office some Stages later.
- *
- * Measured before fixing: with the tray in `transits` the Interchange node carries its chip; with
- * the tray moved to `heldAtLimits` exactly as the engine moves it, the node's `trains` is empty and
- * no grid square has gained it.
- *
- * The fix is in the VIEW, not the engine. The engine's state is right — a held train is inside the
- * Limits and not on an A/D track, which is what `heldAtLimits` says — and `position` is left alone
- * deliberately, so nothing may treat the train as standing on a square it could be switched from.
- */
-describe('a train held at the Limits is drawn at the Limits (#99)', () => {
-  const held = (direction: 'east' | 'west') => {
-    const s = game();
-    const seat = seatOf(s, 0 as PlayerIndex);
-    const area = areaOf(s, 0 as PlayerIndex);
-    const trayId = s.freeTrays.pop()!;
-    const tray: CrewTray = {
-      id: trayId,
-      trainNumber: 5,
-      trainIsExtra: false,
-      engineAt: 0,
-      consist: [],
-      direction,
-      movesUsed: 0,
-      position: { at: 'mainline', index: 1 },
-    } as CrewTray;
-    s.trays.set(trayId, tray);
-    area.heldAtLimits.push(trayId);
-    return { s, seat, trayId, area };
-  };
-
-  it('draws it on the Limits square it is standing at, not nowhere', () => {
-    const { s, seat, trayId, area } = held('east');
-    const { cells } = projectDistrict(s, seat as SeatIndex);
-    const on = cells.filter((c) => c.trains.some((t) => t.trayId === trayId));
-    assert.equal(on.length, 1, 'a train held at the Limits is drawn on no square at all');
-    assert.equal(on[0]!.row, area.limitsWest.row, 'drawn at the wrong Limits');
-    assert.equal(on[0]!.col, area.limitsWest.col);
-  });
-
-  it('holds an EASTBOUND train at the western Limits, because that is the end it came in by', () => {
-    const { s, seat, area } = held('east');
-    const { cells } = projectDistrict(s, seat as SeatIndex);
-    const on = cells.find((c) => c.trains.length > 0)!;
-    assert.deepEqual({ row: on.row, col: on.col }, { row: area.limitsWest.row, col: area.limitsWest.col });
-  });
-
-  it('and a WESTBOUND train at the eastern Limits', () => {
-    const { s, seat, area } = held('west');
-    const { cells } = projectDistrict(s, seat as SeatIndex);
-    const on = cells.find((c) => c.trains.length > 0)!;
-    assert.deepEqual({ row: on.row, col: on.col }, { row: area.limitsEast.row, col: area.limitsEast.col });
-  });
-
-  it('says on the chip that it is HELD, so it is not read as a train free to switch', () => {
-    const { s, seat, trayId } = held('east');
-    const { cells } = projectDistrict(s, seat as SeatIndex);
-    const chip = cells.flatMap((c) => c.trains).find((t) => t.trayId === trayId)!;
-    assert.equal(chip.heldAtLimits, true, 'a held train looked exactly like one standing on the square');
-    assert.match(chip.what, /Interlocking|held/i, 'the chip does not say why it is standing there');
-  });
-
-  it('tells the district owner it is waiting, and what for', () => {
-    const { s } = held('east');
-    const blocked = impediments(s, 0 as PlayerIndex);
-    const b = blocked.find((x) => /Train 5/.test(x.where) && /Limits/i.test(x.why));
-    assert.ok(b, 'the blocked panel said nothing about a train held at the Limits');
-  });
-
-  it('does not invent a train on a square when nothing is held', () => {
-    const s = game();
-    const { cells } = projectDistrict(s, seatOf(s, 0 as PlayerIndex) as SeatIndex);
-    assert.equal(cells.flatMap((c) => c.trains).length, 0, 'a district with no trains drew one');
-  });
-});
-
-/**
- * THE CAMPAIGN TRAIN'S SPEECHES CHANGE ITS RULES, AND THE CARD HAS TO SAY WHICH HALF IT IS IN (#100).
- *
- * X17 is "one turn at station (speeches) then expedite". Its first Office arrival is an ordinary
- * stop; every arrival after that runs EXPEDITED, which means that if it is not back on the Office
- * square when the next Mainline Phase begins it is a Station Master fault costing 1 Revenue.
- *
- * `trainRules()` took `{ trainNumber, trainIsExtra }` — it could not see `speechMade` even though
- * both of its tray-side callers pass a whole `CrewTray` that has it. So the chip read identically
- * before and after, and worse: the "EXPEDITED — must be kept ready to highball… costs 1 Revenue"
- * warning is printed only under `rules.expedite`, so X17 became subject to a fault whose warning the
- * game shows to other trains and never to it.
- */
-describe('the Campaign Train says whether its speeches are made (#100)', () => {
-  const X17 = { trainNumber: 17, trainIsExtra: true } as const;
-
-  it('before the speeches, says they are still to come and does not claim it is expedited yet', () => {
-    const t = trainRules({ ...X17 });
-    assert.match(t, /SPEECHES/i);
-    assert.doesNotMatch(t, /costs 1 Revenue/, 'it warned of a fault the train is not yet subject to');
-  });
-
-  it('after the speeches, says it is expedited NOW and carries the fault it is now subject to', () => {
-    const t = trainRules({ ...X17, speechMade: true });
-    assert.match(t, /EXPEDITED/, 'a train that is now expedited did not say so');
-    assert.match(t, /costs 1 Revenue/, 'the fault warning is shown to other trains and not to this one');
-  });
-
-  it('reads differently before and after — the whole of the bug was that it did not', () => {
-    assert.notEqual(trainRules({ ...X17 }), trainRules({ ...X17, speechMade: true }));
-  });
-
-  it('still warns a permanently expedited train, which must not regress', () => {
-    const fast = trainRules({ trainNumber: 5, trainIsExtra: false });
-    assert.match(fast, /EXPEDITED/);
-    assert.match(fast, /costs 1 Revenue/);
-  });
-
-  it('says nothing about speeches for a train that has no such rule', () => {
-    assert.doesNotMatch(trainRules({ trainNumber: 5, trainIsExtra: false }), /SPEECHES/i);
-  });
-});
-
-/**
- * A DISPATCH DEVICE SAYS WHETHER IT IS STILL AVAILABLE TODAY (#101).
- *
- * Telegraph (+4), Telephone (+8) and Radio (+12) are "once a day, when dispatching facing trains,
- * add +N to the other train's number". The device is drawn on its card and its effect text is in the
- * tooltip — but `enhancementText(key)` takes only the KEY, so it could not vary with anything, and
- * the Radio read "once a day, add +12…" all Day after it had been spent. That is `trainRules` before
- * #100, in a different corner of the same view.
- *
- * THE SECOND HALF IS THE ONE THAT SURPRISES. `spendDispatchBonus` reads
- * `areaOf(s, s.clock.superintendent)` — the SUPERINTENDENT's own devices, not the train owner's —
- * and the Fedora moves every `STAGES_PER_SHIFT` Stages, four times a Day. So a player's Radio does
- * nothing at all for three-quarters of the Day, and is spent automatically, without being asked,
- * during the quarter it is theirs to use. The board said neither half.
- *
- * Shown on EVERY district (Jesse, 2026-09-07), not only the viewer's: it is public, and a rival's
- * spent Radio is exactly what you want to know before forcing a meet. `projectDistrict` serves both
- * the player's own cells and the common board's `districts`, so one change covers both.
- */
-describe('a dispatch device says whether it is still available today (#101)', () => {
-  /** Puts `key` on the first card of seat 0's district and returns the pieces to assert on. */
-  const withDevice = (key: string, opts: { spent?: boolean; fedora?: boolean } = {}) => {
-    const s = game();
-    const area = areaOf(s, 0 as PlayerIndex);
-    const card = [...area.grid.values()][0]!;
-    card.enhancements.push(key);
-    if (opts.spent) area.dispatchUsedToday.push(key);
-    // The Fedora is a PLAYER; give it to somebody whose seat is not this district's.
-    s.clock.superintendent = (opts.fedora ? 0 : 1) as PlayerIndex;
-    const seat = seatOf(s, 0 as PlayerIndex);
-    const cells = projectDistrict(s, seat as SeatIndex).cells;
-    const cell = cells.find((c) => c.enhancements.length > 0)!;
-    const i = cell.enhancementsWhat.findIndex((w) => new RegExp(key, 'i').test(w));
-    return { s, area, cell, what: cell.enhancementsWhat[i] ?? '', spent: cell.enhancementsSpent[i] };
-  };
-
-  it('reads as available before it is used, and says what it is worth', () => {
-    const { what, spent } = withDevice('radio', { fedora: true });
-    assert.equal(spent, false, 'an unused device reported itself spent');
-    assert.match(what, /\+12/, 'the device no longer says what it is worth');
-    assert.doesNotMatch(what, /spent/i, 'an unused device claimed it had been spent');
-  });
-
-  it('says so once it has been spent, and says when it comes back', () => {
-    const { what, spent } = withDevice('radio', { spent: true, fedora: true });
-    assert.equal(spent, true, 'a spent device still reported itself available');
-    assert.match(what, /spent/i, 'a spent device read exactly as it did before it was spent');
-    assert.match(what, /next Day|tomorrow/i, 'it does not say the device comes back');
-  });
-
-  it('reads differently spent and unspent — the whole of the bug was that it did not', () => {
-    assert.notEqual(
-      withDevice('telegraph', { fedora: true }).what,
-      withDevice('telegraph', { spent: true, fedora: true }).what,
-    );
-  });
-
-  it('says a device is idle while somebody else holds the Fedora', () => {
-    const { what } = withDevice('telephone');
-    assert.match(what, /Fedora|Superintendent/i, 'nothing said the device is only used while dispatching');
-  });
-
-  it('does not say that when this district IS the Superintendent', () => {
-    const { what } = withDevice('telephone', { fedora: true });
-    assert.doesNotMatch(what, /while .*holds? the Fedora/i);
-  });
-
-  /**
-   * EXACT equality, not "does not mention the Fedora". The first draft asserted the absence of
-   * /spent|Fedora/i with the Fedora held, and a mutation that removed the `dispatchBonus` guard
-   * altogether PASSED it — because the leaked text in that case reads "Available today, and this
-   * district is dispatching", which contains neither word. A test for a field being left alone has
-   * to compare it to what it should be.
-   */
-  it('leaves an enhancement that is not a dispatch device exactly as it was', () => {
-    for (const fedora of [true, false]) {
-      const { what, spent } = withDevice('interlocking', { fedora });
-      assert.equal(spent, false, 'a non-dispatch enhancement was marked spendable');
-      assert.equal(what, enhancementText('interlocking'), 'an Interlocking was given a dispatch caveat');
-    }
-  });
-
-  it('comes back when the Day turns, which is what clears the record', () => {
-    const { s, area } = withDevice('radio', { spent: true, fedora: true });
-    area.dispatchUsedToday = [];
-    const cell = projectDistrict(s, seatOf(s, 0 as PlayerIndex) as SeatIndex).cells.find(
-      (c) => c.enhancements.length > 0,
-    )!;
-    assert.equal(cell.enhancementsSpent.some((x) => x), false, 'a new Day did not restore the device');
-  });
-
-  /**
-   * SEAT IS NOT PLAYER INDEX, and this is the one place the two are joined: the Fedora is held by a
-   * PLAYER and the devices sit in an Office Area keyed by SEAT. `advance.ts` carried a comment
-   * warning that indexing one with the other was safe only while seating was the identity map — it
-   * read as a live bug and was not one, because `areaOf` resolves through `seatOf`. The comment is
-   * corrected; this is the guard, because the next reader deserves better than a claim.
-   *
-   * §4.4's D12 makes seating a real permutation, so a two-player game where player 1 sits in seat 0
-   * is ordinary rather than contrived.
-   */
-  it("marks the SUPERINTENDENT's own district as dispatching under non-identity seating", () => {
-    const s = game();
-    s.seating = [1, 0] as PlayerIndex[];
-    assert.notEqual(seatOf(s, 0 as PlayerIndex), 0, 'the premise is gone: seating is still identity');
-    s.clock.superintendent = 0 as PlayerIndex;
-
-    const mine = areaOf(s, 0 as PlayerIndex);
-    [...mine.grid.values()][0]!.enhancements.push('radio');
-    const other = areaOf(s, 1 as PlayerIndex);
-    [...other.grid.values()][0]!.enhancements.push('radio');
-
-    const whatAt = (player: PlayerIndex): string => {
-      const cells = projectDistrict(s, seatOf(s, player) as SeatIndex).cells;
-      return cells.find((c) => c.enhancements.length > 0)!.enhancementsWhat.join(' ');
-    };
-    // The Fedora is player 0's, whatever seat that is.
-    assert.doesNotMatch(whatAt(0 as PlayerIndex), /IDLE/, "the Superintendent's own device read as idle");
-    assert.match(whatAt(1 as PlayerIndex), /IDLE/, "somebody else's device read as dispatching");
-  });
-
-  it('is on every district of the common board, not only the viewer own', () => {
-    const { s } = withDevice('radio', { spent: true, fedora: true });
-    const pub = publicSnapshot(s);
-    const all = pub.districts.flatMap((d) => d.cells);
-    assert.ok(
-      all.some((c) => c.enhancementsSpent.some((x) => x)),
-      "a spectator cannot see which devices are spent in a player's district",
-    );
-  });
-});
-
-/**
- * THE RED FLAG HOLDER IS NOT A PER-PLAYER FACT, so it does not belong on the public player view.
- *
- * `docs/plans/jitsi-common-board.md` step 1 asks for one: "Add the Red Flag holder to the public
- * player projection. It is public game state but is currently absent from `Frame`", and its
- * `PublicPlayerView` carries `redFlagHeld: boolean`. Every other step-1 item shipped across v0.7.9.2
- * to v0.7.9.5; this one is STRUCK OFF instead, because the premise does not hold in this codebase.
- *
- * `decks.redFlags` is written in exactly one place — `setup.ts`, from
- * `config.optionalRules.emergencyToolbox` — and never again. There is no `.set` anywhere else, and
- * `redFlag.play` (the intent gated on holding one) emits a `phaseEnded` event and does not spend it.
- * So every player holds one or none of them does, decided before the first card is dealt.
- *
- * A `redFlagHeld` on each player would therefore be `optionalRules.emergencyToolbox` copied N times
- * — already on the public projection — while implying to every reader of the common board that it
- * varies by player and might change during a game. That is worse than the absence.
- *
- * This test exists so the plan item is not re-raised from the plan text: if the rule ever DOES
- * become per-player, this fails and the projection is the right place to look.
- */
-describe('the Red Flag holding is the Emergency Toolbox option, not a per-player fact', () => {
-  const dealt = (emergencyToolbox: boolean): GameState =>
-    createGame({
-      id: 'g',
-      seed: 99,
-      config: { ...config, optionalRules: { ...config.optionalRules, emergencyToolbox } },
-      playerNames: ['Ann', 'Bob', 'Cy'],
-    });
-
-  for (const toolbox of [true, false]) {
-    it(`gives every player the same answer with the toolbox ${toolbox ? 'on' : 'off'}`, () => {
-      const s = dealt(toolbox);
-      const held = s.players.map((p) => s.decks.redFlags.get(p.index) === true);
-      assert.deepEqual(held, [toolbox, toolbox, toolbox], 'the Red Flag has become a per-player fact');
-    });
-  }
-
-  it('is already public, through the option it comes from', () => {
-    const pub = publicSnapshot(dealt(true));
-    assert.equal(
-      pub.optionalRules.emergencyToolbox,
-      true,
-      'a spectator cannot tell whether the hand limit is three or four',
-    );
-  });
-});

test/enhancements.test.ts

@@ -14,16 +14,13 @@ import { applyIntent, areaOf, check, hasDistrictEnhancement, isProtectedFromDera
 import { ENHANCEMENT_RULES, enhancementRule, trainProfile } from '../src/engine/content.ts';
 import { createGame } from '../src/engine/setup.ts';
 import type { GameConfig, GameState, GridCoord, TrackCard } from '../src/engine/state.ts';
-import { coordKey, decisionActor, subdivisions, turnOf } from '../src/engine/state.ts';
+import { coordKey, subdivisions, turnOf } from '../src/engine/state.ts';
 
 const config: GameConfig = {
   mode: 'solitaire',
-  days: 5,
-  minCombinedRevenue: 0,
-  maxCollisionsPerDay: 0,
-  maxCollisionsTotal: 0,
-  pvpCardsAllowed: false,
-  optionalRules: { reducedVisibility: false, employeeRotation: false, emergencyToolbox: false },
+  victory: 'highestAfterDays',
+  length: 'standard',
+  optionalRules: { reducedVisibility: false, sisterTrains: false, employeeRotation: false, emergencyToolbox: false },
 };
 const game = (seed = 5): GameState => createGame({ id: 'g', seed, config, playerNames: ['p'] });
 const at = (row: number, col: number): GridCoord => ({ row, col });
@@ -287,124 +284,17 @@ describe('Interlocking and Yard Office relieve the Office', () => {
     assert.equal(s.players[0]!.revenue, -5);
   });
 
-  /**
-   * §11, THE YARD OFFICE (Gitea#5) — offered, not imposed, and only down a route that exists.
-   *
-   * Jesse: "you have to ask if non-coach trains wish to go in there, rather than to the office",
-   * "if the Yard Office is not accessible in one move, you should not get the option", and cars on
-   * the way in "result in a crash". All three were missing: the train was teleported onto the card.
-   */
-  const answer = (s: GameState, take: boolean) => {
-    const who = decisionActor(s);
-    assert.notEqual(who, null, 'nothing was pending, so there was nothing to answer');
-    const r = applyIntent(s, who!, { type: 'mainline.yardOffice', take });
-    assert.ok(r.ok, 'the district owner could not answer the Yard Office offer');
-    advance(s);
-  };
-
-  it('OFFERS the Yard Office to the district owner rather than diverting automatically', () => {
+  it('diverts a coachless train to the Yard Office', () => {
     const s = game();
     const card = straight();
     card.enhancements.push('yardOffice');
-    addCard(s, at(0, 2), card);
+    addCard(s, at(-1, 0), card);
     const id = inbound(s, [{ type: 'hopper', loaded: true }]);
 
     advance(s);
-    assert.equal(s.clock.pendingDecision?.kind, 'yardOffice', 'the phase did not stop to ask');
-    assert.equal(decisionActor(s), 0, 'the question went to the wrong player');
     const pos = s.trays.get(id)!.position;
-    assert.ok(pos.at !== 'grid' || pos.coord.col !== 2, 'the train moved before anyone answered');
-  });
-
-  it('takes the Yard Office when the owner says yes', () => {
-    const s = game();
-    const card = straight();
-    card.enhancements.push('yardOffice');
-    addCard(s, at(0, 2), card);
-    const id = inbound(s, [{ type: 'hopper', loaded: true }]);
-
-    advance(s);
-    answer(s, true);
-    const pos = s.trays.get(id)!.position;
-    assert.ok(pos.at === 'grid' && pos.coord.col === 2, 'did not arrive at the Yard Office');
-    assert.ok(!areaOf(s, 0).adOccupancy.includes(id), 'took an A/D track anyway');
-    assert.equal(s.players[0]!.revenue, 0, 'a clear lead should not have collided');
-  });
-
-  it('goes to the Train Order Office when the owner says no', () => {
-    // "They can of course still choose to have the train go to the standard office."
-    const s = game();
-    const card = straight();
-    card.enhancements.push('yardOffice');
-    addCard(s, at(0, 2), card);
-    const id = inbound(s, [{ type: 'hopper', loaded: true }]);
-
-    advance(s);
-    answer(s, false);
-    assert.ok(areaOf(s, 0).adOccupancy.includes(id), 'declining did not put it on an A/D track');
-  });
-
-  it('does not offer what cannot be reached, and says why in the history', () => {
-    /**
-     * Jesse, 2026-08-29: "make sure this is logged in history — why can't move so user knows why
-     * they can't get to yard." A silent absence is indistinguishable from a broken feature, which
-     * is how the missing reachability check survived this long.
-     */
-    const s = game();
-    const card = straight();
-    card.enhancements.push('yardOffice');
-    // Far off the Running Track, with nothing laid between: no route in one move.
-    addCard(s, at(3, 4), card);
-    inbound(s, [{ type: 'hopper', loaded: true }]);
-
-    const events = advance(s).events;
-    assert.equal(s.clock.pendingDecision, null, 'offered a Yard Office it cannot reach');
-    const said = events.find(
-      (e) => e.type === 'trainDiverted' && e.reason.includes('could not be offered'),
-    );
-    assert.ok(said, `nothing in the history explains why:\n${JSON.stringify(events, null, 1)}`);
-    assert.match(
-      (said as { reason: string }).reason,
-      /one move/,
-      'the reason does not say it is out of reach in one move',
-    );
-  });
-
-  it('offers a fouled lead, and taking it collides', () => {
-    /**
-     * The third missing condition. "Just like other trains finding cars on the tracks you use to
-     * get into either result in a crash" — and Jesse's ruling keeps the OFFER: a route that exists
-     * is offered, and the consequence of taking it is the player's. §8.3 already reads cars in the
-     * path of an arriving train as a collision rather than a coupling.
-     */
-    const s = game();
-    const card = straight();
-    card.enhancements.push('yardOffice');
-    addCard(s, at(0, 2), card);
-    // A car standing on the lead between the Office and the yard.
-    areaOf(s, 0).grid.get(coordKey(at(0, 1)))!.standing = [{ type: 'boxcar', loaded: false }];
-    const id = inbound(s, [{ type: 'hopper', loaded: true }]);
-
-    advance(s);
-    assert.equal(s.clock.pendingDecision?.kind, 'yardOffice', 'a fouled lead was not offered at all');
-
-    answer(s, true);
-    assert.equal(s.players[0]!.revenue, -5, 'running through standing cars did not collide');
-    assert.ok(!s.trays.has(id), 'the train survived the collision');
-  });
-
-  it('declining a fouled lead is safe — the standard Office is unaffected', () => {
-    const s = game();
-    const card = straight();
-    card.enhancements.push('yardOffice');
-    addCard(s, at(0, 2), card);
-    areaOf(s, 0).grid.get(coordKey(at(0, 1)))!.standing = [{ type: 'boxcar', loaded: false }];
-    const id = inbound(s, [{ type: 'hopper', loaded: true }]);
-
-    advance(s);
-    answer(s, false);
-    assert.equal(s.players[0]!.revenue, 0, 'declining the Yard Office still cost a collision');
-    assert.ok(areaOf(s, 0).adOccupancy.includes(id), 'the train did not reach the Office');
+    assert.ok(pos.at === 'grid' && pos.coord.row === -1, 'arrived at the Yard Office');
+    assert.ok(!areaOf(s, 0).adOccupancy.includes(id), 'did not take an A/D track');
   });
 
   it('does not divert a train carrying coaches', () => {

test/events.test.ts

@@ -47,38 +47,8 @@ const KNOWN_UNREDUCED = [
   'clearanceRequested',
   'dispatchBonusUsed',
   'expediteFault',
-  /**
-   * The New Train Phase's report that it could give a train nothing (playtest, 2026-09-16, the
-   * Sparrow running empty). Emitted by the phase driver after the make-up round has nothing left to
-   * offer, so it describes rather than reduces, like every entry on this list.
-   */
-  'makeUpShort',
   'phaseBegan',
-  /**
-   * §Q, Red Flags (Gitea#19). The flag comes down inside the phase driver as it stops a train, so
-   * this is described rather than reduced like everything else here.
-   *
-   * ADDED DELIBERATELY, and it cost a bug first: the flag was originally taken down in a `reduce`
-   * case, which never fires for an event `advance.ts` emits — so it stayed up and held every train
-   * that came. That is precisely the failure this list exists to make visible.
-   */
-  'redFlagSpent',
-  // Employee Rotation moves `seating` in the phase driver and then describes what it did, which is
-  // the pattern every entry on this list follows.
-  'seatsRotated',
   'stageBegan',
-  /**
-   * §5's Fedora handover, emitted by `shiftChange` on the same mutate-then-describe path as its
-   * neighbours here: the clock moves the Superintendent and then says so. Added 2026-09-16 because
-   * riding on `actorChanged` meant the log dropped it as turn bookkeeping.
-   */
-  'superintendentChanged',
-  /**
-   * The line that closes a switching turn. Emitted by `switch.end` beside the `phaseEnded` that
-   * actually ends the turn, and reduces to nothing itself: it reports what the Moves were spent on
-   * and where the crew was left, both of which the state already holds.
-   */
-  'switchingEnded',
   'trainArrived',
   'trainCompleted',
   'trainDiverted',

test/extended-play.test.ts

@@ -1,324 +0,0 @@
-/**
- * §3.3, EXTENDED PLAY — Gitea#11, "when game ends allow players to continue playing if they wish".
- *
- * The rule as Jesse specified it (2026-08-28), which is what these tests are written against:
- *
- *   - the OFFICIAL result is decided at the original game length and never changes. "In a five-day
- *     game, even if it's extended to eight or nine days, the winner and the official answer is the
- *     winner at the end of five days";
- *   - extending grants exactly ONE Day, and the question is put again at the end of it;
- *   - solitaire: the player decides alone. Multiplayer: unanimous, and one refusal ends it there;
- *   - only days-based endings offer it. A §3.4 collision breach is final, during an extended Day
- *     just as during the regular game.
- *
- * The persistence half matters as much as the rules half: a save is `{ seed, config, history }`
- * replayed through the engine, so an extension that is not an INTENT does not survive a reload, an
- * Undo, or a server restart. `replays the extension` below is the test that pins that.
- */
-
-import { describe, it } from 'node:test';
-import assert from 'node:assert/strict';
-
-import { advance, pump } from '../src/engine/advance.ts';
-import { applyIntent, check } from '../src/engine/apply.ts';
-import { STAGES_PER_DAY } from '../src/engine/content.ts';
-import { legalActions } from '../src/engine/legal.ts';
-import { createGame } from '../src/engine/setup.ts';
-import { currentActorOfState, publicSnapshot, snapshot } from '../src/sim/view.ts';
-import { currentActor } from '../src/web/game.ts';
-import { developerBot, playGame, randomBot } from '../src/sim/bot.ts';
-import type { GameConfig, GameState } from '../src/engine/state.ts';
-
-const baseConfig = (over: Partial<GameConfig> = {}): GameConfig => ({
-  mode: 'solitaire',
-  days: 3,
-  minCombinedRevenue: 0,
-  maxCollisionsPerDay: 0,
-  maxCollisionsTotal: 0,
-  pvpCardsAllowed: false,
-  optionalRules: { reducedVisibility: false, employeeRotation: false, emergencyToolbox: false },
-  ...over,
-});
-
-const game = (over: Partial<GameConfig> = {}, names = ['Jesse']): GameState =>
-  createGame({ id: 'g', seed: 1, config: baseConfig(over), playerNames: names });
-
-/** Parks a game on the last Stage of its final Day, so one `advance` runs the clock off the end. */
-function atTheEnd(s: GameState): GameState {
-  s.clock.day = s.config.days + s.extraDays + 1;
-  s.clock.stage = STAGES_PER_DAY;
-  s.clock.phase = 'shiftChange';
-  return s;
-}
-
-describe('§3.3 extended play — the ending pauses rather than stopping (Gitea#11)', () => {
-  it('offers another Day on a days-based ending, and records the result anyway', () => {
-    const s = atTheEnd(game());
-    advance(s);
-    assert.equal(s.status, 'awaitingExtension', 'a days-based ending did not offer another Day');
-    assert.ok(s.outcome, 'the result was not decided');
-    assert.ok(s.official, 'the official result was not frozen');
-    assert.equal(s.official!.day, s.config.days, 'the official Day is not the original game length');
-  });
-
-  it('does NOT offer another Day after a collision breach — §3.4 is final', () => {
-    const s = game({ mode: 'competitive', maxCollisionsPerDay: 2 });
-    s.collisionsToday = 2;
-    s.clock.stage = 1;
-    s.clock.phase = 'shiftChange';
-    advance(s);
-    assert.equal(s.status, 'finished', 'a railroad declared unsafe offered to carry on');
-    assert.equal(s.outcome!.reason, 'collisionFloor');
-  });
-
-  it('refuses every ordinary intent while the extension question is open', () => {
-    const s = atTheEnd(game());
-    advance(s);
-    assert.equal(check(s, 0, { type: 'draw.fromHomeOffice' }), 'WRONG_PHASE');
-    assert.equal(check(s, 0, { type: 'game.extend', player: 0, agree: true }), null, 'the vote itself was refused');
-  });
-
-  it('offers only the two votes, and only to a seat that has not voted', () => {
-    const s = atTheEnd(game({ mode: 'competitive' }, ['A', 'B']));
-    advance(s);
-    assert.deepEqual(
-      legalActions(s, 0).map((i) => i.type),
-      ['game.extend', 'game.extend'],
-      'something other than the vote is legal while the game is stopped',
-    );
-    applyIntent(s, 0, { type: 'game.extend', player: 0, agree: true });
-    assert.equal(legalActions(s, 0).length, 0, 'a seat was offered a second vote');
-    assert.equal(check(s, 0, { type: 'game.extend', player: 0, agree: true }), 'ALREADY_VOTED');
-    assert.equal(legalActions(s, 1).length, 2, 'the seat still to vote was not offered the vote');
-  });
-
-  it('refuses the vote when no extension is pending', () => {
-    const s = game();
-    assert.equal(check(s, 0, { type: 'game.extend', player: 0, agree: true }), 'NOT_AWAITING_EXTENSION');
-  });
-});
-
-describe('§3.3 extended play — one Day at a time (Gitea#11)', () => {
-  it('grants exactly one Day in solitaire, then asks again at the end of it', () => {
-    const s = atTheEnd(game());
-    advance(s);
-    const official = { ...s.official!.outcome };
-
-    applyIntent(s, 0, { type: 'game.extend', player: 0, agree: true });
-    assert.equal(s.status, 'active', 'agreeing did not resume play');
-    assert.equal(s.extraDays, 1, 'more or less than one Day was granted');
-    assert.deepEqual(s.extensionVotes, [null], 'the votes were not cleared for the next question');
-
-    // Run the extra Day off the end: the question comes round again.
-    atTheEnd(s);
-    advance(s);
-    assert.equal(s.status, 'awaitingExtension', 'the second ending did not ask again');
-    assert.equal(s.extraDays, 1, 'a second Day was granted without being asked for');
-    assert.deepEqual(s.official!.outcome, official, 'the official result was rewritten');
-    assert.equal(s.official!.day, s.config.days, 'the official Day moved with the extension');
-  });
-
-  it('ends the moment one seat declines, without waiting for the rest', () => {
-    const s = atTheEnd(game({ mode: 'competitive' }, ['A', 'B', 'C']));
-    advance(s);
-    applyIntent(s, 0, { type: 'game.extend', player: 0, agree: true });
-    assert.equal(s.status, 'awaitingExtension', 'one yes ended the vote');
-
-    applyIntent(s, 1, { type: 'game.extend', player: 1, agree: false });
-    assert.equal(s.status, 'finished', 'a refusal did not end the game immediately');
-    assert.equal(s.extraDays, 0, 'a Day was granted despite a refusal');
-    assert.equal(check(s, 2, { type: 'game.extend', player: 2, agree: true }), 'NOT_AWAITING_EXTENSION',
-      'the seat that never voted is still being waited on');
-  });
-
-  it('needs every seat before it grants the Day', () => {
-    const s = atTheEnd(game({ mode: 'competitive' }, ['A', 'B', 'C']));
-    advance(s);
-    applyIntent(s, 0, { type: 'game.extend', player: 0, agree: true });
-    applyIntent(s, 1, { type: 'game.extend', player: 1, agree: true });
-    assert.equal(s.status, 'awaitingExtension', 'two of three votes granted the Day');
-    applyIntent(s, 2, { type: 'game.extend', player: 2, agree: true });
-    assert.equal(s.status, 'active', 'a unanimous table was not given its Day');
-    assert.equal(s.extraDays, 1);
-  });
-
-  it('keeps the official result when a collision ends an EXTENDED Day', () => {
-    // The case the freeze exists for: a railroad declared unsafe on the extra Day does not retract
-    // who won on the last scheduled one.
-    const s = atTheEnd(game({ mode: 'competitive', maxCollisionsPerDay: 2 }, ['A', 'B']));
-    s.players[0]!.revenue = 9;
-    s.players[1]!.revenue = 2;
-    advance(s);
-    const official = { ...s.official!.outcome };
-    assert.equal(official.result, 'win');
-    assert.equal(official.winner, 0);
-
-    applyIntent(s, 0, { type: 'game.extend', player: 0, agree: true });
-    applyIntent(s, 1, { type: 'game.extend', player: 1, agree: true });
-    assert.equal(s.status, 'active');
-
-    s.collisionsToday = 2;
-    s.clock.stage = 1;
-    s.clock.phase = 'shiftChange';
-    advance(s);
-    assert.equal(s.status, 'finished');
-    assert.equal(s.outcome!.reason, 'collisionFloor', 'the current evaluation was not updated');
-    assert.deepEqual(s.official!.outcome, official, 'a late collision rewrote a recorded win');
-  });
-
-  it('decides the winner at the ORIGINAL game length, whoever leads afterwards', () => {
-    const s = atTheEnd(game({ mode: 'competitive' }, ['A', 'B']));
-    s.players[0]!.revenue = 9;
-    s.players[1]!.revenue = 2;
-    advance(s);
-    assert.equal(s.official!.outcome.winner, 0);
-    assert.deepEqual(s.official!.revenues, [9, 2], 'the official standings were not frozen');
-
-    applyIntent(s, 0, { type: 'game.extend', player: 0, agree: true });
-    applyIntent(s, 1, { type: 'game.extend', player: 1, agree: true });
-
-    // B overtakes A during the extra Day, and it changes nothing official.
-    s.players[1]!.revenue = 40;
-    atTheEnd(s);
-    advance(s);
-    assert.equal(s.official!.outcome.winner, 0, 'overtaking after the timetable took the win');
-    assert.deepEqual(s.official!.revenues, [9, 2], 'the frozen standings moved');
-    assert.equal(s.outcome!.winner, 1, 'the informational evaluation did not follow the new leader');
-  });
-});
-
-describe('§3.3 extended play — it survives being replayed (Gitea#11)', () => {
-  it('reproduces an extended game from seed and intents alone', () => {
-    // The reason the vote is an intent at all. A save is a replay, so a decision that is not in the
-    // history did not happen — an extended game would evaporate on the next reload.
-    const play = (): GameState => {
-      const s = atTheEnd(game());
-      advance(s);
-      applyIntent(s, 0, { type: 'game.extend', player: 0, agree: true });
-      return s;
-    };
-    const a = play();
-    const b = play();
-    assert.equal(a.extraDays, b.extraDays);
-    assert.equal(a.status, b.status);
-    assert.deepEqual(a.official!.outcome, b.official!.outcome);
-  });
-
-  it('narrates the vote, so a table can see who called time', () => {
-    const s = atTheEnd(game({ mode: 'competitive' }, ['A', 'B']));
-    advance(s);
-    const yes = applyIntent(s, 0, { type: 'game.extend', player: 0, agree: true });
-    assert.ok(yes.ok);
-    assert.deepEqual(yes.events.map((e) => e.type), ['extensionVoted']);
-    const no = applyIntent(s, 1, { type: 'game.extend', player: 1, agree: false });
-    assert.ok(no.ok);
-    assert.deepEqual(no.events.map((e) => e.type), ['extensionVoted', 'playConcluded']);
-  });
-
-  it('announces the granted Day', () => {
-    const s = atTheEnd(game());
-    advance(s);
-    const r = applyIntent(s, 0, { type: 'game.extend', player: 0, agree: true });
-    assert.ok(r.ok);
-    assert.deepEqual(r.events.map((e) => e.type), ['extensionVoted', 'dayExtended']);
-    const extended = r.events.find((e) => e.type === 'dayExtended');
-    assert.equal(extended && 'day' in extended ? extended.day : null, s.config.days + 1);
-  });
-});
-
-describe('§3.3 extended play — bots play the timetable they were dealt (Gitea#11)', () => {
-  it('REGRESSION: a simulated game terminates whatever the policy would vote', () => {
-    /**
-     * `playGame` declines on the driver's own account rather than leaving it to the policy, and this
-     * is why. `randomBot` picks uniformly among its legal options, so it takes another Day about
-     * half the time — and since a table may go on granting Days for ever, the game then runs to
-     * `maxTurns`. It did: `test/sim.test.ts` went from under a second to an unbounded hang, every
-     * seeded game in the harness playing fifty thousand turns instead of a couple of hundred.
-     *
-     * `randomBot` is the policy that exposes it, but the guarantee has to hold for any policy,
-     * including ones not written yet — hence the fix living in the driver and the test living here.
-     */
-    const s = createGame({ id: 'g', seed: 9, config: baseConfig({ days: 1 }), playerNames: ['Jesse'] });
-    const out = playGame(s, randomBot(7), pump, 4_000);
-    assert.equal(s.status, 'finished', 'a simulated game did not finish');
-    assert.equal(s.extraDays, 0, 'the harness played Days the game was not dealt');
-    assert.ok(out.turns < 4_000, `ran to the turn cap (${out.turns}) instead of ending`);
-  });
-
-  it('developerBot declines, so a bot-only game ends on schedule', () => {
-    // "If only bots are playing, they never vote to extend" (Jesse, 2026-08-28). The server votes
-    // yes on a bot's behalf once every human has already agreed; this policy is what is left when
-    // there are no humans to follow.
-    const s = atTheEnd(game());
-    advance(s);
-    const choice = developerBot.choose(s, 0, legalActions(s, 0));
-    assert.equal(choice.type, 'game.extend');
-    assert.equal('agree' in choice ? choice.agree : null, false, 'a bot asked for another Day');
-  });
-});
-
-/**
- * §3.3 — WHO THE SCREEN SAYS THE TABLE IS WAITING ON, while the vote is open.
- *
- * The vote is PARALLEL, and `apply.ts` says so where it accepts one: "open to every seat at once:
- * it is a table decision rather than a ruling, so THERE IS NO ACTOR TO BE". Any seat that has not
- * voted may vote at any moment, in any order, and one refusal ends it. So the honest answer to "who
- * are we waiting on" is every un-voted seat — which is exactly what the vote tally beside the chart
- * already draws — and the honest answer to "whose turn is it" is nobody.
- *
- * The engine gave that answer and the screen did not. `currentActor(game)` guards on
- * `status !== 'active'` and returned null; `actingPlayer(state)` has no such guard and returned
- * `clock.currentActor`, which still holds whoever moved last before the timetable ran out. The
- * frame took the second, so the turn chart named one arbitrary seat — the last to act, who has no
- * more claim on the vote than anybody else — while the tally underneath correctly showed three
- * seats outstanding.
- *
- * The fourth of these in a row after Gitea#21, #22 and #94, and the first found by asking the
- * question of a state the game is not ACTIVE in. See TODO #96.
- */
-describe('§3.3 extended play — the vote has no actor (#96)', () => {
-  const table = (): GameState => {
-    const s = atTheEnd(game({ mode: 'competitive' }, ['Ann', 'Bob', 'Cy']));
-    advance(s);
-    assert.equal(s.status, 'awaitingExtension', 'the table is not being asked');
-    return s;
-  };
-
-  it('reports nobody acting while the vote is open, to a player and to a spectator alike', () => {
-    const s = table();
-    assert.notEqual(s.clock.currentActor, null, 'the premise is gone: nothing was left on the clock');
-
-    assert.equal(currentActorOfState(s), null, 'the engine named an actor during a parallel vote');
-    assert.equal(
-      snapshot(s, [], null, null, null, false, 0).actor,
-      null,
-      'the turn chart named a seat while the whole table was voting',
-    );
-    assert.equal(publicSnapshot(s).actor, null, 'the common board named a seat during the vote');
-  });
-
-  it('agrees with the session, which is the half that decides what is legal', () => {
-    // The disagreement is the bug, not either answer on its own: `currentActor` is what refuses an
-    // intent, so a screen that names somebody it would refuse is telling the table to wait on a
-    // player who cannot act.
-    const s = table();
-    const g = { state: s, log: [] } as unknown as Parameters<typeof currentActor>[0];
-    assert.equal(currentActorOfState(s), currentActor(g), 'the screen and the session disagree');
-  });
-
-  it('still names the actor during ordinary play, which is the case that must not regress', () => {
-    const s = game({ mode: 'competitive' }, ['Ann', 'Bob', 'Cy']);
-    pump(s);
-    assert.equal(s.status, 'active', 'the premise is gone: the game is not running');
-    assert.equal(currentActorOfState(s), s.clock.currentActor, 'an active game lost its actor');
-    assert.equal(snapshot(s, [], null, null, null, false, 0).actor, s.clock.currentActor);
-  });
-
-  it('reports nobody once the table has declined and the game is finished', () => {
-    const s = table();
-    applyIntent(s, 1, { type: 'game.extend', player: 1, agree: false });
-    assert.equal(s.status, 'finished', 'a refusal did not end it');
-    assert.equal(currentActorOfState(s), null, 'a finished game still had somebody to move');
-    assert.equal(publicSnapshot(s).actor, null, 'the common board named a seat after the game ended');
-  });
-});

test/frame-delta.test.ts

@@ -1,86 +0,0 @@
-import { describe, it } from 'node:test';
-import assert from 'node:assert/strict';
-
-import { areaOf } from '../src/engine/apply.ts';
-import { createGame } from '../src/engine/setup.ts';
-import { coordKey } from '../src/engine/state.ts';
-import type { GameConfig, GameState } from '../src/engine/state.ts';
-import { applyDelta, deltaFrame } from '../src/sim/frame-delta.ts';
-import { snapshot } from '../src/sim/view.ts';
-
-const config: GameConfig = {
-  mode: 'solitaire',
-  days: 5,
-  minCombinedRevenue: 0,
-  maxCollisionsPerDay: 0,
-  maxCollisionsTotal: 0,
-  pvpCardsAllowed: false,
-  optionalRules: {
-    reducedVisibility: false,
-    employeeRotation: false,
-    emergencyToolbox: false,
-  },
-};
-
-const game = (seed = 1): GameState => createGame({ id: 'g', seed, config, playerNames: ['a'] });
-
-describe('deltaFrame — the live one-step-back board diff', () => {
-  it('nulls cells/facilities/division when the board has not changed, keeps everything else', () => {
-    const s = game();
-    const first = snapshot(s, [], null);
-    s.players[0]!.revenue = 42; // a non-board change
-    const second = snapshot(s, [], null);
-
-    const delta = deltaFrame(first, second);
-    assert.equal(delta.cells, null, 'unchanged cells were not nulled');
-    assert.equal(delta.facilities, null, 'unchanged facilities were not nulled');
-    assert.equal(delta.division, null, 'unchanged division was not nulled');
-    assert.equal(delta.revenue, 42, 'a real change was dropped along with the unchanged board');
-  });
-
-  it('sends the real board when it changed', () => {
-    const s = game();
-    const first = snapshot(s, [], null);
-    const area = areaOf(s, 0);
-    area.grid.set(coordKey({ row: area.runningRow - 1, col: 0 }), {
-      geometry: { kind: 'track', geometry: 'straight' },
-      baseOperationalRail: true, standing: [], standingWest: 0, facility: null, modifiers: [], enhancements: [],
-    });
-    const second = snapshot(s, [], null);
-
-    const delta = deltaFrame(first, second);
-    assert.notEqual(delta.cells, null, 'a real board change was nulled');
-    assert.deepEqual(delta.cells, second.cells);
-  });
-
-  it('never nulls anything on a first connect (no previous Frame)', () => {
-    const s = game();
-    const frame = snapshot(s, [], null);
-    const delta = deltaFrame(null, frame);
-    assert.deepEqual(delta.cells, frame.cells);
-    assert.deepEqual(delta.facilities, frame.facilities);
-    assert.deepEqual(delta.division, frame.division);
-  });
-
-  it('applyDelta round-trips: merge(delta(A, B)) against A reconstructs B exactly', () => {
-    const s = game();
-    const a = snapshot(s, [], null);
-    s.players[0]!.revenue = 7;
-    const area = areaOf(s, 0);
-    area.grid.set(coordKey({ row: area.runningRow - 1, col: 1 }), {
-      geometry: { kind: 'track', geometry: 'straight' },
-      baseOperationalRail: true, standing: [], standingWest: 0, facility: null, modifiers: [], enhancements: [],
-    });
-    const b = snapshot(s, [], null);
-
-    const merged = applyDelta(a, deltaFrame(a, b));
-    assert.deepEqual(merged, b);
-  });
-
-  it('throws rather than silently reconstructing garbage when previous is missing but the delta says "unchanged"', () => {
-    const s = game();
-    const frame = snapshot(s, [], null);
-    const delta = deltaFrame(frame, frame); // everything nulled, since nothing changed
-    assert.throws(() => applyDelta(null, delta));
-  });
-});

test/harness.test.ts

@@ -29,13 +29,11 @@ const root = join(dirname(fileURLToPath(import.meta.url)), '..');
 
 const config: GameConfig = {
   mode: 'solitaire',
-  days: 5,
-  minCombinedRevenue: 0,
-  maxCollisionsPerDay: 0,
-  maxCollisionsTotal: 0,
-  pvpCardsAllowed: false,
+  victory: 'highestAfterDays',
+  length: 'standard',
   optionalRules: {
     reducedVisibility: false,
+    sisterTrains: false,
     employeeRotation: false,
     emergencyToolbox: false,
   },
@@ -228,28 +226,14 @@ describe('the game conserves Rolling Stock', () => {
       for (let t = 0; t < 50_000; t++) {
         const before = census(s);
         const pumped = pump(s);
-        /**
-         * A COLLISION DESTROYS NO CAR, and this used to assume it destroyed all of them.
-         *
-         * The subtraction that stood here — `expected -= tr.consist.length` for every train in a
-         * `trainsDestroyed` event — describes a rule the engine does not have. Gap 2c (`advance.ts`,
-         * "TAKE THE WRECK OFF THE CARD") sends the wreck's cabooses back to the Division Yard and
-         * everything else to Classification, so the stock is conserved through a collision like any
-         * other move. The train is destroyed; its cars are not.
-         *
-         * It passed for as long as it did because none of the six seeds below ever collided, so the
-         * branch never ran. Changing the deck to the sheet's counts (Gitea#14) moved the deals, seed
-         * 24757 collided, and the test failed claiming the engine had CONJURED three cars — the
-         * exact opposite of what had happened.
-         *
-         * So the census is now held flat, unconditionally, which is both the real invariant and a
-         * stronger test than the one it replaces: there is no longer any event that excuses a
-         * change, and `expected` cannot drift away from the supply it was dealt.
-         */
-        assert.equal(
-          census(s),
-          before,
-          `seed ${seed}: the engine changed the census by ${census(s) - before} while pumping`,
+        // §10 — a collision destroys both trains and everything they were carrying. That is the one
+        // legitimate way the count falls, so the expectation follows it down.
+        for (const e of pumped) {
+          if (e.type === 'trainsDestroyed') for (const tr of e.trains) expected -= tr.consist.length;
+        }
+        assert.ok(
+          census(s) === before || pumped.some((e) => e.type === 'trainsDestroyed'),
+          `seed ${seed}: the engine changed the census by ${census(s) - before} outside a collision`,
         );
         if (s.status === 'finished') break;
         const actor = s.clock.pendingDecision !== null ? s.clock.superintendent : s.clock.currentActor;
@@ -304,18 +288,7 @@ describe('every published replay actually replays', () => {
         `${f} is dead — it replays ${back.history.length} of ${save.history.length} intents. ` +
           'Re-record it with save-replay.ts rather than editing the file.',
       );
-      /**
-       * `awaitingExtension` counts as the end since Gitea#11 — and for a published file it is the
-       * EXPECTED end. These saves were recorded before extended play existed, so their histories
-       * carry no `game.extend` vote: replaying one runs the timetable out and stops on the question
-       * nobody was there to answer. That is a game that reached the end of its own history, which is
-       * what this test is about. `active` would still be a dead replay.
-       */
-      assert.ok(
-        back.state.status === 'finished' || back.state.status === 'awaitingExtension',
-        `${f} does not reach the end of its game — status ${back.state.status}`,
-      );
-      assert.ok(back.state.official !== null, `${f} ends without recording a result`);
+      assert.equal(back.state.status, 'finished', `${f} does not reach the end of its game`);
     }
   });
 });

test/mainline-cards.test.ts

@@ -12,7 +12,6 @@
 import { describe, it } from 'node:test';
 import assert from 'node:assert/strict';
 
-import type { MainlineKind } from '../src/engine/content.ts';
 import { advance } from '../src/engine/advance.ts';
 import { applyIntent, areaOf, check } from '../src/engine/apply.ts';
 import { legalActions } from '../src/engine/legal.ts';
@@ -28,36 +27,19 @@ import {
 import { createGame } from '../src/engine/setup.ts';
 import type { GameEvent } from '../src/engine/events.ts';
 import type { GameConfig, GameState, GridCoord, TrackCard } from '../src/engine/state.ts';
-import { coordKey, decisionActor, turnOf } from '../src/engine/state.ts';
+import { coordKey, turnOf } from '../src/engine/state.ts';
 import { snapshot } from '../src/sim/view.ts';
 
 const config: GameConfig = {
   mode: 'solitaire',
-  days: 5,
-  minCombinedRevenue: 0,
-  maxCollisionsPerDay: 0,
-  maxCollisionsTotal: 0,
-  pvpCardsAllowed: false,
-  optionalRules: { reducedVisibility: false, employeeRotation: false, emergencyToolbox: false },
+  victory: 'highestAfterDays',
+  length: 'standard',
+  optionalRules: { reducedVisibility: false, sisterTrains: false, employeeRotation: false, emergencyToolbox: false },
 };
 const game = (seed = 5): GameState => createGame({ id: 'g', seed, config, playerNames: ['p'] });
 const at = (row: number, col: number): GridCoord => ({ row, col });
 
 /** Puts a card of `kind`/`key` in hand and returns its id. */
-/**
- * Puts a specific rules card in hand and returns its id, MINTING ONE IF THE DECK NO LONGER DEALS IT.
- *
- * A card at `copies: 0` is still a card: the catalogue keeps its row and the engine keeps its rule,
- * so the design stays visible and the mechanic works the moment it is dealt again. Poling and the
- * sharp curves have been treated that way for a while, and Gitea#14 put the dispatching ladder,
- * Facing Point Locks, Flying Switch, Section House and Vandalism there too — none of them are in
- * `docs/Deck cards5.xlsx`.
- *
- * This used to throw when it could not find one, which made "dealt zero copies" and "deleted"
- * indistinguishable from a test's point of view: zeroing Flying Switch took five passing tests of a
- * rule that had not changed at all down with it. Minting keeps the rule under test independently of
- * whether the deck currently deals the card, which is the whole reason for keeping the row.
- */
 function hand(s: GameState, kind: string, key: string): string {
   for (const [id, card] of s.cards) {
     const k = card.kind as { kind: string; key?: string };
@@ -66,10 +48,7 @@ function hand(s: GameState, kind: string, key: string): string {
       return id;
     }
   }
-  const id = `zero-copy-${kind}-${key}`;
-  s.cards.set(id, { id, kind: { kind, key } } as never);
-  s.decks.hands.set(0, [id]);
-  return id;
+  throw new Error(`no ${kind} card: ${key}`);
 }
 
 /**
@@ -108,124 +87,53 @@ function drawTurn(s: GameState): void {
 
 // ---------------------------------------------------------------------------
 
-/**
- * Crossing time on the region model (Gitea#3). `cross` fills in the parts each test does not care
- * about, so the numbers below read as the table RAR gave rather than as argument lists.
- */
-const cross = (
-  kind: Parameters<typeof crossingStages>[0],
-  over: Partial<Parameters<typeof crossingStages>[1]> = {},
-): number =>
-  crossingStages(kind, {
-    trainSpeed: 'fast',
-    direction: 'east',
-    gradeUp: 'east',
-    modifiers: [],
-    ...over,
-  });
-
-describe('a card costs one Stage per printed region (Gitea#3)', () => {
-  /**
-   * RAR, 2026-08-26, and this REPLACES the two rules that were here before — Q1, "the printed 60/30
-   * are mph expressed as crossing time", and Q2, "a Slow train adds one Stage to every card".
-   *
-   * "Ignore speed signs, they are just graphics. Regions shown on cards indicate how many stages it
-   * takes to cross. Plains is 1. Double track is 1, tunnel is 2, curves is 2, heavy grade is 3
-   * unless you have help."
-   *
-   * The report that opened the issue was a Slow train taking two Stages to clear Double Track. Q2 is
-   * what did that, and it is gone.
-   */
-  it('crosses in the number of regions the card prints, whatever the train', () => {
-    for (const speed of ['fast', 'slow'] as const) {
-      assert.equal(cross('plains', { trainSpeed: speed }), 1, `plains, ${speed}`);
-      assert.equal(cross('doubleTrack', { trainSpeed: speed }), 1, `double track, ${speed}`);
-      assert.equal(cross('trestle', { trainSpeed: speed }), 1, `trestle, ${speed}`);
-      assert.equal(cross('curves', { trainSpeed: speed }), 2, `curves, ${speed}`);
-      assert.equal(cross('tunnel', { trainSpeed: speed }), 2, `tunnel, ${speed}`);
-      assert.equal(cross('heavyGrade', { trainSpeed: speed }), 3, `heavy grade, ${speed}`);
-    }
-  });
-
-  it('reads Fast/Slow on Hilly and on nothing else', () => {
-    // "Some cards say fast / slow… Fast / Slow does not apply to every card — just those that say
-    // fast / slow on them. Currently this is only hilly." A fast train starts in the second region.
-    assert.equal(cross('hilly', { trainSpeed: 'fast' }), 1);
-    assert.equal(cross('hilly', { trainSpeed: 'slow' }), 2);
-  });
-
-  it('does not read the consist any more', () => {
-    // Hilly used to take its split off the printed P60/F30 and decide by whether the train carried a
-    // coach, so a fast freight crossed slower than a slow passenger train. RAR: "I notice that you
-    // are basing stages in mainline cards off coach/non-coach. Actually, all trains are rated as
-    // FAST and SLOW." `crossingStages` no longer takes a consist at all — this test is here so the
-    // deletion is deliberate rather than incidental.
-    assert.equal(cross('hilly', { trainSpeed: 'fast' }), cross('hilly', { trainSpeed: 'fast' }));
-  });
-
-  it('runs a train through a siding or an Interchange in one Stage', () => {
-    // Both print a back region that is not part of the road, so a train passing through starts past
-    // it. What that region is FOR is tested below and in the collision tests.
-    assert.equal(cross('uncontrolledSiding'), 1);
-    assert.equal(cross('interchange'), 1);
-  });
-
-  it('costs the extra Stage to anything starting in that back region', () => {
-    // The Uncontrolled Siding with a train already on it, and an Extra beginning its run at an
-    // Interchange. Both start at the back and have the whole card to run.
-    assert.equal(cross('uncontrolledSiding', { startsAtBack: true }), 2);
-    assert.equal(cross('interchange', { startsAtBack: true }), 2);
-  });
-});
-
-describe('grade modifiers move the start, not the clock', () => {
-  it('a Heavy Grade takes three Stages bare', () => {
-    // Three regions, up from the two the old 30mph reading gave it.
-    assert.equal(cross('heavyGrade'), 3);
+describe('grade modifiers change crossing time', () => {
+  it('a Heavy Grade takes two Stages bare', () => {
+    assert.equal(crossingStages('heavyGrade', 'fast', false), 2);
   });
 
   it('Brakeman speeds the descent but not the climb', () => {
-    // Q11 — the card prints "(Up)" and "Player sets orientation", so `gradeUp` is which way is
-    // UPHILL. With up = east, a westbound train is descending.
-    assert.equal(cross('heavyGrade', { modifiers: ['brakeman'], direction: 'west' }), 2);
-    assert.equal(cross('heavyGrade', { modifiers: ['brakeman'], direction: 'east' }), 3);
+    // Q11 — the card prints "(Up)" and "Player sets orientation", so the last argument is which
+    // way is UPHILL. With up = east, a westbound train is descending.
+    assert.equal(crossingStages('heavyGrade', 'fast', false, ['brakeman'], 'west', 'east'), 1);
+    assert.equal(crossingStages('heavyGrade', 'fast', false, ['brakeman'], 'east', 'east'), 2);
   });
 
-  it('follows the orientation the card was dealt, not a fixed compass direction', () => {
-    // The same train on the same card, with the card turned around.
-    assert.equal(cross('heavyGrade', { modifiers: ['brakeman'], direction: 'east', gradeUp: 'west' }), 2);
-    assert.equal(cross('heavyGrade', { modifiers: ['brakeman'], direction: 'west', gradeUp: 'west' }), 3);
-    assert.equal(cross('heavyGrade', { modifiers: ['helpers'], direction: 'west', gradeUp: 'west' }), 2);
-    assert.equal(cross('heavyGrade', { modifiers: ['helpers'], direction: 'east', gradeUp: 'west' }), 3);
+  it('follows the orientation the player chose, not a fixed compass direction', () => {
+    // The same train on the same card, with the card turned around: Brakeman helps a westbound
+    // train on an east-climbing grade, and an eastbound one when the grade climbs west.
+    assert.equal(crossingStages('heavyGrade', 'fast', false, ['brakeman'], 'east', 'west'), 1);
+    assert.equal(crossingStages('heavyGrade', 'fast', false, ['brakeman'], 'west', 'west'), 2);
+    assert.equal(crossingStages('heavyGrade', 'fast', false, ['helpers'], 'west', 'west'), 1);
+    assert.equal(crossingStages('heavyGrade', 'fast', false, ['helpers'], 'east', 'west'), 2);
   });
 
   it('Helpers speed the climb but not the descent', () => {
-    // RAR: "helpers… helps all trains going up hill by starting 1 region easier — so 2 to traverse,
-    // not 3."
-    assert.equal(cross('heavyGrade', { modifiers: ['helpers'], direction: 'east' }), 2);
-    assert.equal(cross('heavyGrade', { modifiers: ['helpers'], direction: 'west' }), 3);
+    assert.equal(crossingStages('heavyGrade', 'fast', false, ['helpers'], 'east', 'east'), 1);
+    assert.equal(crossingStages('heavyGrade', 'fast', false, ['helpers'], 'west', 'east'), 2);
   });
 
-  it('Airbrakes stack on top of Brakeman', () => {
-    // "Airbrakes is an upgrade from brakemen (which must be played first)", so a fully-equipped
-    // grade is one Stage downhill — and `check` refuses Airbrakes without Brakeman already there.
-    assert.equal(cross('heavyGrade', { direction: 'west' }), 3);
-    assert.equal(cross('heavyGrade', { modifiers: ['brakeman'], direction: 'west' }), 2);
-    assert.equal(cross('heavyGrade', { modifiers: ['brakeman', 'airbrakes'], direction: 'west' }), 1);
+  it('Airbrakes stack with Brakeman on a slow train', () => {
+    // A slow train pays 3 on a grade; Brakeman and Airbrakes take one Stage each.
+    assert.equal(crossingStages('heavyGrade', 'slow', false, [], 'west', 'east'), 3);
+    assert.equal(crossingStages('heavyGrade', 'slow', false, ['brakeman'], 'west', 'east'), 2);
+    assert.equal(
+      crossingStages('heavyGrade', 'slow', false, ['brakeman', 'airbrakes'], 'west', 'east'),
+      1,
+    );
   });
 
   it('never lets a train cross in no time', () => {
-    // Three modifiers on a three-region card would otherwise put the start past the far edge.
     assert.equal(
-      cross('heavyGrade', { modifiers: ['brakeman', 'airbrakes', 'helpers'], direction: 'west' }),
+      crossingStages('heavyGrade', 'fast', false, ['brakeman', 'airbrakes'], 'west', 'east'),
       1,
     );
   });
 
   it('leaves non-grade cards alone', () => {
     // Brakeman on Plains would be an illegal placement anyway; the maths must not move regardless.
-    assert.equal(cross('plains', { modifiers: ['brakeman'], direction: 'west' }), 1);
-    assert.equal(cross('curves', { modifiers: ['helpers'] }), 2);
+    assert.equal(crossingStages('plains', 'fast', false, ['brakeman'], 'west', 'east'), 1);
+    assert.equal(crossingStages('curves', 'fast', false, ['helpers'], 'east', 'east'), 2);
   });
 });
 
@@ -298,8 +206,8 @@ describe('Realignment converts one Mainline type to another', () => {
 
     assert.ok(r.ok);
     assert.equal(node.card, 'plains', 'Curves realigns to Plains');
-    // The point of the card: Curves prints two regions, Plains one, so realigning halves the time.
-    assert.equal(cross(node.card), 1);
+    // The point of the card: Curves is a 30 (two Stages), Plains a 60 (one).
+    assert.equal(crossingStages(node.card, 'fast', false), 1);
   });
 
   it('refuses a card with no conversion listed', () => {
@@ -317,177 +225,77 @@ describe('Realignment converts one Mainline type to another', () => {
   });
 });
 
-describe('Red Flags hold a train out of your Limits (Gitea#19)', () => {
-  /**
-   * REPLACES the old rule outright (Jesse, 2026-08-29). Red Flags used to be played on a stopped
-   * train out on the Mainline and protected it from a rear-ender — measured at 4,212 offers and 4
-   * plays across 600 games, a mechanic nobody used. ABS Signals already does that job better.
-   *
-   * Now: "If played, asked FLAG EAST or FLAG WEST. That stops all trains from entering your limits
-   * from that direction (i.e. Flag East holds westbound trains)." Spent on the train it stops —
-   * one card, one train.
-   */
-
-  /** A westbound train one Stage from entering seat 0's district from the east. */
-  function approaching(s: GameState) {
-    const officeIndex = s.division.nodes.findIndex((n) => n.kind === 'office' && n.seat === 0);
-    const node = pinned(s, officeIndex + 1, 'plains');
-    node.transits.push({ tray: 'inbound', stagesRemaining: 1, stagesTotal: 1, direction: 'west' });
-    s.trays.set('inbound', {
-      id: 'inbound', trainNumber: 9, trainIsExtra: false, engineAt: 0,
-      consist: [{ type: 'hopper', loaded: true }], direction: 'west',
-      position: { at: 'mainline', index: officeIndex + 1 }, movesUsed: 0,
+describe('Red Flags protect a stopped train', () => {
+  /** A slow train `behind` closing on a stopped train `ahead`, both eastbound on node 1. */
+  function rearEnder(s: GameState) {
+    const node = pinned(s, 1, 'plains');
+    node.transits.push({ tray: 'ahead', stagesRemaining: 2, stagesTotal: 2, direction: 'east' });
+    s.trays.set('ahead', {
+      id: 'ahead', trainNumber: 4, trainIsExtra: false, engineAt: 0,
+      consist: [], direction: 'east', position: { at: 'mainline', index: 1 }, movesUsed: 0,
     });
+    s.trays.set('behind', {
+      id: 'behind', trainNumber: 2, trainIsExtra: false, engineAt: 0,
+      consist: [], direction: 'east', position: { at: 'divisionPoint', side: 'west' }, movesUsed: 0,
+    });
+    const dp = s.division.nodes[0];
+    if (dp?.kind === 'divisionPoint') dp.holding.push('behind');
     s.clock.phase = 'mainline';
     s.movedThisPhase = new Set();
-    return s.division.nodes[officeIndex] as Extract<typeof s.division.nodes[0], { kind: 'office' }>;
+    return node;
   }
 
-  it('FLAG EAST holds a westbound train short of the Limits', () => {
+  it('holds the approaching train instead of letting it close', () => {
     const s = game();
-    const office = approaching(s);
-    office.redFlag = 'east';
+    const node = rearEnder(s);
+    node.redFlagged = ['ahead'];
 
     advance(s);
-    const pos = s.trays.get('inbound')!.position;
-    assert.equal(pos.at, 'mainline', 'the flagged train came in anyway');
-    assert.ok(!areaOf(s, 0).adOccupancy.includes('inbound'), 'it reached an A/D track');
+    assert.deepEqual(
+      s.trays.get('behind')!.position,
+      { at: 'divisionPoint', side: 'west' },
+      'the flagged train must not be approached',
+    );
   });
 
-  it('is spent on the train it stops — one card, one train', () => {
+  it('comes in when the protected train rolls', () => {
     const s = game();
-    const office = approaching(s);
-    office.redFlag = 'east';
+    const node = rearEnder(s);
+    node.redFlagged = ['ahead'];
+    // Bring the protected train to the end of its crossing so it leaves the card.
+    node.transits[0]!.stagesRemaining = 1;
 
-    advance(s);
-    assert.equal(office.redFlag, undefined, 'the flag stayed up after stopping a train');
+    for (let i = 0; i < 12 && (node.redFlagged?.length ?? 0) > 0; i++) advance(s);
+    assert.deepEqual(node.redFlagged, [], 'flags come in once the train moves off');
   });
 
-  it('lets the train in on the next Mainline Phase', () => {
-    // "Loses one Mainline Phase" — it buys a Stage to clear the lead, not permanent protection.
-    const s = game();
-    const office = approaching(s);
-    office.redFlag = 'east';
-    advance(s);
-
-    s.clock.phase = 'mainline';
-    s.movedThisPhase = new Set();
-    advance(s);
-    assert.ok(areaOf(s, 0).adOccupancy.includes('inbound'), 'the train never came in');
-  });
-
-  it('does not hold a train coming from the OTHER side', () => {
-    // "Flag East holds westbound trains" — an eastbound train arrives from the west.
-    const s = game();
-    const office = approaching(s);
-    office.redFlag = 'west';
-
-    advance(s);
-    assert.ok(areaOf(s, 0).adOccupancy.includes('inbound'), 'a west flag held a train from the east');
-    assert.equal(office.redFlag, 'west', 'the wrong-side flag was spent');
-  });
-
-  it('is played on a side, not on a train', () => {
+  it('only protects a train out on the Mainline', () => {
     const s = game();
+    rearEnder(s);
     s.clock.phase = 'localOps';
     s.clock.currentActor = 0;
     const cardId = hand(s, 'maneuver', 'redFlags');
 
-    assert.equal(check(s, 0, { type: 'maneuver.redFlags', cardId, side: 'east' }), null);
-    assert.equal(check(s, 0, { type: 'maneuver.redFlags', cardId, side: 'west' }), null);
+    assert.equal(
+      check(s, 0, { type: 'maneuver.redFlags', cardId, trayId: 'behind' }),
+      'NO_PLACEMENT',
+      'a train sitting at a Division Point cannot be rear-ended',
+    );
+    assert.equal(check(s, 0, { type: 'maneuver.redFlags', cardId, trayId: 'ahead' }), null);
   });
 
-  it('will not double-flag the same side', () => {
+  it('will not double-flag the same train', () => {
     const s = game();
+    const node = rearEnder(s);
     s.clock.phase = 'localOps';
     s.clock.currentActor = 0;
     const cardId = hand(s, 'maneuver', 'redFlags');
-    const officeIndex = s.division.nodes.findIndex((n) => n.kind === 'office' && n.seat === 0);
-    const office = s.division.nodes[officeIndex] as { redFlag?: string };
-    office.redFlag = 'east';
+    node.redFlagged = ['ahead'];
 
-    assert.equal(check(s, 0, { type: 'maneuver.redFlags', cardId, side: 'east' }), 'ALREADY_FLAGGED');
-    assert.equal(check(s, 0, { type: 'maneuver.redFlags', cardId, side: 'west' }), null,
-      'the other side should still be free');
-  });
-});
-
-describe('Red Flags offered at the moment of danger (Gitea#19)', () => {
-  /**
-   * "In actual cases of danger… if there is a train or cars on the track and there will be a
-   * collision, then you break in with a dialog that says COLLISION RISK! FLAG AGAINST T2? This way,
-   * you can play the card normally or out of phase, but only if you need it."
-   *
-   * The engine establishes the danger, so the player is never asked to judge it — which is also why
-   * the bot can now use this card at all. It is offered ONLY to somebody holding one.
-   */
-  function dangerous(s: GameState, giveCard: boolean) {
-    const officeIndex = s.division.nodes.findIndex((n) => n.kind === 'office' && n.seat === 0);
-    const node = pinned(s, officeIndex + 1, 'plains');
-    node.transits.push({ tray: 'inbound', stagesRemaining: 1, stagesTotal: 1, direction: 'west' });
-    s.trays.set('inbound', {
-      id: 'inbound', trainNumber: 9, trainIsExtra: false, engineAt: 0,
-      consist: [{ type: 'hopper', loaded: true }], direction: 'west',
-      position: { at: 'mainline', index: officeIndex + 1 }, movesUsed: 0,
-    });
-    // A hopper fouling the Running Track: §8.3 makes this arrival a collision.
-    const area = areaOf(s, 0);
-    area.grid.get(coordKey(area.officeCoord))!.standing = [{ type: 'hopper', loaded: false }];
-    if (giveCard) hand(s, 'maneuver', 'redFlags');
-    s.clock.phase = 'mainline';
-    s.movedThisPhase = new Set();
-  }
-
-  it('breaks in to offer the flag when an arrival would collide', () => {
-    const s = game();
-    dangerous(s, true);
-    advance(s);
-    assert.equal(s.clock.pendingDecision?.kind, 'redFlag', 'no prompt before a certain collision');
-    assert.equal(decisionActor(s), 0, 'the prompt went to the wrong player');
-  });
-
-  it('flagging holds the train and costs the card', () => {
-    const s = game();
-    dangerous(s, true);
-    advance(s);
-    const before = (s.decks.hands.get(0) ?? []).length;
-
-    const r = applyIntent(s, 0, { type: 'mainline.redFlag', flag: true });
-    assert.ok(r.ok, 'the flag was refused');
-    advance(s);
-
-    assert.equal(s.players[0]!.revenue, 0, 'the collision happened anyway');
-    assert.equal(s.trays.get('inbound')!.position.at, 'mainline', 'the train came in regardless');
-    assert.equal((s.decks.hands.get(0) ?? []).length, before - 1, 'the card was not spent');
-  });
-
-  it('declining lets the collision happen', () => {
-    const s = game();
-    dangerous(s, true);
-    advance(s);
-
-    assert.ok(applyIntent(s, 0, { type: 'mainline.redFlag', flag: false }).ok);
-    advance(s);
-    assert.equal(s.players[0]!.revenue, -5, 'waving it through did not collide');
-  });
-
-  it('does not offer a flag to a player holding none', () => {
-    // A prompt with one button is not a choice, and it leaks that a collision is coming.
-    const s = game();
-    dangerous(s, false);
-    advance(s);
-    assert.equal(s.clock.pendingDecision, null, 'offered a flag to a player with no card');
-    assert.equal(s.players[0]!.revenue, -5, 'the collision should have happened');
-  });
-
-  it('stays quiet when the arrival is safe', () => {
-    const s = game();
-    dangerous(s, true);
-    // Clear the hazard: nothing fouling the Running Track, and room at the Office.
-    const area = areaOf(s, 0);
-    area.grid.get(coordKey(area.officeCoord))!.standing = [];
-    advance(s);
-    assert.equal(s.clock.pendingDecision, null, 'interrupted the phase for a safe arrival');
+    assert.equal(
+      check(s, 0, { type: 'maneuver.redFlags', cardId, trayId: 'ahead' }),
+      'OPTION_ALREADY_CHOSEN',
+    );
   });
 });
 
@@ -870,100 +678,6 @@ describe('a turnout may be laid on top of a card already down', () => {
   });
 });
 
-describe('extras that must run loaded, and one that must not (Gitea#13)', () => {
-  /**
-   * "I've redefined some of the extra trains that they have to run full boxcars — military trains,
-   * circus trains, etc. If not loaded, then empty, and if none available, run without."
-   *
-   * A PREFERENCE ORDER, so every test here is about what the DIVISION YARD still holds. The rule
-   * has nothing to say about a train once it is running; it decides which car may be taken next.
-   */
-  const madeUp = (trainNumber: number) => {
-    const s = game();
-    s.clock.phase = 'newTrain';
-    s.trays.set('t', {
-      id: 't', trainNumber, trainIsExtra: true, engineAt: 0,
-      consist: [], direction: 'east', position: { at: 'divisionPoint', side: 'west' }, movesUsed: 0,
-    });
-    return s;
-  };
-  const place = (carType: string, loaded: boolean) =>
-    ({ type: 'newTrain.placeCar', trayId: 't', carType, loaded }) as never;
-  /** Leaves the Division Yard holding exactly the cars described. */
-  const stockYard = (s: ReturnType<typeof madeUp>, cars: { type: string; loaded: boolean }[]) => {
-    s.yards.divisionYard.length = 0;
-    s.yards.divisionYard.push(...(cars as never[]));
-  };
-
-  it('refuses an empty while the yard can still supply a loaded one (X18 Circus)', () => {
-    const s = madeUp(18);
-    stockYard(s, [{ type: 'boxcar', loaded: true }, { type: 'boxcar', loaded: false }]);
-    assert.equal(check(s, 0, place('boxcar', false)), 'NO_SUITABLE_CAR',
-      'an empty was accepted while a loaded boxcar was still in the yard');
-    assert.equal(check(s, 0, place('boxcar', true)), null, 'the loaded boxcar was refused');
-  });
-
-  it('accepts an empty once the yard has no loaded car of that kind left', () => {
-    // "If not loaded, then empty." The rule releases as soon as the yard cannot supply.
-    const s = madeUp(18);
-    stockYard(s, [{ type: 'boxcar', loaded: false }]);
-    assert.equal(check(s, 0, place('boxcar', false)), null,
-      'an empty was refused when the yard held no loaded car at all');
-  });
-
-  it('does not let a loaded car of the WRONG category unlock the rule', () => {
-    // A loaded coach is no reason to refuse an empty boxcar: the preference is per category, since
-    // that is the slot the car is competing for.
-    const s = madeUp(18);
-    stockYard(s, [{ type: 'coach', loaded: true }, { type: 'boxcar', loaded: false }]);
-    assert.equal(check(s, 0, place('boxcar', false)), null,
-      'a loaded coach blocked an empty boxcar');
-  });
-
-  it('exempts the caboose, which is never empty in the supply', () => {
-    const s = madeUp(18);
-    stockYard(s, [{ type: 'caboose', loaded: true }, { type: 'boxcar', loaded: true }]);
-    assert.equal(check(s, 0, place('caboose', true)), null, 'the caboose its card calls for was refused');
-  });
-
-  it('applies to the Military train too', () => {
-    const s = madeUp(19);
-    stockYard(s, [{ type: 'coach', loaded: true }, { type: 'coach', loaded: false }]);
-    assert.equal(check(s, 0, place('coach', false)), 'NO_SUITABLE_CAR',
-      'the Military train took an empty coach over a loaded one');
-  });
-
-  it('leaves trains without the rule alone', () => {
-    // X21 Freight Extra has no loading rule: an empty is as good as a loaded one.
-    const s = madeUp(21);
-    stockYard(s, [{ type: 'boxcar', loaded: true }, { type: 'boxcar', loaded: false }]);
-    assert.equal(check(s, 0, place('boxcar', false)), null,
-      'a train with no loading rule was made to prefer loaded cars');
-  });
-
-  it('REGRESSION: X13 Appleseed is empties-only, and now the rules say so too', () => {
-    /**
-     * `ConsistSpec.emptiesOnly` was declared on the card, RENDERED to the player as "(empties only)"
-     * by `web/game.ts` and `sim/view.ts`, and enforced by NOTHING — `acceptsCar` never read it. So
-     * the Appleseed could be made up with loaded cars while its own card said it could not. Found
-     * while building Gitea#13, which is the same rule pointing the other way.
-     */
-    const s = madeUp(13);
-    stockYard(s, [{ type: 'boxcar', loaded: true }, { type: 'boxcar', loaded: false }]);
-    assert.equal(check(s, 0, place('boxcar', true)), 'NO_SUITABLE_CAR',
-      'the Appleseed took a loaded car despite printing "empties only"');
-    assert.equal(check(s, 0, place('boxcar', false)), null, 'the Appleseed refused an empty');
-  });
-
-  it('still lets the Appleseed take the caboose its consist calls for', () => {
-    // Every caboose in ROLLING_STOCK_SUPPLY is minted loaded, so an unexempted empties-only rule
-    // would bar the one car the card explicitly lists.
-    const s = madeUp(13);
-    stockYard(s, [{ type: 'caboose', loaded: true }]);
-    assert.equal(check(s, 0, place('caboose', true)), null, 'the empties-only rule ate the caboose');
-  });
-});
-
 describe("a train is made up to its card's consist (§8.2)", () => {
   it('takes a caboose when the card calls for one, and refuses a fourth freight car', () => {
     // Train 9 "Heavy Freight" is freight 3 + caboose 1. It was being made up with FOUR hoppers and
@@ -1014,24 +728,20 @@ describe("a train is made up to its card's consist (§8.2)", () => {
 
 describe('regions on a Mainline card (§2.1, §8.2)', () => {
   /** Put one train mid-crossing and ask the view where the map should draw it. */
-  const regionFor = (
-    stagesTotal: number,
-    stagesRemaining: number,
-    direction: 'east' | 'west' = 'east',
-  ): { region: number; regions: number } => {
+  const regionFor = (stagesTotal: number, stagesRemaining: number): { region: number; regions: number } => {
     const s = createGame({
       id: 'reg',
       seed: 4,
       config: {
-        mode: 'solitaire', days: 5, minCombinedRevenue: 0, maxCollisionsPerDay: 0, maxCollisionsTotal: 0, pvpCardsAllowed: false,
-        optionalRules: { reducedVisibility: false, employeeRotation: false, emergencyToolbox: false },
+        mode: 'solitaire', victory: 'highestAfterDays', length: 'standard',
+        optionalRules: { reducedVisibility: false, sisterTrains: false, employeeRotation: false, emergencyToolbox: false },
       },
       playerNames: ['Solitaire'],
     });
     const node = s.division.nodes.find((n) => n.kind === 'mainline');
     assert.ok(node && node.kind === 'mainline');
     const tray = [...s.trays.keys()][0]!;
-    node.transits.push({ tray, stagesRemaining, stagesTotal, direction });
+    node.transits.push({ tray, stagesRemaining, stagesTotal, direction: 'east' });
     const ml = snapshot(s, [], null).division.find((n) => n.kind === 'ml');
     assert.ok(ml, 'no Mainline node in the view');
     const t = ml!.trains.flat()[0]!;
@@ -1074,74 +784,6 @@ describe('regions on a Mainline card (§2.1, §8.2)', () => {
       }
     }
   });
-
-  it('never leaves the card it is on, whichever way it runs', () => {
-    for (const direction of ['east', 'west'] as const) {
-      for (let total = 1; total <= 4; total++) {
-        for (let left = total; left >= 1; left--) {
-          const r = regionFor(total, left, direction).region;
-          assert.ok(r >= 0 && r <= 1, `${direction}, total ${total}, ${left} left put the train in region ${r}`);
-        }
-      }
-    }
-  });
-
-  /**
-   * GITEA#22 — A WESTBOUND TRAIN WAS DRAWN IN THE WRONG HALF OF THE CARD.
-   *
-   * `regionOfTransit` answers "how far along its crossing is this train", counted from the end it
-   * ENTERED: a train with everything still to run is in region 0. That is the right question for the
-   * collision rules, which is what the engine asks it, and both directions share the one index space.
-   *
-   * The map asks a different question — WHICH PRINTED BOX, left to right — and used the same number
-   * for it. East is right on this map and always has been, so for an eastbound train the two agree by
-   * luck: it enters at the west end, so "just entered" and "leftmost box" are the same box. A
-   * westbound train enters at the EAST end, so its region 0 is the card's RIGHT-hand box, and drawing
-   * it at index 0 put it at the left — the whole card mirrored.
-   *
-   * Reported from seed 550943578, undo 187, and it cost a collision. Three westbound trains: TX17 had
-   * just entered (2 Stages still to run, so travel index 0) and T5 was nearly across (1 Stage left,
-   * index 1). Physically TX17 was BEHIND T5 — further east, the direction they had both come from.
-   * The map drew TX17 at the left and so put it further WEST, which reads as further ahead. Asked
-   * whether Train 3 could follow Train 5 onto the card, the Superintendent said yes, and Train 3
-   * entered behind — into TX17, exactly where the rules had it and nowhere near where the map did.
-   *
-   * The engine was right throughout. Only the picture lied, so the fix is one mirror in the view and
-   * the collision rules are untouched. This is the same class of bug as the consist row at the
-   * Whistle Post (`board-svg.ts`, seed 270861860), which came out mirrored for the same reason.
-   */
-  describe('Gitea#22 — the map draws a westbound train where it actually is', () => {
-    it('mirrors a westbound train, because it entered from the east end', () => {
-      // Two-region card. Just entered, 2 Stages still to run: an eastbound train is in the WEST box
-      // and a westbound one is in the EAST box, because they came in at opposite ends.
-      assert.equal(regionFor(2, 2, 'east').region, 0);
-      assert.equal(regionFor(2, 2, 'west').region, 1);
-
-      // One Stage left, nearly across: the two swap.
-      assert.equal(regionFor(2, 1, 'east').region, 1);
-      assert.equal(regionFor(2, 1, 'west').region, 0);
-    });
-
-    it('puts the follower behind the leader, not in front of it — the seed 550943578 collision', () => {
-      // TX17 had just entered; T5 was a Stage from the far end. Both westbound, so BEHIND means to
-      // the east, which is to the right, which is the higher index.
-      const tx17 = regionFor(2, 2, 'west').region;
-      const t5 = regionFor(2, 1, 'west').region;
-      assert.ok(
-        tx17 > t5,
-        `a westbound train that has just entered must be drawn east of one that is nearly across, ` +
-          `but TX17 was drawn at ${tx17} and T5 at ${t5}`,
-      );
-    });
-
-    it('leaves an eastbound train where it has always been drawn', () => {
-      // The mirror must not disturb the direction that was right, which is every existing region test
-      // above — those all run east — and the case the printed rule was written for.
-      assert.equal(regionFor(2, 2, 'east').region, 0);
-      assert.equal(regionFor(2, 1, 'east').region, 1);
-      assert.equal(regionFor(1, 1, 'east').region, 1);
-    });
-  });
 });
 
 describe('Q13 — a train that catches the one ahead runs into it', () => {
@@ -1151,35 +793,18 @@ describe('Q13 — a train that catches the one ahead runs into it', () => {
    * then region 1 — so it catches up whichever order the phase happens to process them in.
    */
   const twoTrains = (opts: { absSignals?: boolean } = {}): { s: GameState; events: GameEvent[] } => {
-    /**
-     * THE SEED IS SEARCHED FOR, NOT WRITTEN DOWN.
-     *
-     * This asked for seed 3 and asserted that its Division held a single-track Mainline card. It
-     * does not any more: the Division is laid out from the same RNG stream the card deck is
-     * shuffled from, so changing the SIZE of that deck re-deals the Division too. Gitea#14's deck
-     * counts moved it, and the test failed on its own precondition — "no single-track Mainline card
-     * in this Division" — which says nothing about the rule under test.
-     *
-     * The fixture needs A Division with a card trains may not pass on, not one particular one, so
-     * it now takes the first seed that provides one. That is stable across any future retune, and
-     * it fails loudly if such a Division stops being reachable at all.
-     */
-    let s!: GameState;
-    let index = -1;
-    for (let seed = 3; seed < 200 && index < 0; seed++) {
-      s = createGame({
-        id: 'rear', seed,
-        config: {
-          mode: 'solitaire', days: 5, minCombinedRevenue: 0, maxCollisionsPerDay: 0, maxCollisionsTotal: 0, pvpCardsAllowed: false,
-          optionalRules: { reducedVisibility: false, employeeRotation: false, emergencyToolbox: false },
-        },
-        playerNames: ['bot'],
-      });
-      index = s.division.nodes.findIndex(
-        (n) => n.kind === 'mainline' && !mainlineProfile(n.card).trainsMayPass,
-      );
-    }
-    assert.ok(index >= 0, 'no seed under 200 deals a Division holding a single-track Mainline card');
+    const s = createGame({
+      id: 'rear', seed: 3,
+      config: {
+        mode: 'solitaire', victory: 'highestAfterDays', length: 'standard',
+        optionalRules: { reducedVisibility: false, sisterTrains: false, employeeRotation: false, emergencyToolbox: false },
+      },
+      playerNames: ['bot'],
+    });
+    const index = s.division.nodes.findIndex(
+      (n) => n.kind === 'mainline' && !mainlineProfile(n.card).trainsMayPass,
+    );
+    assert.ok(index >= 0, 'no single-track Mainline card in this Division');
     const node = s.division.nodes[index]!;
     assert.ok(node.kind === 'mainline');
     if (node.kind !== 'mainline') throw new Error('unreachable');
@@ -1235,116 +860,12 @@ describe('Q13 — a train that catches the one ahead runs into it', () => {
     );
   });
 
-  /**
-   * ENTERING an occupied region, as opposed to catching up inside the card (Gitea#3).
-   *
-   * A card can be ONE region wide — Plains, Double Track and Trestle all are — so a following train
-   * granted clearance is in the same place as the train ahead the moment it arrives. Nothing tested
-   * that: the catch-up check lives inside `stagesRemaining > 1`, which a one-Stage crossing never
-   * reaches, so entering behind another train on a Plains was silently free.
-   */
-  const enteringBehind = (card: MainlineKind, opts: { absSignals?: boolean } = {}) => {
-    const s = game();
-    const index = s.division.nodes.findIndex((n) => n.kind === 'mainline');
-    const node = s.division.nodes[index]!;
-    assert.ok(node.kind === 'mainline');
-    if (node.kind !== 'mainline') throw new Error('unreachable');
-    node.card = card;
-    node.transits = [];
-    if (opts.absSignals) node.absSignals = true;
-
-    /**
-     * THE TRAIN ALREADY THERE IS THE JUNIOR ONE, and that is what makes the situation reachable.
-     *
-     * Trains move lowest number first, so a card's occupant normally clears before anything behind
-     * it is even considered — put train 9 on the card and train 11 at the Division Point and 9 has
-     * gone by the time 11 enters. The conflict is a SUPERIOR train catching an inferior one that has
-     * not got out of the way yet, so the numbers run the other way round here.
-     */
-    const leader = s.freeTrays.pop()!;
-    s.trays.set(leader, {
-      id: leader, trainNumber: 11, trainIsExtra: false, engineAt: 0,
-      consist: [{ type: 'boxcar', loaded: false }], direction: 'east',
-      position: { at: 'mainline', index },
-    } as never);
-    const total = crossingStages(card, { trainSpeed: 'fast', direction: 'east', gradeUp: 'east', modifiers: [] });
-    node.transits.push({ tray: leader, stagesRemaining: total, stagesTotal: total, direction: 'east' });
-
-    // And the one arriving, held at the Division Point west of it.
-    const dp = s.division.nodes[index - 1];
-    assert.ok(dp && dp.kind === 'divisionPoint', 'expected a Division Point west of the first card');
-    if (!dp || dp.kind !== 'divisionPoint') throw new Error('unreachable');
-    const follower = s.freeTrays.pop()!;
-    s.trays.set(follower, {
-      id: follower, trainNumber: 9, trainIsExtra: false, engineAt: 0,
-      consist: [{ type: 'boxcar', loaded: false }], direction: 'east',
-      position: { at: 'divisionPoint', side: dp.side },
-    } as never);
-    dp.holding.push(follower);
-
-    /**
-     * THE SUPERINTENDENT LETS IT IN, which is the whole point.
-     *
-     * A same-direction train in the Subdivision is not an absolute bar — §8.1 makes it a judgment
-     * call, and `advance` stops and asks. Granting it is what puts one train in behind another, and
-     * §10 is then explicit that the wreck is the Superintendent's fault. So the fixture answers
-     * `allow: true` whenever it is asked, and the collision below is the consequence of that
-     * ruling rather than of a rule firing on its own.
-     */
-    s.clock.phase = 'mainline';
-    const events: GameEvent[] = [];
-    for (let i = 0; i < 6; i++) {
-      events.push(...advance(s).events);
-      if (s.clock.pendingDecision !== null) {
-        const who = s.clock.superintendent;
-        const r = applyIntent(s, who, { type: 'mainline.clearance', allow: true });
-        assert.ok(r.ok, `clearance refused: ${r.ok ? '' : r.code}`);
-        events.push(...r.events);
-      }
-    }
-    return { s, node, events, follower };
-  };
-
-  it('runs a train into the one ahead when it ENTERS an occupied region', () => {
-    const { events } = enteringBehind('plains');
-    const smash = events.find((e) => e.type === 'trainsDestroyed');
-    assert.ok(smash, 'a train entered a one-region card behind another and nothing happened');
-  });
-
-  it('holds it short instead when the card carries ABS Signals', () => {
-    // RAR: "ABS. This is played on a mainline card to prevent collisions. If a collision would
-    // normally occur, the train moving onto the card is instead held back."
-    const { events } = enteringBehind('plains', { absSignals: true });
-    assert.ok(!events.some((e) => e.type === 'trainsDestroyed'), 'ABS Signals did not prevent it');
-    assert.ok(
-      events.some((e) => e.type === 'trainHeld' && /ABS Signals/.test(e.reason)),
-      'nothing was held short of the train ahead',
-    );
-  });
-
-  it('takes the siding instead of colliding on an Uncontrolled Siding', () => {
-    // "If a train already exists when you arrive, you go in the second stage back — you are in the
-    // siding and are one behind the other train. This prevents a collision, since you are not in
-    // same exact location." So: no wreck, both trains on the card, and the newcomer paying the
-    // extra Stage for the detour.
-    const { node, events, follower } = enteringBehind('uncontrolledSiding');
-    assert.ok(!events.some((e) => e.type === 'trainsDestroyed'), 'the siding did not prevent a collision');
-    const mine = node.transits.find((t) => t.tray === follower);
-    assert.ok(mine, 'the arriving train never made it onto the card');
-    assert.equal(mine.stagesTotal, 2, 'it should have entered at the back of the card, not the front');
-  });
-
-  it('leaves trains alone on the one card that prints "trains may pass"', () => {
-    // Double Track holds two trains because it HAS two roads. Catching up there means going past,
-    // which is what the card is for.
-    //
-    // THE UNCONTROLLED SIDING USED TO BE IN THIS LIST AND IS NOT ANY MORE (Gitea#3). It holds two
-    // trains as well, but not by letting them share a place: the second one takes the siding and
-    // sits a region behind, which is what keeps them apart — "you are in the siding and are one
-    // behind the other train. This prevents a collision, since you are not in same exact location."
-    // Marked "may pass" it skipped the collision test entirely, so the siding did nothing at all and
-    // two trains could occupy the same region of it unchallenged.
+  it('leaves trains alone on a card that prints "trains may pass"', () => {
+    // Double Track and Uncontrolled Siding hold two trains because they HAVE two roads. Catching up
+    // there means going past, which is what the card is for. Without this the mechanic fired 0.41
+    // times a game while the bot never once granted clearance — the tell that they were all
+    // passing cards.
     const passing = MAINLINE_PROFILES.filter((m) => m.trainsMayPass).map((m) => m.kind);
-    assert.deepEqual(passing, ['doubleTrack']);
+    assert.deepEqual(passing, ['doubleTrack', 'uncontrolledSiding']);
   });
 });

test/multiplayer.test.ts

@@ -11,35 +11,22 @@ import { describe, it } from 'node:test';
 import assert from 'node:assert/strict';
 
 import { advance, pump } from '../src/engine/advance.ts';
-import { applyIntent, areaAtSeat, areaOf, check } from '../src/engine/apply.ts';
-import { STAGES_PER_DAY, STAGES_PER_SHIFT, crewTrayCount } from '../src/engine/content.ts';
+import { areaAtSeat, areaOf } from '../src/engine/apply.ts';
+import { STAGES_PER_SHIFT, crewTrayCount } from '../src/engine/content.ts';
 import { createGame } from '../src/engine/setup.ts';
-import { legalActions } from '../src/engine/legal.ts';
 import type { GameConfig, GameState, PlayerIndex } from '../src/engine/state.ts';
-import { coordKey, playerAtSeat, playerLeftOf, seatOf, subdivisions } from '../src/engine/state.ts';
+import { coordKey, playerAtSeat, seatOf, subdivisions } from '../src/engine/state.ts';
 import { developerBot, playGame } from '../src/sim/bot.ts';
 import { snapshot } from '../src/sim/view.ts';
-import { divisionSvg } from '../src/sim/board-svg.ts';
-import { impediments, narrate } from '../src/sim/narrate.ts';
+import { impediments } from '../src/sim/narrate.ts';
 import { readFileSync, readdirSync } from 'node:fs';
 import { join } from 'node:path';
-import { actionMenu } from '../src/web/game.ts';
-import { newCollector } from '../src/sim/display-step.ts';
-import type { Game } from '../src/web/game.ts';
-
-/** The thin wrapper `actionMenu` expects, built directly around an already-created multi-player state
- * — `newGame` (game.ts) hardcodes one player, so it cannot construct this for a multi-seat game. */
-const wrap = (s: GameState): Game =>
-  ({ state: s, seed: s.seed, history: [], log: [], cues: [], scheduled: null, justDrawn: null, announced: null, display: newCollector() });
 
 const competitive: GameConfig = {
   mode: 'competitive',
-  days: 5,
-  minCombinedRevenue: 0,
-  maxCollisionsPerDay: 0,
-  maxCollisionsTotal: 0,
-  pvpCardsAllowed: false,
-  optionalRules: { reducedVisibility: false, employeeRotation: false, emergencyToolbox: false },
+  victory: 'highestAfterDays',
+  length: 'standard',
+  optionalRules: { reducedVisibility: false, sisterTrains: false, employeeRotation: false, emergencyToolbox: false },
 };
 
 const game = (players: number, seed = 4242): GameState =>
@@ -487,9 +474,6 @@ describe('the view shows one seat at a time', () => {
      * which is a list of squares that do not exist on the board they are looking at.
      */
     const s = game(3);
-    // A real floor to pace against — the shared `competitive` fixture leaves it off (0) since most
-    // tests in this file don't care, but pacing against "off" is trivially "always on pace" (view.ts).
-    s.config.minCombinedRevenue = 10;
     s.players[0]!.revenue = 1;
     s.players[1]!.revenue = 9;
     s.players[2]!.revenue = 17;
@@ -616,362 +600,3 @@ describe('scoring lands on the right seat', () => {
     assert.notEqual(areaAtSeat(s, 1), areaAtSeat(s, 2), 'two seats share one Office Area object');
   });
 });
-
-describe('the New Train phase car-placement round rotates (§7, Gap 9)', () => {
-  /**
-   * REGRESSION. `newTrainPhase` used to hand the whole car-filling loop to a fixed actor —
-   * `actorOffset` is reset to 0 entering the phase and was never incremented, so `actorAt(s, 0)`
-   * always resolved to the Superintendent, who placed every car of every train alone. The written
-   * rule (`rules-v0.2.md` §7, Gap 9) is explicit: "starting with the Superintendent and working
-   * left, each player may place ONE car... the round repeats... until the consist is full," with a
-   * worked example showing seats alternating. The fix reads the round position off
-   * `tray.consist.length` instead, which is already exactly that counter and resets per train.
-   */
-  it('cycles Superintendent-then-left, one car per player, wrapping as the round repeats', () => {
-    // Train 5, "The Sparrow" — 3 coaches, no freight or caboose (content.ts) — small enough to
-    // exercise both a player count that wraps (2p: seats 0,1,0) and one that doesn't (3p: 0,1,2).
-    // It was Train 1 until Gitea#7 swapped the coach counts on 1/2 and 5/6; the test needs a
-    // THREE-car consist and the Crack Limited now carries two, so it follows the three coaches.
-    for (const players of [2, 3]) {
-      const s = game(players);
-      s.clock.phase = 'newTrain';
-      s.trays.set('t1', {
-        id: 't1',
-        trainNumber: 5,
-        trainIsExtra: false,
-        engineAt: 0,
-        consist: [],
-        direction: 'west',
-        position: { at: 'divisionPoint', side: 'east' },
-        movesUsed: 0,
-      });
-      s.yards.divisionYard.push(
-        { type: 'coach', loaded: false },
-        { type: 'coach', loaded: false },
-        { type: 'coach', loaded: false },
-      );
-
-      const expected = [0, 1, 2].map((offset) => playerLeftOf(s, s.clock.superintendent, offset));
-      const seenActors: PlayerIndex[] = [];
-      for (let guard = 0; guard < 10; guard++) {
-        const r = advance(s);
-        if (!r.needsInput) break;
-        const actor = s.clock.currentActor!;
-        seenActors.push(actor);
-        const result = applyIntent(s, actor, {
-          type: 'newTrain.placeCar',
-          trayId: 't1',
-          carType: 'coach',
-          loaded: false,
-        });
-        assert.ok(result.ok, `${players}p: placeCar rejected — ${result.ok ? '' : result.code}`);
-      }
-
-      const wanted = [0, 1, 2].map((i) => expected[i % players]!);
-      assert.deepEqual(
-        seenActors,
-        wanted,
-        `${players}p: actor sequence was [${seenActors}], wanted [${wanted}] (Superintendent-then-left)`,
-      );
-    }
-  });
-});
-
-describe('an Extra belongs to the player who played it (§7)', () => {
-  /**
-   * REPORTED BY JESSE 2026-08-23, from a two-player game on StartOS: one seat played a train card
-   * and the OTHER was asked to build the train. For a Timetabled train that is correct — the round
-   * above starts at the Superintendent — but §7 states the Extra rule a paragraph later and it is
-   * the opposite one: "the player who played the card may place the Crew Tray at either Division
-   * Point ... and may load the consist as he chooses."
-   *
-   * The engine could not honour it: `pendingExtras` was a bare `number[]`, so nothing recorded whose
-   * Extra it was and the phase asked whoever the acting order happened to be on. Invisible in
-   * solitaire, where that is always the same person.
-   */
-  const withPendingExtra = (players: number, owner: PlayerIndex) => {
-    const s = game(players);
-    s.clock.phase = 'newTrain';
-    s.timetable = s.timetable.map(() => null);
-    // X22 "Pee-Dee" — a caboose-only Extra, so the consist is short and the round would be visible.
-    s.pendingExtras = [{ trainNumber: 22, player: owner }];
-    return s;
-  };
-
-  it('asks the player who played it where it starts — not whoever the round is on', () => {
-    // The owner is deliberately NOT the Superintendent, which is the case that used to go wrong.
-    const s = withPendingExtra(2, 1 as PlayerIndex);
-    const notSuper = playerLeftOf(s, s.clock.superintendent, 1);
-    s.pendingExtras = [{ trainNumber: 22, player: notSuper }];
-
-    const r = advance(s);
-    assert.equal(r.needsInput, true, 'the phase did not stop to place the Extra');
-    assert.equal(s.clock.currentActor, notSuper, 'the wrong player was asked where the Extra starts');
-  });
-
-  it('refuses another seat placing it, and offers it to nobody else', () => {
-    const s = withPendingExtra(2, 0 as PlayerIndex);
-    const intent = {
-      type: 'newTrain.startExtra' as const,
-      trainNumber: 22,
-      start: { kind: 'divisionPoint' as const, side: 'west' as const },
-    };
-    const theirs = applyIntent(s, 0 as PlayerIndex, intent);
-    assert.ok(theirs.ok, `the owner could not place their own Extra — ${theirs.ok ? '' : theirs.code}`);
-
-    /**
-     * TWO EXTRAS, TWO OWNERS — the case where the guard is actually reachable. The phase stops on
-     * the first pending Extra's owner, so seat 0 is legitimately the current actor; nothing but this
-     * rule stops them placing seat 1's train while they are there.
-     */
-    const both = withPendingExtra(2, 0 as PlayerIndex);
-    both.pendingExtras = [
-      { trainNumber: 22, player: 0 as PlayerIndex },
-      { trainNumber: 24, player: 1 as PlayerIndex },
-    ];
-    advance(both);
-    assert.equal(both.clock.currentActor, 0, 'the first pending Extra should have stopped on its owner');
-    assert.equal(check(both, 0 as PlayerIndex, { ...intent, trainNumber: 24 }), 'NOT_YOUR_EXTRA');
-    const notTheirs = applyIntent(both, 0 as PlayerIndex, { ...intent, trainNumber: 24 });
-    assert.equal(notTheirs.ok, false, 'a seat placed somebody else’s Extra while it was their turn');
-    // And it is not even offered: a menu that lists an action `check` will refuse is a menu lying.
-    assert.equal(
-      legalActions(both, 0 as PlayerIndex).some(
-        (i) => i.type === 'newTrain.startExtra' && i.trainNumber === 24,
-      ),
-      false,
-      'somebody else’s Extra was offered a start point',
-    );
-  });
-
-  it('lets its player load the whole consist, rather than passing the round', () => {
-    // §7: "may load the consist as he chooses" — no going round the table for an Extra.
-    const s = withPendingExtra(2, 0 as PlayerIndex);
-    const owner = 0 as PlayerIndex;
-    const placed = applyIntent(s, owner, {
-      type: 'newTrain.startExtra',
-      trainNumber: 22,
-      start: { kind: 'divisionPoint', side: 'west' },
-    });
-    assert.ok(placed.ok, 'the Extra could not be placed');
-    s.yards.divisionYard.push({ type: 'caboose', loaded: false }, { type: 'caboose', loaded: false });
-
-    const asked: PlayerIndex[] = [];
-    for (let guard = 0; guard < 4; guard++) {
-      const r = advance(s);
-      if (!r.needsInput) break;
-      const actor = s.clock.currentActor!;
-      asked.push(actor);
-      const tray = [...s.trays.values()].find((t) => t.trainIsExtra);
-      assert.ok(tray, 'the Extra has no tray');
-      const result = applyIntent(s, actor, { type: 'newTrain.passCar', trayId: tray.id });
-      if (!result.ok) break;
-    }
-    assert.ok(asked.length > 0, 'nobody was asked to load the Extra');
-    assert.deepEqual(
-      [...new Set(asked)],
-      [owner],
-      `the Extra's consist went round the table (asked ${asked.join(', ')}) instead of staying with its player`,
-    );
-  });
-});
-
-describe('actionMenu is seat-safe (Phase 2 prep)', () => {
-  /**
-   * REGRESSION. `actionMenu(game, seat)` used `seat` only for the `hand` field — `options`/`direct`/
-   * `placeable`/`makeUp` all came from `currentActor(game)` regardless of which seat was asked. A
-   * server computing every connected seat's Menu would have handed the acting player's legal moves to
-   * a waiting seat, paired with the WRONG seat's hand. Found tracing Phase 2's per-seat Menu step.
-   */
-  it('gives the acting seat its real options, and every other seat none at all', () => {
-    const s = game(3);
-    const g = wrap(s);
-    const actorSeat = s.clock.currentActor!;
-    const waiting = [0, 1, 2].filter((seat) => seat !== actorSeat);
-
-    const actorMenu = actionMenu(g, actorSeat as PlayerIndex);
-    assert.ok(actorMenu.options.length > 0, "the acting seat's Menu had no options at all");
-
-    for (const seat of waiting) {
-      const menu = actionMenu(g, seat as PlayerIndex);
-      assert.deepEqual(menu.options, [], `seat ${seat} (not acting) was given real options`);
-      assert.deepEqual(menu.direct, [], `seat ${seat} (not acting) was given direct actions`);
-      assert.deepEqual(menu.placeable, [], `seat ${seat} (not acting) was given placeable actions`);
-      assert.equal(menu.makeUp, null, `seat ${seat} (not acting) was given a make-up panel`);
-    }
-  });
-
-  it('still shows a waiting seat its own hand, just nothing to do with it', () => {
-    const s = game(3);
-    const g = wrap(s);
-    const actorSeat = s.clock.currentActor!;
-    const waitingSeat = [0, 1, 2].find((seat) => seat !== actorSeat)! as PlayerIndex;
-
-    const menu = actionMenu(g, waitingSeat);
-    const expectedHand = s.decks.hands.get(waitingSeat) ?? [];
-    assert.equal(menu.hand.length, expectedHand.length, "the waiting seat's own hand did not come through");
-    for (const card of menu.hand) {
-      assert.equal(card.playNow, null, 'a waiting seat was offered a way to play a card');
-      assert.equal(card.spots, 0, 'a waiting seat was offered somewhere to place a card');
-    }
-  });
-});
-
-describe('the map says whose railroad is whose', () => {
-  it('the Frame names its own viewer, which nothing on it did before', () => {
-    // Every private field is already scoped to one player — hand, Office Area, revenue, option —
-    // but a page rendering that could not say WHICH player, so it could not tell you which of four
-    // railroads was yours.
-    const s = game(4);
-    for (const viewer of [0, 1, 2, 3] as PlayerIndex[]) {
-      const f = snapshot(s, [], null, null, null, false, viewer);
-      assert.equal(f.viewer, viewer);
-      assert.equal(f.viewerSeat, seatOf(s, viewer), 'viewerSeat must be the seat, not the player index');
-    }
-  });
-
-  it('carries the opening D12 that decided the west-to-east chain', () => {
-    const s = game(4);
-    const f = snapshot(s, [], null, null, null, false, 0 as PlayerIndex);
-    assert.equal(f.openingRolls.division.length, 4, 'one division roll per player');
-    assert.equal(f.openingRolls.superintendent.length, 4);
-
-    // The rule the rolls implement: ascending by roll, west to east — so sorting the players by
-    // their roll must reproduce the seating exactly (§4.4).
-    const bySeat = [...f.players].sort((a, b) => a.seat - b.seat).map((p) => p.index);
-    const byRoll = [...f.players]
-      .map((p) => p.index)
-      .sort((a, b) => f.openingRolls.division[a]! - f.openingRolls.division[b]! || b - a);
-    assert.deepEqual(bySeat, byRoll, 'seating does not follow the opening rolls');
-  });
-
-  it('is not always the host at the eastern end — the roll decides', () => {
-    // The question this answers: player 0 is the lobby host, and the eastern end is the LAST seat.
-    // If the two were the same thing, every seed would put player 0 there.
-    const easternPlayer = (seed: number): number => {
-      const s = game(4, seed);
-      const f = snapshot(s, [], null, null, null, false, 0 as PlayerIndex);
-      return [...f.players].sort((a, b) => b.seat - a.seat)[0]!.index;
-    };
-    const seen = new Set([101, 202, 303, 404, 505, 606].map(easternPlayer));
-    assert.ok(seen.size > 1, `the eastern end was always player ${[...seen][0]} across six seeds`);
-  });
-
-  it('labels each Office with its owner, marking whose move it is and which one is yours', () => {
-    const s = game(3);
-    const viewer = 1 as PlayerIndex;
-    const f = snapshot(s, [], null, null, null, false, viewer);
-    const svg = divisionSvg(f.division, { players: f.players, actor: f.actor, viewer: f.viewer });
-
-    const owners = [...svg.matchAll(/<text class="bs-name([^"]*bs-owner[^"]*)"[^>]*>([^<]*)<\/text>/g)].map(
-      (m) => ({ classes: m[1]!, text: m[2]! }),
-    );
-    assert.equal(owners.length, 3, 'expected one owner-labelled Office per player');
-
-    // Every player is named somewhere, in seat order.
-    const bySeat = [...f.players].sort((a, b) => a.seat - b.seat);
-    assert.deepEqual(
-      owners.map((o) => o.text.replace(' (you)', '')),
-      bySeat.map((p) => p.name),
-    );
-
-    const you = owners.find((o) => o.classes.includes('bs-you'));
-    assert.ok(you, 'the viewer’s own Office is not marked');
-    assert.ok(you!.text.endsWith('(you)'), 'colour alone cannot say which railroad is the reader’s');
-    assert.equal(
-      you!.text.replace(' (you)', ''),
-      f.players.find((p) => p.index === viewer)!.name,
-      'the (you) mark is on the wrong Office',
-    );
-
-    const turn = owners.filter((o) => o.classes.includes('bs-turn'));
-    assert.equal(turn.length, f.actor === null ? 0 : 1, 'exactly one Office is the current actor’s');
-    if (f.actor !== null) {
-      assert.equal(turn[0]!.text.replace(' (you)', ''), f.players.find((p) => p.index === f.actor)!.name);
-    }
-  });
-
-  it('draws no owner marks at all when given no roster, so the replay still renders', () => {
-    const s = game(3);
-    const f = snapshot(s, [], null, null, null, false, 0 as PlayerIndex);
-    assert.equal(divisionSvg(f.division).includes('bs-owner'), false);
-  });
-});
-
-describe('Employee Rotation (Appendix B)', () => {
-  /**
-   * Straight to the Day boundary, which is the only moment a rotation happens — the same shortcut
-   * `advance.test.ts` uses to roll the clock over without playing twelve Stages of real turns.
-   */
-  const atDayEnd = (on: boolean): GameState => {
-    const s = createGame({
-      id: 'rot',
-      seed: 4242,
-      config: { ...competitive, optionalRules: { ...competitive.optionalRules, employeeRotation: on } },
-      playerNames: ['Alice', 'Bob', 'Carol'],
-    });
-    s.clock.stage = STAGES_PER_DAY;
-    s.clock.phase = 'shiftChange';
-    return s;
-  };
-
-  it('is off unless asked for — the clock alone must not move anybody', () => {
-    const s = atDayEnd(false);
-    const before = [...s.seating];
-    advance(s);
-    assert.equal(s.clock.day, 2, 'the clock did not roll over');
-    assert.deepEqual(s.seating, before, 'seats moved with the rule switched off');
-  });
-
-  it('moves every player one chair left at the Day boundary', () => {
-    const s = atDayEnd(true);
-    const before = [...s.seating];
-    advance(s);
-    assert.equal(s.clock.day, 2);
-    // "One chair to the left" is seat + 1, the direction `playerLeftOf` already turns the table.
-    const expected = before.map((_, seat, all) => all[(seat - 1 + all.length) % all.length]!);
-    assert.deepEqual(s.seating, expected);
-    // Everyone moved, and nobody was lost or duplicated on the way round.
-    assert.deepEqual([...s.seating].sort(), [...before].sort());
-    assert.notDeepEqual(s.seating, before);
-  });
-
-  it('takes your points and the Fedora with you, and leaves the district behind', () => {
-    const s = atDayEnd(true);
-    const traveller = 1 as PlayerIndex;
-    s.players[traveller]!.revenue = 17;
-    const seatBefore = seatOf(s, traveller);
-    /**
-     * The Fedora is compared against the SAME game with the rule off, not against its own value
-     * before the advance — Stage 12 is a shift change (§5), so it passes here anyway for reasons
-     * that have nothing to do with rotation. What matters is that moving the chairs does not move
-     * it: it names a player, and players are exactly what the rotation does not renumber.
-     */
-    const control = atDayEnd(false);
-    advance(control);
-    // Identity, not a field: anything mutable is liable to be reset at a Day boundary anyway (the
-    // once-a-Day dispatch reset clears `dispatchUsedToday` right there), and the claim under test
-    // is about which OBJECT is attached to which chair.
-    const districtLeftBehind = areaAtSeat(s, seatBefore);
-
-    advance(s);
-
-    assert.notEqual(seatOf(s, traveller), seatBefore, 'the traveller did not move');
-    assert.equal(s.players[traveller]!.revenue, 17, 'Revenue is keyed by player and must travel');
-    assert.equal(s.clock.superintendent, control.clock.superintendent, 'rotating the chairs moved the Fedora');
-    // The Office stayed exactly where it was, so whoever sits there now inherits it as they find
-    // it. That is the rule rather than a side effect of it — you take over the next station up the
-    // line, mess and all.
-    assert.equal(areaAtSeat(s, seatBefore), districtLeftBehind, 'the district moved with the player');
-    assert.notEqual(areaOf(s, traveller), districtLeftBehind, 'the traveller kept their old district');
-  });
-
-  it('says who is now sitting where, by name', () => {
-    const s = atDayEnd(true);
-    const { events } = advance(s);
-    const rotated = events.find((e) => e.type === 'seatsRotated');
-    assert.ok(rotated, 'no seatsRotated event was emitted');
-    const line = narrate(rotated, { playerName: (p) => s.players[p]!.name }).text;
-    for (const name of ['Alice', 'Bob', 'Carol']) assert.match(line, new RegExp(name));
-  });
-});

test/pacing.test.ts

@@ -1,244 +0,0 @@
-/**
- * DWELL BY KIND — v0.8.0, `docs/plans/jitsi-common-board.md` § v0.8.0 § 5.
- *
- * The classification is exhaustive over `Intent['type']` at COMPILE time: `kindOf` declares a
- * `StepKind` return and has no `default`, so a new intent breaks the build rather than landing
- * silently in a fallback tier. These tests add the part the compiler cannot do — they read the
- * intent union out of the source, so the guard survives someone later adding a `default:` that
- * would swallow the very thing the exhaustiveness was protecting.
- */
-
-import { describe, it } from 'node:test';
-import assert from 'node:assert/strict';
-import { readFileSync } from 'node:fs';
-import { dirname, join } from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-import { DWELL, MAX_PACE, PACE_LEVELS, dwellFor, dwellForStep, kindOf, watchableCount } from '../src/sim/pacing.ts';
-import type { StepKind } from '../src/sim/pacing.ts';
-import type { Intent } from '../src/engine/intents.ts';
-
-const root = join(dirname(fileURLToPath(import.meta.url)), '..');
-
-/** Every `type: '…'` literal in the Intent union, read from the source rather than hand-listed. */
-function declaredIntents(): string[] {
-  const src = readFileSync(join(root, 'src/engine/intents.ts'), 'utf8');
-  return [...new Set([...src.matchAll(/type: '([a-zA-Z.]+)'/g)].map((m) => m[1]!))].sort();
-}
-
-const KINDS: StepKind[] = ['switching', 'action', 'phase', 'bookkeeping'];
-
-describe('pacing — dwell by kind', () => {
-  it('classifies every intent the engine declares', () => {
-    const declared = declaredIntents();
-    assert.ok(declared.length > 25, `only found ${declared.length} intents — the parse is wrong`);
-    for (const intent of declared) {
-      const kind = kindOf(intent as Intent['type']);
-      assert.ok(
-        KINDS.includes(kind),
-        `${intent} classified as "${kind}", which is not a StepKind — a default case has crept in`,
-      );
-    }
-  });
-
-  it('protects switching and collapses bookkeeping', () => {
-    // The two ends of the measured argument: a switching move is the thing worth watching, and
-    // `*.end` bookkeeping is over half of a real game's intents.
-    assert.equal(kindOf('switch.move'), 'switching');
-    assert.equal(kindOf('switch.dropCars'), 'switching');
-    assert.equal(kindOf('switch.sortConsist'), 'switching');
-    assert.equal(kindOf('draw.end'), 'bookkeeping');
-    assert.equal(kindOf('loadUnload.end'), 'bookkeeping');
-    assert.equal(kindOf('switch.end'), 'bookkeeping');
-    /**
-     * `localOps.choose` IS AN ANNOUNCEMENT, not bookkeeping — moved 2026-09-09 after the first real
-     * play on the test server. It is the line reading "Player Bot 1 chose to SWITCH", the heading for
-     * everything that follows, and at zero dwell a bot's turn began with no sign of what it was about
-     * to do.
-     */
-    assert.equal(kindOf('localOps.choose'), 'action');
-
-    assert.ok(DWELL.switching > DWELL.action, 'switching must outrank an ordinary action');
-    assert.equal(DWELL.bookkeeping, 0, 'bookkeeping must cost the player no time at all');
-  });
-
-  it('starts switching at a full second, per the 2026-09-09 decision', () => {
-    // Jesse: "start at 1s and tune down". Pinned so a later tune is a deliberate edit rather than
-    // a drift, and so the number in the plan and the number in the code cannot disagree.
-    assert.equal(DWELL.switching, 1000);
-    assert.equal(dwellFor('switch.move'), 1000);
-  });
-
-  it('supports multipliers above 1, and keeps the tiers in proportion at every speed', () => {
-    /**
-     * Jesse, 2026-09-09, after the first play: keep switching and ordinary actions at DIFFERENT
-     * delays, and support 2.0 and 3.0 as well as 1.5. So this pins both halves — that the larger
-     * multipliers work at all, and that scaling never flattens the tiers into each other, since the
-     * relative weighting is the design and the multiplier is only how fast it runs.
-     */
-    for (const pace of [0.5, 1, 1.5, 2, 3]) {
-      assert.equal(dwellFor('switch.move', pace), Math.round(DWELL.switching * pace));
-      assert.equal(dwellFor('card.play', pace), Math.round(DWELL.action * pace));
-      assert.ok(
-        dwellFor('switch.move', pace) > dwellFor('card.play', pace),
-        `at ${pace}x a switching move no longer outlasts an ordinary action`,
-      );
-      assert.equal(dwellFor('draw.end', pace), 0, 'bookkeeping stays free at every speed');
-    }
-    // A whole switching exercise at 3x is slow on purpose, and still not absurd.
-    assert.equal(dwellFor('switch.move', 3) * 6, 18_000);
-
-    // And a typo cannot freeze the board: ?pace=300 from somebody meaning 3.00.
-    assert.equal(dwellFor('switch.move', 300), DWELL.switching * MAX_PACE);
-    assert.equal(dwellFor('switch.move', MAX_PACE + 5), dwellFor('switch.move', MAX_PACE));
-  });
-
-  it('scales with the viewer\'s pace, and 0 turns it off', () => {
-    assert.equal(dwellFor('switch.move', 1), 1000);
-    assert.equal(dwellFor('switch.move', 0.5), 500);
-    assert.equal(dwellFor('switch.move', 2), 2000);
-    // TODO #18's "a player who has seen it a hundred times will want it off" — no second mechanism.
-    for (const intent of declaredIntents()) {
-      assert.equal(dwellFor(intent as Intent['type'], 0), 0, `${intent} still dwells at pace 0`);
-    }
-    // A negative pace is a corrupt preference, not a request to run time backwards.
-    assert.equal(dwellFor('switch.move', -3), 0);
-  });
-
-  it('counts only the steps a player will actually watch', () => {
-    /**
-     * The counter's whole point. A backlog of 17 where 12 are bookkeeping must read "5", not "17"
-     * followed by an instant plummet to 5 — the countdown is meant to be steady enough to decide
-     * whether to press Skip.
-     */
-    const queue: Intent['type'][] = [
-      ...Array<Intent['type']>(12).fill('draw.end'),
-      ...Array<Intent['type']>(5).fill('switch.move'),
-    ];
-    assert.equal(queue.length, 17);
-    assert.equal(watchableCount(queue), 5);
-    assert.equal(watchableCount(queue, 0), 0, 'with animation off, nothing is behind');
-  });
-
-  it('offers speeds a player actually reached for, and none the code would clamp', () => {
-    /**
-     * Jesse played a whole game believing he was at 7× and was in fact at 1×: `?pace=` shipped as the
-     * only lever, and `index.html`'s doors are `play.html?lobby` / `play.html?solitaire`, so arriving
-     * from the splash REPLACES the query string. Hence a real control on the play screen, and hence
-     * this ladder — which must reach the speeds people ask for and must not offer one that
-     * `dwellFor` would silently clamp.
-     */
-    assert.equal(PACE_LEVELS[0], 0, 'off must be the first rung — #18 wants it turned off');
-    assert.ok(PACE_LEVELS.includes(1), 'the default must be on the ladder');
-    assert.ok(PACE_LEVELS.includes(7), '7x was asked for by name');
-    /**
-     * The ceiling is not theoretical. Jesse played at 10× — the top of the ladder as it then was —
-     * and called it "still a bit fast, but followable", so the ladder has to go past the speed
-     * somebody actually reached for and found insufficient.
-     */
-    assert.ok(PACE_LEVELS.some((p) => p > 10), 'the ladder must go beyond the speed that was too fast');
-    for (const p of PACE_LEVELS) {
-      assert.ok(p <= MAX_PACE, `${p}x is past MAX_PACE, so the control would lie about it`);
-      assert.equal(dwellFor('switch.move', p), Math.round(DWELL.switching * p));
-    }
-    // Strictly increasing, so stepping the control always changes the speed.
-    for (let i = 1; i < PACE_LEVELS.length; i++) {
-      assert.ok(PACE_LEVELS[i]! > PACE_LEVELS[i - 1]!, 'the ladder must be strictly increasing');
-    }
-    // The slowest rung has to be slow enough to be worth having: six switching moves at the top of
-    // the ladder is a full minute, which is the "watch them struggle" case.
-    const slowest = dwellFor('switch.move', PACE_LEVELS[PACE_LEVELS.length - 1]!) * 6;
-    assert.ok(slowest >= 60_000, `the slowest a switching turn can be watched is ${slowest}ms`);
-  });
-
-  it('a silent step beats only when the clock turns over — TODO #18', () => {
-    /**
-     * Both obvious rules were wrong, so both are pinned. "No narration, no dwell" flashed past
-     * phases that moved trains without saying so, killing the very thing #18 asks for. "Anything
-     * that changed the board" beat on every turn hand-off — `submit()` steps `advance()` about 4.6
-     * times per intent — which came to a quarter of an hour a game.
-     */
-    const silent = { cause: 'phase' as const, player: null, lines: [] as string[] };
-    assert.equal(dwellForStep({ ...silent, frame: { table: { actor: 2 } } }), 0, 'a turn hand-off shows nothing');
-    assert.equal(dwellForStep({ ...silent, frame: { table: {} } }), 0, 'a step that changed nothing shows nothing');
-    assert.equal(dwellForStep({ ...silent, frame: { table: { phase: 'mainline' } } }), DWELL.phase);
-    assert.equal(dwellForStep({ ...silent, frame: { table: { stage: 4 } } }), DWELL.phase);
-    // Narration always earns the dwell of whatever caused it, clock or no clock.
-    assert.equal(
-      dwellForStep({ cause: 'switch.move', player: 1, lines: ['moved'], frame: { table: {} } }),
-      DWELL.switching,
-    );
-  });
-
-  it('the speed control stretches the clock at a THIRD of the rate it stretches people', () => {
-    /**
-     * Two complaints, one from each direction, and the answer is between them.
-     *
-     * v0.8.0.3, from a 5× game: *"after my turn … I'm still subject to that same delay before it
-     * moves on. That makes no sense."* — phases were scaling with everything else and walling off a
-     * player's own turn. So they were pinned at their tabled beat.
-     *
-     * v0.8.0.7, from a 10× game: *"phases displayed on the upper line go by too quickly still.
-     * Should be 4 times as long — at a guess."* — pinned was too short to read the caption.
-     *
-     * Damped scaling satisfies both: 1× unchanged, 10× lands exactly on the four-times guess, and
-     * the cost stays bounded because phase beats cluster rather than accumulate.
-     */
-    const phase = { cause: 'phase' as const, player: null, lines: ['New Train'], frame: { table: { phase: 'newTrain' } } };
-    const theirs = { cause: 'switch.move' as const, player: 1, lines: ['moved'], frame: { table: {} } };
-
-    assert.equal(dwellForStep(phase, 1), DWELL.phase, '1x must be exactly the tabled beat');
-    assert.equal(dwellForStep(phase, 10), DWELL.phase * 4, '10x must be four times it, as asked for');
-
-    for (const pace of [2, 3, 5, 7, 10, 15, 20]) {
-      const p = dwellForStep(phase, pace);
-      const t = dwellForStep(theirs, pace);
-      assert.ok(p > DWELL.phase, `a phase must grow at ${pace}x`);
-      assert.ok(
-        p < DWELL.phase * pace,
-        `a phase must grow SLOWER than the multiplier at ${pace}x, or the clock walls off the turn`,
-      );
-      assert.ok(t > p, `somebody's move must still outlast a phase beat at ${pace}x`);
-    }
-    // Off still means off, for the clock as much as for anybody's move; and below 1x the clock
-    // follows the multiplier straight, because "faster" should mean everything.
-    assert.equal(dwellForStep(phase, 0), 0);
-    assert.equal(dwellForStep(theirs, 0), 0);
-    assert.equal(dwellForStep(phase, 0.5), DWELL.phase * 0.5);
-  });
-
-  it('a real switching turn is watchable in a few seconds, not tens of them', () => {
-    // Six moves is the engine's cap per crew ("N of 6 Moves left"), so this is the worst ordinary
-    // case for one crew: the announcement, six moves, and an end that shows nothing.
-    const turn: Intent['type'][] = [
-      'localOps.choose',
-      ...Array<Intent['type']>(6).fill('switch.move'),
-      'switch.end',
-    ];
-    const total = turn.reduce((ms, i) => ms + dwellFor(i), 0);
-    assert.equal(total, DWELL.action + 6 * DWELL.switching);
-    assert.ok(total > 5_000 && total < 10_000, `a switching turn takes ${total}ms to watch`);
-    assert.equal(watchableCount(turn), 7, 'the six moves and the announcement; not the end');
-  });
-
-  it("a bot's ordinary turn is followable, which is what the first real play was not", () => {
-    /**
-     * MEASURED FROM A REAL GAME, then pinned. Jesse, after installing v0.8.0 on the test server:
-     * *"bot play was way too fast. I briefly saw that it was the bot's office area then their turn
-     * was done."* This is the shape that turn actually had — no switching in it at all, because
-     * switching is not legal until there is track down — and under the original values it came to
-     * 750ms for the whole thing.
-     */
-    const turn: Intent['type'][] = [
-      'localOps.choose',
-      'draw.fromHomeOffice',
-      'card.play',
-      'draw.end',
-      'localOps.choose',
-      'freightAgent.stockOutbound',
-    ];
-    const total = turn.reduce((ms, i) => ms + dwellFor(i), 0);
-    assert.ok(total >= 3_000, `an ordinary bot turn is only ${total}ms — too fast to follow`);
-    assert.equal(watchableCount(turn), 5, 'only the turn-ending bookkeeping is free');
-  });
-});

test/presets.test.ts

@@ -1,182 +0,0 @@
-/**
- * The four game types (`src/web/presets.ts`) — Jesse's design, 2026-08-23.
- *
- * These numbers are a DESIGN, not an implementation detail: they say what Co-op asks of a table and
- * what Cutthroat refuses to. Pinned here so that changing one is a decision somebody makes on
- * purpose rather than something a refactor can do quietly.
- */
-
-import { describe, it } from 'node:test';
-import assert from 'node:assert/strict';
-
-import {
-  PRESETS,
-  closestPreset,
-  configFromPreset,
-  configFromSettings,
-  differencesFrom,
-  gameTypeLabel,
-  preset,
-  presetOf,
-  presetSettings,
-  settingsOf,
-} from '../src/web/presets.ts';
-import type { PresetName } from '../src/web/presets.ts';
-
-const NAMES: PresetName[] = ['solitaire', 'coop', 'competitive', 'cutthroat'];
-
-describe('what each game type is', () => {
-  it('deals six cards in every type — the hand limit is three, so the first turn is a discard', () => {
-    for (const name of NAMES) {
-      assert.equal(presetSettings(name, 4, 5).startingHand, 'sixRandom', `${name} does not deal six`);
-    }
-  });
-
-  it('scores Cutthroat as Competitive, and Co-op as itself', () => {
-    assert.equal(preset('cutthroat').scoring, 'competitive');
-    assert.equal(preset('competitive').scoring, 'competitive');
-    assert.equal(preset('coop').scoring, 'coop');
-    assert.equal(preset('solitaire').scoring, 'solitaire');
-  });
-
-  it('lets the opponent-directed cards into Competitive and Cutthroat only', () => {
-    // Co-op has no opponent to point them at; solitaire has nobody at all. Inert either way until
-    // the cards are built (`setup.ts`), which is why no screen offers this as a control any more.
-    assert.deepEqual(
-      PRESETS.filter((p) => p.pvpCards).map((p) => p.name),
-      ['competitive', 'cutthroat'],
-    );
-  });
-
-  it('pays for a transit in Co-op alone — the one economy that pays everybody at once', () => {
-    assert.equal(presetSettings('coop', 4, 5).trainPerTransit, 1);
-    for (const name of ['solitaire', 'competitive', 'cutthroat'] as PresetName[]) {
-      assert.equal(presetSettings(name, 4, 5).trainPerTransit, 0, `${name} pays for transits`);
-    }
-  });
-
-  it('lets an Extra be planted in another player’s district in Cutthroat only', () => {
-    assert.equal(presetSettings('cutthroat', 4, 5).extraStart, 'anyOffice');
-    assert.equal(presetSettings('coop', 4, 5).extraStart, 'ownOffice');
-    assert.equal(presetSettings('competitive', 4, 5).extraStart, 'ownOffice');
-    // At one player the two rules ARE the same rule — `apply.ts` only rejects `ownOffice` when the
-    // start is another seat's, which cannot happen. Solitaire said `anyOffice` until 2026-08-30:
-    // true, and it read wrong, since a lone player has no "any player" to be contrasted with. The
-    // label changed and the behaviour did not.
-    assert.equal(presetSettings('solitaire', 1, 5).extraStart, 'ownOffice');
-  });
-
-  it('leaves every optional rule off, in every type', () => {
-    for (const name of NAMES) {
-      const s = presetSettings(name, 4, 5);
-      assert.deepEqual(
-        [s.reducedVisibility, s.employeeRotation, s.emergencyToolbox],
-        [false, false, false],
-        `${name} switches an optional rule on`,
-      );
-    }
-  });
-});
-
-describe('the Revenue floor is a formula, not a number', () => {
-  /**
-   * Jesse gave these at five Days — Co-op 15 × players, Competitive 10 × players — and they scale,
-   * because a ten-Day game with a five-Day target is not a target. The floor follows the table size
-   * AND the length, which is exactly why both sit above the type radios as parameters rather than
-   * below them as rules.
-   */
-  it('asks 15 per player in Co-op at five Days, and 10 in Competitive', () => {
-    for (const players of [2, 3, 4]) {
-      assert.equal(presetSettings('coop', players, 5).minCombinedRevenue, 15 * players);
-      assert.equal(presetSettings('competitive', players, 5).minCombinedRevenue, 10 * players);
-    }
-  });
-
-  it('scales both ways with the Day count', () => {
-    assert.equal(presetSettings('coop', 3, 8).minCombinedRevenue, 3 * 3 * 8);
-    assert.equal(presetSettings('coop', 3, 3).minCombinedRevenue, 3 * 3 * 3);
-    assert.equal(presetSettings('competitive', 4, 10).minCombinedRevenue, 2 * 4 * 10);
-    assert.equal(presetSettings('competitive', 2, 3).minCombinedRevenue, 2 * 2 * 3);
-  });
-
-  it('asks nothing at all in Cutthroat, and leaves only the per-Day collision check standing', () => {
-    const s = presetSettings('cutthroat', 4, 5);
-    assert.equal(s.minCombinedRevenue, 0, 'Cutthroat has a Revenue floor');
-    assert.equal(s.maxCollisionsTotal, 0, 'Cutthroat caps collisions across the game');
-    assert.equal(s.maxCollisionsPerDay, 3, 'three collisions in one Day still ends a Cutthroat game');
-  });
-});
-
-describe('naming a game from its numbers', () => {
-  it('reads every type back as itself, at every table size and length', () => {
-    for (const name of NAMES) {
-      const players = name === 'solitaire' ? 1 : 3;
-      for (const days of [3, 5, 10]) {
-        const config = configFromPreset(name, players, days);
-        assert.equal(presetOf(config, players, days), name, `${name} at ${days} Days did not read back`);
-      }
-    }
-  });
-
-  it('tells Cutthroat and Competitive apart, though they are scored the same way', () => {
-    const cut = configFromPreset('cutthroat', 4, 5);
-    const comp = configFromPreset('competitive', 4, 5);
-    assert.equal(cut.mode, comp.mode, 'these two are meant to share a scoring mode');
-    assert.equal(presetOf(cut, 4, 5), 'cutthroat');
-    assert.equal(presetOf(comp, 4, 5), 'competitive');
-  });
-
-  it('calls a changed rule Custom, and says which rule', () => {
-    const base = configFromPreset('coop', 4, 5);
-    const settings = { ...settingsOf(base), emergencyToolbox: true };
-    const custom = configFromSettings(settings, 'coop', 5, false);
-    assert.equal(presetOf(custom, 4, 5), 'custom');
-    assert.deepEqual(differencesFrom('coop', settings, 4, 5), ['emergencyToolbox']);
-  });
-
-  it('does not call a Co-op game Competitive just because its dials line up', () => {
-    // The scoring mode is part of the comparison: the same numbers under a different mode are a
-    // different game, and the type is what a player reads to know which.
-    const settings = presetSettings('competitive', 4, 5);
-    const coopScored = configFromSettings(settings, 'coop', 5, false);
-    assert.notEqual(presetOf(coopScored, 4, 5), 'competitive');
-    assert.equal(presetOf(coopScored, 4, 5), 'custom');
-  });
-
-  it('measures a Custom game against the nearest type it is scored as', () => {
-    // A join preview is handed a finished config and nothing else — "Custom" alone would tell a
-    // player nothing about what they are sitting down to.
-    const settings = { ...presetSettings('cutthroat', 4, 5), freightPerLoad: 3 };
-    const config = configFromSettings(settings, 'competitive', 5, true);
-    const near = closestPreset(config, 4, 5);
-    assert.equal(near.name, 'cutthroat', 'a tuned Cutthroat game was measured against something else');
-    assert.deepEqual(near.differing, ['freightPerLoad']);
-  });
-
-  it('says what a Custom game is scored as, since the dials cannot', () => {
-    assert.match(gameTypeLabel('custom', 'coop'), /Co-op/);
-    assert.match(gameTypeLabel('custom', 'competitive'), /Competitive/);
-    assert.equal(gameTypeLabel('cutthroat', 'competitive'), 'Cutthroat');
-  });
-});
-
-describe('the config a form produces', () => {
-  it('carries the type’s scoring mode and its stance on the opponent cards', () => {
-    for (const name of NAMES) {
-      const config = configFromPreset(name, name === 'solitaire' ? 1 : 4, 5);
-      assert.equal(config.mode, preset(name).scoring);
-      assert.equal(config.pvpCardsAllowed, preset(name).pvpCards);
-    }
-  });
-
-  it('spells out every house rule rather than leaving one to a default somewhere else', () => {
-    const config = configFromPreset('competitive', 3, 5);
-    assert.ok(config.houseRules?.startingHand, 'the opening hand was left unnamed');
-    assert.ok(config.houseRules?.extraStart, 'the Extra rule was left unnamed');
-    assert.deepEqual(config.houseRules?.revenue, {
-      passengerPerCoach: 1,
-      freightPerLoad: 1,
-      trainPerTransit: 0,
-    });
-  });
-});

test/public-delta.test.ts

@@ -1,294 +0,0 @@
-/**
- * THE SEATLESS PUBLIC DELTA — v0.8.0, `docs/plans/jitsi-common-board.md` § v0.8.0 § 3.
- *
- * The property that matters is RECONSTRUCTION: a receiver that started from one full frame and
- * merged every delta since must hold exactly what a fresh `publicSnapshot()` would give it. A delta
- * scheme that is merely smaller is worthless if the two sides drift, and the drift would show up as
- * a board that is subtly wrong rather than as an error.
- */
-
-import { describe, it } from 'node:test';
-import assert from 'node:assert/strict';
-
-import { pump } from '../src/engine/advance.ts';
-import { createGame } from '../src/engine/setup.ts';
-import { legalActions } from '../src/engine/legal.ts';
-import type { GameConfig, GameState, PlayerIndex } from '../src/engine/state.ts';
-import { applyIntent } from '../src/engine/apply.ts';
-import { currentActorOfState, publicSnapshot } from '../src/sim/view.ts';
-import type { PublicFrame } from '../src/sim/view.ts';
-import { applyPublicDelta, changedPiles, deltaPublicFrame } from '../src/sim/public-delta.ts';
-
-const config: GameConfig = {
-  mode: 'competitive',
-  days: 5,
-  minCombinedRevenue: 0,
-  maxCollisionsPerDay: 0,
-  maxCollisionsTotal: 0,
-  pvpCardsAllowed: false,
-  optionalRules: {
-    reducedVisibility: false,
-    employeeRotation: false,
-    emergencyToolbox: false,
-  },
-};
-
-function newState(seed: number, players = 3, rotation = false): GameState {
-  const s = createGame({
-    id: `delta-${seed}`,
-    seed,
-    config: rotation
-      ? { ...config, optionalRules: { ...config.optionalRules, employeeRotation: true } }
-      : config,
-    playerNames: Array.from({ length: players }, (_, i) => `p${i}`),
-  });
-  pump(s);
-  return s;
-}
-
-/** Plays one legal action, preferring a switch move so districts actually change between frames. */
-function step(s: GameState, actor: PlayerIndex): boolean {
-  const options = legalActions(s, actor);
-  if (options.length === 0) return false;
-  const move = options.find((o) => o.type.startsWith('switch.') && o.type !== 'switch.end');
-  const chosen = move ?? options.find((o) => o.type === 'localOps.choose') ?? options[0]!;
-  const r = applyIntent(s, actor, chosen);
-  if (!r.ok) return false;
-  pump(s);
-  return true;
-}
-
-describe('public frame delta', () => {
-  it('reconstructs exactly what a fresh projection produces, over a long chain', () => {
-    for (const seed of [1917398, 4242]) {
-      const s = newState(seed);
-      let sent: PublicFrame | null = null;
-      let held: PublicFrame | null = null;
-      let steps = 0;
-
-      for (let i = 0; i < 300; i++) {
-        const actor = currentActorOfState(s);
-        if (actor === null) break;
-        if (!step(s, actor)) break;
-
-        const next = publicSnapshot(s);
-        const delta = deltaPublicFrame(sent, next);
-        held = applyPublicDelta(held, delta);
-        sent = next;
-        steps++;
-
-        assert.deepEqual(
-          held,
-          next,
-          `merged frame drifted from a fresh projection at step ${steps} (seed ${seed})`,
-        );
-      }
-      assert.ok(steps > 20, `only ${steps} steps for seed ${seed} — the chain proved little`);
-    }
-  });
-
-  it('sends a district board only when that district changed', () => {
-    const s = newState(1917398);
-    const first = publicSnapshot(s);
-    // Nothing has moved, so a delta against an identical frame must null every board.
-    const idle = deltaPublicFrame(first, publicSnapshot(s));
-    assert.equal(idle.division, null, 'the Division was unchanged and must not be resent');
-    assert.equal(idle.districts.length, 0, 'an unchanged district must be omitted, not sent as nulls');
-    assert.deepEqual(idle.table, {}, 'an unchanged table must send no fields at all');
-
-    // Now move one player. Only that seat's board may be sent — this is the whole point of keying
-    // the delta by seat rather than comparing `districts` as one array.
-    let moved: PublicIndexed | null = null;
-    for (let i = 0; i < 200 && moved === null; i++) {
-      const actor = currentActorOfState(s);
-      if (actor === null) break;
-      const before = publicSnapshot(s);
-      if (!step(s, actor)) break;
-      const after = publicSnapshot(s);
-      const changed = after.districts.filter(
-        (d) => JSON.stringify(d.cells) !== JSON.stringify(before.districts.find((b) => b.seat === d.seat)?.cells),
-      );
-      if (changed.length === 1) moved = { seat: changed[0]!.seat, before, after };
-    }
-    assert.ok(moved !== null, 'no single-district change occurred, so this test proved nothing');
-
-    const delta = deltaPublicFrame(moved.before, moved.after);
-    assert.equal(delta.districts.length, 1, 'only the district that changed may be sent');
-    assert.equal(delta.districts[0]!.seat, moved.seat);
-    assert.notEqual(delta.districts[0]!.cells, null, 'the district that changed must carry its board');
-  });
-
-  it('a step that changes one field sends one field — the reason this is a partial', () => {
-    /**
-     * MEASURED, not assumed. The first version spread the whole frame and nulled only the boards, so
-     * a step whose sole change was whose turn it is still shipped all 35 top-level properties. Once
-     * TODO #18 gave automatic phases their own steps, most steps became exactly that, and a full game
-     * cost 19.4 MB of which 16.7 MB was those. This is the guard against that returning.
-     */
-    const s = newState(1917398);
-    const before = publicSnapshot(s);
-    const full = JSON.stringify(deltaPublicFrame(null, before)).length;
-
-    // Hand the turn on without touching a board, which is what an automatic phase mostly does.
-    const after = { ...before, actor: ((before.actor ?? 0) + 1) as PlayerIndex };
-    const delta = deltaPublicFrame(before, after);
-    assert.deepEqual(Object.keys(delta.table), ['actor'], 'only the field that changed may be sent');
-    assert.equal(delta.districts.length, 0);
-    assert.equal(delta.division, null);
-
-    const size = JSON.stringify(delta).length;
-    assert.ok(size < 120, `a one-field delta serialised to ${size} bytes`);
-    assert.ok(size * 100 < full, `a one-field delta (${size}B) is not much smaller than a full frame (${full}B)`);
-  });
-
-  it('always carries seat, player and name, so Employee Rotation cannot be missed', () => {
-    // Rotation moves players between districts, so the seat→player pairing is itself news. Those
-    // fields are small and are never nulled; the boards they label are what the delta saves.
-    const s = newState(777, 3, true);
-    const a = publicSnapshot(s);
-    // A full frame carries every district, each labelled — that is what a receiver matches on later.
-    const full = deltaPublicFrame(null, a);
-    assert.equal(full.districts.length, a.districts.length);
-    for (const d of full.districts) {
-      assert.equal(typeof d.seat, 'number');
-      assert.equal(typeof d.player, 'number');
-      assert.ok(typeof d.name === 'string' && d.name.length > 0, 'every district must stay labelled');
-    }
-    // And a district sent at all always carries its labels, even when only its board moved: rotation
-    // makes the seat→player pairing news in its own right.
-    const rotated = { ...a, districts: a.districts.map((d, i) => (i === 0 ? { ...d, player: ((d.player + 1) % 3) as PlayerIndex } : d)) };
-    const delta = deltaPublicFrame(a, rotated);
-    assert.equal(delta.districts.length, 1, 'a relabelled district must be sent even with no board change');
-    assert.equal(typeof delta.districts[0]!.player, 'number');
-  });
-
-  it('a first frame is sent whole', () => {
-    const s = newState(4242);
-    const full = deltaPublicFrame(null, publicSnapshot(s));
-    assert.notEqual(full.division, null);
-    for (const d of full.districts) {
-      assert.notEqual(d.cells, null, `seat ${d.seat} must be sent in full on a first frame`);
-      assert.notEqual(d.facilities, null);
-    }
-    // And it merges with no previous frame at all.
-    assert.deepEqual(applyPublicDelta(null, full), publicSnapshot(s));
-  });
-
-  it('refuses to merge an "unchanged" board it has nothing to merge onto', () => {
-    // A sender whose bookkeeping has drifted would otherwise hand a player a blank district.
-    const s = newState(4242);
-    const a = publicSnapshot(s);
-    const unchanged = deltaPublicFrame(a, publicSnapshot(s));
-    assert.throws(() => applyPublicDelta(null, unchanged), /no previous frame to merge onto/);
-  });
-});
-
-type PublicIndexed = { seat: number; before: PublicFrame; after: PublicFrame };
-
-describe('which piles a step moved', () => {
-  /**
-   * MEASURED FROM REAL PLAY, then pinned. The table in `changedPiles` claims what each action moves,
-   * and a claim in a comment is worth nothing unless something checks it — so this drives real games
-   * and asserts the mapping holds, action by action.
-   */
-  it('maps each action to the piles it actually touches', () => {
-    const seen = new Map<string, Set<string>>();
-    /**
-     * TWO PASSES, because a single driver cannot reach every case. Left to itself the bot almost
-     * never takes a Department card, and a driver that prefers one then never draws from the deck —
-     * so each preference is played out separately and the assertions below require BOTH to have
-     * been observed rather than passing on whichever happened to occur.
-     */
-    for (const prefer of ['draw.fromDepartment', 'draw.fromHomeOffice'] as const) {
-      for (const seed of [1917398, 191056, 4242]) {
-        const s = newState(seed);
-        for (let i = 0; i < 400; i++) {
-          const actor = currentActorOfState(s);
-          if (actor === null) break;
-          const options = legalActions(s, actor);
-          if (options.length === 0) break;
-          const chosen =
-            options.find((o) => o.type === prefer) ??
-            options.find((o) => o.type === 'card.discard') ??
-            options[i % options.length]!;
-          const before = publicSnapshot(s);
-          const r = applyIntent(s, actor, chosen);
-          if (!r.ok) break;
-          pump(s);
-          const piles = changedPiles(before, publicSnapshot(s)).map((p) => p.replace(/dept\d/, 'dept'));
-          if (!seen.has(chosen.type)) seen.set(chosen.type, new Set());
-          for (const p of piles) seen.get(chosen.type)!.add(p);
-          if (piles.length === 0) seen.get(chosen.type)!.add('(none)');
-        }
-      }
-    }
-
-    const of = (t: string): Set<string> => seen.get(t) ?? new Set();
-    // NOT VACUOUS: the four cases the mapping is actually about must all have happened.
-    for (const needed of ['draw.fromHomeOffice', 'draw.fromDepartment', 'card.discard', 'card.play']) {
-      assert.ok(of(needed).size > 0, `${needed} never occurred, so its rule proved nothing`);
-    }
-
-    // A HOME OFFICE DRAW MOVES THE COUNT AND NOTHING ELSE ON A PILE. The card is private; the deck
-    // getting shorter is not, and it is the only thing a watcher can be shown.
-    assert.deepEqual([...of('draw.fromHomeOffice')].sort(), ['home']);
-    // A DEPARTMENT DRAW touches that Department, and sometimes the deck too — the pile refills from
-    // it. Both are public, so both may light.
-    for (const p of of('draw.fromDepartment')) {
-      assert.ok(p === 'dept' || p === 'home', `a Department draw moved "${p}"`);
-    }
-    assert.ok(of('draw.fromDepartment').has('dept'), 'a Department draw must light its Department');
-    // A DISCARD lands face up on a Department, and which one is public.
-    assert.deepEqual([...of('card.discard')].sort(), ['dept']);
-    // A PLAYED CARD that does not stay on the board lands face up in the Salvage Yard.
-    assert.ok(of('card.play').has('salvage'), 'a played card must be able to light the Salvage Yard');
-    // ENDING A PHASE moves no card anywhere, so nothing should light for it.
-    for (const quiet of ['draw.end', 'loadUnload.end', 'switch.end', 'localOps.choose']) {
-      if (of(quiet).size > 0) assert.deepEqual([...of(quiet)], ['(none)'], `${quiet} lit a pile`);
-    }
-  });
-
-  it('lights nothing without a previous frame to compare against', () => {
-    // A reset has nothing to have watched arriving, so nothing on it is lit.
-    const s = newState(4242);
-    assert.deepEqual(changedPiles(null, publicSnapshot(s)), []);
-  });
-});
-
-describe('a Mainline card that changed under the players (Gitea#28)', () => {
-  it('names the node a Realignment converted, and nothing else', async () => {
-    const { changedDivisionCards } = await import('../src/sim/public-delta.ts');
-    const { REALIGNMENTS } = await import('../src/engine/content.ts');
-
-    const s = newState(4242);
-    const before = publicSnapshot(s);
-
-    // Realignment converts a card to another kind (`content.ts`'s table). Applied to the state directly:
-    // what is being tested is the DETECTOR, not the play that reaches it — which needs the card in hand,
-    // the draw option taken and no train on the card.
-    const at = s.division.nodes.findIndex((n) => n.kind === 'mainline' && REALIGNMENTS.some((r) => r.from === n.card));
-    assert.ok(at >= 0, 'no Mainline card in this Division can be realigned at all');
-    const node = s.division.nodes[at];
-    assert.equal(node?.kind, 'mainline');
-    if (node?.kind === 'mainline') {
-      node.card = REALIGNMENTS.find((r) => r.from === node.card)!.to;
-    }
-    const after = publicSnapshot(s);
-
-    assert.deepEqual(changedDivisionCards(before, after), [at], 'the realigned card was not the one reported');
-    assert.deepEqual(changedDivisionCards(after, after), [], 'an unchanged Division reported a change');
-    assert.deepEqual(changedDivisionCards(null, after), [], 'a first board has nothing to compare against');
-  });
-
-  it('says nothing when only the trains on a card moved', async () => {
-    const { changedDivisionCards } = await import('../src/sim/public-delta.ts');
-    const s = newState(1917398);
-    const before = publicSnapshot(s);
-    const at = s.division.nodes.findIndex((n) => n.kind === 'mainline');
-    const node = s.division.nodes[at];
-    if (node?.kind === 'mainline') {
-      node.transits.push({ tray: 'tray1', stagesRemaining: 1, stagesTotal: 1, direction: 'east' });
-    }
-    assert.deepEqual(changedDivisionCards(before, publicSnapshot(s)), [], 'a train arriving flashed the card');
-  });
-});

test/redaction.test.ts

@@ -1,553 +0,0 @@
-/**
- * §7's redaction test — "the single most important test in the plan."
- *
- * Everything else about `Frame` degrades gracefully; a redaction bug hands one player's hand to
- * another and cannot be walked back once it has been seen. `test/multiplayer.test.ts`'s "the view
- * shows one seat at a time" section already proves `snapshot(s, ..., viewer)` gives each seat its
- * own hand, board and Revenue — spot-checks that today's code does the right thing. This is the
- * different, exhaustive check: serialize a seat's whole `Frame` and assert none of some OTHER seat's
- * actual secret data appears anywhere in it, so a future careless edit is caught rather than assumed
- * safe. No server needed — `snapshot()` and a multi-player `GameState` are all this exercises.
- */
-
-import { describe, it } from 'node:test';
-import assert from 'node:assert/strict';
-
-import { pump } from '../src/engine/advance.ts';
-import { createGame } from '../src/engine/setup.ts';
-import type { GameConfig, GameState, PlayerIndex } from '../src/engine/state.ts';
-import { developerBot, playGame } from '../src/sim/bot.ts';
-import { cardName, publicSnapshot, snapshot } from '../src/sim/view.ts';
-import { newGame, newMultiplayerGame, submit } from '../src/web/game.ts';
-import { createSession } from '../src/server/session.ts';
-import { legalActions } from '../src/engine/legal.ts';
-
-const config: GameConfig = {
-  mode: 'competitive',
-  days: 5,
-  minCombinedRevenue: 0,
-  maxCollisionsPerDay: 0,
-  maxCollisionsTotal: 0,
-  pvpCardsAllowed: false,
-  optionalRules: {
-    reducedVisibility: false,
-    employeeRotation: false,
-    emergencyToolbox: false,
-  },
-};
-
-/** Plays a real multi-player game partway — enough for every seat to hold a real, distinct hand. */
-function midGame(players: number, seed: number): GameState {
-  const s = createGame({
-    id: `redact-${players}`,
-    seed,
-    config,
-    playerNames: Array.from({ length: players }, (_, i) => `p${i}`),
-  });
-  const r = playGame(s, developerBot, pump, 400);
-  // A partial or finished game both exercise real hands — either is fine for this check.
-  void r;
-  return s;
-}
-
-describe('redaction — a seat\'s Frame never carries another seat\'s secrets', () => {
-  it('never contains another seat\'s actual hand-card ids', () => {
-    for (const players of [3, 4]) {
-      const s = midGame(players, 1000 + players);
-      for (let viewer = 0 as PlayerIndex; viewer < players; viewer++) {
-        const serialized = JSON.stringify(snapshot(s, [], null, null, null, false, viewer));
-        for (let other = 0 as PlayerIndex; other < players; other++) {
-          if (other === viewer) continue;
-          for (const cardId of s.decks.hands.get(other) ?? []) {
-            assert.ok(
-              !serialized.includes(`"${cardId}"`),
-              `${players}p seed ${1000 + players}: seat ${viewer}'s Frame contains seat ${other}'s ` +
-                `hand card id "${cardId}"`,
-            );
-          }
-        }
-      }
-    }
-  });
-
-  it('never contains the Home Office deck\'s order or contents, only its count', () => {
-    for (const players of [3, 4]) {
-      const s = midGame(players, 2000 + players);
-      // The deck's own card ids are the thing that must never leak — distinct from any hand's ids,
-      // since a card once dealt is removed from `homeOffice` (state.ts).
-      const deckIds = new Set(s.decks.homeOffice);
-      for (let viewer = 0 as PlayerIndex; viewer < players; viewer++) {
-        const frame = snapshot(s, [], null, null, null, false, viewer);
-        assert.equal(frame.deck, s.decks.homeOffice.length, 'deck field is not a plain count');
-        const serialized = JSON.stringify(frame);
-        for (const cardId of deckIds) {
-          assert.ok(
-            !serialized.includes(`"${cardId}"`),
-            `${players}p seed ${2000 + players}: seat ${viewer}'s Frame contains a Home Office deck id "${cardId}"`,
-          );
-        }
-      }
-    }
-  });
-
-  it('never carries the seed or rngState — Frame has no field for either', () => {
-    // A structural guarantee, not a runtime one: confirmed here so a future field addition to Frame
-    // that reintroduces one of these is at least forced past a reader of this test, if not the type
-    // system directly (see Frame in src/sim/view.ts, which carries neither today).
-    const s = midGame(3, 3003);
-    const frame = snapshot(s, [], null, null, null, false, 0);
-    assert.ok(!('seed' in frame), 'Frame gained a seed field');
-    assert.ok(!('rngState' in frame), 'Frame gained an rngState field');
-    const serialized = JSON.stringify(frame);
-    assert.ok(!serialized.includes(String(s.seed)), 'the seed value leaked into the Frame some other way');
-  });
-
-  it('the tally that rides the Frame is aggregate counts, never a card id (Gitea#16)', () => {
-    // Gitea#16's statistics live on `GameState` and reach a remote client on the Frame, which is
-    // only safe because nothing in a Tally identifies a card. That is a property of what
-    // `tally.ts` chooses to count, and nothing in the type system enforces it — so it is asserted
-    // here, where a future counter that stashed a `cardId` "just for badges" would be caught.
-    for (const players of [3, 4]) {
-      const s = midGame(players, 5000 + players);
-      const secrets = new Set<string>([...s.decks.homeOffice]);
-      for (const hand of s.decks.hands.values()) for (const id of hand) secrets.add(id);
-      for (let viewer = 0 as PlayerIndex; viewer < players; viewer++) {
-        const serialized = JSON.stringify(snapshot(s, [], null, null, null, false, viewer).tally);
-        for (const cardId of secrets) {
-          assert.ok(!serialized.includes(`"${cardId}"`), `the tally carries card id "${cardId}"`);
-        }
-      }
-    }
-  });
-
-  it('every seat sees the SAME tally — it is the table\'s account, not a private one', () => {
-    const s = midGame(3, 5555);
-    const tallies = [0, 1, 2].map((p) => snapshot(s, [], null, null, null, false, p as PlayerIndex).tally);
-    for (const t of tallies) assert.deepEqual(t, tallies[0], 'the tally differs by seat');
-  });
-
-  it('only the viewer\'s own hand and handCount are non-public — everything else matches across seats', () => {
-    // The redaction surface is four fields (§7), not sixty event types. Cross-check that seats agree
-    // on everything else a Frame carries about shared state.
-    const s = midGame(3, 4004);
-    const frames = [0, 1, 2].map((p) => snapshot(s, [], null, null, null, false, p as PlayerIndex));
-    for (const f of frames) {
-      assert.deepEqual(f.timetable, frames[0]!.timetable, 'the public timetable differs by seat');
-      assert.deepEqual(f.deck, frames[0]!.deck, 'the deck count differs by seat');
-      assert.deepEqual(
-        f.players.map((p) => ({ index: p.index, revenue: p.revenue, hand: p.hand })),
-        frames[0]!.players.map((p) => ({ index: p.index, revenue: p.revenue, hand: p.hand })),
-        'public standing (names, Revenue, hand COUNTS) differs by seat',
-      );
-    }
-  });
-});
-
-
-/**
- * THE OTHER HALF OF §7, AND THE HALF THAT WAS NEVER LOOKED AT.
- *
- * Every test above serializes a `Frame`, and every one of them passes `[]` for the narration log —
- * so the entire shared log has sat outside the redaction net since the net was built. It is not a
- * hypothetical hole: `game.log` is ONE list, and `linesSince(seat)` (`server/session.ts`) slices it
- * with no per-seat filter at all, so every line written into it reaches every player.
- *
- * Two things were being written into it that should never have left the seat that caused them, both
- * found while planning the public common board (Gitea#20 step 1) and both live in multiplayer today,
- * with or without that display:
- *
- *   1. the SEED, announced in the opening line of every multiplayer game — which hands every player
- *      the whole future of the deal;
- *   2. the NAME OF A CARD DRAWN BLIND from the Home Office deck.
- *
- * SOLITAIRE IS DELIBERATELY LEFT ALONE in both cases. There is nobody to leak to at a one-seat
- * table, the seed in the log is what a bug report quotes, and a solo player's own history naming
- * the card they drew is the record, not a leak. The rule is "do not tell the OTHER seats", not
- * "write less down" — so both checks below assert the solitaire text is still there.
- */
-describe('redaction — the shared narration log never carries a seat\'s secrets', () => {
-  const names = ['Ann', 'Bob', 'Cy'];
-
-  it('never announces the seed to the table (Gitea#20 step 1)', () => {
-    const g = newMultiplayerGame(550943578, config, names);
-    const log = g.log.map((l) => l.text).join('\n');
-    assert.ok(
-      !/550943578/.test(log),
-      `the seed was announced to every seat:\n${log}`,
-    );
-    // The opening line must still say what the game IS — the leak is the number, not the line.
-    assert.match(log, /Game Begins/);
-    assert.match(log, /3 players/);
-  });
-
-  it('still tells a solitaire player their own seed — there is nobody to leak it to', () => {
-    const g = newGame(550943578);
-    const log = g.log.map((l) => l.text).join('\n');
-    assert.match(log, /550943578/, 'a solo game stopped recording the seed its bug reports quote');
-  });
-
-  it('never names a card drawn blind from the Home Office deck (Gitea#20 step 1)', () => {
-    const g = newMultiplayerGame(4242, config, names);
-
-    // Drive to the first Home Office draw any seat makes, and note what it actually drew.
-    let drawn: string | null = null;
-    for (let i = 0; i < 400 && drawn === null; i++) {
-      const actor = g.state.clock.currentActor;
-      if (actor === null) break;
-      const before = g.log.length;
-      if (!submit(g, { type: 'localOps.choose', option: 'draw' }, actor as PlayerIndex)) continue;
-      if (!submit(g, { type: 'draw.fromHomeOffice' }, actor as PlayerIndex)) continue;
-      drawn = g.justDrawn;
-      void before;
-    }
-    assert.ok(drawn, 'no seat ever drew from the Home Office deck');
-
-    const name = cardName(g.state, drawn!);
-    const log = g.log.map((l) => l.text).join('\n');
-    assert.ok(
-      !log.includes(name),
-      `a blind draw named "${name}" to the whole table:\n${log.split('\n').slice(-6).join('\n')}`,
-    );
-    // The draw itself is public — everyone saw a hand go to the deck. Only WHICH card is not.
-    assert.match(log, /Home Office/i);
-
-    // And the drawing seat still learns what it got: `justDrawn` is the owner-only channel, and
-    // `session.ts` sends it to that seat alone.
-    assert.equal(g.justDrawn, drawn);
-  });
-});
-
-
-/**
- * #91 — THE SYSTEMATIC NET, not two strings.
- *
- * v0.7.9.2 closed the seed and the blind draw. Both were found by reading a plan, not by a test, and
- * that is the point: a redaction suite made of the leaks somebody happened to notice proves nothing
- * about the next one. This is the pass the common-board plan asks for (Gitea#20 step 1 § Tests) —
- * serialise EVERYTHING a seat or a spectator receives and search it for everything that must not be
- * in it, across every game state where the shape of the answer changes.
- *
- * **What is searched for**, per the plan: every opponent hand card id AND its display name, the
- * objective, `justDrawn` for the wrong seat, seed values and seed narration, and private decision
- * and menu data. Display names matter as much as ids — "Red Flags" in a log leaks exactly what
- * `c118` would, and only the id would have been caught before.
- *
- * **Where it is searched**: a player's `Frame`, the `PublicFrame` a spectator gets, the incremental
- * narration `Push.lines` carries, and a reconnect push — which is a full Frame rather than a delta
- * and is therefore its own opportunity to leak.
- *
- * **And the acceptance bar is not this file.** The plan is explicit that passing redaction tests
- * alone is insufficient and that every public property needs an allow-list review; the last test
- * here is that allow-list, so adding a field to the public projection fails until somebody has said
- * out loud that it is public.
- */
-describe('#91 — nothing private survives serialisation, in any state', () => {
-  const names = ['Ann', 'Bob', 'Cy'];
-
-  /**
-   * Everything one seat can see, split into the two halves the checks below treat differently.
-   *
-   * `structural` is the machine-readable state: their Frame, the public board, and the frame of every
-   * presentation step they are sent (v0.8.0, TODO #13). `narration` is what the table was TOLD.
-   *
-   * Steps are folded in here rather than given a test of their own so every case below covers them:
-   * the blind draw, the pending decision, Employee Rotation before and after the seating moves, and
-   * the played-out game. Their `lines` are a slice of `g.log` by construction, so the log covers the
-   * narration half of a step and does not need to be searched twice.
-   */
-  const everythingSeatSees = (g: ReturnType<typeof newMultiplayerGame>, seat: PlayerIndex): {
-    structural: string;
-    history: string;
-    narration: string[];
-  } => ({
-    /**
-     * `[]` for the Frame's own lines, MATCHING PRODUCTION. `frameFor()` (`server/session.ts`) has
-     * passed no log since #97 — narration goes out incrementally through `Push.lines` instead — so
-     * embedding it here audits a path that no longer exists, and worse, it puts the whole log inside
-     * `structural` where the face-up-pile rule below cannot reach it. The log is audited in full as
-     * `narration`; this is a de-duplication, not a relaxation.
-     */
-    structural:
-      JSON.stringify(snapshot(g.state, [], null, null, null, false, seat)) +
-      '\n' + JSON.stringify(publicSnapshot(g.state)),
-    /**
-     * THE STEP FRAMES ARE A RECORD OF WHAT WAS PUBLIC OVER TIME, not a view of the position now —
-     * so they get the PRECISE check and not the fuzzy one, for the same reason the face-up-pile
-     * lines do.
-     *
-     * Every one is built by `deltaPublicFrame` over `publicSnapshot`, which the allow-list test at
-     * the bottom of this file pins property by property; that is what guarantees a step frame is
-     * clean. Searching their accumulation for a card NAME asks "was this ever public?" and answers
-     * a question nobody was posing: Train 6 sat face-up in a Department at step 40 and is in Ann's
-     * hand at step 120, and both facts are correct. A card ID is different — narration never renders
-     * one and no public field carries an opponent's, so finding one anywhere is still proof.
-     */
-    history: JSON.stringify(g.display.steps.map((step) => step.frame)),
-    narration: g.log.map((l) => l.text),
-  });
-
-  /**
-   * A FACE-UP PILE IS ALLOWED TO NAME THE CARD ON IT, and the log is history rather than a view.
-   *
-   * §2.6: the three Department piles and the Salvage Yard are face up, "so players can audit
-   * discards" — a discard goes onto one precisely so a rival can take it. So "Player Ann discarded
-   * Train 6 face-up on top of Department 3" is the record working, and it stays in the log after Ann
-   * takes the card back into her hand. The name-based check below would otherwise read that historical
-   * line as proof of what Ann is holding NOW, which is how it reported a leak against correct code on
-   * seed 1917398.
-   *
-   * These lines are excluded from the NAME check only. The card-id check and the seed check still run
-   * over them, because those are precise: an id is unique, so finding one is proof, and narration
-   * never renders a raw id.
-   *
-   * **This does not weaken the blind-draw detection**, which is the leak this whole net was built
-   * for (v0.7.9.2, "Red Flags"): a blind draw names the HOME OFFICE DECK, which is face down and
-   * matches nothing here.
-   */
-  const namesAFaceUpPile = (line: string): boolean => /Department|Salvage/i.test(line);
-
-  /**
-   * Every secret belonging to somebody OTHER than `seat`: their card ids, and the names those ids
-   * render as. Ids alone were what the original tests looked for, and an id is the precise
-   * instrument — it is unique, so finding one is proof.
-   *
-   * **A NAME IS ONLY EVIDENCE WHEN IT IS DISTINCTIVE, and most are not.** Card names are types, not
-   * identities: "right-hand curve" names a dozen cards, and one of them is legitimately drawn on the
-   * board as a cell label the moment anybody lays track. Searching for a name that also exists in
-   * public is a test that fails on correct code, which is worse than no test — so a name counts only
-   * when EVERY card bearing it is in that one opponent's hand. Then, and only then, seeing it says
-   * something about what they are holding.
-   *
-   * This is what caught the blind-draw leak in v0.7.9.2: "Red Flags" was in exactly one hand, and it
-   * was in the log.
-   */
-  const secretsOfOthers = (
-    g: ReturnType<typeof newMultiplayerGame>,
-    seat: PlayerIndex,
-  ): { what: string; value: string; precise: boolean }[] => {
-    // `precise` marks evidence that is proof on its own — a card id is unique, so finding one
-    // anywhere is a leak. A NAME is circumstantial and is searched over a narrower string; see
-    // `namesAFaceUpPile`.
-    const out: { what: string; value: string; precise: boolean }[] = [];
-    // How many cards in the whole game carry each name, and how many of those are in a given hand.
-    const totalByName = new Map<string, number>();
-    for (const id of g.state.cards.keys()) {
-      const n = cardName(g.state, id);
-      totalByName.set(n, (totalByName.get(n) ?? 0) + 1);
-    }
-    for (const p of g.state.players) {
-      if (p.index === seat) continue;
-      const hand = g.state.decks.hands.get(p.index) ?? [];
-      const heldByName = new Map<string, number>();
-      for (const id of hand) {
-        const n = cardName(g.state, id);
-        heldByName.set(n, (heldByName.get(n) ?? 0) + 1);
-      }
-      for (const id of hand) {
-        out.push({ what: `${p.name}'s card id`, value: id, precise: true });
-        const name = cardName(g.state, id);
-        if (totalByName.get(name) === heldByName.get(name)) {
-          out.push({ what: `${p.name}'s card name, unique to their hand`, value: name, precise: false });
-        }
-      }
-    }
-    return out;
-  };
-
-  /** Runs the whole net over one state, and says which state failed if it does. */
-  const audit = (g: ReturnType<typeof newMultiplayerGame>, where: string): void => {
-    for (const seat of g.state.players.map((p) => p.index)) {
-      const { structural, history, narration } = everythingSeatSees(g, seat);
-      const everything = structural + '\n' + history + '\n' + narration.join('\n');
-      // Names are fuzzy evidence, so they are searched everywhere EXCEPT the lines a face-up pile
-      // is entitled to name a card on. Ids are precise and are searched everywhere.
-      const forNames = structural + '\n' + narration.filter((l) => !namesAFaceUpPile(l)).join('\n');
-      for (const { what, value, precise } of secretsOfOthers(g, seat)) {
-        assert.ok(
-          !(precise ? everything : forNames).includes(value),
-          `${where}: seat ${seat} can see ${what} ("${value}")`,
-        );
-      }
-      // The seed is the whole future of the deal and must not reach a seat by any route.
-      assert.ok(!everything.includes(String(g.seed)), `${where}: seat ${seat} can see the seed ${g.seed}`);
-    }
-    // And the spectator board, which has no seat and is therefore entitled to nothing private.
-    const pub = JSON.stringify(publicSnapshot(g.state));
-    for (const p of g.state.players) {
-      for (const id of g.state.decks.hands.get(p.index) ?? []) {
-        assert.ok(!pub.includes(id), `${where}: the public board carries ${p.name}'s card ${id}`);
-      }
-    }
-    assert.ok(!pub.includes(String(g.seed)), `${where}: the public board carries the seed`);
-    for (const k of ['hand', 'objective', 'justDrawn', 'decision', 'moves', 'blocked', 'viewer']) {
-      assert.ok(!(k in (JSON.parse(pub) as Record<string, unknown>)), `${where}: the public board has a "${k}" field`);
-    }
-  };
-
-  /** Plays `n` legal moves, so a state is a real position rather than a constructed one. */
-  const play = (g: ReturnType<typeof newMultiplayerGame>, n: number): void => {
-    for (let i = 0; i < n; i++) {
-      const a = g.state.clock.currentActor;
-      if (a === null) break;
-      const opts = legalActions(g.state, a);
-      if (!opts.length) break;
-      if (!submit(g, opts[i % opts.length]!, a)) break;
-    }
-  };
-
-  it('a newly created multiplayer game', () => {
-    audit(newMultiplayerGame(4242, config, names), 'fresh game');
-  });
-
-  it('after a blind Home Office draw', () => {
-    const g = newMultiplayerGame(4242, config, names);
-    let drew = false;
-    for (let i = 0; i < 200 && !drew; i++) {
-      const a = g.state.clock.currentActor;
-      if (a === null) break;
-      if (!submit(g, { type: 'localOps.choose', option: 'draw' }, a)) continue;
-      drew = submit(g, { type: 'draw.fromHomeOffice' }, a);
-    }
-    assert.ok(drew, 'no seat drew from the Home Office deck');
-    audit(g, 'after a blind draw');
-  });
-
-  it('the net actually sees the presentation steps it claims to cover (v0.8.0)', () => {
-    /**
-     * Guards the COVERAGE, not the code. `everythingSeatSees` folds `display.steps` into the string
-     * every case above is audited against — which is worth nothing if that array is empty in
-     * practice. So: play a real game, and assert both that steps accumulated and that the audited
-     * string contains them.
-     */
-    const g = newMultiplayerGame(1917398, config, names);
-    play(g, 120);
-    assert.ok(g.display.steps.length > 20, `only ${g.display.steps.length} steps — the net covers little`);
-    const { history, narration } = everythingSeatSees(g, 0 as PlayerIndex);
-    assert.ok(
-      history.includes(JSON.stringify(g.display.steps.map((step) => step.frame))),
-      'the audited string does not actually contain the step frames',
-    );
-    // And a step's own narration is a slice of the log, so the log half covers it.
-    const fromSteps = g.display.steps.flatMap((step) => step.lines.map((l) => l.text));
-    assert.ok(fromSteps.length > 0, 'the steps carried no narration to cover');
-    assert.ok(fromSteps.every((t) => narration.includes(t)), 'a step said something the log did not');
-    audit(g, 'a played game with presentation steps');
-  });
-
-  it('mid-game, with real hands and a built board', () => {
-    // A DISTINCTIVE seed, deliberately. Seed 7 makes the seed check meaningless — "7" is in "Train
-    // 7", in every coordinate and in half the numbers on the board — so it reported a leak that was
-    // not one. Nine digits collide with nothing, which is what makes a substring match evidence.
-    const g = newMultiplayerGame(613884219, config, names);
-    play(g, 300);
-    audit(g, 'mid-game');
-  });
-
-  it('with a decision pending, and with the Superintendent acting', () => {
-    const g = newMultiplayerGame(550943578, config, names);
-    let sawDecision = false;
-    for (let i = 0; i < 800; i++) {
-      if (g.state.clock.pendingDecision !== null) {
-        sawDecision = true;
-        audit(g, `pending decision (${g.state.clock.pendingDecision.kind})`);
-        break;
-      }
-      const a = g.state.clock.currentActor;
-      if (a === null) break;
-      const opts = legalActions(g.state, a);
-      if (!opts.length || !submit(g, opts[0]!, a)) break;
-    }
-    // A seed that never raises one is not a failure of redaction; say so rather than passing mutely.
-    if (!sawDecision) assert.ok(true, 'no decision arose on this seed — nothing to audit');
-  });
-
-  it('with Employee Rotation on, before and after ownership moves', () => {
-    // The case where seat and player index come apart. A projection that confused them would hand
-    // one player another's district, which is a leak the other tests cannot see.
-    const rotating = { ...config, optionalRules: { ...config.optionalRules, employeeRotation: true } };
-    const g = newMultiplayerGame(729315046, rotating, names);
-    audit(g, 'employee rotation, before');
-    const seatingBefore = [...g.state.seating];
-    play(g, 400);
-    audit(g, 'employee rotation, after');
-    // If the seating never moved this test proved less than it looks — say which happened.
-    const moved = seatingBefore.some((p, i) => g.state.seating[i] !== p);
-    assert.ok(moved || g.state.status !== 'active', 'rotation never moved anybody and the game did not end');
-  });
-
-  it('a game played out to the end, or as far as it goes', () => {
-    const g = newMultiplayerGame(613884219, config, names);
-    play(g, 6000);
-    // Says which it actually got, rather than claiming a finished game it may not have reached.
-    audit(g, `played out (status ${g.state.status})`);
-  });
-
-  it('a reconnect push, which is a full Frame rather than a delta', () => {
-    const session = createSession(550943578, config, names);
-    for (const seat of [0, 1, 2] as PlayerIndex[]) {
-      const push = session.connect(seat);
-      const seen = JSON.stringify(push);
-      const state = session.exportSave();
-      assert.ok(!seen.includes(String(state.seed)), `the reconnect push for seat ${seat} carries the seed`);
-      for (const p of [0, 1, 2] as PlayerIndex[]) {
-        if (p === seat) continue;
-        // `connect` returns that seat's own Frame; another seat's hand must not be in it.
-        assert.ok(
-          !/"hand":\[[^\]]/.test(JSON.stringify((push.frame as unknown as Record<string, unknown>)['players'] ?? '')),
-          `the reconnect push for seat ${seat} carries a hand inside players[]`,
-        );
-      }
-    }
-  });
-
-  /**
-   * THE ALLOW-LIST, and the plan's actual acceptance bar.
-   *
-   * Every property of the public projection, written down and reviewed as public. This does not
-   * check the CONTENT of anything — the tests above do that — it checks that nobody has added a
-   * field without saying out loud that a spectator may see it. That is the check that would have
-   * caught both v0.7.9.2 leaks, because both were fields nobody had ever asked the question about.
-   *
-   * When this fails, the fix is not to add the key here. It is to decide whether the field is
-   * public, and only then to add it.
-   */
-  it('every public property is on the allow-list, and nothing else is', () => {
-    const PUBLIC: readonly string[] = [
-      // The clock and the phase — what a spectator's board is FOR.
-      'day', 'stage', 'clock', 'phase', 'phaseKey', 'actor', 'superintendent',
-      // Deck sizes and face-up piles. A Department pile is face up; the Home Office deck is a count.
-      'deck', 'departments', 'departmentsWhat', 'departmentDepth', 'salvage',
-      // Rolling stock in the yards, by type — visible on the table.
-      'yards',
-      // The timetable is public: it is what everyone is playing against.
-      'timetable', 'timetableWhat',
-      // The rules the game was dealt under, and the score.
-      'houseRules', 'mode', 'optionalRules', 'days', 'minCombinedRevenue',
-      'maxCollisionsPerDay', 'maxCollisionsTotal', 'collisionsToday', 'collisionsTotal',
-      // What the Day that just ended finished on. Public for the same reason the running counts are:
-      // a collision happens on the Mainline in front of everybody.
-      'collisionsPrevDay',
-      'status', 'outcome', 'extraDays', 'extensionVotes', 'official', 'tally',
-      // Names, seats, revenue and HAND SIZE — never hand contents.
-      'players',
-      // The opening rolls decided seating and the Superintendent in the open.
-      'openingRolls',
-      // Where every train is standing.
-      'trains',
-      // The Crew Tray pool and the trains queued for one (#98). §7 scarcity is played out in the
-      // open: the trays are objects in the middle of the table, and an Extra is played face up, so
-      // who is waiting for a crew is not a secret. Counts and train numbers only — never a hand.
-      'crewTrays', 'queued',
-      // The board itself.
-      'division', 'districts',
-    ];
-    const g = newMultiplayerGame(4242, config, names);
-    const actual = Object.keys(publicSnapshot(g.state)).sort();
-    const allowed = [...PUBLIC].sort();
-    assert.deepEqual(
-      actual,
-      allowed,
-      'the public projection gained or lost a property — decide whether it is public before listing it',
-    );
-  });
-});

test/replay.test.ts

@@ -6,34 +6,26 @@
  */
 
 import { describe, it } from 'node:test';
-import { readFileSync } from 'node:fs';
-import { dirname, join } from 'node:path';
-import { fileURLToPath } from 'node:url';
 import assert from 'node:assert/strict';
 
 import { pump } from '../src/engine/advance.ts';
-import { DEFAULT_MAX_COLLISIONS_PER_DAY, DEFAULT_MAX_COLLISIONS_TOTAL, collectiveRevenueFloor } from '../src/engine/content.ts';
 import type { GameEvent } from '../src/engine/events.ts';
 import { areaOf } from '../src/engine/apply.ts';
 import { createGame } from '../src/engine/setup.ts';
-import { coordKey, turnOf } from '../src/engine/state.ts';
-import type { GameConfig, GameState, GridCoord } from '../src/engine/state.ts';
+import { coordKey } from '../src/engine/state.ts';
+import type { GameConfig, GameState } from '../src/engine/state.ts';
 import { developerBot, playGame } from '../src/sim/bot.ts';
 import { impediments, isVisible, narrate, phaseLabel } from '../src/sim/narrate.ts';
 import { compress, rehydrateCells, record, renderHtml } from '../src/sim/replay.ts';
 import { summarize } from '../src/sim/stats.ts';
 
-// Mirrors `record()`'s own default exactly (`replay.ts`) — "does not drift from the engine" below
-// plays the same seed through both paths and compares outcomes, so they must share one floor.
 const config: GameConfig = {
   mode: 'solitaire',
-  days: 5,
-  minCombinedRevenue: collectiveRevenueFloor(1, 5),
-  maxCollisionsPerDay: DEFAULT_MAX_COLLISIONS_PER_DAY,
-  maxCollisionsTotal: DEFAULT_MAX_COLLISIONS_TOTAL,
-  pvpCardsAllowed: false,
+  victory: 'highestAfterDays',
+  length: 'standard',
   optionalRules: {
     reducedVisibility: false,
+    sisterTrains: false,
     employeeRotation: false,
     emergencyToolbox: false,
   },
@@ -44,14 +36,10 @@ const SAMPLES: GameEvent[] = [
   { type: 'stageBegan', day: 1, stage: 7 },
   { type: 'phaseBegan', phase: 'mainline' },
   { type: 'actorChanged', player: 0 },
-  // Sampled rather than left to swell the unsampled count: this sentence is one a player reads at
-  // the table every third Stage, so its text is worth exercising.
-  { type: 'superintendentChanged', player: 1, stage: 6 },
   { type: 'localOpsOptionChosen', player: 0, option: 'switch' },
-  { type: 'trayMoved', player: 0, trayId: 't0', from: { row: 0, col: 0 }, to: { row: 0, col: 1 }, movesRemaining: 5, movesAllowed: 6 },
-  { type: 'switchingEnded', player: 0, movesUsed: 3, movesAllowed: 6, lastMove: { trayId: 't0', to: { row: 0, col: 1 } } },
-  { type: 'carsCoupled', player: 0, trayId: 't0', at: { row: 0, col: 1 }, stock: [{ type: 'hopper', loaded: false }], from: [{ row: 0, col: 1 }], toNose: true },
-  { type: 'carsDropped', player: 0, trayId: 't0', at: { row: 1, col: 0 }, stock: [{ type: 'hopper', loaded: false }] },
+  { type: 'trayMoved', trayId: 't0', from: { row: 0, col: 0 }, to: { row: 0, col: 1 }, movesRemaining: 5 },
+  { type: 'carsCoupled', trayId: 't0', at: { row: 0, col: 1 }, stock: [{ type: 'hopper', loaded: false }], from: [{ row: 0, col: 1 }], toNose: true },
+  { type: 'carsDropped', trayId: 't0', at: { row: 1, col: 0 }, stock: [{ type: 'hopper', loaded: false }] },
   { type: 'cardDrawn', player: 0, source: 'homeOffice', cardId: 'c1' },
   { type: 'cardPlayed', player: 0, cardId: 'c1', placement: { row: 1, col: 0 }, variant: 0 },
   { type: 'officeUpgraded', player: 0, from: 'whistlePost', to: 'depot' },
@@ -62,18 +50,8 @@ const SAMPLES: GameEvent[] = [
   { type: 'inboundCleared', player: 0, at: { row: 1, col: 0 }, stock: { type: 'hopper', loaded: true } },
   { type: 'facilityUnjammed', player: 0, at: { row: 1, col: 0 }, from: 'menAtWork', stock: { type: 'hopper', loaded: true } },
   { type: 'trainScheduled', player: 0, trainNumber: 4, roll: 7, slot: 6, rngState: 1 },
-  { type: 'carPlacedOnTrain', player: 0, trayId: 't0', stock: { type: 'coach', loaded: false }, trainNumber: 10, isExtra: false },
-  { type: 'carPassed', player: 0, trayId: 't0', trainNumber: 10, isExtra: false },
-  {
-    type: 'makeUpShort',
-    trainNumber: 5,
-    isExtra: false,
-    placed: 0,
-    wanted: 3,
-    missing: ['coach'],
-    waiting: 14,
-    divisionYardHolds: 46,
-  },
+  { type: 'carPlacedOnTrain', player: 0, trayId: 't0', stock: { type: 'coach', loaded: false } },
+  { type: 'carPassed', player: 0, trayId: 't0' },
   { type: 'clearanceRequested', trainId: 't1', occupiedBy: 't0' },
   { type: 'clearanceGiven', trainId: 't1', allow: false },
   { type: 'passengersBoarded', player: 0, at: { row: 0, col: 0 }, trayId: 't0', coachIndex: 0 },
@@ -89,56 +67,12 @@ const SAMPLES: GameEvent[] = [
 
 describe('narration', () => {
   it('covers every event type the engine can emit', () => {
-    /**
-     * THIS TEST USED TO BUILD BOTH SETS FROM `SAMPLES` and compare them to each other, so it could
-     * only ever assert that the sample list had 30 distinct entries — the one thing it could not
-     * detect was the thing its comment promised, a new `GameEvent` slipping in unnarrated. Fixed
-     * 2026-09-09 while adding the v0.8.0 step collector, which made the event union load-bearing for
-     * a second reader.
-     *
-     * The union is read out of `src/engine/events.ts` rather than hand-listed, the same way
-     * `test/pacing.test.ts` reads the intent union: a list maintained by hand is a list that goes
-     * stale, which is how this got here.
-     */
-    const here = dirname(fileURLToPath(import.meta.url));
-    const declared = new Set(
-      [...readFileSync(join(here, '../src/engine/events.ts'), 'utf8').matchAll(/type: '([a-zA-Z]+)'/g)]
-        .map((m) => m[1]!),
-    );
-    const narrated = new Set(
-      [...readFileSync(join(here, '../src/sim/narrate.ts'), 'utf8').matchAll(/case '([a-zA-Z]+)':/g)]
-        .map((m) => m[1]!),
-    );
-    assert.ok(declared.size > 40, `only ${declared.size} event types parsed — the parse is wrong`);
-
-    // THE INVARIANT THAT MATTERS: an event the engine can emit and `narrate` has no case for falls
-    // through to a placeholder, in front of a player. This is the check the old version promised.
-    const unnarrated = [...declared].filter((t) => !narrated.has(t));
-    assert.deepEqual(unnarrated, [], 'these event types can be emitted and have no narration case');
-
-    const covered = new Set<string>(SAMPLES.map((e) => e.type));
-    const unknown = [...covered].filter((t) => !declared.has(t));
-    assert.deepEqual(unknown, [], 'these samples name an event the engine no longer declares');
-
-    /**
-     * THE KNOWN GAP, PINNED SO IT CANNOT GROW.
-     *
-     * `SAMPLES` exercises the TEXT of 30 of the 55 declared events; the other 25 have a narration
-     * case (checked above) but no sample, so nothing proves their sentence is any good. Found
-     * 2026-09-09 — the old test built both of its sets from `SAMPLES` and compared them to each
-     * other, so it could only ever assert that the sample list had 30 distinct entries, and the one
-     * thing it could not detect was the thing its comment promised.
-     *
-     * Pinned rather than fixed: writing 25 fixtures is a job of its own, and a bad sentence is worth
-     * finding deliberately rather than in a rush. What this does guarantee is that a NEW event type
-     * cannot join the unsampled set silently.
-     */
-    const unsampled = [...declared].filter((t) => !covered.has(t)).sort();
-    assert.equal(
-      unsampled.length,
-      25,
-      `the unsampled set changed (${unsampled.length}): add a sample for a new event, or update this count`,
-    );
+    // Guards against a new event type slipping in unnarrated.
+    const covered = new Set(SAMPLES.map((e) => e.type));
+    const declared = new Set<string>();
+    for (const e of SAMPLES) declared.add(e.type);
+    assert.equal(covered.size, 30, 'sample list is out of step with GameEvent');
+    assert.equal(declared.size, 30);
   });
 
   it('gives every event a specific, non-empty sentence', () => {
@@ -160,33 +94,6 @@ describe('narration', () => {
     assert.match(loss.text, /COLLISION/i);
   });
 
-  /**
-   * WHOSE OFFICE, AND WHOSE TRAIN — Jesse, playtest 2026-09-16.
-   *
-   * The line went to every seat reading "ARRIVED at the Whistle Post … You can work it in Cargo now".
-   * At a table of four that is one true sentence and one false one: every seat has an Office, so the
-   * tier alone does not say which district the train is standing in, and three of the four readers
-   * cannot touch it. Constructed here rather than fished out of a game so both halves are pinned
-   * exactly, and the resolver-less path is checked too — the replay viewers pass no names for a
-   * table they do not have.
-   */
-  it('names WHOSE Office a train reached, and never tells the table they can work it', () => {
-    const named = narrate(
-      { type: 'trainArrived', trainNumber: 3, consist: [], office: 'Whistle Post', owner: 1, expedited: false },
-      { playerName: () => 'Tom' },
-    );
-    assert.match(named.text, /Tom's Whistle Post/, `the arrival did not name the Office's owner: ${named.text}`);
-    assert.match(named.text, /Tom can work it/, `the arrival did not say whose train it is to work: ${named.text}`);
-    assert.doesNotMatch(named.text, /\bYou can work it\b/i, `the arrival still addresses every reader: ${named.text}`);
-
-    // No resolver — still English, and still no raw index leaking into a sentence.
-    const anon = narrate({
-      type: 'trainArrived', trainNumber: 3, consist: [], office: 'Whistle Post', owner: 1, expedited: false,
-    });
-    assert.match(anon.text, /at the Whistle Post/, anon.text);
-    assert.doesNotMatch(anon.text, /undefined|\bplayer \d+\b/i, anon.text);
-  });
-
   it('points at the board cell where something happened', () => {
     const n = narrate({ type: 'loadCompleted', player: 0, at: { row: 1, col: 2 }, carType: 'hopper' });
     assert.deepEqual(n.where, { row: 1, col: 2 });
@@ -226,89 +133,6 @@ describe('impediments', () => {
     s.freeTrays = [];
     assert.ok(impediments(s, 0).some((b) => /HELD/.test(b.why)));
   });
-
-  /** A crew standing on `at`, working the given train, with one empty tank car on the drawbar. */
-  const express = (s: GameState, trainNumber: number, at: GridCoord): string => {
-    const id = s.freeTrays.pop()!;
-    s.trays.set(id, {
-      id, trainNumber, trainIsExtra: false, engineAt: 0,
-      consist: [{ type: 'tank', loaded: false, origin: 0 }],
-      direction: 'east', position: { at: 'grid', seat: 0, coord: at }, movesUsed: 0,
-    });
-    return id;
-  };
-
-  /**
-   * GITEA#21 — THE GAME REFUSED, AND THE PANEL EXPLAINED SOMETHING ELSE.
-   *
-   * "I wanted to drop two empty tank cars so that the freight agents and men at work could load
-   * them later. I dropped the first tank car, but that was all I was allowed to do. Checked
-   * 'Blocked — why nothing is moving' and saw: refinery 1,0 — green box empty — nothing to load
-   * (needs a Freight Agent action)."
-   *
-   * Replayed from the attached save (seed 550943578, 181 intents): the crew was Train 3, and the
-   * engine's answer was `FREIGHT_WORKED_HERE`. Train 3 is the Express, and the Express prints "May
-   * drop or pick up one freight car at every location" — so THE REFUSAL WAS CORRECT and the rule
-   * is not what is wrong here. It resets next turn, and the Express may work a car at the next
-   * square this turn; that is what makes it an Express rather than a one-car-a-Stage train.
-   *
-   * What was wrong is that nothing said so. The panel whose entire job is "why is nothing moving?"
-   * listed the refinery's green box — a true statement about the FACILITY, and nothing to do with
-   * why the drop was refused — so the player was sent to fix a Freight Agent action that would not
-   * have helped. The rule was on the train card's own tooltip, which is not where somebody looks
-   * when a button they expected is missing.
-   *
-   * The panel is where a refusal gets explained, so the budget belongs in it.
-   */
-  it('says when the Express has spent its one freight car on this square (Gitea#21)', () => {
-    const s = createGame({ id: 'g', seed: 5, config, playerNames: ['p'] });
-    const area = areaOf(s, 0);
-    const at = area.officeCoord;
-
-    // A crew standing at the Office working Train 3 — the Express — with a tank car still on it.
-    const trayId = express(s, 3, at);
-
-    s.clock.phase = 'localOps';
-    const turn = turnOf(s, 0);
-    turn.option = 'switch';
-
-    // Nothing to say before it has worked anything here.
-    assert.ok(
-      !impediments(s, 0).some((b) => /FREIGHT CAR PER LOCATION/i.test(b.why)),
-      'the budget was reported spent before the train had worked a car at all',
-    );
-
-    // Now it has set one car out here — exactly the state the save is in at intent 181.
-    turn.freightWorked[`${trayId}@${coordKey(at)}`] = 1;
-
-    const row = impediments(s, 0).find((b) => /FREIGHT CAR PER LOCATION/i.test(b.why));
-    assert.ok(
-      row,
-      `nothing explained the refusal:\n${JSON.stringify(impediments(s, 0), null, 2)}`,
-    );
-    // It must name the train, or a player with three crews out cannot tell which one it means.
-    assert.match(row!.where, /Train 3/);
-    // And it must say the limit lifts, or it reads as "this train can never work here again".
-    assert.match(row!.why, /turn/i);
-    // Amber: this is the printed rule doing its job, not a fault.
-    assert.equal(row!.severity, 'waiting');
-  });
-
-  it('leaves every other train alone — the rule is printed on 3 and 4 only (Gitea#21)', () => {
-    const s = createGame({ id: 'g', seed: 5, config, playerNames: ['p'] });
-    const area = areaOf(s, 0);
-    const at = area.officeCoord;
-    // Train 5 is The Sparrow, which prints no per-location freight limit.
-    const trayId = express(s, 5, at);
-    s.clock.phase = 'localOps';
-    turnOf(s, 0).option = 'switch';
-    turnOf(s, 0).freightWorked[`${trayId}@${coordKey(at)}`] = 1;
-
-    assert.ok(
-      !impediments(s, 0).some((b) => /FREIGHT CAR PER LOCATION/i.test(b.why)),
-      'a train with no such rule was told it had spent a budget it does not have',
-    );
-  });
 });
 
 /**
@@ -385,24 +209,6 @@ describe('a blocked platform says why (Gitea#2)', () => {
     assert.ok(f.inboundBox.length === 0, 'the red slots were free — the shortage is the only cause');
   });
 
-  it('says why the game ended in words, not as a raw enum (TODO #34)', () => {
-    /**
-     * The heading read `loss — revenueFloor` — the exact defect Gitea#16 was filed about on the
-     * playable page, still alive here a release after that was fixed, because nothing
-     * player-facing pointed at the developer replay. It shares `reasonSentence` with the results
-     * screen now, so the two cannot explain one ending in two ways.
-     */
-    const rec = record(1234, 'standard');
-    for (const raw of ['revenueFloor', 'daysElapsed', 'collisionFloor']) {
-      assert.ok(!rec.outcome.includes(raw), `the summary still prints the raw reason "${raw}"`);
-    }
-    assert.doesNotMatch(rec.outcome, /<[^>]+>/, 'markup leaked into a heading and a console line');
-    assert.match(rec.outcome, /Revenue/, 'the summary says nothing about how the game went');
-    // And the sentence is the shared one, with this game's own numbers in it.
-    assert.match(rec.outcome, /closed short|last on the timetable|declared unsafe/,
-      'the ending is not explained in the words the results screen uses');
-  });
-
   it('says nothing about a platform that is working fine', () => {
     // Passengers waiting AND a train with an empty coach to take them: no impediment.
     const s = createGame({ id: 'g', seed: 5, config, playerNames: ['p'] });
@@ -446,10 +252,7 @@ describe('replay recording', () => {
     const last = rec.frames[rec.frames.length - 1]!;
     assert.equal(last.revenue, stats.revenue.net, 'final revenue disagrees with the engine');
     assert.equal(last.day, s.clock.day, 'final Day disagrees with the engine');
-    // The summary says "won"/"lost" rather than the engine's `win`/`loss` (TODO #34 — it is a
-    // sentence for a reader now, not an enum). Mapped here so this still checks the two AGREE,
-    // which is what the test is for, rather than checking they are spelled the same.
-    assert.match(rec.outcome, new RegExp(stats.result === 'win' ? 'won' : 'lost'));
+    assert.match(rec.outcome, new RegExp(stats.result));
   });
 
   it('narrates every frame', () => {

test/route-cache.test.ts

@@ -1,88 +0,0 @@
-/**
- * The engine's speed-ups must not change a single game (2026-09-15).
- *
- * `applyIntent` became `prepareIntent` (check and execute, sharing one walk of the position's routes)
- * followed by `commitEvents` (reduce and tally), so the switching planner can decide every candidate
- * against one position and apply each to a copy. Two properties hold that together:
- *
- * 1. `prepareIntent` never writes the state it reads — including through the route cache it opens.
- * 2. Preparing on one state and committing to an EQUAL copy lands on exactly what `applyIntent` does.
- *
- * Checked at every decision of seeded bot games rather than on hand-built positions, so the intents
- * exercised are the ones real play submits.
- */
-
-import { describe, it } from 'node:test';
-import assert from 'node:assert/strict';
-
-import { pump } from '../src/engine/advance.ts';
-import { applyIntent, commitEvents, prepareIntent } from '../src/engine/apply.ts';
-import {
-  DEFAULT_MAX_COLLISIONS_PER_DAY,
-  DEFAULT_MAX_COLLISIONS_TOTAL,
-  collectiveRevenueFloor,
-  lengthProfile,
-} from '../src/engine/content.ts';
-import { legalActions } from '../src/engine/legal.ts';
-import { createGame } from '../src/engine/setup.ts';
-import type { GameConfig, GameState } from '../src/engine/state.ts';
-import { developerBot, playGame } from '../src/sim/bot.ts';
-
-const config = (): GameConfig => {
-  const days = lengthProfile('short').days;
-  return {
-    mode: 'solitaire',
-    days,
-    minCombinedRevenue: collectiveRevenueFloor(1, days),
-    maxCollisionsPerDay: DEFAULT_MAX_COLLISIONS_PER_DAY,
-    maxCollisionsTotal: DEFAULT_MAX_COLLISIONS_TOTAL,
-    pvpCardsAllowed: false,
-    optionalRules: { reducedVisibility: false, employeeRotation: false, emergencyToolbox: false },
-  };
-};
-
-const serialise = (s: GameState): string =>
-  JSON.stringify(s, (_k, v) => (v instanceof Map ? [...v] : v instanceof Set ? [...v] : v));
-
-describe('applyIntent split into prepareIntent and commitEvents', () => {
-  it('prepares without writing, and committing to a copy matches applying in place', () => {
-    let decisions = 0;
-    let rejectedSeen = 0;
-    const s = createGame({ id: 'split-8919', seed: 8919, config: config(), playerNames: ['bot'] });
-    const policy = {
-      name: 'split-probe',
-      choose(st: GameState, player: number, options: ReturnType<typeof legalActions>) {
-        const chosen = developerBot.choose(st, player, options);
-        if (decisions < 400) {
-          decisions++;
-          const before = serialise(st);
-          const prepared = prepareIntent(st, player, chosen);
-          assert.equal(serialise(st), before, `decision ${decisions}: prepareIntent wrote into the state it read`);
-          assert.ok(prepared.ok, `decision ${decisions}: a legal choice was refused by prepareIntent`);
-
-          const viaCommit = structuredClone(st);
-          const viaApply = structuredClone(st);
-          commitEvents(viaCommit, prepared.events);
-          const applied = applyIntent(viaApply, player, chosen);
-          assert.ok(applied.ok);
-          assert.deepEqual(applied.events, prepared.events, `decision ${decisions}: the two paths produced different events`);
-          assert.equal(serialise(viaCommit), serialise(viaApply), `decision ${decisions}: committing to a copy diverged from applying`);
-
-          // A refused intent must come back refused from both paths, with nothing written.
-          const refused = { type: 'switch.end' } as const;
-          const r = prepareIntent(st, player, refused);
-          if (!r.ok) {
-            rejectedSeen++;
-            assert.equal(serialise(st), before);
-            assert.equal(applyIntent(structuredClone(st), player, refused).ok, false);
-          }
-        }
-        return chosen;
-      },
-    };
-    const r = playGame(s, policy, pump);
-    assert.ok(r.finished, 'the probed game did not finish');
-    assert.ok(decisions > 0, 'no decision was probed');
-    assert.ok(rejectedSeen > 0, 'no refused intent was exercised');
-  });
-});

test/server/claims.test.ts

@@ -1,68 +0,0 @@
-/**
- * Seat recovery codes — Gitea#33.
- *
- * The properties worth pinning are the ones that make a code safe to put in a link: it is spendable
- * exactly once, it stops working on its own, and a bad code is indistinguishable from a spent one.
- * `now` is a parameter rather than a clock, so expiry is tested without faking timers.
- */
-
-import { describe, it } from 'node:test';
-import assert from 'node:assert/strict';
-
-import { CLAIM_TTL_MS, createClaimStore } from '../../src/server/claims.ts';
-
-describe('seat recovery codes', () => {
-  it('mints a code that names the seat it was minted for', () => {
-    const claims = createClaimStore();
-    const { code, expiresAt } = claims.mint('tok-abc', 'game-1', 1000);
-    assert.equal(expiresAt, 1000 + CLAIM_TTL_MS);
-    assert.deepEqual(claims.redeem(code, 1000), { token: 'tok-abc', gameId: 'game-1' });
-  });
-
-  it('spends a code exactly once — a link in a chat log is worth nothing afterwards', () => {
-    const claims = createClaimStore();
-    const { code } = claims.mint('tok-abc', 'game-1', 0);
-    assert.ok(claims.redeem(code, 1));
-    assert.equal(claims.redeem(code, 2), null, 'the same code was accepted twice');
-  });
-
-  it('stops working once its time is up, without anything having to sweep it', () => {
-    const claims = createClaimStore();
-    const { code } = claims.mint('tok-abc', 'game-1', 0);
-    assert.equal(claims.redeem(code, CLAIM_TTL_MS - 1)?.token, 'tok-abc', 'expired early');
-    const again = claims.mint('tok-abc', 'game-1', 0).code;
-    assert.equal(claims.redeem(again, CLAIM_TTL_MS), null, 'a code outlived its expiry');
-  });
-
-  it('answers the same way for unknown, spent and expired codes', () => {
-    const claims = createClaimStore();
-    const { code } = claims.mint('tok-abc', 'game-1', 0);
-    claims.redeem(code, 1);
-    const expired = claims.mint('tok-abc', 'game-1', 0).code;
-
-    assert.equal(claims.redeem('never-existed', 1), null);
-    assert.equal(claims.redeem(code, 1), null);
-    assert.equal(claims.redeem(expired, CLAIM_TTL_MS + 1), null);
-  });
-
-  it('gives every mint its own code', () => {
-    const claims = createClaimStore();
-    const codes = new Set([0, 1, 2, 3, 4].map(() => claims.mint('tok-abc', 'game-1', 0).code));
-    assert.equal(codes.size, 5, 'two mints produced the same code');
-  });
-
-  it('forgets expired codes rather than accumulating them', () => {
-    const claims = createClaimStore();
-    claims.mint('tok-a', 'game-1', 0);
-    claims.mint('tok-b', 'game-1', 0);
-    assert.equal(claims.outstanding(0), 2);
-    assert.equal(claims.outstanding(CLAIM_TTL_MS), 0, 'expired codes were still being held');
-  });
-
-  it('keeps a short-lived code short-lived when asked for one', () => {
-    const claims = createClaimStore();
-    const { code, expiresAt } = claims.mint('tok-abc', 'game-1', 500, 60_000);
-    assert.equal(expiresAt, 60_500);
-    assert.equal(claims.redeem(code, 60_500), null);
-  });
-});

test/server/lobby.test.ts

@@ -1,346 +0,0 @@
-/**
- * The lobby (`src/server/lobby.ts`) — pure logic, no sockets, no filesystem, exercised directly.
- */
-
-import { describe, it } from 'node:test';
-import assert from 'node:assert/strict';
-
-import type { GameConfig } from '../../src/engine/state.ts';
-import {
-  createLobby,
-  freshGameCode,
-  joinLobby,
-  leaveLobby,
-  playerCountAllowed,
-  reassignHost,
-  setBotSeat,
-  startLobby,
-} from '../../src/server/lobby.ts';
-
-const competitive: GameConfig = {
-  mode: 'competitive',
-  days: 5,
-  minCombinedRevenue: 0,
-  maxCollisionsPerDay: 0,
-  maxCollisionsTotal: 0,
-  pvpCardsAllowed: false,
-  optionalRules: {
-    reducedVisibility: false,
-    employeeRotation: false,
-    emergencyToolbox: false,
-  },
-};
-const solitaire: GameConfig = { ...competitive, mode: 'solitaire' };
-
-describe('creating and joining', () => {
-  it('seats the host at 0 and lays out the whole table at once', () => {
-    const { lobby, session } = createLobby(competitive, 'Alice', 'RAIL-0001', 3);
-    assert.equal(session.player, 0);
-    assert.equal(lobby.hostToken, session.token);
-    // The table is its full size immediately — the empty chairs exist and are waiting, rather
-    // than being appended as people arrive.
-    assert.equal(lobby.seats.length, 3);
-    assert.deepEqual(lobby.seats[0], { kind: 'human', token: session.token, displayName: 'Alice' });
-    assert.deepEqual(lobby.seats.slice(1), [null, null]);
-    assert.deepEqual(lobby.joinOrder, [session.token]);
-  });
-
-  it('fills the next empty seat, in order', () => {
-    const { lobby: l1, session: s1 } = createLobby(competitive, 'Alice', 'RAIL-0001', 4);
-    const j2 = joinLobby(l1, 'Bob');
-    assert.ok(j2.ok);
-    if (!j2.ok) return;
-    assert.equal(j2.session.player, 1);
-    const j3 = joinLobby(j2.lobby, 'Carol');
-    assert.ok(j3.ok);
-    if (!j3.ok) return;
-    assert.equal(j3.session.player, 2);
-    assert.deepEqual(j3.lobby.joinOrder, [s1.token, j2.session.token, j3.session.token]);
-  });
-
-  it('refuses a join once every chair is taken', () => {
-    let lobby = createLobby(competitive, 'Alice', 'RAIL-0001', 4).lobby;
-    for (const name of ['Bob', 'Carol', 'Dave']) {
-      const r = joinLobby(lobby, name);
-      assert.ok(r.ok);
-      if (r.ok) lobby = r.lobby;
-    }
-    const fifth = joinLobby(lobby, 'Eve');
-    assert.deepEqual(fifth, { ok: false, code: 'LOBBY_FULL' });
-  });
-
-  it('refuses a 2nd join to a one-chair table', () => {
-    const { lobby } = createLobby(solitaire, 'Alice', 'RAIL-0002', 1);
-    const second = joinLobby(lobby, 'Bob');
-    assert.deepEqual(second, { ok: false, code: 'LOBBY_FULL' });
-  });
-
-  it('rejoins into a seat an earlier player vacated, not past the end', () => {
-    // Joining always fills the FIRST empty seat, so a bot-seat cleared back to empty (setBotSeat)
-    // is exactly as joinable as one nobody ever filled.
-    let lobby = createLobby(competitive, 'Alice', 'RAIL-0003', 3).lobby;
-    lobby = setBotSeat(lobby, 1, true);
-    lobby = setBotSeat(lobby, 1, false);
-    const r = joinLobby(lobby, 'Bob');
-    assert.ok(r.ok);
-    if (!r.ok) return;
-    assert.equal(r.session.player, 1, 'should take the reopened chair 1');
-    assert.equal(r.lobby.seats.length, 3, 'joining must never resize the table');
-    assert.equal(r.lobby.seats[2], null);
-  });
-
-  it('never grows the table, whoever asks', () => {
-    // The old model appended a seat for anyone who turned up, which is how a lobby could end up
-    // holding more chairs than the host ever asked for.
-    const { lobby } = createLobby(competitive, 'Alice', 'RAIL-0013', 2);
-    const bob = joinLobby(lobby, 'Bob');
-    assert.ok(bob.ok);
-    if (!bob.ok) return;
-    assert.equal(bob.lobby.seats.length, 2);
-    assert.deepEqual(joinLobby(bob.lobby, 'Carol'), { ok: false, code: 'LOBBY_FULL' });
-  });
-});
-
-describe('bot seats', () => {
-  it('fills only an empty seat, and clears only a bot seat', () => {
-    const { lobby: l0 } = createLobby(competitive, 'Alice', 'RAIL-0004', 2);
-    const withBot = setBotSeat(l0, 1, true);
-    assert.deepEqual(withBot.seats[1], { kind: 'bot' });
-
-    // Filling an already-bot seat again is a no-op, not a crash.
-    const stillBot = setBotSeat(withBot, 1, true);
-    assert.deepEqual(stillBot.seats[1], { kind: 'bot' });
-
-    // Clearing seat 0 (a human) does nothing — a host is removed by leaving, not overwritten.
-    const untouched = setBotSeat(withBot, 0, false);
-    assert.deepEqual(untouched.seats[0], l0.seats[0]);
-
-    const cleared = setBotSeat(withBot, 1, false);
-    assert.equal(cleared.seats[1], null);
-  });
-
-  it('refuses a chair that is not at the table, instead of padding one in', () => {
-    // Padding is what used to put a hole in the seats array: dropping a bot into chair 3 of a
-    // 2-chair table grew it to 4 with a null at 2, and Start then refused for reasons the host
-    // had no way to see.
-    const { lobby } = createLobby(competitive, 'Alice', 'RAIL-0014', 2);
-    assert.equal(setBotSeat(lobby, 3, true), lobby);
-    assert.equal(setBotSeat(lobby, 2, true), lobby);
-    assert.equal(lobby.seats.length, 2);
-  });
-});
-
-describe('host transfer', () => {
-  it('passes to the earliest-joined remaining human seat when the host departs', () => {
-    let lobby = createLobby(competitive, 'Alice', 'RAIL-0005', 2).lobby;
-    const hostToken = lobby.hostToken;
-    const j2 = joinLobby(lobby, 'Bob');
-    assert.ok(j2.ok);
-    if (!j2.ok) return;
-    lobby = j2.lobby;
-    // Alice's own seat is cleared (simulating her leaving the table entirely, not just dropping
-    // her connection) so the transfer target is unambiguous in this test.
-    lobby = { ...lobby, seats: [null, lobby.seats[1]!] };
-    const after = reassignHost(lobby, hostToken);
-    assert.equal(after.hostToken, j2.session.token);
-  });
-
-  it('does nothing when the departing token is not the host', () => {
-    const { lobby } = createLobby(competitive, 'Alice', 'RAIL-0006', 2);
-    const after = reassignHost(lobby, 'not-a-real-token');
-    assert.equal(after, lobby);
-  });
-
-  it('leaves hostToken alone when no other human seat exists', () => {
-    const { lobby, session } = createLobby(competitive, 'Alice', 'RAIL-0007', 2);
-    const after = reassignHost(lobby, session.token);
-    assert.equal(after.hostToken, session.token);
-  });
-});
-
-describe('starting', () => {
-  it('refuses a non-host caller', () => {
-    const { lobby } = createLobby(competitive, 'Alice', 'RAIL-0008', 2);
-    joinLobby(lobby, 'Bob');
-    assert.deepEqual(startLobby(lobby, 'someone-elses-token'), { ok: false, code: 'NOT_HOST' });
-  });
-
-  it('refuses to start while a chair is still empty', () => {
-    const lobby = createLobby(competitive, 'Alice', 'RAIL-0009', 3).lobby;
-    const j2 = joinLobby(lobby, 'Bob');
-    assert.ok(j2.ok);
-    if (!j2.ok) return;
-    assert.deepEqual(startLobby(j2.lobby, j2.lobby.hostToken), { ok: false, code: 'BAD_PLAYER_COUNT' });
-  });
-
-  it('refuses a solo human at a table sized for more', () => {
-    const { lobby } = createLobby(competitive, 'Alice', 'RAIL-0010', 2);
-    assert.deepEqual(startLobby(lobby, lobby.hostToken), { ok: false, code: 'BAD_PLAYER_COUNT' });
-  });
-
-  it('starts a full 2-player lobby, naming humans by their display name and numbering the bot', () => {
-    let lobby = createLobby(competitive, 'Alice', 'RAIL-0011', 2).lobby;
-    lobby = setBotSeat(lobby, 1, true);
-    const r = startLobby(lobby, lobby.hostToken);
-    assert.deepEqual(r, { ok: true, playerNames: ['Alice', 'Bot 1'], botSeats: [1] });
-  });
-
-  it('numbers bots so two of them at one table can be told apart', () => {
-    // They are two different railroads on the Division map, and a map that labels both "Bot"
-    // cannot answer "which one is that".
-    let lobby = createLobby(competitive, 'Alice', 'RAIL-0016', 3).lobby;
-    lobby = setBotSeat(setBotSeat(lobby, 1, true), 2, true);
-    const r = startLobby(lobby, lobby.hostToken);
-    assert.ok(r.ok);
-    if (!r.ok) return;
-    assert.deepEqual(r.playerNames, ['Alice', 'Bot 1', 'Bot 2']);
-    assert.deepEqual(r.botSeats, [1, 2]);
-  });
-
-  it('starts a solitaire lobby of exactly 1', () => {
-    const { lobby } = createLobby(solitaire, 'Alice', 'RAIL-0012', 1);
-    const r = startLobby(lobby, lobby.hostToken);
-    assert.deepEqual(r, { ok: true, playerNames: ['Alice'], botSeats: [] });
-  });
-
-  it('seat index is player index, with no compaction to shift it', () => {
-    // The seats array is never resized or squeezed, so the chair a player joined into is the
-    // player index the game gives them — which is what every PlayerSession already recorded at
-    // join time, and what /api/stream and /api/intent route by.
-    let lobby = createLobby(competitive, 'Alice', 'RAIL-0015', 4).lobby;
-    const bob = joinLobby(lobby, 'Bob');
-    assert.ok(bob.ok);
-    if (!bob.ok) return;
-    lobby = setBotSeat(setBotSeat(bob.lobby, 2, true), 3, true);
-    const r = startLobby(lobby, lobby.hostToken);
-    assert.deepEqual(r, { ok: true, playerNames: ['Alice', 'Bob', 'Bot 1', 'Bot 2'], botSeats: [2, 3] });
-    assert.equal(bob.session.player, 1, "Bob's stored player index still names his chair");
-  });
-});
-
-describe('playerCountAllowed', () => {
-  it('solitaire is exactly 1', () => {
-    assert.equal(playerCountAllowed('solitaire', 1), true);
-    assert.equal(playerCountAllowed('solitaire', 0), false);
-    assert.equal(playerCountAllowed('solitaire', 2), false);
-  });
-
-  it('competitive and coop are 2-4', () => {
-    for (const mode of ['competitive', 'coop'] as const) {
-      assert.equal(playerCountAllowed(mode, 1), false);
-      assert.equal(playerCountAllowed(mode, 2), true);
-      assert.equal(playerCountAllowed(mode, 4), true);
-      assert.equal(playerCountAllowed(mode, 5), false);
-    }
-  });
-});
-
-describe('game codes', () => {
-  it('skips codes the caller marks taken', () => {
-    let calls = 0;
-    const code = freshGameCode((c) => {
-      calls++;
-      return calls < 3; // taken twice, free on the third
-    });
-    assert.equal(typeof code, 'string');
-    assert.equal(calls, 3);
-  });
-
-  it('is speakable — a word, a dash, four digits', () => {
-    const code = freshGameCode(() => false);
-    assert.match(code, /^[A-Z]+-\d{4}$/);
-  });
-});
-
-describe('a name nobody else at the table is using', () => {
-  /**
-   * The display name is not decoration: it labels the district on the Division map, it is what the
-   * turn chart means by "waiting on Jesse", and `record()` puts it in front of every line that
-   * player causes. Two identical names make all three ambiguous, and the names lock at
-   * `Lobby.Start` — so the refusal has to happen at the door.
-   */
-  it('refuses a second player using a name already at the table, whatever the case or spacing', () => {
-    const { lobby } = createLobby(competitive, 'Alice', 'RAIL-0001', 4);
-    for (const attempt of ['Alice', 'alice', '  ALICE  ']) {
-      const result = joinLobby(lobby, attempt);
-      assert.equal(result.ok, false, `"${attempt}" was allowed alongside Alice`);
-      if (!result.ok) assert.equal(result.code, 'NAME_TAKEN');
-    }
-  });
-
-  it('frees the name again when that player leaves', () => {
-    const { lobby, session } = createLobby(competitive, 'Alice', 'RAIL-0001', 4);
-    const joined = joinLobby(lobby, 'Bob');
-    assert.ok(joined.ok);
-    if (!joined.ok) return;
-    const after = leaveLobby(joined.lobby, joined.session.token);
-    const again = joinLobby(after.lobby, 'Bob');
-    assert.equal(again.ok, true, 'a departed player’s name was still held against the table');
-    assert.equal(after.empty, false, 'the host is still seated');
-    assert.equal(after.lobby.hostToken, session.token, 'a non-host leaving moved the host chair');
-  });
-});
-
-describe('leaving a lobby', () => {
-  /**
-   * There was no way out at all before 2026-08-23. Start needs every chair filled and `setBotSeat`
-   * refuses to touch an occupied human seat, so a mis-join or a player who wandered off wedged the
-   * whole table.
-   */
-  const table = () => {
-    const { lobby, session } = createLobby(competitive, 'Alice', 'RAIL-0001', 3);
-    const bob = joinLobby(lobby, 'Bob');
-    assert.ok(bob.ok);
-    if (!bob.ok) throw new Error('Bob could not sit down');
-    const carol = joinLobby(bob.lobby, 'Carol');
-    assert.ok(carol.ok);
-    if (!carol.ok) throw new Error('Carol could not sit down');
-    return { lobby: carol.lobby, alice: session, bob: bob.session, carol: carol.session };
-  };
-
-  it('empties the chair and forgets the token, leaving the rest of the table alone', () => {
-    const { lobby, bob } = table();
-    const after = leaveLobby(lobby, bob.token);
-    assert.equal(after.lobby.seats[1], null, 'the seat was not freed');
-    assert.equal(after.lobby.seats.length, 3, 'the table changed size');
-    assert.ok(!after.lobby.joinOrder.includes(bob.token), 'the departed token is still in the join order');
-    assert.equal((after.lobby.seats[0] as { displayName: string }).displayName, 'Alice');
-    assert.equal((after.lobby.seats[2] as { displayName: string }).displayName, 'Carol');
-  });
-
-  it('names a seat to clear somebody else — what the host’s "remove" does', () => {
-    const { lobby, alice, carol } = table();
-    const after = leaveLobby(lobby, alice.token, 2);
-    assert.equal(after.lobby.seats[2], null, 'the named seat was not cleared');
-    assert.ok(!after.lobby.joinOrder.includes(carol.token));
-    // Seat index IS player index (`lobby.ts`), so nothing may shuffle up to fill the hole.
-    assert.equal((after.lobby.seats[0] as { displayName: string }).displayName, 'Alice');
-    assert.equal((after.lobby.seats[1] as { displayName: string }).displayName, 'Bob');
-  });
-
-  it('passes host rights on when the host is the one who leaves', () => {
-    const { lobby, alice, bob } = table();
-    const after = leaveLobby(lobby, alice.token);
-    assert.equal(after.lobby.hostToken, bob.token, 'the earliest-joined remaining player did not become host');
-    assert.equal(after.empty, false);
-  });
-
-  it('reports the table empty when the last human goes, so the caller can drop it', () => {
-    const { lobby, alice, bob, carol } = table();
-    const one = leaveLobby(lobby, bob.token);
-    const two = leaveLobby(one.lobby, carol.token);
-    assert.equal(two.empty, false, 'Alice is still sitting there');
-    const three = leaveLobby(two.lobby, alice.token);
-    assert.equal(three.empty, true, 'a lobby with nobody human in it did not report itself empty');
-  });
-
-  it('leaves a bot seat to the bot controls, and ignores a token holding no seat', () => {
-    const { lobby, alice } = table();
-    const withBot = setBotSeat(leaveLobby(lobby, alice.token, 1).lobby, 1, true);
-    // `leaveLobby` is about people. A bot is removed with the button that put it there.
-    const after = leaveLobby(withBot, alice.token, 1);
-    assert.deepEqual(after.lobby.seats[1], { kind: 'bot' }, 'leaving cleared a bot seat');
-    const stranger = leaveLobby(withBot, 'not-a-token');
-    assert.equal(stranger.lobby, withBot, 'an unknown token changed the lobby');
-  });
-});

test/server/persistence.test.ts

@@ -1,100 +0,0 @@
-import { describe, it } from 'node:test';
-import assert from 'node:assert/strict';
-import { mkdtemp, readFile, rm } from 'node:fs/promises';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-
-import type { GameConfig } from '../../src/engine/state.ts';
-import type { SavedGame } from '../../src/server/session.ts';
-import { appendTiming, loadGame, writeGame } from '../../src/server/persistence.ts';
-
-const config: GameConfig = {
-  mode: 'competitive',
-  days: 5,
-  minCombinedRevenue: 0,
-  maxCollisionsPerDay: 0,
-  maxCollisionsTotal: 0,
-  pvpCardsAllowed: false,
-  optionalRules: {
-    reducedVisibility: false,
-    employeeRotation: false,
-    emergencyToolbox: false,
-  },
-};
-
-const saved: SavedGame = {
-  seed: 42,
-  config,
-  playerNames: ['Alice', 'Bob'],
-  history: [{ type: 'localOps.choose', option: 'draw' }],
-  status: 'active',
-  createdAt: 1000,
-  botSeats: [],
-};
-
-async function withTempDir<T>(fn: (dir: string) => Promise<T>): Promise<T> {
-  const dir = await mkdtemp(join(tmpdir(), 'station-master-persist-'));
-  try {
-    return await fn(dir);
-  } finally {
-    await rm(dir, { recursive: true, force: true });
-  }
-}
-
-describe('game persistence (Phase 3)', () => {
-  it('writes and reads back exactly what was written', () =>
-    withTempDir(async (dir) => {
-      await writeGame(dir, saved, '1.2.3');
-      const result = await loadGame(dir);
-      assert.equal(result.found, true);
-      if (!result.found) return;
-      assert.deepEqual(result.saved, saved);
-    }));
-
-  it('reports the version that wrote the file without judging it', () =>
-    withTempDir(async (dir) => {
-      // Reading a save no longer refuses on the version. The stamp is the PACKAGE version, which
-      // moves for reasons unrelated to the rules, and gating on it destroyed every game in progress
-      // across four releases — one of which only changed how the board is drawn. Whether a save
-      // still replays is decided by replaying it (`tryResumeSession`); the version is kept because
-      // it is worth naming in a failure, and nothing else.
-      await writeGame(dir, saved, '1.2.3');
-      const result = await loadGame(dir);
-      assert.equal(result.found, true);
-      if (!result.found) return;
-      assert.equal(result.storedVersion, '1.2.3');
-      assert.deepEqual(result.saved, saved);
-    }));
-
-  it('reports not-found rather than throwing when nothing has been saved yet', () =>
-    withTempDir(async (dir) => {
-      const result = await loadGame(dir);
-      assert.deepEqual(result, { found: false });
-    }));
-
-  it('a later writeGame fully replaces the earlier one, not merges with it', () =>
-    withTempDir(async (dir) => {
-      await writeGame(dir, saved, '1.2.3');
-      const grown: SavedGame = { ...saved, history: [...saved.history, { type: 'draw.end' }] };
-      await writeGame(dir, grown, '1.2.3');
-      const result = await loadGame(dir);
-      assert.equal(result.found, true);
-      if (!result.found) return;
-      assert.equal(result.saved.history.length, 2);
-    }));
-
-  it('never leaves a stray .tmp file behind after a write', () =>
-    withTempDir(async (dir) => {
-      await writeGame(dir, saved, '1.2.3');
-      await assert.rejects(() => readFile(join(dir, 'game.json.tmp')));
-    }));
-
-  it('appendTiming accumulates across calls rather than overwriting', () =>
-    withTempDir(async (dir) => {
-      await appendTiming(dir, { player: 0, phase: 'localOps', day: 1, stage: 1, startedAt: 1, endedAt: 2 });
-      await appendTiming(dir, { player: 1, phase: 'localOps', day: 1, stage: 1, startedAt: 2, endedAt: 3 });
-      const text = await readFile(join(dir, 'turn-timings.json'), 'utf8');
-      const timings = JSON.parse(text) as unknown[];
-      assert.equal(timings.length, 2);
-    }));
-});

test/server/session.test.ts

@@ -1,609 +0,0 @@
-/**
- * The game session host (`src/server/session.ts`) — pure logic, no sockets, exercised directly.
- */
-
-import { describe, it } from 'node:test';
-import assert from 'node:assert/strict';
-
-import type { GameConfig, PlayerIndex } from '../../src/engine/state.ts';
-import type { GameSession, Push } from '../../src/server/session.ts';
-import { createSession, resumeSession, tryResumeSession } from '../../src/server/session.ts';
-
-const config: GameConfig = {
-  mode: 'competitive',
-  days: 5,
-  minCombinedRevenue: 0,
-  maxCollisionsPerDay: 0,
-  maxCollisionsTotal: 0,
-  pvpCardsAllowed: false,
-  optionalRules: {
-    reducedVisibility: false,
-    employeeRotation: false,
-    emergencyToolbox: false,
-  },
-};
-
-describe('the game session host', () => {
-  it('gives a fresh connect a full Frame — nothing nulled', () => {
-    const session = createSession(42, config, ['Alice', 'Bob']);
-    const push = session.connect(0 as PlayerIndex);
-    assert.notEqual(push.frame!.cells, null, 'a first connect nulled the board');
-    assert.notEqual(push.frame!.division, null, 'a first connect nulled the division');
-  });
-
-  it('only the current actor gets a real Menu; every other seat gets null', () => {
-    const session = createSession(42, config, ['Alice', 'Bob']);
-    const a = session.connect(0 as PlayerIndex);
-    const b = session.connect(1 as PlayerIndex);
-    const actorPushes = [a, b].filter((p) => p.menu !== null);
-    assert.equal(actorPushes.length, 1, 'more than one seat (or zero) was given a real Menu');
-  });
-
-  it('rejects an intent from a seat that is not the current actor, with NOT_YOUR_TURN', () => {
-    const session = createSession(42, config, ['Alice', 'Bob']);
-    // Whichever seat is NOT the current actor should be refused, regardless of the intent's content.
-    const bPush = session.connect(1 as PlayerIndex);
-    const notActor = (bPush.menu === null ? 1 : 0) as PlayerIndex;
-    const result = session.intent(notActor, 1, { type: 'localOps.choose', option: 'draw' });
-    assert.equal(result.accepted, false);
-    if (!result.accepted) assert.equal(result.code, 'NOT_YOUR_TURN');
-  });
-
-  it('accepts a legal intent from the current actor and pushes every seat', () => {
-    const session = createSession(42, config, ['Alice', 'Bob']);
-    const aPush = session.connect(0 as PlayerIndex);
-    const actor = (aPush.menu !== null ? 0 : 1) as PlayerIndex;
-
-    const result = session.intent(actor, 1, { type: 'localOps.choose', option: 'draw' });
-    assert.equal(result.accepted, true);
-    if (result.accepted) assert.equal(result.pushes.size, 2, 'not every connected seat was pushed to');
-  });
-
-  it('rejects an illegal intent with its real RejectionCode, and does not remember the seq', () => {
-    const session = createSession(42, config, ['Alice', 'Bob']);
-    const aPush = session.connect(0 as PlayerIndex);
-    const actor = (aPush.menu !== null ? 0 : 1) as PlayerIndex;
-
-    // Discarding before ever drawing is illegal on an opening hand at the limit — a safe "this is
-    // definitely rejected" fixture that does not depend on exactly which cards were dealt.
-    const bad = session.intent(actor, 1, { type: 'card.discard', cardId: 'not-a-real-card', toSlot: 0 });
-    assert.equal(bad.accepted, false);
-    if (!bad.accepted) assert.ok(bad.code.length > 0, 'a rejection carried no code at all');
-
-    // The same seq, now with a legal intent, must still go through — a rejection is not "applied".
-    const retry = session.intent(actor, 1, { type: 'localOps.choose', option: 'draw' });
-    assert.equal(retry.accepted, true, 'a seq burned by an earlier rejection could not be reused');
-  });
-
-  it('treats a repeated seq as an already-applied no-op, not a second application', () => {
-    const session = createSession(42, config, ['Alice', 'Bob']);
-    const aPush = session.connect(0 as PlayerIndex);
-    const actor = (aPush.menu !== null ? 0 : 1) as PlayerIndex;
-
-    const first = session.intent(actor, 1, { type: 'localOps.choose', option: 'draw' });
-    assert.equal(first.accepted, true);
-    const second = session.intent(actor, 1, { type: 'localOps.choose', option: 'draw' });
-    assert.equal(second.accepted, true, 'a resend of an already-applied seq was rejected instead of ignored');
-    if (second.accepted) assert.equal(second.pushes.size, 0, 'a resend produced pushes as if newly applied');
-  });
-
-  it('deltas the board on a second push when it has not changed since the first', () => {
-    const session = createSession(42, config, ['Alice', 'Bob']);
-    const aPush = session.connect(0 as PlayerIndex);
-    session.connect(1 as PlayerIndex); // both seats need a baseline Frame before a delta means anything
-    const actor = (aPush.menu !== null ? 0 : 1) as PlayerIndex;
-
-    const result = session.intent(actor, 1, { type: 'localOps.choose', option: 'draw' });
-    assert.equal(result.accepted, true);
-    if (!result.accepted) return;
-    // Choosing "draw" doesn't move a single card on the board — the division/cells should be nulled
-    // on this push for a seat that already had them from `connect`.
-    const push = result.pushes.get(actor)!;
-    assert.equal(push.frame!.division, null, 'the board was resent even though nothing on it changed');
-  });
-
-  it('only sends narration NEW since the last push to that specific seat', () => {
-    const session = createSession(42, config, ['Alice', 'Bob']);
-    const aPush = session.connect(0 as PlayerIndex);
-    const actor = (aPush.menu !== null ? 0 : 1) as PlayerIndex;
-    // A first connect is this seat's first contact, so it gets everything narrated so far (the
-    // "Game Begins" intro and whatever `drain()` said entering the first Stage) — not an empty log.
-    assert.ok(aPush.lines.length > 0, 'a first connect got no narration at all, not even the game-begins intro');
-
-    const first = session.intent(actor, 1, { type: 'localOps.choose', option: 'draw' });
-    assert.equal(first.accepted, true);
-    if (!first.accepted) return;
-    const firstLines = first.pushes.get(actor)!.lines;
-    assert.ok(firstLines.length > 0, 'the acting seat got no narration for its own action');
-
-    const second = session.intent(actor, 2, { type: 'draw.end' });
-    assert.equal(second.accepted, true);
-    if (!second.accepted) return;
-    const secondLines = second.pushes.get(actor)!.lines;
-    assert.ok(secondLines.length > 0, 'a second real action produced no narration at all');
-    for (const line of firstLines) {
-      assert.ok(!secondLines.includes(line), 'the second push repeated narration already sent in the first');
-    }
-  });
-});
-
-describe('turn timings (lobby-and-sessions.md §5)', () => {
-  it('records a wall-clock span once the acting player, phase, Day or Stage changes', () => {
-    const session = createSession(42, config, ['Alice', 'Bob']);
-    let pushes = new Map<PlayerIndex, Push>([
-      [0 as PlayerIndex, session.connect(0 as PlayerIndex)],
-      [1 as PlayerIndex, session.connect(1 as PlayerIndex)],
-    ]);
-    const seq = new Map<PlayerIndex, number>([[0 as PlayerIndex, 1], [1 as PlayerIndex, 1]]);
-    const timings = [];
-
-    for (let step = 0; step < 60 && timings.length === 0; step++) {
-      const acting = [0, 1].find((seat) => pushes.get(seat as PlayerIndex)!.menu !== null) as PlayerIndex | undefined;
-      const menu = acting === undefined ? null : pushes.get(acting)!.menu;
-      if (acting === undefined || !menu || menu.options.length === 0) break;
-
-      const n = seq.get(acting)!;
-      seq.set(acting, n + 1);
-      const result = session.intent(acting, n, menu.options[0]!);
-      assert.equal(result.accepted, true, `step ${step}: ${JSON.stringify(menu.options[0])} rejected`);
-      if (!result.accepted) break;
-      if (result.timing) timings.push(result.timing);
-      pushes = result.pushes;
-    }
-
-    assert.ok(timings.length > 0, 'no turn timing ever closed across 60 real steps of actual play');
-    const [timing] = timings;
-    assert.ok(timing!.endedAt >= timing!.startedAt, 'a span ended before it started');
-    assert.ok([0, 1].includes(timing!.player), 'a timing named a player outside the table');
-  });
-});
-
-describe('bot seats (Phase 4 — D8, lobby-and-sessions.md §2)', () => {
-  it('a bot never becomes the observable current actor — it plays before anyone can see it waiting', () => {
-    // Seat 0 acts first (the opening Superintendent), so marking it a bot exercises `driveBots()`
-    // at CONSTRUCTION time — before any external `intent()` has run at all.
-    const session = createSession(11, config, ['Bot', 'Alice'], [0 as PlayerIndex]);
-    assert.equal(session.isBot(0 as PlayerIndex), true);
-    assert.equal(session.isBot(1 as PlayerIndex), false);
-
-    const botPush = session.connect(0 as PlayerIndex);
-    const humanPush = session.connect(1 as PlayerIndex);
-    assert.equal(botPush.menu, null, 'the bot seat was handed a real decision to make');
-    assert.notEqual(humanPush.menu, null, 'nobody was left with a turn to take — the bot never played');
-  });
-
-  it('botSeats round-trips through exportSave/resumeSession', () => {
-    const session = createSession(11, config, ['Bot', 'Alice'], [0 as PlayerIndex]);
-    const resumed = resumeSession(session.exportSave());
-    assert.equal(resumed.isBot(0 as PlayerIndex), true);
-    assert.equal(resumed.connect(0 as PlayerIndex).menu, null, 'a resumed bot seat still never gets a real decision');
-  });
-
-  it('a bot seat is driven forward after a human intent too, not only at construction', () => {
-    // Two bots and one human: whichever of the two non-human seats comes up next after the human's
-    // own move must be played automatically, with no external `intent()` for either of them.
-    const session = createSession(11, config, ['Alice', 'Bot', 'Bot'], [1 as PlayerIndex, 2 as PlayerIndex]);
-    const before = session.exportSave().history.length;
-    const applied = session.intent(0 as PlayerIndex, 1, { type: 'localOps.choose', option: 'draw' });
-    assert.equal(applied.accepted, true);
-    assert.equal(session.connect(1 as PlayerIndex).menu, null, 'bot seat 1 was left with a real decision');
-    assert.equal(session.connect(2 as PlayerIndex).menu, null, 'bot seat 2 was left with a real decision');
-    // Not a strict proof either bot actually moved (the human's own turn may not have ended yet),
-    // but the history can only ever have grown, never shrunk, and never rejected mid-drive.
-    assert.ok(session.exportSave().history.length >= before + 1);
-  });
-});
-
-describe('persistence hooks — exportSave / resumeSession (Phase 3)', () => {
-  it('exportSave carries enough to reconstruct the exact same game', () => {
-    const session = createSession(42, config, ['Alice', 'Bob']);
-    const push = session.connect(0 as PlayerIndex);
-    const actor = (push.menu !== null ? 0 : 1) as PlayerIndex;
-    const applied = session.intent(actor, 1, { type: 'localOps.choose', option: 'draw' });
-    assert.equal(applied.accepted, true);
-
-    const saved = session.exportSave();
-    assert.equal(saved.seed, 42);
-    assert.deepEqual(saved.playerNames, ['Alice', 'Bob']);
-    assert.equal(saved.history.length, 1);
-    assert.equal(saved.status, 'active');
-    assert.ok(saved.createdAt > 0, 'createdAt was not set');
-
-    const resumed = resumeSession(saved);
-    const before = session.connect(actor);
-    const after = resumed.connect(actor);
-    assert.deepEqual(after.frame, before.frame, 'resumeSession did not reconstruct the same board/state');
-  });
-
-  it('a resumed session keeps enforcing whose turn it is', () => {
-    const session = createSession(7, config, ['Alice', 'Bob']);
-    const push = session.connect(0 as PlayerIndex);
-    const actor = (push.menu !== null ? 0 : 1) as PlayerIndex;
-    session.intent(actor, 1, { type: 'localOps.choose', option: 'draw' });
-
-    const resumed = resumeSession(session.exportSave());
-    const notActor = (actor === 0 ? 1 : 0) as PlayerIndex;
-    const rejected = resumed.intent(notActor, 1, { type: 'draw.end' });
-    assert.equal(rejected.accepted, false);
-    if (!rejected.accepted) assert.equal(rejected.code, 'NOT_YOUR_TURN');
-  });
-
-  it('marks status finished only once the game actually is', () => {
-    const session = createSession(42, config, ['Alice', 'Bob']);
-    assert.equal(session.exportSave().status, 'active');
-  });
-});
-
-describe('summary() — what an administrator sees without replaying the game', () => {
-  it('describes a fresh game: who is at the table, where it has got to, and who it waits on', () => {
-    const session = createSession(42, config, ['Alice', 'Bob']);
-    const s = session.summary();
-
-    assert.equal(s.playerCount, 2);
-    assert.deepEqual(s.playerNames, ['Alice', 'Bob']);
-    assert.equal(s.status, 'active');
-    assert.equal(s.day, 1);
-    assert.equal(s.stage, 1);
-    assert.equal(typeof s.phase, 'string');
-    assert.ok(s.waitingOn, 'a game in play must be waiting on somebody');
-    assert.equal(s.waitingOn!.name, s.playerNames[s.waitingOn!.seat]);
-  });
-
-  it('does not hand back a copy of the history the way exportSave must', () => {
-    // The health check polls this on a timer, so it answering with every intent of every game
-    // would make a question about none of them cost a copy of all of them.
-    const session = createSession(42, config, ['Alice', 'Bob']);
-    assert.equal('history' in session.summary(), false);
-  });
-
-  it('moves lastMoveAt when a move is accepted, and leaves it alone when one is refused', async () => {
-    const session = createSession(42, config, ['Alice', 'Bob']);
-    const created = session.summary();
-    assert.equal(created.lastMoveAt, created.createdAt, 'an untouched game has not moved since it began');
-
-    const actor = (session.connect(0 as PlayerIndex).menu !== null ? 0 : 1) as PlayerIndex;
-    const idle = (1 - actor) as PlayerIndex;
-
-    // A rejection is not a move — a player poking at a game they cannot act in must not make it
-    // look alive to whoever is deciding whether it has stalled.
-    session.intent(idle, 1, { type: 'localOps.choose', option: 'draw' });
-    assert.equal(session.summary().lastMoveAt, created.lastMoveAt, 'a refused intent moved the clock');
-
-    await new Promise((r) => setTimeout(r, 2));
-    const accepted = session.intent(actor, 1, { type: 'localOps.choose', option: 'draw' });
-    assert.equal(accepted.accepted, true);
-    assert.ok(session.summary().lastMoveAt > created.lastMoveAt, 'an accepted intent did not move the clock');
-  });
-
-  it('carries lastMoveAt across a restart, and falls back to createdAt for a save without one', async () => {
-    const session = createSession(42, config, ['Alice', 'Bob']);
-    const actor = (session.connect(0 as PlayerIndex).menu !== null ? 0 : 1) as PlayerIndex;
-    await new Promise((r) => setTimeout(r, 2));
-    session.intent(actor, 1, { type: 'localOps.choose', option: 'draw' });
-
-    const saved = session.exportSave();
-    assert.equal(resumeSession(saved).summary().lastMoveAt, saved.lastMoveAt);
-
-    // A game written before the field existed still has to load, and reads as untouched since it
-    // began rather than as having just moved.
-    const { lastMoveAt: _dropped, ...older } = saved;
-    const revived = resumeSession(older).summary();
-    assert.equal(revived.lastMoveAt, saved.createdAt);
-  });
-
-  it('reports a finished game as waiting on nobody', () => {
-    // Every seat a bot, so the game plays itself to a finish inside the constructor.
-    const session = createSession(4242, config, ['A', 'B'], [0 as PlayerIndex, 1 as PlayerIndex]);
-    const s = session.summary();
-    assert.equal(s.status, 'finished');
-    assert.equal(s.waitingOn, null, 'a finished game must not name somebody to wait for');
-  });
-});
-
-describe('a save survives a release that did not change the rules', () => {
-  /** Plays a couple of real moves so the history is worth replaying. */
-  const played = (): ReturnType<GameSession['exportSave']> => {
-    const s = createSession(42, config, ['Alice', 'Bob']);
-    const actor = (s.connect(0 as PlayerIndex).menu !== null ? 0 : 1) as PlayerIndex;
-    s.intent(actor, 1, { type: 'localOps.choose', option: 'draw' });
-    return s.exportSave();
-  };
-
-  it('resumes whatever version stamped it, so long as the moves still replay', () => {
-    // This is the whole point. The engine version used to gate this, and it is the PACKAGE version
-    // — it moves for a CSS fix. Four releases in a row destroyed every game in progress, one of
-    // them for a change that only altered how the board is drawn.
-    const saved = played();
-    const r = tryResumeSession(saved);
-    assert.equal(r.ok, true, 'a replayable save was refused');
-    if (!r.ok) return;
-    assert.deepEqual(r.session.exportSave().history, saved.history);
-  });
-
-  it('refuses a save whose moves no longer replay, and says which move and why', () => {
-    // A rules change is simulated by corrupting one intent — the engine cannot apply it, which is
-    // exactly the shape a genuinely incompatible save has.
-    const saved = played();
-    const broken = {
-      ...saved,
-      history: [...saved.history, { type: 'localOps.choose', option: 'not-a-real-option' } as never],
-    };
-    const r = tryResumeSession(broken);
-    assert.equal(r.ok, false, 'a save the rules reject was accepted');
-    if (r.ok) return;
-    assert.equal(r.failure.of, broken.history.length);
-    assert.equal(r.failure.stoppedAt, broken.history.length - 1, 'wrong move blamed');
-    assert.equal(r.failure.intent, 'localOps.choose');
-    assert.ok(r.failure.code.length > 0, 'no rejection code to act on');
-  });
-
-  it('never silently truncates — the old loop stopped at a bad move and said nothing', () => {
-    // The silence was survivable only because the version check meant a doomed replay was never
-    // attempted. Now that the replay IS the check, a partial one must be impossible to mistake for
-    // a whole one.
-    const saved = played();
-    const broken = { ...saved, history: [{ type: 'draw.end' } as never, ...saved.history] };
-    const r = tryResumeSession(broken);
-    assert.equal(r.ok, false, 'a truncated replay was returned as a healthy session');
-  });
-});
-
-describe('the four transient signals (2026-08-23)', () => {
-  /**
-   * Multiplayer had none of these: `createRemoteSession` answered every one of them with an empty
-   * value, so a game on a server had no sound, no timetable flash, no announcement when a completed
-   * run paid the table, and no badge on the card you had just drawn. They ride on the push now — and
-   * `justDrawn` is the one that has to be careful, because `game.justDrawn` is ONE field for the
-   * whole game and does not say whose card it is.
-   */
-
-  /** Drives the game until the current actor draws a card, and returns that turn's pushes. */
-  const drawSomething = (session: GameSession, players: number): { seat: PlayerIndex; pushes: Map<PlayerIndex, Push> } => {
-    for (let seat = 0 as PlayerIndex; seat < players; seat++) {
-      if (session.connect(seat).menu === null) continue;
-      // Two steps: §6's three options are exclusive, so the turn is spent on drawing before a card
-      // actually leaves the deck.
-      const chose = session.intent(seat, 1, { type: 'localOps.choose', option: 'draw' });
-      assert.equal(chose.accepted, true, 'the actor could not choose to draw');
-      const result = session.intent(seat, 2, { type: 'draw.fromHomeOffice' });
-      assert.equal(result.accepted, true, 'the actor could not draw from the Home Office deck');
-      if (!result.accepted) throw new Error('unreachable');
-      return { seat, pushes: result.pushes };
-    }
-    throw new Error('no seat was able to act');
-  };
-
-  it('sends the drawn card to the seat that drew it, and to nobody else', () => {
-    const session = createSession(42, config, ['Alice', 'Bob', 'Carol']);
-    const { seat, pushes } = drawSomething(session, 3);
-    const mine = pushes.get(seat);
-    assert.ok(mine?.justDrawn, 'the drawing seat was not told which card it drew');
-    for (const [other, push] of pushes) {
-      if (other === seat) continue;
-      assert.equal(
-        push.justDrawn,
-        undefined,
-        `seat ${other} was told which card seat ${seat} drew — that is a hand leak`,
-      );
-    }
-  });
-
-  it('keeps the badge across a reconnect, still only for its owner', () => {
-    const session = createSession(42, config, ['Alice', 'Bob', 'Carol']);
-    const { seat, pushes } = drawSomething(session, 3);
-    const drawn = pushes.get(seat)?.justDrawn;
-    assert.equal(session.connect(seat).justDrawn, drawn, 'a refresh lost the card the player just drew');
-    const other = ((seat + 1) % 3) as PlayerIndex;
-    assert.equal(session.connect(other).justDrawn, undefined, 'a reconnecting seat was told about someone else’s draw');
-  });
-
-  it('sends the shared signals to every seat, identically, and drains them', () => {
-    // A collision anywhere on the Division, the Stage bell, a train running off the end and paying
-    // everyone: these are the table's, not one player's.
-    const session = createSession(42, config, ['Alice', 'Bob', 'Carol']);
-    const { pushes } = drawSomething(session, 3);
-    const cues = [...pushes.values()].map((p) => JSON.stringify(p.cues ?? []));
-    assert.equal(new Set(cues).size, 1, 'seats were sent different sound cues for the same events');
-
-    // Drained: a signal marks a moment, so a later connect must not replay it.
-    const later = session.connect(0 as PlayerIndex);
-    assert.equal(later.cues, undefined, 'a reconnecting client was sent the sounds of what it missed');
-    assert.equal(later.announcement, undefined, 'a reconnecting client was re-sent an old announcement');
-    assert.equal(later.scheduled, undefined, 'a reconnecting client was re-sent an old timetable flash');
-  });
-});
-
-// ---------------------------------------------------------------------------
-
-describe('§3.3 extended play across the server (Gitea#11)', () => {
-  /**
-   * A one-Day game, so these tests reach the end of the timetable by actually PLAYING to it.
-   *
-   * There is no back door into a session's engine state and there should not be — `connect`,
-   * `intent`, `exportSave` and `summary` are the whole surface. So the clock is run down through the
-   * same calls a client makes, which has the side benefit of exercising the real path: what is under
-   * test here is the session's handling of the vote (the turn guard, the bots, the saved status),
-   * and reaching it any other way would prove less.
-   */
-  const oneDay: GameConfig = { ...config, days: 1 };
-
-  /** What seat `seat` can currently see. `connect` always yields a full Frame, never a delta. */
-  const frameOf = (session: GameSession, seat: PlayerIndex) => session.connect(seat).frame!;
-
-  /** Plays until the game stops asking for ordinary moves. Returns the Frame it stopped on. */
-  function playToTheEnd(session: GameSession, seats: PlayerIndex[]) {
-    let seq = 0;
-    for (let i = 0; i < 5_000; i++) {
-      const acting = seats.find((s) => session.connect(s).menu !== null);
-      if (acting === undefined) break;
-      const menu = session.connect(acting).menu!;
-      if (menu.options.length === 0) break;
-      if (!session.intent(acting, seq++, menu.options[0]!).accepted) break;
-    }
-    return { frame: frameOf(session, seats[0]!), seq };
-  }
-
-  it('stops to ask rather than ending, and every seat can see the question', () => {
-    const session = createSession(42, oneDay, ['Alice', 'Bob']);
-    const { frame } = playToTheEnd(session, [0, 1] as PlayerIndex[]);
-    assert.equal(frame.status, 'awaitingExtension', 'the game did not stop to ask');
-    assert.ok(frame.official, 'the official result did not reach the client');
-    assert.deepEqual(frame.extensionVotes, [null, null], 'the votes did not reach the client');
-  });
-
-  it('accepts the vote from a seat that is not the current actor', () => {
-    // `currentActor` is null once the game has stopped, so the ordinary turn guard would refuse
-    // every vote with NOT_YOUR_TURN. Both seats vote here and neither of them is the actor.
-    const session = createSession(42, oneDay, ['Alice', 'Bob']);
-    const { seq } = playToTheEnd(session, [0, 1] as PlayerIndex[]);
-    const a = session.intent(0 as PlayerIndex, seq + 1, { type: 'game.extend', player: 0, agree: true });
-    assert.equal(a.accepted, true, 'seat 0 could not vote');
-    const b = session.intent(1 as PlayerIndex, seq + 2, { type: 'game.extend', player: 1, agree: true });
-    assert.equal(b.accepted, true, 'seat 1 could not vote');
-
-    const after = frameOf(session, 0 as PlayerIndex);
-    assert.equal(after.extraDays, 1, 'a unanimous table was not given its Day');
-    assert.equal(after.status, 'active', 'play did not resume');
-  });
-
-  it('bots agree only once every human has, and never lead', () => {
-    // "Bots will not disagree with the human. Humans get to vote first" (Jesse, 2026-08-28).
-    const session = createSession(42, oneDay, ['Alice', 'Botty'], [1 as PlayerIndex]);
-    const { seq } = playToTheEnd(session, [0, 1] as PlayerIndex[]);
-    assert.equal(frameOf(session, 0 as PlayerIndex).status, 'awaitingExtension');
-    assert.equal(
-      frameOf(session, 0 as PlayerIndex).extensionVotes[1],
-      null,
-      'the bot voted before the human did',
-    );
-
-    session.intent(0 as PlayerIndex, seq + 1, { type: 'game.extend', player: 0, agree: true });
-    const after = frameOf(session, 0 as PlayerIndex);
-    assert.equal(after.extraDays, 1, 'the bot did not follow the human into another Day');
-    assert.equal(after.status, 'active');
-  });
-
-  it('a human refusal ends it, and no bot overrides that', () => {
-    const session = createSession(42, oneDay, ['Alice', 'Botty'], [1 as PlayerIndex]);
-    const { seq } = playToTheEnd(session, [0, 1] as PlayerIndex[]);
-    session.intent(0 as PlayerIndex, seq + 1, { type: 'game.extend', player: 0, agree: false });
-    const after = frameOf(session, 0 as PlayerIndex);
-    assert.equal(after.status, 'finished');
-    assert.equal(after.extraDays, 0);
-  });
-
-  it('REGRESSION: an all-bot game ends rather than hanging on the question', () => {
-    /**
-     * `driveBots` loops on `currentActor`, which is null the moment the game stops to ask — so it
-     * cannot cast the vote itself, and the bots' vote is driven separately. The first cut of that
-     * driver returned early when there were no humans to follow, on the reasoning that a bot-only
-     * table would decline through the ordinary path. It has no ordinary path: nothing ever asked
-     * the bots, and an all-bot session sat on the question for ever without reaching `finished`.
-     * Caught by `summary()`'s own "a finished game waits on nobody" test.
-     */
-    const session = createSession(4242, oneDay, ['A', 'B'], [0, 1] as PlayerIndex[]);
-    assert.equal(frameOf(session, 0 as PlayerIndex).status, 'finished', 'the bots never answered');
-    assert.equal(session.summary().waitingOn, null);
-    assert.equal(frameOf(session, 0 as PlayerIndex).extraDays, 0, 'bots voted themselves another Day');
-  });
-
-  it('saves a game awaiting its vote as ACTIVE, so a restart resumes it', () => {
-    // `server/index.ts` never loads a `finished` game back into memory. A game paused on the
-    // extension question is waiting on its table, not over — persisting it as finished would strand
-    // it on disk mid-decision.
-    const session = createSession(42, oneDay, ['Alice', 'Bob']);
-    playToTheEnd(session, [0, 1] as PlayerIndex[]);
-    assert.equal(frameOf(session, 0 as PlayerIndex).status, 'awaitingExtension');
-    assert.equal(session.exportSave().status, 'active', 'a paused game was saved as finished');
-    assert.equal(session.summary().status, 'active');
-  });
-
-  it('resumes a paused game from its history, vote and all', () => {
-    const session = createSession(42, oneDay, ['Alice', 'Bob']);
-    const { seq } = playToTheEnd(session, [0, 1] as PlayerIndex[]);
-    session.intent(0 as PlayerIndex, seq + 1, { type: 'game.extend', player: 0, agree: true });
-
-    const resumed = resumeSession(session.exportSave());
-    const a = frameOf(session, 0 as PlayerIndex);
-    const b = frameOf(resumed, 0 as PlayerIndex);
-    assert.deepEqual(b.extensionVotes, a.extensionVotes, 'the votes did not survive the replay');
-    assert.equal(b.extraDays, a.extraDays, 'the extra Day did not survive the replay');
-    assert.deepEqual(b.official, a.official, 'the official result did not survive the replay');
-  });
-});
-
-/**
- * NARRATION HAS ONE PATH, AND A RECONNECT HAS TO GET ALL OF IT (#97, Gitea#20 step 1).
- *
- * The common-board plan asks for one thing here: "stop passing the full game log into `frameFor()`;
- * continue sending sanitized incremental narration through `Push.lines`." Doing only the first half
- * would have deleted a real behaviour, so this pins the pair.
- *
- * WHAT WAS ACTUALLY WRONG. `Frame.lines` carried the WHOLE log on every push, and nothing read it:
- * `RemoteSession` (`web/session.ts`) accumulates `lines` from `push.lines` alone and its `lines()`
- * returns that accumulator. So the log was serialised into every frame for every seat, grew all
- * game, and was thrown away on arrival — while `linesSince` sent the same text again, correctly,
- * beside it.
- *
- * And the duplicate was masking a bug rather than merely wasting bandwidth. `connect()` clears
- * `lastFrame` but did NOT clear `sentLines`, so a reconnecting seat was told "nothing new since your
- * last push" — while the browser it was answering had just reloaded and started from an EMPTY
- * accumulator. The history panel came back blank after a refresh, mid-game, with the server holding
- * the whole log and shipping it in the one field nobody reads.
- *
- * So the two halves are one change: a (re)connect resets the seat's watermark and `Push.lines` on a
- * connect IS the history, which is what lets the frame stop carrying a second copy.
- */
-describe('narration reaches a seat exactly once, by one path (#97)', () => {
-  /**
-   * A session with narration already in the log and NO connect yet, so a first connect is a real
-   * "catch me up" rather than a no-op. Connecting inside this helper is what made the first draft of
-   * the reconnect test pass vacuously: both sides of the comparison were the empty array.
-   */
-  const played = (): GameSession => createSession(550943578, config, ['Alice', 'Bob']);
-
-  it('a FIRST connect carries the narration so far in Push.lines', () => {
-    const session = createSession(550943578, config, ['Alice', 'Bob']);
-    const push = session.connect(0 as PlayerIndex);
-    assert.ok(push.lines.length > 0, 'a first connect was given no narration at all');
-    assert.ok(
-      push.lines.some((l) => /players|competitive/i.test(l.text)),
-      'the opening lines are not in what a first connect received',
-    );
-  });
-
-  it('a RECONNECT is given the whole log again, because the browser it answers has none', () => {
-    const session = played();
-    const first = session.connect(0 as PlayerIndex);
-    const again = session.connect(0 as PlayerIndex);
-    // NON-EMPTY first: two empty arrays are deepEqual, and asserting only that is how this test
-    // passed against the broken code on its first draft.
-    assert.ok(first.lines.length > 0, 'the premise is gone: there was no narration to be given');
-    assert.deepEqual(
-      again.lines,
-      first.lines,
-      'a reconnecting seat was told nothing was new, and its history panel would come back empty',
-    );
-  });
-
-  it('the Frame does NOT carry a second copy of the log', () => {
-    const session = played();
-    const push = session.connect(0 as PlayerIndex);
-    assert.deepEqual(
-      (push.frame as unknown as { lines: unknown[] }).lines,
-      [],
-      'the whole narration log is still being serialised into every Frame, where nothing reads it',
-    );
-  });
-
-  it('an ordinary push after a connect carries only what is NEW', () => {
-    const session = played();
-    const opening = session.connect(0 as PlayerIndex);
-    assert.ok(opening.lines.length > 0);
-    // A second connect for the OTHER seat must not re-send seat 0 anything.
-    const other = session.connect(1 as PlayerIndex);
-    assert.ok(other.lines.length > 0, 'the other seat got no history of its own');
-    const third = session.connect(0 as PlayerIndex);
-    assert.deepEqual(third.lines, opening.lines, 'a reconnect is the full log, every time');
-  });
-});

test/session.test.ts

@@ -14,12 +14,11 @@
 
 import { describe, it } from 'node:test';
 import assert from 'node:assert/strict';
-import { readFileSync, readdirSync } from 'node:fs';
+import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
 
-import { actionGroups, currentActor, handPlayable, newGame, submit, toSave, view } from '../src/web/game.ts';
+import { actionGroups, currentActor, handPlayable, newGame, overHandLimit, submit, toSave, view } from '../src/web/game.ts';
 import { createLocalSession } from '../src/web/session.ts';
-import { seatLabel } from '../src/sim/view.ts';
 
 /**
  * Drive a session by always taking the first offered action.
@@ -63,13 +62,7 @@ describe('a local session plays the same game as the calls it replaced', () => {
     assert.ok(turns > 50, `only ${turns} decisions — the game stalled`);
 
     const f = session.view();
-    /**
-     * `awaitingExtension` since Gitea#11, not `finished`: both loops stop when there is no actor,
-     * and a days-based ending now parks the game on the "play one more Day?" question rather than
-     * ending it outright. What this test is actually about is unchanged — the two sides reach the
-     * SAME position — and the assertion below is still the one carrying that.
-     */
-    assert.equal(f.status, 'awaitingExtension');
+    assert.equal(f.status, 'finished');
     assert.equal(f.status, view(game).status);
     assert.equal(f.day, view(game).day);
     assert.deepEqual(f.cells, view(game).cells, 'the board differs across the boundary');
@@ -81,6 +74,7 @@ describe('a local session plays the same game as the calls it replaced', () => {
     assert.equal(session.seat(), 0);
     assert.equal(session.actor(), currentActor(session.game));
     assert.deepEqual(session.handPlayable(), handPlayable(session.game));
+    assert.equal(session.overHandLimit(), overHandLimit(session.game));
   });
 });
 
@@ -224,32 +218,6 @@ describe('the page stays on the near side of the boundary', () => {
   });
 });
 
-describe('seats are counted from 1 wherever a person reads them', () => {
-  it('seatLabel shifts the zero-based index the whole engine uses', () => {
-    assert.deepEqual([0, 1, 2, 3].map(seatLabel), [1, 2, 3, 4]);
-  });
-
-  it('no user-facing "Seat N" bypasses it', () => {
-    // The internal convention is zero-based and must stay that way — it indexes `seating`, the
-    // seats array and every route. The DISPLAYED number is the one a player would say out loud, so
-    // the two have to be converted at exactly one place; anything interpolating a raw seat into a
-    // "Seat …" string has quietly reintroduced "Seat 0".
-    const roots = ['src/web', 'src/sim', 'src/server'];
-    const offenders: string[] = [];
-    for (const dir of roots) {
-      const base = join(import.meta.dirname, '..', dir);
-      for (const name of readdirSync(base, { recursive: true, encoding: 'utf8' })) {
-        if (!name.endsWith('.ts')) continue;
-        const text = readFileSync(join(base, name), 'utf8');
-        for (const m of text.matchAll(/`[^`]*Seat \$\{([^}]*)\}/g)) {
-          if (!m[1]!.includes('seatLabel')) offenders.push(`${dir}/${name}: ${m[0]!.slice(0, 60)}`);
-        }
-      }
-    }
-    assert.deepEqual(offenders, [], 'a seat is shown to a player without going through seatLabel');
-  });
-});
-
 describe('capabilities say what only a local session can do', () => {
   it('offers undo, a local save and a new deal', () => {
     // The page hides these rather than calling them and failing. A server can offer none of them: it

test/setup.test.ts

@@ -35,13 +35,11 @@ import { subdivisions } from '../src/engine/state.ts';
 
 const solitaireConfig: GameConfig = {
   mode: 'solitaire',
-  days: 5,
-  minCombinedRevenue: 0,
-  maxCollisionsPerDay: 0,
-  maxCollisionsTotal: 0,
-  pvpCardsAllowed: false,
+  victory: 'highestAfterDays',
+  length: 'standard',
   optionalRules: {
     reducedVisibility: false,
+    sisterTrains: false,
     employeeRotation: false,
     emergencyToolbox: false,
   },
@@ -63,73 +61,56 @@ const gameDealtWith = (startingHand: StartingHand, seed = 1234) =>
 
 describe('card catalogue (component 1)', () => {
   it('composes the deck from the design', () => {
-    // THE WHOLE CATALOGUE IS docs/Deck cards5.xlsx NOW (Gitea#14). Sheet 5's own totals are
-    // "Total track 48" and "Total other (in play) 107", i.e. 155 shuffled, plus 12 start cards for
-    // its grand total of 167. Card for card, 84 rows agree with it exactly and the only ones that
-    // do not are listed below — every one of them a deliberate hold, in one direction or the other.
+    // Transcribed from docs/Deck cards2.xlsx. The sheet's own totals are "Sum other 115" and
+    // "Total track 104", i.e. 219, plus 12 start cards for its grand total of 231.
     //
-    // EVERY COUNT IN THE CATALOGUE IS NOW THE SHEET'S. The two deliberate departures that used to
-    // sit here are gone with Gitea#14 — the Q12 office doubling (offices 14 → 7) and the Gap 12
-    // industry tripling (27 → 9) — because both were measured against a deck holding 96 track
-    // cards, and sheet 5 halves that. content.ts carries the measurements that decided it.
+    // We are at 235 rather than 219 because of three deliberate departures, all flagged in
+    // content.ts: 18 extra industry cards (Gap 12, industries 9 → 27), 7 extra office cards (Q12,
+    // offices 7 → 14), and the 8 sharp curves taken back OUT. The first two were tuned against a deck
+    // that had NO track in it, so both are due a re-measurement now that 96 track cards share the
+    // draw.
     //
-    // We are at 143 rather than the sheet's 155 for ONE reason: the ten Safety, Event, Inspection
-    // and Space-use cards sheet 5 adds are not built, and stay out until they are (Jesse,
-    // 2026-08-26) — Cargo Theft, Civic Improvement, Civilian angel, Delayed Clearance, Flares 2,
-    // Robbery, Service Delays, Shipper complaints, Strike, Union Hall 2. Twelve copies in all.
-    //
-    // NOTHING RUNS THE OTHER WAY ANY MORE. Every card sheet 5 does not list is dealt ZERO copies
-    // rather than deleted, so the design stays visible and the rules stay implemented: the
-    // Telegraph/Telephone/Radio ladder, Facing Point Locks (both), Flying Switch, Section House and
-    // Vandalism, all removed from the design on purpose; Poling, whose effect the source records as
-    // "TBD"; and the sharp curves, whose only difference from an ordinary curve was a Move cost
-    // nothing ever charged — sheet 5 deals those zero too, so the catalogue and the design agree.
-    //
-    // DECK_SIZE is the CATALOGUE, 143. The deck actually dealt is smaller: the 20 opponent-directed
-    // cards are held back in every mode until they are implemented, so `buildDeck` returns 123.
-    assert.equal(DECK_SIZE, 143);
+    // Two entries are dealt ZERO copies and kept in the catalogue so the design stays visible:
+    // Poling, whose effect is "TBD in the source", and the sharp curves, whose only difference from
+    // an ordinary curve was a Move cost nothing ever charged.
+    // DECK_SIZE is the CATALOGUE, 235. The deck actually dealt is smaller: the 22 opponent-directed
+    // cards are held back in every mode until they are implemented, so `buildDeck` returns 213.
+    assert.equal(DECK_SIZE, 235);
     assert.equal(buildDeck().length, SOLITAIRE_DECK_SIZE);
   });
 
   it('matches the design deck composition exactly', () => {
     const byCategory = Object.fromEntries(deckComposition().map((c) => [c.category, c.count]));
     assert.deepEqual(byCategory, {
-      // Sheet 5's track counts exactly (Gitea#14): 16 straights, 8+8 curves, 8+8 turnouts, and the
-      // sharp curves dealt none — which is where the catalogue already had them, and where sheet 5
-      // now puts them too.
-      track: 48,
-      // The sheet's 7 — the Q12 doubling came out in Gitea#14; see OFFICE_PROFILES.
-      office: 7,
-      // The sheet's 9 — the Gap 12 tripling came out in Gitea#14; see INDUSTRY_PROFILES.
-      industry: 9,
+      // 96, not the sheet's 104: the 8 SHARP CURVES are dealt zero copies. The only thing that made
+      // one different from an ordinary curve was a Move cost that nothing ever charged, so they were
+      // geometric duplicates taking 8 draws. Kept in the catalogue at zero, as Poling is.
+      track: 96,
+      // 14, not the sheet's 7 — Q12 office density; see OFFICE_PROFILES.
+      office: 14,
+      // 27, not the sheet's 9 — Gap 12 industry density; see INDUSTRY_PROFILES.
+      industry: 27,
       modifier: 23,
       train: 22,
-      spaceUse: 11,
-      // 6 — the dispatching ladder and Facing Point Locks are dealt 0 copies (see
-      // ENHANCEMENT_CARDS), and Interlocking, Water column and ABS Signals came down to the sheet's
-      // single copies. What is left is the sheet's Enhancements exactly, bar Railroad crossing,
-      // which sheet 5 moved here from the Action cards and which is still counted there below.
-      enhancement: 6,
-      // 5 — Facing Point Locks came out of the Mainline modifiers too.
-      mainlineModifier: 5,
-      // 3 — Red Flags is the sheet's 3; Flying Switch and Poling are both dealt none.
-      maneuver: 3,
-      // 9 — Vandalism is dealt none. The rest are opponent-directed and held out of every deck.
-      action: 9,
+      spaceUse: 12,
+      enhancement: 18,
+      mainlineModifier: 7,
+      // 6, not 7 — Poling is dealt no copies until its rule is known.
+      maneuver: 6,
+      action: 10,
     });
   });
 
   it('removes opponent-directed cards from a solitaire deck', () => {
     // Q6 took Space-use and Action cards out of solitaire, where they have no legal target. They are
     // now out of the COMPETITIVE deck too, until they are implemented: `checkPlay` answers both
-    // categories NOT_IMPLEMENTED, so dealing them would be a dead draw.
-    // 121, not 123: the 20 opponent-directed cards come out, and so do the TWO that exist only to
-    // answer them — one Water Column and one Overpass. A defence with nothing to defend against is
-    // the same dead draw as the attack would be. `SimpleCard.answers` names the pairing, so they
-    // return together. It was seven until Gitea#14 dealt Facing Point Locks zero copies: a card at
-    // zero is already out, so it no longer needs holding back.
-    assert.equal(SOLITAIRE_DECK_SIZE, 121);
-    assert.equal(DEFENCE_ONLY_COPIES, 2);
+    // categories NOT_IMPLEMENTED, so dealing them would make 22 of 235 draws (9%) reject outright.
+    // 206, not 213: the 22 opponent-directed cards come out, and so do the SEVEN that exist only to
+    // answer them — Facing Point Locks (both the Enhancement and the Mainline modifier, 2 each), two
+    // Water Columns and one Overpass. A defence with nothing to defend against is the same dead draw
+    // as the attack would be. `SimpleCard.answers` names the pairing, so they return together.
+    assert.equal(SOLITAIRE_DECK_SIZE, 206);
+    assert.equal(DEFENCE_ONLY_COPIES, 7);
     for (const c of DEFENCE_ONLY_CARDS) {
       assert.ok(c.answers, `${c.name} is held back without saying what it answers`);
       assert.ok(
@@ -148,12 +129,11 @@ describe('card catalogue (component 1)', () => {
   });
 
   it('deals track FROM the deck, at the sheet\'s counts', () => {
-    // Column B of Deck cards5.xlsx, "Number in Deck": 16 straights, 8+8 curves, 8+8 turnouts, and
-    // 0+0 sharp curves. Sheet 2 had each of those at double, which is what the deck dealt until
-    // Gitea#14. An earlier reading took the sheet's LAST column, "Track Per Player" (26), as a
-    // separate stack outside the deck; it is the sheet's total shared out among four players, not a
-    // second pile.
-    assert.equal(TRACK_IN_DECK, 48);
+    // Column B of Deck cards2.xlsx, "Number in Deck": 32 straights, 16+16 curves, 16+16 turnouts —
+    // and 4+4 sharp curves, which are dealt none. An earlier reading took the sheet's LAST column,
+    // "Track Per Player" (26), as a separate stack outside the deck; it is the sheet's 104 shared out
+    // among four players, not a second pile.
+    assert.equal(TRACK_IN_DECK, 96);
     const deck = buildDeck();
     for (const t of TRACK_CARDS) {
       const n = deck.filter(
@@ -164,26 +144,11 @@ describe('card catalogue (component 1)', () => {
   });
 
   it('makes track the largest category in the deck', () => {
-    // 48 of 121. Building a district is paid for in the industry or train you did not draw, which
+    // 96 of 235. Building a district is paid for in the industry or train you did not draw, which
     // is the whole reason it matters that track is a card rather than a private supply.
-    //
-    // This asked for a THIRD of the deck until Gitea#14, which was only ever a rule of thumb. It
-    // asks its own question now — is track still the biggest single thing you can draw — plus a
-    // loose band, because the exact share is not settled yet and should not be pinned as though it
-    // were. Sheet 5 puts track at 48 of the 155 cards it would have you shuffle, i.e. 31%; we read
-    // 40% because the Space-use, Safety, Event and Inspection cards are held out, which concentrates
-    // everything that is left. The share falls TOWARDS the sheet as those land, so the band is set
-    // to hold across that whole journey rather than to be re-edited at each step.
     const deck = buildDeck();
-    const counts = new Map<string, number>();
-    for (const c of deck) counts.set(c.kind.kind, (counts.get(c.kind.kind) ?? 0) + 1);
-    const track = counts.get('track') ?? 0;
-    for (const [kind, n] of counts) {
-      if (kind === 'track') continue;
-      assert.ok(track > n, `${kind} has ${n} cards against track's ${track}`);
-    }
-    const share = track / deck.length;
-    assert.ok(share > 0.28 && share < 0.45, `track is ${(share * 100).toFixed(1)}% of the deck`);
+    const track = deck.filter((c) => c.kind.kind === 'track').length;
+    assert.ok(track > deck.length / 3, `track is only ${track} of ${deck.length} cards`);
   });
 
   it('has 12 timetabled trains, odd westbound and even eastbound', () => {
@@ -342,16 +307,12 @@ describe('card catalogue (component 1)', () => {
     }
   });
 
-  it('keeps the three day-count presets sim/CLI tooling still relies on', () => {
-    // Gap 10e's fixed targets retired 2026-08-20 — `minCombinedRevenue` is a free `GameConfig`
-    // variable now, not a `length`-keyed lookup. `LENGTH_PROFILES` survives only as a convenience
-    // preset for tools that still want a short/standard/campaign argument (`harness.ts`, `compare.ts`,
-    // `replay.ts`).
+  it('uses the Gap 10e revised victory targets', () => {
     assert.deepEqual(
-      LENGTH_PROFILES.map((p) => [p.length, p.days]),
-      [['short', 3], ['standard', 5], ['campaign', 10]],
+      LENGTH_PROFILES.map((p) => [p.target, p.days]),
+      [[10, 3], [20, 5], [45, 10]],
     );
-    assert.equal(lengthProfile('standard').days, 5);
+    assert.equal(lengthProfile('standard').target, 20);
   });
 
   it('scales fixed supplies with player count', () => {

test/sim.test.ts

@@ -22,13 +22,11 @@ import { anomalies, strategyBuckets } from '../src/sim/stats.ts';
 
 const config: GameConfig = {
   mode: 'solitaire',
-  days: 3,
-  minCombinedRevenue: 0,
-  maxCollisionsPerDay: 0,
-  maxCollisionsTotal: 0,
-  pvpCardsAllowed: false,
+  victory: 'highestAfterDays',
+  length: 'short',
   optionalRules: {
     reducedVisibility: false,
+    sisterTrains: false,
     employeeRotation: false,
     emergencyToolbox: false,
   },
@@ -157,7 +155,7 @@ describe('the revenue chain works end to end (regression)', () => {
     // more cars in total (22 vs 19 over forty games). Widened so it fails for the reason it names.
     let spotted = 0;
     for (const seed of [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]) {
-      const s = createGame({ id: 'g', seed, config: { ...config, days: 5 }, playerNames: ['bot'] });
+      const s = createGame({ id: 'g', seed, config: { ...config, length: 'standard' }, playerNames: ['bot'] });
       playGame(s, developerBot, pump);
       for (const card of s.officeAreas.get(0)!.grid.values()) {
         if (card.facility?.kind === 'freight') spotted += card.facility.industryTrack.cars.length;
@@ -174,7 +172,7 @@ describe('the revenue chain works end to end (regression)', () => {
     // the old 52-card placeholder it was 10 in 52.
     let placed = 0;
     for (const seed of [11, 23, 47, 91, 137, 211]) {
-      const s = createGame({ id: 'g', seed, config: { ...config, days: 10 }, playerNames: ['bot'] });
+      const s = createGame({ id: 'g', seed, config: { ...config, length: 'campaign' }, playerNames: ['bot'] });
       playGame(s, developerBot, pump);
       for (const card of s.officeAreas.get(0)!.grid.values()) {
         if (card.geometry.kind !== 'facility') continue;
@@ -191,26 +189,15 @@ describe('the revenue chain works end to end (regression)', () => {
     // only because unloads were mis-scored as completed loads after one Laborer action instead of
     // four. Correcting that dropped mean revenue from 24.8 to ~4.6 and the win rate to zero, so
     // "did anyone win" is no longer a safe proxy for "does freight work".
-    /**
-     * TWO HUNDRED GAMES, up from forty (Gitea#3). Completed freight loads got scarcer when the
-     * Mainline went onto the region model, and measurably so — on these seeds: 40 games yield 0
-     * loads, 80 yield 3 (1 game), 120 yield 10 (4 games), 200 yield 21 (9 games). Forty could no
-     * longer reach the precondition it exists to establish.
-     *
-     * WHY it got scarcer is not settled and is worth someone's attention rather than a guess — the
-     * change speeds crossings up, which ought to put MORE trains through a district, not fewer.
-     * Freight share of gross fell from 8% to 5% over 100 games across the same change. Recorded in
-     * TODO.md under Play Balance; the assertion itself is untouched.
-     */
     const report = simulate({
-      games: 200,
+      games: 40,
       length: 'standard',
       mode: 'solitaire',
       players: ['bot'],
       policy: developerBot,
     });
     const freight = report.perGame.reduce((n, g) => n + g.revenue.freightLoad, 0);
-    assert.ok(freight > 0, 'no freight load completed across 200 games');
+    assert.ok(freight > 0, 'no freight load completed across 40 games');
   });
 
   it('grows the Office Area off the Running Track, on either side', () => {
@@ -219,7 +206,7 @@ describe('the revenue chain works end to end (regression)', () => {
     // "downward only" is gone, and with it the rule that rejected every square above row 0.
     const rows = new Set<number>();
     for (const seed of [3, 9, 27, 81]) {
-      const s = createGame({ id: 'g', seed, config: { ...config, days: 10 }, playerNames: ['bot'] });
+      const s = createGame({ id: 'g', seed, config: { ...config, length: 'campaign' }, playerNames: ['bot'] });
       playGame(s, developerBot, pump);
       for (const key of s.officeAreas.get(0)!.grid.keys()) rows.add(Number(key.split(',')[0]));
     }
@@ -285,7 +272,7 @@ describe('the deck is closed — no card is created or destroyed', () => {
     // Every card is in exactly one place: the Home Office deck, a Department pile, the Salvage Yard,
     // a hand, or on the board — grid cells, enhancements laid on them, and Mainline modifiers.
     for (const seed of [3, 17, 91]) {
-      const s = createGame({ id: `cc-${seed}`, seed, config: { ...config, days: 5 }, playerNames: ['bot'] });
+      const s = createGame({ id: `cc-${seed}`, seed, config: { ...config, length: 'standard' }, playerNames: ['bot'] });
       const total = s.cards.size;
       playGame(s, developerBot, pump);
 
@@ -307,7 +294,7 @@ describe('the deck is closed — no card is created or destroyed', () => {
     // The sharper form of the same guard. A discard moves a card from a hand to a Department pile
     // and a draw moves one back, so the count across deck + Departments + Salvage Yard + hands can
     // only fall by cards actually placed on the board — never by one being overwritten.
-    const s = createGame({ id: 'cc', seed: 5, config: { ...config, days: 5 }, playerNames: ['bot'] });
+    const s = createGame({ id: 'cc', seed: 5, config: { ...config, length: 'standard' }, playerNames: ['bot'] });
     const before = s.cards.size;
     playGame(s, developerBot, pump);
     const loose =
@@ -362,32 +349,7 @@ describe('end-of-game statistics', () => {
      * rule that has become unreachable. Exempted by name so the other forty-odd event checks stay live,
      * and so removing this line is what proves the bot has been fixed.
      */
-    /**
-     * RED FLAGS JOINS IT, and the reason CHANGED with Gitea#19 — the exemption stays, but it no
-     * longer means what it used to.
-     *
-     * IT USED TO MEAN "the bot will not take it": measured over 600 games under the old rule,
-     * `maneuver.redFlags` was OFFERED 4,212 times and PLAYED 4. The card protected a stopped train
-     * out on the Mainline, it was always available, and the bot simply declined it.
-     *
-     * SINCE Gitea#19 the bot would take it every time — `worthFlagging` accepts the out-of-phase
-     * prompt unconditionally, because the engine only raises that prompt when an arrival is
-     * certainly about to collide, so there is nothing left for the bot to judge. It still never
-     * plays one. MEASURED after the redesign, 200 solitaire games: `redFlagsSet` fires ZERO times.
-     *
-     * The reason is now arithmetic rather than judgement, and it is worth writing down because it
-     * says what would actually change it. The prompt needs two things to coincide — an arrival that
-     * would collide (0.14 collisions per game, so roughly one game in seven) AND the district's
-     * owner holding a Red Flags card at that moment, out of a three-card hand drawn from 121. The
-     * bot also never plants a flag speculatively, which is the other half of the card and the half
-     * a human would use to buy time for switching.
-     *
-     * So this canary is measuring deck luck, not reachability. `test/mainline-cards.test.ts`
-     * exercises both halves of the rule end to end on a hand-built board, which is where the
-     * behaviour is actually pinned. Removing this line still proves something worth proving — that
-     * the bot has learned to plant a flag on purpose rather than only when handed one.
-     */
-    const KNOWN_UNREACHABLE_BY_THE_BOT = ['event flyingSwitch', 'event redFlagsSet'];
+    const KNOWN_UNREACHABLE_BY_THE_BOT = ['event flyingSwitch'];
     const found = anomalies(report.perGame);
     const never = found
       .filter((a) => a.severity === 'never')
@@ -590,7 +552,7 @@ describe('the bot builds sidings that are actually sidings (regression)', () =>
       const s = createGame({
         id: `sd-${i}`,
         seed: 1000 + i * 7919,
-        config: { ...config, days: 5 },
+        config: { ...config, length: 'standard' },
         playerNames: ['bot'],
       });
       playGame(s, developerBot, pump);
@@ -679,21 +641,16 @@ describe('the bot builds sidings that are actually sidings (regression)', () =>
     // Measured across 100 games: tank cars boarded a train 0.07 times a game and were dropped by a
     // crew ZERO times, while boxcars were 67% of every drop — and 23 of 79 waiting loads were
     // sitting at an industry that wanted a tank.
-    // THREE HUNDRED GAMES, up from a hundred, because the sheet's industry density (Gitea#14) makes
-    // the rare commodities much rarer. Measured on these exact seeds, the game at which each type is
-    // first set out by a crew: caboose 5, boxcar 12, hopper 37, reefer 44, coach 64, **tank 216**.
-    //
-    // A Refinery is one card in a hundred and fifty now, so a tank moving at all needs that card
-    // drawn, placed, reached and worked. The old sample of 100 stopped covering it — not because the
-    // rule broke, but because the deck did what the sheet asks. The sample follows the measurement
-    // rather than the assertion being softened: tank is still the strict test, for the reason below.
-    // Deterministic seeds, so this either holds or it does not.
+    // A HUNDRED GAMES, not thirty — the comment above says the original measurement used 100, and
+    // the sample has to be that big to mean anything: measured now, a tank is set out in 3% of games
+    // and a reefer in 5%. Thirty games passed on luck and stopped the moment the opening deal moved
+    // which cards a seed puts in reach. Deterministic seeds, so this either holds or it does not.
     const dropped = new Set<string>();
-    for (let i = 0; i < 300; i++) {
+    for (let i = 0; i < 100; i++) {
       const s = createGame({
         id: `cs-${i}`,
         seed: 1000 + i * 7919,
-        config: { ...config, days: 5 },
+        config: { ...config, length: 'standard' },
         playerNames: ['bot'],
       });
       const r = playGame(s, developerBot, pump);
@@ -777,7 +734,7 @@ describe('the bot does not throw away its own freight (regression)', () => {
       const s = createGame({
         id: `uj-${i}`,
         seed: 1000 + i * 7919,
-        config: { ...config, days: 5 },
+        config: { ...config, length: 'standard' },
         playerNames: ['bot'],
       });
       const r = playGame(s, developerBot, pump);
@@ -806,7 +763,7 @@ describe('the bot does not throw away its own freight (regression)', () => {
     // The other half of the regression above. Gutting the fallback entirely would satisfy "never
     // unjams a green box" while leaving a real jam to block the industry forever — a load stranded
     // on WORK keeps the track locked, which now stops trains passing as well as stopping (§9.3).
-    const s = createGame({ id: 'jam', seed: 5, config: { ...config, days: 5 }, playerNames: ['bot'] });
+    const s = createGame({ id: 'jam', seed: 5, config: { ...config, length: 'standard' }, playerNames: ['bot'] });
     const area = s.officeAreas.get(0)!;
     area.grid.set('-1,0', {
       geometry: { kind: 'facility', facility: 'mineTipple' },
@@ -851,7 +808,7 @@ describe('Enhancements can reach the board at all (regression)', () => {
       const s = createGame({
         id: `st-${i}`,
         seed: 1000 + i * 7919,
-        config: { ...config, days: 5 },
+        config: { ...config, length: 'standard' },
         playerNames: ['bot'],
       });
       playGame(s, developerBot, pump);
@@ -888,7 +845,7 @@ describe('Enhancements can reach the board at all (regression)', () => {
       const s = createGame({
         id: `il-${i}`,
         seed: 1000 + i * 7919,
-        config: { ...config, days: 5 },
+        config: { ...config, length: 'standard' },
         playerNames: ['bot'],
       });
       playGame(s, developerBot, pump);
@@ -926,7 +883,7 @@ describe('rolling stock returns to service (regression)', () => {
     const s = createGame({
       id: 'refill',
       seed: 4,
-      config: { ...config, days: 5 },
+      config: { ...config, length: 'standard' },
       playerNames: ['bot'],
     });
 
@@ -965,7 +922,7 @@ describe('measurement discipline', () => {
     // the observer hook cannot drift from the log, so probes have one trustworthy way in and no
     // reason to hand-roll the drive loop again.
     const seen: string[] = [];
-    const s = createGame({ id: 'obs', seed: 4242, config: { ...config, days: 5 }, playerNames: ['b'] });
+    const s = createGame({ id: 'obs', seed: 4242, config: { ...config, length: 'standard' }, playerNames: ['b'] });
     const out = playGame(s, developerBot, pump, 50_000, (e) => seen.push(e.type));
 
     assert.ok(out.events.length > 0, 'a finished game must produce events');
@@ -977,7 +934,7 @@ describe('measurement discipline', () => {
     // Asserted across several seeds because a single game may never draw a Depot card.
     let upgrades = 0;
     for (let seed = 0; seed < 25; seed++) {
-      const s = createGame({ id: `u${seed}`, seed, config: { ...config, days: 5 }, playerNames: ['b'] });
+      const s = createGame({ id: `u${seed}`, seed, config: { ...config, length: 'standard' }, playerNames: ['b'] });
       const out = playGame(s, developerBot, pump);
       upgrades += out.events.filter((e) => e.type === 'officeUpgraded').length;
     }
@@ -997,7 +954,7 @@ describe('the bot does not lay track that cannot work (regression)', () => {
     const s = createGame({
       id: `lay-${seed}`,
       seed,
-      config: { ...config, days: 5 },
+      config: { ...config, length: 'standard' },
       playerNames: ['Solitaire'],
     });
     const laid: Lay[] = [];
@@ -1039,12 +996,6 @@ describe('the bot does not lay track that cannot work (regression)', () => {
     // A TIE-BREAKER rather than a veto, so this is a rate and not a zero: forbidding it outright
     // measured WORSE (-0.62 revenue a game), while preferring the cleaner of two equally good
     // placements measured better and cut these from 28% of pieces to 7%.
-    //
-    // AND IT STAYS A TIE-BREAKER. Gitea#15 was filed as "track placements must connect" and briefly
-    // became a rule here; RAR reversed it on review (2026-08-26) — a rail may stop dead against its
-    // neighbour, and such a stub is useful as a siding to park cars on. What the engine must refuse
-    // is a TRAIN crossing the gap, which is `exploreMoves`' job and is tested in `track.test.ts`.
-    // So laying one of these is a preference, exactly as it was, and the rate below is the bar.
     let laid = 0;
     let dead = 0;
     /**
@@ -1056,7 +1007,7 @@ describe('the bot does not lay track that cannot work (regression)', () => {
     for (const seed of SEEDS) {
       const s = createGame({
         id: `dp-${seed}`, seed,
-        config: { ...config, days: 5 },
+        config: { ...config, length: 'standard' },
         playerNames: ['Solitaire'],
       });
       const spy = {
@@ -1141,18 +1092,12 @@ describe('the freight figures count both halves (regression)', () => {
      * The subject here is the INSTRUMENT — does `freightUnload` count Revenue earned rather than
      * unloads started — and `unloads > 0` is only the precondition that makes the comparison mean
      * anything. Widening the sample restores the precondition without weakening the assertion.
-     *
-     * A HUNDRED AND FIFTY DEALS, up from forty, for the same reason as the commodity test above:
-     * Gitea#14 put the deck on the sheet's industry density and completed unloads went with it.
-     * Measured on these seeds, the first deal to EARN unload Revenue is number **46**, and 19 deals
-     * in 400 earn any — so forty could not reach the precondition it exists to establish. 150 clears
-     * it with room, and the assertion itself is untouched.
      */
-    for (let i = 0; i < 150; i++) {
+    for (let i = 0; i < 40; i++) {
       const seed = 1000 + i * 7919;
       const s = createGame({
         id: `fu-${seed}`, seed,
-        config: { ...config, days: 5 },
+        config: { ...config, length: 'standard' },
         playerNames: ['bot'],
       });
       const r = playGame(s, developerBot, pump);

test/step-queue.test.ts

@@ -1,409 +0,0 @@
-/**
- * THE ANIMATION QUEUE — v0.8.0, `docs/plans/jitsi-common-board.md` § v0.8.0 §§ 5-6.
- *
- * Driven against REAL steps from a real game rather than hand-built fixtures, because the properties
- * that matter are about what actual play produces: a bot's whole switching turn arriving in one
- * burst, and a backlog that is mostly bookkeeping.
- */
-
-import { describe, it } from 'node:test';
-import assert from 'node:assert/strict';
-
-import { legalActions } from '../src/engine/legal.ts';
-import type { GameConfig } from '../src/engine/state.ts';
-import { currentActor, newMultiplayerGame, submit } from '../src/web/game.ts';
-import { publicSnapshot } from '../src/sim/view.ts';
-import { takeSteps } from '../src/sim/display-step.ts';
-import type { DisplayStep } from '../src/sim/display-step.ts';
-import { actorOnScreen, createStepQueue } from '../src/web/step-queue.ts';
-import { DWELL } from '../src/sim/pacing.ts';
-
-const config: GameConfig = {
-  mode: 'competitive',
-  days: 5,
-  minCombinedRevenue: 0,
-  maxCollisionsPerDay: 0,
-  maxCollisionsTotal: 0,
-  pvpCardsAllowed: false,
-  optionalRules: {
-    reducedVisibility: false,
-    employeeRotation: false,
-    emergencyToolbox: false,
-  },
-};
-
-/**
- * Plays a real game and returns its steps, preferring switch moves so a burst actually occurs.
- *
- * 400 moves, not 120: switching is not legal until there is track laid and a train in the district,
- * and on this seed the first `switch.move` is at move 144. A shorter run produces a queue with no
- * switching in it at all, which would make the pacing assertions here vacuous.
- */
-function realSteps(seed: number, moves: number): { steps: DisplayStep[]; final: ReturnType<typeof publicSnapshot> } {
-  const game = newMultiplayerGame(seed, config, ['Alice', 'Bob', 'Carol']);
-  takeSteps(game.display);
-  const steps: DisplayStep[] = [];
-  for (let i = 0; i < moves; i++) {
-    const actor = currentActor(game);
-    if (actor === null) break;
-    const options = legalActions(game.state, actor);
-    if (options.length === 0) break;
-    const move = options.find((o) => o.type.startsWith('switch.') && o.type !== 'switch.end');
-    if (!submit(game, move ?? options.find((o) => o.type === 'localOps.choose') ?? options[0]!)) break;
-    steps.push(...takeSteps(game.display));
-  }
-  return { steps, final: publicSnapshot(game.state) };
-}
-
-/** The baseline a queue starts from, matching what a connect push carries. */
-function baseline(seed: number): ReturnType<typeof publicSnapshot> {
-  const game = newMultiplayerGame(seed, config, ['Alice', 'Bob', 'Carol']);
-  return publicSnapshot(game.state);
-}
-
-describe('the step queue', () => {
-  it('shows the whole burst in order and lands on the real board', () => {
-    const { steps, final } = realSteps(1917398, 400);
-    assert.ok(steps.length > 30, `only ${steps.length} steps — this proved little`);
-
-    const q = createStepQueue();
-    q.reset(baseline(1917398));
-    q.push(steps);
-
-    // Run a clock forward until it settles, in 50ms ticks like a render loop would.
-    let now = 0;
-    for (let i = 0; i < 20_000 && q.busy(); i++) {
-      q.advance(now);
-      now += 50;
-    }
-    assert.equal(q.busy(), false, 'the queue never drained');
-    assert.deepEqual(q.current(), final, 'the animated board did not land on the real one');
-    assert.equal(q.showing()?.seq, steps[steps.length - 1]!.seq, 'the caption is not on the last step');
-  });
-
-  it('a burst of switching takes real time, and bookkeeping takes none', () => {
-    const { steps } = realSteps(1917398, 400);
-    const q = createStepQueue();
-    q.reset(baseline(1917398));
-
-    // Only the bookkeeping: it must all collapse into a single advance.
-    // `.end` only: `localOps.choose` became an announcement worth watching after the first real play.
-    const bookkeeping = steps.filter((s) => s.cause.endsWith('.end'));
-    assert.ok(bookkeeping.length > 10, 'not enough bookkeeping steps to prove the collapse');
-    q.push(bookkeeping);
-    q.advance(0);
-    q.advance(0);
-    assert.equal(q.busy(), false, `${bookkeeping.length} bookkeeping steps should cost no time at all`);
-
-    // And switching: each one must hold the screen.
-    const switching = steps.filter((s) => s.cause.startsWith('switch.') && s.cause !== 'switch.end');
-    assert.ok(switching.length >= 6, `only ${switching.length} switching steps found`);
-    const q2 = createStepQueue();
-    q2.reset(baseline(1917398));
-    q2.push(switching.slice(0, 6));
-    q2.advance(0);
-    assert.equal(q2.behind(), 5, 'the first is shown at once; five are still to watch');
-    q2.advance(DWELL.switching - 1);
-    assert.equal(q2.behind(), 5, 'a switching move must not be replaced early');
-    q2.advance(DWELL.switching);
-    assert.equal(q2.behind(), 4, 'and must be replaced once its dwell is up');
-  });
-
-  /**
-   * PAUSE — Jesse, playtest 2026-09-16, asking for one beside Skip.
-   *
-   * The property that matters is not "it stops", which any flag gives you. It is that a hold COSTS
-   * THE STEP NOTHING: a move paused half-way through its dwell has to resume with half a dwell left,
-   * or pausing to look at something would punish you by throwing the rest of it away the moment you
-   * let go. That is the whole assertion below, measured against `DWELL.switching` rather than a
-   * hand-picked number so it follows the tuning table.
-   */
-  it('pause holds the board where it is, and resume gives the step back the dwell it had left', () => {
-    const { steps } = realSteps(1917398, 400);
-    const switching = steps.filter((s) => s.cause.startsWith('switch.') && s.cause !== 'switch.end');
-    assert.ok(switching.length >= 6, `only ${switching.length} switching steps found`);
-
-    const q = createStepQueue();
-    q.reset(baseline(1917398));
-    q.push(switching.slice(0, 6));
-    q.advance(0);
-    assert.equal(q.behind(), 5, 'the first is shown at once; five are still to watch');
-
-    // Held half-way through the first move's dwell, and left held for ten times that long.
-    const half = DWELL.switching / 2;
-    assert.equal(q.pause(half), true);
-    assert.equal(q.paused(), true);
-    const held = q.showing()?.seq;
-    q.advance(half + 10_000);
-    assert.equal(q.behind(), 5, 'a held queue consumed a step');
-    assert.equal(q.showing()?.seq, held, 'the board moved while it was supposed to be held');
-    assert.equal(q.busy(), true, 'a held queue must still read busy, or the render loop stops');
-
-    // Resumed, the move still owes exactly the half-dwell it had left — no more, and no less.
-    const at = half + 10_000;
-    assert.equal(q.resume(at), true);
-    assert.equal(q.paused(), false);
-    q.advance(at + half - 1);
-    assert.equal(q.behind(), 5, 'the step was robbed of time it was owed while held');
-    q.advance(at + half);
-    assert.equal(q.behind(), 4, 'and it never gave way once the rest of its dwell was up');
-  });
-
-  it('refuses to hold an idle queue, and Skip lifts a hold rather than leaving it stuck', () => {
-    const q = createStepQueue();
-    q.reset(baseline(1917398));
-    assert.equal(q.pause(0), false, 'an idle queue has no playback to hold');
-    assert.equal(q.paused(), false);
-
-    const { steps } = realSteps(1917398, 400);
-    q.push(steps);
-    q.advance(0);
-    assert.equal(q.pause(10), true);
-    assert.equal(q.skip(), true, 'Skip must still work while held');
-    assert.equal(q.paused(), false, 'Skip left the queue held, with a Resume that does nothing');
-    assert.equal(q.busy(), false);
-  });
-
-  it('counts only what will be watched, so the countdown is steady', () => {
-    // The counter's whole purpose: a backlog of mostly-bookkeeping must not read as a huge number
-    // that collapses the instant it starts.
-    const { steps } = realSteps(1917398, 400);
-    const q = createStepQueue();
-    q.reset(baseline(1917398));
-    q.push(steps);
-    const behind = q.behind();
-    assert.ok(behind > 0 && behind < steps.length, `behind ${behind} of ${steps.length} queued`);
-
-    q.advance(0);
-    let ticks = 0;
-    let previous = q.behind();
-    let now = 0;
-    while (q.busy() && ticks++ < 20_000) {
-      now += 50;
-      q.advance(now);
-      const nowBehind = q.behind();
-      assert.ok(nowBehind <= previous, 'the counter must never go up while draining');
-      previous = nowBehind;
-    }
-    assert.equal(q.behind(), 0);
-  });
-
-  it('skip jumps to the real board without losing a single state on the way', () => {
-    const { steps, final } = realSteps(1917398, 400);
-    const q = createStepQueue();
-    q.reset(baseline(1917398));
-    q.push(steps);
-    q.advance(0);
-
-    assert.equal(q.skip(), true, 'there was a backlog to skip');
-    assert.equal(q.busy(), false);
-    assert.equal(q.behind(), 0);
-    // Skip applies every delta rather than jumping the chain, so the board is exact.
-    assert.deepEqual(q.current(), final, 'skipping produced a board the game was never in');
-    assert.equal(q.skip(), false, 'skipping an empty queue changes nothing');
-  });
-
-  it('pace 0 turns animation off entirely — TODO #18', () => {
-    const { steps, final } = realSteps(1917398, 400);
-    const q = createStepQueue(() => 0);
-    q.reset(baseline(1917398));
-    q.push(steps);
-    // One advance at a single instant must consume everything: nothing dwells at all.
-    q.advance(0);
-    q.advance(0);
-    assert.equal(q.busy(), false, 'with animation off, nothing may be left waiting');
-    assert.equal(q.behind(), 0, 'nothing is "behind" when nothing is being animated');
-    assert.deepEqual(q.current(), final);
-  });
-
-  it('pace scales the wait without changing the order', () => {
-    const { steps } = realSteps(1917398, 400);
-    const switching = steps.filter((s) => s.cause.startsWith('switch.') && s.cause !== 'switch.end').slice(0, 3);
-    assert.equal(switching.length, 3);
-
-    const half = createStepQueue(() => 0.5);
-    half.reset(baseline(1917398));
-    half.push(switching);
-    half.advance(0);
-    half.advance(DWELL.switching / 2);
-    assert.equal(half.behind(), 1, 'at half pace, half the dwell should have advanced one step');
-  });
-
-  it('holds the LAST step of a burst for its dwell — the v0.8.0 snap-back bug', () => {
-    /**
-     * REGRESSION. `busy()` was `pending.length > 0`, so the instant the final step of a burst was
-     * shown the queue reported idle: the animation loop stopped and the district panel snapped back
-     * to the viewer's own board without that step ever being looked at. Jesse, from the first real
-     * play on the test server: *"I briefly saw that it was the bot's office area then their turn was
-     * done and it pointed back to my office area"*, and the countdown row appeared "very briefly".
-     *
-     * The panel follows `busy()`, so this is the property that keeps somebody else's board on screen
-     * for as long as their move is being shown.
-     */
-    const { steps } = realSteps(1917398, 400);
-    const one = steps.filter((s) => s.cause === 'switch.move').slice(0, 1);
-    assert.equal(one.length, 1);
-
-    const q = createStepQueue();
-    q.reset(baseline(1917398));
-    q.push(one);
-
-    q.advance(0);
-    assert.equal(q.behind(), 0, 'nothing is queued behind it');
-    assert.equal(q.busy(), true, 'but it is still being shown, so the queue is not idle');
-
-    q.advance(DWELL.switching - 1);
-    assert.equal(q.busy(), true, 'still inside its dwell');
-
-    q.advance(DWELL.switching);
-    assert.equal(q.busy(), false, 'and idle only once its moment has passed');
-  });
-
-  it("does not spend time replaying the viewer's own moves", () => {
-    // A seated player's own board is drawn from their authoritative Frame, so they have already seen
-    // their own click. Holding it delays the thing they wanted to watch — a bot's turn.
-    const { steps } = realSteps(1917398, 400);
-    const mine = steps.filter((s) => s.player === 0 && s.cause === 'switch.move').slice(0, 3);
-    assert.equal(mine.length, 3, 'need three of seat 0\'s own moves');
-
-    const asSeat0 = createStepQueue(() => 1, () => 0);
-    asSeat0.reset(baseline(1917398));
-    asSeat0.push(mine);
-    // Twice at the same instant: the first call shows the head of the burst, the second collapses the
-    // zero-dwell run behind it. In the page that is two animation frames, ~16ms apart.
-    asSeat0.advance(0);
-    asSeat0.advance(0);
-    assert.equal(asSeat0.busy(), false, "the viewer's own moves must cost no time at all");
-    assert.equal(asSeat0.behind(), 0, 'and must never be counted as something to wait for');
-
-    // The same steps seen by somebody else are worth watching.
-    const asSpectator = createStepQueue(() => 1, () => 1);
-    asSpectator.reset(baseline(1917398));
-    asSpectator.push(mine);
-    asSpectator.advance(0);
-    assert.equal(asSpectator.busy(), true, "another seat's moves are worth showing");
-    assert.equal(asSpectator.behind(), 2);
-  });
-
-  it('a reset discards the backlog rather than merging it onto a new baseline', () => {
-    /**
-     * A reconnecting client holds steps whose deltas chain off a baseline the server has moved past.
-     * Merging them onto the new one would draw a board that never existed — and `applyPublicDelta`
-     * would throw the moment a "null means unchanged" field had nothing to merge onto.
-     */
-    const { steps, final } = realSteps(1917398, 400);
-    const q = createStepQueue();
-    q.reset(baseline(1917398));
-    q.push(steps.slice(0, 10));
-    q.advance(0);
-    assert.ok(q.busy());
-
-    q.reset(final);
-    assert.equal(q.busy(), false, 'a reset must empty the queue');
-    assert.equal(q.behind(), 0);
-    assert.deepEqual(q.current(), final);
-    // And the caption survives: a reconnect should not blank the "what just happened" line.
-    assert.ok(q.showing() !== null, 'the caption should survive a reset');
-  });
-
-  it('can always be emptied, so a player is never stranded behind it', () => {
-    /**
-     * "Your Move" is put away while the board is catching up (v0.8.0.6), which makes `busy()` the
-     * thing standing between a player and their own turn. So the ways it can be cleared matter more
-     * than they did: `skip()` must always work, from any state, including one where the clock has
-     * never advanced — which is exactly the situation a page with no `requestAnimationFrame` is in,
-     * and how this was found.
-     */
-    const { steps, final } = realSteps(1917398, 400);
-    const q = createStepQueue();
-    q.reset(baseline(1917398));
-    q.push(steps);
-    // Never advanced at all: no frame has been shown, and the queue is full.
-    assert.equal(q.busy(), true);
-    assert.equal(q.skip(), true, 'a never-advanced queue must still be skippable');
-    assert.equal(q.busy(), false, 'and must be idle afterwards, or the player stays locked out');
-    assert.deepEqual(q.current(), final);
-  });
-
-  it('draws nothing before a reset has arrived', () => {
-    const q = createStepQueue();
-    assert.equal(q.current(), null);
-    assert.equal(q.advance(0), false);
-    assert.equal(q.behind(), 0);
-    assert.equal(q.showing(), null);
-  });
-});
-
-describe('whose move the screen is showing (Gitea#25)', () => {
-  const step = (player: number | null) => ({ player }) as DisplayStep;
-  const queue = (behind: number, busy: boolean, showing: DisplayStep | null) => ({
-    behind: () => behind,
-    busy: () => busy,
-    showing: () => showing,
-  });
-
-  it('names the live actor once the board has caught up', () => {
-    assert.deepEqual(actorOnScreen(queue(0, false, step(2)), 0), { actor: 0, replaying: false });
-  });
-
-  it('names the player of the step on screen while the board is behind — not the live actor', () => {
-    // One human (seat 0) against bots: the live game already waits on seat 0 while bot 2's moves replay.
-    assert.deepEqual(actorOnScreen(queue(3, true, step(2)), 0), { actor: 2, replaying: true });
-  });
-
-  it('keeps naming the last step while it is still on screen, after the counter reaches zero', () => {
-    assert.deepEqual(actorOnScreen(queue(0, true, step(1)), 0), { actor: 1, replaying: true });
-  });
-
-  it('names nobody for an automatic phase being shown', () => {
-    assert.deepEqual(actorOnScreen(queue(2, true, step(null)), 0), { actor: null, replaying: true });
-  });
-
-  it('falls back to the live actor before any step has been shown', () => {
-    assert.deepEqual(actorOnScreen(queue(1, true, null), 3), { actor: 3, replaying: false });
-  });
-});
-
-describe('the log is held back with the board, and a changed card flashes (playtest, 2026-09-15)', () => {
-  it('owes exactly the lines of the steps not yet shown', () => {
-    const { steps } = realSteps(1917398, 400);
-    const q = createStepQueue();
-    q.reset(baseline(1917398));
-    assert.equal(q.pendingLines(), 0, 'an empty queue holds nothing back');
-
-    q.push(steps);
-    const owed = steps.reduce((n, s) => n + s.lines.length, 0);
-    assert.equal(q.pendingLines(), owed, 'every queued step still owes its lines');
-
-    // Drive the clock as a render loop would; the debt falls monotonically and ends at nothing.
-    let now = 0;
-    let last = owed;
-    for (let i = 0; i < 20_000 && q.busy(); i++) {
-      q.advance(now);
-      const left = q.pendingLines();
-      assert.ok(left <= last, 'the held-back count grew while the board caught up');
-      last = left;
-      now += 50;
-    }
-    assert.equal(q.pendingLines(), 0, 'the board caught up but lines were still withheld');
-  });
-
-  it('skipping reveals the whole log at once', () => {
-    const { steps } = realSteps(1917398, 400);
-    const q = createStepQueue();
-    q.reset(baseline(1917398));
-    q.push(steps);
-    q.skip();
-    assert.equal(q.pendingLines(), 0, 'Skip left lines withheld — the history would stay short');
-  });
-
-  it('flashes nothing on an ordinary step', () => {
-    // Realignment is rare in bot play, so this pins the quiet case: the map must not pulse at random.
-    const { steps } = realSteps(1917398, 400);
-    const q = createStepQueue();
-    q.reset(baseline(1917398));
-    q.push(steps.slice(0, 5));
-    q.advance(0);
-    assert.deepEqual(q.flashing(), [], 'a step that changed no Mainline card flashed one');
-  });
-});

test/switch-planner.test.ts

@@ -1,100 +0,0 @@
-/**
- * The switching planner (`sim/switch-planner.ts`) — the two properties it cannot be allowed to lose.
- *
- * 1. PLANNING TOUCHES NOTHING. The planner applies intents to a partial copy of the game
- *    (`forkForSwitching`) that shares everything a switching intent is not supposed to write. If a
- *    reducer ever starts writing somewhere new, the copy leaks into the real game, and this is where
- *    that shows: the game is serialised before and after planning and must not have changed.
- * 2. A PLAN IS WHAT THE ENGINE WILL DO. Every step replays through `applyIntent` on a FULL copy, and
- *    lands on the fingerprint the planner promised for it. That is what makes the partial copy
- *    trustworthy, and it is what the bot relies on to know it is still on plan.
- *
- * Taken from real seeded bot games rather than hand-built positions, because a district that
- * satisfies the track geometry by hand tests the builder as much as the planner.
- */
-
-import { describe, it } from 'node:test';
-import assert from 'node:assert/strict';
-
-import { pump } from '../src/engine/advance.ts';
-import { applyIntent } from '../src/engine/apply.ts';
-import { legalActions, legalSwitchingActions } from '../src/engine/legal.ts';
-import {
-  DEFAULT_MAX_COLLISIONS_PER_DAY,
-  DEFAULT_MAX_COLLISIONS_TOTAL,
-  MOVES_PER_LOCAL_OPS,
-  collectiveRevenueFloor,
-  lengthProfile,
-} from '../src/engine/content.ts';
-import { createGame } from '../src/engine/setup.ts';
-import type { GameConfig, GameState } from '../src/engine/state.ts';
-import { actingPlayer, turnOf } from '../src/engine/state.ts';
-import { developerBot, playGame } from '../src/sim/bot.ts';
-import { planSwitchingTurn, switchFingerprint } from '../src/sim/switch-planner.ts';
-
-const config = (): GameConfig => {
-  const days = lengthProfile('short').days;
-  return {
-    mode: 'solitaire',
-    days,
-    minCombinedRevenue: collectiveRevenueFloor(1, days),
-    maxCollisionsPerDay: DEFAULT_MAX_COLLISIONS_PER_DAY,
-    maxCollisionsTotal: DEFAULT_MAX_COLLISIONS_TOTAL,
-    pvpCardsAllowed: false,
-    optionalRules: { reducedVisibility: false, employeeRotation: false, emergencyToolbox: false },
-  };
-};
-
-const serialise = (s: GameState): string =>
-  JSON.stringify(s, (_k, v) => (v instanceof Map ? [...v] : v instanceof Set ? [...v] : v));
-
-describe('switching planner', () => {
-  it('asks for switching intents that are exactly the switching subset of legalActions, in order', () => {
-    const SWITCHING = new Set(['switch.move', 'switch.dropCars', 'switch.sortConsist', 'maneuver.flyingSwitch', 'switch.end']);
-    let compared = 0;
-    for (const seed of [1000, 8919]) {
-      const s = createGame({ id: `legal-${seed}`, seed, config: config(), playerNames: ['bot'] });
-      playGame(s, developerBot, pump, 50_000, undefined, (st) => {
-        const p = actingPlayer(st);
-        if (p === null || st.clock.phase !== 'localOps') return;
-        const all = legalActions(st, p).filter((i) => SWITCHING.has(i.type));
-        assert.deepEqual(legalSwitchingActions(st, p), all);
-        compared++;
-      });
-    }
-    assert.ok(compared > 0, 'no Local Operations decision was reached');
-  });
-
-  it('never changes the game it plans for, and every plan replays to the position it promised', () => {
-    let checked = 0;
-    let withSteps = 0;
-    for (const seed of [1000, 8919, 16838]) {
-      const s = createGame({ id: `plan-${seed}`, seed, config: config(), playerNames: ['bot'] });
-      const r = playGame(s, developerBot, pump, 50_000, undefined, (st) => {
-        const p = actingPlayer(st);
-        if (p === null || st.clock.phase !== 'localOps') return;
-        const turn = turnOf(st, p);
-        if (turn.option !== 'switch' || turn.movesRemaining !== MOVES_PER_LOCAL_OPS) return;
-
-        const before = serialise(st);
-        const plan = planSwitchingTurn(st, p, { budget: 400, beam: 16 });
-        assert.equal(serialise(st), before, `seed ${seed}: planning wrote into the real game`);
-        assert.ok(plan.score >= plan.rootScore, 'a plan is never worse than stopping where the crew stands');
-
-        const copy = structuredClone(st);
-        plan.steps.forEach((step, n) => {
-          assert.equal(switchFingerprint(copy, p), plan.keys[n], `seed ${seed}: step ${n} started off plan`);
-          const applied = applyIntent(copy, p, step);
-          assert.ok(applied.ok, `seed ${seed}: step ${n} (${step.type}) was refused by the engine`);
-        });
-        assert.equal(switchFingerprint(copy, p), plan.keys.at(-1), `seed ${seed}: the plan did not end where it said`);
-
-        checked++;
-        if (plan.steps.length > 0) withSteps++;
-      });
-      assert.ok(r.finished, `seed ${seed}: a game with the planner switched on did not finish`);
-    }
-    assert.ok(checked > 0, 'no switching turn was reached, so nothing was tested');
-    assert.ok(withSteps > 0, 'every plan was empty, so replay was never exercised');
-  });
-});

test/tally.test.ts

@@ -1,218 +0,0 @@
-/**
- * THE EVENT TALLY — Gitea#16's statistics, and the one property they depend on.
- *
- * "I don't know if we keep statistics on…" is the question the issue opens with. Nothing was being
- * kept; `GameState.tally` now is, folded from the event stream at the two places every event passes
- * through (`engine/tally.ts` explains which and why).
- *
- * The property that matters is EXACTLY ONCE. A statistic folded twice reads high and a statistic
- * folded nowhere reads zero, and both are indistinguishable from a quiet game when you are looking
- * at a results screen. So the central test here does not assert particular numbers: it plays real
- * games, collects every event the engine emitted along the way, counts them independently, and
- * checks the tally against that count. A fold hooked in the wrong place fails it whatever the seed.
- */
-
-import { describe, it } from 'node:test';
-import assert from 'node:assert/strict';
-
-import { advance } from '../src/engine/advance.ts';
-import { tallyEvent } from '../src/engine/tally.ts';
-import { applyIntent } from '../src/engine/apply.ts';
-import { STAGES_PER_DAY } from '../src/engine/content.ts';
-import { legalActions } from '../src/engine/legal.ts';
-import { createGame } from '../src/engine/setup.ts';
-import { developerBot } from '../src/sim/bot.ts';
-import type { GameEvent } from '../src/engine/events.ts';
-import type { GameConfig, GameState } from '../src/engine/state.ts';
-
-const baseConfig = (over: Partial<GameConfig> = {}): GameConfig => ({
-  mode: 'solitaire',
-  days: 3,
-  minCombinedRevenue: 0,
-  maxCollisionsPerDay: 0,
-  maxCollisionsTotal: 0,
-  pvpCardsAllowed: false,
-  optionalRules: { reducedVisibility: false, employeeRotation: false, emergencyToolbox: false },
-  ...over,
-});
-
-/** Plays a whole game with the developer bot, keeping every event the engine produced. */
-function playKeepingEvents(
-  seed: number,
-  over: Partial<GameConfig> = {},
-  names = ['Jesse'],
-): { state: GameState; events: GameEvent[] } {
-  const state = createGame({ id: 'g', seed, config: baseConfig(over), playerNames: names });
-  const events: GameEvent[] = [];
-  for (let i = 0; i < 20_000; i++) {
-    const r = advance(state);
-    events.push(...r.events);
-    if (state.status === 'finished') break;
-    if (!r.needsInput) continue;
-
-    // The bot declines an extension, so this terminates on the timetable it was dealt (Gitea#11).
-    const actor =
-      state.status === 'awaitingExtension'
-        ? state.extensionVotes.findIndex((v) => v === null)
-        : state.clock.pendingDecision !== null
-          ? state.clock.superintendent
-          : state.clock.currentActor;
-    if (actor === null || actor < 0) break;
-    const options = legalActions(state, actor);
-    if (options.length === 0) break;
-    const applied = applyIntent(state, actor, developerBot.choose(state, actor, options));
-    if (!applied.ok) break;
-    events.push(...applied.events);
-  }
-  return { state, events };
-}
-
-/** Counts events the way `tally.ts` should have, without sharing any of its code. */
-function countIndependently(events: GameEvent[]) {
-  let sum = 0;
-  const n = (type: GameEvent['type']): number => events.filter((e) => e.type === type).length;
-  for (const e of events) {
-    if (e.type === 'carsCoupled' || e.type === 'carsDropped') sum += e.stock.length;
-  }
-  return {
-    trainsCompleted: n('trainCompleted'),
-    loadsCompleted: n('loadCompleted'),
-    unloadsCompleted: n('unloadCompleted'),
-    loadsStarted: n('loadStarted'),
-    unloadsBegun: n('unloadBegan'),
-    passengersBoarded: n('passengersBoarded'),
-    passengersDetrained: n('passengersDetrained'),
-    cardsDrawn: n('cardDrawn'),
-    cardsPlayed: n('cardPlayed'),
-    cardsDiscarded: n('cardDiscarded'),
-    officeUpgrades: n('officeUpgraded'),
-    flyingSwitches: n('flyingSwitch'),
-    extrasStarted: n('extraStarted'),
-    secondSections: n('secondSectionOrdered'),
-    trainsHeld: n('trainHeld'),
-    trainsDiverted: n('trainDiverted'),
-    expediteFaults: n('expediteFault'),
-    facilitiesUnjammed: n('facilityUnjammed'),
-    dispatchBonusesUsed: n('dispatchBonusUsed'),
-    clearancesRequested: n('clearanceRequested'),
-    switchedCars: sum,
-  };
-}
-
-describe('the tally counts every event exactly once (Gitea#16)', () => {
-  for (const seed of [1, 7, 42, 116956197]) {
-    it(`agrees with an independent count of the event stream — seed ${seed}`, () => {
-      const { state, events } = playKeepingEvents(seed);
-      const want = countIndependently(events);
-      const t = state.tally;
-
-      assert.equal(t.trainsCompleted, want.trainsCompleted, 'trains through the Division');
-      assert.equal(t.loadsCompleted, want.loadsCompleted, 'loads made up');
-      assert.equal(t.unloadsCompleted, want.unloadsCompleted, 'loads broken');
-      assert.equal(t.loadsStarted, want.loadsStarted, 'loads started');
-      assert.equal(t.unloadsBegun, want.unloadsBegun, 'unloads begun');
-      assert.equal(t.passengersBoarded, want.passengersBoarded, 'passengers boarded');
-      assert.equal(t.passengersDetrained, want.passengersDetrained, 'passengers detrained');
-      assert.equal(t.cardsDrawn, want.cardsDrawn, 'cards drawn');
-      assert.equal(t.cardsPlayed, want.cardsPlayed, 'cards played');
-      assert.equal(t.cardsDiscarded, want.cardsDiscarded, 'cards discarded');
-      assert.equal(t.officeUpgrades, want.officeUpgrades, 'offices upgraded');
-      assert.equal(t.flyingSwitches, want.flyingSwitches, 'flying switches');
-      assert.equal(t.extrasStarted, want.extrasStarted, 'extras started');
-      assert.equal(t.secondSections, want.secondSections, 'second sections');
-      assert.equal(t.trainsHeld, want.trainsHeld, 'trains held');
-      assert.equal(t.trainsDiverted, want.trainsDiverted, 'trains diverted');
-      assert.equal(t.expediteFaults, want.expediteFaults, 'expedite faults');
-      assert.equal(t.facilitiesUnjammed, want.facilitiesUnjammed, 'facilities unjammed');
-      assert.equal(t.dispatchBonusesUsed, want.dispatchBonusesUsed, 'dispatch bonuses');
-      assert.equal(t.clearancesRequested, want.clearancesRequested, 'clearances requested');
-      assert.equal(t.carsCoupled + t.carsDropped, want.switchedCars, 'cars switched');
-    });
-  }
-
-  it('actually counted something — a tally of zeroes would pass the check above vacuously', () => {
-    // The trap `stats.ts` warns about in its own doc comment: "this never happened" is a finding,
-    // not something to scroll past. A fold hooked nowhere at all agrees perfectly with an
-    // independent count of an event stream nobody looked at, so the exactly-once tests above cannot
-    // catch it on their own.
-    //
-    // ASSERTED ON WHAT THE DEVELOPER BOT ACTUALLY DOES, which is not much: `node src/sim/harness.ts
-    // 12 standard` means 1.1 Revenue per game at an 8% freight share and loses every game on the
-    // revenue floor, and it goes whole games without coupling a single car. That is a known
-    // property of the bot (TODO.md, Bot Performance) and not this fold's business — so this test
-    // asserts on traffic and cards, which happen in every game, rather than on switching, which
-    // would make it a bot-strength test wearing a statistics test's clothes.
-    const { state, events } = playKeepingEvents(1);
-    assert.ok(events.length > 500, `only ${events.length} events — the game barely ran`);
-    assert.ok(state.tally.cardsDrawn > 0, 'no cards were drawn all game');
-    assert.ok(state.tally.trainsCompleted > 0, 'no train ever left the Division');
-    assert.ok(state.tally.cardsPlayed > 0, 'no card was ever played');
-  });
-
-  it('splits Revenue into what was earned and what was given back', () => {
-    // Reconciliation is the real assertion and it holds for any game, earned or not: gained minus
-    // lost IS the score the engine kept. Seed 44 is named because it is one where Revenue actually
-    // moves in both directions — it earns 1 and gives back 5 to a collision — so the two halves are
-    // being told apart rather than both sitting at zero.
-    //
-    // It was seed 42 until v0.8.0.10. That game's collision was the Superintendent holding a train over
-    // one BEHIND it (Gitea#26); with the ruling gone the collision is too, and seed 42 now earns 5 and
-    // loses nothing — a better game and a vacuous test. The seed moved, not the assertion.
-    for (const seed of [1, 7, 44]) {
-      const { state } = playKeepingEvents(seed);
-      const me = state.tally.byPlayer[0]!;
-      assert.equal(
-        me.revenueGained - me.revenueLost,
-        state.players[0]!.revenue,
-        `seed ${seed}: gained minus lost does not reconcile with the score the engine kept`,
-      );
-    }
-    const { state } = playKeepingEvents(44);
-    const me = state.tally.byPlayer[0]!;
-    assert.ok(me.revenueGained > 0, 'seed 44 earned nothing — the gained half is not being counted');
-    assert.ok(me.revenueLost > 0, 'seed 44 lost nothing — the lost half is not being counted');
-  });
-
-  it('records a Circus set-up as the one-off it is, not as a streak', () => {
-    /**
-     * `trainStoodStill` is NOT "this train did not move this Stage". It fires only for a train whose
-     * profile sets `stopEarnsPoint` — the X18 Circus — and `advance.ts` claims it once per train
-     * with `stopPointClaimed`, so it can never fire twice for the same one.
-     *
-     * Gitea#16 asks for "longest engine sat on a siding" and its comment assumed this event would
-     * answer it. It cannot, and a streak folded from it would have read "1 Stage" for ever. Pinned
-     * here so that the day a real per-Stage signal is added, whoever adds it finds this test rather
-     * than the old wrong assumption.
-     */
-    const s = createGame({ id: 'g', seed: 1, config: baseConfig(), playerNames: ['Jesse'] });
-    const feed = (e: GameEvent): void => tallyEvent(s, e);
-    feed({ type: 'trainStoodStill', trainNumber: 18, where: '(0,0)' });
-    assert.deepEqual(s.tally.circusStops, [{ trainNumber: 18, where: '(0,0)' }]);
-    assert.ok(!('longestStand' in s.tally), 'a streak that cannot be computed is being reported');
-  });
-});
-
-describe('the official result freezes the tally with it (Gitea#11 + #16)', () => {
-  it('records the statistics as they stood when the timetable ran out', () => {
-    const { state } = playKeepingEvents(1);
-    assert.ok(state.official, 'no official result was recorded');
-    // Nothing was played after the ending in this game, so the two agree — which is the check that
-    // the freeze happens AFTER the last batch of events is folded rather than before it.
-    assert.equal(state.official!.tally.trainsCompleted, state.tally.trainsCompleted);
-    assert.ok(state.official!.tally.cardsDrawn > 0, 'the frozen tally is empty');
-  });
-
-  it('keeps the frozen copy still while the live tally moves on', () => {
-    const s = createGame({ id: 'g', seed: 1, config: baseConfig(), playerNames: ['Jesse'] });
-    s.clock.day = s.config.days + 1;
-    s.clock.stage = STAGES_PER_DAY;
-    s.clock.phase = 'shiftChange';
-    advance(s);
-    const frozen = s.official!.tally.cardsDrawn;
-
-    applyIntent(s, 0, { type: 'game.extend', player: 0, agree: true });
-    tallyEvent(s, { type: 'cardDrawn', player: 0, source: 'homeOffice', cardId: 'x' });
-    assert.equal(s.tally.cardsDrawn, frozen + 1, 'the live tally did not move');
-    assert.equal(s.official!.tally.cardsDrawn, frozen, 'the frozen tally moved with it');
-  });
-});

test/track.test.ts

@@ -128,8 +128,8 @@ function gameWith(area: OfficeArea): GameState {
   const s = createGame({
     id: 'g', seed: 5,
     config: {
-      mode: 'solitaire', days: 5, minCombinedRevenue: 0, maxCollisionsPerDay: 0, maxCollisionsTotal: 0, pvpCardsAllowed: false,
-      optionalRules: { reducedVisibility: false, employeeRotation: false, emergencyToolbox: false },
+      mode: 'solitaire', victory: 'highestAfterDays', length: 'standard',
+      optionalRules: { reducedVisibility: false, sisterTrains: false, employeeRotation: false, emergencyToolbox: false },
     },
     playerNames: ['p'],
   });
@@ -540,100 +540,6 @@ describe('placement and drop-off', () => {
     assert.ok(!canPlaceAt(area, at(-1, 1), straight()), 'an east-west straight cannot meet a 45° leg');
   });
 
-  describe('a rail that stops dead against its neighbour (Gitea#15)', () => {
-    /**
-     * REPORTED, THEN REVERSED. The issue first read "if a card is placed in that space, it MUST
-     * connect", against a right-hand curve laid at (1,-1) with an Ice House above it and a turnout
-     * with a north-facing leg below. **RAR reviewed it and ruled the other way (2026-08-26): the
-     * placement is fine, and a stub like that has a use — a siding to park cars on.**
-     *
-     * "We need to confirm, however, that trains are not allowed to traverse from the turnout below
-     * to that right-hand curve since the tracks do not connect." That is what these tests are: the
-     * rule lives in MOVEMENT, not in placement.
-     *
-     * The save cannot carry this any more — Gitea#14 took the deck from 206 cards to 121, so its
-     * card ids no longer exist and the history stops at the first `card.play`. The geometry is what
-     * mattered, and it is rebuilt here directly.
-     */
-    /** A Modifier card — an Ice House. Not track: no ports on any edge. */
-    const modifierCard = (): TrackCard => ({
-      geometry: { kind: 'modifier', modifier: 'iceHouse' },
-      baseOperationalRail: false,
-      standing: [],
-      standingWest: 0,
-      facility: null,
-      modifiers: [],
-      enhancements: [],
-    });
-
-    /** A Grocer's Warehouse — a Facility, so a plain east-west through track. */
-    const warehouse = (): TrackCard => ({
-      geometry: { kind: 'facility', facility: 'grocersWarehouse' },
-      baseOperationalRail: true,
-      standing: [],
-      standingWest: 0,
-      facility: null,
-      modifiers: [],
-      enhancements: [],
-    });
-
-    /**
-     * The reported district. `withCurve` puts the disputed right-hand curve on the square; without
-     * it, the square is empty and the placement itself is under test.
-     *
-     * The turnout's leg goes NORTH on the `nw_se` diagonal; the curve is `ne`, which is `ne_sw` and
-     * has no south port at all. Two reasons the two do not join, either of which is enough.
-     */
-    const board = (withCurve: boolean): OfficeArea =>
-      areaFrom(
-        {
-          [coordKey(at(0, -1))]: turnout({ stem: 'w', through: 'e', diverge: 'n' }),
-          [coordKey(at(0, 0))]: officeCard(),
-          [coordKey(at(1, 0))]: warehouse(),
-          [coordKey(at(2, -1))]: modifierCard(),
-          ...(withCurve ? { [coordKey(at(1, -1))]: curve('ne') } : {}),
-        },
-        at(0, 0),
-      );
-
-    it('allows the reported placement, which connects on one side and nothing else', () => {
-      // RAR's ruling. The curve joins the warehouse to its east; its north leg faces an Ice House
-      // that carries no rail, and the turnout below faces its portless south edge. All legal.
-      assert.ok(canPlaceAt(board(false), at(1, -1), curve('ne')), 'the reported play was refused');
-    });
-
-    it('will not let a train cross from the turnout below onto that curve', () => {
-      // The confirmation the issue actually asks for. Running west out of the Office and into the
-      // turnout, the 45° leg goes north — and stops at the curve's blank south edge.
-      const dests = reachableDestinations(ctxFor(board(true)), at(0, 0), 'w');
-      assert.ok(!has(dests, 1, -1), 'a train drove across rails that do not meet');
-    });
-
-    it('still reaches the curve from the side that DOES join', () => {
-      // Otherwise the test above would pass on a card that is simply unreachable, which proves
-      // nothing. East of the curve is the warehouse, and east-west edges always meet.
-      const dests = reachableDestinations(ctxFor(board(true)), at(1, 0), 'w');
-      assert.ok(has(dests, 1, -1), 'the curve was unreachable from the side that joins');
-    });
-
-    it('will not let a train cross a north edge onto a card with no rail at all', () => {
-      // The Ice House above. A Modifier is scenery beside the rails — Jesse confirmed a rail may
-      // point at a building — so what stops a train is the same `joins` test, not a placement rule.
-      const dests = reachableDestinations(ctxFor(board(true)), at(1, 0), 'w');
-      assert.ok(!has(dests, 2, -1), 'a train drove into an Ice House');
-    });
-
-    it('still allows an exit that faces a BLANK square', () => {
-      // Unchanged by the reversal, and the reason a district can grow at all: a turnout laid on the
-      // Running Track with nothing yet beside its diverging leg is a perfectly good play.
-      const area = areaFrom({ [coordKey(at(0, 0))]: officeCard() }, at(0, 0));
-      assert.ok(
-        canPlaceAt(area, at(0, 1), turnout({ stem: 'w', through: 'e', diverge: 'n' })),
-        'a turnout whose leg faces open space was refused',
-      );
-    });
-  });
-
   it('refuses a card that connects to nothing', () => {
     const area = areaFrom({ [coordKey(at(0, 0))]: officeCard() }, at(0, 0));
     assert.ok(!canPlaceAt(area, at(3, 3), straight()), 'orphaned track is never legal');
@@ -657,16 +563,6 @@ describe('placement and drop-off', () => {
     assert.ok(canDropCarsAt(area, at(0, 1)), 'ordinary Operational Rail');
   });
 
-  it('allows a coach, and only a coach, to be dropped at the Office (v0.5.0 §A.4 exception)', () => {
-    const area = areaFrom(
-      { [coordKey(at(0, 0))]: officeCard(), [coordKey(at(0, 1))]: straight() },
-      at(0, 0),
-    );
-    assert.ok(!canDropCarsAt(area, at(0, 0), 1, false), 'not asking for the coach exception');
-    assert.ok(canDropCarsAt(area, at(0, 0), 1, true), 'one coach');
-    assert.ok(canDropCarsAt(area, at(0, 0), 2, true), 'more than one coach');
-  });
-
   it('forbids dropping cars on a locked industry track', () => {
     const area = areaFrom(
       {

test/train-rules.test.ts

@@ -19,12 +19,9 @@ import { trainRules } from '../src/sim/view.ts';
 
 const config: GameConfig = {
   mode: 'solitaire',
-  days: 5,
-  minCombinedRevenue: 0,
-  maxCollisionsPerDay: 0,
-  maxCollisionsTotal: 0,
-  pvpCardsAllowed: false,
-  optionalRules: { reducedVisibility: false, employeeRotation: false, emergencyToolbox: false },
+  victory: 'highestAfterDays',
+  length: 'standard',
+  optionalRules: { reducedVisibility: false, sisterTrains: false, employeeRotation: false, emergencyToolbox: false },
 };
 const game = (seed = 5): GameState => createGame({ id: 'g', seed, config, playerNames: ['p'] });
 const at = (row: number, col: number): GridCoord => ({ row, col });
@@ -49,9 +46,9 @@ function switching(
 ): string {
   const area = areaOf(s, 0);
   const office = area.officeCoord;
-  // The crew stands one square west of the Office and works westward, away from the Office square's
-  // own special-cased drop rule (§A.4 forbids everything but a coach there, v0.5.0) — tests that want
-  // that exception exercise it directly instead.
+  // The crew stands one square west of the Office and works westward. It may NOT stand on the Office
+  // itself: §A.4 forbids leaving Rolling Stock on the Office track, so every drop there is refused
+  // whatever the train's own card says.
   const here = { row: office.row, col: office.col - 1 };
   area.grid.set(coordKey(here), straight());
   area.grid.set(coordKey({ row: office.row, col: office.col - 2 }), straight(westCars));
@@ -224,41 +221,6 @@ describe('§7 — the Local keeps its coach (trains 7/8)', () => {
     switching(s, 9, false, [boxcar(), coach()]);
     assert.equal(check(s, 0, { type: 'switch.dropCars', trayId: 't', count: 1 }), null);
   });
-
-  it('may set the coach out at the Office — the one place §A.4 now allows it (v0.5.0)', () => {
-    const s = game();
-    const area = areaOf(s, 0);
-    const office = area.officeCoord;
-    s.trays.set('t', {
-      id: 't',
-      trainNumber: 7,
-      trainIsExtra: false,
-      engineAt: 0,
-      consist: [boxcar(), coach()],
-      direction: 'west',
-      facing: 'w',
-      position: { at: 'grid', seat: 0, coord: office },
-      movesUsed: 0,
-    });
-    s.clock.phase = 'localOps';
-    s.clock.currentActor = 0;
-    turnOf(s, 0).option = 'switch';
-    turnOf(s, 0).movesRemaining = 6;
-
-    assert.equal(
-      check(s, 0, { type: 'switch.dropCars', trayId: 't', count: 1 }),
-      null,
-      'the coach may be cut loose at the Office',
-    );
-    assert.ok(applyIntent(s, 0, { type: 'switch.dropCars', trayId: 't', count: 1 }).ok);
-    const officeCard = area.grid.get(coordKey(office))!;
-    assert.deepEqual(
-      officeCard.standing.map((c) => c.type),
-      ['coach'],
-      'the coach is parked on the Office card',
-    );
-    assert.equal(s.trays.get('t')!.consist.length, 1, 'the coach left the tray');
-  });
 });
 
 describe('§7 — trains Porters may not work', () => {