Resolve advisor conversion after Ambassador and Discovery transfers

Preserve original transfer and arrival cursors, admit no new Discovery advisor sources, and offer one mandatory counter for empty Ambassador advisor arrivals.
2026-10-24 21:32:12 +11:00
1 parent d66b594770
commit abf0305ddf
@@ -1,5 +1,88 @@
 # Mandatory advisor conversions

+## Ambassador and Discovery relocation — 24 October 2026
+
+**Prototyped / Partial.** Compose the supplied
+Advanced physical17/28 E counter with the original independent relocation
+producers. Fremen Ambassador movement can remove the last outsider beside BG
+advisors, or carry advisors into an empty territory. Discovery's next-turn free
+entry can remove the last outsider from a parent territory. Its original
+non-advisor-only source restriction remains; it grants advisors no free entry.
+
+Under the 14 October recommended policy, complete the physical move and any
+original Sandmaster collection first, then resolve mandatory conversion before
+the original arrival reactions. This selected composition is provisional,
+consistent with the existing committed ground/transport counter. Preserve the
+Ambassador's consumed token, independent movement and original entrant; preserve
+the Discovery round's original one-time entry and exact typed transfer.
+
+Keep an actual empty Ambassador advisor arrival in advisor stance until its
+mandatory counter resolves. Carry the source's accompaniment lock, without
+carrying its previous continuously-alone occurrence to another territory. The
+original quote still sets no optional fighter request for that empty arrival;
+preventing the mandatory flip cannot immediately retry it as an optional flip.
+Occupied destinations retain their original matching-stance and optional-flip
+rules. Existing Basic behavior is unchanged.
+
+The six-field public receipt contains only a fresh event, Ambassador/Discovery
+kind, actor, origin, destination and sector. Do not copy original move orders,
+No-Field identities or denominations, Sandmaster identities, private signatures
+or the original Discovery child. Root binds those original cursors separately
+in a private parent. The original Ambassador phase permission remains
+authoritative, including actual Homeworld Revival/victory arrivals; Discovery
+stays in its phase0 pre-Storm round.
+
+During the counter, the Ambassador retains its original first flip stage. A
+nonmutating nested projection validates completed movement without consuming
+that stage. Discovery retains its original arrival frame; its automatic BG
+response may concern the parent territory, not the destination. Current and
+parked Karama responses remain bound to the original queued occurrence. Exclude
+simultaneous ordinary arrival children. Consume only the automatic parent
+before one original optional flip/Intrusion/Terror or Discovery completion;
+never repeat physical movement, collection, token consumption or round advance.
+Cancellation retains the existing provisional continuously-alone duration.
+
+See the original [Ambassador contract](FREMEN_AMBASSADOR_RULES.md),
+[Discovery prototype](DISCOVERY_PROTOTYPE.md),
+[native relocation fixture](../tests/fixture-advisor-relocation-flip.ts) and
+[connected cases](../tests/advisor-relocation-flip-engine.test.ts).
+The genuine Ambassador source takes44 public Advanced BG/Ecaz/Atreides actions
+with original base33. Actual original packet draws earn a Fremen token, native
+setup places Ecaz6 beside BG1 in Basin10, and paid token placement in Carthag
+precedes Atreides' actual shipment/trigger. Relocating all six to empty Tuek's5
+leaves the original BG advisor. The genuine Discovery source takes49 public
+Advanced BG/Atreides/Emperor actions with actual module selection and base33.
+The original Hagga Discovery Card places its native Cistern token in Gara
+Kulon8. Actual BG setup, Atreides' paid shipment2, Intrusion, Collection
+inspection/reveal and next-turn free entry earn the transferred last counter.
+No played force, wallet, hand, phase, stance, alliance or receipt is installed
+in either native source.
+
+Frozen **19 files270/270**, types/lint/build, five native transfer/response/
+GameTable SSR journeys and eight existing-profile paths pass. Both outcomes
+retain the original physical move and allowances, then finish the original
+arrival once. Original Discovery decline preserves the mixed parent group and
+unused Karama. Two separately labelled controlled empty-arrival cases borrow
+the native Ambassador cards/pieces/event but stage an alliance and BG
+beneficiary; they are not native alliance evidence. Both retain one mandatory
+conversion with no optional retry. Standard controls render; no new callback,
+browser/mobile/deployed or complete-mode certificate is claimed.
+
+Feedback corrects an optional-absence assertion in the smoke/tests and a missing
+presence-helper reference in the new empty-arrival integration. Both focused
+controlled cases then pass. Final review limits the new Karama selector field
+to this producer, preserving existing serialized counter shapes; its focused
+contract regression and final batch pass. This is not a recovery campaign.
+Private proof and original-action HTML:
+`/home/quintine/.local/share/dune/checkpoints/20261024-advisor-relocation-flips/`.
+`frozen-integrated-4/report.json` binds tree
+`e9f37b0270ae5779fe9620b95058a409941804917d55e3988a1f0b8751e4a120`,
+2747 files on base `d66b594770b10af796fddf103583f7ad9c2b162b`.
+Checkpoint prose/reference overlays are separately reviewed and hashed after
+proof. Broader No-Field/Sandmaster/Homeworld/Nexus combinations, native allied
+BG arrival, remaining matching-group interpretation and final assurance remain
+open. No saved-room/D1, reset, restart or deployment operation was performed.
+
 ## Storm casualties before remaining traversal — 24 October 2026

 **Prototyped / Partial.** Compose the supplied Advanced source's physical17
@@ -16,6 +16,32 @@ open mode gates.


 ## Current checkpoint and work
+**Special-relocation advisor conversion — 24 October. Prototyped / Partial.**
+Fremen Ambassador and Discovery free-entry transfers now capture surviving alone
+advisors before original arrivals. Preserve an empty Ambassador advisor arrival
+through one mandatory counter, without granting advisor access to Discovery's
+non-advisor-only free entry. The selected transfer/collection-before-conversion,
+conversion-before-arrival order is provisional. Public six-field location
+receipts omit orders, No-Fields/skills and private continuation. Original phase
+permission, flip/entry stage, tokens and physical transfers remain bound; consume
+the private parent before one original arrival resumes. Existing counter source
+shapes remain unchanged.
+[Source, native routes and limits](ADVISOR_AUTOMATIC_FLIPS.md#ambassador-and-discovery-relocation--24-october-2026).
+
+Disjoint helper/native-fixture lanes, bounded continuation review and root
+integration pass **19 files270/270**, types/lint/build, five native transfer/
+response/GameTable SSR journeys, two labelled controlled empty-arrival cases
+and eight existing-profile paths. Genuine44/49-action public Advanced base33
+sources earn native Fremen packet/placement/trigger and actual Cistern placement,
+Intrusion, Collection reveal and next-turn entry. Both conversion outcomes keep
+the move/allowances; original Discovery decline retains its group. Controlled
+alliance/beneficiary staging is not native-alliance evidence. Feedback repairs
+an optional-absence assertion and missing presence-helper reference; the focused
+serialized-source regression preserves older counters. Wider No-Field/skills/
+Homeworld/Nexus combinations, native allied BG arrival, matching-group counters
+and full modes remain open. No AI refinement, comprehensive/browser/deployed
+assurance or saved-room/D1/reset/restart/deployment operation.
+
 **Advisor conversion during storm traversal — 24 October. Prototyped / Partial.**
 Current-sector losses now capture surviving alone advisors before the original
 traversal continues. Retain them through unresolved Fremen casualty choices;
@@ -64,7 +90,7 @@ Homeworld/Nexus combinations with this counter remain open. No AI refinement,
 comprehensive/browser/deployed assurance or saved-room/D1/reset/restart/deployment
 operation.

-Next conversion work includes special Ambassador/Discovery relocation.
+Special Ambassador/Discovery relocation is now tracked above.
 Matching-group interpretation and complete
 Advanced/mode acceptance remain unfinished.

@@ -1,5 +1,54 @@
 # Dune implementation status

+## 24 October 2026 — Advisor conversion after independent relocation
+
+Supplied physical17/28 E's counter now composes Fremen Ambassador and Discovery
+free-entry transfers. Complete the move and original Sandmaster collection
+before conversion, then resume original arrival reactions once. This selected
+priority is explicit provisional composition under the 14 October authority.
+Preserve the consumed Ambassador token, independent allowances and Discovery's
+exact pre-Storm arrival frame/child. Discovery remains non-advisor-only; it does
+not gain an empty-advisor free-entry path.
+
+An actual empty Ambassador advisor arrival keeps its stance and lock until one
+mandatory conversion. The original quote still sets no optional fighter request
+there, preventing an immediate optional retry after Karama. Public six-field
+location facts omit private move orders, No-Fields and skill identities. Root
+retains the original private first-flip or Discovery arrival cursor, separately
+binds live/parked responses and excludes simultaneous ordinary arrival children.
+Consume the automatic parent before original optional flip/Intrusion/Terror or
+Discovery completion. Original movement, collection and token use never replay.
+The existing continuously-alone cancellation duration remains provisional.
+
+Disjoint helper/native-fixture lanes, bounded timing review and root integration
+pass **19 files270/270**, types/lint/build, five native transfer/response/GameTable
+SSR journeys, two controlled empty-arrival cases and eight existing-profile
+paths. Original public Advanced base33 sources take44 Ambassador and49 Discovery
+actions. Actual Ecaz packet/setup, paid Fremen placement and Atreides shipment
+trigger six counters' Basin10→Tuek's5 relocation. Actual Discovery module/setup,
+native Cistern placement in Gara Kulon8, shipment2/Intrusion, Collection reveal
+and next-turn entry move the last outsider into Cistern0. Both outcomes retain
+physical transfer/allowances. Original Discovery decline leaves its mixed parent
+and Karama intact. No played force, phase, hand, wallet, alliance, stance or
+receipt is installed in those native sources. Controlled BG-beneficiary cases
+explicitly stage alliance/beneficiary on borrowed original cards/pieces/event;
+they do not certify an earned native alliance.
+
+Feedback repairs an optional-absence smoke assertion and the new empty-arrival
+presence helper. Both focused cases pass. Final contract review makes the added
+Karama selector conditional, preserving prior serialized counter shapes; its
+focused regression and final270/270/quick/build/runtime pass. Private proof:
+`/home/quintine/.local/share/dune/checkpoints/20261024-advisor-relocation-flips/`.
+`frozen-integrated-4/report.json` binds tree
+`e9f37b0270ae5779fe9620b95058a409941804917d55e3988a1f0b8751e4a120`,
+2747 files on base `d66b594770b10af796fddf103583f7ad9c2b162b`.
+Prose/reference overlays are separately reviewed/hashed. Standard controls render;
+no new callback/browser/mobile/deployed or complete-mode claim. Broader
+No-Field/Sandmaster/Homeworld/Nexus combinations, native allied BG arrival,
+matching-group counters, final assurance and full AI remain due. No saved-room/
+D1, reset, restart or deployment operation.
+[Connected source and limits](ADVISOR_AUTOMATIC_FLIPS.md#ambassador-and-discovery-relocation--24-october-2026).
+
 ## 24 October 2026 — Advisor conversion between storm sectors

 Supplied physical17/28 E's counter now follows actual current-sector losses
@@ -1,5 +1,20 @@
 # Rule decision index

+## Advisor conversion after special relocation — 24 October 2026
+
+Compose supplied Advanced physical17/28 E with actual Fremen Ambassador and
+Discovery free-entry transfers. Provisionally complete movement and original
+Sandmaster collection, then resolve the conversion counter before original
+arrival reactions. Preserve consumed tokens, independent allowances and exact
+Discovery round/child. Discovery retains non-advisor-only admission; only
+Ambassador movement can carry advisors into an empty destination. Preserve
+that arrival's lock through one mandatory conversion, without an optional retry
+or an imported old alone occurrence. Public six-field location evidence omits
+No-Fields/private orders/cursors. Retain original phase permissions, bind live
+and parked responses, then consume the private parent before original arrival
+resumes once. Continuously-alone cancellation duration remains provisional.
+[Connected source and boundaries](ADVISOR_AUTOMATIC_FLIPS.md#ambassador-and-discovery-relocation--24-october-2026).
+
 ## Advisor conversion during storm traversal — 24 October 2026

 Compose supplied Advanced physical17/28 E with actual current-sector storm