Prevent saved CHOAM movement arrival deadlocks

Preflight ordinary movement through the existing arrival quote before creating new Ornithopter escrow or opening Ixian, Fremen and CHOAM prevention windows. An explicit legacy CHOAM decline can return an uncommitted unsupported arrival for another choice without consuming movement or touching forces, spice, cards or tokens. Preserve an existing Ornithopter and retire it exactly once on a legal replacement move. Keep dedicated Ambassador relocation handling and Karama cancellation validation before cost; unrelated exceptions remain atomic. Simultaneous Ambassador/Terror priority still awaits the recorded material interpretation, with no invented ordering.

Add reusable offline faction-game samples with genuine Basic/Advanced setup, all four AI profiles, physical custody checks, JSON restorations, private traces and failed snapshots. Source-bound reports and input snapshot hashes make fresh and resumed samples repeatable; document that a resumed continuation starts a new seeded stream and does not prove input setup provenance.

Validation: independently reviewed fresh declaration, native cancellation, supported single arrivals, legacy retry and card custody tests. Two production SQLite tests cover authenticated private restoration, stale/duplicate/wrong-owner rejection, resource conservation and concurrent version races. Typecheck, lint, 4583 offline tests, production build and 43 HTTP tests passed. Retain the initial failed check log for the corrected numeric-sort lint issue.

All six fresh samples complete. CHOAM Basic 1054 actions/28 JSON restores, CHOAM Advanced 225/6, Ecaz Basic 91/2, Ecaz Advanced 523/14, all-three Basic 476/12, all-three Advanced 1303/35 with a turn-six CHOAM win. Combined Advanced has 46 guarded arrival candidates with legal alternatives. The exact prior 614-action failed snapshot separately finishes after 691 additional actions/18 restores and 39 guarded candidates. These are bounded paths, not complete faction or combination certification. Gameplay source hashes match the final checkpoint; later evidence-only documentation and recovery-test lint edits are explicit.

After the reported outage, all 632 opening games and original seat/recovery records were preserved (665 after HTTP tests); integrity and foreign keys passed. Existing Ecaz and Ixian browser seats restored their same private hands, resources and pending choices after reload. This is browser restoration evidence, not a staged arrival-return claim. The healthy server was reused; no restart, database reset, recurring automation or publication.

Verified source tree: 550221850f4802c41155f7bbc35d623965bc7db3330825636d50f26bb42868f8

game/engine.ts

@@ -8657,6 +8657,8 @@ function balisetPrevents(g: Game, player: string, origin: string, to: string) {
   );
 }
 function offerChoamMovement(g: Game, move: MovementOrder) {
+  if (move.source === 'ambassador') validateAmbassadorRelocationArrival(g, move);
+  else validateMovementArrival(g, move);
   const choam = byFaction(g, 'choam');
   if (
     g.phase === 5 &&
@@ -8785,7 +8787,7 @@ function pendingFremenMovement(g: Game, response: ResponseWindow) {
   validateMovementOrder(g, p, pending.order);
   return pending;
 }
-function resumeChoamMovement(g: Game) {
+function resumeChoamMovement(g: Game, retryUnsupportedArrival = false) {
   const move = g.pendingChoamMove!;
   if (move.source === 'ambassador')
     currentFremenAmbassador(g, move.ambassadorEvent);
@@ -8802,16 +8804,28 @@ function resumeChoamMovement(g: Game) {
     if (move.source === 'ambassador') offerAmbassadorRelocation(g);
     return;
   }
+  if (retryUnsupportedArrival) {
+    try {
+      if (move.source === 'ambassador') {
+        const blocked = ambassadorRelocationArrivalBlock(g, move.player, move.origin, move.to, move.total);
+        if (blocked) throw new MovementArrivalError(blocked);
+      } else quoteMovementArrival(g, move);
+    } catch (error) {
+      if (!(error instanceof MovementArrivalError)) throw error;
+      log(g, `${p.name}'s uncommitted movement returned for another choice. ${error.message} No additional forces, spice, cards or movement allowance were spent.`);
+      if (move.source === 'ambassador') offerAmbassadorRelocation(g);
+      return;
+    }
+  }
   if (move.source === 'ambassador') commitAmbassadorRelocation(g, move);
   else completeMove(g, move);
 }
-function validateMovementArrival(
+function quoteMovementArrival(
   g: Game,
   move: MovementOrder,
   cancelingChoam = false,
 ) {
-  try {
-    return quoteCompletedMovementArrival({
+  return quoteCompletedMovementArrival({
       advanced: g.advanced,
       players: g.players,
       order: move,
@@ -8826,7 +8840,11 @@ function validateMovementArrival(
         pendingAmbassador: !!g.pendingAmbassador,
         paidBox: !!g.pendingNullentropy,
       },
-    });
+  });
+}
+function validateMovementArrival(g: Game, move: MovementOrder, cancelingChoam = false) {
+  try {
+    return quoteMovementArrival(g, move, cancelingChoam);
   } catch (error) {
     if (error instanceof MovementArrivalError)
       throw new RuleError(error.message);
@@ -20185,7 +20203,7 @@ function applyActionInner(
         action.decline === true,
         'Allow the movement or declare Baliset.',
       );
-      resumeChoamMovement(g);
+      resumeChoamMovement(g, true);
       return g;
     }
     if (
@@ -22419,6 +22437,12 @@ function applyActionInner(
       sourceKeys.every((key) => key !== location(to, s)),
       'Choose a different destination.',
     );
+    // Reject known unsupported arrivals before any movement-card event or
+    // native movement-prevention window can commit this declaration.
+    validateMovementArrival(g, {
+      player: id, group, eliteGroup, elite, origin, origins, total: n,
+      to, sector: s, advisors, wantsFighters, lockedTurn,
+    });
     let flight = g.ornithopter?.player === id ? g.ornithopter : null;
     if (action.movementCard !== undefined) {
       const mode = action.ornithopter;