Compose Planetologist movement with Ornithopter flights

docs/CURRENT_STATUS.md

@@ -16,6 +16,40 @@ open mode gates.
 
 
 ## Current checkpoint and work
+**Planetologist flight composition — 26 October. Prototyped / Partial.**
+Both skill alternatives now compose with physical range3/twoGroups and carried
+Discovery. Fixed3 stays3; twoGroups applies normal+1/cap3 or ordinary gathering
+per accepted movement. A gather counts as one card movement under visible
+provisional policy. Exact original cohorts prevent reuse after merging while
+allowing untouched residual groups. Shared projected flight choices feed actual
+controls and minimal policy; original allowances, credits and one disposal stay.
+Discovery receipts bind skill/leader/both origins while retaining legacy ordinary
+bytes. The reproduced native Discovery profile mismatch is fixed by projecting
+its existing enabled flag. No new mode, saved root field or strategic AI opens.
+
+Three disjoint physical/Discovery/control lanes and root integration pass
+**20 files,196/196**, types/lint/build and **sixteen native engine/GameTable SSR/
+actual selected-props submit-callback paths** on unchanged source. Twelve public
+E/R/A +choam/Skills routes earn the actual cache card for1, a paid four-counter
+shipment for8 and ordinary split; prefixes use Basic74 / Advanced79–80 actions.
+Four public G/E/H Skills/Discovery routes acquire the actual token through
+turn-one Collection and use it on turn two; prefixes use Basic65 / Advanced71.
+Two-to-four continuation actions finish the original Collection. Physical routes
+retain45 Treachery, Discovery routes33; each keeps14 Skills/15 Traitors, and the
+Discovery inventory keeps all8 identities. Sixteen physical engine cases, seven
+Discovery cases, fifteen controlled cases and receipt/profile regressions cover
+the slice. Feedback removes a redundant random Traitor-deal replay, integrates
+the old Discovery selector, retains legal pre-shipment AI candidates after
+shipment choices and completes the controlled Discovery projection shape.
+
+Frozen v3 report/logs:
+`/home/quintine/.local/share/dune/checkpoints/20261026-planetologist-flight-proof-v3/`;
+journeys/HTML: adjacent `20261026-planetologist-flight-runtime/`.
+No saved-room/D1/server, reset/restart, deployment or recovery operation occurs.
+SSR/selected-props callbacks do not certify DOM/hydration, browser/mobile/deployed
+acceptance or full combinations/modes. Final assurance remains due.
+[Source matrix and execution](PLANETOLOGIST_RULES.md#physical-and-discovery-flight-composition--26-october-2026).
+
 **Planetologist No-Field gathering — 26 October. Prototyped / Partial.**
 The own concealed marker and selected physical counters can gather from exactly
 two territories to one destination. Each selected sector keeps ordinary range;
@@ -132,12 +166,16 @@ deployed acceptance. Full Truthtrance, modes/combinations and final assurance
 remain open. [Battle controls](TRUTHTRANCE_NONBATTLE_READINESS_20260907.md#grouped-battle-plan-authoring--26-october-2026);
 [shipment controls](COMPOUND_SHIPMENT_PROMISES.md#full-pure-shipment-authoring--26-october-2026).
 
-Next scoped source check: the live Planetologist/card-movement refusal in
-`validatePlanetologistMove`, against the existing
-[Ornithopter contract](RICHESE_ORNITHOPTER_ENGINE_AUDIT.md) and
-[Planetologist contract](PLANETOLOGIST_RULES.md). Distinguish printed movement
-limits from missing compositions before implementation. Bounded allied-marker
-review found an existing legal voluntary-reveal→endMovement route; the supplied
+Next source-supported interaction: Sandmaster collection along physical
+Ornithopter range3/twoGroups and carried Discovery routes. Its printed moving-
+forces band excludes none of these items. The live `validateSandmasterOrder`
+and `game/sandmaster-movement.ts` adapters still refuse them. Preserve chosen
+paths, exact piles, one collection per entered territory per movement, current
+range, original cohorts and one commitment/disposal. A second card movement
+requotes current spice; income never enlarges unmoved quotas. Use actual trained
+sources and produced Spice blows, not changed played assignments or staged piles.
+Bounded allied-marker review found an existing legal voluntary-reveal→endMovement
+route; the supplied
 physical15/36 text does not expressly add alliance separation as a forced reveal
 trigger. Preserve that route rather than calling it a deadlock or inventing an
 automatic reveal. Complete rules and final assurance remain unfinished.

docs/IMPLEMENTATION_STATUS.md

@@ -1,5 +1,37 @@
 # Dune implementation status
 
+## 26 October 2026 — Planetologist physical and Discovery flight matrix
+
+**Prototyped / Partial.** Connect both skill alternatives to physical range3,
+physical twoGroups and carried Discovery. Fixed range stays3; the two normal card
+movements choose +1/cap3 or ordinary-range gathering independently. A gather
+counts as one card movement under visible provisional composition. Whole-map
+cohorts exclude moved arrivals and preserve original typed residuals. Shared
+owned transport choices drive actual controls and minimal policy. Discovery
+signatures bind skill/leader/origins; legacy ordinary signatures retain their
+exact bytes. Projecting the existing Discovery-enabled flag fixes a reproduced
+native Skills view mismatch without opening a new module combination.
+
+Frozen **20-file196/196**, types/lint/build and **sixteen native engine/GameTable
+SSR/actual selected-props submit-callback paths** pass. Twelve public E/R/A
++choam/Skills routes earn card1, shipment8 and a real split (Basic74 / Advanced
+79–80 source actions); four public G/E/H Skills/Discovery routes earn actual
+turn-one Collection acquisition and later use (Basic65 / Advanced71). Two-to-four
+continuation actions finish same-turn Collection. Physical routes retain45 cards,
+Discovery33; each retains14 Skills/15 Traitors, Discovery all8 token identities.
+Sixteen physical, seven Discovery and fifteen controlled cases plus receipt/
+profile regressions cover the slice and four minimal policies. Feedback repairs
+a redundant random setup replay, the old single-origin Discovery selector,
+pre-shipment policy candidate visibility and controlled projection typing.
+
+Proof: `/home/quintine/.local/share/dune/checkpoints/20261026-planetologist-flight-proof-v3/`;
+journeys/HTML: adjacent `20261026-planetologist-flight-runtime/`.
+No saved-room/D1/server, reset/restart, deployment or recovery operation. No new
+saved root field, action or mode gate. SSR/selected-props callbacks do not prove
+DOM/hydration, browser/mobile/deployed acceptance or complete combinations.
+Full rules and final assurance remain open.
+[Source matrix and contract](PLANETOLOGIST_RULES.md#physical-and-discovery-flight-composition--26-october-2026).
+
 ## 26 October 2026 — Concealed No-Field two-origin Planetologist gathering
 
 **Prototyped / Partial.** The own marker supplies one of exactly two origins,

docs/PLANETOLOGIST_RULES.md

@@ -4,6 +4,73 @@ Updated 26 October 2026. This note audits the movement and battle effects of the
 Planetologist Leader Skill against its physical card, the common Leader Skills
 rules, the GF9 base battle rules and designer Jack Reda's walkthrough. The connected prototype is described below; other Leader Skill effects remain separate work.
 
+## Physical and Discovery flight composition — 26 October 2026
+
+The physical Planetologist face permits forces from two territories in a single
+movement to a common destination, or +1 normal range capped at3. The physical
+Ornithopter face permits one group up to3 or two different groups using normal
+movement. Discovery's publisher E3p13 text supplies3 instead of normal movement
+for one later movement action. Existing [physical-card provenance](RICHESE_ORNITHOPTER_ENGINE_AUDIT.md#authority)
+and [skill-card text](LEADER_SKILLS_RULES.md) remain the source contracts; both
+physical faces were freshly inspected. No joint publisher FAQ was located.
+
+Under 14 October choose-recommended authority, use this provisional composition:
+
+| Flight source | Planetologist range | Planetologist gather |
+| --- | --- | --- |
+| Physical range3 | One origin, fixed3, never4 | Both origins fixed3 to one destination; one card movement |
+| Physical twoGroups | Each current movement may add1/cap3 to normal range | Each selected sector uses ordinary range; each gather counts as one of the two card movements |
+| Carried Discovery | One origin, fixed3, never4 | Both origins fixed3 to one destination; one ordinary movement action |
+
+Treating the single gather as one card movement is the material interpretation,
+despite the physical card's ordinary one-group wording. It is visible guidance,
+not an express joint ruling. The two alternatives stay exclusive per action;
+different card movements may choose different Planetologist alternatives. A
+skilled movement uses one flight source, not physical and Discovery together.
+
+The original physical card is reserved/played and discarded once through its
+existing frame. A first gather subtracts every selected source from the original
+unmoved cohort. A second selection must fit both those exact normal/elite/marker
+quotas and current custody; merged first arrivals cannot be reused, while
+untouched residual forces from an original territory may move. Only completing
+the second card movement earns its existing movement credit. Early ending
+abandons it without an extra credit. Existing Hajr timing/allowances remain.
+
+Discovery still requires acquisition on an earlier turn, current ownership and
+one actual commit before consumption. Its existing receipt string additionally
+binds the selected skill/leader and both normalized gather origins. Ordinary
+single-origin no-skill signatures retain their exact legacy bytes. New skill
+receipts cannot be replayed after changing an origin, trainer or alternative.
+No new saved root field, action or module gate is introduced.
+
+Projected transport choices share exact ranges, current source events and
+cohort checks with actual submission and minimal policy. The existing enabled
+Discovery configuration is now projected explicitly so already-admitted native
+Skills/Discovery games retain the engine's movement profile in their own view.
+This fixes a reproduced projection mismatch; no new module combination opens.
+Full transport interactions, browser/deployed acceptance and assurance remain due.
+
+**Frozen evidence:** v3 passes20 files,196/196, types/lint/build and sixteen
+native engine/GameTable SSR/actual selected-props submit-callback paths. Twelve
+public physical-card routes retain the actual paid card1, shipment4/cost8 and
+ordinary split, using Basic74 / Advanced79–80 source actions. Four public
+Skills/Discovery routes acquire the original token through turn-one Collection
+and use it on turn two, using Basic65 / Advanced71 actions. All six compositions
+and all four twoGroups first/second skill pairs finish same-turn Collection in
+two-to-four continuation actions. Physical routes retain45 Treachery, Discovery
+33; each retains14 Skills/15 Traitors, and Discovery all8 token identities.
+Sixteen physical engine cases, seven Discovery cases, fifteen controlled cases
+and legacy-receipt/native-profile regressions cover the slice and minimal profiles.
+Feedback removes a redundant random Traitor-deal replay, connects the original
+Discovery selector, preserves legal pre-shipment policy choices after ordinary
+shipments and completes controlled projection fields.
+
+Report/logs: private `20261026-planetologist-flight-proof-v3/` under
+`/home/quintine/.local/share/dune/checkpoints/`; journeys/HTML: adjacent
+`20261026-planetologist-flight-runtime/`. No saved-room/D1/server, reset/restart,
+deployment or recovery operation. SSR/selected-props callbacks do not certify
+DOM/hydration, browser/mobile/deployed acceptance or complete combinations/modes.
+
 ## Concealed No-Field two-origin gathering — 26 October 2026
 
 Compose the printed No-Field marker-as-one-force rule (E2 pp5–6,10–12) with

docs/RICHESE_ORNITHOPTER_ENGINE_AUDIT.md

@@ -1,5 +1,17 @@
 # Richese Ornithopter: movement integration audit
 
+## Planetologist movement composition — 26 October 2026
+
+Both physical modes now compose provisionally with either Planetologist
+alternative. Fixed range stays3; twoGroups uses current normal range with
+optional +1/cap3 or normal-range gathering. Each accepted gather counts as one
+card movement. Its full selected map leaves the original unmoved cohort, and
+the second move cannot reuse transported counters/marker after merging.
+Card custody, one discard, existing credits, early ending and Hajr remain.
+[Selected matrix, source and contract](PLANETOLOGIST_RULES.md#physical-and-discovery-flight-composition--26-october-2026)
+also distinguishes the separate Discovery token and its signed two-origin quote.
+This is explicit composition, not a joint FAQ or complete-mode acceptance.
+
 ## Guild Cunning and earned Hajr movement — 18 October 2026
 
 The [printed Guild Nexus](NEXUS_GUILD_RULES.md#primary-evidence) grants only a

docs/RULE_DECISIONS.md

@@ -1,5 +1,17 @@
 # Rule decision index
 
+## Planetologist physical and Discovery flight — 26 October 2026
+
+Under 14 October choose-recommended authority, compose both skill alternatives
+with physical Ornithopter range3/twoGroups and carried Discovery. Fixed3 remains3;
+twoGroups applies normal+1/cap3 or ordinary-range gathering independently to each
+movement. Count one two-origin gather as one card movement and preserve disjoint
+original cohorts, current custody and existing credits/disposal. Discovery
+gather uses fixed3 for both origins in one ordinary action and consumes its
+earlier-acquired token once. This counting/range policy is visibly provisional,
+not a located joint FAQ; physical-card one-group wording is acknowledged.
+Use one flight source per skilled move; no module gate opens.
+[Source matrix and contract](PLANETOLOGIST_RULES.md#physical-and-discovery-flight-composition--26-october-2026).
 ## Planetologist concealed No-Field gathering — 26 October 2026
 
 Under 14 October choose-recommended authority, compose the printed moving-marker