refactor(core): explicit Rank discriminants, checked arithmetic, possible_instructions

- Add Rank=1..13 explicit discriminants so `rank as u8 == rank.value()`; collapse 13-arm value() match to `self as u8`
- Add Rank::RANKS and Suit::SUITS iteration constants
- Add Rank::checked_add / checked_sub (const fn, type-safe boundary enforcement); update rules.rs to use them
- Add GameState::possible_instructions() enumerating all valid move_cards triples (foundation for hints/solver)
- Fix waste buffer card peeking through during draw-slide animation by setting Visibility::Hidden on the buffer entity in sync_cards

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

.gitea/workflows/android-build.yml

@@ -1,131 +0,0 @@
-name: Android Build
-
-on:
-  push:
-    branches: [master]
-    # Rebuild whenever app/engine/asset code changes.
-    # Skip server-only, deploy, and doc changes.
-    paths-ignore:
-      - 'deploy/**'
-      - 'argocd/**'
-      - 'solitaire_server/**'
-      - '**.md'
-
-env:
-  ANDROID_SDK: /opt/android-sdk
-  NDK_VERSION: "25.2.9519653"
-  BUILD_TOOLS_VERSION: "34.0.0"
-  PLATFORM: "android-34"
-
-jobs:
-  build-apk:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set short SHA
-        id: meta
-        run: echo "sha=${GITHUB_SHA::8}" >> "$GITHUB_OUTPUT"
-
-      # ── System dependencies ────────────────────────────────────────────
-      - name: Install system dependencies
-        run: |
-          sudo apt-get update -y
-          sudo apt-get install -y openjdk-17-jdk-headless unzip zip
-
-      # ── Android SDK (shared cache key with release workflow) ──────────
-      - name: Cache Android SDK
-        uses: actions/cache@v4
-        id: sdk-cache
-        with:
-          path: ${{ env.ANDROID_SDK }}
-          key: v2-android-sdk-ndk${{ env.NDK_VERSION }}-bt${{ env.BUILD_TOOLS_VERSION }}
-
-      - name: Install Android SDK + NDK
-        if: steps.sdk-cache.outputs.cache-hit != 'true'
-        run: |
-          sudo mkdir -p ${{ env.ANDROID_SDK }}/cmdline-tools
-          curl -sL \
-            "https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip" \
-            -o /tmp/cmdtools.zip
-          unzip -q /tmp/cmdtools.zip -d /tmp/cmdtools
-          sudo mv /tmp/cmdtools/cmdline-tools ${{ env.ANDROID_SDK }}/cmdline-tools/latest
-          yes | sudo ${{ env.ANDROID_SDK }}/cmdline-tools/latest/bin/sdkmanager \
-            --sdk_root=${{ env.ANDROID_SDK }} --licenses > /dev/null 2>&1 || true
-          sudo ${{ env.ANDROID_SDK }}/cmdline-tools/latest/bin/sdkmanager \
-            --sdk_root=${{ env.ANDROID_SDK }} \
-            "build-tools;${{ env.BUILD_TOOLS_VERSION }}" \
-            "platforms;${{ env.PLATFORM }}" \
-            "ndk;${{ env.NDK_VERSION }}"
-
-      # ── Rust toolchain ─────────────────────────────────────────────────
-      - name: Install Rust stable
-        run: |
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
-            | sh -s -- -y --default-toolchain stable --no-modify-path
-          echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
-
-      - name: Add Android cross-compilation targets
-        run: |
-          rustup target add \
-            aarch64-linux-android \
-            armv7-linux-androideabi \
-            x86_64-linux-android
-
-      # ── Cargo caches ───────────────────────────────────────────────────
-      - name: Cache Cargo registry
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/registry/index
-            ~/.cargo/registry/cache
-            ~/.cargo/git/db
-          key: cargo-registry-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: cargo-registry-
-
-      - name: Cache cargo-ndk binary
-        uses: actions/cache@v4
-        id: ndk-tool-cache
-        with:
-          path: ~/.cargo/bin/cargo-ndk
-          key: cargo-ndk-${{ runner.os }}-stable
-
-      - name: Cache build artifacts
-        uses: actions/cache@v4
-        with:
-          path: target
-          key: android-target-${{ hashFiles('**/Cargo.lock') }}-${{ github.sha }}
-          restore-keys: android-target-${{ hashFiles('**/Cargo.lock') }}-
-
-      - name: Install cargo-ndk
-        if: steps.ndk-tool-cache.outputs.cache-hit != 'true'
-        run: cargo install cargo-ndk --locked
-
-      # ── Build APK ──────────────────────────────────────────────────────
-      # Debug CI only builds arm64-v8a — full three-ABI debug builds blow
-      # past the runner's disk budget (~25 GB of target/ + intermediate
-      # APKs caused apksigner to OOM-on-disk in the previous run). Release
-      # CI still ships all three ABIs from android-release.yml.
-      - name: Build debug APK
-        env:
-          ANDROID_HOME: ${{ env.ANDROID_SDK }}
-          ANDROID_NDK_HOME: ${{ env.ANDROID_SDK }}/ndk/${{ env.NDK_VERSION }}
-          BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOLS_VERSION }}
-          PLATFORM: ${{ env.PLATFORM }}
-          PROFILE: debug
-          ABIS: arm64-v8a
-        run: ./scripts/build_android_apk.sh
-
-      # ── Artifact ───────────────────────────────────────────────────────
-      # Pinned to v3 because Gitea Actions doesn't implement the github.com
-      # artifact service that upload-artifact@v4+ requires; v3 uses the
-      # older chunked HTTP API that Gitea's GHES-compatibility layer
-      # supports.
-      - name: Upload APK
-        uses: actions/upload-artifact@v3
-        with:
-          name: solitaire-quest-debug-${{ steps.meta.outputs.sha }}
-          path: target/debug/apk/solitaire-quest.apk
-          retention-days: 30

.gitea/workflows/android-release.yml

@@ -3,148 +3,107 @@ name: Android Release
 on:
   push:
     tags:
-      - 'v*.*.*'
+      - 'v*'
 
 env:
-  ANDROID_SDK: /opt/android-sdk
+  APK_OUT: target/release/apk/ferrous-solitaire.apk
-  NDK_VERSION: "25.2.9519653"
+  GITEA_URL: https://git.aleshym.co
-  BUILD_TOOLS_VERSION: "34.0.0"
+  REPO: funman300/Ferrous-Solitaire
-  PLATFORM: "android-34"
-  GITEA_API: https://git.aleshym.co/api/v1
-  REPO: funman300/Rusty_Solitare
 
 jobs:
-  build-release-apk:
+  build-apk:
     runs-on: ubuntu-latest
+    container:
+      image: git.aleshym.co/funman300/android-builder:latest
+      credentials:
+        username: ${{ gitea.actor }}
+        password: ${{ secrets.CI_TOKEN }}
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Extract version from tag
-        id: meta
-        run: echo "tag=${GITHUB_REF_NAME}" >> "$GITHUB_OUTPUT"
-
-      # ── System dependencies ────────────────────────────────────────────
-      - name: Install system dependencies
-        run: |
-          sudo apt-get update -y
-          sudo apt-get install -y openjdk-17-jdk-headless unzip zip jq
-
-      # ── Android SDK (shared cache key with debug workflow) ─────────────
-      - name: Cache Android SDK
-        uses: actions/cache@v4
-        id: sdk-cache
-        with:
-          path: ${{ env.ANDROID_SDK }}
-          key: v2-android-sdk-ndk${{ env.NDK_VERSION }}-bt${{ env.BUILD_TOOLS_VERSION }}
-
-      - name: Install Android SDK + NDK
-        if: steps.sdk-cache.outputs.cache-hit != 'true'
-        run: |
-          sudo mkdir -p ${{ env.ANDROID_SDK }}/cmdline-tools
-          curl -sL \
-            "https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip" \
-            -o /tmp/cmdtools.zip
-          unzip -q /tmp/cmdtools.zip -d /tmp/cmdtools
-          sudo mv /tmp/cmdtools/cmdline-tools ${{ env.ANDROID_SDK }}/cmdline-tools/latest
-          yes | sudo ${{ env.ANDROID_SDK }}/cmdline-tools/latest/bin/sdkmanager \
-            --sdk_root=${{ env.ANDROID_SDK }} --licenses > /dev/null 2>&1 || true
-          sudo ${{ env.ANDROID_SDK }}/cmdline-tools/latest/bin/sdkmanager \
-            --sdk_root=${{ env.ANDROID_SDK }} \
-            "build-tools;${{ env.BUILD_TOOLS_VERSION }}" \
-            "platforms;${{ env.PLATFORM }}" \
-            "ndk;${{ env.NDK_VERSION }}"
-
-      # ── Rust toolchain ─────────────────────────────────────────────────
-      - name: Install Rust stable
-        run: |
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
-            | sh -s -- -y --default-toolchain stable --no-modify-path
-          echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
-
-      - name: Add Android cross-compilation targets
-        run: |
-          rustup target add \
-            aarch64-linux-android \
-            armv7-linux-androideabi \
-            x86_64-linux-android
-
-      # ── Cargo caches ───────────────────────────────────────────────────
       - name: Cache Cargo registry
         uses: actions/cache@v4
         with:
           path: |
-            ~/.cargo/registry/index
+            /usr/local/cargo/registry/index
-            ~/.cargo/registry/cache
+            /usr/local/cargo/registry/cache
-            ~/.cargo/git/db
+            /usr/local/cargo/git/db
-          key: cargo-registry-${{ hashFiles('**/Cargo.lock') }}
+          key: cargo-registry-android-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: cargo-registry-
+          restore-keys: cargo-registry-android-
 
-      - name: Cache cargo-ndk binary
+      - name: Cache sccache
-        uses: actions/cache@v4
-        id: ndk-tool-cache
-        with:
-          path: ~/.cargo/bin/cargo-ndk
-          key: cargo-ndk-${{ runner.os }}-stable
-
-      - name: Cache build artifacts
         uses: actions/cache@v4
         with:
-          path: target
+          path: /root/.cache/sccache
-          key: android-release-target-${{ hashFiles('**/Cargo.lock') }}-${{ github.sha }}
+          key: sccache-android-aarch64-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: android-release-target-${{ hashFiles('**/Cargo.lock') }}-
+          restore-keys: sccache-android-aarch64-
 
-      - name: Install cargo-ndk
+      - name: Get tag name
-        if: steps.ndk-tool-cache.outputs.cache-hit != 'true'
+        id: tag
-        run: cargo install cargo-ndk --locked
+        run: echo "name=${GITHUB_REF#refs/tags/}" >> "$GITHUB_OUTPUT"
 
-      # ── Build & sign with release keystore ─────────────────────────────
+      - name: Decode release keystore
-      - name: Decode keystore
+        run: echo "${{ secrets.RELEASE_KEYSTORE_B64 }}" | base64 -d > release.jks
-        run: echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > /tmp/solitaire-release.jks
 
-      - name: Build signed release APK
+      - name: Build release APK
         env:
-          ANDROID_HOME: ${{ env.ANDROID_SDK }}
-          ANDROID_NDK_HOME: ${{ env.ANDROID_SDK }}/ndk/${{ env.NDK_VERSION }}
-          BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOLS_VERSION }}
-          PLATFORM: ${{ env.PLATFORM }}
           PROFILE: release
-          KEYSTORE: /tmp/solitaire-release.jks
+          ABIS: arm64-v8a
-          KEYSTORE_PASS: ${{ secrets.KEYSTORE_PASS }}
+          KEYSTORE: ./release.jks
-          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          KEYSTORE_PASS: ${{ secrets.RELEASE_KEYSTORE_PASS }}
-          KEY_PASS: ${{ secrets.KEY_PASS }}
+          KEY_ALIAS: release
-          APK_OUT: ferrous-solitaire-${{ steps.meta.outputs.tag }}.apk
+          KEY_PASS: ${{ secrets.RELEASE_KEYSTORE_PASS }}
-        run: ./scripts/build_android_apk.sh
+          VERSION_NAME: ${{ steps.tag.outputs.name }}
+          RUSTC_WRAPPER: sccache
+          SCCACHE_DIR: /root/.cache/sccache
+        run: bash scripts/build_android_apk.sh
 
-      # ── Publish to Gitea release ───────────────────────────────────────
+      - name: sccache stats
-      - name: Create Gitea release
+        if: always()
+        run: sccache --show-stats
+
+      - name: Create or get Gitea release
         id: release
         run: |
-          TAG="${{ steps.meta.outputs.tag }}"
+          TAG="${{ steps.tag.outputs.name }}"
-          RESPONSE=$(curl -s -o /tmp/release.json -w "%{http_code}" \
+          BASE="${{ env.GITEA_URL }}/api/v1/repos/${{ env.REPO }}"
-            -X POST "$GITEA_API/repos/$REPO/releases" \
+          AUTH="Authorization: token ${{ secrets.CI_TOKEN }}"
-            -H "Authorization: token ${{ secrets.CI_TOKEN }}" \
-            -H "Content-Type: application/json" \
-            -d "{\"tag_name\":\"$TAG\",\"name\":\"$TAG\",\"draft\":false,\"prerelease\":false}")
-          if [ "$RESPONSE" = "409" ]; then
-            curl -sf "$GITEA_API/repos/$REPO/releases/tags/$TAG" \
-              -H "Authorization: token ${{ secrets.CI_TOKEN }}" \
-              > /tmp/release.json
-          elif [ "$RESPONSE" != "201" ]; then
-            echo "Release creation failed with HTTP $RESPONSE"
-            cat /tmp/release.json
-            exit 1
-          fi
-          RELEASE_ID=$(jq -r '.id' /tmp/release.json)
-          echo "release_id=$RELEASE_ID" >> "$GITHUB_OUTPUT"
 
-      - name: Upload signed APK
+          ID=$(curl -sf -H "$AUTH" "$BASE/releases/tags/$TAG" \
+               | python3 -c "import sys,json; print(json.load(sys.stdin).get('id',''))" \
+               2>/dev/null || true)
+
+          if [ -z "$ID" ]; then
+            ID=$(curl -sf -X POST \
+                 -H "$AUTH" -H "Content-Type: application/json" \
+                 "$BASE/releases" \
+                 -d "{
+                   \"tag_name\": \"$TAG\",
+                   \"name\": \"$TAG\",
+                   \"body\": \"## Android release $TAG\n\n**Install / update with Obtainium** — add this source URL:\n\`\`\`\nhttps://git.aleshym.co/funman300/Ferrous-Solitaire\n\`\`\`\n\nOr download \`ferrous-solitaire.apk\` below and sideload it directly.\",
+                   \"draft\": false,
+                   \"prerelease\": false
+                 }" \
+                 | python3 -c "import sys,json; print(json.load(sys.stdin)['id'])")
+          fi
+          echo "id=$ID" >> "$GITHUB_OUTPUT"
+
+      - name: Upload APK to release
         run: |
-          TAG="${{ steps.meta.outputs.tag }}"
+          BASE="${{ env.GITEA_URL }}/api/v1/repos/${{ env.REPO }}"
-          APK="ferrous-solitaire-${TAG}.apk"
+          AUTH="Authorization: token ${{ secrets.CI_TOKEN }}"
+          RELEASE_ID="${{ steps.release.outputs.id }}"
+
+          # Remove any existing APK assets so re-runs don't accumulate duplicates.
+          curl -sf -H "$AUTH" "$BASE/releases/$RELEASE_ID/assets" \
+            | python3 -c "import sys,json; [print(a['id']) for a in json.load(sys.stdin) if a['name'].endswith('.apk')]" \
+            | while read AID; do
+                curl -sf -X DELETE -H "$AUTH" "$BASE/releases/$RELEASE_ID/assets/$AID"
+              done
+
           curl -sf -X POST \
-            "$GITEA_API/repos/$REPO/releases/${{ steps.release.outputs.release_id }}/assets?name=$APK" \
+            -H "$AUTH" \
-            -H "Authorization: token ${{ secrets.CI_TOKEN }}" \
+            -F "attachment=@${{ env.APK_OUT }};type=application/vnd.android.package-archive" \
-            -H "Content-Type: application/octet-stream" \
+            "$BASE/releases/$RELEASE_ID/assets"
-            --data-binary @"$APK"

.gitea/workflows/builder-image.yml

@@ -0,0 +1,41 @@
+name: Build Android Builder Image
+
+on:
+  push:
+    branches: [master]
+    paths:
+      - 'docker/android-builder.Dockerfile'
+      - '.gitea/workflows/builder-image.yml'
+
+env:
+  IMAGE: git.aleshym.co/funman300/android-builder
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Log in to Gitea registry
+        uses: docker/login-action@v3
+        with:
+          registry: git.aleshym.co
+          username: ${{ gitea.actor }}
+          password: ${{ secrets.CI_TOKEN }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver-opts: network=host
+
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: docker/android-builder.Dockerfile
+          push: true
+          tags: ${{ env.IMAGE }}:latest
+          cache-from: type=registry,ref=${{ env.IMAGE }}:buildcache
+          cache-to: type=registry,ref=${{ env.IMAGE }}:buildcache,mode=max

.gitea/workflows/docker-build.yml

@@ -3,11 +3,13 @@ name: Build and Deploy
 on:
   push:
     branches: [master]
-    # Only run when server code changes, not when CI itself updates deploy/.
+    paths:
-    paths-ignore:
+      - 'solitaire_server/**'
-      - 'deploy/**'
+      - 'solitaire_sync/**'
-      - 'argocd/**'
+      - 'solitaire_core/**'
-      - '**.md'
+      - 'Cargo.toml'
+      - 'Cargo.lock'
+      - '.gitea/workflows/docker-build.yml'
 
 env:
   REGISTRY: git.aleshym.co
@@ -55,7 +57,7 @@ jobs:
 
       - name: Install kustomize
         run: |
-          curl -sL "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash
+          curl -sL https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv5.4.3/kustomize_v5.4.3_linux_amd64.tar.gz | tar xz
           sudo mv kustomize /usr/local/bin/kustomize
 
       - name: Pin image tag in deploy manifests
@@ -68,6 +70,9 @@ jobs:
           git config user.email "ci@gitea.local"
           git config user.name "Gitea CI"
           git add deploy/kustomization.yaml
-          git commit -m "chore(deploy): bump image to ${{ steps.meta.outputs.sha }} [skip ci]" || true
+          git diff --cached --quiet && exit 0  # nothing to commit — skip push
-          git pull --rebase origin master
+          git commit -m "chore(deploy): bump image to ${{ steps.meta.outputs.sha }} [skip ci]"
-          git push
+          for i in 1 2 3; do
+            git pull --rebase origin master && git push && break
+            sleep 5
+          done

.sqlx/query-06c945e50567c6801f1346d436cdc86a82a4e13dd45d8286295ba37cdbdc045e.json

@@ -0,0 +1,20 @@
+{
+  "db_name": "SQLite",
+  "query": "SELECT username FROM users WHERE id = ?",
+  "describe": {
+    "columns": [
+      {
+        "name": "username",
+        "ordinal": 0,
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "06c945e50567c6801f1346d436cdc86a82a4e13dd45d8286295ba37cdbdc045e"
+}

.sqlx/query-15d08e02b102147bc74848ec3692b99edbf4c33078191f0132991ee94d4507b1.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "UPDATE users SET avatar_url = ? WHERE id = ?",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "15d08e02b102147bc74848ec3692b99edbf4c33078191f0132991ee94d4507b1"
+}

.sqlx/query-f23630e78ae88e72d7930184f7cd8fc67e71f3930609f1cf14061d35d6de8ec3.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "INSERT OR IGNORE INTO analytics_events\n               (id, user_id, session_id, event_type, payload, client_time, received_at)\n               VALUES (?, ?, ?, ?, ?, ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 7
-    },
-    "nullable": []
-  },
-  "hash": "f23630e78ae88e72d7930184f7cd8fc67e71f3930609f1cf14061d35d6de8ec3"
-}

.sqlx/query-fae33e7159b43c756131b1545360dcb0250988b43550881e3f0a336d9516dd45.json

@@ -0,0 +1,26 @@
+{
+  "db_name": "SQLite",
+  "query": "SELECT username, avatar_url FROM users WHERE id = ?",
+  "describe": {
+    "columns": [
+      {
+        "name": "username",
+        "ordinal": 0,
+        "type_info": "Text"
+      },
+      {
+        "name": "avatar_url",
+        "ordinal": 1,
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      true
+    ]
+  },
+  "hash": "fae33e7159b43c756131b1545360dcb0250988b43550881e3f0a336d9516dd45"
+}

ARCHITECTURE.md

@@ -58,7 +58,7 @@ Pure-core, no-panics-in-game-logic, and UI-first-interaction constraints are enf
 ## 2. Workspace Structure
 
 ```
-solitaire_quest/
+ferrous_solitaire/
 │
 ├── Cargo.toml                  # Workspace manifest
 ├── .env.example                # Server environment variable template
@@ -366,12 +366,12 @@ Minimum window: 800×600. At this size cards are small but usable.
 
 ### Local Storage
 
-All files stored under `dirs::data_dir() / "solitaire_quest"/`:
+All files stored under `dirs::data_dir() / "ferrous_solitaire"/`:
 
 ```
-~/.local/share/solitaire_quest/   (Linux)
+~/.local/share/ferrous_solitaire/   (Linux)
-~/Library/Application Support/solitaire_quest/   (macOS)
+~/Library/Application Support/ferrous_solitaire/   (macOS)
-%APPDATA%\solitaire_quest\   (Windows)
+%APPDATA%\ferrous_solitaire\   (Windows)
 │
 ├── stats.json          # StatsSnapshot
 ├── progress.json       # PlayerProgress (XP, level, unlocks, daily challenge)
@@ -426,7 +426,7 @@ pub enum SyncBackend {
         url: String,
         username: String,
         // JWT access + refresh tokens stored in OS keychain
-        // key: "solitaire_quest_server_{username}"
+        // key: "ferrous_solitaire_server_{username}"
     },
 }
 ```
@@ -980,8 +980,8 @@ Add `--features bevy/dynamic_linking` during development to dramatically reduce
 ### Docker Compose (Recommended)
 
 ```bash
-git clone https://github.com/yourname/solitaire_quest
+git clone https://github.com/yourname/ferrous_solitaire
-cd solitaire_quest
+cd ferrous_solitaire
 cp .env.example .env
 # Edit .env — set JWT_SECRET and SERVER_PORT
 docker compose up -d

CHANGELOG.md

@@ -6,6 +6,84 @@ project follows [Semantic Versioning](https://semver.org/).
 
 ## [Unreleased]
 
+## [0.33.0] — 2026-05-16
+
+### Fixed
+
+- **Face-down cards render as tiny red squares (startup ordering bug)**. The
+  `load_initial_theme` system fell back to `"dark"` when `SettingsResource` was
+  not yet available at `Startup`, which happens on every fresh run before the
+  settings file is read. The dark theme's near-black card back (#151515) renders
+  as fully-off pixels on AMOLED screens, leaving only a 24×32 px red badge
+  visible. Changed the fallback to `"classic"` so startup behaviour matches the
+  `default_theme_id()` set in v0.31.0. Cascade-collapse and top-row legibility
+  issues were visual consequences of the same invisible-card-back problem, not
+  separate layout bugs.
+
+## [0.32.0] — 2026-05-16
+
+### Fixed
+
+- **Stock-count badge overlaps waste pile on Android** (Bug 1). The badge was
+  centred 12 px inward from the stock pile's right edge, but its half-width of
+  17 px pushed it 5 px past the edge. On Android (`H_GAP_DIVISOR = 32`) the
+  inter-pile gap is only ~4 px, so the badge's top-right corner covered the
+  left edge of the adjacent waste card at `Z_STOCK_BADGE = 30` (above the
+  card's Z ≈ 1). Fixed by moving the inset to 20 px so the badge right edge
+  sits 3 px inside the stock card on every device.
+- **Oversized grey header bar** (Bug 2). The top HUD band was a full-width
+  `Node` with an opaque dark-grey `BackgroundColor` sized to `HUD_BAND_HEIGHT`
+  (64 px desktop / 80 px Android). Typical gameplay only shows one tier of
+  score text (~30 px), leaving a large empty grey block. Removed the
+  `BackgroundColor` from the band entity; the green felt now shows through and
+  only the score text and avatar button are visible in the header area.
+
+## [0.31.0] — 2026-05-16
+
+### Fixed
+
+- **Face-down cards rendered as solid red squares on AMOLED phones** (Bug 1).
+  The dark theme's card back (`back.svg`) uses a near-black background
+  (`#151515`) which AMOLED screens render as fully-off pixels, leaving only a
+  tiny `#a54242` red badge visible — exactly what was reported. Fixed by
+  changing the fresh-install default theme from "dark" to "classic" (white
+  background with navy diamond pattern, clearly readable on all display types).
+  Also corrected stale asset paths in `load_card_images` (`cards/backs/back_N`
+  → `cards/backs/classic/back_N`, `cards/faces/XY` → `cards/faces/classic/XY`)
+  so the PNG fallback loads correctly when the embedded theme hasn't arrived yet.
+
+## [0.30.0] — 2026-05-16
+
+### Changed
+
+- **Tableau card spacing tightened.** Face-up card fan reduced from 25% to 18%
+  of card height; face-down from 20% to 14%. Cards on tableau piles sit closer
+  together while still showing enough of each card to read the pile depth.
+
+## [0.29.0] — 2026-05-16
+
+### Fixed
+
+- **APK versionCode hardcoded to 1** (`AndroidManifest.xml`, `build_android_apk.sh`).
+  Every release shipped with `versionCode="1"` / `versionName="1.0"`, so Android
+  silently refused upgrades and Obtainium permanently showed a false update
+  notification. The CI now derives the version code from the release tag
+  (e.g. v0.29.0 → 2900) and stamps it into the APK via `aapt2 link
+  --version-code / --version-name`.
+- **CI kustomize install flaky** (`.gitea/workflows/docker-build.yml`).
+  The `curl | bash install_kustomize.sh` pattern hit GitHub API rate limits
+  on the shared runner IP, causing a `tar: no such file` failure. Replaced
+  with a direct pinned tarball download (kustomize v5.4.3).
+
+## [0.28.0] — 2026-05-14
+
+### Changed
+
+- **Rename: Solitaire Quest → Ferrous Solitaire.** Android package id changed
+  from `com.solitairequest.app` to `com.ferrousapp.solitaire`; existing installs
+  must be uninstalled first (Android treats the new id as a new app).
+  Data directory renamed from `solitaire_quest/` to `ferrous_solitaire/`.
+
 ### Fixed
 
 - **BUG-3: Multi-modal stacking** (`hud_plugin.rs`). `handle_menu_button`
@@ -1431,7 +1509,7 @@ candidate — the app-icon round — stays open.
 - **Android build target — first working APK** (`fb8b2ac`).
   `cargo apk build -p solitaire_app --target x86_64-linux-android`
   now produces a 54 MB debug-signed APK at
-  `target/debug/apk/solitaire-quest.apk`. Five gating points
+  `target/debug/apk/ferrous-solitaire.apk`. Five gating points
   resolved end-to-end:
   - **`solitaire_app` split into bin + lib.** cargo-apk needs a
     `cdylib` to bundle as `libmain.so`; pure-bin crates panic
@@ -1548,7 +1626,7 @@ candidate — the app-icon round — stays open.
   achievements, replays, game-state, time-attack sessions, user
   themes). New `solitaire_data::platform::data_dir()` shim falls
   through to `dirs::data_dir()` on desktop and returns the per-app
-  sandbox at `/data/data/com.solitairequest.app/files` on Android
+  sandbox at `/data/data/com.ferrousapp.solitaire/files` on Android
   — no JNI needed, since the package id is pinned in
   `[package.metadata.android]`. Six call sites across
   `solitaire_data` plus `solitaire_engine/assets/user_dir.rs`
@@ -1690,7 +1768,7 @@ fully reverted and is not part of this release.
   The test's single-frame `app.update()` was sensitive to
   first-frame `Time::delta_secs()` variance under heavy parallel
   cargo-test load, and to production-disk
-  `~/.local/share/solitaire_quest/game_state.json` state leaking
+  `~/.local/share/ferrous_solitaire/game_state.json` state leaking
   into the test world via `GamePlugin::build`'s load path.
   `test_app` now resets `PendingRestoredGame(None)` after plugin
   build (preventing the dev machine's saved-game state from
@@ -2386,7 +2464,7 @@ the binary shipped with bundled artwork.
   patterns.
 - **Ambient audio loop** wired through the kira mixer.
 - **Arch Linux PKGBUILDs** for the game client and sync server (under
-  the separate `solitaire-quest-pkgbuild` directory).
+  the separate `ferrous-solitaire-pkgbuild` directory).
 - **Workspace README, CI workflow, migration guide.**
 
 ### Changed

CLAUDE.md

@@ -447,7 +447,7 @@ raw `z_index` values — they drift and cause ordering bugs.
 
 ```bash
 cargo apk build --package solitaire_app --lib
-adb install -r target/debug/apk/solitaire-quest.apk
+adb install -r target/debug/apk/ferrous-solitaire.apk
 ```
 
 ## 15.2 Coordinate system reminder

CLAUDE_PROMPT_PACK.md

@@ -1,497 +0,0 @@
-# CLAUDE_PROMPT_PACK.md
-
-version: 1.0
-
----
-
-# 0. GLOBAL INSTRUCTION (prepend to every prompt)
-
-```
-You must follow CLAUDE_SPEC.md strictly.
-
-Rules:
-- Do not expand scope beyond what is defined
-- Do not refactor unrelated code
-- Do not introduce new dependencies to solitaire_core or solitaire_sync without confirmation
-- Prefer minimal, surgical changes
-- Use existing patterns in the codebase
-- Return minimal diffs or changed functions only
-
-Before writing code:
-1. List relevant constraints from CLAUDE_SPEC.md
-2. Identify risks
-3. Then implement
-```
-
----
-
-# 1. FEATURE IMPLEMENTATION
-
-```
-# TASK: Feature Implementation
-
-feature: "<name>"
-
-goal:
-"<clear outcome>"
-
-scope:
-crates: []
-systems: []
-files: []
-
-non_goals:
-- ""
-
-constraints:
-- must follow CLAUDE_SPEC.md
-- event-driven architecture required
-- no blocking operations
-- no cross-crate leakage
-
-acceptance_criteria:
-- ""
-- ""
-
-edge_cases:
-- ""
-
----
-
-## Required Patterns
-
-Use this pattern for systems:
-<PASTE EXISTING SYSTEM SNIPPET HERE>
-
----
-
-## Output Format
-
-intent:
-plan:
-constraints_used:
-risks:
-
-code_changes:
-(minimal diffs only)
-
-notes:
-```
-
----
-
-# 2. BUGFIX
-
-```
-# TASK: Bug Fix
-
-bug_description:
-"<what is broken>"
-
-expected_behavior:
-"<correct behavior>"
-
-root_cause_hint (optional):
-""
-
-scope:
-crates: []
-files: []
-
-constraints:
-- minimal fix only
-- no refactors unless required
-- must add regression protection if applicable
-
----
-
-## Requirements
-
-1. Identify root cause
-2. Fix it minimally
-3. Preserve all invariants
-4. Do not change unrelated logic
-
----
-
-## Output Format
-
-analysis:
-root_cause:
-fix_strategy:
-
-code_changes:
-(minimal diff)
-
-regression_test (only if high-value):
-
-notes:
-```
-
----
-
-# 3. REFACTOR
-
-```
-# TASK: Refactor
-
-target:
-"<what is being improved>"
-
-goal:
-"<what improves>"
-
-scope:
-crates: []
-files: []
-
-non_goals:
-- no behavior changes
-- no new features
-
-constraints:
-- must preserve behavior exactly
-- must respect crate boundaries
-- must not duplicate logic
-
----
-
-## Refactor Type
-
-- [ ] simplify logic
-- [ ] reduce duplication
-- [ ] improve readability
-- [ ] performance (non-invasive)
-
----
-
-## Output Format
-
-analysis:
-issues_found:
-
-refactor_plan:
-
-code_changes:
-(diff only)
-
-verification:
-- behavior unchanged: yes/no
-- invariants preserved: yes/no
-
-notes:
-```
-
----
-
-# 4. SYSTEM DESIGN (NEW FEATURE)
-
-```
-# TASK: System Design
-
-feature:
-"<name>"
-
-goal:
-"<what problem it solves>"
-
-constraints:
-- must fit existing architecture
-- must follow plugin + event model
-- must not violate crate boundaries
-
----
-
-## Required Output
-
-design:
-
-components:
-- plugins:
-- systems:
-- events:
-- resources:
-
-data_flow:
-(step-by-step)
-
-integration_points:
-- where it connects to existing systems
-
-risks:
-- ""
-
-tradeoffs:
-- ""
-
----
-
-## DO NOT
-
-- write full implementation
-- modify unrelated systems
-```
-
----
-
-# 5. NEW BEVY SYSTEM
-
-```
-# TASK: Add Bevy System
-
-system_name:
-""
-
-trigger:
-(event or condition)
-
-reads:
-[Resources]
-
-writes:
-[Resources]
-
-emits:
-[Events]
-
-constraints:
-- must be event-driven
-- must not directly mutate unrelated state
-- must be single responsibility
-
----
-
-## Output Format
-
-system_signature:
-
-implementation:
-(code only)
-
-notes:
-```
-
----
-
-# 6. CORE LOGIC FUNCTION (solitaire_core)
-
-```
-# TASK: Core Logic Implementation
-
-function:
-"<name>"
-
-goal:
-"<what it does>"
-
-rules:
-- no IO
-- no async
-- no Bevy
-- deterministic
-
-invariants:
-- ""
-- ""
-
-errors:
-- ""
-
----
-
-## Output Format
-
-constraints_checked:
-
-implementation:
-(code only)
-
-edge_case_handling:
-
-notes:
-```
-
----
-
-# 7. SYNC / MERGE LOGIC
-
-```
-# TASK: Sync Logic
-
-goal:
-"<what is being merged or synced>"
-
-constraints:
-- must be deterministic
-- must be idempotent
-- must be lossless
-- must not delete data
-
-rules:
-- counters → max
-- times → min
-- collections → union
-
----
-
-## Output Format
-
-analysis:
-
-merge_logic:
-
-code_changes:
-
-invariants_verified:
-- deterministic
-- idempotent
-- lossless
-
-notes:
-```
-
----
-
-# 8. PERFORMANCE OPTIMIZATION
-
-```
-# TASK: Optimization
-
-target:
-"<what is slow>"
-
-constraints:
-- no behavior change
-- no architecture change
-- minimal code changes
-
----
-
-## Output Format
-
-analysis:
-bottleneck:
-
-optimization_strategy:
-
-code_changes:
-
-impact_estimate:
-
-notes:
-```
-
----
-
-# 9. TEST GENERATION (STRICT MODE)
-
-```
-# TASK: Test Generation
-
-target:
-"<function/system>"
-
-reason:
-- bugfix | complex logic | invariant protection
-
-constraints:
-- no redundant tests
-- must test real behavior
-- must fail if logic breaks
-
----
-
-## Output Format
-
-test_cases:
-- ""
-
-test_code:
-
-notes:
-```
-
----
-
-# 10. DEBUGGING / INVESTIGATION
-
-```
-# TASK: Debug
-
-problem:
-"<symptom>"
-
-context:
-"<relevant code or system>"
-
----
-
-## Required Steps
-
-1. List possible causes
-2. Narrow down most likely
-3. Suggest verification steps
-4. Provide minimal fix
-
----
-
-## Output Format
-
-hypotheses:
-
-most_likely:
-
-verification_steps:
-
-fix:
-
-notes:
-```
-
----
-
-# 11. HARD CONSTRAINT OVERRIDE (RARE)
-
-```
-# TASK: Exception Handling
-
-reason:
-"<why constraints must be bent>"
-
-requested_exception:
-"<rule being broken>"
-
-justification:
-"<why unavoidable>"
-
----
-
-## Output Format
-
-analysis:
-
-alternatives_considered:
-
-final_decision:
-
-risk:
-```
-
----
-
-# 12. STOP CONDITIONS (always append)
-
-```
-Stop when:
-- acceptance criteria are met
-- code is minimal and correct
-
-Do NOT:
-- expand scope
-- refactor unrelated code
-- optimize prematurely
-```
-
----
-
-# END

CLAUDE_SPEC.md

@@ -1,296 +0,0 @@
-# CLAUDE_SPEC.md
-
-version: 1.0
-
----
-
-## 0. Global Rules
-
-(Core determinism, panic policy, and event-driven engine constraints live in CLAUDE.md §2.1, §2.3, §3.1. Listed here only when they add information CLAUDE.md doesn't carry.)
-
-rules:
-
-* id: single_source_of_truth
-  description: "GameStateResource is the only mutable game state in runtime"
-
-* id: sync_is_additive
-  description: "Remote data must never destructively overwrite local data"
-
----
-
-## 1. Crate Graph
-
-crates:
-solitaire_core:
-depends_on: [rand, serde, chrono]
-forbidden_deps: [bevy, reqwest, tokio, std::fs]
-
-solitaire_sync:
-depends_on: [serde, serde_json, uuid, chrono]
-role: "shared_types"
-
-solitaire_data:
-depends_on: [solitaire_core, solitaire_sync, reqwest, tokio, keyring]
-role: "persistence_and_sync"
-
-solitaire_engine:
-depends_on: [bevy, kira, solitaire_core, solitaire_data]
-role: "runtime_engine"
-
-solitaire_server:
-depends_on: [solitaire_sync, axum, sqlx, jsonwebtoken]
-role: "backend"
-
-solitaire_wasm:
-depends_on: [solitaire_core, wasm-bindgen, serde-wasm-bindgen]
-role: "wasm_replay_player"
-
-solitaire_app:
-depends_on: [solitaire_engine]
-role: "entrypoint"
-
----
-
-## 2. Data Ownership
-
-ownership:
-GameState:
-owner: solitaire_core
-mutable_in: solitaire_engine
-access_pattern: "via GameStateResource only"
-
-StatsSnapshot:
-owner: solitaire_data
-
-PlayerProgress:
-owner: solitaire_data
-
-AchievementRecord:
-owner: solitaire_data
-
-SyncPayload:
-owner: solitaire_sync
-
----
-
-## 3. State Transitions
-
-state_machine:
-GameState:
-transitions:
-- action: move_cards
-returns: Result<GameState, MoveError>
-
-```
-  - action: draw
-    returns: Result<GameState, MoveError>
-
-  - action: undo
-    returns: Result<GameState, MoveError>
-
-invariants:
-  - "52 cards always exist"
-  - "no duplicate card IDs"
-  - "all cards belong to exactly one pile"
-```
-
----
-
-## 4. Event System
-
-events:
-
-input:
-- MoveRequestEvent
-- DrawRequestEvent
-- UndoRequestEvent
-- NewGameRequestEvent
-
-state:
-- StateChangedEvent
-- GameWonEvent
-
-meta:
-- AchievementUnlockedEvent
-- SyncCompleteEvent
-
-rules:
-
-* "Input events trigger core logic"
-* "Core logic emits state events"
-* "UI reacts to state events only"
-
----
-
-## 5. Sync Contract
-
-sync:
-
-provider_trait:
-methods:
-- pull() -> SyncPayload
-- push(payload) -> SyncResponse
-
-guarantees:
-- "non-blocking during gameplay"
-- "blocking allowed on exit only"
-
-merge:
-rules:
-counters: "max"
-best_times: "min"
-collections: "union"
-achievements: "never removed"
-
-```
-properties:
-  - deterministic
-  - idempotent
-  - lossless
-```
-
----
-
-## 6. Persistence
-
-storage:
-
-format: json
-
-files:
-- stats.json
-- progress.json
-- achievements.json
-- settings.json
-- game_state.json
-
-guarantees:
-- atomic_write: true
-- crash_safe: true
-
----
-
-## 7. Engine Rules
-
-engine:
-
-mutation_rules:
-- "Only GameLogicSystem mutates GameState"
-- "UI systems are read-only"
-
-threading:
-- "sync runs on AsyncComputeTaskPool"
-- "main thread must never block"
-
-plugins:
-pattern: "feature_isolation"
-communication: "events and resources"
-
----
-
-## 8. Server Contract
-
-server:
-
-auth:
-method: jwt
-access_expiry: 24h
-refresh_expiry: 30d
-
-endpoints:
-- POST /api/auth/register
-- POST /api/auth/login
-- GET /api/sync/pull
-- POST /api/sync/push
-
-limits:
-payload_max: 1MB
-rate_limit: "10 req/min auth routes"
-
----
-
-## 9. Achievement System
-
-achievements:
-
-definition_location: solitaire_core
-state_location: solitaire_data
-
-types:
-- condition_based
-- event_driven
-
-rule:
-- "achievements cannot be revoked"
-
----
-
-## 10. Testing Rules
-
-testing:
-
-philosophy:
-- "test real failures"
-- "avoid redundant tests"
-
-required_coverage:
-solitaire_core:
-- move_validation
-- undo_integrity
-- win_detection
-
-```
-solitaire_sync:
-  - merge_correctness
-  - idempotency
-```
-
----
-
-## 11. Prohibited Patterns
-
-(See CLAUDE.md §11 for the canonical forbidden-patterns list.)
-
----
-
-## 12. Extension Points
-
-extensibility:
-
-sync_backends:
-pattern: "implement SyncProvider"
-
-game_modes:
-location: solitaire_core::GameMode
-
-plugins:
-rule: "new feature = new plugin"
-
----
-
-## 13. Validation Checklist (for Claude)
-
-validation:
-
-* check: "crate dependency rules respected"
-* check: "no panics in core"
-* check: "events used for cross-system communication"
-* check: "GameState mutations centralized"
-* check: "merge function properties preserved"
-* check: "no blocking operations in main loop"
-
----
-
-## 14. Mental Model
-
-model:
-
-layers:
-- core
-- engine
-- data
-- server
-
-flow:
-- input -> engine -> core -> engine -> ui
-- data <-> sync <-> server

CLAUDE_WORKFLOW.md

@@ -1,335 +0,0 @@
-# CLAUDE_WORKFLOW.md
-
-version: 1.0
-
----
-
-## 0. Overview
-
-This workflow defines a **two-agent system**:
-
-* **Builder Agent** → writes and modifies code
-* **Guardian Agent** → enforces architecture + rejects invalid changes
-
-No code is considered valid unless it passes Guardian validation.
-
----
-
-## 1. Agent Roles
-
-### 1.1 Builder Agent
-
-role: "code_generation"
-
-responsibilities:
-
-* implement features
-* refactor code
-* generate tests (only when justified)
-* follow CLAUDE_SPEC.md
-
-constraints:
-
-* cannot bypass validation
-* must declare intent before writing code
-
-output_contract:
-must_produce:
-- change_summary
-- files_modified
-- reasoning (short)
-- code_diff
-
----
-
-### 1.2 Guardian Agent
-
-role: "architecture_enforcement"
-
-responsibilities:
-
-* validate against CLAUDE_SPEC.md
-* detect violations
-* reject or approve changes
-* suggest minimal fixes (not full rewrites)
-
-constraints:
-
-* no feature implementation
-* no large rewrites
-* must be deterministic
-
-output_contract:
-must_produce:
-- status: APPROVED | REJECTED
-- violations[]
-- required_fixes[]
-- optional_improvements[]
-
----
-
-## 2. Workflow Pipeline
-
-```text
-User Request
-    ↓
-Builder Agent (proposal + code)
-    ↓
-Guardian Agent (validation)
-    ↓
-IF approved → commit
-IF rejected → feedback → Builder retry
-```
-
----
-
-## 3. Builder Protocol
-
-### Step 1 — Intent Declaration
-
-Builder MUST start with:
-
-```yaml
-intent:
-  feature: "<name>"
-  crates_touched: []
-  systems_affected: []
-  risk_level: low|medium|high
-```
-
----
-
-### Step 2 — Plan
-
-```yaml
-plan:
-  - step: "..."
-  - step: "..."
-```
-
----
-
-### Step 3 — Implementation
-
-* Only modify declared crates
-* Follow ownership rules
-* Use events for cross-system communication
-
----
-
-### Step 4 — Output
-
-```yaml
-change_summary: "..."
-
-files_modified:
-  - path: ...
-    change: "..."
-
-violations_self_check:
-  - none | list
-
-notes: "short reasoning"
-```
-
----
-
-## 4. Guardian Protocol
-
-### Step 1 — Spec Validation
-
-Check against:
-
-* crate boundaries
-* mutation rules
-* event system usage
-* sync guarantees
-* forbidden patterns
-
----
-
-### Step 2 — Invariant Validation
-
-Must verify:
-
-* GameState invariants preserved
-* no new panic paths
-* no blocking calls in engine
-* merge properties unchanged
-
----
-
-### Step 3 — Output Decision
-
-#### APPROVED
-
-```yaml
-status: APPROVED
-
-notes:
-  - "no violations"
-```
-
----
-
-#### REJECTED
-
-```yaml
-status: REJECTED
-
-violations:
-  - id: core_purity_violation
-    file: "solitaire_core/src/..."
-    reason: "uses std::fs"
-
-required_fixes:
-  - "move IO to solitaire_data"
-
-optional_improvements:
-  - "simplify event naming"
-```
-
----
-
-## 5. Enforcement Rules
-
-### Hard Fail (automatic rejection)
-
-* core crate uses IO / Bevy / network
-* GameState mutated outside GameLogicSystem
-* blocking async on main thread
-* duplicate logic across crates
-* merge function altered incorrectly
-
----
-
-### Soft Fail (allowed but flagged)
-
-* unnecessary complexity
-* redundant tests
-* minor architectural drift
-
----
-
-## 6. Iteration Loop
-
-Max attempts per task: **3**
-
-```text
-Attempt 1 → Reject → Fix
-Attempt 2 → Reject → Fix
-Attempt 3 → Final decision
-```
-
-If still failing:
-→ escalate to user
-
----
-
-## 7. Diff Strategy
-
-Builder MUST produce:
-
-* minimal diffs
-* no unrelated refactors
-* no formatting-only changes
-
----
-
-## 8. Test Strategy Integration
-
-Builder rules:
-
-* only add tests if:
-
-  * fixing a bug
-  * protecting complex logic
-  * validating invariants
-
-Guardian rejects:
-
-* redundant tests
-* no-op tests
-
----
-
-## 9. Optional Extensions
-
-### 9.1 Third Agent (Optimizer)
-
-role: performance + cleanup
-
-runs AFTER approval:
-
-* reduce allocations
-* simplify logic
-* improve ECS scheduling
-
----
-
-### 9.2 CI Integration
-
-Pipeline:
-
-```text
-Builder → Guardian → cargo check → clippy → tests
-```
-
-Guardian runs BEFORE compilation to catch structural issues early.
-
----
-
-## 10. Example Interaction
-
-### Builder
-
-```yaml
-intent:
-  feature: "undo stack limit fix"
-  crates_touched: [solitaire_core]
-  risk_level: low
-```
-
-```yaml
-change_summary: "limit undo stack to 64 entries"
-
-files_modified:
-  - solitaire_core/src/game_state.rs
-
-notes: "prevents unbounded memory growth"
-```
-
----
-
-### Guardian
-
-```yaml
-status: APPROVED
-
-notes:
-  - "respects core constraints"
-  - "no invariant violations"
-```
-
----
-
-## 11. Mental Model
-
-* Builder = **creative**
-* Guardian = **strict**
-
-Builder explores
-Guardian enforces
-
-Neither replaces the other.
-
----
-
-## 12. Success Criteria
-
-System is working if:
-
-* architectural violations go to ~0
-* code stays consistent across features
-* refactors become safe
-* complexity grows sub-linearly

Cargo.lock

@@ -4034,9 +4034,14 @@ checksum = "85ab80394333c02fe689eaf900ab500fbd0c2213da414687ebf995a65d5a6104"
 dependencies = [
  "bytemuck",
  "byteorder-lite",
+ "color_quant",
+ "gif",
+ "image-webp",
  "moxcms",
  "num-traits",
  "png 0.18.1",
+ "zune-core",
+ "zune-jpeg",
 ]
 
 [[package]]
@@ -7013,8 +7018,10 @@ dependencies = [
  "bevy",
  "chrono",
  "dirs",
+ "image",
  "jni 0.21.1",
  "kira",
+ "reqwest",
  "resvg",
  "ron",
  "serde",

Cargo.toml

@@ -110,6 +110,9 @@ ron = "0.12"
 # only `deflate` is needed because the importer rejects other
 # compression methods anyway (see Phase 7 spec).
 zip = { version = "8.6", default-features = false, features = ["deflate"] }
+# Image decoding for avatar bytes received from the server.
+# Features mirror what Bevy already enables via bevy_image.
+image = { version = "0.25", default-features = false, features = ["png", "jpeg", "webp", "gif"] }
 
 # Importer-only test dependency: tests build zip archives in a
 # scratch directory so they don't pollute the real user themes path

README.md

@@ -31,6 +31,23 @@ optional self-hosted sync so your stats follow you across machines.
 - **Color-blind mode** — blue tint on red-suit cards alongside the suit
   glyph
 
+## Android Install
+
+### Obtainium (recommended — automatic updates)
+
+1. Install [Obtainium](https://github.com/ImranR98/Obtainium/releases) on your device
+2. Tap the badge below on your Android device — the source type is pre-configured, no manual selection needed:
+
+   [<img src="https://raw.githubusercontent.com/ImranR98/Obtainium/main/assets/graphics/badge_obtainium.png" alt="Get it on Obtainium" height="40">](https://apps.obtainium.imranr.dev/redirect?r=obtainium://app/%7B%22id%22%3A%22com.ferrousapp.solitaire%22%2C%22url%22%3A%22https%3A//git.aleshym.co/funman300/Ferrous-Solitaire%22%2C%22author%22%3A%22funman300%22%2C%22name%22%3A%22Ferrous%20Solitaire%22%2C%22installedVersion%22%3Anull%2C%22latestVersion%22%3Anull%2C%22apkUrls%22%3A%22%5B%5D%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%7D%22%2C%22lastUpdateCheck%22%3Anull%2C%22pinned%22%3Afalse%2C%22categories%22%3A%5B%5D%2C%22releaseDate%22%3Anull%2C%22changeLog%22%3Anull%2C%22overrideSource%22%3A%22Codeberg%22%2C%22allowIdChange%22%3Afalse%2C%22otherAssetUrls%22%3A%22%5B%5D%22%7D)
+
+3. Tap **Install** to download the current release — Obtainium will notify you when updates are available.
+
+### Direct APK
+
+Download the latest `ferrous-solitaire.apk` from the
+[Releases](https://git.aleshym.co/funman300/Ferrous-Solitaire/releases) page,
+enable **Install from unknown sources** in your device settings, and open the file.
+
 ## Building
 
 **Prerequisites**

SESSION_HANDOFF.md

@@ -1,177 +1,130 @@
 # Ferrous Solitaire — Session Handoff
 
-**Last updated:** 2026-05-12 — Leaderboard display name shipped (`03be4fc`). All commits pushed to origin.
+**Last updated:** 2026-05-18 — Three leaderboard bugs fixed, tagged v0.35.1. All commits on origin/master.
-
-Phase 8 closes the self-hosted-server connection arc end-to-end: login/register
-modal, re-auth on token expiry, account deletion flow, server deployment
-artifacts (Dockerfile + docker-compose), replay upload on win, web replay
-player (WASM + HTML/CSS/JS served by the server), leaderboard opt-in/out,
-and full server integration tests.
 
 ---
 
 ## Current state
 
-- **HEAD locally:** `03be4fc` (feat: leaderboard custom display name).
+- **HEAD on origin/master:** `8f86d66` (fix: three leaderboard bugs)
-- **HEAD on origin:** `03be4fc` (fully pushed).
+- **Latest tag:** `v0.35.1`
-- **Working tree:** clean (only `solitaire-release.jks.bak2` untracked — intentional).
+- **Working tree:** clean
-- **Build:** `cargo clippy --workspace --all-targets -- -D warnings` clean.
+- **Build:** `cargo clippy --workspace -- -D warnings` clean
-- **Tests:** **1300+ passing / 0 failing** across the workspace.
+- **Tests:** 1277 passing / 0 failing across the workspace
-- **Tags on origin:** `v0.9.0` through `v0.22.0`.
 
 ---
 
-## What shipped in Phase 8 (432061c – bd388fe)
+## What shipped since the last handoff (v0.23.0 → v0.35.1)
+
+### v0.34.0 — Android polish + code-quality sweep (2026-05-16/17)
 
 | Commit | Summary |
 |--------|---------|
-| `432061c` | Sync setup modal (login/register/connect/disconnect) |
+| `9623bde` | Wire FiraMono to Android corner label; CardImageSet load tests |
-| `6ce5564` | Re-auth on expired session + server deployment artifacts |
+| `980312c` | Fix wrong bottom-right suit symbol on JS/QS/KS card assets |
-| `272d31f` | Account deletion flow + `handle_sync_buttons` refactor |
+| `04e99a8` | Correct Android waste fan overlap and resume layout desync |
-| `bd388fe` | CHANGELOG v0.23.0 documentation |
+| `3bb3ddb` | Eliminate panics, fix dismiss hit-test scope, guard home respawn |
+| `f8f1f26` | Adaptive drop zones, touch event correctness, modal lifecycle guards |
+| `1eb4043` | Auth-guard avatar serving; atomic write; user_id assertion in merge |
+| `69c6e88` | Deterministic pile serialization, undo skip, url-encode bytes, merge_at |
+| `aa7b0f6` | Gate frame-hot ECS systems on resource changes (perf) |
+| `6727126` | Consolidate APP_DIR_NAME; add `#[must_use]` on pure fns |
+| `a4dfb0c` | Differentiate leaderboard opt-in vs opt-out error toasts (M-12) |
+| `7fc98f8` | WASM: state() and step() return Result, errors throw JS exceptions (CR-6) |
+| `ffed6b2` | Share Tokio runtime across all network tasks (M-16) |
+| `fa84152` | Correct Android help hint label `→` to `!` (M-17) |
+| `18d7937` | Derive Copy for DrawMode; drop redundant .clone() calls (M-18) |
+| `132fea9` | Use saturating_add for move_count increments (M-19) |
+| `0ecc1a9` | Add missing derives to AchievementContext (M-20) |
+| `2301cc6` | Align android_keystore temp extension with cleanup glob (M-21) |
+| `2e52f54` | Enforce 32-char display_name limit at sync client boundary (M-22) |
+| `c8878d6` | Fix stale FOCUS_RING colour comment (M-23) |
+| `4aafc0a` | Name HUD popover Z-layers; replace raw Z arithmetic (M-24) |
 
-Also shipped (pre-Phase 8 but post-v0.22.0, already in CHANGELOG):
+### v0.35.0 — Accessibility + sync reliability (2026-05-18)
-- `solitaire_wasm` crate: WASM ReplayPlayer bindings for browser-side replay playback
+
-- Server replay API: `POST /api/replays`, `GET /api/replays/recent`, `GET /api/replays/:id`
+| Commit | Summary |
-- Server web UI: `/replays/:id` HTML route + `ServeDir /web` static assets
+|--------|---------|
-- DB migration 002: `replays` table + two indexes
+| `eb6c93f` | Silence B0004 by adding Transform to ModalScrim |
-- Full server integration tests for replay endpoints
+| `6f5cebd` | Fire WarningToastEvent on sync pull failure (was InfoToastEvent) |
-- `push_replay` in `sync_plugin` (uploads on win, writes share URL into replay history)
+| `87aec5b` | Gate all decorative motion animations under `reduce_motion_mode` |
-- Stats panel "Copy Share Link" button reads `share_url` from replay history
+
+`reduce_motion_mode` now gates: score pulse, score floater, streak flourish
+(hud_plugin), card-shake on rejected move, foundation completion flourish
+(feedback_anim_plugin). Pattern: gate at the trigger/start system, never at
+the tick system — if the component isn't inserted, the tick path never runs.
+
+### v0.35.1 — Leaderboard bug fixes (2026-05-18)
+
+| Commit | Summary |
+|--------|---------|
+| `8f86d66` | Fix three leaderboard bugs: wrong toast type, stale label, name not synced |
+
+Three bugs fixed:
+
+1. **Wrong toast type on error** — `poll_opt_in_task` / `poll_opt_out_task` error
+   branches now fire `WarningToastEvent` instead of `InfoToastEvent`.
+
+2. **Display name not pushed to server on change** — `Settings` gains
+   `leaderboard_opted_in: bool` (serde-defaulted `false`). Set `true`/`false` when
+   opt-in/out tasks succeed and persisted to `settings.json`. `handle_display_name_confirm`
+   now spawns an `opt_in_leaderboard` task when already opted in — the server's upsert
+   endpoint updates only `display_name` without re-opting-in.
+
+3. **"Public name" label stale after name change** — `LeaderboardPublicNameText` marker
+   component added to the label node. `update_leaderboard_public_name_label` system
+   rewrites the text each frame the panel is open; O(0) cost when panel is closed.
+
+5 new regression tests cover all three bugs.
 
 ---
 
-## Open punch list (ordered by priority)
+## Open punch list
 
-### 1. Documentation debt (no code)
+### 1. CHANGELOG documentation debt
-- [x] CHANGELOG [Unreleased] → v0.23.0 — done this session
-- [x] ARCHITECTURE.md update — all 8 gaps closed, bumped to v1.3
-- [x] SESSION_HANDOFF.md update — this file
 
-### 2. Leaderboard wiring gaps
+CHANGELOG.md currently ends at v0.33.0. Entries for v0.34.0, v0.35.0, and v0.35.1
-- [x] **Best-score auto-post.** Done (`303c78a`): `update_leaderboard_if_opted_in`
+are missing. Low priority (git log is authoritative) but worth closing before the
-  called from both first-push and merge paths in `sync.rs`; uses SQLite `MIN`/`MAX`
+next release.
-  in the UPDATE so scores never regress on stale data.
-- [x] **Display name = username.** Done (`03be4fc`): `leaderboard_display_name:
-  Option<String>` added to `Settings`; editor modal in leaderboard panel; persists
-  to `settings.json`; `handle_opt_in_button` prefers custom name over username.
 
-### 3. Security hardening
+### 2. Android APK launch verification (Option A)
-- [x] **Refresh token rotation.** Done (`b129664`): `refresh_tokens` table
-  (migration 003); jti embedded in JWT; rotate-on-use pattern; 3 integration
-  tests.
-- [x] **Sync endpoint rate limiting.** Done (`6e6f3ef`): `UserIdKeyExtractor`
-  decodes JWT for per-user identity; falls back to IP; burst 10 / 6 min
-  steady-state; integration test passes.
 
-### 4. Android validation
+Physical device test: install the latest APK on a real Android device (not AVD),
-- [x] **Android Keystore functional test.** Done (2026-05-11, Pixel 7 AVD,
+confirm:
-  Android 14): `load_access_token()` exercised via `start_pull`; logcat confirmed
+- App launches without crash
-  `NotFound` returned cleanly — no JNI panic. See `docs/android/PLAYABILITY_TODO.md` P4.
+- Safe area insets arrive and shift HUD correctly after ~3 frames
-- [x] **JNI clipboard functional test.** Done (2026-05-11): temporary `KEYCODE_C`
+- All modal Done buttons are above the gesture bar
-  hook confirmed `ClipboardManager.setPrimaryClip()` succeeds on Android 14.
+- Drag-and-drop works on all pile types
-  Hook reverted. Production path requires Interaction::Pressed + non-null `share_url`.
+- Leaderboard panel opens and the "Public name" label updates correctly after
-  Note: `adb shell input tap` doesn't deliver touch events on headless AVD (documented).
+  using "Set Name"
-- [x] **`cargo apk build --lib` noisy stderr** — upstream cargo-apk bug; `--lib`
-  is the canonical command (CLAUDE.md §15.1, docs/ANDROID.md). No in-repo fix possible.
 
-### 5. Feature completeness
+This has never been gated in CI. AVD `adb shell input tap` doesn't deliver real
-- [x] **Theme importer UI.** Done (`613bbf8`): "Scan for new themes" button in
+touch events, so physical-device smoke testing is the only gate.
-  Settings Appearance section. Shows import path label, scans user_theme_dir()
-  for .zip archives, fires InfoToastEvent per file, refreshes ThemeRegistry.
-- [x] **`mirror_achievement` removed.** Done (`549a817`): method was a no-op
-  default never overridden and never called; achievements already sync via
-  `SyncPayload` push. Deleted from trait and blanket impl.
-- [x] **WASM build script.** Done (`40d0712`): `build_wasm.sh` at repo root
-  documents `wasm-pack build --target web`, cleans up pkg metadata files,
-  includes dependency guard + install instructions.
-- [x] **Server password reset.** Done (`7514684`): `--reset-password <username>`
-  subcommand reads new password from stdin, bcrypt-hashes it, invalidates all
-  active sessions for the user.
 
-### 5b. Android UX polish (2026-05-12)
+### 3. Matomo analytics wiring
 
-- [x] **UX-1 — Modal Done button in gesture zone.** `apply_safe_area_to_modal_scrims` system
+`Settings` has `analytics_enabled: bool` and `matomo_url: Option<String>` but no
-  added to `SafeAreaInsetsPlugin` (`safe_area.rs`). Pads every `ModalScrim` bottom by
+engine code consumes them — the analytics toggle in Settings is a no-op. If
-  `insets.bottom / scale`. Fires on resource change + `Added<ModalScrim>`. Verified on device.
+analytics are ever needed, the Matomo HTTP Tracking API client needs to be written
-- [x] **UX-5b — Home mode glyph corruption.** Geometric Shapes (U+25xx, absent from FiraMono)
+and wired to `GameStateResource` events.
-  replaced with card suits U+2660–2666 in `home_plugin.rs`. Affects Zen/Challenge/Daily mode
-  selector buttons at level 5+.
-- [x] **UX-7 — Help text wrap.** Android HUD entry shortened to
-  `"Open menu (Stats, Settings, Profile...)"` in `help_plugin.rs` — fits one line.
-- [x] **BUG-3 — Multi-modal stacking.** `handle_menu_button` now checks
-  `scrims: Query<(), With<ModalScrim>>` and guards `spawn_menu_popover` with `scrims.is_empty()`.
-  Verified on device: ≡ tap while Stats open does nothing.
-
-  **Note:** These 4 fixes are implemented and verified but not yet committed.
-
-### 6. Testing gaps
-- [x] **Server 401 → refresh → retry path.** Done (`198df75`): both
-  `jwt_refresh_on_401_succeeds` (pull) and
-  `push_retries_after_401_on_expired_access_token` (push) in
-  `solitaire_data/tests/sync_round_trip.rs`.
-- [x] **WASM winning-replay step-through.** Done (`b4ada2a`): greedy solver
-  searches seeds 1–200 at test time; steps every move through `ReplayPlayer`;
-  asserts `is_won = true` on the final `StateSnapshot`.
 
 ---
 
-## ARCHITECTURE.md gaps (for the update pass)
+## Architectural notes for next session
 
-Items missing from the doc:
+- **Reduce-motion pattern:** always gate in the `start_*` / `detect_*` system
-1. `solitaire_wasm` crate (§2 workspace + §3 responsibilities)
+  (the trigger), not the `tick_*` system. If the component is never inserted, the
-2. Replay API endpoints (§9 API Reference — 3 new routes)
+  tick path never runs. See `hud_plugin.rs::detect_score_change` and
-3. Web replay player route (`/replays/:id` + `ServeDir /web`)
+  `feedback_anim_plugin.rs::start_shake_anim` for the canonical pattern.
-4. `SyncProvider` trait: 6 added methods
-5. Theme system in Bevy plugin table (§5)
-6. `Settings` new fields: `color_blind_mode`, `high_contrast_mode`,
-   `reduce_motion_mode`, `window_geometry`, `selected_card_back`,
-   `selected_background`
-7. DB migration 002 (§7)
-8. Update "Last Updated" date
 
----
+- **Leaderboard server upsert:** `POST /api/leaderboard/opt-in` is idempotent —
+  calling it when already opted in just updates `display_name`. Safe to call from
+  `handle_display_name_confirm` without tracking a separate "needs update" flag.
 
-## Process notes
+- **`Messages<T>` API (Bevy 0.18.1):** write with
+  `resource_mut::<Messages<T>>().write(value)`; read in tests with
+  `msgs.get_cursor()` + `cursor.read(msgs).next()`.
 
-- **Commit attribution:** use `funman300` as git user. Co-author line:
+- **Test input-state pitfall:** `MinimalPlugins` has no input-tick system, so
-  `Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>`.
+  `ButtonInput::just_pressed` state persists across frames unless explicitly cleared
-- **Commit format:** `type(scope): description` per CLAUDE.md §7.
+  with `input.release(key); input.clear()` between updates.
-- **Never commit without:** `cargo test --workspace` passing + clippy clean.
-- **Sub-agents** stage/verify only; orchestrator commits.
-- **`CARD_PLAN.md`** referenced in `theme/` module comments but not present in
-  repo. Clean up references or commit the file.
-- **Token-port pattern** (v0.20.0): when migrating tokens, walk every concrete
-  artifact downstream — PNGs, SVGs, literals, comments. Three "walked past this"
-  follow-ups in v0.21.0 all had this shape.
-
----
-
-## Resume prompt
-
-```
-You are a senior Rust + Bevy developer working on Ferrous Solitaire.
-Working directory: <Rusty_Solitaire clone path>.
-Branch: master. v0.23.0 is the current version (HEAD: 03be4fc). Fully pushed.
-
-READ FIRST (in order):
-  1. SESSION_HANDOFF.md  — this file
-  2. CHANGELOG.md        — [0.23.0] section has full Phase 8 detail
-  3. CLAUDE.md           — unified-4.0 rule set
-  4. ARCHITECTURE.md     — v1.3, fully up to date
-  5. docs/ui-mockups/    — design system + mockup library
-  6. docs/android/       — Android setup + build runbook
-  7. ~/.claude/projects/<this-project>/memory/MEMORY.md
-
-OPEN WORK:
-  Phase 8 punch list is fully closed. All items verified complete.
-  Remaining nuisance: `cargo apk build --lib` noisy stderr (cosmetic, non-blocking).
-
-  4 Android UX fixes are implemented and verified but NOT YET COMMITTED:
-    - BUG-3 (hud_plugin.rs): multi-modal stacking guard
-    - UX-7 (help_plugin.rs): help text wrap on Android
-    - UX-5b (home_plugin.rs): FiraMono glyph corruption in mode selector
-    - UX-1 (safe_area.rs): modal Done button in gesture zone
-
-  Commit those first, then suggest Phase 9 planning.
-```

argocd/application.yaml

@@ -6,7 +6,7 @@ metadata:
 spec:
   project: default
   source:
-    repoURL: https://git.aleshym.co/funman300/Rusty_Solitare.git
+    repoURL: https://git.aleshym.co/funman300/Ferrous-Solitaire.git
     targetRevision: master
     path: deploy
   destination: