Separate Spiritual Advisor shipment matching and alone conversion

Apply the Advanced retained-fighter target cutover through shared quotes and controls. Preserve committed foreign shipments while handling free-packet shipping, Polar matching, actual placement and original arrival once.

docs/ADVISOR_MATCHING.md

@@ -78,7 +78,7 @@ proof. Existing-mode completeness, special relocation, Guild/Homeworld,
 Planetologist gathering and Spiritual Advisor matching remain open. No saved-
 room/D1, reset, restart or deployment operation was performed.
 
-## Spiritual Advisor source cutover still due
+## Spiritual Advisor source follow-up
 
 Complete physical28 review also requires Polar Sink or decline when the
 original shipment destination retains BG fighters, unless Intrusion changes
@@ -93,5 +93,6 @@ Polar Sink with resident fighters. The recommended provisional composition
 keeps the named Polar fallback and lets the incoming advisor packet match those
 fighters under its own precommit matching counter, after the distinct Spiritual
 Advisor shipping counter. The other faction's shipment is already committed
-and cannot be undone. That separate parent/projection integration is pending;
-this normal movement/shipment prototype does not certify it.
+and cannot be undone. The separate parent, target projection and committed
+alone-conversion follow-up is now tracked in [Spiritual Advisors](SPIRITUAL_ADVISORS.md);
+the normal movement/shipment evidence above does not certify that follow-up.

docs/CURRENT_STATUS.md

@@ -16,6 +16,34 @@ open mode gates.
 
 
 ## Current checkpoint and work
+**Spiritual Advisor targets and conversion — 24 October. Prototyped / Partial.**
+Supplied physical28 redirects retained non-Polar fighters to Polar Sink or
+decline unless Intrusion first changed them. Fresh Advanced declarations now
+share target legality through ordinary/Guild quotes, projected choices, controls
+and minimal bots. Distinct shipping, incoming Polar matching and committed
+alone-conversion responses retain the original foreign shipment. Matching
+prevention restores the owned chooser while blocking that same packet here;
+shipping prevention ends the free packet. An alone-conversion prevention keeps
+the deposited force, withdrawal/income and continuously-alone hold. The Polar
+fallback and matching remedy remain explicit provisional compositions.
+Basic and already-recorded legacy declarations keep their previous protocol.
+[Source, original continuation and limits](SPIRITUAL_ADVISORS.md).
+
+Disjoint helper/native-fixture lanes, bounded source/continuation review and root
+integration pass **22 files390/390**, types/lint/build and fifteen native
+ordinary/Guild declaration/response/GameTable SSR journeys. Public35/37-action
+base33 ordinary sources and45/48-action bare E3 Guild sources earn the original
+setup, actual paid foreign shipment, declined/accepted Intrusion, original
+Karama and independent free shipment. A second genuine foreign shipment joins
+an existing held advisor group without rearming conversion. Two late-stance
+cases are explicitly controlled; recorded-legacy tests are format compatibility,
+not native saved captures. Twenty-four existing-profile paths accept72 actions
+through target choice, distinct responses and restored decline. Feedback updates
+four older matching/projection expectations; no application source repair was
+needed after the frozen runtime passed. No strategic AI work or saved-room/D1/
+server/reset/restart/deployment operation. Wider combinations, other matching
+producers and final browser/deployed/mode assurance remain open.
+
 **Matching incoming BG groups — 24 October. Prototyped / Partial.**
 Normal opposite-type ground arrivals and reserve-to-advisor shipments now offer
 Karama before physical transfer/payment. Supplied physical28 E explicitly marks
@@ -40,15 +68,10 @@ No AI refinement, comprehensive/browser/deployed assurance or saved-room/D1/
 reset/restart/deployment operation. Wider transport, gathering and mode acceptance
 remain open.
 
-Bounded complete-page review also identifies a remaining Advanced Spiritual
-Advisor source cutover: retained fighters at the original shipment destination
-require Polar Sink or decline unless Intrusion changes them first. Polar Sink
-fallback with resident fighters provisionally needs its own incoming matching
-counter after the distinct shipping counter. Ordinary/Guild Ambassador target
-quotes, projected choices and bots must share that restriction; do not apply
-it to ordinary paid shipments. That independent Spiritual-parent integration
-and special relocation/gather matching remain explicitly open after the normal
-arrival prototype. Full rule/mode acceptance is still unfinished.
+The separate Advanced Spiritual target, matching and committed-alone source
+follow-up is now prototyped above. It does not change ordinary paid shipments'
+target permissions. Special relocation/gather matching and wider combinations
+remain open; full rule/mode acceptance is still unfinished.
 
 **Special-relocation advisor conversion — 24 October. Prototyped / Partial.**
 Fremen Ambassador and Discovery free-entry transfers now capture surviving alone

docs/IMPLEMENTATION_STATUS.md

@@ -1,5 +1,48 @@
 # Dune implementation status
 
+## 24 October 2026 — Spiritual Advisor targets, matching and alone conversion
+
+Supplied physical28 starts the free packet advisor-side and directs retained
+non-Polar fighters to Polar Sink or decline unless Intrusion changed them.
+Shared ordinary/Guild quotes, projected choices, controls and minimal bots now
+apply that source cutover. Basic and already-recorded legacy declarations retain
+their old protocol. Fresh Advanced declarations bind a public seven-field
+receipt to the private original chooser, committed foreign parent and order.
+
+Shipping prevention ends the free packet. Provisionally allow the named Polar
+fallback with fighters, then offer a distinct incoming matching counter before
+reserve withdrawal. Prevented matching restores the chooser and blocks that
+same packet/destination for the original grant. Placement then commits native
+withdrawal and income once. A separately prevented mandatory alone conversion
+retains that arrival and its continuously-alone hold, including when a later
+genuine grant joins it. Revalidate availability before matching/placement;
+never re-quote resources after withdrawal. Retire the frame before original
+ordinary/Guild arrival resumes; retain native child, worm and Homeworld suffixes.
+
+Disjoint helper/native-fixture lanes, bounded source/continuation review and root
+integration pass **22 files390/390**, types/lint/build and fifteen native
+ordinary/Guild declaration/response/GameTable SSR journeys. Genuine35/37-action
+public base33 ordinary and45/48-action bare E3 Guild sources earn setup,
+original Karama, paid foreign shipment, actual Intrusion answers and the free
+packet. Both matching and alone outcomes, shipping prevention, retained-fighter
+target rejection, accepted Intrusion and a second real grant are exercised.
+Two late-stance cases are explicitly controlled. Legacy tests are controlled
+format compatibility, not native earned actions or historical-save captures.
+Twenty-four existing-profile paths accept72 legal actions. Feedback updates
+four old matching/projection expectations; their focused repairs and the final
+union pass. The first native runtime needed no application source fix.
+
+Private proof:
+`/home/quintine/.local/share/dune/checkpoints/20261024-spiritual-advisor-flow/`.
+`frozen-integrated-2/report.json` binds tree
+`403d1a46ccdc0fbe353546a870d858fdb80340cb2c20533e87667dd414df6fe0`,
+2757 files on base `438a5692a644305360199da920760e25fee8d15f`.
+Final prose/reference overlays are reviewed separately. Full Homeworld/Tech/
+Nexus/No-Field combinations, other matching producers, browser/deployed/mode
+acceptance and final assurance remain open. No AI refinement or saved-room/D1/
+server/reset/restart/deployment operation.
+[Source, stages and continuation](SPIRITUAL_ADVISORS.md).
+
 ## 24 October 2026 — Matching incoming advisor packets before arrival
 
 Supplied physical28 E explicitly marks matching shipping/moving into resident

docs/RULE_DECISIONS.md

@@ -1,5 +1,26 @@
 # Rule decision index
 
+## Spiritual Advisor targets and distinct conversions — 24 October 2026
+
+Supplied physical28 E ships an advisor and redirects retained non-Polar fighters
+to Polar Sink or decline unless Intrusion first changed them. Basic and already-
+recorded legacy declarations retain their old protocol; fresh Advanced
+declarations carry a new source/private parent. Share target legality across
+normal/Guild quotes, choices, controls and bots; keep resource quotes separate.
+Physical17's shipping and group-flip counters are distinct. An empty Advanced
+arrival remains advisor-side until its separately counterable mandatory alone
+conversion; there is no printed Polar Sink exemption from that conversion.
+
+Under the 14 October authority, provisionally permit the named Polar fallback
+even when it is the original destination with fighters, offering a separate
+incoming matching counter before placement. Prevention restores the original
+chooser while denying the same packet/destination in that grant; shipping
+prevention ends the free packet. Neither undoes the other faction's committed
+shipment. After placement, prevent only conversion while keeping forces/income
+and the existing continuously-alone hold. Preserve original ordinary/Guild
+arrivals once; never rerun reserve availability after withdrawal.
+[Source, stages, compatibility boundary and limits](SPIRITUAL_ADVISORS.md).
+
 ## Matching incoming advisor groups — 24 October 2026
 
 Supplied physical28 E directly marks matching into resident BG forces as

docs/SPIRITUAL_ADVISORS.md

@@ -0,0 +1,113 @@
+# Spiritual Advisor shipment, matching and conversion
+
+## Advanced source cutover — 24 October 2026
+
+**Prototyped / Partial.** Supplied revised Advanced
+physical28/printed26 ships an advisor, permits accompanying the original
+shipment or using Polar Sink, and redirects retained non-Polar fighters to
+Polar Sink or decline. Original Intrusion may first change those residents to
+advisors. The same page's mandatory alone conversion has no Polar Sink exception;
+physical17's group-flip counter remains separate from its shipping counter.
+Do not treat the free packet as an ordinary paid fighter shipment.
+
+Normal and Guild Ambassador declarations, the Guild quote, projected choices,
+human controls and minimal bots now share the target restriction. Homeworld
+reserve/population limits remain resource quotes, independently of target
+legality. Basic is unchanged. Already-recorded declarations without the new
+Spiritual source retain their original one-shot settlement protocol; fresh
+Advanced declarations use an explicit seven-field source and private frame.
+This is a source cutover, not permission to reset or recreate saved games.
+
+## Original grant and distinct responses
+
+The public source contains event, owner, turn, phase, territory, sector and
+amount. A private frame retains the original owned chooser, committed foreign
+parent, selected order and exact signatures. Current and parked responses own
+that same source. No private parent, No-Field identity, resource proof or
+signature is copied into response/Karama source selection.
+
+1. **Shipping.** Choose a legal target and ordinary reserve amount, then offer
+   the separate Spiritual Advisor shipping counter. Prevention ends this free
+   packet without a reserve withdrawal. The other faction's original physical
+   shipment and payment are already committed.
+2. **Matching.** If the named Polar fallback has BG fighters, the incoming
+   advisor packet must match them. Under the 14 October recommended policy,
+   provisionally allow that Polar fallback even if it was the original shipment
+   destination, then offer matching before placement. Residents never change.
+   Prevention restores the original owned chooser. That same packet/destination
+   is unavailable for this original foreign-shipment opportunity; changing
+   sector or accompanying/fallback labels cannot retry it. A different legal
+   amount or decline remains available. Neither page expressly resolves this
+   Polar corner or cancellation remedy; do not call it a publisher exception.
+3. **Placement and alone conversion.** Withdraw actual native reserves, place
+   the free packet, grant original Tech income and log placement once. Advanced
+   arrivals start advisor-side unless matching into resident fighters. If alone,
+   capture the whole actual group before settlement can silently make it a
+   fighter, then offer the independent conversion counter. Prevention retains
+   the actual arrival, withdrawal/income and existing provisional continuously-
+   alone hold. Joining an existing held advisor group preserves that occurrence
+   rather than rearming conversion.
+
+Revalidate target/resource availability before placement, including before
+offering matching. A no-longer-available declaration restores the original
+chooser without moving a force. Never rerun reserve or population availability
+after withdrawal; validate the committed deposit and original parent instead.
+
+## Original continuation
+
+The queued ordinary foreign arrival stays paused while the frame owns its
+choice or responses. Clear the frame and immediately open the actual BG arrival
+before draining that queue. Guild Ambassador keeps its original `advisor` stage
+until all counters finish. Its extracted suffix records `advisorArrival` and
+`finish`, then retains the existing child/outer-continuation handoff. An eligible
+BG child retires the Guild parent first; original worm/Homeworld tags and
+`guildAdvisorOrigin` follow the original suffix. No transfer, income, token use
+or original foreign entry is replayed.
+
+The legacy path is explicitly for an already-declared response format, not an
+option exposed to current callers. Controlled legacy tests preserve those
+callback checks without claiming fresh permission or a genuine saved-game
+capture. Complete recovery/custody/privacy assurance stays in the final phase.
+
+## Prototype evidence and limits
+
+[Native fixture](../tests/fixture-spiritual-advisor-flow.ts) earns ordinary
+public Advanced BG/Atreides/Emperor sources and bare E3 BG/Ecaz/Atreides Guild
+Ambassador sources with original base33 and Atreides' original Karama. Original
+BG setup in empty Tuek's or Polar Sink becomes fighters. Actual foreign shipping
+then earns declined Intrusion, accepted Intrusion/advisors, or Polar fighters.
+Guild sources earn their original packet, paid token/entrant and actual free
+child shipment. The earlier ordinary accompaniment is explicitly declined.
+No played force, hand, wallet, phase, stance or new response is installed.
+
+[Connected cases](../tests/spiritual-advisor-engine.test.ts) cover fresh target
+rejection, separate shipping prevention, both Polar matching/alone outcomes,
+accepted Intrusion, exact parent binding and a second genuine foreign shipment
+joining a held group. Explicit controlled late-stance cases test revalidation.
+The final frozen batch passes **22 files390/390**, types/lint/build, fifteen
+native declaration/response/GameTable SSR journeys and two explicitly controlled
+late-stance cases. Ordinary sources use35 actions for retained/Polar fighters or
+37 for accepted Intrusion; Guild sources use45 or48 respectively. The fifteen
+journeys cover target rejection/decline, shipping prevention, both matching and
+alone-conversion outcomes, same-type Intrusion and the second genuine foreign
+grant joining a held group. Twenty-four existing-profile paths across four
+difficulties, two parents and three stances accept72 actions through choices,
+shipping and later responses or restored decline. This is minimal legal
+participation, without strategic refinement.
+
+Feedback updates four older assertions to follow the independent matching
+response and preferred public choices. The focused four repairs pass before
+the final union. The first native runtime passed without application fixes.
+Private source proof lives in
+`/home/quintine/.local/share/dune/checkpoints/20261024-spiritual-advisor-flow/`:
+`frozen-integrated-2/report.json` binds tree
+`403d1a46ccdc0fbe353546a870d858fdb80340cb2c20533e87667dd414df6fe0`,
+2757 files on base `438a5692a644305360199da920760e25fee8d15f`.
+Only checkpoint prose/reference overlays follow the frozen proof; their links,
+evidence paths and source invariance are separately reviewed.
+
+Full Homeworld/Tech/Nexus/No-Field combinations, other matching producers,
+all valid modes and final browser/deployed assurance remain open. Standard
+controls are reused; SSR is not callback/hydration or desktop/mobile browser
+acceptance. No saved-room/D1/server/reset/restart/deployment operation was needed.
+No strategic AI work is authorized by this prototype.