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

@@ -8,13 +8,25 @@ Thumbs.db
 *.swp
 
 # Dependencies / build output
-node_modules/
+#
+# NO TRAILING SLASH on node_modules, deliberately. `node_modules/` matches a directory and not a
+# SYMLINK of that name — so one pointing at a shared install was committed in v0.4.7, and because it
+# pointed at a path that does not exist, a fresh checkout had no TypeScript: `npm run typecheck` said
+# "tsc: not found" and 20 tests failed for a reason that had nothing to do with the code.
+node_modules
 dist/
 build/
 target/
 __pycache__/
 *.pyc
 
+# Claude Code's own state — session checkpoints and the git worktrees it works in.
+#
+# NOT ignored until now, so `git add -A` in the repo root would have staged
+# `.claude/worktrees/`: a whole second checkout of this repository, committed into itself. Nothing
+# in here is a source file and none of it should travel with the package.
+.claude/
+
 # Env
 .env
 .env.local

README.md

@@ -10,22 +10,29 @@ train into an occupied Subdivision. Get that wrong and two trains meet at speed.
 
 ## Status
 
-**v0.3.1 — solitaire is playable in a browser.** The whole game runs client-side: the engine is pure,
+**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.
 
-- **Rules** — fully specified. Ten gaps in the original prototype rules found and resolved.
+- **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** — six documents, including a 20-component build plan.
+- **Architecture** — seven documents, including a 20-component build plan and the multiplayer plan.
 - **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** — multiplayer (the engine runs 2–5 player games and the bot plays them, but there is
+- **Not built** — the multiplayer server (Phases 0 and 1 of the plan are done: seat and player are
-  no server, no turn submission and no per-player view), the 22 opponent-directed cards, and real
+  separate, turn state is per player, and the page talks to a `Session` rather than to the engine, so
-  audio.
+  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.
 
-Balance is *not* where it should be: the developer bot averages 7.0 Revenue against a target of 20 —
+Balance is *not* where it should be: the developer bot averaged 7.0 Revenue against a target of 20 —
-of which ~5.4 is the "one Revenue per train that clears your section" rule, so the working freight
+of which ~5.4 was the "one Revenue per train that completes its run" rule, so the working freight and
-and passenger economy is still only ~2. `TODO.md` says why, and says which of it is the bot and which
+passenger economy is still only ~2. That rule is now a **setting that defaults to off**, along with
-is the deck.
+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.
@@ -93,18 +100,35 @@ is the thing this machinery exists to prevent.
 - **It has two entry points, not one.** `apply(state, intent)` for player actions, and
   `advance(state)` for everything the game does on its own — Mainline movement, collisions, the Stage
   clock, Superintendent rotation.
-- **State is `fold(events)`.** The event log is the source of truth, which is what gives reconnection,
+- **The canonical record is the seed plus the intents.** A game is `{ seed, history: Intent[] }` and
-  restart recovery and post-game replay from a single decision.
+  `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
+  fourteen of the forty-six event types are never reduced. Anything that needs to rebuild a game
+  replays the intents.
 - **Never call `Math.random()`.** One ambient random call silently breaks replay.
 - **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 one exception is setup: track is shuffled separately and
+  industry or train you drew instead. The opening hand is the exception, and it is now **chosen when
-  each player is dealt **3 track + 3 other**, with the leftover track shuffled back in afterwards.
+  the game is dealt**: three random cards (the default, and the prototype rule), six random cards, or
-  You therefore open holding six against a limit of three, and the first turn is spent choosing.
+  three track and three other from two separately shuffled piles. The last of those is the only one
-  Provisional — see `TODO.md`.
+  that guarantees you a district to build; deal six and you open over the limit of three, so the
-- **Clearing the line scores.** Every train highballed out of your Office earns one Revenue, paid
+  first turn is spent choosing. See `TODO.md`.
-  once. It is worth +5.4 a game, more than the entire freight and passenger economy put together,
+- **What the work pays is a setting too.** Passenger revenue per coach, freight revenue per load and
-  and it pays for traffic you do not have to work. Also provisional.
+  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
+  third pays every player when a train runs off the end of the Division and **defaults to 0**: at 1
+  it was worth more than the entire freight and passenger economy put together, for traffic nobody
+  has to work. A seed alone therefore no longer names a game — the settings ride in the URL beside
+  it, and every save records the rules it was dealt under.
+- **A load may not be broken in the district that made it.** Freight or passengers loaded anywhere in
+  an Office Area cannot be unloaded anywhere in that same Office Area — not at another facility, not
+  in a later Stage. A train has to carry them to a different district first. The printed game turns
+  the chip upside down in the tray; here the load carries the seat that made it (`RollingStock.origin`
+  in `src/engine/state.ts`) and it never expires. Without it a Freight House could unload the boxcar
+  its own Laborers had just loaded and a platform could detrain the passengers it had just boarded,
+  each paying Revenue at both ends for a load that went nowhere: worth **0.60 ± 0.10 Revenue a game**
+  to the developer bot over 400 paired deals, on 78 of them.
 - **A turnout can be laid on top of a card already down.** It upgrades a straight at any rotation, or
   a curve whose arc matches its own diverging leg — both strict port supersets of what they replace,
   so an upgrade can never sever an existing join. Without it a district could only hang off track that

docs/StationMaster-Components-v0.4.5.md

@@ -0,0 +1,58 @@
+# Station Master — Components and Markers
+
+**Rules implementation reference: v0.4.5**  
+**Scope:** non-card physical components and supplies modeled by the v0.4.5 game. Card-created facilities, workers, deck piles, hand state, timetable state, and other markers are documented with their cards or in the rules book.
+
+## Rolling stock
+
+Rolling stock has a type and a load state. In the interface, coloured cars are loaded and white cars are empty. The Division Yard starts with the following supply.
+
+| Type | Loaded | Empty | Total | Use |
+| --- | ---: | ---: | ---: | --- |
+| Coach | 8 | 8 | 16 | Passenger work. |
+| Boxcar | 10 | 10 | 20 | Freight House outbound/inbound; Grocer’s Warehouse inbound. |
+| Hopper | 8 | 8 | 16 | Mine Tipple outbound; Power Plant inbound. |
+| Reefer | 5 | 5 | 10 | Packing Sheds outbound; Grocer’s Warehouse inbound. |
+| Tank car | 6 | 6 | 12 | Refinery outbound; Power Plant inbound. |
+| Caboose | 6 | 0 | 6 | Required or permitted at the rear of the applicable train cards. |
+| **Total** | **43** | **35** | **78** | |
+
+The engine is not rolling stock and does not count against the four-car Crew Tray limit.
+
+## The two yards
+
+### Division Yard
+
+The Division Yard is the active supply. It provides:
+
+- loaded cars to a Freight Agent stocking a green outbound box;
+- empty cars for building up trains;
+- an empty coach when passengers detrain; and
+- an empty matching freight car when a loaded freight car begins unloading.
+
+When a train completes a run or is destroyed, its caboose returns to the Division Yard. When a car is taken from the Division Yard and that yard has become entirely empty, every car from the Classification Yard moves back into the Division Yard immediately.
+
+### Classification Yard
+
+The Classification Yard collects used rolling stock: cars displaced by boarding passengers, cars cleared from inbound red boxes, cars removed by unjamming a facility, ordinary cars from completed or destroyed trains, and empty cars replaced by a completed outbound freight load. It is not a player-selectable source. It returns to service only when the Division Yard is empty.
+
+## Crew Trays and trains
+
+Crew Trays represent an engine and its coupled consist. The game creates **players + 3** free trays at setup. A tray is scarce: a due train without a free tray is held for that Stage, and Extras wait until one becomes free.
+
+Within a tray, the engine can pull, push, or be between cars while switching. To depart an Office for the Mainline, it must be made up with the engine at an outer end; if it has a caboose, the caboose must be at the opposite outer end. A train may have at most four cars. A scheduled train can run under-strength but never with more than its card allows.
+
+## Fedora
+
+The **Fedora** is the physical marker for the Superintendent. The player with it resolves following-train clearance decisions and takes the 5-Revenue penalty for a Mainline collision caused by an unsafe clearance. The initial holder is the first player tied for the highest Superintendent setup D12 roll. The Fedora passes to the next seat to the left at each third-stage shift change.
+
+## D12 and seeded randomness
+
+The D12 is used by the engine for:
+
+- the initial seating roll in a multi-player engine game;
+- the initial Superintendent roll;
+- a timetabled train’s timetable slot; and
+- all shuffled deck order and automatic setup selection through the same seeded random stream.
+
+The rules engine uses a deterministic 32-bit seeded random generator. The same numeric seed, player configuration, house rules, and accepted intent sequence reconstruct the same game. A seed by itself is not enough when house rules differ.

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

@@ -0,0 +1,162 @@
+# Station Master — Home Deck
+
+**Rules implementation reference: v0.4.5**  
+**Scope:** every card associated with the Home Office deck, including cards catalogued in the source but deliberately excluded from the dealt deck.
+
+## Dealt card catalogue
+
+The live Home Office deck contains **213 cards** in every currently supported mode. The rules for its setup, drawing, discarding, reshuffling, and hand limit are in the rules book, section 4.2.
+
+| Active category | Cards |
+| --- | ---: |
+| Track | 96 |
+| Office upgrades | 14 |
+| Freight facilities | 27 |
+| Facility modifiers | 23 |
+| Train cards | 22 |
+| Enhancements | 18 |
+| Mainline modifiers | 7 |
+| Maneuvers | 6 |
+| **Total dealt** | **213** |
+
+The catalogue also contains 12 space-use cards and 10 action cards. All 22 are excluded from every v0.4.5 dealt deck because their opponent-directed play rules are not implemented. They are listed at the end of this document for completeness.
+
+## Track cards — 96
+
+Track cards are ordinary Home Office cards, not a separate personal supply. A placed card must connect to existing rail. The Running Track is the horizontal row from Limit to Limit; cards there must carry an east–west through route. Placing track on a Limit extends the Running Track and moves that Limit outward.
+
+| Card | Copies | Implemented placement facts |
+| --- | ---: | --- |
+| Straight track | 32 | East–west Operational Rail. |
+| Curved track, right | 16 | A 45° curve; can rotate 180°, but cannot flip. Right-hand geometry is fixed to the `ne_sw` diagonal. |
+| Curved track, left | 16 | A 45° curve; can rotate 180°, but cannot flip. Left-hand geometry is fixed to the `nw_se` diagonal. |
+| Turnout, right | 16 | East–west through route plus one 45° branch. It may be passed through but is not Operational Rail, so a train cannot end a Move on it. |
+| Turnout, left | 16 | Same operational rules; opposite fixed diagonal. |
+| Sharp curved track, right | 0 | Catalogued but not dealt. |
+| Sharp curved track, left | 0 | Catalogued but not dealt. |
+
+A turnout may upgrade an existing straight, or a curve whose arc is exactly the turnout’s diverging arc. An upgrade is forbidden if the existing card holds standing cars or an enhancement. All other occupied squares are unavailable.
+
+## Offices — 14
+
+Every player begins at a Whistle Post, which is not drawn from the deck. Office cards are upgrades and must be played in sequence; they upgrade the existing Office rather than replacing its card or attached track.
+
+| Card | Copies | A/D tracks | Porters | Passenger outbound/inbound slots | Other effect |
+| --- | ---: | ---: | ---: | ---: | --- |
+| Depot | 8 | 2 | 1 | 1 / 1 | Becomes a Control Point and Passenger Facility. |
+| Station | 4 | 3 | 2 | 2 / 2 | Upgrade Depot only; Control Point and Passenger Facility. |
+| Terminal | 2 | 4 | 3 | 3 / 3 | Upgrade Station only; Control Point and Passenger Facility. |
+
+The Whistle Post has one A/D track, no porters, and no passenger slots. An Office upgrade preserves modifiers already applied to it.
+
+## Freight facilities — 27
+
+An industry may be placed only on a connected straight stub off the Running Track. Each facility begins with one Laborer and a three-box MEN | AT | WORK freight pipeline. Its industry track has capacity equal to its base outbound plus inbound capacity, with a minimum of one car.
+
+No Office Area may contain a duplicate industry, or both ends of a listed lockout pair.
+
+| Card | Copies | Cars handled | Flow | Base boxes | Lockout in same Office Area |
+| --- | ---: | --- | --- | --- | --- |
+| Freight House | 6 | Boxcar | Outbound and inbound | 1 out / 1 in | Freight House; Grocer’s Warehouse |
+| Mine Tipple | 6 | Hopper | Outbound | 1 out / 0 in | Power Plant |
+| Refinery | 3 | Tank car | Outbound | 1 out / 0 in | Power Plant |
+| Power Plant | 6 | Hopper or tank car | Inbound | 0 out / 1 in | Mine Tipple; Refinery |
+| Packing Sheds | 3 | Reefer | Outbound | 1 out / 0 in | Grocer’s Warehouse |
+| Grocer’s Warehouse | 3 | Boxcar or reefer | Inbound | 0 out / 1 in | Packing Sheds; Freight House |
+
+## Facility modifiers — 23
+
+A modifier occupies an empty square adjacent to an eligible facility. It is unique by modifier type within an Office Area. The implementation attaches it permanently to the first eligible adjacent facility found; it does not implement a per-Stage choice when one modifier touches more than one possible facility.
+
+`+ out` adds green outbound capacity only where the host can load; `+ in` adds red inbound capacity only where the host can unload. A capacity increase at a freight facility also lengthens its industry track by the usable number of added slots. Worker increases always apply.
+
+| Modifier | Copies | Eligible host | Actual grant |
+| --- | ---: | --- | --- |
+| Waiting Area | 3 | Any Office | +1 outbound passenger slot; +1 Porter |
+| Restaurant | 2 | Any Office | +1 outbound passenger slot; +1 Porter |
+| Hotel | 1 | Any Office | +1 outbound passenger slot; +1 Porter |
+| Truck Dock | 2 | Freight House, Packing Sheds, Grocer’s Warehouse | +1 **inbound** slot; no Laborer |
+| Railroad Express Agency | 1 | Freight House | +1 outbound slot; +1 Laborer |
+| Forklifts | 2 | Freight House, Packing Sheds | +1 outbound slot; +1 Laborer |
+| Prep Plant | 1 | Mine Tipple | +1 outbound slot; +1 Laborer |
+| Coal Piles | 1 | Mine Tipple | +1 outbound slot; +1 Laborer |
+| Conveyor Belts | 1 | Mine Tipple | +1 outbound slot; +1 Laborer |
+| Pipelines | 1 | Refinery | +1 outbound slot; +1 Laborer |
+| Oil Depot | 1 | Refinery | +1 outbound slot; +1 Laborer |
+| Viscosity Breakers | 1 | Refinery | +1 outbound slot; +1 Laborer |
+| Transmission Lines | 1 | Power Plant | +1 Laborer |
+| Rotary Dumps | 1 | Power Plant | +1 Laborer |
+| Steam Turbines | 1 | Power Plant | +1 Laborer |
+| Ice House | 2 | Packing Sheds or Grocer’s Warehouse | +1 outbound slot; +1 Laborer |
+| Local Small Groceries | 1 | Grocer’s Warehouse | +1 Laborer |
+
+A bonus beside a facility that cannot use its direction is not usable and does not create a slot or lengthen the track — an outbound bonus beside an inbound-only facility, or the Truck Dock's inbound bonus beside the outbound-only Packing Sheds, which leaves that card with no effect at all. Likewise, passenger modifiers beside a Whistle Post add Porters but do not create an outbound slot until the Office becomes a Passenger Facility.
+
+## Train cards — 22
+
+Playing a timetabled train card rolls the seeded D12 and places its number in the first open timetable slot at or after the result, wrapping around the 12-slot chart. It then runs at that Stage every Day. An Extra is queued and made up when a Crew Tray becomes available; v0.4.5 automatically launches Extras eastbound from the Western Division Point.
+
+The listed consist is a maximum, not a minimum: a train may depart with fewer cars, but must not exceed the listed categories, put a car behind a caboose, or leave with the engine buried among cars. A Crew Tray holds no more than four rolling-stock cars.
+
+> **Changed 2026-08-22 (Gitea#7), Jesse's call:** the coach counts on **1/2 Crack Limited** and
+> **5/6 The Sparrow** were swapped — the Limited drops from three coaches to two, the Sparrow rises
+> from two to three. This is a change to the CARDS, not a correction to this table: `Trains3.pdf` and
+> the transcription in [`rules/implications.md`](rules/implications.md) §5 still show the original
+> numbers, and are right about what the printed cards said. `src/engine/content.ts` and this table
+> carry what the game plays.
+
+| Train | Speed | Direction | Listed maximum consist | Implemented special rule |
+| --- | --- | --- | --- | --- |
+| 1/2 Crack Limited | Fast | 1 west / 2 east | **2 coaches** | No switching; passenger work only at Terminals; expedited. |
+| 3/4 Express | Fast | 3 west / 4 east | 2 freight | May exchange at most one freight car at each grid location during its switching turn; expedited. |
+| 5/6 The Sparrow | Fast | 5 west / 6 east | **3 coaches** | No switching; expedited. |
+| 7/8 Local | Slow | 7 west / 8 east | 1 freight, 1 coach | Its coach may not be set out during switching. |
+| 9/10 Heavy Freight | Slow | 9 west / 10 east | 3 freight, 1 caboose | — |
+| 11/12 Drag Freight | Slow | 11 west / 12 east | 2 freight, 1 caboose | — |
+| X13 Appleseed Extra | Slow | Player choice printed; v0.4.5 launches east | 3 empty freight, 1 caboose | May drop cars but cannot pick up. The engine enforces no pickup, but does not enforce the printed empties-only consist restriction at make-up. |
+| X14 Fruit Growers Express | Fast | Player choice printed; v0.4.5 launches east | 2 reefers, 1 caboose | Expedited. The code enforces reefers-only; the printed extra loaded-reefer pickup is not a separate rule. |
+| X15 Yard Xfer | Slow | Player choice printed; v0.4.5 launches east | 2 freight, 1 caboose | — |
+| X16 Light Engine Move | Fast | Player choice printed; v0.4.5 launches east | No cars | No switching. |
+| X17 Campaign Train | Fast | Player choice printed; v0.4.5 launches east | 1 coach | No switching. First Office arrival lays over for speeches; later arrivals are expedited. |
+| X18 Circus Train | Slow | Player choice printed; v0.4.5 launches east | 2 freight, 1 coach, 1 caboose | No switching. The first Mainline Phase in which it remains stopped awards its current Office’s player 1 Revenue. |
+| X19 Military Train | Slow | Player choice printed; v0.4.5 launches east | 1 freight, 2 coaches | No switching; no passenger work; expedited. |
+| X20 Director’s Private Car | Slow | Player choice printed; v0.4.5 launches east | 2 freight, 1 coach | No passenger work. |
+| X21 Freight Extra | Slow | Player choice printed; v0.4.5 launches east | 3 freight, 1 caboose | — |
+| X22 Pee-Dee | Slow | Player choice printed; v0.4.5 launches east | 1 caboose | May pick up empty cars only. |
+
+## Enhancements — 18
+
+| Card | Copies | Placement | v0.4.5 behavior |
+| --- | ---: | --- | --- |
+| Interlocking | 2 | Bare Running Track straight | When the Office is full, an inbound train is held at the Limits instead of colliding. |
+| Facing Point Locks | 2 | Any card; requires an Interlocking somewhere in the district | Blocks Derail. Derail is unavailable in v0.4.5, so this remains dormant. |
+| Yard Office | 1 | Bare Secondary Track straight | A coachless inbound train is diverted to this track instead of occupying an A/D track. |
+| Small Yard | 1 | Bare Secondary Track straight | A train may spend one switching Move here to reorder its entire consist and put the engine at the nose. |
+| Water Column | 2 | Bare Running Track straight | Removes a Watertower. Watertower cards are unavailable, so this remains dormant. |
+| Overpass | 1 | Any card | No implemented effect. |
+| Telegraph | 3 | Bare Running Track straight | Once per Day, the Superintendent may add 4 to an opposing train’s number when that makes a facing clearance safe. |
+| Telephone | 2 | On a Telegraph | Same dispatch mechanism, +8 once per Day. |
+| Radio | 2 | On a Telephone | Same dispatch mechanism, +12 once per Day. |
+| ABS Signals | 2 | Any Mainline card | Prevents rear-end collisions and holds a following train short. |
+
+An enhancement requiring a bare straight cannot share that straight with another such enhancement. Telephone and Radio are the explicit stackable chain.
+
+## Maneuvers — 6
+
+| Card | Copies | Behavior |
+| --- | ---: | --- |
+| Red Flags | 5 | May be played at any time on a train stopped on a Mainline card. An approaching following train is held instead of moving into it. |
+| Flying Switch | 1 | During the owner’s switching option, spend one Move to roll a tail-end cut into a track-connected freight facility without moving the engine there. |
+| Poling | 0 | Catalogued but not dealt; no rule is implemented. |
+
+## Catalogued but not dealt — 22 opponent-directed cards
+
+### Space-use cards — 12
+
+Bean House (1), Flop House (1), Watertower (1), Hobo Jungle (1), Section House (1), City Blocks (4), Engine Shops (1), Tenderloin District (1), and Engineer Cemetery (1) are excluded. Their source descriptions say they consume table space; Hobo Jungle additionally describes vandalism looting a passing boxcar. No placement or effect is available in v0.4.5.
+
+### Action cards — 10
+
+Derail (2), Broken Coupler (1), Railroad Crossing (1), Per Diem Inventory (1), Demurrage Charge (1), Customer Complaints (1), Vandalism (1), Hotbox (1), and Outlawed (1) are excluded. Their printed target/effect text is catalogued in the code, but `card.play` rejects the categories as not implemented. Consequently, no card can currently be played on another player.
+
+There are also two **Facing Point Locks** listed among Mainline modifiers. They are treated as the same grid enhancement as Facing Point Locks above, require an Interlocking, and are included in the active 213-card total.

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

@@ -0,0 +1,75 @@
+# Station Master — Mainline Deck
+
+**Rules implementation reference: v0.4.5**  
+**Scope:** the tarot-sized Mainline cards placed between Offices. This is an implementation reference, not a transcription of earlier prototype rules.
+
+## How Mainline cards work
+
+At setup the game places one randomly selected Mainline card between each neighbouring pair of Offices and one beyond each end Office, between it and a Division Point. Thus, a game with *N* players has *N + 1* Mainline cards. The implementation selects types with replacement; it does not deal them from a shuffled finite deck.
+
+A train crossing a Mainline card spends Stages, rather than moving through its printed cells. A 60 mph card costs one Stage and a 30 mph card costs two. A Slow train adds one Stage to every crossing. On Hilly terrain, any train carrying at least one coach uses the passenger rate; a train carrying no coach uses the freight rate. No crossing can take less than one Stage.
+
+The card does not itself determine which player owns the adjacent Office. It is part of the shared Division.
+
+## Physical card inventory in `Mainline Cards.pdf`
+
+The supplied PDF has **ten** tarot-sized terrain cards. Plains appears twice; the other terrain types appear once each. It also includes two Division Point cards.
+
+| Physical card | Copies in the PDF |
+| --- | ---: |
+| Plains | 2 |
+| Curves | 1 |
+| Hilly | 1 |
+| Heavy Grade | 1 |
+| Double Track | 1 |
+| Uncontrolled Siding | 1 |
+| Tunnel | 1 |
+| Trestle | 1 |
+| Interchange | 1 |
+| East Division Point | 1 |
+| West Division Point | 1 |
+
+The PDF art labels this card “Yard”; this reference uses the implementation’s correct name, **Interchange**, to distinguish it from the Division Yard, Classification Yard, Yard Office, and Small Yard.
+
+## Implemented Mainline card reference
+
+| Card | Implemented crossing time and feature |
+| --- | --- |
+| 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 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. |
+| Trestle | 60 mph. |
+| Interchange | 60 mph. A train may be reordered there only through the card’s printed “sort cars” concept; the current engine does **not** provide a Mainline sorting action for it. |
+
+### PDF/code mismatch — CORRECTED
+
+**Was:** `src/engine/content.ts` defines nine `MAINLINE_PROFILES` types: one Plains entry plus the eight other terrain types above. `setup.ts` selected uniformly from that nine-type list, **with replacement**. The second Plains card shown in `Mainline Cards.pdf` was therefore not represented as a duplicate card or as extra Plains weight in setup — and, worse than a weighting error, a Division could be dealt two Interchanges, two Tunnels or two Trestles, none of which the deck contains.
+
+**Now:** `MAINLINE_DECK` in `content.ts` is the inventory table above — ten drawable cards, Plains twice and the other eight once each — and `buildDivision` deals from it without replacement. The two Division Point cards are not in that deck: they are the fixed ends of the Division, laid by `buildDivision` itself rather than drawn.
+
+The Interchange is what forced the correction. §7 lets an Extra be started at the Interchange "if one is on the board" (see `docs/rules/implications.md`, §7), which only reads as a rule if the board can hold at most one.
+
+The executable state represents East and West Division Points as fixed end nodes, not as card records. They are functionally present at the ends of the Division, but are not represented as the two PDF cards in the deck/state model.
+
+## Heavy Grade modifiers
+
+These cards come from the Home Office deck and are played onto a Mainline card during a player’s Draw option.
+
+| Card | Copies | Placement and actual effect |
+| --- | ---: | --- |
+| Brakeman | 1 | Heavy Grade only. Reduces a downhill crossing by one Stage. |
+| Airbrakes | 1 | Heavy Grade only, and Brakeman must already be on that card. Reduces a downhill crossing by one additional Stage. |
+| Helpers | 1 | Heavy Grade only. Reduces an uphill crossing by one Stage. |
+| Realignment | 2 | May be played only onto an unoccupied Mainline card. Changes Plains → Double Track, Curves → Plains, Uncontrolled Siding → Double Track, or Trestle → Uncontrolled Siding. It cannot be played on any other card type. |
+
+For the grade cards, “uphill” should be the direction selected by the player when the card is placed. In v0.4.5 it is the seeded `gradeUp` direction because setup has no player-choice step.
+
+## What is not implemented
+
+- 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.
+- Heavy Grade orientation is seeded automatically rather than chosen by a player. The implementation needs a player-selection step to match the card.

docs/StationMaster-Rules-v0.4.5.md

@@ -0,0 +1,290 @@
+# Station Master — Rules
+
+**First-draft rules reference for v0.4.5**  
+**Authority:** observed v0.4.5 code paths and tests. Where a card face, prototype document, and executable behavior differ, this document reports executable behavior and marks unimplemented material.
+
+## 1. Overview and background
+
+Station Master is a railroad-operations game set in the timetable-and-train-order era. Each player operates an Office Area on a shared east–west Division. The local work is building rail, switching cars, moving passengers and freight through facilities, and keeping the Office clear. The shared work is dispatching scheduled trains across the Division. The player holding the Superintendent’s Fedora decides whether to clear a following train into an occupied Subdivision; an unsafe decision can cause a collision.
+
+Revenue is the score. Passenger boarding and detraining, freight loading and unloading, completed runs, collisions, and victory conditions are all resolved by the rules configured when the game is dealt.
+
+This book is divided as follows:
+
+1. overview and scope;
+2. definitions;
+3. creating, saving, replaying, and configuring games;
+4. the shared basic game mechanics;
+5. the implemented solitaire game;
+6. the implemented multiplayer/engine status; and
+7. FAQs and implementation limits.
+
+The companion references are [Mainline deck](StationMaster-Mainline-Deck-v0.4.5.md), [Home deck](StationMaster-Home-Deck-v0.4.5.md), and [components](StationMaster-Components-v0.4.5.md).
+
+## 2. Definitions
+
+| Term | Meaning in v0.4.5 |
+| --- | --- |
+| A/D track | An Office arrival/departure capacity. A Whistle Post has 1; Depot, Station, and Terminal have 2, 3, and 4. |
+| Card location | A square in an Office Area grid. A train may end a switching Move only on Operational Rail. |
+| Classification Yard | The holding yard for used rolling stock. It refills the Division Yard only when that yard is completely empty. |
+| Control Point | A Depot, Station, or Terminal. It breaks the shared Mainline into Subdivisions. A Whistle Post is not one. |
+| Crew Tray | An engine plus up to four coupled rolling-stock cars. The engine itself does not count as a car. |
+| Department pile | One of three shared face-up card stacks. Draw and discard affect only the top card. |
+| Division Point | The western or eastern end of the shared Division, where trains enter and leave it. |
+| Division Yard | The active source of rolling stock. |
+| Expedited train | A train with the expedite rule. It performs Load/Unload at an Office after arriving, then attempts to depart at the end of that same Stage. |
+| Facility | A Passenger Facility at an upgraded Office or a Freight Facility at an industry. |
+| Freight Agent | The Local Operations option that stocks one outbound box, clears one inbound box, unjams one load, or ends without acting. |
+| Limits | The two signs defining an Office Area’s Running Track. They move outward when that track is extended. |
+| Local Operations | The first player-driven phase of a Stage. A player chooses one: switch, draw, or Freight Agent. |
+| Mainline | The shared cards between Offices and Division Points. |
+| MEN \| AT \| WORK | A three-box freight pipeline. Any load on it locks its industry track. |
+| Operational Rail | A card on which a train may finish a Move. Turnouts are pass-through only; a locked industry is not usable at all. |
+| Running Track | The east–west track between an Office Area’s Limits, including its Office. |
+| Secondary Track | All local rail inside the Limits that is not Running Track. |
+| Stage | One of twelve turns in a Day. Its phases are Local Operations, New Train, Mainline, Load/Unload, and Shift Change. |
+| Subdivision | Mainline between Division Points or Control Points. Clearance checks look through the whole next Subdivision. |
+| Superintendent | The player with the Fedora. The role decides same-direction clearances and rotates every three Stages. |
+| Timetabled train | A numbered train card scheduled to one of the 12 Stage slots, then due at that slot each Day. Odd numbers go west; even numbers go east. |
+
+## 3. Create, save, replay, and game configuration
+
+### 3.1 Starting a new game in the shipped client
+
+The v0.4.5 browser page creates a **one-player solitaire Standard game**. Select **New game**, then choose:
+
+1. a numeric seed, or leave it blank for a fresh browser-generated seed;
+2. a starting hand;
+3. passenger, freight, and train-transit Revenue rates.
+
+The browser writes those choices into the URL. A particular game is defined by the **seed plus these house rules**, not the seed alone.
+
+The three starting-hand choices are:
+
+| Choice | Setup result |
+| --- | --- |
+| Three random cards | Default. Deal three cards from one shuffled deck. |
+| Six random cards | Deal six cards from one shuffled deck. The player begins over the normal hand limit and must play/discard down before ending the first Draw turn. |
+| Three random track and three random non-track cards | Shuffle track and non-track piles separately for the opening deal; then recombine and shuffle their remainders for all later draws. |
+
+The three Revenue values are independently rounded and clamped to 0–5:
+
+- passenger Revenue per coach, paid on boarding and again on detraining;
+- freight Revenue per load, paid on completion of an outbound load and again on completion of an inbound unload; and
+- train Revenue per transit, paid to every player when a train leaves the Division.
+
+Defaults are 1 / 1 / 0. Zero turns that revenue source off; it does not prevent the underlying operation.
+
+### 3.2 Deterministic setup and the seed
+
+The engine uses one seeded random stream for shuffles, Mainline selection, opening D12 rolls, timetable rolls, and automatic Heavy Grade orientation. Given the same seed, configuration, player names/order, and accepted action history, it reconstructs the same state.
+
+At setup it creates each Office Area as `Limit — Whistle Post — Limit`, makes the Division Yard, creates players + 3 Crew Trays, turns up three Department cards, and constructs the shared Division.
+
+In a multi-player engine game, every player receives two seeded D12 rolls:
+
+- The **division roll** orders seats from low west to high east; equal results put the lower player index farther east.
+- The **Superintendent roll** gives the initial Fedora to the first player tied for highest.
+
+The opening deal starts at the Superintendent’s seat and proceeds left (eastward in the engine’s seat ordering).
+
+### 3.3 Saving, resuming, and replaying solitaire
+
+The local save format is JSON containing the seed, the accepted intent history, and the house rules. It does not serialize mutable game state. Loading recreates the game from the seed and replays every action through the rules engine. If an old history reaches an action that is no longer legal, replay stops there instead of forcing an invalid state.
+
+The browser also stores the current local game and resumes it automatically when the page opens without an explicit seed in the URL. A downloaded save is named `station-master-seed<seed>-day<day>.json`.
+
+**Undo is solitaire-only.** It removes the final accepted intent and rebuilds the game from the earlier history. Random outcomes are not rerolled: replaying the same action consumes the same seeded result. Undo can therefore change the player’s decision after seeing an outcome, but cannot fish for a different timetable die roll.
+
+### 3.4 Engine game modes and endings
+
+The engine defines Solitaire, Competitive, and Co-op modes. The browser exposes only Solitaire.
+
+| Length | Target | Days |
+| --- | ---: | ---: |
+| Short | 10 | 3 |
+| Standard | 20 | 5 |
+| Campaign | 45 | 10 |
+
+With `firstToTarget`, competitive mode ends when any individual reaches the target; co-op uses target × player count and total Revenue. With `highestAfterDays`, competitive mode requires the table’s combined Revenue to reach `3 × players × days`; otherwise everyone loses. If that floor is met, the highest individual score wins. Solitaire and co-op win only if their score reaches their target at the end of the length.
+
+Competitive mode also ends in a collective loss after three collisions in one Day.
+
+The configuration contains four optional-rule flags. Only two have engine effects: **Reduced Visibility** gives five rather than six switching Moves in Stages 1, 2, 3, 11, and 12; **Emergency Toolbox** initially sets the Red Flags hand-limit status, allowing four cards. Sister Trains and Employee Rotation are represented in configuration/state design but are not executed by v0.4.5.
+
+### 3.5 Multiplayer setup status
+
+There is no multiplayer lobby, room creation flow, remote server, invitation flow, or network session in v0.4.5. The engine can be called with multiple player names (and rejects a Solitaire configuration with more than one), but the delivered page always calls it for one local player. See section 6.
+
+## 4. Basic game mechanics
+
+### 4.1 The Stage sequence
+
+Each of 12 Stages follows this sequence:
+
+```text
+1. Local Operations — each player, starting with the Superintendent and proceeding left
+2. New Train — make up due timetabled trains, then queued second sections and Extras
+3. Mainline — automatic train movement in numeric order
+4. Load/Unload — each player, starting with the Superintendent and proceeding left
+5. Shift Change — expedited departures, clocks/workers, and possibly the Fedora
+```
+
+At a Shift Change, Laborers and Porters reset. The Fedora moves after Stages 3, 6, 9, and 12. At Day end, dispatch-device use resets, collision count resets, the Day and Stage roll over, and victory is checked.
+
+### 4.2 Local Operations: choose one option
+
+On a player’s Local Operations turn, choose exactly one available option.
+
+**Switch.** Select any Crew Tray currently in that player’s Office Area. It gets six Moves, or five under Reduced Visibility on the listed night Stages. A Move travels any connected distance in one direction and must end on Operational Rail. Reversing is a separate Move. A train may pass through a turnout but cannot stop on it. It may not share or pass through another train except through an Office with a free A/D track.
+
+Standing cars couple automatically when the train reaches them; it may not pass them, and the resulting consist may not exceed four cars. Coupling forward places cars ahead of the engine; coupling while backing places them behind it. Setting out cars does not spend a Move, but the cut must come from an outer end of the consist and may not be left on the Office. A Small Yard can reorder a consist for one Move. Flying Switch spends one Move to roll a tail cut into a connected Freight Facility.
+
+**Draw.** Take one card from the face-down Home Office or the exposed top of one Department pile. During this option, play eligible cards and/or discard cards to Department piles, then finish at the hand limit. Track, facilities, offices, modifiers, enhancements, and train cards have the placement or scheduling rules in the deck references. Mainline modifiers are played from this option as well.
+
+**Freight Agent.** Make one of these operations, then the turn ends: stock one green outbound box from a matching loaded Division Yard car; clear one red inbound box to the Classification Yard; unjam one outbound, inbound, or MEN | AT | WORK load to the Classification Yard; or explicitly end without acting. Freight can be stocked only when an unclaimed empty matching car is already spotted at that industry. Passengers may wait in a green Office box without a train present.
+
+Implementation note: `card.discard` is accepted by the v0.4.5 engine during Local Operations without checking that Draw was chosen. This unusual implementation behavior is not a separate published turn option.
+
+### 4.3 Track, switching, and local safety
+
+The Running Track cannot be broken by a curve or other card lacking its east–west through route. Local branches use turnouts and 45° curves. Cards that touch vertically connect only if their 45° legs share the correct diagonal; mere adjacency is not rail connection.
+
+An industry’s track is locked while any load is on its MEN | AT | WORK pipeline. Trains cannot enter, cross, pick up from, or set cars out there. When it is unlocked, an industry track is ordinary Operating Rail and holds up to four cars, the same as any other non-turnout, non-Limits card: a crew may set out one, two, three or four cars there, whatever it is carrying. An industry’s green and red boxes are how much work it can hold, not how much rail it has, and a Modifier beside it adds a box without adding room for a car.
+
+Train-card restrictions also apply while switching. No-switching trains cannot move, set out, or sort locally. Trains 3/4 share a one-freight-car budget for pickup or setout at each grid location. Trains 7/8 cannot set out their coach. X13 cannot pick up, and X22 may pick up empty cars only.
+
+### 4.4 New Train phase
+
+At the Stage shown on the timetable, the engine makes up the matching timetabled train if a Crew Tray is free. It starts at the Division Point appropriate to its direction. A train may receive matching loaded or empty cars from the Division Yard until its listed maximum consist is reached or no suitable car remains. It is permitted to leave under-strength.
+
+A Second Section order on the due train creates another identical timetabled train behind it when a free tray is available. A played Extra is made up after timetabled trains and Second Sections when a tray is free; v0.4.5 automatically sends every Extra east from the Western Division Point.
+
+### 4.5 Mainline movement and Office arrival
+
+Mainline movement is automatic and processes lower train numbers first; a timetabled train outranks an Extra with the same number. A train at a Division Point, at an Office A/D track, or already crossing a Mainline card attempts its applicable movement.
+
+Crossing time comes from the Mainline card and train speed. On a normal card, a train must check the entire next Subdivision before entering it:
+
+- an opposing train normally blocks entry;
+- a following same-direction train asks the Superintendent to allow or deny clearance;
+- Red Flags or ABS Signals hold the follower automatically; and
+- passing cards allow entry without this occupancy check.
+
+An Office arrival normally takes a free A/D track. If the Office is full, the inbound train collides and the local Office player loses 5 Revenue; Interlocking instead holds it at the Limits. A coachless inbound train may divert to a Yard Office. Cars fouling the Running Track at the Office also cause a collision.
+
+An expedited train remains available for this Stage’s Load/Unload work after arriving, then attempts to depart at Shift Change. A non-expedited arrival waits until a later Mainline phase. A train departing an Office must be correctly made up: engine at one end, caboose at the far end if present.
+
+When a train leaves the far Division Point, its cars are returned to yards, its Crew Tray becomes free, and each player receives the configured train-transit Revenue (zero by default).
+
+### 4.6 Passenger work
+
+Passenger work occurs during Load/Unload, at a Depot, Station, or Terminal. Each Porter may take one action per Stage.
+
+- **Board:** replace an empty coach on an eligible train at the Office with a loaded coach from a green outbound box. The removed empty coach goes to the Classification Yard. Earn configured passenger Revenue.
+- **Detrain:** replace a loaded coach on an eligible train with an empty coach from the Division Yard, placing the loaded coach into an available red inbound box. Earn configured passenger Revenue.
+
+Crack Limited trains permit passenger work at Terminals only. Military Train and Director’s Private Car permit no passenger work. A Whistle Post has no Porters.
+
+### 4.7 Freight work
+
+Freight work also occurs during Load/Unload. Each Laborer can take one action per Stage. Every freight facility has MEN, AT, and WORK boxes.
+
+For an **outbound load**, first use the Freight Agent to put a matching loaded car into the green box, with an unclaimed empty matching car spotted on the industry track. A Laborer starts the load on MEN, then advances it to AT, then WORK, then onto the empty car. Completing the last step changes that car to loaded, sends the replaced empty car to the Classification Yard, and earns configured freight Revenue.
+
+For an **inbound unload**, a matching loaded car must be spotted at an inbound-capable industry and the Division Yard must contain a matching empty car. A Laborer replaces the spotted loaded car with that empty car and starts the load on WORK. Laborers move it backward through AT and MEN into a free red inbound box. That final placement earns configured freight Revenue. Clearing the red box later with the Freight Agent pays no additional Revenue.
+
+## 5. Solitaire
+
+The implemented game is solitaire: one named player, one Office Area, local browser execution, Standard length, highest-after-days victory, and the default house rules unless changed in New Game. The game has no AI opponent. “Multiplayer” gameplay does not occur locally by simulating other players.
+
+Solitaire-specific features are:
+
+- a local browser save, automatic resume, and JSON download/load;
+- unlimited step-by-step Undo back through accepted action history; and
+- a seed/rules URL suitable for sharing or reproducing a game.
+
+The active deck removes all 22 opponent-directed cards. Therefore, the defensive cards whose only purpose is to answer them (Facing Point Locks and Water Column) can be placed but have no opportunity to fire; Overpass has no effect at all. The game still includes shared-rail mechanics such as Mainline clearance, but with one player no other player can occupy the Division.
+
+To win the default game, finish Day 5 with at least 20 Revenue. A result below 20 is a loss. Train-transit Revenue defaults to zero, so the default score must principally come from passenger and freight work.
+
+## 6. Multiplayer
+
+### 6.1 What the engine supports
+
+The engine has player, seat, score, Office Area, Director/Division, phase-order, co-op, and competitive-mode data for multiple named players. It deals each player a hand, creates one Office Area per seat, starts acting order at the Superintendent and proceeds left, and models the following multiplayer-specific outcomes:
+
+- the D12 seating and Superintendent rolls described in section 3;
+- individual Revenue in competitive play and shared total Revenue in co-op;
+- a competitive collective loss after three collisions in one Day;
+- a collective Revenue floor for competitive highest-after-days games; and
+- train-transit Revenue awarded to every player, if that revenue setting is nonzero.
+
+The engine’s setup checks only that there is at least one player and that Solitaire has exactly one player. It does not enforce a maximum player count, although the test and design material exercise two through four players.
+
+### 6.2 What is not delivered in v0.4.5
+
+There is no implemented multiplayer game setup for end users: no server, lobby, invitation, room code, player join flow, authoritative remote state, or remote Session. The browser page creates a local single-player session only. Accordingly, there is no supported procedure for resuming a multiplayer game, and no multiplayer Undo.
+
+The 12 space-use cards and 10 action cards are not dealt in competitive or co-op either. The engine rejects attempts to play either category. Thus, **no card can currently be played on another player**. This includes Derail, Broken Coupler, Railroad Crossing, score-penalty cards, Vandalism, Hotbox, Outlawed, and all table-space cards. Facing Point Locks and Water Column are implemented only as dormant defences for these unavailable effects.
+
+### 6.3 Difference from solitaire, if a multi-player engine session is created
+
+Players have separate local districts, hands, and scores, but they share the Home Office deck, Department piles, yards, timetable, Mainline, and traffic consequences. Turn order is sequential; one current actor acts at a time. The Superintendent role is attached to a player while Offices are attached to fixed seats. Employee Rotation is not active, so players do not actually change seats in v0.4.5.
+
+The deck is still 213 cards and still excludes opponent-directed content. Therefore multi-player engine mode changes shared traffic, scores, turns, and win/loss evaluation—not card attacks or a remote user experience.
+
+## 7. Frequently asked questions
+
+### Is the same seed always the same game?
+
+Only with the same house rules, player configuration/order, and action history. The seed drives all engine randomness, but the starting hand and Revenue settings also change the game.
+
+### Why can’t I end my draw turn?
+
+Your hand exceeds three cards, or four when the Red Flags hand-limit status is active. Play or discard down to the limit.
+
+### Why can’t my train move onto a turnout?
+
+It may move through a turnout but cannot end a Move there because turnouts are not Operational Rail.
+
+### Why can’t a train enter my industry?
+
+Its MEN | AT | WORK pipeline contains a load, which locks the track; the rail geometry does not connect; another train occupies it; mandatory coupling would exceed four cars; or four cars are already standing there, which is as many as any card holds.
+
+### Why won’t an industry accept a new outbound load?
+
+The green box may be full, the Division Yard may lack a matching loaded car, or there is no unclaimed empty matching car already spotted on that industry’s track.
+
+### Why does an inbound freight unload require an empty car in the Division Yard?
+
+The engine immediately replaces the spotted loaded car with a matching empty car. It will not create a new car from nothing.
+
+### Why did an arriving train collide instead of wait?
+
+The Office had no free A/D track and no Interlocking. A full Office is an automatic local collision. An Interlocking holds the arrival at the Limits.
+
+### Why is a train held at an Office even though the Mainline is clear?
+
+It may be on Secondary Track rather than the Office, or be badly made up: its engine is between cars or its caboose is not at the far end.
+
+### Why did an expedited train leave after passenger/freight work?
+
+Expedite means it departs in the Stage it arrived, but v0.4.5 waits until Shift Change so it remains present for that Stage’s Load/Unload phase.
+
+### Can I choose the direction of an Extra or a Heavy Grade?
+
+Not in v0.4.5. The engine launches Extras eastbound from the Western Division Point. Heavy Grade orientation is seeded automatically at setup.
+
+### Can I use an Interchange to reorder a train?
+
+No. The card is catalogued with a sorting concept, but there is no implemented Interchange sorting action. Small Yard is the available local sorting mechanism.
+
+### Can I play attack cards on another player?
+
+No. All action and space-use cards are excluded from every dealt deck in v0.4.5 and their play is rejected.
+
+### Is multiplayer playable?
+
+No. Multi-player state and rules-engine support exist, but the lobby, server, remote client, and opponent-directed card mechanics are not implemented.

docs/architecture/components.md

@@ -35,7 +35,7 @@ decision (you are the Superintendent, ruling on your own trains).
 | Turn arbitration between players | Card catalogue |
 | Presence, reconnection of others | Track graph and Move legality |
 | Fedora rotation between players | Board and action UI |
-| Competitive/Co-op victory modes | Event log and persistence |
+| Competitive/Co-op victory modes | Intent history and persistence |
 | Collision floor (Competitive only) | Server and protocol |
 
 **Consequence: the engine is the dominant cost and it is front-loaded.** Components 4–6 barely differ
@@ -141,11 +141,12 @@ is what makes the whole system testable without a server.
 - **Size driver:** at MVP one game and one player, so the pump loop is nearly all of it. Grows with
   concurrent games and per-player routing.
 
-**9. Event log and persistence**
+**9. Intent history and persistence**
 
 - **Where:** Server · **When:** append per event; full read on startup
-- **Does:** append-only log to disk; state is `fold(events)`. Powers restart recovery at MVP, and
+- **Does:** append-only `{ engineVersion, seed, config, history: Intent[] }` to disk. Restart recovery
-  later reconnection and the replay viewer.
+  is `fromSave` over the stored intents; the replay viewer reads the same file
+  ([`protocol.md`](protocol.md) §3 — events narrate, intents reconstruct).
 - **MVP: S** · **Final: M** · ~100 → ~350 LOC
 - **Size driver:** an append and a read-back. Grows with snapshotting, retention and indexing.
 
@@ -161,8 +162,8 @@ is what makes the whole system testable without a server.
 **11. Transport**
 
 - **Where:** Server · **When:** per connection; pushes on every event
-- **Does:** HTTP for lobby operations, WebSocket for the ordered event stream, static asset serving.
+- **Does:** HTTP POST for lobby operations and intents, SSE for the ordered push stream, static asset
-  Bidirectional — most traffic is server → client.
+  serving ([`multiplayer.md`](multiplayer.md) D5). Most traffic is server → client.
 - **MVP: S** · **Final: M** · ~150 → ~400 LOC
 - **Size driver:** small at MVP because one client needs no fan-out. Grows with broadcast, backpressure
   and reconnect-with-replay.
@@ -180,7 +181,7 @@ is what makes the whole system testable without a server.
 
 - **Where:** Server · **When:** once, at process start
 - **Does:** reads environment configuration (bind address, port, data directory), opens or creates the
-  event log, constructs the session host and transport, wires them together, handles shutdown.
+  intent history, constructs the session host and transport, wires them together, handles shutdown.
 - **MVP: XS** · **Final: S** · ~80 → ~200 LOC
 - **Size driver:** trivial in itself, but it is where
   [`deployment.md`](deployment.md)'s five portability rules are actually enforced — single process
@@ -223,9 +224,9 @@ is what makes the whole system testable without a server.
 **16. Replay viewer**
 
 - **Where:** Browser · **When:** after a game ends — **pulled forward, built**
-- **Does:** read-only projection over the event log, with playback controls. A Node script
+- **Does:** read-only playback of a stored game, with controls. A Node script replays the saved
-  precomputes one frame per visible event and writes a self-contained HTML file, so the browser
+  intents, precomputes one `Frame` per visible event with its narration, and writes a self-contained
-  never runs the engine and there is no bundling or build step.
+  HTML file — so the browser never runs the engine and there is no bundling or build step.
 - **MVP: —** · **Final: S** · 0 → ~250 LOC · *built: 560 LOC (replay) + 330 (narration)*
 - **Size driver:** the narration layer, not the rendering. Turning 30 event types into readable
   sentences and deriving the "what is currently blocked" panel is most of it.
@@ -304,7 +305,7 @@ under.
     [4]apply [5]advance [6]legalActions
       └───────┼───────┘
               ▼
-        [8] session host ──► [9] event log
+        [8] session host ──► [9] intent history
               │
               ▼
         [10] view projection
@@ -393,7 +394,7 @@ Crew Tray onto a card holding two standing cars, which couples them automaticall
 | 4 | Apply | Validates the Move via component 3; rejects with `WOULD_REVERSE` / `NOT_OPERATIONAL_RAIL` / `TRACK_OCCUPIED` if illegal. |
 | 3 | Track graph | Confirms the path exists without a direction change. |
 | 4 | Apply | Moves the tray, couples the standing cars **in track order**, checks the four-slot limit, decrements Moves. Emits `TrayMoved` and `CarsCoupled`. |
-| 9 | Event log | Appends both events to disk. |
+| 9 | Intent history | Appends the accepted `switch.move` intent to the game's history on disk. |
 | 8 | Session host | Calls `advance` — no automatic work is due mid-Local-Ops, so it returns `needsInput`. |
 | 10 | View projection | Rebuilds the view. Nothing is redacted here; the board is public. |
 | 6 | Legal-action enumeration | Recomputes affordances from the new state — fewer Moves remain, and a fuller consist may now be at its four-slot limit. |

docs/architecture/deployment.md

@@ -15,8 +15,8 @@ The requirements are modest, which is what makes both paths viable:
 | Need | Why |
 | --- | --- |
 | One long-running process | Active games are held in memory ([`overview.md`](overview.md)) |
-| HTTP + WebSocket on one port | Lobby over HTTP, game stream over WebSocket ([`protocol.md`](protocol.md)) |
+| Plain HTTP on one port | Lobby and intents over POST, game stream over SSE — no WebSocket upgrade, which is what keeps this a *plain* HTTP need ([`multiplayer.md`](multiplayer.md) D5) |
-| A writable data directory | The append-only event log ([`lobby-and-sessions.md`](lobby-and-sessions.md)) |
+| A writable data directory | The append-only `{ seed, config, history }` per game ([`lobby-and-sessions.md`](lobby-and-sessions.md)) |
 | Static asset serving | The browser client |
 | No outbound network access | The game talks to nobody |
 | No scheduled work | Nothing in the rules is real-time ([`overview.md`](overview.md)) |
@@ -59,7 +59,7 @@ network access to that StartOS box. How they get it is the user's configuration
 something the application chooses or should claim.
 
 **One thing the architecture must respect.** A packaged service should not assume it is reachable at
-a fixed, publicly-routable URL. Anything that bakes an origin into the client — absolute WebSocket
+a fixed, publicly-routable URL. Anything that bakes an origin into the client — absolute stream
 URLs, hard-coded hostnames in links, CORS allow-lists pinned to one domain — will break. Serve the
 client from the same origin as the API and use relative URLs throughout. This costs nothing on a
 plain web host and is required on StartOS, so it should simply be the rule.

docs/architecture/lobby-and-sessions.md

@@ -10,20 +10,31 @@ Written against [`../rules/rules-v0.2.md`](../rules/rules-v0.2.md).
 
 ## 1. Identity
 
-No accounts to begin with. A player is a **display name** plus a **session token** the server issues
+No accounts. Access to the server is a **join secret** (§2); identity within a game is a **display
-on join and the client stores locally.
+name** plus a **session token** the server issues on join and the client stores locally.
 
 ```
 Session
   token       : opaque, unguessable
   gameId
-  playerIndex
+  player      : PlayerIndex
   displayName
 ```
 
-The token is what makes reconnection work: it proves "I am the player who was sitting at seat 2,"
+**It names the PLAYER, not the seat.** Those became different things in v0.4.0, and the difference is
-which is the only identity claim the game needs. Keep it out of URLs so it is not shoulder-surfed or
+exactly the case this field has to survive: under Employee Rotation (§4) a player changes chairs while
-pasted into a chat.
+their Revenue and their identity stay with them. A token naming a seat would sit a returning player
+down in someone else's Office. The seat is derived with `seatOf(state, player)` whenever it is needed,
+which is one lookup and always current.
+
+The token is what makes reconnection work: it proves "I am the player who was in this game," which is
+the only identity claim the game needs. Keep it out of URLs so it is not shoulder-surfed or pasted
+into a chat.
+
+**Tokens are per-origin.** The server may be reached by more than one address — `stationmaster.<domain>`
+and `<ip>:<port>` are both expected — and browser storage is scoped to the origin. A player who joined
+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.
 
 Real accounts can be layered on later without touching the rules engine, which is exactly why
 [`overview.md`](overview.md) keeps that boundary sharp.
@@ -33,22 +44,45 @@ Real accounts can be layered on later without touching the rules engine, which i
 ## 2. Creating and joining
 
 ```
-Lobby.Create { config }   →  { gameId, gameCode, token }
+Lobby.Create { secret, config }            →  { gameId, gameCode, token }
-Lobby.Join   { gameCode, displayName }  →  { token, playerIndex }
+Lobby.Join   { secret, gameCode, displayName }  →  { token, player }
 ```
 
-A **game code** — short, human-speakable, e.g. `RAIL-4471` — is the whole discovery mechanism. No
+**These four messages are the one family with no types behind them**, because the engine has no
-matchmaking, no browsing, no public game list. Players are already talking to each other; the code
+concept of a lobby — `intents.ts` starts at `localOps.choose`. Everywhere else, the code is the
-just needs to survive being read aloud.
+protocol ([`protocol.md`](protocol.md)); here the prose is, until the server exists.
 
-The creating player is the **host**: they set the config (§3) and start the game. Host-only rights
+**The join secret gates the door.** Server-wide, set by environment variable, passed out of band by
-end at `Lobby.Start` — the rules give no player special standing during play, and the Superintendent
+whoever runs the server (`multiplayer.md` D14). Anyone holding it may create a game and may join any
-role rotates independently (§5).
+created game that has not started. It is not per-game and it is not an account — it is the cheapest
+thing that stops a clearnet-reachable box from being someone else's game server. Typed once and kept
+per-origin, alongside the token.
 
-**Player counts.** Solitaire is 1. Competitive and Co-op need at least 2. The upper bound is a
+A **game code** — short, human-speakable, e.g. `RAIL-4471` — is the discovery mechanism *inside* the
-practical judgment rather than a rules limit: the Division grows by one Office and one Mainline card
+door. No matchmaking, no browsing, no public game list. Players are already talking to each other; the
-per player (§4.3), and every added player lengthens the Superintendent's rotation and the
+code just needs to survive being read aloud.
-phase-major waiting. **6 is a sensible cap** for the prototype.
+
+**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
+getting that wrong locks a player out of their own server.
+
+The creating player is the **host**: they set the config (§3) and start the game. **If the host leaves
+before `Lobby.Start`, host rights pass to the earliest-joined remaining player.** No lobby should ever
+be stuck waiting on somebody who closed a tab, and the alternative — everyone leaves and someone makes
+a new game — throws away the seating they had already agreed. Host rights end at `Lobby.Start`
+regardless: the rules give no player special standing during play, and the Superintendent rotates
+independently (§4).
+
+**Player counts.** Solitaire is 1. Competitive and Co-op are **2 to 4**. Nothing in the engine enforces
+a limit, so the lobby is where it is enforced — and the number is set to what is actually exercised
+(`test/multiplayer.test.ts` plays 2, 3 and 4 to a finish) rather than to a guess. The cost of more is
+real: the Division grows by one Office and one Mainline card per player (§4.3), and every added player
+lengthens both the Superintendent's rotation and the phase-major waiting. Raise the cap when somebody
+has played a bigger game and reported back, not before.
+
+This is a lobby judgment, **not a rules limit** — §7 of the rules describes what happens at five or
+more players (the New Train round ends mid-pass when the consist fills) and the engine implements it.
+The cap is about what has been played, not about what the game can do.
 
 ---
 
@@ -67,6 +101,10 @@ These must lock at `Lobby.Start`. Changing `length` mid-game would move the fini
 `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.
 
+`mode` and the seat count are checked together at start: solitaire is exactly 1, competitive and
+co-op are 2 to 4 (§2). The engine will happily build a 7-player Division, so this is the only place
+the limit exists.
+
 ---
 
 ## 4. Seating
@@ -82,80 +120,132 @@ So seating must be settled before the opening D12 rolls, and the lobby should sh
 visually — a player should see whose Office lies east and west of theirs before the game begins.
 
 **The opening rolls** (§4.4, §4.5) happen server-side at `Lobby.Start`, from the game seed: highest
-D12 takes the Eastern Division Point, and a second roll picks the opening Superintendent. Emit both
+D12 takes the Eastern Division Point, and a second roll picks the opening Superintendent.
-as events so clients can show the rolls rather than just the outcome — it is the game's first moment
+
-of drama and there is no reason to hide it.
+**Both are implemented.** The Division roll was drawn and discarded until v0.4.1 — `void
+divisionRolls`, with seating fixed by array order — so §4.4 decided nothing and the seat/player split
+was untested at runtime. It orders the chain now: `seating[seat] = player`, ascending by roll from
+seat 0 (west, beside the Western Division Point) to the last seat (east, "highest is the Eastern
+Division Point").
+
+The rule names only those two ends, because at a table the players are already sitting in a chain and
+the roll only says which way round it is. There is no physical table here, so the roll orders
+everybody — it uses a number every player is already told to roll, and it makes the roll matter to
+more than the winner. Ties break toward the lower player index sitting further east, the same
+first-max-wins convention the Superintendent roll uses.
+
+Both rolls are kept on the state as `openingRolls`, indexed by player, **so the lobby can show the
+rolls rather than only their outcome** — it is the game's first moment of drama and there is no reason
+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.
 
 **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. Note what this means for the model: a player's
+Day, carrying their Revenue and the Fedora with them. **The model supports this as of v0.4.0**:
-*seat* changes while their *score* follows them, so `Player.index` and Office ownership must be
+offices and districts are keyed by seat, hands and Revenue and the Fedora by player, and `seating[]`
-separable. This is the one optional rule with real structural consequences — worth wiring in from the
+maps between them, so rotating is a one-line operation and every `areaOf(state, player)` caller
-start rather than retrofitting.
+follows without changing. The *rule* is still unimplemented — nothing rotates `seating` yet — but the
+structure it needs is in place and tested, which was the point of doing it early.
 
 ---
 
 ## 5. Disconnection and reconnection
 
-Turn-based with one actor at a time makes this far easier than it would be in a real-time game.
+Being turn-based makes this far easier than it would be in a real-time game. (It is no longer "one
+actor at a time" — v0.4.0 gave every player their own `TurnState` precisely so that players can act in
+parallel where the rules allow it, `multiplayer.md` D19. Nothing about disconnection changes: the game
+still waits on whoever it is waiting on.)
 
 **On disconnect:** keep the seat. Do not remove the player, do not auto-play. The game simply waits
-if it was their turn. Broadcast a `PlayerDisconnected` event so everyone else can see why nothing is
+if it was their turn. Broadcast a disconnect notice so everyone else can see why nothing is happening
-happening — silence with no explanation is the worst version of this.
+— silence with no explanation is the worst version of this. There is no such event type today; it is
+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 reconnect:** the client presents its token, and the server replies with a full current view plus
+**On reconnect:** the client presents its token and the server replies with a **full current view**.
-the event tail it missed. Because state is `fold(events)` ([`protocol.md`](protocol.md)), catching up
+Not an event tail — a returning client needs the position, not the history of how it got there, and
-is a replay, not a special case.
+the server can always produce the position because it holds the game
+([`protocol.md`](protocol.md) §3). This is why catching up is not a special case.
 
 **On a player who does not come back:** the honest options at this scale are to wait, or to let the
-host end the game. An optional **turn timer** is worth having — a lobby setting, off by default,
+host end the game.
-never part of the rules — that on expiry takes the safest legal action:
 
-| Phase | Timeout action |
+**Nothing moves on an absent player's behalf.** No forcing timer, no bot stepping in. Jesse's call,
-| --- | --- |
+and the reasoning is the same one that keeps bots out of running games generally: the Superintendent's
-| Local Operations | `Switch.End` / `Draw.End` — forfeit the remaining action |
+clearance decision materially affects *other* players' scores, so anything that answers it
-| New Train | `NewTrain.PassCar` if legal, else place any legal car |
+automatically changes the game rather than preserving it. Bots fill empty seats **at game start
-| Mainline clearance | **Deny** clearance — the safe answer; a held train costs a Stage, a wrecked one costs 5 Revenue and counts toward the collision floor |
+only** (`multiplayer.md` D8). Two ways out of a permanently-halted game are recorded in `TODO.md` and
-| Load/Unload | `LoadUnload.End` |
+deliberately not designed here — a bot playing minimally-damaging defensive moves for someone who
+stepped away, and a player *consenting* to resign their railroad to a bot. Both need care; neither is
+a timer.
 
-Denying clearance on timeout is the right default and worth stating explicitly: the asymmetry between
+### The turn clock — a stopwatch, not a shot clock
-the two outcomes is large, and in Competitive mode a timed-out clearance that causes a wreck could
-end the game for everybody (§3.4).
 
-**Do not substitute an AI player.** The Superintendent's clearance decisions materially affect other
+**Record how long each player takes on each turn.** Not to enforce anything: to find out where the
-players' scores; a bot making them on an absent player's behalf changes the game rather than
+game actually goes. "A 4-player game takes an evening" is currently a guess, and the useful version of
-preserving it.
+that answer is per-phase — whether the wait is Local Operations, or making up a train, or one player
+thinking about a clearance while three others watch. That is what tells you which part is worth
+speeding up, and it is the one measurement no amount of bot simulation can produce, because the bot
+does not think.
+
+Where it lives matters:
+
+- **Outside the rules engine.** The engine has no clock and must not acquire one — it is pure and
+  deterministic given a seed, which is what makes every replay and every test work.
+- **Outside the canonical record.** Timings are stored beside `{ engineVersion, seed, config, history }`,
+  never inside it. A replay must reproduce a game from decisions alone; if it depended on wall-clock
+  data it would no longer be reproducible from a seed.
+- **In the session host**, which already sees each intent arrive and already knows whose turn it is.
+  Wall-clock at the start of a turn, wall-clock at the intent that ends it, per player per phase.
+
+Show the current turn's elapsed time in the UI if it is unobtrusive — a table can self-regulate on
+information alone, which is the polite version of a shot clock and costs nothing.
 
 ---
 
 ## 6. Persistence
 
-Persist the **event log**, not a state snapshot. It is smaller, it is the thing that already exists,
+Persist the **intents**, not a state snapshot and not the event log. This section said "event log"
-and it makes a mid-game server restart a replay rather than a recovery.
+until v0.4.0, on the strength of a `state = fold(events)` claim that was never true
+([`protocol.md`](protocol.md) §3) — folding the log rebuilds card plays and switching, and not one
+train movement. The intents genuinely do reconstruct a game, they are smaller still, and `fromSave`
+already replays them, so a mid-game server restart is a replay rather than a recovery.
 
 ```
-games        : gameId → { config, seed, status, createdAt, gameCode }
+games        : gameId → { engineVersion, config, seed, status, createdAt, gameCode }
-events       : gameId → ordered event list
+history      : gameId → ordered Intent list
-sessions     : token  → { gameId, playerIndex, displayName }
+sessions     : token  → { gameId, player, displayName }
 ```
 
+`engineVersion` is stored beside the seed because a replay is only faithful under the rules it was
+recorded with. A version mismatch on load must be refused explicitly rather than replayed and quietly
+diverged (`multiplayer.md` Phase 3).
+
 Requirements are modest enough that the storage choice is genuinely open — SQLite on a single node
-covers this comfortably, and so would flat files with an append-only log per game. The constraint
+covers this comfortably, and so would flat files with an append-only list per game. The constraint
-worth honouring is that the **event log is append-only**: rewriting history breaks the one property
+worth honouring is that the **history is append-only**: rewriting it breaks the one property that
-that makes replay trustworthy.
+makes replay trustworthy. (Undo is not an exception — it replays the history *without* the last
+intent, and a server does not offer it at all.)
 
-**Snapshotting** is an optimisation, not a requirement. If a Campaign game's log grows long enough
+**Snapshotting** is an optimisation, not a requirement. If a Campaign game's history grows long
-that replay feels slow, periodically store a state snapshot with its `eventSeq` and replay forward
+enough that replay feels slow, periodically store a state snapshot with its intent count and replay
-from there. Do not build this until it is needed.
+forward from there. Do not build this until it is needed. Measured today: a finished solitaire game
+is ~350 intents and a few hundred bytes.
 
-**Retention.** Finished games **keep their event log, seed and config**, because post-game replay is
+**Retention.** Finished games **keep their history, seed and config**, because post-game replay is a
-a wanted capability (see [`overview.md`](overview.md#post-game-replay--a-desired-future-capability))
+wanted capability (see [`overview.md`](overview.md#post-game-replay--a-desired-future-capability))
-and the log is the only thing it needs. Do not delete finished games by default.
+and those three are the only things it needs — the replay viewer on the site already reads exactly
+that file. Do not delete finished games by default.
 
 Retention is an operator setting rather than an application decision — a self-hosted instance among
 friends may as well keep everything, since a finished game's log is small. If a cap is wanted, expire
 by age or by total count and say so plainly in the UI, because a replay that silently stops existing
 is worse than one that was never offered.
 
+**Turn timings** (§5) are stored per game beside the history, never inside it, and are retained on the
+same terms — they are only interesting in aggregate, and only across enough games to see a pattern.
+
 Session tokens are the exception: those can expire on a short window once their game has finished.
 
 ---
@@ -167,7 +257,8 @@ At small self-hosted scale these are not needed, and building them early costs m
 - **Matchmaking or a public game browser.** The game code covers discovery.
 - **Ranking, ladders, persistent profiles.** §3's timed modes produce comparable scores, so a
   high-score table would be a natural first addition — but it is a feature, not infrastructure.
-- **Spectators.** Straightforward to add later, since a spectator is just a view with no `private`
+- **Spectators.** Straightforward to add later: a spectator is a `Frame` with no hand and no ability
-  section and no ability to send intents — the same shape post-game replay needs.
+  to send intents. `snapshot` already takes a viewing seat, so the only new thing is a viewer that
+  belongs to no seat — the same shape post-game replay already uses.
 - **Horizontal scaling and cross-process coordination.** One process holds every active game
   in memory.

docs/architecture/multiplayer.md

@@ -0,0 +1,456 @@
+# Multiplayer — design and build plan
+
+How Station Master becomes a multiplayer game with an authoritative server, **as a layer added on top
+of what exists**. Solitaire keeps working exactly as it does today: opened from a static host, played
+entirely in the browser, no server involved at any point.
+
+This is a plan, not an implementation. Written against the engine as built (v0.3.1). It reconciles
+[`overview.md`](overview.md), [`protocol.md`](protocol.md),
+[`lobby-and-sessions.md`](lobby-and-sessions.md) and [`deployment.md`](deployment.md) — all written
+*before* the engine existed — with what was actually built, and with the decisions reviewed and
+settled in §11.
+
+---
+
+## 1. The constraint that shapes everything
+
+> Solitaire still plays the same. No server needed.
+
+That decides the architecture:
+
+- The engine stays **pure and browser-runnable**. No server-only dependency enters `src/engine/`.
+- The client runs in **two modes** without forking: authoritative-local (solitaire, today's
+  behaviour) and view-only-remote (multiplayer).
+- The static deploy keeps working. A server is an *additional* way to run the game.
+
+The existing architecture anticipated nearly all of this and the engine was built to it. Most of what
+follows is assembly.
+
+---
+
+## 2. What holds, and what moved
+
+`overview.md`'s core claims survived contact with the implementation: server authority, a pure
+deterministic engine, two entry points (`applyIntent` / `pump`), events that render standalone,
+per-player redacted views.
+
+Four things moved:
+
+**`state = fold(events)` is not true, and the intents are canonical instead.** `applyIntent` does go
+through the reducer, but the phase driver does not — it mutates and then emits a descriptive event —
+so fourteen of the forty-six event types are never reduced, including the clock and the whole Mainline
+phase. This costs nothing, because the plan never needed it: persistence is `{ seed, history }` (§10)
+and the wire carries `Frame`s rather than events (D2/D3). Reconnection is a fresh `Frame`, not an
+event tail.
+
+**The save format is already the wire format.** A game is `{ seed, history: Intent[] }` and `fromSave`
+reconstructs it exactly. That is what makes persistence nearly free (§7).
+
+**`protocol.md`'s message vocabulary was out of date; fixed in Phase 0.** It had been written from
+the rules before the engine existed, and the real `Intent` union diverged — different names
+(`switch.move`, not `Switch.Move`), different shapes (`dropCars` grew `fromNose`; `card.play` grew
+`variant` and `node`), and intents that did not exist then (`switch.sortConsist`,
+`newTrain.secondSection`, `maneuver.*`, `redFlag.*`), plus 40-odd rejection codes against a listed
+20. **The real types are the protocol**, so `protocol.md` now points at `intents.ts` and `events.ts`
+and keeps only what the types cannot say.
+
+**The client already renders from a projection.** `snapshot()` produces a `Frame`, `actionMenu()` a
+`Menu`, and the renderers consume only those. This is why the multiplayer client is cheap.
+
+---
+
+## 3. Measurements this plan rests on
+
+Taken from 8 four-player bot games and 12 solitaire games, so the sizing is not guesswork.
+
+| | value |
+| --- | --- |
+| Intents per game (4 players) | ~355, over ~16 Stages |
+| Intents per player per game | ~89 |
+| Intents per Stage | 22 — about 5.5 yours, 16.7 watched |
+| Phase split | Local Ops 78%, Load/Unload 19%, New Train 3% |
+| A turn: switch / draw / freight agent | 5.8 / 4.3 / 2.0 intents |
+| Frame | 9.3 KB mean; **2.9 KB** with the board delta'd |
+| Menu | 2.2 KB mean, 9.8 KB max |
+| Events per intent | 3.3, ~160 B |
+| Push rate | ~0.4 per second across a whole game |
+
+Two consequences worth stating plainly:
+
+**Latency is not the problem.** Watching does not block — pushes arrive asynchronously. The only
+latency a player feels is on their own ~89 actions: **1.7 seconds across an entire game** on a LAN.
+Nothing here is a performance decision.
+
+**Idle time is the problem.** With four players you watch ~17 of 22 intents per Stage. That is a
+turn-order property of the rules, not of the implementation — see §11 D19 for what is being kept
+open about it.
+
+> **Open, and not a plan decision:** a 4-player competitive game ends after **~16 Stages of a
+> possible 60**, well before the 5-day limit. Most likely the collision or revenue floor (§3.4)
+> firing early. Worth understanding before building a lobby around game length — it may be a balance
+> bug rather than intent.
+
+---
+
+## 4. The structural idea: a Session boundary
+
+Today `main.ts` calls `submit(game, intent)`, which applies in-process and re-renders. Introduce one
+interface between the UI and the game:
+
+```
+Session
+  view()            -> Frame          what to draw
+  menu()            -> Menu           what may be done
+  submit(intent)    -> Promise<ok>    propose an action
+  subscribe(cb)     -> unsubscribe    "something changed, re-render"
+  capabilities      -> { undo, saveLocal, newGame }
+```
+
+- **`LocalSession`** wraps today's `Game`: applies through the engine, pumps `advance`, keeps
+  `history`, supports undo and `localStorage`. **This is solitaire, unchanged.**
+- **`RemoteSession`** holds no authoritative state. Posts intents, receives `Frame` and `Menu`,
+  re-renders on push. Undo and local save are absent from `capabilities`, so the UI hides those
+  controls rather than failing when pressed.
+
+The client cannot keep authoritative state in remote mode even if it wanted to: it has neither the
+deck order nor the other players' hands.
+
+---
+
+## 5. What the client must stop doing
+
+`main.ts` reaches into `game.state` in **11 places**. Five new `Frame` fields remove all of them:
+
+| Reads today | Fix |
+| --- | --- |
+| `clock.day`, `clock.stage`, `clock.phase` | already on `Frame` |
+| `turn.option` | **add** — and under §6 it becomes *your* turn, not *the* turn |
+| `status`, `outcome` | **add** |
+| `players` (names and revenues of every seat) | **add** — the scoreboard is public |
+| `decks.hands.get(actor).length` | **add** as `handCount`, plus per-seat counts |
+
+Everything else it draws already comes from `Frame`/`Menu`.
+
+**Solitaire-only, gated by `capabilities`:** undo (other players have seen the result), `localStorage`
+save/restore, new-game-by-seed-in-URL.
+
+---
+
+## 6. Per-player turn state
+
+`s.turn` is a **single** `TurnState` — one `option`, one `movesRemaining`, one `freightWorked` — read
+in 50 places, with a phase driver that walks players one at a time calling `freshTurn()` as it goes.
+
+**Phase 0 makes it per-player: `turns: Map<PlayerIndex, TurnState>`, with a turn created for every
+player at phase entry.** This is deliberately **behaviour-neutral** — the cursor still advances one
+player at a time, so play is identical and every existing test still describes the same game.
+
+It is done now because the engine is least encumbered now, and because the alternative later means
+the same work *plus* reworking a client built around "wait your turn". There is no data migration
+either way: we persist intents, not state.
+
+**What it buys later.** There is exactly one `NOT_YOUR_TURN` gate in the engine (`apply.ts:463`,
+delegating to `isActor`). Once turn state is per-player, allowing genuinely local work to happen
+off-cursor is a change to that one function:
+
+```
+isActor(s, player, intent)
+  local intent   -> that player's own turn isn't done
+  shared intent  -> player is at the shared cursor
+```
+
+An intent is **local** iff it touches only the acting player's Office Area **and** does not advance
+the shared RNG (three sites: the reshuffle, the D12 that schedules a train, and setup).
+
+| Local | Shared |
+| --- | --- |
+| `switch.move`, `dropCars`, `sortConsist` | `draw.fromHomeOffice`, `draw.fromDepartment` |
+| `card.play` — track, facility, office, modifier, enhancement | `card.discard` (buries a shared pile) |
+| `localOps.choose`, `switch.end`, `draw.end` | `card.play` — **train cards**, which roll the D12 |
+| | `freightAgent.*`, and the yards generally |
+
+That flip is **not** part of this plan. See D19.
+
+---
+
+## 7. Redaction — the trust boundary
+
+`protocol.md` §4's table governs, and `Frame` was designed for it: `Frame.hand` is the *viewer's own*,
+`Frame.deck` is a count, and the seed is not on it.
+
+**The redaction surface is four fields, not sixty event types.** An earlier draft of this document
+claimed the latter and it was wrong — it biased the design. The genuinely secret things are:
+
+| Secret | Why |
+| --- | --- |
+| `seed`, `rngState` | leak every future shuffle and roll |
+| `decks.homeOffice` — contents *and* order | §12.1; the count is public, the pile's height is visible |
+| `decks.hands` — other players' | owner only; counts public |
+| `cards` (the id→kind map) | the dictionary that turns any leaked id into a known card |
+
+Everything else is public by the rules: the board, the Division, trays and consists, the timetable,
+the yards, the salvage pile, the face-up Departments, revenues, held Red Flags, the clock and whose
+turn it is. `trainScheduled` is **public** — `trainNumber`, `roll` and `slot` all belong on screen;
+only its `rngState` field must be stripped.
+
+So redaction reduces to: **call `snapshot(s, seat)` and never send `GameState`.** Because `Frame`
+resolves card names and descriptions server-side, the client never needs the `cards` dictionary at
+all.
+
+**This must be enforced, not assumed.** Phase 2's redaction test is the single most important test in
+the plan: serialize a seat's payload and assert it contains no other seat's card ids, no deck array,
+and no rng state.
+
+---
+
+## 8. Server shape
+
+One process, one port, same origin. Three layers:
+
+```
+  transport      HTTP: lobby, intents, static assets.  SSE: the per-seat stream.
+       |
+  game session   one per active game: owns state, serializes intents, pumps advance,
+       |         computes per-seat Frame+Menu, appends to the log
+       |
+  rules engine   unchanged, imported as-is from src/engine/
+```
+
+The session host is thin, because the engine does the hard part:
+
+```
+on intent(seat, intent, seq):
+    if seq already applied: ignore                       // idempotent resend
+    result = applyIntent(state, seat, intent)
+    if not result.ok: reply Rejected(result.code)
+    append intent to the log
+    pump(state)                                          // drain the automatic phases
+    for each connected seat:
+        push { frameΔ: delta(snapshot(state, seat)), menu: seat may act ? menuFor(seat) : null, lines }
+```
+
+`pump` after every intent is what today's `drain()` does, and it is why the Mainline Phase needs no
+special handling: `pump` stops, and the next push simply carries a `Menu` containing
+`mainline.clearance` for whoever must rule.
+
+**Bots run server-side** using the existing `developerBot`, for seats chosen at lobby time only.
+
+---
+
+## 9. Transport, and multiple addresses
+
+**SSE for push, HTTP POST for intents.**
+
+```
+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  /                    the client
+```
+
+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
+from anything in the path. WebSocket is supported on StartOS (`recipe-multi-interface.md`;
+`cln-startos` ships one) and remains a contained swap behind the `Session` interface if
+bidirectionality is ever wanted. Two channels means intents carry a `seq`, which the design already
+required for idempotent resend.
+
+**Players will reach one server at different addresses** — a LAN `IP:port` and a clearnet subdomain,
+in the same game. That works because the server serves the client from the same origin, so each
+browser is same-origin with itself and **no CORS is involved at any point**. One rule makes it hold:
+
+> The client derives every endpoint from `location`. Never from configuration, never baked in.
+
+Two consequences:
+
+- **`localStorage` is per-origin**, so a session token exists only at the address it was created at.
+  **A player rejoins at the address they joined from.** This is a stated constraint, not a bug to fix.
+- The two paths have different reliability characteristics — only the clearnet player traverses TLS
+  termination and ingress. SSE's automatic recovery is what makes that difference not matter.
+
+---
+
+## 10. Identity, access and persistence
+
+**Access: a server-wide join secret**, set by environment variable and passed out of band by whoever
+runs the server. Anyone holding it may create a game, and may join any created game that has not
+started. No accounts, no user database. *(Revisit — see `TODO.md`.)*
+
+**Seating is decided by §4.4's D12** as of v0.4.1, so `seating` is a real permutation rather than the
+identity mapping. Everything "round the table" — acting order, the deal, the Fedora — is seat
+arithmetic via `playerLeftOf`, and the three places that were doing it with player indices were found
+and fixed by turning the roll on. That is the point: the seat/player split is now exercised by every
+multi-player game instead of only by tests that rotate `seating` by hand.
+
+**Identity: a session token scoped to one game**, exactly as `lobby-and-sessions.md` describes.
+Joining issues it; presenting it *is* the rejoin, because it already names the game and the person:
+
+```
+Session   token, gameId, player, displayName
+```
+
+It names the **player**, not the seat — the two stopped being the same thing in v0.4.0, and Employee
+Rotation is precisely the case where a token naming a chair would seat someone in the wrong Office.
+The seat is `seatOf(state, player)`, one lookup and always current. (This said `seat` until the
+`lobby-and-sessions.md` review.)
+
+The join secret is separate and server-wide — typed once and kept per-origin for convenience. It
+gates entry; the token identifies a seat.
+
+**One game at a time per person is the expected usage, and is deliberately not enforced.** Enforcing
+it would mean a server-scoped token carrying an `activeGame`, and then answering what clears it — a
+finished game, a player who leaves, a game that never ends — which is real state to get wrong for no
+benefit. Nothing in the design needs a person to be in only one game, so nothing checks. A browser
+that ends up holding two tokens simply has two games.
+
+**Persistence: `{ engineVersion, seed, config, history: Intent[] }`**, append-only per game, plus a
+small index. Rebuilding is `fromSave`, already implemented and exercised by every published replay.
+No state snapshot — see D6.
+
+**Games do not survive a rules change, by design.** A saved intent legal under old rules is rejected
+under new ones; that happened four times in one release. So every game is stamped with its engine
+version, and on load a mismatch is **refused with an explicit message** rather than silently
+truncated. The upgrade path is: stop new games on the old version, let running ones drain.
+
+**Retention: finished games keep everything**, because replay reveals everything (D20) and the log is
+all it needs.
+
+---
+
+## 11. Decisions — reviewed and settled
+
+| # | Decision | Rationale |
+| --- | --- | --- |
+| **D1** | **SSE + HTTP POST** | The game is idle for minutes at a time and players arrive by different paths; browser-native reconnect and resume, no `Upgrade` dependency. Swap is contained behind `Session`. |
+| **D2/D3** | **Push `Frame` + `Menu`, delta'd. No raw event stream.** | Latency is not the deciding factor (1.7 s per game on a LAN), so decide on correctness: one reducer, one redaction chokepoint, no card dictionary on the client. 2.9 KB per push with the board omitted when unchanged — reusing `replay.ts`'s packing, already tested for losslessness. |
+| **D4** | **One client bundle**, mode switch | The engine ships either way; in remote mode it is simply not used for authority. |
+| **D5** | **Persist intents**, not events | Smaller, already the save format, already proven by `fromSave`. |
+| **D6** | **No state snapshot** | A second format to keep correct, and D7 removes the need. |
+| **D7** | **Stamp the engine version; refuse to resume a mismatch** | Rules changes invalidate stored intents. Drain before upgrading. |
+| **D8** | **Bots fill empty seats at lobby time only** | Makes short-handed games and one-person testing possible. Never automatic on disconnect — see the two `TODO.md` items. |
+| **D9** | **Separate seat from identity, now** | Employee Rotation needs a player's score to follow them while their seat changes. The single hardest thing here to retrofit, and the codebase is smallest today. |
+| **D10** | **No hotseat** in v1 | Nearly free once seats exist, but a different UX. Additive later. |
+| **D11** | **Server accepts 1-seat games**, but solitaire stays the static build | Falls out of seats generalising, and is genuinely useful for testing and validation. Not a featured path — playing alone gains nothing from a round trip. |
+| **D12** | **No spectators** in v1 | A view with no private section and no intent rights. Additive later. |
+| **D13** | **No accounts** | Display name plus a per-game session token, as `lobby-and-sessions.md` describes. One game at a time per person is the expected usage but is **not enforced** — doing so would add cross-game state to get wrong for no benefit. |
+| **D14** | **Server-wide join secret**, passed out of band | The server may be clearnet-reachable. Cheapest thing that stops it being someone else's game server. Revisit. |
+| **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 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. |
+
+**Still open, and deliberately so:** whether local turns should run in parallel (D19, needs human
+switching data); whether the join secret is enough (D14); and the ~16-Stage game length in §3, which
+is a balance question rather than an architecture one.
+
+---
+
+## 12. Build plan
+
+Sizes use `components.md`'s scale. Each phase ends somewhere demonstrable.
+
+### Phase 0 — Engine and client preparation · M — **done, v0.4.0**
+
+Safe to do now, and all of it improves the code whether or not multiplayer ships. Larger than a
+typical "phase 0" because two structural changes are cheapest here.
+
+1. **Separate seat from identity** (D9). `Player` carries id, name and revenue; the seat carries the
+   Office. Touches setup, `areaOf`, scoring, seating, the Division build and most tests.
+2. **Per-player turn state** (D19). `turns: Map<PlayerIndex, TurnState>`, one per player at phase
+   entry, `turnOf(s, player)` at 50 sites. **Behaviour-neutral** — the cursor still walks one player
+   at a time, and every existing test must still pass unchanged.
+3. Add `option`, `status`, `outcome`, `players[]`, `handCount` to `Frame`.
+4. Remove all 11 `game.state` reads from `main.ts`; add a test that it never regains one.
+5. Rewrite `protocol.md` to reference `intents.ts` and `events.ts` rather than restate them.
+
+**Done when:** solitaire plays identically, the client renders from `Frame` + `Menu` alone, and the
+engine has per-player turn state that nothing yet exploits. *All five shipped in v0.4.0. Item 1 found
+a real bug on the way — `awardDeparture` was indexing `s.players` with a seat.*
+
+### Phase 1 — The Session boundary · S — **done, v0.4.0**
+
+6. Define `Session`; implement `LocalSession` around today's `Game`.
+7. Move `main.ts` onto it, with `capabilities` gating undo, save and new-game.
+
+**Done when:** solitaire plays identically through the new interface. Maximum "nothing appears to have
+happened"; the regression suite is the proof. *Shipped in v0.4.0. The proof is `test/session.test.ts`,
+which plays seed 77 to a finish through both routes and asserts the boards and histories match, plus a
+source check that `main.ts` never regains a `GameState` read or a value import from `game.ts`.*
+
+### Phase 2 — Server core, one game, no lobby · M
+
+8. Process bootstrap: env-configured bind address, port, data directory, join secret; static serving.
+9. Game session host — the loop in §8.
+10. Per-seat `Frame` + `Menu`, with the board delta reusing `replay.ts`'s packing.
+11. **The redaction test** (§7). Fail loudly.
+12. SSE stream and `POST /api/intent`, with `seq` and `Last-Event-ID`.
+13. `RemoteSession` in the client.
+
+**Done when:** two browsers — one on a LAN IP, one on a hostname — play a 2-player game to a finish.
+
+### Phase 3 — Persistence and resumption · S
+
+14. Append-only `{engineVersion, seed, config, history}` per game; index.
+15. Load on start; rebuild via `fromSave`; refuse a version mismatch explicitly.
+16. **Turn timings**, stored beside the history and never inside it — wall-clock per player per
+    phase, so "how long does a 4-player game take, and which phase is the wait?" becomes a measured
+    answer instead of a guess (`lobby-and-sessions.md` §5).
+
+**Done when:** the server restarts mid-game and both clients carry on.
+
+### Phase 4 — Lobby, sessions, reconnection · M
+
+17. Join secret; per-game session token naming the **player** (not the seat); display name.
+18. Create/join by game code; bot seats; seating UI showing the west-to-east chain; config locked at
+    start; **2–4 players enforced here**, since the engine enforces nothing.
+19. Disconnect keeps the seat and announces it; reconnect replies with a full `Frame`.
+20. Host rights pass to the earliest-joined remaining player if the host leaves before start.
+
+**No forcing turn timer** — cut in the `lobby-and-sessions.md` review, and in `TODO.md` as something
+to explore only if halted games turn out to be a real problem. Nothing moves on an absent player's
+behalf.
+
+**Done when:** four people join from four browsers at two different addresses, one closes the tab and
+rejoins where they left off.
+
+### Phase 5 — Multiplayer content · M
+
+21. The 10 Action and 12 Space-use cards; flip `opponentCardsInDeck` in `setup.ts`.
+22. Facing Point Locks, Water Column and Overpass stop being dormant — already wired.
+
+**Done when:** an opponent-directed card resolves against another player and the Enhancement that
+answers it fires.
+
+### Phase 6 — Package for StartOS · S
+
+23. `.s9pk` per the workspace guide: interface, health check, backup of the data directory.
+
+**Done when:** it installs on a StartOS box and players on two different addresses play a game.
+
+**Shape of it:** Phases 0–1 are low-risk refactoring that stands on its own merits. Phases 2–4 are the
+real system. Phase 5 is content and independent of the rest. Phase 6 is packaging.
+
+---
+
+## 13. Risks
+
+**R1 — The switching UI is still the sleeper.** `components.md` called it that and it remains the
+hardest interface in the game. Multiplayer does not make it harder, but four people now watch one
+person use it.
+
+**R2 — Redaction must be exactly right.** Everything else degrades gracefully; a redaction bug hands
+someone else's hand to a player and cannot be walked back. Hence the explicit test, not a review.
+
+**R3 — `Menu` peaks at 9.8 KB** against a 2.2 KB mean. If that bites, send placements only for a
+selected card. Measure before optimising.
+
+**R4 — Idle time, not latency, is what makes 4-player games drag.** You watch ~17 of 22 intents per
+Stage. D19 keeps the door open; the instrumentation to decide it is a few lines and belongs in the
+first real multiplayer games.
+
+**R5 — The two provisional rules are still unplaytested.** The opening deal and departure Revenue are
+both flagged for review in `TODO.md`. Phases 0–1 are safe regardless; **Phase 2 onward should wait
+until those settle**, or the server gets built against rules that are still moving.

docs/architecture/overview.md

@@ -67,12 +67,18 @@ Three flows, and keeping them distinct is what keeps the implementation tractabl
 ```
 
 - **Intents** are what a player wants to do. They are proposals; they can be rejected.
-- **Events** are what happened. They are facts, ordered, and form the game's history.
+- **Events** are what happened. They are facts, ordered, and standalone — they narrate the game.
+  They do **not** reconstruct it: see `protocol.md` §3, and the note below.
 - **Views** are per-player projections of state, with other players' hands redacted.
 
-An event log that fully determines state is worth building even at this scale. It gives
+A recorded, ordered history is worth keeping even at this scale. It gives persistence (store the
-reconnection (replay to catch up), persistence (store the log, not a snapshot), and debugging (replay
+history, not a snapshot) and debugging (replay a reported bug exactly) for one design decision.
-a reported bug exactly) for one design decision.
+
+**That history is the INTENTS, not the events.** This paragraph originally said an event log "fully
+determines state", and it does not — the phase driver mutates state and then emits a descriptive
+event, so fourteen of the forty-six event types are never reduced, including every train movement.
+A game is `{ seed, history: Intent[] }` and `fromSave` replays it exactly. Reconnection is therefore a
+fresh view rather than a catch-up replay, which is simpler anyway.
 
 ### Post-game replay — a desired future capability
 
@@ -84,9 +90,13 @@ traffic, the wrecks, who was Superintendent when. For a game whose drama is larg
 you are playing your own Office, this is worth more than it would be in most games. You spend the
 game watching your own station; the replay is where you find out what the railroad was doing.
 
-State is already `fold(events)` over an ordered, append-only log, and all randomness derives from a
+A game is already reconstructible from `{ seed, history: Intent[] }`, and all randomness derives from
-stored seed. Replay is therefore a **read-only projection over the existing log** — no new rules-engine
+that stored seed. Replay is therefore a **read-only re-run of the stored intents** — no new
-surface, no second code path, nothing the server has to do differently during play.
+rules-engine surface, no second code path, nothing the server has to do differently during play.
+
+(This paragraph said "state is `fold(events)`" until v0.4.0. It is not: the phase driver mutates state
+and then emits a descriptive event, so folding the log rebuilds card plays and switching but not one
+train movement or clock tick. The intents are what is canonical.)
 
 Three constraints keep it cheap, and all three are free if honoured from the start:
 
@@ -115,13 +125,16 @@ trains move and wrecks happen while the Superintendent rules on clearances.
 That means the server must push. A request/response API alone would leave four players polling to
 watch a fifth switch cars.
 
-**WebSocket, with the HTTP endpoints alongside it** for lobby operations (list games, create, join)
+**Server-Sent Events, with HTTP POST alongside** for lobby operations and for intents, where a
-where a request/response shape is the natural fit. Server-Sent Events would also serve, since the
+request/response shape is the natural fit. This paragraph originally leaned the other way, toward
-push is nearly one-directional and intents are rare enough to send over HTTP — worth keeping in mind
+WebSocket with SSE as the fallback; it was settled the other way in
-if the eventual stack makes SSE materially simpler.
+[`multiplayer.md`](multiplayer.md) D5, because the push is nearly one-directional, intents are rare,
+and SSE reconnects itself through anything in the path without a protocol upgrade to negotiate.
 
-What matters more than the choice: **every state change reaches clients as an event on one ordered
+What matters more than the choice: **every state change reaches clients on one ordered stream**, and
-stream**. Clients apply events in order and never mutate state locally in a way that could drift.
+clients never mutate state locally in a way that could drift. What travels on that stream is a
+redacted `Frame`, not the raw events — see `multiplayer.md` D2/D3 for why one reducer and one
+redaction chokepoint beat shipping the history to every client.
 
 ---
 
@@ -141,7 +154,7 @@ is a lobby setting layered on top of the rules, never part of them.
 Worth stating, because small self-hosted scale makes several standard concerns disappear:
 
 - **No horizontal scaling.** A handful of concurrent games fits in one process. Game state lives in
-  memory; the event log is persisted for durability, not for coordination.
+  memory; the intent history is persisted for durability, not for coordination.
 - **No matchmaking service.** Players share a game code (see `lobby-and-sessions.md`).
 - **No accounts system, initially.** A display name plus a session token is enough to join and
   reconnect. Real accounts can be layered on later without touching the game engine.
@@ -159,7 +172,7 @@ Keep the **rules engine** free of any knowledge of networking, storage, or playe
         │
    game session        owns one game's state, applies intents, emits events
         ▲
-   lobby / transport   connections, reconnection, persistence, HTTP + WebSocket
+   lobby / transport   connections, reconnection, persistence, HTTP POST + SSE
 ```
 
 The rules engine being pure and deterministic is what makes the whole thing testable — you can drive

docs/architecture/protocol.md

@@ -1,269 +1,147 @@
 # Protocol
 
-The client↔server message vocabulary, and how per-player views are redacted. Written against
+The client↔server message vocabulary, and how per-player views are redacted.
-[`../rules/rules-v0.2.md`](../rules/rules-v0.2.md) and [`game-state.md`](game-state.md).
 
-Three message families, matching the flows in [`overview.md`](overview.md):
+**The vocabulary is code, not prose.** This document used to spell out every message with an
+illustrative name and an illustrative payload. It was written before the engine existed, and the
+engine then went and defined all three families for real — so the document became a second,
+drifting, subtly-wrong copy of three TypeScript files. It is now a map of those files plus the rules
+that live nowhere else.
 
-- **Intent** — client → server. A proposal. May be rejected.
+| Family | Direction | Authority |
-- **Event** — server → clients. A fact. Ordered, and the game's history.
+| --- | --- | --- |
-- **View** — server → one client. A redacted state snapshot.
+| **Intent** — a proposal, may be rejected | client → server | [`src/engine/intents.ts`](../../src/engine/intents.ts) — `Intent`, 28 variants |
+| **Event** — a fact, ordered; narration, not the record (§3) | server → clients | [`src/engine/events.ts`](../../src/engine/events.ts) — `GameEvent`, 46 variants |
+| **View** — a redacted projection | server → one client | [`src/sim/view.ts`](../../src/sim/view.ts) — `Frame` and `snapshot(state, …, seat)` |
+| **Rejection** — why an intent was refused | server → one client | `RejectionCode` in `intents.ts` |
 
-Message names below are illustrative. What matters is the *set* of decisions a player can make, which
+Read those files for the shapes. Each variant carries its own doc comment explaining the rule behind
-is fixed by the rules.
+it and, where the field arrangement is load-bearing, why it is arranged that way. What follows is
+what the types cannot say.
+
+The transport that carries these — SSE down, HTTP POST up — and the decision to push `Frame` + `Menu`
+rather than a raw event stream, are in [`multiplayer.md`](multiplayer.md) (D2/D3, D5). Written against
+[`../rules/rules-v0.2.md`](../rules/rules-v0.2.md) and [`game-state.md`](game-state.md); the flows are
+in [`overview.md`](overview.md).
 
 ---
 
 ## 1. Intents
 
-Every intent carries `gameId`, `playerId`, and a `seq` the server uses to reject duplicates from a
+**Intents are already the wire format.** A saved game is `{ seed, history: Intent[] }` and `fromSave`
-reconnecting client.
+replays it, which means the client→server message type was fixed the day save/restore worked. There
+is no separate protocol layer to design and nothing to keep in sync.
 
-### 1.1 Local Operations Phase
+Every intent is validated server-side even when the client only ever offers legal ones — `legalActions`
+and `check` are the same code, so a client-side menu is a convenience, never a guarantee.
+The framing an intent needs on the wire (`gameId`, who sent it, a `seq` for de-duplicating a
+reconnecting client's resend) is added by the transport and is not part of `Intent` itself: the engine
+is given the actor by its caller.
 
-The phase opens with a three-way exclusive choice (§6). Choosing one forecloses the others for that
+### What is deliberately NOT an intent
-Stage.
 
-```
+These are the places where offering a choice would be a rules violation, and they are worth stating
-LocalOps.Choose { option: switch | draw | freightAgent }
+here because "the message is missing" looks like an oversight in a way that "the message exists" never
-```
+does.
 
-**If `switch`** — six Moves, divisible across Crew Trays (§6.1). Five Moves under Reduced Visibility
+- **Picking up cars.** Moving into standing cars couples them automatically and mandatorily (§A.4).
-during night Stages (Appendix B).
+  The engine does it while resolving `switch.move`.
+- **Which cars come off.** `switch.dropCars` takes a *count*: cars come off in seated order (§A.3), so
+  the only free choice is how many, and from which end (`fromNose`).
+- **Mainline movement.** The whole phase is automatic except the Superintendent's clearance decision
+  (`mainline.clearance`, §8.1) — which arrives out of turn order and may concern another player's
+  train. It is the one place a player acts during someone else's traffic.
+- **Scheduling.** `trainScheduled` comes from the 1D12 (§7); nobody chooses it.
 
-```
+### Two loops the client must not flatten
-Switch.Move        { trayId, to: GridCoord }
-Switch.DropCars    { trayId, count }        -- from the tray end; order is fixed (§A.3)
-Switch.SetDirection{ trayId, direction }    -- costs a Move; a Move never reverses (§2.4)
-Switch.End         { }                      -- forfeit remaining Moves
-```
 
-Pick-up is **not** an intent. Moving into standing cars couples them automatically and mandatorily
+- **New Train cycles.** §7 goes round the table one car per player per pass until the consist is full
-(§A.4) — the server does it as part of resolving `Switch.Move`. Offering a choice would be a rules
+  or no suitable car remains. It is *not* one prompt per player per train. At five or more players a
-violation.
+  round can end mid-pass with players never prompted.
-
+- **`newTrain.passCar` is validated, not trusted.** §7 requires "every effort to find a suitable car",
-`Switch.DropCars` takes a count, not a set of car ids: cars come off in seated order (§A.3), so the
+  so the engine checks the Division Yard against the consist spec and refuses a pass when a legal car
-only free choice is how many.
+  is there.
-
-**If `draw`** (§6.2):
-
-```
-Draw.FromHomeOffice  { }
-Draw.FromDepartment  { slot: 0|1|2 }
-Card.Play            { cardId, placement? }   -- placement required for track/facility/office cards
-Card.Discard         { cardId, toSlot: 0|1|2 }
-Draw.End             { }                       -- server rejects while hand > 3
-```
-
-`placement` is a `GridCoord` for track, Facility and Office cards (§11.2); absent for train cards,
-which go to the timetable or to an Extra's staging.
-
-**If `freightAgent`** — exactly one of three operations (§6.3):
-
-```
-FreightAgent.StockToOutbound   { facilityId, stockType, loaded }
-FreightAgent.InboundToClass    { facilityId, stockIndex }
-FreightAgent.UnjamToClass      { facilityId, from: outbound|inbound|menAtWork, index }
-```
-
-### 1.2 New Train Phase
-
-Per train being made up, each player adds one car in Superintendent-then-left order (§7):
-
-```
-NewTrain.PlaceCar { trainId, stockType, loaded }
-NewTrain.PassCar  { trainId }        -- only legal when no suitable car exists in the Division Yard
-```
-
-**This cycles** (§7, Gap 9). The server keeps going round the table — one car per player per pass —
-until the consist is full or no suitable car remains in the Division Yard. It is not a single pass, so
-the client must not assume one prompt per player per train. At five or more players the round ends
-mid-pass when the consist fills; players not yet reached simply are not prompted.
-
-`PassCar` must be validated, not trusted: §7 requires the player to "make every effort to find a
-suitable car." The server checks the Division Yard against the train's `consistSpec` and rejects a
-pass when a legal car is available. A pass by every player in a full pass is the loop's other
-termination condition.
-
-For a played Extra (§7, Gap 4c) the owning player chooses its whole consist:
-
-```
-Extra.Launch    { trainCardId, at: westDP | eastDP, direction }
-Extra.LoadConsist { trainCardId, stock: [{stockType, loaded}] }   -- ≤3 cars + caboose
-```
-
-### 1.3 Mainline Phase
-
-The phase is automatic **except** for the Superintendent's clearance decision (§8.1, fourth
-condition). The server pauses movement, sets `clock.pendingDecision`, and waits:
-
-```
-Mainline.Clearance { trainId, allow: boolean }
-```
-
-Only the current Superintendent may send this, and only for the train named in the pending decision.
-This intent arrives out of the normal turn order and may concern another player's train — the one
-place in the game where a player acts during someone else's traffic.
-
-The Red Flag card (Emergency Toolbox, Appendix B) also interrupts here:
-
-```
-RedFlag.Play { }        -- averts an imminent collision; card is removed from the game
-```
-
-### 1.4 Load/Unload Phase
-
-Each Laborer and Porter is usable once per Stage (§9.1). Resolve one at a time.
-
-```
-Porter.Board      { facilityId }        -- §9.2, +1 Revenue
-Porter.Detrain    { facilityId }        -- §9.2, +1 Revenue
-Laborer.AdvanceLoad { facilityId, loadRef }   -- Green → MEN → AT → WORK → car (§9.3)
-Laborer.BeginUnload { facilityId, carIndex }  -- first step of unloading
-LoadUnload.End    { }
-```
-
-A freight load needs four `Laborer.AdvanceLoad` intents to score one point; a Porter scores in one
-(§9.3). The client should show this clearly — it is the single most surprising thing about the game's
-economy for a new player.
-
-### 1.5 Lobby
-
-Covered in [`lobby-and-sessions.md`](lobby-and-sessions.md); listed here for completeness.
-
-```
-Lobby.Create { config }
-Lobby.Join   { gameCode, displayName }
-Lobby.Leave  { }
-Lobby.SetConfig { config }      -- host only, before start
-Lobby.Start  { }                -- host only
-```
 
 ---
 
 ## 2. Rejections
 
-An intent is rejected with a reason a client can render, not a stack trace:
+`RejectionCode` in `intents.ts` is the closed set. `applyIntent` returns
+`{ ok: false, code, message }` — a reason a client can show, never a stack trace. The `message` today
+is the code restated (`apply.ts`); a client that wants prose should key off `code`, which is stable,
+rather than parsing it.
 
-```
+A client may pre-validate to grey out illegal moves — that is what `legalActions` is for, and it is
-Rejected { seq, code, message, ... }
+good UX — but the server's answer is the only one that counts. **Rejections should therefore be rare,
-
+which makes them worth logging server-side: a spike means client and server rules have drifted.**
-codes:  NOT_YOUR_TURN | WRONG_PHASE | OPTION_ALREADY_CHOSEN | NO_MOVES_REMAINING
-        ILLEGAL_MOVE | TRACK_OCCUPIED | NOT_OPERATIONAL_RAIL | WOULD_REVERSE
-        CONSIST_FULL | CONSIST_ORDER | HAND_LIMIT | CARD_NOT_IN_HAND
-        NO_PLACEMENT | NOT_CONNECTED | RESOURCE_SPENT | SUITABLE_CAR_EXISTS
-        NOT_SUPERINTENDENT | NO_PENDING_DECISION
-```
-
-The client may pre-validate to grey out illegal moves — good UX — but the server's answer is the only
-one that counts (`overview.md`). Rejections should be rare in a well-built client and are therefore
-worth logging server-side: a spike usually means client and server rules have drifted.
 
 ---
 
 ## 3. Events
 
-Events are the authoritative history. State is `fold(events)`, which is what gives reconnection,
+**Events narrate; they do not reconstruct.** This section claimed `state = fold(events)` until
-persistence and replay for one design decision.
+v0.4.0, and it was never true: `applyIntent` goes through `reduce`, but the phase driver mutates state
+and *then* emits a descriptive event, so fourteen of the forty-six event types are never reduced — the
+clock, and the whole Mainline phase, which is to say every train movement in the game.
 
-**Phase and clock**
+**The canonical record is `{ seed, history: Intent[] }`**, replayed by `fromSave`. That is what save,
+share, undo, restart recovery and post-game replay all run on, and it is what persistence stores
+(`multiplayer.md` §10). Events drive the display and the notifications. Do not build anything on
+folding them without first making the phase driver reduce, which is a rewrite of the most rule-dense
+code in the project and buys nothing the current plan uses.
 
-```
+**Events must render standalone** — the rule is stated at the top of `events.ts` and it is the one that
-StageBegan          { day, stage }
+gets broken by accident. Carry the `from`/`to`, not an id the renderer resolves against live state,
-PhaseBegan          { phase }
+or a replay viewer has to reconstruct the whole board to draw one frame.
-ActorChanged        { playerIndex | null }
-SuperintendentChanged { playerIndex }
-DayEnded            { day, revenues }
-```
 
-**Local operations**
+Two consequences worth knowing before adding an event:
 
-```
+- **`collisionOccurred` carries `faultPlayer` explicitly** rather than leaving clients to derive it.
-LocalOpsOptionChosen { playerIndex, option }
+  Fault depends on *where* the wreck happened — Superintendent for a Mainline card, the local player
-TrayMoved           { trayId, from, to, movesRemaining }
+  between their Limits (§10) — and getting it wrong misattributes a −5 and, in Competitive, feeds a
-CarsCoupled         { trayId, stock[] }        -- automatic, from a Move
+  floor that ends the game.
-CarsDropped         { trayId, at, stock[] }
+- **Events are not what goes over the wire.** The server applies the intent and pushes the resulting
-CardDrawn           { playerIndex, source, cardId? }   -- cardId omitted for other players
+  `Frame` (`multiplayer.md` D2/D3). Events are narration and cues, not the protocol — and a reconnect
-CardPlayed          { playerIndex, cardId, placement? }
+  gets a fresh `Frame` rather than the tail it missed.
-OfficeUpgraded      { playerIndex, from, to }   -- property change; connections unaffected (§11.3)
-CardDiscarded       { playerIndex, cardId, toSlot }
-DeckReshuffled      { }
-```
-
-**Trains**
-
-```
-TrainScheduled      { trainCardId, timetableSlot }     -- from the 1D12 roll (§7)
-TrainMadeUp         { trainCardId, trayId, at }
-CarPlacedOnTrain    { playerIndex, trayId, stock }
-ClearanceRequested  { trainId, followingInto, occupiedBy }
-ClearanceGiven      { trainId, allow }
-TrainHighballed     { trayId, from, to }
-TrainMoved          { trayId, from, to }
-TrainCompleted      { trayId, atDivisionPoint }
-```
-
-**Consequences**
-
-```
-CollisionOccurred   { at, trains[], struckCars[], faultPlayer, penalty: 5 }
-RedFlagPlayed       { playerIndex, avertedAt }
-RevenueChanged      { playerIndex, delta, total, reason }
-CollisionCountChanged { collisionsToday }
-GameEnded           { result, winner?, reason }
-```
-
-`CollisionOccurred` carries `faultPlayer` explicitly rather than leaving clients to derive it. Fault
-depends on *where* the wreck happened — Superintendent for a Mainline card, the local player between
-his Limits (§10) — and getting that wrong misattributes a −5 and, in Competitive, contributes to a
-floor that ends the game.
 
 ---
 
 ## 4. Views and redaction
 
-Each client receives a projection with other players' private state removed.
+Each client receives `snapshot(state, …, seat)` — a `Frame`, which is already a projection built for
+rendering and already takes the viewing seat. Nothing else is sent.
 
 | State | Visibility |
 | --- | --- |
 | Board: track grids, Offices, Limits, trains, standing cars | **Public** |
 | Facilities: boxes, `MEN AT WORK`, Laborer/Porter usage | **Public** |
 | Division Yard, Classification Yard contents | **Public** — physical piles on the table |
-| Salvage Yard | **Public** — face up, explicitly so players can audit discards (§2.6) |
+| Salvage Yard | **Public** — face up, so players can audit discards (§2.6) |
 | Department slots (the three face-up cards) | **Public** |
 | Home Office deck **contents and order** | **Secret** — never sent, to anyone |
 | Home Office deck **count** | Public — players can see the pile's height |
 | A player's hand | **Owner only**; others see the count |
-| Red Flag held | Public — it is a known starting card (Appendix B) |
+| Red Flag held | Public — a known starting card (Appendix B) |
 | Revenue totals | **Public** — the race is the game |
-| RNG seed | **Secret** — sending it leaks all future shuffles |
+| RNG seed and state | **Secret** — either leaks every future shuffle and roll |
 
-```
+**The redaction surface is four fields, not sixty event types** — `seed`, `rngState`,
-View {
+`deckReshuffled.order`, and `cardDrawn.cardId` when the draw was from the Home Office. The full
-  public   : PublicState          -- identical for every client
+argument, including why `trainScheduled` is public despite being a die roll, is in
-  private  : { hand: CardId[], redFlag: boolean }
+[`multiplayer.md` §7](multiplayer.md). It reduces to: **call `snapshot` and never send `GameState`.**
-  you      : PlayerIndex
-  canAct   : boolean
-  legalIntents? : IntentSummary[] -- optional server-computed affordances
-}
-```
 
-**Two redaction traps.** First, `CardDrawn` from the Home Office must omit `cardId` for every client
+**This is enforced, not assumed.** The redaction test is the single most important test in the
-except the drawer — the obvious version of this event leaks the draw to the table. Second, the deck
+multiplayer work: everything else degrades gracefully, a redaction bug hands a player the deck.
-*count* is public but the *order* is secret; a naive implementation that ships the deck array and
-tells the client not to look is not redaction.
-
-`legalIntents` is optional but worth it: the server already computes legality to validate, so
-returning the affordance set costs little and removes any need for the client to reimplement rules
-like turnout directionality or the four-slot consist limit.
 
 ---
 
 ## 5. Ordering and idempotency
 
-- Events carry a monotonic `eventSeq` per game. Clients apply strictly in order and request a replay
+- Events carry a monotonic sequence per game. Clients apply strictly in order and request a replay on
-  on a gap rather than guessing.
+  a gap rather than guessing.
 - Intents carry a client `seq`. The server ignores a repeat of one it has already applied, so a
   reconnecting client can safely resend anything it is unsure about.
-- The server never applies two intents concurrently within a game. With one actor at a time this is
+- **The server never applies two intents concurrently within a game.** A per-game queue is sufficient
-  free — a per-game queue is sufficient and there is no need for anything cleverer at this scale.
+  and there is nothing cleverer to do at this scale. Note this is a serialisation rule, not a
+  one-actor-at-a-time rule: per-player turn state (`turns: Map<PlayerIndex, TurnState>`) means several
+  players may hold an open turn at once, and their intents still land one at a time.

docs/design.md

@@ -45,76 +45,57 @@ must do.
 | [`architecture/protocol.md`](architecture/protocol.md) | Intents, events, and per-player view redaction. |
 | [`architecture/lobby-and-sessions.md`](architecture/lobby-and-sessions.md) | Create/join, seating, reconnection, persistence. |
 | [`architecture/deployment.md`](architecture/deployment.md) | Plain web host vs StartOS service — and the one constraint that differs. |
+| [`architecture/multiplayer.md`](architecture/multiplayer.md) | **The multiplayer build plan.** The authoritative server as a layer added on top, with solitaire unchanged and server-free — plus every decision taken, listed for review. |
 
 ## Current status
 
-Rules formalized, card faces specified, architecture documented, and the rules engine built and
+**v0.4.3.** Rules formalized, card faces specified, architecture documented, and the game playable
-simulated. Eleven of thirteen gaps are closed; **Gap 12 (balance variance) and Gap 13 (deck scaling)
+solitaire in a browser. See [`../CHANGELOG.md`](../CHANGELOG.md) for what each version changed and
-remain open**, both with data behind them.
+[`../TODO.md`](../TODO.md) for what is open; this section is the shape of the project, not a
+running tally, because a hand-maintained tally is what drifted last time.
 
-Gaps 8–13 were all found by working the design forward — building it or simulating it — rather than
+**What is built.** The rules engine, the developer bot, the balance harness, the replay viewer and
-by reading the PDFs. None arises in tabletop play, where a person simply does the sensible thing.
+the playable page — components 1–7, 17 and 18 of
+[`architecture/components.md`](architecture/components.md). A game can be saved, shared, replayed and
+stepped back through. **493 tests.**
+
+**What is not.** The server. Phases 0 and 1 of
+[`architecture/multiplayer.md`](architecture/multiplayer.md) landed in v0.4.0 — seat and player are
+separate, turn state is per player, and the page talks to a `Session` rather than to the engine, so a
+`RemoteSession` drops in without the page changing. Phase 2 onward is **deliberately held** until the
+two provisional rules introduced in v0.3.0 have been played at a table: changing a rule after the wire
+format is live costs far more than changing it before. Also unbuilt: the 22 opponent-directed cards
+and real audio.
+
+**Balance is not where it should be, and no conclusion should be read from the revenue numbers yet.**
+The rebalance pass is deliberately deferred until the rules stop moving — card counts, industry counts
+and the track mix all need moving together. `TODO.md` carries the standing distortions and the
+measurements behind them.
+
+**Three rules are genuinely open**, and they are the reason the README does not claim the rules are
+finished: where the Local's coach stands while its engine works (a §A.4 question, not a train-card
+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. Thirteen gaps in the prototype rules were found and closed;
+these three came after.
+
+**The event log narrates; the intents reconstruct.** Settled in v0.4.0 after the documentation had
+claimed `state = fold(events)` for months. It is not true — the phase driver mutates state and then
+describes it — so the canonical record is `{ seed, history: Intent[] }` and persistence will be built
+on that. [`architecture/protocol.md`](architecture/protocol.md) §3 has the reasoning;
+`test/events.test.ts` pins it.
 
 **The economy, in one line:** Local Operations actions are the main currency — one per Stage, twelve
 per Day — but **inbound work bypasses them**, which is where the game's variance comes from. See
 `card-reference.md` §7.
 
-**Wanted, not yet designed:** post-game replay — watching a finished game back at speed. The
-architecture already produces what it needs (an ordered append-only event log plus a stored seed), so
-the note in `architecture/overview.md` exists to keep the capability from being designed out. It is
-explicitly not scheduled.
-
-**Provisional numbers** — the victory targets are now confirmed at the mean by simulation. Still
-untested by play: Crew Tray count, Laborer counts, and whether the variance in Gap 12 is a flaw.
-
-**Next steps.** The specification is complete enough to build against or to play on paper.
-
-The build path is laid out in [`architecture/components.md`](architecture/components.md) — 20
-components, a dependency graph, and a twelve-step order. Its **MVP is solitaire: one Office, a fixed
-number of Days, a server talking to a single browser, display functional rather than pretty.** The
-milestones worth knowing:
-
-- **Step 4** — a full solitaire game runs to completion headless, proving the rules before a pixel is
-  drawn.
-- **Step 6** — the balance harness validates or retunes the provisional numbers, while changing them
-  is still free.
-- **Step 10** — MVP complete; a human plays end to end.
-
 **Stack: TypeScript**, chosen so the engine runs in both the server and the browser — one
 implementation of the movement rules, and instant affordances without a round-trip. Node 22 runs
-TypeScript natively, so there is no build step during development.
+TypeScript natively, so there is no build step during development, which also means **erasable syntax
+only**: no `enum`, no parameter properties, no namespaces.
 
-> **The recovered design files are now transcribed and the nine open questions answered** — see
+Running alongside, and independent of all of it: **print-and-play components.** `card-reference.md`
-> [`rules/implications.md`](rules/implications.md) §1b for exactly what is implemented. The deck is
+specifies every card face, so layout and art are the only remaining work before a table playtest —
-> 115 cards (93 in solitaire), Mainline cards have terrain and crossing times, and the balance
+which answers the one question simulation cannot, whether it is fun.
-> numbers below predate all of it.
-
-**Steps 1–6 are done** — the rules engine (components 1–7), heuristic bots (17) and the balance
-harness (18), with 134 tests passing.
-
-**The step 4 milestone is met: a full solitaire game runs to completion, headless.** Games are
-reproducible from a seed, terminate from every seed tried, conserve all 62 rolling stock pieces, and
-develop properly.
-
-**End-of-game statistics** (`src/sim/stats.ts`) report revenue by source, traffic, development,
-action mix and strategy buckets — plus an **anomaly detector** that treats "this event never fired"
-as a finding. It caught two bugs on its first run.
-
-**The step 6 milestone is met, with a caveat.** The harness found **five engine bugs that no test had
-caught**, and once they were fixed the numbers came good: **~35% win rate and 5.0 Revenue/player/Day,
-matching the Gap 10e prediction of 5-6.**
-
-The caveat is large: those numbers were themselves measured against a **scoring bug**, since fixed.
-Honest figures are ~0.9 Revenue/Day and a **0% win rate** — the targets are currently unreachable.
-The bot is still the prime suspect (it uses ~10 Laborer actions per game out of ~900 available), so
-this is **Gap 12** and remains open. One genuine signal did emerge: **mixed freight/passenger
-strategies outscore pure ones**, with pure freight much the worst.
-
-**Gap 11 is decided** — track orientation is chosen on placement, settled by measurement.
-**Gap 13** answers the deck-size question: do not double it; scale only the buildable cards with
-player count.
-
-Next: step 7 begins the server (components 8, 9, 20).
 
 Run the harness with `node src/sim/harness.ts [games] [length]`.
 

docs/design/cut-ordering-plan.md

@@ -0,0 +1,233 @@
+# Track order for standing cars, and the cut you left on your own card
+
+> **BUILT IN v0.4.7.** Kept as the record of why the model is what it is — the reproductions below
+> are the evidence for west-to-east, and none of them is re-derivable from the code that fixed them.
+>
+> Two departures from the plan as written, both recorded here so the document does not read as a
+> description of the code:
+>
+> - **Step 3 does not flip the card's cut.** The plan asked for `board-svg` to apply the tray strip's
+>   `facing === 'e' ? reverse : as-is` to the standing cars too. Once `standing` is defined west to
+>   east that flip would be wrong — the board is a map and draws west on the left, so the array is
+>   already in drawing order. What the renderer got instead is the half that actually answers the
+>   report: the row is split at the train, west cars left and east cars right, with the engine in the
+>   gap, and each car's tooltip says whether it is ahead of or behind the engine.
+> - **One new field after all.** The plan argued a cut's end is *derivable* from position in the
+>   array. It is not, in the one case that matters: a train may set out off both ends on the same
+>   square, and nothing in the array records where the train itself stands among them. That is
+>   `CrewTray.standingWest`, kept on the tray rather than the card because it describes a
+>   relationship — with no train there, a cut has no near or far side.
+>
+> **Step 5 was decided (i)**: taking your own cut back on the square you are standing on is undoing
+> the drop, exempt from the printed pick-up restrictions, and it refunds the freight budget.
+
+Plan for the next session. Two reported problems that turned out to be one problem.
+
+---
+
+## The reports
+
+1. **Drops.** "If I put cars off the nose on a given track, and my next move is go forward, I need to
+   couple those cars right back on. If I drop cars off the back and I move back, then I will
+   automatically recouple the cars onto the back of my train. Right after dropping my cars I need to
+   be able to see if those cars are ahead or behind the train."
+2. **Ordering.** "When dropping all 4 cars, order was reversed. It worked properly if we dropped cars
+   individually. Also, when adding four cars, again the order was reversed."
+
+---
+
+## The single root cause
+
+`TrackCard.standing` is a bare `RollingStock[]` whose doc comment claims "in track order (§A.3)" and
+which in fact has **no defined orientation at all**. `CrewTray.consist` *is* oriented — nose first,
+relative to `facing` — so every transfer between the two is an orientation change that nothing
+performs.
+
+§A.3 states the requirement plainly:
+
+> It is critical that cars are loaded into and unloaded from the Crew Tray, and occupy the track, in
+> the same order they originally held, **left-to-right**.
+
+Left-to-right is west-to-east. That is the orientation `standing` is missing.
+
+### Reproduced, against the working tree
+
+Scratch scripts only; reproduce with a tray on a plain straight, consist `[boxcar hopper reefer
+tank]`, `engineAt = 0`.
+
+**(a) Batch size changes the parked order.** Tail drops:
+
+| drops | `card.standing` afterwards |
+| --- | --- |
+| `count: 4` | `[boxcar hopper reefer tank]` |
+| `count: 1` ×4 | `[tank reefer hopper boxcar]` |
+| `count: 2` ×2 | `[reefer tank boxcar hopper]` — physically impossible |
+
+`carsDropped` always does `carsOn(card).push(...stock)` (`apply.ts:1657`). Each successive tail cut is
+left *outboard* of the previous one on the track, so it belongs at the other end of the array. Nose
+drops are batch-invariant by luck, so only tail drops show it.
+
+**(b) Coupling is orientation-blind.** A train running **east** onto a parked cut and a train running
+**west** onto the same cut yield the **identical** consist. They must mirror. `couples` is
+accumulated in path order in `exploreMoves` (`track.ts:448`) and `unshift`ed wholesale in
+`carsCoupled` (`apply.ts:1618`), with no reference to which way the engine met the cars.
+
+**(c) The display mismatch — what was actually seen on screen.** `board-svg.ts:736` draws the tray
+strip as `t.facing === 'e' ? [...items].reverse() : items`, so the nose lands on the right for an
+east-facing train (a deliberate fix, documented in the comment above it). The card's standing cars at
+`board-svg.ts:~633` are drawn in raw array order with no such flip. The same physical cut therefore
+reads one way in the tray and the other way on the card — and which one looks "reversed" flips with
+batch size *and* with train facing.
+
+The round trip (drop, run away, back up, collect) is internally self-consistent today, which is why
+this survived: whatever order got parked comes back in that order. Only the picture disagreed.
+
+### Why this settles the earlier design question
+
+The previous session offered two models for recording which end a cut sits at:
+
+- **Option A** — one cut per card plus a `standingEnd?: Port` marker. Cheap.
+- **Option B** — give `standing` a real orientation.
+
+Option A leaves (a), (b) and (c) in place. **Do Option B.** With orientation defined, "which end is
+the cut at" is *derivable* from position in the array and needs no new field — so B is also the
+smaller change once the ordering bugs are counted as in scope, which they now are.
+
+---
+
+## The model
+
+**`TrackCard.standing` (and `Facility.industryTrack.cars`, via `carsOn`) is ordered WEST to EAST.**
+
+That is the printed rule, it is the convention the board already draws in, and it is the only
+orientation that is a property of the board rather than of whichever train last touched the card.
+
+Two derived quantities, both cheap:
+
+- **A cut's end.** With a train on the card, cars before the train in track order are at its west
+  end, cars after it are at its east end. Combined with `railFacing`, that is "ahead" or "behind".
+- **Approach order.** A train travelling east meets a card's cars in array order; travelling west, in
+  reverse array order.
+
+The nose/tail blocking rule then reads: **a move that leaves the card through the end the cut sits at
+must couple that cut first** — onto the nose when running forward, onto the tail when reversing,
+which is what the existing `toNose: !i.reverse` already gives.
+
+### The two conversions, stated once
+
+- **Consist → track.** `consist` is nose-first; nose is `facing`. So an east-facing train's consist
+  reads east-to-west and must be **reversed** on the way onto the card; a west-facing train's reads
+  west-to-east and goes on **as-is**.
+- **Track → consist.** Build `couples` **near-to-far along the direction of travel** (reverse each
+  card's array when travelling west, and visit cards in path order). Then a nose coupling is
+  `unshift(...[...couples].reverse())` and a tail coupling is `push(...couples)` unchanged.
+
+Check the tail case by hand: backing east into a cut, the nearest car couples closest to the existing
+tail, and `consist` runs nose-to-tail, so near-before-far pushed in order is right. Check the nose
+case: running east into a cut, the *farthest* car ends up nose-most, so the reverse is right.
+
+---
+
+## Work, in order
+
+Each step should land green on its own.
+
+### 1. Define the orientation and fix the drop
+
+- `state.ts` — rewrite the `standing` doc comment to state west-to-east outright, and say `carsOn`
+  inherits it. That comment is currently the thing that is wrong.
+- `apply.ts` `carsDropped` reducer (~1649) — insert at the correct end for the dropping train's
+  `facing`, reversing the cut where the conversion above says to. A tail cut from an east-facing
+  train goes at the **west** end of whatever is already on the card; a nose cut from the same train
+  goes at the **east** end.
+- Tests: batch-invariance. `count: 4`, `1×4` and `2×2` must all produce the same `standing`, from
+  both ends, at both facings. Direct regression for report (2).
+
+### 2. Fix the coupling
+
+- `track.ts` `exploreMoves` (~448) — build `couples` near-to-far along travel, per the conversion
+  above. Needs the exit port at each hop, which the walk already has in `MoveStep`.
+- `apply.ts` `carsCoupled` (~1612) — reverse on `toNose`.
+- Tests: the mirror property. Approaching the same parked cut eastbound and westbound must give
+  mirrored consists, never identical ones.
+- Tests: round trip at both facings and all batch sizes — drop, run clear, back up, collect; the
+  consist must come back identical.
+
+### 3. Fix the picture
+
+- `view.ts` `CellView` — `cars: string[]` is flat and carries no relation to `train`. It needs enough
+  for the renderer to place the cut relative to the engine. Preferred: keep `cars` in track order
+  (west-to-east, matching state) and let the renderer flip, exactly as it already does for the tray
+  strip.
+- `board-svg.ts` (~633) — apply the same `facing === 'e' ? reverse : as-is` flip to the cut that line
+  736 applies to the tray, and lay the cut on the correct **side** of the train chip rather than in
+  the fixed slot row. This is the real UI work and answers "I need to see if those cars are ahead or
+  behind".
+- Tooltips: "standing here" becomes "standing ahead of the engine" / "behind the engine" when a train
+  shares the card.
+
+### 4. Layer on the blocking rule
+
+- `track.ts` `exploreMoves` — seed the walk's `couples` with the start card's cut when the cut sits at
+  the exit end. Today the walk begins at `neighbour(start, initialExit)` and never reads
+  `carsOn(startCard)` at all, so a train drives through its own cut in both directions. Regularise
+  the loop-back case at the same time: `couples` already picks up the start card if the walk circles
+  back to it, because only `results.push`/`block` are guarded by `!sameCoord(node.coord, start)`.
+- `apply.ts` `switch.move` build (~1230) — `lifted` is `[...dest.path.map(s => s.coord), i.to]` and can
+  never contain `start`. It must, or the recoupled cut is not cleared off the card.
+- `ctx.consistSize` — the start-card cut must count toward `MAX_CONSIST`, so `tooManyCars` bites at
+  the start square. Its message should name the cut on your own card or it will read as nonsense.
+- Tests: encode §A.5's two worked examples move-for-move. Both must remain playable; the trailing
+  example's step 1 ("drop the back two on Card F, move train to Card B") is the specific case that
+  must *not* recouple, and it is the strongest single check that the rule is right.
+
+### 5. Decide the printed-rule interaction — Jesse's call
+
+Dropping a freight car spends the square's budget for trains 3/4 (`oneFreightPerLocation`). Recoupling
+it on the way out would then be refused with `FREIGHT_WORKED_HERE`, so the train could only ever back
+away from its own cut. Same shape for X13 `dropOnly` and X22 `pickUpEmptiesOnly`.
+
+Two defensible answers:
+
+- **(i)** Recoupling your own cut on the square you are standing on is *undoing the drop* — exempt
+  from those restrictions, and it refunds the freight budget.
+- **(ii)** It is a pickup like any other; a train that sets out off its nose is committed to
+  reversing. Harsher, but never strands a train permanently, since backing up stays legal.
+
+Leaning (i): (ii) makes a legal-looking drop silently one-way, which is exactly the kind of trap the
+"why can't I move" panel exists to prevent.
+
+### 6. Bot and fixtures
+
+- `bot.ts` — the "drop the nose cut to un-bury the engine" heuristic (~1268) and "spot the back car at
+  this facility" (~1352) now have direction consequences. The bot cannot produce an illegal move
+  (legality is enforced upstream) but it will silently get worse until its scoring knows about the
+  cut.
+- `public/replays/seed-*.json` will diverge — legality changes, so bot play changes. Regenerate, as
+  was done last release.
+- **`docs/station-master-seed58228926-day6.json` no longer replays at all.** It stops at intent #2,
+  `mainline.modify c108` → `NO_SUCH_CARD`, because uncommitted deck changes shifted card ids. It
+  cannot serve as the regression case for these reports. Capture a fresh save against current code
+  reproducing the same switching sequence, and keep it.
+
+---
+
+## Files expected to change
+
+| File | Why |
+| --- | --- |
+| `src/engine/state.ts` | `standing` orientation, doc comment |
+| `src/engine/track.ts` | direction-aware `couples`; start-card cut; consist limit |
+| `src/engine/apply.ts` | `carsDropped`, `carsCoupled`, `switch.move` `lifted`, budget decision |
+| `src/sim/view.ts` | `CellView.cars` orientation and its relation to `train` |
+| `src/sim/board-svg.ts` | flip the cut, place it beside the chip, tooltips |
+| `src/sim/narrate.ts` | say which end was set out; distinguish recoupling own cut (~138) |
+| `src/sim/bot.ts` | direction-aware set-out heuristics |
+| `test/apply.test.ts`, `test/train-rules.test.ts`, `test/web.test.ts`, `test/replay.test.ts` | drop/couple batteries, §A.5 examples |
+| `public/replays/seed-*.json` | regenerate |
+
+## Not in scope
+
+- Leaving a coach at the Office (§A.4 / trains 7/8) — separate open item in `TODO.md`.
+- Any change to `maneuver.flyingSwitch`'s target rules. It drops onto a card with no train on it, so
+  the cut has no "end" to sit at; it just needs to land in west-to-east order like any other cut.

docs/plans/switching-paths.md

@@ -0,0 +1,207 @@
+# Plan — Train Switching Paths: two routes to the same square
+
+**Status:** built, v0.4.8. Written against `461c4d9`; see `docs/rules/open-questions.md` Gap 14 and
+the CHANGELOG's "Two routes to the same square" for the ruling and what shipped.
+**Reported by Jesse:** *"There are times when a train can take two different paths to get to a
+destination. See game at undo 379. Train 11 can go from Eastern limits to the straight at 1,1 two
+different ways. It can go through the refinery and pick up the tanker on its nose, or it could go
+straight straight and then make the curve and skip the refinery and not pick up the car. The player
+should have the two different options."*
+
+---
+
+## 1. The defect
+
+A district with a passing loop — turnout down off the main, curve, industry, curve, turnout back up —
+offers two routes from one end to the rejoin square. Both are legal under §2.4 (a Move runs any
+distance without changing direction; neither route ever leaves a card by the port it entered). They
+differ in what they couple.
+
+**The engine offers only one of them, and which one is an artifact of search order.**
+
+`exploreMoves` (`src/engine/track.ts:386`) keys its visited set on destination *and entry port*:
+
+```ts
+// src/engine/track.ts:492
+const key = `${coordKey(node.coord)}|${node.entry}`;
+if (seen.has(key)) continue;
+```
+
+Both routes arrive at the rejoin square through the **same port**, so they collide on that key. The
+walk is breadth-first, so the shorter route is recorded and the longer one is discarded before it can
+become a destination.
+
+### Reproduction
+
+Fixture — Running Track on row 0, industry spur on row −1:
+
+| | col 0 | col 1 | col 2 | col 3 | col 4 |
+|---|---|---|---|---|---|
+| **row 0** | straight | turnout `{w,e,s}` | straight | turnout `{e,w,s}` | Limits (east) |
+| **row −1** | — | curve `ne` | **Refinery + tanker** | curve `nw` | — |
+
+Walking west from `(0,4)`, today's engine returns:
+
+```
+(0,2)  entry=e  couples=[]        path=(0,3)
+(-1,3) entry=n  couples=[]        path=(0,3)
+(-1,2) entry=e  couples=[tanker]  path=(0,3)->(-1,3)
+(0,0)  entry=e  couples=[]        path=(0,3)->(0,2)->(0,1)      ← only one route to (0,0)
+(-1,1) entry=e  couples=[tanker]  path=(0,3)->(-1,3)->(-1,2)
+```
+
+The refinery route to `(0,0)` — which couples the tanker — is absent. A simple-path prototype on the
+same fixture returns both. Verified identical on v0.4.7 and v0.4.8.
+
+### It is not cosmetic
+
+`dest.path` feeds `carsCoupled.from` (`src/engine/apply.ts`, the `switch.move` execute branch at
+`:1303`) — the list of cards swept clean when cars are lifted. The route reaches the reducer, so
+"which route" must be part of the intent, not just the button text.
+
+### How often
+
+Instrumented over 60 developer-bot games (17,884 destinations enumerated):
+
+| measure | count |
+|---|---|
+| destinations enumerated | 17,884 |
+| squares reachable by 2+ **distinct paths** | 208 (~1.2%) |
+| squares where the routes **differed in what they couple** | **0** |
+
+So the geometry occurs and today's engine silently discards a route about 1% of the time — but the
+bot never builds a district where the discarded route *matters*. Two consequences:
+
+- **Balance impact is expected to be nil.** Still confirm with `compare.ts` (see §6).
+- **The bot will never regression-test this.** It needs explicit unit tests.
+
+---
+
+## 2. The rules question, and Jesse's ruling
+
+§A.4 says: *"If you move your Crew Tray into cars on your track, you **MUST** pick them up. You may
+not go around them."* Whether taking the main instead of the siding counts as "going around" decides
+whether this feature is legal at all.
+
+**Ruling (Jesse):** the player may choose the path. Different paths may pick up different cars, or
+none.
+
+The permissive reading is well-supported by the text: §A.4 says *"cars on your track"*, and the
+industry spur is a different track. Declining to enter it is not going around the tanker — it is not
+going to the tanker's track at all, which is ordinary railroading. The mandatory half still bites in
+full: once a route is chosen, every car standing on it couples, and there is no route that passes a
+car and leaves it.
+
+**Doc changes:** add the clarifying sentence to §A.4 in `docs/rules/rules-v0.2.md`, and record the
+ruling in `docs/rules/open-questions.md`.
+
+---
+
+## 3. Design decisions
+
+**The discriminator is `via`: one intermediate `GridCoord` on the chosen route** (Jesse's call).
+Not an index into the destination list — intents are the canonical record and `undo` replays history
+minus one intent, so an order-dependent field would silently reinterpret saved games.
+
+```ts
+// src/engine/intents.ts:19
+| { type: 'switch.move'; trayId: TrayId; to: GridCoord; reverse: boolean; via?: GridCoord }
+```
+
+- `via` names an **intermediate** card — never the start, never the destination.
+- **Resolution:** among destinations at `to` matching `reverse`, take the first enumerated route whose
+  path contains `via`. Enumeration stays shortest-first.
+- **`via` absent resolves exactly as today** (first route at `to`), so existing histories replay
+  unchanged. Note v0.4.8 already established that saves are *not* preserved across rule changes —
+  this is belt-and-braces, not a hard constraint.
+- **`legal.ts` emits a distinguishing `via`** per route, so a generated intent is never ambiguous.
+
+**Collapse routes whose outcome is identical.** Two routes that lift the same cars from the same
+cards are not a choice; offering both is noise in the action list and doubles the bot's branching
+factor for nothing.
+
+**The dedupe key must include the origin cards, not just car types.** Two routes can couple an
+identical car *multiset* lifted from *different* cards. Keying on type alone would collapse them and
+sweep the wrong card clean. Key on `(coord, entry, [(origin card, car)...])`.
+
+**Simple-path walk with an enumeration cap.** Relaxing `seen` to a per-path visited set keeps
+termination (no card twice within one path), but the number of simple paths is worst-case exponential
+in a dense district. Cap enumeration and prefer shortest routes when the cap bites.
+
+> Note: the 45°-diagonal matching rule appears to make closed loops geometrically impossible — a
+> rectangle of four curves cannot close, because the slopes do not match at the corners. **Do not
+> rely on this.** Use a path-local visited set and a cap regardless.
+
+---
+
+## 4. Change list
+
+| File | Site | Change |
+|---|---|---|
+| `src/engine/track.ts` | `exploreMoves` :386, `seen` :492 | Per-path visited set; dedupe on outcome; cap. Preserve shortest-first ordering. |
+| `src/engine/intents.ts` | :19 | Add `via?: GridCoord`. |
+| `src/engine/apply.ts` | `check` :623 | Select destination by `via`, not first-by-coord. |
+| `src/engine/apply.ts` | `execute` :1303 | Same selection; `carsCoupled.from` follows the chosen path. |
+| `src/engine/apply.ts` | `destinationsFor` :1210, `movesFor` :1260 | Unchanged signatures; `movesFor` still collapses to one square per coord for the board. |
+| `src/engine/legal.ts` | :90 | Emit one intent per distinct route, each with a distinguishing `via`. |
+| `src/sim/view.ts` | `describeIntent` :724 | Find the destination by `via` so the label names the cars *that route* couples. |
+| `src/web/game.ts` | `coordOf` :113, label dedupe ~:229 | Labels must differ per route or the label-dedupe drops one button. |
+| `src/web/main.ts` | `cellRef` :660 | Route-on-hover — see §5. |
+| `src/sim/narrate.ts` | move narration | Name the route when it is not the only one. |
+
+**`ownCutFor` (`apply.ts:1241`) needs no change** — it depends only on the exit port, not the route.
+
+---
+
+## 5. UI — route on hover (Jesse's choice)
+
+v0.4.8 already built the mechanism: `coordOf(intent)` → `cellRef` → `data-square="r,c"` on each
+action button, and hovering or focusing lights that square. This feature extends it from one square
+to a route.
+
+- Carry the path on the **menu**, resolved server-side, for the same reason `coordOf` is: a remote
+  client holds no `GameState`.
+- Emit the route as a second attribute (`data-route="r,c r,c …"`); hovering or focusing lights every
+  card the route runs over, with the destination keeping its existing stronger mark.
+- **On focus as well as hover**, matching v0.4.8 — the keyboard route is not a lesser one.
+
+Target rendering:
+
+```
+Switching Train 11, standing at (1, 4)
+  [ move to (1,1) ]
+  [ move to (1,1) — couples 1 tanker on the way (onto the nose) ]   ← hover
+```
+
+---
+
+## 6. Verification
+
+- **Unit test the fixture in §1** — both routes offered, one coupling the tanker and one not.
+- **`via` round-trip** — each intent `legal.ts` emits resolves back to the route it was generated for.
+- **Back-compat** — replay `public/replays/*.json` and assert identical outcomes with `via` absent.
+- **Origin-card dedupe** — two routes coupling identical car *types* from *different* cards must both
+  be offered, and each must sweep its own card.
+- **Cap** — a dense district must terminate and stay bounded.
+- **Balance** — `node src/sim/compare.ts 1600`. Expect no movement (the bot never builds this
+  geometry); keep only at t ≥ 3 per `README.md`, and read the better/worse/identical split.
+
+**Run the suite serially: `node --test --test-concurrency=1`.** The `npm test` script runs files in
+parallel and several of them invoke the static build against a shared `dist/`, which produces ~20
+spurious failures. Measured on `461c4d9`: parallel 20 fail / serial **575 pass, 0 fail**.
+
+> v0.4.8's CHANGELOG attributes those 20 failures to the tracked `node_modules` symlink. That fix was
+> real and worth making, but it is **not** the whole cause: on this checkout `tsc` resolves and
+> typecheck exits 0, yet the same 20 fail under parallel execution and pass under
+> `--test-concurrency=1`. The `dist/` race is still there. Worth fixing separately — give each
+> build-invoking test its own output directory.
+
+---
+
+## 7. Open question for Jesse
+
+A route's cards may be reachable only as a *subset* of a longer route's cards. If that ever happens,
+no single `via` uniquely selects the shorter route, and it is addressable only by the
+shortest-first tiebreak. It did not arise in any fixture or in 60 bot games, and it may be
+geometrically impossible — but if it does arise, the alternatives are to reject the ambiguous intent
+or to let shortest-first stand. **Shortest-first is assumed here.**

docs/rules/card-reference.md

@@ -42,17 +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 | Both | 2 | 2 | 2 | 3 | 2 |
+| Grocer's Warehouse | Boxcar | Inbound only | 2 | — | 2 | 3 | 2 |
-| Oil Refinery | Tank car | Both | 3 | 2 | 2 | 4 | 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 and a refinery do both. This gives §9 all three of its cases —
+produce ships out; a warehouse receives. This gives §9 all three of its cases — outbound-only,
-outbound-only, inbound-only, and both.
+inbound-only, and both — with the **Freight House the one card that does both**.
 
-**"Freight House"** (§9.3, Appendix A) is not a card. It is the collective term for a freight facility
+**The Grocer's Warehouse and the Oil Refinery are ONE-WAY** (corrected v0.4.9e, from gameplay
-that loads *and* unloads — the Grocer's Warehouse and the Oil Refinery. §9.3's "Passenger Facilities
+testing): "Grocer's Warehouse should be receive only, does not ship anything out"; "Refinery: only
-and Freight Houses permit cars to move each direction" therefore names exactly those two.
+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.
+
+**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
 
@@ -80,9 +96,10 @@ deliberately slower industries, unable to quite keep up with a dedicated player.
 That is why Laborer counts track Outbound capacity: Mine Tipple 3/3, Power Plant 3/3, Produce Shed
 2/2, Grocer's Warehouse 2/2. The numbers are derived from the action budget, not chosen freely.
 
-The Oil Refinery is the exception at 3 Laborers against 2+2 capacity, and deliberately so: it serves
+<!-- The paragraph that stood here explained the Oil Refinery's third Laborer as the price of serving
-two flows through one three-box pipeline, so its pipeline stays fuller than a one-way facility's and
+     two flows through one pipeline. It serves one flow (v0.4.9e), so the explanation is gone with the
-the third Laborer is earning its keep.
+     premise; whether the Laborer count is still right is part of the same unverified block flagged
+     above and in TODO.md. -->
 
 Even so, Laborers are rarely what limits a player — spotting the empty car and hauling the loaded one
 away both cost switching actions from the same budget. See §7.
@@ -138,8 +155,14 @@ above and below. Upgrades are drop-in and must never disturb a connection.
 ## 5. Modifier cards
 
 Five cards, one each. A Modifier is **not track**. It is placed adjacent to a Facility, on any of the
-nine nearby spots, and if adjacent to two Facilities its effect may be used on only one per Stage
+nine nearby spots — **diagonals included** — and if adjacent to two Facilities its effect may be used
-(§9).
+on only one per Stage (§9).
+
+Two placement rules follow from it not being track. It is **not bounded by the Limits**: a host
+standing at the edge of the district keeps all nine of its spots, or the card would be unplayable
+exactly where the district ends. And it may **never stand in the Running Track's row**, which inside
+the Limits is always full anyway — beyond the sign that row is the ground the main grows onto, and a
+Modifier parked there would block the Limits sign from moving outward (§2.1).
 
 | Card | Effect | Applies to |
 | --- | --- | --- |
@@ -252,12 +275,12 @@ with all boxes full:
 | Car | Facility demand | Supply | Headroom |
 | --- | ---: | ---: | --- |
 | Hopper | Mine Tipple 3×2 + Power Plant 3×2 = 12 | 12 | exactly met |
-| Tank | Oil Refinery (2+2)×2 = 8 | 8 | exactly met |
+| Tank | Oil Refinery 2×2 = 4 | 8 | 4 spare (was "exactly met" while the Refinery was two-way) |
-| Boxcar | Grocer's (2+2)×2 = 8 | 12 | 4 spare |
+| Boxcar | Grocer's 2×2 = 4 | 12 | 8 spare (same correction) |
 | Reefer | Produce Shed 2×2 = 4 | 8 | 4 spare |
 | Coach | Terminal 4+4, per Office | 16 | scales with Office count |
 
-Hoppers and tank cars are exactly met in the theoretical worst case, which cannot occur in practice —
+Hoppers are exactly met in the theoretical worst case, which cannot occur in practice —
 only 10 freight facility cards exist across a 52-card deck shared by all players, and the §2.2
 Classification Yard recycle returns stock to the Division Yard whenever it empties. Both are worth
 watching in playtesting.

docs/rules/glossary.md

@@ -24,8 +24,8 @@ Every defined term, alphabetized for lookup. The core comes from the Definitions
 | **Extra Platform** | Modifier card: +1 green and +1 red slot at a Passenger Facility. | §12.5 |
 | **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. Some allow only outbound, some only inbound, some both. Per-card values in §12.5. | §9, §12.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** | Not a card — the collective term for a freight facility permitting both directions, namely the Grocer's Warehouse and the Oil Refinery. | §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

@@ -6,7 +6,7 @@ it into this workspace:
 | File | What it is |
 | --- | --- |
 | `Deck cards2.xlsx` | The **complete card list** — every card, its count, where it may be placed, what it does |
-| `Mainline Cards.pdf` | The **Mainline card types** — Plains, Curves, Hilly, Heavy Grade, Double Track, Uncontrolled Siding, Tunnel, Trestle, Yard, and both Division Points |
+| `Mainline Cards.pdf` | The **Mainline card types** — Plains, Curves, Hilly, Heavy Grade, Double Track, Uncontrolled Siding, Tunnel, Trestle, Interchange (printed "Yard"), and both Division Points |
 | `Trains3.pdf` | The **train cards** — all 22, with names, speed class, consist and individual operating rules |
 | `tracks.png` | **Card art** for track and industry cards |
 
@@ -241,6 +241,27 @@ Freeing the Laborers freed the whole turn economy — passenger revenue doubled
 passenger rule changing. **Still 0 wins against a target of 20**, and freight is still only 13% of
 gross, so the loop runs now but does not yet carry the game.
 
+### Where the empty-car requirement belongs
+
+The rule above was later copied onto **stocking** as well, so `freightAgent.stockOutbound` refused a
+green box with no matching empty spotted. That is one step too early, and the designer's ruling is
+that it should never have been there:
+
+> A freight agent should be able to load an outbound green box prior to having the car there that
+> matches the load that he's putting in there. But in order for the laborers to move it from the
+> green box into the men at work track, they would need to have an empty car of the appropriate type
+> waiting there.
+
+Which is what §6.3 and §9.3 say between them. §6.3 lists the Freight Agent's act with no reference to
+the industry track at all; §9.3's **Load the car** is what requires "*a load in the Green Loading Box
+and an empty car of the required type on the industry's track*". So the two errands — fetch the
+cargo, spot the car — may be run in either order, and only the Laborer needs both done.
+
+**Staging ahead cannot jam anything**, which is why the early gate bought nothing: a load in a green
+box is waiting, not stuck, and the lockout in §9.3 applies to loads on MEN | AT | WORK. `startableLoad`
+holds the real gate, counting cars against loads already staged or on the sign so two loads can never
+walk toward one car.
+
 ### Track was unplayable (found while wiring up Enhancements)
 
 Moving track out of the deck into a per-player supply (§12.2) left **no way to play it**. Districts
@@ -465,13 +486,19 @@ Hotel) are what grow them.
 
 | # | Name | Speed | Consist | Rule |
 | --- | --- | --- | --- | --- |
-| 1/2 | Crack Limited | Fast | 3 coaches | Stop at Terminals only. No switching. Expedite. |
+| 1/2 | Crack Limited | Fast | 3 coaches † | Stop at Terminals only. No switching. Expedite. |
 | 3/4 | Express | Fast | 2 freight | May drop or pick up one freight car at every location. Expedite. |
-| 5/6 | The Sparrow | Fast | 2 coaches | No switching. Expedite. |
+| 5/6 | The Sparrow | Fast | 2 coaches † | No switching. Expedite. |
 | 7/8 | Local | Slow | 1 freight + 1 coach | Coach must remain on station track if switching. |
 | 9/10 | Heavy Freight | Slow | 3 freight + caboose | |
 | 11/12 | Drag Freight | Slow | 2 freight + caboose | |
 
+† **The two coach counts have since been swapped by Jesse** (Gitea#7, 2026-08-22): the Crack Limited
+now carries **2** coaches and The Sparrow **3**. The table above is left as `Trains3.pdf` prints it,
+because that is what this section is for — what the design SAYS. What the game plays is
+`src/engine/content.ts`, with the per-card table in
+[`../StationMaster-Home-Deck-v0.4.5.md`](../StationMaster-Home-Deck-v0.4.5.md).
+
 ### Extras (X13–X22) — ten distinct trains, not four generic ones
 
 Appleseed Extra (MT freight only, may drop but not pick up), Fruit Growers Express (reefers only),
@@ -518,7 +545,7 @@ We modelled a Mainline card as **2 regions, uniform**. The design has **ten dist
 | Uncontrolled Siding | 60 | trains may pass; separate "no pass" and "passing" starts |
 | Tunnel | 30 | |
 | Trestle | 60 | |
-| Yard | 60 | **sort cars into any new order**; has a Yard Limit |
+| 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 |
 
 Each card shows **Start positions** — where a train enters depending on direction, train type, and
@@ -762,3 +789,153 @@ Crossing is counted in Stages (Q1), so both trains simply run their counters dow
 Until this is settled the clearance buttons describe only what the engine actually does — they say
 the train "closes up behind" rather than promising a −5 risk that cannot occur. Wording that invents
 a consequence is worse than wording that under-sells one.
+
+---
+
+## §7 — where an Extra starts, and which way it runs
+
+**Reported from playing v0.4.9e** (Gitea#4): "When extras are played the player doing so may choose
+where the extra starts. They may choose either division point. And if the interchange mainline card
+has been played, they may start the extra on that card and choose the direction from there. If there
+is potential for conflict with other trains in that area the superintendent may hold the extra."
+
+**This supersedes an earlier ruling**, and the supersession is the interesting part. §2.3 gives every
+train its direction from its number — odd runs west, even runs east — and an earlier pass extended
+that to Extras explicitly: *"the number decides, like everything else on the timetable."* That reading
+cannot survive "either Division Point". An odd Extra placed at the WEST end would run west, leave the
+Division on its first move having crossed nothing, and be paid the completion Revenue for the run.
+
+So for **Extras only**, the start decides the direction:
+
+| Start | Direction |
+| --- | --- |
+| Western Division Point | east |
+| Eastern Division Point | west |
+| Interchange | player's choice |
+| Control Point (any Office above a Whistle Post) | player's choice |
+
+A timetabled train is unchanged: its number still decides. The Extra cards were always printed
+`direction: 'playerChoice'` (§5) and the engine had been overriding it; they now mean it.
+
+### The Interchange start is a YARD, not a spot on the running line
+
+§7's last clause — "the superintendent may hold the extra" — is what settles how this is modelled.
+An Extra started at an Interchange stands in that card's **yard**, off the running line, and highballs
+onto the card itself at a later Mainline Phase. Three things follow, all of them Jesse's rule rather
+than an implementation convenience:
+
+1. **Placing it can never force a collision**, however busy the card is. It is not on the road yet.
+2. **A guaranteed collision holds it in the yard** for another Stage, and it tries again next Stage.
+3. **A potential collision is the Superintendent's to rule on.**
+
+Those last two are exactly §8.1's two answers — an absolute bar against a facing train, a judgment
+call against a following one — so the Extra leaves the yard through the same clearance check a train
+leaves a Division Point through. Nothing new decides collisions.
+
+The Interchange keeps its printed "sort cars in new order" concept, still unimplemented (§6). Being
+the card with a Yard Limit is what makes it the one Mainline card a train can be made up on.
+
+### Which starts are offered is a setting
+
+The Division Points and the Interchange sit on shared ground and belong to nobody; starting an Extra
+inside a player's own district does not. That is a table preference rather than a rule, so it is set
+when the game is dealt (`extraStart`): Division Points and Interchange only, plus the playing
+player's own Control Point, or plus any player's Control Point. A **Whistle Post never qualifies at
+any setting** — being a place an Extra can start is part of what upgrading buys (§11).
+
+### Two bugs found underneath it
+
+- **The Mainline cards were rolled, not dealt.** `buildDivision` drew uniformly from the nine card
+  TYPES **with replacement**, so a Division could be dealt two Interchanges or two Tunnels, and
+  Plains — printed twice in the deck — carried the same weight as cards printed once.
+  `docs/StationMaster-Mainline-Deck-v0.4.5.md` had already flagged the mismatch as needing
+  correction; "an Extra may start at the Interchange if one is on the board" is what forced it, since
+  that only reads as a rule if the board holds at most one. Now dealt from the printed ten-card deck
+  without replacement.
+- **An Extra started anywhere but a Division Point ran empty.** `isBeingMadeUp` asked only "is this
+  tray standing at a Division Point", which was the whole truth while that was the only place to
+  build a train — so the Control Point start had shipped since it was added with a train that could
+  never be given a consist, and the Interchange start would have shipped the same way. Found by
+  playing it, not by the tests, which had only ever asserted where the tray landed.
+
+---
+
+## §6.2 — which train cards may be discarded
+
+**SUPERSEDED ONCE. Read both rulings; the second narrows the first.**
+
+**Gitea#6, v0.4.9e playtest:** "Players are not allowed to discard Train cards. They may keep the
+card in their hand for multiple stages and even multiple days, but they may not discard it. If a
+player has three train cards in their hand, and they draw a fourth, then they must play one of those
+cards." Extras counted: an Extra is a train.
+
+**Gitea#9, 2026-08-24 — the ruling in force:** "Timetabled trains are at the choice of the player:
+they can either play or discard. If someone else wants to pick it up, they are more than able to.
+The reason: I don't want, if you decide to play a game longer than five days, to decide that maybe
+there are too many trains, the stations are jammed, and the railroad doesn't need any more. You can
+toss it. Someone else might disagree and pick it up."
+
+So the rule is now:
+
+- a **Timetabled** train may be discarded;
+- an **Extra** may not. It never joins the timetable, so it can never be what jams it, and the only
+  rule it would dodge by being thrown away is the hand limit;
+- **on `main` the Timetabled half is a New Game setting** (`discardTimetabled`, on by default),
+  because Jesse's reasoning is explicitly about LONG games and a five-Day game may well want
+  Gitea#6's pressure. The 0.4.9 playtest line has no scaffolding for a setting and takes the plain
+  rule. Both lines behave identically at their defaults.
+
+**"Someone else might disagree and pick it up" needed no machinery.** A discard already goes face-up
+onto a Department pile, and a Department pile is exactly what a rival draws from. The second half of
+the ruling was already built; only the first half was a change.
+
+§6.2 as transcribed says only "the player must reduce his hand to no more than three cards" with no
+exception for any card type, so both of these are rulings rather than gaps — the prototype rules do
+not address it either way.
+
+### It needs no forcing mechanism, and that is the point
+
+The interesting property of the rule is that the forced play falls out of two rules that already
+exist rather than needing a third:
+
+1. an undiscardable card is not among the ways to shed a card; and
+2. `draw.end` already refuses while the hand is over the limit (§6.2).
+
+A player holding four undiscardable trains therefore has exactly one legal way to conclude the turn —
+play one — without anything in the engine ever computing "you must play a train". The corner cannot
+lock a player in, because **playing a train card is unconditionally legal**: `card.play`'s train case
+refuses only a board placement, and a train card played when the timetable is full still leaves the
+hand (it simply schedules nothing). Confirmed by playing it: such a hand offers zero discards, no
+`draw.end`, and four plays.
+
+**Gitea#9 does not retire that corner, it narrows the way in.** With the setting on, the only hand
+that reaches it is four Extras; with the setting off it is any four trains, exactly as before.
+
+### One place decides, and the card says which rule refused
+
+`keepReason` (`src/engine/apply.ts`) returns the sentence a player should read, or `null` if the card
+may be discarded. `check`, the hand panel and the blocked "End Local Operations" button all ask it,
+so none of them can drift from the rule. It returns a SENTENCE rather than a boolean because there
+are now two distinct reasons — "an Extra is never discarded" and "not in this game" — and a panel
+that hard-codes one of them tells half the players the wrong thing. It reaches the page as the
+Frame's `handKeepWhy`.
+
+The bot needed no rule of its own either. `legal.ts` enumerates candidates and filters them through
+`check`, so the option stops being offered; and the developer bot already reaches for `card.play`
+before it reaches for a discard. Measured over 400 games: 400/400 finished, revenue unmoved, and
+**trains scheduled 1.2 → 1.3** — the rule's intended effect, small because a bot rarely held four.
+
+### Consequences
+
+- **Two of the three published replays discarded train cards** (2 and 15 of them) and were retired
+  and re-recorded. Jesse's call: "I'm okay with retiring the replays that no longer work under those
+  old rules."
+- **The opening six-card hand is not exempt.** Under *six random cards* a player opens holding six
+  against a limit of three; if four or more are trains, they all go onto the timetable on turn one.
+  Jesse's call: "If the opening hand has lots of trains, then lots of trains will be placed on the
+  board." Rare — roughly 1.5% of deals — but deliberate.
+- **The player is told, on the card and on the button.** `handDiscardable` on the Frame marks which
+  cards may be shed, the hand panel says so in the card's own tooltip, and when EVERY card held is a
+  train the blocked end-turn button changes its text to say a train must be played. That is the
+  Gitea#2 lesson applied: a rule the player cannot see is a board with nothing to click and no reason
+  given.

docs/rules/open-questions.md

@@ -28,6 +28,7 @@ left open, with the consequence noted.
 | 11 | Track card orientation | **SUPERSEDED** — handedness is printed; both hands supplied |
 | 12 | Balance targets | **INVALIDATED** — measured against a placeholder ruleset |
 | 13 | Deck scaling by player count | **LARGELY DISSOLVED** — track is per-player by design |
+| 14 | Two routes to the same square | **DECIDED** |
 
 ---
 
@@ -669,10 +670,15 @@ balance work was possible.
 | --- | --- | --- | ---: | ---: | ---: | ---: |
 | Mine Tipple | Hopper | Outbound | 3 | 3 | — | 4 |
 | Produce Shed | Reefer | Outbound | 2 | 2 | — | 3 |
-| Grocer's Warehouse | Boxcar | Both | 2 | 2 | 2 | 3 |
+| Grocer's Warehouse | Boxcar | Inbound | 2 | — | 2 | 3 |
-| Oil Refinery | Tank | Both | 3 | 2 | 2 | 4 |
+| Oil Refinery | Tank | Outbound | 3 | 2 | — | 4 |
 | Power Plant | Hopper | Inbound | 3 | — | 3 | 4 |
 
+*Amended v0.4.9e.* The warehouse and the refinery were briefly "Both", on the reading that "Freight
+House" was a collective term for exactly those two and therefore what §9.3's "permit cars to move
+each direction" described. The Freight House turned out to be a card of its own (v0.5.0), and
+playtesting confirmed the one-way reading the sheet always printed.
+
 *Rationale.* Directions follow the commodity and give §9 all three of its stated cases. Bulk
 industries get more Laborers and a 4-car track so the types feel distinct when choosing what to
 build — but the counts stay moderate because Laborers are **not** the binding constraint (see 10e),
@@ -1003,3 +1009,28 @@ needs to get started, while giving each player material to build with.
 
 **Not yet decided**, because it interacts with Gap 12's variance question: more facilities per player
 would raise the ceiling on the runaway mode as well as the floor.
+
+## Gap 14 — Two routes to the same square
+
+**Status:** DECIDED.
+
+**Reported by Jesse:** "There are times when a train can take two different paths to get to a
+destination. See game at undo 379. Train 11 can go from Eastern limits to the straight at 1,1 two
+different ways. It can go through the refinery and pick up the tanker on its nose, or it could go
+straight and then make the curve and skip the refinery and not pick up the car. The player should
+have the two different options."
+
+**The question:** a passing loop — turnout off the main, curve down, industry, curve back up — offers
+two legal routes between the same two squares, and they couple different cars. Does §A.4's "you may
+not go around" a car standing on your track forbid taking the bypass?
+
+**Ruling: the player may choose the path.** Different paths may pick up different cars, or none.
+§A.4 says "cars **on your track**", and the industry spur is a different track — declining to enter
+it is not going around the car standing on it, it is not going to that car's track at all, which is
+ordinary railroading. The mandatory half still bites in full once a route is chosen: every car
+standing on the chosen route couples, and there is no route that passes a car and leaves it.
+
+**Built in v0.4.8** — see `docs/plans/switching-paths.md`. The engine enumerates every distinct
+simple route, dedupes by outcome (destination, entry side, and origin-tagged cars) rather than by
+destination alone, and an intent that would otherwise be ambiguous carries a `via` naming one
+intermediate square on the chosen route.

docs/rules/rules-v0.2.md

@@ -593,10 +593,16 @@ horizontal row through the Office, Limit-to-Limit; everything else is Secondary
 - Plain track, turnouts and Facility cards are all played from hand into an empty adjacent grid spot,
   and **must connect to existing track**. Facility cards carry their own rails — placing a Facility
   places track.
+- Track stays **inside the Limits at every row**, not only on the Running Track. §2.1 makes the sign
+  "the limit of your control area" and §3 defines Secondary Track as "all tracks in your limits", so
+  a siding may run *under* a sign — the sign stands on the boundary — and never past it. Widening a
+  district therefore means extending the main first.
 - Extending the **Running Track** horizontally moves that player's Limits sign outward with it (§2.1).
   Growth is uncapped in the prototype.
 - Modifier Facility cards are not track. They are placed adjacent to a Facility, on any of the nine
-  nearby spots (§9).
+  nearby spots (§9) — diagonals included, and not bounded by the Limits, since a host at the edge of
+  the district would otherwise have nowhere to put one. The one square they may not take is in the
+  Running Track's own row, which is where the main grows.
 
 A longer Running Track is more track to keep clear of arriving trains, so territory carries its own
 collision risk.
@@ -729,8 +735,8 @@ Modifier effects, and track geometries — is catalogued in
 | --- | --- | --- | ---: | ---: | ---: | ---: |
 | Mine Tipple | Hopper | Outbound | 3 | 3 | — | 4 |
 | Produce Shed | Reefer | Outbound | 2 | 2 | — | 3 |
-| Grocer's Warehouse | Boxcar | Both | 2 | 2 | 2 | 3 |
+| Grocer's Warehouse | Boxcar | Inbound | 2 | — | 2 | 3 |
-| Oil Refinery | Tank | Both | 3 | 2 | 2 | 4 |
+| Oil Refinery | Tank | Outbound | 3 | 2 | — | 4 |
 | Power Plant | Hopper | Inbound | 3 | — | 3 | 4 |
 
 | Office | Porters | Green slots | Red slots |
@@ -747,8 +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 not a card — it is the collective term for a freight
+**"Freight House"** (§9.3, Appendix A) is a Freight Facility card, dealt like any other industry —
-facility that both loads and unloads, namely the Grocer's Warehouse and the Oil Refinery.
+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).
 
 ---
 
@@ -795,7 +804,10 @@ same order they originally held, left-to-right.
 - The exception is your Office track, which has the number of A/D tracks listed (§11.1). As long as
   fewer trains are holding there than A/D tracks, you may enter and pass through.
 - If you move your Crew Tray into cars on your track, you **MUST** pick them up. You may not go around
-  them.
+  them. Where a passing loop offers two routes to the same square, choosing not to enter a siding is
+  not "going around" a car standing on it — that car is on a different track, and declining to run
+  onto it is ordinary railroading. Once a route is chosen, every car standing on it still must be
+  coupled in full.
 - A Crew Tray must always have an engine, and may move a maximum of four Rolling Stock — cabooses
   included **[Gap 4c]**.
 - You automatically couple to cars you meet during your Moves. The same is **not** true of trains

docs/station-master-seed493290760-day2.json

@@ -0,0 +1,656 @@
+{
+ "seed": 493290760,
+ "history": [
+  {
+   "type": "localOps.choose",
+   "option": "draw"
+  },
+  {
+   "type": "draw.fromHomeOffice"
+  },
+  {
+   "type": "card.play",
+   "cardId": "c138",
+   "placement": {
+    "row": 0,
+    "col": -1
+   },
+   "variant": 0
+  },
+  {
+   "type": "card.play",
+   "cardId": "c144",
+   "placement": {
+    "row": 0,
+    "col": 1
+   },
+   "variant": 0
+  },
+  {
+   "type": "card.play",
+   "cardId": "c11"
+  },
+  {
+   "type": "card.play",
+   "cardId": "c24"
+  },
+  {
+   "type": "draw.end"
+  },
+  {
+   "type": "loadUnload.end"
+  },
+  {
+   "type": "localOps.choose",
+   "option": "draw"
+  },
+  {
+   "type": "draw.fromDepartment",
+   "slot": 1
+  },
+  {
+   "type": "card.play",
+   "cardId": "c31"
+  },
+  {
+   "type": "draw.end"
+  },
+  {
+   "type": "loadUnload.end"
+  },
+  {
+   "type": "localOps.choose",
+   "option": "freightAgent"
+  },
+  {
+   "type": "freightAgent.stockOutbound",
+   "at": {
+    "row": 0,
+    "col": 0
+   },
+   "carType": "coach"
+  },
+  {
+   "type": "loadUnload.end"
+  },
+  {
+   "type": "localOps.choose",
+   "option": "freightAgent"
+  },
+  {
+   "type": "freightAgent.stockOutbound",
+   "at": {
+    "row": 0,
+    "col": 0
+   },
+   "carType": "coach"
+  },
+  {
+   "type": "loadUnload.end"
+  },
+  {
+   "type": "localOps.choose",
+   "option": "draw"
+  },
+  {
+   "type": "draw.fromDepartment",
+   "slot": 1
+  },
+  {
+   "type": "card.play",
+   "cardId": "c182",
+   "placement": {
+    "row": 0,
+    "col": 1
+   },
+   "variant": 1
+  },
+  {
+   "type": "card.play",
+   "cardId": "c159",
+   "placement": {
+    "row": 1,
+    "col": 1
+   },
+   "variant": 0
+  },
+  {
+   "type": "card.play",
+   "cardId": "c49",
+   "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": "c5"
+  },
+  {
+   "type": "draw.end"
+  },
+  {
+   "type": "newTrain.placeCar",
+   "trayId": "tray3",
+   "carType": "tank",
+   "loaded": false
+  },
+  {
+   "type": "newTrain.placeCar",
+   "trayId": "tray3",
+   "carType": "tank",
+   "loaded": false
+  },
+  {
+   "type": "newTrain.placeCar",
+   "trayId": "tray3",
+   "carType": "caboose",
+   "loaded": true
+  },
+  {
+   "type": "loadUnload.end"
+  },
+  {
+   "type": "localOps.choose",
+   "option": "freightAgent"
+  },
+  {
+   "type": "freightAgent.end"
+  },
+  {
+   "type": "loadUnload.end"
+  },
+  {
+   "type": "localOps.choose",
+   "option": "freightAgent"
+  },
+  {
+   "type": "freightAgent.end"
+  },
+  {
+   "type": "newTrain.placeCar",
+   "trayId": "tray2",
+   "carType": "coach",
+   "loaded": true
+  },
+  {
+   "type": "newTrain.placeCar",
+   "trayId": "tray2",
+   "carType": "coach",
+   "loaded": false
+  },
+  {
+   "type": "mainline.clearance",
+   "allow": 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.end"
+  },
+  {
+   "type": "porter.detrain",
+   "at": {
+    "row": 0,
+    "col": 0
+   }
+  },
+  {
+   "type": "porter.board",
+   "at": {
+    "row": 0,
+    "col": 0
+   }
+  },
+  {
+   "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": 0,
+    "col": -1
+   },
+   "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": 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": -1
+   },
+   "reverse": true
+  },
+  {
+   "type": "loadUnload.end"
+  },
+  {
+   "type": "localOps.choose",
+   "option": "switch"
+  },
+  {
+   "type": "switch.move",
+   "trayId": "tray3",
+   "to": {
+    "row": 0,
+    "col": 0
+   },
+   "reverse": false
+  },
+  {
+   "type": "switch.end"
+  },
+  {
+   "type": "loadUnload.end"
+  },
+  {
+   "type": "localOps.choose",
+   "option": "freightAgent"
+  },
+  {
+   "type": "freightAgent.stockOutbound",
+   "at": {
+    "row": 1,
+    "col": 0
+   },
+   "carType": "tank"
+  },
+  {
+   "type": "laborer.startLoad",
+   "at": {
+    "row": 1,
+    "col": 0
+   }
+  },
+  {
+   "type": "loadUnload.end"
+  },
+  {
+   "type": "localOps.choose",
+   "option": "draw"
+  },
+  {
+   "type": "draw.fromDepartment",
+   "slot": 0
+  },
+  {
+   "type": "card.play",
+   "cardId": "c194",
+   "placement": {
+    "row": 0,
+    "col": -2
+   },
+   "variant": 1
+  },
+  {
+   "type": "draw.end"
+  },
+  {
+   "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": "freightAgent"
+  },
+  {
+   "type": "freightAgent.end"
+  },
+  {
+   "type": "laborer.advanceLoad",
+   "at": {
+    "row": 1,
+    "col": 0
+   },
+   "box": 2
+  },
+  {
+   "type": "loadUnload.end"
+  },
+  {
+   "type": "localOps.choose",
+   "option": "draw"
+  },
+  {
+   "type": "draw.fromDepartment",
+   "slot": 1
+  },
+  {
+   "type": "card.play",
+   "cardId": "c154",
+   "placement": {
+    "row": 1,
+    "col": -2
+   },
+   "variant": 0
+  },
+  {
+   "type": "draw.end"
+  },
+  {
+   "type": "loadUnload.end"
+  },
+  {
+   "type": "localOps.choose",
+   "option": "draw"
+  },
+  {
+   "type": "draw.fromHomeOffice"
+  },
+  {
+   "type": "card.play",
+   "cardId": "c102",
+   "node": 1
+  },
+  {
+   "type": "draw.end"
+  },
+  {
+   "type": "loadUnload.end"
+  },
+  {
+   "type": "localOps.choose",
+   "option": "freightAgent"
+  },
+  {
+   "type": "freightAgent.end"
+  },
+  {
+   "type": "newTrain.placeCar",
+   "trayId": "tray3",
+   "carType": "boxcar",
+   "loaded": true
+  },
+  {
+   "type": "newTrain.placeCar",
+   "trayId": "tray3",
+   "carType": "tank",
+   "loaded": false
+  },
+  {
+   "type": "newTrain.placeCar",
+   "trayId": "tray3",
+   "carType": "caboose",
+   "loaded": true
+  },
+  {
+   "type": "loadUnload.end"
+  },
+  {
+   "type": "localOps.choose",
+   "option": "draw"
+  },
+  {
+   "type": "draw.fromHomeOffice"
+  },
+  {
+   "type": "draw.end"
+  },
+  {
+   "type": "loadUnload.end"
+  },
+  {
+   "type": "localOps.choose",
+   "option": "freightAgent"
+  },
+  {
+   "type": "freightAgent.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": 1,
+    "col": -2
+   },
+   "reverse": true
+  },
+  {
+   "type": "switch.dropCars",
+   "trayId": "tray3",
+   "count": 1
+  },
+  {
+   "type": "switch.dropCars",
+   "trayId": "tray3",
+   "count": 2
+  },
+  {
+   "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.move",
+   "trayId": "tray3",
+   "to": {
+    "row": 0,
+    "col": 2
+   },
+   "reverse": false
+  },
+  {
+   "type": "switch.move",
+   "trayId": "tray3",
+   "to": {
+    "row": 1,
+    "col": -2
+   },
+   "reverse": true
+  },
+  {
+   "type": "switch.dropCars",
+   "trayId": "tray3",
+   "count": 3
+  },
+  {
+   "type": "switch.dropCars",
+   "trayId": "tray3",
+   "count": 1
+  },
+  {
+   "type": "switch.end"
+  },
+  {
+   "type": "loadUnload.end"
+  },
+  {
+   "type": "localOps.choose",
+   "option": "switch"
+  },
+  {
+   "type": "switch.end"
+  },
+  {
+   "type": "porter.detrain",
+   "at": {
+    "row": 0,
+    "col": 0
+   }
+  },
+  {
+   "type": "porter.board",
+   "at": {
+    "row": 0,
+    "col": 0
+   }
+  },
+  {
+   "type": "loadUnload.end"
+  },
+  {
+   "type": "localOps.choose",
+   "option": "switch"
+  },
+  {
+   "type": "switch.move",
+   "trayId": "tray3",
+   "to": {
+    "row": 0,
+    "col": -1
+   },
+   "reverse": false
+  },
+  {
+   "type": "switch.move",
+   "trayId": "tray3",
+   "to": {
+    "row": 1,
+    "col": -2
+   },
+   "reverse": true
+  }
+ ]
+}

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "station-master",
-  "version": "0.0.1",
+  "version": "0.4.8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "station-master",
-      "version": "0.0.1",
+      "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.3.1",
+  "version": "0.4.9g",
   "private": true,
   "type": "module",
   "description": "Station Master — a railroad operations game",

scripts/build-web.ts

@@ -10,7 +10,7 @@
  */
 
 import { execFileSync } from 'node:child_process';
-import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync } from 'node:fs';
+import { copyFileSync, existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
@@ -151,6 +151,17 @@ if (existsSync(replaySrc)) {
 }
 writeFileSync(join(replayOut, 'manifest.json'), JSON.stringify(manifest, null, 1));
 
+/**
+ * Static images — the splash artwork and whatever joins it. Copied verbatim, unlike the replays
+ * above: an image needs no validation, only a place in `dist/` to be served from.
+ */
+const imageSrc = join(root, 'public/images');
+if (existsSync(imageSrc)) {
+  const imageOut = join(dist, 'images');
+  mkdirSync(imageOut, { recursive: true });
+  for (const f of readdirSync(imageSrc)) copyFileSync(join(imageSrc, f), join(imageOut, f));
+}
+
 // A tiny note for whoever unzips this later and wonders what it needs.
 writeFileSync(
   join(dist, 'README.txt'),

scripts/deploy-web.ts

@@ -1,11 +1,29 @@
 /**
- * Build the solitaire site and push it to a File Browser instance.
+ * Build the solitaire site and push it to a FileBrowser instance.
  *
- * Written against File Browser v2.63's REST API, read from its own bundle rather than guessed:
+ * REWRITTEN FOR **FileBrowser Quantum** (2026-08-23). The host was upgraded from File Browser v2.63
+ * to the Quantum fork, whose API is different in three ways at once, and every deploy failed with
+ * `login failed: 404 404 page not found` — the old `/api/login` simply is not there any more.
  *
- *   POST /api/login                          {username, password, recaptcha} -> JWT as plain text
+ * Read from the running instance's own bundle rather than guessed, the same way the v2.63 version
- *   POST /api/resources/<dir>/               X-Auth: <jwt>                   -> create a directory
+ * was (`/public/static/assets/index-*.js`, gzipped — pipe it through `gunzip` before grepping), and
- *   POST /api/resources/<file>?override=true X-Auth: <jwt>, body = bytes     -> upload
+ * each path confirmed against the live host by the response code: an endpoint that exists answers a
+ * bad password with **401**, one that does not answers **404**.
+ *
+ *   POST /api/auth/login?username=<u>&recaptcha=
+ *        headers X-Password: <urlencoded>, X-Secret: <otp or empty>   -> sets a session COOKIE
+ *   GET  /api/settings/sources                                        -> the named sources
+ *   POST /api/resources?path=<p>&source=<s>&isDir=true                -> create a directory
+ *   POST /api/resources?path=<p>&source=<s>&override=true  body=bytes -> upload
+ *
+ * THREE THINGS MOVED, and each would break on its own:
+ *   1. AUTH IS A COOKIE, not an `X-Auth: <jwt>` header. Login returns no usable token in its body;
+ *      the session arrives in `Set-Cookie` and every later request has to carry it back.
+ *   2. THE PASSWORD IS A HEADER, `X-Password`, URL-encoded — not a JSON body field.
+ *   3. THE PATH IS A QUERY PARAMETER, `?path=`, not part of the URL, and every resource call also
+ *      needs a **`source`** naming which configured store to write to. Quantum throws "no source
+ *      provided" without it. `FB_SOURCE` names it; left unset, the sole configured source is used,
+ *      and if there is more than one this stops and lists them rather than guessing.
  *
  * File Browser is the STORE, not the server — Start9 Pages serves the uploaded folder as the site.
  * So the job here is simply to land the built files in the right folder, intact.
@@ -18,6 +36,8 @@
  * Optional:
  *   FB_URL       default https://phoenix.local:58157
  *   FB_DEST      default websites/stationmaster — the folder Start9 Pages serves from
+ *   FB_SOURCE    which configured source to write to; discovered automatically when there is one
+ *   FB_OTP       the one-time code, if the account has two-factor enabled
  *   FB_INSECURE  set to 1 for a self-signed certificate (usual for a .local StartOS host)
  *   SITE_URL     default https://65.78.82.12:54697/ — the public address Start9 Pages serves at
  *   --dry-run    list what would be sent, contact nothing
@@ -44,6 +64,8 @@ const URL_BASE = (process.env['FB_URL'] ?? 'https://phoenix.local:58157').replac
 const DEST = `/${(process.env['FB_DEST'] ?? 'websites/stationmaster').replace(/^\/+|\/+$/g, '')}`;
 const USER = process.env['FB_USER'] ?? '';
 const PASS = process.env['FB_PASS'] ?? '';
+const OTP = process.env['FB_OTP'] ?? '';
+const SOURCE_ENV = process.env['FB_SOURCE'] ?? '';
 const DRY = process.argv.includes('--dry-run');
 
 /**
@@ -75,37 +97,80 @@ const CONTENT_TYPES: Record<string, string> = {
   '.txt': 'text/plain',
 };
 
+/**
+ * Log in and return the session cookie every later request must carry.
+ *
+ * The password goes in a HEADER and URL-encoded, which is Quantum's own client does
+ * (`X-Password: encodeURIComponent(password)`). The body carries nothing useful on success — the
+ * session is in `Set-Cookie`, so a deploy that ignored the cookie would authenticate and then be
+ * rejected by every upload.
+ */
 async function login(): Promise<string> {
-  const res = await fetch(`${URL_BASE}/api/login`, {
+  const url = `${URL_BASE}/api/auth/login?username=${encodeURIComponent(USER)}&recaptcha=`;
+  const res = await fetch(url, {
     method: 'POST',
-    headers: { 'Content-Type': 'application/json' },
+    headers: { 'X-Password': encodeURIComponent(PASS), 'X-Secret': OTP },
-    body: JSON.stringify({ username: USER, password: PASS, recaptcha: '' }),
   });
   const body = await res.text();
-  if (!res.ok) throw new Error(`login failed: ${res.status} ${body || res.statusText}`);
+  if (!res.ok) {
-  if (!body.trim()) throw new Error('login returned an empty token');
+    // 401 here is a wrong username/password; 404 would mean this build has moved the API again.
-  return body.trim();
+    throw new Error(`login failed: ${res.status} ${body || res.statusText}`);
-}
-
-async function makeDir(jwt: string, path: string): Promise<void> {
-  // Trailing slash is what marks a directory in this API. A 409 means it already exists, which is
-  // the normal case on every deploy after the first.
-  const res = await fetch(`${URL_BASE}/api/resources${encodePath(path)}/`, {
-    method: 'POST',
-    headers: { 'X-Auth': jwt },
-  });
-  if (!res.ok && res.status !== 409) {
-    throw new Error(`could not create ${path}: ${res.status} ${await res.text()}`);
   }
+  const cookies = res.headers.getSetCookie();
+  if (cookies.length === 0) throw new Error('login succeeded but set no session cookie');
+  return cookies.map((c) => c.split(';')[0]).join('; ');
 }
 
-async function upload(jwt: string, localPath: string, remotePath: string): Promise<void> {
+/**
+ * WHICH STORE TO WRITE TO. Quantum can serve several named sources and refuses any resource call
+ * that does not name one ("no source provided"), which is the parameter the v2.63 API had no
+ * concept of. One configured source is the normal case and is used without asking; more than one is
+ * ambiguous, and guessing would silently deploy the site into the wrong store.
+ */
+async function resolveSource(cookie: string): Promise<string> {
+  if (SOURCE_ENV) return SOURCE_ENV;
+  const res = await fetch(`${URL_BASE}/api/settings/sources`, { headers: { cookie } });
+  if (!res.ok) throw new Error(`could not list sources: ${res.status} ${await res.text()}`);
+  const names = Object.keys((await res.json()) ?? {});
+  if (names.length === 1) return names[0]!;
+  if (names.length === 0) throw new Error('the server reports no sources at all');
+  throw new Error(`several sources configured (${names.join(', ')}) — pick one with FB_SOURCE=<name>`);
+}
+
+function resourceUrl(source: string, path: string, extra: Record<string, string>): string {
+  const params = new URLSearchParams({ path, source, ...extra });
+  return `${URL_BASE}/api/resources?${params}`;
+}
+
+async function makeDir(cookie: string, source: string, path: string): Promise<void> {
+  const res = await fetch(resourceUrl(source, path, { isDir: 'true' }), {
+    method: 'POST',
+    headers: { cookie },
+  });
+  if (res.ok) return;
+  /**
+   * "Already there" is the normal case on every deploy after the first, and Quantum is not
+   * consistent about which code it reports it with. So the two failures worth stopping for are
+   * named — a rejected session, and a server that broke — and every other 4xx is treated as the
+   * directory already existing. A directory that genuinely is not there fails loudly at the upload
+   * a moment later, which is a better place to find out than a guess here.
+   */
+  const fatal = res.status === 401 || res.status === 403 || res.status >= 500;
+  if (fatal) throw new Error(`could not create ${path}: ${res.status} ${await res.text()}`);
+}
+
+async function upload(
+  cookie: string,
+  source: string,
+  localPath: string,
+  remotePath: string,
+): Promise<void> {
   const bytes = readFileSync(localPath);
   const ext = remotePath.slice(remotePath.lastIndexOf('.'));
-  const res = await fetch(`${URL_BASE}/api/resources${encodePath(remotePath)}?override=true`, {
+  const res = await fetch(resourceUrl(source, remotePath, { override: 'true' }), {
     method: 'POST',
     headers: {
-      'X-Auth': jwt,
+      cookie,
       'Content-Type': CONTENT_TYPES[ext] ?? 'application/octet-stream',
       'Content-Length': String(bytes.byteLength),
     },
@@ -114,11 +179,6 @@ async function upload(jwt: string, localPath: string, remotePath: string): Promi
   if (!res.ok) throw new Error(`upload ${remotePath} failed: ${res.status} ${await res.text()}`);
 }
 
-/** Encode each segment but keep the separators, so a path stays a path. */
-function encodePath(p: string): string {
-  return p.split('/').map(encodeURIComponent).join('/');
-}
-
 // ---------------------------------------------------------------------------
 
 console.log('building…');
@@ -147,15 +207,16 @@ if (DRY) {
     );
   }
 
-  const jwt = await login();
+  const cookie = await login();
-  console.log('logged in');
+  const source = await resolveSource(cookie);
+  console.log(`logged in — writing to source "${source}"`);
 
-  await makeDir(jwt, DEST);
+  await makeDir(cookie, source, DEST);
-  for (const d of dirs) await makeDir(jwt, `${DEST}/${d}`);
+  for (const d of dirs) await makeDir(cookie, source, `${DEST}/${d}`);
 
   let done = 0;
   for (const f of files) {
-    await upload(jwt, join(dist, f), `${DEST}/${f}`);
+    await upload(cookie, source, join(dist, f), `${DEST}/${f}`);
     done++;
     console.log(`  [${String(done).padStart(2)}/${files.length}] ${f}`);
   }

src/engine/advance.ts

@@ -18,6 +18,7 @@
 
 import {
   COLLISION_PENALTY,
+  EXPEDITE_FAULT_PENALTY,
   MAINLINE_PROFILES,
   enhancementRule,
   crossingStages,
@@ -27,6 +28,7 @@ import {
   STAGES_PER_DAY,
   STAGES_PER_SHIFT,
   collectiveRevenueFloor,
+  houseRules,
   lengthProfile,
   officeProfile,
   REGIONS_PER_MAINLINE_CARD,
@@ -36,10 +38,10 @@ import type { Direction } from './content.ts';
 import type { GameEvent } from './events.ts';
 // `trainNeedingCars` lives in apply.ts beside `check`'s copy of the same question, so the phase and
 // the legality test cannot disagree about which train is being assembled.
-import { areaOf, trainNeedingCars } from './apply.ts';
+import { areaAtSeat, areaOf, trainNeedingCars } from './apply.ts';
 import { legalActions } from './legal.ts';
-import type { CrewTray, DivisionNode, GameState, PlayerIndex, RollingStock, TrayId } from './state.ts';
+import type { CrewTray, DivisionNode, GameState, PlayerIndex, RollingStock, SeatIndex, TrayId } from './state.ts';
-import { coordKey, freshTurn, subdivisions, totalRevenue } from './state.ts';
+import { coordKey, freshTurns, playerAtSeat, playerLeftOf, pooled, subdivisions, totalRevenue, turnOf } from './state.ts';
 
 export type AdvanceResult = {
   events: GameEvent[];
@@ -61,8 +63,8 @@ function movesForStage(s: GameState): number {
 // Division navigation
 // ---------------------------------------------------------------------------
 
-function nodeIndexOfOffice(s: GameState, owner: PlayerIndex): number {
+function nodeIndexOfOffice(s: GameState, seat: SeatIndex): number {
-  return s.division.nodes.findIndex((n) => n.kind === 'office' && n.owner === owner);
+  return s.division.nodes.findIndex((n) => n.kind === 'office' && n.seat === seat);
 }
 
 const step = (d: Direction): number => (d === 'east' ? 1 : -1);
@@ -101,31 +103,41 @@ function playerPhase(
   events: GameEvent[],
   phase: 'localOps' | 'loadUnload',
 ): AdvanceResult {
+  /**
+   * THE CURSOR STILL WALKS ONE PLAYER AT A TIME.
+   *
+   * Turn state is now per-player, but only the player at `actorOffset` is ever asked to act, so this
+   * behaves exactly as it did when there was a single `TurnState` — which is the point: the model
+   * change is neutral, and letting local work happen off-cursor is a later change to `isActor`
+   * alone (`docs/architecture/multiplayer.md` D19).
+   */
+  const actor = actorAt(s, s.clock.actorOffset);
+  const turn = turnOf(s, actor);
+
   // A Freight Agent operation is a whole action in itself, so the turn ends with it (§6.3).
-  if (phase === 'localOps' && s.turn.option === 'freightAgent' && s.turn.freightAgentUsed) {
+  if (phase === 'localOps' && turn.option === 'freightAgent' && turn.freightAgentUsed) {
-    s.turn.done = true;
+    turn.done = true;
   }
   // Spending the last Move ends a switching turn without needing an explicit end (§6.1).
-  if (phase === 'localOps' && s.turn.option === 'switch' && s.turn.movesRemaining === 0) {
+  if (phase === 'localOps' && turn.option === 'switch' && turn.movesRemaining === 0) {
-    s.turn.done = true;
+    turn.done = true;
   }
 
-  if (!s.turn.done) {
+  if (!turn.done) {
-    s.clock.currentActor = actorAt(s, s.clock.actorOffset);
+    s.clock.currentActor = actor;
 
     // SAFETY NET. If the actor has no legal action at all, the turn ends rather than deadlocking.
     // This should never fire — an option with no follow-up is already unavailable (§6, apply.ts) —
     // but a rules gap that stranded a player would otherwise hang the game rather than fail
     // visibly, and a hung game is far harder to diagnose than a forfeited turn.
     if (legalActions(s, s.clock.currentActor).length === 0) {
-      s.turn.done = true;
+      turn.done = true;
     } else {
       return { events, needsInput: true };
     }
   }
 
   s.clock.actorOffset += 1;
-  s.turn = freshTurn(movesForStage(s));
 
   if (s.clock.actorOffset >= s.players.length) {
     return { events: [...events, ...enterPhase(s, nextPhase(phase))], needsInput: false };
@@ -137,7 +149,7 @@ function playerPhase(
 }
 
 function actorAt(s: GameState, offset: number): PlayerIndex {
-  return (s.clock.superintendent + offset) % s.players.length;
+  return playerLeftOf(s, s.clock.superintendent, offset);
 }
 
 function nextPhase(p: GameState['clock']['phase']): GameState['clock']['phase'] {
@@ -158,7 +170,9 @@ function nextPhase(p: GameState['clock']['phase']): GameState['clock']['phase']
 function enterPhase(s: GameState, phase: GameState['clock']['phase']): GameEvent[] {
   s.clock.phase = phase;
   s.clock.actorOffset = 0;
-  s.turn = freshTurn(movesForStage(s));
+  // Every player gets a turn at phase entry, not one at a time as the cursor reaches them. With the
+  // cursor still walking sequentially this is indistinguishable from the old behaviour.
+  s.turns = freshTurns(s.players.length, movesForStage(s));
   s.clock.currentActor = phase === 'mainline' ? null : actorAt(s, 0);
   return [
     { type: 'phaseBegan', phase },
@@ -240,34 +254,23 @@ function newTrainPhase(s: GameState, events: GameEvent[]): AdvanceResult {
     }
   }
 
-  // §7 — "Once all timetabled trains are created, if there is a played Extra Train card and an
+  /**
-  // available Crew Tray, the player who played the card may place the Crew Tray in either division
+   * §7 — "if there is a played Extra Train card and an available Crew Tray, the player who played
-  // point for immediate departure." An Extra runs once and is gone.
+   * the card may place the Crew Tray in either division point for immediate departure."
-  //
+   *
-  // SIMPLIFICATION, flagged: the rules let the player choose the direction. This launches eastbound
+   * THIS USED TO LAUNCH EVERY EXTRA EASTBOUND FROM THE WEST DIVISION POINT, with the simplification
-  // from the West Division Point. Giving the player the choice needs its own intent.
+   * flagged in a comment. Jesse's rule: an Extra runs the way its NUMBER says, exactly as a
+   * timetabled train does — odd runs west, even runs east (§2.3) — so it starts at the Division
+   * Point it runs FROM. It may instead start at any Control Point, which is any Office above a
+   * Whistle Post, at the player's choice.
+   *
+   * That is a decision, so the phase stops for it the same way it stops to have cars placed. The
+   * chooser is the acting player; §7 says the player who PLAYED the card, which is the same person
+   * in solitaire and needs `pendingExtras` to carry a player before it is not.
+   */
   if (s.pendingExtras.length > 0 && s.freeTrays.length > 0) {
-    const number = s.pendingExtras.shift()!;
+    s.clock.currentActor = actorAt(s, s.clock.actorOffset % s.players.length);
-    const trayId = s.freeTrays.pop()!;
+    return { events, needsInput: true };
-    s.trays.set(trayId, {
-      id: trayId,
-      trainNumber: number,
-      trainIsExtra: true,
-      engineAt: 0,
-      consist: [],
-      direction: 'east',
-      position: { at: 'divisionPoint', side: 'west' },
-      movesUsed: 0,
-    });
-    const dp = s.division.nodes.find((n) => n.kind === 'divisionPoint' && n.side === 'west');
-    if (dp?.kind === 'divisionPoint') dp.holding.push(trayId);
-    events.push({
-      type: 'trainMadeUp',
-      trainNumber: number,
-      isExtra: true,
-      at: 'West Division Point',
-      direction: 'east',
-    });
   }
 
   // Gap 9 — the car-placement round REPEATS until the consist is full or no suitable car remains.
@@ -305,6 +308,38 @@ function mainlinePhase(s: GameState, events: GameEvent[]): AdvanceResult {
       return d !== 0 ? d : Number(a.trainIsExtra) - Number(b.trainIsExtra);
     });
 
+  /**
+   * Q3 — A STATION MASTER FAULT: an expedited train not at the station when a Mainline Phase begins
+   * was not kept ready to highball, wherever in the district it has been left — switched onto
+   * Secondary Track to clear a move, say. Checked against positions as they stand BEFORE this phase
+   * moves anything, and charged every Phase it is still caught away: the fault is in leaving it
+   * there, not a one-time slip. A train the ordinary §8.1 rules are holding at the Office itself is
+   * unaffected — this only bites when the train is not even in the queue to leave.
+   */
+  for (const [, tray] of order) {
+    if (!isExpedited(tray) || tray.position.at !== 'grid') continue;
+    const area = areaAtSeat(s, tray.position.seat);
+    const { coord } = tray.position;
+    if (coord.row === area.officeCoord.row && coord.col === area.officeCoord.col) continue;
+    const owner = playerAtSeat(s, tray.position.seat);
+    const p = s.players[owner];
+    if (!p) continue;
+    p.revenue -= EXPEDITE_FAULT_PENALTY;
+    events.push({
+      type: 'expediteFault',
+      player: owner,
+      trainNumber: tray.trainNumber ?? 0,
+      where: `(${coord.col},${coord.row})`,
+    });
+    events.push({
+      type: 'revenueChanged',
+      player: owner,
+      delta: -EXPEDITE_FAULT_PENALTY,
+      total: p.revenue,
+      reason: 'expedited train left off the station',
+    });
+  }
+
   for (const [id, tray] of order) {
     if (s.movedThisPhase.has(id)) continue;
     const where = tray.position;
@@ -327,12 +362,13 @@ function mainlinePhase(s: GameState, events: GameEvent[]): AdvanceResult {
         (tray.position.at !== 'grid' ||
           where.at !== 'grid' ||
           (tray.position.coord.row === where.coord.row && tray.position.coord.col === where.coord.col));
-      if (moved !== 'expedited' && stillThere) {
+      if (stillThere) {
         tray.stopPointClaimed = true;
-        const owner = tray.position.at === 'grid' ? tray.position.owner : 0;
+        // The point goes to whoever is SITTING in the district it stopped in.
+        const owner = tray.position.at === 'grid' ? playerAtSeat(s, tray.position.seat) : 0;
         const label =
           tray.position.at === 'grid'
-            ? `(${tray.position.coord.row},${tray.position.coord.col})`
+            ? `(${tray.position.coord.col},${tray.position.coord.row})`
             : tray.position.at === 'mainline'
               ? `Mainline card ${tray.position.index}`
               : `the ${tray.position.side} Division Point`;
@@ -351,11 +387,6 @@ function mainlinePhase(s: GameState, events: GameEvent[]): AdvanceResult {
       }
     }
     if (moved === 'needsClearance') return { events, needsInput: true };
-    // An expedited train may act twice in one Stage: it arrives and departs (Q3).
-    if (moved === 'expedited') {
-      const again = moveTrain(s, id, tray, events);
-      if (again === 'needsClearance') return { events, needsInput: true };
-    }
     s.movedThisPhase.add(id);
   }
 
@@ -363,7 +394,7 @@ function mainlinePhase(s: GameState, events: GameEvent[]): AdvanceResult {
   return { events: [...events, ...enterPhase(s, 'loadUnload')], needsInput: false };
 }
 
-type MoveOutcome = 'moved' | 'held' | 'needsClearance' | 'expedited';
+type MoveOutcome = 'moved' | 'held' | 'needsClearance';
 
 /**
  * §8.2 — why this train is not fit to run, or null if it is.
@@ -414,6 +445,29 @@ function enterMainline(
   );
   node.transits.push({ tray: id, stagesRemaining: stages, stagesTotal: stages, direction: tray.direction });
   tray.position = { at: 'mainline', index };
+  // It is running now, so it is no longer being assembled (state.ts). A train at a Division Point
+  // needs no equivalent: leaving one changes its position, which is what that case reads.
+  delete tray.beingMadeUp;
+
+  /**
+   * OUT OF THE DISTRICT, AND THE SPUR PORT GOES WITH IT.
+   *
+   * `facing` is a port on the card the train is standing on, and switching round a district leaves
+   * it holding a real compass port — 'n' or 's' off a curve. Nothing cleared it when the train
+   * departed, so it carried that port out onto a Division that runs east and west, and then into
+   * the next Office, whose card has no north or south edge at all.
+   *
+   * That is not cosmetic. `movesFor` explores from `facing` and from its opposite, and a card with
+   * neither port yields no destinations either way — so a train that had been shunted onto a spur
+   * arrived at the next Office **unable to make a single Move**. It also drew a ▲ on the Division
+   * map, where there is no north to point at.
+   *
+   * A train out here is running one way along an east-west railroad with its engine at one end, so
+   * this is what `facing` means on the Division; there is nothing else it could be. `railFacing`
+   * follows for the same reason — this IS the east-west sense, freshly known.
+   */
+  tray.facing = tray.direction === 'west' ? 'w' : 'e';
+  tray.railFacing = tray.facing;
 }
 
 /**
@@ -431,8 +485,9 @@ function spendDispatchBonus(
   const mine = tray.trainNumber ?? 99;
   const theirs = other.trainNumber ?? 99;
 
-  const area = s.officeAreas.get(s.clock.superintendent);
+  // The Fedora is held by a PLAYER, and the dispatch devices are installed in an Office Area, which
-  if (!area) return 0;
+  // is keyed by SEAT. Indexing one with the other is right only while seating is the identity map.
+  const area = areaOf(s, s.clock.superintendent);
 
   // Best device first — Radio (+12) beats Telephone (+8) beats Telegraph (+4).
   for (const key of ['radio', 'telephone', 'telegraph'] as const) {
@@ -456,14 +511,18 @@ function spendDispatchBonus(
   return 0;
 }
 
-/** Q3 — an expedited train does not spend a Stage standing at the Office. */
 /**
- * Does this train leave in the same Stage it arrives (§7)?
+ * Q3 — is this train subject to the "kept ready" fault (§7)?
+ *
+ * Expedite does not change WHEN a train leaves — it is released by the ordinary §8.1 rules like any
+ * other train, and may be switched normally while it stands. What it means is that it must not be
+ * held anywhere but the station: a train the player parks on Secondary Track to clear a switching
+ * move faults if it is not back on the Office square by the next Mainline Phase (`mainlinePhase`).
  *
  * Two ways to earn it. `expedite` is printed and permanent. `stopThenExpedite` is the X17 Campaign
  * Train — "one turn at station (speeches) then expedite": its FIRST arrival is an ordinary stop while
  * the speeches are made, and every arrival after that is expedited. `speechMade` is set on that first
- * stop, so the train is slow once and fast thereafter.
+ * stop, so the train is exempt once and subject to the fault thereafter.
  */
 function isExpedited(tray: CrewTray): boolean {
   const rules = trainProfile(tray.trainNumber ?? 0, tray.trainIsExtra)?.rules;
@@ -472,17 +531,17 @@ function isExpedited(tray: CrewTray): boolean {
   return rules.stopThenExpedite === true && tray.speechMade === true;
 }
 
-function moveTrain(
+function moveTrain(s: GameState, id: TrayId, tray: CrewTray, events: GameEvent[]): MoveOutcome {
-  s: GameState,
-  id: TrayId,
-  tray: CrewTray,
-  events: GameEvent[],
-): MoveOutcome {
   const dir = step(tray.direction);
 
   if (tray.position.at === 'divisionPoint') {
+    // Read BEFORE `enterMainline` overwrites `tray.position`: the departure line named the side the
+    // train was leaving FROM, and taking it afterwards read the mainline position instead — so every
+    // train reported leaving the Eastern Division Point, including the eastbound ones that had just
+    // been made up at the Western one.
+    const fromSide = (tray.position as { side: Direction }).side;
     const dpIndex = s.division.nodes.findIndex(
-      (n) => n.kind === 'divisionPoint' && n.side === (tray.position as { side: Direction }).side,
+      (n) => n.kind === 'divisionPoint' && n.side === fromSide,
     );
     const target = dpIndex + dir;
     const node = s.division.nodes[target];
@@ -495,7 +554,15 @@ function moveTrain(
     enterMainline(s, node, id, tray, target);
     const dp = s.division.nodes[dpIndex];
     if (dp?.kind === 'divisionPoint') dp.holding = dp.holding.filter((t) => t !== id);
-    events.push({ type: 'phaseBegan', phase: `train ${tray.trainNumber} highballed` });
+    events.push({
+      type: 'trainHighballed',
+      trainNumber: tray.trainNumber ?? 0,
+      from: `the ${fromSide === 'west' ? 'Western' : 'Eastern'} Division Point`,
+      to: 'the Mainline',
+      // Narrated as a phase marker until now — "▸ train 8 highballed phase" — which is not a phase
+      // and told the player nothing about why the train had started its run.
+      why: 'it was made up and the Subdivision ahead was clear, so its run begins',
+    });
     return 'moved';
   }
 
@@ -503,8 +570,8 @@ function moveTrain(
   // Without this a train that arrives at an Office never leaves, holding an A/D track forever and
   // colliding with every train that follows it.
   if (tray.position.at === 'grid') {
-    const owner = tray.position.owner;
+    const seat = tray.position.seat;
-    const area = areaOf(s, owner);
+    const area = areaAtSeat(s, seat);
     // Only a train at the Office itself is eligible; one on Secondary Track is not (§8.1, Gap 2b).
     if (
       tray.position.coord.row !== area.officeCoord.row ||
@@ -533,7 +600,7 @@ function moveTrain(
       return 'held';
     }
 
-    const officeIndex = nodeIndexOfOffice(s, owner);
+    const officeIndex = nodeIndexOfOffice(s, seat);
     const target = officeIndex + dir;
     const node = s.division.nodes[target];
     if (!node) return 'held';
@@ -550,8 +617,8 @@ function moveTrain(
         trainNumber: tray.trainNumber ?? 0,
         from: 'the Office',
         to: 'the Mainline',
+        why: 'it stood a full Stage at the Office, so §8.1 released it this Mainline Phase',
       });
-      awardDeparture(s, owner, tray, events);
       return 'moved';
     }
 
@@ -566,8 +633,7 @@ function moveTrain(
      */
     if (node.kind === 'divisionPoint') {
       area.adOccupancy = area.adOccupancy.filter((t) => t !== id);
-      awardDeparture(s, owner, tray, events);
+      retireTrain(s, id, tray, node.side, events);
-      retireTrain(s, id, tray, events);
       return 'moved';
     }
 
@@ -579,6 +645,43 @@ function moveTrain(
     const node = s.division.nodes[index];
     if (!node || node.kind !== 'mainline') return 'held';
 
+    /**
+     * §7/§8.1 — AN EXTRA HIGHBALLING OUT OF THE INTERCHANGE'S YARD.
+     *
+     * Standing in `holding` rather than crossing in `transits` (state.ts), which is the position an
+     * Extra started at an Interchange begins in. It leaves exactly the way a train at a Division
+     * Point does — clearance first, then onto the running line — except that the card it enters is
+     * the one it is already standing beside rather than the next one along.
+     *
+     * That reuse is the whole point of modelling the yard separately: Jesse's rule is "a guaranteed
+     * collision holds it at the Interchange for another Stage and it tries again; a potential one is
+     * the Superintendent's to hold", and those are precisely `evaluateClearance`'s `blocked` and
+     * `ask`. Nothing new decides collisions here.
+     */
+    if (node.holding?.includes(id)) {
+      const clearance = evaluateClearance(s, id, tray, index, events);
+      if (clearance === 'blocked') {
+        events.push({
+          type: 'trainHeld',
+          trainNumber: tray.trainNumber ?? 0,
+          reason: 'held in the Interchange — the Subdivision ahead is occupied',
+        });
+        return 'held';
+      }
+      if (clearance === 'ask') return 'needsClearance';
+
+      node.holding = node.holding.filter((t) => t !== id);
+      enterMainline(s, node, id, tray, index);
+      events.push({
+        type: 'trainHighballed',
+        trainNumber: tray.trainNumber ?? 0,
+        from: 'the Interchange',
+        to: 'the Mainline',
+        why: 'it was made up in the yard and the Subdivision was clear, so its run begins',
+      });
+      return 'moved';
+    }
+
     const transit = node.transits.find((t) => t.tray === id);
     if (!transit) return 'held';
 
@@ -649,12 +752,12 @@ function moveTrain(
       // The train has run the length of the Division and leaves the game (§2.3).
       dest.holding.push(id);
       tray.position = { at: 'divisionPoint', side: dest.side };
-      retireTrain(s, id, tray, events);
+      retireTrain(s, id, tray, dest.side, events);
       return 'moved';
     }
 
     if (dest.kind === 'office') {
-      return arriveAtOffice(s, id, tray, dest.owner, events);
+      return arriveAtOffice(s, id, tray, dest.seat, events);
     }
   }
 
@@ -711,28 +814,44 @@ function evaluateClearance(
     for (const t of n.transits) if (t.tray) occupants.push({ tray: t.tray, onCard: i });
   }
 
-  for (const { tray: other, onCard } of occupants) {
+  /**
+   * TWO PASSES, NOT ONE — an opposite-direction occupant is an absolute bar and has to be checked
+   * against EVERY occupant before any same-direction judgment call is offered.
+   *
+   * A single pass returned on whichever occupant it examined first, in `node.transits` insertion
+   * order — which is fine while a Subdivision holds at most one train, but the dispatch exception
+   * below means it now legitimately can hold two: a Telegraph-cleared facing train sits on the same
+   * card as whatever it was cleared past. Found from a playtest report where the Superintendent was
+   * asked to rule on a same-direction train instead of being auto-held against an uncleared
+   * opposite-direction one also on the card — the loop had reached the same-direction occupant
+   * first simply because it entered the transit list first, and returned before ever looking at
+   * the other.
+   */
+  for (const { tray: other } of occupants) {
     if (other === id) continue;
     const otherTray = s.trays.get(other);
-    if (!otherTray) continue;
+    if (!otherTray || otherTray.direction === tray.direction) continue;
-    const onNode = s.division.nodes[onCard];
-
-    if (otherTray.direction !== tray.direction) {
     // §8.1 — a train moving TOWARDS the considered train is an absolute bar. That stands.
     //
     // The exception is dispatching technology. Telegraph/Telephone/Radio exist precisely so the
     // Superintendent can arrange a meet with a facing train: "once a day, when dispatching
     // facing trains, add +4/+8/+12 to the other train's number". Without a device there is no
     // way to pass the order, so the train simply holds.
-      if (spendDispatchBonus(s, tray, otherTray, events) > 0) return 'clear';
+    if (spendDispatchBonus(s, tray, otherTray, events) > 0) continue;
     return 'blocked';
   }
 
+  for (const { tray: other, onCard } of occupants) {
+    if (other === id) continue;
+    const otherTray = s.trays.get(other);
+    if (!otherTray || otherTray.direction !== tray.direction) continue;
+    const onNode = s.division.nodes[onCard];
+
     // Red Flags — "a stopped train is prevented from being hit; the approaching train is prevented
     // from moving". Flagging is per-train rather than per-card, so it protects one specific train
     // where ABS Signals protects everything on the card.
     //
-    // Both of these now read the card the OTHER train is standing on rather than the card being
+    // Both of these read the card the OTHER train is standing on rather than the card being
     // entered. They were the same card while this only looked one card ahead; across a Subdivision
     // they are not, and the protection belongs where the train it protects actually is.
     if (onNode?.kind === 'mainline' && (onNode.redFlagged ?? []).includes(other)) return 'blocked';
@@ -758,10 +877,10 @@ function arriveAtOffice(
   s: GameState,
   id: TrayId,
   tray: CrewTray,
-  owner: PlayerIndex,
+  seat: SeatIndex,
   events: GameEvent[],
 ): MoveOutcome {
-  const area = areaOf(s, owner);
+  const area = areaAtSeat(s, seat);
   const capacity = officeProfile(area.tier).adTracks;
   const hasEnhancement = (key: string): boolean =>
     [...area.grid.values()].some((c) => c.enhancements.includes(key));
@@ -773,7 +892,7 @@ function arriveAtOffice(
     for (const [key, card] of area.grid) {
       if (!card.enhancements.includes('yardOffice')) continue;
       const [row, col] = key.split(',').map(Number);
-      tray.position = { at: 'grid', owner, coord: { row: row!, col: col! } };
+      tray.position = { at: 'grid', seat, coord: { row: row!, col: col! } };
       events.push({
         type: 'trainDiverted',
         trainNumber: tray.trainNumber ?? 0,
@@ -799,7 +918,7 @@ function arriveAtOffice(
       });
       return 'moved';
     }
-    collide(s, owner, [id], events, 'no free A/D track', 'the Office');
+    collide(s, playerAtSeat(s, seat), [id], events, 'no free A/D track', 'the Office');
     return 'moved';
   }
 
@@ -808,7 +927,7 @@ function arriveAtOffice(
     const first = area.heldAtLimits.shift()!;
     area.adOccupancy.push(first);
     const held = s.trays.get(first);
-    if (held) held.position = { at: 'grid', owner, coord: area.officeCoord };
+    if (held) held.position = { at: 'grid', seat, coord: area.officeCoord };
   }
   area.heldAtLimits = area.heldAtLimits.filter((t) => t !== id);
 
@@ -816,12 +935,12 @@ function arriveAtOffice(
   // is not expecting them (§A.4), so this is a collision too, not a coupling.
   const officeCard = area.grid.get(coordKey(area.officeCoord));
   if (officeCard && officeCard.standing.length > 0) {
-    collide(s, owner, [id], events, 'cars fouling the Running Track', 'the Running Track');
+    collide(s, playerAtSeat(s, seat), [id], events, 'cars fouling the Running Track', 'the Running Track');
     return 'moved';
   }
 
   area.adOccupancy.push(id);
-  tray.position = { at: 'grid', owner, coord: area.officeCoord };
+  tray.position = { at: 'grid', seat, coord: area.officeCoord };
   events.push({
     type: 'trainArrived',
     trainNumber: tray.trainNumber ?? 0,
@@ -830,13 +949,10 @@ function arriveAtOffice(
     expedited: isExpedited(tray),
   });
 
-  // Q3 — an expedited train departs in the same Stage it arrived, so it is NOT added to
-  // movedThisPhase and gets a second chance to move before the phase ends.
-  if (isExpedited(tray)) return 'expedited';
   /**
-   * X17 Campaign Train — the speeches happen at the first Office it reaches. Recorded AFTER the
+   * X17 Campaign Train — the speeches happen at the first Office it reaches, and every arrival after
-   * expedite test above, so this arrival is the ordinary stop the card pays for and every later one
+   * that runs expedited (`isExpedited` reads `speechMade`). Setting it here is idempotent on every
-   * runs expedited.
+   * later arrival, so it needs no guard against re-firing.
    */
   if (trainProfile(tray.trainNumber ?? 0, tray.trainIsExtra)?.rules.stopThenExpedite) {
     tray.speechMade = true;
@@ -867,12 +983,33 @@ function collide(
       consist: [...tray.consist],
     });
     // Gap 2c — engines and cabooses return to the Division Yard, everything else to Classification.
+    // `pooled` because a car reaching a yard is back in the common supply: the load's origin stamp
+    // (state.ts) belongs to the load, not to the car that happened to be carrying it.
     for (const car of tray.consist) {
-      if (car.type === 'caboose') s.yards.divisionYard.push(car);
+      if (car.type === 'caboose') s.yards.divisionYard.push(pooled(car));
-      else s.yards.classificationYard.push(car);
+      else s.yards.classificationYard.push(pooled(car));
     }
     s.trays.delete(id);
     s.freeTrays.push(id);
+    /**
+     * TAKE THE WRECK OFF THE CARD.
+     *
+     * Nothing did. `s.trays.delete` removed the train and left its `Transit` sitting on the Mainline
+     * card it died on, and `evaluateClearance` counts every transit as an occupant — so a rear-end
+     * collision (the caller at "ran into the train ahead") permanently poisoned that card: every
+     * later train was either held against a ghost or put to the Superintendent about one. The only
+     * other place a transit is removed is a train rolling off the far end, which a destroyed train
+     * never does.
+     *
+     * Found while adding the Interchange start, which clears onto the running line through that
+     * same occupant list.
+     */
+    for (const n of s.division.nodes) {
+      if (n.kind !== 'mainline') continue;
+      n.transits = n.transits.filter((t) => t.tray !== id);
+      if (n.holding) n.holding = n.holding.filter((t) => t !== id);
+      if (n.redFlagged) n.redFlagged = n.redFlagged.filter((t) => t !== id);
+    }
   }
 
   if (lost.length > 0) {
@@ -893,47 +1030,55 @@ function collide(
   }
 }
 
-/** A completed run frees the crew; Extras go to the Salvage Yard (§2.3, Gap 2c). */
 /**
- * ONE REVENUE FOR EVERY TRAIN THAT GETS OUT OF YOUR SECTION.
+ * ONE REVENUE TO EVERY PLAYER WHEN A TRAIN COMPLETES ITS RUN.
  *
- * Jesse's rule. Unlike freight and passengers it pays for traffic the player does not have to work —
+ * Jesse's rule, revised. It used to pay 1 to the Office a train departed — "it left YOUR section" —
- * which is the point: keeping the line clear is the Superintendent's job, and until now nothing paid
+ * which meant a five-Office railroad paid five times for one train and paid the most to whoever the
- * for doing it well. It rewards splitting a Subdivision with a Control Point, holding a following
+ * train happened to pass first. It pays once now, when the train runs off the end of the Division,
- * train rather than gambling on it, and building the A/D capacity to turn arrivals around.
+ * and it pays EVERYBODY: getting a train the whole length of the railroad is the shared achievement,
+ * and every Office it crossed had to clear it.
  *
- * Paid on DEPARTURE from the Office, once per train. Not paid again when the train later runs off
+ * Unlike freight and passengers it pays for traffic no one has to work, which is the point: keeping
- * the end of the Division and retires: it left YOUR section when it cleared your Office, and the far
+ * the line moving is the Superintendent's job, and nothing else paid for doing it well. It rewards
- * Division Point belongs to whoever is seated there.
+ * splitting a Subdivision with a Control Point, holding a following train rather than gambling on
+ * it, and building the A/D capacity to turn arrivals around.
  *
- * A crew with no train number is a local switching move and not a departure, so it earns nothing.
+ * A crew with no train number is a local switching move, not a run, so it earns nothing.
  *
- * PROVISIONAL, and worth watching: measured, this is roughly +5 Revenue a game against a mean of
+ * NOW A DIAL, AND OFF BY DEFAULT. At 1 it was worth ~5.4 Revenue against a bot mean of 7.0 — the
- * 2.7, so it more than doubles the score on its own. Flagged in `TODO.md`.
+ * railroad was making most of its money from the one thing no one has to work, and the freight and
+ * passenger economies it exists to reward could not be read through it. `trainPerTransit` sets the
+ * rate per player, and 0 (the default) means no event at all rather than a run of "+0" entries.
  */
-function awardDeparture(
+function awardCompletedRun(s: GameState, tray: CrewTray, events: GameEvent[]): void {
-  s: GameState,
-  owner: PlayerIndex,
-  tray: CrewTray,
-  events: GameEvent[],
-): void {
   if (tray.trainNumber === null) return;
-  const p = s.players[owner];
+  const rate = houseRules(s.config).revenue.trainPerTransit;
-  if (!p) return;
+  if (rate <= 0) return;
-  p.revenue += 1;
+  for (const p of s.players) {
+    p.revenue += rate;
     events.push({
       type: 'revenueChanged',
-    player: owner,
+      player: p.index,
-    delta: 1,
+      delta: rate,
       total: p.revenue,
-    reason: 'a train cleared your section',
+      reason: 'a train completed its run',
     });
+  }
 }
 
-function retireTrain(s: GameState, id: TrayId, tray: CrewTray, events: GameEvent[]): void {
+/** A completed run frees the crew; Extras go to the Salvage Yard (§2.3, Gap 2c). */
+function retireTrain(
+  s: GameState,
+  id: TrayId,
+  tray: CrewTray,
+  side: Direction,
+  events: GameEvent[],
+): void {
+  // `pooled` — see `trainsDestroyed` above; a load's origin stamp does not survive the yard.
   for (const car of tray.consist) {
-    if (car.type === 'caboose') s.yards.divisionYard.push(car);
+    if (car.type === 'caboose') s.yards.divisionYard.push(pooled(car));
-    else s.yards.classificationYard.push(car);
+    else s.yards.classificationYard.push(pooled(car));
   }
   s.trays.delete(id);
   s.freeTrays.push(id);
@@ -944,8 +1089,11 @@ function retireTrain(s: GameState, id: TrayId, tray: CrewTray, events: GameEvent
   events.push({
     type: 'trainCompleted',
     trainNumber: tray.trainNumber ?? 0,
+    isExtra: tray.trainIsExtra,
+    side,
     consist: tray.consist.map((c) => ({ ...c })),
   });
+  awardCompletedRun(s, tray, events);
 }
 
 // ---------------------------------------------------------------------------
@@ -955,7 +1103,7 @@ function retireTrain(s: GameState, id: TrayId, tray: CrewTray, events: GameEvent
 function shiftChange(s: GameState, events: GameEvent[]): AdvanceResult {
   // §5 — the Fedora passes every three Stages: shift changes at Stages 3, 6, 9 and 12.
   if (s.clock.stage % STAGES_PER_SHIFT === 0) {
-    s.clock.superintendent = (s.clock.superintendent + 1) % s.players.length;
+    s.clock.superintendent = playerLeftOf(s, s.clock.superintendent);
     events.push({ type: 'actorChanged', player: s.clock.superintendent });
   }
 

src/engine/content.ts

@@ -3,8 +3,8 @@
  *
  * TRANSCRIBED FROM THE RECOVERED DESIGN FILES (2026-07-30):
  *   docs/Deck cards2.xlsx   — the complete card list and counts
- *   docs/Trains3.pdf        — all 22 train cards
+ *   docs/Trains3.pdf        — the train cards
- *   docs/Mainline Cards.pdf — the ten Mainline card types
+ *   docs/Mainline Cards.pdf — the Mainline card types, and the two Division Points
  *   docs/tracks.png         — card art
  *
  * This replaced an invented 52-card placeholder. See docs/rules/implications.md for what changed
@@ -60,13 +60,17 @@ export type TrackProfile = {
 /**
  * TRACK IS IN THE HOME OFFICE DECK, and is drawn and played like any other card.
  *
- * 96 dealt of the sheet's 104 (column B of `docs/Deck cards2.xlsx`) — the 8 sharp curves are dealt
+ * Every row's dealt count is in `copiesInDeck` below; the sharp curves are dealt zero, see below.
- * zero, see below. An earlier reading made track a
+ * How many that comes to is `TRACK_IN_DECK`, computed rather than written down — it moves with
- * separate per-player supply of 26 pieces, sitting outside the deck and laid one a turn. That came
+ * balance work, so a number in this comment would be wrong before long.
- * from misreading the sheet's LAST column, headed "Track Per Player" — 8/4/4/1/1/4/4 = 26, which is
+ *
- * a note about each player's likely share of 104 across four players, not a second stack of cards.
+ * An earlier reading made track a separate per-player supply, sitting outside the deck and laid one
- * The sheet's own totals settle it: "Sum other 115", "Total track 104", and a grand total of 231
+ * a turn. That came from misreading the sheet's LAST column, headed "Track Per Player" —
- * once the 12 start cards are counted. 115 + 104 + 12 = 231.
+ * 8/4/4/1/1/4/4 = 26, which is a note about each player's likely share across four players, not a
+ * second stack of cards. The sheet's own totals settle it: "Sum other 115", "Total track 104", and a
+ * grand total of 231 once the 12 start cards are counted. 115 + 104 + 12 = 231. Those are figures
+ * 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.
  *
  * 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
@@ -89,10 +93,10 @@ export const TRACK_CARDS: readonly TrackProfile[] = [
    * SHARP CURVES ARE DEALT ZERO COPIES — Jesse's call, and the same treatment as Poling.
    *
    * The only thing that made them different from an ordinary curve was `moveCost: 2`, and nothing
-   * ever charged it: every switching move costs exactly 1, hard-coded. So the 8 cards in the deck
+   * ever charged it: every switching move costs exactly 1, hard-coded. So they were geometric
-   * were geometric duplicates of the curves, taking 8 draws from a deck the rebalance already thinks
+   * duplicates of the curves, taking draws from a deck the rebalance already thinks is too diluted.
-   * is too diluted. They come out rather than having the Move cost built, because a per-card movement
+   * They come out rather than having the Move cost built, because a per-card movement cost is a
-   * cost is a change to the Move model and the rebalance can wait.
+   * change to the Move model and the rebalance can wait.
    *
    * The rows stay in the catalogue at zero, exactly as Poling does, so the design is still visible
    * and the geometry still works if they are ever dealt again.
@@ -103,10 +107,10 @@ export const TRACK_CARDS: readonly TrackProfile[] = [
   { geometry: 'turnout', hand: 'left', name: 'Turnout (left)', copiesInDeck: 16, isOperationalRail: false, moveCost: 1 },
 ];
 
-/** 96 — the sheet's "Total track" of 104, less the 8 sharp curves now dealt at zero. */
+/** Summed from `copiesInDeck` above, never written down — it moves whenever the deck is retuned. */
 export const TRACK_IN_DECK = TRACK_CARDS.reduce((n, t) => n + t.copiesInDeck, 0);
 
-/** Start cards, placed at setup and never shuffled: 4 Whistle Posts, 8 Limits. */
+/** Start cards, placed at setup and never shuffled. */
 export const WHISTLE_POST_SUPPLY = 4;
 export const LIMITS_SUPPLY = 8;
 
@@ -116,7 +120,7 @@ export function trackProfile(geometry: TrackGeometry, hand: Hand): TrackProfile
 }
 
 // ---------------------------------------------------------------------------
-// Offices — Depot 4, Station 2, Terminal 1
+// Offices — the upgrade ladder: Whistle Post, Depot, Station, Terminal
 // ---------------------------------------------------------------------------
 
 export type OfficeProfile = {
@@ -139,13 +143,12 @@ export type OfficeProfile = {
  * passenger modifier cards (Waiting Area, Restaurant, Hotel).
  */
 /**
- * Office cards. `copiesInDeck` was **doubled** (Depot 4→8, Station 2→4, Terminal 1→2) — Q12.
+ * Office cards. Every tier's `copiesInDeck` was **doubled** against the recovered design — Q12.
  *
  * 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. Escaping needed one of
+ * upgraded at least once, and 25 of 26 collisions happened at Whistle Post.
- * 4 Depot cards in 111, roughly a 59% chance across a game's draws.
  *
  * 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. Station and Terminal were
@@ -153,9 +156,10 @@ export type OfficeProfile = {
  *
  * 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 (deck 133 → 140). Revisit once the victory target is
+ * dilutes every other category slightly. Revisit once the victory target is settled and freight is
- * settled and freight is carrying its intended share; the right answer may instead be fewer
+ * carrying its intended share; the right answer may instead be fewer Terminals, a cheaper first
- * Terminals, a cheaper first upgrade, or more A/D capacity at Whistle Post.
+ * 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 },
@@ -199,13 +203,14 @@ export type IndustryProfile = {
 
 /**
  * Industry density (Gap 12). The recovered sheet lists 9 industries in a 115-card deck; the
- * prototype ran 10 in 52. At 9-in-115 a game saw 1.6 Freight Facilities, freight was 10% of gross
+ * prototype ran 10 in 52. At the sheet's density a game saw 1.6 Freight Facilities, freight was 10%
- * revenue, and `carsCoupled` fired 4 times per 100 games — the freight loop, which is the point of
+ * of gross revenue, and `carsCoupled` fired 4 times per 100 games — the freight loop, which is the
- * the game, effectively never ran.
+ * point of the game, effectively never ran.
  *
- * Each industry's `copies` is TRIPLED, giving 27 in 133. That restores roughly the prototype's
+ * 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.
+ * 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:
@@ -230,16 +235,52 @@ export type IndustryProfile = {
 export const INDUSTRY_PROFILES: readonly IndustryProfile[] = [
   { 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".
+   *
+   * It was briefly `flow: 'both'`, on the reading that "'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", which made §9.3's "Passenger Facilities and Freight Houses permit cars to move
+   * each direction" name exactly those two. That premise is dead: `glossary.md` and
+   * `rules-v0.2.md` corrected the Freight House to a card of its own, dealt like any other industry,
+   * so §9.3 names the Freight House and nothing else, and card-reference.md's "Both" column loses
+   * the only argument it had.
+   *
+   * The card set says the same thing on its own. All three Refinery modifiers — Pipelines, Oil
+   * Depot, Viscosity Breakers — grant `+1 outbound`; a two-way Refinery would be the one industry in
+   * 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: 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
+   * not ship anything out". `StationMaster-Home-Deck-v0.4.5.md` prints it "Inbound, 0 out / 1 in".
+   *
+   * THE ICE HOUSE IS THEREFORE A DEAD CARD BESIDE A GROCER'S, and that is the design, not an
+   * oversight: `usableGrant` drops a Modifier's grant on a direction its host cannot use, and the
+   * Home Deck sheet says so outright — "a bonus beside a facility that cannot use its direction is
+   * not usable", naming the Truck Dock's inbound bonus beside the outbound-only Packing Sheds as the
+   * 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: 3 },
 ];
 
 /** Legacy alias; the engine still reads FREIGHT_PROFILES in places. */
 export const FREIGHT_PROFILES = INDUSTRY_PROFILES;
 
-/** §9.3 — the collective term for an industry that both loads and unloads. */
+/**
+ * §9.3 — "Passenger Facilities and Freight Houses permit cars to move each direction".
+ *
+ * ONE CARD ANSWERS TO THIS NOW: the Freight House itself. It was briefly three, while the Refinery
+ * and the Grocer's Warehouse were also `both` on a reading of the term the glossary has since
+ * corrected — a Freight House is a card, not a collective noun. Kept as a predicate on `flow`
+ * rather than a comparison against the kind, because it is the DIRECTION §9.3 is talking about.
+ */
 export function isFreightHouse(p: IndustryProfile): boolean {
   return p.flow === 'both';
 }
@@ -251,7 +292,7 @@ export function industryProfile(kind: FreightKind): IndustryProfile {
 }
 
 // ---------------------------------------------------------------------------
-// Modifiers — 17 industry + 6 passenger, each tied to specific hosts
+// Modifiers — passenger and industry, each tied to specific hosts
 // ---------------------------------------------------------------------------
 
 export type ModifierKind =
@@ -280,7 +321,20 @@ export const MODIFIER_PROFILES: readonly ModifierProfile[] = [
   { kind: 'restaurant', name: 'Restaurant', hosts: ['office'], addOut: 1, addIn: 0, addLoaders: 0, addPorters: 1, copies: 2 },
   { kind: 'hotel', name: 'Hotel', hosts: ['office'], addOut: 1, addIn: 0, addLoaders: 0, addPorters: 1, copies: 1 },
   // Freight House / Packing Sheds / Grocer's
-  { kind: 'truckDock', name: 'Truck dock', hosts: ['freightHouse', 'packingSheds', 'grocersWarehouse'], addOut: 1, addIn: 0, addLoaders: 1, addPorters: 0, copies: 2 },
+  /**
+   * INBOUND, AND NO LABORER — the one Modifier that helps a facility RECEIVE.
+   *
+   * It printed "+1 outbound, +1 Laborer" like every other freight Modifier, which made it a
+   * duplicate of Forklifts with a longer host list. A dock is where a truck backs up to take
+   * delivery, so it earns its own line in the deck by adding the red box instead of the green one —
+   * and pays for it by bringing no man to work it.
+   *
+   * Two consequences, both intended. `usableGrant` drops an inbound grant on a host that only ships,
+   * so beside **Packing Sheds** this card now does nothing at all — the hand tooltip says so before
+   * it is played. And it is the first Modifier that grants no worker, so a facility's laborer count
+   * no longer rises with every card set beside it.
+   */
+  { kind: 'truckDock', name: 'Truck dock', hosts: ['freightHouse', 'packingSheds', 'grocersWarehouse'], addOut: 0, addIn: 1, addLoaders: 0, addPorters: 0, copies: 2 },
   { kind: 'railroadExpressAgency', name: 'Railroad Express Agency', hosts: ['freightHouse'], addOut: 1, addIn: 0, addLoaders: 1, addPorters: 0, copies: 1 },
   { kind: 'forklifts', name: 'Forklifts', hosts: ['freightHouse', 'packingSheds'], addOut: 1, addIn: 0, addLoaders: 1, addPorters: 0, copies: 2 },
   // Mine Tipple
@@ -307,7 +361,7 @@ export function modifierProfile(kind: ModifierKind): ModifierProfile {
 }
 
 // ---------------------------------------------------------------------------
-// Trains — 22 cards, named, with speed class and individual rules
+// Trains — named, with a speed class and individual printed rules
 // ---------------------------------------------------------------------------
 
 export type TrainSpeed = 'fast' | 'slow';
@@ -371,11 +425,18 @@ function pair(odd: number, name: string, speed: TrainSpeed, consist: ConsistSpec
 }
 
 export const TIMETABLED_TRAINS: readonly TrainProfile[] = [
-  ...pair(1, 'Crack Limited', 'fast', { freight: 0, coach: 3, caboose: 0 },
+  /**
+   * 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/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.' }),
   ...pair(3, 'Express', 'fast', { freight: 2, coach: 0, caboose: 0 },
     { oneFreightPerLocation: true, expedite: true, note: 'May drop or pick up one freight car at every location.' }),
-  ...pair(5, 'The Sparrow', 'fast', { freight: 0, coach: 2, caboose: 0 },
+  ...pair(5, 'The Sparrow', 'fast', { freight: 0, coach: 3, caboose: 0 },
     { noSwitching: true, expedite: true }),
   ...pair(7, 'Local', 'slow', { freight: 1, coach: 1, caboose: 0 },
     { coachStaysOnStationTrack: true, note: 'Maximum one freight, one coach.' }),
@@ -402,6 +463,29 @@ export const EXTRA_TRAINS: readonly TrainProfile[] = [
 
 export const ALL_TRAINS: readonly TrainProfile[] = [...TIMETABLED_TRAINS, ...EXTRA_TRAINS];
 
+/**
+ * §2.3 — ODD RUNS WEST, EVEN RUNS EAST. The number is the direction for a TIMETABLED train.
+ *
+ * NOT for an Extra any more. Extras print `direction: 'playerChoice'` and now mean it (Jesse's
+ * ruling, superseding "the number decides, like everything else on the timetable"): the player who
+ * played the card picks where it starts, and the start decides the direction — a Crew Tray placed
+ * at the Western Division Point runs east and one at the Eastern runs west, because the alternative
+ * is a train that leaves the Division on its first move having crossed nothing. Where the start is
+ * NOT an end of the Division — an Interchange, or a Control Point — both ways are real runs and the
+ * player says which. `resolveExtraStart` in apply.ts is where that happens.
+ *
+ * Still read for an Extra in one place: replaying a save written before the choice existed, where
+ * `newTrain.startExtra` carries only the legacy `atSeat` field.
+ */
+export function runDirection(trainNumber: number): Direction {
+  return trainNumber % 2 === 0 ? 'east' : 'west';
+}
+
+/** The Division Point a train of this number starts from — the opposite end to the way it runs. */
+export function startingDivisionPoint(trainNumber: number): Direction {
+  return runDirection(trainNumber) === 'east' ? 'west' : 'east';
+}
+
 export function trainProfile(number: number, isExtra: boolean): TrainProfile | null {
   return ALL_TRAINS.find((t) => t.number === number && t.isExtra === isExtra) ?? null;
 }
@@ -417,7 +501,7 @@ export function consistSize(c: ConsistSpec): number {
 
 export type MainlineKind =
   | 'plains' | 'curves' | 'hilly' | 'heavyGrade' | 'doubleTrack'
-  | 'uncontrolledSiding' | 'tunnel' | 'trestle' | 'yard';
+  | 'uncontrolledSiding' | 'tunnel' | 'trestle' | 'interchange';
 
 /**
  * Speed as printed. `60` and `30` appear on the cards; Hilly prints P60/F30, and Heavy Grade
@@ -437,7 +521,7 @@ export type MainlineProfile = {
   speed: MainlineSpeed;
   /** Double Track and Uncontrolled Siding: "Trains may pass". */
   trainsMayPass: boolean;
-  /** Yard: "Sort cars in new order". */
+  /** Interchange: "Sort cars in new order". */
   sortsCars: boolean;
   /** Named entry points printed on the card; some are unlocked by modifier cards. */
   entryPoints: readonly string[];
@@ -452,7 +536,37 @@ export const MAINLINE_PROFILES: readonly MainlineProfile[] = [
   { 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'] },
-  { kind: 'yard', name: 'Yard', speed: { kind: 'uniform', value: 60 }, trainsMayPass: false, sortsCars: true, entryPoints: ['start', 'sortCars'] },
+  /**
+   * 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: 'interchange', name: 'Interchange', speed: { kind: 'uniform', value: 60 }, trainsMayPass: false, sortsCars: true, entryPoints: ['start', 'sortCars'] },
+];
+
+/**
+ * THE MAINLINE DECK AS PRINTED, dealt WITHOUT replacement.
+ *
+ * `MAINLINE_PROFILES` above is a list of card TYPES, one entry each. It is not the deck, and setup
+ * used it as one: `buildDivision` drew uniformly from those types with replacement, which made two
+ * Interchanges (or two Trestles, or two Tunnels) an ordinary outcome and gave Plains the same weight
+ * as everything else although the deck prints two of it. `Mainline Cards.pdf` is the
+ * inventory, transcribed in `docs/StationMaster-Mainline-Deck-v0.4.5.md`, which had already flagged
+ * the mismatch as needing correction.
+ *
+ * It matters more than card flavour now that an Extra may start at an Interchange (§7): "if an
+ * Interchange is on the board" has to mean a card there is at most one of, not a type the deal can
+ * hand out twice.
+ *
+ * The two Division Point cards in that inventory are not here — they are the fixed ends of the
+ * Division, laid by `buildDivision` itself rather than drawn. Plains appears twice because the deck
+ * prints it twice; every other type once. The list below is the deck, so it is not counted here.
+ */
+export const MAINLINE_DECK: readonly MainlineKind[] = [
+  'plains', 'plains', 'curves', 'hilly', 'heavyGrade',
+  'doubleTrack', 'uncontrolledSiding', 'tunnel', 'trestle', 'interchange',
 ];
 
 /**
@@ -496,6 +610,59 @@ export function crossingStages(
   return Math.max(1, stages - gradeReduction(profile, modifiers, direction, gradeUp));
 }
 
+/**
+ * WHAT THIS MAINLINE CARD DOES TO A TRAIN, in a sentence.
+ *
+ * Reported from play: "mainline cards need a tooltip stating what they do. Hilly and Uncontrolled
+ * Siding — I have no idea the impact they have on game play." Both are invisible without one: Hilly
+ * charges freight double what it charges passengers, and Uncontrolled Siding is one of only two
+ * cards where a following train is not stuck behind a slower one.
+ *
+ * The crossing times are COMPUTED by `crossingStages` rather than written out, so a tooltip cannot
+ * drift from the rule it describes — including the Hilly split, which is the whole point of the
+ * card and is decided by whether the train carries a coach.
+ */
+export function mainlineDescription(kind: MainlineKind, gradeUp: Direction = 'east'): string {
+  const p = mainlineProfile(kind);
+  const stages = (n: number): string => `${n} Stage${n === 1 ? '' : 's'}`;
+  const parts: string[] = [];
+
+  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(
+      `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 (p.speed.kind === 'grade') {
+    parts.push(
+      `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 {
+    parts.push(
+      `${p.speed.value} — ${stages(crossingStages(kind, 'fast', false))} for a fast train, ` +
+        `${stages(crossingStages(kind, 'slow', false))} for a slow one.`,
+    );
+  }
+
+  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. 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.');
+  }
+
+  if (p.sortsCars) parts.push('Cars may be sorted into any new order here.');
+  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
@@ -558,7 +725,22 @@ export const REALIGNMENTS: readonly { from: MainlineKind; to: MainlineKind }[] =
 // The four new card categories
 // ---------------------------------------------------------------------------
 
-export type SimpleCard = { key: string; name: string; copies: number; placement: string; effect: string };
+export type SimpleCard = {
+  key: string;
+  name: string;
+  copies: number;
+  placement: string;
+  effect: string;
+  /**
+   * The opponent-directed card this exists SOLELY to answer.
+   *
+   * A defence with nothing to defend against is a dead draw, exactly as the attack itself would be.
+   * The Space-use and Action cards are held out of every deck until they are implemented (Q6), and
+   * these go with them — named here rather than in a list somewhere else so the pairing is visible
+   * on the card, and so they come back together when their attacker does.
+   */
+  answers?: string;
+};
 
 /** "Burns tablespace" — occupies a grid cell and does nothing useful. Semantics pending §10 Q6. */
 export const SPACE_USE_CARDS: readonly SimpleCard[] = [
@@ -601,39 +783,48 @@ export type EnhancementRule = {
    *                     opponent-directed card that a solitaire deck does not contain (Q6).
    *   - `unbuilt`     — nothing reads it at all. The effect is recorded here and not yet written.
    *
-   * Seven of the ten are live. Each row below cites the file that reads it, because the first
+   * Most are live. Each row below cites the file that reads it — the row is the answer, and no
-   * attempt at this table got FIVE of the ten wrong: it was filled in by grepping for four helper
+   * tally is kept here, because a tally is one more thing to forget when a card is implemented.
-   * function names and reading "no match" as "no implementation", when Interlocking, Yard Office,
+   *
-   * Small Yard and ABS Signals are all read directly by key — and all four are covered by tests in
+   * The first attempt at this table got FIVE of the ten wrong: it was filled in by grepping for four
-   * `enhancements.test.ts` that were passing the whole time. The result was a tooltip telling players
+   * helper function names and reading "no match" as "no implementation", when Interlocking, Yard
-   * that four working cards did nothing, which is worse than the bare label it replaced.
+   * Office, Small Yard and ABS Signals are all read directly by key — and all four are covered by
+   * tests in `enhancements.test.ts` that were passing the whole time. The result was a tooltip
+   * telling players that four working cards did nothing, which is worse than the bare label it
+   * replaced.
    *
    * KEEP THIS HONEST, AND CHECK THE CITATION. Implementing one of these means changing its value in
    * the same commit; otherwise the card goes on apologising for something it now does. It is data
    * rather than something derived because "is this key read anywhere" is not a question the type
-   * system can answer — but a claim here without a file reference beside it is a claim nobody checked.
+   * system can answer — but a claim here without a reference beside it is a claim nobody checked.
+   *
+   * CITE THE FUNCTION, NEVER THE LINE NUMBER. Every one of these rows once carried a `file.ts:NNN`
+   * and every one of them had rotted — `apply.ts:405` for Small Yard was pointing four hundred lines
+   * short by the time anyone looked. A line number is a citation that decays silently on the next
+   * edit anywhere above it, which is the opposite of what this note is for.
    */
   effect: 'live' | 'dormantSolo' | 'unbuilt';
 };
 
 export const ENHANCEMENT_RULES: readonly EnhancementRule[] = [
-  // Holds an arrival at the Limits instead of colliding when the Office is full — advance.ts:770.
+  // Holds an arrival at the Limits instead of colliding when the Office is full — `arriveAtOffice`.
   { key: 'interlocking', placement: 'runningTrackStraight', effect: 'live' },
-  // Wired at apply.ts:1738, but it answers Derail, an Action card the solitaire deck omits (Q6).
+  // Wired in `isProtectedFromDerail`, but it answers Derail, an Action card the solo deck omits (Q6).
   { key: 'facingPointLocks', placement: 'onCard', requiresInDistrict: 'interlocking', effect: 'dormantSolo' },
-  // Diverts a coachless arrival away from the Train Order Office — advance.ts:750.
+  // Diverts a coachless arrival away from the Train Order Office — `arriveAtOffice`.
   { key: 'yardOffice', placement: 'secondaryTrackStraight', effect: 'live' },
-  // Lets a consist be re-ordered for one Move — apply.ts:405.
+  // Lets a consist be re-ordered for one Move — `check`'s `switch.sortConsist` case.
   { key: 'smallYard', placement: 'secondaryTrackStraight', effect: 'live' },
-  // Wired at apply.ts:1743, but it removes a Watertower, a Space-use card the solo deck omits.
+  // Wired in `watertowersRemovable`, but it removes a Watertower, a Space-use card the solo deck omits.
   { key: 'waterColumn', placement: 'runningTrackStraight', effect: 'dormantSolo' },
   // The only one with NO code path at all: nothing anywhere reads `overpass`.
   { key: 'overpass', placement: 'onCard', effect: 'unbuilt' },
   { key: 'telegraph', placement: 'runningTrackStraight', dispatchBonus: 4, effect: 'live' },
   { key: 'telephone', placement: 'onCard', requiresOnSameCard: 'telegraph', dispatchBonus: 8, effect: 'live' },
   { key: 'radio', placement: 'onCard', requiresOnSameCard: 'telephone', dispatchBonus: 12, effect: 'live' },
-  // Stored on the Mainline node rather than in `enhancements[]` — apply.ts:1461, read at
+  // Stored on the Mainline node rather than in `enhancements[]` — written by `reduce`'s
-  // advance.ts:599 (no rear-ending) and advance.ts:721 (the follower holds instead of being ruled on).
+  // `enhancementPlaced`, read in `moveTrain` (no rear-ending) and `evaluateClearance` (the follower
+  // holds instead of being ruled on).
   { key: 'absSignals', placement: 'mainlineCard', effect: 'live' },
 ];
 
@@ -665,11 +856,11 @@ export function enhancementRule(key: string): EnhancementRule | null {
 
 export const ENHANCEMENT_CARDS: readonly SimpleCard[] = [
   { 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.' },
+  { 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: 2, placement: 'any Running Track Straight', effect: 'Lets you remove any Watertower in your district.' },
+  { 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.' },
+  { key: 'overpass', name: 'Overpass', copies: 1, placement: 'any Railroad Crossing', effect: 'Removes the restrictions of a played Railroad Crossing.', answers: 'Railroad crossing' },
   { 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.' },
@@ -681,7 +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.' },
-  { key: 'facingPointLocksMainline', name: 'Facing Point Locks', copies: 2, placement: 'adjacent to Interlocking', effect: 'Prevents Derail being played on you.' },
+  { key: 'facingPointLocksMainline', name: 'Facing Point Locks', copies: 2, placement: 'adjacent to Interlocking', effect: 'Prevents Derail being played on you.', answers: 'Derail' },
 ];
 
 /**
@@ -724,11 +915,15 @@ export type StockSupply = { type: CarType; loaded: number; empty: number };
 /**
  * NOT in the recovered files — still the provisional figure.
  *
- * Scaled up alongside the Gap 12 industry increase. Worst-case demand (every copy of every
+ * Scaled up alongside the Gap 12 industry increase. The rule it was set by, rather than the numbers
- * industry in play at full capacity) is boxcar 15, hopper 12, tank 9, reefer 6; the supply must
+ * it produced: worst-case demand for a car type is every copy of every industry that uses it, in
- * cover that, since a Division Yard that runs dry starves the freight loop the increase exists to
+ * play at full capacity, and the supply must cover that — a Division Yard that runs dry starves the
- * feed. Lockouts and district size mean the worst case cannot actually occur, so this carries
+ * freight loop the increase exists to feed. Lockouts and district size mean the worst case cannot
- * deliberate headroom.
+ * actually occur, so this carries deliberate headroom. RE-DERIVE IT FROM `INDUSTRY_PROFILES`
+ * whenever industry copies move; a figure written here would not survive the next retune.
+ *
+ * Coaches are the type this rule does NOT cover, because no industry asks for one — their demand
+ * comes from passenger work, and Gitea#2 is the open report that the supply is short (see TODO.md).
  */
 export const ROLLING_STOCK_SUPPLY: readonly StockSupply[] = [
   { type: 'coach', loaded: 8, empty: 8 },
@@ -756,19 +951,199 @@ export const STAGES_PER_SHIFT = 3;
 export const HAND_LIMIT = 3;
 
 /**
- * The opening deal: 3 track cards and 3 others, from two separately shuffled piles (`setup.ts`).
+ * The split opening deal — track cards and others, from two separately shuffled piles (`setup.ts`).
+ * One of the three `StartingHand` options below, not the only one any more.
  *
- * Six against a limit of three on purpose — the first turn is spent choosing which district you can
+ * Deliberately over the hand limit: the first turn is spent choosing which district you can afford
- * afford to build. PROVISIONAL, and flagged in `TODO.md` for review after play.
+ * to build. The two constants below are the deal.
  */
 export const OPENING_TRACK = 3;
 export const OPENING_OTHER = 3;
+
+// ---------------------------------------------------------------------------
+// House rules — the settings the New Game dialog offers
+// ---------------------------------------------------------------------------
+
+/**
+ * WHAT EACH PLAYER OPENS HOLDING.
+ *
+ * Three answers, all of which have been the rule at some point, and none of which is obviously
+ * right — so the game stops guessing and asks whoever deals.
+ *
+ * - `threeRandom` — the prototype rule. Three cards off one deck, at the hand limit, no guarantees.
+ * - `sixRandom` — six off one deck, so the first turn is a discard and the opening is a choice,
+ *   without the track being handed to you.
+ * - `threeTrackThreeOther` — three of each from separately shuffled piles. Introduced because a
+ *   run-around needs five specific pieces and the bot held a turnout and a matching-hand curve
+ *   together on 0.2% of turns; measured five ways, that was a SUPPLY problem, not a bot weakness.
+ */
+export type StartingHand = 'threeRandom' | 'sixRandom' | 'threeTrackThreeOther';
+
+/** How many cards come off which pile, per `StartingHand`. `any` is dealt from the single deck. */
+export const OPENING_DEALS: Readonly<Record<StartingHand, { any: number; track: number; other: number }>> = {
+  threeRandom: { any: 3, track: 0, other: 0 },
+  sixRandom: { any: 6, track: 0, other: 0 },
+  threeTrackThreeOther: { any: 0, track: OPENING_TRACK, other: OPENING_OTHER },
+};
+
+/**
+ * WHAT THE THREE WORKING ECONOMIES PAY.
+ *
+ * Balance is the open problem in this game, and the way to settle it is to play it at several
+ * settings rather than to keep re-deriving it. So the three rates are dials, set when the game is
+ * dealt and fixed for its duration.
+ *
+ * DO NOT WRITE A CURRENT BALANCE FIGURE HERE. This said "the developer bot averages 7.0 Revenue
+ * against a target of 20" long after that stopped being true: 7.0 was measured while
+ * `trainPerTransit` still defaulted to 1, and the paragraph below explains that this very setting
+ * was then defaulted to 0 for being worth ~5.4 of it. Re-measured 2026-08-22 over 400 games at the
+ * current defaults, the developer bot means about ZERO. Run `node src/sim/harness.ts 400 standard`
+ * for today's number rather than trusting one written here.
+ *
+ * `passengerPerCoach` and `freightPerLoad` each pay on BOTH halves of their cycle: a coach pays when
+ * it is boarded and again when it is detrained, a load pays when it is made up outbound and again
+ * when it is broken inbound. That is what the rates have always done; these scale it.
+ *
+ * `trainPerTransit` pays every player, once, when a train runs off the end of the Division — it is
+ * the shared achievement, and every Office it crossed had to clear it. It defaults to 0 because at 1
+ * it was worth ~5.4 of a 7.0 mean: the railroad was earning most of its money from traffic no one
+ * had to work, which drowned out the freight and passenger economies this game is actually about.
+ */
+export type RevenueRules = {
+  passengerPerCoach: number;
+  freightPerLoad: number;
+  trainPerTransit: number;
+};
+
+/**
+ * WHERE AN EXTRA MAY BE STARTED — a setting, because the table disagrees about it.
+ *
+ * §7 gives an Extra "either Division Point", and Jesse's ruling adds the Interchange to that base
+ * set: both are places on the shared Division that belong to nobody, so neither favours a seat.
+ * Starting one inside a player's own district is the part that does, which is what this dials.
+ *
+ * - `divisionPointsOnly` — the Division Points and the Interchange. No Office start at all.
+ * - `ownOffice` — those, plus a Control Point in the district of the player who played the card.
+ * - `anyOffice` — those, plus a Control Point in ANY player's district.
+ *
+ * A Whistle Post never qualifies however this is set: an Office has to be a Control Point to start
+ * an Extra, which is part of what upgrading buys (§11).
+ */
+export type ExtraStartRule = 'divisionPointsOnly' | 'ownOffice' | 'anyOffice';
+
+export type HouseRules = {
+  startingHand: StartingHand;
+  revenue: RevenueRules;
+  extraStart: ExtraStartRule;
+  /**
+   * §6.2 — MAY A TIMETABLED TRAIN BE THROWN AWAY? (Gitea#9, superseding Gitea#6.)
+   *
+   * Jesse: "Timetabled trains are at the choice of the player — they can either play or discard. If
+   * someone else wants to pick it up, they are more than able to. The reason: I don't want, if you
+   * decide to play a game longer than five days, to decide that maybe there are too many trains, the
+   * stations are jammed, and the railroad doesn't need any more. You can toss it. Someone else might
+   * disagree and pick it up."
+   *
+   * A setting rather than a flat rule because Jesse asked for it as one — the reasoning above is
+   * about LONG games, and a five-Day game may well want the pressure Gitea#6 created. Discarding
+   * puts the card face-up on a Department pile, so "someone else might pick it up" needs no
+   * machinery of its own: that is where every discard already goes.
+   *
+   * AN EXTRA IS NEVER DISCARDED WHATEVER THIS SAYS. Gitea#9 is about the timetable filling up, and
+   * an Extra never joins it — it runs once and ends in the Salvage Yard, so it cannot jam anything.
+   */
+  discardTimetabled: boolean;
+};
+
+/** What a caller may name — any subset, down to none — resolved by `houseRules()`. */
+export type HouseRuleOverrides = {
+  startingHand?: StartingHand;
+  revenue?: Partial<RevenueRules>;
+  extraStart?: ExtraStartRule;
+  discardTimetabled?: boolean;
+};
+
+/** The dialog's range. Zero is a real setting: it switches an economy off so the others can be read. */
+export const REVENUE_MIN = 0;
+export const REVENUE_MAX = 5;
+
+export const DEFAULT_HOUSE_RULES: HouseRules = {
+  startingHand: 'threeRandom',
+  revenue: { passengerPerCoach: 1, freightPerLoad: 1, trainPerTransit: 0 },
+  // `anyOffice` is what the engine did before the setting existed, so a game dealt without naming
+  // it plays the way it always has. Jesse's call, so the 0.4.9 playtest line does not change under
+  // its testers in the middle of a bugfix release.
+  extraStart: 'anyOffice',
+  // Gitea#9's ruling is the default, so a game dealt without naming it plays the rule Jesse most
+  // recently gave rather than the one it replaced. This keeps main and the 0.4.9 playtest line —
+  // which has no setting and simply allows it — playing the same game.
+  discardTimetabled: true,
+};
+
+/**
+ * THE RULES A SAVE THAT PREDATES THIS SETTING WAS PLAYED UNDER.
+ *
+ * A save is a seed and a list of intents, so it only replays under the ruleset that produced it —
+ * `TODO.md` records two published replays going dead unnoticed when the rules moved, one of them 42
+ * intents into 360. Every save written from now on carries its rules; the ones already written do
+ * not, and this is what they meant. Do not "tidy" it into the defaults above: that silently kills
+ * the three replays in `public/replays/`.
+ */
+export const LEGACY_HOUSE_RULES: HouseRules = {
+  startingHand: 'threeTrackThreeOther',
+  revenue: { passengerPerCoach: 1, freightPerLoad: 1, trainPerTransit: 1 },
+  // An Extra could always be started at a Control Point in these games, in any district.
+  extraStart: 'anyOffice',
+  // These games predate Gitea#6 as well as Gitea#9: a train card could simply be discarded. `true`
+  // is what they were played under, and a replay that discards a Timetabled train needs it.
+  discardTimetabled: true,
+};
+
+/** A whole, valid rule set from a config that may carry none, some, or out-of-range values. */
+export function houseRules(config: { houseRules?: HouseRuleOverrides }): HouseRules {
+  const given = config.houseRules ?? {};
+  const rev = given.revenue ?? {};
+  const clamp = (n: number | undefined, fallback: number): number =>
+    typeof n === 'number' && Number.isFinite(n)
+      ? Math.max(REVENUE_MIN, Math.min(REVENUE_MAX, Math.round(n)))
+      : fallback;
+  const d = DEFAULT_HOUSE_RULES;
+  return {
+    startingHand: given.startingHand ?? d.startingHand,
+    revenue: {
+      passengerPerCoach: clamp(rev.passengerPerCoach, d.revenue.passengerPerCoach),
+      freightPerLoad: clamp(rev.freightPerLoad, d.revenue.freightPerLoad),
+      trainPerTransit: clamp(rev.trainPerTransit, d.revenue.trainPerTransit),
+    },
+    extraStart: given.extraStart ?? d.extraStart,
+    discardTimetabled: given.discardTimetabled ?? d.discardTimetabled,
+  };
+}
+
+/** What the dialog calls each option, in the order it offers them. */
+export const STARTING_HAND_LABELS: readonly { value: StartingHand; label: string }[] = [
+  { value: 'threeRandom', label: 'Three random cards' },
+  { value: 'sixRandom', label: 'Six random cards' },
+  { value: 'threeTrackThreeOther', label: 'Three random track and three random non-track cards' },
+];
+/** What the dialog calls each `ExtraStartRule`, in the order it offers them. */
+export const EXTRA_START_LABELS: readonly { value: ExtraStartRule; label: string }[] = [
+  { value: 'divisionPointsOnly', label: 'Division Points and the Interchange only' },
+  { value: 'ownOffice', label: 'Also the playing player\u2019s own Control Point' },
+  { value: 'anyOffice', label: 'Also any player\u2019s Control Point' },
+];
 export const MAX_CONSIST = 4;
 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;
 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.
+ * Charged every Phase it is caught there, not just once, since the fault is being left that way.
+ */
+export const EXPEDITE_FAULT_PENALTY = 1;
 
 export function collectiveRevenueFloor(players: number, days: number): number {
   return 3 * players * days;
@@ -796,7 +1171,8 @@ export function lengthProfile(length: GameLength): LengthProfile {
 
 /**
  * Cards that can only be played AT another player (Q6). In a solitaire game they have no legal
- * target, so they are removed from the deck rather than sitting in hand as 19% dead draws.
+ * target, so they are removed from the deck rather than sitting in hand as dead draws — which, when
+ * this was written, was very nearly a fifth of the deck.
  */
 export const OPPONENT_ONLY_CATEGORIES: readonly string[] = ['spaceUse', 'action'];
 
@@ -804,6 +1180,14 @@ export function isOpponentOnly(category: string): boolean {
   return OPPONENT_ONLY_CATEGORIES.includes(category);
 }
 
+/**
+ * How many cards `DEFENCE_ONLY_CARDS` accounts for. Summed from the rows rather than written down:
+ * which cards qualify is `SimpleCard.answers`, and the total moves whenever one is added.
+ */
+export const DEFENCE_ONLY_COPIES =
+  ENHANCEMENT_CARDS.filter((c) => c.answers).reduce((n, c) => n + c.copies, 0) +
+  MAINLINE_MODIFIER_CARDS.filter((c) => c.answers).reduce((n, c) => n + c.copies, 0);
+
 export function deckComposition(): { category: string; count: number }[] {
   const sum = (xs: readonly { copies: number }[]): number => xs.reduce((n, x) => n + x.copies, 0);
   return [
@@ -822,18 +1206,33 @@ export function deckComposition(): { category: string; count: number }[] {
 
 /**
  * The whole CATALOGUE, including cards not currently dealt. Not the size of any deck in play — see
- * `DEALT_DECK_SIZE`, which is what `buildDeck` actually returns.
+ * `SOLITAIRE_DECK_SIZE` below, which is what `buildDeck` actually deals. (This pointed at a
+ * `DEALT_DECK_SIZE` that has never existed.)
  */
 export const DECK_SIZE = deckComposition().reduce((n, c) => n + c.count, 0);
 
 /**
- * The deck actually dealt, in every mode: the catalogue less the 22 opponent-directed cards.
+ * The deck actually dealt, in every mode: the catalogue less the opponent-directed cards, less the
+ * defensive cards that exist only to answer them.
  *
  * Named for solitaire because Q6 dropped them there first, and kept under that name because the
  * number is the same either way. They are out of the competitive deck too until they are
- * implemented — `checkPlay` answers both categories NOT_IMPLEMENTED, so dealing them would make ~9%
+ * implemented — `checkPlay` answers both categories NOT_IMPLEMENTED, so dealing them would make a
- * of draws reject. See `buildDeck`.
+ * meaningful share of draws reject outright. See `buildDeck`.
  */
-export const SOLITAIRE_DECK_SIZE = deckComposition()
+export const SOLITAIRE_DECK_SIZE =
+  deckComposition()
     .filter((c) => !isOpponentOnly(c.category))
-  .reduce((n, c) => n + c.count, 0);
+    .reduce((n, c) => n + c.count, 0) - DEFENCE_ONLY_COPIES;
+
+/**
+ * Every card held back BECAUSE its attacker is held back — see `SimpleCard.answers`.
+ *
+ * Reported from play: "just like the opponent directed cards are removed from the solitaire game,
+ * remove any of the defensive cards whose only purpose is to answer them. No need to have them in
+ * the deck when they can never be used."
+ */
+export const DEFENCE_ONLY_CARDS: readonly SimpleCard[] = [
+  ...ENHANCEMENT_CARDS.filter((c) => c.answers),
+  ...MAINLINE_MODIFIER_CARDS.filter((c) => c.answers),
+];

src/engine/events.ts

@@ -1,18 +1,27 @@
 /**
  * Events — protocol.md §3.
  *
- * An event is a FACT. Events are ordered, append-only, and fully determine state:
+ * An event is a FACT: ordered, append-only, and standalone. Events NARRATE the game — they drive the
- * `state = fold(events)`. That one property gives reconnection, restart recovery and post-game
+ * log, the sounds and the replay's captions.
- * replay together.
+ *
+ * THEY DO NOT RECONSTRUCT IT. This header claimed `state = fold(events)` until v0.4.0 and it was
+ * never true. `applyIntent` does go through `reduce`, but the phase driver in `advance.ts` mutates
+ * state and THEN emits a descriptive event, so fourteen of the forty-six types below are never
+ * reduced — the clock, and the whole Mainline phase, which is every train movement in the game.
+ *
+ * The canonical record is `{ seed, history: Intent[] }`, replayed by `fromSave`. That is what save,
+ * restore, undo, restart recovery and post-game replay all run on. See
+ * `docs/architecture/protocol.md` §3, and `test/events.test.ts`, which pins the unreduced set so
+ * that closing the gap is a deliberate act rather than a surprise.
  *
  * DESIGN RULE (overview.md, post-game replay): events must render STANDALONE. Carry the from/to,
  * not just an id the renderer has to resolve against live state — otherwise a replay viewer has to
  * reconstruct the whole board to draw one frame.
  */
 
-import type { CarType, OfficeTier } from './content.ts';
+import type { CarType, Direction, OfficeTier } from './content.ts';
-import type { LocalOpsOption } from './intents.ts';
+import type { ExtraStart, LocalOpsOption } from './intents.ts';
-import type { CardId, GridCoord, PlayerIndex, RollingStock, TrayId } from './state.ts';
+import type { CardId, GridCoord, PlayerIndex, RollingStock, SeatIndex, TrayId } from './state.ts';
 
 export type GameEvent =
   // -- clock
@@ -21,7 +30,12 @@ export type GameEvent =
   | { type: 'actorChanged'; player: PlayerIndex | null }
   // -- local operations
   | { type: 'localOpsOptionChosen'; player: PlayerIndex; option: LocalOpsOption }
-  | { type: 'trayMoved'; trayId: TrayId; from: GridCoord; to: GridCoord; movesRemaining: number; facing?: 'n' | 's' | 'e' | 'w' }
+  /**
+   * `via` mirrors the intent's `via` (docs/plans/switching-paths.md) — present only when there was
+   * 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'; trayId: TrayId; from: GridCoord; to: GridCoord; movesRemaining: number; facing?: 'n' | 's' | 'e' | 'w'; via?: GridCoord }
   | {
       type: 'carsCoupled';
       trayId: TrayId;
@@ -34,6 +48,26 @@ export type GameEvent =
        * running forward: the engine meets the cars head-on and takes them on the front.
        */
       toNose: boolean;
+      /**
+       * Cars that STAY on the card the crew pulled out of, when it coupled its own cut.
+       *
+       * A train may set out off both ends on one square, and pulling forward picks up only the cut
+       * at the end it leaves by — the one behind it is still standing there. `from` names the cards
+       * to sweep and every other one is emptied outright, so the start card needs the exception said
+       * explicitly rather than recomputed: the tray has already moved by the time this is reduced,
+       * and `standingWest` went with it.
+       */
+      leaves?: { at: GridCoord; stock: RollingStock[] };
+      /**
+       * The train's OWN cut, lifted back off the square it set it out on.
+       *
+       * Recoupling your own cars on the square you are standing on is UNDOING the drop, not a fresh
+       * pick-up (Jesse's call, of the two the plan put up). Trains 3/4 spend a per-location freight
+       * budget on setting out, so without this a legal-looking drop became silently one-way: the
+       * train could only ever back away from its own cut, never pull forward through it. The budget
+       * is refunded here and not charged again at the far end.
+       */
+      recoupled?: { at: GridCoord; stock: RollingStock[] };
     }
   | { type: 'carsDropped'; trayId: TrayId; at: GridCoord; stock: RollingStock[]; fromNose?: boolean }
   | { type: 'consistSorted'; trayId: TrayId; at: GridCoord; before: RollingStock[]; after: RollingStock[] }
@@ -90,28 +124,73 @@ export type GameEvent =
   | { type: 'trainHeld'; trainNumber: number; reason: string }
   /** A train whose card pays for standing still (X18 Circus) collected on it. */
   | { type: 'trainStoodStill'; trainNumber: number; where: string }
-  | { type: 'trainHighballed'; trainNumber: number; from: string; to: string }
   /**
-   * `expedited` because it changes what the player must do RIGHT NOW. Q3 — an expedited train
+   * Q3 — A STATION MASTER FAULT. An expedited train is not to be held anywhere but the station: if
-   * departs the same Stage it arrives, so there is no Local Operations turn in which to work it;
+   * it is still off the Office square — parked on Secondary Track, say, to clear a switching move —
-   * every other train stands until the next Mainline Phase and can be switched in between.
+   * when a Mainline Phase begins, that is a failure to keep it ready to highball, and it costs
+   * Revenue. `where` names the square it was found on. Always followed by a `revenueChanged`.
+   */
+  | { type: 'expediteFault'; player: PlayerIndex; trainNumber: number; where: string }
+  /**
+   * `why` is the RULE that let it go now, not a restatement of the move.
+   *
+   * Reported from play: "some trains seem to be moving before I can switch or do other operations on
+   * them." Every departure looked identical in the history, so the one that mattered — an Expedited
+   * train leaving at the end of the Stage it arrived, with no Local Operations turn in between —
+   * read exactly like an ordinary train leaving a Stage later.
+   */
+  | { type: 'trainHighballed'; trainNumber: number; from: string; to: string; why: string }
+  /**
+   * `expedited` flags a train that must not be left standing off the station (Q3) — it may be
+   * 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.
    */
   | { type: 'trainArrived'; trainNumber: number; consist: RollingStock[]; office: string; expedited: boolean }
   | { type: 'trainDiverted'; trainNumber: number; to: string; reason: string }
-  | { type: 'trainCompleted'; trainNumber: number; consist: RollingStock[] }
+  /**
+   * The train ran the length of the Division and left it. `side` is the Division Point it left by,
+   * which is what the announcement needs — and every player scores 1 for it, so this event is
+   * always followed by one `revenueChanged` per player.
+   */
+  | { type: 'trainCompleted'; trainNumber: number; isExtra: boolean; side: 'east' | 'west'; consist: RollingStock[] }
+  /** An Extra took a Crew Tray and started its run — at a Division Point, or at a Control Point. */
+  /**
+   * Carries the RESOLVED start and direction (`resolveExtraStart`), not the raw intent fields, so
+   * the reducer never re-answers a question `check` already answered — the same shape as
+   * `passengersBoarded` carrying its tray and coach index.
+   */
+  | {
+      type: 'extraStarted';
+      player: PlayerIndex;
+      trainNumber: number;
+      at: ExtraStart;
+      direction: Direction;
+    }
   | { 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 }
   // -- load / unload
-  | { type: 'passengersBoarded'; player: PlayerIndex; at: GridCoord }
+  /**
-  | { type: 'passengersDetrained'; player: PlayerIndex; at: GridCoord }
+   * `trayId` and `coachIndex` name the TRAIN and the COACH the Porter worked, rather than leaving the
+   * reducer to find them again — the same lesson as `unloadBegan`'s `carIndex` below. Re-deriving
+   * "the first empty coach on the first train at the Office" is how two trains standing at one
+   * station both answered to one roster chip (v0.4.9d playtest), and how a coach the player had not
+   * chosen got filled. Required, not optional: an event is a fact, and a fact that has to be looked
+   * up against live state cannot render standalone in a replay.
+   */
+  | { type: 'passengersBoarded'; player: PlayerIndex; at: GridCoord; trayId: TrayId; coachIndex: number }
+  | { type: 'passengersDetrained'; player: PlayerIndex; at: GridCoord; trayId: TrayId; coachIndex: number }
   | { type: 'loadStarted'; player: PlayerIndex; at: GridCoord; carType: CarType }
   | { type: 'loadAdvanced'; player: PlayerIndex; at: GridCoord; fromBox: number; toBox: number }
   | { type: 'unloadCompleted'; player: PlayerIndex; at: GridCoord; carType: CarType }
   | { type: 'loadCompleted'; player: PlayerIndex; at: GridCoord; carType: CarType }
-  | { type: 'unloadBegan'; player: PlayerIndex; at: GridCoord; carType: CarType }
+  /**
+   * `carIndex` carries the SPECIFIC car the player picked off the industry track — see the comment
+   * on `laborer.beginUnload` in `apply.ts` for why the reducer must not re-derive it.
+   */
+  | { 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 };

src/engine/intents.ts

@@ -5,7 +5,7 @@
  */
 
 import type { CarType, Direction, Hand, OfficeTier, TrackGeometry } from './content.ts';
-import type { CardId, GridCoord, PlayerIndex, TrayId } from './state.ts';
+import type { CardId, GridCoord, PlayerIndex, SeatIndex, TrayId } from './state.ts';
 
 // ---------------------------------------------------------------------------
 // Local Operations Phase (§6) — a three-way exclusive choice
@@ -13,10 +13,28 @@ import type { CardId, GridCoord, PlayerIndex, TrayId } from './state.ts';
 
 export type LocalOpsOption = 'switch' | 'draw' | 'freightAgent';
 
+/**
+ * Where an Extra is placed when it is started (§7).
+ *
+ * `mainline` names a node index in `division.nodes` and is only ever an Interchange; `office` names
+ * a SEAT, which is what an Office Area belongs to, and only ever a Control Point.
+ */
+export type ExtraStart =
+  | { kind: 'divisionPoint'; side: Direction }
+  | { kind: 'mainline'; node: number }
+  | { kind: 'office'; seat: SeatIndex };
+
 export type Intent =
   | { type: 'localOps.choose'; option: LocalOpsOption }
   // -- switch (§6.1, Appendix A)
-  | { type: 'switch.move'; trayId: TrayId; to: GridCoord; reverse: boolean }
+  /**
+   * `via` names one INTERMEDIATE card on the chosen route, for the rare case where two routes to
+   * `to` couple different cars (see docs/plans/switching-paths.md) — never the start, never `to`
+   * itself. Absent, it resolves exactly as it always has: the first route `legal.ts` enumerated to
+   * `to`. An index into the destination list would do the same job worse — intents are the
+   * canonical record `undo` replays against, and enumeration order is not a stable thing to save.
+   */
+  | { type: 'switch.move'; trayId: TrayId; to: GridCoord; reverse: boolean; via?: GridCoord }
   /**
    * Set out a cut. `fromNose` takes it off the FRONT of the train rather than the back — Appendix A's
    * worked example does exactly this: "Back up and drop off everything on the nose of your train
@@ -66,6 +84,32 @@ export type Intent =
   // -- New Train Phase (§7)
   | { type: 'newTrain.placeCar'; trayId: TrayId; carType: CarType; loaded: boolean }
   | { type: 'newTrain.passCar'; trayId: TrayId }
+  /**
+   * §7 — "the player who played the card may place the Crew Tray at EITHER Division Point for
+   * immediate departure", plus Jesse's ruling on where else and which way.
+   *
+   * The number does not decide an Extra's direction — the START does. Either Division Point may be
+   * chosen and the train runs away from it (west end runs east, east end runs west, since the other
+   * reading is a train that leaves the Division having crossed nothing). At an Interchange or a
+   * Control Point, which are in the middle of the railroad, both ways are real runs and `direction`
+   * says which; it is required there and ignored at a Division Point.
+   *
+   * WHICH STARTS ARE OFFERED is the `extraStart` house rule (content.ts) — Division Points and the
+   * Interchange always, Offices by setting.
+   *
+   * `atSeat` IS LEGACY AND WRITE-ONCE. Saves written before this choice existed carry only that
+   * field: `null` meant "the Division Point this train's number sends it to" and a seat meant that
+   * Office, both running in the number's direction. `start` absent is exactly what those saves said,
+   * so they replay unchanged; everything written from now on carries `start` and `atSeat` is
+   * omitted. `resolveExtraStart` (apply.ts) is the single place that reads either.
+   */
+  | {
+      type: 'newTrain.startExtra';
+      trainNumber: number;
+      atSeat?: SeatIndex | null;
+      start?: ExtraStart;
+      direction?: Direction;
+    }
   /** Q9 — run a second, identical section behind a train that is due out this Stage. */
   | { type: 'newTrain.secondSection'; trainNumber: number }
   // -- Mainline Phase (§8.1) — the Superintendent's clearance ruling
@@ -87,8 +131,18 @@ export type Intent =
   | { type: 'maneuver.flyingSwitch'; cardId: CardId; trayId: TrayId; count: number; to: GridCoord }
   | { type: 'redFlag.play' }
   // -- Load/Unload Phase (§9)
-  | { type: 'porter.board'; at: GridCoord }
+  /**
-  | { type: 'porter.detrain'; at: GridCoord }
+   * `trayId` names the train the Porter works — reported from playtesting v0.4.9d as "operating two
+   * trains in a station, the select button does not work: regardless of which you pick, it is always
+   * one train, not the other". It was: neither intent carried a train, so the reducer took the first
+   * one on the A/D tracks and the roster chip the player had clicked changed nothing but the drawing.
+   *
+   * OPTIONAL, like `switch.move`'s `via` and for the same reason: intents are the canonical record
+   * `undo` and every save replay against, and absent means what it has always meant — the first
+   * eligible train at the Office.
+   */
+  | { type: 'porter.board'; at: GridCoord; trayId?: TrayId }
+  | { type: 'porter.detrain'; at: GridCoord; trayId?: TrayId }
   /** §9.3 — the first Laborer step: Green Loading Slot -> MEN. */
   | { type: 'laborer.startLoad'; at: GridCoord }
   | { type: 'laborer.advanceLoad'; at: GridCoord; box: number }
@@ -136,6 +190,11 @@ export type RejectionCode =
   | 'ON_RUNNING_TRACK'
   /** A card with no east-west road would dead-end the Running Track it was laid in. */
   | 'BREAKS_RUNNING_TRACK'
+  /**
+   * §2.1 — track, and the Facilities that carry it, stay inside your own Limits at every row. A
+   * Modifier is not track and is exempt (§9's nine spots), which is why this is not shared with it.
+   */
+  | 'OUTSIDE_LIMITS'
   /**
    * A turnout may be laid on top of a straight, or of a curve on the same arc as its diverging leg
    * — but only those, and only while the square is idle. See `checkTurnoutUpgrade`.
@@ -161,7 +220,61 @@ export type RejectionCode =
   | 'NOT_A_GRADE'
   | 'TRAIN_ON_CARD'
   | 'CONSIST_ORDER'
-  | 'NO_TRAIN_AT_OFFICE';
+  | 'NO_TRAIN_AT_OFFICE'
+  /**
+   * WHY PASSENGER WORK WAS REFUSED, told apart.
+   *
+   * All three used to come back as `NO_TRAIN_AT_OFFICE` — said while a train was standing at the
+   * Office, which reads as a broken game rather than a rule. Measured over 60 solitaire games, the
+   * fallback fired 51 times with a coach train in front of the player: 27 with nobody waiting to
+   * travel, 24 with passengers waiting and every coach on the train already full.
+   */
+  /**
+   * §9.3 — a load may only start down the sign when an empty car of THAT type is standing on the
+   * industry's track and is not already promised to another load. Walking cargo onto WORK with
+   * nothing to put it in is "just dropping it onto the tracks".
+   *
+   * STOCKING THE GREEN BOX IS NOT GATED ON IT. §6.3 lets the Freight Agent stage a load whenever
+   * the Division Yard has the car and the box has room; the empty car only has to be there before
+   * the Laborers can move it out of the box.
+   */
+  | 'NO_EMPTY_CAR_SPOTTED'
+  /**
+   * §9 (Jesse's ruling, v0.4.9e) — freight or passengers loaded anywhere in an Office Area may not
+   * be unloaded anywhere in that same Office Area. The load has to be carried out of the district by
+   * a train first; a Freight House may not break the load it just made, and passengers may not
+   * detrain at the platform they boarded from.
+   *
+   * Distinct from the other refusals because the car IS loaded, the Laborer IS free and the boxes
+   * ARE clear: the only thing wrong with it is where it came from, and a player looking at a loaded
+   * boxcar standing on their own industry track deserves to be told that rather than "wrong car".
+   */
+  | 'LOADED_IN_THIS_DISTRICT'
+  | 'NO_PORTERS_HERE'
+  | 'NO_PASSENGERS_WAITING'
+  | 'NO_EMPTY_COACH'
+  | 'NO_LOADED_COACH'
+  | 'INBOUND_BOX_FULL'
+  | 'NO_EMPTY_COACH_IN_YARD'
+  | 'NOT_A_CONTROL_POINT'
+  | 'NO_EXTRA_PENDING'
+  | 'NO_FREE_TRAY'
+  | 'NO_FREE_AD_TRACK'
+  // -- §7, where an Extra may be started (`resolveExtraStart`)
+  | 'NO_SUCH_DIVISION_POINT'
+  /** Only the Interchange has a yard an Extra can be made up in. */
+  | 'NOT_AN_INTERCHANGE'
+  /** In the middle of the railroad both ways are real runs, so the intent has to say which. */
+  | 'NO_DIRECTION_CHOSEN'
+  /** The `extraStart` house rule is `divisionPointsOnly`. */
+  | 'OFFICE_STARTS_NOT_ALLOWED'
+  /** The `extraStart` house rule is `ownOffice` and this is somebody else's district. */
+  | 'NOT_YOUR_OFFICE'
+  /**
+   * §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';
 
 export type Rejection = { code: RejectionCode; message: string };
 

src/engine/legal.ts

@@ -13,12 +13,42 @@
  */
 
 import type { CarType, Hand, TrackGeometry } from './content.ts';
-import { enhancementRule } from './content.ts';
+import { enhancementRule, mainlineProfile } from './content.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';
+import type { MoveDestination } from './track.ts';
 import { variantsFor } from './track.ts';
 
+/**
+ * A square GridCoord this route passes through that no OTHER route to the same destination does —
+ * the discriminator `switch.move.via` needs so `selectDestination` (apply.ts) never has to guess
+ * which of two routes an intent meant. `siblings` is every route the same `destinationsFor` call
+ * returned at this same square; `route` must be one of them.
+ *
+ * Absent when `route` is the only route there (the overwhelmingly common case — `via` need not be
+ * carried at all), or when the destination is one hop away, which is never ambiguous: the square
+ * immediately before a given entry port is fixed by geometry, so a zero-length path cannot have a
+ * sibling.
+ */
+function distinguishingVia(route: MoveDestination, siblings: readonly MoveDestination[]): GridCoord | undefined {
+  if (route.path.length === 0) return undefined;
+  const otherSquares = new Set<string>();
+  for (const sibling of siblings) {
+    if (sibling === route) continue;
+    for (const step of sibling.path) otherSquares.add(coordKey(step.coord));
+  }
+  for (const step of route.path) {
+    if (!otherSquares.has(coordKey(step.coord))) return step.coord;
+  }
+  // Every square on this route is shared with some sibling — geometrically possible only if the
+  // routes fork and rejoin more than once, which `track.ts`'s doc comment says not to rely on not
+  // happening. Naming the last square before the destination at least matches today's behaviour:
+  // wrong in the same way a route with no `via` at all would be.
+  return route.path[route.path.length - 1]!.coord;
+}
+
 const CAR_TYPES: readonly CarType[] = ['coach', 'boxcar', 'reefer', 'hopper', 'tank', 'caboose'];
 
 /** Every intent `player` may legally submit right now. */
@@ -82,11 +112,23 @@ function localOpsCandidates(s: GameState, player: PlayerIndex): Intent[] {
 
   // -- switch (§6.1)
   for (const [trayId, tray] of s.trays) {
-    if (tray.position.at !== 'grid' || tray.position.owner !== player) continue;
+    if (tray.position.at !== 'grid' || tray.position.seat !== seatOf(s, player)) continue;
     const from = tray.position.coord;
     for (const reverse of [false, true]) {
-      for (const d of destinationsFor(s, player, trayId, from, reverse)) {
+      const dests = destinationsFor(s, player, trayId, from, reverse);
-        out.push({ type: 'switch.move', trayId, to: d.coord, reverse });
+      // Grouped by destination square so `distinguishingVia` only ever compares routes that are
+      // actually racing for the same button — two routes to DIFFERENT squares need no `via` to
+      // tell apart, `to` already does that.
+      const byCoord = new Map<string, MoveDestination[]>();
+      for (const d of dests) {
+        const k = coordKey(d.coord);
+        (byCoord.get(k) ?? byCoord.set(k, []).get(k)!).push(d);
+      }
+      for (const group of byCoord.values()) {
+        for (const d of group) {
+          const via = group.length > 1 ? distinguishingVia(d, group) : undefined;
+          out.push({ type: 'switch.move', trayId, to: d.coord, reverse, ...(via ? { via } : {}) });
+        }
       }
     }
     for (let n = 1; n <= tray.consist.length; n++) {
@@ -113,7 +155,7 @@ function localOpsCandidates(s: GameState, player: PlayerIndex): Intent[] {
     const k = s.cards.get(cardId)?.kind;
     if (k?.kind !== 'maneuver' || k.key !== 'flyingSwitch') continue;
     for (const [trayId, tray] of s.trays) {
-      if (tray.position.at !== 'grid' || tray.position.owner !== player) continue;
+      if (tray.position.at !== 'grid' || tray.position.seat !== seatOf(s, player)) continue;
       const from = tray.position.coord;
       for (const reverse of [false, true]) {
         for (const d of destinationsFor(s, player, trayId, from, reverse)) {
@@ -228,6 +270,31 @@ function newTrainCandidates(s: GameState): Intent[] {
   if (due !== null && due !== undefined) {
     out.push({ type: 'newTrain.secondSection', trainNumber: due });
   }
+  /**
+   * WHERE A PENDING EXTRA MAY START (§7, Jesse's ruling) — every candidate offered, with `check`
+   * doing the filtering, so "is this a Control Point" and "does the house rule allow it" have one
+   * implementation each rather than two.
+   *
+   * BOTH Division Points, not the one the number dictates: an Extra's direction comes from where it
+   * 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.
+   */
+  for (const trainNumber of s.pendingExtras) {
+    for (const side of ['west', 'east'] as const) {
+      out.push({ type: 'newTrain.startExtra', trainNumber, start: { kind: 'divisionPoint', side } });
+    }
+    for (const [node, n] of s.division.nodes.entries()) {
+      if (n.kind !== 'mainline' || !mainlineProfile(n.card).sortsCars) continue;
+      for (const direction of ['west', 'east'] as const) {
+        out.push({ type: 'newTrain.startExtra', trainNumber, start: { kind: 'mainline', node }, direction });
+      }
+    }
+    for (const seat of s.officeAreas.keys()) {
+      for (const direction of ['west', 'east'] as const) {
+        out.push({ type: 'newTrain.startExtra', trainNumber, start: { kind: 'office', seat }, direction });
+      }
+    }
+  }
   return out;
 }
 
@@ -235,9 +302,21 @@ function loadUnloadCandidates(s: GameState, player: PlayerIndex): Intent[] {
   const out: Intent[] = [];
   const area = areaOf(s, player);
 
+  /**
+   * ONE OPTION PER TRAIN STANDING AT THE OFFICE, not one per square.
+   *
+   * Reported from playtesting v0.4.9d: "operating two trains in a station, the select button does
+   * not work — regardless of which you pick, it is always one train, not the other". There was only
+   * ever ONE `board passengers` button, because the intent carried no train; the roster chip chose
+   * what the board drew and nothing else. Now each eligible train is its own candidate, and `check`
+   * filters the ones whose card, consist or passengers rule them out.
+   */
+  const traysHere = area.adOccupancy.filter((id) => s.trays.has(id));
   for (const coord of facilityCoords(s, player)) {
-    out.push({ type: 'porter.board', at: coord });
+    for (const trayId of traysHere) {
-    out.push({ type: 'porter.detrain', at: coord });
+      out.push({ type: 'porter.board', at: coord, trayId });
+      out.push({ type: 'porter.detrain', at: coord, trayId });
+    }
     const f = area.grid.get(`${coord.row},${coord.col}`)?.facility;
     if (f) {
       out.push({ type: 'laborer.startLoad', at: coord });
@@ -301,5 +380,35 @@ function placementCandidates(s: GameState, player: PlayerIndex): GridCoord[] {
       out.push(c);
     }
   }
+
+  /**
+   * THE NINE-SPOT MODIFIER NEIGHBOURHOOD (§9), which the four-square walk above cannot reach.
+   *
+   * A Modifier goes "adjacent to a Facility, on any of the nine nearby spots" — diagonals included —
+   * and `check` has always accepted all eight. It was the CANDIDATES that were orthogonal-only, so a
+   * diagonal square with no orthogonal neighbour was legal and never offered: reported by Jesse as
+   * being unable to place a Modifier to the south-east of his industry.
+   *
+   * Only around a Facility, and only in a second pass. Track has to JOIN, and a diagonal shares no
+   * edge, so a Modifier is the only card these squares can ever take — generating diagonals around
+   * every card instead costs 54% more simulation time for candidates `check` then rejects. Appending
+   * rather than interleaving leaves the existing order untouched, which matters because the bot
+   * breaks ties by first-best: measured over 200 seeded games, 0 played differently.
+   */
+  for (const [key, card] of area.grid) {
+    if (!card.facility) continue;
+    const [row, col] = key.split(',').map(Number);
+    for (const c of [
+      { row: row! + 1, col: col! + 1 },
+      { row: row! + 1, col: col! - 1 },
+      { row: row! - 1, col: col! + 1 },
+      { row: row! - 1, col: col! - 1 },
+    ]) {
+      const k = `${c.row},${c.col}`;
+      if (seen.has(k) || area.grid.has(k)) continue;
+      seen.add(k);
+      out.push(c);
+    }
+  }
   return out;
 }

src/engine/setup.ts

@@ -16,9 +16,9 @@ import {
   MOVES_PER_LOCAL_OPS,
   MODIFIER_PROFILES,
   OFFICE_PROFILES,
-  OPENING_OTHER,
+  OPENING_DEALS,
-  OPENING_TRACK,
+  MAINLINE_DECK,
-  MAINLINE_PROFILES,
+  houseRules,
   mainlineProfile,
   TRACK_CARDS,
   ROLLING_STOCK_SUPPLY,
@@ -34,6 +34,7 @@ import type {
   Card,
   CardId,
   DivisionNode,
+  SeatIndex,
   GameConfig,
   GameState,
   OfficeArea,
@@ -42,7 +43,7 @@ import type {
   TrackCard,
   TrayId,
 } from './state.ts';
-import { coordKey, freshTurn } from './state.ts';
+import { coordKey, freshTurns } from './state.ts';
 
 export type SetupOptions = {
   id: string;
@@ -59,8 +60,9 @@ export function buildDeck(mode: GameConfig['mode'] = 'competitive'): Card[] {
    * 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.
-   * Three Enhancements — Facing Point Locks, Water Column and Overpass — exist only to answer these,
+   *
-   * and stay dormant until they come back. Recorded in TODO.md as multiplayer work.
+   * 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.
    *
    * `mode` is still taken so the signature does not move when they return; it is deliberately unused
    * for these two categories today.
@@ -89,10 +91,22 @@ export function buildDeck(mode: GameConfig['mode'] = 'competitive'): Card[] {
       for (let i = 0; i < c.copies; i++) push({ kind: 'spaceUse', key: c.key });
     }
   }
+  /**
+   * A DEFENCE GOES OUT WITH THE ATTACK IT ANSWERS.
+   *
+   * Facing Point Locks (both kinds), the Water Column and the Overpass exist only to answer Derail,
+   * a Watertower and a Railroad Crossing — all of which are among the 22 opponent-directed cards
+   * held out above. Left in, they are dead draws for exactly the same reason the attacks would be,
+   * and there are 7 of them. `SimpleCard.answers` names the pairing on the card itself, so they come
+   * back together the moment `opponentCardsInDeck` does.
+   */
+  const dealt = (c: { answers?: string }): boolean => opponentCardsInDeck || !c.answers;
   for (const c of ENHANCEMENT_CARDS) {
+    if (!dealt(c)) continue;
     for (let i = 0; i < c.copies; i++) push({ kind: 'enhancement', key: c.key });
   }
   for (const c of MAINLINE_MODIFIER_CARDS) {
+    if (!dealt(c)) continue;
     for (let i = 0; i < c.copies; i++) push({ kind: 'mainlineModifier', key: c.key });
   }
   for (const c of MANEUVER_CARDS) {
@@ -129,7 +143,7 @@ export function buildRollingStock(): RollingStock[] {
  * branch from the opening Stage. The stubs are NOT turnouts: §A.1's directional rule governs
  * drawn turnout cards only.
  */
-function buildOfficeArea(owner: PlayerIndex): OfficeArea {
+function buildOfficeArea(seat: SeatIndex): OfficeArea {
   const row = 0;
   const officeCoord = { row, col: 0 };
   const limitsWest = { row, col: -1 };
@@ -139,6 +153,7 @@ function buildOfficeArea(owner: PlayerIndex): OfficeArea {
     geometry: { kind: 'office' },
     baseOperationalRail: true,
     standing: [],
+    standingWest: 0,
     facility: buildPassengerFacility('whistlePost'),
     modifiers: [],
     enhancements: [],
@@ -148,6 +163,7 @@ function buildOfficeArea(owner: PlayerIndex): OfficeArea {
     geometry: { kind: 'limits' },
     baseOperationalRail: true,
     standing: [],
+    standingWest: 0,
     facility: null,
     modifiers: [],
     enhancements: [],
@@ -159,7 +175,7 @@ function buildOfficeArea(owner: PlayerIndex): OfficeArea {
   grid.set(coordKey(limitsEast), limitsCard());
 
   return {
-    owner,
+    seat,
     tier: 'whistlePost',
     grid,
     officeCoord,
@@ -190,7 +206,7 @@ function buildPassengerFacility(tier: Parameters<typeof officeProfile>[0]): NonN
     // WORK sign is printed "For Freight Facilities" (rules-v0.2.md:452). This was a three-slot array
     // of nulls, which read as "three empty boxes" to every renderer that looked.
     menAtWork: null,
-    industryTrack: { length: 0, cars: [] },
+    industryTrack: { cars: [] },
     laborers: 0,
     porters: p.porters,
     usedThisStage: { laborers: 0, porters: 0 },
@@ -204,11 +220,27 @@ function buildPassengerFacility(tier: Parameters<typeof officeProfile>[0]): NonN
  * placed between each player"), which is what gives the Division its terrain and therefore its
  * crossing times.
  */
+/**
+ * THE MAINLINE CARDS ARE DEALT FROM A DECK, NOT ROLLED.
+ *
+ * `MAINLINE_PROFILES` is a list of card TYPES and this drew from it uniformly WITH replacement, so
+ * a Division could be handed two Interchanges or two Tunnels, and Plains — printed twice in the
+ * deck — carried the same weight as cards printed once. `MAINLINE_DECK` is the printed inventory
+ * (`docs/StationMaster-Mainline-Deck-v0.4.5.md`, which flagged this as needing correction), and the
+ * deal is now a deal: take cards out of it and do not put them back.
+ *
+ * The Extra-start rules are what forced the issue. "An Extra may start at the Interchange if one is
+ * on the board" only reads as a rule if the board can hold at most one.
+ *
+ * A Division needs `players + 1` cards, so four players draw five from ten and the deck is never
+ * close to exhausted; the throw is there because a silent short Division would be very hard to see.
+ */
 function buildDivision(players: number, rng: Rng): DivisionNode[] {
   const nodes: DivisionNode[] = [];
-  const kinds = MAINLINE_PROFILES.map((m) => m.kind);
+  const deck = [...MAINLINE_DECK];
   const mainline = (): DivisionNode => {
-    const card = kinds[rng.nextInt(kinds.length)]!;
+    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: [] };
     // 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
@@ -230,7 +262,7 @@ function buildDivision(players: number, rng: Rng): DivisionNode[] {
   nodes.push({ kind: 'divisionPoint', side: 'west', holding: [] });
   for (let p = 0; p < players; p++) {
     nodes.push(mainline());
-    nodes.push({ kind: 'office', owner: p });
+    nodes.push({ kind: 'office', seat: p });
   }
   nodes.push(mainline());
   nodes.push({ kind: 'divisionPoint', side: 'east', holding: [] });
@@ -250,61 +282,95 @@ export function createGame(opts: SetupOptions): GameState {
 
   const players = playerNames.map((name, index) => ({ index, name, revenue: 0 }));
 
-  const officeAreas = new Map<PlayerIndex, OfficeArea>();
+  // Offices are keyed by SEAT — a fixed position in the west-to-east chain. `seating` maps seats to
-  for (let p = 0; p < playerCount; p++) officeAreas.set(p, buildOfficeArea(p));
+  // the players occupying them, and starts as the identity mapping, which is what makes the
-
+  // seat/player split behaviour-neutral. Employee Rotation would rotate this array and nothing else.
+  const officeAreas = new Map<SeatIndex, OfficeArea>();
+  for (let seat = 0; seat < playerCount; seat++) officeAreas.set(seat, buildOfficeArea(seat));
   // §4.4 - highest D12 takes the Eastern Division Point; §4.5 - highest begins as Superintendent.
   // Both rolls are drawn even in solitaire so the RNG stream stays identical across player counts.
   const divisionRolls = players.map(() => rng.d12());
   const superRolls = players.map(() => rng.d12());
   const superintendent = argmax(superRolls);
-  void divisionRolls; // seating is fixed by array order; the roll is recorded for the event log
 
   /**
-   * §4.6-4.7 — THE OPENING DEAL, dealt from two piles rather than one.
+   * §4.4 — THE OPENING D12 DECIDES WHO SITS WHERE.
    *
-   * Track is shuffled SEPARATELY from everything else and each player is dealt **3 track cards and 3
+   * `seating[seat] = player`, and seat 0 is the WESTERN end of the chain (`buildDivision` lays the
-   * other cards**; the track left over is then shuffled back in and the game runs off one deck as
+   * Western Division Point, then office 0, and finishes at the Eastern one). So the highest roll
-   * before. The player opens holding six against a limit of three, so the first turn is spent
+   * takes the last seat — "highest is the Eastern Division Point" — and the lowest ends up beside
-   * choosing what to keep — draw as usual, then play or discard down to three (§6.2, enforced on
+   * the Western Division Point, which is the rule's other named position.
-   * `draw.end`, which needs no special case for this).
    *
-   * WHY. A run-around needs five specific pieces in a usable order, and the bot held a turnout and a
+   * The rule names only those two ends, because at a table the players are already sitting in a
-   * matching-hand curve together on **0.2% of turns** — about once every eight games. Measured five
+   * chain and the roll only says which way round it is. There is no physical table here, so the
-   * ways, that is a SUPPLY problem and not a bot weakness: 91 run-arounds per 100 games when track
+   * roll orders everybody: ascending by roll, west to east. It uses a number every player is
-   * was a private 26-piece supply the player chose from, 29 per 100 once it was drawn, 4 per 60 with
+   * already told to roll, and it makes the roll matter to more than the winner.
-   * track in the deck. Dealing the opening district as track restores something close to the
-   * prototype's private supply without reintroducing an unbounded one, and makes the opening a
-   * decision rather than a wait.
    *
-   * PROVISIONAL — flagged for review once it has been played. See `TODO.md`.
+   * Ties break toward the LOWER player index sitting further east, which is the same convention
+   * `argmax` uses for the Superintendent roll on the line above — first max wins.
+   *
+   * This was `void divisionRolls` until v0.4.1: the roll was drawn and discarded, and seating was
+   * the identity mapping. Turning it on is what makes seat and player genuinely different at
+   * runtime rather than only in the type names.
    */
+  const seating: PlayerIndex[] = players
+    .map((_, p) => p)
+    .sort((a, b) => divisionRolls[a]! - divisionRolls[b]! || b - a);
+
+  /**
+   * §4.6-4.7 — THE OPENING DEAL, in whichever of the three shapes this game was dealt with.
+   *
+   * `threeRandom` and `sixRandom` deal off ONE shuffled deck; `threeTrackThreeOther` shuffles track
+   * separately and deals three of each, then shuffles the remainder back together so the game runs
+   * off one deck from the first draw onward either way. `content.ts` says what each option is for.
+   *
+   * A player dealt six holds six against a limit of three, on purpose: the first turn is spent
+   * choosing what to keep — draw as usual, then play or discard down to three (§6.2, enforced on
+   * `draw.end`, which needs no special case for this). A player dealt three is already at the limit.
+   *
+   * §4.7 — "starting from the Superintendent, deal each player…", which proceeds round the table and
+   * is therefore SEAT order, not player order. That is the same in all three shapes.
+   */
+  const rules = houseRules(config);
+  const deal = OPENING_DEALS[rules.startingHand];
   const deck = buildDeck(config.mode);
   const cards = new Map<CardId, Card>();
   for (const c of deck) cards.set(c.id, c);
 
   const isTrack = (id: CardId): boolean => cards.get(id)?.kind.kind === 'track';
   const ids = deck.map((c) => c.id);
+  const superSeat = seating.indexOf(superintendent);
+  const hands = new Map<PlayerIndex, CardId[]>();
+  const dealtTo = (i: number): PlayerIndex => seating[(superSeat + i) % playerCount]!;
+
+  let shuffled: CardId[];
+  if (deal.any > 0) {
+    // One deck, one shuffle, the top cards off it — the prototype's own deal.
+    const single = rng.shuffle(ids);
+    let cut = 0;
+    for (let i = 0; i < playerCount; i++) {
+      hands.set(dealtTo(i), single.slice(cut, cut + deal.any));
+      cut += deal.any;
+    }
+    shuffled = single.slice(cut);
+  } else {
     // Shuffled in a fixed order — track first — so the RNG stream is deterministic for a given seed.
     const trackPile = rng.shuffle(ids.filter(isTrack));
     const otherPile = rng.shuffle(ids.filter((id) => !isTrack(id)));
-
-  const hands = new Map<PlayerIndex, CardId[]>();
     let trackCursor = 0;
     let otherCursor = 0;
     for (let i = 0; i < playerCount; i++) {
-    const p = (superintendent + i) % playerCount;
+      hands.set(dealtTo(i), [
-    hands.set(p, [
+        ...trackPile.slice(trackCursor, trackCursor + deal.track),
-      ...trackPile.slice(trackCursor, trackCursor + OPENING_TRACK),
+        ...otherPile.slice(otherCursor, otherCursor + deal.other),
-      ...otherPile.slice(otherCursor, otherCursor + OPENING_OTHER),
       ]);
-    trackCursor += OPENING_TRACK;
+      trackCursor += deal.track;
-    otherCursor += OPENING_OTHER;
+      otherCursor += deal.other;
     }
-
     // The remainder goes back into ONE deck for the rest of the game — the split is an opening-deal
     // device only, so track competes for the draw exactly as before from the first draw onward.
-  const shuffled = rng.shuffle([...trackPile.slice(trackCursor), ...otherPile.slice(otherCursor)]);
+    shuffled = rng.shuffle([...trackPile.slice(trackCursor), ...otherPile.slice(otherCursor)]);
+  }
 
   // §4.6-4.7 — three cards turned face up beside the deck. Each is the bottom of a Department pile
   // that grows as players discard onto it. Taken after the recombination, so a Department slot can
@@ -334,6 +400,8 @@ export function createGame(opts: SetupOptions): GameState {
     seed,
     rngState: rng.getState(),
     players,
+    seating,
+    openingRolls: { division: divisionRolls, superintendent: superRolls },
     division: { nodes: buildDivision(playerCount, rng) },
     officeAreas,
     trays: new Map(),
@@ -354,7 +422,7 @@ export function createGame(opts: SetupOptions): GameState {
       superintendent,
       actorOffset: 0,
     },
-    turn: freshTurn(MOVES_PER_LOCAL_OPS),
+    turns: freshTurns(playerCount, MOVES_PER_LOCAL_OPS),
     movedThisPhase: new Set(),
     collisionsToday: 0,
     status: 'active',

src/engine/state.ts

@@ -13,17 +13,34 @@ import type {
   MainlineKind,
   FreightKind,
   GameLength,
+  HouseRuleOverrides,
   ModifierKind,
   OfficeTier,
   TrackGeometry,
 } from './content.ts';
-import { officeProfile } from './content.ts';
+import { MAX_CONSIST, officeProfile } from './content.ts';
 
 // ---------------------------------------------------------------------------
 // Identifiers
 // ---------------------------------------------------------------------------
 
 export type PlayerIndex = number;
+
+/**
+ * A SEAT at the table — a fixed position in the west-to-east chain of Offices (§4.3).
+ *
+ * NOT the same thing as a `PlayerIndex`, even though the two are equal in every game today. An
+ * Office is a place: it sits between two Mainline cards and never moves. A player OCCUPIES a seat,
+ * and Employee Rotation (Appendix B) moves every player one seat left at the end of each Day while
+ * their Revenue and the Fedora travel with them.
+ *
+ * So: offices, districts and grid positions are keyed by SEAT; hands, Revenue, the Superintendent
+ * and whose turn it is are keyed by PLAYER. `s.seating` maps one to the other, and both are plain
+ * numbers, so the distinction is carried by naming and by the accessors rather than by the type
+ * system — `areaOf(s, player)` and `areaAtSeat(s, seat)` are the two doors, and code should use them
+ * rather than reaching into `officeAreas` directly.
+ */
+export type SeatIndex = number;
 export type CardId = string;
 export type TrayId = string;
 
@@ -39,7 +56,47 @@ export function coordKey(c: GridCoord): string {
 // ---------------------------------------------------------------------------
 
 /** §2.2 — a coloured car is loaded, a white car is empty. */
-export type RollingStock = { type: CarType; loaded: boolean };
+export type RollingStock = {
+  type: CarType;
+  loaded: boolean;
+  /**
+   * WHICH OFFICE AREA MADE THIS LOAD — the physical game's chip turned upside down in the tray.
+   *
+   * Reported from playtesting v0.4.9d as two bugs with one cause: a boxcar loaded at a Freight
+   * House could be unloaded at that same Freight House on the next Laborer action, and passengers
+   * who had just boarded could be detrained again before the train turned a wheel. Both paid full
+   * Revenue at each end for a load that never went anywhere.
+   *
+   * Jesse's rule (v0.4.9e): freight or passengers loaded anywhere in an Office Area may not be
+   * unloaded ANYWHERE in that same Office Area — not at another facility, not in a later Stage.
+   * They have to be carried by a train to a different Office Area. So the stamp is the SEAT, which
+   * is what an Office Area belongs to (Employee Rotation moves players between chairs; the district
+   * stays with the chair), and it never expires.
+   *
+   * A SEAT, NOT A PLAYER, and undefined rather than -1 for "no origin": the Division Yard opens with
+   * loaded cars and loaded coaches that were made up off-Division (`ROLLING_STOCK_SUPPLY`), and
+   * those are exactly the inbound traffic a solitaire district lives on. A sentinel inside
+   * `SeatIndex`'s own value range is not a sentinel — see `card.play`'s `node` in intents.ts.
+   *
+   * Stripped by `pooled` whenever a car goes back to a yard: the stamp belongs to the LOAD, and a
+   * car returning to the common supply is carrying nothing.
+   */
+  origin?: SeatIndex;
+};
+
+/**
+ * A car returning to the common pool — the Division or Classification Yard — with its load's origin
+ * stamp taken off.
+ *
+ * Every yard push goes through this. A loaded car CAN reach a yard still loaded (a train retires at
+ * a Division Point with freight aboard, `advance.ts`), and without this it would carry a stamp from
+ * a district it left several Days ago into whatever train is made up from it next.
+ */
+export function pooled(car: RollingStock): RollingStock {
+  if (car.origin === undefined) return car;
+  const { origin: _origin, ...rest } = car;
+  return rest;
+}
 
 // ---------------------------------------------------------------------------
 // Track and Office Area
@@ -102,8 +159,53 @@ export type TrackCard = {
    * Operational Rail (§9.3). Use isOperationalRail() rather than reading a stored flag.
    */
   baseOperationalRail: boolean;
-  /** Uncoupled cars left here, in track order (§A.3). */
+  /**
+   * Uncoupled cars left standing here, **ordered WEST to EAST** (§A.3).
+   *
+   * §A.3 states the requirement outright: "cars are loaded into and unloaded from the Crew Tray, and
+   * occupy the track, in the same order they originally held, **left-to-right**". Left-to-right is
+   * west-to-east, and this array had no defined orientation at all — the doc comment said "in track
+   * order" and named no direction, so nothing performed the conversion.
+   *
+   * That is one bug wearing three faces, all reported from play. Setting out four cars at once
+   * parked them in a different order than setting out one car four times, because `carsDropped`
+   * always pushed onto the end. A train that ran onto a parked cut got the SAME consist whichever
+   * way it approached, when the two must mirror. And the board drew the tray strip flipped for an
+   * east-facing train and the card's cars unflipped, so the same cut read one way in the tray and
+   * the other on the card.
+   *
+   * WEST-TO-EAST IS THE BOARD'S ORIENTATION, not the train's, which is exactly why it is the right
+   * one: it is a property of the card, so it does not change when a different train touches it. The
+   * two conversions are stated once, in `apply.ts`'s `carsDropped` and `carsCoupled` reducers, and
+   * `standingWest` below records where a train standing here sits among them.
+   */
   standing: RollingStock[];
+  /**
+   * HOW MANY OF `standing` LIE WEST OF THE TRAIN(S) STANDING HERE.
+   *
+   * `standing` runs west to east and a train sits somewhere IN that row: cars `[0, standingWest)`
+   * are west of it, cars `[standingWest, end)` are east. A train can set out off both ends on the
+   * same square — §A.3 lets a cut come off either outer end — so "which side is this cut on" is not
+   * recoverable from the array alone, and it is the question every remaining rule asks: which cars
+   * are AHEAD of an engine and which BEHIND (combine with `CrewTray.railFacing`), which cut a
+   * departing train must couple back up (the one at the end it leaves by), and which side of the
+   * chip the renderer draws the cut on.
+   *
+   * WITH NO TRAIN STANDING HERE, THIS NUMBER MEANS NOTHING: a card's cars are simply a cut with no
+   * near or far side, and the next train to arrive couples all of them regardless — nothing reads
+   * `standingWest` in that state, so a stale value left over from a train that has since moved on is
+   * inert, not wrong. That reasoning is unchanged from when this lived on `CrewTray`.
+   *
+   * WHAT MOVED IT TO THE CARD: the Office square is the one place more than one train may stand at
+   * once, and only one route lets two trays disagree about the same row of cars — a train already
+   * at the Office sets out a cut in place, without moving, while a second train on another A/D track
+   * still holds whatever split it arrived with. A cut lies west or east of the WHOLE block of A/D
+   * tracks, never of one particular track and never between two trains, so there is exactly one
+   * number for the card to carry and every train standing there reads the same one. Everywhere else
+   * on the board at most one train ever stands on a card, so the two homes for this field are
+   * identical in every other case.
+   */
+  standingWest: number;
   facility: Facility | null;
   modifiers: ModifierKind[];
   /** Enhancement cards laid on this card (§7 of implications.md). */
@@ -111,7 +213,8 @@ export type TrackCard = {
 };
 
 export type OfficeArea = {
-  owner: PlayerIndex;
+  /** Where this Office sits in the chain, not who is sitting at it. See `SeatIndex`. */
+  seat: SeatIndex;
   tier: OfficeTier;
   grid: Map<string, TrackCard>;
   officeCoord: GridCoord;
@@ -161,8 +264,19 @@ export type Facility = {
    * reported from playtesting. Typing it away means a fourth renderer cannot reintroduce the bug.
    */
   menAtWork: [Load | null, Load | null, Load | null] | null;
-  /** Where cars are spotted for loading and unloading. */
+  /**
-  industryTrack: { length: number; cars: RollingStock[] };
+   * Where cars are spotted for loading and unloading.
+   *
+   * NO LENGTH. This used to carry `length: baseOut + baseIn`, which quietly made an industry's
+   * SIDING as long as its box count — so a Mine Tipple (one green box) had room for exactly one
+   * car, and a crew standing on it with two hoppers to set out could only put down one. Reported
+   * from play at undo 188. The box count is how much WORK an industry can hold, not how much RAIL
+   * it has; conflating the two invented a printed siding that no industry card actually has.
+   *
+   * An industry track is ordinary Operating Rail and holds what any card holds — see `spaceOn`.
+   * Modifiers raise `capacity` (another red or green box) and never the room for cars.
+   */
+  industryTrack: { cars: RollingStock[] };
   laborers: number;
   porters: number;
   /** Resets at the start of each Stage (§9.1). */
@@ -174,25 +288,35 @@ export type Facility = {
  * Operational Rail status. This is why isOperationalRail is a function, not a stored field.
  */
 /**
- * The cars physically standing on a card.
+ * The cars physically standing on a card, **ordered WEST to EAST**.
  *
  * On a Facility card the industry track IS where cars stand — spotting a car there and leaving a
  * car there are the same act (§9.3). Modelling them as two separate places was a bug: cars dropped
  * at a facility went into `standing`, while loading looked for them on `industryTrack`, so no
  * freight load could ever complete and freight revenue was structurally zero.
+ *
+ * THE ORIENTATION IS THE BOARD'S, NOT THE TRAIN'S, and it is `standing`'s alone to keep — see the
+ * comment on that field. `industryTrack.cars` inherits it through this function, so every reader of
+ * either place gets the same convention and the two can never drift apart.
  */
 export function carsOn(card: TrackCard): RollingStock[] {
-  return card.facility && card.facility.industryTrack.length > 0
+  // Gated on the facility being FREIGHT, not on a track length that no longer exists. A Passenger
-    ? card.facility.industryTrack.cars
+  // Facility has no industry track at all — passengers board off the platform — so cars left on a
-    : card.standing;
+  // Depot stand on the card like they would anywhere else.
+  return card.facility && card.facility.kind === 'freight' ? card.facility.industryTrack.cars : card.standing;
 }
 
-/** How many more cars this card can hold. Ordinary track is unbounded; an industry track is not. */
+/**
+ * How many more cars this card can hold.
+ *
+ * ONE RULE FOR EVERY OPERATING TRACK CARD, industry or not: a card holds up to `MAX_CONSIST` cars,
+ * because a consist may not exceed four and four is therefore all that can ever be shoved onto one.
+ * An industry used to be the exception — its room came from its box count, so a one-box industry
+ * refused a second car — and that exception was the bug. Ordinary track used to be the other
+ * exception, unbounded, which let a pile build up that no train could then legally couple.
+ */
 export function spaceOn(card: TrackCard): number {
-  if (card.facility && card.facility.industryTrack.length > 0) {
+  return MAX_CONSIST - carsOn(card).length;
-    return card.facility.industryTrack.length - card.facility.industryTrack.cars.length;
-  }
-  return Number.MAX_SAFE_INTEGER;
 }
 
 export function isOperationalRail(card: TrackCard): boolean {
@@ -223,13 +347,31 @@ export function isLockedByWork(card: TrackCard): boolean {
 export type NodeRef =
   | { at: 'divisionPoint'; side: Direction }
   | { at: 'mainline'; index: number }
-  | { at: 'grid'; owner: PlayerIndex; coord: GridCoord };
+  /** A tray standing in someone's district. `seat` is WHICH district, not whose turn it is. */
+  | { at: 'grid'; seat: SeatIndex; coord: GridCoord };
 
 export type CrewTray = {
   id: TrayId;
   /** null while a local crew is switching without a train card. */
   trainNumber: number | null;
   trainIsExtra: boolean;
+  /**
+   * STILL BEING ASSEMBLED, somewhere that is not a Division Point.
+   *
+   * `isBeingMadeUp` used to read the position alone — "standing at a Division Point" — which was
+   * true of every train being built when the only place to build one WAS a Division Point. An Extra
+   * may now be started at a Control Point or in an Interchange's yard (§7), and those trains could
+   * not be given a consist at all: they ran empty, and so did every Control Point Extra since that
+   * option was added. Jesse's report says it plainly — an Extra started at the Interchange "would be
+   * loaded with cars".
+   *
+   * Set when such an Extra is placed and cleared the moment it starts running (`enterMainline`), so
+   * it names a train that is being made up rather than one that merely happens to be standing
+   * somewhere. That distinction is load-bearing: a train that ARRIVED at an Office must never be
+   * fillable from the Division Yard, which is the "cars appearing on a train nobody was making up"
+   * bug `isBeingMadeUp` was tightened to kill, and an arriving train never carries this.
+   */
+  beingMadeUp?: boolean;
   /**
    * WHERE THE ENGINE SITS IN THE TRAY, as an index into `consist`.
    *
@@ -264,6 +406,28 @@ export type CrewTray = {
    * without one falls back to `direction`.
    */
   facing?: 'n' | 's' | 'e' | 'w';
+  /**
+   * WHICH WAY THE ENGINE POINTS IN RAILROAD TERMS — east or west, and never anything else.
+   *
+   * `facing` is a PORT, because movement needs one: a crew on a north-south spur must be able to
+   * leave by 'n' or 's'. But a Division runs east and west, and a player reads a train the way a
+   * railroader does — "the engine is on the west end" — so a ▲ on a crew that had turned onto a
+   * spur read as a train that had somehow stood itself on end. Worse, nothing resets `facing` when
+   * a train leaves the district, so a crew that shunted onto a north-south spur and then departed
+   * carried its 'n' out onto the Division map and drew ▲ there too.
+   *
+   * So this is the DISPLAY facing, and it is a separate field because it cannot be derived: on
+   * north-south track the east-west sense is not in the current port, it is in the last one. It
+   * holds its value across north-south track and updates whenever `facing` becomes 'e' or 'w' —
+   * which is exactly the railroad's own convention, where compass north on a branch is still
+   * timetable east. A train that runs forward through 180° of curves genuinely does come out
+   * pointing the other way, and this follows it; backing up does not change it, because a train
+   * that backs up has not turned around.
+   *
+   * NOT `direction`: that is the timetable direction of the RUN and does not move when a run-around
+   * puts the engine on the other end, which is the one thing the arrow exists to show.
+   */
+  railFacing?: 'e' | 'w';
   position: NodeRef;
   movesUsed: number;
   /**
@@ -277,9 +441,10 @@ export type CrewTray = {
    * 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 runs expedited, departing every Office in the Stage it arrives. Recorded on the
+   * then on the train is expedited — it may be switched normally, but it faults (Q3) if it is left
-   * tray for the same reason as `stopPointClaimed` — it is the TRAIN that stops, and an Extra runs
+   * off the Office square when a Mainline Phase begins. Recorded on the tray for the same reason as
-   * once, so there is no later visit to hang it on.
+   * `stopPointClaimed` — it is the TRAIN that stops, and an Extra runs once, so there is no later
+   * visit to hang it on.
    */
   speechMade?: boolean;
 };
@@ -317,6 +482,20 @@ export type DivisionNode =
       kind: 'mainline';
       card: MainlineKind;
       transits: Transit[];
+      /**
+       * TRAINS STANDING IN THE INTERCHANGE'S YARD — not out on the running line.
+       *
+       * Only an Interchange ever has these. An Extra started there (§7, Jesse's ruling) is made up
+       * in the yard beside the Mainline, which is why placing it can never be a collision however
+       * busy the card is: it is not on the road yet. It highballs onto this same card at a later
+       * Mainline Phase, through the ordinary §8.1 clearance check — held automatically against a
+       * facing train, put to the Superintendent against a following one — and becomes a `Transit`
+       * at that moment, exactly like a train leaving a Division Point.
+       *
+       * A tray listed here has `position.at === 'mainline'` with this node's index and NO entry in
+       * `transits`. That pair is what distinguishes standing from crossing.
+       */
+      holding?: TrayId[];
       absSignals?: boolean;
       /** Brakeman / Airbrakes / Helpers / Realignment laid on this card. */
       modifiers?: string[];
@@ -328,7 +507,7 @@ export type DivisionNode =
       /** Red Flags protecting a stopped train here, by tray. */
       redFlagged?: TrayId[];
     }
-  | { kind: 'office'; owner: PlayerIndex };
+  | { kind: 'office'; seat: SeatIndex };
 
 /** Ordered west to east. For N players: N Office nodes and N+1 Mainline cards. */
 export type Division = { nodes: DivisionNode[] };
@@ -444,6 +623,14 @@ export type GameConfig = {
     employeeRotation: boolean;
     emergencyToolbox: boolean;
   };
+  /**
+   * The opening deal and the three revenue rates, chosen when the game is dealt (`content.ts`).
+   *
+   * Optional and PARTIAL on purpose. Every caller that does not care about them — and most of the
+   * engine tests do not — gets `DEFAULT_HOUSE_RULES` through `houseRules()`, which is the one place
+   * a default is written down. A caller that cares names only the dials it is setting.
+   */
+  houseRules?: HouseRuleOverrides;
 };
 
 export type OutcomeReason =
@@ -482,6 +669,93 @@ export type TurnState = {
   done: boolean;
 };
 
+/**
+ * One turn per player, created together at phase entry.
+ *
+ * This was a single `TurnState` on the game, replaced one player at a time as the cursor walked the
+ * table. That is indistinguishable from this while only the player at the cursor may act — which is
+ * exactly the case today, and every existing test still describes the same game.
+ *
+ * It is per-player now because making it so later would mean the same change PLUS reworking a client
+ * built around "wait your turn". What it enables is Local Operations work that no other player can
+ * observe — switching inside your own district — happening off-cursor, which is a change to
+ * `isActor` and nothing else. See `docs/architecture/multiplayer.md` D19.
+ */
+export function freshTurns(players: number, moves: number): Map<PlayerIndex, TurnState> {
+  const turns = new Map<PlayerIndex, TurnState>();
+  for (let p = 0; p < players; p++) turns.set(p, freshTurn(moves));
+  return turns;
+}
+
+/**
+ * WHICH WAY TO DRAW THE ENGINE — east or west, for every train, everywhere.
+ *
+ * The single place the display facing is decided, so the Division map, the Office cards and the
+ * tooltips can never disagree about which end of a train the engine is on. Three sources, in the
+ * order they can be trusted: the carried east-west sense; the current port, when it happens to be
+ * an east-west one (a tray placed straight onto the board has no history yet); and failing both,
+ * the direction of the run.
+ */
+export function railFacingOf(tray: Pick<CrewTray, 'railFacing' | 'facing' | 'direction'>): 'e' | 'w' {
+  if (tray.railFacing) return tray.railFacing;
+  if (tray.facing === 'e' || tray.facing === 'w') return tray.facing;
+  return tray.direction === 'west' ? 'w' : 'e';
+}
+
+/**
+ * THE ONE CONVERSION BETWEEN A TRAY AND A TRACK, stated once and used by both directions.
+ *
+ * `consist` is ordered NOSE FIRST and the nose points `facing`; `standing` is ordered WEST TO EAST.
+ * So for an east-facing train the tray reads east-to-west and has to be reversed to go onto the
+ * card; for a west-facing train it already reads west-to-east and goes on as it stands.
+ *
+ * It is its own inverse, which is why lifting cars off a card uses the same function.
+ */
+export function trackOrder(cut: readonly RollingStock[], facing: 'e' | 'w'): RollingStock[] {
+  return facing === 'e' ? [...cut].reverse() : [...cut];
+}
+
+/**
+ * The cars standing west and east of a train, split at `standingWest`.
+ *
+ * Clamped rather than trusted: a tray that has never dropped anything carries no `standingWest` at
+ * all, and a saved game from before this field existed carries none either — both read as 0, which
+ * puts every car on the card east of the engine. That is the same answer the engine gave before the
+ * split existed, so an old save degrades to the old behaviour instead of throwing.
+ */
+export function standingSides(
+  tray: { standingWest?: number | undefined },
+  cars: readonly RollingStock[],
+): { west: RollingStock[]; east: RollingStock[] } {
+  const k = Math.max(0, Math.min(cars.length, tray.standingWest ?? 0));
+  return { west: cars.slice(0, k), east: cars.slice(k) };
+}
+
+/**
+ * The cut a train would run into if it left this card through `exit` — the cars between it and that
+ * end of the card.
+ *
+ * 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: 'n' | 's' | 'e' | 'w',
+): RollingStock[] {
+  const { west, east } = standingSides(tray, cars);
+  if (exit === 'e') return east;
+  if (exit === 'w') return [...west].reverse();
+  return [];
+}
+
+export function turnOf(s: GameState, player: PlayerIndex): TurnState {
+  const t = s.turns.get(player);
+  if (!t) throw new Error(`no turn state for player ${player}`);
+  return t;
+}
+
 export function freshTurn(moves: number): TurnState {
   return {
     option: null,
@@ -500,8 +774,22 @@ export type GameState = {
   seed: number;
   rngState: number;
   players: Player[];
+  /**
+   * Who is sitting where: `seating[seat] = player`, seat 0 at the WESTERN end of the chain.
+   *
+   * Decided at setup by §4.4's D12 (`openingRolls.division`) — a real permutation, not the identity,
+   * except in solitaire where one player means one seat. Employee Rotation would rotate this array
+   * and nothing else.
+   */
+  seating: PlayerIndex[];
+  /**
+   * The two opening D12s, per player, kept so a client can show the rolls rather than only their
+   * outcome — it is the game's first moment of drama (`lobby-and-sessions.md` §4). Indexed by
+   * PLAYER, since that is who rolls.
+   */
+  openingRolls: { division: number[]; superintendent: number[] };
   division: Division;
-  officeAreas: Map<PlayerIndex, OfficeArea>;
+  officeAreas: Map<SeatIndex, OfficeArea>;
   trays: Map<TrayId, CrewTray>;
   /** Trays not yet in play; §7 scarcity is an explicit mechanic. */
   freeTrays: TrayId[];
@@ -521,7 +809,8 @@ export type GameState = {
    */
   pendingSecondSections: number[];
   clock: Clock;
-  turn: TurnState;
+  /** One per player, keyed by PLAYER (a turn belongs to a person, not to a chair). */
+  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. */
@@ -551,7 +840,7 @@ export function subdivisions(state: GameState): number[][] {
   state.division.nodes.forEach((node, i) => {
     const isBoundary =
       node.kind === 'divisionPoint' ||
-      (node.kind === 'office' && isControlPoint(state, node.owner));
+      (node.kind === 'office' && isControlPoint(state, node.seat));
 
     if (isBoundary) {
       if (current.length > 0) out.push(current);
@@ -565,15 +854,45 @@ export function subdivisions(state: GameState): number[][] {
   return out;
 }
 
-export function isControlPoint(state: GameState, owner: PlayerIndex): boolean {
+/** Who is sitting at this seat. */
-  const area = state.officeAreas.get(owner);
+export function playerAtSeat(state: GameState, seat: SeatIndex): PlayerIndex {
-  if (!area) throw new Error(`no Office Area for player ${owner}`);
+  const p = state.seating[seat];
+  if (p === undefined) throw new Error(`no player at seat ${seat}`);
+  return p;
+}
+
+/** 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.
+ *
+ * Acting order, the deal and the Fedora are all "starting here and proceeding left" (Gap 1, §4.7,
+ * §5), which is a statement about the physical chain of Offices — so it is seat arithmetic, not
+ * player arithmetic. All three used to do `(player + n) % players`, which was the same thing only
+ * while seating was the identity mapping. It stopped being that when §4.4's D12 started deciding
+ * who sits where.
+ *
+ * "Left" is increasing seat index, i.e. eastward along the chain, matching what the shift-change
+ * tests have always asserted.
+ */
+export function playerLeftOf(state: GameState, player: PlayerIndex, n = 1): PlayerIndex {
+  return playerAtSeat(state, (seatOf(state, player) + n) % state.seating.length);
+}
+
+export function seatOf(state: GameState, player: PlayerIndex): SeatIndex {
+  const seat = state.seating.indexOf(player);
+  if (seat < 0) throw new Error(`player ${player} is not seated`);
+  return seat;
+}
+
+export function isControlPoint(state: GameState, seat: SeatIndex): boolean {
+  const area = state.officeAreas.get(seat);
+  if (!area) throw new Error(`no Office Area at seat ${seat}`);
   return officeProfile(area.tier).isControlPoint;
 }
 
-export function adTrackCount(state: GameState, owner: PlayerIndex): number {
+export function adTrackCount(state: GameState, seat: SeatIndex): number {
-  const area = state.officeAreas.get(owner);
+  const area = state.officeAreas.get(seat);
-  if (!area) throw new Error(`no Office Area for player ${owner}`);
+  if (!area) throw new Error(`no Office Area at seat ${seat}`);
   return officeProfile(area.tier).adTracks;
 }
 

src/engine/track.ts

@@ -34,7 +34,7 @@ import type {
   TrackArc,
   TurnoutOrientation,
 } from './state.ts';
-import { carsOn, coordKey, isLockedByWork, isOperationalRail, spaceOn } from './state.ts';
+import { carsOn, coordKey, cutTowards, isLockedByWork, isOperationalRail, spaceOn } from './state.ts';
 
 // ---------------------------------------------------------------------------
 // Ports and geometry
@@ -374,6 +374,28 @@ export type MoveBlock = { coord: GridCoord; kind: MoveBlockKind; why: string };
  * beyond a reachable one whose rails do not meet. Squares the walk never came near are not listed:
  * "there is no track between here and there" is not news.
  */
+/**
+ * How many frontier nodes a single `exploreMoves` walk may enqueue before it stops finding new
+ * routes. A per-path visited set (below) guarantees every individual route terminates, but the
+ * NUMBER of simple paths through a dense district is worst-case exponential — a real board never
+ * gets close, but nothing stops a pathological one from being built. BFS order means the queue
+ * fills shortest-route-first, so hitting the cap loses only the longest, least-likely-to-matter
+ * routes; it never loses a shorter one in favour of a longer one.
+ */
+const MAX_ENUMERATED_FRONTIER = 4000;
+
+/**
+ * The identity of a route's OUTCOME, for dedupe: which square it ends at, which side it entered
+ * by, and exactly which cars it couples, each tagged with the card it came off. Two routes that
+ * couple the same car TYPES from DIFFERENT cards are not the same outcome — sweeping the wrong
+ * card clean is exactly the bug this key exists to avoid — so the origin card rides along with
+ * every car, not just its type.
+ */
+function routeOutcomeKey(coord: GridCoord, entry: Port, couples: RollingStock[], origins: string[]): string {
+  const cars = couples.map((c, idx) => `${origins[idx]}:${c.type}:${c.loaded ? 1 : 0}`).join(',');
+  return `${coordKey(coord)}|${entry}|${cars}`;
+}
+
 export function exploreMoves(
   ctx: MoveContext,
   start: GridCoord,
@@ -394,9 +416,20 @@ export function exploreMoves(
   if (!startCard) return { destinations: results, blocked };
   if (!hasPort(startCard, initialExit)) return { destinations: results, blocked };
 
-  const seen = new Set<string>();
+  const resultKeys = new Set<string>();
 
-  type Frontier = { coord: GridCoord; entry: Port; path: MoveStep[]; couples: RollingStock[] };
+  type Frontier = {
+    coord: GridCoord;
+    entry: Port;
+    path: MoveStep[];
+    couples: RollingStock[];
+    /** Coord key each entry in `couples` came off, aligned by index — see `routeOutcomeKey`. */
+    origins: string[];
+    /** 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
   // hop is checked at the push site below, where both sides of the edge are in hand.
@@ -406,9 +439,30 @@ export function exploreMoves(
     if (firstCard) block(first, 'noJoin', 'the rails do not meet — two cards touching is not a join, and on a north or south edge both 45° legs must lie on the same diagonal');
     return { destinations: results, blocked };
   }
+  /**
+   * THE CUT ON YOUR OWN CARD, which the walk used to ignore entirely.
+   *
+   * Reported from play: "if I put cars off the nose on a given track, and my next move is go
+   * forward, I need to couple those cars right back on". Exactly so — and the engine let the train
+   * drive away and leave them. `cutTowards` takes only the cars between the engine and the end it is
+   * leaving by, so setting out off the nose and then BACKING away is still free, which is the whole
+   * point of setting out off one particular end.
+   *
+   * Ordered nearest-first like every other card's, so it simply seeds the accumulator.
+   */
+  const ownCut = cutTowards(startCard, carsOn(startCard), initialExit);
+  const startKey = coordKey(start);
   const queue: Frontier[] = [
-    { coord: first, entry: opposite(initialExit), path: [], couples: [] },
+    {
+      coord: first,
+      entry: opposite(initialExit),
+      path: [],
+      couples: ownCut,
+      origins: ownCut.map(() => startKey),
+      visited: new Set([startKey]),
+    },
   ];
+  let enumerated = 1;
 
   while (queue.length > 0) {
     const node = queue.shift()!;
@@ -443,30 +497,51 @@ export function exploreMoves(
       continue;
     }
 
-    // Mandatory coupling. Rejecting rather than truncating is deliberate: a move that would
+    /**
-    // overfill the tray is illegal, not a move that picks up fewer cars.
+     * Mandatory coupling. Rejecting rather than truncating is deliberate: a move that would
-    const couples = [...node.couples, ...carsOn(card)];
+     * 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
+     * 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 = 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)];
     if (ctx.consistSize + couples.length > MAX_CONSIST) {
+      const own =
+        ownCut.length > 0
+          ? `, ${ownCut.length} of them the cut standing at the end of your OWN card that this move pulls out through`
+          : '';
       block(
         node.coord,
         'tooManyCars',
-        `too many cars — running here couples ${couples.length} standing car(s) onto a train already holding ${ctx.consistSize}, and ${MAX_CONSIST} is the limit. Coupling is mandatory: you may not run past a car and leave it (§A.4)`,
+        `too many cars — running here couples ${couples.length} standing car(s)${own} onto a train already holding ${ctx.consistSize}, and ${MAX_CONSIST} is the limit. Coupling is mandatory: you may not run past a car and leave it (§A.4)`,
       );
       continue;
     }
 
-    const key = `${coordKey(node.coord)}|${node.entry}`;
-    if (seen.has(key)) continue;
-    seen.add(key);
-
     if (isOperationalRail(card) && !sameCoord(node.coord, start)) {
+      // Dedupe on OUTCOME, not on reaching the square: two routes that end here having coupled
+      // different cars (or the same cars off different cards) are a real choice, and both are
+      // offered. Two routes that end here having coupled identically are not a choice — one is
+      // noise doubling the button list and the bot's branching factor for nothing.
+      const rkey = routeOutcomeKey(node.coord, node.entry, couples, origins);
+      if (!resultKeys.has(rkey)) {
+        resultKeys.add(rkey);
         results.push({ coord: node.coord, entry: node.entry, path: node.path, couples });
+      }
     } else if (!sameCoord(node.coord, start)) {
       // Reached, crossable, but not somewhere a train may STOP — a turnout carries no wheel icon
       // (§A.1). Trains run through one all day; they just cannot finish a Move on it.
       block(node.coord, 'noStopping', 'a train may run through here but not stop — this is not Operational Rail (§A.1), so it cannot be the end of a Move');
     }
 
+    if (enumerated >= MAX_ENUMERATED_FRONTIER) continue;
+
     for (const exit of exitsFrom(card, node.entry)) {
       // Slope is a property of the EDGE, not of either card, so it can only be tested with both in
       // hand. Enqueueing on `hasPort` alone routed trains across a 45° leg that bent back on itself.
@@ -476,8 +551,18 @@ export function exploreMoves(
         if (next) block(to, 'noJoin', 'the rails do not meet — two cards touching is not a join, and on a north or south edge both 45° legs must lie on the same diagonal');
         continue;
       }
+      // A card twice on ONE route is a loop, not a longer route (§2.4 travels without changing
+      // 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.
+      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 });
+      const visited = new Set(node.visited);
+      visited.add(toKey);
+      queue.push({ coord: to, entry: opposite(exit), path: [...node.path, step], couples, origins, visited });
     }
   }
 
@@ -525,6 +610,31 @@ export function carriesThroughTrack(card: TrackCard): boolean {
  * a TURNOUT laid on the Running Track — the Office no longer carries a stub of its own, because no
  * office or industry card on the printed sheet does.
  */
+/**
+ * §2.1 — IS THIS SQUARE INSIDE THE DISTRICT AT ALL?
+ *
+ * The Limits sign denotes "the limit of your control area", and §3 defines Secondary Track as "all
+ * tracks IN YOUR LIMITS that are not the Running Track" — so the bound belongs to the district, not
+ * to the one row the sign happens to stand in. This used to guard the Running Track alone, on the
+ * reasoning that the rows above and below were unbounded; the consequence was a siding snaking east
+ * past your own sign, taking industries with it, and a player switching cars on track outside the
+ * territory §8.1 and §10 reason about. Reported by Jesse: sidings must not be built outside the
+ * Limits.
+ *
+ * INCLUSIVE OF THE SIGN'S OWN COLUMN. The sign stands ON the boundary rather than beyond it, and the
+ * opening district is signs at ±1 around the Office — so the strict reading would leave exactly one
+ * 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 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;
+}
+
 export function canPlaceAt(area: OfficeArea, coord: GridCoord, card: TrackCard): boolean {
   const existing = cardAt(area, coord);
   // A Limits sign on the Running Track is the GROWTH POINT, not an obstacle. Extending means laying
@@ -541,14 +651,12 @@ export function canPlaceAt(area: OfficeArea, coord: GridCoord, card: TrackCard):
   // the sign itself is the only growth point. Allowing a placement beyond it built track on the far
   // side of the sign and then planted a SECOND sign further out, leaving the board reading
   //   limits · Whistle Post · limits · straight · limits
-  // with a Limits card stranded mid-track. The district below the Running Track is unbounded.
+  // with a Limits card stranded mid-track.
-  if (coord.row === area.runningRow) {
+  if (!withinLimits(area, coord)) return false;
-    if (coord.col < area.limitsWest.col || coord.col > area.limitsEast.col) return false;
   // And it must not BREAK the Running Track. A curve laid here has no east-west road, so the main
   // stops dead at it — the bot did exactly this, turning the west end of its own Running Track
   // into a stub and cutting the Office off from the Limits.
-    if (!carriesThroughTrack(card)) return false;
+  if (coord.row === area.runningRow && !carriesThroughTrack(card)) return false;
-  }
 
   const ports: Port[] = ['n', 's', 'e', 'w'];
   for (const p of ports) {

src/sim/board-svg.ts

@@ -51,6 +51,14 @@ export function divisionSvg(nodes: DivisionView[]): string {
   const CW = { dp: 118, ml: 152, run: 78 };
   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
+   * them without spilling onto its neighbours (docs/plans/switching-paths.md — "The Roster Pass").
+   * Sized by CAPACITY, not by how many are occupied right now: a cell drawn for the trains it HAS
+   * holds still as they come and go, where sizing by occupancy moved the East Division Point (and
+   * everything past it) sideways every time an A/D track filled or cleared.
+   */
+  const CHIP_W = 54;
   /**
    * Room for the buffer stops. THE LABELS NO LONGER LIVE OUT HERE.
    *
@@ -77,14 +85,18 @@ export function divisionSvg(nodes: DivisionView[]): string {
       /** Nose first, no engine — drawn as blocks, loaded solid and empty hollow. */
       cars?: string[];
       engineAt?: number;
-      facing?: string;
+      /** East or west, always — a Division runs east and west and so does its rolling stock. */
+      facing?: 'e' | 'w';
+      /** The train's printed card, so a train out on the Mainline can still be asked what it is. */
+      what?: string;
       region?: number;
       direction?: string;
       stagesLeft?: number;
     }[];
     cap: number | null;
     tip: string;
-    owner: number | null;
+    /** Which SEAT's district this cell belongs to, or null for Mainline and Division Points. */
+    seat: number | null;
     /** Mainline cards only: §2.1 divides one into two regions. 0 elsewhere — no bars are drawn. */
     regions: number;
     w: number;
@@ -120,11 +132,11 @@ export function divisionSvg(nodes: DivisionView[]): string {
             : 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'}`,
-          owner: n.owner ?? null,
+          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: CW.run,
+          w: isOffice && cap !== null ? Math.max(CW.run, cap * CHIP_W + 12) : CW.run,
         });
       }
       // A crew below the Running Track has no position ON it, so it is reported against the
@@ -139,16 +151,34 @@ export function divisionSvg(nodes: DivisionView[]): string {
       continue;
     }
     const dp = n.kind === 'dp';
+    /**
+     * A train in the Interchange's yard is drawn on the card but counted against nothing.
+     *
+     * It is not on the running line — that is the whole distinction §7 rests on — so it cannot take
+     * the card's capacity. It still has to be SEEN: an Extra made up here would otherwise be a train
+     * the player just placed that appears nowhere on the map.
+     */
+    const inYard = n.yard ?? [];
+    const onRoad = n.trains.flat();
+    const free = n.capacity === null ? '' : `${Math.max(0, n.capacity - onRoad.length)} of ${n.capacity} free`;
     push({
       kind: dp ? 'dp' : 'ml',
       label: n.label,
-      sub: n.capacity === null ? 'no limit — trains queue' : `${Math.max(0, n.capacity - n.trains.flat().length)} of ${n.capacity} free`,
+      sub: n.capacity === null
-      trains: n.trains.flat(),
+        ? 'no limit — trains queue'
+        : [free, inYard.length > 0 ? `${inYard.length} in the yard` : ''].filter(Boolean).join(' · '),
+      trains: [...onRoad, ...inYard],
       cap: n.capacity,
       tip: dp
         ? 'A Division Point — the end of the line. Trains both enter and leave the Division here (odd numbers run west, even run east), and queue without limit'
-        : `${n.label} — Mainline${n.gradeUp ? `, climbs ${n.gradeUp === 'east' ? 'east' : 'west'}` : ''}${n.modifiers.length ? ` · ${n.modifiers.join(' · ')}` : ''}`,
+        : `${n.label} — Mainline${n.gradeUp ? `, climbs ${n.gradeUp === 'east' ? 'east' : 'west'}` : ''}${n.modifiers.length ? ` · ${n.modifiers.join(' · ')}` : ''}` +
-      owner: null,
+          (inYard.length > 0
+            ? `\n\n${inYard.length} train${inYard.length === 1 ? '' : 's'} standing in the yard, not on the running line — waiting to highball onto this card`
+            : '') +
+          // What the card actually DOES. The name alone left Hilly and Uncontrolled Siding as
+          // words with no gameplay attached — reported exactly that way.
+          (n.what ? `\n\n${n.what}` : ''),
+      seat: null,
       // A Division Point is one region — the queue trains enter and leave the Division through.
       regions: dp ? 1 : (n.regions ?? 0),
       w: dp ? CW.dp : CW.ml,
@@ -290,16 +320,28 @@ export function divisionSvg(nodes: DivisionView[]): string {
      */
     c.trains.forEach((t, k) => {
       const cars = t.cars ?? [];
-      const arrow = t.facing === 'w' ? '\u25c0' : t.facing === 'e' ? '\u25b6' : t.facing === 'n' ? '\u25b2' : '\u25bc';
+      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}`;
 
-      const w = Math.min(c.w - 8, label.length * 6.6 + 12);
+      /**
+       * 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 slotX = inRegion ? c.x + 6 + RW * (t.region ?? 0) + RW / 2 : c.x + c.w / 2;
+      const tx = isOfficeRun
-      const spread = inRegion ? 0 : (k - (c.trains.length - 1) / 2) * (w + 4);
+        ? c.x + 6 + slotW * (k + 0.5)
-      const tx = slotX + spread;
+        : (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'
@@ -309,7 +351,11 @@ export function divisionSvg(nodes: DivisionView[]): string {
           : '';
       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}${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="${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>';
@@ -372,6 +418,22 @@ export function officeSvg(
    * offered without a word. Reported as the Depot lighting up for no visible reason.
    */
   legal: { row: number; col: number; label: string }[] = [],
+  /**
+   * The columns the Limits signs stand in, drawn as the district's east and west edges.
+   *
+   * Omitted by the previews and by the replay viewers' single-card renders, which have no district
+   * to bound. Where it is given, the boundary is drawn down the WHOLE canvas: track may not be laid
+   * outside these columns at any row (§2.1), and two signs sitting on one row could not say that —
+   * a player looking at open ground past a sign had no way to know nothing of his could ever go
+   * there until the square failed to light up.
+   */
+  limits: { west: number; east: number } | null = null,
+  /**
+   * Which train's consist is drawn at the rail, on an Office card holding more than one — the value
+   * the "Which train are you switching?" picker already carries. Defaults to the first train on the
+   * card, so every call site that has never heard of this feature keeps working unchanged.
+   */
+  selectedTrayId: string | null = null,
 ): string {
   const W = 166;
   const H = 96;
@@ -436,7 +498,15 @@ export function officeSvg(
     return { x: W / 2, y: H };
   };
 
-  let out = `<svg class="bs" viewBox="0 0 ${width} ${height}" preserveAspectRatio="xMinYMin meet">`;
+  /**
+   * ROOM FOR THE BOUNDARY. The Limits edge is drawn just outside the sign's own column, and the west
+   * sign is usually the leftmost card on the canvas — so at x = −1.5 the line lands outside a viewBox
+   * starting at 0 and is simply not there. The margin is added only when there is a boundary to draw.
+   */
+  const margin = limits ? 3 : 0;
+  let out =
+    `<svg class="bs" viewBox="${-margin} 0 ${width + margin * 2} ${height}" ` +
+    `preserveAspectRatio="xMinYMin meet">`;
   for (const cell of cells) {
     const x = px(cell.col);
     const y = py(cell.row);
@@ -451,10 +521,21 @@ export function officeSvg(
               ? 'mod'
               : 'trk';
 
+    // An Office card's roster band (below) takes the y-band the BOARDS + ALIGHTS flow label used to
+    // print in, so that explanation folds into the card's own tooltip instead of being drawn — it
+    // prints identically on every Office of every tier and is already implied by the card name and
+    // the Porter pill, so nothing is lost by reading it on the card rather than beside it.
+    const isOfficeRoster = cell.adTracks !== null;
+    const flowFold =
+      isOfficeRoster && cell.facility
+        ? '\n\nBOARDS + ALIGHTS: passengers only — no freight is handled here. They wait in a green ' +
+          'box, are boarded onto a coach by Porters, and arrive into a red one.'
+        : '';
+
     // Addressable so a caller can outline a square as a legal destination without re-rendering.
     // The explanation rides on the group as a tooltip rather than being printed: it is reference
     // detail, read once, and printing it costs the space the board itself needs.
-    out += `<g data-cell="${cell.row},${cell.col}" data-tip="${esc(cell.label)} — ${esc(cell.what)}" transform="translate(${x},${y})">`;
+    out += `<g data-cell="${cell.row},${cell.col}" data-tip="${esc(cell.label)} — ${esc(cell.what)}${esc(flowFold)}" transform="translate(${x},${y})">`;
     out += `<rect class="bs-card bs-${kind}${cell.running ? ' bs-run' : ''}" x="0" y="0" width="${W}" height="${H}" rx="4"/>`;
 
     // The rails. A Modifier is not track and deliberately gets none — that is why nothing can be
@@ -486,20 +567,57 @@ export function officeSvg(
 
     out += `<text class="bs-cn" x="6" y="12">${esc(cell.label)}</text>`;
 
+    // X,Y — east/west then north/south, not the internal row/col storage order.
+    out += `<text class="bs-coord" x="${W - 5}" y="12" text-anchor="end">${cell.col},${cell.row}</text>`;
+
     /**
-     * A/D TRACKS, as pips.
+     * THE ROSTER, one chip per A/D track — not one per train.
      *
-     * The Office tooltip said "3 A/D tracks" and the card showed nothing — so the number that
+     * The Office is the one square where more than one train may legally stand at once (its A/D
-     * decides whether the next arrival is an automatic collision (§8.3) was invisible on the card it
+     * tracks, §2.1), and the old single `cell.train` field only ever showed whichever tray
-     * belongs to. There is no room to draw more rails, and the count is what matters: one pip per
+     * `s.trays` happened to yield first: a second train at a busy Station was counted in the old
-     * track, filled for taken.
+     * A/D pips and never drawn at all. `adTracks` of them, always, whether or not a train is
+     * holding there — the cell is drawn for the tracks it HAS, so a free one reads a dashed,
+     * dimmed chip saying "free" rather than simply vanishing.
+     *
+     * Selected train's chip is lit the same amber the crew strip and action buttons already use,
+     * and it is the one whose consist is drawn at the rail below. Every occupied chip carries
+     * `data-crew`, so the play page can wire a click to switch which train that is.
+     *
+     * COMPUTED FOR EVERY CARD, NOT JUST THE OFFICE. This used to sit inside the `adTracks !== null`
+     * branch below, so it was only ever assigned on the Office card — a train standing anywhere else
+     * in the district (which is everywhere it stands while actually being switched) got no chip at
+     * all: no label, no engine arrow, and no cars drawn, though the game state never lost it. REPORTED:
+     * dropping a car at the Freight House made "the train vanish off the face of the earth" — it had
+     * simply left the one square this code drew a crew on. The Office is the only square that can hold
+     * more than one train, so `cell.trains[0]` is exactly right everywhere else too.
      */
-    if (cell.ad) {
+    const selectedTrain: CellView['trains'][number] | null =
-      for (let i = 0; i < cell.ad.of; i++) {
+      cell.trains.find((t) => t.trayId === selectedTrayId) ?? cell.trains[0] ?? null;
-        out += `<circle class="bs-ad${i < cell.ad.used ? ' bs-occ' : ''}" cx="${W - 9 - i * 9}" cy="10" r="3"/>`;
+    if (cell.adTracks !== null) {
+      const adTracks = cell.adTracks;
+      const gaps = Math.max(0, adTracks - 1);
+      const chipW = Math.min(52, (W - 12 - 4 * gaps) / adTracks);
+      for (let i = 0; i < adTracks; i++) {
+        const train = cell.trains[i] ?? null;
+        const cx = 6 + i * (chipW + 4);
+        if (!train) {
+          out +=
+            `<g class="bs-adchip mt"><rect x="${cx}" y="20" width="${chipW}" height="14" rx="3"/>` +
+            `<text x="${cx + chipW / 2}" y="30.5" text-anchor="middle">free</text></g>`;
+          continue;
+        }
+        const arrow = train.facing === 'w' ? '◀' : '▶';
+        const chipLabel = chipW >= 40 ? `${train.label} ${arrow}${train.cars.length}` : `${train.label}${arrow}`;
+        const consistWords = train.cars.length === 0 ? 'no cars' : train.cars.join(', ');
+        const on = train.trayId === selectedTrain?.trayId;
+        out +=
+          `<g class="bs-adchip${on ? ' on' : ''}" data-crew="${esc(train.trayId)}" ` +
+          `data-tip="${esc(`${train.label} — carrying ${consistWords}`)}">` +
+          `<rect x="${cx}" y="20" width="${chipW}" height="14" rx="3"/>` +
+          `<text x="${cx + chipW / 2}" y="30.5" text-anchor="middle">${esc(chipLabel)}</text></g>`;
       }
     }
-    out += `<text class="bs-coord" x="${W - 5}" y="12" text-anchor="end">${cell.row},${cell.col}</text>`;
 
     /**
      * THE LOAD PIPELINE, on the card itself, DRAWN THE WAY IT FLOWS.
@@ -555,7 +673,7 @@ export function officeSvg(
         }
       }
       // MEN | AT | WORK — one physical sign, worked left to right loading and right to left
-      // unloading. The spotted car sits past WORK, on the siding drawn below.
+      // unloading. The spotted car sits past WORK, standing on the card itself.
       for (let i = 0; i < f.maw.length; i++) {
         out += box(bx, by, f.maw[i] !== null, 'bs-maw', ['M', 'A', 'W'][i]);
         bx += cellW + 2;
@@ -579,6 +697,9 @@ export function officeSvg(
         ? 'BOARDS + ALIGHTS'
         : f.allowsOut && f.allowsIn ? 'SHIPS + RECEIVES' : f.allowsOut ? 'SHIPS OUT' : 'RECEIVES';
       const flowCls = passenger || (f.allowsOut && f.allowsIn) ? 'bs-flow-both' : f.allowsOut ? 'bs-flow-out' : 'bs-flow-in';
+      // An Office card's roster band now occupies this y-band; its tooltip already folded into the
+      // card's own data-tip above, so the label is not printed twice.
+      if (!isOfficeRoster) {
         out += `<text class="bs-flow ${flowCls}" x="${W - 6}" y="26" text-anchor="end" data-tip="${esc(
           passenger
             ? 'Passengers only — no freight is handled here. They wait in a green box, are boarded onto a coach by Porters, and arrive into a red one. There is no MEN | AT | WORK sign because that is a Freight Facility fitting.'
@@ -588,6 +709,7 @@ export function officeSvg(
                 ? 'This industry only SHIPS. A load starts in a green box, is worked along MEN | AT | WORK by Laborers, and comes off onto an empty car spotted on its track. It has no red boxes because nothing arrives here.'
                 : 'This industry only RECEIVES. A loaded car is spotted on its track and Laborers work the load back along WORK | AT | MEN into a red box. It has no green boxes because nothing ships from here.',
         )}">${esc(flow)}</text>`;
+      }
 
       /**
        * THE WORKERS, ON THE CARD.
@@ -615,21 +737,46 @@ export function officeSvg(
       }
     }
 
-    // Standing room, drawn as the printed squares: filled means occupied.
+    /**
-    //
+     * THE CARS STANDING HERE — NO PRINTED SIDING BEHIND THEM.
-    // `Math.max(1, …)` applies only to an industry, whose track is at least one car long. A Passenger
+     *
-    // Facility has NO industry track — passengers board straight off the platform — so a Depot was
+     * An industry card used to draw one empty square per unit of its capacity, which read as a
-    // being drawn a siding slot it cannot spot a car on.
+     * siding of a particular length printed on the card. No industry card prints one. Worse, the
-    const spots = cell.facility
+     * length came from the box count, so a one-box industry drew a single square and looked like it
-      ? cell.facility.kind === 'passenger'
+     * could only ever hold one car — which is exactly what the engine was wrongly enforcing.
-        ? cell.facility.trackCap
+     *
-        : Math.max(1, cell.facility.trackCap)
+     * Every card, industry or not, now draws what is actually standing on it and nothing more. Four
-      : cell.cars.length;
+     * is the ceiling everywhere (`MAX_CONSIST`), so the row cannot overflow the card.
-    for (let i = 0; i < Math.min(spots, 4); i++) {
+     *
-      const filled = i < cell.cars.length;
+     * The 4 is written out rather than imported: this function's SOURCE is serialized into the
-      const carTip = filled
+     * standalone replay page, where module imports are not in scope. Referencing the constant threw
-        ? `${cell.cars[i]} standing here`
+     * `MAX_CONSIST is not defined` in the rendered HTML while typechecking perfectly here.
-        : 'an empty space on this track — a car may be spotted here';
+     */
+    /**
+     * WHICH SIDE OF THE ENGINE THE CUT IS ON.
+     *
+     * Reported from play: "right after dropping my cars I need to be able to see if those cars are
+     * ahead or behind the train." They were drawn as one strip starting at the left edge whether a
+     * train was on the card or not, so the picture could not say.
+     *
+     * `cars` runs WEST TO EAST and `standingWest` is how many of them are west of the train, so the
+     * row is split there: the west cars stay left-aligned, the east cars are pushed over to the
+     * right-hand end, and the gap between them is where the engine is standing. Whether that gap
+     * means "ahead" or "behind" is the engine's facing, which the tooltip says in words rather than
+     * leaving the player to work out from the compass.
+     */
+    const hasTrain = cell.trains.length > 0;
+    const split = hasTrain ? Math.max(0, Math.min(cell.cars.length, cell.standingWest)) : 0;
+    const shown = Math.min(cell.cars.length, 4);
+    for (let i = 0; i < shown; i++) {
+      // With no train on the card there is no gap to leave, so the whole cut stays left-aligned.
+      const westOfEngine = hasTrain ? i < split : true;
+      const side = !selectedTrain
+        ? 'standing here'
+        : (selectedTrain.facing === 'e') === westOfEngine
+          ? 'standing BEHIND the engine — it would couple onto the tail backing up'
+          : 'standing AHEAD of the engine — it would couple onto the nose pulling forward';
+      const carTip = `${cell.cars[i]} ${side}`;
       /**
        * WHICH CAR IS STANDING HERE, not just that one is.
        *
@@ -658,7 +805,7 @@ export function officeSvg(
       // A caboose is never "loaded" in the freight sense (carLabel says so), so it is drawn solid:
       // it is a car that is doing its job, not an empty waiting for one.
       const loaded = /^loaded/.test(car) || /caboose/.test(car);
-      const cls = filled ? ` bs-occ bs-car-${type}${loaded ? ' bs-loaded' : ' bs-mt'}` : '';
+      const cls = ` bs-occ bs-car-${type}${loaded ? ' bs-loaded' : ' bs-mt'}`;
       /**
        * LOADED OR EMPTY, TOLD THE SAME WAY THE TRAY TELLS IT.
        *
@@ -670,10 +817,11 @@ export function officeSvg(
        * Now the card matches the tray — solid face for loaded, hollow for empty — and every slot
        * carries the car's own words as a tooltip, so "loaded hopper" is one hover away.
        */
-      out += `<rect class="bs-slot${cls}" x="${8 + i * 30}" y="${H - 26}" width="26" height="15" rx="2" data-tip="${esc(carTip)}"/>`;
+      // West cars run rightwards from the left edge; east cars run leftwards from the right edge, so
-      if (filled) {
+      // the engine's place in the row is the gap left between them.
-        out += `<text class="bs-carlab${loaded ? ' bs-lab-ld' : ''}" x="${21 + i * 30}" y="${H - 15}" text-anchor="middle" data-tip="${esc(carTip)}">${esc(type)}</text>`;
+      const sx = westOfEngine ? 8 + i * 30 : W - 34 - (shown - 1 - i) * 30;
-      }
+      out += `<rect class="bs-slot${cls}" x="${sx}" y="${H - 26}" width="26" height="15" rx="2" data-tip="${esc(carTip)}"/>`;
+      out += `<text class="bs-carlab${loaded ? ' bs-lab-ld' : ''}" x="${sx + 13}" y="${H - 15}" text-anchor="middle" data-tip="${esc(carTip)}">${esc(type)}</text>`;
     }
 
     if (cell.enhancements.length > 0) {
@@ -686,24 +834,25 @@ export function officeSvg(
         (cell.enhancementsWhat ?? []).join(' · '),
       )}">${esc(cell.enhancements.join(' · '))}</text>`;
     }
-    if (cell.train) {
+    if (selectedTrain) {
       /**
-       * THE TRAIN, DRAWN AS IT SITS IN THE TRAY.
+       * THE SELECTED TRAIN, DRAWN AS IT SITS IN THE TRAY.
        *
        * The badge used to be a name and nothing more, which makes the switching game unplayable:
        * every decision is about car ORDER — which car comes off next, which end a cut couples onto —
        * and none of it was on the board. Now the engine and its cars are drawn in sequence, nose
        * first, with an arrow for which way the engine points, so "set out the caboose off the back"
-       * is a thing you can see before you choose it.
+       * is a thing you can see before you choose it. Where an Office holds more than one train, only
+       * this one is drawn here — the rest are the roster chips above, each with its own tooltip.
        */
-      const t = cell.train;
+      const t = selectedTrain;
       const items: { label: string; kind: string; what: string }[] = t.cars.map((c) => ({
         label: /caboose/.test(c) ? 'cab' : /hopper/.test(c) ? 'hop' : /boxcar/.test(c) ? 'box'
           : /reefer/.test(c) ? 'rfr' : /tank/.test(c) ? 'tnk' : /coach/.test(c) ? 'cch' : '?',
         kind: /^loaded/.test(c) || /caboose/.test(c) ? 'ld' : 'mt',
         what: c,
       }));
-      const arrow = t.facing === 'w' ? '\u25c0' : t.facing === 'e' ? '\u25b6' : t.facing === 'n' ? '\u25b2' : '\u25bc';
+      const arrow = t.facing === 'w' ? '\u25c0' : '\u25b6';
       items.splice(t.engineAt, 0, { label: arrow, kind: 'eng', what: 'the engine' });
       /**
        * WEST ON THE LEFT, AND THE NOSE POINTING THE WAY THE ENGINE FACES.
@@ -714,15 +863,19 @@ export function officeSvg(
        * drawn engine-first at the WEST end, which reads as an engine shoving four cars ahead of it.
        *
        * The board is a map, so the drawing has to obey the map: reverse the seating order for an
-       * east-facing train and its nose lands at the east end, where it is. A crew on a north-south
+       * east-facing train and its nose lands at the east end, where it is.
-       * spur has no left or right to be right about, so it keeps nose-left and its \u25b2/\u25bc says the rest.
+       *
+       * A crew on a north-south spur is drawn east-west like every other train, because `facing` is
+       * now always east or west (`railFacingOf`). It used to keep its compass port and draw \u25b2 or \u25bc
+       * with the consist pinned nose-left, which meant the one thing the picture is for \u2014 which end
+       * the engine is on \u2014 flipped its convention the moment a crew turned a corner. Playtested and
+       * reported as more confusing than a strip drawn the same way every time.
        */
       const laid = t.facing === 'e' ? [...items].reverse() : items;
       const cw = 17;
       const tw = Math.min(W - 8, laid.length * cw + 30);
       const tx = W / 2 - tw / 2;
-      const facingWord =
+      const facingWord = t.facing === 'e' ? 'east' : 'west';
-        t.facing === 'e' ? 'east' : t.facing === 'w' ? 'west' : t.facing === 'n' ? 'north' : 'south';
       const consistWords = t.cars.length === 0 ? 'no cars' : t.cars.join(', ');
       out += `<g class="bs-crew" data-tip="${esc(
         `${t.label} — engine pointing ${facingWord}, carrying ${consistWords}` + (t.what ? `\n\n${t.what}` : ''),
@@ -743,7 +896,7 @@ export function officeSvg(
     out += `<g data-ghost="${g.row},${g.col}" transform="translate(${px(g.col)},${py(g.row)})" class="bs-ghost">` +
       `<rect x="0" y="0" width="${W}" height="${H}" rx="4"/>` +
       `<text x="${W / 2}" y="${H / 2}" text-anchor="middle">place here</text>` +
-      `<text class="bs-coord" x="${W / 2}" y="${H / 2 + 15}" text-anchor="middle">${g.row},${g.col}</text>` +
+      `<text class="bs-coord" x="${W / 2}" y="${H / 2 + 15}" text-anchor="middle">${g.col},${g.row}</text>` +
       `</g>`;
   }
 
@@ -764,6 +917,22 @@ export function officeSvg(
       `<text x="${W / 2}" y="${H - 36}" text-anchor="middle">${esc(l.label)}</text></g>`;
   }
 
+  /**
+   * THE LIMITS, AS THE EDGE OF THE BUILDABLE DISTRICT.
+   *
+   * Drawn just OUTSIDE the sign's own column, because the sign stands on the boundary rather than
+   * beyond it: a siding may run under the sign, and the line has to agree with the rule or it
+   * teaches the wrong one. It moves outward on its own as the Running Track is extended, which is
+   * the reward for extending made visible.
+   */
+  if (limits) {
+    const edge = (x: number, side: string): string =>
+      `<line class="bs-limitline" x1="${x}" y1="0" x2="${x}" y2="${height}"/>` +
+      `<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');
+  }
+
   // Mark the Running Track so the spine of the district is unmistakable.
   out += `<text class="bs-rowlab" x="2" y="${py(runningRow) + 92}">RUNNING TRACK</text>`;
   out += '</svg>';
@@ -834,10 +1003,16 @@ export const BOARD_CSS = `
 .bs-tcar.bs-t-mt{fill:#6b5a2e}
 .bs-tcar.bs-t-eng{fill:#2b2313;stroke:#e0c060;stroke-width:1.4}
 .bs-tcarlab{font:8px ui-monospace,monospace;fill:#2b2313;font-weight:700}
-/* One pip per A/D track, filled when a train is holding on it. A full Office is why the next
+/* One chip per A/D track, not one per train — a full Office is why the next arrival collides, so
-   arrival collides, so this is the count worth seeing without hovering. */
+   the count is worth seeing without hovering, and a free track reads "free" rather than vanishing.
-.bs-ad{fill:none;stroke:#4d6fa8;stroke-width:1.2}
+   The selected train's chip is lit the same amber the crew strip and action buttons use. */
-.bs-ad.bs-occ{fill:#5aa9e6;stroke:#8fc4ee}
+.bs-adchip rect{fill:#20262e;stroke:#4a5361;stroke-width:1}
+.bs-adchip text{fill:#cfd6e0;font:600 8px ui-monospace,monospace}
+.bs-adchip.on rect{fill:#8a6d1f;stroke:#e0c060;stroke-width:1.4}
+.bs-adchip.on text{fill:#fff4d6}
+.bs-adchip.mt rect{fill:none;stroke:#3d4650;stroke-dasharray:3 2}
+.bs-adchip.mt text{fill:#6b7480}
+.bs-adchip[data-crew]{cursor:pointer}
 .bs-t-mt + .bs-tcarlab,.bs-t-eng + .bs-tcarlab{fill:#f0e6cf}
 .bs-tlab{fill:#eaf6ec;font:600 11px ui-monospace,monospace}
 /* The three letters sit ON the slot, so they invert with it: dark on a loaded car's solid face,
@@ -874,6 +1049,10 @@ export const BOARD_CSS = `
 text.bs-mod{fill:#c8a04a}
 .bs-enh{fill:#7fb0e6;font:9px ui-monospace,monospace}
 .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). */
+.bs-limitline{stroke:#5f6b7a;stroke-width:1.5;stroke-dasharray:3 5;opacity:.7}
+.bs-limitlab{fill:#5f6b7a;font:600 8px ui-monospace,monospace;letter-spacing:.12em}
 .bs-ghost rect{fill:rgba(90,169,230,.07);stroke:#5aa9e6;stroke-width:2;stroke-dasharray:5 4}
 .bs-ghost text{fill:#5aa9e6;font:11px ui-monospace,monospace}
 /* The caption on a legal square that already carries a card. Same blue as the ghost squares and the
@@ -884,10 +1063,17 @@ text.bs-mod{fill:#c8a04a}
 .bs-ghost,g[data-cell].bs-legal{cursor:pointer}
 g[data-cell].bs-legal .bs-card{stroke:#5aa9e6;stroke-width:2.5}
 g[data-cell].bs-legal:hover .bs-card,.bs-ghost:hover rect{fill:#233246}
+/* THE SQUARE THE ACTION UNDER THE CURSOR MEANS. White, and brighter than anything else the board
+   marks, because it answers a question being asked RIGHT NOW rather than describing a standing
+   state — and it has to win when it lands on a square that is already legal, focused or blocked. */
+g[data-cell].bs-point .bs-card,g[data-ghost].bs-point rect{stroke:#f2f5f8;stroke-width:3.5;stroke-dasharray:none}
+g[data-cell].bs-point .bs-card{fill:#2b3b52}
 /* WHERE THE CREW CAN GO. Amber, the colour this game spends on "you can do this", so a reachable
-   card reads the same way an action button does. bs-from is where it is standing now. */
+   card reads the same way an action button does. bs-from is where it is standing now — marked on
+   the crew STRIP rather than the whole card, because the Office is the one square where a second
+   train may share that card: outlining the card would claim it belongs to both. */
 g[data-cell].bs-focus .bs-card{stroke:#e0c060;stroke-width:2.5}
-g[data-cell].bs-from .bs-card{stroke:#7a6a3a;stroke-width:2;stroke-dasharray:4 3}
+.bs-crew.bs-from rect:first-of-type{stroke:#7a6a3a;stroke-width:2;stroke-dasharray:4 3}
 /* AND WHERE IT CANNOT. Muted red with a barred face — a card that is refusing traffic, not one that
    is merely uninteresting. The reason rides on the card's own tooltip. */
 g[data-cell].bs-blocked .bs-card{stroke:#8a5a5a;stroke-width:2;stroke-dasharray:2 3}

src/sim/bot.ts

@@ -19,15 +19,23 @@
  *      complete at all.
  */
 
-import { applyIntent, areaOf, canAdvanceLoad, destinationsFor, facilityCarTypes, laborersLeft } from '../engine/apply.ts';
+import {
+  applyIntent,
+  areaOf,
+  canAdvanceLoad,
+  destinationsFor,
+  facilityCarTypes,
+  laborersLeft,
+  ownCutFor,
+} from '../engine/apply.ts';
 import { MAX_CONSIST, nextOfficeTier, officeProfile } from '../engine/content.ts';
-import type { 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 { connectionsFor, exitsFrom, facilityVariants, hasPort, joins, neighbour, opposite, variantsFor } from '../engine/track.ts';
 import type { Port } from '../engine/track.ts';
-import { coordKey } from '../engine/state.ts';
+import { coordKey, turnOf } from '../engine/state.ts';
 import type { Facility, GameState, GridCoord, OfficeArea, PlayerIndex, RollingStock, TrackCard } from '../engine/state.ts';
 
 export type BotPolicy = {
@@ -206,7 +214,7 @@ export function makeDeveloperBot(tweaks: BotTweaks): BotPolicy {
         ? options.filter((i) => !(i.type === 'card.play' && isTrainCard(s, i.cardId)))
         : options;
       const usable = held.length > 0 ? held : options;
-      if (s.turn.option === null) return chooseLocalOption(s, player, usable, tweaks);
+      if (turnOf(s, player).option === null) return chooseLocalOption(s, player, usable, tweaks);
       return followThrough(s, player, usable, tweaks);
     }
 
@@ -339,7 +347,7 @@ function chooseLocalOption(
    * NO BRANCH FOR MAINLINE MODIFIERS, and that is the measured answer rather than an oversight.
    *
    * There was one. It read `options.some((i) => i.type === 'mainline.modify')`, but `mainline.modify`
-   * requires `s.turn.option === 'draw'` and this runs while the option is still null, so
+   * requires `turnOf(s, player).option === 'draw'` and this runs while the option is still null, so
    * `legalActions` had already filtered it out — the branch could never fire and never had.
    *
    * Rewriting it to check the HAND made it work, and made the bot WORSE: -0.64 revenue a game,
@@ -364,8 +372,10 @@ function chooseLocalOption(
     return because('the crew is away from the Office and can never depart from where it stands', can('switch')!);
   }
 
-  // 3. Stock a green box only when the load can actually finish — an empty car of the right type
+  // 3. Stock a green box when the load can actually be worked — an empty car of the right type is
-  //    is already spotted. Stocking without one just fills the box.
+  //    already spotted. Staging ahead of the car is legal (§6.3) and cannot jam anything, but it
+  //    spends the Stage's one Freight Agent action on a load no Laborer can touch yet, so it is not
+  //    worth CHOOSING the option for; it is taken only as a fallback once the option is chosen.
   if (can('freightAgent') && canStockProductively(s, player)) {
     return because('a green box can be stocked with a load that can actually finish', can('freightAgent')!);
   }
@@ -402,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, options: Intent[]): 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) {
@@ -412,7 +422,7 @@ function bestDiscard(s: GameState, options: Intent[]): Intent | null {
     // 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, i.toSlot);
+    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) {
@@ -424,8 +434,8 @@ function bestDiscard(s: GameState, options: Intent[]): Intent | null {
 }
 
 /** A face-up card worth spending the draw on rather than gambling on the deck. */
-function isWorthTaking(s: GameState, slot: number): boolean {
+function isWorthTaking(s: GameState, player: PlayerIndex, slot: number): boolean {
-  return takingRank(s, slot) > 0;
+  return takingRank(s, player, slot) > 0;
 }
 
 /**
@@ -435,12 +445,12 @@ function isWorthTaking(s: GameState, slot: number): boolean {
  * 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, slot: number): 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, 0).tier) === k.tier ? 3 : 0;
+  if (k.kind === 'office') return nextOfficeTier(areaOf(s, player).tier) === k.tier ? 3 : 0;
   if (k.kind === 'timetabledTrain' || k.kind === 'extraTrain') return 2;
   if (k.kind === 'freightFacility') return 1;
   return 0;
@@ -463,9 +473,13 @@ function isTrainCard(s: GameState, cardId: string): boolean {
 /**
  * A facility with room in its green box AND an empty car OF ITS OWN TYPE already spotted.
  *
- * The type match matters: a load that reaches WORK with no matching car to go onto is stuck, and a
+ * A PRIORITY TEST, NOT A LEGALITY TEST — the engine stocks either way (§6.3). What it decides is
- * stuck load strips the industry track of Operational Rail status (§9.3), so no car can be brought
+ * whether stocking is worth the Local Operations action THIS Stage: with a car spotted the load
- * in to rescue it. Stocking speculatively jams the facility.
+ * moves next Stage, without one it sits.
+ *
+ * The type match matters when it does move: a load that reaches WORK with no matching car to go
+ * onto is stuck, and a stuck load strips the industry track of Operational Rail status (§9.3), so
+ * no car can be brought in to rescue it. `loadCanFinish` keeps the Laborers off such a load.
  */
 function canStockProductively(s: GameState, player: PlayerIndex): boolean {
   for (const card of areaOf(s, player).grid.values()) {
@@ -646,8 +660,7 @@ function runAroundCells(area: OfficeArea): Set<string> {
  *     there is one the crew dare not serve.
  */
 function bestFacilityPlay(s: GameState, player: PlayerIndex, options: Intent[]): Intent | null {
-  const area = s.officeAreas.get(player);
+  const area = areaOf(s, player);
-  if (!area) return null;
 
   const onLoop = runAroundCells(area);
   const reachable = reachableOffMain(area);
@@ -703,8 +716,7 @@ function bestFacilityPlay(s: GameState, player: PlayerIndex, options: Intent[]):
 }
 
 function bestTrackLay(s: GameState, player: PlayerIndex, options: Intent[]): Intent | null {
-  const area = s.officeAreas.get(player);
+  const area = areaOf(s, player);
-  if (!area) return null;
 
   const at = (row: number, col: number): TrackCard | undefined => area.grid.get(`${row},${col}`);
 
@@ -1038,6 +1050,25 @@ function loadReason(i: Intent): string {
   }
 }
 
+/**
+ * Would a load stocked here be workable straight away — is there a spotted empty car of that type
+ * not already promised to a load in the box or on the sign?
+ *
+ * A PREFERENCE, NOT A RULE. §6.3 stocking has no car requirement; this only ranks one legal stock
+ * above another, so the Stage's single Freight Agent action goes where a Laborer can use it.
+ */
+function stockCanBeWorked(s: GameState, player: PlayerIndex, at: GridCoord, carType: CarType): boolean {
+  const f = areaOf(s, player).grid.get(coordKey(at))?.facility;
+  if (!f) return false;
+  // Passengers board off the platform with no car spotted at all (§9.2), so a stocked coach is
+  // always immediately workable.
+  if (f.kind !== 'freight') return true;
+  const spotted = f.industryTrack.cars.filter((c) => !c.loaded && c.type === carType).length;
+  const staged = f.outboundBox.filter((c) => c.type === carType).length;
+  const working = (f.menAtWork ?? []).filter((l) => l?.dir === 'out' && l.type === carType).length;
+  return spotted - staged - working > 0;
+}
+
 /**
  * Is there already an empty car of the right type spotted to receive this load (§9.3)? Without one
  * the load can be started and walked across MEN|AT|WORK but can never come off.
@@ -1079,10 +1110,30 @@ function consistAfterMove(
     (d) => d.coord.row === move.to.row && d.coord.col === move.to.col,
   );
   if (!dest) return null;
-  // Forward means the engine leads and meets the cars head-on (§A.3).
+  /**
-  return move.reverse ? [...tray.consist, ...dest.couples] : [...dest.couples, ...tray.consist];
+   * Forward means the engine leads and meets the cars head-on (§A.3), and `couples` is ordered
+   * NEAREST FIRST — so the last car met ends up nose-most and the cut reverses on its way into the
+   * tray. Predicting it unreversed made the bot's run-around test read the wrong car as the tail
+   * whenever it approached a cut of two or more forwards.
+   */
+  return move.reverse
+    ? [...tray.consist, ...dest.couples]
+    : [...[...dest.couples].reverse(), ...tray.consist];
 }
 
+/**
+ * Would this move drag the cars the crew has just set out back onto the train?
+ *
+ * Coupling is mandatory, so pulling out through the end a cut is standing at picks it up again —
+ * which usually undoes the set-out the crew made this turn. The bot cannot make an ILLEGAL move
+ * (legality is enforced upstream), so this costs it nothing to ignore; it simply wastes the Move,
+ * and the crew arrives with the car it was trying to leave behind.
+ */
+function recouplesOwnCut(s: GameState, player: PlayerIndex, i: Intent): boolean {
+  return i.type === 'switch.move' && ownCutFor(s, player, i.trayId, i.reverse).length > 0;
+}
+
+
 /** Is this player's crew sitting somewhere it can never depart from? */
 function strandedFromOffice(s: GameState, player: PlayerIndex): boolean {
   const area = areaOf(s, player);
@@ -1125,17 +1176,17 @@ function followThrough(
   options: Intent[],
   tweaks: BotTweaks,
 ): Intent {
-  switch (s.turn.option) {
+  switch (turnOf(s, player).option) {
     case 'draw': {
       // Draw before playing — otherwise the hand empties and never refills.
       //
       // Prefer a face-up Department card only when it is actually worth having. Taking the visible
       // card unconditionally meant the bot never once drew blind from the deck across 60 games,
       // which the anomaly detector correctly flagged: a whole branch of §6.2 going unexercised.
-      if (!s.turn.drawnThisTurn) {
+      if (!turnOf(s, player).drawnThisTurn) {
         const piles = options.filter(
           (i): i is Extract<Intent, { type: 'draw.fromDepartment' }> =>
-            i.type === 'draw.fromDepartment' && isWorthTaking(s, i.slot),
+            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.
@@ -1143,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, b.slot) - takingRank(s, a.slot))[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);
@@ -1235,11 +1286,31 @@ function followThrough(
       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, options) ?? pickFirst(options, 'card.discard') ?? options[0]!,
+        bestDiscard(s, player, options) ?? pickFirst(options, 'card.discard') ?? options[0]!,
       );
     }
 
     case 'switch': {
+      /**
+       * 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.
+       *
+       * Coupling is mandatory (§A.4), so pulling out through the end a cut is standing at picks it
+       * straight back up — which undoes the set-out the crew just made. Measured before this filter:
+       * **625 of 1,029 set-outs across 60 games were recoupled by the very next move**, 219 of them
+       * cars that had just been spotted at an industry. The bot was not doing anything illegal; it
+       * was spending two Moves to end up where it started, over and over.
+       *
+       * Filtered here rather than at each `find` below because there are six of them and a rule that
+       * has to be remembered at six call sites is a rule that will be forgotten at the seventh. The
+       * originals come back if the filter would leave the crew with no move at all — backed into a
+       * stub behind its own cars, the only way out IS through them, and standing still is worse.
+       */
+      const clear = options.filter((i) => !recouplesOwnCut(s, player, i));
+      if (options.some((i) => i.type === 'switch.move') && clear.some((i) => i.type === 'switch.move')) {
+        options = clear;
+      }
+
       // Re-check every Move, not just when choosing the option. Conditions change mid-turn — a car
       // gets coupled, a siding fills — and once there is nothing left to do the fall-through would
       // pick an arbitrary legal move and burn the remaining Moves shuttling.
@@ -1459,8 +1530,30 @@ function followThrough(
       }
       const clear = options.find((i) => i.type === 'freightAgent.clearInbound');
       if (clear) return because('the red Inbound box is full and blocking further unloading', clear);
-      const stock = options.find((i) => i.type === 'freightAgent.stockOutbound');
+      /**
-      if (stock) return because('stock a green box so a Laborer has work next Stage', stock);
+       * PREFER THE BOX WHOSE LOAD CAN ACTUALLY BE WORKED.
+       *
+       * §6.3 lets the Freight Agent stage a load with no car spotted — cargo may wait on the dock —
+       * so every facility with room and a matching car in the Division Yard is now offered, not just
+       * the ready ones. `canStockProductively` chose the option believing a ready facility existed;
+       * taking the first offer regardless would spend the Stage's one Freight Agent action on some
+       * other industry that cannot move its load for want of a car. Staging ahead is still taken as
+       * a fallback: it is legal, it cannot jam anything, and it saves an action later.
+       */
+      const stockable = options.filter(
+        (i): i is Extract<Intent, { type: 'freightAgent.stockOutbound' }> =>
+          i.type === 'freightAgent.stockOutbound',
+      );
+      const workable = stockable.find((i) => stockCanBeWorked(s, player, i.at, i.carType));
+      const stock = workable ?? stockable[0];
+      if (stock) {
+        return because(
+          workable
+            ? 'stock a green box whose load a Laborer can start next Stage'
+            : 'stage a load ahead of the car — it waits in the green box until one is spotted',
+          stock,
+        );
+      }
       /**
        * NEVER UNJAM A HEALTHY BOX.
        *
@@ -1510,7 +1603,7 @@ function wantedCars(s: GameState, player: PlayerIndex): WantedCar[] {
     const f = card.facility;
     if (!f || f.kind !== 'freight') continue;
     const spotted = f.industryTrack.cars.length;
-    if (spotted >= f.industryTrack.length) continue;
+    if (spotted >= MAX_CONSIST) continue;
     // Every commodity the industry handles, asked of its profile. A hand-written switch here had
     // drifted from the sheet: it named two industries that do not exist (`produceShed`,
     // `oilRefinery`) and omitted three that do (`freightHouse`, `refinery`, `packingSheds`), so
@@ -1539,12 +1632,12 @@ function wantedCars(s: GameState, player: PlayerIndex): WantedCar[] {
  * Would spotting this car here do any work?
  *
  * An OUTBOUND facility needs an EMPTY car of its own commodity to load onto; an INBOUND one needs
- * a LOADED car of its commodity to unload. Anything else merely consumes a slot on a finite
+ * a LOADED car of its commodity to unload. Anything else merely consumes room on the industry's
- * industry track (§9.3).
+ * track, which holds four cars like any other card (§9.3).
  */
 function facilityWants(f: Facility, car: RollingStock): boolean {
   if (f.kind !== 'freight') return false;
-  if (f.industryTrack.cars.length >= f.industryTrack.length) return false;
+  if (f.industryTrack.cars.length >= MAX_CONSIST) return false;
   if (!facilityCarTypes(f).includes(car.type)) return false;
   if (!car.loaded && f.allows.outbound) return true;
   if (car.loaded && f.allows.inbound) return true;
@@ -1654,14 +1747,14 @@ function strandedWantedCars(s: GameState, player: PlayerIndex): { row: number; c
 
 function trayOf(s: GameState, player: PlayerIndex) {
   for (const tray of s.trays.values()) {
-    if (tray.position.at === 'grid' && tray.position.owner === player) return tray;
+    if (tray.position.at === 'grid' && tray.position.seat === player) return tray;
   }
   return null;
 }
 
 function trayLocation(s: GameState, player: PlayerIndex): { row: number; col: number } | null {
   for (const tray of s.trays.values()) {
-    if (tray.position.at === 'grid' && tray.position.owner === player) {
+    if (tray.position.at === 'grid' && tray.position.seat === player) {
       return tray.position.coord;
     }
   }
@@ -1693,7 +1786,7 @@ export type PlayOutcome = {
   trainsScheduled: number;
   cardsPlayed: number;
   outcome: GameState['outcome'];
-  /** The full ordered log. `state = fold(events)`, so this is the complete record of the game. */
+  /** The full ordered log — everything the game emitted, in order. Narration, not a reducible record. */
   events: GameEvent[];
   /** Every intent the bot actually submitted, for action-mix analysis. */
   intents: Intent['type'][];

src/sim/narrate.ts

@@ -15,9 +15,10 @@
  * panel cannot drift from the rules.
  */
 
-import { adTrackCount, coordKey } from '../engine/state.ts';
+import { MAX_CONSIST } from '../engine/content.ts';
-import type { GameState, GridCoord, RollingStock, TrayId } from '../engine/state.ts';
+import { adTrackCount, coordKey, seatOf, turnOf } from '../engine/state.ts';
-import { canAdvanceLoad, canStartLoad, facilityCarType, laborersLeft, movesFor, portersLeft } from '../engine/apply.ts';
+import type { GameState, GridCoord, PlayerIndex, RollingStock, SeatIndex, TrayId } from '../engine/state.ts';
+import { areaOf, canAdvanceLoad, canBoard, canDetrain, canStartLoad, facilityCarType, facilityCarTypes, laborersLeft, movesFor, passengerRefusal, portersLeft } from '../engine/apply.ts';
 import type { GameEvent } from '../engine/events.ts';
 
 // ---------------------------------------------------------------------------
@@ -33,11 +34,20 @@ export function clockTime(stage: number): string {
   return CLOCK[stage - 1] ?? `Stage ${stage}`;
 }
 
-export function carLabel(c: RollingStock): string {
+/**
+ * `homeSeat` is the district the page is being drawn for. Give it, and a load THIS district made
+ * says so — the printed game's answer is to turn the chip upside down in the tray, and this is the
+ * screen's. A load may not be broken in the Office Area that made it (state.ts `RollingStock.origin`),
+ * so "loaded here" is the difference between a boxcar worth switching and one that has to leave the
+ * district first. Omit it and the label is what it always was, which is what the replay viewers and
+ * the history lines want: they describe a board, not a seat's view of one.
+ */
+export function carLabel(c: RollingStock, homeSeat?: SeatIndex): string {
   // A caboose carries the crew, not freight, so "loaded caboose" is nonsense on the page even
   // though the supply marks every caboose loaded. Name it plainly.
   if (c.type === 'caboose') return 'caboose';
-  return `${c.loaded ? 'loaded' : 'empty'} ${c.type}`;
+  const label = `${c.loaded ? 'loaded' : 'empty'} ${c.type}`;
+  return homeSeat !== undefined && c.origin === homeSeat ? `${label} (loaded here)` : label;
 }
 
 export function carsLabel(cars: RollingStock[]): string {
@@ -125,19 +135,34 @@ export function narrate(e: GameEvent, ctx: NarrateContext = {}): Narration {
               : 'Chose FREIGHT AGENT work — one car moved to or from a facility',
       };
     case 'trayMoved':
+      // `via` rides on the event only when there was another legal route to the same square
+      // (docs/plans/switching-paths.md) — so naming it here says which one the crew actually took,
+      // rather than leaving a real choice invisible in the crew's own history.
       return {
         tone: 'plain',
         where: e.to,
-        text: `CREW moved ${at(e.from)} → ${at(e.to)} — ${e.movesRemaining} of 6 Moves left. The crew chip on the grid carries the whole train with it.`,
+        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':
+    case 'carsCoupled': {
+      /**
+       * TAKING YOUR OWN CUT BACK IS NOT THE SAME EVENT AS FINDING CARS ON THE LINE, and the history
+       * read as though it were — "coupled 2 cars" told a player who had just set those very cars out
+       * that the game had silently undone their work. It has not: they were standing at the end the
+       * train pulled out through, and coupling is mandatory (§A.4).
+       */
+      const own = e.recoupled?.stock.length ?? 0;
+      const found = e.stock.length - own;
+      const parts: string[] = [];
+      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:
           `Coupled ${e.stock.length} car(s) at ${at(e.at)} ${e.toNose ? 'ONTO THE NOSE' : 'behind the train'}` +
-          `: ${carsLabel(e.stock)}`,
+          ` — ${parts.join(', and ')}`,
       };
+    }
     case 'consistSorted':
       return {
         tone: 'good',
@@ -145,10 +170,14 @@ export function narrate(e: GameEvent, ctx: NarrateContext = {}): Narration {
         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 '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
+      // in front. "Dropped 2 cars" left the one fact that matters out of the record.
       return {
         tone: 'plain',
         where: e.at,
-        text: `Dropped ${carsLabel(e.stock)} at ${at(e.at)}`,
+        text:
+          `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
@@ -226,6 +255,31 @@ export function narrate(e: GameEvent, ctx: NarrateContext = {}): Narration {
         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 (§8.1)`,
       };
+    /**
+     * WHERE THE PLAYER PUT IT, not where its number would have sent it.
+     *
+     * An Extra's direction comes from its start now (§7, Jesse's ruling), so the line that used to
+     * explain the number's parity would be explaining a rule that no longer applies to this train.
+     */
+    case 'extraStarted': {
+      const where =
+        e.at.kind === 'divisionPoint'
+          ? `the ${e.at.side === 'west' ? 'Western' : 'Eastern'} Division Point`
+          : e.at.kind === 'mainline'
+            ? "the Interchange's yard"
+            : `the Control Point in seat ${e.at.seat}`;
+      const why =
+        e.at.kind === 'divisionPoint'
+          ? 'the end it runs away from — an Extra may start at either, and the end chooses the run'
+          : e.at.kind === 'mainline'
+            ? 'made up off the running line, so it highballs onto the Mainline once the Subdivision ' +
+              'is clear and may be held in the yard until it is'
+            : 'an Extra may begin at any Office above a Whistle Post, and the player chooses the run';
+      return {
+        tone: 'good',
+        text: `EXTRA X${e.trainNumber} started at ${where}, running ${e.direction} — ${why}`,
+      };
+    }
     case 'trainMadeUp':
       return {
         tone: 'good',
@@ -244,24 +298,32 @@ export function narrate(e: GameEvent, ctx: NarrateContext = {}): Narration {
         text: `Train ${e.trainNumber} was due out but is HELD — ${e.reason}`,
       };
     case 'trainHighballed':
+      // The RULE that released it, not a restatement of the move. "Some trains seem to be moving
+      // before I can switch them" was reported against a log in which every departure read alike.
       return {
         tone: 'plain',
-        text: `Train ${e.trainNumber} HIGHBALLED — departed ${e.from} onto ${e.to}`,
+        text: `Train ${e.trainNumber} HIGHBALLED — departed ${e.from} onto ${e.to}. Why now: ${e.why}`,
       };
     case 'trainArrived':
       /**
-       * AN EXPEDITED TRAIN IS NOT COMING BACK ROUND.
+       * AN EXPEDITED ARRIVAL IS AN ORDINARY ARRIVAL, WITH ONE STANDING OBLIGATION.
        *
-       * This said "it will highball again next Mainline Phase, so any work must happen now" to every
+       * This used to say the train stands through Cargo and is forced out at the end of the Stage —
-       * arrival. For an expedited train that is exactly backwards — Q3 departs it in the SAME Stage
+       * true once, and wrong: Q3 means the train must not be PARKED anywhere but the station, not
-       * it arrived, so there is no turn in which to work it — and the log then contradicted itself
+       * that it is rushed out early. It is switched, worked and released exactly like any other
-       * two lines later when the train left. Reported after Train 4, the Express, did precisely that.
+       * arrival; the only difference is what happens if it is left on Secondary Track when the next
+       * Mainline Phase begins (`expediteFault`).
        */
       return {
         tone: 'plain',
         text: e.expedited
-          ? `Train ${e.trainNumber} ARRIVED at the ${e.office} carrying ${carsLabel(e.consist)} — and EXPEDITES, so it leaves again this same Mainline Phase; there is no turn in which to work it`
+          ? `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 until the next Mainline Phase, so any work must happen before then`,
+          : `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',
+        text: `Train ${e.trainNumber} was left at ${e.where}, off the station, when the Mainline Phase began — an expedited train must be kept ready to highball. Station Master fault.`,
       };
     case 'trainDiverted':
       return {
@@ -269,11 +331,13 @@ export function narrate(e: GameEvent, ctx: NarrateContext = {}): Narration {
         text: `Train ${e.trainNumber} DIVERTED to ${e.to} — ${e.reason}`,
       };
     case 'trainCompleted':
+      // The one line in the log that is good news for everybody, so it is not 'quiet'.
       return {
-        tone: 'quiet',
+        tone: 'good',
         text:
-          `Train ${e.trainNumber} finished its run and left the Division carrying ` +
+          `Train ${e.isExtra ? 'X' : ''}${e.trainNumber} has completed its run, leaving via the ` +
-          `${carsLabel(e.consist)} — the crew is free again`,
+          `${e.side === 'east' ? 'Eastern' : 'Western'} Division Point carrying ${carsLabel(e.consist)}. ` +
+          `All players get 1 Revenue. The crew is free again.`,
       };
 
     // -- freight agent
@@ -446,15 +510,124 @@ export type Impediment = { where: string; why: string; severity: 'stuck' | 'wait
  * This is the panel that should answer the standing questions: whether facilities jam, whether
  * trains are held for want of a crew, whether the Office is about to cause a collision.
  */
-export function impediments(s: GameState, player = 0): Impediment[] {
+/** `coordKey`'s inverse — the grid is keyed by string and the engine predicates take coordinates. */
+function uncoordKey(key: string): GridCoord {
+  const [row, col] = key.split(',').map(Number);
+  return { row: row ?? 0, col: col ?? 0 };
+}
+
+/**
+ * One of `passengerRefusal`'s codes, in words a player can act on.
+ *
+ * `NO_EMPTY_COACH_IN_YARD` gets the longest answer because it is the one that looks like a broken
+ * game: the Division Yard is visibly full of cars, and the single type that has run out is the one
+ * §9.2 needs. Where the missing coaches ARE, and the condition that brings them back, is the whole
+ * of what the player needs to know — §2.2 returns the Classification Yard only when the Division
+ * Yard is bare, so a yard with fifty freight cars in it will not refill for a long time.
+ */
+function passengerReason(
+  s: GameState,
+  player: PlayerIndex,
+  at: GridCoord,
+  dir: 'board' | 'detrain',
+): string {
+  const code = passengerRefusal(s, player, at, dir);
+  switch (code) {
+    case 'NO_TRAIN_AT_OFFICE':
+      return dir === 'board'
+        ? 'passengers waiting, no train at the platform to take them'
+        : 'no train at the platform';
+    case 'NOT_A_TERMINAL':
+      return 'the only train here stops at Terminals only — Porters may not work it at this Office';
+    case 'NO_PASSENGER_WORK':
+      return 'the only train here is one its card bars Porters from working';
+    case 'NO_EMPTY_COACH':
+      return 'passengers waiting, but every coach on the train is already full';
+    case 'INBOUND_BOX_FULL':
+      return 'arrivals aboard, but the red Unloading slots are all occupied';
+    case 'LOADED_IN_THIS_DISTRICT':
+      return 'the loaded coaches all boarded here — passengers must be carried to another Office ' +
+        'Area before they can alight';
+    case 'NO_EMPTY_COACH_IN_YARD': {
+      const stuck = s.yards.classificationYard.filter((c) => c.type === 'coach').length;
+      const total = s.yards.divisionYard.length;
+      return (
+        'arrivals aboard, but §9.2 needs a white empty coach from the Division Yard to swap in and ' +
+        `there is none left${stuck > 0 ? ` — ${stuck} ${stuck === 1 ? 'coach is' : 'coaches are'} in the Classification Yard` : ''}. ` +
+        `Classification returns only when the Division Yard is bare, and it still holds ${total} cars.`
+      );
+    }
+    default:
+      return `Porters cannot work here (${code})`;
+  }
+}
+
+export function impediments(s: GameState, player: PlayerIndex = 0): Impediment[] {
   const out: Impediment[] = [];
-  const area = s.officeAreas.get(player);
+  const area = areaOf(s, player);
-  if (!area) return out;
 
   for (const [key, card] of area.grid) {
     const f = card.facility;
-    if (!f || f.kind !== 'freight') continue;
+    if (!f) continue;
-    const name = card.geometry.kind === 'facility' ? card.geometry.facility : 'facility';
+    /**
+     * A Freight Facility names itself off its own card; a Passenger Facility does NOT — it rides on
+     * the `office` card, so `geometry.kind` is `'office'` and it fell through to the literal
+     * "facility". Every passenger impediment therefore read `facility 0,0`, next to a freight row
+     * saying `mineTipple 1,-3`. The Office Area's tier is the name it should carry, and there is
+     * exactly one Office per Area, so `area.tier` is that card's own.
+     */
+    const name =
+      card.geometry.kind === 'facility'
+        ? card.geometry.facility
+        : card.geometry.kind === 'office'
+          ? area.tier
+          : 'facility';
+
+    /**
+     * WHY THE PORTERS ARE STANDING THERE (Gitea#2).
+     *
+     * "Note that the sparrow (with two loaded coaches) pulled into the station. There are two
+     * passengers on the platform. Four porters. My thought was to unload two and load two. I never
+     * get the chance to load the last two."
+     *
+     * The engine was right — §9.2 needs a white coach out of the Division Yard to de-train into,
+     * §2.2 returns the Classification Yard only when the Division Yard is BARE, and the Division
+     * Yard was one empty coach short with eight more sitting in Classification unable to come back.
+     * Jesse's ruling is that the shortage stays: "it is possible to run out — that's part of the
+     * strategy." What was missing was any way to SEE it. A Porter action that cannot be taken is
+     * simply absent from the menu, and this panel — the one that answers "why is nothing moving?" —
+     * covered freight facilities only, so the platform had nothing to say for itself at all.
+     *
+     * The reason comes from `passengerRefusal`, the engine's own, so what is on screen is the rule
+     * that actually refused rather than a second guess at it.
+     */
+    if (f.kind === 'passenger') {
+      if (portersLeft(f) > 0) {
+        const coord = uncoordKey(key);
+        // Passengers standing on the platform with nothing carrying them away.
+        if (f.outboundBox.some((c) => c.type === 'coach' && c.loaded) && !canBoard(s, player, coord)) {
+          out.push({
+            where: `${name} ${key}`,
+            why: passengerReason(s, player, coord, 'board'),
+            severity: 'waiting',
+          });
+        }
+        // A coach full of arrivals that cannot be emptied.
+        const arriving = area.adOccupancy.some((id) =>
+          s.trays.get(id)?.consist.some((c) => c.type === 'coach' && c.loaded && c.origin !== seatOf(s, player)),
+        );
+        if (arriving && !canDetrain(s, player, coord)) {
+          out.push({
+            where: `${name} ${key}`,
+            why: passengerReason(s, player, coord, 'detrain'),
+            severity: 'stuck',
+          });
+        }
+      }
+      continue;
+    }
+
+    if (f.kind !== 'freight') continue;
     const want = facilityCarType(f);
 
     // A load that cannot move, with Laborers standing by, is the worst state a facility reaches:
@@ -477,25 +650,47 @@ export function impediments(s: GameState, player = 0): Impediment[] {
     }
 
     if (f.outboundBox.length > 0 && !canStartLoad(f) && laborersLeft(f) > 0) {
+      // Two quite different reasons, and telling a player "MEN is occupied" when the real answer is
+      // "there is no car to load onto" sends them to fix the wrong thing.
+      const blockedByBox = f.menAtWork?.[0] != null;
       out.push({
         where: `${name} ${key}`,
-        why: 'green box has a load but MEN is occupied',
+        why: blockedByBox
-        severity: 'waiting',
+          ? '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 (§9.3)',
+        severity: blockedByBox ? 'waiting' : 'stuck',
       });
     }
 
     if (f.allows.outbound && f.outboundBox.length === 0) {
+      /**
+       * WHAT TO DO NEXT — AND THE TWO STEPS CAN BE DONE IN EITHER ORDER.
+       *
+       * §6.3 stocking needs only a car in the Division Yard; §9.3's "Load the car" is what needs an
+       * empty car of the commodity standing on the industry's track. So an empty siding is not a
+       * reason to hold the Freight Agent back — it is a second errand to run before the Laborers can
+       * start. Saying "bring a car in FIRST" sent players to do them in a fixed order they are not
+       * bound by, and wasted the Stage's one Freight Agent action.
+       */
+      const spotted = f.industryTrack.cars.some((c) => !c.loaded && facilityCarTypes(f).includes(c.type));
       out.push({
         where: `${name} ${key}`,
-        why: 'green box empty — nothing to load (needs a Freight Agent action)',
+        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 (§9.3)',
         severity: 'waiting',
       });
     }
 
-    if (f.industryTrack.cars.length >= f.industryTrack.length) {
+    // Four cars is the whole of any track card, industry or not — the same limit that caps a
+    // consist. It is no longer the industry's box count, which is what used to make a one-box
+    // industry report itself full with a single car standing on it.
+    if (f.industryTrack.cars.length >= MAX_CONSIST) {
       out.push({
         where: `${name} ${key}`,
-        why: `industry track full (${f.industryTrack.length} cars) — no room to spot another`,
+        why: `industry track full (${MAX_CONSIST} cars) — no room to spot another`,
         severity: 'stuck',
       });
     }
@@ -512,9 +707,10 @@ export function impediments(s: GameState, player = 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.
    */
-  if (s.clock.phase === 'localOps' && s.turn.option === 'switch' && s.turn.movesRemaining > 0) {
+  const turn = turnOf(s, player);
+  if (s.clock.phase === 'localOps' && turn.option === 'switch' && turn.movesRemaining > 0) {
     for (const [id, tray] of s.trays) {
-      if (tray.position.at !== 'grid' || tray.position.owner !== player) continue;
+      if (tray.position.at !== 'grid' || tray.position.seat !== seatOf(s, player)) continue;
       const { blocked } = movesFor(s, player, id);
       for (const b of blocked) {
         // A turnout is not an obstruction — a train runs through one all day and simply may not
@@ -522,7 +718,7 @@ export function impediments(s: GameState, player = 0): Impediment[] {
         // the board says it on the card instead.
         if (b.kind === 'noStopping') continue;
         out.push({
-          where: `${tray.trainNumber === null ? 'crew' : `Train ${tray.trainNumber}`} → (${b.coord.row},${b.coord.col})`,
+          where: `${tray.trainNumber === null ? 'crew' : `Train ${tray.trainNumber}`} → (${b.coord.col},${b.coord.row})`,
           why: b.why,
           // Not "stuck": these are the shape of the district and of the other trains in it, which is
           // the puzzle rather than a fault. Amber, not red.
@@ -533,41 +729,66 @@ export function impediments(s: GameState, player = 0): Impediment[] {
   }
 
   /**
-   * WHY THE PASSENGERS ARE NOT GETTING OFF.
+   * WHY THE PASSENGERS ARE NOT MOVING — boarding as well as de-training.
    *
-   * Reported: "I can't figure out how to have a train with three passenger coaches unload all three
+   * Reported first as "I can't figure out how to have a train with three passenger coaches unload
-   * at my depot." You cannot — a Depot has ONE Porter and ONE red slot, so it works one coach a
+   * all three at my depot." You cannot — a Depot has ONE Porter and ONE red slot, so it works one
-   * Stage and then needs a Freight Agent action to clear the box before the next. A Station does two
+   * coach a Stage and then needs a Freight Agent action to clear the box before the next. A Station
-   * and a Terminal three. That is the Office ladder doing its job, and nothing on screen said so.
+   * does two and a Terminal three. That is the Office ladder doing its job, and nothing on screen
+   * said so.
    *
-   * §9.2 also requires an empty coach in the DIVISION YARD to swap into the train, which is a
+   * Reported again as "passenger trains arrive at my Office and move on before I can load or unload
-   * requirement the engine only started enforcing recently and which no panel mentions at all.
+   * them", which turned out to be two separate silences. This block only looked at trains carrying
+   * a LOADED coach, so a train arriving to PICK UP said nothing at all. A Whistle Post's Office card
+   * carries a passenger facility with zero Porters, so the engine answered `RESOURCE_SPENT` — "all
+   * Porters used" — to a player who had used none.
+   *
+   * §9.2 also requires an empty coach in the DIVISION YARD to swap into the train, which no panel
+   * mentioned at all.
    */
   const office = area.grid.get(coordKey(area.officeCoord));
   const pf = office?.facility;
   if (pf && pf.kind === 'passenger') {
-    const waiting = area.adOccupancy
+    const coachTrains = area.adOccupancy
       .map((id) => s.trays.get(id))
-      .filter((t) => t?.consist.some((c) => c.type === 'coach' && c.loaded));
+      .filter((t): t is NonNullable<typeof t> => !!t && t.consist.some((c) => c.type === 'coach'));
-    if (waiting.length > 0) {
+
-      const reasons: string[] = [];
+    if (coachTrains.length > 0) {
-      if (portersLeft(pf) < 1) {
+      const say = (why: string, severity: Impediment['severity'] = 'waiting'): void => {
-        reasons.push(
+        out.push({ where: 'Office — passengers', why, severity });
+      };
+
+      const boarding = pf.outboundBox.some((c) => c.type === 'coach' && c.loaded);
+      const emptyOnTrain = coachTrains.some((t) => t.consist.some((c) => c.type === 'coach' && !c.loaded));
+      const loadedOnTrain = coachTrains.some((t) => t.consist.some((c) => c.type === 'coach' && c.loaded));
+
+      if (pf.porters < 1) {
+        say(
+          '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',
+        );
+      } else if (portersLeft(pf) < 1) {
+        say(
           `all ${pf.porters} Porter${pf.porters === 1 ? '' : 's'} used this Stage — one works one coach, ` +
             'and the Office tier is the Porter count (Depot 1, Station 2, Terminal 3)',
         );
+      } else {
+        if (boarding && !emptyOnTrain) {
+          say('passengers are waiting to board, but every coach standing here is already full');
         }
-      if (pf.inboundBox.length >= pf.capacity.inbound) {
+        if (!boarding && !loadedOnTrain) {
-        reasons.push(
+          say('nobody waiting to travel and no loaded coach to set down — stock the platform with a Freight Agent action');
+        }
+        if (loadedOnTrain && pf.inboundBox.length >= pf.capacity.inbound) {
+          say(
             `the red Unloading box is full (${pf.capacity.inbound} slot${pf.capacity.inbound === 1 ? '' : 's'}) — ` +
               'a Freight Agent action clears it, which costs a whole Local Operations turn',
           );
         }
-      if (!s.yards.divisionYard.some((c) => c.type === 'coach' && !c.loaded)) {
+        if (loadedOnTrain && !s.yards.divisionYard.some((c) => c.type === 'coach' && !c.loaded)) {
-        reasons.push('no EMPTY coach in the Division Yard to swap into the train (§9.2 requires one)');
+          say('no EMPTY coach in the Division Yard to swap into the train (§9.2 requires one)');
         }
-      for (const why of reasons) {
-        out.push({ where: 'passengers waiting to de-train', why, severity: 'waiting' });
       }
     }
   }
@@ -583,7 +804,7 @@ export function impediments(s: GameState, player = 0): Impediment[] {
   }
 
   // A full Office means the next arrival is an automatic collision (Gap 2d).
-  const cap = adTrackCount(s, player);
+  const cap = adTrackCount(s, seatOf(s, player));
   if (area.adOccupancy.length >= cap) {
     out.push({
       where: 'Office',
@@ -645,6 +866,18 @@ export function cuesFor(events: readonly GameEvent[]): string[] {
     // The 1D12 that sets a train's departure Stage. It is the one roll a player makes and it landed
     // silently, so the card was gone and the answer to "when does it run?" was a line of history.
     if (e.type === 'trainScheduled') out.push('schedule');
+    // A train running the whole length of the Division pays every player, and it is the one event
+    // nobody made happen on the turn it lands. It should be heard, not found in the log.
+    if (e.type === 'trainCompleted') out.push('completed');
+    // A train pulling into an Office. `trainDiverted` (the Yard Office siding) is deliberately not
+    // included — that one goes straight to a work track without the A/D stop `arrive` depicts.
+    if (e.type === 'trainArrived') out.push('arrive');
+    // Only an OFFICE departure, not every highball: a fresh make-up leaving a Division Point already
+    // sounds `train` ("All aboard"), and a train clearing the whole Division already sounds
+    // `completed` — this is the one case neither of those covers.
+    if (e.type === 'trainHighballed' && e.from === 'the Office') out.push('depart');
+    // §10 — the one event nobody wants to hear and everybody needs to.
+    if (e.type === 'trainsDestroyed') out.push('crash');
     if (e.type === 'stageBegan') {
       // A Stage BEGINNING is the previous one ending — except the first, which is the game opening
       // and has nothing behind it. A Day boundary rings the bell only: sounding both would collide,

src/sim/replay.ts

@@ -202,9 +202,9 @@ export function compress(frames: Frame[]): Packed {
       // Identity, not equality: `snapshot` pushes the very same FacilityView object into both the
       // cell and the frame's `facilities`, so this always resolves.
       const fi = c.facility ? f.facilities.indexOf(c.facility) : -1;
-      // `train` rides whole rather than being interned: it changes almost every frame, so a table
+      // `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.tray, c.cars, fi, c.train, c.ad, c.enhancementsWhat];
+      return [ci, wi, c.enhancements, c.cars, fi, c.trains, c.adTracks, c.enhancementsWhat, c.standingWest];
     });
     return { ...f, cells } as unknown as Frame;
   });
@@ -238,17 +238,26 @@ export function rehydrateCells(
   facs: unknown[],
 ): unknown[] {
   return packed.map((row) => {
-    const p = row as [number, number, string[], string | null, string[], number, unknown, unknown, string[]];
+    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
+    // undefined reads as no train at all.
+    const rawTrains = p[5];
+    const trains = Array.isArray(rawTrains) ? rawTrains : rawTrains ? [rawTrains] : [];
     return {
       row: c[0], col: c[1], kind: c[2], label: c[3], running: c[4], links: c[5],
-      what: whats[p[1]], enhancements: p[2], tray: p[3], cars: p[4],
+      what: whats[p[1]], enhancements: p[2], cars: p[3],
-      facility: p[5] < 0 ? null : facs[p[5]],
+      facility: p[4] < 0 ? null : facs[p[4]],
-      train: p[6] ?? null,
+      trains,
-      ad: p[7] ?? null,
+      adTracks: (p[6] as number | undefined) ?? null,
       // Carried rather than recomputed: this function is emitted into the page by toString() and so
       // cannot reach the card catalogue that produced the text.
-      enhancementsWhat: p[8] ?? [],
+      enhancementsWhat: p[7] ?? [],
+      // Where the train(s) on this card stand among the cars standing on it, so the replay draws a
+      // 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,
     };
   });
 }
@@ -453,7 +462,10 @@ const esc = (s) => String(s).replace(/[&<>]/g, (c) => ({'&':'&amp;','<':'&lt;','
 function miniFacility(x) {
   let h = '<div class="mini">';
   if (x.greenCap > 0) h += '<span class="dim">grn </span>' + boxes(x.green, x.greenCap, 'g');
-  if (x.trackCap > 0) h += '<br><span class="dim">work </span>' +
+  // Gated on the sign itself. This used to gate on trackCap, which was a stand-in for "freight
+  // facility" back when only a freight card had an industry track length; the length is gone and
+  // maw is the honest test — a Passenger Facility has no MEN | AT | WORK sign at all.
+  if (x.maw.length > 0) h += '<br><span class="dim">work </span>' +
     x.maw.map((m) => '<span class="box ' + (m ? 'm' : 'empty') + '">' + (m ? esc(m) : '·') + '</span>').join('');
   if (x.redCap > 0) h += '<br><span class="dim">red </span>' + boxes(x.red, x.redCap, 'r');
   return h + '</div>';
@@ -492,7 +504,7 @@ function render() {
 
   $('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);
+  $('grid').innerHTML = officeSvg(CELLS, f.runningRow, [], [], f.limits);
 
   /* Auto-hide: the district is worth its space during the phases that change it, and folded
      otherwise. A summary stays, because a panel that vanishes reads as broken. */
@@ -522,18 +534,20 @@ function render() {
       '<div class="fac"><b>' + esc(x.name) + '</b> <span class="dim">' + esc(x.commodity) + ' · ' + esc(x.flow) +
       ' · laborers ' + esc(x.laborers) + ' · porters ' + esc(x.porters) + '</span>' +
       '<div class="boxes"><span class="dim">green</span>' + boxes(x.green, x.greenCap, 'g') + '</div>' +
-      // No sign and no siding on a Passenger Facility: maw is empty for one, but the LABEL was
+      // No sign on a Passenger Facility: maw is empty for one, but the LABEL was printed before
-      // printed before the loop, so a Depot showed the caption over nothing. The mini card above
+      // the loop, so a Depot showed the caption over nothing.
-      // gates on trackCap and was already right; this copy was not.
       // (No backticks in here — this whole block is inside a template literal.)
       (x.maw.length > 0
         ? '<div class="boxes"><span class="dim">MEN|AT|WORK</span>' +
           x.maw.map((m) => '<span class="box ' + (m ? 'm' : 'empty') + '">' + (m ? esc(m) : '·') + '</span>').join('') + '</div>'
         : '') +
       '<div class="boxes"><span class="dim">red</span>' + boxes(x.red, x.redCap, 'r') + '</div>' +
-      // 's', not 'g': the siding is a place, not a direction, and green is reserved for outbound.
+      // 's', not 'g': standing here is a place, not a direction, and green is reserved for outbound.
-      (x.trackCap > 0 || x.track.length > 0
+      // Cap 0 so only the cars actually spotted are drawn — an industry card prints no siding, and
-        ? '<div class="boxes"><span class="dim">siding</span>' + boxes(x.track, x.trackCap, 's') + '</div>'
+      // the row of empty squares this used to draw claimed both that it did and that the siding was
+      // as long as the industry's box count. It holds four cars, the same as any track card.
+      (x.track.length > 0
+        ? '<div class="boxes"><span class="dim">spotted</span>' + boxes(x.track, 0, 's') + '</div>'
         : '') +
       '<div class="fstat ' + (x.jammed ? 'bad' : (x.canFinish ? 'good' : 'idle')) + '">' +
         (x.jammed

src/sim/save-replay.ts

@@ -21,10 +21,11 @@
  *   node src/sim/save-replay.ts 400 --top 3 trainCapSlack=0
  */
 
-import { writeFileSync } from 'node:fs';
+import { readdirSync, unlinkSync, writeFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
+import { areaAtSeat } from '../engine/apply.ts';
 import { legalActions } from '../engine/legal.ts';
 import type { BotPolicy } from './bot.ts';
 import { developerBot, makeDeveloperBot } from './bot.ts';
@@ -71,7 +72,7 @@ export function playForReplay(seed: number, policy: BotPolicy, maxTurns = 50_000
     save: toSave(game),
     note:
       `${revenue} Revenue over ${game.state.clock.day - 1} Days · ${trains} train(s) on the timetable · ` +
-      `${game.state.officeAreas.get(0)?.grid.size ?? 0} cards down` +
+      `${areaAtSeat(game.state, 0).grid.size} cards down` +
       (collisions > 0 ? ` · ${collisions} collision(s)` : ' · no collisions'),
   };
 }
@@ -130,13 +131,33 @@ if (isMain) {
     `  best ${revenues.slice(0, 5).join(', ')} · median ${revenues[Math.floor(revenues.length / 2)]}`,
   );
 
-  let written = 0;
+  const verified = best.filter((p) => {
-  for (const p of best) {
     const check = verifyReplays(p);
-    if (!check.ok) {
+    if (!check.ok) console.warn(`  REFUSED seed ${p.seed} — ${check.why}`);
-      console.warn(`  REFUSED seed ${p.seed} — ${check.why}`);
+    return check.ok;
-      continue;
+  });
+
+  /**
+   * THE PUBLISHED SET IS REPLACED, NOT ADDED TO.
+   *
+   * Every file here is named for its seed, so re-recording used to leave the previous set sitting
+   * beside the new one — and the previous set is precisely the one whose rules have just moved. The
+   * point of re-recording is that those files are dead; keeping them means the site serves dead
+   * replays and `harness.test.ts` fails on them forever, which is how the last two went unnoticed.
+   *
+   * Only ever run after at least one replacement verifies, so a run that produces nothing publishable
+   * leaves what is already published alone.
+   */
+  if (verified.length > 0) {
+    for (const old of readdirSync(dest).filter((f) => f.endsWith('.json') && f !== 'manifest.json')) {
+      if (verified.some((p) => `seed-${p.seed}.json` === old)) continue;
+      unlinkSync(join(dest, old));
+      console.log(`  retired ${old} — recorded under rules that have since moved`);
     }
+  }
+
+  let written = 0;
+  for (const p of verified) {
     const file = join(dest, `seed-${p.seed}.json`);
     writeFileSync(
       file,
@@ -147,13 +168,16 @@ if (isMain) {
           // there is room — a title carrying seven tweak names is a title nobody reads.
           title: `${p.revenue} Revenue · seed ${p.seed}`,
           note: `${p.note} · played by ${policy.name}`,
+          // The house rules it was DEALT under, without which the seed does not name this game and
+          // the file replays as something else — see `Save.rules` in `web/game.ts`.
+          ...(p.save.rules ? { rules: p.save.rules } : {}),
           history: p.save.history,
         },
         null,
         1,
       ),
     );
-    console.log(`  wrote ${file}  (${p.note}, ${check.why})`);
+    console.log(`  wrote ${file}  (${p.note})`);
     written += 1;
   }
   console.log(`${written} replay(s) saved — run \`npm run build:web\` to publish them`);

src/sim/stats.ts

@@ -1,9 +1,10 @@
 /**
  * End-of-game statistics.
  *
- * Dev-side. Compiles a readable account of how a game actually went, from the event log. Because
+ * Dev-side. Compiles a readable account of how a game actually went, from the event log. Every event
- * `state = fold(events)`, the log is the complete record — nothing needs instrumenting in the
+ * the game emits is in there, so nothing needs instrumenting in the engine to produce any of this —
- * engine to produce any of this.
+ * which is a claim about COVERAGE, not about reducibility: the log narrates the game completely and
+ * reconstructs it not at all (`protocol.md` §3).
  *
  * Three purposes, in ascending order of usefulness:
  *
@@ -18,7 +19,7 @@
 import type { GameEvent } from '../engine/events.ts';
 import type { Intent } from '../engine/intents.ts';
 import type { GameState } from '../engine/state.ts';
-import { areaOf, facilityCarTypes } from '../engine/apply.ts';
+import { areaAtSeat, areaOf, facilityCarTypes } from '../engine/apply.ts';
 import { officeProfile } from '../engine/content.ts';
 
 // ---------------------------------------------------------------------------
@@ -121,7 +122,7 @@ export function makeFunnelProbe(player = 0): {
     // A buried engine is a per-decision condition: every turn it persists is a turn the train is
     // stuck, so this counts turns rather than trains.
     for (const tray of s.trays.values()) {
-      if (tray.position.at !== 'grid' || tray.position.owner !== player) continue;
+      if (tray.position.at !== 'grid' || tray.position.seat !== player) continue;
       if (tray.engineAt <= 0 || tray.engineAt >= tray.consist.length) continue;
       funnel.buriedTurns += 1;
       // Cars may never be set out at the Office (§A.4), which is where this almost always happens.
@@ -295,7 +296,10 @@ export function summarize(
   const grossPassenger = rev.passengerBoard + rev.passengerDetrain;
   const gross = grossFreight + grossPassenger;
 
-  const area = final.officeAreas.get(0);
+  // Seat 0 explicitly: these are SOLITAIRE summaries, where there is exactly one Office Area and
+  // seat 0 is the only player. `areaAtSeat` rather than `officeAreas.get` so the key's meaning is
+  // stated — a multi-player report would have to sum over seats, and would fail loudly here first.
+  const area = areaAtSeat(final, 0);
   let freightFacilities = 0;
   if (area) {
     for (const card of area.grid.values()) {

src/sim/view.ts

@@ -11,12 +11,17 @@
  */
 
 import {
+  areaAtSeat,
   areaOf,
   destinationsFor,
   facilityCarType,
   laborersLeft,
   movesFor,
+  ownCutFor,
+  keepReason,
   portersLeft,
+  resolveExtraStart,
+  selectDestination,
 } from '../engine/apply.ts';
 import {
   ACTION_CARDS,
@@ -37,10 +42,13 @@ import {
   lengthProfile,
   officeProfile,
   trainProfile,
+  houseRules,
+  mainlineDescription,
 } from '../engine/content.ts';
 import type { Intent } from '../engine/intents.ts';
-import type { Facility, GameState, PlayerIndex, TrackCard, TurnoutOrientation } from '../engine/state.ts';
+import type { Facility, GameState, PlayerIndex, SeatIndex, TrackCard, TurnoutOrientation } from '../engine/state.ts';
-import type { Hand, TrackGeometry } from '../engine/content.ts';
+import { carsOn, playerAtSeat, railFacingOf, seatOf, turnOf } from '../engine/state.ts';
+import type { Hand, HouseRules, TrackGeometry } from '../engine/content.ts';
 import type { Port } from '../engine/track.ts';
 import { connectionsFor, slopeOfPair, variantsFor } from '../engine/track.ts';
 import type { Impediment } from './narrate.ts';
@@ -65,22 +73,29 @@ export type CellView = {
    * `toString()`), so it cannot reach the card catalogue itself.
    */
   enhancementsWhat: string[];
-  tray: string | null;
   /**
-   * THE TRAIN STANDING HERE, in order, with the engine in it and which way it points.
+   * EVERY TRAIN STANDING HERE, in order, each with the engine in it and which way it points.
    *
    * The switching game is entirely about car ORDER — which car is next to come off, which end a cut
    * couples onto — and the board showed a crew badge with a name and nothing else. A player could
    * not plan a move at all: "drop 1 car" tells you nothing when you cannot see what is on the back.
    *
+   * An ARRAY because the Office square is the one place more than one train may legally stand at
+   * once (docs/plans/switching-paths.md — "The Roster Pass"): the old singular `train` field only
+   * ever showed whichever tray `s.trays` happened to yield first, so a second train at a busy
+   * Station was never drawn at all, only counted in the A/D pips. Empty, not absent, when the card
+   * is bare, so callers never need an `?? []`.
+   *
    * `cars` runs nose first, matching the tray; `engineAt` is where the locomotive sits in it, and
-   * `facing` is the port it points at on this card.
+   * `facing` is which way the engine points — EAST OR WEST, never north or south, whatever the
+   * track under it runs. See `railFacingOf` in state.ts for why, and why the type says so.
    */
-  train: {
+  trains: {
+    trayId: string;
     label: string;
     cars: string[];
     engineAt: number;
-    facing: string;
+    facing: 'e' | 'w';
     /**
      * WHAT THIS PARTICULAR TRAIN'S CARD SAYS.
      *
@@ -89,16 +104,33 @@ export type CellView = {
      * standing in front of them — the card is face down in a box somewhere by then.
      */
     what: string;
-  } | null;
+  }[];
   /**
-   * Office card only: A/D tracks taken and how many the tier has.
+   * Office card only: how many A/D tracks the tier has — null everywhere else.
    *
-   * The tooltip said "3 A/D tracks" and the card showed nothing, so the number that decides whether
+   * Capacity, not occupancy: `board-svg.ts` draws one roster chip per track regardless of how many
-   * the next arrival collides was invisible on the card it belongs to. Drawn as pips rather than
+   * are taken (a free one reads "free"), so occupancy is implicit in how many of `trains` land on
-   * extra rails — there is no room on the card for more track, and the count is what matters.
+   * it. Used to carry `{used, of}` and draw one pip per track; the pips are gone (the roster band
+   * takes their place) but the count is still needed to know how many chips to lay out.
    */
-  ad: { used: number; of: number } | null;
+  adTracks: number | null;
   cars: string[];
+  /**
+   * Cars in `cars` that stand WEST of the train(s) here — 0 when no train is here, and unsplit if
+   * so: with nobody standing on the card, a cut has no near or far side and the whole row simply
+   * reads west to east (`board-svg.ts` draws the split only while `trains.length > 0`).
+   *
+   * `cars` runs west to east like the state it comes from, and a train standing on the card sits
+   * somewhere IN that row rather than beside it. Reported from play: "right after dropping my cars I
+   * need to be able to see if those cars are ahead or behind the train" — and the board drew the
+   * whole cut in one left-aligned strip at the bottom of the card, which cannot answer that at all.
+   *
+   * Combined with a train's `facing` it is the answer: for an east-facing engine the cars east of it
+   * are the ones ahead. ONE number for the whole card — every train standing here (there is at most
+   * one, except the Office) reads the same split, taken against the block of A/D tracks rather than
+   * against any one engine, straight off `TrackCard.standingWest`.
+   */
+  standingWest: number;
   facility: FacilityView | null;
   /**
    * The port pairs this card joins, as two-letter codes — 'ew' for the through track, and 'ne',
@@ -121,7 +153,8 @@ export type FacilityView = {
   /**
    * Freight or passengers — the one thing the renderers could not previously ask.
    *
-   * Without it they guessed from side effects (`trackCap > 0`, `laborers` starting "0/0"), and one
+   * Without it they guessed from side effects (a non-empty industry track, `laborers` starting
+   * "0/0"), and one
    * of the three simply did not guess at all, so a Depot drew three MEN | AT | WORK boxes it has no
    * Laborer to work. Reported from playtesting.
    */
@@ -134,8 +167,15 @@ export type FacilityView = {
   maw: (string | null)[];
   red: string[];
   redCap: number;
+  /**
+   * Cars standing on the industry's track, and nothing about how many more will fit.
+   *
+   * `trackCap` used to ride alongside this and every renderer drew that many empty squares — a
+   * printed siding, as long as the industry's box count. No industry card prints one, and the
+   * number was wrong anyway: a card holds four cars like any other. Both the field and the squares
+   * are gone; the room left is `spaceOn`'s business, not a drawing's.
+   */
   track: string[];
-  trackCap: number;
   laborers: string;
   porters: string;
   /**
@@ -186,13 +226,22 @@ export type TrainChip = {
    * THE SAME TRAIN THE OFFICE CARD DRAWS, so the Division map can draw it the same way.
    *
    * `cars` is nose first and carries no engine; `engineAt` is where the engine sits among them and
-   * `facing` is the port it points at. The Division chip used to be a name and a number — and the
+   * `facing` is which way the engine points, east or west. The Division chip used to be a name and a
-   * number was Stages left to cross, which reads as redundant beside the position already drawn on
+   * number — and the number was Stages left to cross, which reads as redundant beside the position
-   * the card. A train is worth drawing: what it is carrying, loaded or empty, and which end leads.
+   * already drawn on the card. A train is worth drawing: what it is carrying, loaded or empty, and
+   * which end leads.
    */
   cars: string[];
   engineAt: number;
-  facing: string;
+  facing: 'e' | 'w';
+  /**
+   * The train's printed card — what it may and may not do.
+   *
+   * The Office card has carried this for a while; the Division map chip carried only the consist, so
+   * a train out on the Mainline could not be asked what it was. Same text either way, from
+   * `trainRules`, so the two views cannot describe one train differently.
+   */
+  what: string;
   /**
    * Which region of a Mainline card the train is standing in, and which way it is going. Absent
    * everywhere else: a Division Point is a single queue, and inside a district a train moves by
@@ -245,12 +294,29 @@ export type DivisionView = {
    * on that grade has no visible meaning.
    */
   gradeUp: string | null;
+  /**
+   * Mainline cards only: what the card does to a train, from `mainlineDescription`.
+   *
+   * "I have no idea the impact Hilly and Uncontrolled Siding have on game play" — and there was
+   * nowhere to find out: the tip carried the card's NAME and its modifiers and nothing about the
+   * crossing time or whether trains may pass.
+   */
+  what?: string;
   /** Mainline cards only: how many regions the card is divided into (§2.1 — two). */
   regions?: number;
   /** Office nodes only: the Running Track, Limits to Limits, west to east. */
   running?: RunningCardView[];
   /** Office nodes only: whose district this is. */
-  owner?: number;
+  /** Which SEAT's district this is — a position on the Division, not a player. */
+  seat?: number;
+  /**
+   * Interchange only: trains standing in its yard, not out on the running line (state.ts).
+   *
+   * Separate from `trains` for the same reason `switching` is separate from an Office's A/D list —
+   * they are not occupying the thing whose capacity is being counted. An Extra made up here has to
+   * be VISIBLE, though, or the player who placed it has a train that exists nowhere on the map.
+   */
+  yard?: TrainChip[];
   /**
    * Office nodes only: crews working BELOW the Running Track.
    *
@@ -275,6 +341,44 @@ export type Frame = {
   actor: number | null;
   superintendent: number;
   revenue: number;
+  /**
+   * The rest of what a client needs so it never has to reach into `GameState`.
+   *
+   * The browser client used to read `game.state` in eleven places for exactly these. That is fine
+   * with the engine in the same process and impossible with a server, where the client holds no
+   * state at all — so they live on the projection instead. See `docs/architecture/multiplayer.md` §5.
+   */
+  /** Which of §6's three exclusive options the VIEWER has taken this Stage, if any. */
+  option: 'switch' | 'draw' | 'freightAgent' | null;
+  /**
+   * The settings this game was dealt under — the opening hand, and what the three economies pay.
+   *
+   * On the Frame rather than read off the config, for the same reason as everything else here: a
+   * remote client holds no `GameState`, and "what does a load pay in this game?" is a question it
+   * must be able to answer. Resolved, never partial, so nobody downstream re-applies defaults.
+   */
+  houseRules: HouseRules;
+  status: GameState['status'];
+  outcome: GameState['outcome'];
+  /**
+   * Every PLAYER's public standing — names and Revenue. "The race is the game" (protocol.md §4).
+   *
+   * In player order, not seat order, because the list is about people. `seat` is carried so a client
+   * that wants to draw the table west-to-east can sort by it — which stopped being the same thing as
+   * player order once §4.4's D12 decided who sits where.
+   */
+  players: { index: number; seat: number; name: string; revenue: number; hand: number }[];
+  /**
+   * WHICH of those players is the one this Frame was drawn for.
+   *
+   * `snapshot` has always taken a `viewer`, and everything viewer-scoped on the Frame — `revenue`,
+   * `handCount`, `objective`, `blocked` — is already resolved against it. What was missing was the
+   * INDEX itself, so a panel showing the whole table (the Day-end dialog, Gitea#10) had no way to
+   * mark which row is yours without assuming the web client's `viewer = 0`.
+   */
+  viewer: number;
+  /** How many cards the VIEWER holds. Other players' counts are in `players`. */
+  handCount: number;
   lines: { text: string; tone: string }[];
   where: { row: number; col: number } | null;
   /** Origin of a Move, so the crew's journey is visible rather than a chip teleporting. */
@@ -283,6 +387,15 @@ export type Frame = {
   cells: CellView[];
   /** Which grid row is the Running Track — the spine the district hangs beneath. */
   runningRow: number;
+  /**
+   * The columns the Limits signs stand in — the district's east and west edges, at EVERY row.
+   *
+   * Track may not be laid outside them (§2.1), so a player looking at open ground beyond a sign is
+   * looking at ground no card of his will ever go on. Two signs on one row could not say that; the
+   * board draws the boundary down the whole district instead. Carried on the Frame rather than read
+   * off the area for the usual reason: a remote client holds no `GameState`.
+   */
+  limits: { west: number; east: number };
   /**
    * Moves left in this Local Operations turn, or null outside a switching turn.
    *
@@ -302,15 +415,46 @@ export type Frame = {
    * `blocked` comes out of the movement walk itself (`movesFor`), so a reason on screen is the rule
    * that actually refused the square rather than a second guess at it.
    */
+  /**
+   * ONE ENTRY PER CREW, not one for the district.
+   *
+   * This used to be a single object built from the FIRST tray in the map, with a comment admitting
+   * it: "One crew. Solitaire has one, and with more the answer would depend on which is selected".
+   * More than one crew in a district is ordinary — trains stand on the A/D tracks while a local
+   * shunts — and when it happened the board highlighted one crew's squares while the action list
+   * offered every crew's moves, with nothing saying which was which.
+   */
   moves: {
+    trayId: string;
+    /** "Train 8", "the local crew" — what to call it on screen. */
+    label: string;
     from: { row: number; col: number };
     to: { row: number; col: number }[];
     blocked: { coord: { row: number; col: number }; kind: string; why: string }[];
-  } | null;
+  }[];
   facilities: FacilityView[];
   hand: string[];
   /** What each hand card does, in the same order — names alone are not a playable hand. */
   handWhat: string[];
+  /**
+   * Whether each hand card may be DISCARDED, in the same order.
+   *
+   * The player has to be told which cards those are, not merely find that a button is missing —
+   * that silence is the whole of the Gitea#2 complaint, where a blocked platform left the board with
+   * nothing to click and no reason. Named for the rule rather than for trains, since it answers the
+   * question the panel is asking.
+   */
+  handDiscardable: boolean[];
+  /**
+   * WHY a card may not be discarded, in the same order; `null` where it may.
+   *
+   * Carried rather than written on the page because §6.2 now fails for two different reasons
+   * (Gitea#9): an Extra is never discardable, and a Timetabled train is not discardable only when
+   * the `discardTimetabled` house rule is off. A panel that hard-codes one sentence tells half the
+   * players the wrong thing, and a panel that reconstructs the rule is a second implementation of
+   * it. `keepReason` is the engine's own, so the card says the rule that actually refused.
+   */
+  handKeepWhy: (string | null)[];
   deck: number;
   /** The face-up card on top of each Department pile — the only one that may be drawn. */
   departments: string[];
@@ -347,6 +491,16 @@ export type Frame = {
   };
   /** 12 slots; the train number due out at each Stage, or null. */
   timetable: (number | null)[];
+  /**
+   * THE TRAIN'S CARD, SLOT BY SLOT — so a card played on Day 1 can still be read on Day 4.
+   *
+   * Reported from play: "once a train card's been played, how would I see that particular train card
+   * again — what it's allowed to do and not allowed to do, and how it has to be loaded?" The card
+   * goes onto the Timetable and is then gone, and its restrictions are what decide whether a train
+   * can be switched, worked by Porters, or loaded at all. The Timetable is where the player already
+   * looks for that train, so the card rides there.
+   */
+  timetableWhat: (string | null)[];
   blocked: Impediment[];
   trains: { label: string; where: string }[];
   /**
@@ -392,6 +546,7 @@ const FACILITY_NAMES: Record<string, string> = {
 function facilityView(
   card: { geometry: { kind: string; facility?: string }; facility: unknown; modifiers?: string[] },
   officeName: string,
+  viewerSeat: SeatIndex,
 ): FacilityView | null {
   const f = (card as { facility: import('../engine/state.ts').Facility | null }).facility;
   // Passenger facilities were excluded entirely, so the Office's green and red slots never
@@ -413,8 +568,9 @@ function facilityView(
     maw: (f.menAtWork ?? []).map((l) => (l ? `${l.type} ${l.dir === 'out' ? '→' : '←'}` : null)),
     red: f.inboundBox.map(carLabel),
     redCap: f.capacity.inbound,
-    track: f.industryTrack.cars.map(carLabel),
+    // Marked when this district made the load: the spotted car is exactly where a player is looking
-    trackCap: f.industryTrack.length,
+    // when they ask why the Laborer will not unload it.
+    track: f.industryTrack.cars.map((c) => carLabel(c, viewerSeat)),
     laborers: `${laborersLeft(f)}/${f.laborers}`,
     porters: `${portersLeft(f)}/${f.porters}`,
     canFinish: canFinishHere(f),
@@ -481,20 +637,39 @@ function baseOf(
 }
 
 /** The train standing on a given grid square, drawn as it is seated in the Crew Tray. */
-function trainOnCard(s: GameState, key: string): CellView['train'] {
+/**
+ * Where the train standing on this card sits among the cars standing on it, clamped to the row.
+ *
+ * Zero when there is no train, which is also the right answer for a bare cut: with nobody standing
+ * there, a cut has no near or far side and the whole row simply reads west to east.
+ */
+/**
+ * Every train standing on this card, for THIS viewer's seat.
+ *
+ * KEYED BY COORDINATE, so it must be filtered by seat first — every district uses the same (row,
+ * col) origin, so without the seat check a crew standing at (0,1) in one player's Office Area would
+ * be drawn onto (0,1) of every other player's board too. Collects every match rather than returning
+ * on the first: the Office square is the one place more than one train may legally stand at once
+ * (docs/plans/switching-paths.md), and the old singular version silently drew only whichever tray
+ * `s.trays` happened to yield first.
+ */
+function trainsOnCard(s: GameState, viewerSeat: SeatIndex, key: string): CellView['trains'] {
+  const out: CellView['trains'] = [];
   for (const [id, t] of s.trays) {
-    if (t.position.at !== 'grid') continue;
+    if (t.position.at !== 'grid' || t.position.seat !== viewerSeat) continue;
     if (`${t.position.coord.row},${t.position.coord.col}` !== key) continue;
-    return {
+    out.push({
+      trayId: id,
       label: t.trainNumber === null ? 'crew' : `T${t.trainIsExtra ? 'X' : ''}${t.trainNumber}`,
-      cars: t.consist.map(carLabel),
+      // A coach filled at THIS Office reads "loaded coach (loaded here)" — those passengers may not
+      // alight in the district that boarded them, and the tray is where a player looks for that.
+      cars: t.consist.map((c) => carLabel(c, viewerSeat)),
       engineAt: Math.max(0, Math.min(t.consist.length, t.engineAt)),
-      facing: t.facing ?? (t.direction === 'west' ? 'w' : 'e'),
+      facing: railFacingOf(t),
       what: t.trainNumber === null ? 'A local crew — no timetable, no card, no special rules.' : trainRules(t),
-    };
+    });
-    void id;
   }
-  return null;
+  return out;
 }
 
 /** Is a car spotted that a load on WORK could actually come off onto (§9.3)? */
@@ -544,11 +719,20 @@ function sampleDetail(s: GameState, kind: string, list: Intent[]): string {
   return shown.join('; ') + (more > 0 ? ` … and ${more} more distinct` : '');
 }
 
+/** " onto Train 8", or nothing at all when the intent names no train (an old save, or one train). */
+function onto(s: GameState, trayId: string | undefined, joiner: string): string {
+  return trayId === undefined ? '' : `${joiner}${trainName(s, trayId)}`;
+}
+
 /** One readable line for a single intent. */
 export function describeIntent(s: GameState, i: Intent): string {
-  const at = (c: { row: number; col: number }): string => `(${c.row},${c.col})`;
+  // X,Y — east/west then north/south, not the internal row/col storage order.
+  const at = (c: { row: number; col: number }): string => `(${c.col},${c.row})`;
   // An intent belongs to whoever is acting, so it is described against THEIR district.
-  const seat: PlayerIndex = s.clock.currentActor ?? 0;
+  // The acting PLAYER, not a seat — `describeIntent` describes an intent against the district of
+  // whoever is making it. Named `seat` once, and then used as an `officeAreas` key, which is the
+  // exact confusion the seat/player split exists to stop.
+  const actor: PlayerIndex = s.clock.currentActor ?? 0;
   switch (i.type) {
     case 'localOps.choose':
       // The most consequential decision of the Stage, and it was labelled "choose switch". Say what
@@ -578,7 +762,7 @@ export function describeIntent(s: GameState, i: Intent): string {
        * square was not empty. The Limits sign is excluded: laying track there is ordinary growth.
        */
       const over = i.placement
-        ? s.officeAreas.get(seat)?.grid.get(`${i.placement.row},${i.placement.col}`)
+        ? areaOf(s, actor).grid.get(`${i.placement.row},${i.placement.col}`)
         : undefined;
       const upgrade = over?.geometry.kind === 'track';
       return (
@@ -615,14 +799,37 @@ export function describeIntent(s: GameState, i: Intent): string {
       const tray = s.trays.get(i.trayId);
       const here = tray?.position.at === 'grid' ? tray.position.coord : null;
       let picks = '';
+      let routeNote = '';
       if (here) {
-        const dest = destinationsFor(s, tray!.position.at === 'grid' ? tray!.position.owner : 0, i.trayId, here, i.reverse)
+        const dests = destinationsFor(s, tray!.position.at === 'grid' ? playerAtSeat(s, tray!.position.seat) : 0, i.trayId, here, i.reverse);
-          .find((d) => d.coord.row === i.to.row && d.coord.col === i.to.col);
+        const dest = selectDestination(dests, i.to, i.via);
+        // Two routes to the same square (docs/plans/switching-paths.md) would otherwise print the
+        // identical button twice — "move to (0,0)" and "move to (0,0)" — and the action list drops
+        // duplicate labels, silently discarding the second choice. `via` is the one thing that
+        // differs in the DATA, so it is the one thing safe to print without guessing at scenery
+        // this function has no other reason to know the name of.
+        const atSameSquare = dests.filter((d) => d.coord.row === i.to.row && d.coord.col === i.to.col);
+        if (dest && i.via && atSameSquare.length > 1) {
+          routeNote = ` via ${at(i.via)}`;
+        }
         if (dest && dest.couples.length > 0) {
-          picks = ` — couples ${carsLabel(dest.couples)} on the way${i.reverse ? ' (behind)' : ' (onto the nose)'}`;
+          /**
+           * NAME THE CARS THE CREW SET OUT HERE SEPARATELY. They are at the front of `couples` — the
+           * walk seeds itself with the cut at the end the train pulls out through — and a button
+           * reading "couples 2 cars" over cars the player put down thirty seconds ago is exactly the
+           * surprise this label exists to prevent, running the other way.
+           */
+          const own = ownCutFor(s, playerAtSeat(s, tray!.position.at === 'grid' ? tray!.position.seat : 0), i.trayId, i.reverse).length;
+          const end = i.reverse ? ' (behind)' : ' (onto the nose)';
+          picks =
+            own > 0
+              ? ` — takes your own ${carsLabel(dest.couples.slice(0, own))} back off this card` +
+                (dest.couples.length > own ? `, then couples ${carsLabel(dest.couples.slice(own))} on the way` : '') +
+                end
+              : ` — couples ${carsLabel(dest.couples)} on the way${end}`;
         }
       }
-      return `move to ${at(i.to)}${i.reverse ? ' (reverse)' : ''}${picks}`;
+      return `move to ${at(i.to)}${routeNote}${i.reverse ? ' (reverse)' : ''}${picks}`;
     }
     case 'switch.dropCars': {
       /**
@@ -651,7 +858,7 @@ export function describeIntent(s: GameState, i: Intent): string {
        * waiting for a train that can carry it. For a passenger facility that load is passengers on
        * the platform.
        */
-      const f = areaOf(s, seat).grid.get(`${i.at.row},${i.at.col}`)?.facility ?? null;
+      const f = areaOf(s, actor).grid.get(`${i.at.row},${i.at.col}`)?.facility ?? null;
       const where = f?.kind === 'passenger' ? 'onto the platform' : 'into the green Loading box';
       return i.carType === 'coach' && f?.kind === 'passenger'
         ? `bring passengers ${where} at ${at(i.at)} — they wait there for a train with an empty coach`
@@ -659,18 +866,78 @@ export function describeIntent(s: GameState, i: Intent): string {
     }
     case 'freightAgent.unjam':
       return `unjam ${i.from} at ${at(i.at)}`;
-    case 'freightAgent.clearInbound':
+    /**
-      return `clear red box at ${at(i.at)}`;
+     * SAY THAT IT PAYS NOTHING, because the obvious guess is that it does.
+     *
+     * Reported from play: "it wasn't obvious if that was a mechanical thing or if that's the actual
+     * revenue generation — I believe that's actually where you get the revenue, and that completes
+     * unloading the car." It is the first: the Revenue for an inbound load was already paid, one
+     * step earlier, when the Laborer walked it off the car into the red box (`unloadCompleted` pays
+     * `freightPerLoad`). Clearing the box banks nothing — it empties the one slot an inbound load
+     * can finish in, so the NEXT car can be unloaded, and costs the whole Freight Agent action for
+     * the Stage.
+     *
+     * Verified against the engine rather than read off the rules: `freightAgent.clearInbound` emits
+     * `inboundCleared` alone, with no `revenueChanged` beside it.
+     */
+    case 'freightAgent.clearInbound': {
+      const f = areaOf(s, actor).grid.get(`${i.at.row},${i.at.col}`)?.facility ?? null;
+      const car = f?.inboundBox[i.index];
+      const full = f ? f.inboundBox.length >= f.capacity.inbound : false;
+      // The red box serves both halves of §9: an inbound freight load that has come off its car,
+      // and a coach whose passengers have detrained. Both were paid for a step earlier, and both
+      // sit in the box until the Freight Agent moves them on.
+      const paid =
+        f?.kind === 'passenger'
+          ? 'the Revenue was paid when the passengers detrained'
+          : 'the Revenue was paid when the load reached the box';
+      const frees = f?.kind === 'passenger' ? 'more passengers can detrain here' : 'another car can be unloaded here';
+      return (
+        `send the ${car ? carLabel(car) : 'car'} in the red Inbound box at ${at(i.at)} to the Classification Yard` +
+        ` — pays nothing (${paid}); it frees${full ? ' the last' : ' a'} slot so ${frees}`
+      );
+    }
     case 'laborer.startLoad':
       return `start a load at ${at(i.at)}`;
     case 'laborer.advanceLoad':
       return `advance load in box ${i.box} at ${at(i.at)}`;
     case 'laborer.beginUnload':
       return `begin unloading car ${i.carIndex} at ${at(i.at)}`;
+    /**
+     * NAME THE TRAIN. The action list drops duplicate labels within a crew, and with two trains
+     * standing at one station "board passengers at (0,0)" describes both — which is half of why the
+     * v0.4.9d playtest found that picking a train changed nothing. The intent now carries the tray;
+     * the label has to say so or the second button is thrown away before the menu sees it.
+     */
     case 'porter.board':
-      return `board passengers at ${at(i.at)}`;
+      return `board passengers at ${at(i.at)}${onto(s, i.trayId, ' onto ')}`;
     case 'porter.detrain':
-      return `detrain passengers at ${at(i.at)}`;
+      return `detrain passengers at ${at(i.at)}${onto(s, i.trayId, ' from ')}`;
+    /**
+     * NAME THE PLACE AND THE DIRECTION, because the player is choosing both.
+     *
+     * This used to explain why the Extra had no choice — "it runs west, so that is the end it
+     * starts from". It has one now (§7, Jesse's ruling), and every candidate is on screen at once,
+     * so each label has to be distinguishable from its three or four siblings at a glance.
+     */
+    case 'newTrain.startExtra': {
+      const where = resolveExtraStart(s, s.clock.currentActor ?? 0, i);
+      if (typeof where === 'string') return `start Extra X${i.trainNumber}`;
+      const { direction } = where;
+      if (where.at.kind === 'divisionPoint') {
+        const end = where.at.side === 'west' ? 'Western' : 'Eastern';
+        return `start Extra X${i.trainNumber} at the ${end} Division Point — it runs ${direction} from there`;
+      }
+      if (where.at.kind === 'mainline') {
+        return (
+          `start Extra X${i.trainNumber} ${direction}bound in the Interchange — it is made up in the ` +
+          'yard and highballs onto the Mainline once the Subdivision is clear'
+        );
+      }
+      const tier = officeProfile(areaAtSeat(s, where.at.seat).tier).name;
+      return `start Extra X${i.trainNumber} ${direction}bound at the ${tier} in seat ${where.at.seat} — a Control Point, so it may begin its run there`;
+    }
+
     case 'newTrain.placeCar':
       // carLabel knows a caboose carries the crew, not freight. Formatting it here by hand put
       // "add loaded caboose" on a button.
@@ -718,9 +985,13 @@ export function describeIntent(s: GameState, i: Intent): string {
       // ABS Signals exists to prevent, but no such collision is implemented — granting clearance is
       // currently free. Saying otherwise invents a consequence the engine will never deliver.
       // See implications.md §10 Q13.
+      // THE TRAIN BEING RULED ON GOES ON THE BUTTON, not in the tooltip. `actionButton` splits a
+      // label at the first em-dash and shows only the head, so "ALLOW — Train 7 follows…" left the
+      // one thing the ruling is ABOUT — which train — behind a hover. Reported from play: the
+      // Superintendent could not tell which train he was clearing without pointing at the button.
       return i.allow
-        ? `ALLOW — ${who} follows ${ahead} onto the same Mainline card, closing up behind it`
+        ? `ALLOW ${who} to follow ${ahead} — onto the same Mainline card, closing up behind it`
-        : `HOLD — ${who} waits where it is, losing the Stage but keeping the line clear`;
+        : `HOLD ${who} — it waits where it is, losing the Stage but keeping the line clear`;
     }
     case 'draw.fromDepartment': {
       // Naming the card is the whole point of a FACE-UP pile: "Department 2" tells a player nothing,
@@ -786,14 +1057,7 @@ export function snapshot(
   viewer: PlayerIndex = 0,
 ): Frame {
   const area = areaOf(s, viewer);
-  const trayAt = new Map<string, string>();
+  const viewerSeat = seatOf(s, viewer);
-  for (const [id, tray] of s.trays) {
-    if (tray.position.at === 'grid') {
-      const label = tray.trainNumber === null ? 'crew' : `T${tray.trainIsExtra ? 'X' : ''}${tray.trainNumber}`;
-      const carrying = tray.consist.length ? ` [${tray.consist.map(carLabel).join(', ')}]` : ' [empty]';
-      trayAt.set(`${tray.position.coord.row},${tray.position.coord.col}`, label + carrying);
-    }
-  }
 
   const cells: CellView[] = [];
   const facilities: FacilityView[] = [];
@@ -812,7 +1076,7 @@ export function snapshot(
     else if (g.kind === 'spaceUse') label = prettyKey(g.key);
     else label = geometryLabel(g.geometry);
 
-    const fv = facilityView(card as never, officeProfile(area.tier).name);
+    const fv = facilityView(card as never, officeProfile(area.tier).name, viewerSeat);
     if (fv) facilities.push(fv);
 
     cells.push({
@@ -825,13 +1089,10 @@ export function snapshot(
       links: connectionsFor(card).map(([a, b]) => `${a}${b}`),
       enhancements: card.enhancements.map(prettyKey),
       enhancementsWhat: card.enhancements.map((k) => enhancementText(k) ?? prettyKey(k)),
-      tray: trayAt.get(key) ?? null,
+      trains: trainsOnCard(s, viewerSeat, key),
-      train: trainOnCard(s, key),
+      adTracks: card.geometry.kind === 'office' ? officeProfile(area.tier).adTracks : null,
-      ad:
+      cars: carsOn(card).map((c) => carLabel(c, viewerSeat)),
-        card.geometry.kind === 'office'
+      standingWest: card.standingWest,
-          ? { used: area.adOccupancy.length, of: officeProfile(area.tier).adTracks }
-          : null,
-      cars: (card.facility?.industryTrack.length ? card.facility.industryTrack.cars : card.standing).map(carLabel),
       facility: fv,
     });
   }
@@ -899,21 +1160,25 @@ export function snapshot(
           };
         })],
         capacity: MAINLINE_PROFILES.find((m) => m.kind === n.card)?.trainsMayPass ? 2 : 1,
+        // Drawn at the start of the card: the yard is beside the rail, and this is the end the
+        // train will pull out of. It counts against nothing — see `yard` on DivisionView.
+        yard: (n.holding ?? []).map((id) => ({ ...trainChip(s, id), region: 0 })),
         modifiers: [
           ...(n.modifiers ?? []).map(prettyKey),
           ...(n.absSignals ? ['ABS Signals'] : []),
         ],
         gradeUp: isGrade ? (n.gradeUp ?? 'east') : null,
+        what: mainlineDescription(n.card, n.gradeUp ?? 'east'),
       };
     }
-    const oa = areaOf(s, n.owner);
+    const oa = areaAtSeat(s, n.seat);
 
     // Where every crew in this district actually is: on a Running Track card, or below it.
     const onRunning = new Map<string, TrainChip[]>();
     const below: TrainChip[] = [];
     for (const [id, tray] of s.trays) {
       const pos = tray.position;
-      if (pos.at !== 'grid' || pos.owner !== n.owner) continue;
+      if (pos.at !== 'grid' || pos.seat !== n.seat) continue;
       const c = trainChip(s, id);
       if (pos.coord.row === oa.runningRow) {
         const k = `${pos.coord.row},${pos.coord.col}`;
@@ -954,7 +1219,7 @@ export function snapshot(
       capacity: officeProfile(oa.tier).adTracks,
       modifiers: [],
       gradeUp: null,
-      owner: n.owner,
+      seat: n.seat,
       running,
       switching: below,
     };
@@ -968,7 +1233,7 @@ export function snapshot(
     phaseKey: s.clock.phase,
     actor: s.clock.currentActor,
     superintendent: s.clock.superintendent,
-    revenue: s.players[0]?.revenue ?? 0,
+    revenue: s.players[viewer]?.revenue ?? 0,
     lines,
     where,
     whereFrom,
@@ -986,6 +1251,8 @@ export function snapshot(
      */
     hand: [...(s.decks.hands.get(viewer) ?? [])].reverse().map((id) => cardName(s, id)),
     handWhat: [...(s.decks.hands.get(viewer) ?? [])].reverse().map((id) => cardDescription(s, id)),
+    handDiscardable: [...(s.decks.hands.get(viewer) ?? [])].reverse().map((id) => keepReason(s, id) === null),
+    handKeepWhy: [...(s.decks.hands.get(viewer) ?? [])].reverse().map((id) => keepReason(s, id)),
     deck: s.decks.homeOffice.length,
     departments: s.decks.departments.map((pile) => {
       const top = pile[pile.length - 1];
@@ -1009,13 +1276,28 @@ export function snapshot(
       classificationTotal: s.yards.classificationYard.length,
     },
     timetable: [...s.timetable],
+    timetableWhat: s.timetable.map((n) => (n === null ? null : trainRules({ trainNumber: n, trainIsExtra: false }))),
     decision,
     wasted,
-    objective: objectiveOf(s),
+    option: turnOf(s, viewer).option,
+    houseRules: houseRules(s.config),
+    status: s.status,
+    outcome: s.outcome,
+    players: s.players.map((p) => ({
+      index: p.index,
+      seat: seatOf(s, p.index),
+      name: p.name,
+      revenue: p.revenue,
+      hand: (s.decks.hands.get(p.index) ?? []).length,
+    })),
+    viewer,
+    handCount: (s.decks.hands.get(viewer) ?? []).length,
+    objective: objectiveOf(s, viewer),
     runningRow: area.runningRow,
-    movesLeft: s.clock.phase === 'localOps' && s.turn.option === 'switch' ? s.turn.movesRemaining : null,
+    limits: { west: area.limitsWest.col, east: area.limitsEast.col },
-    moves: switchingMoves(s, 0),
+    movesLeft: s.clock.phase === 'localOps' && turnOf(s, viewer).option === 'switch' ? turnOf(s, viewer).movesRemaining : null,
-    blocked: impediments(s, 0),
+    moves: switchingMoves(s, viewer),
+    blocked: impediments(s, viewer),
     trains: [...s.trays.values()].map((t) => ({
       label: t.trainNumber === null ? 'local crew' : `Train ${t.trainIsExtra ? 'X' : ''}${t.trainNumber}`,
       where:
@@ -1023,7 +1305,7 @@ export function snapshot(
           ? `${t.position.side} Division Point`
           : t.position.at === 'mainline'
             ? `Mainline card ${t.position.index}`
-            : `Office Area (${t.position.coord.row},${t.position.coord.col})`,
+            : `Office Area (${t.position.coord.col},${t.position.coord.row})`,
     })),
   };
 }
@@ -1218,22 +1500,40 @@ export function trainRules(t: {
    * DOES rather than that it exists, because the restriction is the whole character of the card: a
    * Military train that cannot be worked by Porters plays nothing like a Local.
    */
-  if (p.rules.noSwitching) parts.push('NO SWITCHING — it runs the Division and does not shunt');
+  if (p.rules.noSwitching) {
+    parts.push('NO SWITCHING — may not add or drop cars, but may still be moved clear of the mainline');
+  }
   if (p.rules.terminalsOnly) parts.push('TERMINALS ONLY — Porters may work it at a Terminal and nowhere else');
   if (p.rules.coachStaysOnStationTrack) {
-    parts.push('THE COACH STAYS AT THE STATION — a cut carrying it may only be set out at the Office');
+    // Said "may only be set out at the Office", which reads as a place you can do it. You cannot:
+    // §A.4 refuses the Office square outright, so the coach can never be set out anywhere — which
+    // is why the make-up order decides whether this train can switch at all.
+    parts.push(
+      'THE COACH IS NEVER SET OUT — so keep it OFF the outer end of the train, or nothing can come ' +
+        'off at all. Add the coach before the freight car when making up.',
+    );
   }
   if (p.rules.oneFreightPerLocation) {
     parts.push('ONE FREIGHT CAR PER LOCATION — dropped or picked up, one each square per turn');
   }
   if (p.rules.noPassengerWork) parts.push('NO PASSENGER WORK — Porters may not board or detrain it');
   if (p.rules.dropOnly) parts.push('MAY DROP BUT NOT PICK UP — it cannot couple anything');
-  if (p.rules.pickUpEmptiesOnly) parts.push('EMPTIES ONLY — it may not couple a loaded car');
+  if (p.rules.pickUpEmptiesOnly) {
+    parts.push('EMPTIES ONLY — it may not couple a loaded car. A caboose is not a load.');
+  }
   if (p.rules.stopThenExpedite) {
     parts.push('STOPS ONCE FOR SPEECHES, then runs expedited from its next Office onward');
   }
 
-  if (p.rules.expedite) parts.push('EXPEDITED — it departs in the same Stage it arrives (§7)');
+  if (p.rules.expedite) {
+    // It is released and switched exactly like any other train — the restriction is on where it may
+    // be LEFT, not on when it leaves.
+    parts.push(
+      'EXPEDITED — must be kept ready to highball. It works and switches normally, but if it is not ' +
+        'back on the Office square when the next Mainline Phase begins, that is a Station Master ' +
+        'fault and costs 1 Revenue.',
+    );
+  }
   if (p.rules.stopEarnsPoint) parts.push('EARNS A POINT for one Stage spent standing still, once');
   return parts.join(' · ');
 }
@@ -1326,7 +1626,7 @@ function cellDescription(card: TrackCard, officeName: string, onRunning: boolean
       const where = onRunning
         ? ' · ON THE RUNNING TRACK — industries belong on a stub; a car left standing here is hit by the next arrival'
         : '';
-      return `${flow} ${p.carTypes.join('/')} · spot a matching car on its siding to work a load${progress}${where}`;
+      return `${flow} ${p.carTypes.join('/')} · spot a matching car on its track to work a load${progress}${where}`;
     }
     case 'track':
       switch (g.geometry) {
@@ -1410,10 +1710,10 @@ const SIMPLE_CARDS = [
   ...ACTION_CARDS,
 ];
 
-/** The goal, and whether the current score is keeping up with the clock. */
+/** The goal, and whether the VIEWER's score is keeping up with the clock. */
-function objectiveOf(s: GameState): Frame['objective'] {
+function objectiveOf(s: GameState, viewer: PlayerIndex): Frame['objective'] {
   const profile = lengthProfile(s.config.length);
-  const revenue = s.players[0]?.revenue ?? 0;
+  const revenue = s.players[viewer]?.revenue ?? 0;
   const daysLeft = Math.max(0, profile.days - s.clock.day + 1);
   const elapsed = profile.days - daysLeft + 1;
   // Straight-line pace: by the end of Day N you want N/days of the target.
@@ -1501,23 +1801,30 @@ function countStock(
  * Only while a switching turn is actually running and only while Moves remain: a highlight that
  * survives into the Cargo phase is an invitation to click something that is no longer offered.
  *
- * One crew. Solitaire has one, and with more the answer would depend on which is selected — a
+ * EVERY crew in the district, each with its own squares. It used to return the first one it found,
- * question the page does not yet ask.
+ * which is the same thing in solitaire's opening but not once a train is standing at the Office
+ * while a local shunts: the board then drew one crew's reachable squares and the action list offered
+ * both crews' moves, so half the highlights belonged to a train the player was not moving.
  */
 function switchingMoves(s: GameState, player: PlayerIndex): Frame['moves'] {
-  if (s.clock.phase !== 'localOps' || s.turn.option !== 'switch') return null;
+  const turn = turnOf(s, player);
-  if (s.turn.movesRemaining < 1) return null;
+  if (s.clock.phase !== 'localOps' || turn.option !== 'switch') return [];
+  if (turn.movesRemaining < 1) return [];
+  const out: Frame['moves'] = [];
   for (const [id, tray] of s.trays) {
-    if (tray.position.at !== 'grid' || tray.position.owner !== player) continue;
+    if (tray.position.at !== 'grid' || tray.position.seat !== seatOf(s, player)) continue;
+    // A no-switching train may still be moved clear of the mainline (§7) — only coupling, setting
+    // out and sorting are refused, and `check` rejects those the same way it rejects a pick-up X13
+    // (dropOnly) is not allowed to make, so this row is not filtered any differently for either.
     const { to, blocked } = movesFor(s, player, id);
-    return { from: tray.position.coord, to, blocked };
+    out.push({ trayId: id, label: trainName(s, id), from: tray.position.coord, to, blocked });
   }
-  return null;
+  return out;
 }
 
 function trainChip(s: GameState, id: string): TrainChip {
   const t = s.trays.get(id);
-  if (!t) return { label: id, consist: [], cars: [], engineAt: 0, facing: 'e' };
+  if (!t) return { label: id, consist: [], cars: [], engineAt: 0, facing: 'e', what: '' };
   /**
    * The engine is drawn IN the consist, at the position it occupies.
    *
@@ -1535,7 +1842,8 @@ function trainChip(s: GameState, id: string): TrainChip {
     consist: seated,
     cars,
     engineAt: at,
-    facing: t.facing ?? (t.direction === 'west' ? 'w' : 'e'),
+    facing: railFacingOf(t),
+    what: t.trainNumber === null ? 'A local crew — no timetable, no card, no special rules.' : trainRules(t),
   };
 }
 

src/web/game.ts

@@ -17,9 +17,10 @@
  * legal would eventually disagree with `check`, and the failure mode is a UI that offers an illegal
  * move or refuses a legal one.
  *
- * SAVING. The event log is the game (`state = fold(events)`), and the RNG is seeded, so a save is
+ * SAVING. The intents ARE the game — the RNG is seeded and `applyIntent` is deterministic — so a save
- * the seed plus the list of intents submitted. Replaying them reconstructs the position exactly,
+ * is the seed plus the list of intents submitted. Replaying them reconstructs the position exactly,
- * which is far smaller and far more robust than serialising the state graph.
+ * which is far smaller and far more robust than serialising the state graph. (Not the event log:
+ * folding events does not rebuild a game — `protocol.md` §3.)
  */
 
 import { pump } from '../engine/advance.ts';
@@ -29,6 +30,7 @@ import type { Intent } from '../engine/intents.ts';
 import { legalActions } from '../engine/legal.ts';
 import { createGame } from '../engine/setup.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 from the view module, NOT replay.ts — replay.ts writes files and reads process.argv,
 // which would pull node:fs into a browser bundle.
@@ -41,11 +43,18 @@ import {
   trainName,
   variantLabel,
 } from '../sim/view.ts';
-import { HAND_LIMIT, mainlineProfile, trainProfile } from '../engine/content.ts';
+import {
-import type { Hand, TrackGeometry } from '../engine/content.ts';
+  DEFAULT_HOUSE_RULES,
+  HAND_LIMIT,
+  LEGACY_HOUSE_RULES,
+  houseRules,
+  mainlineProfile,
+  trainProfile,
+} from '../engine/content.ts';
+import type { Hand, HouseRuleOverrides, TrackGeometry } from '../engine/content.ts';
 import type { Port } from '../engine/track.ts';
 import { connectionsFor, joins, neighbour, variantsFor } from '../engine/track.ts';
-import { areaOf, trainNeedingCars } from '../engine/apply.ts';
+import { areaOf, destinationsFor, selectDestination, trainNeedingCars } from '../engine/apply.ts';
 import type { Frame } from '../sim/view.ts';
 
 export const SOLO_CONFIG: GameConfig = {
@@ -58,15 +67,86 @@ export const SOLO_CONFIG: GameConfig = {
     employeeRotation: false,
     emergencyToolbox: false,
   },
+  // Spelt out rather than left to fall through, so a save written by the page always names the rules
+  // it was played under — see `Save.rules`.
+  houseRules: DEFAULT_HOUSE_RULES,
 };
 
+/** The same config with the New Game dialog's answers in it. */
+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. */
 export type ActionGroup = {
   kind: string;
   title: string;
-  actions: { index: number; label: string }[];
+  /**
+   * `tip` is the card's own description, resolved HERE rather than by the page.
+   *
+   * The button label is short; the hover text used to be looked up with `cardDescription(state, id)`
+   * from the browser, which needs the whole `GameState`. A remote client has no state, so the menu
+   * carries it. See `docs/architecture/multiplayer.md` §5.
+   */
+  /**
+   * `coord` is the square the action HAPPENS ON, when it happens on one.
+   *
+   * Carried as data rather than left inside the label. Half these buttons are near-identical
+   * sentences distinguished only by a coordinate — "(1,3)" against "(-1,3)" — and picking the wrong
+   * one is recoverable in solitaire, where Undo is a click, and a disaster in a multiplayer game
+   * where it is not. The page hovers the matching square on the board instead of asking the player
+   * to read the row and column off the button. Reported by Jesse.
+   *
+   * Resolved HERE for the same reason `tip` is: a remote client holds no `GameState` and cannot look
+   * up where a tray is standing. See `docs/architecture/multiplayer.md` §5.
+   */
+  actions: {
+    index: number;
+    label: string;
+    tip?: string;
+    coord?: { row: number; col: number };
+    /**
+     * Every square a `switch.move` runs OVER on its way to `coord`, when there is more than one
+     * legal route there (docs/plans/switching-paths.md) — so hovering a route lights the whole
+     * road, not just its destination, which is the only way to tell two buttons reading "move to
+     * (0,0)" apart before clicking one.
+     */
+    route?: { row: number; col: number }[];
+  }[];
 };
 
+/**
+ * The square an intent acts on, or null when it acts on none.
+ *
+ * Only squares the intent NAMES. A card played out on the Mainline (`node`) is not a district
+ * coordinate and must not be treated as one — that confusion is exactly why `placement` and `node`
+ * are separate fields on the intent (see `intents.ts`) — and an action like ending a turn has no
+ * square at all.
+ */
+export function coordOf(i: Intent): { row: number; col: number } | null {
+  if ('at' in i) return i.at;
+  if ('to' in i) return i.to;
+  if (i.type === 'card.play' && i.placement) return i.placement;
+  return null;
+}
+
+/**
+ * Every intermediate square a `switch.move` runs over, resolved the same way `execute` resolves
+ * `via` — so the squares that light up on hover are exactly the squares the move will actually
+ * couple cars from. `undefined` for the overwhelming majority of moves, which run in a straight
+ * line and need nothing beyond the destination `coordOf` already carries.
+ */
+function routeFor(state: GameState, i: Intent): { row: number; col: number }[] | undefined {
+  if (i.type !== 'switch.move') return undefined;
+  const tray = state.trays.get(i.trayId);
+  if (!tray || tray.position.at !== 'grid') return undefined;
+  const actor = playerAtSeat(state, tray.position.seat);
+  const dests = destinationsFor(state, actor, i.trayId, tray.position.coord, i.reverse);
+  const dest = selectDestination(dests, i.to, i.via);
+  if (!dest || dest.path.length === 0) return undefined;
+  return dest.path.map((step) => step.coord);
+}
+
 export type Game = {
   state: GameState;
   seed: number;
@@ -108,6 +188,12 @@ export type Game = {
    * clear it when the card is played — no element carries the class once the card leaves the hand.
    */
   justDrawn: CardId | null;
+  /**
+   * A one-line announcement to flash, once. Drained like `scheduled` rather than read like `Frame`,
+   * because it marks a MOMENT — the only event in the game that scores for everybody without anyone
+   * having taken a turn to cause it.
+   */
+  announced: string | null;
 };
 
 /** How each intent kind is introduced in the action list, in the order they should appear. */
@@ -142,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: [], mustPlayCard: false, cues: [], scheduled: null, justDrawn: null };
+  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' });
@@ -175,23 +261,106 @@ export function actionGroups(game: Game): { options: Intent[]; groups: ActionGro
   if (actor === null) return { options: [], groups: [] };
 
   const options = legalActions(game.state, actor);
-  const byKind = new Map<string, { index: number; label: string }[]>();
+  /**
+   * Entries carry the crew they belong to, rather than it being encoded into the map key.
+   *
+   * An earlier version keyed this map by `type + separator + trayId`, which worked and was a
+   * standing invitation: the key is also what `GROUP_ORDER` prefix-matches on, so the separator had
+   * to survive every edit to a line nobody would think to check. One stray byte and every crew's
+   * moves silently collapsed back into a single group. The tray is data; it travels as data.
+   */
+  type Entry = {
+    index: number;
+    label: string;
+    tip?: string;
+    trayId?: string;
+    coord?: { row: number; col: number };
+    route?: { row: number; col: number }[];
+  };
+  const byKind = new Map<string, Entry[]>();
   options.forEach((intent, index) => {
     const label = describeIntent(game.state, intent);
+    const trayId = 'trayId' in intent ? intent.trayId : undefined;
     const list = byKind.get(intent.type) ?? [];
-    // Orientation variants and duplicate copies describe identically; showing one is enough, and a
+    const cardId = 'cardId' in intent ? (intent as { cardId: string }).cardId : null;
-    // list of forty identical rows hides the real choice rather than presenting it.
+    const tip = cardId ? cardDescription(game.state, cardId) : undefined;
-    if (!list.some((a) => a.label === label)) list.push({ index, label });
+    /**
+     * Identical labels are collapsed, which is right for forty copies of the same track rotation and
+     * wrong for two different trains: "move to (0, 2)" describes Train 8's move and the local crew's
+     * move identically, so one of them was silently dropped and could not be chosen at all. Matching
+     * on the crew as well makes the de-duplication per crew, which is what it always meant.
+     */
+    if (!list.some((a) => a.label === label && a.trayId === trayId)) {
+      const coord = coordOf(intent);
+      const route = routeFor(game.state, intent);
+      list.push({
+        index,
+        label,
+        ...(tip ? { tip } : {}),
+        ...(trayId ? { trayId } : {}),
+        ...(coord ? { coord } : {}),
+        ...(route ? { route } : {}),
+      });
+    }
     byKind.set(intent.type, list);
   });
 
+  /** Groups take the plain shape; the crew was only ever needed to split them. */
+  const plain = (entries: Entry[]): ActionGroup['actions'] =>
+    entries.map(({ index, label, tip, coord }) => ({
+      index,
+      label,
+      ...(tip ? { tip } : {}),
+      ...(coord ? { coord } : {}),
+    }));
+
   const groups: ActionGroup[] = [];
   const used = new Set<string>();
   for (const { prefix, title } of GROUP_ORDER) {
     const kinds = [...byKind.keys()].filter((k) => k.startsWith(prefix) && !used.has(k));
+
+    /**
+     * ONE GROUP PER CREW, NAMED — because more than one train can be switching in a district.
+     *
+     * Reported from play: with two crews on the board, every move from both of them arrived in a
+     * single "Switching" list of bare coordinates, and there was no way to tell which train a button
+     * belonged to. Naming the train in the heading rather than on every button keeps the buttons
+     * short, and the crew's own square is in the heading so the list can be matched to the board.
+     *
+     * `switch.end` carries no tray and is the whole turn rather than one crew's, so it keeps its own
+     * heading at the bottom.
+     */
+    if (prefix === 'switch.') {
+      const perCrew = new Map<string, Entry[]>();
+      const loose: Entry[] = [];
+      for (const k of kinds) {
+        used.add(k);
+        for (const entry of byKind.get(k) ?? []) {
+          if (entry.trayId === undefined) loose.push(entry);
+          else perCrew.set(entry.trayId, [...(perCrew.get(entry.trayId) ?? []), entry]);
+        }
+      }
+      for (const [trayId, entries] of perCrew) {
+        const tray = game.state.trays.get(trayId);
+        const where =
+          tray?.position.at === 'grid'
+            ? `, standing at (${tray.position.coord.col}, ${tray.position.coord.row})`
+            : '';
+        groups.push({
+          kind: prefix,
+          title: `Switching ${trainName(game.state, trayId)}${where}`,
+          actions: plain(entries),
+        });
+      }
+      // `switch.end` belongs to the TURN rather than to any one crew, so it gets its own heading —
+      // "Switching" over a lone "End Local Operations" reads as a crew with nothing it can do.
+      if (loose.length > 0) groups.push({ kind: prefix, title: 'Finish', actions: plain(loose) });
+      continue;
+    }
+
     const actions = kinds.flatMap((k) => {
       used.add(k);
-      return byKind.get(k) ?? [];
+      return plain(byKind.get(k) ?? []);
     });
     if (actions.length > 0) {
       // The New Train group names the TRAIN and what its card calls for. Without it, Extra X22
@@ -201,8 +370,44 @@ export function actionGroups(game: Game): { options: Intent[]; groups: ActionGro
       // The tray the phase is waiting on, so the heading names the train the yard chips will load
       // rather than whichever tray happened to come first out of the map.
       const filling = prefix === 'newTrain.' ? trainNeedingCars(game.state) : null;
-      const headed = filling !== null ? (consistTitle(game, filling) ?? title) : title;
+      let headed = filling !== null ? (consistTitle(game, filling) ?? title) : title;
-      groups.push({ kind: prefix, title: headed, actions });
+
+      /**
+       * THE RULING NAMES ITS TRAINS IN THE HEADING TOO.
+       *
+       * "rule on this train" was the only thing said in plain sight about the §8.1 clearance, and
+       * "this train" is exactly the part the Superintendent has to know. The pending decision holds
+       * both trays, so the heading can ask the actual question.
+       */
+      if (prefix === 'mainline.clearance') {
+        const pending = game.state.clock.pendingDecision;
+        if (pending) {
+          headed =
+            `Superintendent — may ${trainName(game.state, pending.train)} follow ` +
+            `${trainName(game.state, pending.occupiedBy)} onto the same Mainline card?`;
+        }
+      }
+
+      /**
+       * A PENDING EXTRA IS ITS OWN QUESTION, and its own heading.
+       *
+       * "Where does this Extra start?" arrived in the same `newTrain.` group as "which car goes on
+       * this train", under whichever heading the group happened to have — and with no tray being
+       * filled there is no train to name, so it read "Making up the train" over a choice about a
+       * different train entirely. Split out, and headed with the Extra's own card: it is about to
+       * run, and what it may carry is the thing the player needs before choosing where to put it.
+       */
+      const extras = actions.filter((a) => options[a.index]?.type === 'newTrain.startExtra');
+      const rest = actions.filter((a) => options[a.index]?.type !== 'newTrain.startExtra');
+      if (extras.length > 0) {
+        const number = (options[extras[0]!.index] as { trainNumber: number }).trainNumber;
+        groups.push({
+          kind: prefix,
+          title: `${trainCardTitle(number, true) ?? title} — choose where it starts`,
+          actions: extras,
+        });
+      }
+      if (rest.length > 0) groups.push({ kind: prefix, title: headed, actions: rest });
     }
   }
   // Anything the table above does not name still has to be offered — silently dropping a legal
@@ -310,7 +515,17 @@ export type Menu = {
    * is already on screen showing exactly those cars by type and load state. The yard is the surface;
    * these key each chip to the option that adds it.
    */
-  makeUp: { trayId: string; title: string; cars: MakeUpAction[]; pass: number | null } | null;
+  makeUp: {
+    trayId: string;
+    title: string;
+    cars: MakeUpAction[];
+    pass: number | null;
+    /**
+     * The order to add the cars in, when the order decides whether the train can work at all.
+     * Absent for every train where it does not matter, which is nearly all of them.
+     */
+    advice: { text: string; tone: 'hint' | 'warn' } | null;
+  } | null;
 };
 
 /** The action list as the page shows it: direct actions, plus subject-then-location for the rest. */
@@ -436,6 +651,7 @@ export function actionMenu(game: Game, seat: PlayerIndex = 0): Menu {
           title: consistTitle(game, filling) ?? 'Making up the train',
           cars: makeUpCars,
           pass,
+          advice: makeUpAdvice(game, filling, makeUpCars),
         }
       : null;
 
@@ -454,7 +670,8 @@ function subjectOf(
   node?: number;
   links: string[];
 } | null {
-  const at = (c: { row: number; col: number }): string => `(${c.row}, ${c.col})`;
+  // X,Y — east/west then north/south, not the internal row/col storage order.
+  const at = (c: { row: number; col: number }): string => `(${c.col}, ${c.row})`;
   /**
    * ABS Signals is placed on a MAINLINE card, which is not in the Office Area at all — so it names
    * a Division NODE and carries no coordinate. It used to travel as `{ row: -1, col: node }`, and
@@ -581,7 +798,18 @@ function joinsNote(
 function consistTitle(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);
+  return trainCardTitle(tray.trainNumber ?? 0, tray.trainIsExtra);
+}
+
+/**
+ * "Making up Extra X22 “Pee-Dee”: its card calls for 1 caboose — Per-diem train…"
+ *
+ * Taken by NUMBER rather than by tray, because a pending Extra has no Crew Tray yet — it is waiting
+ * for the player to say where it starts, and that heading has to name the train just as much as the
+ * one over a train being loaded does.
+ */
+function trainCardTitle(number: number, isExtra: boolean): string | null {
+  const p = trainProfile(number, isExtra);
   if (!p) return null;
 
   const parts: string[] = [];
@@ -597,6 +825,91 @@ function consistTitle(game: Game, trayId: string): string | null {
   return `Making up ${name}: its card calls for ${calls}${note}`;
 }
 
+/**
+ * THE ORDER YOU ADD THE CARS IN CAN DECIDE WHETHER THE TRAIN CAN EVER SWITCH.
+ *
+ * Only trains 7/8 Local, and only because of the rule printed on them: "coach must remain on
+ * station track if switching", which the engine reads as "the coach is never set out". A cut always
+ * comes off an OUTER end, so if the coach is on one outer end and the engine is on the other, every
+ * cut on offer contains the coach and the train is locked — it cannot set out its freight car, and
+ * it cannot even uncouple to run around, because that means leaving the coach standing too. Measured
+ * over 60 games: 1,181 positions where a set-out should have been possible, every one refused.
+ *
+ * Cars are appended as they are clicked and the engine stays on the nose, so the make-up reads
+ * ENGINE, first car, second car — and the LAST car added is the one on the outer end. Hence the
+ * whole of the advice: do not let the coach be last.
+ *
+ *   ENGINE coach boxcar   the boxcar is on the outer end and can be set out
+ *   ENGINE boxcar coach   locked — nothing can ever come off
+ *
+ * Said here rather than left to the player to discover, because the dead end is invisible until the
+ * train is out on the district with no button to press and no explanation for it.
+ */
+function makeUpAdvice(
+  game: Game,
+  trayId: string,
+  cars: readonly MakeUpAction[],
+): { text: string; tone: 'hint' | 'warn' } | null {
+  const tray = game.state.trays.get(trayId);
+  if (!tray) return null;
+  if (!trainProfile(tray.trainNumber ?? 0, tray.trainIsExtra)?.rules.coachStaysOnStationTrack) return null;
+
+  const hasCoach = tray.consist.some((c) => c.type === 'coach');
+  const lastIsCoach = tray.consist[tray.consist.length - 1]?.type === 'coach';
+  // Nothing to say about a coach that is not coming: the Division Yard may hold none, and a Local
+  // made up of freight alone switches perfectly well.
+  const coachToCome = cars.some((c) => c.carType === 'coach');
+  if (!hasCoach && !coachToCome) return null;
+
+  /**
+   * The coach is on the outer end — which is where it lands the moment it goes on, including for a
+   * player who has just correctly put it on first. So the tone turns on whether it can still be
+   * fixed: while a freight car is there to add, this is the NEXT STEP and not a mistake, and
+   * colouring it as a mistake punishes the player for taking the advice.
+   */
+  if (lastIsCoach) {
+    const freightToCome = cars.some((c) => c.carType !== 'coach');
+    return freightToCome
+      ? {
+          tone: 'hint',
+          text:
+            'Now add the freight car — it takes the outer end, leaving the coach safely inside. Sent out ' +
+            'as it stands, with the coach on the outer end, this train would not be able to set anything ' +
+            'out at all.',
+        }
+      : {
+          tone: 'warn',
+          text:
+            'The coach is on the outer end and there is nothing left to add that would take that end off ' +
+            'it. This train may never set its coach out, so it will not be able to set anything out at ' +
+            'all — not even to uncouple for a run-around.',
+        };
+  }
+
+  if (!hasCoach) {
+    // Nothing on yet, so the good order is still free.
+    if (tray.consist.length === 0) {
+      return {
+        tone: 'hint',
+        text:
+          'Add the coach FIRST. This train may never set its coach out, and the last car added is the one ' +
+          'on the outer end — so a coach added last blocks the freight car in behind it and the train can ' +
+          'never switch. ENGINE, coach, freight is the order that works.',
+      };
+    }
+    // Freight is already on, so a coach added now can only land on the outer end. Saying "add the
+    // coach first" here would be advice it is too late to take.
+    return {
+      tone: 'warn',
+      text:
+        'The freight car is already on, so a coach added now would land on the outer end — and this train ' +
+        'may never set its coach out, which would leave it unable to switch at all. Send it out without ' +
+        'the coach if you want it to work the district.',
+    };
+  }
+  return null;
+}
+
 /**
  * §6.2 — "the player must reduce his hand to no more than three cards", four while a Red Flag is
  * held. The same test the engine applies to `draw.end`, asked here so the page can DISABLE the
@@ -675,6 +988,15 @@ function record(game: Game, events: GameEvent[], actor: PlayerIndex | null = nul
   for (const e of events) if (e.type === 'trainScheduled') game.scheduled = e.slot;
   // Which card just came into hand, so the row can badge it. Last one wins for the same reason.
   for (const e of events) if (e.type === 'cardDrawn') game.justDrawn = e.cardId;
+  // A train that ran the whole Division pays EVERY player, and nobody did anything on this turn to
+  // make it happen — so it is announced rather than left to be found in the log.
+  for (const e of events) {
+    if (e.type === 'trainCompleted') {
+      game.announced =
+        `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.`;
+    }
+  }
   // 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);
 }
@@ -683,10 +1005,31 @@ function record(game: Game, events: GameEvent[], actor: PlayerIndex | null = nul
 // Saving — seed plus intents, replayed
 // ---------------------------------------------------------------------------
 
-export type Save = { seed: number; history: Intent[] };
+/**
+ * A save is a seed, the house rules it was dealt under, and the intents submitted.
+ *
+ * `rules` is optional because saves written before the New Game dialog existed do not have it, and
+ * those replay under `LEGACY_HOUSE_RULES` — see `configFor`. Everything written from now on carries
+ * its rules, so a save can never again be silently re-dealt by a change of default.
+ */
+export type Save = { seed: number; history: Intent[]; rules?: HouseRuleOverrides };
 
 export function toSave(game: Game): Save {
-  return { seed: game.seed, history: game.history };
+  const rules = game.state.config.houseRules;
+  return rules ? { seed: game.seed, history: game.history, rules } : { seed: game.seed, history: game.history };
+}
+
+/**
+ * THE CONFIG A SAVE MUST BE REPLAYED UNDER, which is not necessarily today's default.
+ *
+ * A save is a seed and a list of intents: replay it under different rules and it is a different
+ * game, and the symptom is not an error but a replay that quietly stops early. `TODO.md` records
+ * that happening twice unnoticed, once 42 intents into 360. So a save that names its rules gets
+ * exactly those, and a save that names none is from before the dialog and gets the rules that were
+ * in force then — never the current defaults.
+ */
+function configFor(save: Save, config: GameConfig): GameConfig {
+  return { ...config, houseRules: save.rules ?? LEGACY_HOUSE_RULES };
 }
 
 /**
@@ -711,7 +1054,9 @@ export function toSave(game: Game): Save {
  */
 export function undo(game: Game, config: GameConfig = SOLO_CONFIG): Game | null {
   if (game.history.length === 0) return null;
-  return fromSave({ seed: game.seed, history: game.history.slice(0, -1) }, config);
+  // `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.
+  return fromSave({ ...toSave(game), history: game.history.slice(0, -1) }, config);
 }
 
 /**
@@ -722,7 +1067,7 @@ export function undo(game: Game, config: GameConfig = SOLO_CONFIG): Game | null
  * stops the replay rather than being forced — better a short game than a corrupt one.
  */
 export function fromSave(save: Save, config: GameConfig = SOLO_CONFIG): Game {
-  const game = newGame(save.seed, config);
+  const game = newGame(save.seed, configFor(save, config));
   for (const intent of save.history) {
     const actor = currentActor(game);
     if (actor === null) break;

src/web/index.html

@@ -11,18 +11,28 @@ body{margin:0;background:var(--bg);color:var(--fg);
   font:15px/1.6 ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;
   min-height:100vh;display:flex;flex-direction:column;align-items:center;justify-content:center;padding:28px}
 main{width:100%;max-width:760px}
+.hero{display:flex;gap:24px;align-items:flex-start}
+.hero-image{width:230px;flex:none;border-radius:9px;overflow:hidden;border:1px solid var(--line);cursor:zoom-in}
+.hero-image img{display:block;width:100%;height:auto}
+.hero-content{flex:1;min-width:0}
+@media(max-width:640px){.hero{flex-direction:column}.hero-image{width:100%;max-width:280px}}
 h1{font-size:32px;margin:0 0 2px;letter-spacing:.02em}
 .tag{color:var(--dim);margin:0;font-size:14px}
-.blurb{color:#c6ccd6;margin:16px 0 26px;max-width:66ch}
+.blurb{color:#c6ccd6;margin:16px 0 0;max-width:66ch}
 .rule{height:1px;background:var(--line);margin:22px 0}
-.doors{display:grid;grid-template-columns:1fr 1fr;gap:14px}
+.doors{display:grid;grid-template-columns:1fr 1fr 1fr;gap:14px;margin-top:26px}
 @media(max-width:640px){.doors{grid-template-columns:1fr}}
-a.door{display:block;text-decoration:none;color:inherit;background:var(--panel);
+.door{display:block;text-decoration:none;color:inherit;background:var(--panel);
   border:1px solid var(--line);border-radius:9px;padding:18px 18px 16px;transition:.12s}
 a.door:hover{border-color:#4d6fa8;background:#1f2733;transform:translateY(-1px)}
-a.door h2{font-size:17px;margin:0 0 5px;color:#9fb6d8}
+.door h2{font-size:17px;margin:0 0 5px;color:#9fb6d8}
-a.door p{margin:0;color:var(--dim);font-size:13px;line-height:1.5}
+.door p{margin:0;color:var(--dim);font-size:13px;line-height:1.5}
-a.door .go{display:inline-block;margin-top:11px;font-size:12px;color:#5aa9e6}
+.door .go{display:inline-block;margin-top:11px;font-size:12px;color:#5aa9e6}
+.door.disabled .go{color:var(--dim)}
+.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}
+.lightbox img{display:block;max-width:90vw;max-height:90vh;border-radius:6px;box-shadow:0 12px 40px rgba(0,0,0,.5)}
 /* the rule between title and blurb is drawn as rail, not decorated */
 svg.trackline{width:100%;height:24px;display:block;margin:10px 0 0}
 .rail{stroke:#4a5361;stroke-width:1.6}
@@ -32,6 +42,13 @@ footer{margin-top:26px;color:var(--dim);font-size:11px;display:flex;gap:18px;fle
 </head>
 <body>
 <main>
+  <div class="hero">
+    <div class="hero-image" id="hero-image" tabindex="0" role="button" aria-label="View full-size box art">
+      <img src="./images/station-master-splash.jpg"
+           alt="Station Master — TimeTable &amp; Train Order Railroading, 1840&ndash;1950. Box art: two trains meet at a junction beside a train order office."
+           width="560" height="700">
+    </div>
+    <div class="hero-content">
       <h1>Station Master</h1>
       <p class="tag">TimeTable and Train Order (TT&amp;TO) railroading, 1840&ndash;1950.</p>
 
@@ -48,8 +65,18 @@ footer{margin-top:26px;color:var(--dim);font-size:11px;display:flex;gap:18px;fle
         and get every train away again &mdash; a train with nowhere to stand is a collision, and a
         collision costs more than the freight was worth.
       </p>
+    </div>
+  </div>
 
   <div class="doors">
+    <div class="door disabled">
+      <h2>Play multiplayer</h2>
+      <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">
       <h2>Play solitaire</h2>
       <p>Play by yourself and run the entire division for five full days. Your goal is 20 Revenue.
@@ -71,10 +98,15 @@ 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>runs entirely in your browser &mdash; no server code required</span>
+    <span>solitaire runs entirely in your browser &mdash; no server code required</span>
   </footer>
 </main>
 
+<div class="lightbox" id="lightbox" hidden>
+  <img src="./images/station-master-splash.jpg"
+       alt="Station Master — TimeTable &amp; Train Order Railroading, 1840&ndash;1950. Box art: two trains meet at a junction beside a train order office.">
+</div>
+
 <script type="module" src="./web/splash.js"></script>
 </body>
 </html>

src/web/main.ts

@@ -1,5 +1,5 @@
 /**
- * Browser entry point — wires the DOM to `game.ts`.
+ * Browser entry point — wires the DOM to a `Session`.
  *
  * Presentation only. Every question of what is legal, what it means, or what the board looks like
  * is answered by the engine or by the shared view helpers.
@@ -7,26 +7,26 @@
 
 import { BOARD_CSS, divisionSvg, officeSvg } from '../sim/board-svg.ts';
 import { TURNCHART_CSS, turnChartHtml } from '../sim/turnchart.ts';
-import { PANEL_CSS, blockedHtml, facilitiesHtml, pilesHtml, timetableHtml, yardHtml } from './panels.ts';
+import type { Frame } from '../sim/view.ts';
+import type { Menu, Save } from './game.ts';
+import { PANEL_CSS, blockedHtml, dayEndHtml, facilitiesHtml, pilesHtml, timetableHtml, yardHtml } from './panels.ts';
 import { TOOLTIP_CSS, installTooltips } from './tooltip.ts';
 import { playCue } from './sound.ts';
-import type { Game } from './game.ts';
+import { EXTRA_START_LABELS, MOVES_PER_LOCAL_OPS, STARTING_HAND_LABELS, houseRules } from '../engine/content.ts';
-import { MOVES_PER_LOCAL_OPS } from '../engine/content.ts';
+import type { ExtraStartRule, HouseRuleOverrides, HouseRules, RevenueRules, StartingHand } from '../engine/content.ts';
-import { cardDescription } from '../sim/view.ts';
+import type { LocalSession } from './session.ts';
-import {
+import { createLocalSession } from './session.ts';
-  actionMenu,
-  currentActor,
-  fromSave,
-  newGame,
-  submit,
-  toSave,
-  undo,
-  view,
-} from './game.ts';
 
 const SAVE_KEY = 'station-master.save.v1';
 
-let game: Game;
+/**
+ * The game, behind the Session boundary.
+ *
+ * Typed as `LocalSession` because this page is the solitaire client and uses undo, local saves and
+ * new-game — all of which are local-only. The parts that draw and submit go through the plain
+ * `Session` surface, which is what a remote client will provide unchanged.
+ */
+let session: LocalSession;
 /** Which card or track piece is picked, waiting for a location. */
 let selected: string | null = null;
 /**
@@ -69,8 +69,34 @@ let soundOn = false;
  * ended or what happened in between. Reported exactly that way.
  */
 let lastPhase: string | null = null;
+/**
+ * The Day the page last drew, so a Day rolling over can be shown as a dialog (Gitea#10).
+ *
+ * Null until the first frame: arriving in a game already on Day 3 is not Day 2 ending, and a page
+ * reloaded mid-game would otherwise announce a rollover that happened before it was watching.
+ */
+let lastDay: number | null = null;
+/**
+ * WHICH CREW THE BOARD IS DRAWING, when the district holds more than one.
+ *
+ * Reported from play: "make it clear which train you are switching — it is possible to have more
+ * than one train available." A train standing on an A/D track while a local shunts is ordinary, and
+ * the board used to highlight whichever crew came first out of the map while the action list offered
+ * every crew's moves under one heading.
+ *
+ * Display state, deliberately not in the game: which train a player is looking at is not a fact
+ * about the railroad, and in a multiplayer game two players may reasonably be looking at different
+ * ones. Cleared whenever the named crew stops being one of the choices.
+ */
+let selectedCrew: string | null = null;
 const FOCUS_PHASES = new Set(['localOps', 'loadUnload']);
 
+/** The crew whose squares the board is drawing: the chosen one, or the only one there is. */
+function pickedCrew(f: Frame): Frame['moves'][number] | null {
+  if (f.moves.length === 0) return null;
+  return f.moves.find((m) => m.trayId === selectedCrew) ?? f.moves[0] ?? null;
+}
+
 const $ = (id: string): HTMLElement => {
   const el = document.getElementById(id);
   if (!el) throw new Error(`missing element: ${id}`);
@@ -91,8 +117,8 @@ const esc = (s: string): string =>
  */
 function piecePreview(links: string[], label: string): string {
   const cell = {
-    row: 0, col: 0, kind: 'trk', label, running: false, enhancements: [],
+    row: 0, col: 0, kind: 'trk', label, running: false, enhancements: [], enhancementsWhat: [],
-    tray: null, cars: [], facility: null, links, what: '',
+    trains: [], adTracks: null, cars: [], standingWest: 0, facility: null, links, what: '',
   };
   return officeSvg([cell] as never, 99).replace(
     /<text class="bs-(coord|rowlab)"[^>]*>[^<]*<\/text>/g,
@@ -108,32 +134,143 @@ function piecePreview(links: string[], label: string): string {
  * Built by `turnChartHtml`, shared with both replay viewers, so all three screens report where you
  * are in the Day the same way and with the same violet highlight. It used to live here alone.
  */
-function renderTurnChart(f: ReturnType<typeof view>): void {
+function renderTurnChart(f: Frame): void {
-  const actorName = f.actor === null ? null : (game.state.players[f.actor]?.name ?? null);
+  const actorName = f.actor === null ? null : (f.players[f.actor]?.name ?? null);
   $('turnchart').innerHTML = turnChartHtml(f, actorName);
 }
 
+/**
+ * The settings this game was dealt under, beside the seed, because the seed alone does not name it.
+ *
+ * Abbreviated to fit a header that must not wrap — `3 cards · 1/1/0` — with the whole of it in the
+ * tooltip. Written down at all because a playtest note is worthless without it: "scored 4" means one
+ * thing at 1 Revenue per transit and another at 5.
+ */
+function renderHouseRules(rules: HouseRules): void {
+  const { passengerPerCoach: pax, freightPerLoad: frt, trainPerTransit: trn } = rules.revenue;
+  const short = { threeRandom: '3 cards', sixRandom: '6 cards', threeTrackThreeOther: '3+3 cards' };
+  const el = $('houserules');
+  el.textContent = `· ${short[rules.startingHand]} · ${pax}/${frt}/${trn}`;
+  const handWords = STARTING_HAND_LABELS.find((o) => o.value === rules.startingHand)?.label ?? '';
+  el.title =
+    `Opening hand: ${handWords.toLowerCase()}.\n` +
+    `Passenger revenue per coach: ${pax} (paid on boarding and again on detraining).\n` +
+    `Freight revenue per load: ${frt} (paid on loading and again on unloading).\n` +
+    `Train revenue per transit: ${trn} (paid to every player when a train leaves the Division).`;
+}
+
+/**
+ * THE HOUSE RULES TRAVEL IN THE URL, BESIDE THE SEED.
+ *
+ * A seed on its own no longer names a game: `?seed=430` dealt three random cards is a different
+ * railroad from `?seed=430` dealt three track and three other, and at 0 Revenue per transit it is a
+ * different economy again. The link has to carry all of it or "same link, same deal" stops being
+ * true — and the New Game dialog navigates by URL, so this is also how its answers reach `start()`.
+ *
+ * Absent parameters mean the DEFAULTS, not the legacy rules: a bare `?seed=430` is a new game at
+ * today's settings. It is a save with no rules in it that is old (`game.ts`, `configFor`).
+ */
+const RULE_PARAMS = { passenger: 'passengerPerCoach', freight: 'freightPerLoad', transit: 'trainPerTransit' } as const;
+
+function rulesFromUrl(params: URLSearchParams): HouseRuleOverrides {
+  const rules: HouseRuleOverrides = {};
+  const hand = params.get('hand');
+  if (STARTING_HAND_LABELS.some((o) => o.value === hand)) rules.startingHand = hand as StartingHand;
+  const extra = params.get('extra');
+  if (EXTRA_START_LABELS.some((o) => o.value === extra)) rules.extraStart = extra as ExtraStartRule;
+
+  const revenue: Partial<RevenueRules> = {};
+  for (const [param, key] of Object.entries(RULE_PARAMS)) {
+    const raw = params.get(param);
+    // `houseRules()` clamps and rounds, so anything hand-edited into the URL lands in range rather
+    // than dealing a game at 900 Revenue a coach.
+    if (raw !== null && raw.trim() !== '' && Number.isFinite(Number(raw))) revenue[key] = Number(raw);
+  }
+  if (Object.keys(revenue).length > 0) rules.revenue = revenue;
+  return rules;
+}
+
+function rulesToUrl(rules: HouseRules, seed: string): string {
+  const params = new URLSearchParams();
+  if (seed !== '') params.set('seed', seed);
+  params.set('hand', rules.startingHand);
+  // The dialog answers reach `start()` through the URL and nowhere else, so a setting missing from
+  // here is a setting the dialog silently discards.
+  params.set('extra', rules.extraStart);
+  for (const [param, key] of Object.entries(RULE_PARAMS)) params.set(param, String(rules.revenue[key]));
+  return `?${params}`;
+}
+
 function start(): void {
   const params = new URLSearchParams(location.search);
   const requested = params.get('seed');
 
-  const saved = load();
-  if (saved && requested === null) {
-    game = fromSave(saved);
-    // Restoring replays the whole history, which re-records every draw along the way. Nothing on
-    // this screen is news to the player who left it there, so the "new card" badge starts clear.
-    game.justDrawn = null;
-  } else {
   // A seed in the URL makes a game shareable and reproducible: same link, same deal.
   const seed = requested !== null ? Number(requested) || 1 : Math.floor(Math.random() * 1e9);
-    game = newGame(seed);
+  session = createLocalSession(seed, rulesFromUrl(params));
-  }
+
+  // A saved game carries its OWN rules and re-deals itself under them, whatever the URL says — see
+  // `configFor`. That is why the restore happens after the session is built rather than feeding it.
+  const saved = load();
+  if (saved && requested === null) session.restore(saved);
+
+  applyCapabilities();
+  // Every render goes through the session, so the page redraws whenever the game says it changed —
+  // which is what a remote session will use to push. Locally it fires on each accepted intent.
+  session.subscribe(render);
   render();
 }
 
+/**
+ * Hide the controls this session does not offer.
+ *
+ * Undo, a local save and dealing a new game are all things only a local session can do — a server
+ * cannot un-see what the other players have already seen, the server is the store, and dealing is
+ * the lobby's job. Hidden rather than disabled: a greyed-out Undo in a multiplayer game invites the
+ * question "why not?" every turn, and the honest answer is that the control does not belong there.
+ */
+function applyCapabilities(): void {
+  const c = session.capabilities;
+  const hide = (id: string, on: boolean): void => {
+    const el = document.getElementById(id);
+    if (el) el.hidden = !on;
+  };
+  hide('undo', c.undo);
+  hide('savefile', c.saveLocal);
+  hide('newgame', c.newGame);
+}
+
+/**
+ * THE DAY ROLLING OVER, as a dialog that has to be dismissed (Gitea#10).
+ *
+ * "As the game rolls off the end of the day, you get a dialog saying such. Hard to keep track of
+ * time." Nothing on screen was wrong — the clock, the turn chart and the timetable all said which
+ * Day it was — but a Day turns over inside the phases that run themselves, so it happens while the
+ * player is looking at the board waiting for their next turn. The one transient signal the page
+ * already had, the phase banner, is gone in 2.6 seconds.
+ *
+ * Not shown when:
+ *   - this is the first frame (`lastDay === null`) — arriving on Day 3 is not Day 2 ending;
+ *   - the Day went DOWN, which is Undo stepping back across the rollover, not a Day passing;
+ *   - the game finished on that rollover, when the outcome panel is the thing to read instead.
+ */
+function noteDayEnd(f: Frame): void {
+  const previous = lastDay;
+  lastDay = f.day;
+  if (previous === null || f.day <= previous) return;
+  if (f.status !== 'active') return;
+  const dlg = document.getElementById('dayenddlg') as HTMLDialogElement | null;
+  const body = document.getElementById('dayendbody');
+  if (!dlg || !body) return;
+  body.innerHTML = dayEndHtml(f);
+  // A second rollover cannot happen while this one is open, but a redraw can — `showModal` throws
+  // on an already-open dialog rather than doing nothing.
+  if (!dlg.open) dlg.showModal();
+}
+
 function render(): void {
-  const f = view(game);
+  const f = session.view();
-  const menu = actionMenu(game);
+  const menu = session.menu();
 
   // Which squares the selected card or track piece may go on. Highlighting them is what turns the
   // coordinate list into a board: you pick the thing, then click where it goes.
@@ -166,7 +303,8 @@ function render(): void {
   const obj = $('objective');
   obj.textContent = `${f.revenue} of ${f.objective.target} · ${f.objective.daysLeft} Day${f.objective.daysLeft === 1 ? '' : 's'} left`;
   obj.className = 'pace';
-  $('seed').textContent = String(game.seed);
+  $('seed').textContent = String(session.seed());
+  renderHouseRules(f.houseRules);
 
   // -- division
   $('division').innerHTML = divisionSvg(f.division);
@@ -203,7 +341,14 @@ function render(): void {
           : 'ATTACH TO THIS CARD';
     return [{ row: cell.row, col: cell.col, label }];
   });
-  grid.innerHTML = officeSvg(f.cells, f.runningRow, ghostCoords, legalCaps);
+  grid.innerHTML = officeSvg(f.cells, f.runningRow, ghostCoords, legalCaps, f.limits, selectedCrew);
+
+  // Wire the roster chips: clicking one sets `selectedCrew`, the same value the "Which train are
+  // you switching?" picker writes, so the board and the action panel drive one value either way.
+  for (const g of Array.from(grid.querySelectorAll('g[data-crew]'))) {
+    const trayId = (g as HTMLElement).dataset['crew'];
+    if (trayId) (g as unknown as HTMLElement).onclick = () => { selectedCrew = trayId; render(); };
+  }
 
   // Highlighting rides on top of the drawing: outline the legal squares and make them clickable.
   for (const [key, list] of spotsAt) {
@@ -232,14 +377,22 @@ function render(): void {
    * WHERE IT IS, WHERE IT MAY GO, AND WHY NOT THE REST. A blocked card carries its reason in its own
    * tooltip, so "why can I not get into that industry?" is answered by hovering the industry.
    */
-  if (f.moves && !forPlay) {
+  /**
-    const here = grid.querySelector(`g[data-cell="${f.moves.from.row},${f.moves.from.col}"]`);
+   * ONE CREW'S SQUARES AT A TIME. Drawing every crew's reachable squares at once is worse than
-    if (here) here.classList.add('bs-from');
+   * drawing one crew's: the highlights merge into a single blob and stop meaning "here is where
-    for (const c of f.moves.to) {
+   * THIS train can go", which is the whole reason they are on the board.
+   */
+  const crew = pickedCrew(f);
+  if (crew && !forPlay) {
+    // Marked on the crew strip, not the whole card: the Office is the one square a second train may
+    // share, and outlining the card would claim it belongs to both.
+    const strip = grid.querySelector(`g[data-cell="${crew.from.row},${crew.from.col}"] .bs-crew`);
+    if (strip) strip.classList.add('bs-from');
+    for (const c of crew.to) {
       const g = grid.querySelector(`g[data-cell="${c.row},${c.col}"]`);
       if (g) g.classList.add('bs-focus');
     }
-    for (const b of f.moves.blocked) {
+    for (const b of crew.blocked) {
       const g = grid.querySelector(`g[data-cell="${b.coord.row},${b.coord.col}"]`);
       if (!g) continue;
       // Two different things wearing two different marks. A turnout you cannot STOP on is not in
@@ -255,7 +408,7 @@ function render(): void {
   function pick(key: string, list: { label: string; index: number }[]): void {
     if (list.length === 1) {
       const intent = menu.options[list[0]!.index];
-      if (intent) submit(game, intent);
+      if (intent) void session.submit(intent);
       selected = null;
       pendingAt = null;
     } else {
@@ -296,7 +449,7 @@ function render(): void {
           // The card just drawn, badged so it can be told from the two beside it. It stands until
           // another draw replaces it, rather than flashing once — the question a player asks looking
           // at the row is "which of these is new", not "did something happen".
-          const fresh = h.cardId === game.justDrawn;
+          const fresh = h.cardId === session.justDrawn();
           return (
             `<div class="handcard${canPlay ? '' : ' unplayable'}${picked ? ' picked' : ''}${fresh ? ' fresh' : ''}"${fig}` +
             `${h.what ? ` data-tip="${esc(h.what)}"` : ''} tabindex="0">` +
@@ -341,7 +494,7 @@ function render(): void {
       // A card that needs no square goes straight down; there is nothing to ask.
       if (verb === 'play' && entry.placeKey === null && entry.playNow !== null) {
         const intent = menu.options[entry.playNow];
-        if (intent) submit(game, intent);
+        if (intent) void session.submit(intent);
         selected = null;
         mode = null;
         pendingAt = null;
@@ -374,7 +527,7 @@ function render(): void {
       node.classList.add('target');
       node.onclick = () => {
         const intent = menu.options[index];
-        if (intent) submit(game, intent);
+        if (intent) void session.submit(intent);
         selected = null;
         mode = null;
         render();
@@ -397,7 +550,7 @@ function render(): void {
       node.classList.add('addable');
       node.onclick = () => {
         const intent = menu.options[car.index];
-        if (intent) submit(game, intent);
+        if (intent) void session.submit(intent);
         render();
       };
     }
@@ -409,15 +562,16 @@ function render(): void {
    * `scheduled` is cleared as it is consumed, so the flash marks the moment rather than the state —
    * it is gone by the next render, which is what makes it read as "that just happened".
    */
-  const justSet = game.scheduled;
+  // Draining: the flash marks the moment the die was read, not a state, so it is gone by the next
-  game.scheduled = null;
+  // render. Taken once here and handed to both the timetable and the action panel.
+  const justSet = session.takeScheduled();
   $('timetable').innerHTML = timetableHtml(f, justSet);
 
   $('blocked').innerHTML = blockedHtml(f);
 
   // -- log
   const log = $('log');
-  log.innerHTML = game.log
+  log.innerHTML = session.lines()
     .slice(-60)
     .map((l) => `<div class="line t-${l.tone}">${esc(l.text)}</div>`)
     .join('');
@@ -440,13 +594,29 @@ function render(): void {
   }
   lastPhase = f.phaseKey;
 
+  noteDayEnd(f);
+
+  /**
+   * A train completing its run pays every player and nobody took a turn to cause it, so it is said
+   * out loud rather than left in the log. Drained, so it shows once and does not re-fire on a redraw.
+   */
+  const announcement = session.takeAnnouncement();
+  if (announcement) {
+    const el = $('announce');
+    el.textContent = announcement;
+    el.className = 'shown';
+    window.setTimeout(() => {
+      if (el.textContent === announcement) el.className = '';
+    }, 4200);
+  }
+
   renderDistrict(f);
   renderActions(menu, f, justSet);
   renderUndo();
 
   // Drain whatever the last batch of events earned. Cleared either way, so turning sound on does
   // not then play a backlog of everything that happened while it was off.
-  const cues = game.cues.splice(0, game.cues.length);
+  const cues = session.takeCues();
   if (soundOn) for (const c of cues) playCue(c);
 
   save();
@@ -465,27 +635,23 @@ function render(): void {
  */
 function renderUndo(): void {
   const btn = document.getElementById('undo') as HTMLButtonElement | null;
-  if (!btn) return;
+  if (!btn || !session.capabilities.undo) return;
-  const n = game.history.length;
+  const n = session.steps();
   btn.disabled = n === 0;
   btn.textContent = n === 0 ? 'Undo' : `Undo (${n})`;
   btn.onclick = () => {
-    const back = undo(game);
+    // The session drops the rebuilt game's cues and draws — replaying the history re-records them,
-    if (!back) return;
+    // and none of it is news to a player who just stepped back.
-    game = back;
+    if (!session.undo()) return;
     selected = null;
     mode = null;
     pendingAt = null;
-    // The rebuilt game replays its own cues from the beginning; none of them are news. `justDrawn`
-    // goes with them: replaying the history re-records every draw, so it would badge whichever card
-    // the replay happened to end on rather than one the player just turned over.
-    game.cues.length = 0;
-    game.scheduled = null;
-    game.justDrawn = null;
     // A phase change is announced by comparing against the last frame drawn. Stepping BACK into a
     // different phase is not that event, so the banner is suppressed rather than fired backwards.
     lastPhase = null;
-    render();
+    // Same for the Day: `noteDayEnd` already ignores a Day going down, but undoing back across a
+    // rollover and then replaying forward through it would announce the same Day ending twice.
+    lastDay = null;
   };
 }
 
@@ -496,7 +662,7 @@ function renderUndo(): void {
  * Division Yard is BARE. So the interesting number is not how much has been used but how little is
  * left, and the moment the Division Yard empties a whole pile comes back at once.
  */
-function renderYards(f: ReturnType<typeof view>): void {
+function renderYards(f: Frame): void {
   $('divyard').innerHTML = yardHtml(f.yards.division);
   $('clsyard').innerHTML = yardHtml(f.yards.classification);
   $('divtot').textContent = `${f.yards.divisionTotal} cars`;
@@ -510,14 +676,16 @@ function renderYards(f: ReturnType<typeof view>): void {
     : 'loaded / empty. Classification returns to the Division Yard only when the Division Yard is bare.';
 }
 
-function renderDistrict(f: ReturnType<typeof view>): void {
+function renderDistrict(f: Frame): void {
   const open = districtMode === 'auto' ? FOCUS_PHASES.has(f.phaseKey) : districtMode === 'open';
   const sec = $('district');
   if (open) sec.classList.remove('folded');
   else sec.classList.add('folded');
 
   const cars = f.cells.reduce((n, c) => n + c.cars.length, 0);
-  const crew = f.cells.filter((c) => c.tray).length;
+  // Trains, not cards-with-a-crew: the Office is the one card that may hold more than one, and a
+  // card-count silently read "1 crew on the board" with two trains standing at a busy Station.
+  const crew = f.cells.reduce((n, c) => n + c.trains.length, 0);
   $('districtsummary').textContent =
     `${f.cells.length} cards · ${f.facilities.length} facilities · ${cars} cars standing` +
     (crew > 0 ? ` · ${crew} crew on the board` : '');
@@ -538,19 +706,72 @@ function renderDistrict(f: ReturnType<typeof view>): void {
   };
 }
 
+/**
+ * The square an action button acts on, as an attribute the board can be matched against.
+ *
+ * `null` for the actions that act on no square at all — ending a turn, drawing a card, a train card
+ * that goes to the timetable — so those buttons carry nothing and highlight nothing.
+ */
+function cellRef(
+  coord: { row: number; col: number } | null | undefined,
+  route?: { row: number; col: number }[],
+): string {
+  const square = coord ? ` data-square="${coord.row},${coord.col}"` : '';
+  // Only a `switch.move` with more than one legal route carries this (docs/plans/switching-paths.md)
+  // — every intermediate square the chosen route runs over, so hovering lights the whole road, not
+  // just where it ends.
+  const path = route && route.length > 0 ? ` data-route="${route.map((c) => `${c.row},${c.col}`).join(' ')}"` : '';
+  return square + path;
+}
+
+/**
+ * POINT AT THE SQUARE THE BUTTON MEANS.
+ *
+ * The action list is a column of sentences that differ by a coordinate — "(1,3)" against "(-1,3)" —
+ * and the board is right beside it saying nothing about which one is which. Hovering a button now
+ * lights its square up, so the check happens with the eye rather than by reading two numbers off a
+ * button and finding them on a map. Reported by Jesse: recoverable in solitaire, where Undo is a
+ * click; a disaster in multiplayer, where it is not.
+ *
+ * ON FOCUS AS WELL AS HOVER, so tabbing through the list works the same way as pointing at it — the
+ * keyboard route is not a lesser one.
+ *
+ * BOTH KINDS OF SQUARE. A played card is a `data-cell`; a square being placed ONTO is an empty
+ * `data-ghost` target, which is precisely the case where the player is choosing between coordinates.
+ * Matching only one of the two would leave the most mistake-prone moment unhelped.
+ */
+function wirePointing(node: HTMLElement, key: string, routeKeys: readonly string[] = []): void {
+  const grid = $('grid');
+  const keys = [key, ...routeKeys];
+  const marks = (): Element[] =>
+    keys
+      .flatMap((k) => [grid.querySelector(`g[data-cell="${k}"]`), grid.querySelector(`g[data-ghost="${k}"]`)])
+      .filter((g): g is Element => g !== null);
+  const on = (): void => {
+    for (const g of marks()) g.classList.add('bs-point');
+  };
+  const off = (): void => {
+    for (const g of marks()) g.classList.remove('bs-point');
+  };
+  node.onmouseenter = on;
+  node.onmouseleave = off;
+  node.onfocus = on;
+  node.onblur = off;
+}
+
 function renderActions(
-  menu: ReturnType<typeof actionMenu>,
+  menu: Menu,
-  f: ReturnType<typeof view>,
+  f: Frame,
   justSet: number | null,
 ): void {
   const el = $('actions');
 
-  if (game.state.status !== 'active') {
+  if (f.status !== 'active') {
-    const o = game.state.outcome;
+    const o = f.outcome;
     el.innerHTML =
       `<div class="over ${o?.result === 'win' ? 'win' : 'loss'}">` +
       `${o?.result === 'win' ? 'YOU WIN' : 'GAME OVER'} — ${esc(String(o?.reason ?? ''))}<br>` +
-      `final Revenue ${game.state.players[0]?.revenue ?? 0} against a target of ${view(game).objective.target}</div>` +
+      `final Revenue ${f.revenue} against a target of ${f.objective.target}</div>` +
       `<button id="again">new game</button>`;
     $('again').onclick = () => {
       clearSave();
@@ -566,7 +787,7 @@ function renderActions(
 
   const apply = (index: number): void => {
     const intent = menu.options[index];
-    if (intent) submit(game, intent);
+    if (intent) void session.submit(intent);
     selected = null;
     mode = null;
     pendingAt = null;
@@ -582,17 +803,20 @@ function renderActions(
    * the same card in hand explained itself perfectly — reported on "Realignment on Mainline card 3",
    * which had neither a name for the card it meant nor a word about what it would do.
    */
-  const actionButton = (label: string, index: number): string => {
+  const actionButton = (a: {
+    index: number;
+    label: string;
+    tip?: string;
+    coord?: { row: number; col: number };
+    route?: { row: number; col: number }[];
+  }): string => {
+    const { label, index } = a;
     const cut = label.indexOf(' — ');
     const head = cut > 0 ? label.slice(0, cut) : label;
-    let rest = cut > 0 ? label.slice(cut + 3) : '';
+    // The menu resolved the card's description server-side, so the page never needs the state.
-    if (!rest) {
+    const rest = cut > 0 ? label.slice(cut + 3) : (a.tip ?? '');
-      const intent = menu.options[index];
-      const cardId = intent && 'cardId' in intent ? (intent as { cardId: string }).cardId : null;
-      if (cardId) rest = cardDescription(game.state, cardId);
-    }
     return (
-      `<button class="act" data-i="${index}"${rest ? ` data-tip="${esc(rest)}"` : ''}>${esc(head)}</button>`
+      `<button class="act" data-i="${index}"${cellRef(a.coord, a.route)}${rest ? ` data-tip="${esc(rest)}"` : ''}>${esc(head)}</button>`
     );
   };
 
@@ -627,15 +851,45 @@ function renderActions(
   // no worker able to act, the only thing offered is "End my Cargo phase".
   let html = `<h3 class="actions-hd">Actions</h3>${scheduledNote}${movesNote}`;
 
+  /**
+   * WHICH TRAIN AM I SWITCHING? Only asked when there is more than one crew to be switching, so a
+   * solitaire opening — one crew, no ambiguity — is unchanged. The chosen one is the crew whose
+   * reachable squares the board draws, so this row and the highlights are the same statement.
+   */
+  if (f.moves.length > 1) {
+    const chosen = pickedCrew(f);
+    html +=
+      `<div class="grp crewpick"><h3>Which train are you switching?</h3>` +
+      f.moves
+        .map(
+          (m) =>
+            `<button class="act crew${m.trayId === chosen?.trayId ? ' on' : ''}" data-crew="${esc(m.trayId)}"${cellRef(m.from)} ` +
+            `data-tip="Draw this crew's reachable squares on the board, and show its moves below. ${esc(m.label)} is standing at (${m.from.col}, ${m.from.row}) with ${m.to.length} square${m.to.length === 1 ? '' : 's'} it can reach.">` +
+            `${esc(m.label)} <span class="dim">(${m.from.col}, ${m.from.row})</span></button>`,
+        )
+        .join('') +
+      `</div>`;
+  }
+
   /**
    * WHAT IS LEFT IN THE ACTION LIST.
    *
    * Everything about a card in hand now lives on the card, and everything about making up a train
    * lives on the yard chip. What remains is the rest of the turn: the Local Operations choice,
    * drawing, switching moves, the Freight Agent, and finishing.
+   *
+   * EXCLUDE BY TITLE, NOT BY PREFIX. This used to be `!/^Making up /.test(g.title)`, on the
+   * assumption only the yard-chip panel's own group is ever titled that way. It is not: "choose
+   * where Extra X22 starts" is titled by `trainCardTitle`, which also begins "Making up Extra
+   * X22…", so the regex swallowed it too — and with no tray yet being filled, `menu.makeUp` is
+   * null, so nothing rendered it anywhere else. REPORTED as the game hanging with the Freight
+   * House mid-cycle: an Extra came due, the action panel had a legal decision and zero buttons,
+   * and nothing short of restarting looked like it would ever move again. Matching the exact
+   * title of the ONE group `menu.makeUp` actually covers leaves every other "Making up …" group,
+   * however it is titled, on screen where a player can act on it.
    */
   html += menu.direct
-    .filter((g) => !/^(Play|Discard) a card from my hand$/.test(g.title) && !/^Making up /.test(g.title))
+    .filter((g) => !/^(Play|Discard) a card from my hand$/.test(g.title) && g.title !== menu.makeUp?.title)
     .map(
       (g) =>
         `<div class="grp"><h3>${esc(g.title)}</h3>` +
@@ -644,7 +898,7 @@ function renderActions(
             // §6.2 — a drawn card has to be played or discarded before the turn can end. Keyed on
             // the INTENT, not the label: matching button text would break the moment the wording
             // changed, and would have caught `switch.end` too.
-            return actionButton(a.label, a.index);
+            return actionButton(a);
           })
           .join('') +
         `</div>`,
@@ -673,6 +927,17 @@ function renderActions(
           ? 'The Division Yard is bare, so there is nothing to add. Send the train out as it stands.'
           : 'Nothing in the Division Yard may join this train, and §7 does not allow passing while the yard holds cars.') +
       `</div>` +
+      /**
+       * WHICH ORDER TO ADD THEM IN, when the order is what decides whether the train can work.
+       *
+       * Only ever present for a train the order can lock — 7/8 Local — so this is not a standing
+       * caption a player learns to skip. Reported from play as "I can't drop a car at all": the
+       * Local made up ENGINE, freight, coach cannot set anything out for the rest of the game, and
+       * nothing on screen said so until the crew was out on the district with no button to press.
+       */
+      (menu.makeUp.advice
+        ? `<div class="makeup-advice ${menu.makeUp.advice.tone}">${esc(menu.makeUp.advice.text)}</div>`
+        : '') +
       (menu.makeUp.pass !== null
         ? `<button class="act" data-i="${menu.makeUp.pass}" data-tip="§8.2 — a train may depart with FEWER cars than its card lists, but never with the wrong ones. This sends it out as it stands.">no more cars — send it out</button>`
         : '') +
@@ -707,7 +972,7 @@ function renderActions(
                 ? ` data-tip-html="${esc(piecePreview(sp.links, item.subject))}"`
                 : '';
               return (
-                `<button class="act" data-i="${sp.index}"${fig}` +
+                `<button class="act" data-i="${sp.index}"${fig}${cellRef(sp.coord)}` +
                 ` data-tip="${esc(`${item.subject} — ${sp.label}`)}">${esc(sp.label)}</button>`
               );
             })
@@ -718,22 +983,56 @@ function renderActions(
     html += `</div>`;
   }
   if (
-    game.state.clock.phase === 'localOps' &&
+    f.phaseKey === 'localOps' &&
-    game.state.turn.option === 'draw' &&
+    f.option === 'draw' &&
     !menu.options.some((i) => i.type === 'draw.end')
   ) {
     // The hand being counted is the ACTOR's — they are the one who cannot end the turn.
-    const hand = (game.state.decks.hands.get(currentActor(game) ?? 0) ?? []).length;
+    const hand = f.handCount;
+    /**
+     * WHEN NOTHING IN HAND MAY BE DISCARDED, SAY SO AND SAY WHAT TO DO INSTEAD.
+     *
+     * §6.2 (Gitea#9) leaves ONE kind of undiscardable card on this line — an Extra, which never
+     * joins the timetable and so can never be what jams it. A player holding nothing but Extras has
+     * exactly one way forward: play one. The rule creates that corner deliberately and needs no
+     * machinery, but it must not be a corner the player has to infer from a discard button that has
+     * quietly stopped appearing. The reason is the card's own (`handKeepWhy`) rather than a sentence
+     * written here, so this cannot drift from the rule that actually refused — and main, where
+     * `discardTimetabled` is a New Game setting and a Timetabled train is the second kind, reads the
+     * identical code.
+     */
+    const stuck = f.handDiscardable.length > 0 && f.handDiscardable.every((d) => !d);
+    const why = f.handKeepWhy.find((w) => w !== null) ?? '';
+    const tip = stuck
+      ? 'You may not end a turn holding more than three cards, and every card you hold is one that ' +
+        `cannot be thrown away. ${why} The only way on is to play one.`
+      : 'You may not end a turn holding more than three cards (four with a Red Flag). Play ' +
+        'one onto the board, or discard one face-up to a Department slot — where a rival may pick ' +
+        'it up.';
     html +=
-      `<div class="grp"><button class="act blocked" disabled data-tip="§6.2 — you may not end a turn holding more than three cards (four with a Red Flag). Play one onto the board, or discard one face-up to a Department slot.">` +
+      `<div class="grp"><button class="act blocked" disabled data-tip="${tip.replace(/"/g, '&quot;')}">` +
-      `End Local Operations — play or discard down to three first (holding ${hand})</button></div>`;
+      (stuck
+        ? `End Local Operations — play an Extra first, they cannot be discarded (holding ${hand})`
+        : `End Local Operations — play or discard down to three first (holding ${hand})`) +
+      `</button></div>`;
   }
 
   el.innerHTML = html;
 
   for (const b of Array.from(el.querySelectorAll('button.act'))) {
     const node = b as HTMLElement;
-    node.onclick = () => apply(Number(node.dataset['i']));
+    // The crew buttons choose what the board draws; they submit nothing, so they must not fall
+    // through to `apply` with an undefined index.
+    const crewId = node.dataset['crew'];
+    node.onclick = crewId
+      ? () => {
+          selectedCrew = crewId;
+          render();
+        }
+      : () => apply(Number(node.dataset['i']));
+    const square = node.dataset['square'];
+    const route = node.dataset['route'];
+    if (square) wirePointing(node, square, route ? route.split(' ') : []);
   }
 }
 
@@ -749,28 +1048,29 @@ function renderActions(
  * where a rendered page would have been megabytes.
  */
 function downloadSave(): void {
-  const data = JSON.stringify(toSave(game), null, 1);
+  const data = JSON.stringify(session.save(), null, 1);
   const blob = new Blob([data], { type: 'application/json' });
   const url = URL.createObjectURL(blob);
   const a = document.createElement('a');
   a.href = url;
-  a.download = `station-master-seed${game.seed}-day${game.state.clock.day}.json`;
+  a.download = `station-master-seed${session.seed()}-day${session.view().day}.json`;
   a.click();
   URL.revokeObjectURL(url);
 }
 
 function save(): void {
+  if (!session.capabilities.saveLocal) return;
   try {
-    localStorage.setItem(SAVE_KEY, JSON.stringify(toSave(game)));
+    localStorage.setItem(SAVE_KEY, JSON.stringify(session.save()));
   } catch {
     // A full or disabled localStorage must not take the game down with it.
   }
 }
 
-function load(): ReturnType<typeof toSave> | null {
+function load(): Save | null {
   try {
     const raw = localStorage.getItem(SAVE_KEY);
-    return raw ? (JSON.parse(raw) as ReturnType<typeof toSave>) : null;
+    return raw ? (JSON.parse(raw) as Save) : null;
   } catch {
     return null;
   }
@@ -804,34 +1104,81 @@ if (saveBtn) saveBtn.onclick = downloadSave;
  * steps back one action at a time, but nothing brings back a game that has been dealt over, and the
  * replay download is right beside it.
  *
- * `location.search = ''` rather than a direct re-render, so a `?seed=` in the URL goes too — leaving
+ * Navigating rather than re-rendering, so a stale `?seed=` in the URL goes too — leaving it would
- * it would deal the same game again and look like the button had done nothing.
+ * deal the same game again and look like the button had done nothing.
  */
 const newBtn = document.getElementById('newgame');
-if (newBtn) {
+const dlg = document.getElementById('newgamedlg') as HTMLDialogElement | null;
-  newBtn.onclick = () => {
+if (newBtn && dlg) {
-    const day = game.state.clock.day;
+  const field = <T extends HTMLElement>(id: string): T => document.getElementById(id) as T;
-    const started = game.state.status === 'active' && (day > 1 || game.state.clock.stage > 1);
+
-    if (started && !confirm(`Forget this game (seed ${game.seed}, Day ${day}) and deal a new one?`)) return;
   /**
-     * ASK FOR THE SEED, rather than documenting a URL parameter in the title bar.
+   * ASK FOR ALL THREE, rather than documenting URL parameters in the title bar.
    *
-     * The same deal can be replayed, shared or compared by seed, which is worth offering — it was
+   * It asked for the seed alone, through `prompt()`. The opening hand and the three revenue rates
-     * offered as the note "add ?seed=1234 for a set deal", which spent width on the one line that
+   * were constants in the source, so trying a variation meant an edit and a rebuild — and balance is
-     * must not wrap to explain a thing the button could simply ask. Blank means random.
+   * the open question this game has (`TODO.md`). A dialog is what lets a playtest be a playtest.
+   *
+   * The dialog OPENS ON THE RULES IN PLAY rather than on the defaults: dealing a second game to
+   * compare against the first is the common case, and re-entering four settings each time is how a
+   * comparison silently stops comparing.
    */
-    const asked = prompt('Seed for the new game — leave blank for a random one:', '');
+  newBtn.onclick = () => {
-    if (asked === null) return; // cancelled
+    const f = session.view();
-    clearSave();
+    const day = f.day;
-    const wanted = asked.trim();
+    const started = f.status === 'active' && (day > 1 || f.stage > 1);
-    if (wanted === '') {
+    if (started && !confirm(`Forget this game (seed ${session.seed()}, Day ${day}) and deal a new one?`)) return;
-      // No `?seed=`, so `start()` rolls one. Reload rather than re-render, to clear any seed in the URL.
+
-      if (location.search === '') location.reload();
+    const current = session.view().houseRules;
-      else location.search = '';
+    field<HTMLInputElement>('ng-seed').value = '';
-      return;
+    for (const input of dlg.querySelectorAll<HTMLInputElement>('input[name="ng-hand"]')) {
+      input.checked = input.value === current.startingHand;
     }
-    location.search = `?seed=${encodeURIComponent(wanted)}`;
+    for (const input of dlg.querySelectorAll<HTMLInputElement>('input[name="ng-extra"]')) {
+      input.checked = input.value === current.extraStart;
+    }
+    field<HTMLInputElement>('ng-passenger').value = String(current.revenue.passengerPerCoach);
+    field<HTMLInputElement>('ng-freight').value = String(current.revenue.freightPerLoad);
+    field<HTMLInputElement>('ng-transit').value = String(current.revenue.trainPerTransit);
+    dlg.showModal();
   };
+
+  /**
+   * One handler for every way the dialog can close — the Deal button, the Cancel button, and Esc,
+   * which `<dialog>` answers with an empty `returnValue` and no submit event at all.
+   *
+   * The answers go into the URL and the page navigates, which is the same path `?seed=` already
+   * took: `start()` reads them back, so there is exactly one place that turns a URL into a game.
+   */
+  dlg.addEventListener('close', () => {
+    if (dlg.returnValue !== 'deal') return;
+
+    const asked = field<HTMLInputElement>('ng-seed').value.trim();
+    // A seed the browser cannot parse is not a reason to refuse to deal — blank and unparseable
+    // both mean "surprise me", which is what leaving the box alone plainly asks for.
+    const seed = asked === '' || !Number.isFinite(Number(asked)) ? '' : String(Math.trunc(Number(asked)));
+    const picked = dlg.querySelector<HTMLInputElement>('input[name="ng-hand"]:checked')?.value;
+    const extra = dlg.querySelector<HTMLInputElement>('input[name="ng-extra"]:checked')?.value;
+    const rules = houseRules({
+      houseRules: {
+        ...(STARTING_HAND_LABELS.some((o) => o.value === picked) ? { startingHand: picked as StartingHand } : {}),
+        ...(EXTRA_START_LABELS.some((o) => o.value === extra) ? { extraStart: extra as ExtraStartRule } : {}),
+        revenue: {
+          passengerPerCoach: Number(field<HTMLInputElement>('ng-passenger').value),
+          freightPerLoad: Number(field<HTMLInputElement>('ng-freight').value),
+          trainPerTransit: Number(field<HTMLInputElement>('ng-transit').value),
+        },
+      },
+    });
+
+    clearSave();
+    const next = rulesToUrl(rules, seed);
+    // Assigning the search string the page ALREADY has does nothing at all, which reads as a button
+    // that did not work — and it is the common case: deal a random seed, decide it was a bad deal,
+    // deal another at the same settings. Reload instead, and `start()` rolls a fresh seed.
+    if (next === location.search) location.reload();
+    else location.search = next;
+  });
 }
 
 const soundBtn = document.getElementById('sound');

src/web/panels.ts

@@ -31,8 +31,19 @@ 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: 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) => cardRow(h, f.handWhat[i] ?? '', canPlay[i] ?? null)).join('')
+    ? f.hand
+        .map((h, i) => {
+          const what = f.handWhat[i] ?? '';
+          const held = f.handKeepWhy[i];
+          return cardRow(h, held ? [what, held].filter(Boolean).join(' · ') : what, canPlay[i] ?? null);
+        })
+        .join('')
     : '<span class="dim">empty</span>';
 }
 
@@ -120,9 +131,18 @@ export function timetableHtml(f: Frame, justSet: number | null): string {
       ]
         .filter(Boolean)
         .join(' ');
+      /**
+       * THE CARD ITSELF, not just the number.
+       *
+       * A train card is played once and then lives only as a number in a Timetable slot — but what
+       * it prints is what decides whether the train can be switched, worked by Porters, or loaded at
+       * all. Reported from play: "once a train card's been played, how would I see that particular
+       * train card again?" This is where the player already looks for that train.
+       */
       const tip =
         t !== null
-          ? `Train ${t} departs at Stage ${stage}. A train's NUMBER is its seniority and direction — odd runs west, even runs east — and the Stage it leaves is set by the 1D12 roll made when its card was played, so Train 8 at Stage 6 is normal.`
+          ? `Train ${t} departs at Stage ${stage}. A train's NUMBER is its seniority and direction — odd runs west, even runs east — and the Stage it leaves is set by the 1D12 roll made when its card was played, so Train 8 at Stage 6 is normal.` +
+            (f.timetableWhat[k] ? `\n\nITS CARD — ${f.timetableWhat[k]}` : '')
           : `Stage ${stage} — no train due out.`;
       return (
         `<div class="tt-slot ${cls}" data-tip="${esc(tip)}" tabindex="0">` +
@@ -134,6 +154,62 @@ export function timetableHtml(f: Frame, justSet: number | null): string {
   return `<div class="tt">${slots}</div>`;
 }
 
+/**
+ * THE DAY THAT JUST ENDED — the body of the dialog `main.ts` puts up at every Day rollover.
+ *
+ * Reported as Gitea#10: "as the game rolls off the end of the day, you get a dialog saying such.
+ * Hard to keep track of time." The clock was on screen the whole time, but a Day turns over inside
+ * the automatic phases — between one click and the next — and neither the phase banner (2.6s) nor
+ * the announcement flash (4.2s) survives long enough to be noticed by someone reading the board.
+ * A modal is the point: it stops, and it waits to be dismissed.
+ *
+ * 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.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.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 +
+    `<table class="dayend-t"><tbody>${standings}</tbody></table>` +
+    target
+  );
+}
+
 export function blockedHtml(f: Frame): string {
   return f.blocked.length === 0
     ? '<li class="dim">nothing blocked</li>'
@@ -142,7 +218,7 @@ export function blockedHtml(f: Frame): string {
         .join('');
 }
 
-/** The load pipeline at each industry: green → MEN | AT | WORK → red, and the siding. */
+/** The load pipeline at each industry: green → MEN | AT | WORK → red, and the cars spotted here. */
 export function facilitiesHtml(f: Frame): string {
   /**
    * One number, with what the card printed and what a Modifier added.
@@ -239,12 +315,12 @@ export function facilitiesHtml(f: Frame): string {
                 }">${x.kind === 'passenger' ? 'waiting to board' : 'waiting to load'}</span>${boxes(x.green, x.greenCap, 'g')}</div>`
               : '') +
             /**
-             * A PASSENGER FACILITY HAS NO SIGN AND NO SIDING, so neither row is drawn for one.
+             * A PASSENGER FACILITY HAS NO SIGN, so the row is not drawn for one.
              *
              * `maw` comes back empty for a Depot, Station or Terminal — the pipeline is a Freight
              * Facility fitting (§9.2 is Porters, with no MEN | AT | WORK step). The row LABEL printed
              * ahead of the loop regardless, so a Depot showed the caption and three empty boxes it
-             * has no Laborer to work. Same for the siding: an Office has no industry track at all.
+             * has no Laborer to work.
              */
             (x.maw.length > 0
               ? `<div class="boxes"><span class="dim" data-tip="One physical sign, worked in whichever direction this industry runs. Only one load may sit on each of the three boxes.">MEN AT WORK</span>` +
@@ -258,14 +334,23 @@ export function facilitiesHtml(f: Frame): string {
                     : 'Loads that have come off an arriving car and been cleared. They travel car → WORK → AT → MEN, then into a red box — the opposite direction to loading.'
                 }">${x.kind === 'passenger' ? 'arrived' : 'cleared inbound'}</span>${boxes(x.red, x.redCap, 'r')}</div>`
               : '') +
-            (x.trackCap > 0 || x.track.length > 0
+            /**
-              ? `<div class="boxes"><span class="dim" data-tip="Cars spotted on this industry's track. A load leaves the sign onto one of these, or an arriving load starts from one.">siding</span>${boxes(x.track, x.trackCap, 's')}</div>`
+             * THE CARS THAT ARE HERE — NOT A SIDING OF A FIXED LENGTH.
+             *
+             * This drew one empty box per unit of the industry's capacity and labelled the row
+             * "siding", which said two untrue things: that the card prints a siding, and that its
+             * length is the box count. It is neither. An industry track is ordinary Operating Rail
+             * and holds four cars like every other card, so there is no printed length worth
+             * drawing — only what is actually standing there. Passing cap 0 renders the cars alone.
+             */
+            (x.track.length > 0
+              ? `<div class="boxes"><span class="dim" data-tip="Cars standing on this industry's track. A load leaves the sign onto one of these, or an arriving load starts from one. Up to four cars fit here, the same as any Operating track card.">spotted</span>${boxes(x.track, 0, 's')}</div>`
               : '') +
             `<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 (§9.3).'
                 : x.canFinish
-                  ? 'A matching empty car is spotted on the siding, so a load worked here can come off onto it.'
+                  ? '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.'
             }">` +
             (x.jammed ? 'JAMMED' : x.canFinish ? 'ready' : 'no car spotted') +
@@ -369,7 +454,7 @@ ul.blocked{margin:0;padding-left:18px}
 .box{display:inline-block;min-width:22px;text-align:center;border-radius:3px;padding:1px 4px;font-size:10px}
 .box.empty{background:#242a32;color:#5a6472}
 /* Green OUT, red IN, matching the board SVG's palette exactly — the panel and the map are the same
-   card seen twice, so they may not disagree about which colour means which way. Grey for the siding,
+   card seen twice, so they may not disagree about which colour means which way. Grey for spotted cars,
    which is a place rather than a direction. */
 .box.g{background:#2f6b3d}
 .box.r{background:#8a4a4a}
@@ -379,4 +464,12 @@ ul.blocked{margin:0;padding-left:18px}
 .fstat.good{background:rgba(40,140,60,.28)}
 .fstat.bad{background:rgba(190,50,50,.38);font-weight:700}
 .fstat.idle{opacity:.6}
+/* THE DAY-END DIALOG (Gitea#10). The dialog chrome is play.html's; these are its contents, here
+   because dayEndHtml is here — a panel and its styling stay together. */
+.dayend-h{font-size:15px;text-transform:none;letter-spacing:0;color:#e6e9ee;margin:0 0 8px}
+.dayend-t{border-collapse:collapse;margin:9px 0;min-width:210px}
+.dayend-t td{padding:3px 12px 3px 0;border-top:1px solid #2c333d}
+.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}
 `;

src/web/play.html

@@ -40,6 +40,32 @@ header button:disabled:hover{border-color:#2c333d}
 .pace.good{background:rgba(40,140,60,.32)}
 .pace.behind{background:rgba(190,120,40,.28)}
 .yard.bare{outline:1px dashed #e0a060;outline-offset:3px;border-radius:4px;padding:3px}
+/* NEW GAME DIALOG. Native <dialog>, so Esc closes it and focus is trapped without any of that
+   being written here. Everything below is only colour and spacing: the browser's own white-on-white
+   default is unreadable against this page. */
+dialog{background:var(--panel);color:var(--fg);border:1px solid var(--line);border-radius:9px;
+  padding:16px 18px;max-width:520px;width:calc(100% - 32px);font:inherit;max-height:86vh;overflow:auto}
+dialog::backdrop{background:rgba(0,0,0,.62)}
+dialog h3{margin-top:15px}
+/* The rationale under each heading, not beside each control — the reasons are sentences, and a
+   sentence squeezed into a label column wraps into noise. */
+.ng-note{color:var(--dim);font-size:11.5px;margin:0 0 8px;line-height:1.45}
+dialog input[type=text],dialog input[type=number]{background:#0f1318;color:var(--fg);
+  border:1px solid var(--line);border-radius:5px;padding:4px 7px;font:inherit;font-size:13px}
+dialog input[type=text]{width:100%}
+dialog input[type=number]{width:64px;text-align:right}
+dialog input:focus{outline:none;border-color:#4d6fa8}
+/* Whole rows, so the click target is the sentence and not the 13px circle beside it. */
+.ng-radio{display:flex;gap:9px;align-items:flex-start;padding:6px 7px;border-radius:5px;cursor:pointer}
+.ng-radio:hover{background:#20262e}
+.ng-radio input{margin-top:3px;flex:0 0 auto}
+.ng-radio .dim{font-size:11.5px}
+.ng-num{display:flex;justify-content:space-between;align-items:center;gap:12px;padding:4px 7px}
+.ng-buttons{display:flex;justify-content:flex-end;gap:8px;margin:16px 0 0;padding:0}
+.ng-buttons button{background:#2a3038;color:inherit;border:1px solid var(--line);border-radius:5px;
+  padding:5px 14px;cursor:pointer;font:inherit;font-size:13px}
+.ng-buttons button:hover{border-color:#4d6fa8}
+#ng-deal{background:#31527f;border-color:#4d6fa8}
 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;
@@ -88,11 +114,32 @@ button.cardact.discard{color:#d6b48a}
   box-shadow:0 6px 22px rgba(0,0,0,.5)}
 #phasenote.shown{opacity:1;transform:translateX(-50%) translateY(0)}
 @media(prefers-reduced-motion:reduce){#phasenote{transition:none}}
+/* A train completing its run pays EVERY player, so it is announced rather than left to the log —
+   green like a revenue gain, and its own element so it cannot fight the phase note for the slot. */
+#announce{position:fixed;left:50%;top:14px;transform:translateX(-50%) translateY(-14px);z-index:41;
+  background:#16301f;border:1px solid #4c9a6a;color:#c8f0d8;border-radius:14px;padding:7px 18px;
+  font-size:14px;font-weight:700;opacity:0;pointer-events:none;transition:opacity .18s,transform .18s;
+  box-shadow:0 6px 22px rgba(0,0,0,.5);max-width:min(680px,90vw);text-align:center}
+#announce.shown{opacity:1;transform:translateX(-50%) translateY(0)}
+@media(prefers-reduced-motion:reduce){#announce{transition:none}}
 /* The die's answer, said where the player is looking. Green like a revenue gain — it is a good
    thing that just happened — and it disappears with the next render, as a moment should. */
 .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}
+/* 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. */
+.crewpick{display:flex;flex-wrap:wrap;gap:6px;align-items:baseline}
+.crewpick h3{flex:0 0 100%;margin:0 0 2px}
+button.act.crew{width:auto;display:inline-block;margin:0}
+button.act.crew.on{border-color:var(--now);background:rgba(185,140,240,.18);color:#e9dcff}
+/* THE ORDER TO ADD THE CARS IN. Only ever drawn for a train whose make-up order can lock it (7/8
+   Local), so it is worth a coloured rule down the side: a player who sees this once needs to read
+   it, and will not see it again on the next train. `warn` is the train already made up badly. */
+.makeup-advice{font-size:11px;line-height:1.45;margin:0 0 6px;padding:5px 8px;border-radius:4px;
+  border-left:3px solid #4d6fa8;background:rgba(60,100,170,.13)}
+.makeup-advice.warn{border-left-color:#e0a060;background:rgba(200,150,60,.15)}
 /* Moves left, beside the moves. Amber like the actions, because it is a budget being spent by the
    buttons underneath it; struck through in red once it is gone. */
 .moves{display:inline-block;font-size:11px;margin:0 0 7px;padding:1px 8px;border-radius:10px;
@@ -168,10 +215,15 @@ ul.blocked li{padding:2px 0}
        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>
   <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>
   <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="Deal a fresh game. You will be asked for a seed — leave it blank for a random one. 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>
+  <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>
@@ -185,6 +237,7 @@ ul.blocked li{padding:2px 0}
 <!-- Announces a phase CHANGE. The turn chart says where you are; this says that it moved, which is
      what you miss when the automatic phases run between two clicks. -->
 <div id="phasenote"></div>
+<div id="announce"></div>
 
 <main>
   <div>
@@ -239,6 +292,75 @@ ul.blocked li{padding:2px 0}
   </div>
 </main>
 
+<!-- ===================================================================
+     NEW GAME — the seed, the opening hand, and what the three economies pay.
+
+     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.
+
+     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
+     someone reading the board notices them. A modal stops and waits, which is the whole request:
+     "hard to keep track of time". Filled by `dayEndHtml` and opened from `render()`. -->
+<dialog id="dayenddlg" aria-labelledby="de-title">
+  <form method="dialog">
+    <div id="dayendbody"></div>
+    <menu class="ng-buttons">
+      <button value="ok" id="de-ok" type="submit">Carry on</button>
+    </menu>
+  </form>
+</dialog>
+
 <script type="module" src="./web/main.js"></script>
 </body>
 </html>

src/web/replays.ts

@@ -122,7 +122,7 @@ function show(i: number): void {
   $('vpos').textContent = `${at} / ${steps.length - 1}`;
   ($('vscrub') as HTMLInputElement).value = String(at);
   $('vdivision').innerHTML = divisionSvg(f.division);
-  $('vgrid').innerHTML = officeSvg(f.cells, f.runningRow);
+  $('vgrid').innerHTML = officeSvg(f.cells, f.runningRow, [], [], f.limits);
 
   // Auto-hide: the district is worth its space during the phases that change it.
   const open = districtMode === 'auto' ? FOCUS_PHASES.has(f.phaseKey) : districtMode === 'open';

src/web/session.ts

@@ -0,0 +1,189 @@
+/**
+ * The boundary between the page and the game.
+ *
+ * The page draws a `Frame` and offers a `Menu`, and submits intents. It does not care whether the
+ * rules are being applied a function call away or across a network — which is the whole point:
+ *
+ *   - `LocalSession` runs the engine in this browser. Solitaire, exactly as it has always worked,
+ *     with no server involved at any point.
+ *   - `RemoteSession` (not built yet — see `docs/architecture/multiplayer.md` Phase 2) will hold no
+ *     authoritative state at all. It cannot: it has neither the deck order nor the other players'
+ *     hands, and if it did the game would be cheatable.
+ *
+ * So this interface is deliberately the SMALLER of the two — everything a remote client could
+ * possibly offer, and nothing that only a local one can do. What a local session can do beyond it is
+ * declared in `capabilities`, and the page hides those controls rather than calling them and failing.
+ */
+
+import type { Intent } from '../engine/intents.ts';
+import type { Frame } from '../sim/view.ts';
+import type { PlayerIndex } from '../engine/state.ts';
+import type { HouseRuleOverrides } from '../engine/content.ts';
+import type { Game, Menu, Save } from './game.ts';
+import {
+  actionMenu,
+  configWith,
+  currentActor,
+  fromSave,
+  handPlayable,
+  newGame,
+  overHandLimit,
+  submit,
+  toSave,
+  undo,
+  view,
+} from './game.ts';
+
+/**
+ * What this session can do beyond the common interface.
+ *
+ * None of these survive a server. Undo would have to un-see what other players have already seen;
+ * a local save is meaningless when the server is the store; and dealing a new game is the lobby's
+ * job. The page reads these rather than assuming, so the same code drives both.
+ */
+export type Capabilities = {
+  undo: boolean;
+  saveLocal: boolean;
+  newGame: boolean;
+};
+
+export type Session = {
+  /** The board as this seat sees it. */
+  view(): Frame;
+  /** What this seat may do right now. */
+  menu(): Menu;
+  /** Which seat this client is playing. */
+  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[];
+  /**
+   * Propose an action. Resolves false if the rules refused it.
+   *
+   * Async because a remote session must be, even though the local one answers immediately — a page
+   * written against a synchronous `submit` would have to be rewritten for the server.
+   */
+  submit(intent: Intent): Promise<boolean>;
+  /** Called whenever something changed and the page should redraw. Returns an unsubscribe. */
+  subscribe(fn: () => void): () => void;
+  capabilities: Capabilities;
+
+  /**
+   * WHAT JUST HAPPENED — three transient signals the page uses to draw a moment rather than a state.
+   *
+   * They are separate from `view()` because two of them are CONSUMED: a Stage flash and a sound play
+   * once and are then gone, whereas the Frame can be rebuilt any number of times per render. Putting
+   * them on the Frame would mean re-flashing on every redraw.
+   *
+   * A remote session fills these from the server's pushes rather than from a local event log; the
+   * page cannot tell the difference. Whether they eventually ride on the Frame as animation hints is
+   * a Phase 2 question (`docs/architecture/multiplayer.md` D3).
+   */
+  /** The narrated history, newest last. */
+  lines(): { text: string; tone: string }[];
+  /** Sounds earned since the last call. Draining. */
+  takeCues(): string[];
+  /** The timetable slot the last 1D12 filled, once. Draining. */
+  takeScheduled(): number | null;
+  /** A one-line announcement to flash, once. Draining. */
+  takeAnnouncement(): string | null;
+  /** The card most recently drawn into this seat's hand. Persists until another draw replaces it. */
+  justDrawn(): string | null;
+};
+
+/**
+ * Everything a LOCAL session can additionally do. Kept off `Session` so that reaching for one of
+ * these in shared page code is a type error rather than a runtime surprise against a server.
+ */
+export type LocalSession = Session & {
+  readonly game: Game;
+  seed(): number;
+  save(): Save;
+  /** How many intents have been submitted — what the Undo button counts down. */
+  steps(): number;
+  /** Steps back one intent by replaying the history without it. Returns false at the start. */
+  undo(): boolean;
+  restore(save: Save): void;
+};
+
+/**
+ * A session that owns the engine in this process.
+ *
+ * `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 `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, 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();
+  };
+
+  return {
+    get game() {
+      return game;
+    },
+    view: () => view(game),
+    menu: () => actionMenu(game),
+    seat: () => 0,
+    actor: () => currentActor(game),
+    overHandLimit: () => overHandLimit(game),
+    handPlayable: () => handPlayable(game),
+    submit: async (intent: Intent) => {
+      const ok = submit(game, intent);
+      if (ok) changed();
+      return ok;
+    },
+    subscribe(fn: () => void) {
+      listeners.add(fn);
+      return () => listeners.delete(fn);
+    },
+    capabilities: { undo: true, saveLocal: true, newGame: true },
+
+    lines: () => game.log,
+    takeCues: () => game.cues.splice(0, game.cues.length),
+    takeScheduled: () => {
+      const slot = game.scheduled;
+      game.scheduled = null;
+      return slot;
+    },
+    takeAnnouncement: () => {
+      const text = game.announced;
+      game.announced = null;
+      return text;
+    },
+    justDrawn: () => game.justDrawn,
+
+    seed: () => game.seed,
+    save: () => toSave(game),
+    steps: () => game.history.length,
+    undo() {
+      const back = undo(game);
+      if (!back) return false;
+      game = back;
+      // The rebuilt game replays its own history, so every cue and draw in it is old news.
+      back.cues.length = 0;
+      back.scheduled = null;
+      back.justDrawn = null;
+      back.announced = null;
+      changed();
+      return true;
+    },
+    restore(save: Save) {
+      game = fromSave(save);
+      // Restoring replays the whole history and re-records every draw; none of it is news.
+      game.justDrawn = null;
+      game.announced = null;
+      changed();
+    },
+  };
+}

src/web/sound.ts

@@ -64,6 +64,38 @@ export function playCue(cue: string): void {
     osc.stop(at + dur + 0.02);
   };
 
+  /**
+   * A burst of filtered noise — the breath of steam behind a whistle, one chuff of a moving
+   * locomotive, or the boom of an impact. Shared by `stage` (one long burst) and the chuffs in
+   * `arrive`/`depart` (several short ones), and the wide-open burst under `crash`.
+   */
+  const noiseBurst = (
+    at: number,
+    dur: number,
+    gain: number,
+    freq: number,
+    q: number,
+    type: BiquadFilterType = 'bandpass',
+  ): void => {
+    const frames = Math.max(1, Math.floor(c.sampleRate * dur));
+    const buf = c.createBuffer(1, frames, c.sampleRate);
+    const data = buf.getChannelData(0);
+    for (let i = 0; i < frames; i++) data[i] = Math.random() * 2 - 1;
+    const src = c.createBufferSource();
+    src.buffer = buf;
+    const filt = c.createBiquadFilter();
+    filt.type = type;
+    filt.frequency.value = freq;
+    filt.Q.value = q;
+    const amp = c.createGain();
+    amp.gain.setValueAtTime(0, at);
+    amp.gain.linearRampToValueAtTime(gain, at + Math.min(0.05, dur / 4));
+    amp.gain.exponentialRampToValueAtTime(0.0001, at + dur);
+    src.connect(filt).connect(amp).connect(c.destination);
+    src.start(at);
+    src.stop(at + dur + 0.02);
+  };
+
   const t = c.currentTime + 0.02;
 
   if (cue === 'stage') {
@@ -73,23 +105,55 @@ export function playCue(cue: string): void {
     for (const fg of [[392, 0.16], [466, 0.13], [587, 0.1], [784, 0.05]]) {
       tone(t, fg[0]!, d, fg[1]!, 'sawtooth', fg[0]! * 0.985);
     }
-    const frames = Math.floor(c.sampleRate * d);
+    noiseBurst(t, d, 0.05, 1400, 0.8);
-    const buf = c.createBuffer(1, Math.max(1, frames), c.sampleRate);
+    return;
-    const data = buf.getChannelData(0);
+  }
-    for (let i = 0; i < frames; i++) data[i] = Math.random() * 2 - 1;
+
-    const src = c.createBufferSource();
+  if (cue === 'arrive') {
-    src.buffer = buf;
+    /**
-    const band = c.createBiquadFilter();
+     * A LOCOMOTIVE SLOWING TO A STOP: chuffs (one per wheel revolution) spaced FARTHER apart as
-    band.type = 'bandpass';
+     * road speed drops, then a soft two-partial bell tap as it settles — a lighter cousin of the
-    band.frequency.value = 1400;
+     * `day` bell, not a repeat of it.
-    band.Q.value = 0.8;
+     */
-    const amp = c.createGain();
+    let at = t;
-    amp.gain.setValueAtTime(0, t);
+    const gaps = [0.13, 0.17, 0.22, 0.28];
-    amp.gain.linearRampToValueAtTime(0.05, t + 0.05);
+    for (let i = 0; i < gaps.length; i++) {
-    amp.gain.exponentialRampToValueAtTime(0.0001, t + d);
+      noiseBurst(at, 0.07, 0.11 - i * 0.015, 190, 1.1, 'bandpass');
-    src.connect(band).connect(amp).connect(c.destination);
+      at += gaps[i]!;
-    src.start(t);
+    }
-    src.stop(t + d);
+    for (const fg of [[1046, 0.07], [1568, 0.04]]) {
+      tone(at + 0.12, fg[0]!, 0.3, fg[1]!, 'sine');
+    }
+    return;
+  }
+
+  if (cue === 'depart') {
+    /**
+     * THE INVERSE OF `arrive`: chuffs starting slow and pulling closer together as the train
+     * gathers speed, then one falling, fading horn note — a single call, not `completed`'s pair,
+     * since this train is only leaving the Office, not clearing the whole Division.
+     */
+    let at = t;
+    const gaps = [0.22, 0.15, 0.1, 0.07, 0.05];
+    for (let i = 0; i < gaps.length; i++) {
+      noiseBurst(at, 0.06, 0.06 + i * 0.012, 210, 1.2, 'bandpass');
+      at += gaps[i]!;
+    }
+    tone(at, 349, 0.45, 0.1, 'sawtooth', 300);
+    return;
+  }
+
+  if (cue === 'crash') {
+    /**
+     * IMPACT, NOT MUSIC: two tones bent sharply downward at a DISSONANT (non-harmonic) interval,
+     * so the ear reads a collision rather than a chord — `couple`'s clank is consonant on purpose,
+     * and this is its opposite. A wide-open noise boom and a percussive sub-bass thump give it
+     * weight under the screech.
+     */
+    tone(t, 311, 0.35, 0.16, 'square', 70);
+    tone(t, 233, 0.4, 0.13, 'sawtooth', 52);
+    noiseBurst(t, 0.4, 0.16, 900, 0.4, 'lowpass');
+    tone(t, 45, 0.3, 0.18, 'sine');
     return;
   }
 
@@ -124,6 +188,17 @@ export function playCue(cue: string): void {
     return;
   }
 
+  if (cue === 'completed') {
+    // A train clearing the Division and whistling off: two long horn notes falling away, with the
+    // second quieter and lower so it reads as distance rather than repetition. Longer than any other
+    // cue on purpose — it is the only one that pays every player, and it should land as an event.
+    tone(t, 392, 0.55, 0.13, 'sawtooth', 370);
+    tone(t, 262, 0.55, 0.09, 'triangle', 247);
+    tone(t + 0.42, 330, 0.75, 0.08, 'sawtooth', 300);
+    tone(t + 0.42, 220, 0.75, 0.055, 'triangle', 200);
+    return;
+  }
+
   if (cue === 'day') {
     // The grade-crossing bell: two strikes. Inharmonic partials separate a bell from a beep.
     for (const at of [t, t + 0.22]) {

src/web/splash.ts

@@ -7,3 +7,22 @@ if (ties) {
   }
   ties.innerHTML = out;
 }
+
+/** Clicking the box art opens it full size, since the thumbnail is too small to read. */
+const heroImage = document.getElementById('hero-image');
+const lightbox = document.getElementById('lightbox');
+if (heroImage && lightbox) {
+  const open = () => { lightbox.hidden = false; };
+  const close = () => { lightbox.hidden = true; };
+  heroImage.addEventListener('click', open);
+  heroImage.addEventListener('keydown', (e) => {
+    if (e instanceof KeyboardEvent && (e.key === 'Enter' || e.key === ' ')) {
+      e.preventDefault();
+      open();
+    }
+  });
+  lightbox.addEventListener('click', close);
+  document.addEventListener('keydown', (e) => {
+    if (e instanceof KeyboardEvent && e.key === 'Escape') close();
+  });
+}

test/advance.test.ts

@@ -8,11 +8,13 @@ import { describe, it } from 'node:test';
 import assert from 'node:assert/strict';
 
 import { advance, pump } from '../src/engine/advance.ts';
-import { applyIntent, areaOf } from '../src/engine/apply.ts';
+import { applyIntent, areaOf, check, isBeingMadeUp } from '../src/engine/apply.ts';
-import { HAND_LIMIT, STAGES_PER_DAY, lengthProfile, 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 type { GameConfig, GameState } from '../src/engine/state.ts';
+import { developerBot } from '../src/sim/bot.ts';
+import type { CrewTray, DivisionNode, GameConfig, GameState } from '../src/engine/state.ts';
+import { coordKey, railFacingOf } from '../src/engine/state.ts';
 
 const baseConfig = (over: Partial<GameConfig> = {}): GameConfig => ({
   mode: 'solitaire',
@@ -230,6 +232,14 @@ describe('Mainline Phase (§8)', () => {
 
   it('moves trains one region per Stage (§8.2)', () => {
     const s = game();
+    /**
+     * PIN THE TERRAIN. This used to rely on whatever card the seed happened to lay down, and the
+     * moment the RNG stream moved — a different opening deal draws a different number of cards
+     * before the Division is built — seed 1 dealt a 60 card instead of a 30 and the train crossed in
+     * one Stage. What is under test is that crossing takes the card's time, so the card has to be
+     * the test's own: Curves is a 30, which is two Stages for a fast train.
+     */
+    for (const n of s.division.nodes) if (n.kind === 'mainline') n.card = 'curves';
     scheduleTrain(s, 1, 2);
     s.clock.phase = 'newTrain';
     pump(s);
@@ -586,7 +596,7 @@ describe('X18 Circus Train — a point for standing still', () => {
     s.trays.set('circus', {
       id: 'circus', trainNumber: 18, trainIsExtra: true, engineAt: 0,
       consist: [], direction: 'east',
-      position: { at: 'grid', owner: 0, coord: { row: -1, col: 0 } },
+      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.
@@ -612,3 +622,589 @@ describe('X18 Circus Train — a point for standing still', () => {
     assert.ok(!paidAgain(), 'the Circus Train collected a second time for the same set-up');
   });
 });
+
+// ---------------------------------------------------------------------------
+
+describe('a train on the Division points the way it is running', () => {
+  /**
+   * Nothing reset `facing` when a train left a district, so a crew that had been shunted onto a
+   * north-south spur carried a compass port — 'n' or 's' — out onto the Division with it.
+   *
+   * The Division is east-west, and so is every Office card, so that port exists nowhere the train is
+   * about to be. `movesFor` explores from `facing` and from its opposite, and a card with neither
+   * yields nothing at all: the train arrived at the next Office **unable to switch at all**. It also
+   * drew a ▲ on the Division map, where there is no north.
+   *
+   * A train running the Division has its engine at one end of an east-west railroad, so this is not
+   * a repair applied after the fact — it is the only thing `facing` can mean out there.
+   */
+  const runningOnTheDivision = (spurFacing: 'n' | 's', direction: 'east' | 'west'): CrewTray => {
+    const s = game();
+    // Straight onto the Mainline card west of the first Office, as a departure would.
+    const index = s.division.nodes.findIndex((n) => n.kind === 'mainline');
+    const node = s.division.nodes[index]!;
+    assert.equal(node.kind, 'mainline');
+    const id = 'shunted';
+    s.trays.set(id, {
+      id, trainNumber: 2, trainIsExtra: false, engineAt: 0, consist: [],
+      direction,
+      // What a Move round a district leaves behind: a real port on the card it was standing on.
+      facing: spurFacing,
+      railFacing: 'w',
+      position: { at: 'grid', seat: 0, coord: areaOf(s, 0).officeCoord },
+      movesUsed: 0,
+    });
+    const tray = s.trays.get(id)!;
+    // Depart it: the Mainline Phase's own path onto the card.
+    s.clock.phase = 'mainline';
+    s.movedThisPhase = new Set();
+    for (let i = 0; i < 3 && tray.position.at === 'grid'; i++) {
+      s.clock.phase = 'mainline';
+      s.movedThisPhase = new Set();
+      advance(s);
+    }
+    assert.notEqual(tray.position.at, 'grid', 'the train never left the district');
+    return tray;
+  };
+
+  it('drops the spur port the moment it reaches the Mainline', () => {
+    for (const spur of ['n', 's'] as const) {
+      for (const direction of ['east', 'west'] as const) {
+        const tray = runningOnTheDivision(spur, direction);
+        assert.equal(
+          tray.facing,
+          direction === 'east' ? 'e' : 'w',
+          `a ${direction}bound train left the district still facing ${spur}`,
+        );
+        assert.equal(railFacingOf(tray), direction === 'east' ? 'e' : 'w');
+      }
+    }
+  });
+});
+
+// ---------------------------------------------------------------------------
+
+describe('the history says WHY a train moved, and says it truthfully', () => {
+  /**
+   * REPORTED from play: "some trains seem to be moving before I can switch or do other operations on
+   * them — it may be the rules are wrong, or it may be my perception."
+   *
+   * It was perception, but the log was actively feeding it. Every departure read alike, and the
+   * arrival line for an Expedited train said there was "no turn in which to work it" — which was
+   * false under the OLD (v0.4.8 and earlier) same-stage-departure reading of Q3, and cost the player
+   * the Cargo turn they did have.
+   *
+   * v0.4.9 CORRECTED Q3 ITSELF, not just the narration: Expedite does not change when a train
+   * leaves — it is released by the ordinary §8.1 rules exactly like any other train, and may be
+   * switched normally while it stands. What it means is that the train must not be PARKED anywhere
+   * but the station; leaving it on Secondary Track when a Mainline Phase begins is a Station Master
+   * fault (`expediteFault`, `EXPEDITE_FAULT_PENALTY`). These pin that behaviour, so a phase-order
+   * change cannot silently bring back the old forced departure.
+   */
+  /**
+   * Drop one named train at the Western Division Point and follow it, counting the DISTINCT phases
+   * it spends standing in a district — `advance` is called many times inside one phase, so a raw
+   * count would say nothing. Driven by the developer bot rather than a hand-rolled phase-ender,
+   * 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, { 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
+     * same-direction meet — with the bot's own traffic running, Train 6 was held four Stages and
+     * collected four Local Operations turns. Correct behaviour, but it is traffic noise for what
+     * this test is trying to pin, so clearing the timetable isolates the rule from it.
+     */
+    s.timetable = s.timetable.map(() => null);
+    const id = 'watched';
+    s.trays.set(id, {
+      id, trainNumber, trainIsExtra: false, engineAt: 0,
+      consist: [{ type: 'coach', loaded: true }] as never,
+      direction: 'east', facing: 'e',
+      position: { at: 'divisionPoint', side: 'west' }, movesUsed: 0,
+    });
+    const dp = s.division.nodes.find((n) => n.kind === 'divisionPoint' && n.side === 'west');
+    if (dp?.kind === 'divisionPoint') dp.holding.push(id);
+
+    const standingIn = new Set<string>();
+    let reachedOffice = false;
+    let leftIn = '';
+
+    for (let i = 0; i < 20_000; i++) {
+      const phase = s.clock.phase;
+      const onGrid = s.trays.get(id)?.position.at === 'grid';
+      if (onGrid) {
+        reachedOffice = true;
+        standingIn.add(`${s.clock.day}|${s.clock.stage}|${phase}`);
+      }
+
+      const r = advance(s);
+
+      if (reachedOffice && onGrid && s.trays.get(id)?.position.at !== 'grid' && leftIn === '') {
+        leftIn = phase;
+        break;
+      }
+      if (s.status === 'finished') break;
+      if (r.needsInput) {
+        /**
+         * A PLAYER WHO DOES NOTHING. The developer bot plays train cards, and a train card rolls
+         * itself onto the Timetable — so clearing the Timetable above achieved nothing while the bot
+         * was driving, and the watched train kept meeting traffic it had to be cleared past. This
+         * ends every turn without playing anything, which is the only way to isolate one train.
+         */
+        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;
+        const pick =
+          options.find((x) => x.type === 'mainline.clearance') ??
+          options.find(
+            (x) =>
+              x.type === 'switch.end' ||
+              x.type === 'draw.end' ||
+              x.type === 'loadUnload.end' ||
+              x.type === 'freightAgent.end',
+          ) ??
+          options.find((x) => x.type === 'localOps.choose') ??
+          options[0]!;
+        if (!applyIntent(s, actor, pick).ok) break;
+      }
+    }
+
+    const count = (phase: string): number => [...standingIn].filter((k) => k.endsWith(`|${phase}`)).length;
+    assert.ok(reachedOffice, `train ${trainNumber} never reached a district at all`);
+    return { localOps: count('localOps'), loadUnload: count('loadUnload'), leftIn };
+  };
+
+  it('gives an ordinary train a Local Operations turn before it goes', () => {
+    // Train 12 Drag Freight — no Expedite. Arrives in a Mainline Phase, stands, and the player gets
+    // a Local Operations turn with it in the NEXT Stage. This is what the arrival line promises.
+    const r = phasesWith(12);
+    assert.ok(r.localOps >= 1, `an ordinary train got ${r.localOps} Local Operations turns`);
+    assert.equal(r.leftIn, 'mainline', 'an ordinary train should leave in a Mainline Phase');
+  });
+
+  it('gives an Expedited train a Local Operations turn too, exactly like an ordinary one', () => {
+    // Train 6 The Sparrow — Expedite. v0.4.9 corrected Q3: Expedite no longer forces a same-stage
+    // departure, so an Expedited train is released by the ordinary §8.1 rule and stands for a
+    // Local Operations turn the same as Train 12 above.
+    const r = phasesWith(6);
+    assert.ok(r.localOps >= 1, `an Expedited train got ${r.localOps} Local Operations turns`);
+    assert.ok(r.loadUnload >= 1, 'an Expedited train never stood through a Cargo phase');
+    assert.equal(r.leftIn, 'mainline', 'an Expedited train should leave in a Mainline Phase, like any other');
+  });
+
+  it('faults an Expedited train left off the station when a Mainline Phase begins', () => {
+    // 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, { length: 'standard' });
+    const area = areaOf(s, 0);
+    const id = 'expedited';
+    const secondary = { row: area.officeCoord.row, col: area.officeCoord.col + 1 };
+    s.trays.set(id, {
+      id, trainNumber: 6, trainIsExtra: false, engineAt: 0, consist: [],
+      direction: 'east', facing: 'e',
+      position: { at: 'grid', seat: 0, coord: secondary }, movesUsed: 0,
+    });
+
+    s.clock.phase = 'mainline';
+    const before = s.players[0]!.revenue;
+    const r = advance(s);
+
+    assert.ok(
+      r.events.some((e) => e.type === 'expediteFault' && e.trainNumber === 6),
+      'no fault was raised for an Expedited train left off the station',
+    );
+    assert.equal(
+      s.players[0]!.revenue,
+      before - EXPEDITE_FAULT_PENALTY,
+      'the fault did not cost Revenue',
+    );
+  });
+
+  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, { length: 'standard' });
+    const area = areaOf(s, 0);
+    const id = 'expedited';
+    s.trays.set(id, {
+      id, trainNumber: 6, trainIsExtra: false, engineAt: 0, consist: [],
+      direction: 'east', facing: 'e',
+      position: { at: 'grid', seat: 0, coord: area.officeCoord }, movesUsed: 0,
+    });
+    area.adOccupancy.push(id);
+
+    // 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.
+    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', {
+      id: 'ahead', trainNumber: 12, trainIsExtra: false, engineAt: 0, consist: [],
+      direction: 'east', facing: 'e', position: { at: 'mainline', index: ahead }, movesUsed: 0,
+    });
+    if (node?.kind === 'mainline') {
+      node.transits.push({ tray: 'ahead', stagesRemaining: 2, stagesTotal: 2, direction: 'east' });
+    }
+
+    s.clock.phase = 'mainline';
+    const before = s.players[0]!.revenue;
+    const r = advance(s);
+
+    assert.ok(
+      r.events.some((e) => e.type === 'clearanceRequested' && e.trainId === id),
+      'the departure was not put to the Superintendent',
+    );
+    assert.ok(
+      !r.events.some((e) => e.type === 'expediteFault'),
+      'a train properly parked at the station was faulted anyway',
+    );
+    assert.equal(
+      s.players[0]!.revenue,
+      before,
+      'Revenue changed for a train legitimately held at the station',
+    );
+  });
+});
+
+// ---------------------------------------------------------------------------
+
+describe('an Extra starts where the player puts it (Gitea#4)', () => {
+  /**
+   * REPORTED, v0.4.9e: "When extras are played the player doing so may choose where the extra
+   * starts. They may choose either division point. And if the interchange mainline card has been
+   * played, they may start the extra on that card and choose the direction from there. If there is
+   * potential for conflict with other trains in that area the superintendent may hold the extra."
+   *
+   * This SUPERSEDES the earlier ruling these tests used to assert — "the number decides, like
+   * everything else on the timetable" — for Extras only. The number still decides for a timetabled
+   * train. The reason the two cannot both hold: an odd (westbound) Extra placed at the WEST end
+   * would leave the Division on its first move having crossed nothing, and be paid for the run.
+   *
+   * So: the start decides the direction. A Division Point runs the train away from itself; in the
+   * middle of the railroad — an Interchange, a Control Point — the player says which way.
+   */
+  const pending = (trainNumber: number, tier?: 'depot' | 'station'): GameState => {
+    const s = game(11);
+    s.pendingExtras = [trainNumber];
+    s.timetable = s.timetable.map(() => null);
+    if (tier) s.officeAreas.get(0)!.tier = tier;
+    s.clock.phase = 'newTrain';
+    advance(s);
+    return s;
+  };
+
+  const started = (s: GameState): CrewTray => {
+    const tray = [...s.trays.values()].find((t) => t.trainIsExtra);
+    assert.ok(tray, 'the Extra never took a Crew Tray');
+    return tray;
+  };
+
+  /** Turn one Mainline card into an Interchange, and say which node it is. */
+  const withInterchange = (s: GameState): number => {
+    const i = s.division.nodes.findIndex((n) => n.kind === 'mainline');
+    const node = s.division.nodes[i]!;
+    if (node.kind === 'mainline') node.card = 'interchange';
+    return i;
+  };
+
+  it('stops for the decision instead of launching the train itself', () => {
+    const s = pending(17);
+    assert.equal(s.clock.phase, 'newTrain');
+    assert.equal(s.trays.size, 0, 'the Extra was placed without anyone choosing where');
+    assert.ok(
+      legalActions(s, s.clock.currentActor ?? 0).some((i) => i.type === 'newTrain.startExtra'),
+      'the placement was never offered',
+    );
+  });
+
+  it('offers BOTH Division Points, not the one the number would dictate', () => {
+    const s = pending(17);
+    const sides = legalActions(s, 0)
+      .filter((i) => i.type === 'newTrain.startExtra' && i.start?.kind === 'divisionPoint')
+      .map((i) => (i.type === 'newTrain.startExtra' && i.start?.kind === 'divisionPoint' ? i.start.side : ''));
+    assert.deepEqual([...sides].sort(), ['east', 'west']);
+  });
+
+  it('runs an Extra AWAY from the Division Point it was placed at, whatever its number', () => {
+    // X17 is odd. Under the superseded rule it could only ever start at the East end and run west.
+    for (const [side, direction] of [['west', 'east'], ['east', 'west']] as const) {
+      const s = pending(17);
+      const r = applyIntent(s, 0, {
+        type: 'newTrain.startExtra', trainNumber: 17, start: { kind: 'divisionPoint', side },
+      });
+      assert.ok(r.ok, `the ${side} Division Point was refused: ${r.ok ? '' : r.code}`);
+      const tray = started(s);
+      assert.equal(tray.direction, direction, `an Extra at the ${side} end must run ${direction}`);
+      assert.equal(tray.position.at === 'divisionPoint' && tray.position.side, side);
+    }
+  });
+
+  it('refuses a Whistle Post, which is not a Control Point, at every setting of the house rule', () => {
+    for (const extraStart of ['divisionPointsOnly', 'ownOffice', 'anyOffice'] as const) {
+      const s = pending(18);
+      s.config = { ...s.config, houseRules: { ...s.config.houseRules, extraStart } };
+      assert.equal(s.officeAreas.get(0)!.tier, 'whistlePost');
+      const code = check(s, 0, {
+        type: 'newTrain.startExtra', trainNumber: 18, start: { kind: 'office', seat: 0 }, direction: 'east',
+      });
+      assert.ok(code !== null, `a Whistle Post was allowed under ${extraStart}`);
+    }
+  });
+
+  it('starts at a Control Point when the player picks one, taking an A/D track', () => {
+    // Upgrading the Office is what buys this: a Depot is a Control Point, a Whistle Post is not.
+    const s = pending(18, 'depot');
+    const r = applyIntent(s, 0, {
+      type: 'newTrain.startExtra', trainNumber: 18, start: { kind: 'office', seat: 0 }, direction: 'west',
+    });
+    assert.ok(r.ok, `starting at the Depot was refused: ${r.ok ? '' : r.code}`);
+    const tray = started(s);
+    const area = s.officeAreas.get(0)!;
+    assert.equal(tray.position.at, 'grid');
+    assert.deepEqual(
+      tray.position.at === 'grid' ? tray.position.coord : null,
+      area.officeCoord,
+      'the Extra did not start on the Office card',
+    );
+    assert.ok(area.adOccupancy.includes(tray.id), 'it did not take an A/D track');
+    // The point of the change: an EVEN Extra running WEST, because the player said so.
+    assert.equal(tray.direction, 'west', 'the direction the player chose was not honoured');
+  });
+
+  it('needs a direction anywhere that is not an end of the Division', () => {
+    const s = pending(18, 'depot');
+    assert.equal(
+      check(s, 0, { type: 'newTrain.startExtra', trainNumber: 18, start: { kind: 'office', seat: 0 } }),
+      'NO_DIRECTION_CHOSEN',
+    );
+  });
+
+  it('honours the extraStart house rule for Office starts, and never for the shared ground', () => {
+    for (const [extraStart, code] of [
+      ['divisionPointsOnly', 'OFFICE_STARTS_NOT_ALLOWED'],
+      ['anyOffice', null],
+    ] as const) {
+      const s = pending(18, 'depot');
+      s.config = { ...s.config, houseRules: { ...s.config.houseRules, extraStart } };
+      assert.equal(
+        check(s, 0, {
+          type: 'newTrain.startExtra', trainNumber: 18, start: { kind: 'office', seat: 0 }, direction: 'east',
+        }),
+        code,
+        `office start under ${extraStart}`,
+      );
+      // The Division Points belong to nobody, so no setting ever closes them.
+      assert.equal(
+        check(s, 0, { type: 'newTrain.startExtra', trainNumber: 18, start: { kind: 'divisionPoint', side: 'west' } }),
+        null,
+      );
+    }
+  });
+
+  it('starts at an Interchange in the players yard, not out on the running line', () => {
+    const s = pending(18);
+    const node = withInterchange(s);
+    const r = applyIntent(s, 0, {
+      type: 'newTrain.startExtra', trainNumber: 18, start: { kind: 'mainline', node }, direction: 'east',
+    });
+    assert.ok(r.ok, `the Interchange was refused: ${r.ok ? '' : r.code}`);
+    const tray = started(s);
+    const card = s.division.nodes[node]!;
+    assert.equal(tray.direction, 'east');
+    assert.deepEqual(tray.position, { at: 'mainline', index: node });
+    assert.ok(card.kind === 'mainline' && card.holding?.includes(tray.id), 'it is not in the yard');
+    assert.equal(card.kind === 'mainline' && card.transits.length, 0, 'it was put on the running line');
+  });
+
+  it('refuses any Mainline card that is not an Interchange', () => {
+    const s = pending(18);
+    const plains = s.division.nodes.findIndex((n) => n.kind === 'mainline');
+    const node = s.division.nodes[plains]!;
+    if (node.kind === 'mainline') node.card = 'plains';
+    assert.equal(
+      check(s, 0, { type: 'newTrain.startExtra', trainNumber: 18, start: { kind: 'mainline', node: plains }, direction: 'east' }),
+      'NOT_AN_INTERCHANGE',
+    );
+  });
+
+  it('may be started at an Interchange however busy the card is — the yard forces no collision', () => {
+    const s = pending(18);
+    const node = withInterchange(s);
+    const card = s.division.nodes[node]!;
+    // Nose to tail with opposing traffic. §7: placing here still must not force a collision.
+    if (card.kind === 'mainline') {
+      card.transits.push({ tray: 'tray9', stagesRemaining: 2, stagesTotal: 2, direction: 'west' });
+    }
+    assert.equal(
+      check(s, 0, { type: 'newTrain.startExtra', trainNumber: 18, start: { kind: 'mainline', node }, direction: 'east' }),
+      null,
+    );
+  });
+
+  /**
+   * §7's last clause, and the reason the Interchange start is modelled as a yard at all: "If there
+   * is potential for conflict with other trains in that area the superintendent may hold the extra."
+   *
+   * Jesse's split: a GUARANTEED collision holds the train at the Interchange for another Stage and
+   * it tries again; a POTENTIAL one is the Superintendent's to rule on. Those are exactly §8.1's
+   * two answers, so the Extra highballs out of the yard through `evaluateClearance` — the same
+   * check a train leaving a Division Point goes through — rather than through anything new.
+   */
+  describe('highballing out of the Interchange yard', () => {
+    /** A pending X18 sitting in the yard of an Interchange, with the terrain pinned. */
+    const inYard = (): { s: GameState; node: number; tray: CrewTray } => {
+      const s = pending(18);
+      const node = withInterchange(s);
+      const r = applyIntent(s, 0, {
+        type: 'newTrain.startExtra', trainNumber: 18, start: { kind: 'mainline', node }, direction: 'east',
+      });
+      assert.ok(r.ok, `the Interchange was refused: ${r.ok ? '' : r.code}`);
+      s.clock.phase = 'mainline';
+      s.movedThisPhase = new Set();
+      return { s, node, tray: started(s) };
+    };
+
+    const card = (s: GameState, node: number): Extract<DivisionNode, { kind: 'mainline' }> => {
+      const n = s.division.nodes[node]!;
+      assert.equal(n.kind, 'mainline');
+      return n as Extract<DivisionNode, { kind: 'mainline' }>;
+    };
+
+    it('pulls out onto the card at the next Mainline Phase when the Subdivision is clear', () => {
+      const { s, node, tray } = inYard();
+      advance(s);
+      const n = card(s, node);
+      assert.deepEqual(n.holding, [], 'it never left the yard');
+      assert.ok(n.transits.some((t) => t.tray === tray.id), 'it is not on the running line');
+    });
+
+    it('is held in the yard by a facing train, and tries again the next Stage', () => {
+      const { s, node, tray } = inYard();
+      // Westbound, against an eastbound Extra: §8.1 calls that an absolute bar, not a judgment call.
+      card(s, node).transits.push({ tray: 'facing', stagesRemaining: 2, stagesTotal: 2, direction: 'west' });
+      s.trays.set('facing', {
+        id: 'facing', trainNumber: 3, trainIsExtra: false, engineAt: 0, consist: [],
+        direction: 'west', position: { at: 'mainline', index: node }, movesUsed: 0,
+      });
+
+      const r = advance(s);
+      assert.equal(r.needsInput ?? false, false, 'a guaranteed collision is not a question to ask');
+      assert.equal(s.clock.pendingDecision, null);
+      assert.ok(card(s, node).holding?.includes(tray.id), 'it was not held in the yard');
+      assert.ok(
+        !card(s, node).transits.some((t) => t.tray === tray.id),
+        'it pulled out in front of a train coming the other way',
+      );
+      assert.ok(s.trays.has(tray.id), 'the Extra was destroyed rather than held');
+
+      // AND IT TRIES AGAIN. The Extra waits in the yard, not on the pending list, so once the road
+      // clears the next Mainline Phase takes it out with no further intervention.
+      s.trays.delete('facing');
+      card(s, node).transits = [];
+      s.clock.phase = 'mainline';
+      s.movedThisPhase = new Set();
+      advance(s);
+      assert.deepEqual(card(s, node).holding, [], 'it did not try again once the road was clear');
+      assert.ok(card(s, node).transits.some((t) => t.tray === tray.id), 'it never pulled out');
+    });
+
+    it('puts a following train to the Superintendent rather than holding it automatically', () => {
+      const { s, node, tray } = inYard();
+      // Same direction: §8.1's judgment call, which is what "may hold the extra" means.
+      card(s, 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: node }, movesUsed: 0,
+      });
+
+      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?.occupiedBy, 'ahead');
+
+      // HOLD keeps it in the yard.
+      assert.ok(applyIntent(s, s.clock.superintendent, { type: 'mainline.clearance', allow: false }).ok);
+      advance(s);
+      assert.ok(card(s, node).holding?.includes(tray.id), 'the Superintendent held it and it left anyway');
+    });
+  });
+
+  /**
+   * FOUND BY PLAYING IT, not by the tests above: an Extra started anywhere but a Division Point was
+   * never offered a car and ran empty.
+   *
+   * `isBeingMadeUp` asked only "is this tray standing at a Division Point", which was the whole
+   * truth while that was the only place to build a train. The Control Point start has therefore
+   * shipped since it was added with a train that could not be loaded, and the Interchange start
+   * would have shipped the same way — against Jesse's report, which says an Extra started at the
+   * Interchange "would be Loaded with cars".
+   */
+  describe('an Extra started away from a Division Point can still be made up', () => {
+    const fill = (s: GameState): string[] => {
+      for (let i = 0; i < MAX_CONSIST + 1; i++) {
+        const options = legalActions(s, s.clock.currentActor ?? 0).filter((a) => a.type === 'newTrain.placeCar');
+        if (options.length === 0) break;
+        assert.ok(applyIntent(s, s.clock.currentActor ?? 0, options[0]!).ok);
+      }
+      return started(s).consist.map((c) => c.type);
+    };
+
+    it('takes a consist in the Interchange yard', () => {
+      const s = pending(18);
+      const node = withInterchange(s);
+      assert.ok(applyIntent(s, 0, {
+        type: 'newTrain.startExtra', trainNumber: 18, start: { kind: 'mainline', node }, direction: 'east',
+      }).ok);
+      assert.ok(fill(s).length > 0, 'the Extra was never offered a car and would have run empty');
+    });
+
+    it('takes a consist at a Control Point', () => {
+      const s = pending(18, 'depot');
+      assert.ok(applyIntent(s, 0, {
+        type: 'newTrain.startExtra', trainNumber: 18, start: { kind: 'office', seat: 0 }, direction: 'east',
+      }).ok);
+      assert.ok(fill(s).length > 0, 'the Extra was never offered a car and would have run empty');
+    });
+
+    it('stops being made up the moment it starts running', () => {
+      // Otherwise a train out on the Mainline could be handed cars from the Division Yard — the
+      // "cars appearing on a train nobody was making up" bug `isBeingMadeUp` exists to prevent.
+      const s = pending(18);
+      const node = withInterchange(s);
+      assert.ok(applyIntent(s, 0, {
+        type: 'newTrain.startExtra', trainNumber: 18, start: { kind: 'mainline', node }, direction: 'east',
+      }).ok);
+      const tray = started(s);
+      s.clock.phase = 'mainline';
+      s.movedThisPhase = new Set();
+      advance(s);
+      assert.equal(s.trays.get(tray.id)?.beingMadeUp, undefined, 'a running train is still being made up');
+      assert.equal(isBeingMadeUp(s.trays.get(tray.id)!), false);
+    });
+  });
+
+  it('replays a save written before the choice existed exactly as it meant it', () => {
+    /**
+     * A save is a seed and a list of intents, so an intent whose meaning moves is a save that
+     * quietly replays as a different game. The legacy shape carried only `atSeat`: null meant the
+     * Division Point the NUMBER sent it to, running in the number's direction.
+     */
+    const s = pending(17);
+    assert.ok(applyIntent(s, 0, { type: 'newTrain.startExtra', trainNumber: 17, atSeat: null }).ok);
+    const tray = started(s);
+    assert.equal(tray.direction, 'west', 'the legacy intent stopped meaning what it meant');
+    assert.equal(tray.position.at === 'divisionPoint' && tray.position.side, 'east');
+  });
+
+  it('takes the Extra off the pending list once, whichever end it started from', () => {
+    const s = pending(17);
+    const at = { type: 'newTrain.startExtra', trainNumber: 17, start: { kind: 'divisionPoint', side: 'east' } } as const;
+    assert.ok(applyIntent(s, 0, at).ok);
+    assert.deepEqual(s.pendingExtras, []);
+    assert.equal(check(s, 0, at), 'NO_EXTRA_PENDING');
+  });
+});

test/cut-ordering.test.ts

@@ -0,0 +1,373 @@
+/**
+ * §A.3 — cars occupy the track "in the same order they originally held, left-to-right".
+ *
+ * Left-to-right is west-to-east, and `TrackCard.standing` had no defined orientation at all until
+ * this release. Three reports came out of that one omission and each gets its own battery here:
+ * a cut parked in a different order depending on how many cars were set out at once; a train that
+ * got the identical consist whichever end it approached a cut from; and a train that drove straight
+ * through the cars it had just set out.
+ */
+
+import { describe, it } from 'node:test';
+import assert from 'node:assert/strict';
+
+import { applyIntent, areaOf, check } from '../src/engine/apply.ts';
+import { createGame } from '../src/engine/setup.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',
+  victory: 'highestAfterDays',
+  length: 'standard',
+  optionalRules: {
+    reducedVisibility: false,
+    sisterTrains: false,
+    employeeRotation: false,
+    emergencyToolbox: false,
+  },
+};
+
+const game = (seed = 77): GameState => createGame({ id: 'g', seed, config, playerNames: ['Jesse'] });
+const at = (row: number, col: number): GridCoord => ({ row, col });
+const car = (type: string, loaded = false): RollingStock => ({ type, loaded }) as RollingStock;
+
+const straight = (standing: RollingStock[] = []): TrackCard => ({
+  geometry: { kind: 'track', geometry: 'straight' },
+  baseOperationalRail: true,
+  standing,
+  standingWest: 0,
+  facility: null,
+  modifiers: [],
+  enhancements: [],
+});
+
+function addCard(s: GameState, coord: GridCoord, card: TrackCard): void {
+  areaOf(s, 0).grid.set(coordKey(coord), card);
+}
+
+/** A row of plain straights, on row 1 — row 0 is the Running Track and holds the Office. */
+function row(s: GameState, n: number): void {
+  for (let c = 0; c < n; c++) addCard(s, at(1, c), straight());
+}
+
+function placeTray(
+  s: GameState,
+  coord: GridCoord,
+  consist: RollingStock[],
+  facing: 'e' | 'w',
+  engineAt = 0,
+): string {
+  const id = s.freeTrays.pop()!;
+  s.trays.set(id, {
+    id,
+    trainNumber: null,
+    trainIsExtra: false,
+    engineAt,
+    consist,
+    direction: facing === 'w' ? 'west' : 'east',
+    facing,
+    railFacing: facing,
+    position: { at: 'grid', seat: 0, coord },
+    movesUsed: 0,
+  } as CrewTray);
+  return id;
+}
+
+/** Puts the game in the one phase switching intents are legal in. */
+function switching(s: GameState): void {
+  s.clock.phase = 'localOps';
+  s.clock.currentActor = 0;
+  turnOf(s, 0).option = 'switch';
+}
+
+const types = (cars: readonly RollingStock[]): string[] => cars.map((c) => c.type);
+
+const FOUR = (): RollingStock[] => [car('boxcar'), car('hopper'), car('reefer'), car('tank')];
+
+const standingAt = (s: GameState, coord: GridCoord): string[] =>
+  types(carsOn(areaOf(s, 0).grid.get(coordKey(coord))!));
+
+// ---------------------------------------------------------------------------
+
+describe('a cut parks in the same order however many cars come off at once', () => {
+  /**
+   * Reported: "when dropping all 4 cars, order was reversed. It worked properly if we dropped cars
+   * individually." Both halves are the same bug — `carsDropped` pushed onto the end of the array
+   * whatever end the cut came off, so the answer depended on how the player chose to spend the drop.
+   *
+   * A drop costs no Moves, so one drop of four and four drops of one are the SAME turn played two
+   * ways. They must park the same cars in the same order, and that is the whole property.
+   */
+  function park(facing: 'e' | 'w', fromNose: boolean, batches: number[]): string[] {
+    const s = game();
+    row(s, 1);
+    // The engine goes at whichever end lets the cut come off the one being tested: cars ahead of it
+    // for a nose drop, behind it for a tail drop.
+    const id = placeTray(s, at(1, 0), FOUR(), facing, fromNose ? 4 : 0);
+    switching(s);
+    for (const count of batches) {
+      const r = applyIntent(s, 0, {
+        type: 'switch.dropCars',
+        trayId: id,
+        count,
+        ...(fromNose ? { fromNose: true } : {}),
+      });
+      assert.ok(r.ok, `drop of ${count} refused: ${r.ok ? '' : r.code}`);
+    }
+    return standingAt(s, at(1, 0));
+  }
+
+  for (const facing of ['e', 'w'] as const) {
+    for (const fromNose of [false, true]) {
+      const end = fromNose ? 'nose' : 'tail';
+      it(`is batch-invariant off the ${end}, facing ${facing}`, () => {
+        const all = park(facing, fromNose, [4]);
+        assert.equal(all.length, 4, 'all four cars should be standing on the card');
+        assert.deepEqual(park(facing, fromNose, [1, 1, 1, 1]), all, 'four singles parked a different order than one four');
+        assert.deepEqual(park(facing, fromNose, [2, 2]), all, 'two pairs parked a different order again');
+      });
+    }
+  }
+
+  it('parks west-to-east, so an east-facing train sets its tail cut out behind itself', () => {
+    // Consist is nose first and the nose points east, so `[boxcar hopper reefer tank]` stands on the
+    // ground as tank, reefer, hopper, boxcar reading west to east. The tail car is the westmost.
+    assert.deepEqual(park('e', false, [4]), ['tank', 'reefer', 'hopper', 'boxcar']);
+    // Facing west the tray already reads west-to-east, so it goes down as it stands.
+    assert.deepEqual(park('w', false, [4]), ['boxcar', 'hopper', 'reefer', 'tank']);
+  });
+
+  it('keeps the two cuts apart when a train sets out off both ends on one square', () => {
+    // §A.3 lets a cut come off either outer end, so both can happen on one square. The engine ends
+    // up standing between them, which is the thing `standingWest` exists to record.
+    const s = game();
+    row(s, 1);
+    const id = placeTray(s, at(1, 0), FOUR(), 'e', 2);
+    switching(s);
+    assert.ok(applyIntent(s, 0, { type: 'switch.dropCars', trayId: id, count: 1, fromNose: true }).ok);
+    assert.ok(applyIntent(s, 0, { type: 'switch.dropCars', trayId: id, count: 1 }).ok);
+
+    // Facing east: the nose cut (boxcar) is set out east of the engine, the tail cut (tank) west.
+    assert.deepEqual(standingAt(s, at(1, 0)), ['tank', 'boxcar']);
+    // `standingWest` lives on the CARD now, not the tray (docs/plans/switching-paths.md — "The
+    // Roster Pass"): the Office is the one square more than one train may share, and a cut lies
+    // west or east of the block of A/D tracks rather than of any one engine.
+    assert.equal(
+      areaOf(s, 0).grid.get(coordKey(at(1, 0)))!.standingWest,
+      1,
+      'the engine should be standing between the two cuts',
+    );
+  });
+});
+
+// ---------------------------------------------------------------------------
+
+describe('a parked cut mirrors depending on which end the train comes from', () => {
+  /**
+   * The consist a train ends up with must depend on which way it ran, or a run-around buys nothing.
+   * `couples` was accumulated in path order with no reference to the direction of travel, so both
+   * approaches produced the identical tray.
+   */
+  function collect(from: 'west' | 'east'): string[] {
+    const s = game();
+    row(s, 3);
+    // The cut stands on the middle square, boxcar west of hopper.
+    addCard(s, at(1, 1), straight([car('boxcar'), car('hopper')]));
+    const start = from === 'west' ? at(1, 0) : at(1, 2);
+    const to = from === 'west' ? at(1, 2) : at(1, 0);
+    const id = placeTray(s, start, [], from === 'west' ? 'e' : 'w');
+    switching(s);
+    const r = applyIntent(s, 0, { type: 'switch.move', trayId: id, to, reverse: false });
+    assert.ok(r.ok, `the run was refused: ${r.ok ? '' : r.code}`);
+    return types(s.trays.get(id)!.consist);
+  }
+
+  it('gives mirrored consists, never the same one twice', () => {
+    const eastbound = collect('west');
+    const westbound = collect('east');
+    assert.notDeepEqual(eastbound, westbound, 'approaching from either end gave the identical consist');
+    assert.deepEqual(eastbound, [...westbound].reverse(), 'the two approaches are not mirror images');
+  });
+
+  it('puts the car the engine met LAST on the nose, running forward', () => {
+    // Running east onto boxcar-then-hopper, the engine pushes the boxcar ahead of it and picks the
+    // hopper up in front of that. Nose first, the tray reads hopper, boxcar.
+    assert.deepEqual(collect('west'), ['hopper', 'boxcar']);
+    assert.deepEqual(collect('east'), ['boxcar', 'hopper']);
+  });
+
+  it('couples behind the train nearest-car-first when backing up', () => {
+    const s = game();
+    row(s, 3);
+    addCard(s, at(1, 1), straight([car('boxcar'), car('hopper')]));
+    // Facing east at the east end, so backing up runs WEST into the cut: it meets the hopper first.
+    const id = placeTray(s, at(1, 2), [car('caboose')], 'e');
+    switching(s);
+    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', 'hopper', 'boxcar']);
+  });
+});
+
+// ---------------------------------------------------------------------------
+
+describe('a train may not drive through the cut on its own card (§A.4)', () => {
+  /**
+   * Reported: "if I put cars off the nose on a given track, and my next move is go forward, I need
+   * to couple those cars right back on." The walk started at the NEIGHBOUR of the start square and
+   * never read the start card at all, so the cut was simply left behind.
+   *
+   * The rule is direction-sensitive, which is the point: only the cut at the end the train pulls out
+   * through is in the way. That is what makes setting out off one particular end a decision.
+   */
+  function runOut(fromNose: boolean, reverse: boolean): { consist: string[]; left: string[] } {
+    const s = game();
+    row(s, 3);
+    const id = placeTray(s, at(1, 1), [car('boxcar'), car('hopper')], 'e', fromNose ? 2 : 0);
+    switching(s);
+    assert.ok(
+      applyIntent(s, 0, {
+        type: 'switch.dropCars',
+        trayId: id,
+        count: 1,
+        ...(fromNose ? { fromNose: true } : {}),
+      }).ok,
+    );
+    const to = reverse ? at(1, 0) : at(1, 2);
+    const r = applyIntent(s, 0, { type: 'switch.move', trayId: id, to, reverse });
+    assert.ok(r.ok, `the move was refused: ${r.ok ? '' : r.code}`);
+    return { consist: types(s.trays.get(id)!.consist), left: standingAt(s, at(1, 1)) };
+  }
+
+  it('picks a nose cut back up when it pulls forward through it', () => {
+    const out = runOut(true, false);
+    assert.deepEqual(out.left, [], 'the cut was left standing on the card the train pulled out of');
+    assert.equal(out.consist.length, 2, 'the train should have both cars back');
+  });
+
+  it('leaves a nose cut standing when it backs away from it instead', () => {
+    const out = runOut(true, true);
+    assert.deepEqual(out.left, ['boxcar'], 'backing away from a nose cut should leave it where it is');
+    assert.deepEqual(out.consist, ['hopper']);
+  });
+
+  it('encodes §A.5’s trailing-point step 1 — drop the back cars, then pull away from them', () => {
+    // "Drop the back two cars (blue and red) on Card F. Move train to Card B." The whole example
+    // collapses if that first move drags them along again.
+    const s = game();
+    row(s, 3);
+    const id = placeTray(s, at(1, 2), FOUR(), 'w');
+    switching(s);
+    assert.ok(applyIntent(s, 0, { type: 'switch.dropCars', trayId: id, count: 2 }).ok);
+    const r = applyIntent(s, 0, { type: 'switch.move', trayId: id, to: at(1, 0), reverse: false });
+    assert.ok(r.ok, `pulling away from the set-out cars was refused: ${r.ok ? '' : r.code}`);
+    assert.deepEqual(types(s.trays.get(id)!.consist), ['boxcar', 'hopper'], 'the train kept cars it had set out');
+    assert.deepEqual(
+      standingAt(s, at(1, 2)),
+      ['reefer', 'tank'],
+      'the two cars set out should still be standing on the square the train left',
+    );
+  });
+
+  it('counts the own cut against the four-car limit', () => {
+    // A full tray that sets out one car cannot simply pull forward through it again — that would be
+    // five cars, and coupling is mandatory, so the MOVE is what has to be refused.
+    const s = game();
+    row(s, 3);
+    const id = placeTray(s, at(1, 1), FOUR(), 'e', 4);
+    switching(s);
+    assert.ok(applyIntent(s, 0, { type: 'switch.dropCars', trayId: id, count: 1, fromNose: true }).ok);
+    // Refill the tray so the recoupled car would be a fifth.
+    s.trays.get(id)!.consist = FOUR();
+    assert.equal(check(s, 0, { type: 'switch.move', trayId: id, to: at(1, 2), reverse: false }), 'ILLEGAL_MOVE');
+    // Backing away from it is still legal — the cut is not at that end.
+    assert.equal(check(s, 0, { type: 'switch.move', trayId: id, to: at(1, 0), reverse: true }), null);
+  });
+});
+
+// ---------------------------------------------------------------------------
+
+describe('the round trip comes back with the train it started with', () => {
+  /**
+   * Drop, run clear, back up, collect. This was already self-consistent before the fix — whatever
+   * order got parked came back — and it has to STAY that way now that both halves have changed, at
+   * both facings and every batch size.
+   */
+  for (const facing of ['e', 'w'] as const) {
+    for (const batches of [[4], [1, 1, 1, 1], [2, 2]]) {
+      it(`survives ${batches.join('+')} cars set out, facing ${facing}`, () => {
+        const s = game();
+        row(s, 3);
+        const start = facing === 'e' ? at(1, 0) : at(1, 2);
+        const away = facing === 'e' ? at(1, 2) : at(1, 0);
+        const before = types(FOUR());
+        const id = placeTray(s, start, FOUR(), facing);
+        switching(s);
+        turnOf(s, 0).movesRemaining = 6;
+
+        for (const count of batches) {
+          assert.ok(applyIntent(s, 0, { type: 'switch.dropCars', trayId: id, count }).ok);
+        }
+        assert.equal(s.trays.get(id)!.consist.length, 0, 'the whole train should be on the ground');
+
+        // Pull forward clear of the cut, then back up onto it again.
+        assert.ok(applyIntent(s, 0, { type: 'switch.move', trayId: id, to: away, reverse: false }).ok);
+        const back = applyIntent(s, 0, { type: 'switch.move', trayId: id, to: start, reverse: true });
+        assert.ok(back.ok, `backing onto the cut was refused: ${back.ok ? '' : back.code}`);
+
+        assert.deepEqual(types(s.trays.get(id)!.consist), before, 'the train came back in a different order');
+        assert.deepEqual(standingAt(s, start), [], 'cars were left behind');
+      });
+    }
+  }
+});
+
+// ---------------------------------------------------------------------------
+
+describe('taking your own cut back is undoing the drop, not a fresh pick-up', () => {
+  /**
+   * Jesse's call, of the two answers the plan put up. Trains 3/4 print "may drop OR pick up one
+   * freight car at every location" and the two share one budget, so a drop off the nose would
+   * otherwise leave the train forbidden to pull forward past its own cars — a legal-looking move
+   * that is silently one-way. Same shape for X13's "drop but not pick up".
+   */
+  it('refunds the 3/4 Express its per-location freight budget', () => {
+    const s = game();
+    row(s, 3);
+    const id = placeTray(s, at(1, 1), [car('boxcar'), car('hopper')], 'e', 2);
+    s.trays.get(id)!.trainNumber = 3;
+    switching(s);
+    turnOf(s, 0).movesRemaining = 6;
+
+    assert.ok(applyIntent(s, 0, { type: 'switch.dropCars', trayId: id, count: 1, fromNose: true }).ok);
+    const r = applyIntent(s, 0, { type: 'switch.move', trayId: id, to: at(1, 2), reverse: false });
+    assert.ok(r.ok, `the Express could not take its own car back: ${r.ok ? '' : r.code}`);
+    assert.equal(s.trays.get(id)!.consist.length, 2, 'the car it set out should be back on the train');
+    assert.deepEqual(
+      Object.values(turnOf(s, 0).freightWorked).filter((n) => n > 0),
+      [],
+      'the drop it undid is still charged against the square it was made on',
+    );
+  });
+
+  it('still charges a genuine pick-up', () => {
+    // The exemption is for YOUR OWN cut and nothing else: a car that was already standing there when
+    // the crew arrived is an ordinary pick-up and the budget still bites.
+    const s = game();
+    row(s, 3);
+    addCard(s, at(1, 2), straight([car('reefer')]));
+    const id = placeTray(s, at(1, 1), [car('boxcar'), car('hopper')], 'e', 2);
+    s.trays.get(id)!.trainNumber = 3;
+    switching(s);
+    turnOf(s, 0).movesRemaining = 6;
+
+    assert.ok(applyIntent(s, 0, { type: 'switch.dropCars', trayId: id, count: 1, fromNose: true }).ok);
+    assert.ok(applyIntent(s, 0, { type: 'switch.move', trayId: id, to: at(1, 2), reverse: false }).ok);
+    assert.equal(
+      turnOf(s, 0).freightWorked[`${id}@${coordKey(at(1, 2))}`],
+      1,
+      'only the car that was already standing there should be charged',
+    );
+  });
+});

test/enhancements.test.ts

@@ -14,7 +14,7 @@ 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, subdivisions } from '../src/engine/state.ts';
+import { coordKey, subdivisions, turnOf } from '../src/engine/state.ts';
 
 const config: GameConfig = {
   mode: 'solitaire',
@@ -29,6 +29,7 @@ const straight = (): TrackCard => ({
   geometry: { kind: 'track', geometry: 'straight' },
   baseOperationalRail: true,
   standing: [],
+  standingWest: 0,
   facility: null,
   modifiers: [],
   enhancements: [],
@@ -38,7 +39,15 @@ function addCard(s: GameState, coord: GridCoord, card: TrackCard): void {
   areaOf(s, 0).grid.set(coordKey(coord), card);
 }
 
-/** Puts an enhancement card in hand and returns its id. */
+/**
+ * An Enhancement in hand — minting one if the deck does not deal it.
+ *
+ * Facing Point Locks, the Water Column and the Overpass answer opponent-directed cards, which are
+ * held out of every deck until they are implemented, so those three are no longer dealt either
+ * (v0.4.7). Their RULES are still live and still worth testing: they fire the moment their attacker
+ * returns, and a rule nobody exercises is a rule that rots. So the card is put in hand directly
+ * rather than fished out of a deck that deliberately no longer contains it.
+ */
 function handEnhancement(s: GameState, key: string): string {
   for (const [id, card] of s.cards) {
     if (card.kind.kind === 'enhancement' && card.kind.key === key) {
@@ -46,7 +55,10 @@ function handEnhancement(s: GameState, key: string): string {
       return id;
     }
   }
-  throw new Error(`no enhancement card: ${key}`);
+  const id = `mint-${key}-${s.cards.size}`;
+  s.cards.set(id, { id, kind: { kind: 'enhancement', key } } as never);
+  s.decks.hands.set(0, [id]);
+  return id;
 }
 
 /** Puts a specific track card in hand and returns its id. */
@@ -65,7 +77,7 @@ function placeTray(s: GameState, coord: GridCoord, consist: TrackCard['standing'
   const id = s.freeTrays.pop()!;
   s.trays.set(id, {
     id, trainNumber: 9, trainIsExtra: false, engineAt: 0,
-    consist, direction: 'east', position: { at: 'grid', owner: 0, coord }, movesUsed: 0,
+    consist, direction: 'east', position: { at: 'grid', seat: 0, coord }, movesUsed: 0,
   });
   return id;
 }
@@ -197,9 +209,9 @@ describe('Small Yard — the card that makes switching solvable', () => {
 
   it('costs one Move — "spends one move in the yard"', () => {
     const { s, tray } = yardGame();
-    const before = s.turn.movesRemaining;
+    const before = turnOf(s, 0).movesRemaining;
     applyIntent(s, 0, { type: 'switch.sortConsist', trayId: tray, order: [2, 1, 0] });
-    assert.equal(s.turn.movesRemaining, before - 1);
+    assert.equal(turnOf(s, 0).movesRemaining, before - 1);
   });
 
   it('is refused anywhere without a Small Yard', () => {
@@ -332,13 +344,26 @@ describe('ABS Signals amend the collision rule', () => {
 
 // ---------------------------------------------------------------------------
 
-describe('one Revenue for every train that clears your section', () => {
+describe('train revenue per transit — paid to EVERY player when a train completes its run', () => {
+  /**
+   * `trainPerTransit` is a dial now, and it defaults to ZERO: at 1 it was worth ~5.4 Revenue against
+   * a bot mean of 7.0, drowning out the freight and passenger economies the game is about. These
+   * tests are about the rule, so they set the rate; the last one is about the default.
+   */
+  const paying = (rate = 1, seed = 5): GameState =>
+    createGame({
+      id: 'g',
+      seed,
+      config: { ...config, houseRules: { revenue: { trainPerTransit: rate } } },
+      playerNames: ['p'],
+    });
+
   /** A train sitting on the A/D track, made up and ready to highball. */
   const readyToLeave = (s: GameState, direction: 'east' | 'west' = 'east'): string => {
     const id = 'leaving';
     s.trays.set(id, {
       id, trainNumber: 2, trainIsExtra: false, engineAt: 0,
-      consist: [], direction, position: { at: 'grid', owner: 0, coord: areaOf(s, 0).officeCoord },
+      consist: [], direction, position: { at: 'grid', seat: 0, coord: areaOf(s, 0).officeCoord },
       movesUsed: 0,
     });
     areaOf(s, 0).adOccupancy.push(id);
@@ -348,35 +373,87 @@ describe('one Revenue for every train that clears your section', () => {
     return id;
   };
 
-  it('pays the owner when a train departs onto the Mainline', () => {
+  it('pays nothing for merely leaving the Office', () => {
+    /**
+     * THE RULE CHANGED IN v0.4.2. It used to pay 1 to the Office a train departed, which meant a
+     * five-Office railroad paid five times for one train and paid most to whoever it happened to
+     * pass first. Departing is now worth nothing on its own.
+     */
     const s = game();
     const before = s.players[0]!.revenue;
     readyToLeave(s, 'east');
 
-    const r = advance(s);
+    advance(s);
 
-    assert.equal(s.players[0]!.revenue, before + 1, 'clearing a train earned nothing');
+    assert.equal(s.players[0]!.revenue, before, 'departing the Office still paid');
-    assert.ok(
-      r.events.some((e) => e.type === 'revenueChanged' && e.reason === 'a train cleared your section'),
-      'no revenue event was emitted for the departure',
-    );
-
-    // Paid ONCE. Running off the end of the Division later is not a second departure — that far
-    // Division Point belongs to whoever is seated at it.
-    const after = s.players[0]!.revenue;
-    for (let i = 0; i < 8; i++) { s.movedThisPhase = new Set(); s.clock.phase = 'mainline'; advance(s); }
-    assert.equal(s.players[0]!.revenue, after, 'the same train was paid for a second time on its way out');
   });
 
-  it('pays nothing for a local crew, which is switching rather than departing', () => {
+  it('pays every player once the train runs off the end of the Division', () => {
-    const s = game();
+    const s = paying();
+    const before = s.players.map((p) => p.revenue);
+    readyToLeave(s, 'east');
+
+    // Run the Mainline Phase until the train has crossed the Division and left it.
+    const seen: typeof s.players[number]['revenue'][] = [];
+    let completed: { type: string; side?: string } | undefined;
+    for (let i = 0; i < 20 && !completed; i++) {
+      s.movedThisPhase = new Set();
+      s.clock.phase = 'mainline';
+      const r = advance(s);
+      completed = r.events.find((e) => e.type === 'trainCompleted');
+      if (completed) {
+        assert.equal(completed.side, 'east', 'an eastbound train left by the wrong Division Point');
+        assert.ok(
+          r.events.some((e) => e.type === 'revenueChanged' && e.reason === 'a train completed its run'),
+          'no revenue event was emitted for the completed run',
+        );
+      }
+      seen.push(s.players[0]!.revenue);
+    }
+    assert.ok(completed, 'the train never left the Division');
+    assert.deepEqual(s.players.map((p) => p.revenue), before.map((r) => r + 1), 'not every player was paid');
+
+    // Paid ONCE — the train is gone, so there is nothing left to pay again.
+    const after = s.players.map((p) => p.revenue);
+    for (let i = 0; i < 8; i++) { s.movedThisPhase = new Set(); s.clock.phase = 'mainline'; advance(s); }
+    assert.deepEqual(s.players.map((p) => p.revenue), after, 'the same run was paid twice');
+  });
+
+  it('pays nothing for a local crew, which is switching rather than running', () => {
+    const s = paying();
     const before = s.players[0]!.revenue;
     const id = readyToLeave(s, 'east');
     s.trays.get(id)!.trainNumber = null;
 
-    advance(s);
+    for (let i = 0; i < 20; i++) { s.movedThisPhase = new Set(); s.clock.phase = 'mainline'; advance(s); }
 
-    assert.equal(s.players[0]!.revenue, before, 'a switching crew was paid as though it had cleared the section');
+    assert.equal(s.players[0]!.revenue, before, 'a switching crew was paid as though it had completed a run');
+  });
+
+  it('pays at the rate the game was dealt with, and nothing at the default of zero', () => {
+    // Zero is not "one, suppressed": no revenue event is emitted at all, so the history does not
+    // fill with "+0 Revenue" for work that did not pay.
+    const run = (rate: number): { revenue: number; events: number } => {
+      const s = rate === 0 ? game() : paying(rate);
+      readyToLeave(s, 'east');
+      let events = 0;
+      let done = false;
+      for (let i = 0; i < 20 && !done; i++) {
+        s.movedThisPhase = new Set();
+        s.clock.phase = 'mainline';
+        const r = advance(s);
+        events += r.events.filter(
+          (e) => e.type === 'revenueChanged' && e.reason === 'a train completed its run',
+        ).length;
+        done = r.events.some((e) => e.type === 'trainCompleted');
+      }
+      assert.ok(done, `the train never left the Division at rate ${rate}`);
+      return { revenue: s.players[0]!.revenue, events };
+    };
+
+    assert.deepEqual(run(0), { revenue: 0, events: 0 }, 'the default paid for a transit');
+    assert.deepEqual(run(1), { revenue: 1, events: 1 });
+    assert.deepEqual(run(5), { revenue: 5, events: 1 }, 'the top of the range pays 5 in one event');
   });
 });
 
@@ -391,8 +468,10 @@ describe('§8.1 — a train that just arrived from the mainline stops for the St
    * Nothing states the rule, which makes it exactly the kind of property a later change to the loop
    * would break in silence. These pin it.
    *
-   * It is also what gives the printed **Expedite** rule something to do — an Expedited train is
+   * v0.4.9 CORRECTED Q3 so **Expedite is not an exception to this any more**: an Expedited train
-   * granted a second `moveTrain` in the same phase precisely because the general rule forbids it.
+   * stops for the Stage exactly like any other and may be switched in the Local Operations turn that
+   * follows. What Expedite restricts is where the train may be left standing afterwards, not when it
+   * departs — see `advance.test.ts`'s `expediteFault` coverage for that half.
    */
   const arriving = (s: GameState, trainNumber: number, isExtra = false): string => {
     const id = 'arriving';
@@ -425,9 +504,15 @@ describe('§8.1 — a train that just arrived from the mainline stops for the St
     );
   });
 
-  it('unless its card prints Expedite, which exists to override exactly this', () => {
+  it('an Expedite train follows the same rule now — no exception any more', () => {
-    // Q3. Train 3 prints `expedite`, so it arrives and departs in one Stage — still subject to the
+    /**
-    // rest of §8.1, which is why the clearance path is re-entered rather than skipped.
+     * Q3, as CORRECTED in v0.4.9. Before this, an Expedite train left the Stage it arrived — at the
+     * end of it rather than inside the Mainline Phase (v0.4.2's fix for coaches otherwise never
+     * reaching Load/Unload) — which made it the one exception to "stops for the Stage". That forced
+     * departure is gone: Expedite no longer changes WHEN a train leaves, only where it may be left
+     * standing afterwards (`expediteFault`, pinned in `advance.test.ts`). So it stops for the Stage
+     * exactly like Train 9 above.
+     */
     const s = game();
     assert.equal(trainProfile(3, false)?.rules.expedite, true, 'train 3 should be an Expedite train');
     const id = arriving(s, 3);
@@ -435,9 +520,10 @@ describe('§8.1 — a train that just arrived from the mainline stops for the St
     advance(s);
 
     assert.equal(
-      s.trays.get(id)!.position.at, 'mainline',
+      s.trays.get(id)!.position.at, 'grid',
-      'an Expedite train should leave again the Stage it arrives',
+      'an Expedite train departed again in the same Stage it arrived from a mainline card',
     );
+    assert.ok(areaOf(s, 0).adOccupancy.includes(id), 'it is not standing on an A/D track');
   });
 });
 
@@ -573,6 +659,50 @@ describe('Telegraph, Telephone and Radio dispatch meets', () => {
     assert.deepEqual(s.trays.get('mine')!.position, { at: 'divisionPoint', side: 'west' });
   });
 
+  it('holds against an uncleared facing train even if a same-direction one is checked first', () => {
+    // Reproduces a playtest report: the Superintendent was asked to rule on a same-direction train
+    // instead of being automatically held against an opposite-direction one also occupying the
+    // card. Root cause — `evaluateClearance` returned on whichever occupant it examined first, in
+    // `node.transits` insertion order, rather than checking every occupant. Only visible once a
+    // card can hold two trains at once, which the Telegraph/Telephone/Radio exception is exactly
+    // what creates: a facing train dispatched past another sits on the same card as it.
+    const s = game();
+    const ml = s.division.nodes[1];
+    assert.equal(ml?.kind, 'mainline');
+    if (ml?.kind === 'mainline') {
+      ml.card = 'plains';
+      // SAME direction, entered the transit list FIRST — what the old code asked about.
+      s.trays.set('sameDir', {
+        id: 'sameDir', trainNumber: 3, trainIsExtra: false, engineAt: 0,
+        consist: [], direction: 'east', position: { at: 'mainline', index: 1 }, movesUsed: 0,
+      });
+      ml.transits.push({ tray: 'sameDir', stagesRemaining: 2, stagesTotal: 2, direction: 'east' });
+      // OPPOSITE direction, entered SECOND, no dispatch device on the board — an absolute bar.
+      s.trays.set('facing', {
+        id: 'facing', trainNumber: 5, trainIsExtra: false, engineAt: 0,
+        consist: [], direction: 'west', position: { at: 'mainline', index: 1 }, movesUsed: 0,
+      });
+      ml.transits.push({ tray: 'facing', stagesRemaining: 2, stagesTotal: 2, direction: 'west' });
+    }
+    s.trays.set('mine', {
+      id: 'mine', trainNumber: 9, trainIsExtra: false, engineAt: 0,
+      consist: [], direction: 'east', position: { at: 'divisionPoint', side: 'west' }, movesUsed: 0,
+    });
+    s.clock.phase = 'mainline';
+    s.movedThisPhase = new Set();
+
+    const r = advance(s);
+
+    assert.equal(
+      s.trays.get('mine')!.position.at, 'divisionPoint',
+      'the train entered despite an uncleared opposite-direction occupant on the card',
+    );
+    assert.ok(
+      !r.events.some((e) => e.type === 'clearanceRequested'),
+      'the Superintendent was asked to rule on the same-direction occupant instead of an automatic hold',
+    );
+  });
+
   it('lets a junior train win the meet with a Telegraph', () => {
     // Train 9 against Train 3: +4 makes the other count as 7 — still senior. Radio's +12 wins.
     const s = game();

test/events.test.ts

@@ -0,0 +1,133 @@
+/**
+ * What the event log is, and what it is not.
+ *
+ * The README, four architecture documents and six source comments all claimed `state = fold(events)`
+ * until v0.4.0. It was never true, and the claim was load-bearing — it was the stated justification
+ * for reconnection, restart recovery and persistence, none of which were built yet. This file makes
+ * the real shape checkable so the claim cannot quietly come back.
+ *
+ * The decision (`docs/architecture/protocol.md` §3): **the intents are canonical.** A game is
+ * `{ seed, history: Intent[] }`, `fromSave` replays it exactly, and events narrate.
+ */
+
+import { describe, it } from 'node:test';
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import { join } from 'node:path';
+
+import { fromSave, newGame, submit, toSave, view } from '../src/web/game.ts';
+import { actionGroups, currentActor } from '../src/web/game.ts';
+
+const src = (rel: string): string => readFileSync(join(import.meta.dirname, '..', 'src', rel), 'utf8');
+
+/** Every `type: 'x'` in the `GameEvent` union. */
+function eventTypes(): Set<string> {
+  const text = src('engine/events.ts');
+  const union = text.slice(text.indexOf('export type GameEvent ='));
+  return new Set([...union.matchAll(/type: '([a-zA-Z]+)'/g)].map((m) => m[1]!));
+}
+
+/** Every `case 'x':` inside `reduce`. */
+function reducedTypes(): Set<string> {
+  const text = src('engine/apply.ts');
+  const body = text.slice(text.indexOf('export function reduce'));
+  return new Set([...body.matchAll(/case '([a-zA-Z]+)':/g)].map((m) => m[1]!));
+}
+
+/**
+ * The event types the reducer does not handle, as of v0.4.0.
+ *
+ * Every one is emitted by the phase driver in `advance.ts`, which mutates state and then describes
+ * what it did. Read the list: it is the clock, plus the entire Mainline phase — which is to say every
+ * train movement in the game. That is why folding the log rebuilds a district and not a railroad.
+ */
+const KNOWN_UNREDUCED = [
+  'actorChanged',
+  'carPassed',
+  'clearanceRequested',
+  'dispatchBonusUsed',
+  'expediteFault',
+  'phaseBegan',
+  'stageBegan',
+  'trainArrived',
+  'trainCompleted',
+  'trainDiverted',
+  'trainHeld',
+  'trainHighballed',
+  'trainMadeUp',
+  'trainStoodStill',
+  'trainsDestroyed',
+];
+
+describe('the event log narrates but does not reconstruct', () => {
+  it('has exactly the unreduced event types it is documented to have', () => {
+    /**
+     * A CHANGE-DETECTOR ON PURPOSE. If this fails because the list shrank, someone has made the
+     * phase driver reduce — good, and the docs in `protocol.md` §3, `events.ts` and the README now
+     * understate the engine and should be corrected in the same change. If it fails because the list
+     * GREW, a new event was added on the mutate-then-describe path, which is worth knowing before it
+     * becomes another thing the log cannot rebuild.
+     */
+    const all = eventTypes();
+    const reduced = reducedTypes();
+    const unreduced = [...all].filter((t) => !reduced.has(t)).sort();
+    assert.deepEqual(
+      unreduced,
+      KNOWN_UNREDUCED,
+      'the set of events the reducer ignores has changed — see the comment above KNOWN_UNREDUCED',
+    );
+  });
+
+  it('never folds events in the phase driver, which is what makes the above true', () => {
+    // `advance.ts` mutating directly is the whole mechanism. If it ever starts calling `reduce`,
+    // the claim becomes recoverable and this file should be rewritten rather than relaxed.
+    assert.doesNotMatch(
+      src('engine/advance.ts'),
+      /\breduce\(s[,)]/,
+      'the phase driver now folds events — reconsider the canonical-record decision',
+    );
+  });
+});
+
+describe('the intents are what reconstructs a game', () => {
+  it('replays a partly-played game to exactly the same position', () => {
+    // The property that actually holds, stated as a test rather than as a comment. This is what
+    // save, share, undo, restart recovery and post-game replay all rest on.
+    const game = newGame(31337);
+    for (let i = 0; i < 120; i++) {
+      if (currentActor(game) === null) break;
+      const { options } = actionGroups(game);
+      if (options.length === 0) break;
+      if (!submit(game, options[0]!)) break;
+    }
+    assert.ok(game.history.length > 20, 'the driver did not play far enough to be a real test');
+
+    const back = fromSave(toSave(game));
+    assert.deepEqual(view(back).cells, view(game).cells, 'the board differs after replay');
+    assert.deepEqual(
+      back.state.players.map((p) => p.revenue),
+      game.state.players.map((p) => p.revenue),
+      'the score differs after replay',
+    );
+    assert.equal(back.state.clock.day, game.state.clock.day);
+    assert.equal(back.state.clock.stage, game.state.clock.stage);
+    assert.equal(back.state.clock.phase, game.state.clock.phase);
+    // The trains are the part folding the log would have lost, so check them specifically.
+    assert.deepEqual(
+      [...back.state.trays.keys()].sort(),
+      [...game.state.trays.keys()].sort(),
+      'the crews differ after replay',
+    );
+  });
+
+  it('carries no POSITION in the save — the seed, the rules dealt under, and the intents', () => {
+    // If anything else ever creeps into `Save`, the claim above weakens: the game would no longer be
+    // reconstructible from decisions alone, and persistence would have a schema to migrate.
+    //
+    // `rules` is the one addition, and it is not position: it is the other half of the seed. A seed
+    // only names a game together with the rules it was dealt under, which is why two published
+    // replays went dead when the rules moved (`TODO.md`) — the intents were fine, the deal was not.
+    const game = newGame(7);
+    assert.deepEqual(Object.keys(toSave(game)).sort(), ['history', 'rules', 'seed']);
+  });
+});

test/harness.test.ts

@@ -275,8 +275,13 @@ describe('every published replay actually replays', () => {
       const save = JSON.parse(readFileSync(join(dir, f), 'utf8')) as {
         seed: number;
         history: unknown[];
+        rules?: unknown;
       };
-      const back = fromSave({ seed: save.seed, history: save.history as never });
+      // The WHOLE save, `rules` included. Rebuilding it from seed and history alone threw away the
+      // one field that says which ruleset the file was recorded under, so this replayed every
+      // published file under the pre-dialog defaults no matter what it said — a test that would
+      // pass a genuinely dead replay the moment the defaults and the file disagreed.
+      const back = fromSave(save as never);
       assert.equal(
         back.history.length,
         save.history.length,

test/mainline-cards.test.ts

@@ -27,7 +27,7 @@ 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 } from '../src/engine/state.ts';
+import { coordKey, turnOf } from '../src/engine/state.ts';
 import { snapshot } from '../src/sim/view.ts';
 
 const config: GameConfig = {
@@ -81,8 +81,8 @@ function pinned(s: GameState, index: number, card: string) {
 function drawTurn(s: GameState): void {
   s.clock.phase = 'localOps';
   s.clock.currentActor = 0;
-  s.turn.option = 'draw';
+  turnOf(s, 0).option = 'draw';
-  s.turn.drawnThisTurn = true;
+  turnOf(s, 0).drawnThisTurn = true;
 }
 
 // ---------------------------------------------------------------------------
@@ -313,6 +313,7 @@ describe('Flying Switch rolls a cut into an industry', () => {
       geometry: { kind: 'track', geometry: 'straight' },
       baseOperationalRail: true,
       standing: [],
+      standingWest: 0,
       facility: null,
       modifiers: [],
       enhancements: [],
@@ -332,7 +333,7 @@ describe('Flying Switch rolls a cut into an industry', () => {
         outboundBox: [], inboundBox: [],
         capacity: { outbound: 1, inbound: 0 },
         menAtWork: [null, null, null],
-        industryTrack: { length: 2, cars: [] },
+        industryTrack: { cars: [] },
         laborers: 1, porters: 0,
         usedThisStage: { laborers: 0, porters: 0 },
       },
@@ -343,12 +344,12 @@ describe('Flying Switch rolls a cut into an industry', () => {
       id: 'crew', trainNumber: 1, trainIsExtra: false, engineAt: 0,
       consist: [{ type: 'hopper', loaded: false }, { type: 'boxcar', loaded: false }],
       direction: 'east', facing: 'e',
-      position: { at: 'grid', owner: 0, coord: at(-1, 2) }, movesUsed: 0,
+      position: { at: 'grid', seat: 0, coord: at(-1, 2) }, movesUsed: 0,
     });
     s.clock.phase = 'localOps';
     s.clock.currentActor = 0;
-    s.turn.option = 'switch';
+    turnOf(s, 0).option = 'switch';
-    s.turn.movesRemaining = 6;
+    turnOf(s, 0).movesRemaining = 6;
     return industry;
   }
 
@@ -367,10 +368,10 @@ describe('Flying Switch rolls a cut into an industry', () => {
     assert.equal(s.trays.get('crew')!.consist.length, 1, 'the cut leaves the consist');
     assert.deepEqual(
       s.trays.get('crew')!.position,
-      { at: 'grid', owner: 0, coord: at(-1, 2) },
+      { at: 'grid', seat: 0, coord: at(-1, 2) },
       'the engine never enters the industry',
     );
-    assert.equal(s.turn.movesRemaining, 5, 'the manoeuvre costs a Move');
+    assert.equal(turnOf(s, 0).movesRemaining, 5, 'the manoeuvre costs a Move');
   });
 
   it('only reaches an adjacent card', () => {
@@ -454,7 +455,7 @@ describe('the Limits sign moves with the Running Track (§2.1, Gap 4a)', () => {
     // — track on the far side of the sign, and a second sign planted beyond that.
     const s = game();
     const area = areaOf(s, 0);
-    s.turn.option = 'draw';
+    turnOf(s, 0).option = 'draw';
 
     const straight = trackInHand(s, 'straight', 'none');
     const beyondEast = { row: area.runningRow, col: area.limitsEast.col + 1 };
@@ -508,7 +509,7 @@ describe('the Limits sign moves with the Running Track (§2.1, Gap 4a)', () => {
     // player's Limits is what makes a collision his fault.
     const s = game();
     const area = areaOf(s, 0);
-    s.turn.option = 'draw';
+    turnOf(s, 0).option = 'draw';
 
     for (let n = 0; n < 4; n++) {
       const target = { row: area.runningRow, col: area.limitsWest.col };
@@ -549,7 +550,7 @@ describe('a turnout may be laid on top of a card already down', () => {
     // straight along the main and then wanted to branch there had no move at all — the piece had to
     // have been a turnout when it went down.
     const s = game();
-    s.turn.option = 'draw';
+    turnOf(s, 0).option = 'draw';
     const at = layStraight(s);
 
     for (const hand of ['left', 'right'] as const) {
@@ -575,7 +576,7 @@ describe('a turnout may be laid on top of a card already down', () => {
     // opposite edges, so swapping one for the other would move the leg off whatever it joined.
     const s = game();
     const area = areaOf(s, 0);
-    s.turn.option = 'draw';
+    turnOf(s, 0).option = 'draw';
 
     // A turnout on the main, then its matching curve on the row below — the start of every siding.
     const turnoutAt = { row: area.runningRow, col: area.limitsEast.col };
@@ -609,7 +610,7 @@ describe('a turnout may be laid on top of a card already down', () => {
   it('refuses to swap the track out from under a car, or out from under an Interlocking', () => {
     const s = game();
     const area = areaOf(s, 0);
-    s.turn.option = 'draw';
+    turnOf(s, 0).option = 'draw';
     const at = layStraight(s);
     const square = area.grid.get(`${at.row},${at.col}`)!;
 
@@ -633,7 +634,7 @@ describe('a turnout may be laid on top of a card already down', () => {
     // The Office is east-west track like a straight, but it is not track to build over.
     const s = game();
     const area = areaOf(s, 0);
-    s.turn.option = 'draw';
+    turnOf(s, 0).option = 'draw';
     assert.equal(
       check(s, 0, {
         type: 'card.play', cardId: trackInHand(s, 'turnout', 'right'),
@@ -646,7 +647,7 @@ describe('a turnout may be laid on top of a card already down', () => {
 
   it('does not let a straight or a curve upgrade anything — only a turnout may', () => {
     const s = game();
-    s.turn.option = 'draw';
+    turnOf(s, 0).option = 'draw';
     const at = layStraight(s);
 
     assert.equal(
@@ -665,7 +666,7 @@ describe('a turnout may be laid on top of a card already down', () => {
     // The 18 Enhancement cards were permanently dead for weeks for exactly this reason: the engine
     // allowed the play and `legalIntents` never once offered a square it could go on.
     const s = game();
-    s.turn.option = 'draw';
+    turnOf(s, 0).option = 'draw';
     const at = layStraight(s);
     const cardId = trackInHand(s, 'turnout', 'right');
 

test/multiplayer.test.ts

@@ -11,13 +11,16 @@ import { describe, it } from 'node:test';
 import assert from 'node:assert/strict';
 
 import { advance, pump } from '../src/engine/advance.ts';
-import { areaOf } from '../src/engine/apply.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 type { GameConfig, GameState, PlayerIndex } from '../src/engine/state.ts';
-import { coordKey, 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 { impediments } from '../src/sim/narrate.ts';
+import { readFileSync, readdirSync } from 'node:fs';
+import { join } from 'node:path';
 
 const competitive: GameConfig = {
   mode: 'competitive',
@@ -39,11 +42,34 @@ function readyToLeave(s: GameState, owner: PlayerIndex, id: string, direction: '
   const area = areaOf(s, owner);
   s.trays.set(id, {
     id, trainNumber: 9, trainIsExtra: false, engineAt: 0, consist: [],
-    direction, position: { at: 'grid', owner, coord: area.officeCoord }, movesUsed: 0,
+    direction, position: { at: 'grid', seat: seatOf(s, owner), coord: area.officeCoord }, movesUsed: 0,
   });
   area.adOccupancy.push(id);
 }
 
+/** An industry with nothing in its green box — the simplest thing `impediments` reports. */
+const idleIndustry = () =>
+  ({
+    geometry: { kind: 'facility', facility: 'mineTipple' },
+    baseOperationalRail: true,
+    standing: [],
+    modifiers: [],
+    enhancements: [],
+    facility: {
+      kind: 'freight',
+      subtype: 'mineTipple',
+      allows: { outbound: true, inbound: false },
+      outboundBox: [],
+      inboundBox: [],
+      capacity: { outbound: 1, inbound: 0 },
+      menAtWork: [null, null, null],
+      industryTrack: { cars: [] },
+      laborers: 1,
+      porters: 0,
+      usedThisStage: { laborers: 0, porters: 0 },
+    },
+  }) as never;
+
 const pinTerrain = (s: GameState): void => {
   // Double Track and Uncontrolled Siding print "trains may pass", which would clear any departure.
   for (const n of s.division.nodes) if (n.kind === 'mainline') n.card = 'plains';
@@ -67,8 +93,11 @@ describe('multi-player games run at all', () => {
     for (const players of [2, 3, 4]) {
       const s = game(players);
       assert.equal(s.officeAreas.size, players, `${players}p office areas`);
-      for (let p = 0; p < players; p++) {
+      // Every seat is occupied by exactly one player, and that player's district is that seat's.
-        assert.equal(areaOf(s, p).owner, p, 'an Office Area is owned by the wrong seat');
+      // Which player sits where is decided by §4.4's D12, so it is a permutation, not the identity.
+      assert.deepEqual([...s.seating].sort((a, b) => a - b), [...Array(players).keys()]);
+      for (let seat = 0; seat < players; seat++) {
+        assert.equal(areaOf(s, playerAtSeat(s, seat)).seat, seat, 'a seat holds the wrong district');
       }
       // §7 — trays are scarce on purpose, and the count is per player count.
       assert.equal(s.freeTrays.length, crewTrayCount(players), `${players}p crew trays`);
@@ -81,8 +110,10 @@ describe('the Fedora goes round the table', () => {
    * Watches the Superintendent while the BOT plays the game.
    *
    * `advance` stops and asks for input rather than driving itself, so calling it in a loop never
-   * moves the clock — the game has to actually be played. A spy policy records the seat holding the
+   * moves the clock — the game has to actually be played. A spy policy records the SEAT holding the
-   * Fedora each time a decision is asked for.
+   * Fedora each time a decision is asked for: §5 passes it round the table, and since §4.4's D12
+   * decides who sits where, the sequence of player indices is a permutation while the sequence of
+   * seats is the plain 0, 1, 2, … that the rule describes.
    */
   const superintendentsSeen = (players: number): number[] => {
     const s = game(players);
@@ -90,7 +121,7 @@ describe('the Fedora goes round the table', () => {
     const spy = {
       name: 'spy',
       choose(st: GameState, p: PlayerIndex, opts: Parameters<typeof developerBot.choose>[2]) {
-        const who = st.clock.superintendent;
+        const who = seatOf(st, st.clock.superintendent);
         if (seen[seen.length - 1] !== who) seen.push(who);
         return developerBot.choose(st, p, opts);
       },
@@ -157,13 +188,16 @@ describe('Subdivisions are split by whoever is a Control Point', () => {
     const s = game(4);
     assert.equal(subdivisions(s).length, 1, 'four Whistle Posts should leave one Subdivision');
 
-    areaOf(s, 1).tier = 'depot';
+    // BY SEAT: a Subdivision is a stretch of the physical chain, and §4.4's D12 decides which
+    // player is sitting in which stretch. Upgrading "player 1's" Office would upgrade whichever
+    // seat they happen to hold, which is not what this test is about.
+    areaAtSeat(s, 1).tier = 'depot';
     const split = subdivisions(s);
     assert.equal(split.length, 2, 'a Control Point should cut the Division in two');
 
     // The upgraded Office is a BOUNDARY, so it appears in neither group; the others still sit inside.
-    const officeIndex = (owner: number): number =>
+    const officeIndex = (seat: number): number =>
-      s.division.nodes.findIndex((n) => n.kind === 'office' && n.owner === owner);
+      s.division.nodes.findIndex((n) => n.kind === 'office' && n.seat === seat);
     const all = split.flat();
     assert.ok(!all.includes(officeIndex(1)), 'the Control Point is still inside a Subdivision');
     for (const other of [0, 2, 3]) {
@@ -173,7 +207,7 @@ describe('Subdivisions are split by whoever is a Control Point', () => {
 
   it('gives every Office its own Subdivision once they are all Control Points', () => {
     const s = game(4);
-    for (let p = 0; p < 4; p++) areaOf(s, p).tier = 'terminal';
+    for (let seat = 0; seat < 4; seat++) areaAtSeat(s, seat).tier = 'terminal';
     // Five Mainline cards, each now bounded by a Control Point or a Division Point.
     assert.equal(subdivisions(s).length, 5, 'each Mainline card should be its own Subdivision');
   });
@@ -241,6 +275,162 @@ describe("one player's train blocks another's", () => {
   });
 });
 
+describe('a seat is a place, a player is a person', () => {
+  it('seats everyone exactly once, and seats them by the §4.4 roll', () => {
+    /**
+     * `seating` was the identity mapping until §4.4's D12 was wired up, which meant the whole
+     * seat/player distinction was untested at runtime — every mix-up of the two was silently
+     * correct. It is a real permutation now, and this is what says so.
+     *
+     * Solitaire is the exception and must stay one: with a single player there is one seat, the
+     * permutation is trivially the identity, and every replay depends on that.
+     */
+    for (const players of [2, 3, 4]) {
+      const s = game(players);
+      assert.deepEqual([...s.seating].sort((a, b) => a - b), [...Array(players).keys()], 'not a permutation');
+      for (let p = 0; p < players; p++) {
+        assert.equal(playerAtSeat(s, seatOf(s, p)), p, 'seatOf and playerAtSeat disagree');
+        assert.equal(areaOf(s, p).seat, seatOf(s, p), 'a player is looking at the wrong district');
+      }
+    }
+
+    const solo = createGame({ id: 's', seed: 4242, config: { ...competitive, mode: 'solitaire' }, playerNames: ['a'] });
+    assert.deepEqual(solo.seating, [0], 'solitaire seating must stay the identity — replays depend on it');
+  });
+
+  it('seats the highest roller at the eastern end of the chain', () => {
+    // §4.4 — "highest is the Eastern Division Point". `buildDivision` lays west-to-east, so the
+    // eastern end is the LAST seat. Checked over many seeds rather than one, because a single deal
+    // could satisfy this by luck.
+    for (let seed = 1; seed <= 40; seed++) {
+      const s = game(3, seed);
+      const rolls = s.openingRolls.division;
+      const east = s.seating[s.seating.length - 1]!;
+      const best = Math.max(...rolls);
+      assert.equal(rolls[east], best, `seed ${seed}: the easternmost seat is not the highest roll`);
+      // And the chain runs low-to-high west to east, so nobody east of you rolled lower.
+      for (let i = 1; i < s.seating.length; i++) {
+        assert.ok(rolls[s.seating[i - 1]!]! <= rolls[s.seating[i]!]!, `seed ${seed}: the chain is not ordered`);
+      }
+    }
+  });
+
+  it("follows a player to their new Office when the seating rotates", () => {
+    /**
+     * Employee Rotation (Appendix B) moves every player one seat left at the end of a Day while
+     * their Revenue and the Fedora travel with them. The rule is not implemented, but the MODEL now
+     * supports it: rotating `seating` is the whole operation, and every `areaOf(s, player)` caller
+     * follows without changing. This is the test that the split actually bought something.
+     */
+    const s = game(3);
+    const officeOf = (p: PlayerIndex): number => areaOf(s, p).seat;
+    const before = [0, 1, 2].map(officeOf);
+
+    // Mark each Office so we can see which one a player is looking at. BY SEAT — the Offices are
+    // the furniture, and the point of the test is that the furniture stays put.
+    const tiers = ['depot', 'station', 'terminal'] as const;
+    for (let seat = 0; seat < 3; seat++) areaAtSeat(s, seat).tier = tiers[seat]!;
+    const tierOf = (p: PlayerIndex): string => areaOf(s, p).tier;
+    assert.deepEqual([0, 1, 2].map(tierOf), before.map((seat) => tiers[seat]!));
+
+    // Everyone shuffles one chair along: whoever was at seat n is now at seat n+1.
+    const rotated = [...s.seating];
+    rotated.unshift(rotated.pop()!);
+    s.seating = rotated;
+
+    assert.deepEqual([0, 1, 2].map(officeOf), before.map((seat) => (seat + 1) % 3), 'players did not move seats');
+    assert.deepEqual(
+      [0, 1, 2].map(tierOf),
+      before.map((seat) => tiers[(seat + 1) % 3]!),
+      'the Offices moved with them instead of staying put',
+    );
+    // Revenue belongs to the person and must NOT have moved with the chair.
+    assert.equal(s.players[0]!.index, 0, 'a player index changed when the seating rotated');
+  });
+
+  it('plays a whole game with the seating rotated', () => {
+    /**
+     * The abstraction is only worth something if the game still RUNS through it. Rotating `seating`
+     * before the first move puts every seat/player confusion in the engine on the critical path at
+     * once — the terminal check, the dispatch devices, the bot's own district lookups — where under
+     * the identity mapping they were all silently correct.
+     */
+    const s = game(3);
+    s.seating = [2, 0, 1];
+    const r = playGame(s, developerBot, pump);
+    assert.ok(r.finished, 'a rotated game did not finish');
+    assert.equal(new Set(s.players.map((p) => p.index)).size, 3, 'seats stopped being distinct');
+    // Each Office is still occupied by exactly one player, and by the one `seating` says.
+    for (let seat = 0; seat < 3; seat++) {
+      assert.equal(areaOf(s, playerAtSeat(s, seat)).seat, seat, `seat ${seat} lost its occupant`);
+    }
+  });
+
+  it('reports the impediments of the district a player is now sitting at', () => {
+    /**
+     * `impediments` took a PLAYER and used it as an `officeAreas` key, and `Frame.blocked` is built
+     * from it — so after a rotation a player would have been shown the jams of whoever inherited
+     * their old chair, naming squares that are not on the board in front of them.
+     */
+    const s = game(3);
+    // Put it in a SEAT, and work out who is sitting there.
+    const area = areaAtSeat(s, 1);
+    area.grid.set(coordKey({ row: area.runningRow - 1, col: 0 }), idleIndustry());
+    const occupant = playerAtSeat(s, 1);
+
+    const withImpediments = (): PlayerIndex[] =>
+      [0, 1, 2].filter((p) => impediments(s, p).length > 0);
+    assert.deepEqual(withImpediments(), [occupant], 'the industry is not reported to its own player');
+
+    // Everyone shuffles one chair along, so seat 1 changes hands.
+    const rotated = [...s.seating];
+    rotated.unshift(rotated.pop()!);
+    s.seating = rotated;
+    const newOccupant = playerAtSeat(s, 1);
+    assert.notEqual(newOccupant, occupant, 'the rotation did not move anybody into seat 1');
+
+    assert.deepEqual(withImpediments(), [newOccupant], 'the impediment did not follow the chair');
+    assert.deepEqual(
+      [0, 1, 2].map((p) => snapshot(s, [], null, null, null, false, p).blocked.length > 0),
+      [0, 1, 2].map((p) => p === newOccupant),
+      'the Frame disagrees with impediments after a rotation',
+    );
+  });
+});
+
+describe('nothing keys an Office Area by player', () => {
+  it('reaches officeAreas only through areaAtSeat', () => {
+    /**
+     * The class of bug, rather than the five instances of it that were found by hand. `officeAreas`
+     * is keyed by SEAT; every one of these lookups was passing a PLAYER, which is right only while
+     * seating is the identity mapping and wrong the moment Employee Rotation lands. Routing them all
+     * through `areaOf`/`areaAtSeat` fixes them; this keeps them fixed.
+     */
+    // `state.ts` and `apply.ts` hold the seat-typed accessors — `areaAtSeat`, `isControlPoint`,
+    // `adTrackCount` — and are the only files allowed to touch the map directly. Everywhere else
+    // goes through them, which is what makes the argument's meaning checkable at the call site.
+    const allowed = ['engine/state.ts', 'engine/apply.ts'];
+    const root = join(import.meta.dirname, '..', 'src');
+    const offenders: string[] = [];
+    const walk = (dir: string): void => {
+      for (const e of readdirSync(dir, { withFileTypes: true })) {
+        const full = join(dir, e.name);
+        if (e.isDirectory()) walk(full);
+        else if (e.name.endsWith('.ts')) {
+          readFileSync(full, 'utf8').split('\n').forEach((line, i) => {
+            // `areaAtSeat` is the one legal reader — it is what everything else goes through.
+            if (line.includes('officeAreas.get(') && !allowed.some((a) => full.endsWith(a))) {
+              offenders.push(`${full}:${i + 1}`);
+            }
+          });
+        }
+      }
+    };
+    walk(root);
+    assert.deepEqual(offenders, [], 'officeAreas is being indexed outside areaAtSeat');
+  });
+});
+
 describe('the view shows one seat at a time', () => {
   it('gives each seat its own board and its own hand', () => {
     /**
@@ -260,7 +450,7 @@ describe('the view shows one seat at a time', () => {
       for (let n = 0; n < p; n++) {
         area.grid.set(coordKey({ row: area.runningRow - 1, col: n }), {
           geometry: { kind: 'track', geometry: 'straight' },
-          baseOperationalRail: true, standing: [], facility: null, modifiers: [], enhancements: [],
+          baseOperationalRail: true, standing: [], standingWest: 0, facility: null, modifiers: [], enhancements: [],
         });
       }
       s.decks.hands.set(p, source.slice(0, p + 1));
@@ -276,6 +466,72 @@ describe('the view shows one seat at a time', () => {
     assert.deepEqual(frames.map((f) => f.hand.length), [1, 2, 3], 'seats do not have distinct hands');
   });
 
+  it('gives each seat its own Revenue, pace note, Moves and impediments', () => {
+    /**
+     * The board and the hand were seat-scoped; four scalar fields beside them were not, and each was
+     * still reporting player 0. A player looking at their own railroad would have been shown someone
+     * else's score, someone else's Moves left, and someone else's jammed facilities — the last of
+     * which is a list of squares that do not exist on the board they are looking at.
+     */
+    const s = game(3);
+    s.players[0]!.revenue = 1;
+    s.players[1]!.revenue = 9;
+    s.players[2]!.revenue = 17;
+
+    const frames = [0, 1, 2].map((p) => snapshot(s, [], null, null, null, false, p));
+    assert.deepEqual(frames.map((f) => f.revenue), [1, 9, 17], 'seats do not see their own Revenue');
+
+    // The pace note is computed from the viewer's score against the clock, so it must move with it.
+    const pace = frames.map((f) => f.objective.onPace);
+    assert.notDeepEqual(pace, [pace[0], pace[0], pace[0]], 'every seat got the same pace verdict');
+    assert.ok(frames[2]!.objective.note.startsWith('17 of '), `seat 2's note reads "${frames[2]!.objective.note}"`);
+
+    // Stand an unstocked industry in ONE district — "green box empty" is the impediment. Only that
+    // seat should be told about it.
+    const area = areaOf(s, 1);
+    const key = coordKey({ row: area.runningRow - 1, col: 0 });
+    area.grid.set(key, {
+      geometry: { kind: 'facility', facility: 'mineTipple' },
+      baseOperationalRail: true,
+      standing: [],
+      modifiers: [],
+      enhancements: [],
+      facility: {
+        kind: 'freight',
+        subtype: 'mineTipple',
+        allows: { outbound: true, inbound: false },
+        outboundBox: [],
+        inboundBox: [],
+        capacity: { outbound: 1, inbound: 0 },
+        menAtWork: [null, null, null],
+        industryTrack: { cars: [] },
+        laborers: 1,
+        porters: 0,
+        usedThisStage: { laborers: 0, porters: 0 },
+      },
+    } as never);
+
+    const blocked = [0, 1, 2].map((p) => snapshot(s, [], null, null, null, false, p).blocked.length);
+    assert.deepEqual([blocked[0], blocked[2]], [0, 0], 'an impediment in one district was reported to the others');
+    assert.ok(blocked[1]! > 0, 'the district with the idle industry was not told about it');
+  });
+
+  it('never draws one seat’s crew onto another seat’s board', () => {
+    /**
+     * REGRESSION. The tray lookup was keyed by `row,col` alone while every district uses the same
+     * origin, so a crew standing at (0, 1) in one Office Area appeared at (0, 1) in ALL of them. The
+     * cells were the viewer's own; the train drawn on them was whoever's happened to be there.
+     */
+    const s = game(3);
+    // Crews are made up during play, so the opening state has none — stand one in seat 1's district.
+    readyToLeave(s, 1, 'crew-1', 'east');
+
+    const withTray = (p: PlayerIndex): number =>
+      snapshot(s, [], null, null, null, false, p).cells.filter((c) => c.trains.length > 0).length;
+    assert.equal(withTray(1), 1, "the crew is not on its own seat's board");
+    assert.deepEqual([withTray(0), withTray(2)], [0, 0], "a crew was drawn onto another seat's board");
+  });
+
   it('defaults to seat 0, so solitaire and every replay are unaffected', () => {
     const s = game(2);
     assert.deepEqual(
@@ -287,13 +543,25 @@ describe('the view shows one seat at a time', () => {
 });
 
 describe('scoring lands on the right seat', () => {
-  it('pays the departure Revenue to the Office the train left, not to seat 0', () => {
+  it('pays EVERY player when a train completes its run, and nobody for merely departing', () => {
     /**
-     * The rule reads "one Revenue for every train that clears YOUR section", and `awardDeparture`
+     * THE RULE CHANGED IN v0.4.2. It used to pay 1 to the Office a train departed — which on a
-     * takes the owner of the departing Office. With one player that is unfalsifiable: seat 0 is the
+     * three-Office railroad paid three separate times for one train, and paid whichever Office the
-     * only seat there is. This is the test that says so with three.
+     * train happened to pass first. It pays once now, when the train runs off the end of the
+     * Division, and it pays everybody: getting a train the whole length is the shared achievement.
+     *
+     * With one player this is unfalsifiable, because "everybody" is one person. This is the test
+     * that says so with three.
+     *
+     * The rate is a dial now and defaults to zero, so this names it: what is under test is WHO gets
+     * paid, not whether the default pays at all (`enhancements.test.ts` covers that).
      */
-    const s = game(3);
+    const s = createGame({
+      id: 'm',
+      seed: 4242,
+      config: { ...competitive, houseRules: { revenue: { trainPerTransit: 1 } } },
+      playerNames: ['a', 'b', 'c'],
+    });
     pinTerrain(s);
     const before = s.players.map((p) => p.revenue);
 
@@ -302,23 +570,33 @@ describe('scoring lands on the right seat', () => {
     s.movedThisPhase = new Set();
 
     advance(s);
+    assert.deepEqual(s.players.map((p) => p.revenue), before, 'departing the Office paid somebody');
 
-    assert.equal(s.players[2]!.revenue, before[2]! + 1, 'seat 2 was not paid for its own departure');
+    let completed;
-    assert.equal(s.players[0]!.revenue, before[0]!, 'seat 0 was paid for a train it never ran');
+    for (let i = 0; i < 25 && !completed; i++) {
-    assert.equal(s.players[1]!.revenue, before[1]!, 'seat 1 was paid for a train it never ran');
+      s.movedThisPhase = new Set();
+      s.clock.phase = 'mainline';
+      completed = advance(s).events.find((e) => e.type === 'trainCompleted');
+    }
+    assert.ok(completed, 'the train never ran off the end of the Division');
+    assert.deepEqual(
+      s.players.map((p) => p.revenue),
+      before.map((r) => r + 1),
+      'a completed run did not pay every player exactly 1',
+    );
   });
 
   it('keeps each seat’s Office Area to itself', () => {
     // A card laid in one player's district must not appear in another's — the areas are separate maps
     // and it would be easy for a shared reference to make every district the same district.
     const s = game(3);
-    const mine = areaOf(s, 1);
+    const mine = areaAtSeat(s, 1);
-    const sizeBefore = s.officeAreas.get(2)!.grid.size;
+    const sizeBefore = areaAtSeat(s, 2).grid.size;
     mine.grid.set(coordKey({ row: mine.runningRow - 1, col: 0 }), {
       geometry: { kind: 'track', geometry: 'straight' },
-      baseOperationalRail: true, standing: [], facility: null, modifiers: [], enhancements: [],
+      baseOperationalRail: true, standing: [], standingWest: 0, facility: null, modifiers: [], enhancements: [],
     });
-    assert.equal(s.officeAreas.get(2)!.grid.size, sizeBefore, "one player's track appeared in another's district");
+    assert.equal(areaAtSeat(s, 2).grid.size, sizeBefore, "one seat's track appeared in another's district");
-    assert.notEqual(areaOf(s, 1), areaOf(s, 2), 'two seats share one Office Area object');
+    assert.notEqual(areaAtSeat(s, 1), areaAtSeat(s, 2), 'two seats share one Office Area object');
   });
 });

test/replay.test.ts

@@ -10,8 +10,10 @@ import assert from 'node:assert/strict';
 
 import { pump } from '../src/engine/advance.ts';
 import type { GameEvent } from '../src/engine/events.ts';
+import { areaOf } from '../src/engine/apply.ts';
 import { createGame } from '../src/engine/setup.ts';
-import type { GameConfig } 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';
@@ -52,13 +54,13 @@ const SAMPLES: GameEvent[] = [
   { 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 } },
+  { type: 'passengersBoarded', player: 0, at: { row: 0, col: 0 }, trayId: 't0', coachIndex: 0 },
-  { type: 'passengersDetrained', player: 0, at: { row: 0, col: 0 } },
+  { type: 'passengersDetrained', player: 0, at: { row: 0, col: 0 }, trayId: 't0', coachIndex: 0 },
   { type: 'loadStarted', player: 0, at: { row: 1, col: 0 }, carType: 'hopper' },
   { type: 'loadAdvanced', player: 0, at: { row: 1, col: 0 }, fromBox: 0, toBox: 1 },
   { type: 'unloadCompleted', player: 0, at: { row: 1, col: 0 }, carType: 'hopper' },
   { type: 'loadCompleted', player: 0, at: { row: 1, col: 0 }, carType: 'hopper' },
-  { type: 'unloadBegan', player: 0, at: { row: 1, col: 0 }, carType: 'hopper' },
+  { type: 'unloadBegan', player: 0, at: { row: 1, col: 0 }, carType: 'hopper', carIndex: 0 },
   { type: 'revenueChanged', player: 0, delta: 1, total: 3, reason: 'freightLoad' },
   { type: 'phaseEnded', player: 0, phase: 'localOps' },
 ];
@@ -133,6 +135,91 @@ describe('impediments', () => {
   });
 });
 
+/**
+ * Gitea#2 — "four porters, two passengers on the platform, and I never get the chance to work them."
+ *
+ * The engine was faithful at every step; what was missing was any way to SEE why. A Porter action
+ * that cannot be taken is simply absent from the menu, and this panel — the one that answers "why is
+ * nothing moving?" — opened with `f.kind !== 'freight'`, so a platform had never had anything to say
+ * for itself at all.
+ */
+describe('a blocked platform says why (Gitea#2)', () => {
+  /** Raise the Whistle Post to a working Terminal: the tier's printed numbers, applied directly. */
+  function platform(s: GameState) {
+    const area = areaOf(s, 0);
+    area.tier = 'terminal';
+    const card = area.grid.get(coordKey(area.officeCoord))!;
+    const f = card.facility!;
+    f.allows = { outbound: true, inbound: true };
+    f.porters = 3;
+    f.capacity = { outbound: 3, inbound: 3 };
+    return { area, f };
+  }
+
+  /** A tray standing on an A/D track at the Office, carrying whatever it is given. */
+  function atOffice(s: GameState, consist: { type: 'coach'; loaded: boolean; origin?: number }[]): void {
+    const area = areaOf(s, 0);
+    const id = s.freeTrays.pop()!;
+    s.trays.set(id, {
+      id, trainNumber: null, trainIsExtra: false, engineAt: 0, consist,
+      direction: 'east', position: { at: 'grid', seat: 0, coord: area.officeCoord }, movesUsed: 0,
+    });
+    area.adOccupancy.push(id);
+  }
+
+  it('reports passengers standing on a platform with no train to take them', () => {
+    // The whole of the bug's second half: before this, `impediments` returned an EMPTY list here.
+    const s = createGame({ id: 'g', seed: 5, config, playerNames: ['p'] });
+    const { f } = platform(s);
+    f.outboundBox = [{ type: 'coach', loaded: true }];
+    const found = impediments(s, 0);
+    const platformRow = found.find((b) => /platform/.test(b.why));
+    assert.ok(platformRow, `nothing reported for the platform:\n${JSON.stringify(found, null, 2)}`);
+    assert.match(platformRow.why, /passengers waiting, no train at the platform/);
+    assert.equal(platformRow.severity, 'waiting');
+  });
+
+  it('names the Office by its tier rather than the word "facility"', () => {
+    // A Passenger Facility rides on the `office` card, so the freight branch's `geometry.facility`
+    // is not there to read and every passenger row read `facility 0,0` next to `mineTipple 1,-3`.
+    const s = createGame({ id: 'g', seed: 5, config, playerNames: ['p'] });
+    const { f } = platform(s);
+    f.outboundBox = [{ type: 'coach', loaded: true }];
+    const row = impediments(s, 0).find((b) => /platform/.test(b.why))!;
+    assert.match(row.where, /^terminal /, `the Office is unnamed: ${row.where}`);
+  });
+
+  it('explains the coach shortage that made the game look broken', () => {
+    // The reported state: a train in with passengers to set down, red slots free, four porters —
+    // and §9.2 needs a white coach out of the Division Yard to swap in. There was none, with eight
+    // more sitting in the Classification Yard that §2.2 returns only when the Division Yard is BARE.
+    const s = createGame({ id: 'g', seed: 5, config, playerNames: ['p'] });
+    const { f } = platform(s);
+    atOffice(s, [{ type: 'coach', loaded: true, origin: 1 }]);
+    s.yards.divisionYard = s.yards.divisionYard.filter((c) => !(c.type === 'coach' && !c.loaded));
+    s.yards.classificationYard = [
+      { type: 'coach', loaded: false },
+      { type: 'coach', loaded: false },
+    ];
+    const row = impediments(s, 0).find((b) => /§9\.2/.test(b.why));
+    assert.ok(row, `the coach shortage was not explained:\n${JSON.stringify(impediments(s, 0), null, 2)}`);
+    assert.equal(row.severity, 'stuck', 'a train that cannot be emptied is stuck, not merely waiting');
+    assert.match(row.why, /2 coaches are in the Classification Yard/, `where the coaches are is not said: ${row.why}`);
+    assert.match(row.why, /Classification returns only when the Division Yard is bare/);
+    assert.ok(f.inboundBox.length === 0, 'the red slots were free — the shortage is the only cause');
+  });
+
+  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'] });
+    const { f } = platform(s);
+    f.outboundBox = [{ type: 'coach', loaded: true }];
+    atOffice(s, [{ type: 'coach', loaded: false }]);
+    const found = impediments(s, 0).filter((b) => /platform|§9\.2|Porters/.test(b.why));
+    assert.deepEqual(found, [], `a working platform reported an impediment:\n${JSON.stringify(found, null, 2)}`);
+  });
+});
+
 describe('replay recording', () => {
   const rec = record(1234, 'standard');
 
@@ -368,6 +455,34 @@ describe('the replay wire format is lossless (regression)', () => {
     assert.ok(checked > 100, `only ${checked} frames checked`);
   });
 
+  it("tolerates an older recording's singular train at the trains slot", () => {
+    // Before "The Roster Pass" (docs/plans/switching-paths.md), the trains slot held one train
+    // object or null — `rehydrateCells` has to make sense of that shape too, with no version flag
+    // anywhere in a packed row to key off.
+    const cards: unknown[] = [[0, 0, 'office', 'Whistle Post', true, ['ew']]];
+    const whats = ['a station'];
+    const facs: unknown[] = [];
+    const oldTrain = { trayId: 'crew', label: 'crew', cars: [], engineAt: 0, facing: 'e', what: '' };
+
+    const [withObject] = rehydrateCells([[0, 0, [], [], -1, oldTrain, 1, [], 0]], cards, whats, facs) as {
+      trains: unknown[];
+    }[];
+    assert.deepEqual(withObject!.trains, [oldTrain], 'a lone train object should wrap into a one-train roster');
+
+    const [withNull] = rehydrateCells([[0, 0, [], [], -1, null, 1, [], 0]], cards, whats, facs) as {
+      trains: unknown[];
+    }[];
+    assert.deepEqual(withNull!.trains, [], 'a null train slot should read as no train at all');
+
+    const [withArray] = rehydrateCells(
+      [[0, 0, [], [], -1, [oldTrain, oldTrain], 1, [], 0]],
+      cards,
+      whats,
+      facs,
+    ) as { trains: unknown[] }[];
+    assert.equal(withArray!.trains.length, 2, 'an array should ride through as-is');
+  });
+
   it('writes each distinct card and description once, not once per frame', () => {
     const rec = record(880009, 'standard', 4000);
     const packed = compress(rec.frames);
@@ -395,7 +510,17 @@ describe('the replay behaves like the game it is replaying', () => {
     // seed and passed on luck — the moment the opening deal changed, that seed's game happened to
     // contain no switching at all and four of the six cues vanished. What is under test is the
     // plumbing, not one game, so the frames are pooled.
-    const recs = [5, 4321, 880009].map((seed) => record(seed, 'standard', 4000));
+    /**
+     * TWELVE SEEDS, not three — the same lesson as the comment above, learnt again at v0.4.7.
+     * Coupling happens in about 39 games in 200, so three deals expect 0.6 of one: the assertion was
+     * riding on luck exactly as the single seed had been, and the deck losing seven cards was enough
+     * to tip it.
+     *
+     * TWENTY-FOUR, not twelve, and the difference is instructive: on this stride the first game that
+     * couples anything is index 13, so a twelve-seed pool still contained none. The rate is what
+     * matters, not the count — measured 39 in 200, with couplers at indices 13, 19, 22, 24, 28 …
+     */
+    const recs = Array.from({ length: 24 }, (_, i) => record(1000 + i * 7919, 'standard', 4000));
     const withCues = recs.flatMap((rec) => rec.frames.filter((f) => (f.cues?.length ?? 0) > 0));
     assert.ok(withCues.length > 20, `only ${withCues.length} frames carry a cue`);
 
@@ -408,6 +533,13 @@ describe('the replay behaves like the game it is replaying', () => {
     assert.ok(kinds.has('couple'), 'coupling a cut never made a sound');
     assert.ok(kinds.has('drop'), 'setting cars out never made a sound');
     assert.ok(kinds.has('schedule'), 'the 1D12 that sets a train\'s departure Stage landed silently');
+    assert.ok(kinds.has('arrive'), 'a train pulling into an Office never made a sound');
+    assert.ok(kinds.has('depart'), 'a train highballing out of an Office never made a sound');
+    // Collisions are rare — measured 2 in 40 games — so this is the one cue this pool is not
+    // guaranteed to contain on every stride; it happens to (seeds 96028 and 159380) at the current
+    // stride and seed count. If this starts failing after either changes, widen the pool rather than
+    // deleting the assertion — §10 is the one event a player most needs to hear.
+    assert.ok(kinds.has('crash'), 'a collision never made a sound');
 
     // One CLOCK cue per Stage boundary, the bell replacing the whistle at a Day — the same
     // accounting the live game is held to. The switching cues are counted separately: they follow

test/session.test.ts

@@ -0,0 +1,232 @@
+/**
+ * The Session boundary.
+ *
+ * Phase 1 of `docs/architecture/multiplayer.md` moved the page off `game.ts` and onto a `Session`,
+ * so that a server can later be substituted for the local engine without the page noticing. The
+ * whole point of the change is that nothing about solitaire changed, which is a hard thing to prove
+ * by playing — hence this file: the same seed driven the same way through both routes must land in
+ * the same position, card for card.
+ *
+ * The rest of the suite covers what a remote session will have to reproduce exactly: which calls
+ * fire the redraw, which signals drain, and what `capabilities` admits a local session can do that a
+ * server cannot.
+ */
+
+import { describe, it } from 'node:test';
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import { join } from 'node:path';
+
+import { actionGroups, currentActor, handPlayable, newGame, overHandLimit, submit, toSave, view } from '../src/web/game.ts';
+import { createLocalSession } from '../src/web/session.ts';
+
+/**
+ * Drive a session by always taking the first offered action.
+ *
+ * `menu().options` and `actionGroups(game).options` are the same `legalActions` list in the same
+ * order, so taking index 0 on either side is the same rule — which is what makes the two routes
+ * comparable below.
+ */
+async function playSession(seed: number, maxTurns = 20_000) {
+  const session = createLocalSession(seed);
+  let turns = 0;
+  for (; turns < maxTurns; turns++) {
+    if (session.actor() === null) break;
+    const options = session.menu().options;
+    if (options.length === 0) break;
+    if (!(await session.submit(options[0]!))) break;
+  }
+  return { session, turns };
+}
+
+/** One action through the session, first option, for tests that just need the game to move. */
+async function step(session: ReturnType<typeof createLocalSession>): Promise<boolean> {
+  const options = session.menu().options;
+  if (options.length === 0) return false;
+  return session.submit(options[0]!);
+}
+
+describe('a local session plays the same game as the calls it replaced', () => {
+  it('reaches an identical position from the same seed', async () => {
+    // The equivalence proof. `game.ts` directly on the left, the Session on the right, same seed and
+    // same tie-breaking rule — if the boundary leaked anything the boards diverge.
+    const game = newGame(77);
+    for (let i = 0; i < 20_000; i++) {
+      if (currentActor(game) === null) break;
+      const { options } = actionGroups(game);
+      if (options.length === 0) break;
+      if (!submit(game, options[0]!)) break;
+    }
+
+    const { session, turns } = await playSession(77);
+    assert.ok(turns > 50, `only ${turns} decisions — the game stalled`);
+
+    const f = session.view();
+    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');
+    assert.deepEqual(session.save(), toSave(game), 'the histories differ across the boundary');
+  });
+
+  it('reports the same seat, actor and hand as the underlying game', () => {
+    const session = createLocalSession(31);
+    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));
+  });
+});
+
+describe('a session tells the page when to redraw', () => {
+  it('notifies on an accepted intent and not on a refused one', async () => {
+    const session = createLocalSession(404);
+    let redraws = 0;
+    session.subscribe(() => {
+      redraws++;
+    });
+
+    assert.ok(await step(session));
+    assert.equal(redraws, 1);
+
+    // A refused intent leaves the game where it was, so there is nothing to redraw. This matters
+    // more than it looks: a remote session will push on state change, and a page that redrew on
+    // every submit would flicker on every rejection the server sends back.
+    assert.equal(await session.submit({ type: 'turn.end', player: 0 } as never), false);
+    assert.equal(redraws, 1);
+  });
+
+  it('stops notifying after unsubscribe', async () => {
+    const session = createLocalSession(404);
+    let redraws = 0;
+    const off = session.subscribe(() => {
+      redraws++;
+    });
+    assert.ok(await step(session));
+    off();
+    await step(session);
+    assert.equal(redraws, 1);
+  });
+});
+
+describe('the transient signals drain', () => {
+  it('hands out cues once', async () => {
+    // Cues are a moment, not a state — the Frame can be rebuilt any number of times per render, and
+    // a sound that replayed on each rebuild would stutter. So they are taken, not read.
+    const session = createLocalSession(88);
+    for (let i = 0; i < 40; i++) {
+      if (session.actor() === null) break;
+      if (!(await step(session))) break;
+      if (session.takeCues().length > 0) {
+        assert.deepEqual(session.takeCues(), [], 'a cue was handed out twice');
+        return;
+      }
+    }
+    assert.fail('no cue was earned in 40 actions — the driver never reached a sounding event');
+  });
+
+  it('hands out a scheduled slot once', () => {
+    const session = createLocalSession(88);
+    session.game.scheduled = 3;
+    assert.equal(session.takeScheduled(), 3);
+    assert.equal(session.takeScheduled(), null, 'the timetable flash fired twice');
+  });
+
+  it('keeps the newest card badged until another draw replaces it', () => {
+    // Unlike the other two this one PERSISTS: it says which card is new, not that something just
+    // happened, so it survives redraws and is superseded rather than consumed.
+    const session = createLocalSession(88);
+    session.game.justDrawn = 'card-a';
+    assert.equal(session.justDrawn(), 'card-a');
+    assert.equal(session.justDrawn(), 'card-a');
+  });
+});
+
+describe('undo and restore rebuild the game without leaking the replay', () => {
+  it('steps back one action and refuses at the start', async () => {
+    const session = createLocalSession(909);
+    assert.equal(session.steps(), 0);
+    assert.equal(session.undo(), false, 'undo at the start must be a no-op');
+
+    // Cloned: `toSave` hands back the game's own history array, so holding the object would watch it
+    // grow rather than record where the game was.
+    const before = structuredClone(session.save());
+    await step(session);
+    assert.equal(session.steps(), 1);
+
+    assert.equal(session.undo(), true);
+    assert.equal(session.steps(), 0);
+    assert.deepEqual(session.save(), before, 'undo did not return to the previous position');
+  });
+
+  it('drops the rebuilt game’s cues and draws', async () => {
+    // Undo replays the history from the start, which re-earns every cue and re-records every draw
+    // along the way. None of that is news to a player who just stepped back, so a page that read it
+    // would replay a whole game of sounds and badge whichever card the replay ended on.
+    const session = createLocalSession(909);
+    for (let i = 0; i < 12; i++) {
+      if (session.actor() === null) break;
+      if (!(await step(session))) break;
+    }
+    session.takeCues();
+
+    assert.equal(session.undo(), true);
+    assert.deepEqual(session.takeCues(), [], 'undo replayed the game’s sounds');
+    assert.equal(session.takeScheduled(), null);
+    assert.equal(session.justDrawn(), null, 'undo badged a card from the replay');
+  });
+
+  it('restores to the same position with nothing badged', async () => {
+    const session = createLocalSession(909);
+    for (let i = 0; i < 30; i++) {
+      if (session.actor() === null) break;
+      if (!(await step(session))) break;
+    }
+    const save = session.save();
+    const cells = session.view().cells;
+
+    const fresh = createLocalSession(1);
+    fresh.restore(save);
+    assert.equal(fresh.seed(), save.seed, 'restore kept the session’s original seed');
+    assert.equal(fresh.steps(), save.history.length);
+    assert.deepEqual(fresh.view().cells, cells, 'the board differs after restore');
+    assert.equal(fresh.justDrawn(), null, 'restore badged a card from the replay');
+  });
+});
+
+describe('the page stays on the near side of the boundary', () => {
+  const main = readFileSync(join(import.meta.dirname, '..', 'src', 'web', 'main.ts'), 'utf8');
+
+  it('never reaches through to GameState', () => {
+    // There were eleven of these, and each one was a place the page knew something a server would
+    // never send it — the deck order, another player's hand, the RNG. They all had to go before a
+    // `RemoteSession` could be dropped in, and the cheapest way to keep them gone is to say so here:
+    // a reader that comes back is a failing test rather than a bug found in Phase 2.
+    const reaches = main.match(/\b(session\.game|game)\.state\b/g) ?? [];
+    assert.deepEqual(reaches, [], 'main.ts reached through the Session into GameState');
+  });
+
+  it('imports only types from game.ts', () => {
+    // Everything the page DOES now goes through `session`. Values from `game.ts` — `submit`, `view`,
+    // `undo` — are the local engine by another name, and importing one is how the boundary gets
+    // quietly reopened. Types are fine: `Frame` and `Menu` are what a server sends.
+    const lines = main.split('\n').filter((l) => l.includes("from './game.ts'"));
+    assert.ok(lines.length > 0, 'the check found no game.ts import at all — it has stopped checking');
+    for (const l of lines) {
+      assert.match(l, /^import type /, `main.ts imports values from game.ts: ${l.trim()}`);
+    }
+  });
+});
+
+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
+    // cannot un-see what other players have already seen, it is itself the store, and dealing is the
+    // lobby's job. The page reads this object instead of assuming it is local.
+    assert.deepEqual(createLocalSession(1).capabilities, {
+      undo: true,
+      saveLocal: true,
+      newGame: true,
+    });
+  });
+});

test/setup.test.ts

@@ -7,7 +7,7 @@ import { describe, it } from 'node:test';
 import assert from 'node:assert/strict';
 
 import type { CarType } from '../src/engine/content.ts';
-import { MODIFIER_PROFILES, OPENING_OTHER, OPENING_TRACK, SOLITAIRE_DECK_SIZE, TRACK_CARDS, TRACK_IN_DECK } from '../src/engine/content.ts';
+import { DEFENCE_ONLY_CARDS, DEFENCE_ONLY_COPIES, MODIFIER_PROFILES, OPENING_OTHER, OPENING_TRACK, SOLITAIRE_DECK_SIZE, TRACK_CARDS, TRACK_IN_DECK } from '../src/engine/content.ts';
 import {
   DECK_SIZE,
   EXTRA_TRAINS,
@@ -22,12 +22,14 @@ import {
   deckComposition,
   isFreightHouse,
   lengthProfile,
+  MAINLINE_DECK,
   mainlineCardCount,
   nextOfficeTier,
   officeProfile,
 } from '../src/engine/content.ts';
 import { createRng } from '../src/engine/rng.ts';
 import { buildDeck, buildRollingStock, createGame } from '../src/engine/setup.ts';
+import type { StartingHand } from '../src/engine/content.ts';
 import type { GameConfig } from '../src/engine/state.ts';
 import { subdivisions } from '../src/engine/state.ts';
 
@@ -46,6 +48,15 @@ const solitaireConfig: GameConfig = {
 const newSolitaireGame = (seed = 1234) =>
   createGame({ id: 'g1', seed, config: solitaireConfig, playerNames: ['Jesse'] });
 
+/** A game dealt under one named `StartingHand`, for the tests that are about the deal itself. */
+const gameDealtWith = (startingHand: StartingHand, seed = 1234) =>
+  createGame({
+    id: 'g1',
+    seed,
+    config: { ...solitaireConfig, houseRules: { startingHand } },
+    playerNames: ['Jesse'],
+  });
+
 // ---------------------------------------------------------------------------
 
 describe('card catalogue (component 1)', () => {
@@ -94,7 +105,19 @@ describe('card catalogue (component 1)', () => {
     // 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 make 22 of 235 draws (9%) reject outright.
-    assert.equal(SOLITAIRE_DECK_SIZE, 213);
+    // 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(
+        !buildDeck().some((x) => (x.kind as { key?: string }).key === c.key),
+        `${c.name} is still dealt`,
+      );
+    }
     for (const mode of ['solitaire', 'competitive'] as const) {
       const deck = buildDeck(mode);
       assert.equal(deck.length, SOLITAIRE_DECK_SIZE, `${mode} deck size`);
@@ -159,9 +182,30 @@ describe('card catalogue (component 1)', () => {
     }
   });
 
-  it('identifies the both-direction industry', () => {
+  it('names the Freight House and nothing else as the two-way industry', () => {
+    /**
+     * §9.3 — "Passenger Facilities and Freight Houses permit cars to move each direction". ONE card
+     * answers to that.
+     *
+     * This briefly asserted three. `card-reference.md` reads "'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 on that premise the Refinery and the Grocer's were both made
+     * `flow: 'both'`. The premise is dead: `glossary.md` and `rules-v0.2.md` corrected the Freight
+     * House to a card of its own, dealt like any other industry, so §9.3 names it and the table's
+     * "Both" column loses its only argument.
+     *
+     * Reported from playtesting v0.4.9d and confirmed by Jesse: the Refinery only ships tanks out,
+     * the Grocer's Warehouse only receives. `StationMaster-Home-Deck-v0.4.5.md` prints both that way,
+     * and so does the modifier set — all three Refinery modifiers grant outbound.
+     */
     const houses = FREIGHT_PROFILES.filter(isFreightHouse).map((f) => f.kind);
     assert.deepEqual(houses.sort(), ['freightHouse']);
+    const refinery = FREIGHT_PROFILES.find((f) => f.kind === 'refinery')!;
+    assert.equal(refinery.flow, 'outbound');
+    assert.deepEqual([refinery.baseOut, refinery.baseIn], [1, 0]);
+    const grocers = FREIGHT_PROFILES.find((f) => f.kind === 'grocersWarehouse')!;
+    assert.equal(grocers.flow, 'inbound');
+    assert.deepEqual([grocers.baseOut, grocers.baseIn], [0, 1]);
   });
 
   it('starts every industry at one car out and one loader', () => {
@@ -364,6 +408,42 @@ describe('game setup (component 2)', () => {
     }
   });
 
+  it('deals the Mainline cards from the printed deck, without replacement', () => {
+    /**
+     * `buildDivision` drew uniformly from the nine card TYPES with replacement, so a Division could
+     * be dealt two Interchanges (or two Tunnels), and Plains — printed twice in the deck — carried
+     * the same weight as cards printed once. That became a rules question rather than a flavour one
+     * when an Extra gained the right to start "at the Interchange if one is on the board" (§7): the
+     * board has to hold at most one for that to mean anything.
+     *
+     * Swept over many seeds because a single deal cannot tell a deck from a die.
+     */
+    const seen = new Map<string, number>();
+    for (let seed = 0; seed < 400; seed++) {
+      for (const players of [1, 2, 3, 4]) {
+        const g = createGame({
+          id: 'deck', seed,
+          config: players === 1 ? solitaireConfig : { ...solitaireConfig, mode: 'competitive' },
+          playerNames: Array.from({ length: players }, (_, i) => `P${i}`),
+        });
+        const cards = g.division.nodes.flatMap((n) => (n.kind === 'mainline' ? [n.card] : []));
+        assert.equal(cards.length, mainlineCardCount(players));
+        const counts = new Map<string, number>();
+        for (const c of cards) {
+          const n = (counts.get(c) ?? 0) + 1;
+          counts.set(c, n);
+          seen.set(c, (seen.get(c) ?? 0) + 1);
+          // Plains is the one card printed twice; nothing else may be dealt twice at all.
+          assert.ok(n <= (c === 'plains' ? 2 : 1), `${c} dealt ${n} times at seed ${seed}`);
+        }
+      }
+    }
+    // Every card in the deck reachable, so the deal is not quietly missing one.
+    for (const kind of new Set(MAINLINE_DECK)) {
+      assert.ok((seen.get(kind) ?? 0) > 0, `${kind} was never dealt in 400 seeds`);
+    }
+  });
+
   it('opens with the whole railroad as one Subdivision', () => {
     // §8 — every Office is a Whistle Post, which is not a Control Point.
     const g = newSolitaireGame();
@@ -380,26 +460,40 @@ describe('game setup (component 2)', () => {
     assert.equal(area.adOccupancy.length, 0);
   });
 
-  it('deals three track and three other cards, and starts three Department piles', () => {
+  it('deals three random cards by default, and starts three Department piles', () => {
-    // The opening deal comes from two separately shuffled piles, so the district you can build is
+    // The prototype rule, and the New Game dialog's default: three off one deck, already at the hand
-    // dealt rather than waited for. Six against a hand limit of three is deliberate: the first turn
+    // limit, with no guarantee of anything. The other two shapes are below.
-    // is spent choosing which of them to keep.
     const g = newSolitaireGame();
+    assert.equal(g.decks.hands.get(0)!.length, 3);
+
+    assert.equal(g.decks.departments.length, 3);
+    assert.ok(g.decks.departments.every((pile) => pile.length === 1), 'each Department starts with one face-up card');
+  });
+
+  it('deals six random cards when that is the rule, over the hand limit on purpose', () => {
+    // Six against a hand limit of three is deliberate: the first turn is spent choosing which of
+    // them to keep. What it does NOT do is guarantee track, which is the difference from the split
+    // deal below.
+    const g = gameDealtWith('sixRandom');
+    assert.equal(g.decks.hands.get(0)!.length, 6);
+  });
+
+  it('deals three track and three other cards when that is the rule', () => {
+    // From two separately shuffled piles, so the district you can build is dealt rather than waited
+    // for — a run-around needs five specific pieces, and drawing for them took eight games.
+    const g = gameDealtWith('threeTrackThreeOther');
     const hand = g.decks.hands.get(0)!;
     assert.equal(hand.length, OPENING_TRACK + OPENING_OTHER);
 
     const track = hand.filter((id) => g.cards.get(id)!.kind.kind === 'track');
     assert.equal(track.length, OPENING_TRACK, 'the opening hand is not three track cards');
     assert.equal(hand.length - track.length, OPENING_OTHER, 'the opening hand is not three other cards');
-
-    assert.equal(g.decks.departments.length, 3);
-    assert.ok(g.decks.departments.every((pile) => pile.length === 1), 'each Department starts with one face-up card');
   });
 
   it('shuffles the leftover track back into one deck for the rest of the game', () => {
     // The split is an opening-deal device only. If the leftover track stayed out, every draw after
     // the first turn would be drawn from a deck with no track in it at all.
-    const g = newSolitaireGame();
+    const g = gameDealtWith('threeTrackThreeOther');
     const rest = [...g.decks.homeOffice, ...g.decks.departments.flat()];
     const track = rest.filter((id) => g.cards.get(id)!.kind.kind === 'track');
     assert.equal(
@@ -408,6 +502,22 @@ describe('game setup (component 2)', () => {
     );
   });
 
+  it('leaves every card accounted for whichever shape it was dealt in', () => {
+    // The single-deck path and the two-pile path deal from different piles into the same game; a
+    // card lost or duplicated by either would be a deck that quietly runs short mid-game.
+    for (const shape of ['threeRandom', 'sixRandom', 'threeTrackThreeOther'] as const) {
+      const g = gameDealtWith(shape);
+      const all = [
+        ...g.decks.homeOffice,
+        ...g.decks.departments.flat(),
+        ...g.decks.salvageYard,
+        ...[...g.decks.hands.values()].flat(),
+      ];
+      assert.equal(all.length, SOLITAIRE_DECK_SIZE, `cards lost or duplicated dealing ${shape}`);
+      assert.equal(new Set(all).size, all.length, `duplicate card dealing ${shape}`);
+    }
+  });
+
   it('accounts for every card exactly once', () => {
     const g = newSolitaireGame();
     const all = [

test/sim.test.ts

@@ -13,7 +13,7 @@ import { TOTAL_ROLLING_STOCK } from '../src/engine/content.ts';
 import type { GameConfig, GameState, OfficeArea } from '../src/engine/state.ts';
 import type { Intent } from '../src/engine/intents.ts';
 import { connectionsFor, exitsFrom, hasPort, joins, neighbour, opposite, variantsFor } from '../src/engine/track.ts';
-import { isOperationalRail } from '../src/engine/state.ts';
+import { isOperationalRail, turnOf } from '../src/engine/state.ts';
 import type { Port } from '../src/engine/track.ts';
 import { developerBot, playGame, randomBot } from '../src/sim/bot.ts';
 import { simulate } from '../src/sim/harness.ts';
@@ -97,7 +97,7 @@ describe('trains complete their runs (regression)', () => {
         assert.ok(tray, `A/D track holds ${id}, which no longer exists`);
         assert.equal(tray.position.at, 'grid', `${id} is recorded at an Office but is elsewhere`);
         if (tray.position.at === 'grid') {
-          assert.equal(tray.position.owner, owner);
+          assert.equal(tray.position.seat, owner);
         }
       }
     }
@@ -146,15 +146,22 @@ describe('the revenue chain works end to end (regression)', () => {
     // REGRESSION. Cars dropped at a facility went into the card's `standing` list, while §9.3's
     // loading rule looked at `industryTrack`. Across 50 games ZERO cars were ever spotted and
     // freight revenue was structurally zero. Win rate went 0% -> ~35% when these were unified.
+    //
+    // TWENTY SEEDS, NOT EIGHT. The claim is "structurally zero", and eight games was far too thin a
+    // sample to stand for it: across the original eight, exactly ONE car was ever left spotted, so
+    // the test passed on a single coin-flip. It went red on a change that measurably IMPROVED
+    // spotting — once an industry track stopped being as short as its box count, the bot began
+    // leaving whole cuts (2-5 cars) instead of single cars, which lands on fewer seeds but delivers
+    // 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]) {
+    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, 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;
       }
     }
-    assert.ok(spotted > 0, 'no car ever reached an industry track across eight games');
+    assert.ok(spotted > 0, 'no car ever reached an industry track across twenty games');
   });
 
   it('instantiates a real Facility when a freight card is placed', () => {
@@ -213,7 +220,7 @@ describe('the revenue chain works end to end (regression)', () => {
     const area = s.officeAreas.get(0)!;
     s.clock.phase = 'localOps';
     s.clock.currentActor = 0;
-    s.turn.option = 'draw';
+    turnOf(s, 0).option = 'draw';
     // A north-diverging turnout on the Running Track, and the arc that climbs to meet it. The
     // column is captured BEFORE the lay: laying on the sign moves the sign outward, so reading
     // `limitsEast` again afterwards names the next square along, not the turnout.
@@ -315,11 +322,19 @@ describe('end-of-game statistics', () => {
   });
 
   it('reports no anomalies — every rule in the engine is reachable', () => {
+    /**
+     * 200 GAMES, not 60. This is a reachability canary, and the rarest thing it watches for is Red
+     * Flags: measured at 200 games it fires in 4 of them, about 2%, so a 60-game sample expects 1.2
+     * and reports "unreachable" on the luck of the draw — which is the opposite of what a canary is
+     * for. Coupling is the next rarest at 39 in 200. Both are genuinely reachable; the sample was
+     * simply too small to say so, and it got smaller in effect when v0.4.7 took seven cards out of
+     * the deck and moved which seeds reach which districts.
+     */
     // THE POINT OF THIS MODULE. Every serious bug so far was an unreachable rule: a pipeline with
     // no entry point, a facility that could not be worked, a car that could not be spotted. If an
     // expected event stops firing, something has become unreachable again.
     const report = simulate({
-      games: 60, length: 'standard', mode: 'solitaire', players: ['bot'], policy: developerBot,
+      games: 200, length: 'standard', mode: 'solitaire', players: ['bot'], policy: developerBot,
     });
     /**
      * ONE NAMED EXEMPTION, not a blanket one.
@@ -330,8 +345,8 @@ describe('end-of-game statistics', () => {
      * BOT no longer gets a crew next to an industry: it builds shallow districts and places 2.2
      * facilities a game, down from 3.8 when industries could sit on the main.
      *
-     * That is the bot's district-building weakness, which is the top item in TODO.md, not a rule
+     * That is the bot's district-building weakness, tracked in TODO.md under Bot Performance, not a
-     * that has become unreachable. Exempted by name so the other forty-odd event checks stay live,
+     * 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.
      */
     const KNOWN_UNREACHABLE_BY_THE_BOT = ['event flyingSwitch'];
@@ -371,13 +386,22 @@ describe('switching accomplishes something (regression)', () => {
     // no switching at all (§9.2 works coaches straight off the A/D track), so an entire Local
     // Operations action was wasted.
     /**
-     * ACROSS SEEDS, because one game cannot tell a fixed bug from a lucky deal. Measured over these
+     * ACROSS SEEDS, because one game cannot tell a fixed bug from a lucky deal — and the sample has
-     * 16: thirteen show no oscillation at all and three reach a run of five, so the shuttling is a
+     * to be big enough that it cannot tell a lucky DEAL from a fixed bug either.
-     * minority behaviour rather than the every-game waste this test was written to catch. The bar is
+     *
-     * therefore a RATE — most games clean — plus a ceiling on how bad the worst may get. The residual
+     * It was 16 hand-picked seeds against a bar of 70% clean, on a measurement of 13/16. Dealing the
-     * is recorded in TODO.md with the rest of the bot work.
+     * Mainline cards from the printed deck instead of rolling them (`buildDivision`) re-dealt every
+     * one of those boards and the same 16 came back 11/16, which read as a regression and was not
+     * one: re-measured over 80 seeds the rate is **70.0% clean, worst run 5** — the identical
+     * behaviour, and 13/16 was the lucky draw. A bar sitting exactly on the true rate fails half the
+     * time it is moved.
+     *
+     * So: a wider sweep, and a bar well below the measured rate. What the test is really guarding is
+     * the every-game waste it was written for, which shows up as a rate near ZERO, not as a few
+     * points of drift. The ceiling on the worst run is the sharp half of the assertion and is
+     * unchanged. The residual is recorded in TODO.md with the rest of the bot work.
      */
-    const seeds = [1234, 5, 77, 430, 202, 999, 21, 555, 4321, 31337, 60606, 7777, 123456, 888, 31, 42];
+    const seeds = Array.from({ length: 48 }, (_, i) => i + 1);
     let clean = 0;
     let worstAnywhere = 0;
     for (const seed of seeds) {
@@ -409,7 +433,7 @@ describe('switching accomplishes something (regression)', () => {
     }
 
     assert.ok(
-      clean >= seeds.length * 0.7,
+      clean >= seeds.length * 0.55,
       `only ${clean}/${seeds.length} games were free of aimless shuttling`,
     );
     assert.ok(worstAnywhere <= 5, `a crew oscillated ${worstAnywhere + 1} times without doing any work`);
@@ -424,24 +448,53 @@ describe('switching accomplishes something (regression)', () => {
     // So test the thing the old threshold was a proxy for: motion must convert into work. A crew
     // that shuttles for its own sake shows a high ratio here, however few or many Moves it makes.
     /**
-     * 150 games, not 40. At 40 this measured 1.9 productive acts against a floor of 2 and failed,
+     * 400 games, not 150 and not 40. This has been under-powered twice: at 40 it measured 1.9
-     * while the same bot over 200 games gives 2.6 — the test was under-powered rather than the bot
+     * against a floor of 2, and the fix was 150 on the strength of a 200-game figure of 2.6. Neither
-     * broken, and a floor that trips on sample noise trains you to ignore it. Switching is a
+     * number survived. Measured decisively at 400 games the bot does **1.76** productive acts, and
-     * low-count, high-variance activity: a couple of games with a stranded crew move the mean.
+     * the 150-game sample was reading 2.16 purely on which seeds it happened to include — so the
+     * floor of 2 had been passing on sample composition rather than on behaviour, which is the exact
+     * failure mode the previous comment was written to prevent.
+     *
+     * Switching is a low-count, high-variance activity: a couple of games with a stranded crew move
+     * the mean, so the sample has to be big enough that they cannot.
      */
     const report = simulate({
-      games: 150, length: 'standard', mode: 'solitaire', players: ['bot'], policy: developerBot,
+      games: 400, length: 'standard', mode: 'solitaire', players: ['bot'], policy: developerBot,
     });
     const per = (f: (g: (typeof report.perGame)[number]) => number): number =>
       report.perGame.reduce((n, g) => n + f(g), 0) / report.perGame.length;
 
     const moves = per((g) => g.actions.moves);
     const work = per((g) => g.actions.drops + g.actions.couples);
-    assert.ok(work > 2, `only ${work.toFixed(1)} productive acts a game — the crew is doing nothing`);
+    /**
+     * 1.2, against 1.48 measured. Lowered from 2 in v0.4.2 for two separate reasons, both recorded
+     * rather than blended: the old floor was never actually met (1.76 at 400 games), and expedited
+     * trains now stand at the Office for a Stage instead of passing straight through, which costs
+     * about 16% of the crew's work because a train on the A/D track and the Office square is in the
+     * way. That second part is the change doing what it is supposed to do, not a fault — but it IS
+     * drift, and it is logged in `TODO.md` with the rest of it rather than quietly absorbed here.
+     */
+    assert.ok(work > 1.2, `only ${work.toFixed(2)} productive acts a game — the crew is doing nothing`);
+    /**
+     * RAISED 9 -> 11, and the crew is doing MORE work rather than less.
+     *
+     * Measured at 400 games after v0.4.7: 18 Moves and 1.84 productive acts, a ratio of 9.9 — where
+     * the work figure was 1.48 when the floor above was written. Both halves grew and the numerator
+     * grew faster, which is traffic rather than aimlessness, and there are two new sources of it:
+     * Extras now start at the Division Point their NUMBER sends them to, so westbound Extras exist
+     * at all (measured 32 west / 29 east across 60 deals, against every single one launching
+     * eastbound from the West Division Point before); and the Grocer's Warehouse briefly shipped as
+     * well as received, which was more switching worth doing. That second source is gone again in
+     * v0.4.9e — the Grocer's is inbound-only, as it always was on the sheet — and the ratio still
+     * clears the floor, so the figure is left where it is rather than re-tuned to one release.
+     *
+     * A crew that shuttles for its own sake would show this ratio climbing while `work` stood still.
+     * Logged in TODO.md with the rest of the bot drift rather than quietly absorbed.
+     */
     assert.ok(
-      moves / work < 8,
+      moves / work < 11,
       `${(moves / work).toFixed(1)} Moves per drop or coupling suggests aimless shuttling ` +
-        `(${moves.toFixed(0)} Moves, ${work.toFixed(1)} productive acts)`,
+        `(${moves.toFixed(0)} Moves, ${work.toFixed(2)} productive acts)`,
     );
   });
 });
@@ -721,13 +774,13 @@ describe('the bot does not throw away its own freight (regression)', () => {
         outboundBox: [], inboundBox: [], capacity: { outbound: 1, inbound: 0 },
         // Stranded on WORK with no spotted car to receive it — the definition of a jam.
         menAtWork: [null, null, { type: 'hopper', dir: 'out' }],
-        industryTrack: { length: 2, cars: [] },
+        industryTrack: { cars: [] },
         laborers: 1, porters: 0, usedThisStage: { laborers: 0, porters: 0 },
       },
     } as never);
     s.clock.phase = 'localOps';
     s.clock.currentActor = 0;
-    s.turn.option = 'freightAgent';
+    turnOf(s, 0).option = 'freightAgent';
 
     const jammed = area.grid.get('-1,0')!;
     assert.ok(!isOperationalRail(jammed), 'a jammed industry is not Operational Rail');
@@ -932,6 +985,8 @@ describe('the bot does not lay track that cannot work (regression)', () => {
     assert.ok(lays.length > 3, `the bot laid only ${lays.length} pieces`);
   });
 
+  const SEEDS = [1000, 8919, 16838, 24757, 32676, 40595, 48514, 56433];
+
   it('rarely lays rail that butts a card which cannot accept it', () => {
     // A port facing an EMPTY square is a promise — something may be built there later. A port
     // butting an OCCUPIED square whose card has no matching port is not: that square is taken, so
@@ -943,7 +998,13 @@ describe('the bot does not lay track that cannot work (regression)', () => {
     // placements measured better and cut these from 28% of pieces to 7%.
     let laid = 0;
     let dead = 0;
-    for (const seed of [1000, 8919, 16838, 24757, 32676]) {
+    /**
+     * EIGHT GAMES, NOT FIVE. Five stopped yielding a big enough sample once crews could back out of
+     * a curve: the bot has more switching worth doing, so it spends fewer turns laying track, and
+     * the count fell to 34 against a floor of 40. Seeds added on the same stride rather than the
+     * floor lowered — the floor is what makes the RATE below mean anything.
+     */
+    for (const seed of SEEDS) {
       const s = createGame({
         id: `dp-${seed}`, seed,
         config: { ...config, length: 'standard' },
@@ -982,7 +1043,7 @@ describe('the bot does not lay track that cannot work (regression)', () => {
       };
       playGame(s, spy as never, pump);
     }
-    assert.ok(laid > 40, `only ${laid} pieces laid across five games`);
+    assert.ok(laid > 40, `only ${laid} pieces laid across ${SEEDS.length} games`);
     const rate = dead / laid;
     /**
      * RAISED FROM 0.15 TO 0.25 WHEN THE OPENING DEAL CHANGED, and that is a regression, not a
@@ -1019,8 +1080,21 @@ describe('the freight figures count both halves (regression)', () => {
     // the precondition that makes the comparison mean anything. Three deals is a thin thread to hang
     // that on: an unload needs an inbound industry built, reachable, and a loaded car spotted at it,
     // and whether the bot manages all three on a given deal is luck, not the thing under test.
-    // Measured across these twelve: 34 unloads earned, on 12 of 40 deals sampled more widely.
+    /**
-    for (const seed of [1000, 8919, 16838, 24757, 32676, 40595, 48514, 56433, 64352, 72271, 80190, 88109]) {
+     * FORTY DEALS, up from twelve, and the reason was a rules correction rather than flakiness.
+     *
+     * The Grocer's Warehouse was briefly a both-direction facility, so the bot shipped from it as
+     * well as receiving and deals producing at least one completed unload fell from 12 in 40 to 6 in
+     * 40. v0.4.9e put it back to inbound-only, which is what the sheet always printed. The wider
+     * sample is kept: the precondition it protects — that some deal in the batch actually completes
+     * an unload — is worth having whichever way the rule goes.
+     *
+     * 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.
+     */
+    for (let i = 0; i < 40; i++) {
+      const seed = 1000 + i * 7919;
       const s = createGame({
         id: `fu-${seed}`, seed,
         config: { ...config, length: 'standard' },

test/track.test.ts

@@ -15,9 +15,11 @@ import type {
   TrackCard,
   TurnoutOrientation,
 } from '../src/engine/state.ts';
-import { coordKey, isOperationalRail } from '../src/engine/state.ts';
+import { coordKey, isOperationalRail, turnOf } from '../src/engine/state.ts';
 import { createGame } from '../src/engine/setup.ts';
 import { applyIntent, areaOf } from '../src/engine/apply.ts';
+import { legalActions } from '../src/engine/legal.ts';
+import type { Intent } from '../src/engine/intents.ts';
 import type { MoveContext, Occupancy, Port } from '../src/engine/track.ts';
 import {
   allReachable,
@@ -46,6 +48,7 @@ const straight = (standing: RollingStock[] = []): TrackCard => ({
   geometry: { kind: 'track', geometry: 'straight' },
   baseOperationalRail: true,
   standing,
+  standingWest: 0,
   facility: null,
   modifiers: [],
   enhancements: [],
@@ -60,6 +63,7 @@ const curve = (arc: TrackArc, standing: RollingStock[] = []): TrackCard => ({
   geometry: { kind: 'track', geometry: 'curved', arc },
   baseOperationalRail: true,
   standing,
+  standingWest: 0,
   facility: null,
   modifiers: [],
   enhancements: [],
@@ -71,6 +75,7 @@ const turnout = (o?: TurnoutOrientation): TrackCard => ({
     : { kind: 'track', geometry: 'turnout' },
   baseOperationalRail: false, // no wheel icon — a train may pass through but not stop (§A.1)
   standing: [],
+  standingWest: 0,
   facility: null,
   modifiers: [],
   enhancements: [],
@@ -80,6 +85,7 @@ const officeCard = (): TrackCard => ({
   geometry: { kind: 'office' },
   baseOperationalRail: true,
   standing: [],
+  standingWest: 0,
   facility: null,
   modifiers: [],
   enhancements: [],
@@ -89,6 +95,7 @@ const lockedFacility = (): TrackCard => ({
   geometry: { kind: 'facility', facility: 'mineTipple' },
   baseOperationalRail: true,
   standing: [],
+  standingWest: 0,
   // A load sitting on MEN|AT|WORK locks the industry track down (§9.3).
   facility: {
     kind: 'freight',
@@ -98,7 +105,7 @@ const lockedFacility = (): TrackCard => ({
     inboundBox: [],
     capacity: { outbound: 3, inbound: 0 },
     menAtWork: [{ type: 'hopper', dir: 'out' }, null, null],
-    industryTrack: { length: 4, cars: [] },
+    industryTrack: { cars: [] },
     laborers: 3,
     porters: 0,
     usedThisStage: { laborers: 0, porters: 0 },
@@ -112,7 +119,7 @@ const car = (): RollingStock => ({ type: 'boxcar', loaded: false });
 function straightCard(): TrackCard {
   return {
     geometry: { kind: 'track', geometry: 'straight' },
-    baseOperationalRail: true, standing: [], facility: null, modifiers: [], enhancements: [],
+    baseOperationalRail: true, standing: [], standingWest: 0, facility: null, modifiers: [], enhancements: [],
   };
 }
 
@@ -134,7 +141,7 @@ function areaFrom(cards: Record<string, TrackCard>, officeCoord: GridCoord): Off
   const grid = new Map<string, TrackCard>();
   for (const [k, v] of Object.entries(cards)) grid.set(k, v);
   return {
-    owner: 0,
+    seat: 0,
     tier: 'whistlePost',
     grid,
     officeCoord,
@@ -208,6 +215,7 @@ describe('ports and geometry', () => {
       geometry: { kind: 'track', geometry: 'curved', hand: 'left' },
       baseOperationalRail: true,
       standing: [],
+      standingWest: 0,
       facility: null,
       modifiers: [],
       enhancements: [],
@@ -565,12 +573,69 @@ describe('placement and drop-off', () => {
     );
     assert.ok(!canDropCarsAt(area, at(0, 1)));
   });
+
+  it('lets a crew set out as many cars at an industry as anywhere else (regression)', () => {
+    /**
+     * REPORTED from a playtest, at undo 188: "we wanted to drop two cars, but were only allowed to
+     * drop one."
+     *
+     * An industry track used to be `length: baseOut + baseIn` cars long, so a Mine Tipple — one
+     * green box, no red one — had room for exactly ONE car and refused the second. The box count is
+     * how much WORK an industry can hold; it has nothing to do with how much rail is in front of it.
+     * No industry card prints a siding of a fixed length, and an industry track is ordinary
+     * Operating Rail: four cars fit, the same as on the plain straight beside it.
+     */
+    const oneBoxIndustry = (): TrackCard => {
+      const c = lockedFacility();
+      // Unlocked — §9.3's lock is tested above and is not what this is about.
+      c.facility!.menAtWork = [null, null, null];
+      c.facility!.capacity = { outbound: 1, inbound: 0 };
+      return c;
+    };
+
+    const area = areaFrom(
+      {
+        [coordKey(at(0, 0))]: officeCard(),
+        [coordKey(at(0, 1))]: oneBoxIndustry(),
+        [coordKey(at(0, 2))]: straight(),
+      },
+      at(0, 0),
+    );
+
+    for (const count of [1, 2, 3, 4]) {
+      assert.ok(
+        canDropCarsAt(area, at(0, 1), count),
+        `a one-box industry refused a cut of ${count} — the box count is not the siding length`,
+      );
+      assert.equal(
+        canDropCarsAt(area, at(0, 1), count),
+        canDropCarsAt(area, at(0, 2), count),
+        `an industry and a plain straight disagreed about a cut of ${count}`,
+      );
+    }
+
+    // Four is the ceiling everywhere, because a consist may not exceed four.
+    assert.ok(!canDropCarsAt(area, at(0, 1), 5), 'a fifth car fitted on an industry track');
+    assert.ok(!canDropCarsAt(area, at(0, 2), 5), 'a fifth car fitted on a plain straight');
+  });
+
+  it('counts the cars already spotted at an industry against the room left', () => {
+    const busy = lockedFacility();
+    busy.facility!.menAtWork = [null, null, null];
+    busy.facility!.industryTrack.cars = [car(), car(), car()];
+    const area = areaFrom(
+      { [coordKey(at(0, 0))]: officeCard(), [coordKey(at(0, 1))]: busy },
+      at(0, 0),
+    );
+    assert.ok(canDropCarsAt(area, at(0, 1), 1), 'the fourth car should still fit');
+    assert.ok(!canDropCarsAt(area, at(0, 1), 2), 'a fifth car fitted');
+  });
 });
 
 describe('curves are arcs, and arcs make sidings possible', () => {
   const arcCard = (arc: 'ne' | 'nw' | 'se' | 'sw', geometry: 'curved' | 'sharpCurved' = 'curved'): TrackCard => ({
     geometry: { kind: 'track', geometry, arc },
-    baseOperationalRail: true, standing: [], facility: null, modifiers: [], enhancements: [],
+    baseOperationalRail: true, standing: [], standingWest: 0, facility: null, modifiers: [], enhancements: [],
   });
 
   it('joins exactly two adjacent edges, with no through track', () => {
@@ -588,7 +653,7 @@ describe('curves are arcs, and arcs make sidings possible', () => {
       c.map((p) => [...p].sort().join('')).sort().join(' ');
     const turnout: TrackCard = {
       geometry: { kind: 'track', geometry: 'turnout', turnout: { stem: 'w', through: 'e', diverge: 's' } },
-      baseOperationalRail: true, standing: [], facility: null, modifiers: [], enhancements: [],
+      baseOperationalRail: true, standing: [], standingWest: 0, facility: null, modifiers: [], enhancements: [],
     };
     for (const arc of ['ne', 'nw', 'se', 'sw'] as const) {
       assert.notEqual(norm(connectionsFor(arcCard(arc))), norm(connectionsFor(turnout)),
@@ -631,11 +696,11 @@ describe('curves are arcs, and arcs make sidings possible', () => {
     const ew = (): TrackCard => straightCard();
     const grid: Record<string, TrackCard> = {
       '0,-2': ew(),
-      '0,-1': { geometry: { kind: 'track', geometry: 'turnout', turnout: { stem: 'w', through: 'e', diverge: 's' }, hand: 'right' }, baseOperationalRail: true, standing: [], facility: null, modifiers: [], enhancements: [] },
+      '0,-1': { geometry: { kind: 'track', geometry: 'turnout', turnout: { stem: 'w', through: 'e', diverge: 's' }, hand: 'right' }, baseOperationalRail: true, standing: [], standingWest: 0, facility: null, modifiers: [], enhancements: [] },
       '-1,-1': arcCard('ne'),
       '-1,0': ew(),
       '-1,1': arcCard('nw'),
-      '0,1': { geometry: { kind: 'track', geometry: 'turnout', turnout: { stem: 'e', through: 'w', diverge: 's' }, hand: 'left' }, baseOperationalRail: true, standing: [], facility: null, modifiers: [], enhancements: [] },
+      '0,1': { geometry: { kind: 'track', geometry: 'turnout', turnout: { stem: 'e', through: 'w', diverge: 's' }, hand: 'left' }, baseOperationalRail: true, standing: [], standingWest: 0, facility: null, modifiers: [], enhancements: [] },
       '0,0': ew(),
     };
     const area = areaFrom(grid, { row: 0, col: 0 });
@@ -682,12 +747,12 @@ describe('coupling lifts only the cars the crew ran over', () => {
       // A local CREW, which is what this test is about — `trainNumber: null`. It used to say train 1,
       // the Crack Limited, which prints "no switching" (§7) and may not make this move at all.
       id: 'crew', trainNumber: null, trainIsExtra: false, engineAt: 0, consist: [],
-      direction: 'west', facing: 'w', position: { at: 'grid', owner: 0, coord: { row: 0, col: 0 } }, movesUsed: 0,
+      direction: 'west', facing: 'w', position: { at: 'grid', seat: 0, coord: { row: 0, col: 0 } }, movesUsed: 0,
     });
     s.clock.phase = 'localOps';
     s.clock.currentActor = 0;
-    s.turn.option = 'switch';
+    turnOf(s, 0).option = 'switch';
-    s.turn.movesRemaining = 6;
+    turnOf(s, 0).movesRemaining = 6;
 
     const r = applyIntent(s, 0, { type: 'switch.move', trayId: 'crew', to: { row: 0, col: -1 }, reverse: false });
     assert.ok(r.ok, 'the move should be legal');
@@ -719,12 +784,13 @@ describe('Operational Rail — where a train may stop and leave cars (Appendix A
     geometry: { kind: 'facility', facility: 'mineTipple' },
     baseOperationalRail: true,
     standing: [],
+    standingWest: 0,
     facility: {
       kind: 'freight', subtype: 'mineTipple',
       allows: { outbound: true, inbound: false },
       outboundBox: [], inboundBox: [], capacity: { outbound: 1, inbound: 0 },
       menAtWork: menAtWork as never,
-      industryTrack: { length: 2, cars: [] },
+      industryTrack: { cars: [] },
       laborers: 1, porters: 0, usedThisStage: { laborers: 0, porters: 0 },
     },
     modifiers: [],
@@ -860,7 +926,7 @@ describe('a turnout may be laid to face another, making a crossover', () => {
   /** A turnout stated the way the cards read: who may come in, and where they may go. */
   const facing = (stem: Port, through: Port, diverge: Port, hand: 'left' | 'right'): TrackCard => ({
     geometry: { kind: 'track', geometry: 'turnout', turnout: { stem, through, diverge }, hand },
-    baseOperationalRail: false, standing: [], facility: null, modifiers: [], enhancements: [],
+    baseOperationalRail: false, standing: [], standingWest: 0, facility: null, modifiers: [], enhancements: [],
   });
 
   it('joins a south-diverging turnout to the north-diverging one beneath it', () => {
@@ -927,12 +993,12 @@ describe('backing up does not turn the train around', () => {
     s.trays.set(id, {
       id, trainNumber: null, trainIsExtra: false, engineAt: 0,
       consist: [], direction: 'east', facing: 'e',
-      position: { at: 'grid', owner: 0, coord: at(0, 1) }, movesUsed: 0,
+      position: { at: 'grid', seat: 0, coord: at(0, 1) }, movesUsed: 0,
     } as never);
     s.clock.phase = 'localOps';
     s.clock.currentActor = 0;
-    s.turn.option = 'switch';
+    turnOf(s, 0).option = 'switch';
-    s.turn.movesRemaining = 6;
+    turnOf(s, 0).movesRemaining = 6;
 
     // Running forward, east: the engine leads, so it still points east.
     assert.ok(applyIntent(s, 0, { type: 'switch.move', trayId: id, to: at(0, 2), reverse: false }).ok);
@@ -968,13 +1034,14 @@ describe('why a square is NOT offered (the same walk, keeping its rejections)',
     geometry: { kind: 'facility', facility: 'mineTipple' },
     baseOperationalRail: true,
     standing: [],
+    standingWest: 0,
     facility: {
       kind: 'freight', subtype: 'mineTipple',
       allows: { outbound: true, inbound: false },
       outboundBox: [], inboundBox: [], capacity: { outbound: 1, inbound: 0 },
       // A load on MEN locks the track (§9.3).
       menAtWork: [{ type: 'hopper', dir: 'out' }, null, null] as never,
-      industryTrack: { length: 2, cars: [] },
+      industryTrack: { cars: [] },
       laborers: 1, porters: 0, usedThisStage: { laborers: 0, porters: 0 },
     },
     modifiers: [],
@@ -1053,3 +1120,138 @@ describe('why a square is NOT offered (the same walk, keeping its rejections)',
     }
   });
 });
+
+// ---------------------------------------------------------------------------
+// docs/plans/switching-paths.md — two routes to the same square
+// ---------------------------------------------------------------------------
+
+describe('two routes to one square', () => {
+  const limitsCard = (): TrackCard => ({
+    geometry: { kind: 'limits' },
+    baseOperationalRail: true,
+    standing: [],
+    standingWest: 0,
+    facility: null,
+    modifiers: [],
+    enhancements: [],
+  });
+
+  /**
+   * A passing loop: a turnout diverges off the Running Track, curves down to an industry, and
+   * curves back up to rejoin the main two columns west. Both routes from (0,4) to (0,0) are legal
+   * under §2.4 (neither ever leaves a card by the port it entered); they differ in what they
+   * couple. This is the fixture in the plan's §1, verified identical on v0.4.7 and v0.4.8.
+   */
+  function loopArea(midCard: (col: number) => TrackCard = () => straight()): OfficeArea {
+    return areaFrom(
+      {
+        [coordKey(at(0, 0))]: straight(),
+        [coordKey(at(0, 1))]: turnout({ stem: 'w', through: 'e', diverge: 's' }),
+        [coordKey(at(0, 2))]: midCard(2),
+        [coordKey(at(0, 3))]: turnout({ stem: 'e', through: 'w', diverge: 's' }),
+        [coordKey(at(0, 4))]: limitsCard(),
+        [coordKey(at(-1, 1))]: curve('ne'),
+        [coordKey(at(-1, 2))]: midCard(-1),
+        [coordKey(at(-1, 3))]: curve('nw'),
+      },
+      at(9, 9), // office coord, deliberately away from the fixture
+    );
+  }
+
+  const tanker: RollingStock = { type: 'tank', loaded: false };
+
+  it('offers both routes, and only one couples the tanker on the spur', () => {
+    const area = loopArea((col) => (col === -1 ? straight([tanker]) : straight()));
+    const dests = reachableDestinations(ctxFor(area), at(0, 4), 'w');
+    const atZero = dests.filter((d) => d.coord.row === 0 && d.coord.col === 0);
+    assert.equal(atZero.length, 2, `expected two distinct routes to (0,0), got ${atZero.length}`);
+    const withTanker = atZero.filter((d) => d.couples.some((c) => c.type === 'tank'));
+    const without = atZero.filter((d) => d.couples.length === 0);
+    assert.equal(withTanker.length, 1, 'exactly one route should couple the tanker');
+    assert.equal(without.length, 1, 'exactly one route should couple nothing');
+  });
+
+  it('offers two routes coupling the SAME car type off DIFFERENT cards, and neither is dropped', () => {
+    // The dedupe key must include the origin card, not just the car type (plan §3) — two boxcars,
+    // one on the bypass and one on the main, must not collapse into one destination.
+    const area = loopArea(() => straight([{ type: 'boxcar', loaded: false }]));
+    const dests = reachableDestinations(ctxFor(area), at(0, 4), 'w');
+    const atZero = dests.filter((d) => d.coord.row === 0 && d.coord.col === 0);
+    assert.equal(atZero.length, 2, `expected two distinct routes to (0,0), got ${atZero.length}`);
+    for (const d of atZero) {
+      assert.deepEqual(d.couples.map((c) => c.type), ['boxcar'], 'each route should couple its own boxcar');
+    }
+  });
+
+  it('a `via`-qualified switch.move resolves to the route it names', () => {
+    function freshGame(): GameState {
+      const s = gameWith(loopArea((col) => (col === -1 ? straight([tanker]) : straight())));
+      s.trays.set('crew', {
+        id: 'crew', trainNumber: null, trainIsExtra: false, engineAt: 0, consist: [],
+        direction: 'west', facing: 'w', position: { at: 'grid', seat: 0, coord: at(0, 4) }, movesUsed: 0,
+      });
+      s.clock.phase = 'localOps';
+      s.clock.currentActor = 0;
+      turnOf(s, 0).option = 'switch';
+      turnOf(s, 0).movesRemaining = 6;
+      return s;
+    }
+
+    const probe = freshGame();
+    const options = legalActions(probe, 0).filter(
+      (i): i is Extract<Intent, { type: 'switch.move' }> =>
+        i.type === 'switch.move' && i.to.row === 0 && i.to.col === 0,
+    );
+    assert.equal(options.length, 2, 'expected two distinct switch.move intents to (0,0)');
+    assert.ok(options.every((i) => i.via !== undefined), 'an ambiguous route must carry a distinguishing via');
+    const vias = new Set(options.map((i) => `${i.via!.row},${i.via!.col}`));
+    assert.equal(vias.size, 2, 'the two routes must carry DIFFERENT via');
+
+    const outcomes = options.map((intent) => {
+      const s = freshGame();
+      const r = applyIntent(s, 0, intent);
+      assert.ok(r.ok, 'a via-qualified move to a square the engine offered must be legal');
+      return s.trays.get('crew')!.consist.map((c) => c.type);
+    });
+    assert.ok(outcomes.some((c) => c.includes('tank')), 'one via should have coupled the tanker');
+    assert.ok(outcomes.some((c) => c.length === 0), 'the other via should have coupled nothing');
+
+    // `via` absent still resolves — the first route enumerated, exactly as before this feature.
+    const s = freshGame();
+    const r = applyIntent(s, 0, { type: 'switch.move', trayId: 'crew', to: at(0, 0), reverse: false });
+    assert.ok(r.ok, 'a plain move with no via must still resolve to SOME legal route');
+  });
+
+  it('a dense district terminates and stays bounded, preferring the routes BFS finds first', () => {
+    // Chained passing loops: each one independently offers "through" or "detour", so N of them
+    // offer 2^N routes to the far end with no global memo to stop it — exactly the exponential case
+    // the cap exists for (plan §3). 15 segments is 32,768 routes; the cap is 4,000 frontier nodes.
+    const segments = 15;
+    const start = 3 * segments;
+    const grid: Record<string, TrackCard> = { [coordKey(at(0, start + 1))]: limitsCard() };
+    for (let k = 0; k < segments; k++) {
+      const divergeCol = start - 3 * k;
+      const midCol = divergeCol - 1;
+      const mergeCol = divergeCol - 2;
+      grid[coordKey(at(0, divergeCol))] = turnout({ stem: 'e', through: 'w', diverge: 's' });
+      grid[coordKey(at(0, midCol))] = straight();
+      grid[coordKey(at(0, mergeCol))] = turnout({ stem: 'w', through: 'e', diverge: 's' });
+      grid[coordKey(at(-1, divergeCol))] = curve('nw');
+      grid[coordKey(at(-1, midCol))] = straight();
+      grid[coordKey(at(-1, mergeCol))] = curve('ne');
+    }
+    grid[coordKey(at(0, 0))] = straight();
+    const area = areaFrom(grid, at(9, 9));
+
+    const startedAt = Date.now();
+    const dests = reachableDestinations(ctxFor(area), at(0, start + 1), 'w');
+    const elapsed = Date.now() - startedAt;
+
+    assert.ok(elapsed < 5000, `exploreMoves took ${elapsed}ms — the cap should keep this fast`);
+    assert.ok(dests.length > 0, 'the cap must not eliminate every route');
+    assert.ok(
+      dests.length < 2 ** segments,
+      `${dests.length} destinations found — the cap should have cut off full 2^${segments} enumeration`,
+    );
+  });
+});

test/train-rules.test.ts

@@ -14,7 +14,7 @@ import { applyIntent, areaOf, check } from '../src/engine/apply.ts';
 import { ALL_TRAINS, trainProfile } from '../src/engine/content.ts';
 import { createGame } from '../src/engine/setup.ts';
 import type { GameConfig, GameState, GridCoord, RollingStock, TrackCard } from '../src/engine/state.ts';
-import { coordKey } from '../src/engine/state.ts';
+import { coordKey, turnOf } from '../src/engine/state.ts';
 import { trainRules } from '../src/sim/view.ts';
 
 const config: GameConfig = {
@@ -30,6 +30,7 @@ const straight = (standing: RollingStock[] = []): TrackCard => ({
   geometry: { kind: 'track', geometry: 'straight' },
   baseOperationalRail: true,
   standing,
+  standingWest: 0,
   facility: null,
   modifiers: [],
   enhancements: [],
@@ -54,12 +55,12 @@ function switching(
   area.grid.set(coordKey({ row: office.row, col: office.col - 3 }), straight());
   s.trays.set('t', {
     id: 't', trainNumber, trainIsExtra: isExtra, engineAt: 0, consist,
-    direction: 'west', facing: 'w', position: { at: 'grid', owner: 0, coord: here }, movesUsed: 0,
+    direction: 'west', facing: 'w', position: { at: 'grid', seat: 0, coord: here }, movesUsed: 0,
   });
   s.clock.phase = 'localOps';
   s.clock.currentActor = 0;
-  s.turn.option = 'switch';
+  turnOf(s, 0).option = 'switch';
-  s.turn.movesRemaining = 6;
+  turnOf(s, 0).movesRemaining = 6;
   return 't';
 }
 
@@ -70,18 +71,30 @@ const west = (s: GameState, n = 2): GridCoord => {
 };
 
 const boxcar = (loaded = false): RollingStock => ({ type: 'boxcar', loaded });
+/** As `ROLLING_STOCK_SUPPLY` mints them: there is no empty caboose in the game. */
+const caboose = (): RollingStock => ({ type: 'caboose', loaded: true });
 const coach = (loaded = false): RollingStock => ({ type: 'coach', loaded });
 
 // ---------------------------------------------------------------------------
 
 describe('§7 — no switching', () => {
-  it('refuses every switching act to a train whose card forbids it', () => {
+  it('still allows a plain move — "no switching" means no adding or dropping cars', () => {
     // Six cards print it: both expresses, the Light Engine, Campaign, Circus and Military trains.
-    // Moving, setting out and sorting are all switching, so all three are refused.
+    // A train held at the Office may still need to clear onto Secondary Track ahead of other
+    // traffic, so a move that couples nothing is legal.
     const s = game();
     switching(s, 1, false, [boxcar()]);
+    assert.equal(check(s, 0, { type: 'switch.move', trayId: 't', to: west(s), reverse: false }), null);
+  });
 
-    assert.equal(check(s, 0, { type: 'switch.move', trayId: 't', to: west(s), reverse: false }), 'NO_SWITCHING');
+  it('refuses a move that would couple a car, and refuses dropping and sorting outright', () => {
+    const s = game();
+    switching(s, 1, false, [boxcar()], [boxcar()]);
+
+    assert.equal(
+      check(s, 0, { type: 'switch.move', trayId: 't', to: west(s), reverse: false }),
+      'PICKUP_NOT_ALLOWED',
+    );
     assert.equal(check(s, 0, { type: 'switch.dropCars', trayId: 't', count: 1 }), 'NO_SWITCHING');
     assert.equal(check(s, 0, { type: 'switch.sortConsist', trayId: 't', order: [0] }), 'NO_SWITCHING');
   });
@@ -127,6 +140,23 @@ describe('§7 — what a train may couple', () => {
       'EMPTIES_ONLY',
     );
   });
+
+  it('X22 Pee-Dee may still couple a caboose, which is not a load (Gitea#8)', () => {
+    // Every caboose in the game is minted `loaded: true` because the supply table's loaded/empty
+    // split doubles as a piece count. Taken literally that left the per-diem train unable to pick
+    // up ANY caboose, its own included: set it out at the end of a sweep and it was stranded there.
+    const s = game();
+    switching(s, 22, true, [], [caboose()]);
+    assert.equal(check(s, 0, { type: 'switch.move', trayId: 't', to: west(s), reverse: false }), null);
+
+    // The restriction itself is untouched — a loaded car alongside the caboose still refuses.
+    const withLoad = game();
+    switching(withLoad, 22, true, [], [caboose(), boxcar(true)]);
+    assert.equal(
+      check(withLoad, 0, { type: 'switch.move', trayId: 't', to: west(withLoad), reverse: false }),
+      'EMPTIES_ONLY',
+    );
+  });
 });
 
 describe('§7 — one freight car per location (trains 3/4)', () => {
@@ -205,12 +235,12 @@ describe('§7 — trains Porters may not work', () => {
       outboundBox: [coach(true)], inboundBox: [],
       capacity: { outbound: 2, inbound: 2 },
       menAtWork: null,
-      industryTrack: { length: 0, cars: [] },
+      industryTrack: { cars: [] },
       laborers: 0, porters: 2, usedThisStage: { laborers: 0, porters: 0 },
     };
     s.trays.set('t', {
       id: 't', trainNumber, trainIsExtra: isExtra, engineAt: 0, consist: [coach(false)],
-      direction: 'east', position: { at: 'grid', owner: 0, coord: area.officeCoord }, movesUsed: 0,
+      direction: 'east', position: { at: 'grid', seat: 0, coord: area.officeCoord }, movesUsed: 0,
     });
     area.adOccupancy.push('t');
     s.clock.phase = 'loadUnload';