make recipe selection and buffers of smelter and reprocessing plant behave like other buildings, except that a recipe may be chosen automatically

bin/app/data/config/recipes.toml

@@ -6,6 +6,10 @@
 # realized: tier 1 ratios are 1:1, tier 2 ratios are 2:3, tier 3+ ratios
 # are deliberately strange.
 #
+# A recipe id names the process, not the product — the display name shown in
+# the UI is derived from it — so an item and the recipe that makes it never
+# carry the same name.
+#
 # Input chain per game phase — each phase transition adds exactly one new
 # base input:
 #
@@ -27,21 +31,21 @@
 # -----------------------------------------------------------------------------
 
 [[recipe]]
-id = "mine_iron_ore"
+id = "iron_mining"
 building = "miner"
 inputs = []
 outputs = [{item = "iron_ore", amount = 1}]
 duration_seconds = 1.0
 
 [[recipe]]
-id = "mine_copper_ore"
+id = "copper_mining"
 building = "miner"
 inputs = []
 outputs = [{item = "copper_ore", amount = 1}]
 duration_seconds = 1.0
 
 [[recipe]]
-id = "mine_quartz"
+id = "quartz_mining"
 building = "miner"
 inputs = []
 outputs = [{item = "quartz", amount = 1}]
@@ -52,21 +56,21 @@ duration_seconds = 2.0
 # -----------------------------------------------------------------------------
 
 [[recipe]]
-id = "iron_ingot"
+id = "iron_smelting"
 building = "smelter"
 inputs = [{item = "iron_ore", amount = 1}]
 outputs = [{item = "iron_ingot", amount = 1}]
 duration_seconds = 1.0
 
 [[recipe]]
-id = "copper_ingot"
+id = "copper_smelting"
 building = "smelter"
 inputs = [{item = "copper_ore", amount = 1}]
 outputs = [{item = "copper_ingot", amount = 1}]
 duration_seconds = 1.0
 
 [[recipe]]
-id = "silicon"
+id = "quartz_reduction"
 building = "smelter"
 inputs = [{item = "quartz", amount = 1}]
 outputs = [{item = "silicon", amount = 1}]
@@ -90,7 +94,7 @@ duration_seconds = 1.0
 # -----------------------------------------------------------------------------
 
 [[recipe]]
-id = "reprocessing_cycle"
+id = "scrap_reprocessing"
 building = "reprocessing_plant"
 inputs = [{item = "scrap", amount = 4}]
 duration_seconds = 4.0
@@ -120,21 +124,21 @@ duration_seconds = 4.0
 # -----------------------------------------------------------------------------
 
 [[recipe]]
-id = "steel_plate"
+id = "steel_rolling"
 building = "assembler"
 inputs = [{item = "iron_ingot", amount = 2}]
 outputs = [{item = "steel_plate", amount = 1}]
 duration_seconds = 3.0
 
 [[recipe]]
-id = "copper_wire"
+id = "wire_drawing"
 building = "assembler"
 inputs = [{item = "copper_ingot", amount = 1}]
 outputs = [{item = "copper_wire", amount = 2}]
 duration_seconds = 1.0
 
 [[recipe]]
-id = "copper_coil"
+id = "coil_winding"
 building = "assembler"
 inputs = [{item = "copper_wire", amount = 2}]
 outputs = [{item = "copper_coil", amount = 1}]
@@ -145,7 +149,7 @@ duration_seconds = 1.5
 # unlocked_at_start: building blocks appear in no schematic's materials, so the
 # implicit item graph can never reach this recipe (REQ-LOCK-IMPLICIT).
 [[recipe]]
-id = "building_block"
+id = "block_pressing"
 building = "assembler"
 unlocked_at_start = true
 inputs = [{item = "steel_plate", amount = 2}]
@@ -157,14 +161,14 @@ duration_seconds = 2.0
 # -----------------------------------------------------------------------------
 
 [[recipe]]
-id = "control_chip"
+id = "chip_etching"
 building = "assembler"
 inputs = [{item = "silicon", amount = 1}, {item = "copper_wire", amount = 2}]
 outputs = [{item = "control_chip", amount = 1}]
 duration_seconds = 5.0
 
 [[recipe]]
-id = "capacitor_bank"
+id = "capacitor_assembly"
 building = "assembler"
 inputs = [{item = "copper_coil", amount = 2}, {item = "silicon", amount = 1}]
 outputs = [{item = "capacitor_bank", amount = 1}]
@@ -173,21 +177,21 @@ duration_seconds = 5.0
 # The quality gate for m+ hulls: a deliberately long-running recipe
 # (time-heavy archetype).
 [[recipe]]
-id = "hardened_steel"
+id = "steel_hardening"
 building = "assembler"
 inputs = [{item = "steel_plate", amount = 3}]
 outputs = [{item = "hardened_steel", amount = 1}]
 duration_seconds = 12.0
 
 [[recipe]]
-id = "ceramic_plate"
+id = "ceramic_firing"
 building = "assembler"
 inputs = [{item = "quartz", amount = 2}]
 outputs = [{item = "ceramic_plate", amount = 1}]
 duration_seconds = 4.0
 
 [[recipe]]
-id = "drive_unit"
+id = "drive_assembly"
 building = "assembler"
 inputs = [
     {item = "steel_plate", amount = 2},
@@ -202,14 +206,14 @@ duration_seconds = 8.0
 # -----------------------------------------------------------------------------
 
 [[recipe]]
-id = "voidsteel_plate"
+id = "voidsteel_forging"
 building = "assembler"
 inputs = [{item = "voidsteel", amount = 1}, {item = "hardened_steel", amount = 1}]
 outputs = [{item = "voidsteel_plate", amount = 1}]
 duration_seconds = 8.0
 
 [[recipe]]
-id = "capital_core"
+id = "core_assembly"
 building = "assembler"
 inputs = [
     {item = "voidsteel", amount = 2},
@@ -223,25 +227,26 @@ duration_seconds = 10.0
 # Shortcut recipes — drop-only assembler recipes, gated by unlock groups in
 # unlocks.toml (REQ-LOCK-EXPLICIT). Pure rewards: item threat stays defined by
 # the base (expensive) path via the max rule, so shortcuts give real factory
-# efficiency without shifting any balance.
+# efficiency without shifting any balance. Named "direct_*" after the base
+# process they skip a step of, so the reward reads as what it is.
 # -----------------------------------------------------------------------------
 
 [[recipe]]
-id = "shortcut_steel_plate"
+id = "direct_rolling"
 building = "assembler"
 inputs = [{item = "iron_ore", amount = 3}]
 outputs = [{item = "steel_plate", amount = 1}]
 duration_seconds = 2.0
 
 [[recipe]]
-id = "shortcut_control_chip"
+id = "direct_etching"
 building = "assembler"
 inputs = [{item = "quartz", amount = 2}]
 outputs = [{item = "control_chip", amount = 1}]
 duration_seconds = 4.0
 
 [[recipe]]
-id = "shortcut_hardened_steel"
+id = "direct_hardening"
 building = "assembler"
 inputs = [{item = "iron_ingot", amount = 4}]
 outputs = [{item = "hardened_steel", amount = 1}]
@@ -252,35 +257,35 @@ duration_seconds = 8.0
 # -----------------------------------------------------------------------------
 
 [[recipe]]
-id = "drone_hull"
+id = "drone_framing"
 building = "assembler"
 inputs = [{item = "iron_ingot", amount = 1}]
 outputs = [{item = "drone_hull", amount = 1}]
 duration_seconds = 1.0
 
 [[recipe]]
-id = "frigate_hull"
+id = "frigate_framing"
 building = "assembler"
 inputs = [{item = "steel_plate", amount = 2}, {item = "copper_wire", amount = 1}]
 outputs = [{item = "frigate_hull", amount = 1}]
 duration_seconds = 2.0
 
 [[recipe]]
-id = "destroyer_hull"
+id = "destroyer_framing"
 building = "assembler"
 inputs = [{item = "steel_plate", amount = 3}, {item = "copper_coil", amount = 2}]
 outputs = [{item = "destroyer_hull", amount = 1}]
 duration_seconds = 4.0
 
 [[recipe]]
-id = "cruiser_hull"
+id = "cruiser_framing"
 building = "assembler"
 inputs = [{item = "hardened_steel", amount = 2}, {item = "control_chip", amount = 2}]
 outputs = [{item = "cruiser_hull", amount = 1}]
 duration_seconds = 6.0
 
 [[recipe]]
-id = "battlecruiser_hull"
+id = "battlecruiser_framing"
 building = "assembler"
 inputs = [
     {item = "hardened_steel", amount = 3},
@@ -291,7 +296,7 @@ outputs = [{item = "battlecruiser_hull", amount = 1}]
 duration_seconds = 8.0
 
 [[recipe]]
-id = "battleship_hull"
+id = "battleship_framing"
 building = "assembler"
 inputs = [
     {item = "voidsteel_plate", amount = 3},
@@ -302,7 +307,7 @@ outputs = [{item = "battleship_hull", amount = 1}]
 duration_seconds = 10.0
 
 [[recipe]]
-id = "dreadnought_hull"
+id = "dreadnought_framing"
 building = "assembler"
 inputs = [
     {item = "voidsteel_plate", amount = 5},
@@ -313,7 +318,7 @@ outputs = [{item = "dreadnought_hull", amount = 1}]
 duration_seconds = 12.0
 
 [[recipe]]
-id = "carrier_hull"
+id = "carrier_framing"
 building = "assembler"
 inputs = [
     {item = "voidsteel_plate", amount = 5},
@@ -328,21 +333,21 @@ duration_seconds = 12.0
 # -----------------------------------------------------------------------------
 
 [[recipe]]
-id = "railgun_s_module"
+id = "railgun_s_kit"
 building = "assembler"
 inputs = [{item = "copper_coil", amount = 1}]
 outputs = [{item = "railgun_s_module", amount = 1}]
 duration_seconds = 1.0
 
 [[recipe]]
-id = "salvager_module"
+id = "salvager_kit"
 building = "assembler"
 inputs = [{item = "steel_plate", amount = 1}, {item = "copper_wire", amount = 2}]
 outputs = [{item = "salvager_module", amount = 1}]
 duration_seconds = 2.0
 
 [[recipe]]
-id = "repair_tool_module"
+id = "repair_tool_kit"
 building = "assembler"
 inputs = [{item = "steel_plate", amount = 1}, {item = "copper_wire", amount = 2}]
 outputs = [{item = "repair_tool_module", amount = 1}]
@@ -350,56 +355,56 @@ duration_seconds = 2.0
 
 # Material-heavy, fast: the armor archetype.
 [[recipe]]
-id = "armor_plates_module"
+id = "armor_plates_kit"
 building = "assembler"
 inputs = [{item = "steel_plate", amount = 4}]
 outputs = [{item = "armor_plates_module", amount = 1}]
 duration_seconds = 3.0
 
 [[recipe]]
-id = "maneuvering_thrusters_module"
+id = "maneuvering_thrusters_kit"
 building = "assembler"
 inputs = [{item = "steel_plate", amount = 1}, {item = "copper_coil", amount = 1}]
 outputs = [{item = "maneuvering_thrusters_module", amount = 1}]
 duration_seconds = 2.0
 
 [[recipe]]
-id = "sensor_booster_module"
+id = "sensor_booster_kit"
 building = "assembler"
 inputs = [{item = "copper_wire", amount = 2}, {item = "copper_coil", amount = 1}]
 outputs = [{item = "sensor_booster_module", amount = 1}]
 duration_seconds = 2.0
 
 [[recipe]]
-id = "afterburner_module"
+id = "afterburner_kit"
 building = "assembler"
 inputs = [{item = "copper_coil", amount = 2}, {item = "steel_plate", amount = 1}]
 outputs = [{item = "afterburner_module", amount = 1}]
 duration_seconds = 3.0
 
 [[recipe]]
-id = "weapon_stabilizer_module"
+id = "weapon_stabilizer_kit"
 building = "assembler"
 inputs = [{item = "steel_plate", amount = 1}, {item = "copper_coil", amount = 1}]
 outputs = [{item = "weapon_stabilizer_module", amount = 1}]
 duration_seconds = 2.0
 
 [[recipe]]
-id = "weapon_primer_module"
+id = "weapon_primer_kit"
 building = "assembler"
 inputs = [{item = "capacitor_bank", amount = 1}, {item = "copper_coil", amount = 1}]
 outputs = [{item = "weapon_primer_module", amount = 1}]
 duration_seconds = 4.0
 
 [[recipe]]
-id = "weapon_upgrade_module"
+id = "weapon_upgrade_kit"
 building = "assembler"
 inputs = [{item = "control_chip", amount = 1}, {item = "copper_coil", amount = 1}]
 outputs = [{item = "weapon_upgrade_module", amount = 1}]
 duration_seconds = 4.0
 
 [[recipe]]
-id = "railgun_m_module"
+id = "railgun_m_kit"
 building = "assembler"
 inputs = [
     {item = "capacitor_bank", amount = 1},
@@ -410,7 +415,7 @@ outputs = [{item = "railgun_m_module", amount = 1}]
 duration_seconds = 4.0
 
 [[recipe]]
-id = "drone_bay_module"
+id = "drone_bay_kit"
 building = "assembler"
 inputs = [
     {item = "control_chip", amount = 1},
@@ -421,7 +426,7 @@ outputs = [{item = "drone_bay_module", amount = 1}]
 duration_seconds = 4.0
 
 [[recipe]]
-id = "railgun_l_module"
+id = "railgun_l_kit"
 building = "assembler"
 inputs = [
     {item = "capacitor_bank", amount = 1},
@@ -432,7 +437,7 @@ outputs = [{item = "railgun_l_module", amount = 1}]
 duration_seconds = 6.0
 
 [[recipe]]
-id = "drone_hangar_module"
+id = "drone_hangar_kit"
 building = "assembler"
 inputs = [
     {item = "voidsteel_plate", amount = 1},

bin/app/data/config/unlocks.toml

@@ -125,16 +125,16 @@ modules = ["drone_hangar"]
 # --- Assembler recipes -----------------------------------------------------
 
 [[unlock]]
-id = "shortcut_steel_plate"
+id = "direct_rolling"
 station_level = 1
-recipes = ["shortcut_steel_plate"]
+recipes = ["direct_rolling"]
 
 [[unlock]]
-id = "shortcut_control_chip"
+id = "direct_etching"
 station_level = 2
-recipes = ["shortcut_control_chip"]
+recipes = ["direct_etching"]
 
 [[unlock]]
-id = "shortcut_hardened_steel"
+id = "direct_hardening"
 station_level = 2
-recipes = ["shortcut_hardened_steel"]
+recipes = ["direct_hardening"]

bin/app/data/config/visuals.toml

@@ -109,40 +109,40 @@ glyph   = "E"
 # --- ores ---
 
 [items.iron_ore]
-fill    = "#8a5a4a"
+fill    = "#47271c"
-outline = "#201010"
+outline = "#a65b42"
 
 [items.copper_ore]
-fill    = "#c47a3a"
+fill    = "#deb592"
-outline = "#3a1a0a"
+outline = "#826a56"
 
 [items.quartz]
-fill    = "#e0d4f0"
+fill    = "#4f3d66"
-outline = "#40345a"
+outline = "#9776c4"
 
 # --- smelted basics ---
 
 [items.iron_ingot]
-fill    = "#b0b0b8"
+fill    = "#535357"
-outline = "#202028"
+outline = "#97979e"
 
 [items.copper_ingot]
-fill    = "#d48a4a"
+fill    = "#663810"
-outline = "#402010"
+outline = "#b07746"
 
 [items.silicon]
-fill    = "#33415e"
+fill    = "#737f99"
-outline = "#0e1420"
+outline = "#373f4f"
 
 # --- salvage loop ---
 
 [items.scrap]
-fill    = "#7a7268"
+fill    = "#998e81"
-outline = "#201a14"
+outline = "#574b3d"
 
 [items.voidsteel]
-fill    = "#4a3a6a"
+fill    = "#82759c"
-outline = "#151020"
+outline = "#3f374f"
 
 # --- basic components ---
 
@@ -151,106 +151,106 @@ fill    = "#e09a50"
 outline = "#3a2008"
 
 [items.steel_plate]
-fill    = "#8a92a0"
+fill    = "#202836"
-outline = "#22262c"
+outline = "#54698c"
 
 [items.copper_coil]
-fill    = "#d07030"
+fill    = "#cca287"
-outline = "#381808"
+outline = "#755d4d"
 
 [items.building_block]
-fill    = "#c8b070"
+fill    = "#544724"
-outline = "#302810"
+outline = "#a18845"
 
 # --- advanced components ---
 
 [items.control_chip]
-fill    = "#2ea35a"
+fill    = "#74b08b"
-outline = "#0a2a14"
+outline = "#42634e"
 
 [items.capacitor_bank]
 fill    = "#d0a030"
 outline = "#302408"
 
 [items.hardened_steel]
-fill    = "#6a7280"
+fill    = "#818999"
-outline = "#181c22"
+outline = "#3e4859"
 
 [items.ceramic_plate]
 fill    = "#e0d8c8"
 outline = "#3a3428"
 
 [items.drive_unit]
-fill    = "#4a6ad0"
+fill    = "#92a4de"
-outline = "#101a38"
+outline = "#545f80"
 
 # --- capital components ---
 
 [items.voidsteel_plate]
-fill    = "#7a5aaa"
+fill    = "#9986b5"
-outline = "#1c1038"
+outline = "#544766"
 
 [items.capital_core]
-fill    = "#b040d0"
+fill    = "#420c52"
-outline = "#280c30"
+outline = "#9444ab"
 
 # --- module items ---
 
 [items.railgun_s_module]
-fill    = "#691313"
+fill    = "#bf7e7e"
-outline = "#f3ff4f"
+outline = "#664343"
 
 [items.railgun_m_module]
-fill    = "#892020"
+fill    = "#b07474"
-outline = "#f3ff4f"
+outline = "#593b3b"
 
 [items.railgun_l_module]
-fill    = "#a92d2d"
+fill    = "#b07474"
-outline = "#f3ff4f"
+outline = "#593b3b"
 
 [items.salvager_module]
 fill    = "#b2cfdd"
 outline = "#236137"
 
 [items.repair_tool_module]
-fill    = "#2e9ba3"
+fill    = "#0b4347"
-outline = "#689275"
+outline = "#38868c"
 
 [items.armor_plates_module]
-fill    = "#808080"
+fill    = "#999999"
-outline = "#202020"
+outline = "#545454"
 
 [items.sensor_booster_module]
-fill    = "#40a0ff"
+fill    = "#a0c9f2"
-outline = "#102840"
+outline = "#607991"
 
 [items.maneuvering_thrusters_module]
-fill    = "#5090e0"
+fill    = "#92b4de"
-outline = "#142438"
+outline = "#566982"
 
 [items.afterburner_module]
-fill    = "#6080c0"
+fill    = "#1d2e52"
-outline = "#182030"
+outline = "#486db5"
 
 [items.weapon_upgrade_module]
 fill    = "#ff4040"
 outline = "#401010"
 
 [items.weapon_primer_module]
-fill    = "#e03838"
+fill    = "#e69797"
-outline = "#380e0e"
+outline = "#855858"
 
 [items.weapon_stabilizer_module]
-fill    = "#c03030"
+fill    = "#c78383"
-outline = "#300c0c"
+outline = "#6e4848"
 
 [items.drone_bay_module]
 fill    = "#cc66ff"
 outline = "#331040"
 
 [items.drone_hangar_module]
-fill    = "#9933cc"
+fill    = "#8c689e"
-outline = "#260c33"
+outline = "#42314a"
 
 # --- ship hulls (outline matches the ship's fleet color in [ships.*]) ---
 
@@ -283,8 +283,8 @@ fill    = "#1b1b1b"
 outline = "#ff5533"
 
 [items.carrier_hull]
-fill    = "#1b1b1b"
+fill    = "#310f42"
-outline = "#cc66ff"
+outline = "#8542a6"
 
 # -----------------------------------------------------------------------------
 # Ships

bin/app/data/config/world.toml

@@ -1,5 +1,5 @@
 [world]
-height_tiles = 40
+height_tiles = 30
 refund_percentage = 100
 deconstruction_time_seconds = 0.1
 starting_building_blocks = 200
@@ -15,7 +15,7 @@ building_blocks_tooltip = "Building blocks are the currency for construction. Sp
 artifact_tooltip = "Artifacts are the key to victory. Earn one by choosing the artifact reward when you destroy a set of enemy defence stations. Collect enough of them to win the game."
 
 [regions]
-asteroid_width_tiles = 60
+asteroid_width_tiles = 40
 player_buffer_width_tiles = 20
 contest_zone_width_tiles = 60
 enemy_buffer_width_tiles = 20

docs/architecture.md

@@ -124,13 +124,31 @@ Within a single simulation tick, subsystems run in this fixed order. The order i
 Three product targets plus tests:
 
 - `lib/` — simulation + config. Depends on Qt Core + Qt Gui, toml++, tinyexpr. No QtWidgets.
-- `ui/` — QtWidgets + `QOpenGLWidget` code: header bar, game world view, selection panel, build button bar. Depends on `lib` and on Qt's OpenGL widgets module.
+- `ui/` — QtWidgets + `QOpenGLWidget` code: header bar, game world view, selection panel, build button bar, controls panel. Depends on `lib` and on Qt's OpenGL widgets module.
   - `ui/selection/` — the selection panel's contents. `SelectionPanel` itself only arbitrates between the two selection categories, picks a card from the catalog (`SelectionContentFactory`), and hosts one at a time; each kind of selection has its own `SelectionContent` subclass assembled from shared parts (REQ-UI-SELECTION-CARD, REQ-UI-SELECTION-CONTENT).
 - `app/` — thin `main()` that creates the simulation, the UI, and wires them together. Depends on `ui`.
 - `tests/` — Catch2 tests. Links only against `lib`.
 
 Directory discipline inside `lib/` keeps the internal sim/config seam clear; sim code must not reach into config parsing and vice versa.
 
+## Player Input
+
+Every player control is declared once, in `lib/core/ControlAction.h`, and read by three consumers that must never disagree about it:
+
+* **`ControlsPanel`** asks which actions apply and draws a row per action (REQ-UI-CONTROLS-CONTENT).
+* **`InputMapper`** resolves a key press to an action and fires the event that action stands for.
+* **`GameWorldView`** resolves a mouse gesture to an action and runs the branch that carries it out.
+
+The file declares; it never performs. It holds no simulation access, fires no events, and names nothing — display strings live in `ui/ControlActionText.h`, which renders each badge from the binding the resolver actually matches, so a chip cannot claim a key that does nothing. What an action *does* stays in the widget that always did it: the drag state machines, hit-testing, and command enqueuing were not moved.
+
+Three invariants are easy to break here:
+
+* **Do not add a shortcut straight to `InputMapper`'s switch or `mousePressEvent`'s branches.** Add the action and its binding to the table; the handler switches on the resolved action. A binding added directly is invisible to the panel, which is the drift the table exists to prevent. (Build hotkeys and `F3`/`F4` are deliberate exceptions, documented in the header and in REQ-UI-CONTROLS-ACCURACY.)
+* **Availability and display are different questions.** An action can be live in a context the panel does not advertise it in — `Ctrl`+click with an empty selection is the standing example. `isControlActionAvailable` answers the first, the per-context row lists answer the second, and `ControlActionTest` asserts the pairing that matters: every row's bindings resolve back to that row's action.
+* **Gesture state is shared, not owned by an action.** Whether a belt drag is in progress decides what the right mouse button means, so it lives on `BuildModeController` where the resolver can see it — as does the hovered-transfer flag. `m_boxSelecting` is likewise one gesture serving two actions (box select and deconstruct area).
+
+`ControlContext` is a plain snapshot rather than references to the live controllers, which is what keeps the rules testable without a world and stops an action reaching into the simulation: if a rule needs a fact, the fact is named in the struct and the caller supplies it. When bindings become player-configurable, only the binding tables in `ControlAction.cpp` turn from hard-coded data into loaded data.
+
 ## Belt Subsystem
 
 Belts and splitters are their own specialized subsystem. Belt items are **not** entities — they are transient data flowing through the belt representation. They do not have identities that persist across ticks.

docs/balancing/derived.md

@@ -44,9 +44,9 @@ move. Combat stats were tuned empirically against the arena suite in
 | capital_core | 2 voidsteel + 1 capacitor_bank + 1 control_chip | 10 | 1 | 240 |
 
 Shortcut recipes (drop-only; item threat stays defined by the base path
-via the max rule): `shortcut_steel_plate` 3 iron_ore → 1 plate (2 s,
+via the max rule): `direct_rolling` 3 iron_ore → 1 plate (2 s,
-level 1), `shortcut_control_chip` 2 quartz → 1 chip (4 s, level 2),
+level 1), `direct_etching` 2 quartz → 1 chip (4 s, level 2),
-`shortcut_hardened_steel` 4 iron_ingot → 1 hardened (8 s, level 2).
+`direct_hardening` 4 iron_ingot → 1 hardened (8 s, level 2).
 
 Ratio curve realized: t1 all 1:1 (miner:smelter); t2 clean 2:3
 (ingot→plate, wire→coil); t3 strange — 2:5 (silicon→chip), 3:5
@@ -122,13 +122,13 @@ range 120, scrap 40. Enemy station: 3000+1500x HP, 25+12x dmg,
 ## Pacing
 
 **Unlock ladder** (level → unlocks; ← marks `unlock_requires`; starting
-set at −1: drone, frigate, railgun_s, salvager, building_block recipe):
+set at −1: drone, frigate, railgun_s, salvager, block_pressing recipe):
 
 | level | ships | modules | recipes |
 |---|---|---|---|
 | 0 | destroyer | repair_tool, armor_plates | |
-| 1 | | maneuvering_thrusters, sensor_booster | shortcut_steel_plate |
+| 1 | | maneuvering_thrusters, sensor_booster | direct_rolling |
-| 2 | cruiser | railgun_m, afterburner | shortcut_control_chip, shortcut_hardened_steel |
+| 2 | cruiser | railgun_m, afterburner | direct_etching, direct_hardening |
 | 3 | | weapon_stabilizer | |
 | 4 | battlecruiser ← cruiser | weapon_primer, weapon_upgrade | |
 | 5 | | drone_bay | |

docs/requirements.md

@@ -6,8 +6,7 @@ Config files use the TOML format. The following config files drive game paramete
 
 - **world.toml** — world dimensions, region widths, expansion amounts, building refund percentage, building deconstruction time, wave timing, boss wave timing, belt speed, starting building blocks, departure interval, ship orbit factor, rally orbit radius, scrap-per-threat conversion, combat target-selection parameters (target score formula, overclaim penalty formula, target hysteresis), artifact chance formula, artifact win count, view pan speeds (slow and fast horizontal pan speed and pan ramp band width), an optional building blocks tooltip string (shown as the header bar's building blocks stock hover tooltip, REQ-UI-BLOCKS-TOOLTIP; omitted when unset), and an optional artifact tooltip string (shown as the header bar's artifact count hover tooltip, REQ-UI-ARTIFACTS-TOOLTIP; omitted when unset).
 - **buildings.toml** — building block cost and construction time per building type, plus an optional tooltip description string per building type (shown as the build button's hover tooltip, REQ-UI-BUILD-TOOLTIP; omitted when unset). Whether a building type is available from game start or must be unlocked during play is not defined here but in **unlocks.toml** (REQ-LOCK-EXPLICIT): a building type granted by an unlock group starts locked and is hidden from the build menu until its group is awarded (REQ-LOCK-BUILDING).
-- **recipes.toml** — crafting recipes: inputs, outputs, quantities, durations, and reprocessing plant probabilities. Assembler recipe entries may optionally define `unlocked_at_start` (boolean, default false): when true the recipe is available from game start regardless of the implicit item graph — used for base recipes that no schematic's materials reach (such as building blocks; see REQ-LOCK-IMPLICIT). Which assembler recipes must instead be awarded during play (explicitly gated) is defined in **unlocks.toml**, not here (REQ-LOCK-EXPLICIT); every remaining assembler recipe is implicitly unlocked through the item graph (REQ-LOCK-IMPLICIT). Any recipe entry may optionally define `icon` (string): the id of an item whose icon represents the recipe in the recipe-selection dialog (REQ-UI-RECIPE-ICON); when omitted, the recipe's first output item is used.
+- **recipes.toml** — crafting recipes: inputs, outputs, quantities, durations, and reprocessing plant probabilities. Assembler recipe entries may optionally define `unlocked_at_start` (boolean, default false): when true the recipe is available from game start regardless of the implicit item graph — used for base recipes that no schematic's materials reach (such as building blocks; see REQ-LOCK-IMPLICIT). Which assembler recipes must instead be awarded during play (explicitly gated) is defined in **unlocks.toml**, not here (REQ-LOCK-EXPLICIT); every remaining assembler recipe is implicitly unlocked through the item graph (REQ-LOCK-IMPLICIT).- **ships.toml** — per schematic: a human-readable display name (used in the UI), hull stats (HP, max linear speed, sensor range, main acceleration, maneuvering acceleration, angular acceleration, max rotation speed) as plain values, required build materials, a layout grid defining the ship's module slots, and a `default_modules` list used for enemy wave ships (see REQ-WAV-DEFAULT-MODULES). Whether a ship schematic is available from game start or must be unlocked during play is defined in **unlocks.toml** (REQ-LOCK-EXPLICIT), not here.
-- **ships.toml** — per schematic: a human-readable display name (used in the UI), hull stats (HP, max linear speed, sensor range, main acceleration, maneuvering acceleration, angular acceleration, max rotation speed) as plain values, required build materials, a layout grid defining the ship's module slots, and a `default_modules` list used for enemy wave ships (see REQ-WAV-DEFAULT-MODULES). Whether a ship schematic is available from game start or must be unlocked during play is defined in **unlocks.toml** (REQ-LOCK-EXPLICIT), not here.
 - **modules.toml** — per module type: id, surface mask, materials list, production time, fill color, glyph, an optional tooltip description string (shown as the module selection button's hover tooltip, REQ-MOD-UI-MODULE-TOOLTIP; omitted when unset), and an optional capability section and/or stat modifier formulas. Whether a module schematic is available from game start or must be unlocked during play is defined in **unlocks.toml** (REQ-LOCK-EXPLICIT), not here. A module with a capability section (`[module.weapon]`, `[module.salvage]`, or `[module.repair]`) containing base stat formulas is a **capability module** that grants the ship a weapon, salvage bay, or repair tool per instance (see REQ-MOD-CONFIG for the full list of formulas per capability type). A module with only `added_*`/`multiplied_*` formulas is a **passive module** that modifies stats on the ship or on capability module instances (see REQ-MOD-STAT-CALC).
 - **unlocks.toml** — unlock groups: each `[[unlock]]` entry names a group of ship schematics, module schematics, building types, and/or assembler recipes that are awarded together from a single defence station drop (see Unlock Group Format, REQ-LOCK-EXPLICIT, REQ-DEF-SCHEMATIC-DROP). Anything not granted by any unlock group is available from game start.
 - **stations.toml** — HP, damage, range, fire rate, and scrap drop for player and enemy defence stations, defined as formulas of station level.
@@ -91,7 +90,7 @@ Any ship, module, building, or assembler recipe id that appears in no unlock gro
 ## Game World
 
 - REQ-GW-COORDS: Tile coordinates are integer `(x, y)`. The origin `(0, 0)` is the first column of space — the tile immediately to the right of the asteroid's right edge at game start, at the top of the world. X grows right; Y grows down. All asteroid tiles have `x < 0`; asteroid left-expansions add tiles at increasingly negative X. The origin never shifts.
-- REQ-GW-TILE-SIZE: Tiles are square. The tile size in pixels is derived automatically so that the world height (in tiles) exactly fills the game world view's height in pixels. Items on belts are rendered at half-tile size (drawn as an item icon, or a colored square as the fallback — REQ-UI-ITEM-ICON); when multiple items occupy the same tile they are spaced quarter-tile apart along the direction of travel and overlap, rendered in ascending order of progress — the least-progressed item is drawn first (bottom) and the furthest-progressed item is drawn last (on top). Items emerging from a building's output port are rendered by these same rules on that port's output belt (REQ-MAT-OUTPUT-EMERGE).
+- REQ-GW-TILE-SIZE: Tiles are square. The tile size in pixels is derived automatically so that the world height (in tiles) exactly fills the game world view's height in pixels. Items on belts are rendered at half-tile size (drawn as a colored square carrying the item's icon, or the square alone when the item has no icon — REQ-UI-ITEM-ICON); when multiple items occupy the same tile they are spaced quarter-tile apart along the direction of travel and overlap, rendered in ascending order of progress — the least-progressed item is drawn first (bottom) and the furthest-progressed item is drawn last (on top). Items emerging from a building's output port are rendered by these same rules on that port's output belt (REQ-MAT-OUTPUT-EMERGE).
 - REQ-GW-BELT-CAPACITY: Belt tiles and tunnel entry/exit tiles each hold up to four items simultaneously, queued one behind the other in the direction of travel. Splitter tiles hold up to four items: two unassigned items (progress < 0.5, not yet routed to an output) and one item per output slot (progress ≥ 0.5, committed to a specific output direction). Output-slot items are rendered on top of unassigned items; when both output slots are occupied, their rendering order follows the clockwise port order starting from East.
 - REQ-GW-BELT-SPEED: Items on belts move at `world.toml [world].belt_speed_tiles_per_second` tiles per second (default 2).
 - REQ-GW-HEIGHT: The world height (in tiles) is read from `world.toml [world].height_tiles`.
@@ -146,16 +145,20 @@ Any ship, module, building, or assembler recipe id that appears in no unlock gro
 - REQ-BLD-DECON-QUEUE: Fully-built factory buildings marked for demolition (REQ-BLD-DECONSTRUCT) enter a **deconstruction queue** that is processed one building at a time and runs in parallel with the construction queue (REQ-BLD-QUEUE) — the two queues advance independently and simultaneously. Each building takes `world.toml [world].deconstruction_time_seconds` (default 0.1) to deconstruct, the same duration for every building type. When a building's deconstruction completes it is removed from the world and its refund is credited (REQ-BLD-DECONSTRUCT). A building **stops operating the moment it enters the queue**: it runs no production and transports no items, and no longer participates as a live building (its tunnel pairing is re-evaluated as if it were gone, REQ-BLD-TUNNEL-PAIR), but it still physically occupies its tiles until removed, so those tiles stay blocked for placement. A queued building can be taken back out of the deconstruction queue before it is removed (REQ-BLD-DECONSTRUCT-CLICK, REQ-BLD-DECONSTRUCT-BOX) — including the one currently being deconstructed; doing so discards any deconstruction progress, credits no refund, and the building resumes operating (and re-pairs, REQ-BLD-TUNNEL-PAIR). Construction sites never enter the deconstruction queue (REQ-BLD-DECONSTRUCT). Every building in the deconstruction queue is rendered with the deconstruct tint — the `visuals.toml [overlays].deconstruct_tint` color, the same tint applied to a building hovered in deconstruct mode (REQ-UI-DECONSTRUCT-BORDER) — so queued buildings are visually distinct.
 - REQ-BLD-DECONSTRUCT-CLICK: While in deconstruct mode (REQ-UI-HOTKEYS, REQ-UI-DECONSTRUCT-BUTTON), left-clicking a placed factory building or construction site in the game world marks it for demolition, following the rules of REQ-BLD-DECONSTRUCT: a fully-built building is added to the deconstruction queue (REQ-BLD-DECON-QUEUE), and a construction site is removed instantly with the full refund. Left-clicking a fully-built building that is **already in the deconstruction queue** instead removes it from the queue (un-queues it, REQ-BLD-DECON-QUEUE), with no refund; repeated clicks on the same building therefore alternate between queueing and un-queueing it. Clicking a building that cannot be deconstructed (the HQ or a player defence station, per REQ-BLD-DECONSTRUCT), or clicking empty world space, has no effect. Deconstruct mode stays active after each action so the player can continue without re-entering the mode; it is exited via the Q toggle (REQ-UI-HOTKEYS) or the Deconstruct button (REQ-UI-DECONSTRUCT-BUTTON).
 - REQ-BLD-DECONSTRUCT-BOX: While in deconstruct mode (REQ-UI-HOTKEYS, REQ-UI-DECONSTRUCT-BUTTON), the player can click and drag a selection box in the game world. A selection rectangle is drawn while dragging, using the same box-drag gesture and coverage semantics as the multi-select box (REQ-UI-MULTI-SELECT). On mouse up, following the rules of REQ-BLD-DECONSTRUCT: every construction site covered by the box is removed instantly with the full refund; and among the fully-built deconstructible buildings covered by the box, if **all** of them are already in the deconstruction queue they are all removed from it (un-queued, REQ-BLD-DECON-QUEUE), otherwise every covered building not yet in the queue is added to the deconstruction queue (already-queued ones stay). Buildings that cannot be deconstructed (the HQ and player defence stations, per REQ-BLD-DECONSTRUCT) are excluded from the box demolition; ships and defence stations are never affected.
-- REQ-BLD-SITE-CONFIG: A construction site — a building that has been placed but is still queued or under construction (REQ-BLD-QUEUE) — can be selected and configured exactly like the equivalent operational building, before it finishes building. Whatever configuration the building type supports is available on the site: the recipe for a Miner or Assembler (REQ-UI-SELECT-BUTTON), the produced-ship schematic and its module layout for a Shipyard (REQ-UI-SELECT-BUTTON, REQ-MOD-UI-PREVIEW, REQ-MOD-UI-DIALOG), and the output filters for a Splitter (REQ-BLD-SPLITTER) — all set through the same selection panel controls (REQ-UI-CONFIG-INLINE). Only currently unlocked recipes and schematics are offered, exactly as for operational buildings (REQ-LOCK-UI-RECIPE, REQ-LOCK-UI-SCHEMATIC, REQ-LOCK-UI-SPLITTER). The configuration is stored on the construction site and carries over unchanged when construction completes, so the building becomes operational already configured. A construction site has no input/output buffers and runs no production cycle, so the buffer and production-progress portions of the panel (REQ-UI-SINGLE-SELECTION, REQ-UI-PRODUCTION-PROGRESS) are not shown for it; only its construction progress (REQ-UI-CONSTRUCTION-PROGRESS) and its configuration controls appear. (Blueprint placement already applies a stored recipe or schematic to a construction site on placement per REQ-UI-BLUEPRINT-PLACE; this requirement additionally lets the player set or change that configuration directly on an existing site.)
+- REQ-BLD-SITE-CONFIG: A construction site — a building that has been placed but is still queued or under construction (REQ-BLD-QUEUE) — can be selected and configured exactly like the equivalent operational building, before it finishes building. Whatever configuration the building type supports is available on the site: the recipe for a Miner, Assembler, Smelter or Reprocessing Plant (REQ-UI-SELECT-BUTTON, REQ-BLD-AUTO-RECIPE), the produced-ship schematic and its module layout for a Shipyard (REQ-UI-SELECT-BUTTON, REQ-MOD-UI-PREVIEW, REQ-MOD-UI-DIALOG), and the output filters for a Splitter (REQ-BLD-SPLITTER) — all set through the same selection panel controls (REQ-UI-CONFIG-INLINE). Only currently unlocked recipes and schematics are offered, exactly as for operational buildings (REQ-LOCK-UI-RECIPE, REQ-LOCK-UI-SCHEMATIC, REQ-LOCK-UI-SPLITTER). The configuration is stored on the construction site and carries over unchanged when construction completes, so the building becomes operational already configured. A construction site has no input/output buffers and runs no production cycle, so the buffer and production-progress portions of the panel (REQ-UI-SINGLE-SELECTION, REQ-UI-PRODUCTION-PROGRESS) are not shown for it; only its construction progress (REQ-UI-CONSTRUCTION-PROGRESS) and its configuration controls appear. (Blueprint placement already applies a stored recipe or schematic to a construction site on placement per REQ-UI-BLUEPRINT-PLACE; this requirement additionally lets the player set or change that configuration directly on an existing site.)
 
 ## Building Types
 
 - REQ-BLD-MINER: **Miner** (2×2): The player selects which ore type it extracts. Each ore type corresponds to a `recipes.toml [[recipe]]` entry with `building = "miner"`, defining the output item and `duration_seconds`. Every asteroid tile is equivalent for mining — any miner can produce any ore type based solely on its selected recipe. Ore never depletes. Only implicitly unlocked ore-type recipes are available for selection (REQ-LOCK-UI-RECIPE).
-- REQ-BLD-SMELTER: **Smelter** (2×2): Converts ore or scrap into basic materials. No recipe selection required. Inputs, outputs, and rates are defined in `recipes.toml [[recipe]]` entries with `building = "smelter"`.
+- REQ-BLD-SMELTER: **Smelter** (2×2): Converts ore or scrap into basic materials. Its recipe is selected as any other building's is, except that it also picks one for itself from the first material it is offered (REQ-BLD-AUTO-RECIPE). Inputs, outputs, and rates are defined in `recipes.toml [[recipe]]` entries with `building = "smelter"`.
 - REQ-BLD-ASSEMBLER: **Assembler** (3×3): The player selects a recipe from the config-defined crafting tree. Produces the selected output item at the rate defined in the corresponding `recipes.toml [[recipe]]` entry with `building = "assembler"`. Only implicitly unlocked recipes are available for selection (REQ-LOCK-UI-RECIPE).
-- REQ-BLD-REPROCESSING: **Reprocessing Plant** (3×3): Consumes scrap per cycle and produces exactly one higher-level intermediate product per cycle via weighted random pick. The input quantity, possible output items, per-output weights, and amounts are defined in `recipes.toml [[recipe]]` entries with `building = "reprocessing_plant"` (`inputs`, `outputs[].item`, `outputs[].amount`, `outputs[].weight`). Weights are normalized at load time; their sum does not need to equal 1. The output is rolled at cycle start (see REQ-MAT-CYCLE); the pool of eligible outputs is restricted to implicitly unlocked item types (REQ-LOCK-REPROCESSING-POOL). The output buffer holds at most one cycle's output — see REQ-MAT-OUTPUT-BUFFER-REPROCESSING.
+- REQ-BLD-REPROCESSING: **Reprocessing Plant** (3×3): Consumes scrap per cycle and produces exactly one **kind** of higher-level intermediate product per cycle via weighted random pick, in that output's configured amount (which may be more than one item). The input quantity, possible output items, per-output weights, and amounts are defined in `recipes.toml [[recipe]]` entries with `building = "reprocessing_plant"` (`inputs`, `outputs[].item`, `outputs[].amount`, `outputs[].weight`). Weights are normalized at load time; their sum does not need to equal 1. The output is rolled at cycle start (see REQ-MAT-CYCLE); the pool of eligible outputs is restricted to implicitly unlocked item types (REQ-LOCK-REPROCESSING-POOL). Its output side follows the general rules with no exception: one buffer per possible output item (REQ-MAT-OUTPUT-BUFFER), and a cycle starts only when every possible roll would fit (REQ-MAT-CYCLE) — which is also what denies the player a reroll by stalling the output belt. Like the Smelter it picks its recipe from the first material it is offered while none is set (REQ-BLD-AUTO-RECIPE).
+- REQ-BLD-AUTO-RECIPE: **Automatic recipe selection.** The Smelter and the Reprocessing Plant (REQ-BLD-SMELTER, REQ-BLD-REPROCESSING) are *auto-recipe buildings*. They carry a selected recipe and are configured exactly as a Miner or Assembler is — the same selection button and dialog (REQ-UI-SELECT-BUTTON), buffers sized for that one recipe alone (REQ-MAT-INPUT-BUFFER, REQ-MAT-OUTPUT-BUFFER), and the same pre-configuration on a construction site (REQ-BLD-SITE-CONFIG). They differ in one respect only:
+  - **Selection while none is set.** When such a building has no recipe, the first material offered at any of its input ports that some recipe of its type consumes selects that recipe; the material is then accepted as normal. This holds for every intake path — a belt, splitter or tunnel exit at an input port, and a directly coupled producer (REQ-MAT-DIRECT-COUPLE) — because a building that accepts nothing would otherwise leave a coupled producer stuck at its port forever. The choice is deterministic: input ports are examined in order, and where several recipes of the type consume the offered material the first in config order wins.
+  - **No further switching.** Once a recipe is set the building keeps it. It does not switch when its buffers run empty, nor when a material belonging to another of its recipes arrives — that material is simply not an accepted input, exactly as for any other building.
+  - **The player is always in control.** Selecting a different recipe clears the buffers (REQ-MAT-INPUT-BUFFER, REQ-MAT-OUTPUT-BUFFER); that is how a building left holding part of a cycle nothing feeds any more is freed, and how a selection the player did not want is corrected. For these buildings the dialog's clearing option is captioned `(Auto)` rather than `(None)` (REQ-UI-SELECT-OPTIONS): it unsets the recipe and hands the building back to automatic selection.
 - REQ-BLD-SHIPYARD: **Shipyard** (4×2): The player selects a schematic. When all required materials — the ship's base materials (`[ship.schematic].materials`) plus the materials of all modules in the configured layout (REQ-MOD-MATERIALS) — are present in its input buffer, the shipyard consumes them and begins a production cycle lasting the ship's base `[ship.schematic].production_time_seconds` plus the sum of production times contributed by all module instances in the configured layout (REQ-MOD-PRODUCTION-TIME). One ship of that type is spawned with the configured modules when the cycle completes. The shipyard cannot start a new cycle while one is in progress. If the player confirms a layout change (REQ-MOD-UI-DIALOG) while a production cycle is in progress, the current cycle is cancelled and all consumed materials are discarded; the shipyard returns to idle with the new layout configuration. Confirming a layout identical to the one already configured is not a change and cancels nothing (REQ-MAT-INPUT-BUFFER).
-- REQ-BLD-SALVAGE-BAY: **Salvage Bay** (3×2): A dedicated drop-off point for salvage ships. It has an output buffer whose holding capacity is defined by the `output_buffer_capacity` field of the `salvage_bay` entry in `buildings.toml` (rather than by a production cycle, since the Salvage Bay has no recipe). A ship at the bay hands over one unit of scrap per tick while the buffer has free space; a full buffer blocks further drop-off until space frees up (consistent with the buffer-full semantics of REQ-MAT-OUTPUT-BUFFER). Held scrap is pushed onto connected output belts.
+- REQ-BLD-SALVAGE-BAY: **Salvage Bay** (3×2): A dedicated drop-off point for salvage ships. It has a single output buffer — scrap is the only thing it ever holds — whose holding capacity is defined by the `output_buffer_capacity` field of the `salvage_bay` entry in `buildings.toml` (rather than by a production cycle, since the Salvage Bay has no recipe). A ship at the bay hands over one unit of scrap per tick while the buffer has free space; a full buffer blocks further drop-off until space frees up (consistent with the buffer-full semantics of REQ-MAT-OUTPUT-BUFFER). Held scrap is pushed onto connected output belts.
 - REQ-BLD-BELT: **Belt** (1×1): Transports items. A belt tile has one direction (N, S, E, W) set at placement (modified by rotation). Curved belts are auto-derived: when a belt tile's outgoing direction leads into another belt whose direction is orthogonal, the downstream belt is rendered and behaves as a curve. Belt speed is defined in `world.toml [world].belt_speed_tiles_per_second` (REQ-GW-BELT-SPEED). A belt accepts items only through a non-output edge (REQ-MAT-ACCEPT-DIR).
 - REQ-BLD-SPLITTER: **Splitter** (1×1): Distributes incoming items between two output directions. Incoming items are accepted only through the splitter's non-output edges (REQ-MAT-ACCEPT-DIR). Each output can optionally have a filter (a list of item types), configurable via the selection panel; only implicitly unlocked item types are available as filter options (REQ-LOCK-UI-SPLITTER). Routing rules:
   - An item matching only one output's filter is routed to that output.
@@ -188,8 +191,8 @@ Any ship, module, building, or assembler recipe id that appears in no unlock gro
   - **Intake rendering (no pop-out).** Mirror of the emergence rendering in REQ-MAT-OUTPUT-EMERGE: the building is rendered over the input belt, so an in-transit item is occluded while inside the footprint and is only visible as it crosses the outer edge — appearing to sink into the port. The portion inside the footprint is hidden, and the item disappears at the tile centre (progress 0.5) as it enters the buffer.
 - REQ-MAT-OUTPUT-PORT: Each building has one or more fixed output port(s) defined by its surface_mask (direction determined by rotation). Produced items do not appear on the outgoing belt instantly; each item leaves the building by first emerging across the output port tile on that port's own output belt and then transferring onto the adjacent real belt tile (REQ-MAT-OUTPUT-EMERGE). The adjacent belt's direction is otherwise unconstrained (it may flow away from the building or perpendicular to it), except that a belt oriented with its own output edge facing back into the building refuses the transfer and the item stays stuck at the port (REQ-MAT-ACCEPT-DIR, REQ-MAT-OUTPUT-EMERGE).
 - REQ-MAT-OUTPUT-EMERGE: Items emerge from a building output port as an animation rather than popping directly onto the outgoing belt. Each output port has its own **output belt** — a virtual belt tile occupying the output port tile, oriented in the port's facing direction, with progress 0.0 at the tile's inner edge and 1.0 at the outer (port) edge adjacent to the next real belt tile. It reuses the belt subsystem: movement at belt speed (REQ-GW-BELT-SPEED), item rendering and spacing (REQ-GW-TILE-SIZE), and capacity/packing (REQ-GW-BELT-CAPACITY), but restricted to the 0.5→1.0 half of the tile. This applies to every building that outputs items onto belts (Miner, Smelter, Assembler, Reprocessing Plant, Salvage Bay); it does not apply to the Shipyard, which spawns a ship rather than a belt item (REQ-SHP-SPAWN-PLAYER).
-  - **Feeding.** While the output buffer (REQ-MAT-OUTPUT-BUFFER) holds an item that has not yet begun emerging and the output belt's entry slot at progress 0.5 is free (per REQ-GW-BELT-CAPACITY spacing — no emerging item within a quarter tile of progress 0.5), the next buffered item is placed on the output belt at progress 0.5. Because only the 0.5→1.0 span is used, the output belt holds at most three emerging items (progress 0.5, 0.75, 1.0); once that span is full the building places no further items on it even if the output buffer still holds more.
+  - **Feeding.** While the output buffers (REQ-MAT-OUTPUT-BUFFER) hold an item that has not yet begun emerging and the output belt's entry slot at progress 0.5 is free (per REQ-GW-BELT-CAPACITY spacing — no emerging item within a quarter tile of progress 0.5), the longest-waiting buffered item is placed on the output belt at progress 0.5. Items leave in the order they were produced whatever their type, so per-item-type buffers do not reorder what comes out of the port. Because only the 0.5→1.0 span is used, the output belt holds at most three emerging items (progress 0.5, 0.75, 1.0); once that span is full the building places no further items on it even if the output buffers still hold more.
-  - **Cosmetic hold.** An emerging item still counts as residing in the output buffer (REQ-MAT-GLOBAL-STOCK) for the whole animation; it only leaves the building when it transfers onto a real belt tile at progress 1.0. The output belt therefore adds no inventory capacity beyond the output buffer, and clearing the output buffer on a recipe or schematic change (REQ-MAT-OUTPUT-BUFFER) also removes any items currently emerging.
+  - **Cosmetic hold.** An emerging item still counts as residing in its output buffer (REQ-MAT-GLOBAL-STOCK) for the whole animation; it only leaves the building when it transfers onto a real belt tile at progress 1.0. The output belt therefore adds no inventory capacity beyond the output buffers, and clearing them on a recipe or schematic change (REQ-MAT-OUTPUT-BUFFER) also removes any items currently emerging.
   - **Travel & handoff.** An emerging item advances from progress 0.5 to 1.0 at belt speed. At progress 1.0 it attempts to transfer onto the adjacent real belt tile using the normal belt hand-off and accept-direction rules (REQ-MAT-OUTPUT-PORT, REQ-MAT-ACCEPT-DIR): the transfer succeeds only if a transport tile exists there, is not oriented with its output edge facing back into the building, and has free space. On success the item leaves the output buffer and becomes an ordinary item on that belt tile. If instead the output port tile is a directly adjacent building's input edge, the item transfers straight into that building (REQ-MAT-DIRECT-COUPLE).
   - **Stuck items.** If there is no next real belt tile and no directly-coupled building (REQ-MAT-DIRECT-COUPLE), or the transfer is refused or blocked, the emerging item stops at progress 1.0 and is rendered there (still counted in the output buffer). Following items pile up behind it at progress 0.75 and 0.5 per the packing above, and once the 0.5→1.0 span is full no further items emerge until the front item transfers.
   - **Emergence rendering (no pop-in).** An emerging item must not simply appear at progress 0.5. The output port tile's building is rendered over the output belt, so an emerging item is occluded while inside the footprint and is revealed progressively as it slides past the port edge — appearing to physically emerge from the building. The portion of the item still within the output port tile is hidden; the portion past the outer edge is drawn.
@@ -199,9 +202,8 @@ Any ship, module, building, or assembler recipe id that appears in no unlock gro
 - REQ-MAT-ACCEPT-DIR: A transport tile (belt, splitter, tunnel entry, or tunnel exit) accepts an incoming item only through a non-output edge; an item that would enter through one of the tile's output edges is refused. For a belt or a tunnel entry/exit the sole output edge is the one in its facing direction; for a splitter either of its two output directions is an output edge. This applies both to items pushed from an adjacent transport tile and to items deposited by a building's output port (REQ-MAT-OUTPUT-PORT).
 - REQ-MAT-INPUT-BUFFER: Each building has one input buffer per required input material. Each per-material buffer holds up to twice that material's per-cycle requirement. When the player selects a new recipe or schematic, all items in all input buffers are cleared.
   - **Setting a configuration to the value it already holds is a no-op.** Selecting the recipe or schematic already set, or applying a ship layout identical to the one already configured, changes nothing: buffers are not cleared, an in-progress production cycle is not cancelled (REQ-BLD-SHIPYARD), and a construction site's progress and stored settings are untouched. This holds however the setting is applied — through the selection dialog (REQ-UI-SELECT-BUTTON), the layout configuration dialog (REQ-MOD-UI-DIALOG), a blueprint placement (REQ-UI-BLUEPRINT-PLACE), or a blueprint configuration transfer (REQ-UI-BLUEPRINT-TRANSFER). Only a setting that genuinely differs has effects.
-- REQ-MAT-OUTPUT-BUFFER: Each building has an output buffer that holds up to twice the quantity produced by one production cycle. If the output buffer is full, production stops until space is available. When the player selects a new recipe or schematic, all items in the output buffer are cleared (relevant when the adjacent belt is jammed and items have accumulated). Re-applying a setting the building already has clears nothing, per REQ-MAT-INPUT-BUFFER.
+- REQ-MAT-OUTPUT-BUFFER: Each building has **one output buffer per item its recipe can produce** — each output of a deterministic recipe, and every possible roll of a probabilistic one (REQ-BLD-REPROCESSING). Each per-material buffer holds up to twice that item's per-cycle amount, mirroring the input side (REQ-MAT-INPUT-BUFFER); a buffer's contents never occupy another item's capacity. An emerging item still occupies its buffer for the whole animation (REQ-MAT-OUTPUT-EMERGE). Whether a buffer without room stops production is decided by REQ-MAT-CYCLE. When the player selects a new recipe or schematic, all items in all output buffers are cleared (relevant when the adjacent belt is jammed and items have accumulated). Re-applying a setting the building already has clears nothing, per REQ-MAT-INPUT-BUFFER. Two buildings stand outside this rule: the Shipyard has no output buffer at all, since it spawns a ship rather than producing items (REQ-BLD-SHIPYARD), and the Salvage Bay has no recipe, so its single scrap buffer is sized by config instead (REQ-BLD-SALVAGE-BAY).
-- REQ-MAT-OUTPUT-BUFFER-REPROCESSING: Exception to REQ-MAT-OUTPUT-BUFFER — the Reprocessing Plant's output buffer holds at most one cycle's output. This prevents exploits where the player stalls the output belt to force the plant to reroll.
+- REQ-MAT-CYCLE: Production cycle lifecycle. When a building is idle, it attempts to start a new cycle: (a) all required inputs must be present in the per-material input buffers, and (b) **every** output the cycle could produce must fit in that item's own output buffer (REQ-MAT-OUTPUT-BUFFER). For a deterministic recipe (b) is simply its own outputs. The Reprocessing Plant rolls its output at cycle start (weighted pick, REQ-BLD-REPROCESSING), so every possible roll must fit: the roll is committed the moment the cycle begins, and a cycle whose result could not be stored must not be started at all. Testing every possibility rather than the rolled one is what keeps a stalled output belt from biasing the distribution — with one item type's buffer full the plant stops entirely instead of going on producing only the others. On cycle start, inputs are consumed immediately and the production timer begins. On cycle completion, the (already-decided) output is deposited into its output buffer and the building returns to idle.
-- REQ-MAT-CYCLE: Production cycle lifecycle. When a building is idle, it attempts to start a new cycle: (a) all required inputs must be present in the per-material input buffers, and (b) the cycle's output must fit in the output buffer. For the Reprocessing Plant, the output is picked at cycle start (weighted pick); the cycle only starts if that chosen output fits. On cycle start, inputs are consumed immediately and the production timer begins. On cycle completion, the (already-decided) output is deposited into the output buffer and the building returns to idle.
 - REQ-MAT-GLOBAL-STOCK: The building blocks stock is the only global inventory. All other materials exist only in building buffers or on belt tiles.
 
 ## Resources
@@ -306,13 +308,13 @@ Any ship, module, building, or assembler recipe id that appears in no unlock gro
 
 ### Module UI
 
-- REQ-MOD-UI-PREVIEW: For a selected shipyard (operational building or construction site), the selection panel always shows a small non-interactive **ship layout preview** widget below the schematic selection button (REQ-UI-SELECT-BUTTON) and a "Configure" button below the preview. Both are **disabled while no schematic is selected**, and enabled once one is; the preview then shows an empty placeholder in place of a layout grid. When a schematic is selected, the preview renders the ship's layout grid at a reduced scale: buildable cells without a module are shown as white, non-buildable cells are shown as black, and cells occupied by a module are shown in that module's `fill_color` with the module's `glyph` character. For non-shipyard buildings, neither the preview nor the "Configure" button is shown.
+- REQ-MOD-UI-PREVIEW: For a selected shipyard (operational building or construction site), the selection panel always shows a small non-interactive **ship layout preview** widget below the schematic selection button (REQ-UI-SELECT-BUTTON) and a "Configure" button below the preview. Both are **disabled while no schematic is selected**, and enabled once one is; the preview then shows an empty placeholder in place of a layout grid. When a schematic is selected, the preview renders the ship's layout grid at a reduced scale: buildable cells without a module are shown as white, non-buildable cells are shown as black, and cells occupied by a module are shown in that module's `fill_color` alone — no glyph, which at this scale would not be legible anyway; the layout configuration dialog's full-scale grid is where a module is identified by its glyph (REQ-MOD-UI-DIALOG). For non-shipyard buildings, neither the preview nor the "Configure" button is shown.
-- REQ-MOD-UI-DIALOG: Clicking the "Configure" button opens the **layout configuration dialog** as a modal. While the dialog is open, the game is paused (speed set to 0×). On close, the game speed is restored to what it was before the dialog was opened.
+- REQ-MOD-UI-DIALOG: Clicking the "Configure" button opens the **layout configuration dialog** as a modal, centered on the selection panel it was opened from (REQ-UI-PANEL-MODAL). While the dialog is open, the game is paused (speed set to 0×). On close, the game speed is restored to what it was before the dialog was opened.
 
   The dialog contains:
   - **Top**: The ship's layout grid rendered at full scale. Buildable cells are white; non-buildable cells are black. Placed modules are rendered with their `fill_color` and `glyph`. The ghost of the currently selected module is shown at the cursor position when in placement mode.
-  - **Left** (below the grid): The ship stats panel (see REQ-MOD-UI-STATS-PANEL).
+  - **Left** (below the grid): The ship stats panel (see REQ-MOD-UI-STATS-PANEL), and beneath it the layout's **build cost**, so the price of a configuration is visible while it is being assembled rather than only once it has been confirmed: the total materials required for the ship — the union of the schematic's base materials and those of every placed module, summed per item type (REQ-MOD-MATERIALS) — drawn as item icons on their colored squares with their amounts (REQ-UI-ITEM-ICON), and beside them the total production time (REQ-MOD-PRODUCTION-TIME). Both update in real time as modules are placed and removed. The cost sits beside the stats panel rather than within it because a build cost belongs to a ship being configured: the same panel serves an existing ship (REQ-UI-SHIP-STATS-PANEL) and the balancing tool, neither of which costs anything.
-  - **Center** (below the grid): A grid of module selection buttons (one per **unlocked** module type; see REQ-DEF-SCHEMATIC-DROP) plus a "Remove" button. Each module button shows the module id and its glyph.
+  - **Center** (below the grid): A grid of module selection buttons (one per **unlocked** module type; see REQ-DEF-SCHEMATIC-DROP) plus a "Remove" button. A module button shows the module's name — its `id` under the usual display convention — on its first line, and beneath it what the module costs: the icons of its `materials` items on their colored squares with their amounts (REQ-UI-ITEM-ICON) and the production time it adds, as `+<n> s` (REQ-MOD-MATERIALS, REQ-MOD-PRODUCTION-TIME). This is the same form a recipe option button uses to state what it makes (REQ-UI-SELECT-OPTIONS), and it puts the price of a module in front of the player before it is placed. The "Remove" button costs nothing and shows its caption alone.
   - **Right** (below the grid): The layout blueprint panel (see REQ-MOD-UI-BLUEPRINT-PANEL through REQ-MOD-UI-BLUEPRINT-FILE-LOAD).
   - **Bottom**: A "Confirm" button and a "Cancel" button. Cancel discards all changes made in this dialog session and closes the dialog. Confirm applies the changes: the shipyard's configured layout is updated, the required materials and cycle time displayed in the selection panel are recalculated, and the ship layout preview is refreshed.
 
@@ -372,9 +374,9 @@ Any ship, module, building, or assembler recipe id that appears in no unlock gro
 
   Each option in the dialog displays the unlock group's display name — derived from its `id` (same display convention as building, module, and recipe ids) — and the list of items it would grant: its ship, module, building, and assembler-recipe ids (each shown with the same display convention as its respective selection dialog). The artifact option (if present) is displayed as a distinct entry with the name "Artifact".
 
-  Each option additionally displays a vertical list of recipe names labeled "Unlocks recipes:", showing which miner and assembler recipes would newly become implicitly unlocked (REQ-LOCK-IMPLICIT) if this option were selected — specifically, the miner recipes and implicitly-gated assembler recipes that are not currently implicitly unlocked but would become so after applying this option's effect. To compute this, all `materials` of the group's granted ship and module schematics are added to the base set per REQ-LOCK-IMPLICIT step 1a, and the output items of the group's granted assembler recipes are added per step 1b, before recomputation.
+  Each option additionally displays a vertical list of recipe lines labeled "Unlocks recipes:", showing which miner and assembler recipes would newly become implicitly unlocked (REQ-LOCK-IMPLICIT) if this option were selected — specifically, the miner recipes and implicitly-gated assembler recipes that are not currently implicitly unlocked but would become so after applying this option's effect. To compute this, all `materials` of the group's granted ship and module schematics are added to the base set per REQ-LOCK-IMPLICIT step 1a, and the output items of the group's granted assembler recipes are added per step 1b, before recomputation.
 
-  Each recipe is listed by its `id` (using the same display convention as the assembler recipe-selection dialog), sorted alphabetically. Hovering a recipe in this list displays the recipe info tooltip described for a recipe in REQ-UI-SELECT-TOOLTIP (the recipe name; the name and quantity of each input item; the completion time; and the name and quantity of the produced output item). If no recipes would be newly unlocked, the list shows "None".
+  Each recipe is shown as a **recipe line** of the same two-row card the item production tooltip uses (REQ-UI-ITEM-TOOLTIP): the icon of the building that runs it (REQ-UI-BUILD-ICON) and the recipe's name — by its `id`, using the same display convention as the assembler recipe-selection dialog — on the first row, and the recipe drawn as the recipe summary draws it (REQ-UI-RECIPE-SUMMARY) on the second. The lines are sorted alphabetically by recipe name. The line says everything there is to say about the recipe, so nothing in this list carries a tooltip, as in the selection dialog (REQ-UI-SELECT-OPTIONS). If no recipes would be newly unlocked, the list shows "None".
 
   The player selects one option by clicking it. If the player selects the artifact option, the player's artifact count is incremented by 1 (REQ-WIN-ARTIFACT-COUNT) and the dialog closes; no unlock is applied. Otherwise the selected unlock group is awarded and the dialog closes: every ship, module, building, and assembler recipe the group grants becomes unlocked at once — ship schematics unlock the corresponding shipyard selection; module schematics unlock the module type for placement in the layout configuration dialog (REQ-MOD-UI-DIALOG); building types become available in the build menu (REQ-LOCK-BUILDING); assembler recipes become available in the assembler recipe-selection dialog (subject to REQ-LOCK-UI-RECIPE). The unlock group is removed from the pool permanently (REQ-LOCK-EXPLICIT), and the implicit unlock set is recomputed (REQ-LOCK-IMPLICIT).
 
@@ -392,7 +394,7 @@ Any ship, module, building, or assembler recipe id that appears in no unlock gro
 
 - REQ-LOCK-REPROCESSING-POOL: The pool of possible outputs for a Reprocessing Plant cycle (REQ-BLD-REPROCESSING) is restricted to item types that are currently implicitly unlocked (REQ-LOCK-IMPLICIT). Weights are renormalized over the eligible outputs. If no eligible outputs remain, the Reprocessing Plant cannot start a production cycle.
 
-- REQ-LOCK-UI-RECIPE: Locked miner ore-type recipes and assembler recipes are not shown in their respective recipe-selection dialogs (REQ-UI-SELECT-BUTTON).
+- REQ-LOCK-UI-RECIPE: Locked miner ore-type recipes and assembler recipes are not shown in their respective recipe-selection dialogs (REQ-UI-SELECT-BUTTON). Smelter and Reprocessing Plant recipes are never granted by an unlock group (REQ-LOCK-EXPLICIT restricts `recipes` grants to assembler recipes), so they are available from the start and their dialogs list them all; what gates them in practice is whether the building itself is unlocked (REQ-LOCK-BUILDING).
 
 - REQ-LOCK-UI-SCHEMATIC: Locked ship schematics are not shown in the shipyard's schematic-selection dialog (REQ-UI-SELECT-BUTTON).
 
@@ -428,7 +430,7 @@ Any ship, module, building, or assembler recipe id that appears in no unlock gro
 
 ### Layout
 
-The screen is a single column: a header bar across the top and the game world view filling the whole area below it. There is no side panel. Both permanent UI widgets float over the game world — the build button bar (REQ-UI-BUILD-BAR) at its bottom center, and the selection panel (REQ-UI-SELECTION-PANEL) at its right edge, centered vertically within the height left above the build button bar and shown only while something is selected. Blueprints have no permanent screen real estate; they are reached through modal dialogs (REQ-UI-BLUEPRINT-DIALOG):
+The screen is a single column: a header bar across the top and the game world view filling the whole area below it. There is no side panel. All three permanent UI widgets float over the game world — the build button bar (REQ-UI-BUILD-BAR) at its bottom center, the selection panel (REQ-UI-SELECTION-PANEL) beside whatever is currently selected — or wherever the player has dragged it by its header (REQ-UI-SELECTION-PANEL-DRAG) — shown only while something is selected and holding its place on the screen until the next selection, and the controls panel (REQ-UI-CONTROLS-PANEL) in its bottom-left corner, beside the build button bar and rising above it only when the two would overlap. Blueprints have no permanent screen real estate; they are reached through modal dialogs (REQ-UI-BLUEPRINT-DIALOG):
 
 ```
 +-----------------------------------------------------------+
@@ -439,9 +441,10 @@ The screen is a single column: a header bar across the top and the game world vi
 |                    Game World               |   Panel   | |
 |                                             +-----------+ |
 |                                                           |
-|                  +------------------+                     |
+| +----------+                                              |
-|                  | Build Button Bar |                     |
+| | Controls |     +------------------+                     |
-+------------------+------------------+---------------------+
+| |  Panel   |     | Build Button Bar |                     |
++-+----------+-----+------------------+---------------------+
                      (full window width)
 ```
 
@@ -454,14 +457,30 @@ The screen is a single column: a header bar across the top and the game world vi
 - REQ-UI-PAUSE-BORDER: While the game is paused (speed 0×, whether set via the speed controls (REQ-UI-SPEED), the Space toggle (REQ-UI-HOTKEYS), or an auto-pausing modal), a vignette border is drawn around the edges of the game world view to make the paused state hard to miss. The border is black and fades in the alpha channel from fully transparent at its inner (center-facing) edge to 50% opacity at the viewport edge, over a thickness of 100 pixels (capped at half the smaller viewport dimension on very small views).
 - REQ-UI-DECONSTRUCT-BORDER: While deconstruct mode is active (REQ-UI-DECONSTRUCT-BUTTON, REQ-UI-HOTKEYS), a vignette border is drawn around the edges of the game world view to signal the mode, matching the geometry of the paused-state vignette (REQ-UI-PAUSE-BORDER): a 100-pixel thickness (capped at half the smaller viewport dimension on very small views) with the four sides meeting along mitred corner diagonals. It fades in the alpha channel from fully transparent at its inner (center-facing) edge to the deconstruct tint color at the viewport edge. The color — including its alpha, which sets the peak opacity at the viewport edge — is read from `visuals.toml [overlays].deconstruct_tint`, the same deconstruct-mode color used for the hover tint. The border is presentation-only and has no effect on the simulation. If the game is both paused and in deconstruct mode, both vignettes are drawn and compose over each other.
 - REQ-UI-EXPAND-BUTTON: The header bar shows an asteroid expansion button captioned `Expand: <x>` followed by the `building_block` item icon (REQ-UI-BLOCKS-ICON, REQ-UI-ITEM-ICON) in place of the trailing `Blocks` word, where `<x>` is the current expansion cost computed from `world.toml [expansion].cost_building_blocks_formula` at the current number of purchased expansions (REQ-EXP-COST). When no icon file exists for `building_block`, the caption falls back to the `Expand: <x> Blocks` text. Clicking the button unlocks the next asteroid expansion (REQ-EXP-UNLOCK, REQ-GW-ASTEROID-EXPAND), spending that many building blocks from the global stock. The button is disabled when the player cannot currently afford the cost (consistent with REQ-UI-BUILD-DISABLED). The caption updates as the cost changes with each purchased expansion.
-- REQ-UI-WORLD-SIZE: The game world view occupies the full width of the game window and the full height below the header bar. No widget insets it: the build button bar (REQ-UI-BUILD-BAR) and the selection panel (REQ-UI-SELECTION-PANEL) float over it.
+- REQ-UI-WORLD-SIZE: The game world view occupies the full width of the game window and the full height below the header bar. No widget insets it: the build button bar (REQ-UI-BUILD-BAR), the selection panel (REQ-UI-SELECTION-PANEL), and the controls panel (REQ-UI-CONTROLS-PANEL) float over it.
-- REQ-UI-SELECTION-PANEL: The **selection panel** (the panel described under Selection Panel, REQ-UI-SINGLE-SELECTION and following) is a widget that **floats over the game world view** (REQ-UI-WORLD-SIZE), anchored to the view's right edge with a small margin. It is **sized to its content in both width and height**, so it grows and shrinks as the selection changes, staying right-anchored as its size changes.
+- REQ-UI-SELECTION-PANEL: The **selection panel** (the panel described under Selection Panel, REQ-UI-SINGLE-SELECTION and following) is a widget that **floats over the game world view** (REQ-UI-WORLD-SIZE), placed **beside the objects it describes** rather than at a fixed corner of the view, so it appears where the player is already looking. It is **sized to its content in both width and height**, so it grows and shrinks as the content changes. It keeps the same small margin from the view's edges that it uses as its gap from the selection.
-
+  - **Anchor rectangle.** The panel is placed against the screen rectangle of the selection **at the moment that selection started**: the footprint of the single object selected (a building or construction site, an actor, or a piece of debris), or, when the selection started as a multi-selection (REQ-UI-MULTI-SELECT), the bounding box of all the objects it started with.
-  The panel's vertical placement and maximum height are defined against an **available band**: the height of the game world view, less the panel's top and bottom margins, less the height of the horizontal strip occupied by the build button bar at the bottom of the view (the bar's height plus its bottom margin, REQ-UI-BUILD-BAR) — the bar's band is subtracted over the full view width, regardless of how wide the bar currently is. The panel is **vertically centered within that available band**, not within the full view height, so it sits slightly above the view's vertical center. Should its content ever be taller than the band, the panel's height is capped at the band height and the content scrolls vertically within it.
+  - **Side.** The panel goes to the **right** of the anchor rectangle, separated from it by the panel's margin, whenever it fits within the view there. Otherwise it goes to the **left** of the anchor rectangle by that same margin. When it fits on neither side — a bounding box spanning most of the view, or an object too close to an edge — it is placed on whichever side leaves more room and then pushed inside the view. That is the one case in which the panel covers part of the selection.
+  - **Vertical placement.** The panel's **top edge is aligned with the anchor rectangle's top edge** and it extends downward. Its bottom is limited by the lowest of: the view's bottom edge less the panel's margin; and the top edge, less that margin, of the build button bar (REQ-UI-BUILD-BAR) or the controls panel (REQ-UI-CONTROLS-PANEL) — but each of those two only where the panel's own horizontal extent actually overlaps that widget's current rectangle, so a panel whose column misses them is not shortened by them. Should the panel not fit above that limit, it is shifted up, as far as the view's top margin and no further; if it still does not fit, its height is capped at the space available there and the content scrolls vertically within it.
+  - **Fixed for the life of the selection.** The anchor rectangle and the side are determined once, when the selection starts, and are not revisited while that selection lasts; the panel's own size is the only thing that may still move it (see **Resizing in place** below). The player may override the resulting position by dragging the panel's header (REQ-UI-SELECTION-PANEL-DRAG); the dragged position then takes the anchor rectangle's and the side's place for the rest of that selection. The panel **keeps its place on the screen** when the player scrolls the view (REQ-UI-SCROLL) and when a selected object moves under it (a selected ship flying away), rather than following the object — which may leave it beside nothing, or beside an object that has left the view entirely. It likewise does not move when the selection is **expanded** by adding objects or reduced by removing them (REQ-UI-MULTI-SELECT), nor when a selected object is destroyed or deconstructed. Starting a **new** selection — clicking a different object, or a box drag that replaces the selection — places the panel anew against the new anchor rectangle.
+  - **Resizing in place.** Only the anchor rectangle and the chosen side are fixed for the life of the selection (or, once the panel has been dragged, the dragged desired position — REQ-UI-SELECTION-PANEL-DRAG); the panel's geometry is **re-solved from them** whenever its content size changes (a section appearing or disappearing as the selection's state changes), the view is resized, or the build button bar's or controls panel's rectangle changes. Re-solving keeps the two edges the panel was placed by — its top edge, and the edge facing the anchor rectangle (its left edge when it sits to the right of the selection, its right edge when it sits to the left) — so the panel grows away from the selection rather than over it, and it never switches sides for as long as the selection lasts. What re-solving may change is the vertical result: growth that would take the panel outside the view or into either of those two widgets is resolved as in **Vertical placement** above, by shifting it up and capping its height, and a panel that shrinks again regains the room.
   - **Visibility.** The panel is shown only while at least one object is selected. With an empty selection it is not shown at all (REQ-UI-EMPTY-SELECTION), leaving the full game world view visible.
-  - **Overlay behavior.** As for the build button bar (REQ-UI-BUILD-BAR): the panel occludes the strip of the game world it covers; the world view itself keeps its full extent and the view's scrolling, ghost rendering, and tile geometry are unaffected. It is drawn above the pause and deconstruct vignettes (REQ-UI-PAUSE-BORDER, REQ-UI-DECONSTRUCT-BORDER), which keep their full right-hand band underneath it, and below the modal dim (REQ-UI-MODAL-DIM), which covers the entire game window including the panel. The panel and the build button bar never overlap, because the panel's available band excludes the bar's strip; the bar itself never moves on the panel's account (REQ-UI-BUILD-BAR).
+  - **Overlay behavior.** As for the build button bar (REQ-UI-BUILD-BAR): the panel occludes the strip of the game world it covers; the world view itself keeps its full extent and the view's scrolling, ghost rendering, and tile geometry are unaffected. It is drawn above the pause and deconstruct vignettes (REQ-UI-PAUSE-BORDER, REQ-UI-DECONSTRUCT-BORDER), which keep their full band underneath it, and below the modal dim (REQ-UI-MODAL-DIM), which covers the entire game window including the panel. The panel never overlaps the build button bar or the controls panel, because it stays above both wherever their rectangles meet its own; neither of them ever moves on the panel's account (REQ-UI-BUILD-BAR, REQ-UI-CONTROLS-PANEL).
-  - **Input.** Mouse events over the panel are consumed by the panel and never reach the game world: hovering it shows no builder-mode ghost at the tile beneath, and clicking it neither places a building nor changes the selection. Right-clicking the panel does not exit builder mode (REQ-BLD-BUILDER-MODE) or cancel a belt drag (REQ-BLD-BELT-DRAG).
+  - **Input.** Mouse events over the panel are consumed by the panel and never reach the game world: hovering it shows no builder-mode ghost at the tile beneath, and clicking it neither places a building nor changes the selection. Right-clicking the panel does not exit builder mode (REQ-BLD-BUILDER-MODE) or cancel a belt drag (REQ-BLD-BELT-DRAG). Beside the controls its content offers, the panel's own chrome offers one gesture: the header drag that moves it (REQ-UI-SELECTION-PANEL-DRAG).
-- REQ-UI-MODAL-DIM: While a modal dialog, menu, or full-screen state screen is open on top of the game, a transparent black overlay (a dim/scrim) is drawn over the **entire game window** — the header bar, the game world view, and the widgets floating over it (the build button bar, REQ-UI-BUILD-BAR, and the selection panel, REQ-UI-SELECTION-PANEL) — behind that modal, so the game reads as inactive while the modal holds focus. The overlay is shown for every modal that auto-pauses the simulation — the escape menu (REQ-UI-GAME-MENU), the recipe/schematic selection dialog (REQ-UI-SELECT-BUTTON), the layout configuration dialog (REQ-MOD-UI-DIALOG), the schematic choice dialog (REQ-DEF-SCHEMATIC-DROP), the blueprint save dialog (REQ-UI-BLUEPRINT-CREATE), and the blueprint selection dialog (REQ-UI-BLUEPRINT-DIALOG) — as well as the game-over screen (REQ-HQ-GAME-OVER) and the win screen (REQ-WIN-SCREEN), which end rather than pause the game. When modals are nested (for example the Create Blueprint name dialog (REQ-MOD-UI-BLUEPRINT-CREATE) opened from the layout configuration dialog), only a single dim is shown over the game window; nested modals do not stack additional overlays. The same applies when one modal hands directly off to another — the blueprint save dialog opening the blueprint selection dialog on confirm (REQ-UI-BLUEPRINT-CREATE): the dim persists across the handoff rather than flickering off and back on, and the simulation is not resumed in between. The dim color and opacity are read from `visuals.toml [overlays]` (a semi-transparent black modal-dim color), consistent with the other overlay colors. The overlay is presentation-only and has no effect on the simulation.
+- REQ-UI-SELECTION-PANEL-DRAG: **Moving the panel by its header.** The player can move the selection panel by pressing the left mouse button on the panel's **header** (REQ-UI-SELECTION-CARD) and dragging: the panel follows the cursor for the duration of the drag and stays where it is dropped on release. The header is the whole drag handle, and no other part of the panel starts a drag.
+  - **Desired position, not resolved position.** A drag sets only the panel's **desired top-left corner** in view coordinates. Where the panel actually lands is resolved from that desired position by the rules of REQ-UI-SELECTION-PANEL, exactly as an anchor-derived position is: the panel keeps its margin from the view's edges; its bottom is limited by the top edge, less that margin, of the build button bar (REQ-UI-BUILD-BAR) and of the controls panel (REQ-UI-CONTROLS-PANEL), but each only where the panel's own horizontal extent actually overlaps that widget's current rectangle; and a panel that does not fit above that limit is shifted up as far as the view's top margin and, failing that, capped in height with its content scrolling. The player therefore cannot park the panel over either widget, and neither widget ever moves on the panel's account (REQ-UI-BUILD-BAR, REQ-UI-CONTROLS-PANEL) — stepping around them stays entirely the panel's job.
+  - **The desired position survives the resolution.** Resolving does not overwrite what the player set: the desired position is retained as dropped, so a panel that had to be shifted up or shortened returns to it as soon as the obstruction stops overlapping it — its content shrinks, the bar's button set changes (REQ-LOCK-BUILDING), the controls panel's context changes, or the view is resized. A desired position that the current view cannot honour at all is likewise kept, so enlarging the window brings the panel back to it.
+  - **What the drag replaces.** From the first drag on, the desired position replaces the anchor rectangle and the side (REQ-UI-SELECTION-PANEL) for the rest of the current selection; the panel no longer has a side and never switches to one. Re-solving (the **Resizing in place** rule of REQ-UI-SELECTION-PANEL) then keeps the top and left edges of the desired position, in place of the top edge and the edge facing the anchor, so the panel still grows away from where the player put it rather than over it. The panel may be dragged repeatedly; each drag replaces the previous desired position.
+  - **Scope: the current selection.** The desired position lasts as long as the selection it was set in — across the panel's own resizing, view resizes, and view scrolling (REQ-UI-SELECTION-PANEL), and across the selection being expanded or reduced (REQ-UI-MULTI-SELECT). Starting a **new** selection discards it: the panel is placed anew against the new anchor rectangle (REQ-UI-SELECTION-PANEL), and the player drags it again if they want it elsewhere.
+  - **Input.** The drag consumes its mouse events like every other event over the panel (REQ-UI-SELECTION-PANEL): the press, the movement, and the release never reach the game world, so dragging the header neither box-selects (REQ-UI-MULTI-SELECT) nor places belts (REQ-BLD-BELT-DRAG). The drag continues while the cursor moves outside the panel or outside the view, and ends when the left button is released, wherever that happens. A press and release on the header without movement moves nothing and has no other effect.
+  - **Presentation only.** Moving the panel is not a player command: it never enters the replay stream and has no effect on the simulation, consistent with the controls panel's collapsed state (REQ-UI-CONTROLS-PANEL). The desired position is not saved to disk.
+- REQ-UI-PANEL-MODAL: **A modal opened from the selection panel opens on the panel.** A modal the player opens from a control inside the selection panel is placed **centered on the panel's current rectangle** rather than centered on the game window, so it appears where the player is already looking and under the cursor that just clicked the control. This is the same reason the panel itself is placed beside the selection instead of at a fixed corner (REQ-UI-SELECTION-PANEL): a modal centered on the window sends the cursor back across the view and then back again. Two modals are opened from the panel — the recipe/schematic selection dialog (REQ-UI-SELECT-BUTTON), from the selection button; and the layout configuration dialog (REQ-MOD-UI-DIALOG), both from the "Configure" button (REQ-MOD-UI-PREVIEW) and when it opens automatically after a schematic change (REQ-MOD-UI-AUTO-DIALOG).
+  - **The panel's rectangle as it currently stands.** The modal is centered on where the panel actually is when the modal opens: the position resolved from the anchor rectangle (REQ-UI-SELECTION-PANEL) or, once the player has dragged the panel, the position they dragged it to (REQ-UI-SELECTION-PANEL-DRAG). The panel is always shown when one of these modals opens, since the modal is opened from a control within it (REQ-UI-EMPTY-SELECTION).
+  - **Kept inside the game window.** Should the modal, centered that way, extend past an edge of the game window, it is pushed back inside; its size is never changed to make it fit. A modal larger than the window in a dimension is instead aligned with the window's top or left edge in that dimension, so the part read first stays visible.
+  - **Placement is all that changes.** The modal is modal as before, pauses the game and restores the speed on close as before (REQ-UI-SELECT-BUTTON, REQ-MOD-UI-DIALOG), shows the dim over the entire window including the panel it sits on (REQ-UI-MODAL-DIM), and is dismissed the same way. That it covers the panel costs nothing: while it is open the panel is dimmed and takes no input anyway.
+  - **Only these modals.** Every other modal is placed as before, centered on the game window: the escape menu (REQ-UI-GAME-MENU), the blueprint save and selection dialogs (REQ-UI-BLUEPRINT-CREATE, REQ-UI-BLUEPRINT-DIALOG), and the schematic choice dialog (REQ-DEF-SCHEMATIC-DROP), none of which is opened from the panel. So is a modal opened from another modal rather than from the panel — the Create Blueprint name dialog within the layout configuration dialog (REQ-MOD-UI-BLUEPRINT-CREATE) — which is placed against the modal that opened it.
+  - **Presentation only.** The placement is computed once, when the modal opens, and is not revisited while it is open; the panel cannot move meanwhile, being behind the modal and receiving no input. It is not a player command, never enters the replay stream, and has no effect on the simulation.
+- REQ-UI-MODAL-DIM: While a modal dialog, menu, or full-screen state screen is open on top of the game, a transparent black overlay (a dim/scrim) is drawn over the **entire game window** — the header bar, the game world view, and the widgets floating over it (the build button bar, REQ-UI-BUILD-BAR, the selection panel, REQ-UI-SELECTION-PANEL, and the controls panel, REQ-UI-CONTROLS-PANEL) — behind that modal, so the game reads as inactive while the modal holds focus. The overlay is shown for every modal that auto-pauses the simulation — the escape menu (REQ-UI-GAME-MENU), the recipe/schematic selection dialog (REQ-UI-SELECT-BUTTON), the layout configuration dialog (REQ-MOD-UI-DIALOG), the schematic choice dialog (REQ-DEF-SCHEMATIC-DROP), the blueprint save dialog (REQ-UI-BLUEPRINT-CREATE), and the blueprint selection dialog (REQ-UI-BLUEPRINT-DIALOG) — as well as the game-over screen (REQ-HQ-GAME-OVER) and the win screen (REQ-WIN-SCREEN), which end rather than pause the game. When modals are nested (for example the Create Blueprint name dialog (REQ-MOD-UI-BLUEPRINT-CREATE) opened from the layout configuration dialog), only a single dim is shown over the game window; nested modals do not stack additional overlays. The same applies when one modal hands directly off to another — the blueprint save dialog opening the blueprint selection dialog on confirm (REQ-UI-BLUEPRINT-CREATE): the dim persists across the handoff rather than flickering off and back on, and the simulation is not resumed in between. The dim color and opacity are read from `visuals.toml [overlays]` (a semi-transparent black modal-dim color), consistent with the other overlay colors. The overlay is presentation-only and has no effect on the simulation.
 
 ### Game World
 
@@ -473,17 +492,17 @@ The screen is a single column: a header bar across the top and the game world vi
 
   Because the contest-zone boundaries shift as the scrollable area grows with each push (REQ-GW-PUSH-EXPAND, REQ-GW-SCROLL-LIMIT), the ramp bands are recomputed from the current contest-zone boundaries. This is a presentation-only concern and does not affect the simulation, consistent with REQ-UI-NO-ZOOM.
 - REQ-UI-WORLD-ICON: In the game world, a building is drawn with an icon's glyph symbol centered on its footprint, in place of the letter identity glyph. The icon is an SVG loaded from `data/icons/buildings/`; only the icon's glyph is drawn in the world — in a contrasting ink (white over dark fills, dark over light fills) so it stays legible — and its colored chip background is omitted, because the footprint is already filled with the building's `visuals.toml` fill color. This applies to the production buildings (Miner, Smelter, Assembler, Reprocessing Plant, Shipyard, Salvage Bay), the HQ, and the player and enemy defence stations, wherever the identity label appears: operational buildings, construction sites (REQ-UI-CONSTRUCTION-PROGRESS), and the builder-mode and blueprint-placement ghosts. **Belts, splitters, and tunnels are excluded** — they keep their existing tile rendering so their orientation and flow stay readable (a centered icon would obscure direction). Their build-menu buttons still use icons (REQ-UI-BUILD-ICON); in particular the shared Tunnel button's `tunnel_entry.svg` is a build-button icon only, not a world icon. The directional output-port glyphs (REQ-UI-PORT-GLYPH, REQ-UI-PORT-TARGET-GLYPH) are a separate indicator and are unaffected. A building or station with no icon file falls back to its `visuals.toml` text glyph; a type with neither icon nor glyph shows no identity label. A missing icon is not an error, consistent with REQ-UI-BUILD-ICON.
-- REQ-UI-ITEM-ICON: In the game world, an item is drawn with its **item icon** in place of the colored square of REQ-GW-TILE-SIZE. The icon is a self-contained, full-color SVG (rendered as-is, unlike the glyph-only building icons of REQ-UI-WORLD-ICON), loaded at runtime from `data/icons/items/` — a sibling of the config directory, read the same way as the building icons (REQ-UI-BUILD-ICON) — one file per item type named after the item's id (e.g. `iron_ore.svg`). It fills the item's half-tile rect, keeping the size, spacing, and draw-order rules of REQ-GW-TILE-SIZE, and applies wherever an item is drawn: on belts, splitters, and tunnel ends, and while emerging from or sinking into a building port (REQ-MAT-OUTPUT-EMERGE, REQ-MAT-INPUT-INTAKE). An item type with no icon file falls back to its `visuals.toml` colored square (`fill` + `outline`); a missing icon is not an error, consistent with REQ-UI-BUILD-ICON. For performance, each item icon is rasterized to a pixmap cached per target pixel size — re-rasterized only when the tile pixel size changes (e.g. on view resize) — rather than re-rendered from vector every frame.
+- REQ-UI-ITEM-ICON: In the game world, an item is drawn as its `visuals.toml` colored square (`fill` + `outline`, the square of REQ-GW-TILE-SIZE) carrying its **item icon** on top. The square is drawn for every item, with or without an icon: it is what gives the item contrast against the tile beneath it, and its outline is what separates neighbouring items where they overlap on a belt. The icon is a self-contained, full-color SVG (rendered as-is, unlike the glyph-only building icons of REQ-UI-WORLD-ICON), loaded at runtime from `data/icons/items/` — a sibling of the config directory, read the same way as the building icons (REQ-UI-BUILD-ICON) — one file per item type named after the item's id (e.g. `iron_ore.svg`). The square fills the item's half-tile rect, keeping the size, spacing, and draw-order rules of REQ-GW-TILE-SIZE; the icon is drawn **inset** within that rect so a frame of the square's color stays visible all around it — required because each icon's viewBox is cropped tight to its artwork, so an icon drawn at the full rect would cover the square entirely. This applies wherever an item is drawn: on belts, splitters, and tunnel ends, and while emerging from or sinking into a building port (REQ-MAT-OUTPUT-EMERGE, REQ-MAT-INPUT-INTAKE). An item type with no icon file shows the colored square alone; a missing icon is not an error, consistent with REQ-UI-BUILD-ICON. **The colored square travels with the icon into the UI.** Wherever the UI displays an item *as an item* — the selection panel's item chips (REQ-UI-SINGLE-SELECTION, REQ-UI-HQ-PANEL), the recipe summary's input and output icons (REQ-UI-RECIPE-SUMMARY), and those same icons wherever a recipe is drawn in that form: on the selection dialog's option buttons (REQ-UI-SELECT-OPTIONS), in the item production tooltip (REQ-UI-ITEM-TOOLTIP), and in the unlock-choice dialog's recipe lines (REQ-DEF-SCHEMATIC-DROP) — the icon is drawn on that same square, by the same rules: the item's `fill` and `outline` from `visuals.toml`, the icon inset within the square so a frame of the square's color stays visible all around it, and the square alone when the item has no icon file. The square fills the rect the display allots to the icon, as it fills the half-tile rect in the world. One item therefore reads the same in a panel as it does on a belt. The one exception is an **inline icon standing in for the item's name beside a number** on a line of text: the `building_block` icon in place of the word `Blocks` (REQ-UI-BLOCKS-ICON, REQ-UI-EXPAND-BUTTON, REQ-UI-BUILD-COST, REQ-UI-MULTI-SELECTION, REQ-UI-BLUEPRINT-CARD), and the `scrap` icon in place of the word `Scrap` in the debris panel's remaining-scrap value (REQ-UI-DEBRIS-PANEL, REQ-UI-FIELD-MULTI-SELECTION). There the icon is a decoration on a line of text rather than an item display: it is drawn bare, without the square, and sized to the height of the text it sits in. Where the same value is instead shown *as an item* it keeps the square, as the HQ's block stock chip does beside the header bar's bare block icon (REQ-UI-HQ-PANEL). For performance, each item icon is rasterized to a pixmap cached per target pixel size — re-rasterized only when the tile pixel size changes (e.g. on view resize) — rather than re-rendered from vector every frame.
 - REQ-UI-CONSTRUCTION-PROGRESS: Construction sites display the building's identity symbol centered on the footprint (same as an operational building) — its icon glyph, or the text glyph as a fallback (REQ-UI-WORLD-ICON). Below the symbol — or centered on the footprint if the building has neither an icon nor a glyph — a construction progress percentage is shown (integer, e.g. `42%`), increasing from 0% to 100% as construction completes.
 - REQ-UI-PORT-GLYPH: Every output port of every building is indicated by a directional glyph drawn on the port's tile. The glyph is a `>` rotated to face the port's exit direction (`>` for East, `^` for North, `<` for West, `v` for South). It is drawn at the midpoint between the tile center and the tile edge that the port exits through (i.e. halfway from center toward the exit edge). The indicator is rendered for all building states: operational buildings, construction sites, and the builder-mode ghost. Buildings with multiple output ports (e.g. splitters) show one indicator per port.
 - REQ-UI-PORT-TARGET-GLYPH: While in builder mode (REQ-BLD-BUILDER-MODE), the builder-mode ghost additionally shows, for each of the building's output ports, a directional glyph drawn centered in the port's **target cell** — the cell immediately outside the footprint that the port pushes into, i.e. the cell the surface-mask output-port indicator occupies (see Surface Mask Format). As in REQ-UI-PORT-GLYPH the glyph is a `>` rotated to face the port's exit direction (`>` East, `^` North, `<` West, `v` South), previewing where the port's output will go before placement. This is in addition to the on-tile port glyph of REQ-UI-PORT-GLYPH, and — unlike that indicator — is shown only for the builder-mode ghost, not for operational buildings, construction sites, or the blueprint-placement ghost (REQ-UI-BLUEPRINT-PLACE). A building with multiple output ports (e.g. a splitter) shows one target-cell glyph per port. The target-cell glyph is drawn larger than the on-tile port glyph so it stands out as the flow-direction preview. Exceptions: the Tunnel Entry shows no target-cell glyph, because it receives items (which may arrive from any of its non-mouth edges, REQ-BLD-TUNNEL-ENTRY) rather than emitting into a single adjacent cell; the Shipyard shows none either, because its output port is a ship-spawn point (REQ-SHP-SPAWN-PLAYER) rather than a belt-item output (REQ-MAT-OUTPUT-EMERGE).
 - REQ-UI-STATUS-LIGHT: Every operational production building — Miner, Smelter, Assembler, Reprocessing Plant, Shipyard, and Salvage Bay — renders a small **status light**: a filled circle with a black outline drawn in the building's upper-right corner, letting the player read a building's production state without selecting it. The light is anchored to the footprint corner that is the upper-right corner in the building's default orientation and rotates with the building — like the output-port glyph (REQ-UI-PORT-GLYPH) — so it stays on the same physical corner of the building as it is rotated. The status light is rendered only for operational buildings; construction sites (which instead show construction progress, REQ-UI-CONSTRUCTION-PROGRESS) and the builder-mode ghost do not render it. Buildings that are not production buildings — belts, splitters, tunnel entries/exits, and the HQ — have no status light. The black outline is constant; the fill color reflects the building's current production state.
   - For the five production buildings (Miner, Smelter, Assembler, Reprocessing Plant, Shipyard), the fill color is determined by evaluating, in order:
-    - **Grey** — no recipe or schematic is selected. This applies only to buildings with a player-facing selection (Miner, Assembler, Shipyard); the Smelter and Reprocessing Plant always run an implicit recipe (REQ-BLD-SMELTER, REQ-BLD-REPROCESSING) and are never grey.
+    - **Grey** — no recipe or schematic is selected. Every production building can show it, an auto-recipe building included: it is grey until something is offered at an input port for it to select a recipe from, and again whenever the player hands it back to automatic selection (REQ-BLD-AUTO-RECIPE).
     - **Green** — the building is currently producing: a production cycle is active (REQ-MAT-CYCLE; for the Shipyard, an in-progress production cycle per REQ-BLD-SHIPYARD).
-    - **Red** — the building is idle because a required input is missing from its input buffers, so it cannot start a cycle. Missing input takes precedence over a full output buffer: if any required input is missing the light is red even when the output buffer is also full.
+    - **Red** — the building is idle because a required input is missing from its input buffers, so it cannot start a cycle. Missing input takes precedence over a blocked output side: if any required input is missing the light is red even when an output buffer is also out of room.
-    - **Yellow** — the building is idle with all required inputs present but its output buffer full, so no new cycle can start (REQ-MAT-OUTPUT-BUFFER, REQ-MAT-CYCLE).
+    - **Yellow** — the building is idle with all required inputs present but the output side cannot take the cycle: at least one item the cycle could produce has no room in its own buffer, so no new cycle can start (REQ-MAT-OUTPUT-BUFFER, REQ-MAT-CYCLE). A buffer short of a full cycle's worth of free space blocks just as a completely full one does.
-    - A configured building that is momentarily idle yet blocked by neither condition (all inputs present and the output buffer has room — a transient state that resolves into a started cycle on the same or the next tick per REQ-MAT-CYCLE) shows green.
+    - A configured building that is momentarily idle yet blocked by neither condition (all inputs present and room for every output the cycle could produce — a transient state that resolves into a started cycle on the same or the next tick per REQ-MAT-CYCLE) shows green.
   - The Salvage Bay has no recipe and no production cycle (REQ-BLD-SALVAGE-BAY); its status light uses only two states: **green** while its output buffer holds at least one unit of scrap, and **red** while its output buffer is empty. The Salvage Bay's status light is never grey or yellow.
   - The four fill colors (grey, green, red, yellow) and the outline color are read from `visuals.toml [status_light]`, consistent with the other rendering-only colors. The status light is presentation-only and has no effect on the simulation.
 - REQ-UI-HP-BARS: All entities with HP — the HQ, player and enemy defence stations, and player and enemy ships — render an HP bar below them. The bar is always visible regardless of current HP. The bar's filled portion represents the fraction of current HP to maximum HP.
@@ -504,6 +523,8 @@ The screen is a single column: a header bar across the top and the game world vi
     - **1** — Belt, **2** — Splitter, **3** — Tunnel (the unified tunnel build mode, REQ-BLD-TUNNEL-MODE). Hotkey 4 is unused.
     - **Shift+1** — Miner, **Shift+2** — Smelter, **Shift+3** — Assembler, **Shift+4** — Shipyard, **Shift+5** — Salvage Bay, **Shift+6** — Reprocessing Plant.
 
+  These shortcuts are the definition; the controls panel (REQ-UI-CONTROLS-PANEL) displays the subset of them that applies to the player's current situation, and the build buttons carry the build hotkeys on their badges (REQ-UI-BUILD-COST). Neither display defines a binding of its own.
+
 ### Debug Draw
 
 - REQ-UI-DEBUG-DRAW: A debug draw mode can be toggled on and off with the **F3** key. It is inactive by default. While active, the sensor range of every ship — both player and enemy — is drawn as a circle centered on the ship, using that ship schematic's outline color from `visuals.toml`.
@@ -532,17 +553,16 @@ The panel shows exactly one **content** at a time, picked from the catalog in RE
 - REQ-UI-EMPTY-SELECTION: When nothing is selected (no building, construction site, ship, defence station, or piece of debris), the selection panel is not shown at all — it is hidden rather than shown empty, so the full game world view is visible (REQ-UI-SELECTION-PANEL). It reappears as soon as an object is selected.
 - REQ-UI-SELECTION-CATEGORIES: **Selection categories and precedence.** Every selectable object belongs to one of two mutually exclusive selection categories: **buildings** (buildings and construction sites) and **field objects** (ships and defence stations — player or enemy — together with debris). A single selection holds objects from only one category at a time. Field objects of different kinds may be selected together (e.g. several ships plus debris, freely mixing player and enemy actors). Buildings are exclusive and take precedence — **buildings win**: selecting a building (by click, Ctrl+click, or a box-drag covering at least one building) clears any field selection and yields a buildings-only selection, and conversely selecting any field object clears any building selection. Point hit-testing prefers a building over a coincident field object, and among field objects prefers an actor (ship or defence station) over a coincident piece of debris (REQ-UI-ENTITY-CLICK-SELECT, REQ-UI-DEBRIS-CLICK-SELECT).
 - REQ-UI-SELECTION-CARD: **Card structure.** Every panel content is a card with the same three parts, top to bottom:
-  - **Header** — always shown. It holds the selection's identity symbol on the left — the building's icon glyph (REQ-UI-WORLD-ICON), a ship's schematic color swatch, or the kind symbol of a defence station or piece of debris — the selection's name beside it, and one optional **right slot**. The right slot holds a status indicator (REQ-UI-SELECTION-STATUS), a ship's current behavior (REQ-UI-SHIP-BEHAVIOR), or an object count — never more than one of them; which one applies is stated per content in REQ-UI-SELECTION-CONTENT.
+  - **Header** — always shown. It holds the selection's identity symbol on the left — the building's icon glyph (REQ-UI-WORLD-ICON), a ship's schematic color swatch, or the kind symbol of a defence station or piece of debris — the selection's name beside it, and one optional **right slot**. The right slot holds a status indicator (REQ-UI-SELECTION-STATUS), a ship's current behavior (REQ-UI-SHIP-BEHAVIOR), or an object count — never more than one of them; which one applies is stated per content in REQ-UI-SELECTION-CONTENT. The header carries no control of its own, and doubles as the panel's drag handle (REQ-UI-SELECTION-PANEL-DRAG).
   - **Configuration group** — the controls that change how the selected object is set up: the recipe/schematic selection control (REQ-UI-SELECT-BUTTON), a shipyard's layout preview and Configure button (REQ-MOD-UI-PREVIEW), and a splitter's output filters (REQ-BLD-SPLITTER). It is shown identically for an operational building and for a construction site of the same type (REQ-BLD-SITE-CONFIG).
-  - **Runtime group** — what the object is currently doing: buffer contents, production progress, HP, remaining scrap, and the belt clear action (REQ-UI-BELT-CLEAR). For a **construction site** the entire runtime group is replaced by a captioned `Construction` section: a progress bar filled to the site's construction completion with that completion as an integer percentage beside the caption — the same value the world draws on the footprint (REQ-UI-CONSTRUCTION-PROGRESS) — followed by a note that buffers appear once the building is built, because a site has neither buffers nor a production cycle (REQ-BLD-SITE-CONFIG). The configuration group is unaffected and stays visible on a site.
+  - **Runtime group** — what the object is currently doing: buffer contents, production progress, HP, remaining scrap, and the belt clear action (REQ-UI-BELT-CLEAR). Where the object has **HP**, its bar is the first thing in this group, above everything else the card shows (REQ-UI-HQ-PANEL, REQ-UI-SHIP-STATS-PANEL, REQ-UI-STATION-STATS-PANEL) — how close the thing is to dying outranks what it is holding. For a **construction site** the entire runtime group is replaced by a captioned `Construction` section: a progress bar filled to the site's construction completion with that completion as an integer percentage beside the caption — the same value the world draws on the footprint (REQ-UI-CONSTRUCTION-PROGRESS) — followed by a note that buffers appear once the building is built, because a site has neither buffers nor a production cycle (REQ-BLD-SITE-CONFIG). That section sits **directly below the header, above the configuration group**, so how far along the site is reads first; the configuration group is otherwise unaffected and stays visible on a site.
 
-  A group with nothing to show takes no space, so a content may consist of a header alone. Within a group, related parts form **sections** carrying a short caption above them (e.g. `Layout`, `Input buffers`, `Production`, `Output buffer`); a section and its caption are shown only while that section has content, so e.g. a Miner (which consumes nothing) shows no input buffer section.
+  A group with nothing to show takes no space, so a content may consist of a header alone. Within a group, related parts form **sections** carrying a short caption above them (e.g. `Layout`, `Input buffers`, `Production`, `Output buffers`); a section and its caption are shown only while that section has content, so e.g. a Miner (which consumes nothing) shows no input buffer section.
 - REQ-UI-SELECTION-CONTENT: **Content catalog.** Which content the panel shows follows from the selection alone:
 
   | Selection | Header right slot | Configuration group | Runtime group |
   |---|---|---|---|
-  | Miner, Assembler | status | recipe control + recipe summary | buffers + production |
+  | Miner, Assembler, Smelter, Reprocessing Plant | status | recipe control + recipe summary | buffers + production |
-  | Smelter, Reprocessing Plant | status | recipe summary | buffers + production |
   | Shipyard | status | schematic control + layout preview + Configure | buffers + production |
   | Salvage Bay | status | — | buffers |
   | HQ | — | — | block stock + HP |
@@ -561,23 +581,34 @@ The panel shows exactly one **content** at a time, picked from the catalog in RE
   - **Debris** — several pieces of debris and nothing else. Their remaining scrap sums into one value (REQ-UI-DEBRIS-PANEL).
 
   Every other multi-selection falls back to the count summary. In particular a selection mixing a splitter with belts does not aggregate (a splitter carries per-object output filters, which have no aggregate), and neither do several production buildings of one type (per-building buffers and cycle progress have no aggregate).
-- REQ-UI-SINGLE-SELECTION: When one building is selected, the panel shows its symbol and name in the header (REQ-UI-SELECTION-CARD), its current recipe or schematic selection (REQ-UI-SELECT-BUTTON) and recipe summary (REQ-UI-RECIPE-SUMMARY) in the configuration group, and its input and output buffer contents in the runtime group. Each buffered item is shown as an **item chip** bearing that item's icon (REQ-UI-ITEM-ICON) and its current count:
+- REQ-UI-SINGLE-SELECTION: When one building is selected, the panel shows its symbol and name in the header (REQ-UI-SELECTION-CARD), its current recipe or schematic selection (REQ-UI-SELECT-BUTTON) and recipe summary (REQ-UI-RECIPE-SUMMARY) in the configuration group, and its input and output buffer contents in the runtime group. Each buffered item is shown as an **item chip** bearing that item's icon on its colored square (REQ-UI-ITEM-ICON) and its current count, and hovering a chip shows that item's production tooltip (REQ-UI-ITEM-TOOLTIP):
   - an **input** chip shows the per-cycle amount below the count (the items consumed per run, e.g. `/ 2 per cycle`), or the count alone when the building has no selected recipe or schematic to give one;
-  - an **output** chip shows the count against the output buffer's capacity as `a / b` (REQ-MAT-OUTPUT-BUFFER), with the item's name below.
+  - an **output** chip shows the count against **that item's own** output buffer capacity as `a / b` (REQ-MAT-OUTPUT-BUFFER), with the item's name below. Each output chip therefore stands for one buffer, and a Reprocessing Plant shows one per possible roll.
 
-  Input and output chips form separately captioned sections, each shown only while it holds something (REQ-UI-SELECTION-CARD). For a selected construction site the buffer sections are omitted (REQ-BLD-SITE-CONFIG).
+  Input and output chips form separately captioned sections (REQ-UI-SELECTION-CARD). A section lists a chip for **every item the building's cycle involves**, whether or not the buffer currently holds any: an empty buffer reads `0` rather than its chip disappearing, so the card keeps one shape while the building runs. A section left with no chips at all is not shown. The production section (REQ-UI-PRODUCTION-PROGRESS) sits **between them**, so the card reads in the direction the materials flow: what goes in, what is being made of it, what has come out. For a selected construction site the buffer sections are omitted (REQ-BLD-SITE-CONFIG).
-- REQ-UI-RECIPE-SUMMARY: Below the recipe/schematic selection control, a building running a recipe or schematic shows a one-line **recipe summary**: each input item's icon with its per-cycle amount, an arrow, each output item's icon with its per-cycle amount, and the cycle time in seconds. It restates what the building will do without opening the selection dialog, and it is the panel's only display of the cycle time. For a Shipyard the summary is built from the schematic's materials and production time including the placed modules' contributions (REQ-BLD-SHIPYARD, REQ-MOD-STAT-CALC), matching the buffers beneath it. Auto-recipe buildings (Smelter, Reprocessing Plant — REQ-BLD-SMELTER, REQ-BLD-REPROCESSING) have no player-selected recipe and so show no selection control; they show the summary of the recipe currently in production, and none while idle. A building with no recipe or schematic selected shows no summary.
+
-- REQ-UI-PRODUCTION-PROGRESS: For buildings that produce items or ships (miner, smelter, assembler, reprocessing plant, shipyard), the panel's runtime group shows a captioned **production section**: a horizontal progress bar filled to the completion of the active production cycle, with that completion beside the caption as an integer percentage (e.g. `72%`), or the text `idle` in place of the percentage and an empty bar when no production cycle is active. The cycle time is shown in the recipe summary (REQ-UI-RECIPE-SUMMARY) rather than repeated here. When no recipe or schematic is selected, the production section is not shown at all.
+  **Only unlocked items are listed.** Should a building's buffers carry an entry for an item the player cannot make yet, it is left out of both sections, consistent with the rest of the UI hiding what is not unlocked yet (REQ-LOCK-UI-RECIPE, REQ-LOCK-UI-SPLITTER).
+- REQ-UI-RECIPE-SUMMARY: Below the recipe/schematic selection control, a building running a recipe or schematic shows a one-line **recipe summary**: each input item's icon on its colored square (REQ-UI-ITEM-ICON) with its per-cycle amount and the inputs separated by `+`, an arrow, each output item's icon on its colored square with its per-cycle amount, and the cycle time in seconds. It restates what the building will do without opening the selection dialog, and it is the panel's only display of the cycle time. For a Shipyard the summary is built from the schematic's materials and production time including the placed modules' contributions (REQ-BLD-SHIPYARD, REQ-MOD-STAT-CALC), matching the buffers beneath it. A building with no recipe or schematic selected shows no summary — including an auto-recipe building that has yet to select one (REQ-BLD-AUTO-RECIPE), which shows none until it does and keeps it from then on, so the card does not resize in step with the building's status (REQ-UI-SELECTION-STATUS, REQ-UI-SELECTION-PANEL).
+- REQ-UI-PRODUCTION-PROGRESS: For buildings that produce items or ships (miner, smelter, assembler, reprocessing plant, shipyard), the panel's runtime group shows a captioned **production section** between the input and output buffer sections (REQ-UI-SINGLE-SELECTION): a horizontal progress bar filled to the completion of the active production cycle, with that completion beside the caption as an integer percentage (e.g. `72%`), or the text `idle` in place of the percentage and an empty bar when no production cycle is active. The cycle time is shown in the recipe summary (REQ-UI-RECIPE-SUMMARY) rather than repeated here. When no recipe or schematic is selected, the production section is not shown at all.
 - REQ-UI-MULTI-SELECT: The player selects multiple objects by box-drag or by Ctrl+clicking individual objects to add or remove them from the selection. Multi-select operates within a single category (REQ-UI-SELECTION-CATEGORIES). A box-drag that covers at least one building selects buildings (any field objects within the box are ignored — buildings win); a box-drag that covers no building but does cover ships, defence stations, or debris selects all of those field objects together (REQ-UI-ENTITY-CLICK-SELECT, REQ-UI-DEBRIS-MULTI-SELECT).
 - REQ-UI-MULTI-SELECTION: When multiple buildings are selected and the selection does not aggregate (REQ-UI-SELECTION-AGGREGATE), the panel shows a count summary. Its header names the size of the selection as `<n> buildings` in place of an object name, and carries no symbol and nothing in its right slot. Below it is one row per selected building type — the type's symbol, its name, and the number selected as `x<count>` — one type per row, and no per-building detail. A final row shows the **total building block cost** of the selection, captioned `Total cost` with the value followed by the `building_block` item icon (REQ-UI-BLOCKS-ICON, REQ-UI-ITEM-ICON): the sum of each selected building's placement cost (`buildings.toml [[building]].cost`, per REQ-BLD-COST), counting only player-placeable buildings (buildings with a button in the build button bar); non-player-placeable buildings (the HQ and defence stations) are excluded from the total, consistent with the blueprint total (REQ-UI-BLUEPRINT-CARD). Construction sites count at their building type's full placement cost regardless of construction progress.
-- REQ-UI-CONFIG-INLINE: Recipe and schematic configuration for a selected building is shown within this panel, in its configuration group (REQ-UI-SELECTION-CARD). Recipe selection (miner, assembler) and schematic selection (shipyard) use the selection button and dialog (REQ-UI-SELECT-BUTTON) rather than an inline control. For shipyards, the panel additionally shows the ship layout preview and "Configure" button below the schematic selection button (REQ-MOD-UI-PREVIEW).
+- REQ-UI-CONFIG-INLINE: Recipe and schematic configuration for a selected building is shown within this panel, in its configuration group (REQ-UI-SELECTION-CARD). Recipe selection (miner, assembler, smelter, reprocessing plant) and schematic selection (shipyard) use the selection button and dialog (REQ-UI-SELECT-BUTTON) rather than an inline control. For shipyards, the panel additionally shows the ship layout preview and "Configure" button below the schematic selection button (REQ-MOD-UI-PREVIEW).
-- REQ-UI-SELECT-BUTTON: **Recipe and schematic selection control.** Recipe selection (Miner ore type, Assembler recipe) and schematic selection (Shipyard) are each presented in the selection panel as a single **selection button** whose caption is the name of the currently selected recipe or schematic, or a placeholder ("Select recipe" / "Select schematic") when none is selected. Clicking the button opens a modal **selection dialog** that pauses the game (speed set to 0×; on close, the speed is restored to what it was before the dialog was opened). The dialog contains a grid of option buttons, one per selectable option — only options that are currently unlocked are shown (REQ-LOCK-UI-RECIPE for recipes, REQ-LOCK-UI-SCHEMATIC for schematics). Hovering an option button shows the selection info tooltip (REQ-UI-SELECT-TOOLTIP). Clicking an option button selects that recipe/schematic, closes the dialog, and updates the selection button's caption in the selection panel. The dialog can be dismissed without changing the current selection (e.g. closing it without clicking an option). Selecting a new recipe or schematic has the same effects as before (REQ-MAT-INPUT-BUFFER, REQ-MAT-OUTPUT-BUFFER, REQ-BLD-SHIPYARD).
+- REQ-UI-SELECT-BUTTON: **Recipe and schematic selection control.** Recipe selection (Miner ore type, Assembler recipe, and the Smelter's and Reprocessing Plant's recipe per REQ-BLD-AUTO-RECIPE) and schematic selection (Shipyard) are each presented in the selection panel as a single **selection button** whose caption is the name of the currently selected recipe or schematic, or a placeholder ("Select recipe" / "Select schematic") when none is selected. Clicking the button opens a modal **selection dialog** that pauses the game (speed set to 0×; on close, the speed is restored to what it was before the dialog was opened) and that opens centered on the selection panel, as every modal opened from the panel does (REQ-UI-PANEL-MODAL). The dialog contains a vertical list of option buttons, one per selectable option, each describing itself (REQ-UI-SELECT-OPTIONS) — only options that are currently unlocked are shown (REQ-LOCK-UI-RECIPE for recipes, REQ-LOCK-UI-SCHEMATIC for schematics). Neither the option buttons nor the selection button carries a tooltip: an option button states what it makes on its own face, and what the building has selected is drawn beneath the selection button as the recipe summary (REQ-UI-RECIPE-SUMMARY), with the production paths of the items involved reachable by hovering the card's item chips (REQ-UI-ITEM-TOOLTIP). Clicking an option button selects that recipe/schematic, closes the dialog, and updates the selection button's caption in the selection panel. The dialog can be dismissed without changing the current selection (e.g. closing it without clicking an option). Selecting a new recipe or schematic has the same effects as before (REQ-MAT-INPUT-BUFFER, REQ-MAT-OUTPUT-BUFFER, REQ-BLD-SHIPYARD).
-- REQ-UI-SELECT-TOOLTIP: **Selection info tooltip.** Hovering an option button in the selection dialog (REQ-UI-SELECT-BUTTON), and hovering the selection button in the selection panel when a selection is set, displays an info tooltip:
+- REQ-UI-SELECT-OPTIONS: **Option list of the selection dialog.** The selection dialog (REQ-UI-SELECT-BUTTON) lists its options as a **single vertical column** of buttons, one per option, rather than a grid: each button is as wide as the dialog and states what the option does, which needs a line of its own. No option button carries a tooltip — the button face is the whole description, so the player reads every option's inputs, product, and time from the list itself without hovering anything. Should the column be taller than the space the window leaves the dialog — a fully unlocked Assembler offers more options than any window can hold, and a modal is never resized to fit (REQ-UI-PANEL-MODAL) — the list **scrolls** within the dialog rather than the dialog growing past the window.
-  - For a **recipe** (Miner or Assembler): the recipe name; the name and quantity of each input item (no inputs are listed for miner recipes, which consume nothing); the completion time (`duration_seconds`); and the name and quantity of the produced output item.
+  - A **recipe** option (Miner, Assembler) shows the **recipe name** on its first line and, beneath it, that recipe drawn as the recipe summary line draws it (REQ-UI-RECIPE-SUMMARY): each input item's icon on its colored square with its per-cycle amount, an arrow, each output item's icon with its amount, and the cycle time. A miner recipe consumes nothing, so its line begins at the arrow.
-  - For a **ship schematic** (Shipyard): the ship's `display_name`; the name and quantity of each base required material (`[ship.schematic].materials`, excluding any module contributions); the base production time (`[ship.schematic].production_time_seconds`); and "Produces: 1 <ship display name>".
+  - A **ship schematic** option (Shipyard) shows the ship's `display_name` on its first line and, beneath it, the icons and quantities of its base required materials (`[ship.schematic].materials`, excluding any module contributions) with the base production time (`[ship.schematic].production_time_seconds`). A ship is not an item and has no icon of its own, so this line names no output: the button's caption is what it produces.
-- REQ-UI-RECIPE-ICON: In the recipe-selection dialog (REQ-UI-SELECT-BUTTON) for a Miner or Assembler, each recipe option button shows the icon of the recipe's produced item **instead of** its name caption (icon-only). The item shown is the recipe's `icon` field if set, otherwise its first output item; the icon is that item's icon per REQ-UI-ITEM-ICON. When the item has no icon file, the button falls back to the recipe/item name caption. The recipe name and details remain available on hover via the selection info tooltip (REQ-UI-SELECT-TOOLTIP). The `(None)` option keeps its text caption. This applies only to recipe options; the Shipyard schematic-selection dialog is unaffected and continues to show ship name captions.
+  - The `(None)` option shows its text caption alone. On an auto-recipe building it is captioned `(Auto)` instead, because there it does not leave the building idle but returns it to automatic selection (REQ-BLD-AUTO-RECIPE).
+- REQ-UI-ITEM-TOOLTIP: **Item production tooltip.** Hovering an item chip in the selection panel — an input or output buffer chip (REQ-UI-SINGLE-SELECTION) or the HQ's block stock chip (REQ-UI-HQ-PANEL) — shows a tooltip telling the player where that item comes from. It has a heading and a body:
+  - the heading is the **hovered item's name**. For an input chip this is the only place the item is named at all, since such a chip carries a count and no name (REQ-UI-SINGLE-SELECTION).
+  - the body is the caption `Produced by` followed by one **recipe line** per unlocked recipe that produces the item. A recipe line is a small **card** of two rows: the icon of the building that runs the recipe (REQ-UI-BUILD-ICON) and the recipe's name on the first, and the recipe itself on the second, drawn as the recipe summary draws it (REQ-UI-RECIPE-SUMMARY) — each input item's icon on its colored square with its per-cycle amount, the inputs separated by `+`, an arrow, each output item's icon with its amount, and the cycle time. Two rows rather than one because an identity and a cycle read as different things, and a single row of icons, names and numbers runs too long to scan; a card around each because several producers stacked as bare lines read as one field of icons and numbers rather than as separate recipes. A line drawn where its surroundings already frame it — on an option button (REQ-UI-SELECT-OPTIONS), or as the panel's recipe summary — takes no card of its own. An item may have several producers — an iron ingot is smelted from ore, smelted from scrap, and recovered by reprocessing — and the building icon and recipe name are what tell those lines apart and tell the player which building to place for which path.
+
+  **Only recipes the player can run are listed**, consistent with the rest of the UI hiding what the player cannot make yet. What that means differs by building, because only Miner and Assembler recipes are unlocked individually (REQ-LOCK-UI-RECIPE): those are listed once unlocked, while a Smelter's or Reprocessing Plant's recipes (REQ-BLD-SMELTER, REQ-BLD-REPROCESSING) are listed once **their building** is unlocked (REQ-LOCK-BUILDING) — there is no sense in naming a path through a plant the player cannot place. Two cases have no recipe line to show, and each says so in place of the list rather than leaving the tooltip bare:
+  - **An item no recipe produces at all.** Scrap is salvaged from debris (REQ-RES-DEBRIS-DROP) rather than crafted, so its tooltip reads `Salvaged from debris` in place of the `Produced by` caption and lists nothing beneath it.
+  - **An item whose every producing recipe is still locked.** The caption stays `Produced by`, and the single line beneath it reads `Undiscovered`: the player is told the item is made somehow, without being shown a path they have not unlocked yet.
+
+  The tooltip belongs to item chips only. The selection dialog shows no tooltips at all, its buttons describing themselves (REQ-UI-SELECT-OPTIONS), and the icons of the recipe summary line (REQ-UI-RECIPE-SUMMARY) show none either: they are parts of one line that already describes one recipe, rather than standalone item displays.
 - REQ-UI-BELT-CLEAR: When one or more belt, splitter, tunnel entry, or tunnel exit tiles are selected, the panel's runtime group shows a **"Clear stuck items"** button that removes all items from the selected tiles. Clearing a tunnel entry or exit also discards all items currently in transit through that tunnel (REQ-BLD-TUNNEL-TRANSIT). This can be used to resolve stalled belts, splitters, and tunnels. The button acts on every selected tile, which is why a selection of belts and tunnel ends aggregates into one content rather than a count summary (REQ-UI-SELECTION-AGGREGATE).
-- REQ-UI-HQ-PANEL: When the HQ is selected, the panel shows the **global building blocks stock** — the same value as the header bar's stock display (REQ-UI-BLOCKS-ICON), rendered as an item chip (REQ-UI-SINGLE-SELECTION) carrying the `building_block` icon — and the HQ's **HP** as a bar labelled `current / maximum` (REQ-HQ-STATS, REQ-UI-HP-BARS). The HQ has no input or output buffers of its own: building blocks delivered by belt go straight into the global stock (REQ-HQ-BELT-INPUT), and showing that stock on the HQ is what tells the player to route blocks there. The HQ has no configuration group and no status indicator (REQ-UI-SELECTION-STATUS), and it is never a construction site.
+- REQ-UI-HQ-PANEL: When the HQ is selected, the panel shows the HQ's **HP** as a bar labelled `current / maximum` (REQ-HQ-STATS, REQ-UI-HP-BARS) and, beneath it, the **global building blocks stock** — the same value as the header bar's stock display (REQ-UI-BLOCKS-ICON), rendered as an item chip (REQ-UI-SINGLE-SELECTION) carrying the `building_block` icon on its colored square — a chip is an item display, so it takes the square even though the header bar's inline block icon does not (REQ-UI-ITEM-ICON, REQ-UI-BLOCKS-ICON), and hovering it shows the item production tooltip as any other chip does (REQ-UI-ITEM-TOOLTIP). The HP comes first, as it does on every card that has it (REQ-UI-SELECTION-CARD). The HQ has no input or output buffers of its own: building blocks delivered by belt go straight into the global stock (REQ-HQ-BELT-INPUT), and showing that stock on the HQ is what tells the player to route blocks there. The HQ has no configuration group and no status indicator (REQ-UI-SELECTION-STATUS), and it is never a construction site.
 - REQ-UI-ENTITY-CLICK-SELECT: The player can click any ship (player or enemy) or any defence station (player or enemy) in the game world to select it. A plain click on a ship or defence station makes it the sole selection, clearing any previous selection. Ships and defence stations can be multi-selected — by Ctrl+clicking individual actors to add or remove them, or by box-drag (REQ-UI-MULTI-SELECT) — and can be selected together with debris and with one another in a single field selection (REQ-UI-SELECTION-CATEGORIES), freely mixing player and enemy actors. Actors cannot be selected together with buildings: selecting a ship or defence station clears any building selection, and selecting a building clears the actors (buildings win). Clicking a piece of debris adds to or establishes a field selection (REQ-UI-DEBRIS-CLICK-SELECT). Clicking empty world space (no building, ship, defence station, or piece of debris) clears the selection.
 - REQ-UI-SHIP-STATS-PANEL: When exactly one ship is selected (REQ-UI-ENTITY-CLICK-SELECT) and no debris is selected, the selection panel shows a **ship stats panel**. (If debris is also selected, the panel shows the compact count summary instead, per REQ-UI-FIELD-MULTI-SELECTION.) The panel structure mirrors REQ-MOD-UI-STATS-PANEL but reflects the ship's actual live state: stats are computed from its installed modules per REQ-MOD-STAT-CALC. Its header (REQ-UI-SELECTION-CARD) carries the schematic's color swatch and display name, with the ship's current behavior in the right slot (REQ-UI-SHIP-BEHAVIOR). The panel always shows all hull stats: HP (current / maximum) as a **bar** with the two values beside its caption, then max linear speed, sensor range, main acceleration, maneuvering acceleration, angular acceleration, and max rotation speed as label/value rows. In addition, capability module summaries are shown below the hull stats, each as its own outlined row, conditioned on which module types are installed and using the same aggregation rules as REQ-MOD-UI-STATS-PANEL: weapons (combined DPS, maximum range), salvage (combined collection rate, maximum range), and repair (combined repair rate, maximum range), each appearing only if at least one instance of that module type is installed. While debug draw mode is active (REQ-UI-DEBUG-DRAW), the panel additionally shows the ship's derived threat cost (REQ-MOD-THREAT).
 - REQ-UI-SHIP-BEHAVIOR: The ship stats panel (REQ-UI-SHIP-STATS-PANEL) additionally displays the selected ship's **current behavior** in its header's right slot (REQ-UI-SELECTION-CARD) — a single label naming the top-priority behavior currently governing the ship's navigation, as resolved by the fixed-priority behavior arbitration. Only the winning behavior is named; lower-priority behaviors that are suppressed are not shown, and neither are the salvage/repair cycles that run regardless of the active behavior (REQ-SHP-SALVAGE, REQ-SHP-REPAIR). The label updates live as the ship's behavior changes, and it is always shown (independent of debug draw mode, unlike the threat-cost line of REQ-UI-SHIP-STATS-PANEL). This applies to both player and enemy ships (REQ-UI-ENTITY-CLICK-SELECT); enemy ships only ever show **Engaging** or **Advancing**. The behavior labels (all wrapped in `tr()`) are:
@@ -589,24 +620,97 @@ The panel shows exactly one **content** at a time, picked from the catalog in RE
   - **Standby** — the ship is holding with its fleet (REQ-SHP-STANDBY).
   - **Advancing** — the ship is executing the baseline forward advance with no higher-priority behavior active (player: REQ-SHP-COMBAT advance toward the enemy; enemy: REQ-SHP-ENEMY-AI advance toward the asteroid).
 - REQ-UI-STATION-STATS-PANEL: When exactly one defence station is selected (REQ-UI-ENTITY-CLICK-SELECT) and no debris is selected, the selection panel shows a **station stats panel** displaying the station's stats computed at its current level: HP (current / maximum) as a **bar** with the two values beside its caption, then damage, range, and fire rate as label/value rows, matching the ship stats panel's rendering (REQ-UI-SHIP-STATS-PANEL). Its header carries no right slot: a station has no behavior label and no status light. (If debris is also selected, the panel shows the compact count summary instead, per REQ-UI-FIELD-MULTI-SELECTION.)
-- REQ-UI-FIELD-MULTI-SELECTION: A full single-object stats panel (REQ-UI-SHIP-STATS-PANEL, REQ-UI-STATION-STATS-PANEL, REQ-UI-DEBRIS-PANEL) is shown when the field selection holds exactly one object — one ship, one defence station, or one piece of debris — and, for debris only, when it holds several pieces of debris and nothing else, which aggregate into that same content (REQ-UI-SELECTION-AGGREGATE). Every other field selection of more than one object — multiple actors, or any mix of actors and debris — shows a **count summary** instead. Its header reads `Mixed selection` with the total number of selected objects in the right slot (REQ-UI-SELECTION-CARD). Below it is one row per type — the type's symbol, its name, and the number selected as `x<count>`, the same `x`-count notation as the recipe tooltip and the building multi-selection (REQ-UI-MULTI-SELECTION). Ships are grouped by schematic display name and defence stations as a group, distinguishing player from enemy; all selected pieces of debris are grouped into a single `Debris` row whose count is the number of selected pieces. No per-object detail is shown. If debris is part of the selection, its row is followed by an indented sub-row giving the summed remaining scrap across all selected debris (REQ-UI-DEBRIS-PANEL). Building selections use REQ-UI-SINGLE-SELECTION / REQ-UI-MULTI-SELECTION instead.
+- REQ-UI-FIELD-MULTI-SELECTION: A full single-object stats panel (REQ-UI-SHIP-STATS-PANEL, REQ-UI-STATION-STATS-PANEL, REQ-UI-DEBRIS-PANEL) is shown when the field selection holds exactly one object — one ship, one defence station, or one piece of debris — and, for debris only, when it holds several pieces of debris and nothing else, which aggregate into that same content (REQ-UI-SELECTION-AGGREGATE). Every other field selection of more than one object — multiple actors, or any mix of actors and debris — shows a **count summary** instead. Its header reads `Mixed selection` with the total number of selected objects in the right slot (REQ-UI-SELECTION-CARD). Below it is one row per type — the type's symbol, its name, and the number selected as `x<count>`, the same `x`-count notation as the recipe tooltip and the building multi-selection (REQ-UI-MULTI-SELECTION). Ships are grouped by schematic display name and defence stations as a group, distinguishing player from enemy; all selected pieces of debris are grouped into a single `Debris` row whose count is the number of selected pieces. No per-object detail is shown. If debris is part of the selection, its row is followed by an indented sub-row giving the summed remaining scrap across all selected debris as the amount followed by the bare `scrap` icon, exactly as the debris panel states it (REQ-UI-DEBRIS-PANEL, REQ-UI-ITEM-ICON). Building selections use REQ-UI-SINGLE-SELECTION / REQ-UI-MULTI-SELECTION instead.
 - REQ-UI-DEBRIS-CLICK-SELECT: The player can click any piece of debris (REQ-RES-DEBRIS-DROP) in the game world to select it. Debris are field objects (REQ-UI-SELECTION-CATEGORIES) and can be selected together with ships and defence stations, but not with buildings. A plain click on a piece of debris makes it the sole selection, clearing any previous selection; selecting a building clears any debris (buildings win), and selecting a piece of debris clears any building selection. Hit-testing prefers a building over a coincident actor or piece of debris, and an actor (ship or defence station) over a coincident piece of debris: a piece of debris is selected only when no building or actor is under the cursor. A selected piece of debris that despawns or is fully collected (REQ-RES-DEBRIS-DROP) is removed from the selection; if no selected object remains, the panel becomes empty (REQ-UI-EMPTY-SELECTION).
 - REQ-UI-DEBRIS-MULTI-SELECT: Multiple pieces of debris can be selected by box-drag or by Ctrl+clicking individual pieces to add or remove them, mirroring building multi-select (REQ-UI-MULTI-SELECT). Debris shares the field-object category with ships and defence stations (REQ-UI-SELECTION-CATEGORIES), so a field selection may hold debris and actors together. Ctrl+clicking a piece of debris while a field selection is active adds or removes that piece within the same selection; Ctrl+clicking a piece of debris while a building selection is active first clears the buildings and begins a field selection (buildings win). Conversely, selecting a building while a field selection is active clears it. Box-drag disambiguation follows REQ-UI-MULTI-SELECT (a box covering any building selects buildings; a box covering no building selects the ships, defence stations, and debris within it).
-- REQ-UI-DEBRIS-PANEL: When debris is selected and no actors are (REQ-UI-FIELD-MULTI-SELECTION), the selection panel shows a **debris stats panel** structured like the ship and station stats panels (REQ-UI-SHIP-STATS-PANEL, REQ-UI-STATION-STATS-PANEL): a header reading **"Debris"**, followed by a single stat row, **"Scrap remaining"**, in the same label/value style as a ship hull stat row. With one piece selected the row shows that piece's remaining scrap amount (REQ-RES-DEBRIS-DROP) and the header's right slot is empty. With several pieces selected the same content is shown aggregated (REQ-UI-SELECTION-AGGREGATE): the number of selected pieces appears in the header's right slot as `x<count>` and the row shows the summed remaining scrap across them. When debris is selected together with actors, the debris are instead summarized within the count summary (REQ-UI-FIELD-MULTI-SELECTION): a `Debris` row giving the number of selected pieces, followed by an indented sub-row with their summed remaining scrap. The displayed scrap value updates as selected debris are partially collected or despawn (REQ-UI-DEBRIS-CLICK-SELECT).
+- REQ-UI-DEBRIS-PANEL: When debris is selected and no actors are (REQ-UI-FIELD-MULTI-SELECTION), the selection panel shows a **debris stats panel** structured like the ship and station stats panels (REQ-UI-SHIP-STATS-PANEL, REQ-UI-STATION-STATS-PANEL): a header reading **"Debris"**, followed by a single stat row captioned **"Remaining"**, in the same label/value style as a ship hull stat row. Its value is the scrap amount followed by the `scrap` item icon drawn **bare, without its colored square** and sized to the row's text height — the same inline form the header bar uses for building blocks (REQ-UI-BLOCKS-ICON, REQ-UI-ITEM-ICON). The icon stands in for the word `Scrap`, which is why the caption names neither the item nor its unit; when no icon file exists for `scrap` (a missing icon is not an error, REQ-UI-ITEM-ICON), the row falls back to the caption `Scrap remaining` with the amount alone as its value. With one piece selected the row shows that piece's remaining scrap amount (REQ-RES-DEBRIS-DROP) and the header's right slot is empty. With several pieces selected the same content is shown aggregated (REQ-UI-SELECTION-AGGREGATE): the number of selected pieces appears in the header's right slot as `x<count>` and the row shows the summed remaining scrap across them. When debris is selected together with actors, the debris are instead summarized within the count summary (REQ-UI-FIELD-MULTI-SELECTION): a `Debris` row giving the number of selected pieces, followed by an indented sub-row with their summed remaining scrap, stated in the same amount-plus-bare-icon form. The displayed scrap value updates as selected debris are partially collected or despawn (REQ-UI-DEBRIS-CLICK-SELECT).
 
 ### Build Button Bar
 
 - REQ-UI-BUILD-BAR: All placeable building types are shown as a **single horizontal row** of buttons with no grouping and no wrapping, inside a widget that **floats over the game world view** (REQ-UI-WORLD-SIZE), horizontally centered and anchored at the bottom edge with a small margin. Tunnel Entry and Tunnel Exit share a single **Tunnel** button (REQ-BLD-TUNNEL-MODE) rather than one button each. The bar is sized to its buttons and re-centers whenever the set of shown buttons changes (REQ-LOCK-BUILDING) or the view is resized.
   - **Overlay behavior.** The bar occludes the strip of the game world it covers; the world view itself keeps its full extent and the view's scrolling, ghost rendering, and tile geometry are unaffected (the world is not inset for the bar). The bar is drawn above the pause and deconstruct vignettes (REQ-UI-PAUSE-BORDER, REQ-UI-DECONSTRUCT-BORDER), which keep their full 100-pixel bottom band underneath it, and below the modal dim (REQ-UI-MODAL-DIM), which covers the entire game window including the bar.
-  - **No overlap with the selection panel.** The bar and the selection panel (REQ-UI-SELECTION-PANEL) never overlap, and keeping them apart is entirely the panel's job: the bar's position depends only on its own button set and the view size, and it never moves, re-centers, or resizes because the panel appears, disappears, or changes size. The panel instead confines itself to the view height less the bar's strip (REQ-UI-SELECTION-PANEL).
+  - **No overlap with the selection panel.** The bar and the selection panel (REQ-UI-SELECTION-PANEL) never overlap, and keeping them apart is entirely the panel's job: the bar's position depends only on its own button set and the view size, and it never moves, re-centers, or resizes because the panel appears, disappears, or changes size. The panel instead steps around the bar's current rectangle wherever its own column would meet it (REQ-UI-SELECTION-PANEL).
   - **Input.** Mouse events over the bar are consumed by the bar and never reach the game world: hovering it shows no builder-mode ghost at the tile beneath, and clicking it neither places a building nor changes the selection. Right-clicking the bar does not exit builder mode (REQ-BLD-BUILDER-MODE) or cancel a belt drag (REQ-BLD-BELT-DRAG).
 - REQ-UI-BUILD-COST: Each button is **icon-only with a cost**, its face composed of three elements: the button's **hotkey badge** in the top-left corner, the building's icon (REQ-UI-BUILD-ICON) centered below it, and the building block cost centered under the icon, shown with the `building_block` item icon (REQ-UI-BLOCKS-ICON, REQ-UI-ITEM-ICON) to the right of the number in place of the trailing `Blocks` word, e.g. `2` then a small block icon. The building name is not shown on the button; it is shown in the button's hover tooltip instead (REQ-UI-BUILD-TOOLTIP). When no icon file exists for `building_block`, the cost is shown as the bare number. The Deconstruct button (REQ-UI-DECONSTRUCT-BUTTON) has no cost and shows its name as a text caption in the cost's place.
   - **Hotkey badge.** The badge names the build hotkey that activates the button (REQ-UI-HOTKEYS), so the player can learn the shortcuts from the bar itself. It is rendered dimmer than the cost so it reads as secondary, but at the same size and in bold, because a smaller badge is not legible. A plain-digit hotkey is shown as the bare digit (`1`, `2`, `3`); a Shift+digit hotkey is shown with an upwards arrow prefixed and no separator (`↑1` … `↑6`); the Deconstruct button shows `Q`. A button whose building type has no build hotkey shows no badge and keeps the same face size, so the row stays even.
 - REQ-UI-BUILD-ICON: Each build button shows an icon. Icons are SVG files loaded at runtime from `data/icons/buildings/` (a sibling of the config directory, read the same way as `visuals.toml`), one file per button named after the building's id (e.g. `belt.svg`, `reprocessing_plant.svg`). The shared Tunnel button (REQ-UI-BUILD-BAR) uses `tunnel_entry.svg`; the Deconstruct button (REQ-UI-DECONSTRUCT-BUTTON) uses `deconstruct.svg`. Each icon is a rounded colored "chip" bearing a white line glyph, the chip color following the building's fill color in `visuals.toml`. A missing icon file leaves the button showing its building name as a text caption in place of the icon, so the button stays identifiable in the icon-only bar (REQ-UI-BUILD-COST); it is not an error.
-- REQ-UI-BUILD-TOOLTIP: Each building-type button shows a hover tooltip consisting of the building name followed by the descriptive text defined for that building type in `buildings.toml` (the optional per-building tooltip field). Because the button caption is icon-only (REQ-UI-BUILD-COST), the name is always part of the tooltip; if a building type defines no tooltip text, the tooltip shows the name alone. This tooltip is distinct from the recipe/schematic selection tooltip (REQ-UI-SELECT-TOOLTIP). The Deconstruct button (REQ-UI-DECONSTRUCT-BUTTON) is not a building type and so has no config-defined tooltip; it instead shows its own refund tooltip defined in REQ-UI-DECONSTRUCT-BUTTON.
+- REQ-UI-BUILD-TOOLTIP: Each building-type button shows a hover tooltip consisting of the building name followed by the descriptive text defined for that building type in `buildings.toml` (the optional per-building tooltip field). Because the button caption is icon-only (REQ-UI-BUILD-COST), the name is always part of the tooltip; if a building type defines no tooltip text, the tooltip shows the name alone. This tooltip is distinct from the item production tooltip of the selection panel's item chips (REQ-UI-ITEM-TOOLTIP); the recipe/schematic selection dialog has no tooltip at all (REQ-UI-SELECT-OPTIONS). The Deconstruct button (REQ-UI-DECONSTRUCT-BUTTON) is not a building type and so has no config-defined tooltip; it instead shows its own refund tooltip defined in REQ-UI-DECONSTRUCT-BUTTON.
 - REQ-UI-BUILD-DISABLED: Buttons for buildings the player cannot currently afford are shown as disabled. A disabled button's icon (REQ-UI-BUILD-ICON) is rendered in a greyed variant, with its colored chip background recolored grey while the white glyph is retained.
 - REQ-UI-DECONSTRUCT-BUTTON: A dedicated **Deconstruct** button is shown in the build button bar (REQ-UI-BUILD-BAR), as the last entry of the row and **visually separated** from the building-type buttons by a gap (not a divider line), because it toggles a mode rather than selecting a building type. Its face follows REQ-UI-BUILD-COST with two differences: its hotkey badge reads `Q`, and because it has no building block cost it shows its **Deconstruct** name as a text caption where the building-type buttons show their cost — so it is the one labelled button in the bar. It is therefore wider than the building-type buttons, which share a uniform width. Clicking it toggles deconstruct mode on and off, equivalent to the Q deconstruct toggle (REQ-UI-HOTKEYS). The button is shown in a visually active/pressed state while deconstruct mode is active. The button shows a hover tooltip stating the deconstruction refund (REQ-BLD-DECONSTRUCT): that deconstructing a fully-built building returns `world.toml [world].refund_percentage` percent of its building block cost once deconstruction completes, and that a construction site removed before it finishes building is refunded in full. When `refund_percentage` is 100% both cases yield the same refund, and the tooltip is simplified to state the single refund percentage without distinguishing the two cases. Unlike the building-type button tooltips (REQ-UI-BUILD-TOOLTIP), this tooltip is not config-defined text but is composed from the refund percentage.
 
+### Controls Panel
+
+The controls panel tells the player which controls are available right now. It is context-sensitive: the game is always in exactly one **control context**, derived from the active build mode and the current selection, and the panel shows that context's rows and no others. Its position, size, and overlay behavior are defined in REQ-UI-CONTROLS-PANEL; its structure in REQ-UI-CONTROLS-CARD; and which rows each context shows in REQ-UI-CONTROLS-CONTENT. The panel never defines a binding: every row restates one already defined in REQ-UI-HOTKEYS or in the mouse gestures cited beside it.
+
+- REQ-UI-CONTROLS-PANEL: The **controls panel** is a widget that **floats over the game world view** (REQ-UI-WORLD-SIZE), anchored to the view's **bottom-left corner** with a small margin on both edges. It is **sized to its content in both width and height**, growing and shrinking upward from that corner as the context changes. Should its content ever be taller than the view, the panel's height is capped at the view height less its margins and the content scrolls vertically within it. The selection panel is placed beside the current selection (REQ-UI-SELECTION-PANEL) and so can reach this corner; the two never overlap, and keeping them apart is entirely the selection panel's job — this panel's position depends only on its own content, the view size, and the build button bar, and it never moves or resizes because the selection panel appears, disappears, or changes size.
+  - **Stepping around the build button bar.** Like the selection panel (REQ-UI-SELECTION-PANEL), the panel does **not** confine itself to the band above the build button bar's strip: the bar is horizontally centered and sized to its buttons (REQ-UI-BUILD-BAR), so it normally leaves this corner free, and the panel shares the view's bottom edge with it. The panel **rises only to avoid an actual overlap**: whenever the panel at the bottom-left corner would intersect the bar's current rectangle, it is moved up so that its bottom edge clears the bar's top by the same margin it keeps from the view's edges, and its height is capped at the space that leaves. Whether it rises therefore depends on how wide the bar and the panel currently are, and it returns to the corner as soon as they no longer meet. The bar never moves on the panel's account (REQ-UI-BUILD-BAR).
+  - **Visibility.** The panel is shown whenever the game is being played. Unlike the selection panel it has no empty state (REQ-UI-EMPTY-SELECTION): every context has rows, so there is never nothing to show.
+  - **Collapsing.** Clicking anywhere on the panel's header (REQ-UI-CONTROLS-CARD) toggles the panel between **expanded** and **collapsed**. Collapsed, it shows its header alone, keeping the context name visible and the header clickable so the panel can be expanded again; expanded, it shows the header followed by every row of the current context. The panel starts **expanded**. Changing context does not change the collapsed state: a panel collapsed in one context stays collapsed in the next, and its header updates in place. The collapsed state is presentation-only — it is not a player command, never enters the replay stream, and has no effect on the simulation. It persists for as long as the application runs, including across a restart from the escape menu (REQ-UI-GAME-MENU), and is not saved to disk.
+  - **Overlay behavior.** As for the build button bar and the selection panel (REQ-UI-BUILD-BAR, REQ-UI-SELECTION-PANEL): the panel occludes the strip of the game world it covers; the world view itself keeps its full extent and the view's scrolling, ghost rendering, and tile geometry are unaffected. It is drawn above the pause and deconstruct vignettes (REQ-UI-PAUSE-BORDER, REQ-UI-DECONSTRUCT-BORDER), which keep their full left-hand band underneath it, and below the modal dim (REQ-UI-MODAL-DIM), which covers the entire game window including the panel.
+  - **Input.** Mouse events over the panel are consumed by the panel and never reach the game world: hovering it shows no builder-mode ghost at the tile beneath, and clicking it neither places a building nor changes the selection. Right-clicking the panel does not exit builder mode (REQ-BLD-BUILDER-MODE) or cancel a belt drag (REQ-BLD-BELT-DRAG). The only control the panel itself offers is the header click that collapses and expands it.
+- REQ-UI-CONTROLS-CARD: **Card structure.** The panel is a card with two parts, top to bottom:
+  - **Header** — always shown, and the panel's only interactive element (REQ-UI-CONTROLS-PANEL). It holds a colored context dot on the left, the context's name beside it in upper case, and, for contexts that define one, a **detail suffix** separated by a middle dot (`BUILD MODE · Assembler`). The name and detail per context are given in REQ-UI-CONTROLS-CONTENT.
+  - **Rows** — one per available control, shown only while the panel is expanded. Each row is one or more **key badges** on the left — the key or mouse button drawn as a small bordered chip — and a **label** beside them naming what it does. An action reachable two ways carries both badges in the same row (`RMB` `Q` — Exit placement) rather than occupying two rows. A row whose action leaves the current mode is drawn with the destructive badge styling, distinguishing it from the rows that act within the mode. No row is ever drawn greyed or otherwise disabled: a control the player cannot currently use is not shown at all (REQ-UI-CONTROLS-ACCURACY).
+
+  The rows that are live in every context (REQ-UI-CONTROLS-CONTENT) are shown last, under a divider and the caption `ALWAYS AVAILABLE`. This holds in every context including the General one, which has context rows of its own above the divider like any other, so the card is read the same way wherever the player is.
+- REQ-UI-CONTROLS-CONTENT: **Content catalog.** The control context follows from the active build mode and the selection alone. Build modes are mutually exclusive (REQ-BLD-BUILDER-MODE), so exactly one context applies at any moment:
+
+  | Context | When | Header name | Header detail |
+  |---|---|---|---|
+  | General | no build mode active, nothing selected | `GENERAL` | — |
+  | Selection | no build mode active, at least one object selected | `SELECTION` | `<n> buildings` or `<n> objects` |
+  | Build | builder mode active (REQ-BLD-BUILDER-MODE) | `BUILD MODE` | the building type's name |
+  | Blueprint | blueprint placement mode active (REQ-UI-BLUEPRINT-MODE) | `BLUEPRINT MODE` | the blueprint's name, or `Temporary` for a temporary blueprint (REQ-UI-BLUEPRINT-TEMP) |
+  | Deconstruct | deconstruct mode active (REQ-UI-DECONSTRUCT-BUTTON) | `DECONSTRUCT MODE` | — |
+
+  The Selection context's detail counts the selection and names its category (REQ-UI-SELECTION-CATEGORIES): `<n> buildings` for a building selection, `<n> objects` for a field selection, in the singular at a count of one. The Build and Blueprint contexts show **the same rows** and differ only in their header.
+
+  **Always-available rows**, shown in every context:
+
+  | Badges | Label | Shown |
+  |---|---|---|
+  | `A` `D` | Move | always |
+  | `W` `S` | Game speed | always |
+  | `Space` | Toggle pause | always |
+  | `V` | Paste last | only while a temporary blueprint exists (REQ-UI-BLUEPRINT-TEMP) |
+  | `Ctrl` `V` | Blueprints | always |
+  | `Esc` | Menu | always |
+
+  **Context rows**, shown above the always-available block:
+
+  | Context | Badges | Label |
+  |---|---|---|
+  | General | `LMB` | Select |
+  | | `LMB` drag | Select area |
+  | | `Q` | Deconstruct mode |
+  | Selection | `LMB` | Select / clear selection |
+  | | `LMB` drag | Select area |
+  | | `Ctrl` `LMB` | Add / remove from selection |
+  | | `Ctrl` `LMB` drag | Add area to selection |
+  | | `Q` | Deconstruct mode |
+  | | `C` | Copy to temporary blueprint |
+  | | `Ctrl` `C` | Create blueprint |
+  | Build, Blueprint | `LMB` | Place |
+  | | `LMB` drag | Place belt line |
+  | | `R` / `Shift` `R` | Rotate |
+  | | `RMB` `Q` | Exit placement |
+  | Deconstruct | `LMB` | Toggle deconstruct |
+  | | `LMB` drag | Deconstruct area |
+  | | `RMB` `Q` | Exit deconstruct mode |
+
+  Four rows are conditional on more than the context, because the binding behind them is:
+  - **`C` / `Ctrl` `C`** are shown only while the selection holds at least one player-placeable building, the condition under which those keys do anything (REQ-UI-HOTKEYS). A selection of ships, defence stations, or debris shows neither.
+  - **`LMB` drag — Place belt line** is shown only in builder mode for the Belt type, the only type placed by dragging (REQ-BLD-BELT-DRAG). Every other builder type and blueprint placement omit the row.
+  - **`RMB` `Q` — Exit placement** splits into two rows **while a belt drag is in progress**, because the two bindings then part company (REQ-BLD-BELT-DRAG): `RMB` reads **Cancel belt line** and cancels the drag while leaving builder mode active, and `Q` reads **Exit placement** and leaves the mode outright.
+  - **`LMB` — Place** reads **Apply settings** instead whenever the ghost under the cursor resolves to a configuration transfer (REQ-UI-BLUEPRINT-TRANSFER) — a single-building blueprint hovering a same-type building of a configurable type, which is the case in which clicking hands over settings rather than placing anything. A blueprint holding more than one building keeps the `Place` label, since its click both places and transfers (REQ-UI-BLUEPRINT-PLACE).
+- REQ-UI-CONTROLS-ACCURACY: **The panel never advertises a binding that would do nothing.** Every row shown must, if triggered in the situation the panel is showing it in, have the effect its label names; a binding that is inert in the current context is omitted rather than shown greyed (REQ-UI-CONTROLS-CARD). The relation holds in one direction only: the panel may omit a binding that is available, and deliberately does so in three cases:
+  - **Build hotkeys** (REQ-UI-HOTKEYS) are live in every context, but are advertised on the build buttons' badges (REQ-UI-BUILD-COST) instead of taking eleven rows in every context of this panel.
+  - **`C` and `Ctrl` `C`** are omitted from the Build, Blueprint, and Deconstruct contexts even though a selection surviving into a build mode keeps them working. They belong to the Selection context, and repeating them in every mode would defeat the panel's purpose of showing what the player's current situation affords.
+  - **`Ctrl` `LMB` and `Ctrl` `LMB` drag** work with nothing selected — they select the object under the cursor much as a plain click would — but are shown only in the Selection context. "Add / remove from selection" names an operation on a selection, and there is none to operate on until something is selected; the plain `LMB` row already covers what the gesture does before then.
+  - **`F3` and `F4`** (REQ-UI-DEBUG-DRAW) are development controls rather than player controls and appear in no context.
+
+  This asymmetry between what is available and what is shown is why the two are separate questions in the implementation, and why the tests assert that a resolvable input is *available* rather than that it is displayed.
+
 ### Blueprints
 
 Blueprints occupy no permanent screen space. They are saved with **Ctrl+C** from the current selection (REQ-UI-BLUEPRINT-CREATE) and picked for placement from the blueprint selection dialog, opened with **Ctrl+V** (REQ-UI-BLUEPRINT-DIALOG). The unmodified **C** and **V** keys are the throwaway counterparts of the same two gestures: they capture and re-place a single unnamed temporary blueprint that is never saved and never listed (REQ-UI-BLUEPRINT-TEMP). Blueprints have no widget on the game screen at all. (The ship layout blueprint panel of the layout configuration dialog, REQ-MOD-UI-BLUEPRINT-PANEL, is a separate feature and is unaffected.)

src/balancing/CMakeLists.txt

@@ -13,6 +13,9 @@ SET(HDRS
 	${CMAKE_CURRENT_SOURCE_DIR}/../ui/selection/BarRow.h
 	${CMAKE_CURRENT_SOURCE_DIR}/../ui/selection/SectionBox.h
 	${CMAKE_CURRENT_SOURCE_DIR}/../ui/selection/SelectionNames.h
+	# A stat row states a value with an inline item icon (REQ-UI-ITEM-ICON), which this
+	# composes; it needs nothing but Qt's painting.
+	${CMAKE_CURRENT_SOURCE_DIR}/../ui/IconCaption.h
 	${CMAKE_CURRENT_SOURCE_DIR}/../ui/VisualsConfig.h
 	${CMAKE_CURRENT_SOURCE_DIR}/../ui/VisualsLoader.h
 	# Shared world-space shapes so the arena keeps looking like the game
@@ -36,6 +39,7 @@ SET(SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/../ui/selection/BarRow.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/../ui/selection/SectionBox.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/../ui/selection/SelectionNames.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/../ui/IconCaption.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/../ui/VisualsLoader.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/../ui/WorldPrimitives.cpp
 	PARENT_SCOPE

src/lib/config/ConfigLoaderRecipes.cpp

@@ -94,14 +94,6 @@ RecipesConfig ConfigLoader::loadRecipes(const std::string& path)
         const toml::array& outputs = utility::requireArray(mt["outputs"], file, elemPath + ".outputs");
         def.outputs = parseRecipeOutputs(outputs, file, elemPath + ".outputs");
 
-        // Optional icon item id (REQ-UI-RECIPE-ICON); defaults to the first output
-        // in the UI when unset. Not validated against known items here — a missing
-        // icon is not an error (REQ-UI-ITEM-ICON).
-        if (mt.contains("icon"))
-        {
-            def.icon = utility::requireString(mt["icon"], file, elemPath + ".icon");
-        }
-
         cfg.recipes.push_back(std::move(def));
     }
 

src/lib/config/RecipesConfig.h

@@ -32,10 +32,6 @@ struct RecipeDef
     std::vector<RecipeIngredient> inputs;
     std::vector<RecipeOutput> outputs;
     double durationSeconds;
-    // Optional id of the item whose icon represents this recipe in the recipe-
-    // selection dialog (REQ-UI-RECIPE-ICON). When unset, the first output item is
-    // used. A missing icon file for that item is not an error (REQ-UI-ITEM-ICON).
-    std::optional<std::string> icon;
     // Assembler only. When true, this recipe is available from game start
     // regardless of the implicit item graph — used for base recipes that no
     // schematic's materials reach (e.g. building blocks). See REQ-LOCK-IMPLICIT.

src/lib/core/BuildModeController.cpp

@@ -72,6 +72,7 @@ void BuildModeController::enterMode(BuildMode mode)
             std::make_shared<BuilderModeExitedEvent>());
         break;
     case BuildMode::Blueprint:
+        m_hoveredGhostIsTransfer = false;
         EventManager::getInstance()->sendEventImmediately(
             std::make_shared<BlueprintModeExitedEvent>());
         break;
@@ -249,6 +250,16 @@ void BuildModeController::setBlueprintGhostTile(QPoint tile)
     m_blueprintGhostTile = tile;
 }
 
+bool BuildModeController::isHoveredGhostTransfer() const
+{
+    return m_hoveredGhostIsTransfer;
+}
+
+void BuildModeController::setHoveredGhostTransfer(bool transfer)
+{
+    m_hoveredGhostIsTransfer = transfer;
+}
+
 const std::optional<BuildingId>&
 BuildModeController::getDeconstructHoverBuildingId() const
 {

src/lib/core/BuildModeController.h

@@ -95,6 +95,15 @@ public:
     QPoint           getBlueprintGhostTile() const;
     void             setBlueprintGhostTile(QPoint tile);
 
+    // Whether the ghost under the cursor would hand its settings to the building
+    // already there rather than place anything (REQ-UI-BLUEPRINT-TRANSFER). Classifying
+    // it needs the factory state, so the caller resolves it and stores the answer here,
+    // as with setGhostValidity. Kept here rather than recomputed per reader so the
+    // click, the ghost's colour, and the controls panel cannot disagree about what the
+    // cursor is over.
+    bool isHoveredGhostTransfer() const;
+    void setHoveredGhostTransfer(bool transfer);
+
     // --- deconstruct mode -----------------------------------------------------
     const std::optional<BuildingId>& getDeconstructHoverBuildingId() const;
     void setDeconstructHoverBuildingId(std::optional<BuildingId> id);
@@ -118,6 +127,7 @@ private:
 
     Blueprint m_blueprint;
     QPoint    m_blueprintGhostTile;
+    bool      m_hoveredGhostIsTransfer = false;
 
     std::optional<BuildingId> m_deconstructHoverBuildingId;
 };

src/lib/core/BuildingType.cpp

@@ -59,6 +59,8 @@ bool isConfigurableBuildingType(BuildingType type)
     {
     case BuildingType::Miner:      // recipe (REQ-BLD-MINER)
     case BuildingType::Assembler:  // recipe (REQ-BLD-ASSEMBLER)
+    case BuildingType::Smelter:           // recipe (REQ-BLD-AUTO-RECIPE)
+    case BuildingType::ReprocessingPlant:  // recipe (REQ-BLD-AUTO-RECIPE)
     case BuildingType::Shipyard:   // schematic and layout (REQ-BLD-SHIPYARD, REQ-MOD-LAYOUT)
     case BuildingType::Splitter:   // output filters (REQ-BLD-SPLITTER)
         return true;

src/lib/core/BuildingType.h

@@ -30,9 +30,9 @@ std::optional<BuildingType> parseBuildingType(const std::string& id);
 // Canonical id string for a BuildingType. The inverse of parseBuildingType.
 std::string buildingTypeId(BuildingType type);
 
-// Smelter and Reprocessing Plant have no player-selected recipe
+// Smelter and Reprocessing Plant pick a recipe for themselves from the first material
-// (REQ-BLD-SMELTER, REQ-BLD-REPROCESSING). They auto-process whatever inputs
+// offered to them while they have none (REQ-BLD-AUTO-RECIPE). In every other respect
-// they receive, matching against every recipe of their building type.
+// their recipe is selected and held exactly as any other building's.
 bool isAutoRecipeBuildingType(BuildingType type);
 
 // Buildings that run a production cycle: Miner, Smelter, Assembler, Reprocessing
@@ -45,7 +45,9 @@ bool isProductionBuildingType(BuildingType type);
 bool isBeltSubsystemType(BuildingType type);
 
 // Building types with player-facing settings that a blueprint can carry and hand to an
-// existing building (REQ-UI-BLUEPRINT-TRANSFER): Miner and Assembler (recipe), Shipyard
+// existing building (REQ-UI-BLUEPRINT-TRANSFER): Miner, Assembler, Smelter and
-// (schematic and module layout), Splitter (output filters). Every other type has nothing
+// Reprocessing Plant (recipe -- the last two select their own when they have none,
-// to configure, so a blueprint of one has nothing to transfer.
+// REQ-BLD-AUTO-RECIPE), Shipyard (schematic and module layout), Splitter (output
+// filters). Every other type has nothing to configure, so a blueprint of one has
+// nothing to transfer.
 bool isConfigurableBuildingType(BuildingType type);

src/lib/core/CMakeLists.txt

@@ -16,8 +16,10 @@ SET(HDRS
     ${CMAKE_CURRENT_SOURCE_DIR}/TunnelCompletion.h
     ${CMAKE_CURRENT_SOURCE_DIR}/WorldCoordinates.h
     ${CMAKE_CURRENT_SOURCE_DIR}/WorldCamera.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/FloatingPanelPlacement.h
     ${CMAKE_CURRENT_SOURCE_DIR}/SelectionController.h
     ${CMAKE_CURRENT_SOURCE_DIR}/BuildModeController.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/ControlAction.h
     PARENT_SCOPE
 )
 
@@ -31,8 +33,10 @@ SET(SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/TunnelCompletion.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/WorldCoordinates.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/WorldCamera.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/FloatingPanelPlacement.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/SelectionController.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/BuildModeController.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/ControlAction.cpp
     PARENT_SCOPE
 )
 

src/lib/core/ControlAction.cpp

@@ -0,0 +1,263 @@
+#include "ControlAction.h"
+
+namespace
+{
+
+// A binding that a belt drag can take over. Availability is a property of the action,
+// but a binding can be claimed by a different action while a gesture is in progress:
+// right-click cancels the drag instead of leaving builder mode (REQ-BLD-BELT-DRAG), so
+// ExitMode's right-click drops out and it is left with Q alone.
+enum class BindingCondition
+{
+    Always,
+    NotDraggingBelt
+};
+
+struct KeyBindingEntry
+{
+    ControlAction         action;
+    int                   key;
+    // Shown on the badge, and Ctrl additionally participates in matching. Every other
+    // modifier is display only -- see resolveKeyAction.
+    Qt::KeyboardModifiers modifiers;
+};
+
+struct MouseBindingEntry
+{
+    ControlAction    action;
+    MouseBinding     binding;
+    BindingCondition condition;
+};
+
+// Resolution is first-match-wins over these tables, so an entry that must beat another
+// on the same input is listed above it -- CancelBeltLine before ExitMode on the right
+// mouse button. Everything else is disjoint by availability.
+const KeyBindingEntry KEY_BINDINGS[] = {
+    {ControlAction::Move,             Qt::Key_A,      Qt::NoModifier},
+    {ControlAction::Move,             Qt::Key_D,      Qt::NoModifier},
+    {ControlAction::GameSpeed,        Qt::Key_W,      Qt::NoModifier},
+    {ControlAction::GameSpeed,        Qt::Key_S,      Qt::NoModifier},
+    {ControlAction::TogglePause,      Qt::Key_Space,  Qt::NoModifier},
+    {ControlAction::CopyTemporary,    Qt::Key_C,      Qt::NoModifier},
+    {ControlAction::CreateBlueprint,  Qt::Key_C,      Qt::ControlModifier},
+    {ControlAction::PasteTemporary,   Qt::Key_V,      Qt::NoModifier},
+    {ControlAction::OpenBlueprints,   Qt::Key_V,      Qt::ControlModifier},
+    // One binding, two badges: Shift picks the rotation direction and is read by the
+    // handler, the way a build hotkey's digit is (REQ-BLD-ROTATE). Both entries match
+    // the same press, and both resolve to the same action, so listing them twice costs
+    // nothing and is what puts "R" and "Shift+R" on the row.
+    {ControlAction::Rotate,           Qt::Key_R,      Qt::NoModifier},
+    {ControlAction::Rotate,           Qt::Key_R,      Qt::ShiftModifier},
+    {ControlAction::EnterDeconstruct, Qt::Key_Q,      Qt::NoModifier},
+    {ControlAction::ExitMode,         Qt::Key_Q,      Qt::NoModifier},
+    {ControlAction::OpenMenu,         Qt::Key_Escape, Qt::NoModifier},
+};
+
+const MouseBindingEntry MOUSE_BINDINGS[] = {
+    {ControlAction::Select,             MouseBinding::LeftClick,     BindingCondition::Always},
+    {ControlAction::Place,              MouseBinding::LeftClick,     BindingCondition::Always},
+    {ControlAction::ApplySettings,      MouseBinding::LeftClick,     BindingCondition::Always},
+    {ControlAction::ToggleDeconstruct,  MouseBinding::LeftClick,     BindingCondition::Always},
+    {ControlAction::SelectArea,         MouseBinding::LeftDrag,      BindingCondition::Always},
+    {ControlAction::PlaceBeltLine,      MouseBinding::LeftDrag,      BindingCondition::Always},
+    {ControlAction::DeconstructArea,    MouseBinding::LeftDrag,      BindingCondition::Always},
+    {ControlAction::AddToSelection,     MouseBinding::CtrlLeftClick, BindingCondition::Always},
+    {ControlAction::AddAreaToSelection, MouseBinding::CtrlLeftDrag,  BindingCondition::Always},
+    {ControlAction::CancelBeltLine,     MouseBinding::RightClick,    BindingCondition::Always},
+    {ControlAction::ExitMode,           MouseBinding::RightClick,    BindingCondition::NotDraggingBelt},
+};
+
+bool isConditionMet(BindingCondition condition, const ControlContext& context)
+{
+    if (condition == BindingCondition::NotDraggingBelt) { return !context.draggingBelt; }
+    return true;
+}
+
+bool isPlacementMode(const ControlContext& context)
+{
+    return context.mode == BuildMode::Builder || context.mode == BuildMode::Blueprint;
+}
+
+std::vector<ControlAction> filterAvailable(const std::vector<ControlAction>& actions,
+                                           const ControlContext& context)
+{
+    std::vector<ControlAction> available;
+    for (ControlAction action : actions)
+    {
+        if (isControlActionAvailable(action, context)) { available.push_back(action); }
+    }
+    return available;
+}
+
+}  // namespace
+
+bool isControlActionAvailable(ControlAction action, const ControlContext& context)
+{
+    switch (action)
+    {
+    case ControlAction::None:
+        return false;
+
+    case ControlAction::Move:
+    case ControlAction::GameSpeed:
+    case ControlAction::TogglePause:
+    case ControlAction::OpenBlueprints:
+    case ControlAction::OpenMenu:
+        return true;
+
+    // Does nothing until something has been captured with C, so it is not offered
+    // before then (REQ-UI-BLUEPRINT-TEMP, REQ-UI-CONTROLS-ACCURACY).
+    case ControlAction::PasteTemporary:
+        return context.temporaryBlueprintExists;
+
+    case ControlAction::Select:
+    case ControlAction::SelectArea:
+    case ControlAction::AddToSelection:
+    case ControlAction::AddAreaToSelection:
+    case ControlAction::EnterDeconstruct:
+        return context.mode == BuildMode::None;
+
+    // Both need something a blueprint can be made of; a selection of ships or debris
+    // leaves them inert (REQ-UI-HOTKEYS).
+    case ControlAction::CopyTemporary:
+    case ControlAction::CreateBlueprint:
+        return context.mode == BuildMode::None && context.placeableBuildingSelected;
+
+    // Place and ApplySettings are the same click; which one it is depends on whether
+    // the ghost under the cursor is a transfer target (REQ-UI-BLUEPRINT-TRANSFER).
+    case ControlAction::Place:
+        return isPlacementMode(context) && !context.hoveredGhostIsTransfer;
+    case ControlAction::ApplySettings:
+        return context.mode == BuildMode::Blueprint && context.hoveredGhostIsTransfer;
+
+    // The only building type placed by dragging (REQ-BLD-BELT-DRAG).
+    case ControlAction::PlaceBeltLine:
+        return context.mode == BuildMode::Builder
+               && context.builderType == BuildingType::Belt;
+
+    case ControlAction::Rotate:
+        return isPlacementMode(context);
+    case ControlAction::CancelBeltLine:
+        return context.draggingBelt;
+    case ControlAction::ExitMode:
+        return context.mode != BuildMode::None;
+
+    case ControlAction::ToggleDeconstruct:
+    case ControlAction::DeconstructArea:
+        return context.mode == BuildMode::Deconstruct;
+    }
+    return false;
+}
+
+std::vector<ControlBinding> getControlActionBindings(ControlAction action,
+                                                     const ControlContext& context)
+{
+    std::vector<ControlBinding> bindings;
+    for (const MouseBindingEntry& entry : MOUSE_BINDINGS)
+    {
+        if (entry.action != action)                    { continue; }
+        if (!isConditionMet(entry.condition, context)) { continue; }
+        ControlBinding binding;
+        binding.isMouse = true;
+        binding.mouse   = entry.binding;
+        bindings.push_back(binding);
+    }
+    for (const KeyBindingEntry& entry : KEY_BINDINGS)
+    {
+        if (entry.action != action) { continue; }
+        ControlBinding binding;
+        binding.key       = entry.key;
+        binding.modifiers = entry.modifiers;
+        bindings.push_back(binding);
+    }
+    return bindings;
+}
+
+ControlContextKind getControlContextKind(const ControlContext& context)
+{
+    switch (context.mode)
+    {
+    case BuildMode::Builder:     return ControlContextKind::Build;
+    case BuildMode::Blueprint:   return ControlContextKind::Blueprint;
+    case BuildMode::Deconstruct: return ControlContextKind::Deconstruct;
+    case BuildMode::None:        break;
+    }
+    return context.selection == ControlSelection::None ? ControlContextKind::General
+                                                       : ControlContextKind::Selection;
+}
+
+std::vector<ControlAction> getContextActions(const ControlContext& context)
+{
+    // The candidates of each context, in the order REQ-UI-CONTROLS-CONTENT lists them,
+    // then filtered by availability.
+    //
+    // The General and Selection lists differ rather than one filtered list serving
+    // both, because the additive-selection rows are an omission and not an
+    // unavailability: Ctrl+click does work with nothing selected, it just picks the
+    // object like a plain click would. "Add / remove from selection" is a row that
+    // means nothing until there is a selection to add to, so it waits for one
+    // (REQ-UI-CONTROLS-ACCURACY permits omitting an available binding).
+    switch (getControlContextKind(context))
+    {
+    case ControlContextKind::Build:
+    case ControlContextKind::Blueprint:
+        return filterAvailable({ControlAction::Place, ControlAction::ApplySettings,
+                                ControlAction::PlaceBeltLine, ControlAction::Rotate,
+                                ControlAction::CancelBeltLine, ControlAction::ExitMode},
+                               context);
+    case ControlContextKind::Deconstruct:
+        return filterAvailable({ControlAction::ToggleDeconstruct,
+                                ControlAction::DeconstructArea, ControlAction::ExitMode},
+                               context);
+    case ControlContextKind::Selection:
+        return filterAvailable({ControlAction::Select, ControlAction::SelectArea,
+                                ControlAction::AddToSelection,
+                                ControlAction::AddAreaToSelection,
+                                ControlAction::EnterDeconstruct,
+                                ControlAction::CopyTemporary,
+                                ControlAction::CreateBlueprint},
+                               context);
+    case ControlContextKind::General:
+        break;
+    }
+    return filterAvailable({ControlAction::Select, ControlAction::SelectArea,
+                            ControlAction::EnterDeconstruct},
+                           context);
+}
+
+std::vector<ControlAction> getAlwaysAvailableActions(const ControlContext& context)
+{
+    return filterAvailable({ControlAction::Move, ControlAction::GameSpeed,
+                            ControlAction::TogglePause, ControlAction::PasteTemporary,
+                            ControlAction::OpenBlueprints, ControlAction::OpenMenu},
+                           context);
+}
+
+ControlAction resolveKeyAction(int key, Qt::KeyboardModifiers modifiers,
+                               const ControlContext& context)
+{
+    // Ctrl distinguishes a chord from the bare key (Ctrl+C is not C); every other
+    // modifier is ignored, so Shift+A still pans and Shift+R still rotates. This is
+    // what the key handler has always done, and matching modifiers exactly instead
+    // would silently drop those presses.
+    const bool controlHeld = (modifiers & Qt::ControlModifier) != 0;
+    for (const KeyBindingEntry& entry : KEY_BINDINGS)
+    {
+        if (entry.key != key) { continue; }
+        const bool entryNeedsControl = (entry.modifiers & Qt::ControlModifier) != 0;
+        if (entryNeedsControl != controlHeld) { continue; }
+        if (isControlActionAvailable(entry.action, context)) { return entry.action; }
+    }
+    return ControlAction::None;
+}
+
+ControlAction resolveMouseAction(MouseBinding binding, const ControlContext& context)
+{
+    for (const MouseBindingEntry& entry : MOUSE_BINDINGS)
+    {
+        if (entry.binding != binding)                        { continue; }
+        if (!isConditionMet(entry.condition, context))       { continue; }
+        if (isControlActionAvailable(entry.action, context)) { return entry.action; }
+    }
+    return ControlAction::None;
+}

src/lib/core/ControlAction.h

@@ -0,0 +1,164 @@
+#pragma once
+
+#include <vector>
+
+#include <Qt>
+
+#include "BuildModeController.h"
+#include "BuildingType.h"
+
+// The single statement of what the player can do right now, and which input does it
+// (REQ-UI-CONTROLS-CONTENT, REQ-UI-CONTROLS-ACCURACY).
+//
+// This file declares actions; it never performs them and it never names them. It knows
+// an action's bindings and the situations in which it does something -- nothing about
+// the simulation, the widgets, the events an action ends up firing, or the words shown
+// to the player. Display text lives in ui/ControlActionText.h, which formats the
+// bindings this hands it, so a badge is derived from the real binding rather than
+// typed beside it.
+//
+// Three readers, all of them consuming this and none of them extending it:
+//
+//  * ControlsPanel calls getContextActions()/getAlwaysAvailableActions() and draws them.
+//  * InputMapper calls resolveKeyAction() and fires the event the action stands for.
+//  * GameWorldView calls resolveMouseAction() and runs the branch it already ran.
+//
+// Two bindings are deliberately absent. Build hotkeys (REQ-UI-HOTKEYS) are advertised
+// on the build buttons instead of in the panel, and InputMapper::getBuildHotkeyLabel
+// already derives their badges from the same table the handler switches on, so they
+// have no drift to fix. F3/F4 are development controls and appear nowhere
+// (REQ-UI-CONTROLS-ACCURACY).
+//
+// When bindings become player-configurable, only the binding tables in the .cpp turn
+// from hard-coded data into loaded data. The actions, the availability rules, the
+// panel, and every handler are unaffected.
+enum class ControlAction
+{
+    None,  // no action is bound to the queried input in the queried context
+
+    // Always available (REQ-UI-CONTROLS-CONTENT).
+    Move,
+    GameSpeed,
+    TogglePause,
+    PasteTemporary,
+    OpenBlueprints,
+    OpenMenu,
+
+    // No build mode active.
+    Select,
+    SelectArea,
+    AddToSelection,
+    AddAreaToSelection,
+    EnterDeconstruct,
+
+    // No build mode active, with something selected.
+    CopyTemporary,
+    CreateBlueprint,
+
+    // Builder and blueprint placement mode.
+    Place,
+    ApplySettings,
+    PlaceBeltLine,
+    Rotate,
+    CancelBeltLine,
+    ExitMode,
+
+    // Deconstruct mode.
+    ToggleDeconstruct,
+    DeconstructArea
+};
+
+// The mouse gestures that carry a binding. Each is a whole gesture rather than a raw
+// event: a drag is one binding, not a press plus a release, because that is the unit
+// the player and the panel both think in. Which events make up the gesture, and the
+// state it runs on, stay with the widget that owns them.
+enum class MouseBinding
+{
+    LeftClick,
+    LeftDrag,
+    CtrlLeftClick,
+    CtrlLeftDrag,
+    RightClick
+};
+
+// Which selection category is held, mirroring REQ-UI-SELECTION-CATEGORIES without
+// depending on SelectionController.
+enum class ControlSelection
+{
+    None,
+    Buildings,
+    FieldObjects
+};
+
+// Which card the panel is showing (REQ-UI-CONTROLS-CONTENT). Named rather than
+// spelled, so the heading text stays a presentation concern.
+enum class ControlContextKind
+{
+    General,
+    Selection,
+    Build,
+    Blueprint,
+    Deconstruct
+};
+
+// Everything the availability rules are allowed to depend on, as a plain snapshot.
+//
+// Taking a snapshot rather than references to the live controllers is what keeps this
+// testable without a world, and it is what stops an action from reaching into the
+// simulation: if a rule needs a fact, the fact is named here and the caller supplies it.
+struct ControlContext
+{
+    BuildMode        mode                      = BuildMode::None;
+    BuildingType     builderType               = BuildingType::Belt;  // while mode == Builder
+    bool             draggingBelt              = false;
+    // A single-building blueprint whose ghost is over a configuration-transfer target,
+    // so clicking hands over settings rather than placing (REQ-UI-BLUEPRINT-TRANSFER).
+    bool             hoveredGhostIsTransfer    = false;
+    ControlSelection selection                 = ControlSelection::None;
+    int              selectionCount            = 0;
+    // At least one selected building is player-placeable, the condition under which
+    // C and Ctrl+C do anything (REQ-UI-HOTKEYS).
+    bool             placeableBuildingSelected = false;
+    bool             temporaryBlueprintExists  = false;
+};
+
+// One input an action answers to, in structured form so the badge can be rendered from
+// it. `modifiers` is what the badge shows; matching is looser than equality, see
+// resolveKeyAction.
+struct ControlBinding
+{
+    bool                  isMouse    = false;
+    MouseBinding          mouse      = MouseBinding::LeftClick;
+    int                   key        = 0;  // Qt::Key_*, when !isMouse
+    Qt::KeyboardModifiers modifiers  = Qt::NoModifier;
+};
+
+// True when triggering the action in this context would do what its label says. The
+// panel shows exactly the available actions, and the resolvers return only available
+// ones, which is REQ-UI-CONTROLS-ACCURACY expressed as one function.
+bool isControlActionAvailable(ControlAction action, const ControlContext& context);
+
+// The inputs an action answers to, in the order the panel should badge them.
+// Context-dependent because a binding can be taken over: while a belt drag is in
+// progress the right mouse button cancels the drag, so ExitMode is left with its key
+// binding alone (REQ-BLD-BELT-DRAG).
+std::vector<ControlBinding> getControlActionBindings(ControlAction action,
+                                                     const ControlContext& context);
+
+// Which card is showing, and the rows it holds -- the context's own, then the block
+// available everywhere (REQ-UI-CONTROLS-CARD). Both lists are already filtered to the
+// available actions and ordered as REQ-UI-CONTROLS-CONTENT lists them.
+ControlContextKind         getControlContextKind(const ControlContext& context);
+std::vector<ControlAction> getContextActions(const ControlContext& context);
+std::vector<ControlAction> getAlwaysAvailableActions(const ControlContext& context);
+
+// The action a key press or a mouse gesture triggers here, or None when the input is
+// unbound in this context. Both return only actions that are available, so a caller can
+// act on the result without re-checking the situation.
+//
+// Rotation direction is not part of the action: R and Shift+R are one Rotate, and the
+// caller reads the modifier for the direction, exactly as the digit of a build hotkey
+// is read from the key. An action with a parameter keeps the parameter at the handler.
+ControlAction resolveKeyAction(int key, Qt::KeyboardModifiers modifiers,
+                               const ControlContext& context);
+ControlAction resolveMouseAction(MouseBinding binding, const ControlContext& context);

src/lib/core/EntityAdmin.h

@@ -28,7 +28,7 @@ public:
     void forEach(Func&& f) const;
 
     template <typename... Ts>
-    bool hasAll(entt::entity entity);
+    bool hasAll(entt::entity entity) const;
 
     template <typename T>
     T& get(entt::entity entity);
@@ -101,7 +101,7 @@ void EntityAdmin::forEach(Func&& f) const
 }
 
 template <typename... Ts>
-bool EntityAdmin::hasAll(entt::entity entity)
+bool EntityAdmin::hasAll(entt::entity entity) const
 {
     return m_registry.all_of<Ts...>(entity);
 }

src/lib/core/FloatingPanelPlacement.cpp

@@ -0,0 +1,110 @@
+#include "FloatingPanelPlacement.h"
+
+#include <algorithm>
+
+namespace
+{
+
+// The part every placement shares, whatever put the panel where it wants to be: it is
+// pushed inside band rather than hanging off it, shortened to what its own column has
+// free, and lifted by however much of it hangs below that. wantedLeftPx and wantedTopPx
+// are where the panel would stand if nothing were in the way.
+QRect fitInBand(const QRect& band, int wantedLeftPx, int wantedTopPx, QSize wantedSize,
+                const std::vector<QRect>& occupiedRects, int marginPx)
+{
+    const int widthPx = std::min(wantedSize.width(), band.width());
+
+    int leftPx = std::min(wantedLeftPx, band.right() - widthPx + 1);
+    leftPx     = std::max(leftPx, band.left());
+
+    // Only the widgets its own column meets can shorten it.
+    const int bottomPx = getAvailableBottomPx(band, occupiedRects, leftPx,
+                                              leftPx + widthPx - 1, marginPx);
+    const int heightPx =
+        std::min(wantedSize.height(), std::max(0, bottomPx - band.top() + 1));
+
+    // Never above the band: a panel taller than the space left is capped instead, and
+    // scrolls.
+    int topPx = std::max(wantedTopPx, band.top());
+    topPx     = std::min(topPx, bottomPx - heightPx + 1);
+    topPx     = std::max(topPx, band.top());
+
+    return QRect(leftPx, topPx, widthPx, heightPx);
+}
+
+}  // namespace
+
+
+int getAvailableBottomPx(const QRect& band, const std::vector<QRect>& occupiedRects,
+                         int leftPx, int rightPx, int marginPx)
+{
+    int bottomPx = band.bottom();
+    for (const QRect& occupied : occupiedRects)
+    {
+        if (occupied.isEmpty())
+        {
+            continue;
+        }
+        // Only what is actually in the way counts: a widget entirely to one side of this
+        // span is not below it, however tall it is.
+        if (occupied.right() < leftPx || occupied.left() > rightPx)
+        {
+            continue;
+        }
+        bottomPx = std::min(bottomPx, occupied.top() - marginPx - 1);
+    }
+    return bottomPx;
+}
+
+PanelSide chooseSide(const QRect& band, const QRect& anchorRect, int widthPx,
+                     int marginPx)
+{
+    // What each side offers: the gap between the anchor and that edge of the band, less
+    // the margin the panel keeps from the anchor.
+    const int roomRightPx = band.right() - anchorRect.right() - marginPx;
+    const int roomLeftPx  = anchorRect.left() - band.left() - marginPx;
+
+    if (roomRightPx >= widthPx)
+    {
+        return PanelSide::Right;
+    }
+    if (roomLeftPx >= widthPx)
+    {
+        return PanelSide::Left;
+    }
+    // Neither side can hold it without covering the selection, so it goes where it
+    // covers the least of it.
+    return (roomRightPx >= roomLeftPx) ? PanelSide::Right : PanelSide::Left;
+}
+
+QRect placeBesideAnchor(const QRect& band, const QRect& anchorRect, PanelSide side,
+                        QSize wantedSize, const std::vector<QRect>& occupiedRects,
+                        int marginPx)
+{
+    const int widthPx = std::min(wantedSize.width(), band.width());
+
+    // Against the anchor on the chosen side, growing away from it: the edge facing the
+    // selection is the one that stays put as the panel's content resizes. A panel that
+    // does not fit there is pushed back inside the view rather than hanging off it, which
+    // is what puts it over the selection when neither side had room.
+    const int wantedLeftPx = (side == PanelSide::Right)
+                                 ? anchorRect.right() + marginPx + 1
+                                 : anchorRect.left() - marginPx - widthPx;
+
+    // Top-aligned with the anchor, then lifted by however much of it hangs below what is
+    // free.
+    return fitInBand(band, wantedLeftPx, anchorRect.top(), wantedSize, occupiedRects,
+                     marginPx);
+}
+
+QRect placeAtDesiredTopLeft(const QRect& band, const QPoint& desiredTopLeftPx,
+                            QSize wantedSize, const std::vector<QRect>& occupiedRects,
+                            int marginPx)
+{
+    // Where the player dropped it, resolved by the same rules as any other placement
+    // (REQ-UI-SELECTION-PANEL-DRAG). Nothing here is written back to the desired point:
+    // a panel lifted above the build button bar returns to where it was dropped as soon
+    // as the bar stops meeting its column.
+    return fitInBand(band, desiredTopLeftPx.x(), desiredTopLeftPx.y(), wantedSize,
+                     occupiedRects, marginPx);
+}

src/lib/core/FloatingPanelPlacement.h

@@ -0,0 +1,54 @@
+#pragma once
+
+#include <vector>
+
+#include <QPoint>
+#include <QRect>
+#include <QSize>
+
+// Geometry for the widgets floating over the game world view (REQ-UI-WORLD-SIZE). Their
+// owner places them in one ordered pass, each into the space the earlier ones left free,
+// and these are the rules they place themselves by. Pure geometry -- no widget is
+// involved, which is what lets the rules be tested without a display.
+
+// The lowest bottom edge available to a widget occupying the horizontal span
+// [leftPx, rightPx] inside band: the band's own bottom, or marginPx above the topmost
+// occupied rectangle whose horizontal extent meets that span. A rectangle beside the
+// span is not in the way and does not shorten it (REQ-UI-SELECTION-PANEL,
+// REQ-UI-CONTROLS-PANEL). The result is inclusive, as QRect::bottom() is.
+int getAvailableBottomPx(const QRect& band, const std::vector<QRect>& occupiedRects,
+                         int leftPx, int rightPx, int marginPx);
+
+// Which side of the selection the panel stands on (REQ-UI-SELECTION-PANEL).
+enum class PanelSide
+{
+    Right,
+    Left
+};
+
+// The side a panel widthPx wide takes beside anchorRect: the right of it where it fits
+// within band, otherwise the left, and where it fits on neither, whichever side leaves
+// more room -- the one case in which the panel ends up over the selection
+// (REQ-UI-SELECTION-PANEL). Decided once when the selection starts and kept for as long
+// as it lasts, so a card that grows later never flips the panel across the object.
+PanelSide chooseSide(const QRect& band, const QRect& anchorRect, int widthPx,
+                     int marginPx);
+
+// Where a panel of wantedSize stands beside anchorRect on the given side: separated from
+// it by marginPx and growing away from it, its top edge on the anchor's top edge, pushed
+// inside band and above whatever occupies it. The returned height is short of
+// wantedSize's when there was not enough room, which is the caller's cue to scroll its
+// content (REQ-UI-SELECTION-PANEL).
+QRect placeBesideAnchor(const QRect& band, const QRect& anchorRect, PanelSide side,
+                        QSize wantedSize, const std::vector<QRect>& occupiedRects,
+                        int marginPx);
+
+// Where a panel of wantedSize stands once the player has dragged it to desiredTopLeftPx:
+// at that point, by the same rules that place it beside a selection -- pushed inside band,
+// lifted above whatever occupies its column, and capped in height where that leaves too
+// little room (REQ-UI-SELECTION-PANEL-DRAG). The desired point is an input only: it is
+// never corrected and handed back, which is what lets the caller keep it exactly as
+// dropped and return to it once the room is there again.
+QRect placeAtDesiredTopLeft(const QRect& band, const QPoint& desiredTopLeftPx,
+                            QSize wantedSize, const std::vector<QRect>& occupiedRects,
+                            int marginPx);

src/lib/eventsystem/event/CMakeLists.txt

@@ -9,6 +9,7 @@ SET(HDRS
 	${CMAKE_CURRENT_SOURCE_DIR}/BossWaveUpdatedEvent.h
 	${CMAKE_CURRENT_SOURCE_DIR}/SchematicChoicesAvailableEvent.h
 	${CMAKE_CURRENT_SOURCE_DIR}/SelectionChangedEvent.h
+	${CMAKE_CURRENT_SOURCE_DIR}/SelectionAnchorChangedEvent.h
 	${CMAKE_CURRENT_SOURCE_DIR}/GameOverEvent.h
 	${CMAKE_CURRENT_SOURCE_DIR}/GameResetEvent.h
 	${CMAKE_CURRENT_SOURCE_DIR}/WinEvent.h
@@ -43,6 +44,7 @@ SET(HDRS
 	${CMAKE_CURRENT_SOURCE_DIR}/BeamFiredEvent.h
 	${CMAKE_CURRENT_SOURCE_DIR}/DebugDrawToggledEvent.h
 	${CMAKE_CURRENT_SOURCE_DIR}/CommandRequestedEvent.h
+	${CMAKE_CURRENT_SOURCE_DIR}/FloatingLayoutInvalidatedEvent.h
 	${CMAKE_CURRENT_SOURCE_DIR}/PlayerCommandsAppliedEvent.h
 	PARENT_SCOPE
 )

src/lib/eventsystem/event/FloatingLayoutInvalidatedEvent.h

@@ -0,0 +1,12 @@
+#pragma once
+
+#include "Event.h"
+
+// Asks the owner of the widgets floating over the game world view to re-run its placement
+// pass (see ui/FloatingPanel.h). Published by a floating widget whose content or
+// visibility changed: what space that widget may take depends on the ones placed before
+// it, so it cannot re-place itself alone (REQ-UI-BUILD-BAR, REQ-UI-CONTROLS-PANEL,
+// REQ-UI-SELECTION-PANEL). Carries no payload -- the pass re-reads every widget.
+class FloatingLayoutInvalidatedEvent : public Event
+{
+};

src/lib/eventsystem/event/SelectionAnchorChangedEvent.h

@@ -0,0 +1,25 @@
+#pragma once
+
+#include <QRect>
+
+#include "Event.h"
+
+// Where on the screen the selection that is about to be made sits: the bounds of the one
+// object selected, or of all of them when the selection starts as a multi-selection
+// (REQ-UI-SELECTION-PANEL). The rectangle is in the game world view's own widget
+// coordinates.
+//
+// Published only when a selection *starts* -- a plain click or drag, or an additive one
+// onto an empty selection -- and always immediately before the selection itself. Adding
+// to a selection publishes nothing, which is what leaves the selection panel where it
+// is while the selection grows; and because the rectangle is screen space frozen at that
+// moment, scrolling the view or a selected ship flying off does not move the panel
+// either.
+class SelectionAnchorChangedEvent : public Event
+{
+public:
+    explicit SelectionAnchorChangedEvent(QRect rectPx)
+        : rectPx(rectPx) {}
+
+    const QRect rectPx;
+};

src/lib/sim/Building.h

@@ -27,11 +27,14 @@ struct InputBuffer
     std::map<ItemType, int> caps;    // max items per material (2× per-cycle requirement)
 };
 
-// Output buffer shared by all output materials for a production building.
+// Per-material output buffer for a production building. The items are held in one
+// production-ordered queue -- that is the order they leave at the output port
+// (REQ-MAT-OUTPUT-EMERGE) -- while the capacity is per item type, so one item's backlog
+// never occupies another's room (REQ-MAT-OUTPUT-BUFFER).
 struct OutputBuffer
 {
-    std::vector<Item> items;
+    std::vector<Item>       items;  // production order; feeds the output belt
-    int capacity = 0;  // 2× per-cycle output; 1× for ReprocessingPlant
+    std::map<ItemType, int> caps;   // max items per material (2x its per-cycle amount)
 };
 
 // Active production cycle for a building.
@@ -96,6 +99,25 @@ struct Building
         return count;
     }
 
+    // The same over one material, which is what its own capacity is measured against
+    // (REQ-MAT-OUTPUT-BUFFER).
+    int getOutputItemCount(const ItemType& type) const
+    {
+        int count = 0;
+        for (const Item& item : outputBuffer.items)
+        {
+            if (item.type == type) { ++count; }
+        }
+        for (const std::vector<BeltItemSlot>& lane : emergingItems)
+        {
+            for (const BeltItemSlot& slot : lane)
+            {
+                if (slot.item.type == type) { ++count; }
+            }
+        }
+        return count;
+    }
+
     // Items currently travelling inward on each input port's virtual input belt
     // (REQ-MAT-INPUT-INTAKE); one lane per input port, parallel to inputPorts. Each
     // lane holds slots at progress [0.0, 0.5], front (highest progress) first. An

src/lib/sim/BuildingBuffers.cpp

@@ -2,12 +2,48 @@
 
 #include <algorithm>
 #include <cassert>
+#include <map>
 
 #include "BuildingType.h"
 #include "ItemType.h"
 #include "ModulesConfig.h"
 #include "ShipsConfig.h"
 
+namespace
+{
+
+// Folds the output capacities one recipe implies into `caps`: twice each produced
+// item's per-cycle amount (REQ-MAT-OUTPUT-BUFFER). A Reprocessing Plant rolls exactly
+// one of its outputs per cycle (REQ-BLD-REPROCESSING), so its per-cycle amount for an
+// item is that one outcome's amount rather than a sum over the entries.
+//
+// Where a cap is already present the larger wins, which is how an auto-recipe building
+// unions the recipes of its type -- the same rule its input caps follow.
+void addOutputCaps(std::map<ItemType, int>& caps, BuildingType type,
+                   const RecipeDef& recipe)
+{
+    std::map<ItemType, int> perCycle;
+    for (const RecipeOutput& out : recipe.outputs)
+    {
+        const ItemType item{out.item};
+        if (type == BuildingType::ReprocessingPlant)
+        {
+            perCycle[item] = std::max(perCycle[item], out.amount);
+        }
+        else
+        {
+            perCycle[item] += out.amount;
+        }
+    }
+
+    for (const std::pair<const ItemType, int>& entry : perCycle)
+    {
+        caps[entry.first] = std::max(caps[entry.first], 2 * entry.second);
+    }
+}
+
+}  // namespace
+
 void initBuffers(Building& b, const RecipeDef& recipe)
 {
     b.inputBuffer.counts.clear();
@@ -20,87 +56,18 @@ void initBuffers(Building& b, const RecipeDef& recipe)
     }
 
     b.outputBuffer.items.clear();
-    if (b.type == BuildingType::ReprocessingPlant)
+    b.outputBuffer.caps.clear();
-    {
+    addOutputCaps(b.outputBuffer.caps, b.type, recipe);
-        // 1× max-per-roll (REQ-MAT-OUTPUT-BUFFER-REPROCESSING).
-        int maxAmount = 0;
-        for (const RecipeOutput& out : recipe.outputs)
-        {
-            if (out.amount > maxAmount)
-            {
-                maxAmount = out.amount;
-            }
-        }
-        b.outputBuffer.capacity = maxAmount;
-    }
-    else
-    {
-        // 2× per-cycle output.
-        int totalAmount = 0;
-        for (const RecipeOutput& out : recipe.outputs)
-        {
-            totalAmount += out.amount;
-        }
-        b.outputBuffer.capacity = 2 * totalAmount;
-    }
-}
-
-void initAutoBuffers(const GameConfig& config, Building& b)
-{
-    b.inputBuffer.counts.clear();
-    b.inputBuffer.caps.clear();
-
-    // Union the inputs of every recipe of this building type; the cap for each
-    // item is twice the largest per-cycle requirement across those recipes.
-    // Output capacity follows the same rules as initBuffers: the Reprocessing
-    // Plant holds one cycle's max output (REQ-MAT-OUTPUT-BUFFER-REPROCESSING),
-    // other auto buildings hold twice the largest per-cycle output.
-    int outputCapacity = 0;
-    for (const RecipeDef& recipe : config.recipes.recipes)
-    {
-        if (recipe.building != b.type)
-        {
-            continue;
-        }
-
-        for (const RecipeIngredient& ing : recipe.inputs)
-        {
-            const ItemType type{ing.item};
-            b.inputBuffer.counts[type] = 0;
-            b.inputBuffer.caps[type] =
-                std::max(b.inputBuffer.caps[type], 2 * ing.amount);
-        }
-
-        if (b.type == BuildingType::ReprocessingPlant)
-        {
-            int maxAmount = 0;
-            for (const RecipeOutput& out : recipe.outputs)
-            {
-                maxAmount = std::max(maxAmount, out.amount);
-            }
-            outputCapacity = std::max(outputCapacity, maxAmount);
-        }
-        else
-        {
-            int totalAmount = 0;
-            for (const RecipeOutput& out : recipe.outputs)
-            {
-                totalAmount += out.amount;
-            }
-            outputCapacity = std::max(outputCapacity, 2 * totalAmount);
-        }
-    }
-
-    b.outputBuffer.items.clear();
-    b.outputBuffer.capacity = outputCapacity;
 }
 
 void initShipyardBuffers(const GameConfig& config, Building& b)
 {
     b.inputBuffer.counts.clear();
     b.inputBuffer.caps.clear();
+    // A shipyard spawns a ship rather than producing items, so it holds no output
+    // buffer at all (REQ-MAT-OUTPUT-BUFFER, REQ-BLD-SHIPYARD).
     b.outputBuffer.items.clear();
-    b.outputBuffer.capacity = 0;
+    b.outputBuffer.caps.clear();
     const ShipDef* def = config.ships.findShipDef(b.recipeId);
     if (!def)
     {
@@ -133,11 +100,13 @@ void initShipyardBuffers(const GameConfig& config, Building& b)
 
 void initSalvageBayBuffer(const GameConfig& config, Building& b)
 {
-    // Salvage Bay has no recipe-driven buffer; its output-buffer holding size for
+    // Salvage Bay has no recipe-driven buffer; scrap is the only thing it ever holds,
-    // ship drop-off is config-defined (REQ-BLD-SALVAGE-BAY).
+    // and that single buffer's holding size for ship drop-off is config-defined
+    // (REQ-BLD-SALVAGE-BAY).
     b.outputBuffer.items.clear();
+    b.outputBuffer.caps.clear();
     const BuildingDef* def = config.buildings.findBuildingDef(BuildingType::SalvageBay);
-    b.outputBuffer.capacity =
+    b.outputBuffer.caps[ItemType{"scrap"}] =
         (def && def->outputBufferCapacity) ? *def->outputBufferCapacity : 0;
 }
 

src/lib/sim/BuildingBuffers.h

@@ -13,15 +13,11 @@
 // to BeltSystem. Free functions over the config and the building — they read no
 // factory state, so both BuildingSystem and ConstructionSystem can use them.
 
-// Buffers for a building running one known recipe: inputs capped at twice each
+// Buffers for a building running one known recipe: one buffer per material on each
-// ingredient's per-cycle amount, output at twice the per-cycle total (one cycle's
+// side, capped at twice that material's per-cycle amount (REQ-MAT-INPUT-BUFFER,
-// max for a Reprocessing Plant, REQ-MAT-OUTPUT-BUFFER-REPROCESSING).
+// REQ-MAT-OUTPUT-BUFFER).
 void initBuffers(Building& b, const RecipeDef& recipe);
 
-// Buffers for an auto-recipe building (Smelter, Reprocessing Plant), unioned over
-// every recipe of its type (REQ-BLD-SMELTER, REQ-BLD-REPROCESSING).
-void initAutoBuffers(const GameConfig& config, Building& b);
-
 // Buffers for a shipyard: its schematic's materials plus those of every placed
 // module (REQ-BLD-SHIPYARD).
 void initShipyardBuffers(const GameConfig& config, Building& b);

src/lib/sim/BuildingSystem.cpp

@@ -200,12 +200,6 @@ void BuildingSystem::setRecipe(FactoryState& state, BuildingId id, const std::st
     {
         if (site.id == id)
         {
-            // Auto-recipe buildings have no player-selected recipe
-            // (REQ-BLD-SMELTER, REQ-BLD-REPROCESSING); ignore any attempt to set one.
-            if (isAutoRecipeBuildingType(site.type))
-            {
-                return;
-            }
             // No-op if the recipe is unchanged, so a redundant selection does
             // not wipe an already-configured ship layout.
             if (site.recipeId == recipeId)
@@ -223,12 +217,6 @@ void BuildingSystem::setRecipe(FactoryState& state, BuildingId id, const std::st
     {
         if (building.id == id)
         {
-            // Auto-recipe buildings have no player-selected recipe
-            // (REQ-BLD-SMELTER, REQ-BLD-REPROCESSING); ignore any attempt to set one.
-            if (isAutoRecipeBuildingType(building.type))
-            {
-                return;
-            }
             // No-op if the recipe is unchanged, so a redundant selection does
             // not wipe an already-configured ship layout or reset buffers.
             if (building.recipeId == recipeId)
@@ -240,7 +228,7 @@ void BuildingSystem::setRecipe(FactoryState& state, BuildingId id, const std::st
             building.inputBuffer.counts.clear();
             building.inputBuffer.caps.clear();
             building.outputBuffer.items.clear();
-            building.outputBuffer.capacity = 0;
+            building.outputBuffer.caps.clear();
             // Emerging items are part of the output buffer, so clearing it on a
             // recipe change discards them too (REQ-MAT-OUTPUT-EMERGE); in-transit
             // input items are discarded and their reservations released
@@ -307,7 +295,7 @@ void BuildingSystem::setShipLayout(FactoryState& state, BuildingId id, const Shi
             building.inputBuffer.counts.clear();
             building.inputBuffer.caps.clear();
             building.outputBuffer.items.clear();
-            building.outputBuffer.capacity = 0;
+            building.outputBuffer.caps.clear();
             for (std::vector<BeltItemSlot>& lane : building.emergingItems) { lane.clear(); }
             for (std::vector<BeltItemSlot>& lane : building.incomingItems) { lane.clear(); }
             if (!building.recipeId.empty() && building.type == BuildingType::Shipyard)
@@ -407,6 +395,10 @@ void BuildingSystem::tickBeltPull(FactoryState& state)
         {
             const std::optional<ItemType> peeked = m_belts.peekItem(building.inputPorts[i]);
             if (!peeked) { continue; }
+            // A Smelter or Reprocessing Plant without a recipe takes the first material
+            // offered to it as its selection (REQ-BLD-AUTO-RECIPE); the ports are walked
+            // in order, so which offer comes first is fixed.
+            selectAutoRecipeIfUnset(building, *peeked);
             if (!canAcceptInput(building, i, *peeked)) { continue; }
             const std::optional<Item> taken = m_belts.tryTakeItem(building.inputPorts[i]);
             if (taken)
@@ -417,6 +409,25 @@ void BuildingSystem::tickBeltPull(FactoryState& state)
     }
 }
 
+void BuildingSystem::selectAutoRecipeIfUnset(Building& building, const ItemType& offered)
+{
+    // Only while it holds none: once set, a recipe is the player's to change
+    // (REQ-BLD-AUTO-RECIPE). Buildings that select their own recipe are the only ones
+    // this applies to; everyone else ignores an offer they have no recipe for.
+    if (!building.recipeId.empty())
+    {
+        return;
+    }
+    const RecipeDef* recipe = findAutoRecipeFor(m_config, building.type, offered);
+    if (!recipe)
+    {
+        return;
+    }
+
+    building.recipeId = recipe->id;
+    initBuffers(building, *recipe);
+}
+
 bool BuildingSystem::canAcceptInput(const Building& consumer,
                                     std::size_t inputPortIndex,
                                     const ItemType& type) const
@@ -477,6 +488,10 @@ bool BuildingSystem::tryDirectCoupleDeposit(FactoryState& state, BuildingId prod
         if (in.direction != outputPort.direction) { continue; }
         if (inputBodyTile(in.tile, in.direction) != outputPort.tile) { continue; }
 
+        // A coupling is an offer too, so an unset auto-recipe building selects from it
+        // (REQ-BLD-AUTO-RECIPE). Without this a Smelter placed flush against a producer
+        // would accept nothing and leave it stuck at its port for good.
+        selectAutoRecipeIfUnset(*consumer, item.type);
         if (!canAcceptInput(*consumer, j, item.type)) { return false; }
         depositToInputBelt(*consumer, j, item);
         return true;
@@ -502,88 +517,92 @@ void BuildingSystem::tickProduction(FactoryState& state, Tick currentTick)
             continue;
         }
 
-        const bool autoRecipe = isAutoRecipeBuildingType(building.type);
+        if (building.recipeId.empty())
-        if (!autoRecipe && building.recipeId.empty())
         {
             continue;
         }
 
         // If a production cycle is active, check for completion. Completion only
         // needs the already-decided outputs, so it does not depend on which
-        // recipe is selected or auto-chosen.
+        // recipe is selected.
         if (building.production)
         {
-            if (currentTick >= building.production->completesAt)
+            if (currentTick < building.production->completesAt)
             {
-                for (const Item& item : building.production->chosenOutputs)
+                continue;
-                {
-                    building.outputBuffer.items.push_back(item);
-                }
-                building.production = std::nullopt;
             }
-            // Whether we just completed or are still running, do not start
+            for (const Item& item : building.production->chosenOutputs)
-            // another cycle in the same tick.
+            {
+                building.outputBuffer.items.push_back(item);
+            }
+            building.production = std::nullopt;
+            // Fall through to the start attempt below rather than idling for a tick,
+            // so a cycle takes exactly its recipe duration and a building fed to
+            // capacity produces at the configured rate (REQ-MAT-CYCLE). The start
+            // code runs once per building per tick, so at most one cycle begins here
+            // even when a duration rounds to zero ticks. The outputs just deposited
+            // count against the space check, so a cycle whose output no longer fits
+            // waits, exactly as it would have on the following tick.
+        }
+
+        // Idle: try to start the building's one selected recipe. Every type holds
+        // exactly one, a Smelter and a Reprocessing Plant included -- they differ only
+        // in how theirs first got set (REQ-BLD-AUTO-RECIPE).
+        const RecipeDef* recipe = getSelectedRecipe(m_config, building);
+        if (!recipe)
+        {
             continue;
         }
 
-        // Idle: gather the candidate recipes to try. Auto-recipe buildings
+        // 1. All required inputs present?
-        // (Smelter, Reprocessing Plant) have no selected recipe and try every
+        if (!recipeInputsAvailable(building, *recipe))
-        // recipe of their type in config order, running the first whose inputs
-        // are satisfied (REQ-BLD-SMELTER, REQ-BLD-REPROCESSING). Other buildings
-        // try only their selected recipe.
-        const std::vector<const RecipeDef*> candidates =
-            gatherCandidateRecipes(m_config, building);
-
-        for (const RecipeDef* recipe : candidates)
         {
-            // 1. All required inputs present?
+            continue;
-            if (!recipeInputsAvailable(building, *recipe))
+        }
-            {
-                continue;
-            }
 
-            // 2. Determine chosen outputs (roll for reprocessing).
+        // 2. Room for every output this cycle could produce -- checked before anything
-            std::vector<Item> chosen;
+        //    is rolled (REQ-MAT-CYCLE). The roll below is committed the moment the cycle
-            if (building.type == BuildingType::ReprocessingPlant)
+        //    starts, so a plant that could not store some outcome must not start at all:
+        //    that is what stops a stalled output belt from biasing the distribution
+        //    towards the outputs that still fit. Emerging items count against their
+        //    buffer (REQ-MAT-OUTPUT-EMERGE). The status light asks the same question to
+        //    decide yellow (REQ-UI-STATUS-LIGHT), so the test lives in one place.
+        if (!recipeOutputsFit(building, *recipe))
+        {
+            continue;
+        }
+
+        // 3. Determine chosen outputs (roll for reprocessing).
+        std::vector<Item> chosen;
+        if (building.type == BuildingType::ReprocessingPlant)
+        {
+            chosen = rollReprocessingOutput(*recipe);
+            if (chosen.empty()) { continue; }
+        }
+        else
+        {
+            for (const RecipeOutput& out : recipe->outputs)
             {
-                chosen = rollReprocessingOutput(*recipe);
+                Item item;
-                if (chosen.empty()) { continue; }
+                item.type.id = out.item;
-            }
+                for (int i = 0; i < out.amount; ++i)
-            else
-            {
-                for (const RecipeOutput& out : recipe->outputs)
                 {
-                    Item item;
+                    chosen.push_back(item);
-                    item.type.id = out.item;
-                    for (int i = 0; i < out.amount; ++i)
-                    {
-                        chosen.push_back(item);
-                    }
                 }
             }
-
-            // 3. Output buffer has space for chosen outputs? Emerging items still
-            //    count against the buffer (REQ-MAT-OUTPUT-EMERGE).
-            const int newSize = building.getOutputItemCount()
-                              + static_cast<int>(chosen.size());
-            if (newSize > building.outputBuffer.capacity)
-            {
-                continue;
-            }
-
-            // 4. Consume inputs and start cycle.
-            for (const RecipeIngredient& ing : recipe->inputs)
-            {
-                building.inputBuffer.counts[ItemType{ing.item}] -= ing.amount;
-            }
-
-            Production prod;
-            prod.recipeId      = recipe->id;
-            prod.completesAt   = currentTick + secondsToTicks(recipe->durationSeconds);
-            prod.chosenOutputs = std::move(chosen);
-            building.production = std::move(prod);
-            break;  // At most one cycle starts per tick.
         }
+
+        // 4. Consume inputs and start cycle.
+        for (const RecipeIngredient& ing : recipe->inputs)
+        {
+            building.inputBuffer.counts[ItemType{ing.item}] -= ing.amount;
+        }
+
+        Production prod;
+        prod.recipeId      = recipe->id;
+        prod.completesAt   = currentTick + secondsToTicks(recipe->durationSeconds);
+        prod.chosenOutputs = std::move(chosen);
+        building.production = std::move(prod);
     }
 }
 
@@ -612,26 +631,29 @@ void BuildingSystem::tickShipyardProduction(FactoryState& state, Tick currentTic
         // If a cycle is in progress, check for completion.
         if (building.production)
         {
-            if (currentTick >= building.production->completesAt)
+            if (currentTick < building.production->completesAt)
             {
-                if (!building.outputPorts.empty())
+                continue;
-                {
-                    const Port& p = building.outputPorts[0];
-                    const QVector2D spawnPos(p.tile.x() + 0.5f, p.tile.y() + 0.5f);
-                    // A shipyard builds exactly what the player configured and
-                    // paid for. When no layout is set it produces a bare hull, so
-                    // pass an explicit empty layout rather than nullopt: the latter
-                    // would make ShipSystem fall back to the schematic's
-                    // defaultModules (a wave-only loadout) and yield free weapons.
-                    const std::optional<ShipLayoutConfig> layout =
-                        building.shipLayout.has_value()
-                            ? building.shipLayout
-                            : std::make_optional<ShipLayoutConfig>();
-                    m_spawnShip(building.recipeId, spawnPos, layout);
-                }
-                building.production = std::nullopt;
             }
-            continue;
+            if (!building.outputPorts.empty())
+            {
+                const Port& p = building.outputPorts[0];
+                const QVector2D spawnPos(p.tile.x() + 0.5f, p.tile.y() + 0.5f);
+                // A shipyard builds exactly what the player configured and
+                // paid for. When no layout is set it produces a bare hull, so
+                // pass an explicit empty layout rather than nullopt: the latter
+                // would make ShipSystem fall back to the schematic's
+                // defaultModules (a wave-only loadout) and yield free weapons.
+                const std::optional<ShipLayoutConfig> layout =
+                    building.shipLayout.has_value()
+                        ? building.shipLayout
+                        : std::make_optional<ShipLayoutConfig>();
+                m_spawnShip(building.recipeId, spawnPos, layout);
+            }
+            building.production = std::nullopt;
+            // Fall through and start the next cycle in this same tick, so a ship takes
+            // exactly its computed production time (REQ-BLD-SHIPYARD), as for the
+            // recipe buildings in tickProduction.
         }
 
         // Build combined materials list (base + modules).
@@ -942,21 +964,22 @@ void appendItems(Hasher& hasher, const std::vector<Item>& items)
     }
 }
 
+// std::map<ItemType, int> iterates in sorted-id order (ItemType::operator<), so both
+// buffer sides hash the same way in every run.
+void appendItemCounts(Hasher& hasher, const std::map<ItemType, int>& counts)
+{
+    hasher.append(counts.size());
+    for (const std::pair<const ItemType, int>& entry : counts)
+    {
+        hasher.append(entry.first.id);
+        hasher.append(entry.second);
+    }
+}
+
 void appendInputBuffer(Hasher& hasher, const InputBuffer& buffer)
 {
-    // std::map<ItemType, int> iterates in sorted-id order (ItemType::operator<).
+    appendItemCounts(hasher, buffer.counts);
-    hasher.append(buffer.counts.size());
+    appendItemCounts(hasher, buffer.caps);
-    for (const std::pair<const ItemType, int>& entry : buffer.counts)
-    {
-        hasher.append(entry.first.id);
-        hasher.append(entry.second);
-    }
-    hasher.append(buffer.caps.size());
-    for (const std::pair<const ItemType, int>& entry : buffer.caps)
-    {
-        hasher.append(entry.first.id);
-        hasher.append(entry.second);
-    }
 }
 }  // namespace
 
@@ -976,7 +999,7 @@ void BuildingSystem::appendChecksum(const FactoryState& state, Hasher& hasher) c
         hasher.append(b.recipeId);
         appendInputBuffer(hasher, b.inputBuffer);
         appendItems(hasher, b.outputBuffer.items);
-        hasher.append(b.outputBuffer.capacity);
+        appendItemCounts(hasher, b.outputBuffer.caps);
         hasher.append(b.emergingItems.size());
         for (const std::vector<BeltItemSlot>& lane : b.emergingItems)
         {

src/lib/sim/BuildingSystem.h

@@ -188,6 +188,13 @@ private:
     // (on construction completion, or when un-queuing a deconstruction). No-op for
     // non-belt-subsystem types. Splitter filters are (re)applied after placement.
 
+    // Selects a recipe for an auto-recipe building that has none, from a material being
+    // offered to it at one of its input ports (REQ-BLD-AUTO-RECIPE). No-op for every
+    // other building, for one that already holds a recipe, and for a material none of
+    // its recipes consumes. Called from both intake paths -- the belt pull and the
+    // direct coupling -- since either can be where the first material arrives.
+    void                 selectAutoRecipeIfUnset(Building& building,
+                                                 const ItemType& offered);
     // True if the consumer would accept `type` at the given input port right now:
     // it is a required input (or a building block for the HQ), the reservation-aware
     // buffer has room, and the input belt entry is free (REQ-MAT-INPUT-INTAKE).

src/lib/sim/ConstructionSystem.cpp

@@ -67,12 +67,6 @@ void ConstructionSystem::tick(FactoryState& state, BeltSystem& belts, Tick curre
     {
         initSalvageBayBuffer(m_config, building);
     }
-    else if (isAutoRecipeBuildingType(building.type))
-    {
-        // Smelter/Reprocessing Plant need no recipe selection; buffers are set
-        // up from all recipes of the type (REQ-BLD-SMELTER, REQ-BLD-REPROCESSING).
-        initAutoBuffers(m_config, building);
-    }
     else if (!building.recipeId.empty())
     {
         if (building.type == BuildingType::Shipyard)

src/lib/sim/FactoryQueries.cpp

@@ -4,6 +4,7 @@
 #include <limits>
 
 #include "PortGeometry.h"
+#include "ProductionRules.h"
 #include "SurfaceMask.h"
 
 #include "Item.h"
@@ -122,12 +123,14 @@ bool deliverScrapToSalvageBay(FactoryState& state, BuildingId bayId)
         return false;  // queued for deconstruction: stopped operating (REQ-BLD-DECON-QUEUE)
     }
     // Emerging scrap still counts against the bay's holding capacity
-    // (REQ-MAT-OUTPUT-EMERGE).
+    // (REQ-MAT-OUTPUT-EMERGE). Scrap is all the bay ever holds, so its single buffer is
-    if (bay->getOutputItemCount() >= bay->outputBuffer.capacity)
+    // the one being filled (REQ-BLD-SALVAGE-BAY).
+    const ItemType scrap{"scrap"};
+    if (!outputBufferHasRoom(*bay, scrap, 1))
     {
         return false;
     }
-    bay->outputBuffer.items.push_back(Item{ItemType{"scrap"}});
+    bay->outputBuffer.items.push_back(Item{scrap});
     return true;
 }
 

src/lib/sim/ProductionRules.cpp

@@ -1,33 +1,44 @@
 #include "ProductionRules.h"
 
+#include <algorithm>
+#include <map>
+
 #include "BuildingType.h"
 #include "ItemType.h"
 #include "ModulesConfig.h"
 #include "ShipsConfig.h"
 
-std::vector<const RecipeDef*>
+const RecipeDef* getSelectedRecipe(const GameConfig& config, const Building& b)
-gatherCandidateRecipes(const GameConfig& config, const Building& b)
 {
-    std::vector<const RecipeDef*> candidates;
+    if (b.recipeId.empty())
-    if (isAutoRecipeBuildingType(b.type))
     {
-        for (const RecipeDef& r : config.recipes.recipes)
+        return nullptr;
+    }
+    return config.recipes.findRecipeDef(b.recipeId, b.type);
+}
+
+const RecipeDef* findAutoRecipeFor(const GameConfig& config, BuildingType type,
+                                   const ItemType& item)
+{
+    if (!isAutoRecipeBuildingType(type))
+    {
+        return nullptr;
+    }
+
+    // Config order decides where a material feeds more than one recipe of the type, so
+    // the same offer always picks the same recipe (REQ-BLD-AUTO-RECIPE).
+    for (const RecipeDef& recipe : config.recipes.recipes)
+    {
+        if (recipe.building != type) { continue; }
+        for (const RecipeIngredient& ing : recipe.inputs)
         {
-            if (r.building == b.type && !r.inputs.empty())
+            if (ItemType{ing.item} == item)
             {
-                candidates.push_back(&r);
+                return &recipe;
             }
         }
     }
-    else
+    return nullptr;
-    {
-        const RecipeDef* recipe = config.recipes.findRecipeDef(b.recipeId, b.type);
-        if (recipe)
-        {
-            candidates.push_back(recipe);
-        }
-    }
-    return candidates;
 }
 bool recipeInputsAvailable(const Building& b, const RecipeDef& recipe)
 {
@@ -81,6 +92,33 @@ computeShipyardRequiredMaterials(const GameConfig& config,
     }
     return requiredMaterials;
 }
+
+double computeShipyardProductionTimeSeconds(
+    const GameConfig& config, const std::string& recipeId,
+    const std::optional<ShipLayoutConfig>& shipLayout)
+{
+    const ShipDef* shipDef = config.ships.findShipDef(recipeId);
+    if (!shipDef)
+    {
+        return 0.0;
+    }
+
+    double seconds = shipDef->schematic.productionTimeSeconds;
+    if (shipLayout.has_value())
+    {
+        for (const PlacedModule& pm : shipLayout->placedModules)
+        {
+            const ModuleDef* modDef = config.modules.findModuleDef(pm.moduleId);
+            if (!modDef)
+            {
+                continue;
+            }
+            seconds += modDef->productionTimeSeconds;
+        }
+    }
+    return seconds;
+}
+
 bool hasInputsToStart(const GameConfig& config, const Building& b)
 {
     if (b.type == BuildingType::Shipyard)
@@ -100,18 +138,67 @@ bool hasInputsToStart(const GameConfig& config, const Building& b)
         return true;
     }
 
-    // Recipe buildings: startable if any candidate recipe's inputs are satisfied.
+    // Recipe buildings: startable if the selected recipe's inputs are satisfied. A Miner
-    // A Miner recipe has no inputs, so an idle Miner is always startable and its
+    // recipe has no inputs, so an idle Miner is always startable here and its only idle
-    // only idle reason is a full output buffer.
+    // reason is an output buffer without room for the next cycle.
-    for (const RecipeDef* recipe : gatherCandidateRecipes(config, b))
+    const RecipeDef* recipe = getSelectedRecipe(config, b);
+    return recipe != nullptr && recipeInputsAvailable(b, *recipe);
+}
+
+bool outputBufferHasRoom(const Building& b, const ItemType& type, int itemCount)
+{
+    const std::map<ItemType, int>::const_iterator capIt = b.outputBuffer.caps.find(type);
+    const int cap = (capIt != b.outputBuffer.caps.end()) ? capIt->second : 0;
+    return b.getOutputItemCount(type) + itemCount <= cap;
+}
+
+bool recipeOutputsFit(const Building& b, const RecipeDef& recipe)
+{
+    if (b.type == BuildingType::ReprocessingPlant)
     {
-        if (recipeInputsAvailable(b, *recipe))
+        // One roll yields one of these, so each is measured on its own -- but all of them
+        // have to fit, since which one it will be is not known yet.
+        for (const RecipeOutput& out : recipe.outputs)
         {
-            return true;
+            if (!outputBufferHasRoom(b, ItemType{out.item}, out.amount))
+            {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    // A deterministic cycle deposits all of its outputs together. An item listed more
+    // than once is produced in the sum of those amounts, so it is judged once, as a sum.
+    std::map<ItemType, int> perCycle;
+    for (const RecipeOutput& out : recipe.outputs)
+    {
+        perCycle[ItemType{out.item}] += out.amount;
+    }
+    for (const std::pair<const ItemType, int>& entry : perCycle)
+    {
+        if (!outputBufferHasRoom(b, entry.first, entry.second))
+        {
+            return false;
         }
     }
-    return false;
+    return true;
 }
+
+bool canStartCycle(const GameConfig& config, const Building& b)
+{
+    // A shipyard's completed cycle spawns a ship instead of filling an output buffer
+    // (REQ-BLD-SHIPYARD), so holding the materials is the whole condition.
+    if (b.type == BuildingType::Shipyard)
+    {
+        return hasInputsToStart(config, b);
+    }
+
+    const RecipeDef* recipe = getSelectedRecipe(config, b);
+    return recipe != nullptr && recipeInputsAvailable(b, *recipe)
+           && recipeOutputsFit(b, *recipe);
+}
+
 std::optional<ProductionStatus>
 getProductionStatus(const GameConfig& config, const Building& building)
 {
@@ -130,9 +217,10 @@ getProductionStatus(const GameConfig& config, const Building& building)
         return std::nullopt;
     }
 
-    // Grey only applies to player-configured types; auto-recipe buildings
+    // Every production building can be unconfigured, an auto-recipe building included:
-    // (Smelter, Reprocessing Plant) always run an implicit recipe.
+    // it holds no recipe until one is offered to it, and the player can hand it back to
-    if (!isAutoRecipeBuildingType(building.type) && building.recipeId.empty())
+    // automatic selection (REQ-BLD-AUTO-RECIPE, REQ-UI-STATUS-LIGHT).
+    if (building.recipeId.empty())
     {
         return ProductionStatus::Unconfigured;
     }
@@ -142,9 +230,18 @@ getProductionStatus(const GameConfig& config, const Building& building)
         return ProductionStatus::Producing;
     }
 
-    // Idle: missing inputs (red) take precedence over a full output buffer
+    // Idle, but blocked by neither condition: the building is only between cycles and
-    // (yellow). If inputs are present yet the building is idle, the only remaining
+    // the simulation starts the next one on a following tick. A building running back
-    // reason it could not start a cycle is a full output buffer (REQ-MAT-CYCLE).
+    // to back sits here for exactly one tick per cycle, since tickProduction never
+    // starts a cycle in the tick one completed, so this must read as producing rather
+    // than blink (REQ-UI-STATUS-LIGHT, REQ-MAT-CYCLE).
+    if (canStartCycle(config, building))
+    {
+        return ProductionStatus::Producing;
+    }
+
+    // Idle for a reason: a missing input (red) takes precedence over an output buffer
+    // with no room for the next cycle's output (yellow).
     return hasInputsToStart(config, building) ? ProductionStatus::Blocked
-                                      : ProductionStatus::Starved;
+                                              : ProductionStatus::Starved;
 }

src/lib/sim/ProductionRules.h

@@ -25,10 +25,16 @@ enum class ProductionStatus
 // Pure functions of the config and the building itself — they read no factory
 // state, so they are free functions rather than BuildingSystem members.
 
-// Recipes this building could run: every recipe of its type for an auto-recipe
+// The recipe this building runs, or null when it has none selected. Every building type
-// building (REQ-BLD-SMELTER, REQ-BLD-REPROCESSING), otherwise just its selected one.
+// holds exactly one, a Smelter and a Reprocessing Plant included -- they only differ in
-std::vector<const RecipeDef*> gatherCandidateRecipes(const GameConfig& config,
+// how theirs first gets set (REQ-BLD-AUTO-RECIPE).
-                                                     const Building& b);
+const RecipeDef* getSelectedRecipe(const GameConfig& config, const Building& b);
+
+// The recipe an auto-recipe building adopts when this material is offered to it while it
+// has none: the first recipe of its type, in config order, that consumes the material
+// (REQ-BLD-AUTO-RECIPE). Null when no recipe of the type takes it.
+const RecipeDef* findAutoRecipeFor(const GameConfig& config, BuildingType type,
+                                   const ItemType& item);
 
 // True when the building's input buffer holds every ingredient the recipe needs.
 bool recipeInputsAvailable(const Building& b, const RecipeDef& recipe);
@@ -44,9 +50,33 @@ std::map<std::string, int> computeShipyardRequiredMaterials(
     const GameConfig& config, const std::string& recipeId,
     const std::optional<ShipLayoutConfig>& shipLayout);
 
+// The ship's base production time plus that of every module in the configured layout
+// (REQ-MOD-PRODUCTION-TIME), over a stored configuration as above.
+double computeShipyardProductionTimeSeconds(
+    const GameConfig& config, const std::string& recipeId,
+    const std::optional<ShipLayoutConfig>& shipLayout);
+
 // True when a production cycle could start right now, ignoring output-buffer space.
 bool hasInputsToStart(const GameConfig& config, const Building& b);
 
+// True when the building can take `itemCount` more items of `type` beside what it
+// already holds of it. An emerging item has not left the building yet and so still
+// counts against that material's capacity (REQ-MAT-OUTPUT-EMERGE, REQ-MAT-OUTPUT-BUFFER).
+bool outputBufferHasRoom(const Building& b, const ItemType& type, int itemCount);
+
+// True when every output a cycle of this recipe could produce would fit -- the gate a
+// cycle has to pass before it may start (REQ-MAT-CYCLE). For a deterministic recipe that
+// is its own outputs. A Reprocessing Plant rolls one of its outputs per cycle
+// (REQ-BLD-REPROCESSING), so each possibility is judged on its own and all must fit: the
+// roll is committed the moment the cycle starts, and testing every outcome rather than
+// the rolled one is what keeps a stalled output belt from biasing the distribution.
+bool recipeOutputsFit(const Building& b, const RecipeDef& recipe);
+
+// True when a production cycle could actually start right now: some candidate recipe
+// has its inputs *and* passes recipeOutputsFit (REQ-MAT-CYCLE). Stricter than
+// hasInputsToStart, which looks at the input buffers alone.
+bool canStartCycle(const GameConfig& config, const Building& b);
+
 // Status light for a building, or nullopt for types that show none — belts,
 // splitters, tunnels, HQ and defence stations (REQ-UI-STATUS-LIGHT).
 std::optional<ProductionStatus> getProductionStatus(const GameConfig& config,

src/test/BehaviorSystemTest.cpp

@@ -1000,8 +1000,9 @@ TEST_CASE("SalvagerSystem: full-cargo ship at its SalvageBay hands over cargo",
     }
     const Building* bay = findBuilding(f.state, bayId);
     REQUIRE(bay != nullptr);
-    // Config-driven output-buffer capacity is applied on placement (REQ-BLD-SALVAGE-BAY).
+    // Config-driven output-buffer capacity is applied on placement, onto the single
-    REQUIRE(bay->outputBuffer.capacity == 20);
+    // scrap buffer the bay holds (REQ-BLD-SALVAGE-BAY).
+    REQUIRE(bay->outputBuffer.caps.at(ItemType{"scrap"}) == 20);
 
     const QVector2D bayCenter(bay->anchor.x() + bay->footprint.width()  / 2.0f,
                               bay->anchor.y() + bay->footprint.height() / 2.0f);

src/test/BuildingTest.cpp

@@ -14,6 +14,7 @@
 
 #include "BeltSystem.h"
 #include "Building.h"
+#include "BuildingBuffers.h"
 #include "BuildingSystem.h"
 #include "ConstructionSystem.h"
 #include "DeconstructionSystem.h"
@@ -495,13 +496,13 @@ TEST_CASE("BuildingSystem: miner output buffer stalls when full", "[building]")
 
     Tick tick = 0;
     // Construction (10s) then cycle 1 starts at tick 300 (completesAt=330).
-    // Cycle 1 completes at tick 330: deposit item, continue (no same-tick restart).
+    // Cycle 1 completes at tick 330 and cycle 2 starts in that same tick
-    // Cycle 2 starts at tick 331 (completesAt=361).
+    // (completesAt=360). Cycle 2 completes at tick 360: deposit item -> 2 items held,
-    // Cycle 2 completes at tick 361: deposit item → buffer=2, cycle 3 stalls.
+    // which fills the buffer (capacity 2), so cycle 3 cannot start.
-    // Need to process through tick 361: 362 ticks total.
+    // Need to process through tick 360: 361 ticks total.
     runTicks(f.bs, f.cfg, f.state, f.belts, f.stock,
              static_cast<int>(secondsToTicks(10.0))
-             + 2 * static_cast<int>(secondsToTicks(1.0)) + 2,
+             + 2 * static_cast<int>(secondsToTicks(1.0)) + 1,
              tick);
 
     const Building* b = findBuilding(f.state, id);
@@ -512,6 +513,49 @@ TEST_CASE("BuildingSystem: miner output buffer stalls when full", "[building]")
     REQUIRE_FALSE(b->production.has_value());
 }
 
+TEST_CASE("BuildingSystem: the next cycle starts on the tick the last one completed",
+          "[building]")
+{
+    // A cycle takes exactly its recipe duration, so a building whose output keeps
+    // draining produces at the configured rate (REQ-MAT-CYCLE). An idle tick between
+    // cycles would cost a one-second recipe about 3% of its throughput.
+    PlacementFixture f;
+
+    const BuildingId id =
+        f.bs.place(f.state, BuildingType::Miner, QPoint(0, 0), Rotation::East, 0).value();
+    f.bs.setRecipe(f.state, id, "mine_iron_ore");
+
+    const Tick cycleTicks = secondsToTicks(1.0);  // mine_iron_ore duration
+
+    Tick tick = 0;
+    // Construction completes at tick 300 and cycle 1 starts in that same tick.
+    runTicks(f.bs, f.cfg, f.state, f.belts, f.stock,
+             static_cast<int>(secondsToTicks(10.0)) + 1, tick);
+    const Building* b = findBuilding(f.state, id);
+    REQUIRE(b != nullptr);
+    REQUIRE(b->production.has_value());
+    const Tick firstCompletesAt = b->production->completesAt;
+
+    // Process up to and including that completion tick: the next cycle is already
+    // running, due exactly one duration later rather than one duration plus a tick.
+    runTicks(f.bs, f.cfg, f.state, f.belts, f.stock, static_cast<int>(cycleTicks), tick);
+    b = findBuilding(f.state, id);
+    REQUIRE(b->getOutputItemCount() == 1);
+    REQUIRE(b->production.has_value());
+    REQUIRE(b->production->completesAt == firstCompletesAt + cycleTicks);
+
+    // Nothing hauls the ore away here, so the buffer (capacity 2) would stall the third
+    // cycle. Drain it and confirm the cadence holds across the next boundary too.
+    f.bs.forEachBuilding(f.state, [](Building& building) {
+        building.outputBuffer.items.clear();
+        for (std::vector<BeltItemSlot>& lane : building.emergingItems) { lane.clear(); }
+    });
+    runTicks(f.bs, f.cfg, f.state, f.belts, f.stock, static_cast<int>(cycleTicks), tick);
+    b = findBuilding(f.state, id);
+    REQUIRE(b->production.has_value());
+    REQUIRE(b->production->completesAt == firstCompletesAt + 2 * cycleTicks);
+}
+
 // ---------------------------------------------------------------------------
 // REQ-UI-DEBUG-OVERLAY production counts
 // ---------------------------------------------------------------------------
@@ -585,12 +629,13 @@ TEST_CASE("BuildingSystem: smelter input buffer fills from adjacent west-flowing
     // Smelter mask ["AA ","AA>"] → body (0,0),(1,0),(0,1),(1,1).
     // Output port (2,1) East.  Input port example: (2,0) West.
     const BuildingId sid = f.bs.place(f.state, BuildingType::Smelter, QPoint(0, 0), Rotation::East, 0).value();
-    // Smelters have no recipe selection (REQ-BLD-SMELTER); they auto-accept any
+    // A smelter starts with no recipe and picks one from the first material offered to
-    // ore/scrap that is an input to a smelter recipe.
+    // it (REQ-BLD-AUTO-RECIPE), which is what lets it accept the ore below.
 
     // Complete construction (15s → tick 450+1 = 451 ticks).
     Tick tick = 0;
     runTicks(f.bs, f.cfg, f.state, f.belts, f.stock, static_cast<int>(secondsToTicks(15.0)) + 1, tick);
+    REQUIRE(findBuilding(f.state, sid)->recipeId.empty());
 
     // Place west-flowing belt at (2,0): belt flows West, delivers to smelter.
     f.belts.placeBelt(QPoint(2, 0), Rotation::West);
@@ -601,6 +646,13 @@ TEST_CASE("BuildingSystem: smelter input buffer fills from adjacent west-flowing
 
     const Building* b = findBuilding(f.state, sid);
     REQUIRE(b != nullptr);
+    // The ore selected the recipe that consumes it, and its buffers were sized for that
+    // recipe alone -- copper ore is not one of its inputs any more.
+    REQUIRE(b->recipeId == "iron_ingot");
+    REQUIRE(b->inputBuffer.caps.count(ItemType{"iron_ore"}) == 1);
+    REQUIRE(b->inputBuffer.caps.count(ItemType{"copper_ore"}) == 0);
+    REQUIRE(b->outputBuffer.caps.count(ItemType{"iron_ingot"}) == 1);
+    REQUIRE(b->outputBuffer.caps.count(ItemType{"copper_ingot"}) == 0);
     // The item was accepted; it may still be travelling inward on the input belt,
     // so count buffered + in-transit (REQ-MAT-INPUT-INTAKE).
     REQUIRE(b->pendingInputCount(ItemType{"iron_ore"}) >= 1);
@@ -705,10 +757,10 @@ TEST_CASE("BuildingSystem: smelter auto-smelts ore without a recipe selection",
     REQUIRE(hasIronIngot);
 }
 
-// With mixed inputs, the smelter runs whichever recipe is currently satisfiable
+// A belt carrying mixed ore is the realistic case for REQ-BLD-AUTO-RECIPE: the first ore
-// and leaves an incomplete batch of another input waiting (see the union-of-
+// to arrive settles the recipe, and everything else on that belt is refused rather than
-// inputs caps in initAutoBuffers).
+// smelted alongside it.
-TEST_CASE("BuildingSystem: smelter runs a satisfiable recipe while an incomplete batch waits",
+TEST_CASE("BuildingSystem: mixed ore on one belt leaves the smelter on the first ore's recipe",
           "[building]")
 {
     PlacementFixture f(kFastBeltSpeed_tps);
@@ -718,8 +770,7 @@ TEST_CASE("BuildingSystem: smelter runs a satisfiable recipe while an incomplete
     Tick tick = 0;
     runTicks(f.bs, f.cfg, f.state, f.belts, f.stock, static_cast<int>(secondsToTicks(15.0)) + 1, tick);
 
-    // Feed 1 iron_ore (iron_ingot needs 2 — incomplete) then 2 copper_ore
+    // Feed 1 iron_ore, then 2 copper_ore, via the west-flowing input belt.
-    // (copper_ingot needs 2 — satisfiable) via the west-flowing input belt.
     f.belts.placeBelt(QPoint(2, 0), Rotation::West);
     const char* fed[] = { "iron_ore", "copper_ore", "copper_ore" };
     for (const char* id : fed)
@@ -729,24 +780,26 @@ TEST_CASE("BuildingSystem: smelter runs a satisfiable recipe while an incomplete
         f.bs.tickBeltPull(f.state);
     }
 
-    // copper_ingot cycle is 2.5s; run to completion.
     runTicks(f.bs, f.cfg, f.state, f.belts, f.stock, static_cast<int>(secondsToTicks(2.5)) + 2, tick);
 
     const Building* b = findBuilding(f.state, sid);
     REQUIRE(b != nullptr);
 
-    // Copper was smelted; the lone iron_ore still waits for a second unit.
+    // The iron ore came first, so the smelter smelts iron and nothing else. The copper
-    bool hasCopperIngot = false;
+    // was never taken in, so no copper ingot was made.
+    REQUIRE(b->recipeId == "iron_ingot");
     for (const Item& item : outputSideItems(*b))
     {
-        if (item.type.id == "copper_ingot") { hasCopperIngot = true; }
+        REQUIRE(item.type.id != "copper_ingot");
     }
-    REQUIRE(hasCopperIngot);
+    REQUIRE(b->pendingInputCount(ItemType{"copper_ore"}) == 0);
 
+    // The lone iron ore still waits for a second unit: the recipe needs two.
     const std::map<ItemType, int>::const_iterator ironIt =
         b->inputBuffer.counts.find(ItemType{"iron_ore"});
     REQUIRE(ironIt != b->inputBuffer.counts.end());
     REQUIRE(ironIt->second == 1);
+    REQUIRE_FALSE(b->production.has_value());
 }
 
 // ---------------------------------------------------------------------------
@@ -833,7 +886,8 @@ TEST_CASE("BuildingSystem: direct coupling to a non-consumer leaves the item stu
     REQUIRE(sink != nullptr);
     // Nothing was delivered, and the producer's output side has backed up to its cap.
     REQUIRE(sink->pendingInputCount(ItemType{"iron_ore"}) == 0);
-    REQUIRE(miner->getOutputItemCount() == miner->outputBuffer.capacity);
+    REQUIRE(miner->getOutputItemCount(ItemType{"iron_ore"})
+            == miner->outputBuffer.caps.at(ItemType{"iron_ore"}));
 }
 
 // ---------------------------------------------------------------------------
@@ -870,28 +924,250 @@ TEST_CASE("BuildingSystem: setRecipe clears output buffer and active production"
 }
 
 // ---------------------------------------------------------------------------
-// Reprocessing plant — output buffer capacity (REQ-MAT-OUTPUT-BUFFER-REPROCESSING)
+// Reprocessing plant -- per-item output buffers (REQ-MAT-OUTPUT-BUFFER)
 // ---------------------------------------------------------------------------
 
-TEST_CASE("BuildingSystem: reprocessing plant output buffer capacity equals max output per roll",
+TEST_CASE("BuildingSystem: reprocessing plant sizes one output buffer per possible roll",
           "[building]")
 {
     PlacementFixture f;
 
     const BuildingId id = f.bs.place(f.state, BuildingType::ReprocessingPlant,
                                   QPoint(0, 0), Rotation::East, 0).value();
-    // Reprocessing plants have no recipe selection (REQ-BLD-REPROCESSING); the
-    // single reprocessing recipe is applied automatically on completion.
 
     // Complete construction (25s).
     Tick tick = 0;
     runTicks(f.bs, f.cfg, f.state, f.belts, f.stock, static_cast<int>(secondsToTicks(25.0)) + 1, tick);
 
+    // A plant holds no buffers until it has a recipe (REQ-BLD-AUTO-RECIPE); selecting
+    // one sizes them, exactly as the first scrap offered to it would.
+    REQUIRE(findBuilding(f.state, id)->outputBuffer.caps.empty());
+    f.bs.setRecipe(f.state, id, "reprocessing_cycle");
+
     const Building* b = findBuilding(f.state, id);
     REQUIRE(b != nullptr);
     // reprocessing_cycle outputs: 2 iron_ingot (60%), 1 circuit_board (30%),
-    // 1 advanced_alloy (10%).  Max per roll = 2.  Capacity = 2 (1× max).
+    // 1 advanced_alloy (10%). One roll yields one of them, so each buffer holds twice
-    REQUIRE(b->outputBuffer.capacity == 2);
+    // that outcome's own amount (REQ-MAT-OUTPUT-BUFFER).
+    REQUIRE(b->outputBuffer.caps.size() == 3);
+    REQUIRE(b->outputBuffer.caps.at(ItemType{"iron_ingot"})    == 4);
+    REQUIRE(b->outputBuffer.caps.at(ItemType{"circuit_board"}) == 2);
+    REQUIRE(b->outputBuffer.caps.at(ItemType{"advanced_alloy"}) == 2);
+}
+
+TEST_CASE("BuildingSystem: one full output buffer stops the plant even when the others have room",
+          "[building]")
+{
+    // The gate that replaced the old one-item cap: a cycle may only start when *every*
+    // outcome would fit, because the roll is committed once it starts (REQ-MAT-CYCLE).
+    // Were the plant to roll first and skip a result that does not fit, a player could
+    // stall one output belt to filter the distribution towards the other items.
+    PlacementFixture f(kFastBeltSpeed_tps);
+
+    const BuildingId id = f.bs.place(f.state, BuildingType::ReprocessingPlant,
+                                     QPoint(0, 0), Rotation::East, 0).value();
+    Tick tick = 0;
+    runTicks(f.bs, f.cfg, f.state, f.belts, f.stock,
+             static_cast<int>(secondsToTicks(25.0)) + 1, tick);
+
+    // Feed a full cycle's scrap (5) so only the output side can hold it back.
+    f.belts.placeBelt(QPoint(-1, 0), Rotation::East);
+    for (int i = 0; i < 5; ++i)
+    {
+        f.belts.tryPutItem(QPoint(-1, 0), makeItem("scrap"), Rotation::East);
+        f.belts.tick();
+        f.bs.tickBeltPull(f.state);
+    }
+
+    // Fill the iron_ingot buffer to its cap and leave the other two empty.
+    f.bs.forEachBuilding(f.state, [](Building& building) {
+        if (building.type != BuildingType::ReprocessingPlant) { return; }
+        const int cap = building.outputBuffer.caps.at(ItemType{"iron_ingot"});
+        for (int i = 0; i < cap; ++i)
+        {
+            building.outputBuffer.items.push_back(makeItem("iron_ingot"));
+        }
+    });
+
+    runTicks(f.bs, f.cfg, f.state, f.belts, f.stock, 5, tick);
+
+    const Building* b = findBuilding(f.state, id);
+    REQUIRE(b != nullptr);
+    // circuit_board and advanced_alloy have room, but iron_ingot does not, so no cycle
+    // starts at all and the scrap is still waiting.
+    REQUIRE(b->outputBuffer.caps.at(ItemType{"circuit_board"}) > 0);
+    REQUIRE(outputBufferHasRoom(*b, ItemType{"circuit_board"}, 1));
+    REQUIRE_FALSE(outputBufferHasRoom(*b, ItemType{"iron_ingot"}, 1));
+    REQUIRE_FALSE(b->production.has_value());
+    REQUIRE(b->pendingInputCount(ItemType{"scrap"}) == 5);
+    REQUIRE(getProductionStatus(f.cfg, *b) == ProductionStatus::Blocked);
+}
+
+TEST_CASE("BuildingSystem: reprocessing plant runs a second cycle while holding the first output",
+          "[building]")
+{
+    // Its buffers hold twice each outcome's amount (REQ-MAT-OUTPUT-BUFFER), so a held
+    // result no longer stops the next cycle. The old one-item cap made this impossible:
+    // whatever the first roll was, the plant stalled until that item left the building.
+    PlacementFixture f(kFastBeltSpeed_tps);
+
+    const BuildingId id = f.bs.place(f.state, BuildingType::ReprocessingPlant,
+                                     QPoint(0, 0), Rotation::East, 0).value();
+    Tick tick = 0;
+    runTicks(f.bs, f.cfg, f.state, f.belts, f.stock,
+             static_cast<int>(secondsToTicks(25.0)) + 1, tick);
+
+    // Two cycles' worth of scrap (5 each), which is exactly the input cap.
+    f.belts.placeBelt(QPoint(-1, 0), Rotation::East);
+    for (int i = 0; i < 10; ++i)
+    {
+        f.belts.tryPutItem(QPoint(-1, 0), makeItem("scrap"), Rotation::East);
+        f.belts.tick();
+        f.bs.tickBeltPull(f.state);
+    }
+    REQUIRE(findBuilding(f.state, id)->pendingInputCount(ItemType{"scrap"}) == 10);
+
+    // No belt carries the output away, so the first cycle's result is still held.
+    // reprocessing_cycle runs 3s; run through the completion tick.
+    runTicks(f.bs, f.cfg, f.state, f.belts, f.stock,
+             static_cast<int>(secondsToTicks(3.0)) + 1, tick);
+
+    const Building* b = findBuilding(f.state, id);
+    REQUIRE(b != nullptr);
+    REQUIRE(b->getOutputItemCount() > 0);
+    // Whichever outcome was rolled, every outcome still fits, so the second cycle is
+    // already running rather than the plant sitting blocked.
+    REQUIRE(b->production.has_value());
+    REQUIRE(getProductionStatus(f.cfg, *b) == ProductionStatus::Producing);
+}
+
+// ---------------------------------------------------------------------------
+// Automatic recipe selection (REQ-BLD-AUTO-RECIPE)
+// ---------------------------------------------------------------------------
+
+// Places a smelter and runs it to completion, leaving it with no recipe.
+static BuildingId buildSmelter(PlacementFixture& f, QPoint anchor, Tick& tick)
+{
+    const BuildingId id =
+        f.bs.place(f.state, BuildingType::Smelter, anchor, Rotation::East, 0).value();
+    runTicks(f.bs, f.cfg, f.state, f.belts, f.stock,
+             static_cast<int>(secondsToTicks(15.0)) + 1, tick);
+    return id;
+}
+
+TEST_CASE("BuildingSystem: an unset auto-recipe building is unconfigured", "[building]")
+{
+    // It holds no recipe until one is offered to it, so it reads grey like any other
+    // unconfigured building (REQ-BLD-AUTO-RECIPE, REQ-UI-STATUS-LIGHT).
+    PlacementFixture f;
+    Tick tick = 0;
+    const BuildingId id = buildSmelter(f, QPoint(0, 0), tick);
+
+    const Building* b = findBuilding(f.state, id);
+    REQUIRE(b != nullptr);
+    REQUIRE(b->recipeId.empty());
+    REQUIRE(b->inputBuffer.caps.empty());
+    REQUIRE(b->outputBuffer.caps.empty());
+    REQUIRE(getProductionStatus(f.cfg, *b) == ProductionStatus::Unconfigured);
+}
+
+TEST_CASE("BuildingSystem: a set recipe is never replaced by a later material",
+          "[building]")
+{
+    // Once set the recipe is the player's to change: a material belonging to another of
+    // its recipes is simply not an accepted input (REQ-BLD-AUTO-RECIPE).
+    PlacementFixture f(kFastBeltSpeed_tps);
+    Tick tick = 0;
+    const BuildingId id = buildSmelter(f, QPoint(0, 0), tick);
+
+    // Iron ore first, which selects the iron recipe.
+    f.belts.placeBelt(QPoint(2, 0), Rotation::West);
+    f.belts.tryPutItem(QPoint(2, 0), makeItem("iron_ore"));
+    f.belts.tick();
+    f.bs.tickBeltPull(f.state);
+    REQUIRE(findBuilding(f.state, id)->recipeId == "iron_ingot");
+
+    // Copper ore next: refused, and the recipe stands.
+    f.belts.tryPutItem(QPoint(2, 0), makeItem("copper_ore"));
+    f.belts.tick();
+    f.bs.tickBeltPull(f.state);
+
+    const Building* b = findBuilding(f.state, id);
+    REQUIRE(b->recipeId == "iron_ingot");
+    REQUIRE(b->pendingInputCount(ItemType{"copper_ore"}) == 0);
+    // The copper is still sitting on the belt, refused rather than swallowed.
+    REQUIRE(f.belts.peekItem(westPort(QPoint(2, 0))).has_value());
+}
+
+TEST_CASE("BuildingSystem: a manually selected recipe is not overridden", "[building]")
+{
+    // The player's selection is a recipe like any other, so auto-selection stays out of
+    // the way and the smelter refuses ore it does not smelt (REQ-BLD-AUTO-RECIPE).
+    PlacementFixture f(kFastBeltSpeed_tps);
+    Tick tick = 0;
+    const BuildingId id = buildSmelter(f, QPoint(0, 0), tick);
+
+    f.bs.setRecipe(f.state, id, "copper_ingot");
+    REQUIRE(findBuilding(f.state, id)->recipeId == "copper_ingot");
+
+    f.belts.placeBelt(QPoint(2, 0), Rotation::West);
+    f.belts.tryPutItem(QPoint(2, 0), makeItem("iron_ore"));
+    f.belts.tick();
+    f.bs.tickBeltPull(f.state);
+
+    const Building* b = findBuilding(f.state, id);
+    REQUIRE(b->recipeId == "copper_ingot");
+    REQUIRE(b->pendingInputCount(ItemType{"iron_ore"}) == 0);
+}
+
+TEST_CASE("BuildingSystem: selecting a different recipe frees a stuck auto-recipe building",
+          "[building]")
+{
+    // A smelter left holding part of a cycle nothing feeds any more is freed by
+    // selecting another recipe, which clears the buffers -- that is why no separate
+    // clear action exists (REQ-BLD-AUTO-RECIPE, REQ-MAT-INPUT-BUFFER).
+    PlacementFixture f(kFastBeltSpeed_tps);
+    Tick tick = 0;
+    const BuildingId id = buildSmelter(f, QPoint(0, 0), tick);
+
+    // One iron ore, where the recipe needs two: it can never run.
+    f.belts.placeBelt(QPoint(2, 0), Rotation::West);
+    f.belts.tryPutItem(QPoint(2, 0), makeItem("iron_ore"));
+    f.belts.tick();
+    f.bs.tickBeltPull(f.state);
+    runTicks(f.bs, f.cfg, f.state, f.belts, f.stock, 30, tick);
+
+    const Building* stuck = findBuilding(f.state, id);
+    REQUIRE(stuck->recipeId == "iron_ingot");
+    REQUIRE(stuck->pendingInputCount(ItemType{"iron_ore"}) == 1);
+    REQUIRE_FALSE(stuck->production.has_value());
+
+    f.bs.setRecipe(f.state, id, "copper_ingot");
+    const Building* freed = findBuilding(f.state, id);
+    REQUIRE(freed->recipeId == "copper_ingot");
+    REQUIRE(freed->pendingInputCount(ItemType{"iron_ore"}) == 0);
+    REQUIRE(freed->inputBuffer.caps.count(ItemType{"copper_ore"}) == 1);
+}
+
+TEST_CASE("BuildingSystem: selecting (Auto) returns the building to automatic selection",
+          "[building]")
+{
+    // The dialog's clearing option unsets the recipe rather than leaving the building
+    // idle for good: the next material offered selects one again (REQ-BLD-AUTO-RECIPE).
+    PlacementFixture f(kFastBeltSpeed_tps);
+    Tick tick = 0;
+    const BuildingId id = buildSmelter(f, QPoint(0, 0), tick);
+
+    f.bs.setRecipe(f.state, id, "copper_ingot");
+    f.bs.setRecipe(f.state, id, std::string());  // the "(Auto)" option
+    REQUIRE(findBuilding(f.state, id)->recipeId.empty());
+
+    f.belts.placeBelt(QPoint(2, 0), Rotation::West);
+    f.belts.tryPutItem(QPoint(2, 0), makeItem("iron_ore"));
+    f.belts.tick();
+    f.bs.tickBeltPull(f.state);
+
+    REQUIRE(findBuilding(f.state, id)->recipeId == "iron_ingot");
 }
 
 TEST_CASE("BuildingSystem: reprocessing plant produces one cycle output then stalls",
@@ -902,8 +1178,8 @@ TEST_CASE("BuildingSystem: reprocessing plant produces one cycle output then sta
 
     const BuildingId id = f.bs.place(f.state, BuildingType::ReprocessingPlant,
                                   QPoint(0, 0), Rotation::East, 0).value();
-    // Reprocessing plants have no recipe selection (REQ-BLD-REPROCESSING); the
+    // The plant selects its recipe from the first scrap offered to it
-    // single reprocessing recipe is applied automatically on completion.
+    // (REQ-BLD-AUTO-RECIPE), which is what the belt feeding below does.
 
     // Complete construction (25s).
     Tick tick = 0;
@@ -1081,10 +1357,12 @@ TEST_CASE("isConfigurableBuildingType: only types with player-facing settings",
     CHECK(isConfigurableBuildingType(BuildingType::Shipyard));
     CHECK(isConfigurableBuildingType(BuildingType::Splitter));
 
-    // Smelter and Reprocessing Plant run implicit recipes (REQ-BLD-SMELTER,
+    // Smelter and Reprocessing Plant carry a recipe like any other, even though they can
-    // REQ-BLD-REPROCESSING) and the rest have no settings whatsoever.
+    // also select it themselves (REQ-BLD-AUTO-RECIPE).
-    CHECK_FALSE(isConfigurableBuildingType(BuildingType::Smelter));
+    CHECK(isConfigurableBuildingType(BuildingType::Smelter));
-    CHECK_FALSE(isConfigurableBuildingType(BuildingType::ReprocessingPlant));
+    CHECK(isConfigurableBuildingType(BuildingType::ReprocessingPlant));
+
+    // The rest have no settings whatsoever.
     CHECK_FALSE(isConfigurableBuildingType(BuildingType::SalvageBay));
     CHECK_FALSE(isConfigurableBuildingType(BuildingType::Belt));
     CHECK_FALSE(isConfigurableBuildingType(BuildingType::TunnelEntry));
@@ -1134,8 +1412,15 @@ TEST_CASE("resolveBlueprintGhost: a partial overlap of the same type is invalid"
     // Both footprints stay on the asteroid, so terrain is not what fails here.
     f.bs.place(f.state, BuildingType::Smelter, QPoint(-3, 0), Rotation::East, 0);
 
-    CHECK(resolveOne(f, BuildingType::Smelter, QPoint(-2, 0), Rotation::East).action
+    // Judged on where it sits, with no cursor to hit-test: the overlap is what decides.
+    CHECK(resolveInConstellation(f, BuildingType::Smelter, QPoint(-2, 0), Rotation::East).action
           == BlueprintGhostAction::Invalid);
+
+    // With the cursor on the existing smelter the single-building gesture answers first
+    // and hands it the settings, since a smelter carries a recipe (REQ-BLD-AUTO-RECIPE,
+    // REQ-UI-BLUEPRINT-TRANSFER) -- the same as for a miner.
+    CHECK(resolveOne(f, BuildingType::Smelter, QPoint(-2, 0), Rotation::East).action
+          == BlueprintGhostAction::Transfer);
 }
 
 TEST_CASE("resolveBlueprintGhost: a single configurable building transfers its settings",
@@ -1296,11 +1581,11 @@ TEST_CASE("resolveBlueprintGhost: a constellation mixes transfers and plain over
     REQUIRE(miner.action == BlueprintGhostAction::Transfer);
     CHECK(*miner.targetId == minerId);
 
-    // A smelter runs an implicit recipe (REQ-BLD-SMELTER), so there is nothing to hand
+    // A smelter carries a recipe too now (REQ-BLD-AUTO-RECIPE), so a blueprint of one
-    // over and it is simply left as it is.
+    // has something to hand over just as the miner does.
     const BlueprintGhostResolved smelter =
         resolveInConstellation(f, BuildingType::Smelter, QPoint(-5, 0), Rotation::East);
-    REQUIRE(smelter.action == BlueprintGhostAction::CompatibleOverlap);
+    REQUIRE(smelter.action == BlueprintGhostAction::Transfer);
     CHECK(*smelter.targetId == smelterId);
 }
 
@@ -1515,41 +1800,187 @@ TEST_CASE("BuildingSystem: getProductionStatus classifies production state", "[b
         miner.production = Production{};
         REQUIRE(statusOf(miner) == ProductionStatus::Producing);     // active cycle -> green
 
-        // A miner has no inputs, so its only idle reason is a full output buffer.
+        // A miner has no inputs, so its only idle reason is an output buffer with no
+        // room for the next cycle's output.
         miner.production = std::nullopt;
-        miner.outputBuffer.capacity = 2;
+        miner.outputBuffer.caps[ItemType{"iron_ore"}] = 2;
-        miner.outputBuffer.items    = { makeItem("iron_ore"), makeItem("iron_ore") };
+        miner.outputBuffer.items = { makeItem("iron_ore"), makeItem("iron_ore") };
         REQUIRE(statusOf(miner) == ProductionStatus::Blocked);       // -> yellow
+
+        // One item handed off: the next cycle fits again, so the idle tick between two
+        // cycles reads as producing rather than blinking yellow (REQ-UI-STATUS-LIGHT).
+        miner.outputBuffer.items.pop_back();
+        REQUIRE(statusOf(miner) == ProductionStatus::Producing);     // -> green
+
+        // An emerging item has not left the building, so it fills the freed room and
+        // blocks the cycle again (REQ-MAT-OUTPUT-EMERGE).
+        miner.emergingItems.push_back({ BeltItemSlot{ makeItem("iron_ore"), 0.5 } });
+        REQUIRE(miner.getOutputItemCount(ItemType{"iron_ore"}) == 2);
+        REQUIRE(statusOf(miner) == ProductionStatus::Blocked);       // -> yellow
+
+        // Another item's backlog is measured against its own buffer, so it changes
+        // nothing here (REQ-MAT-OUTPUT-BUFFER).
+        miner.outputBuffer.caps[ItemType{"copper_ore"}] = 2;
+        miner.outputBuffer.items.push_back(makeItem("copper_ore"));
+        REQUIRE(statusOf(miner) == ProductionStatus::Blocked);
+        miner.outputBuffer.items.clear();
+        REQUIRE(statusOf(miner) == ProductionStatus::Producing);
     }
 
-    SECTION("Assembler: starved vs blocked, input-missing takes precedence")
+    SECTION("Assembler: starved, the transient between cycles, then blocked")
     {
         Building assembler; assembler.type = BuildingType::Assembler;
         assembler.recipeId = assemblerRecipe->id;
+        // Sized the way the simulation sizes it (REQ-MAT-OUTPUT-BUFFER).
+        initBuffers(assembler, *assemblerRecipe);
+
+        const std::string outputItemId = assemblerRecipe->outputs.front().item;
+        int cycleOutput = 0;
+        for (const RecipeOutput& out : assemblerRecipe->outputs)
+        {
+            cycleOutput += out.amount;
+        }
+        REQUIRE(cycleOutput > 0);
 
         // Idle with inputs missing -> red.
         REQUIRE(statusOf(assembler) == ProductionStatus::Starved);
 
-        // Inputs present but idle -> the only remaining reason is a full output
+        // Inputs present and the output fits: nothing blocks a cycle, so the building
-        // buffer -> yellow.
+        // is merely between cycles -> green, not yellow (REQ-UI-STATUS-LIGHT).
         for (const RecipeIngredient& ing : assemblerRecipe->inputs)
         {
             assembler.inputBuffer.counts[ItemType{ing.item}] = ing.amount;
         }
+        REQUIRE(statusOf(assembler) == ProductionStatus::Producing);
+
+        // That item's own buffer filled to within less than one cycle's output of its
+        // capacity: no cycle can start -> yellow.
+        for (int i = 0; i < cycleOutput + 1; ++i)
+        {
+            assembler.outputBuffer.items.push_back(makeItem(outputItemId));
+        }
         REQUIRE(statusOf(assembler) == ProductionStatus::Blocked);
 
-        // Inputs missing AND output full -> red wins over yellow.
+        // Inputs missing AND output blocked -> red wins over yellow.
         assembler.inputBuffer.counts.clear();
-        assembler.outputBuffer.capacity = 2;
-        assembler.outputBuffer.items    = { makeItem("x"), makeItem("x") };
         REQUIRE(statusOf(assembler) == ProductionStatus::Starved);
     }
 
-    SECTION("Smelter (auto-recipe) is never grey")
+    SECTION("A multi-item cycle blocks before the output buffer is full")
     {
+        // Free space smaller than one cycle's output stops the cycle even though the
+        // buffer still has room, so yellow is not the same as "full" (REQ-MAT-CYCLE).
+        const RecipeDef* multiOutputRecipe = nullptr;
+        for (const RecipeDef& r : f.cfg.recipes.recipes)
+        {
+            if (r.building != BuildingType::Assembler || r.inputs.empty()) { continue; }
+            int total = 0;
+            for (const RecipeOutput& out : r.outputs) { total += out.amount; }
+            if (total >= 2) { multiOutputRecipe = &r; break; }
+        }
+        REQUIRE(multiOutputRecipe != nullptr);
+
+        int cycleOutput = 0;
+        for (const RecipeOutput& out : multiOutputRecipe->outputs)
+        {
+            cycleOutput += out.amount;
+        }
+        const std::string outputItemId = multiOutputRecipe->outputs.front().item;
+
+        Building assembler; assembler.type = BuildingType::Assembler;
+        assembler.recipeId = multiOutputRecipe->id;
+        initBuffers(assembler, *multiOutputRecipe);
+        for (const RecipeIngredient& ing : multiOutputRecipe->inputs)
+        {
+            assembler.inputBuffer.counts[ItemType{ing.item}] = ing.amount;
+        }
+
+        // One item short of a full cycle's worth of free space.
+        for (int i = 0; i < cycleOutput + 1; ++i)
+        {
+            assembler.outputBuffer.items.push_back(makeItem(outputItemId));
+        }
+        REQUIRE(assembler.getOutputItemCount(ItemType{outputItemId})
+                < assembler.outputBuffer.caps.at(ItemType{outputItemId}));
+        REQUIRE(statusOf(assembler) == ProductionStatus::Blocked);
+
+        // Exactly one cycle's worth of free space: the cycle fits again.
+        assembler.outputBuffer.items.pop_back();
+        REQUIRE(statusOf(assembler) == ProductionStatus::Producing);
+    }
+
+    SECTION("Reprocessing Plant: blocked once any possible roll has no room")
+    {
+        // The plant rolls one of its outputs per cycle (REQ-BLD-REPROCESSING) and the
+        // roll is committed at cycle start, so every outcome has to fit before it may
+        // begin: one full buffer blocks it whatever room the others have (REQ-MAT-CYCLE).
+        const RecipeDef* reprocessingRecipe = nullptr;
+        for (const RecipeDef& r : f.cfg.recipes.recipes)
+        {
+            if (r.building == BuildingType::ReprocessingPlant && !r.inputs.empty())
+            {
+                reprocessingRecipe = &r;
+                break;
+            }
+        }
+        REQUIRE(reprocessingRecipe != nullptr);
+        REQUIRE(reprocessingRecipe->outputs.size() >= 2);
+
+        Building plant; plant.type = BuildingType::ReprocessingPlant;
+        plant.recipeId = reprocessingRecipe->id;
+        initBuffers(plant, *reprocessingRecipe);
+        for (const RecipeIngredient& ing : reprocessingRecipe->inputs)
+        {
+            plant.inputBuffer.counts[ItemType{ing.item}] = ing.amount;
+        }
+
+        // Every buffer empty: whatever the roll turns out to be, it fits -> green.
+        REQUIRE(statusOf(plant) == ProductionStatus::Producing);
+
+        // Fill one outcome's buffer and leave the rest untouched -> yellow, even though
+        // the other outcomes still have room.
+        const std::string firstItemId = reprocessingRecipe->outputs.front().item;
+        const std::string lastItemId  = reprocessingRecipe->outputs.back().item;
+        for (int i = 0; i < plant.outputBuffer.caps.at(ItemType{firstItemId}); ++i)
+        {
+            plant.outputBuffer.items.push_back(makeItem(firstItemId));
+        }
+        REQUIRE(outputBufferHasRoom(plant, ItemType{lastItemId}, 1));
+        REQUIRE_FALSE(outputBufferHasRoom(plant, ItemType{firstItemId}, 1));
+        REQUIRE(statusOf(plant) == ProductionStatus::Blocked);
+
+        // Without the scrap it is starved regardless of the buffers.
+        plant.inputBuffer.counts.clear();
+        REQUIRE(statusOf(plant) == ProductionStatus::Starved);
+    }
+
+    SECTION("Smelter: grey until it has a recipe, then judged like any other building")
+    {
+        // It holds no recipe until one is offered to it, so grey now applies to it too
+        // (REQ-BLD-AUTO-RECIPE, REQ-UI-STATUS-LIGHT).
         Building smelter; smelter.type = BuildingType::Smelter;
-        // No player-selectable recipe and empty inputs -> red, not grey.
+        REQUIRE(statusOf(smelter) == ProductionStatus::Unconfigured);
-        REQUIRE(statusOf(smelter) == ProductionStatus::Starved);
+
+        const RecipeDef* smelterRecipe = nullptr;
+        for (const RecipeDef& r : f.cfg.recipes.recipes)
+        {
+            if (r.building == BuildingType::Smelter && !r.inputs.empty())
+            {
+                smelterRecipe = &r;
+                break;
+            }
+        }
+        REQUIRE(smelterRecipe != nullptr);
+
+        smelter.recipeId = smelterRecipe->id;
+        initBuffers(smelter, *smelterRecipe);
+        REQUIRE(statusOf(smelter) == ProductionStatus::Starved);  // recipe, but no ore
+
+        for (const RecipeIngredient& ing : smelterRecipe->inputs)
+        {
+            smelter.inputBuffer.counts[ItemType{ing.item}] = ing.amount;
+        }
+        REQUIRE(statusOf(smelter) == ProductionStatus::Producing);
     }
 
     SECTION("Shipyard: unconfigured, then starved without materials, then producing")
@@ -1567,7 +1998,7 @@ TEST_CASE("BuildingSystem: getProductionStatus classifies production state", "[b
     SECTION("Salvage Bay: red when empty, green when holding scrap")
     {
         Building bay; bay.type = BuildingType::SalvageBay;
-        bay.outputBuffer.capacity = 20;
+        bay.outputBuffer.caps[ItemType{"scrap"}] = 20;
         REQUIRE(statusOf(bay) == ProductionStatus::Starved);         // empty -> red
 
         bay.outputBuffer.items = { makeItem("scrap") };

src/test/CMakeLists.txt

@@ -14,8 +14,10 @@ add_files(
     TunnelCompletionTest.cpp
     WorldCoordinatesTest.cpp
     WorldCameraTest.cpp
+    FloatingPanelPlacementTest.cpp
     SelectionControllerTest.cpp
     BuildModeControllerTest.cpp
+    ControlActionTest.cpp
     BuildingTest.cpp
     BuildingConfigTest.cpp
     ShipTest.cpp

src/test/ConfigLoaderTest.cpp

@@ -390,39 +390,6 @@ duration_seconds = 1.0
         std::runtime_error);
 }
 
-TEST_CASE("Optional recipe icon field parses; absent leaves it unset", "[config]")
-{
-    TempConfigDir dir;
-    writeFile(dir.path() / "recipes.toml", R"(
-[[recipe]]
-id = "with_icon"
-building = "assembler"
-inputs = [{item = "iron_ingot", amount = 1}]
-outputs = [{item = "steel_plate", amount = 1}]
-duration_seconds = 1.0
-icon = "hardened_steel"
-
-[[recipe]]
-id = "without_icon"
-building = "assembler"
-inputs = [{item = "iron_ingot", amount = 1}]
-outputs = [{item = "copper_wire", amount = 1}]
-duration_seconds = 1.0
-)");
-
-    const RecipesConfig cfg =
-        ConfigLoader::loadRecipes((dir.path() / "recipes.toml").string());
-
-    const RecipeDef& withIcon = cfg.recipes.at(0);
-    REQUIRE(withIcon.id == "with_icon");
-    REQUIRE(withIcon.icon.has_value());
-    REQUIRE(*withIcon.icon == "hardened_steel");
-
-    const RecipeDef& withoutIcon = cfg.recipes.at(1);
-    REQUIRE(withoutIcon.id == "without_icon");
-    REQUIRE_FALSE(withoutIcon.icon.has_value());
-}
-
 // --- unlock_requires (REQ-LOCK-PREREQ) ------------------------------------
 
 namespace

src/test/ControlActionTest.cpp

@@ -0,0 +1,328 @@
+#include "catch.hpp"
+
+#include <algorithm>
+#include <vector>
+
+#include "BuildModeController.h"
+#include "BuildingType.h"
+#include "ControlAction.h"
+
+// REQ-UI-CONTROLS-ACCURACY. The panel and the input handling read one table, and these
+// tests are what makes that pay: the round-trip case below fails the moment a row is
+// shown whose binding resolves elsewhere, which is the drift the whole design exists to
+// prevent. Everything here works on action ids -- the display strings live in the ui
+// target and are not what can silently go wrong.
+
+namespace
+{
+
+ControlContext generalContext()
+{
+    return ControlContext();
+}
+
+ControlContext selectionContext(bool placeable = true)
+{
+    ControlContext context;
+    context.selection                 = ControlSelection::Buildings;
+    context.selectionCount            = 3;
+    context.placeableBuildingSelected = placeable;
+    return context;
+}
+
+ControlContext builderContext(BuildingType type)
+{
+    ControlContext context;
+    context.mode        = BuildMode::Builder;
+    context.builderType = type;
+    return context;
+}
+
+ControlContext blueprintContext(bool transfer = false)
+{
+    ControlContext context;
+    context.mode                   = BuildMode::Blueprint;
+    context.hoveredGhostIsTransfer = transfer;
+    return context;
+}
+
+ControlContext deconstructContext()
+{
+    ControlContext context;
+    context.mode = BuildMode::Deconstruct;
+    return context;
+}
+
+// A spread wide enough that every availability rule and every binding condition is
+// exercised by the whole-table properties below.
+std::vector<ControlContext> allContexts()
+{
+    ControlContext beltDragging = builderContext(BuildingType::Belt);
+    beltDragging.draggingBelt   = true;
+
+    ControlContext generalWithBlueprint            = generalContext();
+    generalWithBlueprint.temporaryBlueprintExists  = true;
+
+    ControlContext fieldSelection      = selectionContext(false);
+    fieldSelection.selection           = ControlSelection::FieldObjects;
+
+    return {generalContext(),
+            generalWithBlueprint,
+            selectionContext(),
+            fieldSelection,
+            builderContext(BuildingType::Belt),
+            builderContext(BuildingType::Assembler),
+            beltDragging,
+            blueprintContext(false),
+            blueprintContext(true),
+            deconstructContext()};
+}
+
+std::vector<ControlAction> shownActions(const ControlContext& context)
+{
+    std::vector<ControlAction> actions = getContextActions(context);
+    const std::vector<ControlAction> always = getAlwaysAvailableActions(context);
+    actions.insert(actions.end(), always.begin(), always.end());
+    return actions;
+}
+
+bool contains(const std::vector<ControlAction>& actions, ControlAction action)
+{
+    return std::find(actions.begin(), actions.end(), action) != actions.end();
+}
+
+}  // namespace
+
+TEST_CASE("ControlAction: every shown row is available", "[controls]")
+{
+    for (const ControlContext& context : allContexts())
+    {
+        for (ControlAction action : shownActions(context))
+        {
+            REQUIRE(isControlActionAvailable(action, context));
+        }
+    }
+}
+
+TEST_CASE("ControlAction: no row is shown twice", "[controls]")
+{
+    for (const ControlContext& context : allContexts())
+    {
+        std::vector<ControlAction> actions = shownActions(context);
+        std::vector<ControlAction> unique  = actions;
+        std::sort(unique.begin(), unique.end());
+        unique.erase(std::unique(unique.begin(), unique.end()), unique.end());
+        REQUIRE(unique.size() == actions.size());
+    }
+}
+
+// The core anti-drift property: a row's badges are rendered from its bindings, so every
+// binding a row advertises must actually trigger that row's action in that same context.
+TEST_CASE("ControlAction: every advertised binding resolves back to its own action",
+          "[controls]")
+{
+    for (const ControlContext& context : allContexts())
+    {
+        for (ControlAction action : shownActions(context))
+        {
+            const std::vector<ControlBinding> bindings =
+                getControlActionBindings(action, context);
+            REQUIRE_FALSE(bindings.empty());
+
+            for (const ControlBinding& binding : bindings)
+            {
+                if (binding.isMouse)
+                {
+                    REQUIRE(resolveMouseAction(binding.mouse, context) == action);
+                }
+                else
+                {
+                    REQUIRE(resolveKeyAction(binding.key, binding.modifiers, context)
+                            == action);
+                }
+            }
+        }
+    }
+}
+
+// The other direction: an input that resolves to something must resolve to an action
+// that is actually available there, so no input can trigger a no-op. This is weaker
+// than "must be a shown row" on purpose -- a context may omit an available binding
+// (Ctrl+click in the General context), which REQ-UI-CONTROLS-ACCURACY permits; what it
+// may never do is act on an unavailable one.
+TEST_CASE("ControlAction: every resolvable input is available", "[controls]")
+{
+    const std::vector<MouseBinding> mouseBindings = {
+        MouseBinding::LeftClick, MouseBinding::LeftDrag, MouseBinding::CtrlLeftClick,
+        MouseBinding::CtrlLeftDrag, MouseBinding::RightClick};
+
+    for (const ControlContext& context : allContexts())
+    {
+        for (MouseBinding binding : mouseBindings)
+        {
+            const ControlAction action = resolveMouseAction(binding, context);
+            if (action != ControlAction::None)
+            {
+                REQUIRE(isControlActionAvailable(action, context));
+            }
+        }
+
+        const std::vector<int> keys = {Qt::Key_A, Qt::Key_D, Qt::Key_W, Qt::Key_S,
+                                       Qt::Key_Space, Qt::Key_C, Qt::Key_V, Qt::Key_R,
+                                       Qt::Key_Q, Qt::Key_Escape};
+        for (int key : keys)
+        {
+            for (Qt::KeyboardModifiers modifiers :
+                 {Qt::KeyboardModifiers(Qt::NoModifier),
+                  Qt::KeyboardModifiers(Qt::ShiftModifier),
+                  Qt::KeyboardModifiers(Qt::ControlModifier)})
+            {
+                const ControlAction action = resolveKeyAction(key, modifiers, context);
+                if (action != ControlAction::None)
+                {
+                    REQUIRE(isControlActionAvailable(action, context));
+                }
+            }
+        }
+    }
+}
+
+TEST_CASE("ControlAction: contexts are named by mode and selection", "[controls]")
+{
+    REQUIRE(getControlContextKind(generalContext()) == ControlContextKind::General);
+    REQUIRE(getControlContextKind(selectionContext()) == ControlContextKind::Selection);
+    REQUIRE(getControlContextKind(builderContext(BuildingType::Belt))
+            == ControlContextKind::Build);
+    REQUIRE(getControlContextKind(blueprintContext()) == ControlContextKind::Blueprint);
+    REQUIRE(getControlContextKind(deconstructContext())
+            == ControlContextKind::Deconstruct);
+}
+
+TEST_CASE("ControlAction: Q enters deconstruct mode, or leaves the active one",
+          "[controls]")
+{
+    REQUIRE(resolveKeyAction(Qt::Key_Q, Qt::NoModifier, generalContext())
+            == ControlAction::EnterDeconstruct);
+    REQUIRE(resolveKeyAction(Qt::Key_Q, Qt::NoModifier, selectionContext())
+            == ControlAction::EnterDeconstruct);
+    REQUIRE(resolveKeyAction(Qt::Key_Q, Qt::NoModifier, builderContext(BuildingType::Belt))
+            == ControlAction::ExitMode);
+    REQUIRE(resolveKeyAction(Qt::Key_Q, Qt::NoModifier, blueprintContext())
+            == ControlAction::ExitMode);
+    REQUIRE(resolveKeyAction(Qt::Key_Q, Qt::NoModifier, deconstructContext())
+            == ControlAction::ExitMode);
+}
+
+TEST_CASE("ControlAction: Ctrl distinguishes the chords, other modifiers do not",
+          "[controls]")
+{
+    const ControlContext context = selectionContext();
+
+    REQUIRE(resolveKeyAction(Qt::Key_C, Qt::NoModifier, context)
+            == ControlAction::CopyTemporary);
+    REQUIRE(resolveKeyAction(Qt::Key_C, Qt::ControlModifier, context)
+            == ControlAction::CreateBlueprint);
+    REQUIRE(resolveKeyAction(Qt::Key_V, Qt::ControlModifier, context)
+            == ControlAction::OpenBlueprints);
+
+    // Shift+A must still pan, as it always has -- matching modifiers exactly instead of
+    // testing Ctrl alone would silently swallow the press.
+    REQUIRE(resolveKeyAction(Qt::Key_A, Qt::ShiftModifier, context) == ControlAction::Move);
+    REQUIRE(resolveKeyAction(Qt::Key_R, Qt::ShiftModifier, blueprintContext())
+            == ControlAction::Rotate);
+}
+
+TEST_CASE("ControlAction: a transfer target turns the click into Apply settings",
+          "[controls]")
+{
+    const ControlContext plain    = blueprintContext(false);
+    const ControlContext transfer = blueprintContext(true);
+
+    REQUIRE(resolveMouseAction(MouseBinding::LeftClick, plain) == ControlAction::Place);
+    REQUIRE(resolveMouseAction(MouseBinding::LeftClick, transfer)
+            == ControlAction::ApplySettings);
+
+    REQUIRE(contains(getContextActions(plain), ControlAction::Place));
+    REQUIRE_FALSE(contains(getContextActions(plain), ControlAction::ApplySettings));
+    REQUIRE(contains(getContextActions(transfer), ControlAction::ApplySettings));
+    REQUIRE_FALSE(contains(getContextActions(transfer), ControlAction::Place));
+}
+
+TEST_CASE("ControlAction: a belt drag takes the right mouse button from ExitMode",
+          "[controls]")
+{
+    ControlContext dragging   = builderContext(BuildingType::Belt);
+    dragging.draggingBelt     = true;
+    const ControlContext idle = builderContext(BuildingType::Belt);
+
+    REQUIRE(resolveMouseAction(MouseBinding::RightClick, idle) == ControlAction::ExitMode);
+    REQUIRE(resolveMouseAction(MouseBinding::RightClick, dragging)
+            == ControlAction::CancelBeltLine);
+
+    // Q still leaves the mode outright while the drag runs, so ExitMode stays shown --
+    // with its right-click badge dropped, since the button now means something else.
+    REQUIRE(resolveKeyAction(Qt::Key_Q, Qt::NoModifier, dragging) == ControlAction::ExitMode);
+
+    const std::vector<ControlBinding> idleBindings =
+        getControlActionBindings(ControlAction::ExitMode, idle);
+    const std::vector<ControlBinding> dragBindings =
+        getControlActionBindings(ControlAction::ExitMode, dragging);
+    REQUIRE(idleBindings.size() == 2);
+    REQUIRE(dragBindings.size() == 1);
+    REQUIRE_FALSE(dragBindings.front().isMouse);
+}
+
+TEST_CASE("ControlAction: dragging a line is offered for belts only", "[controls]")
+{
+    REQUIRE(resolveMouseAction(MouseBinding::LeftDrag, builderContext(BuildingType::Belt))
+            == ControlAction::PlaceBeltLine);
+    REQUIRE(resolveMouseAction(MouseBinding::LeftDrag,
+                               builderContext(BuildingType::Assembler))
+            == ControlAction::None);
+    REQUIRE(resolveMouseAction(MouseBinding::LeftDrag, blueprintContext())
+            == ControlAction::None);
+}
+
+TEST_CASE("ControlAction: blueprint keys are offered only where they do something",
+          "[controls]")
+{
+    // V does nothing until C has captured something (REQ-UI-BLUEPRINT-TEMP).
+    ControlContext withBlueprint                  = generalContext();
+    withBlueprint.temporaryBlueprintExists        = true;
+    REQUIRE_FALSE(contains(shownActions(generalContext()), ControlAction::PasteTemporary));
+    REQUIRE(contains(shownActions(withBlueprint), ControlAction::PasteTemporary));
+    REQUIRE(resolveKeyAction(Qt::Key_V, Qt::NoModifier, generalContext())
+            == ControlAction::None);
+
+    // C and Ctrl+C need a selection holding something placeable (REQ-UI-HOTKEYS).
+    ControlContext fieldSelection = selectionContext(false);
+    fieldSelection.selection      = ControlSelection::FieldObjects;
+    REQUIRE(contains(getContextActions(selectionContext()), ControlAction::CopyTemporary));
+    REQUIRE_FALSE(contains(getContextActions(fieldSelection), ControlAction::CopyTemporary));
+    REQUIRE(resolveKeyAction(Qt::Key_C, Qt::NoModifier, fieldSelection)
+            == ControlAction::None);
+
+    // Ctrl+V opens the dialog whatever is going on (REQ-UI-HOTKEYS).
+    for (const ControlContext& context : allContexts())
+    {
+        REQUIRE(resolveKeyAction(Qt::Key_V, Qt::ControlModifier, context)
+                == ControlAction::OpenBlueprints);
+    }
+}
+
+TEST_CASE("ControlAction: selection rows appear only once something is selected",
+          "[controls]")
+{
+    const std::vector<ControlAction> general   = getContextActions(generalContext());
+    const std::vector<ControlAction> selection = getContextActions(selectionContext());
+
+    REQUIRE(contains(general, ControlAction::Select));
+    REQUIRE(contains(general, ControlAction::EnterDeconstruct));
+    REQUIRE_FALSE(contains(general, ControlAction::AddToSelection));
+    REQUIRE_FALSE(contains(general, ControlAction::CreateBlueprint));
+
+    REQUIRE(contains(selection, ControlAction::AddToSelection));
+    REQUIRE(contains(selection, ControlAction::AddAreaToSelection));
+    REQUIRE(contains(selection, ControlAction::CreateBlueprint));
+    REQUIRE(contains(selection, ControlAction::EnterDeconstruct));
+}

src/test/FloatingPanelPlacementTest.cpp

@@ -0,0 +1,231 @@
+#include "catch.hpp"
+
+#include <vector>
+
+#include <QRect>
+
+#include "FloatingPanelPlacement.h"
+
+// The band every case below places into: 1000x600, so a bottom edge of 599.
+static QRect makeBand()
+{
+    return QRect(0, 0, 1000, 600);
+}
+
+static const int kMarginPx = 8;
+
+TEST_CASE("With nothing in the way a widget may use the whole band", "[layout]")
+{
+    // REQ-UI-SELECTION-PANEL: the band's own bottom is the limit when no other floating
+    // widget has been placed yet.
+    REQUIRE(getAvailableBottomPx(makeBand(), {}, 0, 999, kMarginPx) == 599);
+}
+
+TEST_CASE("A widget in the same column pushes the bottom above it", "[layout]")
+{
+    // The build button bar sitting at the bottom center leaves the space above it, less
+    // the margin kept between the two (REQ-UI-BUILD-BAR).
+    const std::vector<QRect> occupied = { QRect(400, 520, 200, 72) };
+    REQUIRE(getAvailableBottomPx(makeBand(), occupied, 350, 650, kMarginPx) == 511);
+}
+
+TEST_CASE("A widget beside the column does not shorten it", "[layout]")
+{
+    // The controls panel in the bottom-left corner is not in the way of a panel standing
+    // at the right edge, however tall it is (REQ-UI-CONTROLS-PANEL).
+    const std::vector<QRect> occupied = { QRect(0, 100, 200, 499) };
+    REQUIRE(getAvailableBottomPx(makeBand(), occupied, 700, 999, kMarginPx) == 599);
+
+    // Touching columns do count as meeting: the panel starts exactly where the widget
+    // ends, which is an overlap of one pixel.
+    REQUIRE(getAvailableBottomPx(makeBand(), occupied, 199, 999, kMarginPx) == 91);
+}
+
+TEST_CASE("The topmost widget in the column decides", "[layout]")
+{
+    // Several widgets meet the column: the one that reaches highest is the binding one,
+    // whatever order they are given in.
+    const std::vector<QRect> occupied = { QRect(400, 520, 200, 72),
+                                          QRect(0, 300, 500, 299),
+                                          QRect(900, 560, 100, 40) };
+    REQUIRE(getAvailableBottomPx(makeBand(), occupied, 450, 550, kMarginPx) == 291);
+}
+
+TEST_CASE("An empty rectangle occupies nothing", "[layout]")
+{
+    // A floating widget that is hidden contributes a null rect rather than being left
+    // out of the pass.
+    const std::vector<QRect> occupied = { QRect(), QRect(400, 520, 200, 0) };
+    REQUIRE(getAvailableBottomPx(makeBand(), occupied, 0, 999, kMarginPx) == 599);
+}
+
+TEST_CASE("A widget filling the column leaves nothing", "[layout]")
+{
+    // The caller is expected to notice that the space left is not positive rather than
+    // being handed a floor of its own.
+    const std::vector<QRect> occupied = { QRect(0, 0, 1000, 600) };
+    REQUIRE(getAvailableBottomPx(makeBand(), occupied, 0, 999, kMarginPx) == -9);
+}
+
+// ---------------------------------------------------------------------------
+// Which side of the selection the panel takes
+// ---------------------------------------------------------------------------
+
+TEST_CASE("The panel stands to the right of the selection where it fits", "[layout]")
+{
+    // REQ-UI-SELECTION-PANEL: right of the anchor is the first choice.
+    REQUIRE(chooseSide(makeBand(), QRect(100, 100, 60, 60), 300, kMarginPx)
+            == PanelSide::Right);
+}
+
+TEST_CASE("The panel goes left when the right cannot hold it", "[layout]")
+{
+    // A selection near the right edge leaves 100 px there, not enough for a 300 px
+    // panel, and the left is wide open.
+    REQUIRE(chooseSide(makeBand(), QRect(880, 100, 20, 60), 300, kMarginPx)
+            == PanelSide::Left);
+}
+
+TEST_CASE("Fitting on neither side, the panel takes the roomier one", "[layout]")
+{
+    // A bounding box spanning most of the view: 192 px free on the left, 92 on the
+    // right, and a 300 px panel fits in neither. It covers as little as it can.
+    REQUIRE(chooseSide(makeBand(), QRect(200, 100, 700, 200), 300, kMarginPx)
+            == PanelSide::Left);
+    REQUIRE(chooseSide(makeBand(), QRect(100, 100, 700, 200), 300, kMarginPx)
+            == PanelSide::Right);
+}
+
+// ---------------------------------------------------------------------------
+// Where it then stands
+// ---------------------------------------------------------------------------
+
+TEST_CASE("The panel sits beside the anchor with its top edges aligned", "[layout]")
+{
+    // REQ-UI-SELECTION-PANEL: separated by the margin, growing away from the selection,
+    // top edge on the anchor's top edge.
+    const QRect placed = placeBesideAnchor(makeBand(), QRect(100, 120, 60, 60),
+                                           PanelSide::Right, QSize(300, 200), {},
+                                           kMarginPx);
+    REQUIRE(placed == QRect(168, 120, 300, 200));
+
+    const QRect placedLeft = placeBesideAnchor(makeBand(), QRect(500, 120, 60, 60),
+                                               PanelSide::Left, QSize(300, 200), {},
+                                               kMarginPx);
+    REQUIRE(placedLeft == QRect(192, 120, 300, 200));
+}
+
+TEST_CASE("A panel that would hang below the view is lifted", "[layout]")
+{
+    // Top-aligning with a selection low in the view would put the panel's bottom past
+    // the band, so it rises until it fits rather than overrunning it.
+    const QRect placed = placeBesideAnchor(makeBand(), QRect(100, 500, 60, 60),
+                                           PanelSide::Right, QSize(300, 200), {},
+                                           kMarginPx);
+    REQUIRE(placed == QRect(168, 400, 300, 200));
+}
+
+TEST_CASE("A panel standing over another widget rises above it", "[layout]")
+{
+    // The controls panel in the bottom-left is in the way of a panel placed to the left
+    // of a selection: it clears the top of it by the margin (REQ-UI-CONTROLS-PANEL).
+    const std::vector<QRect> occupied = { QRect(0, 300, 260, 300) };
+    const QRect placed = placeBesideAnchor(makeBand(), QRect(500, 250, 60, 60),
+                                           PanelSide::Left, QSize(300, 200), occupied,
+                                           kMarginPx);
+    REQUIRE(placed == QRect(192, 92, 300, 200));
+}
+
+TEST_CASE("A panel taller than the space left is capped", "[layout]")
+{
+    // Capping is the caller's cue to scroll: it asked for 700 and got what there was.
+    const QRect placed = placeBesideAnchor(makeBand(), QRect(100, 100, 60, 60),
+                                           PanelSide::Right, QSize(300, 700), {},
+                                           kMarginPx);
+    REQUIRE(placed == QRect(168, 0, 300, 600));
+}
+
+TEST_CASE("A panel that fits on neither side is pushed inside the view", "[layout]")
+{
+    // The one case where it covers part of the selection (REQ-UI-SELECTION-PANEL): it
+    // stands as far from the anchor as the band allows, not off the edge of it.
+    const QRect placed = placeBesideAnchor(makeBand(), QRect(100, 100, 700, 200),
+                                           PanelSide::Right, QSize(300, 200), {},
+                                           kMarginPx);
+    REQUIRE(placed == QRect(700, 100, 300, 200));
+}
+
+// ---------------------------------------------------------------------------
+// Where it stands once the player has dragged it (REQ-UI-SELECTION-PANEL-DRAG)
+// ---------------------------------------------------------------------------
+
+TEST_CASE("A dragged panel stands where it was dropped", "[layout]")
+{
+    // With room for it there, the desired top-left corner is the answer: nothing about
+    // the selection it describes is consulted any more.
+    const QRect placed = placeAtDesiredTopLeft(makeBand(), QPoint(420, 180),
+                                               QSize(300, 200), {}, kMarginPx);
+    REQUIRE(placed == QRect(420, 180, 300, 200));
+}
+
+TEST_CASE("A panel dragged past the view's edges is pushed back inside", "[layout]")
+{
+    // Dropped off the right edge and below the bottom, it is brought back within the
+    // band, as an anchored panel is.
+    REQUIRE(placeAtDesiredTopLeft(makeBand(), QPoint(900, 500), QSize(300, 200), {},
+                                  kMarginPx)
+            == QRect(700, 400, 300, 200));
+
+    // And off the left edge and above the top, the other way.
+    REQUIRE(placeAtDesiredTopLeft(makeBand(), QPoint(-120, -60), QSize(300, 200), {},
+                                  kMarginPx)
+            == QRect(0, 0, 300, 200));
+}
+
+TEST_CASE("A dragged panel rises above the widget it was dropped over", "[layout]")
+{
+    // The player drops it over the build button bar; it lands above the bar's top by the
+    // margin instead, the bar staying where it is (REQ-UI-BUILD-BAR).
+    const std::vector<QRect> occupied = { QRect(400, 520, 200, 72) };
+    const QRect placed = placeAtDesiredTopLeft(makeBand(), QPoint(450, 480),
+                                               QSize(300, 200), occupied, kMarginPx);
+    REQUIRE(placed == QRect(450, 312, 300, 200));
+}
+
+TEST_CASE("A widget beside a dragged panel's column does not move it", "[layout]")
+{
+    // Only what the panel's own column meets is in its way: the controls panel in the
+    // bottom-left corner leaves a panel dropped at the right edge alone
+    // (REQ-UI-CONTROLS-PANEL).
+    const std::vector<QRect> occupied = { QRect(0, 300, 260, 300) };
+    const QRect placed = placeAtDesiredTopLeft(makeBand(), QPoint(600, 380),
+                                               QSize(300, 200), occupied, kMarginPx);
+    REQUIRE(placed == QRect(600, 380, 300, 200));
+}
+
+TEST_CASE("A dragged panel too tall for the room left is capped", "[layout]")
+{
+    // Capping is the caller's cue to scroll here too: a card asking for 700 px over a bar
+    // that leaves 512 px of band gets what there is, from the top of the band.
+    const std::vector<QRect> occupied = { QRect(400, 520, 200, 72) };
+    const QRect placed = placeAtDesiredTopLeft(makeBand(), QPoint(450, 100),
+                                               QSize(300, 700), occupied, kMarginPx);
+    REQUIRE(placed == QRect(450, 0, 300, 512));
+}
+
+TEST_CASE("A dragged panel returns to where it was dropped", "[layout]")
+{
+    // The resolution never writes back to the desired position: a panel lifted above the
+    // build button bar goes back to the point the player dropped it at as soon as the bar
+    // stops meeting its column -- here because the bar's button set shrank.
+    const QPoint desired(450, 380);
+    const std::vector<QRect> wideBar = { QRect(400, 520, 200, 72) };
+    REQUIRE(placeAtDesiredTopLeft(makeBand(), desired, QSize(300, 200), wideBar,
+                                  kMarginPx)
+            == QRect(450, 312, 300, 200));
+
+    const std::vector<QRect> narrowBar = { QRect(400, 520, 40, 72) };
+    REQUIRE(placeAtDesiredTopLeft(makeBand(), desired, QSize(300, 200), narrowBar,
+                                  kMarginPx)
+            == QRect(450, 380, 300, 200));
+}

src/ui/BlueprintLibrary.cpp

@@ -39,6 +39,11 @@ bool BlueprintLibrary::getCanCaptureSelection() const
     return selectionHasPlaceableBuilding(*m_sim, m_selectedBuildingIds);
 }
 
+bool BlueprintLibrary::getHasTemporaryBlueprint() const
+{
+    return m_temporaryBlueprint.has_value();
+}
+
 void BlueprintLibrary::saveSelectionAs(const QString& name)
 {
     Blueprint blueprint = createBlueprintFromSelection();

src/ui/BlueprintLibrary.h

@@ -44,6 +44,11 @@ public:
     // (REQ-UI-BLUEPRINT-CREATE).
     bool getCanCaptureSelection() const;
 
+    // True once C has captured something -- the condition under which V does anything
+    // (REQ-UI-BLUEPRINT-TEMP), and so the condition under which the controls panel
+    // offers it (REQ-UI-CONTROLS-ACCURACY).
+    bool getHasTemporaryBlueprint() const;
+
     // Captures the current selection under the given name and appends it to the list.
     // Silently does nothing when nothing player-placeable is selected.
     void saveSelectionAs(const QString& name);

src/ui/BlueprintSelectionDialog.cpp

@@ -266,9 +266,7 @@ void BlueprintSelectionDialog::rebuildGrid()
 
     // Block icon shown to the right of each cost (REQ-UI-BLUEPRINT-CARD); null when no
     // building_block icon exists, in which case the cost is the bare number.
-    const QPixmap blockIcon = m_itemIcons->hasIcon(kBlockItemId)
+    const QPixmap blockIcon = m_itemIcons->getInlineIcon(kBlockItemId, font());
-        ? m_itemIcons->getPixmap(kBlockItemId, QFontMetrics(font()).height())
-        : QPixmap();
 
     const QSize cardSize = getCardSize(font());
 

src/ui/BuildButtonBar.cpp

@@ -24,6 +24,7 @@
 #include "DisplayName.h"
 #include "EventManager.h"
 #include "ExitBuilderModeRequestedEvent.h"
+#include "FloatingLayoutInvalidatedEvent.h"
 #include "IconCaption.h"
 #include "InputMapper.h"
 #include "ItemIconCache.h"
@@ -174,9 +175,7 @@ BuildButtonBar::BuildButtonBar(Simulation* sim, const GameConfig* config,
 
     // Block icon shown to the right of each button's cost (REQ-UI-BUILD-COST); null
     // when no building_block icon exists, in which case the cost is the bare number.
-    const QPixmap blockIcon = m_itemIcons->hasIcon(kBlockItemId)
+    const QPixmap blockIcon = m_itemIcons->getInlineIcon(kBlockItemId, font());
-        ? m_itemIcons->getPixmap(kBlockItemId, QFontMetrics(font()).height())
-        : QPixmap();
 
     for (const BuildingDef& def : config->buildings.buildings)
     {
@@ -270,15 +269,25 @@ BuildButtonBar::~BuildButtonBar()
     unregisterForEvents();
 }
 
-void BuildButtonBar::anchorTo(const QRect& worldViewRect)
+void BuildButtonBar::placeIn(const QRect& viewRect,
+                             const std::vector<QRect>& /*occupiedRects*/)
 {
-    m_viewRect = worldViewRect;
+    if (viewRect.isNull())
-    recenter();
+    {
-}
+        return;
+    }
+    // The layout drops hidden buttons from its size hint, but only once it has been
+    // re-run: an unlock changes which buttons are shown, and Qt would not get around to
+    // it before the bar is measured here.
+    layout()->activate();
 
-int BuildButtonBar::getStripHeightPx() const
+    const QSize barSize = sizeHint();
-{
+    // Centered, except that a bar wider than the view stays flush with its left edge
-    return height() + kBottomMarginPx;
+    // rather than hanging off both sides.
+    const int x = qMax(viewRect.left(),
+                       viewRect.left() + (viewRect.width() - barSize.width()) / 2);
+    const int y = viewRect.bottom() - kBottomMarginPx - barSize.height() + 1;
+    setGeometry(QRect(QPoint(x, y), barSize));
 }
 
 void BuildButtonBar::clearActiveButton()
@@ -328,29 +337,11 @@ void BuildButtonBar::updateVisibility()
     {
         m_buttons[i]->setVisible(m_sim->isBuildingUnlocked(m_types[i]));
     }
-    // A hidden button leaves the row, so the bar has to take up its new width and
+    // A hidden button leaves the row, so the bar takes up a new width and has to be
-    // re-center on it (REQ-UI-BUILD-BAR).
+    // re-centered on it -- and the widgets that keep clear of the bar have to be placed
-    recenter();
+    // against that new rect too, so the whole pass is re-run (REQ-UI-BUILD-BAR).
-}
+    EventManager::getInstance()->sendEventImmediately(
-
+        std::make_shared<FloatingLayoutInvalidatedEvent>());
-void BuildButtonBar::recenter()
-{
-    if (m_viewRect.isNull())
-    {
-        return;
-    }
-    // The layout drops hidden buttons from its size hint, but only once it has been
-    // re-run: updateVisibility() calls this straight after setVisible(), before Qt
-    // would get around to it on its own.
-    layout()->activate();
-
-    const QSize barSize = sizeHint();
-    // Centered, except that a bar wider than the view stays flush with its left edge
-    // rather than hanging off both sides.
-    const int x = qMax(m_viewRect.left(),
-                       m_viewRect.left() + (m_viewRect.width() - barSize.width()) / 2);
-    const int y = m_viewRect.bottom() - kBottomMarginPx - barSize.height() + 1;
-    setGeometry(QRect(QPoint(x, y), barSize));
 }
 
 void BuildButtonBar::onBuildButton(int index)

src/ui/BuildButtonBar.h

@@ -15,6 +15,7 @@
 #include "BuildingType.h"
 #include "DeconstructModeChangedEvent.h"
 #include "EventHandler.h"
+#include "FloatingPanel.h"
 #include "GameConfig.h"
 #include "UnlockedBuildingsChangedEvent.h"
 
@@ -24,10 +25,12 @@ class BuildingIconCache;
 class ItemIconCache;
 
 // The build menu: one horizontal row of build buttons floating over the game world
-// view (REQ-UI-BUILD-BAR). The bar is sized to its buttons; its owner hands it the
+// view (REQ-UI-BUILD-BAR). The bar is sized to its buttons and centers itself along the
-// world view's rect through anchorTo() and it centers itself along that rect's
+// bottom edge of the rect its owner places it in. It is placed first of the floating
-// bottom edge.
+// widgets and so takes the space it wants outright: nothing ever moves it aside, and the
+// widgets placed after it keep out of its way instead.
 class BuildButtonBar : public QWidget,
+                       public FloatingPanel,
                        public CombinedEventHandler<BuilderModeExitedEvent,
                                                    DeconstructModeChangedEvent,
                                                    BuildHotkeyPressedEvent,
@@ -45,15 +48,11 @@ public:
                    QWidget* parent = nullptr);
     ~BuildButtonBar() override;
 
-    // Centers the bar along the bottom edge of the game world view's rect, given in
+    // Centers the bar along the bottom edge of the game world view's rect, given in the
-    // the bar's parent coordinates (REQ-UI-BUILD-BAR). The rect is remembered, so a
+    // bar's parent coordinates (REQ-UI-BUILD-BAR). Nothing is occupied yet when the bar
-    // re-center later driven by an unlock needs no second call from the owner.
+    // is placed, so it ignores what it is handed there.
-    void anchorTo(const QRect& worldViewRect);
+    void placeIn(const QRect& viewRect,
-
+                 const std::vector<QRect>& occupiedRects) override;
-    // Height of the strip the bar occupies along the bottom of the world view: its own
-    // height plus the margin below it. The selection panel keeps out of this strip, and
-    // the bar never moves for the panel in return (REQ-UI-BUILD-BAR).
-    int getStripHeightPx() const;
 
     void clearActiveButton();
 
@@ -67,11 +66,6 @@ private:
     // unlock state (REQ-LOCK-BUILDING); a locked building type's button is hidden.
     void updateVisibility();
 
-    // Shrinks the bar to its currently shown buttons and re-centers it in the
-    // anchored rect (REQ-UI-BUILD-BAR). Does nothing until anchorTo() supplied that
-    // rect, so the construction-time call is harmless.
-    void recenter();
-
     void handleEvent(std::shared_ptr<const BuilderModeExitedEvent> event) override;
     void handleEvent(std::shared_ptr<const DeconstructModeChangedEvent> event) override;
     void handleEvent(std::shared_ptr<const BuildHotkeyPressedEvent> event) override;
@@ -91,5 +85,4 @@ private:
     std::map<BuildingType, int>      m_costs;
     std::optional<std::size_t>       m_activeIndex;
     QPushButton*                     m_deconstructButton;
-    QRect                            m_viewRect;
 };

src/ui/CMakeLists.txt

@@ -12,8 +12,12 @@ SET(HDRS
     ${CMAKE_CURRENT_SOURCE_DIR}/WorldPrimitives.h
     ${CMAKE_CURRENT_SOURCE_DIR}/WorldRenderer.h
     ${CMAKE_CURRENT_SOURCE_DIR}/HeaderBar.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/FloatingPanel.h
     ${CMAKE_CURRENT_SOURCE_DIR}/BuildButtonBar.h
     ${CMAKE_CURRENT_SOURCE_DIR}/SelectionPanel.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/SelectionBounds.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/ControlsPanel.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/ControlActionText.h
     ${CMAKE_CURRENT_SOURCE_DIR}/BlueprintLibrary.h
     ${CMAKE_CURRENT_SOURCE_DIR}/BlueprintSelectionDialog.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ShipLayoutDialog.h
@@ -21,7 +25,9 @@ SET(HDRS
     ${CMAKE_CURRENT_SOURCE_DIR}/ShipStatsPanel.h
     ${CMAKE_CURRENT_SOURCE_DIR}/SchematicChoiceDialog.h
     ${CMAKE_CURRENT_SOURCE_DIR}/RecipeSelectionDialog.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/RecipeTooltip.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/RecipeLineRow.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/OptionButton.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/ItemProducers.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ItemIconCache.h
     ${CMAKE_CURRENT_SOURCE_DIR}/BuildingIconCache.h
     ${CMAKE_CURRENT_SOURCE_DIR}/IconCaption.h
@@ -45,6 +51,9 @@ SET(SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/HeaderBar.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/BuildButtonBar.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/SelectionPanel.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/SelectionBounds.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/ControlsPanel.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/ControlActionText.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/BlueprintLibrary.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/BlueprintSelectionDialog.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ShipLayoutDialog.cpp
@@ -52,7 +61,9 @@ SET(SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/ShipStatsPanel.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/SchematicChoiceDialog.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/RecipeSelectionDialog.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/RecipeTooltip.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/RecipeLineRow.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/OptionButton.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/ItemProducers.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ItemIconCache.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/BuildingIconCache.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/IconCaption.cpp

src/ui/ControlActionText.cpp

@@ -0,0 +1,92 @@
+#include "ControlActionText.h"
+
+#include <QCoreApplication>
+#include <QKeySequence>
+
+namespace
+{
+
+// tr() for a file of free functions. Q_DECLARE_TR_FUNCTIONS expands with access
+// specifiers, so it needs a class rather than a namespace; this struct exists only to
+// carry it and give the strings a single lupdate context.
+struct Strings
+{
+    Q_DECLARE_TR_FUNCTIONS(ControlActionText)
+};
+
+QString getMouseBadge(MouseBinding binding)
+{
+    switch (binding)
+    {
+    case MouseBinding::LeftClick:     return Strings::tr("LMB");
+    case MouseBinding::LeftDrag:      return Strings::tr("LMB drag");
+    case MouseBinding::CtrlLeftClick: return Strings::tr("Ctrl+LMB");
+    case MouseBinding::CtrlLeftDrag:  return Strings::tr("Ctrl+LMB drag");
+    case MouseBinding::RightClick:    return Strings::tr("RMB");
+    }
+    return QString();
+}
+
+}  // namespace
+
+QString getControlBindingBadge(const ControlBinding& binding)
+{
+    if (binding.isMouse) { return getMouseBadge(binding.mouse); }
+
+    // QKeySequence spells the modifiers and the key together and localizes them, which
+    // is what makes this stay correct once keys are rebindable: the chip is generated
+    // from the binding rather than typed next to it.
+    return QKeySequence(binding.key | static_cast<int>(binding.modifiers))
+        .toString(QKeySequence::NativeText);
+}
+
+QString getControlActionLabel(ControlAction action, const ControlContext& context)
+{
+    switch (action)
+    {
+    case ControlAction::None:               return QString();
+    case ControlAction::Move:               return Strings::tr("Move");
+    case ControlAction::GameSpeed:          return Strings::tr("Game speed");
+    case ControlAction::TogglePause:        return Strings::tr("Toggle pause");
+    case ControlAction::PasteTemporary:     return Strings::tr("Paste last");
+    case ControlAction::OpenBlueprints:     return Strings::tr("Blueprints");
+    case ControlAction::OpenMenu:           return Strings::tr("Menu");
+    // A click on empty space clears and a click on an object replaces; naming only the
+    // first would be a half-truth once something is selected.
+    case ControlAction::Select:
+        return context.selection == ControlSelection::None
+                   ? Strings::tr("Select")
+                   : Strings::tr("Select / clear selection");
+    case ControlAction::SelectArea:         return Strings::tr("Select area");
+    case ControlAction::AddToSelection:     return Strings::tr("Add / remove from selection");
+    case ControlAction::AddAreaToSelection: return Strings::tr("Add area to selection");
+    case ControlAction::EnterDeconstruct:   return Strings::tr("Deconstruct mode");
+    case ControlAction::CopyTemporary:      return Strings::tr("Copy to temporary blueprint");
+    case ControlAction::CreateBlueprint:    return Strings::tr("Create blueprint");
+    case ControlAction::Place:              return Strings::tr("Place");
+    case ControlAction::ApplySettings:      return Strings::tr("Apply settings");
+    case ControlAction::PlaceBeltLine:      return Strings::tr("Place belt line");
+    case ControlAction::Rotate:             return Strings::tr("Rotate");
+    case ControlAction::CancelBeltLine:     return Strings::tr("Cancel belt line");
+    case ControlAction::ExitMode:
+        return context.mode == BuildMode::Deconstruct
+                   ? Strings::tr("Exit deconstruct mode")
+                   : Strings::tr("Exit placement");
+    case ControlAction::ToggleDeconstruct:  return Strings::tr("Toggle deconstruct");
+    case ControlAction::DeconstructArea:    return Strings::tr("Deconstruct area");
+    }
+    return QString();
+}
+
+QString getControlContextName(ControlContextKind kind)
+{
+    switch (kind)
+    {
+    case ControlContextKind::General:     return Strings::tr("GENERAL");
+    case ControlContextKind::Selection:   return Strings::tr("SELECTION");
+    case ControlContextKind::Build:       return Strings::tr("BUILD MODE");
+    case ControlContextKind::Blueprint:   return Strings::tr("BLUEPRINT MODE");
+    case ControlContextKind::Deconstruct: return Strings::tr("DECONSTRUCT MODE");
+    }
+    return QString();
+}

src/ui/ControlActionText.h

@@ -0,0 +1,26 @@
+#pragma once
+
+#include <QString>
+
+#include "ControlAction.h"
+
+// What the player is shown for the actions and bindings declared in ControlAction.h
+// (REQ-UI-CONTROLS-CONTENT). Kept out of lib/core deliberately: that file decides what
+// is available and what triggers it, this one decides what it is called, and only this
+// half is presentation.
+//
+// A badge is rendered from the binding it belongs to rather than written beside it, so
+// what the panel shows on a chip is what the resolver actually matches. When bindings
+// become player-configurable, this is the only place that has to learn to spell a
+// rebound key.
+
+// The chip text for one binding: "Ctrl+V", "LMB drag", "RMB".
+QString getControlBindingBadge(const ControlBinding& binding);
+
+// What the action is called in this context. A few actions are named for their
+// situation rather than their implementation -- one exit action reads "Exit placement"
+// in a placement mode and "Exit deconstruct mode" in deconstruct mode.
+QString getControlActionLabel(ControlAction action, const ControlContext& context);
+
+// The heading, in the upper case the card shows it in (REQ-UI-CONTROLS-CARD).
+QString getControlContextName(ControlContextKind kind);

src/ui/ControlsPanel.cpp

@@ -0,0 +1,340 @@
+#include "ControlsPanel.h"
+
+#include <QFont>
+#include <QFrame>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QMouseEvent>
+#include <QScrollArea>
+#include <QScrollBar>
+#include <QTimer>
+#include <QVBoxLayout>
+
+#include "ControlActionText.h"
+#include "EventManager.h"
+#include "FloatingLayoutInvalidatedEvent.h"
+#include "FloatingPanelPlacement.h"
+#include "GameWorldView.h"
+#include "selection/SelectionNames.h"
+
+namespace
+{
+
+const int kMarginPx      = 8;   // between the view's edge and the panel
+const int kCardMarginPx  = 8;   // inside the panel, around its content
+const int kHeadingGapPx  = 4;   // between the heading and the rows
+const int kRefreshMs     = 50;  // see the class comment on why this polls
+
+// The panel's border, from the stylesheet below. Spelled out because the stylesheet box
+// is what sets it and asking the style for it before the first show is unreliable.
+const int kBorderPx = 1;
+
+// Separates the heading's name from its detail, e.g. "BUILD MODE * Assembler".
+const QChar kHeadingSeparator(0x00B7);  // U+00B7 MIDDLE DOT
+
+// The upper-case heading and caption are tracked out a little so they read as labels
+// rather than as words. Set on the font because Qt's stylesheets have no letter-spacing
+// property -- writing one there is silently ignored apart from a warning per widget.
+QFont makeSpacedFont(QFont font, bool bold, int pointSizeDelta)
+{
+    font.setBold(bold);
+    if (pointSizeDelta != 0 && font.pointSize() > 0)
+    {
+        font.setPointSize(qMax(1, font.pointSize() + pointSizeDelta));
+    }
+    font.setLetterSpacing(QFont::AbsoluteSpacing, 1.0);
+    return font;
+}
+
+// One row: the chips for the bindings, then what the action is called. Built as a plain
+// widget rather than a class of its own -- it holds no state and answers no questions.
+QWidget* makeRow(ControlAction action, const ControlContext& context, QWidget* parent)
+{
+    QWidget*     row    = new QWidget(parent);
+    QHBoxLayout* layout = new QHBoxLayout(row);
+    layout->setContentsMargins(0, 2, 0, 2);
+    layout->setSpacing(4);
+
+    // Every badge is rendered from the binding the resolver matches, so a chip cannot
+    // claim a key that does nothing (REQ-UI-CONTROLS-ACCURACY). The chips of the row
+    // that leaves the mode are the ones marked, not its label (REQ-UI-CONTROLS-CARD).
+    const bool exitsMode = (action == ControlAction::ExitMode);
+    const std::vector<ControlBinding> bindings = getControlActionBindings(action, context);
+    for (const ControlBinding& binding : bindings)
+    {
+        QLabel* badge = new QLabel(getControlBindingBadge(binding), row);
+        badge->setObjectName(exitsMode ? QStringLiteral("controlBadgeExit")
+                                       : QStringLiteral("controlBadge"));
+        layout->addWidget(badge);
+    }
+
+    QLabel* label = new QLabel(getControlActionLabel(action, context), row);
+    label->setObjectName(QStringLiteral("controlLabel"));
+    layout->addSpacing(4);
+    layout->addWidget(label);
+    layout->addStretch(1);
+    return row;
+}
+
+// Adds a freshly built widget to the rows and shows it.
+//
+// The show is what makes it count. A widget created under an already-visible parent
+// starts hidden, and a layout treats a hidden item as empty -- it contributes nothing
+// to the size hint until something shows it, which otherwise does not happen until the
+// event loop next runs, long after the panel has measured itself.
+void addAndShow(QVBoxLayout* layout, QWidget* widget)
+{
+    layout->addWidget(widget);
+    widget->show();
+}
+
+}  // namespace
+
+ControlsPanel::ControlsPanel(const GameWorldView* view, QWidget* parent)
+    : QWidget(parent)
+    , m_view(view)
+{
+    // Floats over the rendered world, so it brings its own background to stay legible
+    // over any world content (REQ-UI-CONTROLS-PANEL). Palette colors match the build
+    // button bar's and the selection panel's chrome; like them this is widget chrome
+    // rather than world rendering, so it is deliberately not a visuals.toml color. The
+    // class scoped selector keeps the border on the panel rather than cascading onto
+    // its children.
+    setAttribute(Qt::WA_StyledBackground, true);
+    // Letter spacing is deliberately absent here: Qt's stylesheet syntax has no such
+    // property and warns on every widget it is applied to. The heading and the caption
+    // set it on their QFont instead.
+    setStyleSheet(QStringLiteral(
+        "ControlsPanel { background-color: palette(window);"
+        " border: 1px solid palette(mid); border-radius: 4px; }"
+        "QLabel#controlHeading { color: palette(text); }"
+        "QLabel#controlBadge { border: 1px solid palette(mid); border-radius: 3px;"
+        " padding: 1px 5px; font-family: monospace; color: palette(text); }"
+        "QLabel#controlLabel { color: palette(text); }"
+        // The row that leaves the mode is marked on its chips rather than its label
+        // (REQ-UI-CONTROLS-CARD): the label keeps the ordinary text color, so the row
+        // stays legible whatever the palette, and only the chips carry the warning.
+        //
+        // A literal red because there is no palette role for "destructive" -- the
+        // nearest, bright-text, is white by design, being meant for text over dark
+        // highlights, and was unreadable on this panel's chrome. This value reads on a
+        // light and a dark background alike. It is widget chrome, so like the rest of
+        // this stylesheet it is deliberately not a visuals.toml color.
+        "QLabel#controlBadgeExit { border: 1px solid #c0392b; border-radius: 3px;"
+        " padding: 1px 5px; font-family: monospace; color: #c0392b; }"
+        "QLabel#controlCaption { color: palette(mid); }"));
+
+    QVBoxLayout* outerLayout = new QVBoxLayout(this);
+    outerLayout->setContentsMargins(kCardMarginPx, kCardMarginPx,
+                                    kCardMarginPx, kCardMarginPx);
+    outerLayout->setSpacing(kHeadingGapPx);
+
+    m_heading = new QLabel(this);
+    m_heading->setObjectName(QStringLiteral("controlHeading"));
+    m_heading->setCursor(Qt::PointingHandCursor);
+    m_heading->setFont(makeSpacedFont(font(), /*bold*/ true, /*pointSizeDelta*/ 0));
+    outerLayout->addWidget(m_heading);
+
+    // Rows taller than the space available scroll rather than being cut off
+    // (REQ-UI-CONTROLS-PANEL). The viewport is transparent so the panel's own rounded
+    // chrome shows through, and horizontal scrolling is off because the width always
+    // follows the content.
+    m_rows       = new QWidget(this);
+    m_rowsLayout = new QVBoxLayout(m_rows);
+    m_rowsLayout->setContentsMargins(0, 0, 0, 0);
+    m_rowsLayout->setSpacing(0);
+    m_rows->setAutoFillBackground(false);
+
+    m_scrollArea = new QScrollArea(this);
+    m_scrollArea->setFrameShape(QFrame::NoFrame);
+    m_scrollArea->setWidgetResizable(true);
+    m_scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    m_scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+    m_scrollArea->viewport()->setAutoFillBackground(false);
+    m_scrollArea->setWidget(m_rows);
+    outerLayout->addWidget(m_scrollArea);
+
+    // Polling rather than subscribing; see the class comment.
+    m_refreshTimer = new QTimer(this);
+    connect(m_refreshTimer, &QTimer::timeout, this, &ControlsPanel::refresh);
+    m_refreshTimer->start(kRefreshMs);
+
+    refresh();
+}
+
+void ControlsPanel::invalidateLayout()
+{
+    EventManager::getInstance()->sendEventImmediately(
+        std::make_shared<FloatingLayoutInvalidatedEvent>());
+}
+
+void ControlsPanel::mousePressEvent(QMouseEvent* event)
+{
+    // Only the heading toggles; a click anywhere else is swallowed so it never reaches
+    // the world beneath (REQ-UI-CONTROLS-PANEL).
+    if (m_heading->geometry().contains(event->pos()))
+    {
+        m_collapsed = !m_collapsed;
+        m_scrollArea->setVisible(!m_collapsed);
+        invalidateLayout();
+    }
+    event->accept();
+}
+
+void ControlsPanel::refresh()
+{
+    if (!m_view) { return; }
+
+    const ControlContext context = m_view->getControlContext();
+
+    const QString                    heading = getHeadingText(context);
+    const std::vector<ControlAction> contextActions = getContextActions(context);
+    const std::vector<ControlAction> alwaysActions  = getAlwaysAvailableActions(context);
+
+    if (heading == m_shownHeading && contextActions == m_shownContextActions
+        && alwaysActions == m_shownAlwaysActions)
+    {
+        return;
+    }
+
+    m_shownHeading        = heading;
+    m_shownContextActions = contextActions;
+    m_shownAlwaysActions  = alwaysActions;
+    rebuild(context);
+}
+
+void ControlsPanel::rebuild(const ControlContext& context)
+{
+    m_heading->setText(m_shownHeading);
+
+    // Rows are rebuilt wholesale rather than reconciled: a context change replaces
+    // nearly all of them, and the panel redraws only when something actually changed.
+    while (QLayoutItem* item = m_rowsLayout->takeAt(0))
+    {
+        delete item->widget();
+        delete item;
+    }
+
+    for (ControlAction action : m_shownContextActions)
+    {
+        addAndShow(m_rowsLayout, makeRow(action, context, m_rows));
+    }
+
+    // The always-available block sits under a divider in every context, the General one
+    // included, so the card is read the same way wherever the player is
+    // (REQ-UI-CONTROLS-CARD).
+    if (!m_shownAlwaysActions.empty())
+    {
+        QFrame* divider = new QFrame(m_rows);
+        divider->setFrameShape(QFrame::HLine);
+        divider->setFrameShadow(QFrame::Plain);
+        m_rowsLayout->addSpacing(6);
+        addAndShow(m_rowsLayout, divider);
+
+        QLabel* caption = new QLabel(tr("ALWAYS AVAILABLE"), m_rows);
+        caption->setObjectName(QStringLiteral("controlCaption"));
+        caption->setFont(makeSpacedFont(font(), /*bold*/ false, /*pointSizeDelta*/ -1));
+        addAndShow(m_rowsLayout, caption);
+    }
+
+    for (ControlAction action : m_shownAlwaysActions)
+    {
+        addAndShow(m_rowsLayout, makeRow(action, context, m_rows));
+    }
+
+    m_scrollArea->setVisible(!m_collapsed);
+    invalidateLayout();
+}
+
+QString ControlsPanel::getHeadingText(const ControlContext& context) const
+{
+    const ControlContextKind kind = getControlContextKind(context);
+    const QString            name = getControlContextName(kind);
+
+    QString detail;
+    switch (kind)
+    {
+    case ControlContextKind::Build:
+        detail = getBuildingTypeName(context.builderType);
+        break;
+    case ControlContextKind::Blueprint:
+    {
+        // The temporary blueprint is never named (REQ-UI-BLUEPRINT-TEMP), so it is
+        // labelled by what it is rather than left blank.
+        const QString blueprintName = m_view->getActiveBlueprintName();
+        detail = blueprintName.isEmpty() ? tr("Temporary") : blueprintName;
+        break;
+    }
+    case ControlContextKind::Selection:
+        detail = context.selection == ControlSelection::Buildings
+                     ? tr("%n building(s)", "", context.selectionCount)
+                     : tr("%n object(s)", "", context.selectionCount);
+        break;
+    case ControlContextKind::General:
+    case ControlContextKind::Deconstruct:
+        break;
+    }
+
+    if (detail.isEmpty()) { return name; }
+    return name + QStringLiteral(" ") + kHeadingSeparator + QStringLiteral(" ") + detail;
+}
+
+void ControlsPanel::placeIn(const QRect& viewRect, const std::vector<QRect>& occupiedRects)
+{
+    if (viewRect.isNull()) { return; }
+
+    // Rows are torn down and rebuilt wholesale, and a widget added to a layout is only
+    // shown once that layout runs -- without this the new rows count for nothing and
+    // the card is measured for the context before it. The polish belongs to the same
+    // step: a freshly created label reports an unstyled size hint until the stylesheet
+    // has reached it, and the badge chips carry border and padding that change it.
+    m_rows->ensurePolished();
+    m_rowsLayout->invalidate();
+    m_rowsLayout->activate();
+
+    const QRect band = viewRect.adjusted(kMarginPx, kMarginPx, -kMarginPx, -kMarginPx);
+    if (band.width() <= 0 || band.height() <= 0) { return; }
+
+    // Measured from the heading and the rows directly rather than from the panel's own
+    // layout: the rows now sit in a scroll area, whose size hint describes a viewport
+    // and says nothing about how tall its contents are. Deliberately not activating the
+    // panel's own layout either -- that lays its children out inside the geometry left
+    // over from the previous context, which is the wrong frame of reference for
+    // choosing the new one. setGeometry below re-runs it.
+    const int   chromePx    = 2 * (kCardMarginPx + kBorderPx);
+    const QSize headingHint = m_heading->sizeHint();
+    const QSize rowsHint    = m_rows->sizeHint();
+
+    int contentWidthPx  = headingHint.width();
+    int contentHeightPx = headingHint.height();
+    if (!m_collapsed)
+    {
+        contentWidthPx  = qMax(contentWidthPx, rowsHint.width());
+        contentHeightPx += kHeadingGapPx + rowsHint.height();
+    }
+    const int wantedHeightPx = contentHeightPx + chromePx;
+
+    // The bottom-left corner of the view, growing upward as rows are added
+    // (REQ-UI-CONTROLS-PANEL).
+    int widthPx = qMin(contentWidthPx + chromePx, band.width());
+
+    // The build button bar is centered and sized to its buttons, so it usually leaves
+    // this corner free and the panel can share the bottom edge with it. Only where the
+    // two would actually meet does the panel rise, clearing the bar's top by the same
+    // margin it keeps from the view's edges (REQ-UI-BUILD-BAR). The bar is the only
+    // widget placed before this one, so it is the only rect that can be in the way.
+    const int bottomPx = getAvailableBottomPx(band, occupiedRects, band.left(),
+                                              band.left() + widthPx - 1, kMarginPx);
+    int heightPx = qMin(wantedHeightPx, qMax(0, bottomPx - band.top() + 1));
+    int topPx    = bottomPx - heightPx + 1;
+
+    // Whatever the rows lost to either cap, they scroll for. The scrollbar needs its
+    // own width, or it would appear over the labels.
+    if (heightPx < wantedHeightPx)
+    {
+        widthPx = qMin(widthPx + m_scrollArea->verticalScrollBar()->sizeHint().width(),
+                       band.width());
+    }
+
+    setGeometry(band.left(), topPx, widthPx, heightPx);
+}

src/ui/ControlsPanel.h

@@ -0,0 +1,87 @@
+#pragma once
+
+#include <vector>
+
+#include <QRect>
+#include <QString>
+#include <QWidget>
+
+#include "ControlAction.h"
+#include "FloatingPanel.h"
+
+class GameWorldView;
+class QLabel;
+class QScrollArea;
+class QTimer;
+class QVBoxLayout;
+
+// Shows the controls available in the player's current situation
+// (REQ-UI-CONTROLS-PANEL). The panel decides nothing: which rows apply is
+// ControlAction.h's answer, the same one the key handling and the world view's mouse
+// dispatch act on, so what is shown and what happens cannot part company
+// (REQ-UI-CONTROLS-ACCURACY).
+//
+// It floats over the game world at the left edge, bottom-aligned within the band its
+// owner hands it, and collapses to its heading when the heading is clicked.
+//
+// Refreshed on a timer rather than by subscribing to events: two of the things that
+// change a row -- a belt drag starting, the ghost moving over a transfer target --
+// happen on mouse movement and publish nothing, and they still have to be reflected
+// while the game is paused, so there is no tick to hang it on either. The rebuild is
+// skipped unless the resolved content actually differs, which is a vector of enums to
+// compare.
+class ControlsPanel : public QWidget, public FloatingPanel
+{
+    Q_OBJECT
+
+public:
+    // Neither pointer is owned; both must outlive this widget. The view is the source
+    // of the control context, being the widget that owns the build mode and the
+    // selection.
+    ControlsPanel(const GameWorldView* view, QWidget* parent = nullptr);
+
+    // Places the panel in the bottom-left corner of the game world view. It shares the
+    // bottom edge with the build button bar rather than clearing its strip, the bar
+    // being centered and sized to its buttons and so usually leaving the left free; it
+    // rises above the bar only when the two would otherwise overlap
+    // (REQ-UI-CONTROLS-PANEL, REQ-UI-BUILD-BAR). The bar is the only thing placed before
+    // it, so it is the only rect it ever has to rise above.
+    void placeIn(const QRect& viewRect,
+                 const std::vector<QRect>& occupiedRects) override;
+
+protected:
+    // Clicking the heading collapses and expands the panel (REQ-UI-CONTROLS-PANEL).
+    void mousePressEvent(QMouseEvent* event) override;
+
+private:
+    // Re-resolves the context and rebuilds only if the rows or the heading changed.
+    void refresh();
+    // Replaces the rows with those of the current context.
+    void rebuild(const ControlContext& context);
+    // The heading's "<name> * <detail>" text for the context, detail omitted when the
+    // context has none.
+    QString getHeadingText(const ControlContext& context) const;
+    // Asks for the placement pass to be re-run, the panel's own size having changed.
+    void invalidateLayout();
+
+    const GameWorldView* m_view;
+
+    QLabel*      m_heading;
+    // Scrolls the rows once they outgrow the space the panel has (REQ-UI-CONTROLS-PANEL).
+    // The heading is deliberately outside it, so it stays put and stays clickable.
+    QScrollArea* m_scrollArea;
+    QWidget*     m_rows;
+    QVBoxLayout* m_rowsLayout;
+    QTimer*      m_refreshTimer;
+
+    // What is currently drawn, so a refresh that resolves to the same thing does
+    // nothing. The always-available block is kept separately because the divider
+    // between the two is part of what is drawn.
+    QString                    m_shownHeading;
+    std::vector<ControlAction> m_shownContextActions;
+    std::vector<ControlAction> m_shownAlwaysActions;
+
+    // Survives context changes and simulation restarts; presentation only, never a
+    // command (REQ-UI-CONTROLS-PANEL).
+    bool m_collapsed = false;
+};

src/ui/FloatingPanel.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include <vector>
+
+#include <QRect>
+
+// A widget floating over the game world view (REQ-UI-WORLD-SIZE). MainWindow places all
+// of them in one ordered pass -- build button bar, then controls panel, then selection
+// panel -- and each places itself into the space the earlier ones have not taken. The
+// order is the priority the requirements state: the bar never moves for anyone
+// (REQ-UI-BUILD-BAR), the controls panel steps around the bar (REQ-UI-CONTROLS-PANEL),
+// and keeping clear of both is the selection panel's job (REQ-UI-SELECTION-PANEL).
+//
+// A widget never re-places itself, because what it may take depends on the widgets placed
+// before it. It instead publishes FloatingLayoutInvalidatedEvent whenever its content or
+// its visibility changed, and the owner re-runs the whole pass.
+class FloatingPanel
+{
+public:
+    virtual ~FloatingPanel() = default;
+
+    // Sets this widget's own geometry within viewRect, keeping clear of occupiedRects --
+    // the geometry of every floating widget already placed in this pass, in the same
+    // coordinates. A widget with nothing to show hides itself and takes no space.
+    virtual void placeIn(const QRect& viewRect,
+                         const std::vector<QRect>& occupiedRects) = 0;
+};

src/ui/GameWorldView.cpp

@@ -1,6 +1,7 @@
 #include "GameWorldView.h"
 #include "PlacementRules.h"
 #include "FactoryQueries.h"
+#include "BlueprintLibrary.h"
 
 #include <algorithm>
 #include <cctype>
@@ -46,6 +47,8 @@
 #include "ItemIconCache.h"
 #include "PositionComponent.h"
 #include "DebrisSystem.h"
+#include "SelectionAnchorChangedEvent.h"
+#include "SelectionBounds.h"
 #include "SelectionChangedEvent.h"
 #include "ShipIdentityComponent.h"
 #include "ShipSystem.h"
@@ -73,6 +76,23 @@
 namespace
 {
 
+// The action a left-button gesture triggers, with the Ctrl variant falling back to the
+// plain one wherever nothing is bound to it. That fallback is what keeps Ctrl+click
+// placing a building in builder mode and Ctrl+drag deconstructing an area: the modifier
+// only means something where an action claims it (REQ-UI-CONTROLS-CONTENT).
+ControlAction resolveLeftGesture(bool controlHeld, bool isDrag,
+                                 const ControlContext& context)
+{
+    if (controlHeld)
+    {
+        const ControlAction action = resolveMouseAction(
+            isDrag ? MouseBinding::CtrlLeftDrag : MouseBinding::CtrlLeftClick, context);
+        if (action != ControlAction::None) { return action; }
+    }
+    return resolveMouseAction(isDrag ? MouseBinding::LeftDrag : MouseBinding::LeftClick,
+                              context);
+}
+
 // Keep only the filter entries whose item type is currently unlocked
 // (REQ-LOCK-UI-BLUEPRINT). An empty result means "accept all".
 std::vector<ItemType> filterUnlockedItems(const std::vector<ItemType>& filter,
@@ -1075,7 +1095,7 @@ void GameWorldView::keyPressEvent(QKeyEvent* event)
     // Keys are turned into actions and published by the input mapper
     // (REQ-UI-HOTKEYS); this widget reacts to those as an ordinary subscriber, so
     // nothing is handled here directly.
-    if (m_inputMapper.handleKeyPress(event)) { return; }
+    if (m_inputMapper.handleKeyPress(event, getControlContext())) { return; }
 
     QOpenGLWidget::keyPressEvent(event);
 }
@@ -1087,7 +1107,7 @@ void GameWorldView::keyReleaseEvent(QKeyEvent* event)
         QOpenGLWidget::keyReleaseEvent(event);
         return;
     }
-    if (m_inputMapper.handleKeyRelease(event)) { return; }
+    if (m_inputMapper.handleKeyRelease(event, getControlContext())) { return; }
     QOpenGLWidget::keyReleaseEvent(event);
 }
 
@@ -1101,36 +1121,93 @@ void GameWorldView::focusOutEvent(QFocusEvent* event)
     QOpenGLWidget::focusOutEvent(event);
 }
 
+void GameWorldView::setBlueprintLibrary(const BlueprintLibrary* library)
+{
+    m_blueprintLibrary = library;
+}
+
+ControlContext GameWorldView::getControlContext() const
+{
+    ControlContext context;
+    context.mode                   = m_buildMode.getMode();
+    context.draggingBelt           = m_buildMode.isDraggingBelt();
+    context.hoveredGhostIsTransfer = m_buildMode.isHoveredGhostTransfer();
+    if (m_buildMode.isBuilderMode()) { context.builderType = m_buildMode.getBuilderType(); }
+
+    // Buildings win over field objects, so the two are never both non-empty
+    // (REQ-UI-SELECTION-CATEGORIES).
+    const std::vector<BuildingId>&   buildings = m_selection.getSelectedBuildings();
+    const std::vector<entt::entity>& actors    = m_selection.getSelectedActors();
+    const std::vector<entt::entity>& debris    = m_selection.getSelectedDebris();
+    if (!buildings.empty())
+    {
+        context.selection      = ControlSelection::Buildings;
+        context.selectionCount = static_cast<int>(buildings.size());
+    }
+    else if (!actors.empty() || !debris.empty())
+    {
+        context.selection      = ControlSelection::FieldObjects;
+        context.selectionCount = static_cast<int>(actors.size() + debris.size());
+    }
+
+    if (m_blueprintLibrary)
+    {
+        context.placeableBuildingSelected = m_blueprintLibrary->getCanCaptureSelection();
+        context.temporaryBlueprintExists  = m_blueprintLibrary->getHasTemporaryBlueprint();
+    }
+    return context;
+}
+
+QString GameWorldView::getActiveBlueprintName() const
+{
+    if (!m_buildMode.isBlueprintMode()) { return QString(); }
+    return m_buildMode.getBlueprint().name;
+}
+
 void GameWorldView::mousePressEvent(QMouseEvent* event)
 {
     const WorldCoordinates coordinates = getCoordinates();
+    const ControlContext   context     = getControlContext();
 
     if (event->button() != Qt::LeftButton)
     {
         if (event->button() == Qt::RightButton)
         {
-            if (m_buildMode.isBuilderMode() && m_buildMode.isDraggingBelt())
+            switch (resolveMouseAction(MouseBinding::RightClick, context))
             {
-                // Cancel the in-progress belt drag without placing anything;
+            case ControlAction::CancelBeltLine:
-                // stay in belt builder mode (REQ-BLD-BELT-DRAG).
+                // Drop the in-progress path without placing anything; belt builder
+                // mode stays active (REQ-BLD-BELT-DRAG).
                 m_buildMode.cancelBeltDrag();
-            }
+                break;
-            else if (m_buildMode.getMode() != BuildMode::None)
+            case ControlAction::ExitMode:
-            {
                 m_buildMode.exitCurrentMode();
+                break;
+            default:
+                break;
             }
         }
         return;
     }
 
     const QPoint tile = coordinates.widgetToTile(event->pos());
+    const bool   controlHeld = (event->modifiers() & Qt::ControlModifier) != 0;
 
-    if (m_buildMode.isBuilderMode())
+    // A press begins the click gesture; whether it turns out to be a drag is settled on
+    // release, where the drag binding is resolved instead.
+    switch (resolveLeftGesture(controlHeld, /*isDrag*/ false, context))
     {
-        if (m_buildMode.getBuilderType() == BuildingType::Belt)
+    case ControlAction::Place:
+    case ControlAction::ApplySettings:
+        if (m_buildMode.isBlueprintMode())
         {
-            // Deferred placement: start the drag and show the path ghost; nothing
+            placeBlueprintAtTile(tile);
-            // is placed until release (REQ-BLD-BELT-DRAG).
+        }
+        else if (m_buildMode.getBuilderType() == BuildingType::Belt)
+        {
+            // Belts place by dragging, so the press only anchors the path and shows its
+            // ghost; nothing is placed until release, and a plain click is the one-tile
+            // case (REQ-BLD-BELT-DRAG).
             m_buildMode.beginBeltDrag(tile);
             m_cursorWorldPos = coordinates.widgetToWorld(event->pos());
             recomputeBeltDragPath(tile);
@@ -1139,27 +1216,22 @@ void GameWorldView::mousePressEvent(QMouseEvent* event)
         {
             placeAtTile(tile);
         }
-    }
+        break;
-    else if (m_buildMode.isBlueprintMode())
+
-    {
+    case ControlAction::ToggleDeconstruct:
-        placeBlueprintAtTile(tile);
-    }
-    else if (m_buildMode.isDeconstructMode())
-    {
         // Start a deconstruct box drag; a plain click resolves as a 1x1 box on
         // release (REQ-BLD-DECONSTRUCT-CLICK, REQ-BLD-DECONSTRUCT-BOX).
         m_boxSelecting   = true;
         m_boxStartTile   = tile;
         m_boxCurrentTile = tile;
-    }
+        break;
-    else
-    {
-        const bool ctrl = (event->modifiers() & Qt::ControlModifier) != 0;
 
+    case ControlAction::Select:
+    case ControlAction::AddToSelection:
         // Only a click that hit nothing starts a box drag. Starting one on a hit
         // would re-resolve the same object as a 1x1 box on release and undo the
         // click: a Ctrl+click would toggle the building off, then straight back on.
-        if (!selectAtPoint(tile, coordinates.widgetToWorld(event->pos()), ctrl))
+        if (!selectAtPoint(tile, coordinates.widgetToWorld(event->pos()), controlHeld))
         {
             // selectAtPoint has already cleared the selection unless Ctrl is
             // preserving it for an additive drag.
@@ -1167,6 +1239,10 @@ void GameWorldView::mousePressEvent(QMouseEvent* event)
             m_boxStartTile    = tile;
             m_boxCurrentTile  = tile;
         }
+        break;
+
+    default:
+        break;
     }
 }
 
@@ -1181,6 +1257,7 @@ bool GameWorldView::selectAtPoint(QPoint tile, QVector2D worldPos, bool additive
     if (!buildingHit.has_value()) { buildingHit = siteAtTile(tile); }
     if (buildingHit.has_value())
     {
+        publishSelectionAnchor(mode, {*buildingHit}, {}, {});
         m_selection.selectBuildings({*buildingHit}, mode);
         return true;
     }
@@ -1188,6 +1265,7 @@ bool GameWorldView::selectAtPoint(QPoint tile, QVector2D worldPos, bool additive
     const entt::entity actorHit = entityAtWorldPos(m_sim->getAdmin(), worldPos);
     if (actorHit != entt::null)
     {
+        publishSelectionAnchor(mode, {}, {actorHit}, {});
         m_selection.selectFieldObjects({actorHit}, {}, mode);
         return true;
     }
@@ -1195,6 +1273,7 @@ bool GameWorldView::selectAtPoint(QPoint tile, QVector2D worldPos, bool additive
     const entt::entity debrisHit = debrisAtWorldPos(m_sim->getAdmin(), worldPos);
     if (debrisHit != entt::null)
     {
+        publishSelectionAnchor(mode, {}, {}, {debrisHit});
         m_selection.selectFieldObjects({}, {debrisHit}, mode);
         return true;
     }
@@ -1215,6 +1294,7 @@ void GameWorldView::selectInBox(bool additive)
         buildingsInBox(m_sim->getFactoryState(), m_boxStartTile, m_boxCurrentTile);
     if (!boxIds.empty())
     {
+        publishSelectionAnchor(mode, boxIds, {}, {});
         m_selection.selectBuildings(boxIds, mode);
         return;
     }
@@ -1225,6 +1305,7 @@ void GameWorldView::selectInBox(bool additive)
         debrisInBox(m_sim->getAdmin(), m_boxStartTile, m_boxCurrentTile);
     if (!boxActors.empty() || !boxDebris.empty())
     {
+        publishSelectionAnchor(mode, {}, boxActors, boxDebris);
         m_selection.selectFieldObjects(boxActors, boxDebris, mode);
         return;
     }
@@ -1233,6 +1314,35 @@ void GameWorldView::selectInBox(bool additive)
     if (!additive) { m_selection.clearAll(); }
 }
 
+void GameWorldView::publishSelectionAnchor(SelectionMode mode,
+                                           const std::vector<BuildingId>& buildings,
+                                           const std::vector<entt::entity>& actors,
+                                           const std::vector<entt::entity>& debris)
+{
+    // An additive gesture onto something already selected is growing that selection, not
+    // starting one, and the panel stays where it was put (REQ-UI-SELECTION-PANEL).
+    const bool startsSelection =
+        (mode == SelectionMode::Replace) || (m_selection.getSelectedBuildings().empty()
+                                             && m_selection.getSelectedActors().empty()
+                                             && m_selection.getSelectedDebris().empty());
+    if (!startsSelection)
+    {
+        return;
+    }
+
+    // Screen space, frozen here: the panel is placed against where the selection is at
+    // this moment and stays there, however far the view scrolls or the objects move
+    // afterwards.
+    const QRect anchorRect = getSelectionWidgetRect(*m_sim, getCoordinates(),
+                                                    buildings, actors, debris);
+    if (anchorRect.isNull())
+    {
+        return;
+    }
+    EventManager::getInstance()->sendEventImmediately(
+        std::make_shared<SelectionAnchorChangedEvent>(anchorRect));
+}
+
 void GameWorldView::mouseMoveEvent(QMouseEvent* event)
 {
     const WorldCoordinates coordinates = getCoordinates();
@@ -1263,6 +1373,21 @@ void GameWorldView::mouseMoveEvent(QMouseEvent* event)
     else if (m_buildMode.isBlueprintMode())
     {
         m_buildMode.setBlueprintGhostTile(tile);
+
+        // Resolved here, once, through the same classifier the click and the ghost's
+        // colour use, and stored on the mode: the controls panel says "Apply settings"
+        // exactly when clicking would transfer (REQ-UI-BLUEPRINT-TRANSFER). Only a
+        // single-building blueprint hit-tests the cursor, so only it can be a hovered
+        // transfer target.
+        const std::vector<BlueprintBuilding>& buildings =
+            m_buildMode.getBlueprint().buildings;
+        bool transfer = false;
+        if (buildings.size() == 1)
+        {
+            transfer = resolveBlueprintGhostHere(buildings.front(), tile).action
+                       == BlueprintGhostAction::Transfer;
+        }
+        m_buildMode.setHoveredGhostTransfer(transfer);
     }
     else if (m_buildMode.isDeconstructMode())
     {
@@ -1294,7 +1419,11 @@ void GameWorldView::mouseReleaseEvent(QMouseEvent* event)
         const std::vector<BuildingId> boxIds =
             buildingsInBox(m_sim->getFactoryState(), m_boxStartTile, m_boxCurrentTile);
 
-        if (m_buildMode.isDeconstructMode())
+        const bool controlHeld = (event->modifiers() & Qt::ControlModifier) != 0;
+        const ControlAction dragAction =
+            resolveLeftGesture(controlHeld, /*isDrag*/ true, getControlContext());
+
+        if (dragAction == ControlAction::DeconstructArea)
         {
             const FactoryState& factory = m_sim->getFactoryState();
 
@@ -1356,7 +1485,9 @@ void GameWorldView::mouseReleaseEvent(QMouseEvent* event)
             return;
         }
 
-        selectInBox((event->modifiers() & Qt::ControlModifier) != 0);
+        // A Ctrl box adds and never deselects, where a plain one replaces
+        // (REQ-UI-MULTI-SELECT).
+        selectInBox(dragAction == ControlAction::AddAreaToSelection);
     }
 }
 

src/ui/GameWorldView.h

@@ -64,6 +64,7 @@
 
 struct Command;
 struct ParsedReplay;
+class BlueprintLibrary;
 class ItemIconCache;
 class ReplayPlayer;
 class Simulation;
@@ -102,6 +103,21 @@ public:
     void setGameSpeed(double multiplier);
     void resetForNewGame();
 
+    // The blueprint library is constructed after this widget, so it arrives by setter.
+    // Not owned; supplies the two facts about blueprints that the control context needs
+    // (REQ-UI-CONTROLS-CONTENT).
+    void setBlueprintLibrary(const BlueprintLibrary* library);
+
+    // The player's current situation, as the one snapshot every reader of the control
+    // table works from: this widget's own mouse dispatch, the input mapper, and the
+    // controls panel (REQ-UI-CONTROLS-CONTENT). Built here because this widget owns the
+    // build mode and the selection.
+    ControlContext getControlContext() const;
+
+    // Name of the blueprint being placed, for the controls panel's heading. Empty while
+    // no blueprint is active and for the unnamed temporary one (REQ-UI-BLUEPRINT-TEMP).
+    QString getActiveBlueprintName() const;
+
 protected:
     void initializeGL() override;
     void paintGL() override;
@@ -210,6 +226,15 @@ private:
     // which is the only case that goes on to start a box drag.
     bool                     selectAtPoint(QPoint tile, QVector2D worldPos, bool additive);
     void                     selectInBox(bool additive);
+    // Publishes where on the screen the selection about to be made sits, so the
+    // selection panel can be placed beside it (REQ-UI-SELECTION-PANEL). Called with
+    // what is about to be selected, immediately before selecting it, and publishes
+    // nothing unless that selection is starting rather than growing.
+    void                     publishSelectionAnchor(
+                                 SelectionMode mode,
+                                 const std::vector<BuildingId>& buildings,
+                                 const std::vector<entt::entity>& actors,
+                                 const std::vector<entt::entity>& debris);
     void                     stepSpeed(int delta);
     void                     placeAtTile(QPoint tile);
 
@@ -280,6 +305,8 @@ private:
     // between them (REQ-UI-SELECTION-CATEGORIES), including publishing the change
     // events. This widget only resolves what was hit.
     SelectionController   m_selection;
+    // Not owned; set after construction, so null until MainWindow has built it.
+    const BlueprintLibrary* m_blueprintLibrary = nullptr;
     bool                  m_boxSelecting;
     QPoint                m_boxStartTile;
     QPoint                m_boxCurrentTile;

src/ui/HeaderBar.cpp

@@ -3,7 +3,6 @@
 #include <cmath>
 #include <string>
 
-#include <QFontMetrics>
 #include <QHBoxLayout>
 #include <QIcon>
 #include <QLabel>
@@ -120,19 +119,11 @@ void HeaderBar::handleEvent(std::shared_ptr<const ExpansionCostChangedEvent> /*e
     updateExpandButton();
 }
 
-QPixmap HeaderBar::blockIcon() const
-{
-    if (!m_itemIcons->hasIcon(kBlockItemId)) { return QPixmap(); }
-    // Sized to the header text height so it sits inline with the caption.
-    const int sizePx = QFontMetrics(font()).height();
-    return m_itemIcons->getPixmap(kBlockItemId, sizePx);
-}
-
 void HeaderBar::updateBlocksLabel()
 {
     const int blocks = m_sim->getBuildingBlocksStock();
 
-    const QPixmap icon = blockIcon();
+    const QPixmap icon = m_itemIcons->getInlineIcon(kBlockItemId, font());
     if (icon.isNull())
     {
         // Fallback text form when no building_block icon exists (REQ-UI-BLOCKS-ICON).
@@ -151,7 +142,7 @@ void HeaderBar::updateExpandButton()
 
     m_expandButton->setEnabled(blocks >= expansionCost);
 
-    const QPixmap icon = blockIcon();
+    const QPixmap icon = m_itemIcons->getInlineIcon(kBlockItemId, font());
     if (icon.isNull())
     {
         // Fallback text form when no building_block icon exists (REQ-UI-EXPAND-BUTTON).

src/ui/HeaderBar.h

@@ -61,10 +61,6 @@ private:
     // (REQ-UI-BLOCKS-ICON).
     void updateBlocksLabel();
 
-    // The building_block icon at the header's text height, or a null pixmap when no
-    // icon file exists. Loaded once via m_itemIcons on first use.
-    QPixmap blockIcon() const;
-
     QLabel*                  m_timeLabel;
     QLabel*                  m_blocksLabel;
     QLabel*                  m_artifactsLabel;

src/ui/IconCaption.h

@@ -21,8 +21,11 @@ QPixmap renderCaptionWithIcon(const QString& text, const QPixmap& icon,
 // their raw size is not the size to lay them out at.
 QSize getLogicalSize(const QPixmap& pixmap);
 
-// Item id of the building blocks resource, whose icon stands in for the "Blocks"
+// The items whose icons stand in for their names beside a number, drawn bare and without
-// word wherever a cost or stock is captioned (REQ-UI-BLOCKS-ICON, REQ-UI-BUILD-COST,
+// their colored square (REQ-UI-ITEM-ICON): building blocks beside a cost or a stock
-// REQ-UI-EXPAND-BUTTON). It lives next to the caption helper because every caller of
+// (REQ-UI-BLOCKS-ICON, REQ-UI-BUILD-COST, REQ-UI-EXPAND-BUTTON), and scrap beside the
-// one is a caller of the other.
+// amount left in debris (REQ-UI-DEBRIS-PANEL, REQ-UI-FIELD-MULTI-SELECTION). They live
+// next to the caption helper because every caller of one is a caller of the other;
+// ItemIconCache::getInlineIcon() is what turns an id here into that icon.
 const char* const kBlockItemId = "building_block";
+const char* const kScrapItemId = "scrap";

src/ui/InputMapper.cpp

@@ -9,6 +9,7 @@
 #include "BlueprintSelectionRequestedEvent.h"
 #include "BuildHotkeyPressedEvent.h"
 #include "BuildingType.h"
+#include "ControlAction.h"
 #include "DebugDrawToggleRequestedEvent.h"
 #include "EscapeMenuRequestedEvent.h"
 #include "EventManager.h"
@@ -77,7 +78,7 @@ QString InputMapper::getBuildHotkeyLabel(BuildingType type)
     return QString();
 }
 
-bool InputMapper::handleKeyPress(QKeyEvent* event)
+bool InputMapper::handleKeyPress(QKeyEvent* event, const ControlContext& context)
 {
     // Auto-repeat says nothing new about which keys are down, and a held action is
     // already held.
@@ -86,6 +87,9 @@ bool InputMapper::handleKeyPress(QKeyEvent* event)
     // Number-key build-mode hotkeys (REQ-UI-HOTKEYS). nativeVirtualKey gives the
     // physical digit independent of keyboard layout and Shift (with Shift held, key()
     // for the number row can arrive as Key_Exclam etc.). VK_1..VK_9 = 0x31..0x39.
+    // Not part of the ControlAction table: these are advertised on the build buttons
+    // rather than in the controls panel, and getBuildHotkeyLabel already reads the
+    // same binding table this does (REQ-UI-CONTROLS-ACCURACY).
     const quint32 virtualKey = event->nativeVirtualKey();
     if (virtualKey >= 0x31 && virtualKey <= 0x39)
     {
@@ -100,107 +104,102 @@ bool InputMapper::handleKeyPress(QKeyEvent* event)
         }
     }
 
-    // Blueprint chords (REQ-UI-HOTKEYS). Checked ahead of the plain-key switch below,
+    // Development controls, deliberately outside the table so they are never offered
-    // which binds bare A/D/W/S/R/Q/C/V and must not fire on a Ctrl chord -- bare C and V
+    // to the player (REQ-UI-CONTROLS-ACCURACY).
-    // are the temporary-blueprint counterparts of these two (REQ-UI-BLUEPRINT-TEMP). Both
-    // requests are decided by MainWindow, the only widget that can pause the game and dim
-    // the window for a modal.
-    if ((event->modifiers() & Qt::ControlModifier) != 0)
-    {
-        switch (event->key())
-        {
-        case Qt::Key_C:
-            EventManager::getInstance()->sendEventImmediately(
-                std::make_shared<BlueprintSaveRequestedEvent>());
-            return true;
-        case Qt::Key_V:
-            EventManager::getInstance()->sendEventImmediately(
-                std::make_shared<BlueprintSelectionRequestedEvent>());
-            return true;
-        default:
-            break;
-        }
-    }
-
     switch (event->key())
     {
-    case Qt::Key_A:
-        m_panLeftHeld = true;
-        updatePanDirection();
-        return true;
-    case Qt::Key_D:
-        m_panRightHeld = true;
-        updatePanDirection();
-        return true;
-    case Qt::Key_Space:
-        EventManager::getInstance()->sendEventImmediately(
-            std::make_shared<PauseToggleRequestedEvent>());
-        return true;
-    case Qt::Key_W:
-        EventManager::getInstance()->sendEventImmediately(
-            std::make_shared<SpeedStepRequestedEvent>(+1));
-        return true;
-    case Qt::Key_S:
-        EventManager::getInstance()->sendEventImmediately(
-            std::make_shared<SpeedStepRequestedEvent>(-1));
-        return true;
-    case Qt::Key_R:
-        // Shift reverses the rotation direction (REQ-BLD-ROTATE).
-        EventManager::getInstance()->sendEventImmediately(
-            std::make_shared<GhostRotationRequestedEvent>(
-                (event->modifiers() & Qt::ShiftModifier) != 0));
-        return true;
-    case Qt::Key_Q:
-        EventManager::getInstance()->sendEventImmediately(
-            std::make_shared<ModeCancelRequestedEvent>());
-        return true;
-    case Qt::Key_C:
-        // Capture a temporary blueprint from the current selection (REQ-UI-BLUEPRINT-TEMP).
-        // The BlueprintLibrary owns the selection and blueprint-capture logic; it decides
-        // whether anything placeable is selected and drives placement mode from there.
-        EventManager::getInstance()->sendEventImmediately(
-            std::make_shared<TemporaryBlueprintCaptureRequestedEvent>());
-        return true;
-    case Qt::Key_V:
-        // Re-enter placement mode for the temporary blueprint captured with C, if there is
-        // one (REQ-UI-BLUEPRINT-TEMP). The library holds it; nothing is captured here.
-        EventManager::getInstance()->sendEventImmediately(
-            std::make_shared<TemporaryBlueprintPlaceRequestedEvent>());
-        return true;
     case Qt::Key_F3:
         EventManager::getInstance()->sendEventImmediately(
             std::make_shared<DebugDrawToggleRequestedEvent>());
         return true;
-    case Qt::Key_Escape:
-        EventManager::getInstance()->sendEventImmediately(
-            std::make_shared<EscapeMenuRequestedEvent>());
-        return true;
     case Qt::Key_F4:
         EventManager::getInstance()->addEvent(
             std::make_shared<TracePrintRequestedEvent>());
         return true;
     default:
+        break;
+    }
+
+    // Everything else: the key names an action, the action names an event. Which key
+    // is bound to what, and whether it does anything in this situation, are both the
+    // table's business -- this switch only knows what each action means
+    // (REQ-UI-HOTKEYS, REQ-UI-CONTROLS-ACCURACY).
+    switch (resolveKeyAction(event->key(), event->modifiers(), context))
+    {
+    case ControlAction::Move:
+        // A parameter of the action rather than an action of its own: the table binds
+        // both keys to Move and the direction is read off the key here, as the rotation
+        // direction and the build hotkey's digit are.
+        if (event->key() == Qt::Key_A) { m_panLeftHeld = true; }
+        else                           { m_panRightHeld = true; }
+        updatePanDirection();
+        return true;
+    case ControlAction::GameSpeed:
+        EventManager::getInstance()->sendEventImmediately(
+            std::make_shared<SpeedStepRequestedEvent>(event->key() == Qt::Key_W ? +1 : -1));
+        return true;
+    case ControlAction::TogglePause:
+        EventManager::getInstance()->sendEventImmediately(
+            std::make_shared<PauseToggleRequestedEvent>());
+        return true;
+    case ControlAction::Rotate:
+        // Shift reverses the rotation direction (REQ-BLD-ROTATE).
+        EventManager::getInstance()->sendEventImmediately(
+            std::make_shared<GhostRotationRequestedEvent>(
+                (event->modifiers() & Qt::ShiftModifier) != 0));
+        return true;
+    case ControlAction::EnterDeconstruct:
+    case ControlAction::ExitMode:
+        EventManager::getInstance()->sendEventImmediately(
+            std::make_shared<ModeCancelRequestedEvent>());
+        return true;
+    case ControlAction::CopyTemporary:
+        // The BlueprintLibrary owns the selection and blueprint-capture logic; it drives
+        // placement mode from there (REQ-UI-BLUEPRINT-TEMP).
+        EventManager::getInstance()->sendEventImmediately(
+            std::make_shared<TemporaryBlueprintCaptureRequestedEvent>());
+        return true;
+    case ControlAction::PasteTemporary:
+        EventManager::getInstance()->sendEventImmediately(
+            std::make_shared<TemporaryBlueprintPlaceRequestedEvent>());
+        return true;
+    case ControlAction::CreateBlueprint:
+        // Decided by MainWindow, the only widget that can pause the game and dim the
+        // window for a modal.
+        EventManager::getInstance()->sendEventImmediately(
+            std::make_shared<BlueprintSaveRequestedEvent>());
+        return true;
+    case ControlAction::OpenBlueprints:
+        EventManager::getInstance()->sendEventImmediately(
+            std::make_shared<BlueprintSelectionRequestedEvent>());
+        return true;
+    case ControlAction::OpenMenu:
+        EventManager::getInstance()->sendEventImmediately(
+            std::make_shared<EscapeMenuRequestedEvent>());
+        return true;
+    default:
+        // Either nothing is bound to the key here, or what is bound is a mouse gesture
+        // the view handles. Unconsumed, so ordinary Qt shortcuts keep working.
         return false;
     }
 }
 
-bool InputMapper::handleKeyRelease(QKeyEvent* event)
+bool InputMapper::handleKeyRelease(QKeyEvent* event, const ControlContext& context)
 {
     if (event->isAutoRepeat()) { return false; }
 
-    switch (event->key())
+    // Only held actions have a release worth acting on. Resolved through the table
+    // rather than matched against A and D directly, so the keys stay rebindable in one
+    // place rather than two.
+    if (resolveKeyAction(event->key(), event->modifiers(), context) != ControlAction::Move)
     {
-    case Qt::Key_A:
-        m_panLeftHeld = false;
-        updatePanDirection();
-        return true;
-    case Qt::Key_D:
-        m_panRightHeld = false;
-        updatePanDirection();
-        return true;
-    default:
         return false;
     }
+
+    if (event->key() == Qt::Key_A) { m_panLeftHeld = false; }
+    else                           { m_panRightHeld = false; }
+    updatePanDirection();
+    return true;
 }
 
 void InputMapper::releaseAll()

src/ui/InputMapper.h

@@ -3,14 +3,19 @@
 #include <QString>
 
 #include "BuildingType.h"
+#include "ControlAction.h"
 #include "WorldCamera.h"
 
 class QKeyEvent;
 
 // Turns raw key events into the game's semantic actions and publishes them
 // (REQ-UI-HOTKEYS). Widgets react to the action, never to the key, so the two can
-// be rebound independently later; the bindings themselves are still hard-coded
+// be rebound independently later.
-// here for now.
+//
+// Which key means what is not decided here: the caller hands in a ControlContext and
+// ControlAction.h resolves the press against it, so this file only knows what each
+// action means once resolved. That is what keeps the controls panel and the key
+// handling from drifting apart -- both read the one table (REQ-UI-CONTROLS-ACCURACY).
 //
 // Two output shapes, chosen by the nature of the action rather than by taste:
 //
@@ -34,9 +39,10 @@ public:
     static QString getBuildHotkeyLabel(BuildingType type);
 
     // Both return true when the key was consumed; the caller passes anything else
-    // on to its base class so unrelated shortcuts keep working.
+    // on to its base class so unrelated shortcuts keep working. `context` is the
-    bool handleKeyPress(QKeyEvent* event);
+    // player's current situation, which decides what a key does (REQ-UI-CONTROLS-CONTENT).
-    bool handleKeyRelease(QKeyEvent* event);
+    bool handleKeyPress(QKeyEvent* event, const ControlContext& context);
+    bool handleKeyRelease(QKeyEvent* event, const ControlContext& context);
 
     // Drops all held-key state, publishing the resulting change. Call when the
     // receiving widget can no longer expect key-up events.

src/ui/ItemIconCache.cpp

@@ -1,11 +1,28 @@
 #include "ItemIconCache.h"
 
 #include <QFile>
+#include <QFontMetrics>
 #include <QPainter>
+#include <QRectF>
 #include <QSvgRenderer>
 
-ItemIconCache::ItemIconCache(const QString& iconDir)
+#include "VisualsConfig.h"
+
+namespace
+{
+
+// How far the icon is inset within the item's colored square, as a fraction of the
+// square's size on each side (REQ-UI-ITEM-ICON). The inset is what keeps a frame of the
+// square's color visible all around the icon: each icon's viewBox is cropped tight to
+// its artwork, so an icon drawn at the full rect would cover the square entirely.
+const double kIconInsetFraction = 0.15;
+
+}  // namespace
+
+
+ItemIconCache::ItemIconCache(const QString& iconDir, const VisualsConfig* visuals)
     : m_iconDir(iconDir)
+    , m_visuals(visuals)
 {
 }
 
@@ -34,14 +51,65 @@ bool ItemIconCache::hasIcon(const std::string& itemId)
     return !getSvg(itemId).isEmpty();
 }
 
+void ItemIconCache::paintItem(QPainter& painter, const QRectF& rect,
+                              const std::string& itemId)
+{
+    // The colored square from visuals.toml backs every item, icon or not: it is what
+    // gives the item contrast against the tile beneath it in the world, and its outline
+    // is what separates neighbouring items where they overlap on a belt (REQ-GW-TILE-SIZE,
+    // REQ-UI-ITEM-ICON).
+    if (m_visuals != nullptr)
+    {
+        const std::map<std::string, ItemVisuals>::const_iterator it =
+            m_visuals->items.find(itemId);
+        if (it != m_visuals->items.end())
+        {
+            painter.fillRect(rect, it->second.fill);
+            painter.setPen(QPen(it->second.outline, 1));
+            painter.setBrush(Qt::NoBrush);
+            painter.drawRect(rect);
+        }
+    }
+
+    if (!hasIcon(itemId)) { return; }
+
+    // The icon goes on top, inset so a frame of the square's color stays visible all
+    // around it. It is rasterized once at the inset pixel size and cached, so this is a
+    // plain pixmap blit per frame.
+    const double inset = kIconInsetFraction * rect.width();
+    const QRectF iconRect = rect.adjusted(inset, inset, -inset, -inset);
+
+    int sizePx = qRound(iconRect.width());
+    if (sizePx < 1) { sizePx = 1; }
+    painter.drawPixmap(iconRect, getPixmap(itemId, sizePx),
+                       QRectF(0, 0, sizePx, sizePx));
+}
+
+QPixmap ItemIconCache::getSquarePixmap(const std::string& itemId, int sizePx)
+{
+    return getPixmap("square:" + itemId, itemId, sizePx, true);
+}
+
 QPixmap ItemIconCache::getPixmap(const std::string& itemId, int sizePx)
+{
+    return getPixmap(itemId, itemId, sizePx, false);
+}
+
+QPixmap ItemIconCache::getInlineIcon(const std::string& itemId, const QFont& font)
+{
+    if (!hasIcon(itemId)) { return QPixmap(); }
+    return getPixmap(itemId, QFontMetrics(font).height());
+}
+
+QPixmap ItemIconCache::getPixmap(const std::string& cacheKey, const std::string& itemId,
+                                 int sizePx, bool withSquare)
 {
     if (sizePx <= 0)
     {
         return QPixmap();
     }
 
-    const std::pair<std::string, int> key(itemId, sizePx);
+    const std::pair<std::string, int> key(cacheKey, sizePx);
     const std::map<std::pair<std::string, int>, QPixmap>::const_iterator cached =
         m_pixmapCache.find(key);
     if (cached != m_pixmapCache.end())
@@ -49,16 +117,45 @@ QPixmap ItemIconCache::getPixmap(const std::string& itemId, int sizePx)
         return cached->second;
     }
 
-    const QByteArray& svg = getSvg(itemId);
     QPixmap pixmap;
-    if (!svg.isEmpty())
+    if (withSquare)
     {
-        QSvgRenderer renderer(svg);
+        // Null unless the item has something to draw -- a square, an icon, or both --
-        pixmap = QPixmap(sizePx, sizePx);
+        // so a caller with nothing to show can fall back to text (REQ-UI-ITEM-ICON).
-        pixmap.fill(Qt::transparent);
+        const bool hasSquare = m_visuals != nullptr
-        QPainter painter(&pixmap);
+            && m_visuals->items.find(itemId) != m_visuals->items.end();
-        painter.setRenderHint(QPainter::Antialiasing, true);
+        if (hasSquare || hasIcon(itemId))
-        renderer.render(&painter);
+        {
+            pixmap = QPixmap(sizePx, sizePx);
+            pixmap.fill(Qt::transparent);
+            QPainter painter(&pixmap);
+            // No antialiasing: the square's edges are axis-aligned and land on pixel
+            // boundaries, and smoothing a 1-pixel outline only blurs it. The icon is
+            // blitted into a slightly smaller rect than it was rasterized at, which is
+            // what the smooth transform is for.
+            painter.setRenderHint(QPainter::SmoothPixmapTransform, true);
+            // One pixel short of the pixmap so the square's right and bottom edges land
+            // inside it rather than on its border.
+            paintItem(painter, QRectF(0, 0, sizePx - 1, sizePx - 1), itemId);
+        }
+    }
+    else
+    {
+        const QByteArray& svg = getSvg(itemId);
+        if (!svg.isEmpty())
+        {
+            QSvgRenderer renderer(svg);
+            pixmap = QPixmap(sizePx, sizePx);
+            pixmap.fill(Qt::transparent);
+            QPainter painter(&pixmap);
+            painter.setRenderHint(QPainter::Antialiasing, true);
+            renderer.render(&painter);
+        }
     }
     return m_pixmapCache.emplace(key, std::move(pixmap)).first->second;
 }
+
+void ItemIconCache::clearPixmapCache()
+{
+    m_pixmapCache.clear();
+}

src/ui/ItemIconCache.h

@@ -5,41 +5,89 @@
 #include <utility>
 
 #include <QByteArray>
+#include <QFont>
 #include <QPixmap>
 #include <QString>
 
-// Rasterizes and caches per-item icon SVGs (REQ-UI-ITEM-ICON). Item icons are
+class QPainter;
-// self-contained, full-color SVGs loaded from a directory, one file per item type
+class QRectF;
-// named after the item's id (e.g. "iron_ore.svg"). Shared by the recipe-selection
+struct VisualsConfig;
-// dialog (REQ-UI-RECIPE-ICON) and the game world's belt/port item rendering so the
+
-// rasterization is not duplicated.
+// Rasterizes and caches per-item icon SVGs, and composes them onto the item's colored
+// square (REQ-UI-ITEM-ICON). Item icons are self-contained, full-color SVGs loaded from
+// a directory, one file per item type named after the item's id (e.g. "iron_ore.svg").
 //
-// A missing icon file is not an error: hasIcon() returns false for it and the caller
+// The square is the item's `fill` and `outline` from visuals.toml with the icon inset
-// falls back (a colored square in the world, a name caption in the dialog).
+// within it, and it backs the icon both in the game world and wherever the UI displays
+// an item as an item: the selection panel's item chips (REQ-UI-SINGLE-SELECTION,
+// REQ-UI-HQ-PANEL), and every recipe drawn as a line -- the recipe summary, the
+// selection dialog's option buttons, the item production tooltip
+// (REQ-UI-RECIPE-SUMMARY, REQ-UI-SELECT-OPTIONS, REQ-UI-ITEM-TOOLTIP). Defined here
+// once rather than per widget, in
+// two forms: paintItem() for the world's fractional geometry, getSquarePixmap() for
+// widgets that want a ready-made pixmap.
+//
+// The bare icon of getPixmap() has one remaining use: an inline icon standing in for the
+// item's name beside a number -- building blocks beside a cost or a stock
+// (REQ-UI-BLOCKS-ICON), scrap beside the amount left in debris (REQ-UI-DEBRIS-PANEL) --
+// which is a decoration on a line of text rather than an item display and takes no
+// square. getInlineItemIcon() in IconCaption.h is how callers ask for that form.
+//
+// A missing icon file is not an error: hasIcon() returns false for it and the item shows
+// its colored square alone.
 class ItemIconCache
 {
 public:
-    // iconDir is the directory holding the "<item_id>.svg" icon files
+    // iconDir is the directory holding the "<item_id>.svg" icon files (typically
-    // (typically "<configDir>/../icons/items").
+    // "<configDir>/../icons/items"). visuals supplies the per-item square colors and
-    explicit ItemIconCache(const QString& iconDir);
+    // must outlive the cache; its contents may be replaced on a restart (REQ-CFG-RELOAD),
+    // which is what clearPixmapCache() is for.
+    ItemIconCache(const QString& iconDir, const VisualsConfig* visuals);
 
     // True if an icon SVG file exists for the given item id. Loads the file's bytes
     // on first query and remembers the result (including absence) so repeated calls
     // are cheap.
     bool hasIcon(const std::string& itemId);
 
-    // Returns the item's icon rasterized to a transparent sizePx*sizePx pixmap,
+    // Paints the item's colored square into rect and its icon inset within it
-    // cached per (item id, size) so it is rendered once and reused across frames and
+    // (REQ-UI-ITEM-ICON). Takes the rect as a QRectF so the world can keep painting at
-    // only re-rasterized when the target size changes (REQ-UI-ITEM-ICON). Returns a
+    // sub-pixel geometry. An item with no visuals entry gets no square, one with no icon
-    // null pixmap if the item has no icon file (callers should gate on hasIcon()).
+    // file no icon; with neither, this paints nothing.
+    void paintItem(QPainter& painter, const QRectF& rect, const std::string& itemId);
+
+    // The same composition rasterized to a sizePx*sizePx pixmap for widget use, cached
+    // per (item id, size) so it is rendered once and reused. Returns a null pixmap only
+    // when the item has neither a visuals entry nor an icon file, which is the one case
+    // in which a caller has nothing to show and falls back to text.
+    QPixmap getSquarePixmap(const std::string& itemId, int sizePx);
+
+    // Returns the item's icon alone, without its square, rasterized to a transparent
+    // sizePx*sizePx pixmap and cached per (item id, size) so it is rendered once and
+    // reused across frames (REQ-UI-ITEM-ICON). Returns a null pixmap if the item has no
+    // icon file (callers should gate on hasIcon()).
     QPixmap getPixmap(const std::string& itemId, int sizePx);
 
+    // The same bare icon sized to the height of `font`'s text, for the inline form above:
+    // an icon standing in for the item's name on a line of text. Null when the item has
+    // no icon file, which is not an error -- the caller names the item in words instead.
+    QPixmap getInlineIcon(const std::string& itemId, const QFont& font);
+
+    // Drops every rasterized pixmap. Called when the visuals are reloaded on a restart
+    // (REQ-CFG-RELOAD), because the composed squares carry the colors they were painted
+    // with; they are re-rasterized on next use.
+    void clearPixmapCache();
+
 private:
     // Returns the raw SVG bytes for an item id, loading and caching them on first
     // access. An absent file caches an empty QByteArray so it is not retried.
     const QByteArray& getSvg(const std::string& itemId);
+    // Shared rasterize-and-cache step. cacheKey distinguishes the bare and squared
+    // variants of one item within the single pixmap cache.
+    QPixmap getPixmap(const std::string& cacheKey, const std::string& itemId,
+                      int sizePx, bool withSquare);
 
     QString                            m_iconDir;
+    const VisualsConfig*               m_visuals;  // Not owned; lives in MainWindow.
     std::map<std::string, QByteArray>  m_svgById;
     std::map<std::pair<std::string, int>, QPixmap> m_pixmapCache;
 };

src/ui/ItemProducers.cpp

@@ -0,0 +1,60 @@
+#include "ItemProducers.h"
+
+#include "GameConfig.h"
+#include "RecipesConfig.h"
+#include "Simulation.h"
+
+namespace
+{
+
+bool producesItem(const RecipeDef& recipe, const std::string& itemId)
+{
+    for (const RecipeOutput& output : recipe.outputs)
+    {
+        if (output.item == itemId)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool isAvailable(const RecipeDef& recipe, const Simulation& sim)
+{
+    if (recipe.building == BuildingType::Miner
+        || recipe.building == BuildingType::Assembler)
+    {
+        return sim.isRecipeUnlocked(recipe.id);
+    }
+    return sim.isBuildingUnlocked(recipe.building);
+}
+
+}  // namespace
+
+ItemProduction findItemProduction(const std::string& itemId, const Simulation& sim,
+                                  const GameConfig& config)
+{
+    ItemProduction result;
+
+    bool anyProducer = false;
+    for (const RecipeDef& recipe : config.recipes.recipes)
+    {
+        if (!producesItem(recipe, itemId)) { continue; }
+
+        anyProducer = true;
+        if (isAvailable(recipe, sim))
+        {
+            result.recipes.push_back(&recipe);
+        }
+    }
+
+    if (!result.recipes.empty())
+    {
+        result.origin = ItemOrigin::Produced;
+    }
+    else
+    {
+        result.origin = anyProducer ? ItemOrigin::Undiscovered : ItemOrigin::Salvaged;
+    }
+    return result;
+}

src/ui/ItemProducers.h

@@ -0,0 +1,35 @@
+#pragma once
+
+#include <string>
+#include <vector>
+
+struct GameConfig;
+struct RecipeDef;
+class Simulation;
+
+// Where an item comes from, as far as the player has discovered (REQ-UI-ITEM-TOOLTIP).
+enum class ItemOrigin
+{
+    Produced,      // at least one recipe the player can run makes it
+    Undiscovered,  // recipes make it, but none of them is available yet
+    Salvaged,      // no recipe makes it at all -- scrap, which comes from debris
+};
+
+struct ItemProduction
+{
+    ItemOrigin                    origin = ItemOrigin::Salvaged;
+    // The available producers, in config order. Empty unless origin is Produced.
+    std::vector<const RecipeDef*> recipes;
+};
+
+// Every way the player can currently produce the given item, for the tooltip that
+// explains an item chip (REQ-UI-ITEM-TOOLTIP).
+//
+// What counts as available differs by building type, because only Miner and Assembler
+// recipes are individually unlocked (REQ-LOCK-UI-RECIPE): those are filtered by the
+// unlock state, while a Smelter's or Reprocessing Plant's recipes
+// (REQ-BLD-SMELTER, REQ-BLD-REPROCESSING) are filtered by whether their building is
+// unlocked yet (REQ-LOCK-BUILDING) -- there is no sense in naming a path through a
+// plant the player cannot place.
+ItemProduction findItemProduction(const std::string& itemId, const Simulation& sim,
+                                  const GameConfig& config);

src/ui/MainWindow.cpp

@@ -7,6 +7,7 @@
 
 #include <QApplication>
 #include <QCloseEvent>
+#include <QDialog>
 #include <QDir>
 #include <QFile>
 #include <QInputDialog>
@@ -29,6 +30,7 @@
 #include "SchematicChoiceDialog.h"
 #include "HeaderBar.h"
 #include "SelectionPanel.h"
+#include "ControlsPanel.h"
 #include "ShipLayoutBlueprintSerializer.h"
 #include "ShipLayoutDialog.h"
 #include "BuildingIconCache.h"
@@ -54,7 +56,7 @@ MainWindow::MainWindow(Simulation* sim, const std::string& configDir,
     // REQ-UI-BUILD-ICON).
     const QString configDirPath = QString::fromStdString(m_configDir);
     m_itemIcons = std::make_unique<ItemIconCache>(
-        QDir::cleanPath(configDirPath + "/../icons/items"));
+        QDir::cleanPath(configDirPath + "/../icons/items"), &m_visuals);
     m_buildingIcons = std::make_unique<BuildingIconCache>(
         QDir::cleanPath(configDirPath + "/../icons/buildings"));
 
@@ -77,6 +79,10 @@ MainWindow::MainWindow(Simulation* sim, const std::string& configDir,
     // because only it can pause the game and raise the dim overlay. Built after the
     // world view because loading blueprints.toml may put a message box on screen.
     m_blueprintLibrary = std::make_unique<BlueprintLibrary>(sim, &sim->getConfig(), this);
+    // Two facts about blueprints decide what the world view offers the player
+    // (REQ-UI-CONTROLS-CONTENT); the library is built after the view, so it is handed
+    // over here rather than passed to the constructor.
+    m_gameWorldView->setBlueprintLibrary(m_blueprintLibrary.get());
 
     // Floats over the game world at its right edge rather than occupying a column of
     // its own, and hides itself while nothing is selected (REQ-UI-SELECTION-PANEL). Like
@@ -87,6 +93,11 @@ MainWindow::MainWindow(Simulation* sim, const std::string& configDir,
                                           m_itemIcons.get(), m_buildingIcons.get(),
                                           this);
 
+    // Floats at the world view's opposite edge from the selection panel and reads the
+    // world view for the player's current situation (REQ-UI-CONTROLS-PANEL). Built
+    // after the view for the same stacking reason as the panels above it.
+    m_controlsPanel = new ControlsPanel(m_gameWorldView, this);
+
     // Created last so it stacks above the other children; covers the whole window and
     // dims the game behind modal dialogs/menus (REQ-UI-MODAL-DIM).
     m_dimOverlay = new ModalDimOverlay(m_visuals.overlays.modalDim, this);
@@ -162,14 +173,50 @@ void MainWindow::layoutPanels()
     const QRect worldRect(0, headerH, totalW, totalH - headerH);
     m_headerBar->setGeometry(0, 0, totalW, headerH);
     m_gameWorldView->setGeometry(worldRect);
-    // Sizes itself to its buttons and centers along the bottom of the world view
-    // (REQ-UI-BUILD-BAR).
-    m_buildButtonBar->anchorTo(worldRect);
-    // The panel confines itself to what the bar leaves free, so the bar never has to
-    // move for it (REQ-UI-SELECTION-PANEL, REQ-UI-BUILD-BAR).
-    m_selectionPanel->anchorTo(
-        worldRect.adjusted(0, 0, 0, -m_buildButtonBar->getStripHeightPx()));
     m_dimOverlay->setGeometry(0, 0, totalW, totalH);
+
+    // The floating widgets are placed in one ordered pass, each into the space the
+    // earlier ones have not taken (FloatingPanel.h). The order is the priority the
+    // requirements state: the build button bar takes what it wants and never moves for
+    // anyone (REQ-UI-BUILD-BAR), the controls panel steps around the bar
+    // (REQ-UI-CONTROLS-PANEL), and the selection panel keeps clear of both
+    // (REQ-UI-SELECTION-PANEL). A widget with nothing to show hides itself in placeIn()
+    // and takes no space.
+    //
+    // Re-entry is refused rather than queued: setGeometry() on a widget in the pass can
+    // reach code that asks for another pass, and the one already running is about to
+    // produce the same answer.
+    if (m_layingOut)
+    {
+        return;
+    }
+    m_layingOut = true;
+
+    const std::vector<QWidget*> floatingWidgets = {
+        m_buildButtonBar, m_controlsPanel, m_selectionPanel };
+    const std::vector<FloatingPanel*> floatingPanels = {
+        m_buildButtonBar, m_controlsPanel, m_selectionPanel };
+
+    std::vector<QRect> occupiedRects;
+    for (std::size_t i = 0; i < floatingPanels.size(); ++i)
+    {
+        floatingPanels[i]->placeIn(worldRect, occupiedRects);
+        if (floatingWidgets[i]->isVisible())
+        {
+            occupiedRects.push_back(floatingWidgets[i]->geometry());
+        }
+    }
+
+    m_layingOut = false;
+}
+
+void MainWindow::handleEvent(
+    std::shared_ptr<const FloatingLayoutInvalidatedEvent> /*event*/)
+{
+    // One of the floating widgets changed size or visibility. What each of them may take
+    // depends on the ones placed before it, so the answer is the whole pass rather than
+    // that one widget re-placing itself.
+    layoutPanels();
 }
 
 void MainWindow::handleEvent(std::shared_ptr<const SchematicChoicesAvailableEvent> event)
@@ -177,7 +224,8 @@ void MainWindow::handleEvent(std::shared_ptr<const SchematicChoicesAvailableEven
     ModalPauseScope pause(*m_gameWorldView);
 
     ModalDimScope dim(*m_dimOverlay);
-    SchematicChoiceDialog dialog(event->choices, m_sim->getConfig().recipes, this);
+    SchematicChoiceDialog dialog(event->choices, m_sim->getConfig().recipes,
+                                 m_itemIcons.get(), m_buildingIcons.get(), this);
     dialog.exec();
 
     std::shared_ptr<ApplySchematicChoiceCommand> command =
@@ -237,6 +285,9 @@ std::optional<GameConfig> MainWindow::reloadConfig()
         VisualsConfig newVisuals = VisualsLoader::load(m_configDir + "/visuals.toml");
         m_visuals = std::move(newVisuals);
         m_dimOverlay->setDimColor(m_visuals.overlays.modalDim);
+        // The composed item squares carry the colors they were painted with, so they
+        // are dropped for the new ones to take effect (REQ-UI-ITEM-ICON).
+        m_itemIcons->clearPixmapCache();
         return newConfig;
     }
     catch (const std::exception& e)
@@ -267,7 +318,10 @@ void MainWindow::openShipLayoutDialog(BuildingId shipyardId,
                             m_layoutBlueprints,
                             std::move(unlockedModuleIds),
                             m_gameWorldView->isDebugDrawEnabled(),
-                            this);
+                            m_itemIcons.get(), this);
+    // Opened from the panel's "Configure" button (REQ-MOD-UI-PREVIEW) or straight after
+    // a schematic change (REQ-MOD-UI-AUTO-DIALOG), so it opens on the panel either way.
+    placeOnSelectionPanel(dialog);
     if (dialog.exec() == QDialog::Accepted && dialog.getResult().has_value())
     {
         std::shared_ptr<SetShipLayoutCommand> command =
@@ -279,6 +333,45 @@ void MainWindow::openShipLayoutDialog(BuildingId shipyardId,
     }
 }
 
+void MainWindow::placeOnSelectionPanel(QDialog& dialog) const
+{
+    // The panel is up whenever one of these modals opens -- they are opened from its own
+    // controls, and it is shown whenever anything is selected (REQ-UI-EMPTY-SELECTION).
+    // Were it not, there would be no rectangle to center on and Qt's own centering on
+    // this window stands.
+    if (!m_selectionPanel->isVisible()) { return; }
+
+    // The dialog has never been shown, so it is still at its default size until its
+    // layout has run; centering it before that would use the wrong extent.
+    dialog.adjustSize();
+    const QSize dialogSize = dialog.size();
+
+    // The panel's live geometry, so a panel the player has dragged
+    // (REQ-UI-SELECTION-PANEL-DRAG) carries the modal with it.
+    const QRect panelRect(m_selectionPanel->mapToGlobal(QPoint(0, 0)),
+                          m_selectionPanel->size());
+    const QRect windowRect(mapToGlobal(QPoint(0, 0)), size());
+
+    QPoint topLeft(panelRect.center().x() - dialogSize.width() / 2,
+                   panelRect.center().y() - dialogSize.height() / 2);
+
+    // Pushed back inside the window, never resized to fit (REQ-UI-PANEL-MODAL). The far
+    // edge is clamped first and the near edge second, which is what aligns a dialog too
+    // large for the window with the window's top-left corner rather than pushing it off
+    // the opposite edge.
+    topLeft.setX(qMax(windowRect.left(),
+                      qMin(topLeft.x(), windowRect.right() - dialogSize.width() + 1)));
+    topLeft.setY(qMax(windowRect.top(),
+                      qMin(topLeft.y(), windowRect.bottom() - dialogSize.height() + 1)));
+
+    // Positions the dialog's frame, whose size is not known until it is first shown, so
+    // the result sits low by the title bar height against a true center -- measuring it
+    // would mean showing the dialog at the wrong place first. The move also marks the
+    // dialog as positioned, which is what stops QDialog from centering it on this window
+    // when it is shown.
+    dialog.move(topLeft);
+}
+
 void MainWindow::handleEvent(std::shared_ptr<const LayoutDialogRequestedEvent> event)
 {
     // A construction site has no Building yet; fall back to its site record so
@@ -335,7 +428,9 @@ void MainWindow::handleEvent(std::shared_ptr<const RecipeSelectionRequestedEvent
 
     bool autoOpenLayout = false;
     std::string chosenSchematic;
-    RecipeSelectionDialog dialog(options, title, m_itemIcons.get(), this);
+    RecipeSelectionDialog dialog(options, title, m_itemIcons.get(),
+                                 m_buildingIcons.get(), this);
+    placeOnSelectionPanel(dialog);
     if (dialog.exec() == QDialog::Accepted && dialog.getChosenId().has_value())
     {
         std::shared_ptr<SetRecipeCommand> command = std::make_shared<SetRecipeCommand>();

src/ui/MainWindow.h

@@ -12,6 +12,7 @@
 #include "BuildingId.h"
 #include "EscapeMenuRequestedEvent.h"
 #include "EventHandler.h"
+#include "FloatingLayoutInvalidatedEvent.h"
 #include "GameConfig.h"
 #include "GameOverEvent.h"
 #include "LayoutDialogRequestedEvent.h"
@@ -29,11 +30,13 @@ class Simulation;
 class GameWorldView;
 class HeaderBar;
 class SelectionPanel;
+class ControlsPanel;
 class BuildButtonBar;
 class BlueprintLibrary;
 class BuildingIconCache;
 class ItemIconCache;
 class QCloseEvent;
+class QDialog;
 class QResizeEvent;
 
 class MainWindow : public QWidget,
@@ -44,7 +47,8 @@ class MainWindow : public QWidget,
                                                LayoutDialogRequestedEvent,
                                                RecipeSelectionRequestedEvent,
                                                BlueprintSaveRequestedEvent,
-                                               BlueprintSelectionRequestedEvent>
+                                               BlueprintSelectionRequestedEvent,
+                                               FloatingLayoutInvalidatedEvent>
 {
     Q_OBJECT
 
@@ -66,6 +70,7 @@ private:
     void handleEvent(std::shared_ptr<const RecipeSelectionRequestedEvent> event) override;
     void handleEvent(std::shared_ptr<const BlueprintSaveRequestedEvent> event) override;
     void handleEvent(std::shared_ptr<const BlueprintSelectionRequestedEvent> event) override;
+    void handleEvent(std::shared_ptr<const FloatingLayoutInvalidatedEvent> event) override;
 
     // Reloads the game config and visuals.toml from disk (REQ-CFG-RELOAD), shared
     // by every restart path. On success the reloaded visuals are applied to this
@@ -79,11 +84,18 @@ private:
                               const std::string& schematicId,
                               const ShipLayoutConfig& currentLayout);
 
+    // Centers a modal opened from the selection panel on that panel, kept inside this
+    // window (REQ-UI-PANEL-MODAL). Called on the constructed dialog before exec(), and
+    // only for the two modals the panel opens.
+    void placeOnSelectionPanel(QDialog& dialog) const;
+
     // Runs the blueprint selection dialog and enters placement mode for whatever the
     // player picked (REQ-UI-BLUEPRINT-DIALOG). Holds no pause or dim scope of its own:
     // both callers already hold theirs, which is what keeps the dim continuous when a
     // confirmed save hands straight over to this dialog (REQ-UI-MODAL-DIM).
     void showBlueprintSelectionDialog();
+    // Places the widgets floating over the game world view, in one ordered pass
+    // (FloatingPanel.h). Runs on a resize and on every FloatingLayoutInvalidatedEvent.
     void layoutPanels();
 
 private:
@@ -99,6 +111,7 @@ private:
     GameWorldView*         m_gameWorldView;
     HeaderBar*             m_headerBar;
     SelectionPanel*        m_selectionPanel;
+    ControlsPanel*         m_controlsPanel;
     BuildButtonBar*        m_buildButtonBar;
     // The saved blueprints themselves; they have no widget of their own any more and
     // are reached through the two modal dialogs (REQ-UI-BLUEPRINT-DIALOG).
@@ -107,4 +120,8 @@ private:
 
     std::vector<ShipLayoutBlueprint> m_layoutBlueprints;
     std::shared_ptr<ParsedReplay>    m_replay;  // non-null => view-only playback
+
+    // Set while the placement pass runs, so a widget placed in it cannot start a second
+    // pass from inside the first.
+    bool m_layingOut = false;
 };

src/ui/OptionButton.cpp

@@ -0,0 +1,35 @@
+#include "OptionButton.h"
+
+#include <QLayout>
+#include <QStyle>
+#include <QStyleOptionButton>
+
+OptionButton::OptionButton(QWidget* parent)
+    : QPushButton(parent)
+{
+}
+
+QSize OptionButton::sizeHint() const
+{
+    if (layout() == nullptr)
+    {
+        return QPushButton::sizeHint();
+    }
+    return sizeForFace(layout()->sizeHint());
+}
+
+QSize OptionButton::minimumSizeHint() const
+{
+    if (layout() == nullptr)
+    {
+        return QPushButton::minimumSizeHint();
+    }
+    return sizeForFace(layout()->minimumSize());
+}
+
+QSize OptionButton::sizeForFace(const QSize& faceSize) const
+{
+    QStyleOptionButton option;
+    initStyleOption(&option);
+    return style()->sizeFromContents(QStyle::CT_PushButton, &option, faceSize, this);
+}

src/ui/OptionButton.h

@@ -0,0 +1,28 @@
+#pragma once
+
+#include <QPushButton>
+#include <QSize>
+
+// A push button whose face is built of widgets rather than of a caption: an option's
+// name over the recipe line stating what it makes (REQ-UI-SELECT-OPTIONS), or a module's
+// name over what it costs (REQ-MOD-UI-DIALOG).
+//
+// It exists only to be measured correctly. QPushButton computes its size hint from its
+// text and icon and ignores a layout set on it, so a button carrying a face of widgets
+// would be sized as if it were empty and clip everything in it. This asks the layout
+// instead, and then lets the style add what the button's own frame needs.
+class OptionButton : public QPushButton
+{
+    Q_OBJECT
+
+public:
+    explicit OptionButton(QWidget* parent = nullptr);
+
+    QSize sizeHint() const override;
+    QSize minimumSizeHint() const override;
+
+private:
+    // The style's button size for the given face size, or the plain QPushButton hint
+    // when there is no face to measure.
+    QSize sizeForFace(const QSize& faceSize) const;
+};

src/ui/RecipeLineRow.cpp

@@ -0,0 +1,196 @@
+#include "RecipeLineRow.h"
+
+#include <QFont>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QLayoutItem>
+#include <QMargins>
+#include <QPixmap>
+#include <QVBoxLayout>
+
+#include "BuildingIconCache.h"
+#include "ItemIconCache.h"
+
+namespace
+{
+
+// Size the items' colored squares and the building's chip are drawn at on a line, in
+// device-independent pixels. Larger than the artwork they carry, which the square
+// insets (REQ-UI-ITEM-ICON).
+const int kIconSizePx = 18;
+
+// Adds a freshly built label to the line and shows it.
+//
+// The show is what makes it count: a widget created under an already-visible parent
+// starts hidden, and a layout treats a hidden item as empty, so an unshown label would
+// add nothing to the size hint the surrounding widget measures itself against as soon
+// as this returns.
+void addAndShow(QHBoxLayout* layout, QLabel* label)
+{
+    layout->addWidget(label);
+    label->show();
+}
+
+// Empties one of the two rows, leaving the row widget and its layout in place.
+void clearRow(QHBoxLayout* layout)
+{
+    while (QLayoutItem* item = layout->takeAt(0))
+    {
+        if (item->widget())
+        {
+            item->widget()->deleteLater();
+        }
+        delete item;
+    }
+}
+
+}  // namespace
+
+
+RecipeLineRow::RecipeLineRow(ItemIconCache* itemIcons, BuildingIconCache* buildingIcons,
+                             QWidget* parent)
+    : QWidget(parent)
+    , m_itemIcons(itemIcons)
+    , m_buildingIcons(buildingIcons)
+{
+    m_outerLayout = new QVBoxLayout(this);
+    m_outerLayout->setContentsMargins(0, 0, 0, 0);
+    m_outerLayout->setSpacing(1);
+
+    m_headerRow    = new QWidget(this);
+    m_headerLayout = new QHBoxLayout(m_headerRow);
+    m_headerLayout->setContentsMargins(0, 0, 0, 0);
+    m_headerLayout->setSpacing(4);
+    m_headerRow->hide();
+    m_outerLayout->addWidget(m_headerRow);
+
+    m_amountsRow    = new QWidget(this);
+    m_amountsLayout = new QHBoxLayout(m_amountsRow);
+    m_amountsLayout->setContentsMargins(0, 0, 0, 0);
+    m_amountsLayout->setSpacing(4);
+    m_outerLayout->addWidget(m_amountsRow);
+
+    hide();
+}
+
+void RecipeLineRow::setCardChrome(bool enabled)
+{
+    // Palette colors like the item chip's chrome (REQ-UI-SELECTION-CARD), not
+    // visuals.toml, which is for world rendering. The selector names this class alone, so
+    // nothing inside the card inherits the border.
+    setAttribute(Qt::WA_StyledBackground, enabled);
+    setStyleSheet(enabled
+        ? QStringLiteral("RecipeLineRow { border: 1px solid palette(mid); "
+                         "border-radius: 4px; }")
+        : QString());
+    m_outerLayout->setContentsMargins(enabled ? QMargins(6, 4, 6, 4)
+                                              : QMargins(0, 0, 0, 0));
+}
+
+void RecipeLineRow::setLine(const Spec& spec)
+{
+    if (spec.isEmpty())
+    {
+        // Forgotten as well as hidden, so re-selecting the same recipe later is seen as
+        // a change and shows the row again.
+        m_spec = Spec();
+        hide();
+        return;
+    }
+    if (spec == m_spec)
+    {
+        return;
+    }
+
+    m_spec = spec;
+    rebuild(spec);
+    show();
+}
+
+void RecipeLineRow::rebuild(const Spec& spec)
+{
+    clearRow(m_headerLayout);
+    clearRow(m_amountsLayout);
+
+    // First line: which building runs the recipe and which recipe it is, where the line
+    // has to distinguish one producer from another (REQ-UI-ITEM-TOOLTIP). A building with
+    // no chip file leaves the icon off, as everywhere else (REQ-UI-BUILD-ICON).
+    if (spec.building.has_value() && m_buildingIcons != nullptr)
+    {
+        const QPixmap chip =
+            m_buildingIcons->getChip(buildingTypeId(*spec.building), kIconSizePx);
+        if (!chip.isNull())
+        {
+            QLabel* chipLabel = new QLabel(m_headerRow);
+            chipLabel->setPixmap(chip);
+            addAndShow(m_headerLayout, chipLabel);
+        }
+    }
+    if (!spec.name.isEmpty())
+    {
+        QLabel* nameLabel = new QLabel(spec.name, m_headerRow);
+        QFont nameFont = nameLabel->font();
+        nameFont.setBold(true);
+        nameLabel->setFont(nameFont);
+        addAndShow(m_headerLayout, nameLabel);
+    }
+    const bool hasHeader = m_headerLayout->count() > 0;
+    if (hasHeader)
+    {
+        m_headerLayout->addStretch(1);
+    }
+    m_headerRow->setVisible(hasHeader);
+
+    // Second line: what the cycle costs, makes and takes.
+    addAmounts(spec.inputs);
+    if (!spec.inputs.empty() && !spec.outputs.empty())
+    {
+        const QChar rightArrow(0x2192);  // U+2192 RIGHTWARDS ARROW
+        addAndShow(m_amountsLayout, new QLabel(QString(rightArrow), m_amountsRow));
+    }
+    addAmounts(spec.outputs);
+
+    if (spec.durationSeconds.has_value() && *spec.durationSeconds > 0.0)
+    {
+        const QChar middleDot(0x00B7);  // U+00B7 MIDDLE DOT
+        const QString time = spec.durationIsAddition
+            ? tr("+%1 s").arg(*spec.durationSeconds, 0, 'f', 1)
+            : tr("%1 s").arg(*spec.durationSeconds, 0, 'f', 1);
+        addAndShow(m_amountsLayout, new QLabel(
+            QStringLiteral("%1 %2").arg(middleDot).arg(time), m_amountsRow));
+    }
+    m_amountsLayout->addStretch(1);
+}
+
+void RecipeLineRow::addAmounts(const std::vector<Amount>& amounts)
+{
+    for (const Amount& entry : amounts)
+    {
+        // Between one item and the next, so a run of icons and numbers reads as a sum
+        // rather than as a list.
+        if (&entry != &amounts.front())
+        {
+            addAndShow(m_amountsLayout, new QLabel(QStringLiteral("+"), m_amountsRow));
+        }
+
+        // The item's icon on its colored square (REQ-UI-ITEM-ICON). A missing icon file
+        // is not an error: the square stands alone then, and only an item with no square
+        // either falls back to its id in text.
+        const QPixmap icon = (m_itemIcons != nullptr)
+            ? m_itemIcons->getSquarePixmap(entry.itemId, kIconSizePx)
+            : QPixmap();
+        if (!icon.isNull())
+        {
+            QLabel* iconLabel = new QLabel(m_amountsRow);
+            iconLabel->setPixmap(icon);
+            addAndShow(m_amountsLayout, iconLabel);
+        }
+        else
+        {
+            addAndShow(m_amountsLayout,
+                       new QLabel(QString::fromStdString(entry.itemId), m_amountsRow));
+        }
+        addAndShow(m_amountsLayout,
+                   new QLabel(QString::number(entry.amount), m_amountsRow));
+    }
+}

src/ui/RecipeLineRow.h

@@ -0,0 +1,115 @@
+#pragma once
+
+#include <optional>
+#include <string>
+#include <vector>
+
+#include <QString>
+#include <QWidget>
+
+#include "BuildingType.h"
+
+class BuildingIconCache;
+class ItemIconCache;
+class QHBoxLayout;
+class QVBoxLayout;
+
+// One recipe drawn: what it consumes, an arrow, what it produces, and how long a cycle
+// takes (REQ-UI-RECIPE-SUMMARY), under a header naming the building that runs it and the
+// recipe itself where the recipe has to identify itself. Every place the UI states what
+// something makes draws this same line, so a recipe reads alike wherever it is shown:
+//
+//  * beneath the selection button, for the recipe a building is running
+//    (REQ-UI-RECIPE-SUMMARY);
+//  * on a selection dialog's option buttons, under the option's name
+//    (REQ-UI-SELECT-OPTIONS);
+//  * in an item's production tooltip and in the unlock-choice dialog, there led by the
+//    icon of the building that runs the recipe and its name
+//    (REQ-UI-ITEM-TOOLTIP, REQ-DEF-SCHEMATIC-DROP);
+//  * on a module button and in the layout dialog's build cost, where there is a price
+//    and a time but nothing produced (REQ-MOD-UI-DIALOG, REQ-MOD-UI-STATS-PANEL).
+class RecipeLineRow : public QWidget
+{
+    Q_OBJECT
+
+public:
+    // One item and how many of it the line states.
+    struct Amount
+    {
+        std::string itemId;
+        int         amount = 0;
+
+        bool operator==(const Amount& other) const
+        {
+            return itemId == other.itemId && amount == other.amount;
+        }
+    };
+
+    // What the line says. Everything but the inputs is optional, which is what lets the
+    // one widget serve the summary, the option buttons, the tooltip lines and the cost
+    // lines.
+    struct Spec
+    {
+        // The chip of the building running the recipe, on the header line, where the
+        // recipe has to say which building that is -- an item may have several producers
+        // (REQ-UI-ITEM-TOOLTIP). Unset wherever the surrounding widget already
+        // establishes the building, and the header line is then left out entirely.
+        std::optional<BuildingType> building;
+        // The recipe's name, beside the building chip on the header line. Empty where the
+        // name is the caption of the widget around this one instead.
+        QString                     name;
+        std::vector<Amount>         inputs;
+        // Empty for a line that produces no item of its own: a ship schematic, or a
+        // module's price. No arrow is drawn then.
+        std::vector<Amount>         outputs;
+        std::optional<double>       durationSeconds;
+        // True where the time is added to something else rather than being a cycle of
+        // its own, and so reads "+3.0 s" (REQ-MOD-UI-DIALOG).
+        bool                        durationIsAddition = false;
+
+        bool operator==(const Spec& other) const
+        {
+            return building == other.building && name == other.name
+                && inputs == other.inputs && outputs == other.outputs
+                && durationSeconds == other.durationSeconds
+                && durationIsAddition == other.durationIsAddition;
+        }
+
+        bool isEmpty() const { return inputs.empty() && outputs.empty(); }
+    };
+
+    // Both caches may be null, which leaves the icons off: an item with no square and
+    // no icon falls back to its id, and a building with no chip to its name alone.
+    // Neither is owned.
+    RecipeLineRow(ItemIconCache* itemIcons, BuildingIconCache* buildingIcons,
+                  QWidget* parent = nullptr);
+
+    // Hides the row when the spec has nothing to state, which is how a building with no
+    // recipe shows no summary at all (REQ-UI-RECIPE-SUMMARY).
+    void setLine(const Spec& spec);
+
+    // Boxes the line in a card of its own, for the two places that stack several of them
+    // (REQ-UI-ITEM-TOOLTIP, REQ-DEF-SCHEMATIC-DROP): a run of bare lines reads as one
+    // field of icons and numbers, and the box is what separates one recipe from the next.
+    // Off by default -- a line drawn inside a button or a panel section is already framed
+    // by what holds it.
+    void setCardChrome(bool enabled);
+
+private:
+    void rebuild(const Spec& spec);
+    void addAmounts(const std::vector<Amount>& amounts);
+
+    ItemIconCache*     m_itemIcons;
+    BuildingIconCache* m_buildingIcons;
+    QVBoxLayout*       m_outerLayout;
+    // The two lines, each a row widget of its own so a rebuild only has to empty their
+    // layouts -- no nested layout to take apart. The header is hidden where the spec
+    // names neither a building nor a recipe.
+    QWidget*           m_headerRow;
+    QHBoxLayout*       m_headerLayout;
+    QWidget*           m_amountsRow;
+    QHBoxLayout*       m_amountsLayout;
+    // What the row currently shows, so a refresh at tick rate rebuilds it only when the
+    // recipe actually changed.
+    Spec               m_spec;
+};

src/ui/RecipeSelectionDialog.cpp

@@ -2,60 +2,46 @@
 
 #include <cstddef>
 
-#include <QGridLayout>
+#include <QFont>
-#include <QIcon>
+#include <QFrame>
-#include <QPixmap>
+#include <QLabel>
 #include <QPushButton>
-#include <QSize>
+#include <QScrollArea>
-#include <QStringList>
 #include <QVBoxLayout>
 
 #include "Building.h"
 #include "BuildingType.h"
 #include "DisplayName.h"
 #include "GameConfig.h"
-#include "ItemIconCache.h"
+#include "OptionButton.h"
 #include "RecipesConfig.h"
-#include "RecipeTooltip.h"
 #include "ShipsConfig.h"
 #include "Simulation.h"
 
 namespace
 {
 
-QString itemLine(const std::string& itemId, int amount)
+std::vector<RecipeLineRow::Amount> toAmounts(
+    const std::vector<RecipeIngredient>& ingredients)
 {
-    return QStringLiteral("  ")
+    std::vector<RecipeLineRow::Amount> amounts;
-        + QString::fromStdString(toDisplayName(itemId))
+    amounts.reserve(ingredients.size());
-        + QStringLiteral(" x ") + QString::number(amount);
+    for (const RecipeIngredient& ingredient : ingredients)
+    {
+        amounts.push_back(RecipeLineRow::Amount{ ingredient.item, ingredient.amount });
+    }
+    return amounts;
 }
 
-QString shipTooltip(const ShipDef& def)
+std::vector<RecipeLineRow::Amount> toAmounts(const std::vector<RecipeOutput>& outputs)
 {
-    const QString name = QString::fromStdString(toDisplayName(def.id));
+    std::vector<RecipeLineRow::Amount> amounts;
-
+    amounts.reserve(outputs.size());
-    QStringList lines;
+    for (const RecipeOutput& output : outputs)
-    lines << QObject::tr("Ship: %1").arg(name);
-
-    if (def.schematic.materials.empty())
     {
-        lines << QObject::tr("Materials: none");
+        amounts.push_back(RecipeLineRow::Amount{ output.item, output.amount });
     }
-    else
+    return amounts;
-    {
-        lines << QObject::tr("Materials:");
-        for (const RecipeIngredient& material : def.schematic.materials)
-        {
-            lines << itemLine(material.item, material.amount);
-        }
-        lines << QObject::tr("  + installed modules");
-    }
-
-    lines << QObject::tr("Completion time: %1 s")
-        .arg(def.schematic.productionTimeSeconds);
-    lines << QObject::tr("Produces: 1 %1").arg(name);
-
-    return lines.join('\n');
 }
 
 }  // namespace
@@ -64,16 +50,30 @@ std::vector<RecipeSelectionOption> buildRecipeSelectionOptions(
     BuildingType type, Simulation& sim, const GameConfig& config)
 {
     std::vector<RecipeSelectionOption> options;
-    options.push_back({std::string(), QObject::tr("(None)"), QString()});
+    // The clearing option. On a building that picks its own recipe it does not leave the
+    // building idle but hands it back to that selection, and says so
+    // (REQ-UI-SELECT-OPTIONS, REQ-BLD-AUTO-RECIPE).
+    options.push_back({std::string(),
+                       isAutoRecipeBuildingType(type) ? QObject::tr("(Auto)")
+                                                      : QObject::tr("(None)"),
+                       RecipeLineRow::Spec()});
 
     if (type == BuildingType::Shipyard)
     {
         for (const ShipDef& def : config.ships.ships)
         {
             if (!sim.isSchematicUnlocked(def.id)) { continue; }
+
+            // The base materials and base production time, excluding the modules the
+            // player has not placed yet (REQ-UI-SELECT-OPTIONS). No output item: a ship
+            // has no icon, so the caption is what the option produces.
+            RecipeLineRow::Spec line;
+            line.inputs          = toAmounts(def.schematic.materials);
+            line.durationSeconds = def.schematic.productionTimeSeconds;
+
             options.push_back({def.id,
                                QString::fromStdString(toDisplayName(def.id)),
-                               shipTooltip(def)});
+                               line});
         }
     }
     else
@@ -87,16 +87,15 @@ std::vector<RecipeSelectionOption> buildRecipeSelectionOptions(
             {
                 continue;
             }
-            // Icon shown on the option button (REQ-UI-RECIPE-ICON): the recipe's
+
-            // configured icon item, else its first output item.
+            RecipeLineRow::Spec line;
-            const std::string iconItemId = recipe.icon
+            line.inputs          = toAmounts(recipe.inputs);
-                ? *recipe.icon
+            line.outputs         = toAmounts(recipe.outputs);
-                : (recipe.outputs.empty() ? std::string()
+            line.durationSeconds = recipe.durationSeconds;
-                                          : recipe.outputs.front().item);
+
             options.push_back({recipe.id,
                                QString::fromStdString(toDisplayName(recipe.id)),
-                               buildRecipeTooltip(recipe),
+                               line});
-                               iconItemId});
         }
     }
 
@@ -105,46 +104,77 @@ std::vector<RecipeSelectionOption> buildRecipeSelectionOptions(
 
 namespace
 {
-    // On-screen size of a recipe option button's item icon (REQ-UI-RECIPE-ICON).
+    // Height the option list is allowed to take, as the dialog's parent window's height
-    const QSize kOptionIconSize(32, 32);
+    // less what the window margins and the dialog's own frame need. Fully unlocked, an
+    // Assembler offers more options than any window can hold, and the modal is never
+    // resized to fit (REQ-UI-PANEL-MODAL) -- so the list scrolls instead.
+    const int kListHeightReservePx = 80;
+
+    // Fallback cap for a dialog built without a parent window to measure.
+    const int kFallbackListHeightPx = 600;
 }
 
 RecipeSelectionDialog::RecipeSelectionDialog(
     const std::vector<RecipeSelectionOption>& options,
-    const QString& title, ItemIconCache* itemIcons, QWidget* parent)
+    const QString& title, ItemIconCache* itemIcons, BuildingIconCache* buildingIcons,
+    QWidget* parent)
     : QDialog(parent)
 {
     setWindowTitle(title);
     setModal(true);
 
     QVBoxLayout* mainLayout = new QVBoxLayout(this);
-    QGridLayout* grid = new QGridLayout();
-    mainLayout->addLayout(grid);
 
-    const int columnCount = 2;
+    // One vertical column of buttons, each stating what it makes (REQ-UI-SELECT-OPTIONS).
+    QScrollArea* scrollArea = new QScrollArea(this);
+    scrollArea->setWidgetResizable(true);
+    scrollArea->setFrameShape(QFrame::NoFrame);
+    scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    scrollArea->setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents);
+    scrollArea->setMaximumHeight(parent != nullptr
+        ? qMax(kListHeightReservePx, parent->height() - kListHeightReservePx)
+        : kFallbackListHeightPx);
+    mainLayout->addWidget(scrollArea);
+
+    QWidget*     list       = new QWidget(scrollArea);
+    QVBoxLayout* listLayout = new QVBoxLayout(list);
+    listLayout->setContentsMargins(0, 0, 0, 0);
+    listLayout->setSpacing(4);
+
     for (int i = 0; i < static_cast<int>(options.size()); ++i)
     {
         const RecipeSelectionOption& option = options[static_cast<std::size_t>(i)];
 
-        QPushButton* button = new QPushButton(this);
+        // An OptionButton so the face of widgets below is what sizes the button
-        // Icon-only when the produced item has an icon (REQ-UI-RECIPE-ICON); otherwise
+        // (REQ-UI-SELECT-OPTIONS).
-        // fall back to the caption. The name stays reachable via the tooltip.
+        OptionButton* button = new OptionButton(list);
-        if (!option.iconItemId.empty() && itemIcons->hasIcon(option.iconItemId))
+        if (option.line.isEmpty())
         {
-            button->setIcon(QIcon(itemIcons->getPixmap(
+            // The "(None)" option makes nothing and is a caption alone
-                option.iconItemId, kOptionIconSize.width())));
+            // (REQ-UI-SELECT-OPTIONS).
-            button->setIconSize(kOptionIconSize);
+            button->setText(option.caption);
         }
         else
         {
-            button->setText(option.caption);
+            // The name over the recipe it stands for. Both are transparent to the mouse
+            // so a click anywhere on the face still reaches the button beneath them.
+            QVBoxLayout* face = new QVBoxLayout(button);
+            face->setContentsMargins(8, 6, 8, 6);
+            face->setSpacing(2);
+
+            QLabel* nameLabel = new QLabel(option.caption, button);
+            QFont nameFont = nameLabel->font();
+            nameFont.setBold(true);
+            nameLabel->setFont(nameFont);
+            nameLabel->setAttribute(Qt::WA_TransparentForMouseEvents, true);
+            face->addWidget(nameLabel);
+
+            RecipeLineRow* line = new RecipeLineRow(itemIcons, buildingIcons, button);
+            line->setAttribute(Qt::WA_TransparentForMouseEvents, true);
+            face->addWidget(line);
+            line->setLine(option.line);
         }
-        if (!option.tooltip.isEmpty())
+        listLayout->addWidget(button);
-        {
-            button->setToolTip(option.tooltip);
-        }
-        button->setMinimumHeight(40);
-        grid->addWidget(button, i / columnCount, i % columnCount);
 
         m_optionIds.push_back(option.id);
         const int index = i;
@@ -153,6 +183,9 @@ RecipeSelectionDialog::RecipeSelectionDialog(
             onOptionClicked(index);
         });
     }
+    listLayout->addStretch(1);
+
+    scrollArea->setWidget(list);
 }
 
 std::optional<std::string> RecipeSelectionDialog::getChosenId() const

src/ui/RecipeSelectionDialog.h

@@ -8,11 +8,13 @@
 #include <QString>
 
 #include "BuildingType.h"
+#include "RecipeLineRow.h"
 
 struct GameConfig;
+class BuildingIconCache;
+class ItemIconCache;
 class Simulation;
 class QPushButton;
-class ItemIconCache;
 
 // One selectable entry in the recipe/schematic selection dialog
 // (REQ-UI-SELECT-BUTTON). The "(None)" entry uses an empty id.
@@ -20,23 +22,23 @@ struct RecipeSelectionOption
 {
     std::string id;
     QString     caption;
-    QString     tooltip;
+    // What the option makes, drawn beneath its caption on the button
-    // Id of the item whose icon is shown on the option button (REQ-UI-RECIPE-ICON);
+    // (REQ-UI-SELECT-OPTIONS). Empty for the "(None)" option, which is a caption alone.
-    // empty for the "(None)" option and for Shipyard schematics, which keep their
+    // A ship schematic fills the inputs and the time and leaves the outputs empty: a
-    // caption. When set but no icon file exists, the button falls back to the caption.
+    // ship is not an item and has no icon, so the caption is what it produces.
-    std::string iconItemId;
+    RecipeLineRow::Spec line;
 };
 
 // Builds the lock-aware list of selectable options for a production building
-// of the given type, with display captions and info tooltips
+// of the given type, with display captions and recipe lines
-// (REQ-UI-SELECT-BUTTON, REQ-UI-SELECT-TOOLTIP). The first entry is always a
+// (REQ-UI-SELECT-BUTTON, REQ-UI-SELECT-OPTIONS). The first entry is always a
 // "(None)" option with an empty id. Shared by the selection dialog and the
-// panel selection button so both render identical captions and tooltips, and
+// panel selection button so both render identical captions, and
 // usable for construction sites which have no Building yet (REQ-BLD-SITE-CONFIG).
 std::vector<RecipeSelectionOption> buildRecipeSelectionOptions(
     BuildingType type, Simulation& sim, const GameConfig& config);
 
-// Modal dialog showing a grid of option buttons (REQ-UI-SELECT-BUTTON). The
+// Modal dialog listing the options in one vertical column (REQ-UI-SELECT-OPTIONS). The
 // game is paused by the caller while it is open. Clicking an option selects it
 // and closes the dialog; dismissing it (close/Esc) leaves no choice.
 class RecipeSelectionDialog : public QDialog
@@ -44,12 +46,10 @@ class RecipeSelectionDialog : public QDialog
     Q_OBJECT
 
 public:
-    // itemIcons is the window-wide per-item icon cache (REQ-UI-ITEM-ICON); used to
+    // The icon caches draw each option's recipe line (REQ-UI-ITEM-ICON). Not owned.
-    // render recipe options icon-only (REQ-UI-RECIPE-ICON). Options whose item has
-    // no icon file fall back to their caption text. Not owned.
     RecipeSelectionDialog(const std::vector<RecipeSelectionOption>& options,
                           const QString& title, ItemIconCache* itemIcons,
-                          QWidget* parent = nullptr);
+                          BuildingIconCache* buildingIcons, QWidget* parent = nullptr);
 
     std::optional<std::string> getChosenId() const;
 

src/ui/RecipeTooltip.cpp

@@ -1,52 +0,0 @@
-#include "RecipeTooltip.h"
-
-#include <QObject>
-#include <QStringList>
-
-#include "DisplayName.h"
-#include "RecipesConfig.h"
-
-namespace
-{
-
-QString itemLine(const std::string& itemId, int amount)
-{
-    return QStringLiteral("  ")
-        + QString::fromStdString(toDisplayName(itemId))
-        + QStringLiteral(" x ") + QString::number(amount);
-}
-
-}  // namespace
-
-QString buildRecipeTooltip(const RecipeDef& recipe)
-{
-    QStringList lines;
-    lines << QObject::tr("Recipe: %1")
-        .arg(QString::fromStdString(toDisplayName(recipe.id)));
-
-    if (recipe.inputs.empty())
-    {
-        lines << QObject::tr("Inputs: none");
-    }
-    else
-    {
-        lines << QObject::tr("Inputs:");
-        for (const RecipeIngredient& ingredient : recipe.inputs)
-        {
-            lines << itemLine(ingredient.item, ingredient.amount);
-        }
-    }
-
-    lines << QObject::tr("Completion time: %1 s").arg(recipe.durationSeconds);
-
-    if (!recipe.outputs.empty())
-    {
-        lines << QObject::tr("Produces:");
-        for (const RecipeOutput& output : recipe.outputs)
-        {
-            lines << itemLine(output.item, output.amount);
-        }
-    }
-
-    return lines.join('\n');
-}

src/ui/RecipeTooltip.h

@@ -1,11 +0,0 @@
-#pragma once
-
-#include <QString>
-
-struct RecipeDef;
-
-// Builds the recipe info tooltip text (REQ-UI-SELECT-TOOLTIP): the recipe name,
-// each input item name and quantity, the completion time, and the produced
-// output item name and quantity. Shared by the recipe-selection dialog and the
-// schematic choice dialog's "Unlocks recipes:" list so both render identically.
-QString buildRecipeTooltip(const RecipeDef& recipe);

src/ui/SchematicChoiceDialog.cpp

@@ -6,12 +6,35 @@
 #include <QVBoxLayout>
 
 #include "DisplayName.h"
-#include "RecipeTooltip.h"
+#include "RecipeLineRow.h"
 #include "RecipesConfig.h"
 
 namespace
 {
 
+std::vector<RecipeLineRow::Amount> toAmounts(
+    const std::vector<RecipeIngredient>& ingredients)
+{
+    std::vector<RecipeLineRow::Amount> amounts;
+    amounts.reserve(ingredients.size());
+    for (const RecipeIngredient& ingredient : ingredients)
+    {
+        amounts.push_back(RecipeLineRow::Amount{ ingredient.item, ingredient.amount });
+    }
+    return amounts;
+}
+
+std::vector<RecipeLineRow::Amount> toAmounts(const std::vector<RecipeOutput>& outputs)
+{
+    std::vector<RecipeLineRow::Amount> amounts;
+    amounts.reserve(outputs.size());
+    for (const RecipeOutput& output : outputs)
+    {
+        amounts.push_back(RecipeLineRow::Amount{ output.item, output.amount });
+    }
+    return amounts;
+}
+
 QString grantKindLabel(SchematicType type)
 {
     switch (type)
@@ -28,7 +51,8 @@ QString grantKindLabel(SchematicType type)
 
 SchematicChoiceDialog::SchematicChoiceDialog(
     const std::vector<SchematicChoiceOption>& options,
-    const RecipesConfig& recipes,
+    const RecipesConfig& recipes, ItemIconCache* itemIcons,
+    BuildingIconCache* buildingIcons,
     QWidget* parent)
     : QDialog(parent)
     , m_chosenIndex(0)
@@ -56,7 +80,12 @@ SchematicChoiceDialog::SchematicChoiceDialog(
 
         QWidget* card = new QWidget(this);
         QVBoxLayout* cardLayout = new QVBoxLayout(card);
-        card->setStyleSheet("QWidget { border: 1px solid gray; padding: 8px; }");
+        // Scoped to the card by object name. An unscoped "QWidget" selector cascades to
+        // every descendant, which boxed each label and each icon of the recipe lines
+        // inside it as well.
+        card->setObjectName(QStringLiteral("schematicChoiceCard"));
+        card->setStyleSheet(QStringLiteral(
+            "QWidget#schematicChoiceCard { border: 1px solid gray; padding: 8px; }"));
 
         QLabel* nameLabel = new QLabel(QString::fromStdString(option.displayName), card);
         QFont nameFont = nameLabel->font();
@@ -108,14 +137,24 @@ SchematicChoiceDialog::SchematicChoiceDialog(
             {
                 for (const std::string& recipeId : option.newlyUnlockedRecipeIds)
                 {
-                    QLabel* recipeLabel = new QLabel(
+                    const RecipeDef* def = recipes.findRecipeDef(recipeId);
-                        QString::fromStdString(toDisplayName(recipeId)), card);
+                    if (def == nullptr) { continue; }
-                    recipeLabel->setAlignment(Qt::AlignCenter);
+
-                    if (const RecipeDef* def = recipes.findRecipeDef(recipeId))
+                    // The recipe drawn as it is everywhere else, led by the building
-                    {
+                    // that runs it and its name, so the line says everything there is
-                        recipeLabel->setToolTip(buildRecipeTooltip(*def));
+                    // to say about it and carries no tooltip (REQ-DEF-SCHEMATIC-DROP).
-                    }
+                    RecipeLineRow::Spec spec;
-                    cardLayout->addWidget(recipeLabel);
+                    spec.building        = def->building;
+                    spec.name            = QString::fromStdString(toDisplayName(def->id));
+                    spec.inputs          = toAmounts(def->inputs);
+                    spec.outputs         = toAmounts(def->outputs);
+                    spec.durationSeconds = def->durationSeconds;
+
+                    RecipeLineRow* line =
+                        new RecipeLineRow(itemIcons, buildingIcons, card);
+                    line->setCardChrome(true);
+                    cardLayout->addWidget(line);
+                    line->setLine(spec);
                 }
             }
         }

src/ui/SchematicChoiceDialog.h

@@ -7,14 +7,19 @@
 #include "SchematicChoiceOption.h"
 
 struct RecipesConfig;
+class BuildingIconCache;
+class ItemIconCache;
 
 class SchematicChoiceDialog : public QDialog
 {
     Q_OBJECT
 
 public:
+    // The icon caches draw the recipe lines of the "Unlocks recipes" list
+    // (REQ-DEF-SCHEMATIC-DROP, REQ-UI-ITEM-ICON, REQ-UI-BUILD-ICON). Not owned.
     SchematicChoiceDialog(const std::vector<SchematicChoiceOption>& options,
-                          const RecipesConfig& recipes,
+                          const RecipesConfig& recipes, ItemIconCache* itemIcons,
+                          BuildingIconCache* buildingIcons,
                           QWidget* parent = nullptr);
 
     int getChosenIndex() const;

src/ui/SelectionBounds.cpp

@@ -0,0 +1,115 @@
+#include "SelectionBounds.h"
+
+#include "Building.h"
+#include "DebrisComponent.h"
+#include "EntityAdmin.h"
+#include "FactoryQueries.h"
+#include "PositionComponent.h"
+#include "Simulation.h"
+#include "StationBodyComponent.h"
+#include "WorldCoordinates.h"
+#include "WorldPrimitives.h"
+
+namespace
+{
+
+// The widget rectangle of a footprint anchored at a tile, both kinds of body being
+// described the same way.
+QRectF getFootprintWidgetRect(const WorldCoordinates& coordinates, QPoint anchor,
+                              QSize footprint)
+{
+    const QPointF topLeft = coordinates.tileToWidget(anchor);
+    return QRectF(topLeft.x(), topLeft.y(),
+                  footprint.width()  * static_cast<qreal>(coordinates.getTilePx()),
+                  footprint.height() * static_cast<qreal>(coordinates.getTilePx()));
+}
+
+}  // namespace
+
+
+std::optional<QRectF> getBuildingWidgetRect(const FactoryState& state,
+                                            const WorldCoordinates& coordinates,
+                                            BuildingId id)
+{
+    if (const Building* building = findBuilding(state, id))
+    {
+        return getFootprintWidgetRect(coordinates, building->anchor, building->footprint);
+    }
+    if (const ConstructionSite* site = findSite(state, id))
+    {
+        return getFootprintWidgetRect(coordinates, site->anchor, site->footprint);
+    }
+    return std::nullopt;
+}
+
+std::optional<QRectF> getActorWidgetRect(const EntityAdmin& admin,
+                                         const WorldCoordinates& coordinates,
+                                         entt::entity actor)
+{
+    if (!admin.isValid(actor))
+    {
+        return std::nullopt;
+    }
+    if (admin.hasAll<StationBodyComponent>(actor))
+    {
+        const StationBodyComponent& body = admin.get<StationBodyComponent>(actor);
+        return getFootprintWidgetRect(coordinates, body.anchor, body.footprint);
+    }
+    if (admin.hasAll<PositionComponent>(actor))
+    {
+        // A ship is a triangle about its center; the square its longest extent fits in
+        // is what the panel is placed beside.
+        const QPointF center =
+            coordinates.worldToWidget(admin.get<PositionComponent>(actor).value);
+        const qreal extent = static_cast<qreal>(getShipForwardExtentPx(coordinates));
+        return QRectF(center.x() - extent, center.y() - extent,
+                      2.0 * extent, 2.0 * extent);
+    }
+    return std::nullopt;
+}
+
+std::optional<QRectF> getDebrisWidgetRect(const EntityAdmin& admin,
+                                          const WorldCoordinates& coordinates,
+                                          entt::entity debris)
+{
+    if (!admin.isValid(debris) || !admin.hasAll<PositionComponent, DebrisComponent>(debris))
+    {
+        return std::nullopt;
+    }
+    const QPointF center =
+        coordinates.worldToWidget(admin.get<PositionComponent>(debris).value);
+    const qreal radius = static_cast<qreal>(getDebrisRadiusPx(coordinates));
+    return QRectF(center.x() - radius, center.y() - radius, 2.0 * radius, 2.0 * radius);
+}
+
+QRect getSelectionWidgetRect(const Simulation& sim, const WorldCoordinates& coordinates,
+                             const std::vector<BuildingId>& buildings,
+                             const std::vector<entt::entity>& actors,
+                             const std::vector<entt::entity>& debris)
+{
+    QRectF bounds;
+    // A null rect unites to nothing of its own, so the first object found sets the box
+    // and every later one grows it.
+    auto add = [&bounds](const std::optional<QRectF>& rect)
+    {
+        if (rect.has_value())
+        {
+            bounds = bounds.isNull() ? *rect : bounds.united(*rect);
+        }
+    };
+
+    for (BuildingId id : buildings)
+    {
+        add(getBuildingWidgetRect(sim.getFactoryState(), coordinates, id));
+    }
+    for (entt::entity actor : actors)
+    {
+        add(getActorWidgetRect(sim.getAdmin(), coordinates, actor));
+    }
+    for (entt::entity piece : debris)
+    {
+        add(getDebrisWidgetRect(sim.getAdmin(), coordinates, piece));
+    }
+
+    return bounds.isNull() ? QRect() : bounds.toAlignedRect();
+}

src/ui/SelectionBounds.h

@@ -0,0 +1,48 @@
+#pragma once
+
+#include <optional>
+#include <vector>
+
+#include <QRect>
+
+#include "entt/entity/entity.hpp"
+
+#include "BuildingId.h"
+
+class EntityAdmin;
+class Simulation;
+class WorldCoordinates;
+struct FactoryState;
+
+// Where selectable objects are on the screen. The world renderer draws every selection
+// outline from these rectangles, and the selection panel is placed beside the one that
+// covers the whole selection (REQ-UI-SELECTION-PANEL).
+//
+// All of them are in the game world view's own widget coordinates, and all of them are
+// only true for the WorldCoordinates they were asked for: the transform is a value built
+// per frame or per event, so a rectangle does not survive a scroll or a resize.
+
+// The footprint of a building or of a construction site (REQ-UI-SELECTION-CARD). Null
+// when the id names neither, which is what a deconstruction under the caller looks like.
+std::optional<QRectF> getBuildingWidgetRect(const FactoryState& state,
+                                            const WorldCoordinates& coordinates,
+                                            BuildingId id);
+
+// The body of a ship or of a defence station (REQ-UI-ENTITY-CLICK-SELECT): a station's
+// footprint, or the square the ship's triangle is drawn in.
+std::optional<QRectF> getActorWidgetRect(const EntityAdmin& admin,
+                                         const WorldCoordinates& coordinates,
+                                         entt::entity actor);
+
+// The circle a piece of debris is drawn as (REQ-UI-DEBRIS-CLICK-SELECT).
+std::optional<QRectF> getDebrisWidgetRect(const EntityAdmin& admin,
+                                          const WorldCoordinates& coordinates,
+                                          entt::entity debris);
+
+// The rectangle covering a whole selection -- one object, or the bounding box of all of
+// them (REQ-UI-SELECTION-PANEL). Objects that no longer resolve are skipped; the result
+// is null when none of them does.
+QRect getSelectionWidgetRect(const Simulation& sim, const WorldCoordinates& coordinates,
+                             const std::vector<BuildingId>& buildings,
+                             const std::vector<entt::entity>& actors,
+                             const std::vector<entt::entity>& debris);

src/ui/SelectionPanel.cpp

@@ -1,10 +1,14 @@
 #include "SelectionPanel.h"
 
+#include <QMouseEvent>
 #include <QScrollArea>
 #include <QScrollBar>
 #include <QVBoxLayout>
 
 #include "BuildingIconCache.h"
+#include "EventManager.h"
+#include "FloatingLayoutInvalidatedEvent.h"
+#include "FloatingPanelPlacement.h"
 #include "ItemIconCache.h"
 #include "Simulation.h"
 #include "VisualsConfig.h"
@@ -13,8 +17,8 @@
 namespace
 {
 
-// Distance kept between the panel and the edges of the band it is anchored to
+// Distance kept between the panel and the edges of the game world view, and between it
-// (REQ-UI-SELECTION-PANEL).
+// and the widgets it steps around (REQ-UI-SELECTION-PANEL).
 const int kMarginPx = 8;
 
 // Upper bound on the card width. The panel is content-sized, but several of the cards'
@@ -62,7 +66,13 @@ SelectionPanel::SelectionPanel(Simulation* sim, const GameConfig* config,
     m_scrollArea->setFrameShape(QFrame::NoFrame);
     m_scrollArea->setWidgetResizable(true);
     m_scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    m_scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+    // The panel works out for itself whether the card fits the band, and sizes itself to
+    // leave room for the bar when it does not (REQ-UI-SELECTION-PANEL), so refit() sets
+    // this policy rather than leaving the scroll area to decide. Asked to decide, it
+    // shows a bar the moment the card is momentarily larger than the viewport -- which
+    // happens while the card is being measured -- and does not take it back when the
+    // range turns out to be empty.
+    m_scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     m_scrollArea->viewport()->setAutoFillBackground(false);
     m_body->setAutoFillBackground(false);
     m_scrollArea->setWidget(m_body);
@@ -88,10 +98,60 @@ SelectionPanel::~SelectionPanel()
     unregisterForEvents();
 }
 
-void SelectionPanel::anchorTo(const QRect& bandRect)
+void SelectionPanel::invalidateLayout()
 {
-    m_bandRect = bandRect;
+    EventManager::getInstance()->sendEventImmediately(
-    updateVisibility();
+        std::make_shared<FloatingLayoutInvalidatedEvent>());
+}
+
+void SelectionPanel::mousePressEvent(QMouseEvent* event)
+{
+    // Only the card's header moves the panel (REQ-UI-SELECTION-PANEL-DRAG). Presses on
+    // the header's labels arrive here by ordinary propagation, none of them being a
+    // widget that accepts mouse events, and carry a position in this panel's coordinates.
+    if (event->button() == Qt::LeftButton && m_content != nullptr)
+    {
+        QWidget* header = m_content->getHeaderWidget();
+        QRect headerRect(header->mapTo(this, QPoint(0, 0)), header->size());
+        // A card long enough to scroll can have its header scrolled out of sight; what is
+        // hidden is not a handle, and the pixels it would claim show other parts of the
+        // card.
+        QWidget* viewport = m_scrollArea->viewport();
+        headerRect &= QRect(viewport->mapTo(this, QPoint(0, 0)), viewport->size());
+        if (headerRect.contains(event->pos()))
+        {
+            m_dragGrabOffsetPx = event->pos();
+        }
+    }
+
+    // Accepted whether or not it started a drag: no mouse event over the panel reaches
+    // the game world (REQ-UI-SELECTION-PANEL).
+    event->accept();
+}
+
+void SelectionPanel::mouseMoveEvent(QMouseEvent* event)
+{
+    if (m_dragGrabOffsetPx.has_value() && parentWidget() != nullptr)
+    {
+        // Read from the cursor's position on the screen rather than from the panel's own
+        // coordinates, which move under the cursor as the drag places the panel again.
+        const QPoint topLeftPx =
+            parentWidget()->mapFromGlobal(event->globalPos()) - *m_dragGrabOffsetPx;
+        m_desiredTopLeftPx = topLeftPx - m_viewOriginPx;
+        // Where the panel actually lands follows from the desired position by the
+        // ordinary rules, the widgets it steps around included (REQ-UI-SELECTION-PANEL-DRAG).
+        invalidateLayout();
+    }
+    event->accept();
+}
+
+void SelectionPanel::mouseReleaseEvent(QMouseEvent* event)
+{
+    // Qt's implicit grab has kept the drag alive while the cursor was outside the panel
+    // or outside the view; it ends here, wherever the button was let go
+    // (REQ-UI-SELECTION-PANEL-DRAG). The desired position stays as dropped.
+    m_dragGrabOffsetPx.reset();
+    event->accept();
 }
 
 void SelectionPanel::handleEvent(std::shared_ptr<const SelectionChangedEvent> event)
@@ -107,6 +167,25 @@ void SelectionPanel::handleEvent(std::shared_ptr<const SelectionChangedEvent> ev
     rebuildContent();
 }
 
+void SelectionPanel::handleEvent(
+    std::shared_ptr<const SelectionAnchorChangedEvent> event)
+{
+    // A new selection is starting. Both the anchor and the side are settled against it
+    // and then left alone for as long as it lasts (REQ-UI-SELECTION-PANEL); the side is
+    // only reset here, being resolved on the next placement once the card's width is
+    // known. The rect arrives in the world view's coordinates and is translated when the
+    // panel is placed, the two widgets being siblings in the same parent.
+    m_anchorRect = event->rectPx;
+    m_side.reset();
+    // A position the player dragged the panel to belongs to the selection it was set in.
+    // A new selection places the panel anew against its own anchor
+    // (REQ-UI-SELECTION-PANEL-DRAG); this event is published only when one starts, and
+    // not when an existing selection is added to or reduced, which is exactly the scope
+    // the dragged position keeps.
+    m_desiredTopLeftPx.reset();
+    m_dragGrabOffsetPx.reset();
+}
+
 void SelectionPanel::handleEvent(
     std::shared_ptr<const EntitySelectionChangedEvent> event)
 {
@@ -172,7 +251,7 @@ void SelectionPanel::refreshContent()
     }
 
     m_content->refresh();
-    updateVisibility();
+    invalidateLayout();
 }
 
 void SelectionPanel::rebuildContent()
@@ -193,75 +272,155 @@ void SelectionPanel::rebuildContent()
     if (m_content)
     {
         m_bodyLayout->addWidget(m_content);
+        // The show is what makes the card count. A widget created under an
+        // already-visible parent starts hidden, and a layout treats a hidden item as
+        // empty -- it adds nothing to the size hint until something shows it, which
+        // otherwise does not happen until the event loop next runs, long after refit()
+        // has measured the panel. The panel then fits itself to an empty body and
+        // collapses to its scroll bar.
+        m_content->show();
         m_content->refresh();
     }
-    updateVisibility();
+    invalidateLayout();
 }
 
-void SelectionPanel::updateVisibility()
+void SelectionPanel::placeIn(const QRect& viewRect, const std::vector<QRect>& occupiedRects)
 {
     // Nothing selected in either category means no panel at all rather than an empty one
-    // (REQ-UI-EMPTY-SELECTION), leaving the whole game world view visible. Before the
+    // (REQ-UI-EMPTY-SELECTION), leaving the whole game world view visible.
-    // owner has anchored the panel there is nowhere to put it either, so it stays hidden
+    setVisible(m_content != nullptr);
-    // until then.
+    if (m_content == nullptr || viewRect.isNull())
-    const bool shouldShow = (m_content != nullptr) && !m_bandRect.isNull();
-    setVisible(shouldShow);
-    if (shouldShow)
     {
-        refit();
+        return;
     }
-}
 
-void SelectionPanel::refit()
+    const QRect band = viewRect.adjusted(kMarginPx, kMarginPx, -kMarginPx, -kMarginPx);
-{
-    // The layout drops hidden widgets from its size hint, but only once it has been
-    // re-run: a card hides and shows its parts as it refreshes, before Qt would get
-    // around to it on its own.
-    m_body->layout()->activate();
 
-    const QRect band =
+    // What the view's coordinates and this panel's differ by, kept for the drag gesture,
-        m_bandRect.adjusted(kMarginPx, kMarginPx, -kMarginPx, -kMarginPx);
+    // which learns of the cursor in the latter and stores its result in the former
+    // (REQ-UI-SELECTION-PANEL-DRAG).
+    m_viewOriginPx = viewRect.topLeft();
+
+    // The anchor is published in the world view's coordinates and this panel is placed in
+    // its parent's; the two widgets are siblings, so the view's own origin is the whole
+    // difference. Without an anchor the panel falls back to the top-right corner, by
+    // standing beside a point just outside that corner -- in practice unreachable, every
+    // non-empty selection following a click or a drag that publishes one.
+    const QRect anchorRect =
+        m_anchorRect.isNull() ? QRect(band.right() + kMarginPx + 1, band.top(), 1, 1)
+                              : m_anchorRect.translated(viewRect.topLeft());
 
     // The panel's border is drawn around the scroll area rather than around the card, so
     // it is added to whatever the card asks for. Spelled out here instead of read back
     // from contentsMargins() because the stylesheet box is what sets it, and asking the
     // style for it before the first show is unreliable.
-    const int borderPx    = 1;
+    const int borderPx   = 1;
-    const int maxWidthPx  = qMin(kMaxContentWidthPx, band.width() - 2 * borderPx);
+    const int maxWidthPx = qMin(kMaxContentWidthPx, band.width() - 2 * borderPx);
-    const int maxHeightPx = band.height() - 2 * borderPx;
+    if (maxWidthPx <= 0 || band.height() <= 2 * borderPx)
-    if (maxWidthPx <= 0 || maxHeightPx <= 0)
     {
         return;
     }
 
-    int contentWidthPx = qMin(m_body->sizeHint().width(), maxWidthPx);
+    // What the card asks for at a given width. The width has to be applied before
-    // Word-wrapped labels only know their height once the width is fixed; the layout
+    // asking, because a card's height depends on the room it is given -- and so, once
-    // reports -1 when nothing in it wraps, in which case the plain hint is exact.
+    // laid out, does the width it reports. Measuring at whatever width the panel
-    int contentHeightPx = m_body->heightForWidth(contentWidthPx);
+    // happens to have carries the previous card's shape into this one.
-    if (contentHeightPx < 0)
+    //
+    // Each measurement re-runs the body layout. Cards are built and discarded whole, so
+    // its cached hint describes the card before this one until it is invalidated, and
+    // re-running it is also what accounts for the parts a card hides and shows as it
+    // refreshes. The polish belongs to the same step: a freshly created chip reports an
+    // unstyled hint until the stylesheet has reached it, and the chips carry border and
+    // padding that change their size.
+    auto measureAt = [this](int widthPx) -> QSize
     {
-        contentHeightPx = m_body->sizeHint().height();
+        m_body->resize(widthPx, m_body->height());
-    }
+        m_body->ensurePolished();
+        m_body->layout()->invalidate();
+        m_body->layout()->activate();
+        return m_body->sizeHint();
+    };
 
-    if (contentHeightPx > maxHeightPx)
+    // Where a panel of that size stands: beside the selection, or at the position the
+    // player dragged the panel to, which replaces both the anchor and the side for the
+    // rest of the selection (REQ-UI-SELECTION-PANEL-DRAG). Either way the result is
+    // resolved against the view's edges and the widgets placed before this one, so a
+    // dragged panel steps around them exactly as an anchored one does.
+    auto solve = [&](QSize wantedSize) -> QRect
     {
-        // A card taller than the band is capped there and scrolls
+        if (m_desiredTopLeftPx.has_value())
-        // (REQ-UI-SELECTION-PANEL). The scroll bar is laid out beside the card, so the
+        {
-        // panel widens by its width to keep the card as wide as the height was computed
+            return placeAtDesiredTopLeft(band, *m_desiredTopLeftPx + viewRect.topLeft(),
-        // for.
+                                         wantedSize, occupiedRects, kMarginPx);
-        contentHeightPx = maxHeightPx;
+        }
-        contentWidthPx  = qMin(
+        return placeBesideAnchor(band, anchorRect, *m_side, wantedSize, occupiedRects,
-            contentWidthPx + m_scrollArea->verticalScrollBar()->sizeHint().width(),
+                                 kMarginPx);
-            maxWidthPx);
+    };
+
+    // Run twice. Parts of a card report an unstyled size until the style has actually
+    // reached them, which for a freshly built card happens during the first round of
+    // measuring; the second round then measures a card that is fully laid out and
+    // settles on the answer. Without it a card can end up a few pixels short of what it
+    // turns out to need, and the difference shows as a scroll bar over a card that
+    // looks like it fits.
+    for (int pass = 0; pass < 2; ++pass)
+    {
+        // First at the cap, the most room the card can ever get, to learn how wide it
+        // wants to be; then at that width for the height that follows from it.
+        int contentWidthPx  = qMin(measureAt(maxWidthPx).width(), maxWidthPx);
+
+        // Which side of the selection the panel takes is settled on the first placement
+        // after a new anchor and kept for as long as that selection lasts, so a card that
+        // grows or shrinks never flips the panel across the object it describes
+        // (REQ-UI-SELECTION-PANEL). This is the first point at which its width is known.
+        if (!m_side.has_value())
+        {
+            m_side = chooseSide(band, anchorRect, contentWidthPx + 2 * borderPx,
+                                kMarginPx);
+        }
+
+        // How much height there is depends on where the panel ends up standing: of the
+        // widgets placed before it, only those whose rectangles meet its own column are
+        // in its way. That column follows from the width just measured, so this cannot be
+        // settled before it -- and where the scroll bar below widens the panel, the second
+        // pass settles it again against the wider column. Asking for the whole band's
+        // height is what makes the answer the most the panel could have there.
+        const int maxHeightPx =
+            solve(QSize(contentWidthPx + 2 * borderPx, band.height())).height()
+            - 2 * borderPx;
+        if (maxHeightPx <= 0)
+        {
+            return;
+        }
+
+        int contentHeightPx = measureAt(contentWidthPx).height();
+
+        // A card taller than the space left is capped there and scrolls
+        // (REQ-UI-SELECTION-PANEL). The bar is laid out beside the card, so the panel
+        // widens by its width to leave the card the width its height was measured for --
+        // and where the cap does not allow that, the card is measured again at what is
+        // left over.
+        const bool scrolls = (contentHeightPx > maxHeightPx);
+        int viewportWidthPx = contentWidthPx;
+        if (scrolls)
+        {
+            const int scrollBarWidthPx =
+                m_scrollArea->verticalScrollBar()->sizeHint().width();
+            contentWidthPx  = qMin(contentWidthPx + scrollBarWidthPx, maxWidthPx);
+            contentHeightPx = maxHeightPx;
+            viewportWidthPx = contentWidthPx - scrollBarWidthPx;
+            measureAt(viewportWidthPx);
+        }
+        m_scrollArea->setVerticalScrollBarPolicy(
+            scrolls ? Qt::ScrollBarAlwaysOn : Qt::ScrollBarAlwaysOff);
+
+        // Left at the size the scroll area is about to give it, so the card is not
+        // briefly wider than its viewport.
+        m_body->resize(viewportWidthPx, m_body->sizeHint().height());
+
+        const int panelWidthPx  = contentWidthPx + 2 * borderPx;
+        const int panelHeightPx = contentHeightPx + 2 * borderPx;
+
+        setGeometry(solve(QSize(panelWidthPx, panelHeightPx)));
     }
-
-    const int panelWidthPx  = contentWidthPx + 2 * borderPx;
-    const int panelHeightPx = contentHeightPx + 2 * borderPx;
-
-    // Right-aligned in the band and centered on it vertically. The band excludes the
-    // build button bar's strip, so centering here never puts the panel over the bar
-    // (REQ-UI-SELECTION-PANEL).
-    setGeometry(band.right() - panelWidthPx + 1,
-                band.top() + (band.height() - panelHeightPx) / 2,
-                panelWidthPx, panelHeightPx);
 }

src/ui/SelectionPanel.h

@@ -1,13 +1,20 @@
 #pragma once
 
+#include <QPoint>
 #include <QRect>
 #include <QWidget>
 
+#include <optional>
+#include <vector>
+
 #include "DebrisSelectionChangedEvent.h"
 #include "DebugDrawToggledEvent.h"
 #include "EntitySelectionChangedEvent.h"
 #include "EventHandler.h"
+#include "FloatingPanel.h"
+#include "FloatingPanelPlacement.h"
 #include "PlayerCommandsAppliedEvent.h"
+#include "SelectionAnchorChangedEvent.h"
 #include "SelectionChangedEvent.h"
 #include "TickAdvancedEvent.h"
 #include "selection/SelectionContentFactory.h"
@@ -19,6 +26,7 @@ class BuildingIconCache;
 class ItemIconCache;
 class SelectionContent;
 class Simulation;
+class QMouseEvent;
 class QScrollArea;
 class QVBoxLayout;
 
@@ -28,14 +36,16 @@ class QVBoxLayout;
 // What each card looks like lives in src/ui/selection/.
 //
 // The panel floats over the game world view rather than occupying a column of its own
-// (REQ-UI-SELECTION-PANEL): it sizes itself to its card, anchors to the right edge of
+// (REQ-UI-SELECTION-PANEL): it sizes itself to its card, places itself in what the build
-// the band its owner hands it, and hides itself entirely while nothing is selected
+// button bar and the controls panel have left free, and hides itself entirely while
-// (REQ-UI-EMPTY-SELECTION).
+// nothing is selected (REQ-UI-EMPTY-SELECTION).
 class SelectionPanel : public QWidget,
+                       public FloatingPanel,
                        public CombinedEventHandler<TickAdvancedEvent,
                                                    PlayerCommandsAppliedEvent,
                                                    EntitySelectionChangedEvent,
                                                    SelectionChangedEvent,
+                                                   SelectionAnchorChangedEvent,
                                                    DebrisSelectionChangedEvent,
                                                    DebugDrawToggledEvent>
 {
@@ -49,14 +59,24 @@ public:
                    BuildingIconCache* buildingIcons, QWidget* parent = nullptr);
     ~SelectionPanel() override;
 
-    // Confines the panel to the given band of the game world view: it right-aligns
+    // Sizes the panel to its card and places it beside the selection it describes, in
-    // within it and centers vertically in it. The band is the world view less the strip
+    // what the widgets placed before it have left free. Keeping clear of them is entirely
-    // the build button bar occupies, so the two never overlap and the bar never has to
+    // this panel's job; neither of them ever moves for it (REQ-UI-SELECTION-PANEL,
-    // move (REQ-UI-SELECTION-PANEL, REQ-UI-BUILD-BAR).
+    // REQ-UI-BUILD-BAR, REQ-UI-CONTROLS-PANEL).
-    void anchorTo(const QRect& bandRect);
+    void placeIn(const QRect& viewRect,
+                 const std::vector<QRect>& occupiedRects) override;
+
+protected:
+    // The panel is moved by dragging its card header (REQ-UI-SELECTION-PANEL-DRAG). Every
+    // other mouse event over the panel is swallowed here so that none of them reaches the
+    // game world beneath (REQ-UI-SELECTION-PANEL).
+    void mousePressEvent(QMouseEvent* event) override;
+    void mouseMoveEvent(QMouseEvent* event) override;
+    void mouseReleaseEvent(QMouseEvent* event) override;
 
 private:
     void handleEvent(std::shared_ptr<const SelectionChangedEvent> event) override;
+    void handleEvent(std::shared_ptr<const SelectionAnchorChangedEvent> event) override;
     void handleEvent(std::shared_ptr<const EntitySelectionChangedEvent> event) override;
     void handleEvent(std::shared_ptr<const DebrisSelectionChangedEvent> event) override;
     void handleEvent(std::shared_ptr<const TickAdvancedEvent> event) override;
@@ -69,11 +89,9 @@ private:
     void refreshContent();
     // Replaces the card with the one the current selection calls for.
     void rebuildContent();
-    // Shows the panel while a card exists and hides it otherwise
+    // Asks for the placement pass to be re-run, the card having changed size or the
-    // (REQ-UI-EMPTY-SELECTION), re-fitting it to the card while it is shown.
+    // panel having gained or lost its reason to be shown at all.
-    void updateVisibility();
+    void invalidateLayout();
-    // Re-fits the panel to its card within the anchored band.
-    void refit();
 
     SelectionContext m_context;
     // Read through m_context by the cards that need it, so a toggle reaches the card on
@@ -84,12 +102,31 @@ private:
     ContentKey        m_contentKey;
     SelectionContent* m_content = nullptr;
 
-    // The band the panel confines itself to, in the coordinates of its parent; null
+    // Where the current selection was on the screen when it started, in the game world
-    // until the owner has anchored it for the first time.
+    // view's coordinates, and which side of it the panel took. Both are frozen for as
-    QRect m_bandRect;
+    // long as the selection lasts: the anchor because the panel does not chase a
+    // scrolling view or a moving ship, the side because a card that grows must not flip
+    // the panel across the object (REQ-UI-SELECTION-PANEL). The side is resolved on the
+    // first placement after a new anchor, being the first point at which the panel's
+    // width is known. Dragging the panel supersedes the pair for the rest of the
+    // selection (REQ-UI-SELECTION-PANEL-DRAG).
+    QRect                    m_anchorRect;
+    std::optional<PanelSide> m_side;
 
-    // Scrolls the card once it outgrows the band (REQ-UI-SELECTION-PANEL). The card is a
+    // Where the player dragged the panel, in the game world view's coordinates, and the
-    // child of m_body, not of the panel itself.
+    // cursor's offset within the panel while a drag is running
+    // (REQ-UI-SELECTION-PANEL-DRAG). The desired position is kept exactly as dropped:
+    // resolving it against the view's edges and the widgets the panel steps around never
+    // writes back to it, so the panel returns to it once the room is there again. It
+    // lasts as long as the selection it was set in.
+    std::optional<QPoint> m_desiredTopLeftPx;
+    std::optional<QPoint> m_dragGrabOffsetPx;
+    // Origin of the view the panel was last placed in, which is what the two coordinate
+    // systems differ by -- the panel is a sibling of the view, not a child of it.
+    QPoint m_viewOriginPx;
+
+    // Scrolls the card once it outgrows the space the panel has (REQ-UI-SELECTION-PANEL).
+    // The card is a child of m_body, not of the panel itself.
     QScrollArea* m_scrollArea;
     QWidget*     m_body;
     QVBoxLayout* m_bodyLayout;

src/ui/ShipLayoutDialog.cpp

@@ -5,11 +5,16 @@
 #include <functional>
 
 #include "DisplayName.h"
+#include "OptionButton.h"
+#include "ProductionRules.h"
+#include "RecipeLineRow.h"
+#include "SectionBox.h"
 
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QInputDialog>
 #include <QKeyEvent>
+#include <QLabel>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QPushButton>
@@ -22,6 +27,18 @@
 namespace
 {
 
+std::vector<RecipeLineRow::Amount> toAmounts(
+    const std::vector<RecipeIngredient>& ingredients)
+{
+    std::vector<RecipeLineRow::Amount> amounts;
+    amounts.reserve(ingredients.size());
+    for (const RecipeIngredient& ingredient : ingredients)
+    {
+        amounts.push_back(RecipeLineRow::Amount{ ingredient.item, ingredient.amount });
+    }
+    return amounts;
+}
+
 const int kCellSize = 32;
 
 // Empty ship tiles pulse between this grey and white at 1 Hz while a module is
@@ -401,9 +418,11 @@ ShipLayoutDialog::ShipLayoutDialog(const GameConfig* config,
                                    std::vector<ShipLayoutBlueprint>& allBlueprints,
                                    std::set<std::string> unlockedModuleIds,
                                    bool debugDraw,
+                                   ItemIconCache* itemIcons,
                                    QWidget* parent)
     : QDialog(parent)
     , m_config(config)
+    , m_itemIcons(itemIcons)
     , m_shipId(shipId)
     , m_unlockedModuleIds(std::move(unlockedModuleIds))
     , m_rows(0)
@@ -463,10 +482,22 @@ ShipLayoutDialog::ShipLayoutDialog(const GameConfig* config,
     // Middle: three-column area (stats | module buttons | blueprints).
     QHBoxLayout* columnsLayout = new QHBoxLayout();
 
-    // Left column: ship stats panel.
+    // Left column: ship stats panel, and beneath it what the layout being configured
+    // would cost to build (REQ-MOD-UI-DIALOG). The cost sits outside the stats panel
+    // because that widget is shared with the live ship card and the balancing tool,
+    // neither of which costs anything -- and the balancing tool is deliberately built
+    // without the item icons this line draws with.
+    QVBoxLayout* leftLayout = new QVBoxLayout();
     m_statsPanel = new ShipStatsPanel(config, this);
     m_statsPanel->setDebugDrawEnabled(m_debugDraw);
-    columnsLayout->addWidget(m_statsPanel);
+    leftLayout->addWidget(m_statsPanel);
+
+    m_buildCostSection = new SectionBox(tr("Build cost"), this);
+    m_buildCostLine    = new RecipeLineRow(m_itemIcons, nullptr, m_buildCostSection);
+    m_buildCostSection->getContentLayout()->addWidget(m_buildCostLine);
+    leftLayout->addWidget(m_buildCostSection);
+    leftLayout->addStretch(1);
+    columnsLayout->addLayout(leftLayout);
 
     // Center column: module selection buttons.
     QVBoxLayout* centerLayout = new QVBoxLayout();
@@ -487,11 +518,34 @@ ShipLayoutDialog::ShipLayoutDialog(const GameConfig* config,
             m_moduleButtons.push_back(nullptr);
             continue;
         }
-        const QString label = QString::fromStdString(toDisplayName(def.id))
+        // The module's name over what it costs -- its materials and the production time
-            + "\n" + QString::fromStdString(def.glyph);
+        // it adds (REQ-MOD-UI-DIALOG). The glyph is how a module is identified on the
-        QPushButton* btn = new QPushButton(label, this);
+        // layout grid, not here. Both children are transparent to the mouse so a click
+        // anywhere on the face still reaches the button.
+        OptionButton* btn = new OptionButton(this);
         btn->setCheckable(true);
-        btn->setFixedHeight(48);
+
+        QVBoxLayout* face = new QVBoxLayout(btn);
+        face->setContentsMargins(8, 4, 8, 4);
+        face->setSpacing(1);
+
+        QLabel* nameLabel =
+            new QLabel(QString::fromStdString(toDisplayName(def.id)), btn);
+        nameLabel->setAttribute(Qt::WA_TransparentForMouseEvents, true);
+        face->addWidget(nameLabel);
+
+        RecipeLineRow::Spec cost;
+        cost.inputs             = toAmounts(def.materials);
+        cost.durationSeconds    = def.productionTimeSeconds;
+        cost.durationIsAddition = true;
+
+        RecipeLineRow* costLine = new RecipeLineRow(m_itemIcons, nullptr, btn);
+        costLine->setAttribute(Qt::WA_TransparentForMouseEvents, true);
+        face->addWidget(costLine);
+        costLine->setLine(cost);
+
+        // The config tooltip stays: it says what the module does, which the cost line
+        // does not (REQ-MOD-UI-MODULE-TOOLTIP).
         if (def.tooltip)
         {
             btn->setToolTip(QString::fromStdString(*def.tooltip));
@@ -731,6 +785,29 @@ void ShipLayoutDialog::updateGridWidget()
 void ShipLayoutDialog::updateStats()
 {
     m_statsPanel->refresh(m_shipId, m_placedModules);
+
+    // What the layout as it currently stands would cost to build, so the price follows
+    // every placement and removal (REQ-MOD-UI-DIALOG). The sums come from the
+    // simulation's own rules rather than being added up a second time here
+    // (REQ-MOD-MATERIALS, REQ-MOD-PRODUCTION-TIME).
+    ShipLayoutConfig layout;
+    layout.placedModules = m_placedModules;
+    const std::map<std::string, int> materials =
+        computeShipyardRequiredMaterials(*m_config, m_shipId, layout);
+
+    RecipeLineRow::Spec cost;
+    cost.inputs.reserve(materials.size());
+    for (const std::pair<const std::string, int>& entry : materials)
+    {
+        cost.inputs.push_back(RecipeLineRow::Amount{ entry.first, entry.second });
+    }
+    cost.durationSeconds =
+        computeShipyardProductionTimeSeconds(*m_config, m_shipId, layout);
+
+    m_buildCostLine->setLine(cost);
+    // A schematic costing no materials at all has no line to draw, and the section then
+    // stays out of the way.
+    m_buildCostSection->setVisible(!cost.inputs.empty());
 }
 
 bool ShipLayoutDialog::canPlaceModule(const ModuleDef& def, QPoint position,

src/ui/ShipLayoutDialog.h

@@ -14,7 +14,10 @@
 #include "ShipLayout.h"
 #include "ShipLayoutBlueprint.h"
 
+class ItemIconCache;
 class QPushButton;
+class RecipeLineRow;
+class SectionBox;
 class ShipStatsPanel;
 
 class ShipLayoutDialog : public QDialog
@@ -22,12 +25,15 @@ class ShipLayoutDialog : public QDialog
     Q_OBJECT
 
 public:
+    // itemIcons draws what each module costs and what the layout costs in total
+    // (REQ-MOD-UI-DIALOG, REQ-MOD-UI-STATS-PANEL). Not owned.
     ShipLayoutDialog(const GameConfig* config,
                      const std::string& shipId,
                      const ShipLayoutConfig& currentLayout,
                      std::vector<ShipLayoutBlueprint>& allBlueprints,
                      std::set<std::string> unlockedModuleIds,
                      bool debugDraw,
+                     ItemIconCache* itemIcons,
                      QWidget* parent = nullptr);
 
     std::optional<ShipLayoutConfig> getResult() const;
@@ -60,6 +66,7 @@ private:
     void loadLayoutBlueprint(const std::vector<PlacedModule>& modules);
 
     const GameConfig* m_config;
+    ItemIconCache* m_itemIcons;
     std::string m_shipId;
     std::set<std::string> m_unlockedModuleIds;
     std::vector<std::string> m_shipLayout;
@@ -81,6 +88,8 @@ private:
     QPushButton* m_removeButton;
     QWidget* m_gridWidget;
     ShipStatsPanel* m_statsPanel;
+    SectionBox* m_buildCostSection;
+    RecipeLineRow* m_buildCostLine;
     bool m_debugDraw;
 
     std::optional<ShipLayoutConfig> m_result;

src/ui/WorldRenderer.cpp

@@ -35,6 +35,7 @@
 #include "ProductionRules.h"
 #include "RepairBehavior.h"
 #include "SalvageScrapBehavior.h"
+#include "SelectionBounds.h"
 #include "SensorRangeComponent.h"
 #include "ShipIdentityComponent.h"
 #include "Simulation.h"
@@ -108,7 +109,7 @@ QColor statusLightFill(ProductionStatus status, const StatusLightVisuals& sl)
 
 }  // namespace
 
-WorldRenderer::WorldRenderer(Simulation& sim, const VisualsConfig& visuals,
+WorldRenderer::WorldRenderer(const Simulation& sim, const VisualsConfig& visuals,
                              ItemIconCache* itemIcons, const std::string& configDir)
     : m_sim(sim)
     , m_visuals(visuals)
@@ -451,30 +452,6 @@ void WorldRenderer::drawBuildings(QPainter& painter, const WorldCoordinates& coo
     drawSelectionHighlights(painter, coordinates, frame);
 }
 
-std::optional<QRectF> WorldRenderer::footprintWidgetRect(
-    const WorldCoordinates& coordinates, BuildingId id) const
-{
-    std::optional<QPoint> anchor;
-    std::optional<QSize>  footprint;
-
-    if (const Building* b = findBuilding(m_sim.getFactoryState(), id))
-    {
-        anchor    = b->anchor;
-        footprint = b->footprint;
-    }
-    else if (const ConstructionSite* s = findSite(m_sim.getFactoryState(), id))
-    {
-        anchor    = s->anchor;
-        footprint = s->footprint;
-    }
-    if (!anchor.has_value() || !footprint.has_value()) { return std::nullopt; }
-
-    const QPointF tl = coordinates.tileToWidget(*anchor);
-    return QRectF(tl.x(), tl.y(),
-        footprint->width()  * static_cast<qreal>(coordinates.getTilePx()),
-        footprint->height() * static_cast<qreal>(coordinates.getTilePx()));
-}
-
 void WorldRenderer::drawSelectionHighlights(QPainter& painter, const WorldCoordinates& coordinates,
                                             const WorldRenderFrame& frame)
 {
@@ -483,7 +460,8 @@ void WorldRenderer::drawSelectionHighlights(QPainter& painter, const WorldCoordi
 
     for (BuildingId selId : frame.selection.getSelectedBuildings())
     {
-        const std::optional<QRectF> rect = footprintWidgetRect(coordinates, selId);
+        const std::optional<QRectF> rect =
+            getBuildingWidgetRect(m_sim.getFactoryState(), coordinates, selId);
         if (!rect.has_value()) { continue; }
         // Outline sits 1px outside the footprint (into adjacent tiles).
         painter.drawRect(rect->adjusted(-1, -1, 1, 1));
@@ -542,8 +520,8 @@ void WorldRenderer::drawPortItems(QPainter& painter, const WorldCoordinates& coo
         }
     }
 
-    // Shared with belt items (REQ-GW-TILE-SIZE): a half-tile item icon, or the
+    // Shared with belt items (REQ-GW-TILE-SIZE): a half-tile colored square carrying the
-    // colored-square fallback (REQ-UI-ITEM-ICON), via the same draw path.
+    // item's icon (REQ-UI-ITEM-ICON), via the same draw path.
     const std::function<void(const ItemType&, QPointF)> drawItem =
         [&](const ItemType& type, QPointF worldPos)
     {
@@ -563,28 +541,14 @@ void WorldRenderer::drawPortItems(QPainter& painter, const WorldCoordinates& coo
 void WorldRenderer::drawWorldItem(QPainter& painter, const std::string& itemId,
                                   QPointF center, float halfPx)
 {
+    if (!m_itemIcons) { return; }
+
+    // The colored square carrying the item's icon (REQ-GW-TILE-SIZE, REQ-UI-ITEM-ICON).
+    // The composition lives in the icon cache, which draws it the same way here and in
+    // the UI's item displays, so an item reads the same on a belt as in a panel.
     const QRectF itemRect(center.x() - halfPx, center.y() - halfPx,
                           halfPx * 2, halfPx * 2);
-
+    m_itemIcons->paintItem(painter, itemRect, itemId);
-    // Prefer the item's icon (REQ-UI-ITEM-ICON); it is rasterized once at the current
-    // half-tile pixel size and cached, so this is a plain pixmap blit per frame.
-    if (m_itemIcons && m_itemIcons->hasIcon(itemId))
-    {
-        int sizePx = qRound(static_cast<qreal>(halfPx * 2.0f));
-        if (sizePx < 1) { sizePx = 1; }
-        painter.drawPixmap(itemRect, m_itemIcons->getPixmap(itemId, sizePx),
-                           QRectF(0, 0, sizePx, sizePx));
-        return;
-    }
-
-    // Fallback: the colored square from visuals.toml (REQ-GW-TILE-SIZE).
-    const std::map<std::string, ItemVisuals>::const_iterator it =
-        m_visuals.items.find(itemId);
-    if (it == m_visuals.items.end()) { return; }
-    painter.fillRect(itemRect, it->second.fill);
-    painter.setPen(QPen(it->second.outline, 1));
-    painter.setBrush(Qt::NoBrush);
-    painter.drawRect(itemRect);
 }
 
 void WorldRenderer::drawBeltItems(QPainter& painter, const WorldCoordinates& coordinates,

src/ui/WorldRenderer.h

@@ -77,7 +77,7 @@ public:
     // `itemIcons` is the window-wide per-item icon cache (REQ-UI-ITEM-ICON); not
     // owned, must outlive this renderer. `configDir` is used once, to load the
     // per-building world icons.
-    WorldRenderer(Simulation& sim, const VisualsConfig& visuals,
+    WorldRenderer(const Simulation& sim, const VisualsConfig& visuals,
                   ItemIconCache* itemIcons, const std::string& configDir);
     ~WorldRenderer();
 
@@ -113,9 +113,9 @@ private:
     void drawOverlays(QPainter& painter, const WorldCoordinates& coordinates,
                       const WorldRenderFrame& frame);
     // Draws a single item centered at widget-space `center`, spanning `halfPx` in
-    // each direction (a half-tile). Uses the item's icon when one exists
+    // each direction (a half-tile): the colored square from visuals.toml, carrying
-    // (REQ-UI-ITEM-ICON), otherwise falls back to the colored square from
+    // the item's icon inset on top of it when one exists (REQ-UI-ITEM-ICON).
-    // visuals.toml. Shared by drawBeltItems and drawPortItems.
+    // Shared by drawBeltItems and drawPortItems.
     void drawWorldItem(QPainter& painter, const std::string& itemId,
                        QPointF center, float halfPx);
     void drawPortGlyph(QPainter& painter, const WorldCoordinates& coordinates,
@@ -139,16 +139,10 @@ private:
                           BuildingType type, const QRectF& box,
                           const QColor& fill) const;
 
-    // Widget-space rectangle covering a building or construction site's footprint,
-    // or nullopt if the id resolves to neither. Used by the selection highlight.
-    std::optional<QRectF> footprintWidgetRect(const WorldCoordinates& coordinates,
-                                              BuildingId id) const;
-
     std::optional<QVector2D> entityPosition(entt::entity entity) const;
 
-    // Non-const only because EntityAdmin's component accessors are; the renderer
+    // The renderer reads the simulation and never writes it.
-    // reads the simulation and never writes it.
+    const Simulation&    m_sim;
-    Simulation&          m_sim;
     const VisualsConfig& m_visuals;
 
     // Per-item icon cache (REQ-UI-ITEM-ICON), shared window-wide and owned by

src/ui/selection/AutoProductionContent.cpp

@@ -1,44 +0,0 @@
-#include "AutoProductionContent.h"
-
-#include "Building.h"
-#include "BuildingTarget.h"
-#include "GameConfig.h"
-
-AutoProductionContent::AutoProductionContent(const SelectionContext& context,
-                                             const SelectionRequest& request,
-                                             QWidget* parent)
-    : BufferedBuildingContent(context, request.buildings.front(), parent)
-{
-}
-
-BufferedBuildingContent::CycleInfo AutoProductionContent::getCycleInfo(
-    const BuildingTarget& target) const
-{
-    CycleInfo info;
-    // An auto-recipe building always runs an implicit recipe (REQ-BLD-SMELTER,
-    // REQ-BLD-REPROCESSING), so its production section is always shown -- but only a
-    // running cycle names a recipe, so while it is idle there is no cycle to describe.
-    info.runsProduction = true;
-    if (!target.building || !target.building->production.has_value())
-    {
-        return info;
-    }
-
-    const RecipeDef* recipe = getContext().config->recipes.findRecipeDef(
-        target.building->production->recipeId, target.type);
-    if (!recipe)
-    {
-        return info;
-    }
-
-    for (const RecipeIngredient& ingredient : recipe->inputs)
-    {
-        info.perCycleInputs[ingredient.item] = ingredient.amount;
-    }
-    for (const RecipeOutput& output : recipe->outputs)
-    {
-        info.perCycleOutputs[output.item] = output.amount;
-    }
-    info.durationSeconds = recipe->durationSeconds;
-    return info;
-}

src/ui/selection/AutoProductionContent.h

@@ -1,20 +0,0 @@
-#pragma once
-
-#include "BufferedBuildingContent.h"
-#include "SelectionContentFactory.h"
-
-// The card for a Smelter or a Reprocessing Plant (REQ-UI-SELECTION-CONTENT). Both
-// auto-process whatever they receive and have no player-facing recipe selection
-// (REQ-BLD-SMELTER, REQ-BLD-REPROCESSING), so the card has no configuration group at
-// all; its cycle is whichever recipe is currently in production.
-class AutoProductionContent : public BufferedBuildingContent
-{
-    Q_OBJECT
-
-public:
-    AutoProductionContent(const SelectionContext& context,
-                          const SelectionRequest& request, QWidget* parent = nullptr);
-
-protected:
-    CycleInfo getCycleInfo(const BuildingTarget& target) const override;
-};

src/ui/selection/BarRow.cpp

@@ -50,9 +50,14 @@ public:
 protected:
     void paintEvent(QPaintEvent* /*event*/) override
     {
+        // The active group is asked for by name rather than taken from the current one,
+        // which follows the window's focus: the inactive group's highlight is close
+        // enough to the card's background that the bar reads as gone whenever the game
+        // is tabbed away from or a modal dialog holds focus -- exactly when a player
+        // watching a build finish is most likely to be looking at it.
         const QColor fill = m_fillColor.isValid()
             ? m_fillColor
-            : palette().color(QPalette::Highlight);
+            : palette().color(QPalette::Active, QPalette::Highlight);
 
         QColor track = fill;
         track.setAlpha(kTrackAlpha);

src/ui/selection/BufferSection.cpp

@@ -1,103 +0,0 @@
-#include "BufferSection.h"
-
-#include <vector>
-
-#include <QVBoxLayout>
-
-#include "Building.h"
-#include "DisplayName.h"
-#include "ItemChipRow.h"
-#include "SectionBox.h"
-
-namespace
-{
-
-int findPerCycle(const std::map<std::string, int>& perCycle, const std::string& itemId)
-{
-    const std::map<std::string, int>::const_iterator it = perCycle.find(itemId);
-    return (it != perCycle.end()) ? it->second : 0;
-}
-
-}  // namespace
-
-
-BufferSection::BufferSection(const SelectionContext& context, QWidget* parent)
-    : QWidget(parent)
-{
-    QVBoxLayout* layout = new QVBoxLayout(this);
-    layout->setContentsMargins(0, 0, 0, 0);
-    layout->setSpacing(6);
-
-    m_inputSection = new SectionBox(tr("Input buffers"), this);
-    m_inputChips   = new ItemChipRow(context.itemIcons, m_inputSection);
-    m_inputSection->getContentLayout()->addWidget(m_inputChips);
-
-    m_outputSection = new SectionBox(tr("Output buffer"), this);
-    m_outputChips   = new ItemChipRow(context.itemIcons, m_outputSection);
-    m_outputSection->getContentLayout()->addWidget(m_outputChips);
-
-    layout->addWidget(m_inputSection);
-    layout->addWidget(m_outputSection);
-}
-
-void BufferSection::setBuffers(const Building& building,
-                               const std::map<std::string, int>& perCycleInputs,
-                               const std::map<std::string, int>& perCycleOutputs)
-{
-    std::vector<ItemChipRow::Entry> inputs;
-    for (const std::pair<const ItemType, int>& entry : building.inputBuffer.counts)
-    {
-        ItemChipRow::Entry chip;
-        chip.itemId    = entry.first.id;
-        chip.countText = QString::number(entry.second);
-
-        const int perCycle = findPerCycle(perCycleInputs, entry.first.id);
-        if (perCycle > 0)
-        {
-            chip.subLine = tr("/ %1 per cycle").arg(perCycle);
-        }
-        inputs.push_back(chip);
-    }
-
-    // Output-side items are the buffered ones plus those still emerging onto the output
-    // belts: an emerging item still belongs to the output buffer (REQ-MAT-OUTPUT-EMERGE),
-    // so leaving it out would make it vanish from the panel while it animates.
-    std::map<std::string, int> outputCounts;
-    for (const Item& item : building.outputBuffer.items)
-    {
-        outputCounts[item.type.id]++;
-    }
-    for (const std::vector<BeltItemSlot>& lane : building.emergingItems)
-    {
-        for (const BeltItemSlot& slot : lane)
-        {
-            outputCounts[slot.item.type.id]++;
-        }
-    }
-    // A configured building lists everything its cycle produces, so an output the player
-    // is waiting for reads as 0 rather than being absent.
-    for (const std::pair<const std::string, int>& entry : perCycleOutputs)
-    {
-        outputCounts.emplace(entry.first, 0);
-    }
-
-    std::vector<ItemChipRow::Entry> outputs;
-    for (const std::pair<const std::string, int>& entry : outputCounts)
-    {
-        ItemChipRow::Entry chip;
-        chip.itemId = entry.first;
-        // Counted against the buffer's capacity, which is what production stops at
-        // (REQ-MAT-OUTPUT-BUFFER).
-        chip.countText = building.outputBuffer.capacity > 0
-            ? tr("%1 / %2").arg(entry.second).arg(building.outputBuffer.capacity)
-            : QString::number(entry.second);
-        chip.subLine = QString::fromStdString(toDisplayName(entry.first));
-        outputs.push_back(chip);
-    }
-
-    m_inputChips->setEntries(inputs);
-    m_outputChips->setEntries(outputs);
-    m_inputSection->setVisible(!inputs.empty());
-    m_outputSection->setVisible(!outputs.empty());
-    setVisible(!inputs.empty() || !outputs.empty());
-}

src/ui/selection/BufferSection.h

@@ -1,39 +0,0 @@
-#pragma once
-
-#include <map>
-#include <string>
-
-#include <QWidget>
-
-#include "SelectionContext.h"
-
-struct Building;
-class ItemChipRow;
-class SectionBox;
-
-// The input and output buffer contents of one building, each a captioned section of item
-// chips (REQ-UI-SINGLE-SELECTION).
-//
-// Counting what is in the buffers is the same for every building type, so it happens
-// here; what a cycle consumes and produces is not, so the owning content supplies those
-// per-cycle amounts. An item with no entry in the maps is shown without a denominator,
-// and a section holding nothing is not shown at all.
-class BufferSection : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit BufferSection(const SelectionContext& context, QWidget* parent = nullptr);
-
-    // perCycleInputs and perCycleOutputs map an item id to the amount one production
-    // cycle consumes or produces. Both may be empty, for a building that runs no cycle.
-    void setBuffers(const Building& building,
-                    const std::map<std::string, int>& perCycleInputs,
-                    const std::map<std::string, int>& perCycleOutputs);
-
-private:
-    SectionBox*  m_inputSection;
-    ItemChipRow* m_inputChips;
-    SectionBox*  m_outputSection;
-    ItemChipRow* m_outputChips;
-};

src/ui/selection/BufferedBuildingContent.cpp

@@ -1,32 +1,61 @@
 #include "BufferedBuildingContent.h"
 
-#include <vector>
+#include <map>
+#include <set>
 
 #include <QVBoxLayout>
 
 #include "Building.h"
-#include "BufferSection.h"
 #include "BuildingTarget.h"
+#include "DisplayName.h"
 #include "FactoryQueries.h"
 #include "ProductionSection.h"
-#include "RecipeSummaryRow.h"
+#include "RecipeLineRow.h"
+#include "SectionBox.h"
 #include "SelectionNames.h"
 #include "Simulation.h"
 
 namespace
 {
 
-std::vector<RecipeSummaryRow::Amount> toAmounts(const std::map<std::string, int>& map)
+std::vector<RecipeLineRow::Amount> toAmounts(const std::map<std::string, int>& map)
 {
-    std::vector<RecipeSummaryRow::Amount> amounts;
+    std::vector<RecipeLineRow::Amount> amounts;
     amounts.reserve(map.size());
     for (const std::pair<const std::string, int>& entry : map)
     {
-        amounts.push_back(RecipeSummaryRow::Amount{ entry.first, entry.second });
+        amounts.push_back(RecipeLineRow::Amount{ entry.first, entry.second });
     }
     return amounts;
 }
 
+// Every item one side of the card should list: what the buffer holds, what a cycle
+// moves, and what the building handles at all. A building's buffers can carry items it
+// is not currently making anything of, and an auto-recipe building between cycles names
+// nothing at all, so the three sources are unioned rather than one being picked.
+std::set<std::string> collectItemIds(const std::map<std::string, int>& buffered,
+                                     const std::map<std::string, int>& perCycle,
+                                     const std::vector<std::string>& handled)
+{
+    std::set<std::string> itemIds;
+    for (const std::pair<const std::string, int>& entry : buffered)
+    {
+        itemIds.insert(entry.first);
+    }
+    for (const std::pair<const std::string, int>& entry : perCycle)
+    {
+        itemIds.insert(entry.first);
+    }
+    itemIds.insert(handled.begin(), handled.end());
+    return itemIds;
+}
+
+int lookUp(const std::map<std::string, int>& map, const std::string& key)
+{
+    const std::map<std::string, int>::const_iterator it = map.find(key);
+    return (it != map.end()) ? it->second : 0;
+}
+
 }  // namespace
 
 
@@ -37,13 +66,24 @@ BufferedBuildingContent::BufferedBuildingContent(const SelectionContext& context
 {
     // The summary is configuration -- what the building will do -- so it sits with the
     // selection control and is shown for a construction site too (REQ-UI-RECIPE-SUMMARY).
-    m_recipeSummary = new RecipeSummaryRow(context.itemIcons, this);
+    m_recipeSummary = new RecipeLineRow(context.itemIcons, context.buildingIcons, this);
     getConfigurationLayout()->addWidget(m_recipeSummary);
 
-    m_buffers = new BufferSection(context, this);
+    m_inputSection = new SectionBox(tr("Input buffers"), this);
+    m_inputChips   = new ItemChipRow(context, m_inputSection);
+    m_inputSection->getContentLayout()->addWidget(m_inputChips);
+
     m_production = new ProductionSection(this);
-    getRuntimeLayout()->addWidget(m_buffers);
+
+    m_outputSection = new SectionBox(tr("Output buffers"), this);
+    m_outputChips   = new ItemChipRow(context, m_outputSection);
+    m_outputSection->getContentLayout()->addWidget(m_outputChips);
+
+    // In the direction the materials flow: what goes in, what is being made of it, what
+    // has come out (REQ-UI-SINGLE-SELECTION, REQ-UI-PRODUCTION-PROGRESS).
+    getRuntimeLayout()->addWidget(m_inputSection);
     getRuntimeLayout()->addWidget(m_production);
+    getRuntimeLayout()->addWidget(m_outputSection);
 }
 
 void BufferedBuildingContent::refreshConfiguration()
@@ -58,10 +98,14 @@ void BufferedBuildingContent::refreshConfiguration()
 
     setBuildingIdentity(target.type, getBuildingTypeName(target.type));
 
+    // The card already names the building in its header, so the summary states the cycle
+    // alone -- no building chip, no recipe name (REQ-UI-RECIPE-SUMMARY).
     const CycleInfo cycle = getCycleInfo(target);
-    m_recipeSummary->setSummary(toAmounts(cycle.perCycleInputs),
+    RecipeLineRow::Spec summary;
-                                toAmounts(cycle.perCycleOutputs),
+    summary.inputs          = toAmounts(cycle.perCycleInputs);
-                                cycle.durationSeconds);
+    summary.outputs         = toAmounts(cycle.perCycleOutputs);
+    summary.durationSeconds = cycle.durationSeconds;
+    m_recipeSummary->setLine(summary);
 
     refreshControls(target);
 }
@@ -77,8 +121,98 @@ void BufferedBuildingContent::refreshRuntime()
     setProductionStatusSlot(*target.building);
 
     const CycleInfo cycle = getCycleInfo(target);
-    m_buffers->setBuffers(*target.building, cycle.perCycleInputs, cycle.perCycleOutputs);
+
+    const std::vector<ItemChipRow::Entry> inputs =
+        buildInputEntries(*target.building, cycle);
+    const std::vector<ItemChipRow::Entry> outputs =
+        buildOutputEntries(*target.building, cycle);
+
+    m_inputChips->setEntries(inputs);
+    m_outputChips->setEntries(outputs);
+    m_inputSection->setVisible(!inputs.empty());
+    m_outputSection->setVisible(!outputs.empty());
+
     m_production->setProduction(cycle.runsProduction, *target.building,
                                 cycle.durationSeconds,
                                 getContext().sim->getCurrentTick());
 }
+
+std::vector<ItemChipRow::Entry> BufferedBuildingContent::buildInputEntries(
+    const Building& building, const CycleInfo& cycle) const
+{
+    std::map<std::string, int> buffered;
+    for (const std::pair<const ItemType, int>& entry : building.inputBuffer.counts)
+    {
+        buffered[entry.first.id] = entry.second;
+    }
+
+    std::vector<ItemChipRow::Entry> entries;
+    for (const std::string& itemId :
+         collectItemIds(buffered, cycle.perCycleInputs, cycle.handledInputs))
+    {
+        // An auto-recipe building's buffers are sized over every recipe of its type,
+        // including recipes still locked, so those entries are left out here
+        // (REQ-UI-SINGLE-SELECTION, REQ-LOCK-UI-RECIPE).
+        if (!getContext().sim->isItemUnlocked(itemId)) { continue; }
+
+        ItemChipRow::Entry chip;
+        chip.itemId    = itemId;
+        chip.countText = QString::number(lookUp(buffered, itemId));
+
+        const int perCycle = lookUp(cycle.perCycleInputs, itemId);
+        if (perCycle > 0)
+        {
+            chip.subLine = tr("/ %1 per cycle").arg(perCycle);
+        }
+        else
+        {
+            chip.subLine = QString::fromStdString(toDisplayName(itemId));
+        }
+        entries.push_back(chip);
+    }
+    return entries;
+}
+
+std::vector<ItemChipRow::Entry> BufferedBuildingContent::buildOutputEntries(
+    const Building& building, const CycleInfo& cycle) const
+{
+    // The buffered items plus those still emerging onto the output belts: an emerging
+    // item still belongs to the output buffer (REQ-MAT-OUTPUT-EMERGE), so leaving it out
+    // would make it vanish from the panel while it animates.
+    std::map<std::string, int> buffered;
+    for (const Item& item : building.outputBuffer.items)
+    {
+        buffered[item.type.id]++;
+    }
+    for (const std::vector<BeltItemSlot>& lane : building.emergingItems)
+    {
+        for (const BeltItemSlot& slot : lane)
+        {
+            buffered[slot.item.type.id]++;
+        }
+    }
+
+    std::vector<ItemChipRow::Entry> entries;
+    for (const std::string& itemId :
+         collectItemIds(buffered, cycle.perCycleOutputs, cycle.handledOutputs))
+    {
+        if (!getContext().sim->isItemUnlocked(itemId)) { continue; }
+
+        ItemChipRow::Entry chip;
+        chip.itemId = itemId;
+        // Counted against this item's own buffer capacity, which is what production
+        // stops at (REQ-MAT-OUTPUT-BUFFER, REQ-UI-SINGLE-SELECTION). A chip for an item
+        // the building has no buffer for -- one left over from a previous recipe --
+        // carries the bare count, as an unsized buffer has no denominator to state.
+        const std::map<ItemType, int>::const_iterator capIt =
+            building.outputBuffer.caps.find(ItemType{itemId});
+        const int cap =
+            (capIt != building.outputBuffer.caps.end()) ? capIt->second : 0;
+        chip.countText = cap > 0
+            ? tr("%1 / %2").arg(lookUp(buffered, itemId)).arg(cap)
+            : QString::number(lookUp(buffered, itemId));
+        chip.subLine = QString::fromStdString(toDisplayName(itemId));
+        entries.push_back(chip);
+    }
+    return entries;
+}

src/ui/selection/BufferedBuildingContent.h

@@ -2,20 +2,23 @@
 
 #include <map>
 #include <string>
+#include <vector>
 
 #include "BuildingId.h"
+#include "ItemChipRow.h"
 #include "SelectionContent.h"
 
+struct Building;
 struct BuildingTarget;
-class BufferSection;
 class ProductionSection;
-class RecipeSummaryRow;
+class RecipeLineRow;
+class SectionBox;
 
 // Shared body of the four cards that show one building with buffers -- the Miner and
 // Assembler, the Smelter and Reprocessing Plant, the Shipyard, and the Salvage Bay
-// (REQ-UI-SELECTION-CONTENT). All four show the same header identity and status, recipe
+// (REQ-UI-SELECTION-CONTENT). All four show the same header status, recipe summary,
-// summary, buffer contents and production progress; they differ only in what one
+// buffer contents and production progress; they differ only in what one production cycle
-// production cycle costs and how long it takes, which is what the subclass supplies.
+// costs and how long it takes, which is what the subclass supplies.
 //
 // This is implementation sharing, not a catalog entry: every concrete subclass is one
 // row of the content catalog.
@@ -29,12 +32,21 @@ protected:
     {
         std::map<std::string, int> perCycleInputs;
         std::map<std::string, int> perCycleOutputs;
+
+        // Items the card lists whether or not they are currently in the buffers, for a
+        // building whose recipe is implicit and so has nothing to name while it sits
+        // between cycles (REQ-BLD-SMELTER, REQ-BLD-REPROCESSING). They carry no
+        // per-cycle denominator, since no one recipe is in force.
+        std::vector<std::string> handledInputs;
+        std::vector<std::string> handledOutputs;
+
         // False when the building produces nothing at all (the Salvage Bay,
         // REQ-BLD-SALVAGE-BAY) or has no recipe or schematic selected yet: the
         // production section is then not shown (REQ-UI-PRODUCTION-PROGRESS).
         bool runsProduction = false;
-        // 0 while an auto-recipe building sits between cycles, when no single recipe
+        // 0 only when no recipe describes the cycle at all -- an auto-recipe building
-        // names a cycle time; the progress line then reads "idle".
+        // that has yet to run one (REQ-UI-RECIPE-SUMMARY). The progress line reads
+        // "idle" whenever no cycle is actually running, whatever this says.
         double durationSeconds = 0.0;
     };
 
@@ -55,8 +67,20 @@ private:
     void refreshConfiguration() override;
     void refreshRuntime() override;
 
-    BuildingId         m_id;
+    std::vector<ItemChipRow::Entry> buildInputEntries(const Building& building,
-    RecipeSummaryRow*  m_recipeSummary;
+                                                      const CycleInfo& cycle) const;
-    BufferSection*     m_buffers;
+    std::vector<ItemChipRow::Entry> buildOutputEntries(const Building& building,
+                                                       const CycleInfo& cycle) const;
+
+    BuildingId m_id;
+
+    RecipeLineRow*    m_recipeSummary;
+
+    // Input buffers, production progress, output buffer -- in that order, so the card
+    // reads the way the materials flow (REQ-UI-SINGLE-SELECTION).
+    SectionBox*        m_inputSection;
+    ItemChipRow*       m_inputChips;
     ProductionSection* m_production;
+    SectionBox*        m_outputSection;
+    ItemChipRow*       m_outputChips;
 };

src/ui/selection/CMakeLists.txt

@@ -14,14 +14,12 @@ SET(HDRS
     ${CMAKE_CURRENT_SOURCE_DIR}/EmptyNote.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ItemChip.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ItemChipRow.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/RecipeSummaryRow.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/ItemTooltip.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/BufferSection.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ProductionSection.h
     ${CMAKE_CURRENT_SOURCE_DIR}/RecipeSelectionControl.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ClearBeltControl.h
     ${CMAKE_CURRENT_SOURCE_DIR}/BufferedBuildingContent.h
     ${CMAKE_CURRENT_SOURCE_DIR}/RecipeProductionContent.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/AutoProductionContent.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ShipyardContent.h
     ${CMAKE_CURRENT_SOURCE_DIR}/StorageContent.h
     ${CMAKE_CURRENT_SOURCE_DIR}/HqContent.h
@@ -50,14 +48,12 @@ SET(SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/EmptyNote.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ItemChip.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ItemChipRow.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/RecipeSummaryRow.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/ItemTooltip.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/BufferSection.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ProductionSection.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/RecipeSelectionControl.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ClearBeltControl.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/BufferedBuildingContent.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/RecipeProductionContent.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/AutoProductionContent.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ShipyardContent.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/StorageContent.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/HqContent.cpp

src/ui/selection/DebrisContent.cpp

@@ -3,6 +3,8 @@
 #include <QVBoxLayout>
 
 #include "DebrisScrap.h"
+#include "IconCaption.h"
+#include "ItemIconCache.h"
 #include "Simulation.h"
 #include "StatRow.h"
 
@@ -10,8 +12,16 @@ DebrisContent::DebrisContent(const SelectionContext& context,
                              const SelectionRequest& request, QWidget* parent)
     : SelectionContent(context, std::nullopt, parent)
     , m_debris(request.debris)
+    , m_scrapIcon(context.itemIcons->getInlineIcon(kScrapItemId, font()))
 {
-    m_scrapRow = new StatRow(tr("Scrap remaining"), this);
+    // The row states the amount and the bare scrap icon, the icon standing in for the
+    // word so the row spells out neither the item nor its unit -- the form the header bar
+    // states the block stock in (REQ-UI-DEBRIS-PANEL, REQ-UI-ITEM-ICON,
+    // REQ-UI-BLOCKS-ICON). Without an icon file the caption has to name the item again,
+    // since nothing else on the row would.
+    m_scrapRow = new StatRow(
+        m_scrapIcon.isNull() ? tr("Scrap remaining") : tr("Remaining"), this);
+    m_scrapRow->setValueIcon(m_scrapIcon);
     m_scrapRow->setValueEmphasized(true);
     getRuntimeLayout()->addWidget(m_scrapRow);
 

src/ui/selection/DebrisContent.h

@@ -2,6 +2,8 @@
 
 #include <vector>
 
+#include <QPixmap>
+
 #include "entt/entity/entity.hpp"
 
 #include "SelectionContent.h"
@@ -28,4 +30,8 @@ protected:
 private:
     std::vector<entt::entity> m_debris;
     StatRow*                  m_scrapRow;
+    // The bare scrap icon the row states its amount with, or null where there is no icon
+    // file and the row names the item in words instead (REQ-UI-DEBRIS-PANEL). Taken once:
+    // it depends on the card's font, not on the value.
+    QPixmap                   m_scrapIcon;
 };

src/ui/selection/FieldMultiContent.cpp

@@ -10,6 +10,8 @@
 #include "DisplayName.h"
 #include "EntityAdmin.h"
 #include "FactionComponent.h"
+#include "IconCaption.h"
+#include "ItemIconCache.h"
 #include "ShipIdentityComponent.h"
 #include "Simulation.h"
 #include "StatRow.h"
@@ -20,6 +22,7 @@ FieldMultiContent::FieldMultiContent(const SelectionContext& context,
     : SelectionContent(context, std::nullopt, parent)
     , m_debris(request.debris)
     , m_scrapRow(nullptr)
+    , m_scrapIcon(context.itemIcons->getInlineIcon(kScrapItemId, font()))
 {
     setIdentity(QPixmap(), tr("Mixed selection"));
     setCountSlot(static_cast<int>(request.actors.size() + request.debris.size()));
@@ -84,9 +87,11 @@ void FieldMultiContent::buildSummary(const std::vector<entt::entity>& actors)
         getRuntimeLayout()->addWidget(new CountRow(
             QPixmap(), tr("Debris"), static_cast<int>(m_debris.size()), this));
 
-        // Indented under the debris row, so the total reads as belonging to it
+        // Indented under the debris row, so the total reads as belonging to it, and
-        // (REQ-UI-DEBRIS-PANEL).
+        // stated in the same amount-plus-bare-icon form the debris card uses
+        // (REQ-UI-DEBRIS-PANEL, REQ-UI-FIELD-MULTI-SELECTION).
         m_scrapRow = new StatRow(tr("holding"), this);
+        m_scrapRow->setValueIcon(m_scrapIcon);
         m_scrapRow->setIndented(true);
         m_scrapRow->setValueEmphasized(true);
         getRuntimeLayout()->addWidget(m_scrapRow);
@@ -99,7 +104,9 @@ void FieldMultiContent::refreshRuntime()
     // selection and rebuilds this card -- but the scrap falls as the debris is collected.
     if (m_scrapRow)
     {
-        m_scrapRow->setValue(tr("%1 scrap")
+        const int scrap = sumDebrisScrap(getContext().sim->getAdmin(), m_debris);
-            .arg(sumDebrisScrap(getContext().sim->getAdmin(), m_debris)));
+        // The icon names the item; only without one does the value have to say the word.
+        m_scrapRow->setValue(m_scrapIcon.isNull() ? tr("%1 scrap").arg(scrap)
+                                                  : QString::number(scrap));
     }
 }

src/ui/selection/FieldMultiContent.h

@@ -2,6 +2,8 @@
 
 #include <vector>
 
+#include <QPixmap>
+
 #include "entt/entity/entity.hpp"
 
 #include "SelectionContent.h"
@@ -30,4 +32,7 @@ private:
     // Null unless debris is part of the selection; the only value here that changes
     // while the selection stands.
     StatRow*                  m_scrapRow;
+    // The bare scrap icon the sub-row states its total with, or null where there is no
+    // icon file and the total names the item in words instead (REQ-UI-DEBRIS-PANEL).
+    QPixmap                   m_scrapIcon;
 };

src/ui/selection/HqContent.cpp

@@ -20,14 +20,15 @@ HqContent::HqContent(const SelectionContext& context, const SelectionRequest& re
     // (REQ-BLD-DECONSTRUCT), so it is never a construction site.
     : SelectionContent(context, std::nullopt, parent)
 {
-    m_stockSection = new SectionBox(tr("Building blocks"), this);
-    m_stockChips   = new ItemChipRow(context.itemIcons, m_stockSection);
-    m_stockSection->getContentLayout()->addWidget(m_stockChips);
-
     m_hpBar = new BarRow(tr("HP"), this);
 
-    getRuntimeLayout()->addWidget(m_stockSection);
+    m_stockSection = new SectionBox(tr("Building blocks"), this);
+    m_stockChips   = new ItemChipRow(context, m_stockSection);
+    m_stockSection->getContentLayout()->addWidget(m_stockChips);
+
+    // HP first, as on every card that has it (REQ-UI-SELECTION-CARD, REQ-UI-HQ-PANEL).
     getRuntimeLayout()->addWidget(m_hpBar);
+    getRuntimeLayout()->addWidget(m_stockSection);
 
     setBuildingIdentity(BuildingType::Hq, getBuildingTypeName(BuildingType::Hq));
 }

src/ui/selection/ItemChip.cpp

@@ -1,11 +1,15 @@
 #include "ItemChip.h"
 
+#include <QCursor>
 #include <QFont>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QPalette>
+#include <QTimer>
 #include <QVBoxLayout>
 
+#include "ItemTooltip.h"
+
 namespace
 {
 
@@ -13,11 +17,18 @@ namespace
 const int kCountSizeRisePt   = 2;
 const int kSubLineSizeDropPt = 1;
 
+// How long the cursor rests on a chip before its tooltip appears, in milliseconds.
+// Matches the feel of an ordinary tooltip, which this one replaces (REQ-UI-ITEM-TOOLTIP).
+const int kHoverDelayMs = 500;
+
 }  // namespace
 
 
-ItemChip::ItemChip(const QPixmap& icon, QWidget* parent)
+ItemChip::ItemChip(const SelectionContext& context, const std::string& itemId,
+                   const QPixmap& icon, QWidget* parent)
     : QWidget(parent)
+    , m_context(context)
+    , m_itemId(itemId)
 {
     // Its own boxed chrome, drawn with palette colors like the rest of the panel's
     // furniture rather than from visuals.toml, which is for world rendering.
@@ -58,6 +69,11 @@ ItemChip::ItemChip(const QPixmap& icon, QWidget* parent)
 
     layout->addWidget(m_iconLabel);
     layout->addWidget(text);
+
+    m_hoverTimer = new QTimer(this);
+    m_hoverTimer->setSingleShot(true);
+    m_hoverTimer->setInterval(kHoverDelayMs);
+    connect(m_hoverTimer, &QTimer::timeout, this, &ItemChip::showTooltip);
 }
 
 void ItemChip::setCount(const QString& count)
@@ -70,3 +86,28 @@ void ItemChip::setSubLine(const QString& subLine)
     m_subLineLabel->setText(subLine);
     m_subLineLabel->setVisible(!subLine.isEmpty());
 }
+
+void ItemChip::enterEvent(QEvent* event)
+{
+    m_hoverTimer->start();
+    QWidget::enterEvent(event);
+}
+
+void ItemChip::leaveEvent(QEvent* event)
+{
+    m_hoverTimer->stop();
+    if (m_tooltip != nullptr)
+    {
+        m_tooltip->hide();
+    }
+    QWidget::leaveEvent(event);
+}
+
+void ItemChip::showTooltip()
+{
+    if (m_tooltip == nullptr)
+    {
+        m_tooltip = new ItemTooltip(m_context, m_itemId, this);
+    }
+    m_tooltip->showAt(QCursor::pos());
+}

src/ui/selection/ItemChip.h

@@ -1,28 +1,51 @@
 #pragma once
 
+#include <string>
+
 #include <QPixmap>
 #include <QString>
 #include <QWidget>
 
+#include "SelectionContext.h"
+
+class ItemTooltip;
+class QEvent;
 class QLabel;
+class QTimer;
 
 // One buffered item: its icon, its count in a larger type, and a sub-line beneath the
 // count (REQ-UI-SINGLE-SELECTION). Boxed so a row of them reads as separate quantities
 // rather than as a run of text.
+//
+// Hovering it explains where its item comes from (REQ-UI-ITEM-TOOLTIP).
 class ItemChip : public QWidget
 {
     Q_OBJECT
 
 public:
     // An empty icon leaves the icon off and the chip laid out around the text alone.
-    ItemChip(const QPixmap& icon, QWidget* parent = nullptr);
+    ItemChip(const SelectionContext& context, const std::string& itemId,
+             const QPixmap& icon, QWidget* parent = nullptr);
 
     void setCount(const QString& count);
     // Left empty for an item with nothing to say beneath its count.
     void setSubLine(const QString& subLine);
 
+protected:
+    void enterEvent(QEvent* event) override;
+    void leaveEvent(QEvent* event) override;
+
 private:
-    QLabel* m_iconLabel;
+    void showTooltip();
-    QLabel* m_countLabel;
+
-    QLabel* m_subLineLabel;
+    SelectionContext m_context;
+    std::string      m_itemId;
+    QLabel*          m_iconLabel;
+    QLabel*          m_countLabel;
+    QLabel*          m_subLineLabel;
+    // Held back so a cursor crossing the chip on its way elsewhere does not flash the
+    // tooltip, the way an ordinary tooltip is.
+    QTimer*          m_hoverTimer;
+    // Built on the first hover, because most chips are never hovered at all.
+    ItemTooltip*     m_tooltip = nullptr;
 };

src/ui/selection/ItemChipRow.cpp

@@ -8,8 +8,9 @@
 namespace
 {
 
-// Size the item icon is drawn at inside a chip, in device-independent pixels.
+// Size the item's colored square is drawn at inside a chip, in device-independent
-const int kChipIconSizePx = 18;
+// pixels. Larger than the artwork it carries, which the square insets (REQ-UI-ITEM-ICON).
+const int kChipIconSizePx = 22;
 
 // Chips per row. Two fit the panel's capped width side by side; a third would force the
 // counts to shrink.
@@ -18,9 +19,9 @@ const int kChipsPerRow = 2;
 }  // namespace
 
 
-ItemChipRow::ItemChipRow(ItemIconCache* itemIcons, QWidget* parent)
+ItemChipRow::ItemChipRow(const SelectionContext& context, QWidget* parent)
     : QWidget(parent)
-    , m_itemIcons(itemIcons)
+    , m_context(context)
 {
     m_layout = new QGridLayout(this);
     m_layout->setContentsMargins(0, 0, 0, 0);
@@ -64,15 +65,20 @@ void ItemChipRow::rebuildChips(const std::vector<Entry>& entries)
     for (std::size_t index = 0; index < entries.size(); ++index)
     {
         const std::string& itemId = entries[index].itemId;
-        // A missing icon file is not an error (REQ-UI-ITEM-ICON): the chip is then laid
+        // The item's icon on its colored square (REQ-UI-ITEM-ICON). A missing icon file
-        // out around its count alone.
+        // is not an error: the chip then carries the square alone, and only an item with
-        const QPixmap icon = m_itemIcons->hasIcon(itemId)
+        // no square either leaves the chip laid out around its count alone.
-            ? m_itemIcons->getPixmap(itemId, kChipIconSizePx)
+        const QPixmap icon =
-            : QPixmap();
+            m_context.itemIcons->getSquarePixmap(itemId, kChipIconSizePx);
 
-        ItemChip* chip = new ItemChip(icon, this);
+        ItemChip* chip = new ItemChip(m_context, itemId, icon, this);
         m_layout->addWidget(chip, static_cast<int>(index) / kChipsPerRow,
                             static_cast<int>(index) % kChipsPerRow);
+        // Shown right away, because the panel measures itself as soon as this returns. A
+        // widget created under an already-visible parent starts hidden, and a layout
+        // treats a hidden item as empty, so an unshown chip would add nothing to the
+        // size hint and the panel would be fitted to a buffer section that looks empty.
+        chip->show();
         m_chips.push_back(chip);
     }
 }

src/ui/selection/ItemChipRow.h

@@ -6,8 +6,9 @@
 #include <QString>
 #include <QWidget>
 
+#include "SelectionContext.h"
+
 class ItemChip;
-class ItemIconCache;
 class QGridLayout;
 
 // The buffered items of one building, each as a chip carrying the item's icon, its
@@ -28,16 +29,18 @@ public:
         QString     subLine;
     };
 
-    // itemIcons is the window-wide per-item icon cache (REQ-UI-ITEM-ICON); an item with
+    // The context supplies the icon cache each chip draws its item with
-    // no icon file simply shows no icon, which is not an error. Not owned.
+    // (REQ-UI-ITEM-ICON) -- an item with no icon file simply shows no icon, which is not
-    explicit ItemChipRow(ItemIconCache* itemIcons, QWidget* parent = nullptr);
+    // an error -- and what a chip's tooltip reads to explain its item
+    // (REQ-UI-ITEM-TOOLTIP).
+    explicit ItemChipRow(const SelectionContext& context, QWidget* parent = nullptr);
 
     void setEntries(const std::vector<Entry>& entries);
 
 private:
     void rebuildChips(const std::vector<Entry>& entries);
 
-    ItemIconCache*           m_itemIcons;
+    SelectionContext         m_context;
     QGridLayout*             m_layout;
     std::vector<std::string> m_itemIds;  // what the chips currently stand for
     std::vector<ItemChip*>   m_chips;

src/ui/selection/ItemTooltip.cpp

@@ -0,0 +1,166 @@
+#include "ItemTooltip.h"
+
+#include <QFont>
+#include <QGuiApplication>
+#include <QLabel>
+#include <QLayoutItem>
+#include <QPalette>
+#include <QRect>
+#include <QScreen>
+#include <QVBoxLayout>
+
+#include "DisplayName.h"
+#include "GameConfig.h"
+#include "ItemProducers.h"
+#include "RecipeLineRow.h"
+#include "RecipesConfig.h"
+#include "Simulation.h"
+
+namespace
+{
+
+// Gap between the cursor and the tooltip's corner, in device-independent pixels. Wide
+// enough that the cursor never covers the heading.
+const int kCursorOffsetPx = 16;
+
+std::vector<RecipeLineRow::Amount> toAmounts(
+    const std::vector<RecipeIngredient>& ingredients)
+{
+    std::vector<RecipeLineRow::Amount> amounts;
+    amounts.reserve(ingredients.size());
+    for (const RecipeIngredient& ingredient : ingredients)
+    {
+        amounts.push_back(RecipeLineRow::Amount{ ingredient.item, ingredient.amount });
+    }
+    return amounts;
+}
+
+std::vector<RecipeLineRow::Amount> toAmounts(const std::vector<RecipeOutput>& outputs)
+{
+    std::vector<RecipeLineRow::Amount> amounts;
+    amounts.reserve(outputs.size());
+    for (const RecipeOutput& output : outputs)
+    {
+        amounts.push_back(RecipeLineRow::Amount{ output.item, output.amount });
+    }
+    return amounts;
+}
+
+// The screen the cursor is on, falling back to the primary screen when the position is
+// on none of them (a cursor between two screens of different heights).
+QRect availableScreenRect(const QPoint& globalPos)
+{
+    const QScreen* screen = QGuiApplication::screenAt(globalPos);
+    if (screen == nullptr)
+    {
+        screen = QGuiApplication::primaryScreen();
+    }
+    return (screen != nullptr) ? screen->availableGeometry() : QRect();
+}
+
+}  // namespace
+
+
+ItemTooltip::ItemTooltip(const SelectionContext& context, const std::string& itemId,
+                         QWidget* parent)
+    : QFrame(parent, Qt::ToolTip)
+    , m_context(context)
+    , m_itemId(itemId)
+{
+    // The palette's tooltip colors behind a themed border, so it reads as a tooltip
+    // rather than as a stray window.
+    setFrameShape(QFrame::StyledPanel);
+    setAutoFillBackground(true);
+    QPalette tooltipPalette = palette();
+    tooltipPalette.setColor(QPalette::Window,
+                            tooltipPalette.color(QPalette::ToolTipBase));
+    tooltipPalette.setColor(QPalette::WindowText,
+                            tooltipPalette.color(QPalette::ToolTipText));
+    setPalette(tooltipPalette);
+
+    m_layout = new QVBoxLayout(this);
+    m_layout->setContentsMargins(6, 4, 6, 4);
+    m_layout->setSpacing(2);
+}
+
+void ItemTooltip::showAt(const QPoint& globalPos)
+{
+    rebuild();
+    adjustSize();
+
+    // Kept on the screen the cursor is on: a tooltip for a chip near the right or
+    // bottom edge would otherwise be cut off.
+    const QRect screen = availableScreenRect(globalPos);
+    QPoint topLeft(globalPos.x() + kCursorOffsetPx, globalPos.y() + kCursorOffsetPx);
+    if (screen.isValid())
+    {
+        topLeft.setX(qMax(screen.left(),
+                          qMin(topLeft.x(), screen.right() - width() + 1)));
+        topLeft.setY(qMax(screen.top(),
+                          qMin(topLeft.y(), screen.bottom() - height() + 1)));
+    }
+
+    move(topLeft);
+    show();
+}
+
+void ItemTooltip::rebuild()
+{
+    while (QLayoutItem* item = m_layout->takeAt(0))
+    {
+        if (item->widget())
+        {
+            item->widget()->deleteLater();
+        }
+        delete item;
+    }
+
+    // The heading names the item. For an input chip this is the only place it is named
+    // at all, since such a chip carries a count and no name (REQ-UI-SINGLE-SELECTION).
+    QLabel* heading =
+        new QLabel(QString::fromStdString(toDisplayName(m_itemId)), this);
+    QFont headingFont = heading->font();
+    headingFont.setBold(true);
+    heading->setFont(headingFont);
+    m_layout->addWidget(heading);
+    heading->show();
+
+    const ItemProduction production =
+        findItemProduction(m_itemId, *m_context.sim, *m_context.config);
+
+    // Scrap is salvaged from debris rather than crafted (REQ-RES-DEBRIS-DROP), so it
+    // says where it comes from in place of the caption and lists nothing.
+    QLabel* caption = new QLabel(production.origin == ItemOrigin::Salvaged
+        ? tr("Salvaged from debris")
+        : tr("Produced by"), this);
+    m_layout->addWidget(caption);
+    caption->show();
+
+    if (production.origin == ItemOrigin::Undiscovered)
+    {
+        // Made somehow, but by nothing the player has unlocked -- named without being
+        // shown a path they cannot take yet (REQ-UI-ITEM-TOOLTIP).
+        QLabel* undiscovered = new QLabel(tr("Undiscovered"), this);
+        m_layout->addWidget(undiscovered);
+        undiscovered->show();
+        return;
+    }
+
+    for (const RecipeDef* recipe : production.recipes)
+    {
+        RecipeLineRow::Spec spec;
+        spec.building        = recipe->building;
+        spec.name            = QString::fromStdString(toDisplayName(recipe->id));
+        spec.inputs          = toAmounts(recipe->inputs);
+        spec.outputs         = toAmounts(recipe->outputs);
+        spec.durationSeconds = recipe->durationSeconds;
+
+        // Boxed, because an item with several producers stacks several of these and a run
+        // of bare lines reads as one field of icons (REQ-UI-ITEM-TOOLTIP).
+        RecipeLineRow* line =
+            new RecipeLineRow(m_context.itemIcons, m_context.buildingIcons, this);
+        line->setCardChrome(true);
+        m_layout->addWidget(line);
+        line->setLine(spec);
+    }
+}

src/ui/selection/ItemTooltip.h

@@ -0,0 +1,36 @@
+#pragma once
+
+#include <string>
+
+#include <QFrame>
+
+#include "SelectionContext.h"
+
+class QVBoxLayout;
+
+// The tooltip an item chip shows on hover: the item's name, and every way the player
+// can currently produce it, each drawn as a recipe line (REQ-UI-ITEM-TOOLTIP).
+//
+// A window of its own rather than a Qt tooltip, because Qt's are text and this one is
+// drawn -- item squares, building chips and all. It is a Qt::ToolTip window, so it
+// floats above everything and takes no input.
+class ItemTooltip : public QFrame
+{
+    Q_OBJECT
+
+public:
+    ItemTooltip(const SelectionContext& context, const std::string& itemId,
+                QWidget* parent = nullptr);
+
+    // Rebuilds the content and shows the tooltip near the given screen position, kept
+    // inside the screen. Rebuilt on every show because what produces an item changes as
+    // the player unlocks recipes (REQ-LOCK-UI-RECIPE).
+    void showAt(const QPoint& globalPos);
+
+private:
+    void rebuild();
+
+    SelectionContext m_context;
+    std::string      m_itemId;
+    QVBoxLayout*     m_layout;
+};

src/ui/selection/MultiBuildingContent.cpp

@@ -10,6 +10,8 @@
 #include "CountRow.h"
 #include "FactoryQueries.h"
 #include "GameConfig.h"
+#include "IconCaption.h"
+#include "ItemIconCache.h"
 #include "SelectionNames.h"
 #include "Simulation.h"
 #include "StatRow.h"
@@ -92,7 +94,13 @@ void MultiBuildingContent::buildSummary()
         }
     }
 
+    // The block icon stands beside the total in place of the word, as it does on a build
+    // button and a blueprint card (REQ-UI-MULTI-SELECTION, REQ-UI-BLOCKS-ICON). With no
+    // icon file the total is the bare number, as it is there
+    // (REQ-UI-BUILD-COST, REQ-UI-BLUEPRINT-CARD).
     StatRow* totalRow = new StatRow(tr("Total cost"), this);
+    totalRow->setValueIcon(
+        getContext().itemIcons->getInlineIcon(kBlockItemId, font()));
     totalRow->setValue(QString::number(totalCost));
     totalRow->setValueEmphasized(true);
     getRuntimeLayout()->addWidget(totalRow);