Connect Basic CHOAM skills and preserve market Ghola choices

Connect ordinary Leader Skill paths to Basic CHOAM with base opponents,
the real 35-card Treachery deck and all fourteen skills. Retain wider
development initializer behavior and existing mode/publication gates.

Pause a declared sale until its Ghola revival and private skill choice
finish. Bind the actual revived leader, offer event and completion to the
saved interruption. Preserve nested Truthtrance disposal and exact sale
responses; canceling a resumed sale leaves the free revival completed.
Keep force-only and retained-skill revivals free of replacement offers.

Add genuine setup, native card-sale, mandatory disposal, private custody,
corruption and concurrent authenticated recovery regressions plus a
two-through-six-player complete-game sample profile. Record the unresolved
Sandmaster/native-HMS eligibility question without inventing a bonus.

Validation: types, lint, 5101 offline tests and production build passed.
Five genuine 2-6 player CHOAM Skills games completed with zero rejected
actions. Independent review and 50 focused compatibility tests passed.
Browser Y2UJGMCS exercised real setup, Ghola draw, exact private refresh,
mobile assignment and resumed sale paying two spice once. Screenshot
capture timed out; full visual acceptance remains open.
All 1,583 prior rooms, 3,351 seats and auxiliary records remain intact;
one QA room and human seat were added. No restart, reset or automation.

Full AI implementation and tuning remain deferred until all non-AI
features are complete, then target roughly 75% for each adjacent tier.

docs/CHOAM_LEADER_SKILLS.md

@@ -0,0 +1,99 @@
+# Basic CHOAM with Leader Skills
+
+Development integration, 21 September 2026. Genuine CHOAM/Skills setup already
+existed. This follow-up connects the ordinary skill action paths for Basic CHOAM
+with base opponents and checks native card sales and revival interruptions.
+It does not certify the full expansion or open public starts/publication.
+
+## Configuration and components
+
+The shared ordinary-skill profile requires Basic rules, exactly CHOAM & Richese,
+two through six players including CHOAM, and no other optional modules. Other
+seats belong to the six base factions. The existing initializer's wider Richese
+and Advanced development admission is retained; those action combinations keep
+their separate implementation boundaries.
+
+Setup keeps all fourteen physical skill cards and the real 35-card Treachery
+deck: the base cards plus Poison Tooth and Artillery. Neither added battle card
+is a green Special for Planetologist. CHOAM has its five ordinary Basic leaders;
+Auditor is an additional Advanced disc and never an eligible skill assignment.
+Starting cards precede private skill choices, public assignments and Traitors.
+
+## Connected paths
+
+The shared profile now admits ordinary Planetologist, Sandmaster, Smuggler,
+Suk Graduate, Rihani, Diplomat copying and the existing Banker battle-spending
+path. Existing missing bands stay explicit. Common rule helpers still supply
+human controls and minimal legal AI choices; no strategy tuning is performed.
+
+CHOAM's native Worthless-card sales and powers retain their physical card
+ownership and response windows. A card committed to a sale cannot also be spent
+as a skill substitute. Planetologist uses a qualifying Special solely in its
+battle role, without executing its native effect, then discards it through
+mandatory winner cleanup. CHOAM cannot sell that already discarded card.
+
+Bureaucrat's existing qualifying third-party auction, shipment and bribe
+payments remain available. The skill does not redirect its own owner's payments
+or turn a small bank-funded market sale into a qualifying player-to-player
+payment. Existing Richese-sale support is preserved.
+
+A real own-leader death returns its skill once. Ghola may revive that leader
+while a declared CHOAM sale waits; the revived leader receives the normal
+optional replacement offer. The Ghola discard, private draw/decline and any
+required skill selection must finish before the exact original sale resumes.
+The sale's card, quoted amount, response passes and physical ownership remain
+bound throughout. Revival is free; canceling the resumed sale does not undo
+the completed revival or duplicate its spent Ghola.
+
+New skill-enabled interruptions also bind the actual revived leader and private
+offer event. Altered targets, omitted offers or lost owned decisions reject
+without committing an action. A nested card disposal may temporarily hold that
+same decision in its saved continuation. Ordinary non-Skills receipts retain
+their existing format. A read-only scan before the new QA revival found no
+existing skill-enabled market interruption requiring conversion.
+
+The [Leader Skills source contract](LEADER_SKILLS_RULES.md) supplies assignment,
+death and own-revival rules. The existing [market rules](CHOAM_REMAINING_RULES.md)
+and implemented market/Ghola continuation supply native timing. These are
+composed existing effects, not a new way to cancel a skill or a new revival fee.
+Later implementation evidence supersedes historical missing-code observations.
+
+## Entry and focused verification
+
+Create and ready a fresh Basic CHOAM lobby with the expansion selected, retaining
+its room cookie. Use the backed-up, version-checked
+[prototype entry](IX_PROTOTYPE.md) with profile `leader-skills`.
+
+```sh
+npm test -- choam-skills
+node --import tsx tools/faction-games.ts --profile choam-skills --out /private/new-choam-skills-samples
+```
+
+The sample profile adds Emperor, Guild, Harkonnen, Fremen and Bene Gesserit in
+order for two through six players, with stable ordinals 31–35. Tests also use
+Atreides. The normal/all sample defaults remain unchanged.
+
+Focused regressions use genuine full-deck setup and explicitly conserved
+positions for skill/battle/market interactions, strict rejected-action
+immutability, JSON/private-view recovery and physical force/card custody.
+Authenticated in-memory recovery exercises concurrent private choices and
+the interrupted-sale continuation. Final source-bound reports record actual
+check/build, complete sample, browser and preservation results.
+
+The browser check completed genuine skill/Traitor setup, then used a backed-up
+conserved battle position to kill the assigned leader and declare a sale. Real
+controls revived Frankos Aru, drew two private skills, restored the identical
+saved offer after refresh and assigned Killer Medic. The sale resumed, paid two
+spice once and discarded its card once. Mobile controls fit a 390-pixel viewport
+without horizontal overflow. Screenshot capture timed out; full visual acceptance
+remains open.
+
+## Remaining scope
+
+Normal Banker income, ordinary Mentat questioning, Diplomat retreat, modified
+Smuggler collection, captured replacement entitlement and other recorded skill
+questions remain unfinished. Advanced Auditor rules and mixed Richese/other
+faction or module combinations remain separate work. See the
+[runtime boundaries](LEADER_SKILLS_RUNTIME.md) and [decision register](RULE_DECISIONS.md).
+Full AI implementation and difficulty calibration wait until every non-AI
+feature is complete.

docs/CURRENT_STATUS.md

@@ -6,22 +6,26 @@ gated.** Prototypes do not open completion or publication gates.
 
 ## Current checkpoint and work
 
-Latest delivered checkpoint: `d3559f6`, [Basic Tleilaxu with Leader Skills](TLEILAXU_LEADER_SKILLS.md).
-Types, lint, **5,058 offline tests** and the production build passed; five
+Latest delivered checkpoint: `3efda21`, [Basic Ixians with Leader Skills](IX_LEADER_SKILLS.md).
+Types, lint, **5,082 offline tests** and the production build passed; five
 complete two-through-six-player samples had no rejected actions. Browser setup,
-Rihani exchange, mobile controls and refresh were checked. All 1,581 prior rooms
-and 3,349 seats remained intact; one QA room/seat brought the baseline to 1,582
-rooms and 3,350 human seats. Screenshot capture timed out; full visual acceptance
-remains open.
+first Storm/HMS placement, mobile Suk rescue and substitution, and same-state
+refresh were checked. All 1,582 prior rooms and 3,350 seats remained intact;
+one QA room/seat brought the baseline to 1,583 rooms and 3,351 human seats.
+Screenshot capture timed out; full visual acceptance remains open.
 
-Current work: [Basic Ixians with Leader Skills](IX_LEADER_SKILLS.md) connects
-genuine starting-card/skill setup, per-origin cyborg movement, Sandmaster HMS
-entry/exit, Suk rescue before actual cyborg substitution, Rihani precedence and
-mandatory green-Special disposal. Saved receipts bind physical losses and choices.
-Focused tests, authenticated setup recovery and a two-through-six-player sample
-profile accompany final reports. Existing missing skill bands, Advanced and
-other module combinations remain separate work. The Bureaucrat/Emperor gift
-question is still pending.
+Current work [connects ordinary Leader Skill actions to Basic CHOAM](CHOAM_LEADER_SKILLS.md),
+using its existing genuine setup. Exact 35-card Treachery and fourteen-skill inventories,
+native Worthless-card powers, mandatory battle disposal and interrupted market
+Ghola revival are receiving integration and saved-continuation checks. Advanced
+Auditor and Richese/other combinations retain their existing separate contracts.
+
+The [Sandmaster/HMS source comparison](SANDMASTER_MOVEMENT.md#21-september-native-hms-relocation-eligibility)
+found no official clarification that passengers remaining in the interior
+trigger collection from outside territories during native relocation. A ruling
+question was sent; ordinary HMS relocation and force entry/exit remain working.
+No extra collection is silently applied. The Bureaucrat/Emperor gift question
+and the other recorded skill boundaries remain pending.
 
 The reviewed remaining native Ecaz/Moritani effects, Duke revival and Richese
 empty-cache auction arithmetic still cross recorded source questions. Native

docs/IMPLEMENTATION_STATUS.md

@@ -1,5 +1,14 @@
 # Dune implementation status
 
+## 21 September 2026 — Basic CHOAM ordinary Leader Skill integration
+
+The existing genuine CHOAM setup now shares ordinary skill action guards for
+its Basic/base roster. Full-deck, card-sale, mandatory battle cleanup and saved
+market/Ghola replacement choices are covered by the [integration contract](CHOAM_LEADER_SKILLS.md).
+Auditor, Richese and other mode/module boundaries retain their separate gates.
+The Sandmaster/native-HMS source audit records an unresolved eligibility
+question rather than assuming an extra collection power.
+
 ## 21 September 2026 — Basic Ixians with Leader Skills
 
 Genuine full-deck setup connects cyborg movement per origin, Sandmaster HMS entry

docs/IX_LEADER_SKILLS.md

@@ -77,8 +77,8 @@ starting-card choice, subsequent private setup and unchanged seats. Final
 source-bound check/build, samples, browser and preservation reports remain private.
 These are playability checks, not AI strength studies.
 
-Advanced Ixians, additional faction/module combinations, Sandmaster's extra
-native HMS relocation band and the other missing Leader Skill effects remain
+Advanced Ixians, additional faction/module combinations, unresolved Sandmaster
+eligibility during native HMS relocation and other missing Leader Skill effects remain
 separate work. Existing Banker, Mentat, Diplomat and modified-Smuggler questions
 remain in the [decision register](RULE_DECISIONS.md). Full AI implementation and
 difficulty tuning wait until all non-AI game features are complete.

docs/LEADER_SKILLS_RUNTIME.md

@@ -185,4 +185,14 @@ setup, per-origin cyborg range, Sandmaster HMS entry/exit, explicit Suk cyborg
 rescue origins, Rihani-before-substitution and mandatory green-Special disposal.
 Tleilaxu/base opponents are supported through the complete deck; Advanced and
 other combinations remain separate. This supersedes earlier Ix admission gaps,
-not the documented missing skill bands or Sandmaster native HMS relocation.
+not the documented missing skill bands or unresolved Sandmaster eligibility
+during native HMS relocation.
+
+## Basic CHOAM ordinary action integration
+
+[Basic CHOAM with Leader Skills](CHOAM_LEADER_SKILLS.md) connects ordinary
+skill actions to the already available genuine setup. It retains the complete
+fourteen-card skill and 35-card Treachery inventories, native card sales and
+private own-revival replacement through interrupted market timing. Existing
+Advanced/Richese setup admission remains, without extending this action profile
+or certifying its separate effects.

docs/RULE_DECISIONS.md

@@ -33,6 +33,7 @@ Updated 14 September 2026. This is the authoritative navigation index for existi
 | Expansion Nexus families | Source audit coverage does not imply every panel is playable; consult later runtime records in the status log. | [Ixian Cunning](NEXUS_IXIAN_CUNNING_RULES.md), [Ixian replacement](NEXUS_IXIAN_REPLACEMENT_RULES.md), [Tleilaxu](NEXUS_TLEILAXU_RULES.md), [CHOAM](NEXUS_CHOAM_RULES.md), [Richese](NEXUS_RICHESE_RULES.md), [Ecaz](NEXUS_ECAZ_RULES.md), [Moritani](NEXUS_MORITANI_RULES.md) |
 | CHOAM Secret Ally | Absent-faction Collection trade spends one actual Worthless card and the Nexus for two bank spice. It is separate from native Cunning and Auditor; the battle inspection alternative remains missing. | [Prototype contract](NEXUS_CHOAM_SECRET_ALLY.md) |
 | Sapho movement | At a clean boundary, first reorders only remaining unstarted turns; completed turns stay completed. Advanced Guild must have finished or be absent. Last retains existing protection after Guild. | [Existing source contract](JUICE_OF_SAPHO_SOURCE_UPDATE.md#movement-firstlast), [runtime](JUICE_OF_SAPHO_RUNTIME.md) |
+| Basic CHOAM / Leader Skills | Compose existing ordinary skills with native sales and own-leader Ghola revival. Finish the private optional replacement before the exact suspended sale resumes. The free revival remains completed if the resumed sale is canceled. Basic uses five ordinary leaders and 35 Treachery Cards; Auditor remains Advanced and ineligible for skills. | [Integration and source contracts](CHOAM_LEADER_SKILLS.md) |
 | Basic Ixians / Leader Skills | Per-origin cyborg range, room-local HMS force routes, rescue before actual cyborg Tank substitution, Rihani before faction substitution and mandatory cleanup compose existing contracts. Ambiguous rescued cyborg reserve origins are explicit player choices. Exact green Ix Specials are Thumper, Harvester and Amal. | [Integration and physical sources](IX_LEADER_SKILLS.md) |
 | Basic Tleilaxu / Leader Skills | Compose settled native Rihani Face Dancer eligibility, own revival offers and Face Dance death return through the full deck. Zoal copies opposing printed disc value for unmodified Smuggler collection. Advanced foreign gholas and existing skill questions remain gated. | [Integration and sources](TLEILAXU_LEADER_SKILLS.md) |
 | Leader Skills | Fourteen physical cards, variant setup order, public/hidden assignment, death return, own-leader revival and captured lower-band effects are sourced. Five battle disciplines, Planetologist movement/Special substitution, Suk Graduate rescues and common lifecycle are prototyped; Rihani, lower Mentat/Bureaucrat/Sandmaster, normal Smuggler and normal Diplomat now have connected follow-ups. Remaining bands and combinations stay missing. Known skilled capture identifies the leader through its unique public card. | [Source contract](LEADER_SKILLS_RULES.md), [capture inference](LEADER_SKILLS_CAPTURE.md), [runtime](LEADER_SKILLS_RUNTIME.md), [Diplomat](DIPLOMAT_DEFENSE.md), [Planetologist](PLANETOLOGIST_RULES.md), [Suk Graduate](SUK_GRADUATE_RULES.md) |
@@ -57,6 +58,7 @@ These are unresolved in the cited records. Do not infer an answer from elapsed t
 | Reinforcements cost | A user question asks whether to keep the card disabled, always transfer three reserve forces on every outcome, or waive only a sole traitor-call winner's cost. No answer is assumed. Advanced Atreides loss accounting and same-plan Harass ordering are separate unresolved combinations. Eligibility must not depend on concealed matching Traitors. | [Fresh cost review](ECAZ_TREACHERY_RULES.md#14-september-reinforcements-cost-review) |
 | Harass / Stone Burner | A user question has been sent: keep the combination gated or compare forces remaining after withdrawal. No answer is assumed. The Richese card-family configuration is guarded publicly; hidden Stone Burner custody never controls eligibility. Ambiguous physical allocations and other optional modules remain unfinished. | [Current boundaries](HARASS_WITHDRAW_RUNTIME.md#current-boundaries) |
 | Recruits late accounting and rates | A user question has been sent for two free plus one paid Atreides return before Recruits: keep the disputed case gated, or one/two further free returns without refund. No answer is assumed. Late-changing free rates, pending repricing and same-turn recovered-card replay also stay gated. The connected clean-case preview retains the independent seven-force cap after faction-advantage cancellation as an explicit inference, not a direct combined FAQ. | [Source audit](RECRUITS_RULES.md), [runtime scope](RECRUITS_RUNTIME.md) |
+| Sandmaster / native HMS relocation | No official source located establishes that passengers remaining inside the HMS enter outside territories for this skill. Extra collection eligibility is pending a user ruling; native sector collection and ordinary force entry/exit remain available. | [Source comparison and question](SANDMASTER_MOVEMENT.md#21-september-native-hms-relocation-eligibility) |
 | Ambassador/Terror arrival priority | Both optionally react to the same entry, but no publisher/designer priority was found. The order can change Fremen relocation versus Atomics losses. A user question has been sent: keep the overlap gated pending an official ruling, or use explicitly provisional storm order. No answer is assumed; Baliset remains a separate pre-entry prevention effect. | [Reproduction and source boundary](DEFERRED_MOVEMENT_ARRIVAL.md) |
 | Sapho remaining timing | First versus unspent Advanced Guild priority, partly completed combined turns, cyclic auction duration and later battle timing stay guarded. The existing pre-plan opportunity supports [early aggressor](SAPHO_AGGRESSOR.md). Prior questions remain unanswered. | [Source audit](JUICE_OF_SAPHO_SOURCE_UPDATE.md), [battle review](JUICE_OF_SAPHO_BATTLE_REVIEW.md) |
 | Mirror Weapon | Whether copied Tooth/Artillery mandatory-discard rules attach to the physical Mirror remains unanswered. Every genuine Richese setup includes those cards and Stone Burner; an ordinary-copy-only admission gate cannot depend on concealed custody or alter the printed deck. | [Engine audit](MIRROR_WEAPON_ENGINE_AUDIT.md) |

docs/SANDMASTER_MOVEMENT.md

@@ -74,3 +74,26 @@ collection, including saved arrival reactions. Remaining work includes other
 nonordinary relocation, special movement cards, expansion/module integration, multiple-pile adjudication and
 wider interaction and strategy acceptance. The lower battle band remains in
 [the battle-effects contract](LEADER_BATTLE_EFFECTS.md).
+
+## 21 September: native HMS relocation eligibility
+
+The [Basic Ixian integration](IX_LEADER_SKILLS.md) connects ordinary force entry
+and exit through the current HMS pointer. Native relocation is a different event:
+it changes the stronghold's pointing sector while its forces remain in the
+separate interior territory. Calling a further Sandmaster collection a known
+missing bonus was too strong; eligibility is unresolved.
+
+The [publisher-authored Ix rules, pages 9 and 11](https://cdn.1j1ju.com/medias/20/16/31-dune-ixians-tleilaxu-rulebook.pdf)
+give native collection of two spice per force from traversed spice-containing
+sectors, including departure, and prohibit movement into, out of or through the
+storm. Sandmaster instead requires forces moving into or through a territory
+and grants one total spice per entered territory. The
+[official November FAQ, page 7](https://www.gf9games.com/dune/wp-content/uploads/2020/11/Dune-FAQ-Nov-2020.pdf)
+allows Karama to prevent HMS relocation and collection together.
+
+The checked card, designer walkthrough and available official rules did not
+clarify whether passengers staying in the interior count as entering outside
+territories. Skill-before-faction precedence settles ordering only if eligibility
+is established. A user ruling question was sent; no answer is assumed. Native
+relocation and ordinary Sandmaster entry/exit remain available. No extra
+collection is silently applied, and full combined compliance remains unverified.

docs/VERIFICATION_WORKFLOW.md

@@ -117,6 +117,10 @@ Old room IDs in historical browser evidence no longer identify active local game
 Future games must be preserved. This was a one-time user-authorized reset, not a
 maintenance strategy or permission to clear future games.
 
+The explicit `--profile choam-skills` runs Basic CHOAM and base opponents for
+two through six players (ordinals 31–35), retaining the full skill module and
+native 35-card Treachery deck; see [CHOAM integration](CHOAM_LEADER_SKILLS.md).
+
 The explicit `--profile ix-skills` runs genuine Basic Ixian full-deck setup for
 two through six players, with Tleilaxu and base opponents. It preserves ordinals
 26–30 and full custody/private saved continuation; see [Ix integration](IX_LEADER_SKILLS.md).