Skip to content

fix(game): unblock optional choices after state restore#6071

Merged
matthewevans merged 1 commit into
mainfrom
ship/fix-restored-optional-choice
Jul 17, 2026
Merged

fix(game): unblock optional choices after state restore#6071
matthewevans merged 1 commit into
mainfrom
ship/fix-restored-optional-choice

Conversation

@matthewevans

Copy link
Copy Markdown
Member

Summary

  • Reset the client dispatch generation when restoring a saved game so stale work cannot hold the queue mutex.
  • Ignore stale in-flight work after a restore and expose keyed optional preference actions in the engine snapshot.

Validation

  • cargo fmt --all
  • Tilt: frontend tests and frontend check passed.
  • Engine Tilt is queued behind unrelated in-progress changes; CI will run the full engine suite.

@gemini-code-assist

Copy link
Copy Markdown
Contributor

Warning

You have reached your daily quota limit. Please wait up to 24 hours and I will start processing your requests again!

@matthewevans
matthewevans enabled auto-merge July 17, 2026 04:52
@matthewevans
matthewevans added this pull request to the merge queue Jul 17, 2026
@github-actions

Copy link
Copy Markdown

Parse changes introduced by this PR

✓ No card-parse changes detected.

Merged via the queue into main with commit 7c79627 Jul 17, 2026
13 checks passed
@matthewevans
matthewevans deleted the ship/fix-restored-optional-choice branch July 17, 2026 05:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant