Use actual Collection receipts for co-present Orgiz payers

docs/CURRENT_STATUS.md

@@ -29,7 +29,27 @@ optional skill bands, combinations and public expansion starts remain open.
 Rules implementation continues; comprehensive assurance and administration
 remain deferred until all rules are implemented.
 
-**Orgiz payer ordering and native Collection proof — 14 October.**
+**Canonical Orgiz Collection sources — 14 October.**
+The original ordinary quote now records positive player/location/amount deposit
+receipts before Orgiz. Both modes use actual collectors, not co-present force
+inference: Basic groups by positive deposit; Advanced groups by territory.
+Original storm-order eligibility skips self, zero actual collection and empty
+purses. City income and unresolved Ecaz escrow cannot identify an ordinary
+payer. The former shared-sector withholding branch and `collectorAt` are gone;
+phase controls and Advanced bilateral allocation remain original.
+
+Genuine Basic/Advanced Sihaya Ridge paths preserve setup, cards, armies,
+alliance, reveal/entry, departure and paid shipments. Exact source receipts
+show both collectors taking2, or one consuming the original6-spice pile with
+the other taking0. Face1 is selected at the actual turn-two forecast shuffle,
+not assigned to a later source. Final six-file union72/72; types/lint and app
+build pass. Actual390px Finish shipment & movement turns phase5→7,
+Ecaz7/Guild10→Ecaz8/Guild14 with one Orgiz transfer and Ready restored.
+No horizontal overflow or browser errors. Basic shared-allocation settlement,
+complete modules and deployed acceptance remain open.
+[Contract](DISCOVERY_PROTOTYPE.md#multi-occupant-and-shared-cisternorgiz-collection--14-october-2026).
+
+**Earlier Orgiz payer ordering and native proof (`bc09ac3`) — 14 October.**
 Every Cistern fighter occupant receives two bank spice. Orgiz occupants resolve
 in original storm order without debt. Advanced charges once per territory,
 selecting the first definite foreign collected-sector payer in storm order that
@@ -48,8 +68,9 @@ types/lint and app build pass. Actual390px table proposal4/0 leaves wallets7/11
 unchanged until Guild accepts, then credits Ecaz10/Guild12 with one transfer,
 no remaining decision and enabled Ready. No horizontal overflow; fresh settled
 surface has no application errors. The earlier checkpoint's genuine-fixture
-and app-build claims were unsupported and are corrected here. Ambiguous
-collected-sector payers and complete/deployed acceptance remain open.
+and app-build claims were unsupported and are corrected here. That checkpoint's
+ordinary-source ambiguity gap is superseded by the canonical receipt pass
+above; Basic shared allocation and complete/deployed acceptance remain open.
 [Contract](DISCOVERY_PROTOTYPE.md#multi-occupant-and-shared-cisternorgiz-collection--14-october-2026).
 
 

docs/DISCOVERY_PROTOTYPE.md

@@ -68,35 +68,41 @@ source/actor/transition/payment boundaries, not wording or fixture-copy echoes.
 
 Cistern pays every fighter occupant two bank spice after ordinary advisor
 releases; a lone advisor never qualifies. Orgiz resolves fighter occupants in
-original storm order. Advanced charges one actual foreign collector per
-territory, choosing among definite collected-sector payers in original storm
-order and skipping the owner and empty purses. Basic retains the provisional
-positive-deposit mapping. An ambiguous collected sector still withholds that
-territory's transfer. No debt is created; ordinary Collection continues.
+original storm order. The original `CollectionQuote.deposits` records each
+actual positive ordinary map collection by player/location/amount, excluding
+city income and unresolved shared escrow. Orgiz considers those actual foreign
+recipients in storm order, skipping self and empty purses: once per territory
+in Advanced, once per positive deposit under Basic's provisional mapping.
+Co-present forces and old wallets alone do not establish collection.
 
-Shared Ecaz desert lots wait for the actual bilateral allocation. Each occupant
-considers positive foreign recipients Ecaz first, then ally, charging at most
-one spice from an available current balance. A zero share or an old wallet
-alone cannot establish eligibility; the owner never pays itself. These occupant
-and payer orderings are recommended provisional interpretations, not new
-publisher rulings or separately answered numerical user questions.
+Advanced shared Ecaz desert lots wait for actual bilateral allocation. Each
+occupant considers positive foreign recipients Ecaz first, then ally, charging
+at most one spice from an available current balance. A zero share or an old
+wallet alone cannot establish eligibility; the owner never pays itself. Basic
+shared-allocation Orgiz settlement remains pending. Occupant/payer ordering
+is a recommended provisional interpretation, not a new publisher ruling or
+separately answered numerical user question.
 
 Current native fixtures preserve original armies, wallets, hands, alliances
 and phases. They use real setup, token placement, paid shipments, inspection,
-reveal, free entry, a worm Nexus alliance and allocation. Only original
-unplayed Spice Card order and the actual token lottery are staged. The shared
-route uses two fresh desert blows with different sectors, real Ecaz departure
-from Orgiz, and fresh paid Ecaz/Guild shipments. Rock blows cannot create an
-Ecaz shared lot. Cases cover equal/full/zero Ecaz shares, owner exclusion,
-acceptance timing, wrong-actor rejection and stale-allocation rejection.
+reveal, free entry, a worm alliance and allocation. Staging is limited to
+original unplayed Spice Card order, the actual token lottery and face1 at the
+real turn-two forecast shuffle; the resulting turn-three source is original.
+Shared desert lots and ordinary co-present rock collectors use real Ecaz
+departure and fresh paid Ecaz/Guild shipments. Rock spice does not create a
+shared Ecaz lot, but each positive ordinary recipient is now an eligible payer.
+An exhausted pile leaves the later collector ineligible even with old spice.
 
 `tests/fixture-discovery-occupied-collection.ts`,
 `tests/discovery-occupied-collection-runtime.test.ts`,
 `tests/fixture-discovery-shared-orgiz.ts` and
-`tests/discovery-shared-orgiz-runtime.test.ts`. Focused helper regressions also
-cover original storm-order payer selection, one available spice for two owners
-and advisor exclusion. Ambiguous collected-sector sources and complete
-combined-module acceptance remain open.
+`tests/discovery-shared-orgiz-runtime.test.ts`. Focused helper regressions cover
+original storm-order payer selection, depleted purses, advisor exclusion and
+zero actual collection. The six-file related union72/72, types/lint and app
+build pass. Actual390px Finish shipment & movement produces phase7,
+Ecaz8/Guild14 from7/10, two actual2-spice source receipts, one Orgiz transfer,
+no decision, enabled Ready, no overflow and no browser errors. Basic shared
+allocation, broader combined modules and full acceptance remain open.
 
 ## Mixed E1/E2 and paired E3 Nexus — 7 October 2026
 
@@ -754,13 +760,13 @@ says Orgiz steals one collected spice **each time collection occurs in a
 territory containing spice**, rather than the publisher's older per-blow text.
 For Advanced, each fighter occupant receives at most one transfer per actual
 positive territory Collection. Multiple collected source keys do not multiply
-the transfer. Definite rival collectors are considered in original storm
-order, skipping self and empty purses. A collected sector whose actual payer
-is ambiguous still withholds that territory's transfer. Shared Ecaz desert
-lots wait for the actual bilateral split, then consider positive foreign
-recipients Ecaz first, ally second. Those payer/occupant orderings are explicitly
-provisional implementations under the recommended-option priority; the
-territory trigger is sourced, not the ordering. Ordinary Collection proceeds.
+the transfer. Canonical positive ordinary deposit receipts identify actual
+foreign payers in original storm order, including multiple collectors in one
+sector; self and empty purses are skipped. No presence-based ambiguity gate
+remains. Advanced shared Ecaz desert lots wait for actual bilateral allocation,
+then consider positive foreign recipients Ecaz first, ally second. Basic
+shared settlement remains pending. Ordering is provisional under the
+recommended-option priority; the Advanced territory trigger itself is sourced.
 
 Basic retains its recorded provisional one-transfer-per-positive-deposit
 interpretation. The context requires its existing public `advanced` boolean:
@@ -868,15 +874,15 @@ conversion was fabricated.
   occupant of the revealed location receives two bank spice. A lone advisor
   never qualifies. Two fighters therefore both collect; the former withheld
   two-fighter gap is closed.
-- **Orgiz:** during Collection, each fighter occupant resolves in original storm
-  order after ordinary advisor releases. Advanced charges once per territory,
-  choosing the first definite foreign collector in original storm order that
-  can pay. Basic retains one transfer per positive deposit with a unique rival
-  collector. Empty purses never create debt. An ambiguous collected sector
-  withholds the territory effect without blocking ordinary Collection. Shared
-  Ecaz desert lots settle their real bilateral allocation first; positive
-  foreign recipients are considered Ecaz first, ally second. Zero shares and
-  the occupant itself do not qualify. Ordering remains provisional.
+- **Orgiz:** fighter occupants resolve in original storm order after advisor
+  releases. Actual positive ordinary deposit receipts identify eligible foreign
+  payers, even when forces share a sector. Advanced charges once per territory;
+  Basic provisionally charges once per positive deposit. The first actual
+  foreign collector in storm order with available spice pays; mere presence,
+  self and zero actual collection do not qualify. Empty purses never create
+  debt. Advanced shared Ecaz lots wait for allocation, then consider positive
+  foreign recipients Ecaz first, ally second. Basic shared settlement remains
+  pending; occupant/payer ordering remains provisional.
 
 - **Jacurutu:** one bank spice per opposing undialed physical counter actually
   sent to the Tanks. Unique readings remain automatic. For different possible
@@ -1022,10 +1028,10 @@ to Spice Blow. Refresh restored the same station forces and private Snooper.
 This is targeted control/recovery evidence, not an unmodified complete game.
 The 187 opening saved rooms remain preserved; no server restart was needed.
 
-1. Resolve ambiguous collected-sector Orgiz sources and refine combined
-   Discovery interactions. Multi-occupant Cistern/Orgiz, shared allocation,
-   Jacurutu mixed dials and Testing Station ordering now use the visible
-   recommended interpretations above; Basic Orgiz remains provisional.
+1. Connect Basic shared-allocation Orgiz settlement and refine combined
+   Discovery interactions. Canonical ordinary receipts now close the guessed
+   shared-sector payer gap. Other recommended Discovery interpretations remain
+   visibly provisional; the Basic positive-deposit mapping is not certified.
 2. Integrate combined modules and complete games, then refine interaction,
    strategy and presentation coverage before opening normal start gates.
 3. Use the existing prototype starter and saved-room verification for further

docs/IMPLEMENTATION_STATUS.md

@@ -1,5 +1,31 @@
 # Dune implementation status
 
+## 14 October 2026 — Canonical positive Collection receipts for Orgiz
+
+The original ordinary quote now emits `deposits` with actual positive
+player/location/amount receipts. It excludes city awards and shared escrow;
+zero-take forces are not collectors. Discovery consumes that original source
+instead of inferring a unique collector from occupancy. `collectorAt` and the
+whole-territory ambiguity guard were removed. Basic groups by positive deposit;
+Advanced groups by territory, retaining source-key event order and original
+storm-order owner/payer selection. Self and empty purses are skipped.
+
+Native Basic/Advanced Ecaz/Guild rock scenarios use genuine setup, token
+lottery/reveal/entry, alliance, departure and paid shipments. Both collect2
+from original Sihaya Ridge spice, or the first actual collector consumes the
+whole6-spice pile and the later co-present force takes0. The latter cannot pay
+solely because it has an old wallet. Actual Storm face1 is selected at the
+original forecast producer after turn-two Storm, not assigned to a later
+forecast or source. Shared desert allocation keeps its original separate path.
+
+Final six-file union72/72, types/lint and app build pass. Actual390px table:
+Finish shipment & movement produces phase7 with two2-spice ordinary source
+receipts, Ecaz8/Guild14 from7/10, exactly one Orgiz transfer, no decision and
+enabled Ready. No horizontal overflow or browser errors. Local proof is
+outside Git; owned hosts/tabs/scaffolding were removed. DEP0205, large-chunk
+and route-classification warnings remain. Basic shared-allocation settlement,
+full modules, assurance and deployed acceptance remain open.
+
 ## 14 October 2026 — Cistern/Orgiz multi-occupant and shared-lot Collection
 
 Recommended-option priority: Advanced Orgiz now chooses one definite actual

docs/RULE_DECISIONS.md

@@ -549,7 +549,7 @@ These are unresolved in the cited records. Do not infer an answer from elapsed t
 | Nexus responses and composition | Betrayal private-response timing, partial revival/payment choices, Emperor fewer-than-five, fresh advisor/storm cases, Duke restoration and remaining faction-specific combinations. Tleilaxu Secret Ally force accounting, leader slot/eligibility and force-only use remain unresolved after requested publisher/designer source searches; do not infer answers from native Tleilaxu revival or Ghola. | [Common boundaries](NEXUS_CARD_RULES.md#remaining-source-questions-and-release-boundaries), [Tleilaxu source search](NEXUS_TLEILAXU_RULES.md#source-search-follow-up) and individual faction source/runtime documents |
 | Moritani Atomics after alliance change | The publisher's persistent −1 hand-limit text names Moritani and “your ally,” but not whether the penalty follows a later ally, remains on the original ally or affects both. Requested online source searches found no clarification; the alliance-change case remains gated. | [Terror source boundary](MORITANI_TERROR_RULES.md#material-gaps-and-ordinary-compositions) |
 | Moritani Sneak Attack entry classification | The printed verb is “Send”; no retrieved ruling classifies the off-planet reserve transfer as a shipment for other arrival powers. The engine now **explicitly adopts** the supported shipment composition: a positive Sneak Attack in Shipment and Movement accrues the Heighliners token once for its owner, then offers the Bene Gesserit Intrusion (Advanced, with fighters present) and the free spiritual-advisor shipment, with the committed Terror entry resolving first; a zero-force resolution accrues nothing and opens no reaction. This order is an implementation interpretation, not a publisher ruling. | [Source boundary and adopted classification](MORITANI_ASSASSINATION_SNEAK.md#adopted-shipment-classification-7-october-2026) |
-| Orgiz collection | Basic retains the publisher-p13 per-blow ambiguity and provisional one-transfer-per-positive-deposit mapping. Authorized supplied Advanced rulebook physical24 says each time Collection occurs in a territory containing spice: one transfer per actual positive territory Collection per fighter occupant, never extra transfers for multiple source keys. Under the choose-recommended-option priority, distinct definite collectors are considered in original storm order, skipping the owner and empty purses; a sector whose actual collector is ambiguous still withholds its territory transfer. Shared Ecaz lots wait for actual bilateral allocation, then consider positive foreign recipients Ecaz first, ally second. Occupant and payer ordering are provisional implementation interpretations, not separate numerical user answers or publisher rulings. Ordinary Collection proceeds without debt. | [Advanced source cutover and Basic boundary](DISCOVERY_PROTOTYPE.md#authorized-advanced-collection-wording) |
+| Orgiz collection | Basic retains the publisher-p13 per-blow ambiguity and provisional one-transfer-per-positive-deposit mapping. Authorized supplied Advanced rulebook physical24 says each time Collection occurs in a territory containing spice: one transfer per actual positive territory Collection per fighter occupant, never extra transfers for multiple source keys. Canonical positive ordinary deposit receipts now identify actual payers, including co-present collectors; force presence and old wallets alone do not qualify. Under choose-recommended-option priority, owners and eligible foreign ordinary payers resolve in original storm order, skipping self and empty purses. Advanced shared Ecaz lots wait for actual allocation and consider positive foreign recipients Ecaz first, ally second; Basic shared settlement remains pending. Ordering is provisional implementation interpretation, not a separate numerical user answer or publisher ruling. No debt is created. | [Advanced source cutover and Basic boundary](DISCOVERY_PROTOTYPE.md#authorized-advanced-collection-wording) |
 | Jacurutu physical dial | Under the 14 October choose-recommendation priority, the prototype selects the defeated-player exact ordinary/elite/paid reading before settlement. Unique readings remain automatic; actual returned counters never earn income. This replaces the earlier unpaid gap without claiming a separate numerical user answer or publisher ruling. | [Recommended runtime and source](DISCOVERY_PROTOTYPE.md#recommended-physical-dial-and-cumulative-storm-choices--14-october-2026) |
 | Testing Station contest/timing | The 14 October recommended prototype gives each non-advisor occupant one cumulative adjustment in original storm order, after the ordinary card window and before a single traversal. Original source/base and Weather immunity stay unchanged. Ordering/stacking is explicit provisional interpretation, not a newly found publisher answer. | [Recommended runtime and source](DISCOVERY_PROTOTYPE.md#recommended-physical-dial-and-cumulative-storm-choices--14-october-2026) |
 | CHOAM Secret Ally battle timing | The printed after-victory inspection is optional and the Nexus identity stays secret. The connected prototype chooses a uniform use-or-continue window for every winner when Nexus is enabled and CHOAM absent; nonholders pass, while a holder may decide after the result. This privacy-preserving prompt is a product inference, not publisher text. A holder-only pause would reveal custody and a precommitment would remove the printed choice. Ordinary Karama cancellation remains unestablished by retrieved sources; no response is invented. | [After-victory inspection boundary](NEXUS_CHOAM_SECRET_ALLY.md#after-victory-inspection-audit) |