Two carve-outs land on top of v0.21.5: -d3cb1a5: HC-mode coverage for scrub track + notches via new HighContrastBackground primitive in ui_theme + paint system in settings_plugin. -2e25476: continuous scrub on key-held ← / → at 100ms cadence; matches mockup's "[← →] scrub" terminology while keeping single-press = single-step semantics. Update Since-cut log, status (1250 → 1254 tests passing, flake cleared), and next-step menu. B-2 keyboard accelerator coverage + accessibility + scrub UX are all complete; remaining options are notch-label centering polish (smallest), the move-log/mini-tableau multi-session arcs that close B-2, or WIN MOVE marker HC bump (optional). Recommended next-step: notch label centering (small). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
20 KiB
Solitaire Quest — Session Handoff
Last updated: 2026-05-08 — v0.21.5 cut and tagged at
a2432df, working tree clean, all post-tag work pushed to
origin.
v0.21.5 is a patch release with one through-line: replay-overlay scrubbing affordances + accessibility. v0.21.4 shipped pause / resume / step + the WIN MOVE marker as the first scrubbing-shaped additions to the replay overlay; v0.21.5 fills out the rest of the scrubbing UX so the player has both visual anchor points (notches + labels) and a complete keyboard control surface (Space / Esc / ← / →) for navigating a paused replay.
Six commits on the B-2 replay screen-takeover redesign arc land here. Two of them are layout-changing — banner height grew 60 → 76 → 92 px to make room for the notch labels and keybind footer. Banner geometry was fixed for every prior B-2 commit; this release establishes the "grow the container, add a flex-column child" pattern that the remaining B-2 sub-pieces (move-log scroller, mini-tableau preview) will inherit when they land.
Full v0.21.5 detail lives in CHANGELOG.md § [0.21.5]. This
file from here on focuses on what's open post-cut and how to
resume.
Status at pause
- HEAD locally: see
git rev-parse HEAD. The cut commit isa2432df; any post-cut docs edits ride on top of that. - HEAD on origin: matches local. v0.21.5 is fully on origin.
- Working tree: clean. No WIP outstanding.
artwork/directory: still untracked. Intentional.- Build:
cargo clippy --workspace --all-targets -- -D warningsclean. - Tests: 1254 passing / 0 failing across the workspace
(1250 in v0.21.5 + 2 from
d3cb1a5's HC-marker tests + 2 from2e25476's continuous-scrub tests). The time-dependentdaily_challengeflake noted in v0.21.5's CHANGELOG passes again (UTC clock has moved past the trigger window). Detail inCHANGELOG.md§ [0.21.5] § Stats for the v0.21.5 baseline; post-cut delta tracked in this file's Since-cut log. - Tags on origin:
v0.9.0throughv0.21.5. v0.21.5 is ona2432df; v0.21.4 stays on23ff62c; v0.21.3 stays on3d92a91; v0.21.2 stays onf23df3b; v0.21.1 stays ondaa655a; v0.21.0 stays on04f9bf9; v0.20.0 stays on41a009a.
Since the v0.21.5 cut
d3cb1a5—feat(replay): HC-mode coverage for scrub track + notches. Adds a parallel primitive to ui_theme (HighContrastBackgroundmarker carryingdefault_color) and a paint system in settings_plugin (update_high_contrast_backgrounds) that mirrors the existing border-marker pattern but targetsBackgroundColorinstead ofBorderColor. Tags the 1 px scrub track Node and all five quarter-mark notch ticks with the new marker so they bump fromBORDER_SUBTLE(#505050) →BORDER_SUBTLE_HC(#a0a0a0) under HC mode. Scrub fill (ACCENT_PRIMARY) and WIN MOVE marker (STATE_SUCCESS) don't get the marker — accent and state colours are already saturated. 2 new tests; 1250 → 1252.2e25476—feat(replay): continuous scrub on key-held arrow keys. Holding ← or → now triggers continuous step at 100 ms cadence (10 steps/sec) — matches the mockup's[← →] scrubterminology while keeping single-press = single-step semantics. Per-key accumulators in a newReplayScrubKeyHoldresource;just_pressedevents bypass the accumulator and fire immediately. Release resets to 0 so the next fresh press fires immediately rather than at half-interval. Footer text unchanged ([← →] step) — held-key scrub is a discoverable enhancement to the same keybind, not a new keybind. 2 new tests usingTimeUpdateStrategy::ManualDuration; 1252 → 1254.
Open next-step menu (B-2 keyboard accelerator coverage + accessibility + scrub UX are all complete):
- Move-log scroller / mini-tableau preview — both need
a much larger banner-height grow (effectively the takeover
container itself). Multi-session arcs that close B-2.
Mockup at
docs/ui-mockups/replay-overlay-mobile.html. - Polish: notch label centering. Bevy 0.18 lacks a clean
translate-x: -50%primitive so middle three labels sit slightly right-of-notch. Could use a child Text wrapper with computed left-margin compensation. Tiny commit. - Polish: WIN MOVE marker HC bump. Currently the marker
uses
STATE_SUCCESSlime which stays visible under HC, but a slight saturation / contrast bump under HC would make the marker even more legible alongside the bumped notches. Optional.
Recommended order: option 2 (notch label centering) is the smallest concrete next-step. Option 1 is the multi-session arc that closes B-2 — natural place to start a fresh session.
Open punch list
Phase Android (build + persistence shipped; runtime gaps remain)
- APK launch verification on AVD / device.
adb installthenadb logcatagainst thebevy_testAVD or an x86_64 device. The build works and persistence is wired, but no end-to-end device run has been logged. Shakes out runtime bugs the build + unit tests can't catch. - JNI ClipboardManager bridge. Replaces the Android stub for
the Stats "Copy share link" toast.
arboarddoesn't ship an Android backend; small custom JNI call. - Android Keystore for credentials.
keyringis target-gated to a stub returningKeychainUnavailable; replace with Android Keystore via JNI when sync auth ships on mobile. - Google Play Games (gpgs) integration. Listed as a Phase-Android target since Phase 1; now unblocked by the build target.
- Cosmetic
cargo apk build --libworkaround. Post-sign panic doesn't affect the APK on disk but produces noisy stderr. Either upstream a cargo-apk fix or document--libas canonical in the runbook.
Visual-identity follow-ups (post-v0.21.0)
The visual-identity arc is effectively complete: token system,
chrome migration, splash boot screen, replay-overlay banner,
card-face artwork (both rendering paths), and the ACCENT_PRIMARY
palette refresh all shipped in v0.20.0 + v0.21.0. What stays open:
- Replay-overlay screen-takeover redesign. The full mockup
(
docs/ui-mockups/replay-overlay-mobile.html) calls for a mini-tableau preview, playback controls, move-log scroll, and a WIN MOVE marker on the scrub bar. Banner-local pieces all shipped in v0.21.0 (c84d9f4+6204db8+54005d5+e080b49); the floating MOVE chip above the focused card shipped in v0.21.2 (2fb2d63). The WIN MOVE scrub-bar marker shipped post-v0.21.3 inab857bb(data field) +52befa6(UI). Playback controls (pause / resume / step + Space accelerator) shipped post-v0.21.3 infbe48ac. v0.21.5 bundled six more commits under "replay-overlay scrubbing affordances + accessibility" — scrub notches + percentage labels + keybind-hint footer + ESC and ← / → accelerators- HC marker for the footer top border. Banner height grew
60 → 76 → 92 px across two layout-changing commits in
v0.21.5; banner geometry is now mutable. Full per-commit
detail in
CHANGELOG.md§ [0.21.5]. Keyboard accelerator coverage is complete. What still needs to land: HC-mode coverage for the scrub-track / notches / WIN MOVE marker (they render viaBackgroundColorso theHighContrastBordermarker doesn't apply — needs a settings-aware paint), continuous scrub on key-held ← / → (vs single-step), then the bigger pieces — a move-log scroller and a mini-tableau preview — both screen- takeover-only pieces that need a much larger banner height grow (effectively the takeover container itself). Multi-session.
- HC marker for the footer top border. Banner height grew
60 → 76 → 92 px across two layout-changing commits in
v0.21.5; banner geometry is now mutable. Full per-commit
detail in
- Floating
MOVE N/Mchip above the focused card during playback — closed 2026-05-08 by2fb2d63. World-spaceText2dentity sibling to the banner overlay; uses the sameLayoutResourcepile coordinates so it survives window resizes without UI/camera math. - Toast Warning variant wiring — closed 2026-05-08 by
279e23d. Daily-challenge-expiry toast fires once perdaily.datewhen within 30 min of UTC midnight reset and today is incomplete.ToastVariantis now fully load-bearing (every variant has at least one real driver). Future Warning drivers can either reuse the genericWarningToastEvent(String)carrier or add their own domain message +animation_pluginhandler. - Toast Error variant wiring — closed 2026-05-08 by
68d50b5.MoveRejectedEventnow fires a 2-second pink-bordered "Invalid move" toast as the third leg of the audio + visual + text rejection-feedback stool. - High-contrast accessibility mode — closed 2026-05-08 by
c5787c6+07e0357(engine + UI) + v0.21.2's HC chrome rollout (c9af1ea+d87761d+ec804d5) + post-cut dynamic-paint rollout (c153363). Card text rendering plus 8 static-border chrome surfaces (modal scaffold, tooltip, onboarding key chips, help panel key chips, stats panel cells, home Level/XP/Score row, home mode buttons, home mode-hotkey chips, 4 settings panel surfaces) all boost borders toBORDER_SUBTLE_HCunder HC via theHighContrastBordermarker. The previously-carved-out dynamic-paint sites are now also covered: HUD action buttons and modal buttons take the same marker (their paint cycles only mutateBackgroundColor, so no race); the radial menu rim folds HC into its per-frame spawn viaradial_rim_outlineso the focused rim boosts toBORDER_SUBTLE_HCunder HC (preserving focused-vs-resting hierarchy that naive marker substitution would invert). - Reduced-motion mode — closed 2026-05-08 by
c5787c6+ v0.21.2'sed152e2.effective_slide_secsforces 0 on card animations;pulse_splash_cursorskips the per-frame pulse multiplier;spawn_splashskips the scanline overlay entirely. Future scope: gate any future card-lift z-bump animation, warning-chip pulse (when one materialises).
Carried forward from v0.19.0
- App icon round — closed 2026-05-08 by
3eb3a26+716a025. RuntimeWindow::iconwired (Linux/macOS/Windows); 9-size PNG hierarchy atassets/icon/icon_<size>.pngcovers Linux hicolor + downstream.icns/.icopackaging needs. The.icoand.icnsbundle-format files themselves are not generated — both would need new crate deps (icoandicnsrespectively) and only matter at app-bundle time (cargo-bundle / packaging), not atcargo run. Open if the project later ships as a packaged macOS / Windows app.
Other small candidates
- Prev/Next selector chips spawn site. v0.19.0's
9b065e5noted Prev/Next markers exist instats_pluginbut no spawn site renders them today — the Shareable badge therefore lands on the single-replay caption. If/when Prev/Next is plumbed, the badge will need to follow. - Toast queue / immediate unification. The two toast paths
(
spawn_queued_toastforInfoToastEventqueue;spawn_toastfor fire-and-forget) now share visual treatment but remain separate functions because they serve different temporal needs (sequential vs. parallel). If overlap becomes a UX issue, merge into one queue with priority lanes.
Process notes
- The desktop-adaptation spec is the canonical reference for
geometry decisions when porting any future plugin. Read
docs/ui-mockups/desktop-adaptation.mdfirst; apply the universal rules to every surface; consult the per-screen table for the priority surfaces. The 9 missing-plugin screens (splash now ported; eight remaining) inherit the universal rules without dedicated guidance. - Stitch
generate_variantsis unreliable for layout-only adaptation prompts as of 2026-05-07. The first call timed out and no variant ever landed inlist_screens. If a future session wants visual desktop mockups, prefergenerate_screen_from_textwith a fresh narrow prompt per screen rather thangenerate_variantsagainst existing mobile screens. - Token-port pattern. v0.20.0's chrome-migration commits
set a reusable shape for "centralised design system applied
across N plugins":
- Constants module (
ui_theme.rs) is the source of truth. - Const sites that can't call
Alpha::with_alpha(not yetconston stable) use a literal RGB matching the token, with a unit test pinning the RGB to the token (e.g.MARKER_VALID,HINT_PILE_HIGHLIGHT_COLOUR,RIGHT_CLICK_HIGHLIGHT_COLOUR). - Cross-plugin duplication (e.g.
MARKER_DEFAULT↔PILE_MARKER_DEFAULT_COLOUR) collapses to a single promoted const re-exported from one plugin and imported by the other — replaces "kept in sync" doc comments with a compile-time invariant. - Domain colours (suit pips, card faces, lerp helpers) stay as literals with a comment naming the rationale; only UI chrome routes through tokens.
- Constants module (
SplashFadablescaffolding pattern (introduced incacb19c). Any future overlay that needs to fadeN >> 3elements together should follow the same shape: one tiny marker carrying the full-alpha base colour, one global query that lerps every marker's alpha each frame, no per-element query plumbing. Cleanly outscales theWithout<X>, Without<Y>query exclusion pattern that the old splash was hitting at three siblings.
Canonical remote
github.com/funman300/Rusty_Solitaire is the canonical repo.
Always push there. As of v0.21.0 origin matches local; the next
push happens when post-cut work accumulates and is ready to roll
into a v0.21.1 / v0.22.0 cut.
Design direction (Terminal — base16-eighties)
- Tone: retro-terminal / synthwave — flat depth (no box-shadows), monospaced-forward typography (JetBrains Mono / FiraMono), tight 16 px edge margins, 8 px card radius.
- Palette: near-black surface ramp (
#151515/#202020/#2a2a2a/#353535), brick-red primary CTA (#a54242— swapped from cyan#6fc2efin v0.21.0 commita292a7e), lime success (#acc267), gold warning (#ddb26f), pink error / suit-red (#fb9fb1), lavender celebration (#e1a3ee), teal info (#12cfc0). - Two-color suits. Red =
#fb9fb1, black =#d0d0d0. Outlined glyphs for diamonds & clubs are always on; the Settings "color-blind mode" toggle swaps red → lime#acc267(was red → cyan pre-v0.21.0; lime is the next-best non-red base16-eighties accent now that the primary itself is red). - Card glyphs render upright in both corners — no 180°
inverted-corner-indicator rotation. Single-orientation
digital play doesn't benefit from the traditional flip-
readback convention.
design-system.md§ Game Cards documents this deliberate deviation.
Resume prompt
You are a senior Rust + Bevy developer working on Solitaire Quest.
Working directory: <Rusty_Solitaire clone path on this machine>.
Branch: master. v0.21.5 is tagged at a2432df (cut 2026-05-08, a
patch release rolling up replay-overlay scrubbing affordances +
accessibility: scrub-bar notches with percentage labels, keybind-
hint footer, ESC + ← / → keyboard accelerators, and HC-mode
coverage for the footer top border). v0.21.4 stays at 23ff62c,
v0.21.3 at 3d92a91, v0.21.2 at f23df3b, v0.21.1 at daa655a,
v0.21.0 at 04f9bf9. Working tree clean. See CHANGELOG.md §
[0.21.5] for full detail.
State: HEAD locally — see `git rev-parse HEAD`. The cut commit
is a2432df; any post-cut docs edits ride on top of that.
Workspace tests: 1250 total / 1249 passing / 1 pre-existing
time-dependent flake (`daily_challenge` warning, fails when UTC
is within 30 min of midnight; verified not introduced by recent
work). Clippy clean.
READ FIRST (in order, before doing anything):
1. SESSION_HANDOFF.md — this file
2. CHANGELOG.md — [0.21.5] section is the most recent cut
3. CLAUDE.md — unified-3.0 rule set
4. CLAUDE_SPEC.md — formal architecture spec
5. ARCHITECTURE.md — crate responsibilities + data flow
6. docs/ui-mockups/ — design system + 24-mockup library +
desktop-adaptation.md (the rules-based
companion to the mockups; read this
before any plugin port)
7. docs/android/* — Android setup + build runbook
8. ~/.claude/projects/<this-project>/memory/MEMORY.md
— saved feedback / project context
(machine-local; may be missing on a
fresh machine)
DECISION TO ASK THE PLAYER FIRST:
A. APK launch verification on AVD / device — `adb install` +
`adb logcat` to shake out runtime bugs the build / unit
tests can't catch. Likely surfaces JNI ClipboardManager
and Android Keystore stubs that need real bridges. Larger
scope; needs an Android device or emulator running.
B. Replay-overlay screen-takeover redesign — multi-session
work. v0.21.4 shipped WIN MOVE marker, pause / resume /
step + Space accelerator, plus the floating-MOVE-chip
piece from v0.21.2 (`2fb2d63`). v0.21.5 shipped scrub
notches + percentage labels + keybind-hint footer + ESC
and ← / → accelerators + HC marker for the footer top
border (six commits across CHANGELOG § [0.21.5]). Banner
height grew 60 → 76 → 92 px across two layout-changing
commits in v0.21.5; geometry is now mutable. Keyboard
accelerator coverage is complete. Natural next finite
steps:
1. **HC-mode coverage** for the scrub-track / notches /
WIN MOVE marker (render via `BackgroundColor` not
`BorderColor`, so `HighContrastBorder` doesn't apply
— needs a settings-aware paint, precedent
`radial_rim_outline`). Smallest next commit.
2. **Continuous scrub on key-held ← / →** instead of
single-step. Needs a key-held event source. Matches
the mockup's `[← →] scrub` terminology.
3. **Move-log scroller / mini-tableau preview** — both
need a much larger banner-height grow (effectively
the takeover container itself). Multi-session arcs
that close B-2.
Mockup at `docs/ui-mockups/replay-overlay-mobile.html`.
C. Phase 8 (sync) — local storage scaffolding, self-hosted
Axum server, `SolitaireServerClient` impl, GPGS stub
wired into Settings. The biggest open arc by scope; rolls
up several Phase Android dependencies (Keystore,
ClipboardManager).
WORKFLOW NOTES:
- Use the system git config (already correct).
- When attributing playtester feedback in commits/docs, use
"Quat" not "Rhys" (saved feedback memory).
- Sub-agents stage + verify only; orchestrator commits.
- Every commit must pass build / clippy / test before pushing.
- Push to GitHub (origin) — gh auth setup-git wired on
primary dev box; verify on laptop before first push.
- Token-port pattern: when migrating tokens, walk every
concrete artifact downstream of the token (PNG textures,
embedded SVGs, hardcoded literals, comment color names),
not just the token name. v0.21.0 surfaced three "the
migration walked past this" follow-ups that all matched
this shape — codified here so future similar work can
pattern-match instead of rediscovering.
- Doc-vs-implementation drift pattern: v0.21.1's pile-marker
visibility fix (`4d48cad`) implemented an invariant that
had been declared in a module doc comment but was never
enforced in code. When future work touches a module with
a "this does X" doc comment, verify the code actually does
X and add a test if not. Two layers, two checks.
OPEN AT THE START: ask which of A–C. Don't pick unilaterally.
Note: every remaining option is multi-session by nature (A is
gated on Android tooling, B and C are explicitly multi-session
arcs). A fresh session is a better fit for any of them than the
tail of a long working stretch.