diff --git a/.env.example b/.env.example
deleted file mode 100644
index bd16935..0000000
--- a/.env.example
+++ /dev/null
@@ -1,10 +0,0 @@
-# App Configuration
-NODE_ENV=development
-PORT=3000
-
-# API Keys (optional)
-# ANTHROPIC_API_KEY=
-# OPENAI_API_KEY=
-
-# Database (if applicable)
-# DATABASE_URL=sqlite:./data/local.db
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ab51419..335d66c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,55 +5,37 @@ on:
     branches: ["**"]
   pull_request:
 
-jobs:
-  frontend:
-    name: Frontend Checks
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v7
-
-      - name: Setup Node
-        uses: actions/setup-node@v7
-        with:
-          node-version: 22
-          cache: npm
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Run canonical frontend verification
-        run: npm run verify:required:frontend
-
-      - name: Upload frontend QA artifacts
-        if: always()
-        uses: actions/upload-artifact@v7
-        with:
-          name: frontend-qa-artifacts
-          path: artifacts/*.*
-          if-no-files-found: ignore
+permissions:
+  contents: read
 
-  tauri-backend:
-    name: Tauri Backend + Bundle
+jobs:
+  checks:
+    name: Checks and app bundle
     runs-on: macos-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v7
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
 
       - name: Setup Node
-        uses: actions/setup-node@v7
+        uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7
         with:
-          node-version: 22
+          node-version-file: .node-version
           cache: npm
 
+      - name: Setup pinned npm
+        run: npm install --global npm@12.2.0
+
       - name: Setup Rust
-        uses: dtolnay/rust-toolchain@stable
+        uses: dtolnay/rust-toolchain@e2a55d2ffb04f378e9626c28d38b36d230d1e12f # rust 1.98.1
+        with:
+          toolchain: 1.98.1
+          components: rustfmt, clippy
 
       - name: Install dependencies
         run: npm ci
 
-      - name: Run smoke tests
-        run: DESKTOP_PET_STRICT_RUST=1 npm run test:smoke
+      - name: Run checks
+        run: make check
 
-      - name: Run canonical Tauri verification
-        run: DESKTOP_PET_STRICT_RUST=1 npm run verify:required:tauri
+      - name: Build macOS app bundle
+        run: npm run tauri -- build --bundles app
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index a57d7c2..36bbce0 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -7,7 +7,7 @@ on:
     branches: [main]
   workflow_dispatch:
   schedule:
-    - cron: '37 8 * * 1'
+    - cron: "37 8 * * 1"
 
 permissions:
   contents: read
@@ -25,12 +25,12 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v4
+        uses: github/codeql-action/init@24c54180a607b1449ed407dd24f251e4e9147c8d # v4
         with:
           languages: ${{ matrix.language }}
 
       - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@v4
+        uses: github/codeql-action/analyze@24c54180a607b1449ed407dd24f251e4e9147c8d # v4
diff --git a/.github/workflows/git-hygiene.yml b/.github/workflows/git-hygiene.yml
index bca9f80..2656f37 100644
--- a/.github/workflows/git-hygiene.yml
+++ b/.github/workflows/git-hygiene.yml
@@ -12,17 +12,17 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
         with:
           fetch-depth: 0
-      - uses: wagoid/commitlint-github-action@b948419dd99f3fd78a6548d48f94e3df7f6bf3ed
+      - uses: wagoid/commitlint-github-action@b948419dd99f3fd78a6548d48f94e3df7f6bf3ed # v6
 
   pr-title:
     runs-on: ubuntu-latest
     permissions:
       pull-requests: read
     steps:
-      - uses: amannn/action-semantic-pull-request@48f256284bd46cdaab1048c3721360e808335d50
+      - uses: amannn/action-semantic-pull-request@48f256284bd46cdaab1048c3721360e808335d50 # v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -37,7 +37,7 @@ jobs:
       # guard accepts <type>/<slug> and <agent>/<task-slug>, this copy accepted
       # neither, so a branch the local hook blessed failed here. One rule, one
       # place, pinned by the guard's own test suite.
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
       - run: bash scripts/git/guard-branch.sh
 
   secrets:
@@ -45,9 +45,9 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
         with:
           fetch-depth: 0
-      - uses: gitleaks/gitleaks-action@e0c47f4f8be36e29cdc102c57e68cb5cbf0e8d1e
+      - uses: gitleaks/gitleaks-action@e0c47f4f8be36e29cdc102c57e68cb5cbf0e8d1e # v3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/lockfile-rationale.yml b/.github/workflows/lockfile-rationale.yml
index 18409c9..c6bc426 100644
--- a/.github/workflows/lockfile-rationale.yml
+++ b/.github/workflows/lockfile-rationale.yml
@@ -12,10 +12,10 @@ jobs:
       contents: read
       pull-requests: read
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
-      - uses: tj-actions/changed-files@9426d40962ed5378910ee2e21d5f8c6fcbf2dd96
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+      - uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46
         id: changed
-      - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3
+      - uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
         if: contains(steps.changed.outputs.all_changed_files, 'pnpm-lock.yaml') || contains(steps.changed.outputs.all_changed_files, 'package-lock.json') || contains(steps.changed.outputs.all_changed_files, 'yarn.lock')
         with:
           script: |
diff --git a/.github/workflows/perf-enforced.yml b/.github/workflows/perf-enforced.yml
index 9891c5e..7ce1a76 100644
--- a/.github/workflows/perf-enforced.yml
+++ b/.github/workflows/perf-enforced.yml
@@ -14,11 +14,14 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-node@v7
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+      - uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7
         with:
-          node-version: 22
+          node-version-file: .node-version
           cache: npm
+
+      - name: Setup pinned npm
+        run: npm install --global npm@12.2.0
       - run: npm ci
       - run: npm run build
       - run: npm run perf:bundle:gate
@@ -32,11 +35,14 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-node@v7
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+      - uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7
         with:
-          node-version: 22
+          node-version-file: .node-version
           cache: npm
+
+      - name: Setup pinned npm
+        run: npm install --global npm@12.2.0
       - run: npm ci
       - run: npm run perf:build:gate
 
@@ -46,59 +52,23 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
       - run: ASSET_MAX_BYTES=250000 bash scripts/perf/check-assets.sh
 
-  perf-memory:
-    if: ${{ vars.PERF_PROFILE == 'production' }}
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-node@v7
-        with:
-          node-version: 22
-          cache: npm
-      - run: npm ci
-      - run: MEMORY_MAX_DELTA_MB=5 npm run perf:memory
-
   perf-lighthouse:
     if: ${{ vars.PERF_PROFILE == 'production' }}
     runs-on: ubuntu-latest
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-node@v7
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+      - uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7
         with:
-          node-version: 22
+          node-version-file: .node-version
           cache: npm
+
+      - name: Setup pinned npm
+        run: npm install --global npm@12.2.0
       - run: npm ci
       - run: npm run build
       - run: npm run perf:lhci:prod
-
-  perf-api:
-    if: ${{ vars.PERF_PROFILE == 'production' && vars.PERF_BASE_URL != '' }}
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    steps:
-      - uses: actions/checkout@v7
-      - uses: grafana/setup-k6-action@v1
-      - run: k6 run tests/perf/api.k6.js --summary-export=.perf-results/api-summary.json
-        env:
-          BASE_URL: ${{ vars.PERF_BASE_URL }}
-          API_P95_MS: "250"
-          API_P99_MS: "700"
-
-  perf-db:
-    if: ${{ vars.PERF_PROFILE == 'production' && vars.PERF_DATABASE_URL != '' }}
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    steps:
-      - uses: actions/checkout@v7
-      - name: Install PostgreSQL client
-        run: sudo apt-get update && sudo apt-get install -y postgresql-client
-      - run: psql "${{ vars.PERF_DATABASE_URL }}" -f scripts/perf/db/check-pg-stat.sql
diff --git a/.github/workflows/perf-foundation.yml b/.github/workflows/perf-foundation.yml
index 01ab1e5..986d73b 100644
--- a/.github/workflows/perf-foundation.yml
+++ b/.github/workflows/perf-foundation.yml
@@ -11,11 +11,14 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-node@v7
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+      - uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7
         with:
-          node-version: 22
+          node-version-file: .node-version
           cache: npm
+
+      - name: Setup pinned npm
+        run: npm install --global npm@12.2.0
       - run: npm ci
       - run: npm run build
       - run: npm run perf:bundle
@@ -25,11 +28,14 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-node@v7
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+      - uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7
         with:
-          node-version: 22
+          node-version-file: .node-version
           cache: npm
+
+      - name: Setup pinned npm
+        run: npm install --global npm@12.2.0
       - run: npm ci
       - run: npm run perf:build
 
@@ -38,11 +44,14 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-node@v7
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+      - uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7
         with:
-          node-version: 22
+          node-version-file: .node-version
           cache: npm
+
+      - name: Setup pinned npm
+        run: npm install --global npm@12.2.0
       - run: npm ci
       - run: npm run build
       - run: npm run perf:lhci
@@ -52,41 +61,5 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
       - run: bash scripts/perf/check-assets.sh
-
-  perf-memory:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-node@v7
-        with:
-          node-version: 22
-          cache: npm
-      - run: npm ci
-      - run: npm run perf:memory
-
-  perf-api:
-    if: ${{ vars.PERF_BASE_URL != '' }}
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    steps:
-      - uses: actions/checkout@v7
-      - uses: grafana/setup-k6-action@v1
-      - run: k6 run tests/perf/api.k6.js --summary-export=.perf-results/api-summary.json
-        env:
-          BASE_URL: ${{ vars.PERF_BASE_URL }}
-
-  perf-db:
-    if: ${{ vars.PERF_DATABASE_URL != '' }}
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    steps:
-      - uses: actions/checkout@v7
-      - name: Install PostgreSQL client
-        run: sudo apt-get update && sudo apt-get install -y postgresql-client
-      - run: psql "${{ vars.PERF_DATABASE_URL }}" -f scripts/perf/db/check-pg-stat.sql
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a7b8c75..2db4270 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -25,16 +25,22 @@ jobs:
       APPLE_API_KEY_BASE64: ${{ secrets.APPLE_API_KEY_BASE64 }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v7
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
 
       - name: Setup Node
-        uses: actions/setup-node@v7
+        uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7
         with:
-          node-version: 22
+          node-version-file: .node-version
           cache: npm
 
+      - name: Setup pinned npm
+        run: npm install --global npm@12.2.0
+
       - name: Setup Rust
-        uses: dtolnay/rust-toolchain@stable
+        uses: dtolnay/rust-toolchain@e2a55d2ffb04f378e9626c28d38b36d230d1e12f # rust 1.98.1
+        with:
+          toolchain: 1.98.1
+          components: rustfmt, clippy
 
       - name: Install dependencies
         run: npm ci
@@ -52,7 +58,7 @@ jobs:
         run: npm run release:updater:package
 
       - name: Upload release artifacts
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7
         with:
           name: desktop-pet-macos
           path: |
@@ -66,7 +72,7 @@ jobs:
 
       - name: Publish GitHub Release (tag builds only)
         if: startsWith(github.ref, 'refs/tags/')
-        uses: softprops/action-gh-release@v3
+        uses: softprops/action-gh-release@efb35369e0ad2afab669f228072c1b0d510eae64 # v3
         with:
           files: |
             src-tauri/target/release/bundle/dmg/*.dmg
@@ -75,7 +81,7 @@ jobs:
 
       - name: Publish updater release assets (tag builds only)
         if: startsWith(github.ref, 'refs/tags/') && hashFiles('artifacts/release/updater-assets.tar.gz') != ''
-        uses: softprops/action-gh-release@v3
+        uses: softprops/action-gh-release@efb35369e0ad2afab669f228072c1b0d510eae64 # v3
         with:
           files: |
             artifacts/release/updater-artifacts.txt
diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml
index bf8c45c..204ed0c 100644
--- a/.github/workflows/security.yml
+++ b/.github/workflows/security.yml
@@ -17,16 +17,22 @@ jobs:
       DESKTOP_PET_SKIP_GITLEAKS: "1"
     steps:
       - name: Checkout
-        uses: actions/checkout@v7
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
 
       - name: Setup Node
-        uses: actions/setup-node@v7
+        uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7
         with:
-          node-version: 22
+          node-version-file: .node-version
           cache: npm
 
+      - name: Setup pinned npm
+        run: npm install --global npm@12.2.0
+
       - name: Setup Rust
-        uses: dtolnay/rust-toolchain@stable
+        uses: dtolnay/rust-toolchain@e2a55d2ffb04f378e9626c28d38b36d230d1e12f # rust 1.98.1
+        with:
+          toolchain: 1.98.1
+          components: rustfmt, clippy
 
       - name: Install dependencies
         run: npm ci
@@ -43,13 +49,13 @@ jobs:
 
       - name: Run strict secret scan
         if: env.DESKTOP_PET_SKIP_GITLEAKS != '1'
-        uses: gitleaks/gitleaks-action@v3
+        uses: gitleaks/gitleaks-action@e0c47f4f8be36e29cdc102c57e68cb5cbf0e8d1e # v3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload security artifacts
         if: always()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7
         with:
           name: security-scan-artifacts
           path: artifacts/security/*
diff --git a/.gitignore b/.gitignore
index 1dda7dc..daad5f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,6 @@ src-tauri/target/
 .perf-results/
 .DS_Store
 *.dmg
+.npm-cache/
+.local-cargo-home/
+.local-rustup/
diff --git a/.node-version b/.node-version
new file mode 100644
index 0000000..de889f8
--- /dev/null
+++ b/.node-version
@@ -0,0 +1 @@
+22.23.3
diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 0000000..6c5f4fe
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,9 @@
+node_modules/
+dist/
+src-tauri/target/
+src-tauri/gen/
+target/
+artifacts/
+.perf-results/
+.perf-baselines/
+.npm-cache/
diff --git a/AGENTS.md b/AGENTS.md
index a4eec2f..c12e8b2 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,57 +1,36 @@
-<!-- comm-contract:start -->
+# Purpose
 
-## Communication Contract
+DesktopPet is a local desktop companion built with Tauri and React. Keep persistence explicit and protect user data during migrations and imports.
 
-- Inherit global Codex communication and reporting rules from `/Users/d/.codex/AGENTS.override.md` and `/Users/d/.codex/policies/communication/BigPictureReportingV1.md`.
-- Repo-specific instructions below add project constraints only; do not restate global voice or status-reporting rules here.
-<!-- comm-contract:end -->
+# Layout
 
-## Inherited Operating Rules
+- `src/`: React interface, hooks, domain types, and frontend tests.
+- `src-tauri/`: Tauri commands, Rust models, persistence, and backend tests.
+- `scripts/`: build, performance budget, security, and release helpers.
+- `docs/`: product contracts and release history.
 
-- Inherit global git, review/fix, testing, docs, skill-use, and reporting gates from `/Users/d/.codex/AGENTS.md` and active session instructions.
-- Use `.codex/verify.commands` and `.codex/scripts/run_verify_commands.sh` as this repo-local verification authority when present.
-- Keep the project-specific portfolio constraints below as the source of truth for runtime, privacy, and release risks.
+# Setup
 
-<!-- portfolio-context:start -->
-# Portfolio Context
+- Node.js 22.23.3 and npm 12.2.0 (see `package.json`).
+- Rust 1.98.1 with `rustfmt` and `clippy` (see `src-tauri/rust-toolchain.toml`).
+- Run `npm ci` to install frontend dependencies.
+- Native desktop builds also need the Tauri prerequisites for the host operating system.
 
-## What This Project Is
+# Checks
 
-DesktopPet is a Tauri desktop companion that turns focus sessions into a pet progression loop. A transparent always-on-top pet overlay, controls panel, Pomodoro presets, XP/coins, quests, shop unlocks, and focus guardrails work together as a local desktop productivity game.
+- `make check` runs formatting, TypeScript, Vitest, Rust formatting, Clippy, Rust tests, and the frontend build.
+- `npm run security:scan` runs the separate network-dependent security checks.
+- Preserve failures and report the command and output; do not weaken checks to make them pass.
 
-## Current State
+# Boundaries
 
-The repo is active desktop product work. Existing local changes are PR-template metadata, so context recovery should stay documentation-only.
+- Do not add automatic focus interventions from configured rules without genuine observations and an explicit product decision.
+- Keep local persistence as the source of truth; do not introduce a remote API or database without approval.
+- Preserve unrelated work and user data. Do not publish, deploy, sign, notarize, or release as part of routine changes.
+- Do not access the user's Downloads folder.
 
-## Stack
+# Delivery
 
-| Layer | Technology |
-|-------|------------|
-| Shell | Tauri 2 (Rust backend) |
-| Language | TypeScript + React |
-| Bundler | Vite |
-| Testing | Vitest |
-| Styling | Tailwind CSS |
-
-## How To Run
-
-```bash
-# Frontend development
-npm run dev
-
-# Frontend production build
-npm run build
-```
-
-## Known Risks
-
-- Focus guardrails affect user workflow; avoid blocking behavior without clear controls and tests.
-- Pet, quest, shop, and focus-session state crosses TypeScript stores and the Rust layer, so keep persistence boundaries explicit.
-- Transparent always-on-top windows can be fragile on desktop platforms; verify overlay behavior after UI changes.
-- Keep PR-template drift separate from product changes.
-
-## Next Recommended Move
-
-Resolve the PR-template drift separately, then verify overlay, Pomodoro, quest/shop, and focus-guardrail flows before shipping behavior changes.
-
-<!-- portfolio-context:end -->
+- Keep changes small and reviewable, with focused tests for changed behavior.
+- Use conventional commit subjects: `feat`, `fix`, `refactor`, `perf`, `docs`, `test`, `build`, `ci`, `chore`, or `revert`.
+- Verify the final diff and explain checks and any remaining limits.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62c6624..9fdd304 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [1.0.0] - 2026-03-22
 
 ### Added
+
 - Initial Desktop Pet / Pomodoro Buddy
 - Streamlined UI with penguin icon and minimal floating pet
 - Deepen pet interactions, customization, and guardrails
@@ -29,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Pre-signing handoff documentation
 
 ### Fixed
+
 - Honor DesktopPEt gitleaks skip flag
 - Stabilize overlay recovery and app flows
 - Increase pet window size to fit all evolution stages
@@ -38,6 +40,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Normalize import settings and preserve loadout FIFO
 
 ### Changed
+
 - Harden verification and packaging for release
 - Complete audit hardening and ops tooling
 - Cover backup and diagnostics settings flows
diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 0000000..43c994c
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1 @@
+@AGENTS.md
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 4c38b83..22be14d 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -13,19 +13,19 @@ identity and orientation.
 
 Examples of behavior that contributes to a positive environment:
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
 
 Examples of unacceptable behavior:
 
-* The use of sexualized language or imagery, and sexual attention or advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
+- The use of sexualized language or imagery, and sexual attention or advances of any kind
+- Trolling, insulting or derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information without explicit permission
+- Other conduct which could reasonably be considered inappropriate in a professional setting
 
 ## Enforcement
 
diff --git a/Makefile b/Makefile
index 49ecf1f..cd865d6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,35 @@
-.PHONY: dev build test lint clean install
+.PHONY: dev build test lint clean install check
 
 install:
-	pnpm install
+	npm ci
 
 dev:
-	pnpm dev
+	npm run dev
 
 build:
-	pnpm build
+	npm run build
 
 test:
-	pnpm test
+	npm test
 
 lint:
-	pnpm lint
+	npm run lint
 
 clean:
 	rm -rf node_modules dist .next .turbo
+
+check:
+	@missing=0; for tool in node npm cargo; do \
+		if ! command -v $$tool >/dev/null 2>&1; then echo "Missing $$tool; install Node.js 22.23.3 and the pinned Rust toolchain first."; missing=1; fi; \
+	done; test $$missing -eq 0 || exit 1
+	npm run lint
+	npm run typecheck
+	npm test
+	npm run test:pack-qa
+	cd src-tauri && cargo fmt --all -- --check
+	cd src-tauri && cargo clippy --locked --all-targets -- -D warnings
+	cd src-tauri && cargo test --locked
+	npm run build
+	npm run check:performance-budget
+	npm run perf:bundle:gate
+	npm run perf:assets
diff --git a/README.md b/README.md
index c0ad607..4e06fb9 100644
--- a/README.md
+++ b/README.md
@@ -12,15 +12,16 @@ DesktopPet is a Tauri-powered desktop companion that floats above your windows a
 - **Pomodoro integration** — 15/5, 25/5, and 50/10 presets with XP and coin rewards on completion
 - **Pet progression** — evolution stages, care stats, personality state, and 20+ unlockable achievements
 - **Shop + quests** — accessory catalog, rolling events, and active quests with completion rewards
-- **Focus guardrails** — allowlist/blocklist host matching with timer messages, pause interventions, and event history
+- **Focus guardrails** — explicit evaluation of supplied host observations against allowlists and blocklists
 - **Customization** — skins, scenes, themes, saved loadouts, and a photo booth for shareable pet cards
 
 ## Quick Start
 
 ### Prerequisites
 
-- Node.js 22.13+ on the 22.x line and npm (the CI runtime; required by the locked Vite/jsdom toolchain).
-- For native desktop work: Rust `stable`, Cargo, and the [Tauri prerequisites for your OS](https://v2.tauri.app/start/prerequisites/). `Cargo.toml` declares Rust 1.77.2, but the locked dependency graph may require a newer toolchain.
+- Node.js 22.23.3 and npm 12.2.0.
+- Rust 1.98.1 with Cargo, `rustfmt`, and `clippy` for native checks.
+- For native desktop work, install the [Tauri prerequisites for your OS](https://v2.tauri.app/start/prerequisites/).
 - Use the Tauri CLI pinned in `package.json` through `npm run tauri`; no global CLI installation is needed.
 
 ### Installation
@@ -46,17 +47,31 @@ npm run tauri -- dev
 npm run build
 ```
 
-See the [execution contract](docs/execution-contract.md) for focused tests, format/typecheck checks, native builds, strict verification and conditional browser/desktop checks.
+Run `make check` for the repository checks. Run `npm run security:scan` separately for network-dependent security scans.
 
-## Tech Stack
+## Status
 
-| Layer    | Technology             |
-| -------- | ---------------------- |
-| Shell    | Tauri 2 (Rust backend) |
-| Language | TypeScript + React     |
-| Bundler  | Vite                   |
-| Testing  | Vitest                 |
-| Styling  | Tailwind CSS           |
+### Stack
+
+| Layer   | Technology                  |
+| ------- | --------------------------- |
+| Shell   | Tauri 2 with a Rust backend |
+| UI      | React 19 and TypeScript 7   |
+| Bundler | Vite 8                      |
+| Tests   | Vitest                      |
+| Styling | Tailwind CSS                |
+
+### Known risks
+
+- Focus guardrails evaluate only hosts explicitly provided by the application. The desktop app does not detect activity in other apps or browsers.
+- Transparent, always-on-top windows can vary across desktop environments and need platform-specific manual verification.
+- Backup imports replace local application state after schema validation; keep a separate backup before importing important data.
+
+### Next steps
+
+- Run `make check` before proposing changes.
+- Verify overlay behavior and focus-session flows on the target desktop platform before a release.
+- CI builds the macOS `.app` bundle; DMG creation, signing, and notarization are release-only work.
 
 ## Architecture
 
diff --git a/SECURITY.md b/SECURITY.md
index f51e103..3590edf 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -7,6 +7,7 @@ Please **do not** open a public GitHub issue for security vulnerabilities.
 Open a [GitHub Security Advisory](../../security/advisories/new) or email the maintainer directly.
 
 Include:
+
 - Description of the vulnerability
 - Steps to reproduce
 - Potential impact
diff --git a/commitlint.config.mjs b/commitlint.config.mjs
index 6509d3b..772f426 100644
--- a/commitlint.config.mjs
+++ b/commitlint.config.mjs
@@ -2,7 +2,22 @@
 export default {
   extends: ["@commitlint/config-conventional"],
   rules: {
-    "type-enum": [2, "always", ["feat", "fix", "refactor", "perf", "docs", "test", "build", "ci", "chore", "revert"]],
+    "type-enum": [
+      2,
+      "always",
+      [
+        "feat",
+        "fix",
+        "refactor",
+        "perf",
+        "docs",
+        "test",
+        "build",
+        "ci",
+        "chore",
+        "revert",
+      ],
+    ],
     "header-max-length": [2, "always", 72],
     "subject-empty": [2, "never"],
     "subject-full-stop": [2, "never", "."],
diff --git a/docs/PORTFOLIO-DISPOSITION.md b/docs/PORTFOLIO-DISPOSITION.md
index b7ed040..6973c23 100644
--- a/docs/PORTFOLIO-DISPOSITION.md
+++ b/docs/PORTFOLIO-DISPOSITION.md
@@ -26,6 +26,7 @@ Developer ID signing + notarization credentials**, which is
 operator-only work.
 
 For the full detail, see (in this order):
+
 - `docs/release-candidate-status.md`
 - `docs/macos-signing-handoff.md`
 - `docs/release-runbook.md`
@@ -37,11 +38,11 @@ system what to do given those.
 
 ## Portfolio operating system instructions
 
-| Aspect | Posture |
-|---|---|
-| Portfolio status | `Release Frozen` (not `Cold Storage`, not `Active`) |
-| Review cadence | Suspend overdue counting |
-| Next review trigger | When Apple signing credentials become available, or when the operator explicitly decides to ship unsigned (not currently planned) |
+| Aspect               | Posture                                                                                                                                                      |
+| -------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| Portfolio status     | `Release Frozen` (not `Cold Storage`, not `Active`)                                                                                                          |
+| Review cadence       | Suspend overdue counting                                                                                                                                     |
+| Next review trigger  | When Apple signing credentials become available, or when the operator explicitly decides to ship unsigned (not currently planned)                            |
 | Resurface conditions | (a) signing credentials configured in CI, or (b) operator decides to abandon ship and switch to `Cold Storage` with disposition `RC reached, ship abandoned` |
 
 ---
@@ -60,7 +61,7 @@ system what to do given those.
 
 The distinction matters because portfolio reviews should treat these
 differently. Active projects get attention. Cold projects get
-ignored. Frozen projects get *neither* — they sit until the unblocking
+ignored. Frozen projects get _neither_ — they sit until the unblocking
 condition flips, then move quickly.
 
 ---
@@ -89,7 +90,7 @@ When portfolio operating system flips this row to `Active`:
 1. Delete the abandoned `codex/*` WIP branches that accumulated during
    the freeze — they don't reflect the shipping artifact.
 2. Re-verify on current toolchain: `npm install && npm run
-   verify:required && npm run verify:required:tauri`.
+verify:required && npm run verify:required:tauri`.
 3. Re-run the packaged-app smoke checks listed in
    `release-candidate-status.md`.
 4. Only then proceed to signing — do not assume the 2026-03-14 build
@@ -99,11 +100,11 @@ When portfolio operating system flips this row to `Active`:
 
 ## Last known reference
 
-| Field | Value |
-|---|---|
-| Last commit on `main` | `d7fcfd3` docs(release): add pre-signing handoff |
-| Date | 2026-03-14 |
-| Build verification status | green |
-| Smoke test status | green |
-| Blocker | Apple signing + notarization (operator-only) |
-| Local WIP branches | several `codex/*` branches, not reflected in shipping artifact, safe to delete on reactivation |
+| Field                     | Value                                                                                          |
+| ------------------------- | ---------------------------------------------------------------------------------------------- |
+| Last commit on `main`     | `d7fcfd3` docs(release): add pre-signing handoff                                               |
+| Date                      | 2026-03-14                                                                                     |
+| Build verification status | green                                                                                          |
+| Smoke test status         | green                                                                                          |
+| Blocker                   | Apple signing + notarization (operator-only)                                                   |
+| Local WIP branches        | several `codex/*` branches, not reflected in shipping artifact, safe to delete on reactivation |
diff --git a/docs/release-candidate-status.md b/docs/release-candidate-status.md
index 4d3b4e3..5aa0e27 100644
--- a/docs/release-candidate-status.md
+++ b/docs/release-candidate-status.md
@@ -1,63 +1,5 @@
-# Unsigned Release Candidate Status
+# Historical release candidate notes
 
-Last updated: 2026-03-14
+This document records a release-candidate assessment from March 2026. Its build, smoke-test, signing, and distribution statements describe that historical assessment only; they are not evidence of current readiness.
 
-## Current Decision
-
-DesktopPEt is at an unsigned macOS release-candidate state.
-
-Go for pre-signing handoff:
-
-- Yes
-
-Go for final public distribution:
-
-- Not yet
-
-## What Is Proven
-
-- Canonical verification passes:
-  - `npm run verify:required`
-  - `npm run verify:required:tauri`
-- Release artifact validation passes:
-  - `npm run release:artifacts:validate`
-  - `npm run release:updater:package` (clean skip because updater assets are not enabled yet)
-- Unsigned macOS artifacts build successfully:
-  - `src-tauri/target/release/bundle/macos/Desktop Pet.app`
-  - `src-tauri/target/release/bundle/dmg/Desktop Pet_1.0.0_aarch64.dmg`
-- Live smoke checks passed in both `tauri dev` and the packaged `.app`:
-  - pet and panel windows launch
-  - timer preset changes apply
-  - timer start, pause, resume, and reset work
-  - backup export works
-  - reset returns the app to defaults
-  - backup import restores prior timer state
-  - pet window recovery keeps the overlay reachable
-
-## Evidence
-
-- Release manifest:
-  - `artifacts/release/tauri-artifacts.txt`
-- Release checksums:
-  - `artifacts/release/tauri-artifacts-sha256.txt`
-- Pack QA report:
-  - `artifacts/pack-qa-report.md`
-- Performance budget report:
-  - `artifacts/performance-budget-report.md`
-
-## Remaining Blocker
-
-The only material blocker for final distribution is Apple signing and notarization setup.
-
-Missing release inputs are documented in:
-
-- `docs/macos-signing-handoff.md`
-
-## Non-Blocking Notes
-
-- Updater packaging currently skips because no updater metadata or signatures are being produced.
-- Release-hardening and product-fix work is recorded in commits `83c1e91` and `3a5f4f6`.
-
-## Recommended Next Action
-
-Use `docs/macos-signing-handoff.md` to provision Apple credentials, run signing preflight, build a signed/notarized bundle, and rerun artifact validation.
+The old verification details and artifact claims have been removed because their evidence is not maintained with this document. For current checks, run `make check`. macOS signing and notarization remain release-only work and are not automated by the repository.
diff --git a/package-lock.json b/package-lock.json
index 67f1687..b8489e2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,6 @@
       "dependencies": {
         "@tauri-apps/api": "2.12.1",
         "@tauri-apps/plugin-clipboard-manager": "^2.4.1",
-        "@tauri-apps/plugin-store": "^2.5.0",
         "react": "^19.3.0",
         "react-dom": "^19.3.0"
       },
@@ -36,6 +35,10 @@
         "typescript": "^7.0.2",
         "vite": "^8.2.2",
         "vitest": "^5.0.3"
+      },
+      "engines": {
+        "node": "22.23.3",
+        "npm": "12.2.0"
       }
     },
     "node_modules/@adobe/css-tools": {
@@ -2091,8 +2094,8 @@
       "integrity": "sha512-DeyFHa3wynpyoqTDikDEDGTJIq4LQ5USfolQGRmGIWT6JMADyxZBTDa5cAdT3tDg73rUXufPaCwN7aXBos4OnQ==",
       "license": "Apache-2.0 OR MIT",
       "funding": {
-        "url": "https://opencollective.com/tauri",
-        "type": "opencollective"
+        "type": "opencollective",
+        "url": "https://opencollective.com/tauri"
       }
     },
     "node_modules/@tauri-apps/cli": {
@@ -2336,15 +2339,6 @@
         "@tauri-apps/api": "^2.12.0"
       }
     },
-    "node_modules/@tauri-apps/plugin-store": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-store/-/plugin-store-2.5.0.tgz",
-      "integrity": "sha512-+ykjiQwMJCSk/U2enHA8peKBWgDKgrP7JfZnGwQpqzwA0nVtKTc0LCyxWr2whOrcQoQqtUdr9NVdDZpfKpT1Xw==",
-      "license": "MIT OR Apache-2.0",
-      "dependencies": {
-        "@tauri-apps/api": "^2.12.0"
-      }
-    },
     "node_modules/@testing-library/dom": {
       "version": "10.4.1",
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz",
diff --git a/package.json b/package.json
index 681165b..b2332ef 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,11 @@
   "name": "desktoppet",
   "version": "1.0.0",
   "private": true,
+  "packageManager": "npm@12.2.0",
+  "engines": {
+    "node": "22.23.3",
+    "npm": "12.2.0"
+  },
   "scripts": {
     "dev": "node ./node_modules/vite/bin/vite.js",
     "dev:lean": "bash ./scripts/lean-dev.sh",
@@ -14,8 +19,6 @@
     "test:pack-qa": "node ./scripts/pack_qa.mjs",
     "test": "node ./node_modules/vitest/vitest.mjs run",
     "test:watch": "node ./node_modules/vitest/vitest.mjs",
-    "test:ui": "node ./node_modules/vitest/vitest.mjs --ui",
-    "test:coverage": "node ./node_modules/vitest/vitest.mjs run --coverage",
     "test:rust": "./scripts/tauri-rust-test.sh",
     "test:rust:release": "./scripts/tauri-rust-test.sh --release",
     "test:all": "npm test && npm run test:rust",
@@ -28,7 +31,7 @@
     "release:updater:package": "bash ./scripts/release/package-updater-assets.sh",
     "security:scan": "bash ./scripts/security/run-security-scans.sh",
     "test:tauri-preflight": "./scripts/tauri-preflight.sh",
-    "verify:required:frontend": "npm run typecheck && npm test && npm run test:smoke:frontend && npm run test:pack-qa && npm run build && npm run check:performance-budget && npm run perf:build:gate && npm run perf:bundle:gate && npm run perf:assets && npm run perf:memory && npm run perf:summary && npm run security:scan",
+    "verify:required:frontend": "npm run typecheck && npm test && npm run build && npm run check:performance-budget && npm run perf:bundle:gate && npm run perf:assets",
     "verify:required:tauri": "npm run test:tauri-preflight && npm run test:rust && npm run tauri:build:checked",
     "verify:required:tauri:strict:temp": "bash ./scripts/verify-tauri-strict-temp.sh",
     "verify:required": "npm run verify:required:frontend && npm run verify:required:tauri",
@@ -52,7 +55,6 @@
     "perf:bundle:gate": "npm run perf:bundle && if [ \"${DESKTOP_PET_STRICT_PERF:-0}\" = \"1\" ]; then node scripts/perf/compare-metric.mjs .perf-baselines/bundle.json .perf-results/bundle.json totalBytes 0.08; else echo \"Skipping strict perf regression compare (set DESKTOP_PET_STRICT_PERF=1 to enforce).\"; fi",
     "perf:baseline:update": "bash ./scripts/perf/update-baselines.sh",
     "perf:assets": "bash scripts/perf/check-assets.sh",
-    "perf:memory": "node --expose-gc scripts/perf/memory-smoke.mjs",
     "perf:lhci": "bash ./scripts/perf/lhci.sh",
     "perf:lhci:prod": "LHCI_PROFILE=production bash ./scripts/perf/lhci.sh",
     "perf:summary": "node scripts/perf/summarize.mjs",
@@ -61,7 +63,6 @@
   "dependencies": {
     "@tauri-apps/api": "2.12.1",
     "@tauri-apps/plugin-clipboard-manager": "^2.4.1",
-    "@tauri-apps/plugin-store": "^2.5.0",
     "react": "^19.3.0",
     "react-dom": "^19.3.0"
   },
diff --git a/pet.html b/pet.html
index 6565853..e2ce21a 100644
--- a/pet.html
+++ b/pet.html
@@ -5,7 +5,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Desktop Pet</title>
     <style>
-      html, body, #root {
+      html,
+      body,
+      #root {
         margin: 0;
         padding: 0;
         background: transparent;
diff --git a/scripts/check_performance_budget.mjs b/scripts/check_performance_budget.mjs
index dc823db..68a1d65 100644
--- a/scripts/check_performance_budget.mjs
+++ b/scripts/check_performance_budget.mjs
@@ -9,7 +9,11 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const repoRoot = path.resolve(__dirname, "..");
 const distAssetsDir = path.join(repoRoot, "dist", "assets");
 const artifactsDir = path.join(repoRoot, "artifacts");
-const baselinePath = path.join(repoRoot, "docs", "performance-budget-baseline.json");
+const baselinePath = path.join(
+  repoRoot,
+  "docs",
+  "performance-budget-baseline.json",
+);
 
 const budgetConfig = [
   {
@@ -38,7 +42,9 @@ function readJson(filePath) {
 
 function findAssetFile(files, prefixes, suffix) {
   for (const prefix of prefixes) {
-    const matches = files.filter((file) => file.startsWith(prefix) && file.endsWith(suffix)).sort();
+    const matches = files
+      .filter((file) => file.startsWith(prefix) && file.endsWith(suffix))
+      .sort();
     if (matches.length > 0) {
       return matches[matches.length - 1];
     }
@@ -72,8 +78,8 @@ function buildMarkdown(results) {
   for (const row of results) {
     lines.push(
       `| ${row.id} | ${formatKiB(row.baselineGzipBytes)} | ${formatKiB(row.currentGzipBytes)} | ${formatKiB(
-        row.deltaGzipBytes
-      )} | ${formatKiB(row.thresholdGzipDeltaBytes)} | ${row.pass ? "PASS" : "FAIL"} |`
+        row.deltaGzipBytes,
+      )} | ${formatKiB(row.thresholdGzipDeltaBytes)} | ${row.pass ? "PASS" : "FAIL"} |`,
     );
   }
 
@@ -85,7 +91,9 @@ function main() {
     throw new Error("Missing docs/performance-budget-baseline.json");
   }
   if (!fs.existsSync(distAssetsDir)) {
-    throw new Error("Missing dist/assets. Run `npm run build` before this check.");
+    throw new Error(
+      "Missing dist/assets. Run `npm run build` before this check.",
+    );
   }
 
   const baseline = readJson(baselinePath);
@@ -94,7 +102,9 @@ function main() {
   const rows = budgetConfig.map((entry) => {
     const baselineTarget = baseline.targets?.[entry.id];
     if (!baselineTarget || typeof baselineTarget.gzipBytes !== "number") {
-      throw new Error(`Missing baseline target ${entry.id} in ${path.relative(repoRoot, baselinePath)}`);
+      throw new Error(
+        `Missing baseline target ${entry.id} in ${path.relative(repoRoot, baselinePath)}`,
+      );
     }
 
     const fileName = findAssetFile(distFiles, entry.prefixes, entry.suffix);
diff --git a/scripts/pack_qa.mjs b/scripts/pack_qa.mjs
index 3b519db..0a8eb25 100644
--- a/scripts/pack_qa.mjs
+++ b/scripts/pack_qa.mjs
@@ -41,17 +41,19 @@ function validatePack(pack, fileName, spriteFiles) {
     checks,
     "schema-version",
     pack.schemaVersion === supportedSchemaVersion,
-    `v${pack.schemaVersion}`
+    `v${pack.schemaVersion}`,
   );
   addCheck(checks, "id-slug", isSlug(pack.id), String(pack.id ?? ""));
   addCheck(
     checks,
     "stage-names",
     Array.isArray(pack.stageNames) && pack.stageNames.length === 3,
-    `${Array.isArray(pack.stageNames) ? pack.stageNames.length : 0} names`
+    `${Array.isArray(pack.stageNames) ? pack.stageNames.length : 0} names`,
   );
 
-  const thresholds = Array.isArray(pack.evolutionThresholds) ? pack.evolutionThresholds : [];
+  const thresholds = Array.isArray(pack.evolutionThresholds)
+    ? pack.evolutionThresholds
+    : [];
   const thresholdsValid =
     thresholds.length === 3 &&
     thresholds[0] === 0 &&
@@ -61,11 +63,20 @@ function validatePack(pack, fileName, spriteFiles) {
     thresholds[2] > thresholds[1];
   addCheck(checks, "thresholds", thresholdsValid, thresholds.join(" / "));
 
-  const stageSprites = Array.isArray(pack.stageSpriteFiles) ? pack.stageSpriteFiles : [];
+  const stageSprites = Array.isArray(pack.stageSpriteFiles)
+    ? pack.stageSpriteFiles
+    : [];
   const spritesPresent =
     stageSprites.length === 3 &&
-    stageSprites.every((file) => typeof file === "string" && spriteFiles.has(file));
-  addCheck(checks, "sprites", spritesPresent, `${stageSprites.length} sprite assets`);
+    stageSprites.every(
+      (file) => typeof file === "string" && spriteFiles.has(file),
+    );
+  addCheck(
+    checks,
+    "sprites",
+    spritesPresent,
+    `${stageSprites.length} sprite assets`,
+  );
 
   const blink = pack.idleBehavior?.blinkIntervalMs;
   const blinkValid =
@@ -73,7 +84,12 @@ function validatePack(pack, fileName, spriteFiles) {
     blink.length === 2 &&
     blink[0] >= 1200 &&
     blink[1] > blink[0];
-  addCheck(checks, "blink-window", blinkValid, Array.isArray(blink) ? `${blink[0]}-${blink[1]}ms` : "");
+  addCheck(
+    checks,
+    "blink-window",
+    blinkValid,
+    Array.isArray(blink) ? `${blink[0]}-${blink[1]}ms` : "",
+  );
 
   const anchors = pack.accessoryAnchors ?? {};
   addCheck(
@@ -83,17 +99,19 @@ function validatePack(pack, fileName, spriteFiles) {
       inBounds(anchors.neck) &&
       inBounds(anchors.left) &&
       inBounds(anchors.right),
-    "head/neck/left/right"
+    "head/neck/left/right",
   );
 
   const verbs = new Set(
-    Array.isArray(pack.interactionVerbs) ? pack.interactionVerbs.map((verb) => verb.id) : []
+    Array.isArray(pack.interactionVerbs)
+      ? pack.interactionVerbs.map((verb) => verb.id)
+      : [],
   );
   addCheck(
     checks,
     "verbs",
     requiredVerbs.every((verb) => verbs.has(verb)),
-    `${verbs.size} verbs`
+    `${verbs.size} verbs`,
   );
 
   const cadence = pack.behaviorProfile?.interactionCadenceMs;
@@ -109,7 +127,7 @@ function validatePack(pack, fileName, spriteFiles) {
     checks,
     "behavior-profile",
     behaviorValid,
-    Array.isArray(cadence) ? `${cadence[0]}-${cadence[1]}ms / ${posture}` : ""
+    Array.isArray(cadence) ? `${cadence[0]}-${cadence[1]}ms / ${posture}` : "",
   );
 
   const failed = checks.filter((check) => !check.pass);
@@ -138,8 +156,8 @@ function buildMarkdownReport(report) {
   for (const pack of report.packs) {
     lines.push(
       `| ${pack.id} (${pack.fileName}) | ${pack.pass ? "PASS" : "FAIL"} | ${
-        pack.failedChecks.length > 0 ? pack.failedChecks.join(", ") : "-" 
-      } |`
+        pack.failedChecks.length > 0 ? pack.failedChecks.join(", ") : "-"
+      } |`,
     );
   }
 
@@ -158,7 +176,9 @@ function main() {
     return { fileName, pack: JSON.parse(raw) };
   });
 
-  const results = packs.map(({ fileName, pack }) => validatePack(pack, fileName, spriteFiles));
+  const results = packs.map(({ fileName, pack }) =>
+    validatePack(pack, fileName, spriteFiles),
+  );
   const failed = results.filter((pack) => !pack.pass);
 
   const report = {
@@ -179,11 +199,15 @@ function main() {
   fs.writeFileSync(mdPath, buildMarkdownReport(report));
 
   if (failed.length > 0) {
-    console.error("Pack QA failed. See artifacts/pack-qa-report.md for details.");
+    console.error(
+      "Pack QA failed. See artifacts/pack-qa-report.md for details.",
+    );
     process.exit(1);
   }
 
-  console.log(`Pack QA passed (${report.summary.passed}/${report.summary.total}).`);
+  console.log(
+    `Pack QA passed (${report.summary.passed}/${report.summary.total}).`,
+  );
   console.log(`Report: ${path.relative(repoRoot, mdPath)}`);
 }
 
diff --git a/scripts/perf/bundle-report.mjs b/scripts/perf/bundle-report.mjs
index 6f92cc8..421dc2d 100644
--- a/scripts/perf/bundle-report.mjs
+++ b/scripts/perf/bundle-report.mjs
@@ -1,4 +1,11 @@
-import { existsSync, mkdirSync, readFileSync, readdirSync, statSync, writeFileSync } from "node:fs";
+import {
+  existsSync,
+  mkdirSync,
+  readFileSync,
+  readdirSync,
+  statSync,
+  writeFileSync,
+} from "node:fs";
 import path from "node:path";
 
 function nextBundle() {
@@ -44,11 +51,16 @@ function viteBundle() {
 }
 
 const run = async () => {
-  const report = nextBundle() || (await viteBundle()) || { source: "none", totalBytes: 0 };
+  const report = nextBundle() ||
+    (await viteBundle()) || { source: "none", totalBytes: 0 };
   mkdirSync(".perf-results", { recursive: true });
   writeFileSync(
     ".perf-results/bundle.json",
-    JSON.stringify({ ...report, capturedAt: new Date().toISOString() }, null, 2),
+    JSON.stringify(
+      { ...report, capturedAt: new Date().toISOString() },
+      null,
+      2,
+    ),
   );
 };
 
diff --git a/scripts/perf/memory-smoke.mjs b/scripts/perf/memory-smoke.mjs
deleted file mode 100644
index 5545a13..0000000
--- a/scripts/perf/memory-smoke.mjs
+++ /dev/null
@@ -1,40 +0,0 @@
-import { mkdirSync, writeFileSync } from "node:fs";
-
-if (typeof globalThis.gc !== "function") {
-  console.error("Run with --expose-gc.");
-  process.exit(1);
-}
-
-globalThis.gc();
-const before = process.memoryUsage().heapUsed;
-
-const allocations = [];
-for (let i = 0; i < 20_000; i += 1) {
-  allocations.push({ i, payload: `row-${i}`.repeat(4) });
-}
-
-globalThis.gc();
-const after = process.memoryUsage().heapUsed;
-const deltaMb = Number(((after - before) / (1024 * 1024)).toFixed(2));
-const maxDelta = Number(process.env.MEMORY_MAX_DELTA_MB || 10);
-
-mkdirSync(".perf-results", { recursive: true });
-writeFileSync(
-  ".perf-results/memory.json",
-  JSON.stringify(
-    {
-      heapBefore: before,
-      heapAfter: after,
-      deltaMb,
-      maxDeltaMb: maxDelta,
-      capturedAt: new Date().toISOString(),
-    },
-    null,
-    2,
-  ),
-);
-
-if (deltaMb > maxDelta) {
-  console.error(`Memory growth too high: ${deltaMb}MB > ${maxDelta}MB`);
-  process.exit(1);
-}
diff --git a/scripts/perf/summarize.mjs b/scripts/perf/summarize.mjs
index 58a69d5..9c3c67a 100644
--- a/scripts/perf/summarize.mjs
+++ b/scripts/perf/summarize.mjs
@@ -7,7 +7,11 @@ const files = {
   api: ".perf-results/api-summary.json",
 };
 
-const summary = { capturedAt: new Date().toISOString(), metrics: {}, status: "pass" };
+const summary = {
+  capturedAt: new Date().toISOString(),
+  metrics: {},
+  status: "pass",
+};
 for (const [key, file] of Object.entries(files)) {
   if (existsSync(file)) {
     summary.metrics[key] = JSON.parse(readFileSync(file, "utf8"));
@@ -17,5 +21,8 @@ for (const [key, file] of Object.entries(files)) {
 }
 
 mkdirSync(".perf-results", { recursive: true });
-writeFileSync(".perf-results/summary.json", `${JSON.stringify(summary, null, 2)}\n`);
+writeFileSync(
+  ".perf-results/summary.json",
+  `${JSON.stringify(summary, null, 2)}\n`,
+);
 console.log("wrote .perf-results/summary.json");
diff --git a/scripts/tauri-rust-test.sh b/scripts/tauri-rust-test.sh
index a1fa01f..5e38d8b 100755
--- a/scripts/tauri-rust-test.sh
+++ b/scripts/tauri-rust-test.sh
@@ -23,4 +23,4 @@ if [[ "$(pwd)" == *:* ]]; then
   skip_or_fail "workspace path contains ':', which is unsupported for this cargo workflow."
 fi
 
-cargo test --manifest-path src-tauri/Cargo.toml "$@"
+(cd src-tauri && cargo test --locked "$@")
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 4c07df3..e2e35fd 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "adler2"
@@ -579,7 +579,6 @@ name = "desktop-pet"
 version = "1.0.0"
 dependencies = [
  "chrono",
- "log",
  "serde",
  "serde_json",
  "tauri",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 169726b..4fc0259 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -5,7 +5,7 @@ description = "Desktop Pet Pomodoro Buddy"
 authors = ["you"]
 license = "MIT"
 edition = "2021"
-rust-version = "1.90"
+rust-version = "1.98.1"
 
 [lib]
 name = "app_lib"
@@ -21,5 +21,4 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 chrono = { version = "0.4", features = ["serde"] }
 uuid = { version = "1", features = ["v4"] }
-log = "0.4"
 tauri-plugin-clipboard-manager = "2.3.2"
diff --git a/src-tauri/rust-toolchain.toml b/src-tauri/rust-toolchain.toml
new file mode 100644
index 0000000..68c0ea2
--- /dev/null
+++ b/src-tauri/rust-toolchain.toml
@@ -0,0 +1,3 @@
+[toolchain]
+channel = "1.98.1"
+components = ["rustfmt", "clippy"]
diff --git a/src-tauri/src/achievements.rs b/src-tauri/src/achievements.rs
index 49cafc8..7e77844 100644
--- a/src-tauri/src/achievements.rs
+++ b/src-tauri/src/achievements.rs
@@ -136,7 +136,7 @@ pub fn initialize_achievements() -> Vec<Achievement> {
             id: "pet_evolved".to_string(),
             category: "pet".to_string(),
             title: "Growing Up".to_string(),
-            description: "Evolve your pet to stage 2".to_string(),
+            description: "Evolve your pet to evolution stage 2".to_string(),
             icon: "🌱".to_string(),
             unlocked_at: None,
             progress: 0,
@@ -147,7 +147,7 @@ pub fn initialize_achievements() -> Vec<Achievement> {
             id: "pet_mastery".to_string(),
             category: "pet".to_string(),
             title: "Pet Master".to_string(),
-            description: "Evolve your pet to stage 3".to_string(),
+            description: "Evolve your pet to evolution stage 3".to_string(),
             icon: "🌳".to_string(),
             unlocked_at: None,
             progress: 0,
@@ -192,11 +192,14 @@ pub fn initialize_achievements() -> Vec<Achievement> {
             id: "collector".to_string(),
             category: "progression".to_string(),
             title: "Collector".to_string(),
-            description: "Own 10 accessories".to_string(),
+            description: format!(
+                "Collect all {} accessories",
+                crate::commands::shop::accessory_count()
+            ),
             icon: "🎨".to_string(),
             unlocked_at: None,
             progress: 0,
-            target: 10,
+            target: crate::commands::shop::accessory_count(),
             hidden: false,
         },
         // Special Achievements
@@ -238,33 +241,78 @@ pub fn initialize_achievements() -> Vec<Achievement> {
 
 /// Check and update achievement progress based on user progress
 pub fn check_progress_achievements(
-    achievements: &mut Vec<Achievement>,
+    achievements: &mut [Achievement],
     progress: &UserProgress,
 ) -> Vec<String> {
     let mut newly_unlocked = Vec::new();
 
     // Focus session achievements
-    check_and_unlock(achievements, "first_session", progress.total_sessions, &mut newly_unlocked);
-    check_and_unlock(achievements, "focused_5", progress.total_sessions, &mut newly_unlocked);
-    check_and_unlock(achievements, "focused_25", progress.total_sessions, &mut newly_unlocked);
-    check_and_unlock(achievements, "focused_100", progress.total_sessions, &mut newly_unlocked);
+    check_and_unlock(
+        achievements,
+        "first_session",
+        progress.total_sessions,
+        &mut newly_unlocked,
+    );
+    check_and_unlock(
+        achievements,
+        "focused_5",
+        progress.total_sessions,
+        &mut newly_unlocked,
+    );
+    check_and_unlock(
+        achievements,
+        "focused_25",
+        progress.total_sessions,
+        &mut newly_unlocked,
+    );
+    check_and_unlock(
+        achievements,
+        "focused_100",
+        progress.total_sessions,
+        &mut newly_unlocked,
+    );
 
     // Streak achievements
-    check_and_unlock(achievements, "streak_3", progress.streak_days, &mut newly_unlocked);
-    check_and_unlock(achievements, "streak_7", progress.streak_days, &mut newly_unlocked);
-    check_and_unlock(achievements, "streak_30", progress.streak_days, &mut newly_unlocked);
-    check_and_unlock(achievements, "dedication", progress.streak_days, &mut newly_unlocked);
+    check_and_unlock(
+        achievements,
+        "streak_3",
+        progress.streak_days,
+        &mut newly_unlocked,
+    );
+    check_and_unlock(
+        achievements,
+        "streak_7",
+        progress.streak_days,
+        &mut newly_unlocked,
+    );
+    check_and_unlock(
+        achievements,
+        "streak_30",
+        progress.streak_days,
+        &mut newly_unlocked,
+    );
+    check_and_unlock(
+        achievements,
+        "dedication",
+        progress.streak_days,
+        &mut newly_unlocked,
+    );
 
     // Progression achievements
     check_and_unlock(achievements, "level_5", progress.level, &mut newly_unlocked);
-    check_and_unlock(achievements, "level_10", progress.level, &mut newly_unlocked);
+    check_and_unlock(
+        achievements,
+        "level_10",
+        progress.level,
+        &mut newly_unlocked,
+    );
 
     newly_unlocked
 }
 
 /// Check and update pet-related achievements
 pub fn check_pet_achievements(
-    achievements: &mut Vec<Achievement>,
+    achievements: &mut [Achievement],
     pet: &PetState,
     total_coins: u32,
 ) -> Vec<String> {
@@ -276,10 +324,10 @@ pub fn check_pet_achievements(
     }
 
     // Pet evolution achievements
-    if pet.current_stage >= 2 {
+    if pet.current_stage >= 1 {
         check_and_unlock(achievements, "pet_evolved", 1, &mut newly_unlocked);
     }
-    if pet.current_stage >= 3 {
+    if pet.current_stage >= 2 {
         check_and_unlock(achievements, "pet_mastery", 1, &mut newly_unlocked);
     }
 
@@ -292,20 +340,30 @@ pub fn check_pet_achievements(
     check_and_unlock(achievements, "wealthy", total_coins, &mut newly_unlocked);
 
     // Collector achievement
-    check_and_unlock(achievements, "collector", pet.accessories.len() as u32, &mut newly_unlocked);
+    check_and_unlock(
+        achievements,
+        "collector",
+        pet.owned_accessories.len() as u32,
+        &mut newly_unlocked,
+    );
 
     newly_unlocked
 }
 
 /// Check daily summary for special achievements
 pub fn check_daily_achievements(
-    achievements: &mut Vec<Achievement>,
+    achievements: &mut [Achievement],
     summary: &DailySummary,
 ) -> Vec<String> {
     let mut newly_unlocked = Vec::new();
 
     // Marathon achievement
-    check_and_unlock(achievements, "marathon", summary.sessions_completed, &mut newly_unlocked);
+    check_and_unlock(
+        achievements,
+        "marathon",
+        summary.sessions_completed,
+        &mut newly_unlocked,
+    );
 
     // Perfectionist achievement
     if summary.goals_completed >= 4 {
@@ -317,7 +375,7 @@ pub fn check_daily_achievements(
 
 /// Check time-based achievements
 pub fn check_time_achievements(
-    achievements: &mut Vec<Achievement>,
+    achievements: &mut [Achievement],
     completion_hour: u32,
 ) -> Vec<String> {
     let mut newly_unlocked = Vec::new();
@@ -337,7 +395,7 @@ pub fn check_time_achievements(
 
 /// Helper function to check and unlock an achievement
 fn check_and_unlock(
-    achievements: &mut Vec<Achievement>,
+    achievements: &mut [Achievement],
     id: &str,
     current_progress: u32,
     newly_unlocked: &mut Vec<String>,
@@ -358,7 +416,10 @@ pub fn get_achievement_stats(achievements: &[Achievement]) -> HashMap<String, u3
     let mut stats = HashMap::new();
 
     let total = achievements.len() as u32;
-    let unlocked = achievements.iter().filter(|a| a.unlocked_at.is_some()).count() as u32;
+    let unlocked = achievements
+        .iter()
+        .filter(|a| a.unlocked_at.is_some())
+        .count() as u32;
 
     stats.insert("total".to_string(), total);
     stats.insert("unlocked".to_string(), unlocked);
@@ -389,6 +450,58 @@ mod tests {
         assert!(achievements.iter().all(|a| a.unlocked_at.is_none()));
     }
 
+    #[test]
+    fn every_defined_achievement_has_a_reachable_unlock_condition() {
+        let mut achievements = initialize_achievements();
+        let progress = UserProgress {
+            xp_total: u32::MAX,
+            level: u32::MAX,
+            streak_days: u32::MAX,
+            longest_streak: u32::MAX,
+            last_active_date: Some("2026-10-12".to_string()),
+            total_sessions: u32::MAX,
+            total_focus_minutes: u32::MAX,
+            total_tasks_completed: u32::MAX,
+        };
+        let pet = PetState {
+            last_interaction: Some("2026-10-12T00:00:00Z".to_string()),
+            current_stage: 2,
+            energy: 100,
+            hunger: 0,
+            cleanliness: 100,
+            affection: 100,
+            owned_accessories: vec![
+                "party_hat".into(),
+                "bow_tie".into(),
+                "sunglasses".into(),
+                "scarf".into(),
+                "apple".into(),
+                "cookie".into(),
+            ],
+            ..PetState::default()
+        };
+        let mut reached = check_progress_achievements(&mut achievements, &progress);
+        reached.extend(check_pet_achievements(&mut achievements, &pet, u32::MAX));
+        reached.extend(check_daily_achievements(
+            &mut achievements,
+            &DailySummary {
+                sessions_completed: 10,
+                goals_completed: 4,
+                ..DailySummary::default()
+            },
+        ));
+        reached.extend(check_time_achievements(&mut achievements, 7));
+        reached.extend(check_time_achievements(&mut achievements, 22));
+        assert_eq!(reached.len(), 20);
+        assert_eq!(
+            reached
+                .into_iter()
+                .collect::<std::collections::HashSet<_>>()
+                .len(),
+            20
+        );
+    }
+
     #[test]
     fn test_check_progress_achievements() {
         let mut achievements = initialize_achievements();
diff --git a/src-tauri/src/commands/achievements.rs b/src-tauri/src/commands/achievements.rs
index 63b8922..df50e08 100644
--- a/src-tauri/src/commands/achievements.rs
+++ b/src-tauri/src/commands/achievements.rs
@@ -2,7 +2,9 @@ use crate::achievements::{
     check_daily_achievements, check_pet_achievements, check_progress_achievements,
     check_time_achievements, initialize_achievements,
 };
-use crate::models::{Achievement, AchievementState, CoinBalance, DailySummary, PetState, UserProgress};
+use crate::models::{
+    Achievement, AchievementState, CoinBalance, DailySummary, PetState, UserProgress,
+};
 use crate::StoreLock;
 use std::collections::HashMap;
 use tauri::{AppHandle, Emitter, State};
@@ -56,7 +58,9 @@ pub async fn get_achievement_stats(
         .and_then(|v| serde_json::from_value(v.clone()).ok())
         .unwrap_or_default();
 
-    Ok(crate::achievements::get_achievement_stats(&achievement_state.achievements))
+    Ok(crate::achievements::get_achievement_stats(
+        &achievement_state.achievements,
+    ))
 }
 
 /// Check and update achievement progress (called after significant events)
@@ -103,26 +107,19 @@ pub async fn check_achievement_progress(
     let mut all_newly_unlocked = Vec::new();
 
     // Check progress-based achievements
-    let newly_unlocked = check_progress_achievements(
-        &mut achievement_state.achievements,
-        &user_progress,
-    );
+    let newly_unlocked =
+        check_progress_achievements(&mut achievement_state.achievements, &user_progress);
     all_newly_unlocked.extend(newly_unlocked);
 
     // Check pet-based achievements
-    let newly_unlocked = check_pet_achievements(
-        &mut achievement_state.achievements,
-        &pet,
-        coins.total,
-    );
+    let newly_unlocked =
+        check_pet_achievements(&mut achievement_state.achievements, &pet, coins.total);
     all_newly_unlocked.extend(newly_unlocked);
 
     // Check daily achievements if there's a recent summary (newest first)
     if let Some(latest_summary) = daily_summaries.first() {
-        let newly_unlocked = check_daily_achievements(
-            &mut achievement_state.achievements,
-            latest_summary,
-        );
+        let newly_unlocked =
+            check_daily_achievements(&mut achievement_state.achievements, latest_summary);
         all_newly_unlocked.extend(newly_unlocked);
     }
 
@@ -185,10 +182,8 @@ pub async fn check_time_achievement(
         achievement_state.achievements = initialize_achievements();
     }
 
-    let newly_unlocked = check_time_achievements(
-        &mut achievement_state.achievements,
-        completion_hour,
-    );
+    let newly_unlocked =
+        check_time_achievements(&mut achievement_state.achievements, completion_hour);
 
     if !newly_unlocked.is_empty() {
         // Update total unlocked count
diff --git a/src-tauri/src/commands/customization.rs b/src-tauri/src/commands/customization.rs
index 31552a3..0d27259 100644
--- a/src-tauri/src/commands/customization.rs
+++ b/src-tauri/src/commands/customization.rs
@@ -22,7 +22,7 @@ const MAX_LOADOUTS: usize = 40;
 const MAX_LOADOUT_NAME_CHARS: usize = 64;
 
 fn validate_variant(value: &str, allowed: &[&str], field: &str) -> Result<(), String> {
-    if allowed.iter().any(|candidate| *candidate == value) {
+    if allowed.contains(&value) {
         Ok(())
     } else {
         Err(format!("Invalid {}: {}", field, value))
@@ -43,6 +43,14 @@ fn sanitize_accessories(accessories: Vec<String>) -> Vec<String> {
     sanitized
 }
 
+fn equipped_accessories_for_loadout(accessories: &[String], owned: &[String]) -> Vec<String> {
+    accessories
+        .iter()
+        .filter(|accessory| owned.contains(accessory))
+        .cloned()
+        .collect()
+}
+
 fn sanitize_loadout(mut loadout: CustomizationLoadout) -> Result<CustomizationLoadout, String> {
     let name = loadout.name.trim();
     if name.is_empty() {
@@ -101,7 +109,7 @@ pub fn get_customization_loadouts(app: AppHandle) -> Result<Vec<CustomizationLoa
         .get("customization_loadouts")
         .and_then(|v| serde_json::from_value(v).ok())
         .unwrap_or_default();
-    loadouts.sort_by(|a, b| a.name.to_lowercase().cmp(&b.name.to_lowercase()));
+    loadouts.sort_by_key(|a| a.name.to_lowercase());
     Ok(loadouts)
 }
 
@@ -158,7 +166,8 @@ pub fn apply_customization_loadout(
     let mut pet = load_pet(&app)?;
     pet.skin = loadout.pet_skin.clone();
     pet.scene = loadout.pet_scene.clone();
-    pet.accessories = loadout.accessories.clone();
+    pet.accessories =
+        equipped_accessories_for_loadout(&loadout.accessories, &pet.owned_accessories);
     store.set("pet", json!(pet));
 
     let _ = app.emit(EVENT_SETTINGS_CHANGED, settings);
@@ -168,7 +177,9 @@ pub fn apply_customization_loadout(
 
 #[cfg(test)]
 mod tests {
-    use super::{sanitize_accessories, sanitize_loadout, upsert_loadout};
+    use super::{
+        equipped_accessories_for_loadout, sanitize_accessories, sanitize_loadout, upsert_loadout,
+    };
     use crate::models::CustomizationLoadout;
 
     #[test]
@@ -181,6 +192,13 @@ mod tests {
         assert_eq!(sanitized, vec!["party_hat".to_string()]);
     }
 
+    #[test]
+    fn loadout_equipment_does_not_change_ownership() {
+        let owned = vec!["party_hat".to_string()];
+        let loadout = vec!["party_hat".to_string(), "scarf".to_string()];
+        assert_eq!(equipped_accessories_for_loadout(&loadout, &owned), owned);
+    }
+
     #[test]
     fn sanitize_loadout_trims_name() {
         let loadout = CustomizationLoadout {
diff --git a/src-tauri/src/commands/focus_guardrails.rs b/src-tauri/src/commands/focus_guardrails.rs
index 06a6e4d..d34ce92 100644
--- a/src-tauri/src/commands/focus_guardrails.rs
+++ b/src-tauri/src/commands/focus_guardrails.rs
@@ -188,7 +188,9 @@ pub fn apply_focus_guardrails_intervention(
     }
     if status.active {
         let _ = append_guardrail_event(&app, &status, &sampled_hosts);
-        let _ = crate::progression::record_guardrail_intervention(&app, &status.nudge_level);
+        crate::progression::record_guardrail_intervention(&app, &status.nudge_level).map_err(
+            |error| format!("Guardrail event recorded, but progression update failed: {error}"),
+        )?;
         let _ = app.emit(EVENT_FOCUS_GUARDRAILS_ALERT, &status);
     }
     Ok(status)
diff --git a/src-tauri/src/commands/goals.rs b/src-tauri/src/commands/goals.rs
index 8985cc6..81ef83f 100644
--- a/src-tauri/src/commands/goals.rs
+++ b/src-tauri/src/commands/goals.rs
@@ -9,6 +9,26 @@ fn today() -> String {
     chrono::Utc::now().format("%Y-%m-%d").to_string()
 }
 
+fn breaks_for_date(events: &[String], date: &str) -> u32 {
+    events
+        .iter()
+        .filter(|timestamp| {
+            chrono::DateTime::parse_from_rfc3339(timestamp)
+                .ok()
+                .map(|value| {
+                    value
+                        .with_timezone(&chrono::Utc)
+                        .format("%Y-%m-%d")
+                        .to_string()
+                        == date
+                })
+                .unwrap_or(false)
+        })
+        .count()
+        .try_into()
+        .unwrap_or(u32::MAX)
+}
+
 fn default_goals(date: &str) -> Vec<DailyGoal> {
     vec![
         DailyGoal {
@@ -50,17 +70,43 @@ fn load_goals(app: &AppHandle) -> Result<Vec<DailyGoal>, String> {
         .unwrap_or_default();
 
     let date = today();
-    let has_current_date = !goals.is_empty() && goals.iter().all(|goal| goal.date == date);
-    if !has_current_date {
-        let new_goals = default_goals(&date);
-        store.set("goals", json!(new_goals));
-        Ok(store
-            .get("goals")
-            .and_then(|v| serde_json::from_value(v).ok())
-            .unwrap_or_default())
+    let mut current_goals = if !goals.is_empty() && goals.iter().all(|goal| goal.date == date) {
+        goals
     } else {
-        Ok(goals)
+        default_goals(&date)
+    };
+    let breaks: Vec<String> = store
+        .get("break_events")
+        .and_then(|value| serde_json::from_value(value).ok())
+        .unwrap_or_default();
+    if let Some(goal) = current_goals.iter_mut().find(|goal| goal.id == "breaks") {
+        goal.progress = breaks_for_date(&breaks, &date).min(goal.target);
     }
+    store.set("goals", json!(current_goals));
+    Ok(current_goals)
+}
+
+#[tauri::command]
+pub fn record_break_completion(
+    app: AppHandle,
+    store_lock: tauri::State<'_, crate::StoreLock>,
+) -> Result<Vec<DailyGoal>, String> {
+    let _guard = store_lock
+        .0
+        .lock()
+        .map_err(|error| format!("Could not lock app state: {error}"))?;
+    let store = app
+        .store("store.json")
+        .map_err(|error| format!("Could not open app state: {error}"))?;
+    let mut events: Vec<String> = store
+        .get("break_events")
+        .and_then(|value| serde_json::from_value(value).ok())
+        .unwrap_or_default();
+    events.push(chrono::Utc::now().to_rfc3339());
+    store.set("break_events", json!(events));
+    let goals = load_goals(&app)?;
+    let _ = app.emit(EVENT_GOALS_CHANGED, &goals);
+    Ok(goals)
 }
 
 #[tauri::command]
@@ -99,7 +145,8 @@ fn save_goal_progress_delta(app: &AppHandle, goal_id: &str, delta: u32) -> Resul
     let _ = app.emit(EVENT_GOALS_CHANGED, &goals);
 
     if newly_completed {
-        let _ = crate::progression::record_goal_completion(app);
+        crate::progression::record_goal_completion(app)
+            .map_err(|error| format!("Goal completed, but progression reward failed: {error}"))?;
     }
 
     Ok(())
@@ -126,7 +173,8 @@ pub fn update_goal_progress(
     store.set("goals", json!(goals));
     let _ = app.emit(EVENT_GOALS_CHANGED, &goals);
     if newly_completed {
-        let _ = crate::progression::record_goal_completion(&app);
+        crate::progression::record_goal_completion(&app)
+            .map_err(|error| format!("Goal completed, but progression reward failed: {error}"))?;
     }
     Ok(goals)
 }
@@ -135,6 +183,18 @@ pub fn update_goal_progress(
 mod tests {
     use super::*;
 
+    #[test]
+    fn daily_break_count_uses_event_dates() {
+        let events = vec![
+            "2026-10-11T23:59:00Z".to_string(),
+            "2026-10-12T00:01:00Z".to_string(),
+            "not-a-date".to_string(),
+        ];
+        assert_eq!(breaks_for_date(&events, "2026-10-12"), 1);
+        assert_eq!(breaks_for_date(&events, "2026-10-11"), 1);
+        assert_eq!(breaks_for_date(&events, "2026-10-13"), 0);
+    }
+
     #[test]
     fn default_goals_have_correct_count() {
         let goals = default_goals("2025-01-01");
diff --git a/src-tauri/src/commands/maintenance.rs b/src-tauri/src/commands/maintenance.rs
index df71b18..c30840d 100644
--- a/src-tauri/src/commands/maintenance.rs
+++ b/src-tauri/src/commands/maintenance.rs
@@ -1,3 +1,4 @@
+use serde::de::DeserializeOwned;
 use serde_json::json;
 use tauri::{AppHandle, Emitter};
 use tauri_plugin_store::StoreExt;
@@ -10,118 +11,116 @@ use crate::{
     models::{AppDiagnostics, AppSnapshot, CURRENT_SCHEMA_VERSION},
 };
 
-const MAX_TASKS: usize = 2_000;
-const MAX_SESSIONS: usize = 10_000;
-const MAX_SUMMARIES: usize = 365;
-const MAX_LOADOUTS: usize = 200;
-const MAX_PET_EVENTS: usize = 200;
-const MAX_GUARDRAIL_EVENTS: usize = 500;
-
-fn cap_len<T>(values: &mut Vec<T>, max_len: usize) {
-    if values.len() > max_len {
-        values.truncate(max_len);
-    }
-}
-
 fn sanitize_snapshot(mut snapshot: AppSnapshot) -> AppSnapshot {
+    // Backups preserve domain values exactly; validation belongs at mutation boundaries.
     snapshot.schema_version = CURRENT_SCHEMA_VERSION;
+    snapshot
+}
 
-    crate::commands::settings::sanitize_settings(&mut snapshot.settings);
-
-    snapshot.tasks.retain(|task| !task.title.trim().is_empty());
-    for task in &mut snapshot.tasks {
-        task.title = task.title.trim().chars().take(140).collect();
+fn validate_snapshot(snapshot: &AppSnapshot) -> Result<(), String> {
+    if snapshot.schema_version > CURRENT_SCHEMA_VERSION {
+        return Err(format!(
+            "Backup schema {} is newer than supported schema {}",
+            snapshot.schema_version, CURRENT_SCHEMA_VERSION
+        ));
     }
+    if snapshot.schema_version < CURRENT_SCHEMA_VERSION.saturating_sub(1) {
+        return Err(format!(
+            "Unsupported backup schema {}; expected {} or {}",
+            snapshot.schema_version,
+            CURRENT_SCHEMA_VERSION - 1,
+            CURRENT_SCHEMA_VERSION
+        ));
+    }
+    if snapshot.schema_version == CURRENT_SCHEMA_VERSION && snapshot.format != "desktop-pet-backup"
+    {
+        return Err("Backup format identity is invalid".to_string());
+    }
+    if snapshot.schema_version == CURRENT_SCHEMA_VERSION - 1
+        && !snapshot.format.is_empty()
+        && snapshot.format != "desktop-pet-backup"
+    {
+        return Err("Backup format identity is invalid".to_string());
+    }
+    chrono::DateTime::parse_from_rfc3339(&snapshot.exported_at)
+        .map_err(|_| "Backup exportedAt must be an RFC 3339 timestamp".to_string())?;
+    Ok(())
+}
 
-    snapshot.timer_runtime.total_seconds =
-        snapshot.timer_runtime.total_seconds.clamp(60, 3 * 60 * 60);
-    snapshot.timer_runtime.seconds_left = snapshot
-        .timer_runtime
-        .seconds_left
-        .min(snapshot.timer_runtime.total_seconds);
-
-    cap_len(&mut snapshot.tasks, MAX_TASKS);
-    cap_len(&mut snapshot.sessions, MAX_SESSIONS);
-    cap_len(&mut snapshot.summaries, MAX_SUMMARIES);
-    cap_len(&mut snapshot.customization_loadouts, MAX_LOADOUTS);
-    cap_len(&mut snapshot.pet_events, MAX_PET_EVENTS);
-    cap_len(&mut snapshot.focus_guardrail_events, MAX_GUARDRAIL_EVENTS);
-
-    snapshot
+fn decode_store_value<T: DeserializeOwned + Default>(
+    value: Option<serde_json::Value>,
+    key: &str,
+) -> Result<T, String> {
+    value
+        .map(|value| {
+            serde_json::from_value(value)
+                .map_err(|error| format!("Stored {key} data is malformed: {error}"))
+        })
+        .unwrap_or_else(|| Ok(T::default()))
 }
 
 fn load_snapshot(app: &AppHandle) -> Result<AppSnapshot, String> {
     let store = app.store("store.json").map_err(|e| e.to_string())?;
 
-    let schema_version = store
-        .get("schema_version")
-        .and_then(|v| v.as_u64())
-        .and_then(|v| u32::try_from(v).ok())
-        .unwrap_or(CURRENT_SCHEMA_VERSION);
+    let schema_version = match store.get("schema_version") {
+        None => CURRENT_SCHEMA_VERSION,
+        Some(value) => u32::try_from(
+            value
+                .as_u64()
+                .ok_or_else(|| "Stored schema version is malformed".to_string())?,
+        )
+        .map_err(|_| "Stored schema version is out of range".to_string())?,
+    };
 
-    Ok(sanitize_snapshot(AppSnapshot {
+    Ok(AppSnapshot {
+        format: "desktop-pet-backup".to_string(),
         schema_version,
         exported_at: chrono::Utc::now().to_rfc3339(),
-        pet: store
-            .get("pet")
-            .and_then(|v| serde_json::from_value(v).ok())
-            .unwrap_or_default(),
-        coins: store
-            .get("coins")
-            .and_then(|v| serde_json::from_value(v).ok())
-            .unwrap_or_default(),
-        tasks: store
-            .get("tasks")
-            .and_then(|v| serde_json::from_value(v).ok())
-            .unwrap_or_default(),
-        goals: store
-            .get("goals")
-            .and_then(|v| serde_json::from_value(v).ok())
-            .unwrap_or_default(),
-        sessions: store
-            .get("sessions")
-            .and_then(|v| serde_json::from_value(v).ok())
-            .unwrap_or_default(),
-        settings: store
-            .get("settings")
-            .and_then(|v| serde_json::from_value(v).ok())
-            .unwrap_or_default(),
-        timer_runtime: store
-            .get("timer_runtime")
-            .and_then(|v| serde_json::from_value(v).ok())
-            .unwrap_or_default(),
-        progress: store
-            .get("user_progress")
-            .and_then(|v| serde_json::from_value(v).ok())
-            .unwrap_or_default(),
-        summaries: store
-            .get("daily_summaries")
-            .and_then(|v| serde_json::from_value(v).ok())
-            .unwrap_or_default(),
-        customization_loadouts: store
-            .get("customization_loadouts")
-            .and_then(|v| serde_json::from_value(v).ok())
-            .unwrap_or_default(),
-        pet_events: store
-            .get("pet_events")
-            .and_then(|v| serde_json::from_value(v).ok())
-            .unwrap_or_default(),
-        pet_active_quest: store
-            .get("pet_active_quest")
-            .and_then(|v| serde_json::from_value(v).ok())
-            .unwrap_or_default(),
-        focus_guardrail_events: store
-            .get("focus_guardrail_events")
-            .and_then(|v| serde_json::from_value(v).ok())
-            .unwrap_or_default(),
-    }))
+        pet: decode_store_value(store.get("pet"), "pet")?,
+        coins: decode_store_value(store.get("coins"), "coins")?,
+        tasks: decode_store_value(store.get("tasks"), "tasks")?,
+        goals: decode_store_value(store.get("goals"), "goals")?,
+        sessions: decode_store_value(store.get("sessions"), "sessions")?,
+        settings: decode_store_value(store.get("settings"), "settings")?,
+        timer_runtime: decode_store_value(store.get("timer_runtime"), "timer_runtime")?,
+        progress: decode_store_value(store.get("user_progress"), "user_progress")?,
+        summaries: decode_store_value(store.get("daily_summaries"), "daily_summaries")?,
+        customization_loadouts: decode_store_value(
+            store.get("customization_loadouts"),
+            "customization_loadouts",
+        )?,
+        pet_events: decode_store_value(store.get("pet_events"), "pet_events")?,
+        pet_active_quest: decode_store_value(store.get("pet_active_quest"), "pet_active_quest")?,
+        focus_guardrail_events: decode_store_value(
+            store.get("focus_guardrail_events"),
+            "focus_guardrail_events",
+        )?,
+        achievement_state: decode_store_value(store.get("achievement_state"), "achievement_state")?,
+        quest_recent_focus: decode_store_value(
+            store.get("pet_recent_focus_progress"),
+            "pet_recent_focus_progress",
+        )?,
+        quest_recent_care: decode_store_value(
+            store.get("pet_recent_care_progress"),
+            "pet_recent_care_progress",
+        )?,
+        quest_last_kind: decode_store_value(
+            store.get("pet_last_quest_kind"),
+            "pet_last_quest_kind",
+        )?,
+        quest_last_roll_at: decode_store_value(
+            store.get("pet_last_quest_roll_at"),
+            "pet_last_quest_roll_at",
+        )?,
+        break_events: decode_store_value(store.get("break_events"), "break_events")?,
+    })
 }
 
 fn save_snapshot(app: &AppHandle, snapshot: AppSnapshot) -> Result<(), String> {
     let store = app.store("store.json").map_err(|e| e.to_string())?;
     let snapshot = sanitize_snapshot(snapshot);
 
-    // Persist only canonical keys and flush immediately for explicit import/reset flows.
+    // Persist all domain keys and flush immediately for explicit import/reset flows.
     store.clear();
     store.set("schema_version", json!(CURRENT_SCHEMA_VERSION));
     store.set("pet", json!(snapshot.pet));
@@ -143,11 +142,44 @@ fn save_snapshot(app: &AppHandle, snapshot: AppSnapshot) -> Result<(), String> {
         "focus_guardrail_events",
         json!(snapshot.focus_guardrail_events),
     );
+    store.set("achievement_state", json!(snapshot.achievement_state));
+    store.set(
+        "pet_recent_focus_progress",
+        json!(snapshot.quest_recent_focus),
+    );
+    store.set(
+        "pet_recent_care_progress",
+        json!(snapshot.quest_recent_care),
+    );
+    store.set("pet_last_quest_kind", json!(snapshot.quest_last_kind));
+    store.set("pet_last_quest_roll_at", json!(snapshot.quest_last_roll_at));
+    store.set("break_events", json!(snapshot.break_events));
     store.save().map_err(|e| e.to_string())?;
 
     Ok(())
 }
 
+fn save_with_rollback<F>(
+    next: &AppSnapshot,
+    previous: &AppSnapshot,
+    mut persist: F,
+) -> Result<(), String>
+where
+    F: FnMut(&AppSnapshot) -> Result<(), String>,
+{
+    if let Err(error) = persist(next) {
+        return match persist(previous) {
+            Ok(()) => Err(format!(
+                "Import save failed; previous data restored: {error}"
+            )),
+            Err(rollback_error) => Err(format!(
+                "Import save failed: {error}; rollback also failed: {rollback_error}"
+            )),
+        };
+    }
+    Ok(())
+}
+
 fn emit_snapshot_refresh_events(app: &AppHandle, snapshot: &AppSnapshot) {
     let _ = app.emit(EVENT_PET_STATE_CHANGED, &snapshot.pet);
     let _ = app.emit(EVENT_COINS_CHANGED, &snapshot.coins);
@@ -170,8 +202,19 @@ pub fn import_app_snapshot(
     snapshot: AppSnapshot,
 ) -> Result<String, String> {
     let _guard = store_lock.0.lock().map_err(|e| e.to_string())?;
+    validate_snapshot(&snapshot)?;
+    let mut snapshot = snapshot;
+    if snapshot.schema_version == CURRENT_SCHEMA_VERSION - 1 {
+        if snapshot.pet.owned_accessories.is_empty() {
+            snapshot.pet.owned_accessories = snapshot.pet.accessories.clone();
+        }
+        snapshot.format = "desktop-pet-backup".to_string();
+    }
     let snapshot = sanitize_snapshot(snapshot);
-    save_snapshot(&app, snapshot.clone())?;
+    let previous = load_snapshot(&app)?;
+    save_with_rollback(&snapshot, &previous, |candidate| {
+        save_snapshot(&app, candidate.clone())
+    })?;
     emit_snapshot_refresh_events(&app, &snapshot);
     Ok("Import complete".to_string())
 }
@@ -210,85 +253,80 @@ pub fn get_app_diagnostics(app: AppHandle) -> Result<AppDiagnostics, String> {
 
 #[cfg(test)]
 mod tests {
-    use super::sanitize_snapshot;
-    use crate::models::{AppSnapshot, Task, TimerRuntimeState};
+    use super::{sanitize_snapshot, save_with_rollback, validate_snapshot};
+    use crate::models::{AchievementState, AppSnapshot, Task, CURRENT_SCHEMA_VERSION};
 
     #[test]
-    fn sanitize_snapshot_trims_empty_tasks_and_caps_lengths() {
-        let mut snapshot = AppSnapshot::default();
-        snapshot.tasks = vec![
-            Task {
-                id: "1".to_string(),
-                title: " ".to_string(),
-                completed: false,
-                created_at: "2026-01-01T00:00:00Z".to_string(),
-            },
-            Task {
-                id: "2".to_string(),
-                title: "  Keep this task  ".to_string(),
-                completed: false,
-                created_at: "2026-01-01T00:00:00Z".to_string(),
+    fn snapshot_round_trip_preserves_persisted_state_and_long_collections() {
+        let snapshot = AppSnapshot {
+            tasks: (0..2_100)
+                .map(|index| Task {
+                    id: index.to_string(),
+                    title: format!(" task {index} "),
+                    completed: false,
+                    reward_claimed: false,
+                    created_at: "2026-01-01T00:00:00Z".to_string(),
+                })
+                .collect(),
+            quest_recent_focus: 7,
+            achievement_state: AchievementState {
+                total_unlocked: 3,
+                ..AchievementState::default()
             },
-        ];
+            ..AppSnapshot::default()
+        };
+        let serialized = serde_json::to_value(&snapshot).unwrap();
+        let restored: AppSnapshot = serde_json::from_value(serialized.clone()).unwrap();
+        assert_eq!(serde_json::to_value(restored).unwrap(), serialized);
+        assert_eq!(sanitize_snapshot(snapshot.clone()).tasks.len(), 2_100);
+    }
 
-        let sanitized = sanitize_snapshot(snapshot);
-        assert_eq!(sanitized.tasks.len(), 1);
-        assert_eq!(sanitized.tasks[0].title, "Keep this task");
+    #[test]
+    fn rejects_empty_malformed_and_future_schema_backups() {
+        assert!(serde_json::from_str::<AppSnapshot>("{}").is_err());
+        assert!(serde_json::from_str::<AppSnapshot>("not json").is_err());
+        let future = AppSnapshot {
+            schema_version: CURRENT_SCHEMA_VERSION + 1,
+            ..AppSnapshot::default()
+        };
+        assert!(validate_snapshot(&future).is_err());
     }
 
     #[test]
-    fn sanitize_snapshot_clamps_runtime() {
+    fn validates_backup_identity_and_supported_schema() {
+        assert!(validate_snapshot(&AppSnapshot::default()).is_ok());
         let snapshot = AppSnapshot {
-            timer_runtime: TimerRuntimeState {
-                phase: "work".to_string(),
-                seconds_left: 999_999,
-                total_seconds: 999_999,
-                paused: false,
-                session_id: Some("abc".to_string()),
-                sessions_completed: 1,
-                preset: "standard".to_string(),
-                last_updated_at: "2026-01-01T00:00:00Z".to_string(),
-            },
+            exported_at: "invalid".to_string(),
             ..AppSnapshot::default()
         };
-
-        let sanitized = sanitize_snapshot(snapshot);
-        assert_eq!(sanitized.timer_runtime.total_seconds, 3 * 60 * 60);
-        assert_eq!(sanitized.timer_runtime.seconds_left, 3 * 60 * 60);
+        assert!(validate_snapshot(&snapshot).is_err());
+        let invalid_identity = AppSnapshot {
+            format: "another-app".to_string(),
+            ..AppSnapshot::default()
+        };
+        assert!(validate_snapshot(&invalid_identity).is_err());
     }
 
     #[test]
-    fn sanitize_snapshot_normalizes_settings() {
-        let mut snapshot = AppSnapshot::default();
-        snapshot.settings.timer_preset = "very-long".to_string();
-        snapshot.settings.ui_theme = "neon".to_string();
-        snapshot.settings.pet_skin = "retro".to_string();
-        snapshot.settings.pet_scene = "moon".to_string();
-        snapshot.settings.sound_volume = f32::NAN;
-        snapshot.settings.focus_allowlist = vec![
-            "https://Docs.YouTube.com/watch?v=1".to_string(),
-            "docs.youtube.com".to_string(),
-            "bad host".to_string(),
-        ];
-        snapshot.settings.focus_blocklist = vec![
-            "Example.com".to_string(),
-            "https://example.com/path".to_string(),
-            "bad*host".to_string(),
-        ];
-
-        let sanitized = sanitize_snapshot(snapshot);
-        assert_eq!(sanitized.settings.timer_preset, "standard");
-        assert_eq!(sanitized.settings.ui_theme, "sunrise");
-        assert_eq!(sanitized.settings.pet_skin, "classic");
-        assert_eq!(sanitized.settings.pet_scene, "meadow");
-        assert_eq!(sanitized.settings.sound_volume, 0.7);
-        assert_eq!(
-            sanitized.settings.focus_allowlist,
-            vec!["docs.youtube.com".to_string()]
-        );
-        assert_eq!(
-            sanitized.settings.focus_blocklist,
-            vec!["example.com".to_string()]
-        );
+    fn failed_snapshot_save_restores_previous_value() {
+        let previous = AppSnapshot::default();
+        let next = AppSnapshot {
+            pet: crate::models::PetState {
+                total_pomodoros: 10,
+                ..crate::models::PetState::default()
+            },
+            ..AppSnapshot::default()
+        };
+        let mut persisted = serde_json::to_value(&previous).unwrap();
+        let result = save_with_rollback(&next, &previous, |candidate| {
+            persisted = serde_json::to_value(candidate).unwrap();
+            if candidate.pet.total_pomodoros == 10 {
+                Err("simulated persistence failure".to_string())
+            } else {
+                Ok(())
+            }
+        });
+        assert!(result.is_err());
+        assert_eq!(persisted, serde_json::to_value(previous).unwrap());
     }
 }
diff --git a/src-tauri/src/commands/pet.rs b/src-tauri/src/commands/pet.rs
index 2164183..2cbe10e 100644
--- a/src-tauri/src/commands/pet.rs
+++ b/src-tauri/src/commands/pet.rs
@@ -54,7 +54,7 @@ fn normalize_evolution_thresholds(input: Option<Vec<u32>>) -> Vec<u32> {
         values = vec![0, 5, 15];
     }
     let stage1 = values[1].max(1);
-    let stage2 = values[2].max(stage1 + 1);
+    let stage2 = values[2].max(stage1.saturating_add(1));
     vec![0, stage1, stage2]
 }
 
@@ -76,7 +76,7 @@ fn stage_for_total_pomodoros(total_pomodoros: u32, thresholds: &[u32]) -> u32 {
     }
 }
 
-fn clamp_metric(value: i32) -> u32 {
+fn clamp_metric(value: i64) -> u32 {
     value.clamp(0, 100) as u32
 }
 
@@ -94,10 +94,11 @@ fn apply_care_decay(mut pet: PetState) -> PetState {
         return pet;
     }
 
-    pet.energy = clamp_metric(pet.energy as i32 - elapsed_hours * 2);
-    pet.hunger = clamp_metric(pet.hunger as i32 + elapsed_hours * 3);
-    pet.cleanliness = clamp_metric(pet.cleanliness as i32 - elapsed_hours);
-    pet.affection = clamp_metric(pet.affection as i32 - elapsed_hours / 2);
+    let elapsed_hours = i64::from(elapsed_hours);
+    pet.energy = clamp_metric(pet.energy as i64 - elapsed_hours * 2);
+    pet.hunger = clamp_metric(pet.hunger as i64 + elapsed_hours * 3);
+    pet.cleanliness = clamp_metric(pet.cleanliness as i64 - elapsed_hours);
+    pet.affection = clamp_metric(pet.affection as i64 - elapsed_hours / 2);
     pet.last_care_update_at = chrono::Utc::now().to_rfc3339();
 
     pet.mood = if pet.energy < 25 {
@@ -117,10 +118,11 @@ fn apply_care_decay(mut pet: PetState) -> PetState {
 
 fn load_pet(app: &AppHandle) -> Result<PetState, String> {
     let store = app.store("store.json").map_err(|e| e.to_string())?;
-    let pet: PetState = store
-        .get("pet")
-        .and_then(|v| serde_json::from_value(v).ok())
-        .unwrap_or_default();
+    let pet: PetState = match store.get("pet") {
+        None => PetState::default(),
+        Some(value) => serde_json::from_value(value)
+            .map_err(|error| format!("Stored pet data is malformed: {error}"))?,
+    };
     Ok(apply_care_decay(pet))
 }
 
@@ -306,9 +308,8 @@ fn select_quest_template_for_pet(
     recent_focus: u32,
     recent_care: u32,
 ) -> QuestTemplate {
-    let offset =
-        (pet.total_pomodoros + pet.current_stage + recent_focus + recent_care) as usize
-            % QUEST_TEMPLATES.len();
+    let offset = (pet.total_pomodoros + pet.current_stage + recent_focus + recent_care) as usize
+        % QUEST_TEMPLATES.len();
     let mut ranked = Vec::with_capacity(QUEST_TEMPLATES.len());
     for step in 0..QUEST_TEMPLATES.len() {
         let candidate = QUEST_TEMPLATES[(offset + step) % QUEST_TEMPLATES.len()];
@@ -317,11 +318,13 @@ fn select_quest_template_for_pet(
             quest_total_score(candidate, pet, last_quest_kind, recent_focus, recent_care),
         ));
     }
-    ranked.sort_by(|(left_template, left_score), (right_template, right_score)| {
-        right_score
-            .cmp(left_score)
-            .then_with(|| left_template.kind.cmp(right_template.kind))
-    });
+    ranked.sort_by(
+        |(left_template, left_score), (right_template, right_score)| {
+            right_score
+                .cmp(left_score)
+                .then_with(|| left_template.kind.cmp(right_template.kind))
+        },
+    );
     if let Some(last_kind) = last_quest_kind {
         if let Some((template, score)) = ranked.first().copied() {
             if template.kind == last_kind {
@@ -338,7 +341,10 @@ fn select_quest_template_for_pet(
             return template;
         }
     }
-    ranked.first().map(|(template, _)| *template).unwrap_or(QUEST_TEMPLATES[0])
+    ranked
+        .first()
+        .map(|(template, _)| *template)
+        .unwrap_or(QUEST_TEMPLATES[0])
 }
 
 fn load_recent_quest_progress(app: &AppHandle) -> Result<(u32, u32), String> {
@@ -410,7 +416,9 @@ fn save_last_quest_kind(app: &AppHandle, quest_kind: &str) -> Result<(), String>
     Ok(())
 }
 
-fn load_last_quest_roll_at(app: &AppHandle) -> Result<Option<chrono::DateTime<chrono::Utc>>, String> {
+fn load_last_quest_roll_at(
+    app: &AppHandle,
+) -> Result<Option<chrono::DateTime<chrono::Utc>>, String> {
     let store = app.store("store.json").map_err(|e| e.to_string())?;
     let raw: Option<String> = store
         .get(QUEST_LAST_ROLL_KEY)
@@ -542,35 +550,35 @@ pub fn pet_interact(
 
     match action.as_str() {
         "pet" => {
-            pet.affection = clamp_metric(pet.affection as i32 + 8);
-            pet.energy = clamp_metric(pet.energy as i32 - 1);
+            pet.affection = clamp_metric(pet.affection as i64 + 8);
+            pet.energy = clamp_metric(pet.energy as i64 - 1);
             pet.animation_state = "clicked".to_string();
         }
         "feed" => {
-            pet.hunger = clamp_metric(pet.hunger as i32 - 25);
-            pet.affection = clamp_metric(pet.affection as i32 + 4);
+            pet.hunger = clamp_metric(pet.hunger as i64 - 25);
+            pet.affection = clamp_metric(pet.affection as i64 + 4);
             pet.animation_state = "celebrating".to_string();
         }
         "play" => {
-            pet.affection = clamp_metric(pet.affection as i32 + 10);
-            pet.energy = clamp_metric(pet.energy as i32 - 8);
-            pet.cleanliness = clamp_metric(pet.cleanliness as i32 - 4);
+            pet.affection = clamp_metric(pet.affection as i64 + 10);
+            pet.energy = clamp_metric(pet.energy as i64 - 8);
+            pet.cleanliness = clamp_metric(pet.cleanliness as i64 - 4);
             pet.animation_state = "celebrating".to_string();
         }
         "nap" => {
-            pet.energy = clamp_metric(pet.energy as i32 + 20);
-            pet.hunger = clamp_metric(pet.hunger as i32 + 8);
+            pet.energy = clamp_metric(pet.energy as i64 + 20);
+            pet.hunger = clamp_metric(pet.hunger as i64 + 8);
             pet.animation_state = "break".to_string();
         }
         "clean" => {
-            pet.cleanliness = clamp_metric(pet.cleanliness as i32 + 22);
-            pet.affection = clamp_metric(pet.affection as i32 + 3);
+            pet.cleanliness = clamp_metric(pet.cleanliness as i64 + 22);
+            pet.affection = clamp_metric(pet.affection as i64 + 3);
             pet.animation_state = "idle".to_string();
         }
         "train" => {
-            pet.energy = clamp_metric(pet.energy as i32 - 12);
-            pet.hunger = clamp_metric(pet.hunger as i32 + 12);
-            pet.affection = clamp_metric(pet.affection as i32 + 6);
+            pet.energy = clamp_metric(pet.energy as i64 - 12);
+            pet.hunger = clamp_metric(pet.hunger as i64 + 12);
+            pet.affection = clamp_metric(pet.affection as i64 + 6);
             pet.animation_state = "working".to_string();
         }
         _ => return Err("Unknown pet interaction".to_string()),
@@ -711,13 +719,13 @@ fn progress_active_quest(
         .get("coins")
         .and_then(|v| serde_json::from_value(v).ok())
         .unwrap_or_default();
-    coins.total += quest.reward_coins;
+    coins.total = coins.total.saturating_add(quest.reward_coins);
     store.set("coins", json!(coins));
     let _ = app.emit(EVENT_COINS_CHANGED, &coins);
 
     let mut pet = load_pet(app)?;
-    pet.affection = clamp_metric(pet.affection as i32 + 12);
-    pet.energy = clamp_metric(pet.energy as i32 + 4);
+    pet.affection = clamp_metric(pet.affection as i64 + 12);
+    pet.energy = clamp_metric(pet.energy as i64 + 4);
     pet.mood = "proud".to_string();
     pet.animation_state = "celebrating".to_string();
     pet.last_interaction = Some("quest_complete".to_string());
@@ -828,9 +836,11 @@ pub fn roll_pet_event(
     };
 
     let mut events = load_events(&app)?;
-    let duplicate_unresolved = events
-        .iter()
-        .any(|existing| !existing.resolved && existing.kind == event.kind && existing.description == event.description);
+    let duplicate_unresolved = events.iter().any(|existing| {
+        !existing.resolved
+            && existing.kind == event.kind
+            && existing.description == event.description
+    });
     if !duplicate_unresolved {
         events.push(event.clone());
         let _ = save_bounded_events(&app, events)?;
@@ -842,9 +852,9 @@ pub fn roll_pet_event(
 mod tests {
     use super::{
         apply_quest_progress, cooldown_remaining_secs, create_quest_for_pet,
-        select_quest_template_for_pet,
         normalize_evolution_thresholds, normalize_species_id, quest_reward_for_stage,
-        quest_target_for_stage, validate_variant, QuestProgressKind, ALLOWED_ANIMATIONS,
+        quest_target_for_stage, select_quest_template_for_pet, validate_variant, QuestProgressKind,
+        ALLOWED_ANIMATIONS,
     };
     use crate::models::{PetQuest, PetState};
 
@@ -878,8 +888,14 @@ mod tests {
 
     #[test]
     fn normalize_evolution_thresholds_repairs_invalid_input() {
-        assert_eq!(normalize_evolution_thresholds(Some(vec![0, 0, 0])), vec![0, 1, 2]);
-        assert_eq!(normalize_evolution_thresholds(Some(vec![0, 8, 4])), vec![0, 8, 9]);
+        assert_eq!(
+            normalize_evolution_thresholds(Some(vec![0, 0, 0])),
+            vec![0, 1, 2]
+        );
+        assert_eq!(
+            normalize_evolution_thresholds(Some(vec![0, 8, 4])),
+            vec![0, 8, 9]
+        );
     }
 
     #[test]
@@ -948,26 +964,31 @@ mod tests {
 
     #[test]
     fn create_quest_for_pet_avoids_recent_kind_when_possible() {
-        let mut pet = PetState::default();
-        pet.total_pomodoros = 4;
+        let pet = PetState {
+            total_pomodoros: 4,
+            ..PetState::default()
+        };
         let quest = create_quest_for_pet(&pet, Some("focus_sessions"), 2, 1);
         assert_ne!(quest.kind, "focus_sessions");
     }
 
     #[test]
     fn quest_selection_prefers_care_when_recent_focus_is_high() {
-        let mut pet = PetState::default();
-        pet.current_stage = 2;
-        let template =
-            select_quest_template_for_pet(&pet, Some("focus_sessions"), 6, 1);
+        let pet = PetState {
+            current_stage: 2,
+            ..PetState::default()
+        };
+        let template = select_quest_template_for_pet(&pet, Some("focus_sessions"), 6, 1);
         assert!(template.kind == "care_actions" || template.kind == "mindful_reset");
     }
 
     #[test]
     fn quest_selection_accounts_for_accessory_bias() {
-        let mut pet = PetState::default();
-        pet.current_stage = 2;
-        pet.accessories = vec!["apple".to_string(), "cookie".to_string()];
+        let pet = PetState {
+            current_stage: 2,
+            accessories: vec!["apple".to_string(), "cookie".to_string()],
+            ..PetState::default()
+        };
         let quest = create_quest_for_pet(&pet, None, 1, 1);
         assert!(quest.kind == "care_actions" || quest.kind == "mindful_reset");
     }
diff --git a/src-tauri/src/commands/pomodoro.rs b/src-tauri/src/commands/pomodoro.rs
index 92b5f94..2ef61df 100644
--- a/src-tauri/src/commands/pomodoro.rs
+++ b/src-tauri/src/commands/pomodoro.rs
@@ -1,5 +1,5 @@
-use serde_json::json;
 use chrono::Timelike;
+use serde_json::json;
 use tauri::{AppHandle, Emitter};
 use tauri_plugin_store::StoreExt;
 
@@ -27,7 +27,7 @@ fn normalized_thresholds(raw: &[u32]) -> [u32; 3] {
         return [0, DEFAULT_STAGE_1_THRESHOLD, DEFAULT_STAGE_2_THRESHOLD];
     }
     let stage1 = raw[1].max(1);
-    let stage2 = raw[2].max(stage1 + 1);
+    let stage2 = raw[2].max(stage1.saturating_add(1));
     [0, stage1, stage2]
 }
 
@@ -99,7 +99,13 @@ pub async fn complete_pomodoro(
         .find(|s| s.id == session_id)
         .ok_or_else(|| "Session not found".to_string())?;
     if session.completed_at.is_some() {
-        return Err("Session already completed".to_string());
+        return store
+            .get("pet")
+            .ok_or_else(|| "Completed session exists but pet state is missing".to_string())
+            .and_then(|value| {
+                serde_json::from_value(value)
+                    .map_err(|error| format!("Stored pet data is malformed: {error}"))
+            });
     }
     session.completed_at = Some(chrono::Utc::now().to_rfc3339());
     let completed_work_duration = session.work_duration;
@@ -110,7 +116,7 @@ pub async fn complete_pomodoro(
         .get("coins")
         .and_then(|v| serde_json::from_value(v).ok())
         .unwrap_or_default();
-    coins.total += COINS_PER_POMODORO;
+    coins.total = coins.total.saturating_add(COINS_PER_POMODORO);
     store.set("coins", json!(coins));
     let _ = app.emit(EVENT_COINS_CHANGED, &coins);
 
@@ -119,10 +125,10 @@ pub async fn complete_pomodoro(
         .get("pet")
         .and_then(|v| serde_json::from_value(v).ok())
         .unwrap_or_default();
-    pet.total_pomodoros += 1;
+    pet.total_pomodoros = pet.total_pomodoros.saturating_add(1);
     pet.energy = pet.energy.saturating_sub(3);
-    pet.hunger = (pet.hunger + 4).min(100);
-    pet.affection = (pet.affection + 2).min(100);
+    pet.hunger = pet.hunger.saturating_add(4).min(100);
+    pet.affection = pet.affection.saturating_add(2).min(100);
     pet.animation_state = "celebrating".to_string();
 
     let new_stage = stage_for_total_pomodoros(pet.total_pomodoros, &pet.evolution_thresholds);
@@ -136,9 +142,11 @@ pub async fn complete_pomodoro(
         .get("user_progress")
         .and_then(|v| serde_json::from_value(v).ok())
         .unwrap_or_default();
-    let focus_bias = progress.total_focus_minutes + (completed_work_duration / 60);
-    let task_bias = progress.total_tasks_completed * 20;
-    pet.evolution_path = if focus_bias > task_bias + 120 {
+    let focus_bias = progress
+        .total_focus_minutes
+        .saturating_add(completed_work_duration / 60);
+    let task_bias = progress.total_tasks_completed.saturating_mul(20);
+    pet.evolution_path = if focus_bias > task_bias.saturating_add(120) {
         "scholar".to_string()
     } else if task_bias > focus_bias {
         "guardian".to_string()
@@ -155,23 +163,27 @@ pub async fn complete_pomodoro(
     let _ = app.emit(EVENT_PET_STATE_CHANGED, &pet);
 
     // Update daily goal for pomodoros
-    let _ = crate::commands::goals::increment_goal_progress(&app, "pomodoros");
-    let _ = crate::commands::goals::add_goal_progress(
-        &app,
-        "focus_minutes",
-        completed_work_duration / 60,
-    );
-    let _ =
-        crate::progression::record_focus_session(&app, completed_work_duration, COINS_PER_POMODORO);
-    let _ = crate::commands::pet::advance_focus_quest(&app, 1);
+    crate::commands::goals::increment_goal_progress(&app, "pomodoros")
+        .map_err(|error| format!("Session completed, but pomodoro goal update failed: {error}"))?;
+    crate::commands::goals::add_goal_progress(&app, "focus_minutes", completed_work_duration / 60)
+        .map_err(|error| {
+            format!("Session completed, but focus-minute goal update failed: {error}")
+        })?;
+    crate::progression::record_focus_session(&app, completed_work_duration, COINS_PER_POMODORO)
+        .map_err(|error| format!("Session completed, but progression reward failed: {error}"))?;
+    crate::commands::pet::advance_focus_quest(&app, 1)
+        .map_err(|error| format!("Session completed, but quest progress update failed: {error}"))?;
 
     // Release the store lock before invoking nested commands that lock the store.
     drop(_guard);
 
     // Check for achievement unlocks
     let completion_hour = chrono::Local::now().hour();
-    let _ = crate::commands::achievements::check_achievement_progress(app.clone(), store_lock.clone()).await;
-    let _ = crate::commands::achievements::check_time_achievement(app, store_lock, completion_hour).await;
+    let _ =
+        crate::commands::achievements::check_achievement_progress(app.clone(), store_lock.clone())
+            .await;
+    let _ = crate::commands::achievements::check_time_achievement(app, store_lock, completion_hour)
+        .await;
 
     Ok(pet)
 }
@@ -182,7 +194,14 @@ mod tests {
 
     #[test]
     fn evolution_thresholds_ordering() {
-        assert!(DEFAULT_STAGE_1_THRESHOLD < DEFAULT_STAGE_2_THRESHOLD);
+        assert_eq!(
+            normalized_thresholds(&[]),
+            [0, DEFAULT_STAGE_1_THRESHOLD, DEFAULT_STAGE_2_THRESHOLD]
+        );
+        assert_eq!(
+            stage_for_total_pomodoros(u32::MAX, &[0, u32::MAX, u32::MAX]),
+            2
+        );
     }
 
     #[test]
diff --git a/src-tauri/src/commands/progress.rs b/src-tauri/src/commands/progress.rs
index c89b026..3c9f70c 100644
--- a/src-tauri/src/commands/progress.rs
+++ b/src-tauri/src/commands/progress.rs
@@ -1,13 +1,20 @@
-use tauri::AppHandle;
+use tauri::{AppHandle, State};
 
 use crate::models::{DailySummary, UserProgress};
 
 #[tauri::command]
-pub fn get_user_progress(app: AppHandle) -> Result<UserProgress, String> {
+pub fn get_user_progress(
+    app: AppHandle,
+    store_lock: State<'_, crate::StoreLock>,
+) -> Result<UserProgress, String> {
+    let _guard = store_lock
+        .0
+        .lock()
+        .map_err(|error| format!("Could not lock app state: {error}"))?;
     crate::progression::get_user_progress(&app)
 }
 
 #[tauri::command]
 pub fn get_daily_summaries(app: AppHandle, days: Option<u32>) -> Result<Vec<DailySummary>, String> {
-    crate::progression::get_daily_summaries(&app, days.unwrap_or(14).max(1).min(90))
+    crate::progression::get_daily_summaries(&app, days.unwrap_or(14).clamp(1, 90))
 }
diff --git a/src-tauri/src/commands/settings.rs b/src-tauri/src/commands/settings.rs
index 9d403a4..5f4387e 100644
--- a/src-tauri/src/commands/settings.rs
+++ b/src-tauri/src/commands/settings.rs
@@ -27,7 +27,7 @@ const MIN_TYPING_THRESHOLD_CPM: u32 = 80;
 const MAX_TYPING_THRESHOLD_CPM: u32 = 420;
 
 fn is_allowed(value: &str, allowed: &[&str]) -> bool {
-    allowed.iter().any(|candidate| *candidate == value)
+    allowed.contains(&value)
 }
 
 fn normalize_host_pattern(value: &str) -> Option<String> {
@@ -138,7 +138,10 @@ fn normalize_notification_whitelist(input: Vec<String>) -> Vec<String> {
     }
 
     if output.is_empty() {
-        vec!["session_complete".to_string(), "guardrail_alert".to_string()]
+        vec![
+            "session_complete".to_string(),
+            "guardrail_alert".to_string(),
+        ]
     } else {
         output
     }
diff --git a/src-tauri/src/commands/shop.rs b/src-tauri/src/commands/shop.rs
index e9fb2e8..4796151 100644
--- a/src-tauri/src/commands/shop.rs
+++ b/src-tauri/src/commands/shop.rs
@@ -48,6 +48,10 @@ fn shop_catalog() -> Vec<ShopItem> {
     ]
 }
 
+pub fn accessory_count() -> u32 {
+    shop_catalog().len().try_into().unwrap_or(u32::MAX)
+}
+
 #[tauri::command]
 pub fn get_shop_items() -> Vec<ShopItem> {
     shop_catalog()
@@ -67,7 +71,7 @@ pub fn purchase_item(
         .and_then(|v| serde_json::from_value(v).ok())
         .unwrap_or_default();
 
-    if pet.accessories.contains(&item_id) {
+    if pet.owned_accessories.contains(&item_id) {
         return Err("Already owned".to_string());
     }
 
@@ -86,10 +90,11 @@ pub fn purchase_item(
         return Err("Insufficient coins".to_string());
     }
 
-    coins.spent += item.cost;
+    coins.spent = coins.spent.saturating_add(item.cost);
     store.set("coins", json!(coins));
     let _ = app.emit(EVENT_COINS_CHANGED, &coins);
 
+    pet.owned_accessories.push(item_id.clone());
     pet.accessories.push(item_id);
     store.set("pet", json!(pet));
     let _ = app.emit(EVENT_PET_STATE_CHANGED, &pet);
diff --git a/src-tauri/src/commands/tasks.rs b/src-tauri/src/commands/tasks.rs
index 8360b13..dc88a88 100644
--- a/src-tauri/src/commands/tasks.rs
+++ b/src-tauri/src/commands/tasks.rs
@@ -34,6 +34,15 @@ fn save_tasks(app: &AppHandle, tasks: &[Task]) -> Result<(), String> {
     Ok(())
 }
 
+fn toggle_completion(task: &mut Task) -> bool {
+    task.completed = !task.completed;
+    if task.completed && !task.reward_claimed {
+        task.reward_claimed = true;
+        return true;
+    }
+    false
+}
+
 #[tauri::command]
 pub fn get_tasks(app: AppHandle) -> Result<Vec<Task>, String> {
     load_tasks(&app)
@@ -52,6 +61,7 @@ pub fn add_task(
         id: uuid::Uuid::new_v4().to_string(),
         title,
         completed: false,
+        reward_claimed: false,
         created_at: chrono::Utc::now().to_rfc3339(),
     };
     tasks.push(task.clone());
@@ -67,21 +77,19 @@ pub fn toggle_task(
 ) -> Result<Vec<Task>, String> {
     let _guard = store_lock.0.lock().map_err(|e| e.to_string())?;
     let mut tasks = load_tasks(&app)?;
-    let was_incomplete = tasks
-        .iter()
+    let should_reward = tasks
+        .iter_mut()
         .find(|t| t.id == task_id)
-        .map(|t| !t.completed)
+        .map(toggle_completion)
         .unwrap_or(false);
-
-    if let Some(task) = tasks.iter_mut().find(|t| t.id == task_id) {
-        task.completed = !task.completed;
-    }
     save_tasks(&app, &tasks)?;
 
     // If task was just completed, increment goal
-    if was_incomplete {
-        let _ = crate::commands::goals::increment_goal_progress(&app, "tasks");
-        let _ = crate::progression::record_task_completion(&app);
+    if should_reward {
+        crate::commands::goals::increment_goal_progress(&app, "tasks")
+            .map_err(|error| format!("Task completed, but task goal progress failed: {error}"))?;
+        crate::progression::record_task_completion(&app)
+            .map_err(|error| format!("Task completed, but progression reward failed: {error}"))?;
     }
 
     Ok(tasks)
@@ -104,6 +112,26 @@ pub fn delete_task(
 mod tests {
     use super::*;
 
+    fn task() -> Task {
+        Task {
+            id: "one-time".to_string(),
+            title: "Finish task".to_string(),
+            completed: false,
+            reward_claimed: false,
+            created_at: "2026-01-01T00:00:00Z".to_string(),
+        }
+    }
+
+    #[test]
+    fn task_reward_is_claimed_only_once_across_recompletion() {
+        let mut task = task();
+        assert!(toggle_completion(&mut task));
+        assert!(!toggle_completion(&mut task));
+        assert!(!toggle_completion(&mut task));
+        assert!(task.completed);
+        assert!(task.reward_claimed);
+    }
+
     #[test]
     fn normalize_task_title_trims() {
         let title = normalize_task_title("  ship release  ".to_string()).unwrap();
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 6707124..749164a 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -62,6 +62,7 @@ pub fn run() {
             commands::tasks::delete_task,
             commands::goals::get_daily_goals,
             commands::goals::update_goal_progress,
+            commands::goals::record_break_completion,
             commands::shop::get_shop_items,
             commands::shop::purchase_item,
             commands::maintenance::export_app_snapshot,
diff --git a/src-tauri/src/models.rs b/src-tauri/src/models.rs
index f8200e8..c58b57b 100644
--- a/src-tauri/src/models.rs
+++ b/src-tauri/src/models.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-pub const CURRENT_SCHEMA_VERSION: u32 = 4;
+pub const CURRENT_SCHEMA_VERSION: u32 = 5;
 
 fn default_quest_kind() -> String {
     "focus_sessions".to_string()
@@ -13,6 +13,8 @@ pub struct PetState {
     pub current_stage: u32,
     pub animation_state: String,
     pub accessories: Vec<String>,
+    #[serde(default)]
+    pub owned_accessories: Vec<String>,
     pub total_pomodoros: u32,
     pub species_id: String,
     pub evolution_thresholds: Vec<u32>,
@@ -35,6 +37,7 @@ impl Default for PetState {
             current_stage: 0,
             animation_state: "idle".to_string(),
             accessories: vec![],
+            owned_accessories: vec![],
             total_pomodoros: 0,
             species_id: "penguin".to_string(),
             evolution_thresholds: vec![0, 5, 15],
@@ -87,19 +90,13 @@ pub struct PomodoroSession {
     pub break_duration: u32,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct CoinBalance {
     pub total: u32,
     pub spent: u32,
 }
 
-impl Default for CoinBalance {
-    fn default() -> Self {
-        Self { total: 0, spent: 0 }
-    }
-}
-
 impl CoinBalance {
     pub fn available(&self) -> u32 {
         self.total.saturating_sub(self.spent)
@@ -112,6 +109,8 @@ pub struct Task {
     pub id: String,
     pub title: String,
     pub completed: bool,
+    #[serde(default)]
+    pub reward_claimed: bool,
     pub created_at: String,
 }
 
@@ -430,9 +429,10 @@ pub struct FocusGuardrailEvent {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(default)]
 #[serde(rename_all = "camelCase")]
 pub struct AppSnapshot {
+    #[serde(default)]
+    pub format: String,
     pub schema_version: u32,
     pub exported_at: String,
     pub pet: PetState,
@@ -448,11 +448,24 @@ pub struct AppSnapshot {
     pub pet_events: Vec<PetEvent>,
     pub pet_active_quest: Option<PetQuest>,
     pub focus_guardrail_events: Vec<FocusGuardrailEvent>,
+    #[serde(default)]
+    pub achievement_state: AchievementState,
+    #[serde(default)]
+    pub quest_recent_focus: u32,
+    #[serde(default)]
+    pub quest_recent_care: u32,
+    #[serde(default)]
+    pub quest_last_kind: Option<String>,
+    #[serde(default)]
+    pub quest_last_roll_at: Option<String>,
+    #[serde(default)]
+    pub break_events: Vec<String>,
 }
 
 impl Default for AppSnapshot {
     fn default() -> Self {
         Self {
+            format: "desktop-pet-backup".to_string(),
             schema_version: CURRENT_SCHEMA_VERSION,
             exported_at: chrono::Utc::now().to_rfc3339(),
             pet: PetState::default(),
@@ -468,6 +481,12 @@ impl Default for AppSnapshot {
             pet_events: vec![],
             pet_active_quest: None,
             focus_guardrail_events: vec![],
+            achievement_state: AchievementState::default(),
+            quest_recent_focus: 0,
+            quest_recent_care: 0,
+            quest_last_kind: None,
+            quest_last_roll_at: None,
+            break_events: vec![],
         }
     }
 }
@@ -504,7 +523,7 @@ pub struct Achievement {
     pub hidden: bool,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(default)]
 #[serde(rename_all = "camelCase")]
 pub struct AchievementState {
@@ -513,16 +532,6 @@ pub struct AchievementState {
     pub last_unlocked_id: Option<String>,
 }
 
-impl Default for AchievementState {
-    fn default() -> Self {
-        Self {
-            achievements: vec![],
-            total_unlocked: 0,
-            last_unlocked_id: None,
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -631,6 +640,7 @@ mod tests {
             current_stage: 1,
             animation_state: "working".to_string(),
             accessories: vec!["party_hat".to_string(), "bow_tie".to_string()],
+            owned_accessories: vec!["party_hat".to_string(), "bow_tie".to_string()],
             total_pomodoros: 7,
             species_id: "penguin".to_string(),
             evolution_thresholds: vec![0, 5, 15],
@@ -659,6 +669,7 @@ mod tests {
             current_stage: 2,
             animation_state: "celebrating".to_string(),
             accessories: vec!["sunglasses".to_string()],
+            owned_accessories: vec!["sunglasses".to_string()],
             total_pomodoros: 20,
             species_id: "penguin".to_string(),
             evolution_thresholds: vec![0, 5, 15],
@@ -775,6 +786,7 @@ mod tests {
             id: "test".to_string(),
             title: "Test".to_string(),
             completed: false,
+            reward_claimed: false,
             created_at: "2025-01-01".to_string(),
         };
         let json = serde_json::to_value(&t).unwrap();
@@ -788,6 +800,7 @@ mod tests {
             id: "t1".to_string(),
             title: "Write tests".to_string(),
             completed: true,
+            reward_claimed: false,
             created_at: "2025-01-01T12:00:00Z".to_string(),
         };
         let json_str = serde_json::to_string(&original).unwrap();
@@ -923,10 +936,7 @@ mod tests {
         assert!(!restored.quiet_mode_enabled);
         assert!(restored.focus_mode_enabled);
         assert_eq!(restored.animation_budget, "low");
-        assert_eq!(
-            restored.meeting_hosts,
-            vec!["meet.google.com".to_string()]
-        );
+        assert_eq!(restored.meeting_hosts, vec!["meet.google.com".to_string()]);
         assert_eq!(restored.heavy_typing_threshold_cpm, 260);
         assert_eq!(
             restored.enabled_seasonal_packs,
diff --git a/src-tauri/src/progression.rs b/src-tauri/src/progression.rs
index b28975c..8b51235 100644
--- a/src-tauri/src/progression.rs
+++ b/src-tauri/src/progression.rs
@@ -32,7 +32,7 @@ fn update_streak(progress: &mut UserProgress, active_date: &str) {
                 _ => false,
             };
             progress.streak_days = if continues_streak {
-                progress.streak_days + 1
+                progress.streak_days.saturating_add(1)
             } else {
                 1
             };
@@ -132,16 +132,20 @@ pub fn record_focus_session(
     coins_earned: u32,
 ) -> Result<(), String> {
     mutate_progress(app, |progress| {
-        progress.total_sessions += 1;
-        progress.total_focus_minutes += work_duration_secs / 60;
-        progress.xp_total += XP_PER_POMODORO;
+        progress.total_sessions = progress.total_sessions.saturating_add(1);
+        progress.total_focus_minutes = progress
+            .total_focus_minutes
+            .saturating_add(work_duration_secs / 60);
+        progress.xp_total = progress.xp_total.saturating_add(XP_PER_POMODORO);
     })?;
 
     mutate_today_summary(app, |summary| {
-        summary.sessions_completed += 1;
-        summary.focus_minutes += work_duration_secs / 60;
-        summary.coins_earned += coins_earned;
-        summary.xp_earned += XP_PER_POMODORO;
+        summary.sessions_completed = summary.sessions_completed.saturating_add(1);
+        summary.focus_minutes = summary
+            .focus_minutes
+            .saturating_add(work_duration_secs / 60);
+        summary.coins_earned = summary.coins_earned.saturating_add(coins_earned);
+        summary.xp_earned = summary.xp_earned.saturating_add(XP_PER_POMODORO);
     })?;
 
     Ok(())
@@ -149,13 +153,13 @@ pub fn record_focus_session(
 
 pub fn record_task_completion(app: &AppHandle) -> Result<(), String> {
     mutate_progress(app, |progress| {
-        progress.total_tasks_completed += 1;
-        progress.xp_total += XP_PER_TASK_COMPLETION;
+        progress.total_tasks_completed = progress.total_tasks_completed.saturating_add(1);
+        progress.xp_total = progress.xp_total.saturating_add(XP_PER_TASK_COMPLETION);
     })?;
 
     mutate_today_summary(app, |summary| {
-        summary.tasks_completed += 1;
-        summary.xp_earned += XP_PER_TASK_COMPLETION;
+        summary.tasks_completed = summary.tasks_completed.saturating_add(1);
+        summary.xp_earned = summary.xp_earned.saturating_add(XP_PER_TASK_COMPLETION);
     })?;
 
     Ok(())
@@ -163,12 +167,12 @@ pub fn record_task_completion(app: &AppHandle) -> Result<(), String> {
 
 pub fn record_goal_completion(app: &AppHandle) -> Result<(), String> {
     mutate_progress(app, |progress| {
-        progress.xp_total += XP_PER_GOAL_COMPLETION;
+        progress.xp_total = progress.xp_total.saturating_add(XP_PER_GOAL_COMPLETION);
     })?;
 
     mutate_today_summary(app, |summary| {
-        summary.goals_completed += 1;
-        summary.xp_earned += XP_PER_GOAL_COMPLETION;
+        summary.goals_completed = summary.goals_completed.saturating_add(1);
+        summary.xp_earned = summary.xp_earned.saturating_add(XP_PER_GOAL_COMPLETION);
     })?;
 
     Ok(())
@@ -176,9 +180,9 @@ pub fn record_goal_completion(app: &AppHandle) -> Result<(), String> {
 
 pub fn record_guardrail_intervention(app: &AppHandle, nudge_level: &str) -> Result<(), String> {
     mutate_today_summary(app, |summary| {
-        summary.guardrails_interventions += 1;
+        summary.guardrails_interventions = summary.guardrails_interventions.saturating_add(1);
         if nudge_level == "high" {
-            summary.high_nudges += 1;
+            summary.high_nudges = summary.high_nudges.saturating_add(1);
         }
     })?;
     Ok(())
diff --git a/src-tauri/src/storage.rs b/src-tauri/src/storage.rs
index f25d383..443ea4e 100644
--- a/src-tauri/src/storage.rs
+++ b/src-tauri/src/storage.rs
@@ -2,21 +2,73 @@ use serde_json::json;
 use tauri::AppHandle;
 use tauri_plugin_store::StoreExt;
 
-use crate::models::{AchievementState, CoinBalance, PetState, Settings, TimerRuntimeState, CURRENT_SCHEMA_VERSION};
+use crate::models::{
+    AchievementState, CoinBalance, PetState, Settings, TimerRuntimeState, CURRENT_SCHEMA_VERSION,
+};
 
-fn normalized_schema(existing: Option<u64>) -> u32 {
-    existing
-        .and_then(|v| u32::try_from(v).ok())
-        .unwrap_or(CURRENT_SCHEMA_VERSION)
+fn normalized_schema(existing: Option<u64>) -> Result<u32, String> {
+    match existing {
+        None => Ok(4),
+        Some(value) => {
+            u32::try_from(value).map_err(|_| "Stored schema version is invalid".to_string())
+        }
+    }
+}
+
+fn migrate_store(
+    store: &tauri_plugin_store::Store<tauri::Wry>,
+    mut version: u32,
+) -> Result<u32, String> {
+    if version > CURRENT_SCHEMA_VERSION {
+        return Err(format!(
+            "Stored schema {version} is newer than supported schema {CURRENT_SCHEMA_VERSION}"
+        ));
+    }
+    while version < CURRENT_SCHEMA_VERSION {
+        match version {
+            4 => {
+                if let Some(mut pet) = store.get("pet") {
+                    if let Some(object) = pet.as_object_mut() {
+                        if !object.contains_key("ownedAccessories") {
+                            let existing = object
+                                .get("accessories")
+                                .cloned()
+                                .unwrap_or_else(|| serde_json::json!([]));
+                            object.insert("ownedAccessories".to_string(), existing);
+                        }
+                        store.set("pet", pet);
+                    }
+                }
+                version = 5;
+                store.set("schema_version", json!(version));
+            }
+            _ => {
+                return Err(format!(
+                    "No storage migration is available from schema {version}"
+                ))
+            }
+        }
+    }
+    Ok(version)
 }
 
 pub fn ensure_schema_version(app: &AppHandle) -> Result<u32, String> {
     let store = app.store("store.json").map_err(|e| e.to_string())?;
-    let existing = store.get("schema_version").and_then(|v| v.as_u64());
-    let current = normalized_schema(existing);
+    let existing = match store.get("schema_version") {
+        Some(value) => Some(
+            value
+                .as_u64()
+                .ok_or_else(|| "Stored schema version is malformed".to_string())?,
+        ),
+        None => None,
+    };
+    let current = migrate_store(&store, normalized_schema(existing)?)?;
 
-    if existing.is_none() || current != CURRENT_SCHEMA_VERSION {
+    if existing.is_none() {
         store.set("schema_version", json!(CURRENT_SCHEMA_VERSION));
+        store
+            .save()
+            .map_err(|error| format!("Could not initialize schema version: {error}"))?;
     }
     if store.get("settings").is_none() {
         store.set("settings", json!(Settings::default()));
@@ -34,26 +86,29 @@ pub fn ensure_schema_version(app: &AppHandle) -> Result<u32, String> {
         store.set("achievement_state", json!(AchievementState::default()));
     }
 
+    store
+        .save()
+        .map_err(|error| format!("Could not save storage migration: {error}"))?;
+
     Ok(current)
 }
 
 #[cfg(test)]
 mod tests {
     use super::normalized_schema;
-    use crate::models::CURRENT_SCHEMA_VERSION;
 
     #[test]
     fn normalized_schema_uses_current_when_missing() {
-        assert_eq!(normalized_schema(None), CURRENT_SCHEMA_VERSION);
+        assert_eq!(normalized_schema(None).unwrap(), 4);
     }
 
     #[test]
     fn normalized_schema_uses_current_when_invalid() {
-        assert_eq!(normalized_schema(Some(u64::MAX)), CURRENT_SCHEMA_VERSION);
+        assert!(normalized_schema(Some(u64::MAX)).is_err());
     }
 
     #[test]
     fn normalized_schema_uses_existing_when_valid() {
-        assert_eq!(normalized_schema(Some(3)), 3);
+        assert_eq!(normalized_schema(Some(3)).unwrap(), 3);
     }
 }
diff --git a/src/components/panel/AchievementsPanel.tsx b/src/components/panel/AchievementsPanel.tsx
index fb5761a..a16eb9e 100644
--- a/src/components/panel/AchievementsPanel.tsx
+++ b/src/components/panel/AchievementsPanel.tsx
@@ -13,15 +13,12 @@ const CATEGORIES: { id: AchievementCategory | "all"; label: string }[] = [
 ];
 
 export function AchievementsPanel() {
-  const {
-    achievements,
-    stats,
-    loading,
-    getByCategory,
-    getCompletionPercent,
-  } = useAchievements();
+  const { achievements, stats, loading, getByCategory, getCompletionPercent } =
+    useAchievements();
 
-  const [selectedCategory, setSelectedCategory] = useState<AchievementCategory | "all">("all");
+  const [selectedCategory, setSelectedCategory] = useState<
+    AchievementCategory | "all"
+  >("all");
   const [filter, setFilter] = useState<"all" | "unlocked" | "locked">("all");
 
   // Get filtered achievements
@@ -57,7 +54,9 @@ export function AchievementsPanel() {
     <div className="flex h-full flex-col overflow-hidden">
       {/* Header */}
       <div className="border-b border-gray-200 p-4 dark:border-gray-700">
-        <h2 className="text-xl font-bold text-gray-900 dark:text-gray-100">Achievements</h2>
+        <h2 className="text-xl font-bold text-gray-900 dark:text-gray-100">
+          Achievements
+        </h2>
         <div className="mt-2 flex items-center gap-4 text-sm text-gray-600 dark:text-gray-400">
           <div>
             <span className="font-semibold text-gray-900 dark:text-gray-100">
@@ -103,7 +102,9 @@ export function AchievementsPanel() {
 
         {/* Status Filter */}
         <div>
-          <div className="text-xs font-medium text-gray-500 dark:text-gray-400 mb-2">Status</div>
+          <div className="text-xs font-medium text-gray-500 dark:text-gray-400 mb-2">
+            Status
+          </div>
           <div className="flex gap-2">
             {(["all", "unlocked", "locked"] as const).map((f) => (
               <button
@@ -139,7 +140,8 @@ export function AchievementsPanel() {
                   </div>
                   {achievement.unlockedAt && (
                     <div className="mt-1 text-[10px] text-gray-500 dark:text-gray-500">
-                      Unlocked {new Date(achievement.unlockedAt).toLocaleDateString()}
+                      Unlocked{" "}
+                      {new Date(achievement.unlockedAt).toLocaleDateString()}
                     </div>
                   )}
                 </div>
diff --git a/src/components/panel/CoinDisplay.tsx b/src/components/panel/CoinDisplay.tsx
index 961d93f..bbd8918 100644
--- a/src/components/panel/CoinDisplay.tsx
+++ b/src/components/panel/CoinDisplay.tsx
@@ -31,26 +31,42 @@ export function CoinDisplay({
       <div className="flex items-center justify-between">
         <CoinBadge amount={available} />
         <div className="text-right">
-          <span className="block text-sm font-medium" style={{ color: "var(--muted-color)" }}>
-            Stage: <span style={{ color: "var(--accent-color)" }}>{stageName}</span>
+          <span
+            className="block text-sm font-medium"
+            style={{ color: "var(--muted-color)" }}
+          >
+            Stage:{" "}
+            <span style={{ color: "var(--accent-color)" }}>{stageName}</span>
           </span>
-          <span className="block text-xs" style={{ color: "var(--muted-color)" }}>
+          <span
+            className="block text-xs"
+            style={{ color: "var(--muted-color)" }}
+          >
             Level {level} • {streakDays}-day streak
           </span>
         </div>
       </div>
       {stageSpan > 0 ? (
         <div>
-          <div className="flex justify-between text-xs mb-1" style={{ color: "var(--muted-color)" }}>
+          <div
+            className="flex justify-between text-xs mb-1"
+            style={{ color: "var(--muted-color)" }}
+          >
             <span>Evolution progress</span>
             <span>
               {stageProgress}/{stageSpan}
             </span>
           </div>
-          <ProgressBar value={progressToNext} color="bg-[var(--accent-color)]" />
+          <ProgressBar
+            value={progressToNext}
+            color="bg-[var(--accent-color)]"
+          />
         </div>
       ) : (
-        <div className="text-xs text-center" style={{ color: "var(--muted-color)" }}>
+        <div
+          className="text-xs text-center"
+          style={{ color: "var(--muted-color)" }}
+        >
           Max evolution reached!
         </div>
       )}
diff --git a/src/components/panel/ControlPanel.tsx b/src/components/panel/ControlPanel.tsx
index 4661be1..81b87bd 100644
--- a/src/components/panel/ControlPanel.tsx
+++ b/src/components/panel/ControlPanel.tsx
@@ -245,7 +245,10 @@ export function ControlPanel() {
           />
         )}
         {tab === "shop" && (
-          <ShopPanel available={available} ownedAccessories={pet.accessories} />
+          <ShopPanel
+            available={available}
+            ownedAccessories={pet.ownedAccessories ?? pet.accessories}
+          />
         )}
         {tab === "stats" && (
           <StatsPanel progress={progress} summaries={summaries} />
diff --git a/src/components/panel/CustomizationPanel.tsx b/src/components/panel/CustomizationPanel.tsx
index 5c45f7b..b589d5a 100644
--- a/src/components/panel/CustomizationPanel.tsx
+++ b/src/components/panel/CustomizationPanel.tsx
@@ -6,7 +6,12 @@ import {
 } from "../../pets/packValidation";
 import { getSpeciesPackById, getSpeciesPacks } from "../../pets/species";
 import { getSeasonalPacks } from "../../pets/seasonalPacks";
-import type { CustomizationLoadout, PetState, Settings, SettingsPatch } from "../../store/types";
+import type {
+  CustomizationLoadout,
+  PetState,
+  Settings,
+  SettingsPatch,
+} from "../../store/types";
 
 interface Props {
   settings: Settings;
@@ -23,9 +28,24 @@ const THEMES = ["sunrise", "dusk", "mint", "mono"] as const;
 const SKINS = ["classic", "neon", "pixel", "plush"] as const;
 const SCENES = ["meadow", "forest", "space", "cozy_room"] as const;
 const STYLE_BUNDLES = [
-  { name: "Focus Studio", uiTheme: "mono", petSkin: "pixel", petScene: "cozy_room" },
-  { name: "Cozy Flow", uiTheme: "sunrise", petSkin: "plush", petScene: "meadow" },
-  { name: "Deep Work Orbit", uiTheme: "dusk", petSkin: "neon", petScene: "space" },
+  {
+    name: "Focus Studio",
+    uiTheme: "mono",
+    petSkin: "pixel",
+    petScene: "cozy_room",
+  },
+  {
+    name: "Cozy Flow",
+    uiTheme: "sunrise",
+    petSkin: "plush",
+    petScene: "meadow",
+  },
+  {
+    name: "Deep Work Orbit",
+    uiTheme: "dusk",
+    petSkin: "neon",
+    petScene: "space",
+  },
 ] as const;
 const MONTH_NAMES = [
   "Jan",
@@ -42,7 +62,10 @@ const MONTH_NAMES = [
   "Dec",
 ] as const;
 
-function buildValidationFailureReport(packName: string, result: PackValidationResult) {
+function buildValidationFailureReport(
+  packName: string,
+  result: PackValidationResult,
+) {
   const failures = result.checks.filter((check) => !check.pass);
   if (failures.length === 0) {
     return `${packName} (${result.speciesId}) has no validation failures.`;
@@ -69,8 +92,9 @@ export function CustomizationPanel({
   onApplyLoadout,
 }: Props) {
   const [loadoutName, setLoadoutName] = useState("");
-  const [validationRunAt, setValidationRunAt] = useState<string | null>(null);
-  const [validationMessage, setValidationMessage] = useState<string | null>(null);
+  const [validationMessage, setValidationMessage] = useState<string | null>(
+    null,
+  );
   const speciesPacks = getSpeciesPacks();
   const speciesValidation = validateSpeciesPacks(speciesPacks);
   const selectableSpeciesIds = new Set([
@@ -85,9 +109,17 @@ export function CustomizationPanel({
     <div className="flex flex-col gap-4">
       <div
         className="p-3 rounded-lg border flex flex-col gap-3"
-        style={{ backgroundColor: "var(--card-bg)", borderColor: "var(--border-color)" }}
+        style={{
+          backgroundColor: "var(--card-bg)",
+          borderColor: "var(--border-color)",
+        }}
       >
-        <h3 className="text-sm font-medium" style={{ color: "var(--text-color)" }}>Theme</h3>
+        <h3
+          className="text-sm font-medium"
+          style={{ color: "var(--text-color)" }}
+        >
+          Theme
+        </h3>
         <div className="grid grid-cols-2 gap-2">
           {THEMES.map((theme) => (
             <button
@@ -96,7 +128,9 @@ export function CustomizationPanel({
               className="px-2 py-2 rounded-md border text-xs capitalize"
               style={{
                 backgroundColor:
-                  settings.uiTheme === theme ? "var(--accent-soft)" : "var(--card-bg)",
+                  settings.uiTheme === theme
+                    ? "var(--accent-soft)"
+                    : "var(--card-bg)",
                 borderColor:
                   settings.uiTheme === theme
                     ? "color-mix(in srgb, var(--accent-color) 35%, white)"
@@ -115,15 +149,28 @@ export function CustomizationPanel({
 
       <div
         className="p-3 rounded-lg border flex flex-col gap-3"
-        style={{ backgroundColor: "var(--card-bg)", borderColor: "var(--border-color)" }}
+        style={{
+          backgroundColor: "var(--card-bg)",
+          borderColor: "var(--border-color)",
+        }}
       >
-        <h3 className="text-sm font-medium" style={{ color: "var(--text-color)" }}>Pet Style</h3>
-        <label className="text-xs flex flex-col gap-1" style={{ color: "var(--muted-color)" }}>
+        <h3
+          className="text-sm font-medium"
+          style={{ color: "var(--text-color)" }}
+        >
+          Pet Style
+        </h3>
+        <label
+          className="text-xs flex flex-col gap-1"
+          style={{ color: "var(--muted-color)" }}
+        >
           Species
           <select
             value={pet.speciesId}
             onChange={(event) => {
-              const selected = speciesPacks.find((pack) => pack.id === event.target.value);
+              const selected = speciesPacks.find(
+                (pack) => pack.id === event.target.value,
+              );
               if (!selected) {
                 return;
               }
@@ -139,13 +186,16 @@ export function CustomizationPanel({
             {speciesPacks
               .filter((pack) => selectableSpeciesIds.has(pack.id))
               .map((pack) => (
-              <option key={pack.id} value={pack.id}>
-                {pack.name}
-              </option>
+                <option key={pack.id} value={pack.id}>
+                  {pack.name}
+                </option>
               ))}
           </select>
         </label>
-        <label className="text-xs flex flex-col gap-1" style={{ color: "var(--muted-color)" }}>
+        <label
+          className="text-xs flex flex-col gap-1"
+          style={{ color: "var(--muted-color)" }}
+        >
           Skin
           <select
             value={settings.petSkin}
@@ -168,7 +218,10 @@ export function CustomizationPanel({
             ))}
           </select>
         </label>
-        <label className="text-xs flex flex-col gap-1" style={{ color: "var(--muted-color)" }}>
+        <label
+          className="text-xs flex flex-col gap-1"
+          style={{ color: "var(--muted-color)" }}
+        >
           Scene
           <select
             value={settings.petScene}
@@ -195,42 +248,39 @@ export function CustomizationPanel({
 
       <div
         className="p-3 rounded-lg border flex flex-col gap-2"
-        style={{ backgroundColor: "var(--card-bg)", borderColor: "var(--border-color)" }}
+        style={{
+          backgroundColor: "var(--card-bg)",
+          borderColor: "var(--border-color)",
+        }}
       >
         <div className="flex items-center justify-between">
-          <h3 className="text-sm font-medium" style={{ color: "var(--text-color)" }}>
+          <h3
+            className="text-sm font-medium"
+            style={{ color: "var(--text-color)" }}
+          >
             Species Pack Validator
           </h3>
-          <button
-            onClick={() => {
-              setValidationRunAt(new Date().toLocaleTimeString());
-              setValidationMessage(null);
-            }}
-            className="px-2 py-1 rounded-md text-xs text-white"
-            style={{ backgroundColor: "var(--accent-color)" }}
-          >
-            Run Validation
-          </button>
         </div>
         <p className="text-xs" style={{ color: "var(--muted-color)" }}>
-          New drop-in species stay locked until all checks pass and you activate the pack.
+          New drop-in species stay locked until all checks pass and you activate
+          the pack.
         </p>
-        {validationRunAt && (
-          <p className="text-[11px]" style={{ color: "var(--muted-color)" }}>
-            Last run: {validationRunAt}
-          </p>
-        )}
         {validationMessage && (
           <div
             className="text-[11px] rounded-md border px-2 py-1 whitespace-pre-wrap break-words"
-            style={{ color: "var(--muted-color)", borderColor: "var(--border-color)" }}
+            style={{
+              color: "var(--muted-color)",
+              borderColor: "var(--border-color)",
+            }}
           >
             {validationMessage}
           </div>
         )}
         <div className="flex flex-col gap-2">
           {speciesValidation.map((result) => {
-            const pack = speciesPacks.find((item) => item.id === result.speciesId);
+            const pack = speciesPacks.find(
+              (item) => item.id === result.speciesId,
+            );
             if (!pack) {
               return null;
             }
@@ -243,10 +293,16 @@ export function CustomizationPanel({
               >
                 <div className="flex items-center justify-between gap-2">
                   <div>
-                    <div className="text-sm font-medium" style={{ color: "var(--text-color)" }}>
+                    <div
+                      className="text-sm font-medium"
+                      style={{ color: "var(--text-color)" }}
+                    >
                       {pack.name}
                     </div>
-                    <div className="text-xs capitalize" style={{ color: "var(--muted-color)" }}>
+                    <div
+                      className="text-xs capitalize"
+                      style={{ color: "var(--muted-color)" }}
+                    >
                       {result.pass ? "checks passed" : "checks failed"}
                     </div>
                   </div>
@@ -256,40 +312,58 @@ export function CustomizationPanel({
                         aria-label={`Copy ${pack.name} validation report`}
                         onClick={() => {
                           void (async () => {
-                            const report = buildValidationFailureReport(pack.name, result);
+                            const report = buildValidationFailureReport(
+                              pack.name,
+                              result,
+                            );
                             const message = await copyTextWithFallback(
                               report,
-                              "Species validation report"
+                              "Species validation report",
                             );
                             setValidationMessage(message);
                           })();
                         }}
                         className="px-2 py-1 rounded-md text-xs"
-                        style={{ color: "var(--text-color)", border: "1px solid var(--border-color)" }}
+                        style={{
+                          color: "var(--text-color)",
+                          border: "1px solid var(--border-color)",
+                        }}
                       >
                         Copy Report
                       </button>
                     )}
                     <button
-                      aria-label={activated ? `Deactivate ${pack.name}` : `Activate ${pack.name}`}
+                      aria-label={
+                        activated
+                          ? `Deactivate ${pack.name}`
+                          : `Activate ${pack.name}`
+                      }
                       disabled={!result.pass}
                       onClick={() => {
                         if (activated) {
                           onUpdateSettings({
-                            validatedSpeciesPacks: settings.validatedSpeciesPacks.filter(
-                              (id) => id !== pack.id
-                            ),
+                            validatedSpeciesPacks:
+                              settings.validatedSpeciesPacks.filter(
+                                (id) => id !== pack.id,
+                              ),
                           });
                           return;
                         }
                         onUpdateSettings({
                           validatedSpeciesPacks: Array.from(
-                            new Set([...settings.validatedSpeciesPacks, pack.id])
+                            new Set([
+                              ...settings.validatedSpeciesPacks,
+                              pack.id,
+                            ]),
                           ),
                         });
                       }}
                       className="px-2 py-1 rounded-md text-xs text-white disabled:opacity-50"
-                      style={{ backgroundColor: activated ? "#334155" : "var(--accent-color)" }}
+                      style={{
+                        backgroundColor: activated
+                          ? "#334155"
+                          : "var(--accent-color)",
+                      }}
                     >
                       {activated ? "Deactivate" : "Activate"}
                     </button>
@@ -302,10 +376,14 @@ export function CustomizationPanel({
                       className="rounded-sm border px-2 py-1 text-[11px]"
                       style={{ borderColor: "var(--border-color)" }}
                     >
-                      <div style={{ color: check.pass ? "#16a34a" : "#dc2626" }}>
+                      <div
+                        style={{ color: check.pass ? "#16a34a" : "#dc2626" }}
+                      >
                         {check.pass ? "PASS" : "FAIL"} {check.label}
                       </div>
-                      <div style={{ color: "var(--muted-color)" }}>Observed: {check.detail}</div>
+                      <div style={{ color: "var(--muted-color)" }}>
+                        Observed: {check.detail}
+                      </div>
                       {!check.pass && (
                         <div style={{ color: "var(--muted-color)" }}>
                           Fix: {check.remediation}
@@ -322,9 +400,17 @@ export function CustomizationPanel({
 
       <div
         className="p-3 rounded-lg border flex flex-col gap-2"
-        style={{ backgroundColor: "var(--card-bg)", borderColor: "var(--border-color)" }}
+        style={{
+          backgroundColor: "var(--card-bg)",
+          borderColor: "var(--border-color)",
+        }}
       >
-        <h3 className="text-sm font-medium" style={{ color: "var(--text-color)" }}>Style Bundles</h3>
+        <h3
+          className="text-sm font-medium"
+          style={{ color: "var(--text-color)" }}
+        >
+          Style Bundles
+        </h3>
         <div className="grid grid-cols-1 gap-2">
           {STYLE_BUNDLES.map((bundle) => (
             <button
@@ -338,7 +424,10 @@ export function CustomizationPanel({
                 onSetPetCustomization(bundle.petSkin, bundle.petScene);
               }}
               className="text-left px-2 py-2 rounded-md border text-xs transition-opacity hover:opacity-90"
-              style={{ borderColor: "var(--border-color)", color: "var(--text-color)" }}
+              style={{
+                borderColor: "var(--border-color)",
+                color: "var(--text-color)",
+              }}
             >
               <div className="font-medium">{bundle.name}</div>
               <div style={{ color: "var(--muted-color)" }}>
@@ -351,15 +440,23 @@ export function CustomizationPanel({
 
       <div
         className="p-3 rounded-lg border flex flex-col gap-2"
-        style={{ backgroundColor: "var(--card-bg)", borderColor: "var(--border-color)" }}
+        style={{
+          backgroundColor: "var(--card-bg)",
+          borderColor: "var(--border-color)",
+        }}
       >
-        <h3 className="text-sm font-medium" style={{ color: "var(--text-color)" }}>
+        <h3
+          className="text-sm font-medium"
+          style={{ color: "var(--text-color)" }}
+        >
           Seasonal Cosmetic Packs (Optional)
         </h3>
         <p className="text-xs" style={{ color: "var(--muted-color)" }}>
           No timed nudges. Enable only what you want.
         </p>
-        <p className="text-[11px]" style={{ color: "var(--muted-color)" }}>{seasonalBundleNotice}</p>
+        <p className="text-[11px]" style={{ color: "var(--muted-color)" }}>
+          {seasonalBundleNotice}
+        </p>
         <div className="flex flex-col gap-2">
           {seasonalPacks.map((pack) => {
             const enabled = settings.enabledSeasonalPacks.includes(pack.id);
@@ -367,24 +464,43 @@ export function CustomizationPanel({
               .map((month) => MONTH_NAMES[Math.max(0, Math.min(11, month - 1))])
               .join(", ");
             return (
-              <div key={pack.id} className="rounded-md border p-2" style={{ borderColor: "var(--border-color)" }}>
+              <div
+                key={pack.id}
+                className="rounded-md border p-2"
+                style={{ borderColor: "var(--border-color)" }}
+              >
                 <label className="flex items-center justify-between gap-2 text-sm">
-                  <span style={{ color: "var(--text-color)" }}>{pack.name}</span>
+                  <span style={{ color: "var(--text-color)" }}>
+                    {pack.name}
+                  </span>
                   <input
                     type="checkbox"
                     checked={enabled}
                     onChange={(event) => {
                       const next = event.target.checked
-                        ? Array.from(new Set([...settings.enabledSeasonalPacks, pack.id]))
-                        : settings.enabledSeasonalPacks.filter((id) => id !== pack.id);
+                        ? Array.from(
+                            new Set([
+                              ...settings.enabledSeasonalPacks,
+                              pack.id,
+                            ]),
+                          )
+                        : settings.enabledSeasonalPacks.filter(
+                            (id) => id !== pack.id,
+                          );
                       onUpdateSettings({ enabledSeasonalPacks: next });
                     }}
                   />
                 </label>
-                <div className="text-xs mt-1" style={{ color: "var(--muted-color)" }}>
+                <div
+                  className="text-xs mt-1"
+                  style={{ color: "var(--muted-color)" }}
+                >
                   {pack.description}
                 </div>
-                <div className="text-[11px] mt-1" style={{ color: "var(--muted-color)" }}>
+                <div
+                  className="text-[11px] mt-1"
+                  style={{ color: "var(--muted-color)" }}
+                >
                   Suggested season: {activeMonths}
                 </div>
                 {enabled && (
@@ -398,21 +514,34 @@ export function CustomizationPanel({
                             petSkin: bundle.petSkin,
                             petScene: bundle.petScene,
                           });
-                          onSetPetCustomization(bundle.petSkin, bundle.petScene);
+                          onSetPetCustomization(
+                            bundle.petSkin,
+                            bundle.petScene,
+                          );
                           const species = getSpeciesPackById(bundle.speciesId);
                           onUpdateSettings({
                             validatedSpeciesPacks: Array.from(
-                              new Set([...settings.validatedSpeciesPacks, species.id])
+                              new Set([
+                                ...settings.validatedSpeciesPacks,
+                                species.id,
+                              ]),
                             ),
                           });
-                          onSetPetSpecies(species.id, species.evolutionThresholds);
+                          onSetPetSpecies(
+                            species.id,
+                            species.evolutionThresholds,
+                          );
                         }}
                         className="text-left px-2 py-2 rounded-md border text-xs transition-opacity hover:opacity-90"
-                        style={{ borderColor: "var(--border-color)", color: "var(--text-color)" }}
+                        style={{
+                          borderColor: "var(--border-color)",
+                          color: "var(--text-color)",
+                        }}
                       >
                         <div className="font-medium">{bundle.name}</div>
                         <div style={{ color: "var(--muted-color)" }}>
-                          {bundle.uiTheme} • {bundle.petSkin} • {bundle.petScene} • {bundle.speciesId}
+                          {bundle.uiTheme} • {bundle.petSkin} •{" "}
+                          {bundle.petScene} • {bundle.speciesId}
                         </div>
                       </button>
                     ))}
@@ -426,9 +555,17 @@ export function CustomizationPanel({
 
       <div
         className="p-3 rounded-lg border flex flex-col gap-2"
-        style={{ backgroundColor: "var(--card-bg)", borderColor: "var(--border-color)" }}
+        style={{
+          backgroundColor: "var(--card-bg)",
+          borderColor: "var(--border-color)",
+        }}
       >
-        <h3 className="text-sm font-medium" style={{ color: "var(--text-color)" }}>Loadouts</h3>
+        <h3
+          className="text-sm font-medium"
+          style={{ color: "var(--text-color)" }}
+        >
+          Loadouts
+        </h3>
         <div className="flex gap-2">
           <input
             value={loadoutName}
@@ -461,7 +598,9 @@ export function CustomizationPanel({
           </button>
         </div>
         {loadouts.length === 0 ? (
-          <p className="text-xs" style={{ color: "var(--muted-color)" }}>No loadouts saved yet.</p>
+          <p className="text-xs" style={{ color: "var(--muted-color)" }}>
+            No loadouts saved yet.
+          </p>
         ) : (
           <div className="flex flex-col gap-1">
             {loadouts.map((loadout) => (
@@ -471,7 +610,12 @@ export function CustomizationPanel({
                 className="text-left px-2 py-2 rounded-md border text-xs transition-opacity hover:opacity-90"
                 style={{ borderColor: "var(--border-color)" }}
               >
-                <div className="font-medium" style={{ color: "var(--text-color)" }}>{loadout.name}</div>
+                <div
+                  className="font-medium"
+                  style={{ color: "var(--text-color)" }}
+                >
+                  {loadout.name}
+                </div>
                 <div style={{ color: "var(--muted-color)" }}>
                   {loadout.uiTheme} • {loadout.petSkin} • {loadout.petScene}
                 </div>
diff --git a/src/components/panel/GoalsList.tsx b/src/components/panel/GoalsList.tsx
index 5d76b13..403313a 100644
--- a/src/components/panel/GoalsList.tsx
+++ b/src/components/panel/GoalsList.tsx
@@ -8,7 +8,10 @@ interface Props {
 export function GoalsList({ goals }: Props) {
   if (goals.length === 0) {
     return (
-      <p className="text-sm text-center py-4" style={{ color: "var(--muted-color)" }}>
+      <p
+        className="text-sm text-center py-4"
+        style={{ color: "var(--muted-color)" }}
+      >
         Loading goals...
       </p>
     );
@@ -22,7 +25,10 @@ export function GoalsList({ goals }: Props) {
           <div
             key={goal.id}
             className="p-3 rounded-lg border"
-            style={{ backgroundColor: "var(--card-bg)", borderColor: "var(--border-color)" }}
+            style={{
+              backgroundColor: "var(--card-bg)",
+              borderColor: "var(--border-color)",
+            }}
           >
             <div className="flex items-center justify-between mb-1">
               <span
@@ -36,7 +42,10 @@ export function GoalsList({ goals }: Props) {
                 {done ? "\u2713 " : ""}
                 {goal.description}
               </span>
-              <span className="text-xs text-gray-400" style={{ color: "var(--muted-color)" }}>
+              <span
+                className="text-xs text-gray-400"
+                style={{ color: "var(--muted-color)" }}
+              >
                 {goal.progress}/{goal.target}
               </span>
             </div>
diff --git a/src/components/panel/PetPanel.tsx b/src/components/panel/PetPanel.tsx
index a8d69de..a518177 100644
--- a/src/components/panel/PetPanel.tsx
+++ b/src/components/panel/PetPanel.tsx
@@ -22,17 +22,35 @@ const ACTION_ICONS: Record<string, string> = {
   train: "💪",
 };
 
-function StatBar({ label, value, color }: { label: string; value: number; color: string }) {
+function StatBar({
+  label,
+  value,
+  color,
+}: {
+  label: string;
+  value: number;
+  color: string;
+}) {
   return (
     <div className="flex items-center gap-2">
-      <span className="text-xs w-16" style={{ color: "var(--muted-color)" }}>{label}</span>
-      <div className="flex-1 h-2 rounded-full" style={{ backgroundColor: "var(--border-color)" }}>
+      <span className="text-xs w-16" style={{ color: "var(--muted-color)" }}>
+        {label}
+      </span>
+      <div
+        className="flex-1 h-2 rounded-full"
+        style={{ backgroundColor: "var(--border-color)" }}
+      >
         <div
           className="h-full rounded-full transition-all"
           style={{ width: `${value}%`, backgroundColor: color }}
         />
       </div>
-      <span className="text-xs w-8 text-right" style={{ color: "var(--text-color)" }}>{value}%</span>
+      <span
+        className="text-xs w-8 text-right"
+        style={{ color: "var(--text-color)" }}
+      >
+        {value}%
+      </span>
     </div>
   );
 }
@@ -49,15 +67,27 @@ export function PetPanel({
   onResolveEvent,
 }: Props) {
   const [photoMessage, setPhotoMessage] = useState<string | null>(null);
+  const [photoError, setPhotoError] = useState<string | null>(null);
   const [rollingQuest, setRollingQuest] = useState(false);
 
   return (
     <div className="flex flex-col gap-4">
       {/* Pet Status */}
-      <div className="rounded-lg p-4" style={{ backgroundColor: "var(--card-bg)" }}>
+      <div
+        className="rounded-lg p-4"
+        style={{ backgroundColor: "var(--card-bg)" }}
+      >
         <div className="flex items-center justify-between mb-3">
-          <h3 className="font-medium" style={{ color: "var(--text-color)" }}>Pet Status</h3>
-          <span className="text-sm px-2 py-0.5 rounded-full capitalize" style={{ backgroundColor: "var(--accent-soft)", color: "var(--accent-color)" }}>
+          <h3 className="font-medium" style={{ color: "var(--text-color)" }}>
+            Pet Status
+          </h3>
+          <span
+            className="text-sm px-2 py-0.5 rounded-full capitalize"
+            style={{
+              backgroundColor: "var(--accent-soft)",
+              color: "var(--accent-color)",
+            }}
+          >
             {pet.mood}
           </span>
         </div>
@@ -67,15 +97,36 @@ export function PetPanel({
           <StatBar label="Clean" value={pet.cleanliness} color="#3b82f6" />
           <StatBar label="Bond" value={pet.affection} color="#ec4899" />
         </div>
-        <div className="mt-3 pt-3 flex items-center justify-between text-xs" style={{ borderTop: "1px solid var(--border-color)", color: "var(--muted-color)" }}>
-          <span>Path: <span className="capitalize" style={{ color: "var(--text-color)" }}>{pet.evolutionPath}</span></span>
-          <span>Personality: <span className="capitalize" style={{ color: "var(--text-color)" }}>{pet.personality}</span></span>
+        <div
+          className="mt-3 pt-3 flex items-center justify-between text-xs"
+          style={{
+            borderTop: "1px solid var(--border-color)",
+            color: "var(--muted-color)",
+          }}
+        >
+          <span>
+            Path:{" "}
+            <span className="capitalize" style={{ color: "var(--text-color)" }}>
+              {pet.evolutionPath}
+            </span>
+          </span>
+          <span>
+            Personality:{" "}
+            <span className="capitalize" style={{ color: "var(--text-color)" }}>
+              {pet.personality}
+            </span>
+          </span>
         </div>
       </div>
 
       {/* Actions */}
-      <div className="rounded-lg p-4" style={{ backgroundColor: "var(--card-bg)" }}>
-        <h3 className="font-medium mb-3" style={{ color: "var(--text-color)" }}>Actions</h3>
+      <div
+        className="rounded-lg p-4"
+        style={{ backgroundColor: "var(--card-bg)" }}
+      >
+        <h3 className="font-medium mb-3" style={{ color: "var(--text-color)" }}>
+          Actions
+        </h3>
         <div className="grid grid-cols-3 gap-2">
           {interactionVerbs.map((item) => (
             <button
@@ -86,14 +137,25 @@ export function PetPanel({
               style={{ backgroundColor: "var(--panel-bg)" }}
             >
               <span className="text-xl">{ACTION_ICONS[item.id] ?? "✨"}</span>
-              <span className="text-xs" style={{ color: "var(--text-color)" }}>{item.label}</span>
+              <span className="text-xs" style={{ color: "var(--text-color)" }}>
+                {item.label}
+              </span>
             </button>
           ))}
         </div>
         <button
           type="button"
           onClick={() => {
-            void onCaptureCard().then(setPhotoMessage);
+            setPhotoError(null);
+            void onCaptureCard()
+              .then(setPhotoMessage)
+              .catch((error: unknown) => {
+                setPhotoError(
+                  error instanceof Error
+                    ? error.message
+                    : "Could not save pet card.",
+                );
+              });
           }}
           className="mt-3 w-full py-2 rounded-lg text-sm text-white transition-opacity hover:opacity-90"
           style={{ backgroundColor: "var(--accent-color)" }}
@@ -105,21 +167,48 @@ export function PetPanel({
             {photoMessage}
           </p>
         )}
+        {photoError && (
+          <p role="alert" className="mt-2 text-xs text-red-600">
+            {photoError}
+          </p>
+        )}
       </div>
 
       {/* Active Quest */}
       {activeQuest && (
-        <div className="rounded-lg p-4" style={{ backgroundColor: "var(--accent-soft)" }}>
-          <h3 className="font-medium mb-2" style={{ color: "var(--accent-color)" }}>Active Quest</h3>
-          <p className="text-sm mb-2" style={{ color: "var(--text-color)" }}>{activeQuest.title}</p>
-          <p className="text-xs mb-2 capitalize" style={{ color: "var(--muted-color)" }}>
+        <div
+          className="rounded-lg p-4"
+          style={{ backgroundColor: "var(--accent-soft)" }}
+        >
+          <h3
+            className="font-medium mb-2"
+            style={{ color: "var(--accent-color)" }}
+          >
+            Active Quest
+          </h3>
+          <p className="text-sm mb-2" style={{ color: "var(--text-color)" }}>
+            {activeQuest.title}
+          </p>
+          <p
+            className="text-xs mb-2 capitalize"
+            style={{ color: "var(--muted-color)" }}
+          >
             {activeQuest.kind.replace("_", " ")}
           </p>
-          <div className="flex items-center justify-between text-xs" style={{ color: "var(--muted-color)" }}>
-            <span>{activeQuest.completedSessions}/{activeQuest.targetSessions} sessions</span>
+          <div
+            className="flex items-center justify-between text-xs"
+            style={{ color: "var(--muted-color)" }}
+          >
+            <span>
+              {activeQuest.completedSessions}/{activeQuest.targetSessions}{" "}
+              sessions
+            </span>
             <span>+{activeQuest.rewardCoins} coins</span>
           </div>
-          <div className="mt-2 h-2 rounded-full" style={{ backgroundColor: "var(--border-color)" }}>
+          <div
+            className="mt-2 h-2 rounded-full"
+            style={{ backgroundColor: "var(--border-color)" }}
+          >
             <div
               className="h-full rounded-full"
               style={{
@@ -132,9 +221,14 @@ export function PetPanel({
       )}
 
       {/* Events */}
-      <div className="rounded-lg p-4" style={{ backgroundColor: "var(--card-bg)" }}>
+      <div
+        className="rounded-lg p-4"
+        style={{ backgroundColor: "var(--card-bg)" }}
+      >
         <div className="flex items-center justify-between mb-3">
-          <h3 className="font-medium" style={{ color: "var(--text-color)" }}>Events</h3>
+          <h3 className="font-medium" style={{ color: "var(--text-color)" }}>
+            Events
+          </h3>
           <button
             type="button"
             onClick={() => {
@@ -148,7 +242,10 @@ export function PetPanel({
             }}
             disabled={rollingQuest}
             className="text-xs px-2 py-1 rounded transition-colors hover:opacity-80"
-            style={{ backgroundColor: "var(--accent-soft)", color: "var(--accent-color)" }}
+            style={{
+              backgroundColor: "var(--accent-soft)",
+              color: "var(--accent-color)",
+            }}
           >
             {rollingQuest ? "Checking..." : "New Quest"}
           </button>
@@ -167,7 +264,9 @@ export function PetPanel({
           </div>
         )}
         {events.length === 0 ? (
-          <p className="text-sm" style={{ color: "var(--muted-color)" }}>No active events</p>
+          <p className="text-sm" style={{ color: "var(--muted-color)" }}>
+            No active events
+          </p>
         ) : (
           <div className="flex flex-col gap-2">
             {events.slice(0, 5).map((event) => (
@@ -176,7 +275,10 @@ export function PetPanel({
                 className="flex items-center justify-between gap-2 p-2 rounded text-sm"
                 style={{ backgroundColor: "var(--panel-bg)" }}
               >
-                <span className={event.resolved ? "opacity-50 line-through" : ""} style={{ color: "var(--text-color)" }}>
+                <span
+                  className={event.resolved ? "opacity-50 line-through" : ""}
+                  style={{ color: "var(--text-color)" }}
+                >
                   {event.description}
                 </span>
                 {!event.resolved && (
@@ -184,7 +286,10 @@ export function PetPanel({
                     type="button"
                     onClick={() => onResolveEvent(event.id)}
                     className="text-xs px-2 py-0.5 rounded hover:opacity-80"
-                    style={{ backgroundColor: "var(--accent-color)", color: "white" }}
+                    style={{
+                      backgroundColor: "var(--accent-color)",
+                      color: "white",
+                    }}
                   >
                     Done
                   </button>
diff --git a/src/components/panel/ShopPanel.tsx b/src/components/panel/ShopPanel.tsx
index b1fd8b6..2a582f9 100644
--- a/src/components/panel/ShopPanel.tsx
+++ b/src/components/panel/ShopPanel.tsx
@@ -17,7 +17,10 @@ export function ShopPanel({ available, ownedAccessories }: Props) {
   return (
     <div className="flex flex-col gap-3">
       <div className="flex items-center justify-between">
-        <span className="text-sm font-medium" style={{ color: "var(--muted-color)" }}>
+        <span
+          className="text-sm font-medium"
+          style={{ color: "var(--muted-color)" }}
+        >
           Your balance:
         </span>
         <CoinBadge amount={available} />
@@ -41,8 +44,16 @@ export function ShopPanel({ available, ownedAccessories }: Props) {
               }}
             >
               <div className="text-2xl mb-1">{item.icon}</div>
-              <div className="text-sm font-medium" style={{ color: "var(--text-color)" }}>{item.name}</div>
-              <div className="text-xs mb-2" style={{ color: "var(--muted-color)" }}>
+              <div
+                className="text-sm font-medium"
+                style={{ color: "var(--text-color)" }}
+              >
+                {item.name}
+              </div>
+              <div
+                className="text-xs mb-2"
+                style={{ color: "var(--muted-color)" }}
+              >
                 <CoinBadge amount={item.cost} />
               </div>
               <div
@@ -54,7 +65,10 @@ export function ShopPanel({ available, ownedAccessories }: Props) {
               {owned ? (
                 <span
                   className="text-xs font-medium"
-                  style={{ color: "color-mix(in srgb, var(--accent-color) 40%, #15803d)" }}
+                  style={{
+                    color:
+                      "color-mix(in srgb, var(--accent-color) 40%, #15803d)",
+                  }}
                 >
                   Owned
                 </span>
@@ -65,9 +79,13 @@ export function ShopPanel({ available, ownedAccessories }: Props) {
                   className="px-3 py-1 text-xs rounded-full font-medium transition-opacity disabled:cursor-not-allowed"
                   style={
                     canAfford
-                      ? { backgroundColor: "var(--accent-color)", color: "white" }
+                      ? {
+                          backgroundColor: "var(--accent-color)",
+                          color: "white",
+                        }
                       : {
-                          backgroundColor: "color-mix(in srgb, var(--muted-color) 20%, white)",
+                          backgroundColor:
+                            "color-mix(in srgb, var(--muted-color) 20%, white)",
                           color: "var(--muted-color)",
                         }
                   }
diff --git a/src/components/panel/StatsPanel.tsx b/src/components/panel/StatsPanel.tsx
index 093fac1..da1ed83 100644
--- a/src/components/panel/StatsPanel.tsx
+++ b/src/components/panel/StatsPanel.tsx
@@ -6,7 +6,10 @@ interface Props {
 }
 
 export function StatsPanel({ progress, summaries }: Props) {
-  const totalGuardrails = summaries.reduce((acc, item) => acc + item.guardrailsInterventions, 0);
+  const totalGuardrails = summaries.reduce(
+    (acc, item) => acc + item.guardrailsInterventions,
+    0,
+  );
 
   return (
     <div className="flex flex-col gap-4">
@@ -21,11 +24,16 @@ export function StatsPanel({ progress, summaries }: Props) {
       </div>
 
       <div className="flex flex-col gap-2">
-        <h3 className="text-sm font-medium" style={{ color: "var(--muted-color)" }}>
+        <h3
+          className="text-sm font-medium"
+          style={{ color: "var(--muted-color)" }}
+        >
           Recent activity
         </h3>
         {summaries.length === 0 ? (
-          <p className="text-sm" style={{ color: "var(--muted-color)" }}>No activity yet.</p>
+          <p className="text-sm" style={{ color: "var(--muted-color)" }}>
+            No activity yet.
+          </p>
         ) : (
           <div className="flex flex-col gap-2">
             {summaries.map((summary) => (
@@ -39,7 +47,10 @@ export function StatsPanel({ progress, summaries }: Props) {
                 }}
               >
                 <div className="flex items-center justify-between mb-1">
-                  <span className="font-medium" style={{ color: "var(--text-color)" }}>
+                  <span
+                    className="font-medium"
+                    style={{ color: "var(--text-color)" }}
+                  >
                     {summary.date}
                   </span>
                   <span>+{summary.xpEarned} XP</span>
@@ -65,10 +76,20 @@ function StatCard({ label, value }: { label: string; value: string }) {
   return (
     <div
       className="p-3 rounded-lg border"
-      style={{ backgroundColor: "var(--card-bg)", borderColor: "var(--border-color)" }}
+      style={{
+        backgroundColor: "var(--card-bg)",
+        borderColor: "var(--border-color)",
+      }}
     >
-      <div className="text-xs" style={{ color: "var(--muted-color)" }}>{label}</div>
-      <div className="text-sm font-semibold" style={{ color: "var(--text-color)" }}>{value}</div>
+      <div className="text-xs" style={{ color: "var(--muted-color)" }}>
+        {label}
+      </div>
+      <div
+        className="text-sm font-semibold"
+        style={{ color: "var(--text-color)" }}
+      >
+        {value}
+      </div>
     </div>
   );
 }
diff --git a/src/components/panel/TaskList.tsx b/src/components/panel/TaskList.tsx
index 50ea69d..d5cb2f8 100644
--- a/src/components/panel/TaskList.tsx
+++ b/src/components/panel/TaskList.tsx
@@ -45,7 +45,10 @@ export function TaskList({ tasks, onAdd, onToggle, onDelete }: Props) {
       </form>
 
       {tasks.length === 0 ? (
-        <p className="text-sm text-center py-4" style={{ color: "var(--muted-color)" }}>
+        <p
+          className="text-sm text-center py-4"
+          style={{ color: "var(--muted-color)" }}
+        >
           No tasks yet
         </p>
       ) : (
@@ -54,7 +57,10 @@ export function TaskList({ tasks, onAdd, onToggle, onDelete }: Props) {
             <li
               key={task.id}
               className="flex items-center gap-2 p-2 rounded-lg border"
-              style={{ backgroundColor: "var(--card-bg)", borderColor: "var(--border-color)" }}
+              style={{
+                backgroundColor: "var(--card-bg)",
+                borderColor: "var(--border-color)",
+              }}
             >
               <button
                 onClick={() => onToggle(task.id)}
@@ -63,17 +69,30 @@ export function TaskList({ tasks, onAdd, onToggle, onDelete }: Props) {
                     ? "bg-green-500 border-green-500 text-white"
                     : "hover:opacity-90"
                 }`}
-                style={!task.completed ? { borderColor: "var(--border-color)" } : undefined}
+                style={
+                  !task.completed
+                    ? { borderColor: "var(--border-color)" }
+                    : undefined
+                }
               >
                 {task.completed && (
                   <svg width="12" height="12" viewBox="0 0 12 12" fill="none">
-                    <path d="M2 6L5 9L10 3" stroke="currentColor" strokeWidth="2" strokeLinecap="round" />
+                    <path
+                      d="M2 6L5 9L10 3"
+                      stroke="currentColor"
+                      strokeWidth="2"
+                      strokeLinecap="round"
+                    />
                   </svg>
                 )}
               </button>
               <span
                 className={`flex-1 text-sm ${task.completed ? "line-through" : ""}`}
-                style={{ color: task.completed ? "var(--muted-color)" : "var(--text-color)" }}
+                style={{
+                  color: task.completed
+                    ? "var(--muted-color)"
+                    : "var(--text-color)",
+                }}
               >
                 {task.title}
               </span>
@@ -83,7 +102,12 @@ export function TaskList({ tasks, onAdd, onToggle, onDelete }: Props) {
                 style={{ color: "var(--muted-color)" }}
               >
                 <svg width="14" height="14" viewBox="0 0 14 14" fill="none">
-                  <path d="M3 3L11 11M11 3L3 11" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" />
+                  <path
+                    d="M3 3L11 11M11 3L3 11"
+                    stroke="currentColor"
+                    strokeWidth="1.5"
+                    strokeLinecap="round"
+                  />
                 </svg>
               </button>
             </li>
diff --git a/src/components/panel/TimerDisplay.tsx b/src/components/panel/TimerDisplay.tsx
index 1c49e65..744d038 100644
--- a/src/components/panel/TimerDisplay.tsx
+++ b/src/components/panel/TimerDisplay.tsx
@@ -85,10 +85,15 @@ export function TimerDisplay({
           />
         </svg>
         <div className="absolute inset-0 flex flex-col items-center justify-center">
-          <span className="text-3xl font-mono font-bold" style={{ color: "var(--text-color)" }}>
+          <span
+            className="text-3xl font-mono font-bold"
+            style={{ color: "var(--text-color)" }}
+          >
             {formatTime(secondsLeft)}
           </span>
-          <span className="text-sm" style={{ color: "var(--muted-color)" }}>{phaseLabel}</span>
+          <span className="text-sm" style={{ color: "var(--muted-color)" }}>
+            {phaseLabel}
+          </span>
         </div>
       </div>
 
@@ -107,7 +112,10 @@ export function TimerDisplay({
           <button
             onClick={onPause}
             className="px-6 py-2 text-white rounded-full font-medium transition-opacity hover:opacity-90"
-            style={{ backgroundColor: "color-mix(in srgb, var(--muted-color) 80%, black)" }}
+            style={{
+              backgroundColor:
+                "color-mix(in srgb, var(--muted-color) 80%, black)",
+            }}
           >
             Pause
           </button>
@@ -116,7 +124,10 @@ export function TimerDisplay({
           <button
             onClick={onResume}
             className="px-6 py-2 text-white rounded-full font-medium transition-opacity hover:opacity-90"
-            style={{ backgroundColor: "color-mix(in srgb, var(--accent-color) 70%, green)" }}
+            style={{
+              backgroundColor:
+                "color-mix(in srgb, var(--accent-color) 70%, green)",
+            }}
           >
             Resume
           </button>
@@ -126,7 +137,8 @@ export function TimerDisplay({
             onClick={onReset}
             className="px-6 py-2 rounded-full font-medium transition-opacity hover:opacity-90"
             style={{
-              backgroundColor: "color-mix(in srgb, var(--muted-color) 15%, white)",
+              backgroundColor:
+                "color-mix(in srgb, var(--muted-color) 15%, white)",
               color: "var(--text-color)",
             }}
           >
@@ -137,14 +149,18 @@ export function TimerDisplay({
 
       {/* Session counter */}
       <div className="text-sm" style={{ color: "var(--muted-color)" }}>
-        Sessions today: <span className="font-semibold" style={{ color: "var(--text-color)" }}>{sessionsCompleted}</span>
+        Sessions today:{" "}
+        <span className="font-semibold" style={{ color: "var(--text-color)" }}>
+          {sessionsCompleted}
+        </span>
       </div>
       {guardrailMessage && (
         <div
           className="text-xs px-2 py-1 rounded-md text-center border"
           style={{
             color: "color-mix(in srgb, var(--accent-color) 55%, #92400e)",
-            backgroundColor: "color-mix(in srgb, var(--accent-soft) 40%, #fef3c7)",
+            backgroundColor:
+              "color-mix(in srgb, var(--accent-soft) 40%, #fef3c7)",
             borderColor: "color-mix(in srgb, var(--accent-color) 25%, #f59e0b)",
           }}
         >
diff --git a/src/components/panel/__tests__/CoinDisplay.test.tsx b/src/components/panel/__tests__/CoinDisplay.test.tsx
index 4e5ba69..cf6b741 100644
--- a/src/components/panel/__tests__/CoinDisplay.test.tsx
+++ b/src/components/panel/__tests__/CoinDisplay.test.tsx
@@ -5,38 +5,70 @@ import { CoinDisplay } from "../CoinDisplay";
 describe("CoinDisplay", () => {
   it("displays coin balance", () => {
     render(
-      <CoinDisplay available={50} stageName="Blob" progressToNext={0.5} stageProgress={2} stageSpan={5} />
+      <CoinDisplay
+        available={50}
+        stageName="Blob"
+        progressToNext={0.5}
+        stageProgress={2}
+        stageSpan={5}
+      />,
     );
     expect(screen.getByText("50")).toBeInTheDocument();
   });
 
   it("displays stage name", () => {
     render(
-      <CoinDisplay available={50} stageName="Buddy" progressToNext={0.3} stageProgress={3} stageSpan={10} />
+      <CoinDisplay
+        available={50}
+        stageName="Buddy"
+        progressToNext={0.3}
+        stageProgress={3}
+        stageSpan={10}
+      />,
     );
     expect(screen.getByText("Buddy")).toBeInTheDocument();
   });
 
   it("shows evolution progress fraction", () => {
     const { container } = render(
-      <CoinDisplay available={50} stageName="Blob" progressToNext={0.4} stageProgress={2} stageSpan={5} />
+      <CoinDisplay
+        available={50}
+        stageName="Blob"
+        progressToNext={0.4}
+        stageProgress={2}
+        stageSpan={5}
+      />,
     );
     // {stageProgress}/{stageSpan} renders as separate text nodes — check via textContent
     const spans = container.querySelectorAll("span");
-    const found = Array.from(spans).some((s) => s.textContent?.replace(/\s/g, "") === "2/5");
+    const found = Array.from(spans).some(
+      (s) => s.textContent?.replace(/\s/g, "") === "2/5",
+    );
     expect(found).toBe(true);
   });
 
   it("shows max evolution message when stageSpan is 0", () => {
     render(
-      <CoinDisplay available={50} stageName="Champion" progressToNext={1} stageProgress={0} stageSpan={0} />
+      <CoinDisplay
+        available={50}
+        stageName="Champion"
+        progressToNext={1}
+        stageProgress={0}
+        stageSpan={0}
+      />,
     );
     expect(screen.getByText("Max evolution reached!")).toBeInTheDocument();
   });
 
   it("shows evolution progress label when not maxed", () => {
     render(
-      <CoinDisplay available={50} stageName="Blob" progressToNext={0.5} stageProgress={2} stageSpan={5} />
+      <CoinDisplay
+        available={50}
+        stageName="Blob"
+        progressToNext={0.5}
+        stageProgress={2}
+        stageSpan={5}
+      />,
     );
     expect(screen.getByText("Evolution progress")).toBeInTheDocument();
   });
diff --git a/src/components/panel/__tests__/CustomizationPanel.smoke.test.tsx b/src/components/panel/__tests__/CustomizationPanel.smoke.test.tsx
index 048974c..1c5a5b5 100644
--- a/src/components/panel/__tests__/CustomizationPanel.smoke.test.tsx
+++ b/src/components/panel/__tests__/CustomizationPanel.smoke.test.tsx
@@ -69,7 +69,7 @@ describe("CustomizationPanel smoke flow", () => {
         onSetPetSpecies={onSetPetSpecies}
         onSaveLoadout={vi.fn()}
         onApplyLoadout={vi.fn()}
-      />
+      />,
     );
 
     const speciesSelect = screen.getByLabelText("Species") as HTMLSelectElement;
@@ -100,10 +100,12 @@ describe("CustomizationPanel smoke flow", () => {
         onSetPetSpecies={onSetPetSpecies}
         onSaveLoadout={vi.fn()}
         onApplyLoadout={vi.fn()}
-      />
+      />,
     );
 
-    expect(screen.queryByRole("button", { name: /Petal Morning/i })).not.toBeInTheDocument();
+    expect(
+      screen.queryByRole("button", { name: /Petal Morning/i }),
+    ).not.toBeInTheDocument();
     await user.click(screen.getByLabelText("Spring Blossom"));
     expect(onUpdateSettings).toHaveBeenCalledWith({
       enabledSeasonalPacks: ["spring-blossom"],
@@ -125,14 +127,17 @@ describe("CustomizationPanel smoke flow", () => {
         onSetPetSpecies={onSetPetSpecies}
         onSaveLoadout={vi.fn()}
         onApplyLoadout={vi.fn()}
-      />
+      />,
     );
 
     await user.click(screen.getByRole("button", { name: /Petal Morning/i }));
     expect(onSetPetCustomization).toHaveBeenCalledWith("plush", "meadow");
 
     const catPack = getSpeciesPackById("cat");
-    expect(onSetPetSpecies).toHaveBeenCalledWith("cat", catPack.evolutionThresholds);
+    expect(onSetPetSpecies).toHaveBeenCalledWith(
+      "cat",
+      catPack.evolutionThresholds,
+    );
     expect(onUpdateSettings).toHaveBeenCalledWith({
       uiTheme: "sunrise",
       petSkin: "plush",
@@ -144,7 +149,7 @@ describe("CustomizationPanel smoke flow", () => {
     expect(onUpdateSettings).not.toHaveBeenCalledWith(
       expect.objectContaining({
         toastNotificationsEnabled: expect.anything(),
-      })
+      }),
     );
   });
 });
diff --git a/src/components/panel/__tests__/CustomizationPanel.validator.test.tsx b/src/components/panel/__tests__/CustomizationPanel.validator.test.tsx
index cc225bb..1996125 100644
--- a/src/components/panel/__tests__/CustomizationPanel.validator.test.tsx
+++ b/src/components/panel/__tests__/CustomizationPanel.validator.test.tsx
@@ -5,7 +5,8 @@ import { CustomizationPanel } from "../CustomizationPanel";
 import type { PetState, Settings } from "../../../store/types";
 
 vi.mock("../../../pets/packValidation", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("../../../pets/packValidation")>();
+  const actual =
+    await importOriginal<typeof import("../../../pets/packValidation")>();
   return {
     ...actual,
     validateSpeciesPacks: vi.fn(() => [
@@ -18,7 +19,8 @@ vi.mock("../../../pets/packValidation", async (importOriginal) => {
             label: "Valid ascending evolution thresholds",
             pass: false,
             detail: "0 / 8 / 4",
-            remediation: "Set thresholds to [0, mid, final] where mid >= 1 and final > mid.",
+            remediation:
+              "Set thresholds to [0, mid, final] where mid >= 1 and final > mid.",
           },
         ],
       },
@@ -92,18 +94,18 @@ describe("CustomizationPanel validator reports", () => {
         onSetPetSpecies={vi.fn()}
         onSaveLoadout={vi.fn()}
         onApplyLoadout={vi.fn()}
-      />
+      />,
     );
 
     await user.click(
-      screen.getByRole("button", { name: "Copy Penguin validation report" })
+      screen.getByRole("button", { name: "Copy Penguin validation report" }),
     );
 
     await screen.findByText((text) =>
-      text.includes("Clipboard unavailable. Species validation report:")
+      text.includes("Clipboard unavailable. Species validation report:"),
     );
     await screen.findByText((text) =>
-      text.includes("Species: Penguin (penguin)")
+      text.includes("Species: Penguin (penguin)"),
     );
   });
 });
diff --git a/src/components/panel/__tests__/GoalsList.test.tsx b/src/components/panel/__tests__/GoalsList.test.tsx
index 04b97ed..b51b1f0 100644
--- a/src/components/panel/__tests__/GoalsList.test.tsx
+++ b/src/components/panel/__tests__/GoalsList.test.tsx
@@ -4,9 +4,27 @@ import { GoalsList } from "../GoalsList";
 import type { DailyGoal } from "../../../store/types";
 
 const mockGoals: DailyGoal[] = [
-  { id: "pomodoros", description: "Complete 4 pomodoros", target: 4, progress: 2, date: "2025-01-01" },
-  { id: "breaks", description: "Take 3 breaks", target: 3, progress: 3, date: "2025-01-01" },
-  { id: "tasks", description: "Complete 2 tasks", target: 2, progress: 0, date: "2025-01-01" },
+  {
+    id: "pomodoros",
+    description: "Complete 4 pomodoros",
+    target: 4,
+    progress: 2,
+    date: "2025-01-01",
+  },
+  {
+    id: "breaks",
+    description: "Take 3 breaks",
+    target: 3,
+    progress: 3,
+    date: "2025-01-01",
+  },
+  {
+    id: "tasks",
+    description: "Complete 2 tasks",
+    target: 2,
+    progress: 0,
+    date: "2025-01-01",
+  },
 ];
 
 describe("GoalsList", () => {
@@ -26,7 +44,9 @@ describe("GoalsList", () => {
     const { container } = render(<GoalsList goals={mockGoals} />);
     // Progress renders as {progress}/{target} with separate text nodes
     const countSpans = container.querySelectorAll(".text-xs.text-gray-400");
-    const texts = Array.from(countSpans).map((el) => el.textContent?.replace(/\s/g, ""));
+    const texts = Array.from(countSpans).map((el) =>
+      el.textContent?.replace(/\s/g, ""),
+    );
     expect(texts).toContain("2/4");
     expect(texts).toContain("3/3");
     expect(texts).toContain("0/2");
@@ -37,7 +57,7 @@ describe("GoalsList", () => {
     // Completed goal (breaks 3/3) has checkmark in text
     const goalSpans = container.querySelectorAll(".text-sm");
     const breaksSpan = Array.from(goalSpans).find((el) =>
-      el.textContent?.includes("Take 3 breaks")
+      el.textContent?.includes("Take 3 breaks"),
     );
     expect(breaksSpan?.textContent).toContain("\u2713");
   });
@@ -46,7 +66,7 @@ describe("GoalsList", () => {
     const { container } = render(<GoalsList goals={mockGoals} />);
     const goalSpans = container.querySelectorAll(".text-sm");
     const breaksSpan = Array.from(goalSpans).find((el) =>
-      el.textContent?.includes("Take 3 breaks")
+      el.textContent?.includes("Take 3 breaks"),
     ) as HTMLElement;
     expect(breaksSpan.className).toContain("line-through");
   });
@@ -55,7 +75,7 @@ describe("GoalsList", () => {
     const { container } = render(<GoalsList goals={mockGoals} />);
     const goalSpans = container.querySelectorAll(".text-sm");
     const pomodorosSpan = Array.from(goalSpans).find((el) =>
-      el.textContent?.includes("Complete 4 pomodoros")
+      el.textContent?.includes("Complete 4 pomodoros"),
     ) as HTMLElement;
     expect(pomodorosSpan.className).not.toContain("line-through");
   });
diff --git a/src/components/panel/__tests__/PetPanel.smoke.test.tsx b/src/components/panel/__tests__/PetPanel.smoke.test.tsx
index 8b551df..2a72863 100644
--- a/src/components/panel/__tests__/PetPanel.smoke.test.tsx
+++ b/src/components/panel/__tests__/PetPanel.smoke.test.tsx
@@ -47,14 +47,41 @@ describe("PetPanel smoke flow", () => {
         onCaptureCard={onCaptureCard}
         onRollEvent={vi.fn(async () => null)}
         onResolveEvent={vi.fn()}
-      />
+      />,
     );
 
-    await user.click(screen.getByRole("button", { name: "Photo Booth: Save Pet Card" }));
+    await user.click(
+      screen.getByRole("button", { name: "Photo Booth: Save Pet Card" }),
+    );
     expect(onCaptureCard).toHaveBeenCalledTimes(1);
     await screen.findByText("Pet card saved.");
   });
 
+  it("shows a photo-card error when capture rejects", async () => {
+    const user = userEvent.setup();
+    render(
+      <PetPanel
+        pet={pet}
+        events={[]}
+        activeQuest={null}
+        rollFeedback={null}
+        interactionVerbs={[]}
+        onInteract={vi.fn()}
+        onCaptureCard={vi.fn(async () => {
+          throw new Error("Permission denied");
+        })}
+        onRollEvent={vi.fn(async () => null)}
+        onResolveEvent={vi.fn()}
+      />,
+    );
+    await user.click(
+      screen.getByRole("button", { name: "Photo Booth: Save Pet Card" }),
+    );
+    expect(await screen.findByRole("alert")).toHaveTextContent(
+      "Permission denied",
+    );
+  });
+
   it("shows the latest quest-roll feedback message", () => {
     const feedback: PetEvent = {
       id: "quiet-1",
@@ -82,11 +109,11 @@ describe("PetPanel smoke flow", () => {
         onCaptureCard={vi.fn(async () => "Pet card saved.")}
         onRollEvent={vi.fn(async () => null)}
         onResolveEvent={vi.fn()}
-      />
+      />,
     );
 
     expect(
-      screen.getByText("Quiet mode: next new quest available in about 12 min.")
+      screen.getByText("Quiet mode: next new quest available in about 12 min."),
     ).toBeInTheDocument();
   });
 
@@ -97,7 +124,7 @@ describe("PetPanel smoke flow", () => {
       () =>
         new Promise<PetEvent | null>((resolve) => {
           resolveRoll = resolve;
-        })
+        }),
     );
 
     render(
@@ -118,7 +145,7 @@ describe("PetPanel smoke flow", () => {
         onCaptureCard={vi.fn(async () => "Pet card saved.")}
         onRollEvent={onRollEvent}
         onResolveEvent={vi.fn()}
-      />
+      />,
     );
 
     await user.click(screen.getByRole("button", { name: "New Quest" }));
diff --git a/src/components/panel/__tests__/ShopPanel.test.tsx b/src/components/panel/__tests__/ShopPanel.test.tsx
index f440c9f..4b7c017 100644
--- a/src/components/panel/__tests__/ShopPanel.test.tsx
+++ b/src/components/panel/__tests__/ShopPanel.test.tsx
@@ -21,9 +21,13 @@ describe("ShopPanel", () => {
   });
 
   it("displays user balance", () => {
-    const { container } = render(<ShopPanel available={42} ownedAccessories={[]} />);
+    const { container } = render(
+      <ShopPanel available={42} ownedAccessories={[]} />,
+    );
     // Balance is shown via CoinBadge — look for it in the balance section
-    const balanceSection = container.querySelector(".flex.items-center.justify-between");
+    const balanceSection = container.querySelector(
+      ".flex.items-center.justify-between",
+    );
     expect(balanceSection?.textContent).toContain("42");
   });
 
@@ -50,7 +54,9 @@ describe("ShopPanel", () => {
     // Apple costs 5
     render(<ShopPanel available={5} ownedAccessories={[]} />);
     const buyButtons = screen.getAllByRole("button", { name: "Buy" });
-    const enabledButtons = buyButtons.filter((btn) => !btn.hasAttribute("disabled"));
+    const enabledButtons = buyButtons.filter(
+      (btn) => !btn.hasAttribute("disabled"),
+    );
     expect(enabledButtons.length).toBeGreaterThan(0);
   });
 
@@ -61,7 +67,9 @@ describe("ShopPanel", () => {
     const buyButtons = screen.getAllByRole("button", { name: "Buy" });
     await user.click(buyButtons[0]);
 
-    expect(invoke).toHaveBeenCalledWith("purchase_item", { itemId: SHOP_ITEMS[0].id });
+    expect(invoke).toHaveBeenCalledWith("purchase_item", {
+      itemId: SHOP_ITEMS[0].id,
+    });
   });
 
   it("renders item icons", () => {
@@ -74,7 +82,9 @@ describe("ShopPanel", () => {
   it("shows accessory behavior hints", () => {
     render(<ShopPanel available={100} ownedAccessories={[]} />);
     for (const item of SHOP_ITEMS) {
-      expect(screen.getByText(getAccessoryBehaviorProfile(item.id).shopHint)).toBeInTheDocument();
+      expect(
+        screen.getByText(getAccessoryBehaviorProfile(item.id).shopHint),
+      ).toBeInTheDocument();
     }
   });
 });
diff --git a/src/components/panel/__tests__/TaskList.test.tsx b/src/components/panel/__tests__/TaskList.test.tsx
index 1176b63..5110d81 100644
--- a/src/components/panel/__tests__/TaskList.test.tsx
+++ b/src/components/panel/__tests__/TaskList.test.tsx
@@ -5,8 +5,18 @@ import { TaskList } from "../TaskList";
 import type { Task } from "../../../store/types";
 
 const mockTasks: Task[] = [
-  { id: "1", title: "Write tests", completed: false, createdAt: "2025-01-01T00:00:00Z" },
-  { id: "2", title: "Fix bug", completed: true, createdAt: "2025-01-01T01:00:00Z" },
+  {
+    id: "1",
+    title: "Write tests",
+    completed: false,
+    createdAt: "2025-01-01T00:00:00Z",
+  },
+  {
+    id: "2",
+    title: "Fix bug",
+    completed: true,
+    createdAt: "2025-01-01T01:00:00Z",
+  },
 ];
 
 const defaultProps = {
@@ -62,7 +72,9 @@ describe("TaskList", () => {
     const user = userEvent.setup();
     render(<TaskList {...defaultProps} />);
 
-    const input = screen.getByPlaceholderText("Add a task...") as HTMLInputElement;
+    const input = screen.getByPlaceholderText(
+      "Add a task...",
+    ) as HTMLInputElement;
     await user.type(input, "New task");
     await user.click(screen.getByRole("button", { name: "Add" }));
 
diff --git a/src/components/panel/__tests__/TimerDisplay.test.tsx b/src/components/panel/__tests__/TimerDisplay.test.tsx
index db330c3..3f2c936 100644
--- a/src/components/panel/__tests__/TimerDisplay.test.tsx
+++ b/src/components/panel/__tests__/TimerDisplay.test.tsx
@@ -65,7 +65,14 @@ describe("TimerDisplay", () => {
   it("calls onResume when Resume clicked", async () => {
     const user = userEvent.setup();
     const onResume = vi.fn();
-    render(<TimerDisplay {...baseProps} phase="work" paused={true} onResume={onResume} />);
+    render(
+      <TimerDisplay
+        {...baseProps}
+        phase="work"
+        paused={true}
+        onResume={onResume}
+      />,
+    );
     await user.click(screen.getByRole("button", { name: "Resume" }));
     expect(onResume).toHaveBeenCalledTimes(1);
   });
@@ -77,11 +84,20 @@ describe("TimerDisplay", () => {
 
   it("does not show Reset button when idle", () => {
     render(<TimerDisplay {...baseProps} />);
-    expect(screen.queryByRole("button", { name: "Reset" })).not.toBeInTheDocument();
+    expect(
+      screen.queryByRole("button", { name: "Reset" }),
+    ).not.toBeInTheDocument();
   });
 
   it("shows 'Break' label during break phase", () => {
-    render(<TimerDisplay {...baseProps} phase="break" secondsLeft={300} totalSeconds={300} />);
+    render(
+      <TimerDisplay
+        {...baseProps}
+        phase="break"
+        secondsLeft={300}
+        totalSeconds={300}
+      />,
+    );
     expect(screen.getByText("Break")).toBeInTheDocument();
   });
 
diff --git a/src/components/pet/PetCharacter.tsx b/src/components/pet/PetCharacter.tsx
index 3f20448..8312d3f 100644
--- a/src/components/pet/PetCharacter.tsx
+++ b/src/components/pet/PetCharacter.tsx
@@ -19,7 +19,7 @@ const ACCESSORY_GLYPHS: Record<ShopItemId, string> = {
 
 function anchorForAccessory(
   accessory: ShopItemId,
-  anchors: ReturnType<typeof getSpeciesPackById>["accessoryAnchors"]
+  anchors: ReturnType<typeof getSpeciesPackById>["accessoryAnchors"],
 ) {
   if (accessory === "party_hat") return anchors.head;
   if (accessory === "bow_tie" || accessory === "scarf") return anchors.neck;
@@ -28,10 +28,16 @@ function anchorForAccessory(
   return anchors.head;
 }
 
-export function PetCharacter({ stage, accessories, speciesId, speciesMotionClass }: Props) {
+export function PetCharacter({
+  stage,
+  accessories,
+  speciesId,
+  speciesMotionClass,
+}: Props) {
   const species = getSpeciesPackById(speciesId);
   const stageIndex = Math.max(0, Math.min(2, stage));
-  const motionClass = speciesMotionClass ?? `species-${species.idleBehavior.baseAnimation}`;
+  const motionClass =
+    speciesMotionClass ?? `species-${species.idleBehavior.baseAnimation}`;
 
   return (
     <div className="relative w-[220px] h-[220px] flex items-center justify-center">
diff --git a/src/components/pet/PetStage1.tsx b/src/components/pet/PetStage1.tsx
index 0ede65c..85d9eba 100644
--- a/src/components/pet/PetStage1.tsx
+++ b/src/components/pet/PetStage1.tsx
@@ -22,7 +22,13 @@ export function PetStage1({ accessories }: Props) {
       <circle cx="96" cy="73" r="2.5" fill="white" />
 
       {/* Mouth */}
-      <path d="M 67 92 Q 75 100 83 92" stroke="#2D3748" strokeWidth="2" fill="none" strokeLinecap="round" />
+      <path
+        d="M 67 92 Q 75 100 83 92"
+        stroke="#2D3748"
+        strokeWidth="2"
+        fill="none"
+        strokeLinecap="round"
+      />
 
       {/* Blush spots */}
       <ellipse cx="48" cy="90" rx="8" ry="5" fill="#FFB3B3" opacity="0.5" />
@@ -47,19 +53,50 @@ export function PetStage1({ accessories }: Props) {
       )}
       {accessories.includes("sunglasses") && (
         <g>
-          <rect x="46" y="69" width="22" height="14" rx="4" fill="#1A1A2E" opacity="0.85" />
-          <rect x="82" y="69" width="22" height="14" rx="4" fill="#1A1A2E" opacity="0.85" />
-          <line x1="68" y1="76" x2="82" y2="76" stroke="#1A1A2E" strokeWidth="2" />
+          <rect
+            x="46"
+            y="69"
+            width="22"
+            height="14"
+            rx="4"
+            fill="#1A1A2E"
+            opacity="0.85"
+          />
+          <rect
+            x="82"
+            y="69"
+            width="22"
+            height="14"
+            rx="4"
+            fill="#1A1A2E"
+            opacity="0.85"
+          />
+          <line
+            x1="68"
+            y1="76"
+            x2="82"
+            y2="76"
+            stroke="#1A1A2E"
+            strokeWidth="2"
+          />
         </g>
       )}
       {accessories.includes("scarf") && (
-        <path d="M 35 105 Q 75 120 115 105 Q 110 115 75 118 Q 40 115 35 105" fill="#E74C3C" />
+        <path
+          d="M 35 105 Q 75 120 115 105 Q 110 115 75 118 Q 40 115 35 105"
+          fill="#E74C3C"
+        />
       )}
       {accessories.includes("apple") && (
         <g>
           <circle cx="30" cy="100" r="8" fill="#E74C3C" />
           <ellipse cx="30" cy="100" rx="8" ry="7" fill="#FF6B6B" />
-          <path d="M 30 92 Q 33 86 36 89" stroke="#4A7C3F" strokeWidth="1.5" fill="none" />
+          <path
+            d="M 30 92 Q 33 86 36 89"
+            stroke="#4A7C3F"
+            strokeWidth="1.5"
+            fill="none"
+          />
         </g>
       )}
       {accessories.includes("cookie") && (
diff --git a/src/components/pet/PetStage2.tsx b/src/components/pet/PetStage2.tsx
index 9991b6f..6276b1e 100644
--- a/src/components/pet/PetStage2.tsx
+++ b/src/components/pet/PetStage2.tsx
@@ -24,23 +24,57 @@ export function PetStage2({ accessories }: Props) {
       <circle cx="147" cy="73" r="3" fill="white" />
 
       {/* Mouth — confident smile */}
-      <path d="M 112 95 Q 125 107 138 95" stroke="#2D3748" strokeWidth="2.5" fill="none" strokeLinecap="round" />
+      <path
+        d="M 112 95 Q 125 107 138 95"
+        stroke="#2D3748"
+        strokeWidth="2.5"
+        fill="none"
+        strokeLinecap="round"
+      />
 
       {/* Blush */}
       <ellipse cx="90" cy="92" rx="9" ry="5" fill="#FFB3B3" opacity="0.4" />
       <ellipse cx="160" cy="92" rx="9" ry="5" fill="#FFB3B3" opacity="0.4" />
 
       {/* Arms */}
-      <ellipse cx="55" cy="145" rx="15" ry="10" fill="#4A9EC7" transform="rotate(-20 55 145)" />
-      <ellipse cx="195" cy="145" rx="15" ry="10" fill="#4A9EC7" transform="rotate(20 195 145)" />
+      <ellipse
+        cx="55"
+        cy="145"
+        rx="15"
+        ry="10"
+        fill="#4A9EC7"
+        transform="rotate(-20 55 145)"
+      />
+      <ellipse
+        cx="195"
+        cy="145"
+        rx="15"
+        ry="10"
+        fill="#4A9EC7"
+        transform="rotate(20 195 145)"
+      />
 
       {/* Legs */}
       <ellipse cx="100" cy="195" rx="18" ry="10" fill="#3A8DB5" />
       <ellipse cx="150" cy="195" rx="18" ry="10" fill="#3A8DB5" />
 
       {/* Small ears */}
-      <ellipse cx="90" cy="48" rx="10" ry="14" fill="#5BB5D5" transform="rotate(-15 90 48)" />
-      <ellipse cx="160" cy="48" rx="10" ry="14" fill="#5BB5D5" transform="rotate(15 160 48)" />
+      <ellipse
+        cx="90"
+        cy="48"
+        rx="10"
+        ry="14"
+        fill="#5BB5D5"
+        transform="rotate(-15 90 48)"
+      />
+      <ellipse
+        cx="160"
+        cy="48"
+        rx="10"
+        ry="14"
+        fill="#5BB5D5"
+        transform="rotate(15 160 48)"
+      />
 
       {/* Accessories */}
       {accessories.includes("party_hat") && (
@@ -57,19 +91,50 @@ export function PetStage2({ accessories }: Props) {
       )}
       {accessories.includes("sunglasses") && (
         <g>
-          <rect x="94" y="68" width="25" height="16" rx="5" fill="#1A1A2E" opacity="0.85" />
-          <rect x="131" y="68" width="25" height="16" rx="5" fill="#1A1A2E" opacity="0.85" />
-          <line x1="119" y1="76" x2="131" y2="76" stroke="#1A1A2E" strokeWidth="2.5" />
+          <rect
+            x="94"
+            y="68"
+            width="25"
+            height="16"
+            rx="5"
+            fill="#1A1A2E"
+            opacity="0.85"
+          />
+          <rect
+            x="131"
+            y="68"
+            width="25"
+            height="16"
+            rx="5"
+            fill="#1A1A2E"
+            opacity="0.85"
+          />
+          <line
+            x1="119"
+            y1="76"
+            x2="131"
+            y2="76"
+            stroke="#1A1A2E"
+            strokeWidth="2.5"
+          />
         </g>
       )}
       {accessories.includes("scarf") && (
-        <path d="M 70 115 Q 125 135 180 115 Q 175 128 125 132 Q 75 128 70 115" fill="#E74C3C" />
+        <path
+          d="M 70 115 Q 125 135 180 115 Q 175 128 125 132 Q 75 128 70 115"
+          fill="#E74C3C"
+        />
       )}
       {accessories.includes("apple") && (
         <g>
           <circle cx="42" cy="148" r="10" fill="#E74C3C" />
           <ellipse cx="42" cy="148" rx="10" ry="9" fill="#FF6B6B" />
-          <path d="M 42 138 Q 46 131 50 135" stroke="#4A7C3F" strokeWidth="1.5" fill="none" />
+          <path
+            d="M 42 138 Q 46 131 50 135"
+            stroke="#4A7C3F"
+            strokeWidth="1.5"
+            fill="none"
+          />
         </g>
       )}
       {accessories.includes("cookie") && (
diff --git a/src/components/pet/PetStage3.tsx b/src/components/pet/PetStage3.tsx
index d5ae76e..304fb2c 100644
--- a/src/components/pet/PetStage3.tsx
+++ b/src/components/pet/PetStage3.tsx
@@ -8,19 +8,49 @@ export function PetStage3({ accessories }: Props) {
   return (
     <svg width="350" height="350" viewBox="0 0 350 350" fill="none">
       {/* Wings */}
-      <path d="M 50 160 Q 20 120 40 80 Q 60 100 70 150" fill="#3A7CA5" opacity="0.7" />
-      <path d="M 300 160 Q 330 120 310 80 Q 290 100 280 150" fill="#3A7CA5" opacity="0.7" />
-      <path d="M 55 175 Q 15 140 30 95 Q 55 115 65 165" fill="#2E6B8A" opacity="0.5" />
-      <path d="M 295 175 Q 335 140 320 95 Q 295 115 285 165" fill="#2E6B8A" opacity="0.5" />
+      <path
+        d="M 50 160 Q 20 120 40 80 Q 60 100 70 150"
+        fill="#3A7CA5"
+        opacity="0.7"
+      />
+      <path
+        d="M 300 160 Q 330 120 310 80 Q 290 100 280 150"
+        fill="#3A7CA5"
+        opacity="0.7"
+      />
+      <path
+        d="M 55 175 Q 15 140 30 95 Q 55 115 65 165"
+        fill="#2E6B8A"
+        opacity="0.5"
+      />
+      <path
+        d="M 295 175 Q 335 140 320 95 Q 295 115 285 165"
+        fill="#2E6B8A"
+        opacity="0.5"
+      />
 
       {/* Body — angular/armored */}
-      <path d="M 110 120 L 175 100 L 240 120 L 250 200 L 175 230 L 100 200 Z" fill="#2A6F97" />
+      <path
+        d="M 110 120 L 175 100 L 240 120 L 250 200 L 175 230 L 100 200 Z"
+        fill="#2A6F97"
+      />
       {/* Armor plates */}
-      <path d="M 130 135 L 175 120 L 220 135 L 215 185 L 175 200 L 135 185 Z" fill="#3D8AB9" opacity="0.7" />
-      <path d="M 150 150 L 175 140 L 200 150 L 195 175 L 175 182 L 155 175 Z" fill="#5BA8C8" opacity="0.5" />
+      <path
+        d="M 130 135 L 175 120 L 220 135 L 215 185 L 175 200 L 135 185 Z"
+        fill="#3D8AB9"
+        opacity="0.7"
+      />
+      <path
+        d="M 150 150 L 175 140 L 200 150 L 195 175 L 175 182 L 155 175 Z"
+        fill="#5BA8C8"
+        opacity="0.5"
+      />
 
       {/* Head — more angular */}
-      <path d="M 125 60 L 175 40 L 225 60 L 220 110 L 175 120 L 130 110 Z" fill="#327BA8" />
+      <path
+        d="M 125 60 L 175 40 L 225 60 L 220 110 L 175 120 L 130 110 Z"
+        fill="#327BA8"
+      />
 
       {/* Crown spikes */}
       <polygon points="140,60 145,30 155,55" fill="#FFD93D" />
@@ -36,7 +66,13 @@ export function PetStage3({ accessories }: Props) {
       <circle cx="195" cy="76" r="1.5" fill="white" />
 
       {/* Mouth — determined */}
-      <path d="M 160 96 L 175 102 L 190 96" stroke="#1A1A2E" strokeWidth="2.5" fill="none" strokeLinecap="round" />
+      <path
+        d="M 160 96 L 175 102 L 190 96"
+        stroke="#1A1A2E"
+        strokeWidth="2.5"
+        fill="none"
+        strokeLinecap="round"
+      />
 
       {/* Arms — strong */}
       <path d="M 95 150 Q 60 145 55 170 Q 60 185 95 180" fill="#2A6F97" />
@@ -53,7 +89,12 @@ export function PetStage3({ accessories }: Props) {
       <ellipse cx="215" cy="265" rx="20" ry="10" fill="#163D57" />
 
       {/* Tail */}
-      <path d="M 175 230 Q 140 260 120 290 Q 115 300 125 295 Q 145 275 175 240" fill="#2A6F97" stroke="#1E5276" strokeWidth="1" />
+      <path
+        d="M 175 230 Q 140 260 120 290 Q 115 300 125 295 Q 145 275 175 240"
+        fill="#2A6F97"
+        stroke="#1E5276"
+        strokeWidth="1"
+      />
 
       {/* Accessories */}
       {accessories.includes("party_hat") && (
@@ -70,19 +111,50 @@ export function PetStage3({ accessories }: Props) {
       )}
       {accessories.includes("sunglasses") && (
         <g>
-          <rect x="140" y="71" width="30" height="14" rx="3" fill="#1A1A2E" opacity="0.9" />
-          <rect x="180" y="71" width="30" height="14" rx="3" fill="#1A1A2E" opacity="0.9" />
-          <line x1="170" y1="78" x2="180" y2="78" stroke="#1A1A2E" strokeWidth="3" />
+          <rect
+            x="140"
+            y="71"
+            width="30"
+            height="14"
+            rx="3"
+            fill="#1A1A2E"
+            opacity="0.9"
+          />
+          <rect
+            x="180"
+            y="71"
+            width="30"
+            height="14"
+            rx="3"
+            fill="#1A1A2E"
+            opacity="0.9"
+          />
+          <line
+            x1="170"
+            y1="78"
+            x2="180"
+            y2="78"
+            stroke="#1A1A2E"
+            strokeWidth="3"
+          />
         </g>
       )}
       {accessories.includes("scarf") && (
-        <path d="M 100 115 Q 175 140 250 115 Q 245 130 175 135 Q 105 130 100 115" fill="#E74C3C" />
+        <path
+          d="M 100 115 Q 175 140 250 115 Q 245 130 175 135 Q 105 130 100 115"
+          fill="#E74C3C"
+        />
       )}
       {accessories.includes("apple") && (
         <g>
           <circle cx="42" cy="168" r="12" fill="#E74C3C" />
           <ellipse cx="42" cy="168" rx="12" ry="11" fill="#FF6B6B" />
-          <path d="M 42 156 Q 47 148 52 153" stroke="#4A7C3F" strokeWidth="2" fill="none" />
+          <path
+            d="M 42 156 Q 47 148 52 153"
+            stroke="#4A7C3F"
+            strokeWidth="2"
+            fill="none"
+          />
         </g>
       )}
       {accessories.includes("cookie") && (
diff --git a/src/components/pet/__tests__/PetCharacter.test.tsx b/src/components/pet/__tests__/PetCharacter.test.tsx
index 4b5be48..b6dbb5c 100644
--- a/src/components/pet/__tests__/PetCharacter.test.tsx
+++ b/src/components/pet/__tests__/PetCharacter.test.tsx
@@ -5,7 +5,7 @@ import { PetCharacter } from "../PetCharacter";
 describe("PetCharacter", () => {
   it("renders species stage sprite for stage 0", () => {
     const { container } = render(
-      <PetCharacter stage={0} accessories={[]} speciesId="penguin" />
+      <PetCharacter stage={0} accessories={[]} speciesId="penguin" />,
     );
     const image = container.querySelector("img");
     expect(image).toBeInTheDocument();
@@ -14,7 +14,7 @@ describe("PetCharacter", () => {
 
   it("renders stage 2 sprite for stage 1", () => {
     const { container } = render(
-      <PetCharacter stage={1} accessories={[]} speciesId="cat" />
+      <PetCharacter stage={1} accessories={[]} speciesId="cat" />,
     );
     const image = container.querySelector("img");
     expect(image?.getAttribute("alt")).toContain("Cat stage 2");
@@ -22,7 +22,7 @@ describe("PetCharacter", () => {
 
   it("clamps stage above max", () => {
     const { container } = render(
-      <PetCharacter stage={99} accessories={[]} speciesId="corgi" />
+      <PetCharacter stage={99} accessories={[]} speciesId="corgi" />,
     );
     const image = container.querySelector("img");
     expect(image?.getAttribute("alt")).toContain("Corgi stage 3");
@@ -30,7 +30,7 @@ describe("PetCharacter", () => {
 
   it("falls back to default species for unknown species id", () => {
     const { container } = render(
-      <PetCharacter stage={0} accessories={[]} speciesId="unknown" />
+      <PetCharacter stage={0} accessories={[]} speciesId="unknown" />,
     );
     const image = container.querySelector("img");
     expect(image?.getAttribute("alt")).toContain("Penguin stage 1");
@@ -38,7 +38,11 @@ describe("PetCharacter", () => {
 
   it("renders accessory overlays", () => {
     const { container } = render(
-      <PetCharacter stage={0} accessories={["party_hat"]} speciesId="axolotl" />
+      <PetCharacter
+        stage={0}
+        accessories={["party_hat"]}
+        speciesId="axolotl"
+      />,
     );
     expect(container.textContent).toContain("🎉");
   });
@@ -50,7 +54,7 @@ describe("PetCharacter", () => {
         accessories={[]}
         speciesId="penguin"
         speciesMotionClass="species-float"
-      />
+      />,
     );
     const image = container.querySelector("img");
     expect(image?.className).toContain("species-float");
diff --git a/src/components/pet/animations.css b/src/components/pet/animations.css
index b8b1cc3..a275d7e 100644
--- a/src/components/pet/animations.css
+++ b/src/components/pet/animations.css
@@ -1,42 +1,93 @@
 @keyframes idle-bounce {
-  0%, 100% { transform: translateY(0); }
-  50% { transform: translateY(-8px); }
+  0%,
+  100% {
+    transform: translateY(0);
+  }
+  50% {
+    transform: translateY(-8px);
+  }
 }
 
 @keyframes working-pulse {
-  0%, 100% { transform: scale(1); opacity: 1; }
-  50% { transform: scale(1.05); opacity: 0.9; }
+  0%,
+  100% {
+    transform: scale(1);
+    opacity: 1;
+  }
+  50% {
+    transform: scale(1.05);
+    opacity: 0.9;
+  }
 }
 
 @keyframes break-sway {
-  0%, 100% { transform: rotate(0deg); }
-  25% { transform: rotate(-5deg); }
-  75% { transform: rotate(5deg); }
+  0%,
+  100% {
+    transform: rotate(0deg);
+  }
+  25% {
+    transform: rotate(-5deg);
+  }
+  75% {
+    transform: rotate(5deg);
+  }
 }
 
 @keyframes celebrating-jump {
-  0%, 100% { transform: translateY(0) scale(1); }
-  30% { transform: translateY(-20px) scale(1.1); }
-  50% { transform: translateY(-25px) scale(1.05); }
-  70% { transform: translateY(-15px) scale(1.1); }
+  0%,
+  100% {
+    transform: translateY(0) scale(1);
+  }
+  30% {
+    transform: translateY(-20px) scale(1.1);
+  }
+  50% {
+    transform: translateY(-25px) scale(1.05);
+  }
+  70% {
+    transform: translateY(-15px) scale(1.1);
+  }
 }
 
 @keyframes evolving-glow {
-  0% { transform: scale(1); filter: brightness(1) drop-shadow(0 0 0 transparent); }
-  50% { transform: scale(1.2); filter: brightness(1.5) drop-shadow(0 0 20px rgba(255, 200, 50, 0.8)); }
-  100% { transform: scale(1); filter: brightness(1) drop-shadow(0 0 0 transparent); }
+  0% {
+    transform: scale(1);
+    filter: brightness(1) drop-shadow(0 0 0 transparent);
+  }
+  50% {
+    transform: scale(1.2);
+    filter: brightness(1.5) drop-shadow(0 0 20px rgba(255, 200, 50, 0.8));
+  }
+  100% {
+    transform: scale(1);
+    filter: brightness(1) drop-shadow(0 0 0 transparent);
+  }
 }
 
 @keyframes clicked-squish {
-  0% { transform: scale(1, 1); }
-  30% { transform: scale(1.15, 0.85); }
-  60% { transform: scale(0.9, 1.1); }
-  100% { transform: scale(1, 1); }
+  0% {
+    transform: scale(1, 1);
+  }
+  30% {
+    transform: scale(1.15, 0.85);
+  }
+  60% {
+    transform: scale(0.9, 1.1);
+  }
+  100% {
+    transform: scale(1, 1);
+  }
 }
 
 @keyframes float-particle {
-  0% { transform: translateY(0) scale(1); opacity: 0.7; }
-  100% { transform: translateY(-40px) scale(0); opacity: 0; }
+  0% {
+    transform: translateY(0) scale(1);
+    opacity: 0.7;
+  }
+  100% {
+    transform: translateY(-40px) scale(0);
+    opacity: 0;
+  }
 }
 
 .anim-idle {
@@ -114,35 +165,55 @@
 .chill-dim {
   opacity: 0.66;
   filter: saturate(0.9) brightness(0.92);
-  transition: opacity 180ms ease, filter 180ms ease;
+  transition:
+    opacity 180ms ease,
+    filter 180ms ease;
 }
 
 @keyframes species-idle-float {
-  0%, 100% { transform: translateY(0); }
-  50% { transform: translateY(calc(-4px * var(--species-motion-scale, 1))); }
+  0%,
+  100% {
+    transform: translateY(0);
+  }
+  50% {
+    transform: translateY(calc(-4px * var(--species-motion-scale, 1)));
+  }
 }
 
 @keyframes species-idle-sway {
-  0%, 100% { transform: rotate(0deg); }
-  50% { transform: rotate(calc(1.8deg * var(--species-motion-scale, 1))); }
+  0%,
+  100% {
+    transform: rotate(0deg);
+  }
+  50% {
+    transform: rotate(calc(1.8deg * var(--species-motion-scale, 1)));
+  }
 }
 
 @keyframes species-idle-bounce {
-  0%, 100% { transform: scale(1); }
-  50% { transform: scale(calc(1 + (0.02 * var(--species-motion-scale, 1)))); }
+  0%,
+  100% {
+    transform: scale(1);
+  }
+  50% {
+    transform: scale(calc(1 + (0.02 * var(--species-motion-scale, 1))));
+  }
 }
 
 .species-float {
-  animation: species-idle-float calc(5.8s * var(--species-motion-duration, 1)) ease-in-out infinite;
+  animation: species-idle-float calc(5.8s * var(--species-motion-duration, 1))
+    ease-in-out infinite;
 }
 
 .species-sway {
   transform-origin: center bottom;
-  animation: species-idle-sway calc(6.2s * var(--species-motion-duration, 1)) ease-in-out infinite;
+  animation: species-idle-sway calc(6.2s * var(--species-motion-duration, 1))
+    ease-in-out infinite;
 }
 
 .species-bounce {
-  animation: species-idle-bounce calc(4.8s * var(--species-motion-duration, 1)) ease-in-out infinite;
+  animation: species-idle-bounce calc(4.8s * var(--species-motion-duration, 1))
+    ease-in-out infinite;
 }
 
 .species-intensity-still {
@@ -178,38 +249,73 @@
 }
 
 @keyframes accessory-scarf-warmth {
-  0%, 100% { filter: saturate(1); }
-  50% { filter: saturate(1.06); }
+  0%,
+  100% {
+    filter: saturate(1);
+  }
+  50% {
+    filter: saturate(1.06);
+  }
 }
 
 @keyframes accessory-bow-twinkle {
-  0%, 100% { transform: translateY(0); }
-  50% { transform: translateY(-1.5px); }
+  0%,
+  100% {
+    transform: translateY(0);
+  }
+  50% {
+    transform: translateY(-1.5px);
+  }
 }
 
 @keyframes accessory-partyhat-bop {
-  0%, 100% { transform: rotate(0deg); }
-  50% { transform: rotate(1.8deg); }
+  0%,
+  100% {
+    transform: rotate(0deg);
+  }
+  50% {
+    transform: rotate(1.8deg);
+  }
 }
 
 @keyframes accessory-apple-bob {
-  0%, 100% { transform: translateY(0); }
-  50% { transform: translateY(-1.5px); }
+  0%,
+  100% {
+    transform: translateY(0);
+  }
+  50% {
+    transform: translateY(-1.5px);
+  }
 }
 
 @keyframes accessory-cookie-glint {
-  0%, 100% { filter: saturate(1); }
-  50% { filter: saturate(1.12); }
+  0%,
+  100% {
+    filter: saturate(1);
+  }
+  50% {
+    filter: saturate(1.12);
+  }
 }
 
 @keyframes quest-accent-soft-glow {
-  0%, 100% { filter: saturate(1) brightness(1); }
-  50% { filter: saturate(1.06) brightness(1.03); }
+  0%,
+  100% {
+    filter: saturate(1) brightness(1);
+  }
+  50% {
+    filter: saturate(1.06) brightness(1.03);
+  }
 }
 
 @keyframes quest-accent-soft-tilt {
-  0%, 100% { transform: rotate(0deg); }
-  50% { transform: rotate(0.9deg); }
+  0%,
+  100% {
+    transform: rotate(0deg);
+  }
+  50% {
+    transform: rotate(0.9deg);
+  }
 }
 
 .behavior-scarf {
diff --git a/src/components/shared/AchievementBadge.tsx b/src/components/shared/AchievementBadge.tsx
index 4bd31df..93537dc 100644
--- a/src/components/shared/AchievementBadge.tsx
+++ b/src/components/shared/AchievementBadge.tsx
@@ -12,9 +12,13 @@ export function AchievementBadge({
   showProgress = true,
 }: AchievementBadgeProps) {
   const isUnlocked = achievement.unlockedAt !== null;
-  const progressPercent = achievement.target > 0
-    ? Math.min(100, Math.round((achievement.progress / achievement.target) * 100))
-    : 0;
+  const progressPercent =
+    achievement.target > 0
+      ? Math.min(
+          100,
+          Math.round((achievement.progress / achievement.target) * 100),
+        )
+      : 0;
 
   const sizeClasses = {
     small: "w-16 h-20",
@@ -49,7 +53,9 @@ export function AchievementBadge({
       {/* Title */}
       <div
         className={`mt-1 text-center text-xs font-medium ${
-          isUnlocked ? "text-gray-900 dark:text-gray-100" : "text-gray-500 dark:text-gray-400"
+          isUnlocked
+            ? "text-gray-900 dark:text-gray-100"
+            : "text-gray-500 dark:text-gray-400"
         }`}
       >
         {achievement.title}
diff --git a/src/components/shared/CoinBadge.tsx b/src/components/shared/CoinBadge.tsx
index 9698afb..6429cf7 100644
--- a/src/components/shared/CoinBadge.tsx
+++ b/src/components/shared/CoinBadge.tsx
@@ -6,8 +6,22 @@ export function CoinBadge({ amount }: Props) {
   return (
     <span className="inline-flex items-center gap-1 text-amber-600 font-semibold">
       <svg width="16" height="16" viewBox="0 0 16 16" fill="none">
-        <circle cx="8" cy="8" r="7" fill="#FFD93D" stroke="#E6A800" strokeWidth="1" />
-        <text x="8" y="11" textAnchor="middle" fontSize="8" fill="#B8860B" fontWeight="bold">
+        <circle
+          cx="8"
+          cy="8"
+          r="7"
+          fill="#FFD93D"
+          stroke="#E6A800"
+          strokeWidth="1"
+        />
+        <text
+          x="8"
+          y="11"
+          textAnchor="middle"
+          fontSize="8"
+          fill="#B8860B"
+          fontWeight="bold"
+        >
           $
         </text>
       </svg>
diff --git a/src/components/shared/ProgressBar.tsx b/src/components/shared/ProgressBar.tsx
index 8511297..fbc34eb 100644
--- a/src/components/shared/ProgressBar.tsx
+++ b/src/components/shared/ProgressBar.tsx
@@ -13,7 +13,9 @@ export function ProgressBar({
 }: Props) {
   const pct = max > 0 ? Math.min((value / max) * 100, 100) : 0;
   return (
-    <div className={`h-2 bg-gray-200 rounded-full overflow-hidden ${className}`}>
+    <div
+      className={`h-2 bg-gray-200 rounded-full overflow-hidden ${className}`}
+    >
       <div
         className={`h-full rounded-full transition-all duration-500 ${color}`}
         style={{ width: `${pct}%` }}
diff --git a/src/components/shared/__tests__/ErrorBoundary.test.tsx b/src/components/shared/__tests__/ErrorBoundary.test.tsx
index e9273cb..0f971a0 100644
--- a/src/components/shared/__tests__/ErrorBoundary.test.tsx
+++ b/src/components/shared/__tests__/ErrorBoundary.test.tsx
@@ -13,7 +13,7 @@ describe("ErrorBoundary", () => {
     render(
       <ErrorBoundary>
         <div data-testid="test-child">Test Content</div>
-      </ErrorBoundary>
+      </ErrorBoundary>,
     );
 
     expect(screen.getByTestId("test-child")).toBeInTheDocument();
@@ -29,11 +29,13 @@ describe("ErrorBoundary", () => {
     render(
       <ErrorBoundary>
         <ThrowError />
-      </ErrorBoundary>
+      </ErrorBoundary>,
     );
 
     expect(screen.getByText("Something went wrong")).toBeInTheDocument();
-    expect(screen.getByText(/DesktopPet encountered an unexpected error/i)).toBeInTheDocument();
+    expect(
+      screen.getByText(/DesktopPet encountered an unexpected error/i),
+    ).toBeInTheDocument();
   });
 
   it("should display error details in development mode", () => {
@@ -47,7 +49,7 @@ describe("ErrorBoundary", () => {
     render(
       <ErrorBoundary>
         <ThrowError />
-      </ErrorBoundary>
+      </ErrorBoundary>,
     );
 
     // Error details should be in a collapsed details element
@@ -67,7 +69,7 @@ describe("ErrorBoundary", () => {
     render(
       <ErrorBoundary onError={onErrorMock}>
         <ThrowError />
-      </ErrorBoundary>
+      </ErrorBoundary>,
     );
 
     expect(onErrorMock).toHaveBeenCalled();
@@ -89,7 +91,7 @@ describe("ErrorBoundary", () => {
     render(
       <ErrorBoundary>
         <ConditionalError />
-      </ErrorBoundary>
+      </ErrorBoundary>,
     );
 
     expect(screen.getByText("Something went wrong")).toBeInTheDocument();
@@ -116,9 +118,11 @@ describe("ErrorBoundary", () => {
     render(
       <ErrorBoundary>
         <ThrowError />
-      </ErrorBoundary>
+      </ErrorBoundary>,
     );
 
-    expect(screen.getByRole("button", { name: /Reload App/i })).toBeInTheDocument();
+    expect(
+      screen.getByRole("button", { name: /Reload App/i }),
+    ).toBeInTheDocument();
   });
 });
diff --git a/src/components/shared/__tests__/ProgressBar.test.tsx b/src/components/shared/__tests__/ProgressBar.test.tsx
index cd09d6e..5f0133d 100644
--- a/src/components/shared/__tests__/ProgressBar.test.tsx
+++ b/src/components/shared/__tests__/ProgressBar.test.tsx
@@ -36,7 +36,9 @@ describe("ProgressBar", () => {
   });
 
   it("applies custom color class", () => {
-    const { container } = render(<ProgressBar value={0.5} color="bg-green-500" />);
+    const { container } = render(
+      <ProgressBar value={0.5} color="bg-green-500" />,
+    );
     expect(getBar(container).className).toContain("bg-green-500");
   });
 
diff --git a/src/hooks/__tests__/useAchievements.test.ts b/src/hooks/__tests__/useAchievements.test.ts
index cba0b5b..62076b3 100644
--- a/src/hooks/__tests__/useAchievements.test.ts
+++ b/src/hooks/__tests__/useAchievements.test.ts
@@ -127,7 +127,9 @@ describe("useAchievements", () => {
       expect(result.current.loading).toBe(false);
     });
 
-    const achievement = result.current.achievements.find((a) => a.id === "focused_5");
+    const achievement = result.current.achievements.find(
+      (a) => a.id === "focused_5",
+    );
     if (!achievement) throw new Error("Achievement not found");
 
     const percent = result.current.getProgressPercent(achievement);
diff --git a/src/hooks/__tests__/usePomodoro.test.ts b/src/hooks/__tests__/usePomodoro.test.ts
index f949293..e49aac4 100644
--- a/src/hooks/__tests__/usePomodoro.test.ts
+++ b/src/hooks/__tests__/usePomodoro.test.ts
@@ -1,9 +1,6 @@
-// @ts-nocheck
 import { describe, it, expect, beforeEach, afterEach, vi } from "vitest";
 import { renderHook, act, waitFor } from "@testing-library/react";
 import { usePomodoro } from "../usePomodoro";
-// import * as TauriApi from "@tauri-apps/api/core";
-// import * as TauriEvent from "@tauri-apps/api/event";
 
 // Mock Tauri modules
 vi.mock("@tauri-apps/api/core");
@@ -33,30 +30,18 @@ vi.mock("../../lib/tauri", () => ({
         quietModeEnabled: false,
         soundEnabled: true,
         volume: 50,
+        focusGuardrailsEnabled: true,
+        focusBlocklist: ["configured-only.example"],
+        focusAllowlist: [],
       };
     }
     return null;
   }),
-  invokeOr: vi.fn(async (command: string, args: any, defaultValue: any) => {
-    if (command === "get_timer_runtime") {
-      return {
-        phase: "idle",
-        secondsLeft: 1500,
-        totalSeconds: 1500,
-        paused: false,
-        sessionId: null,
-        sessionsCompleted: 0,
-        preset: "standard",
-        lastUpdatedAt: new Date().toISOString(),
-      };
-    }
-    return defaultValue;
-  }),
   invokeQuiet: vi.fn(),
   listenSafe: vi.fn(() => Promise.resolve(() => {})),
 }));
 
-describe.skip("usePomodoro", () => {
+describe("usePomodoro", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     // Clear localStorage
@@ -65,6 +50,7 @@ describe.skip("usePomodoro", () => {
 
   afterEach(() => {
     vi.clearAllTimers();
+    vi.useRealTimers();
   });
 
   it("should initialize with idle phase and default preset", async () => {
@@ -75,15 +61,15 @@ describe.skip("usePomodoro", () => {
     });
 
     // After hydration, should have loaded timer runtime
-    expect(result.current.state.phase).toBe("idle");
-    expect(result.current.state.preset).toBe("standard");
+    expect(result.current.phase).toBe("idle");
+    expect(result.current.preset).toBe("standard");
   });
 
   it("should start a pomodoro session and transition to work phase", async () => {
     const { result } = renderHook(() => usePomodoro());
 
     await waitFor(() => {
-      expect(result.current.state.phase).toBe("idle");
+      expect(result.current.phase).toBe("idle");
     });
 
     // Start timer
@@ -92,39 +78,41 @@ describe.skip("usePomodoro", () => {
     });
 
     await waitFor(() => {
-      expect(result.current.state.phase).toBe("work");
-      expect(result.current.state.sessionId).toBe("session-123");
+      expect(result.current.phase).toBe("work");
+      expect(result.current.sessionId).toBe("session-123");
     });
+    const { invokeMaybe } = await import("../../lib/tauri");
+    expect(invokeMaybe).not.toHaveBeenCalledWith(
+      "apply_focus_guardrails_intervention",
+      expect.anything(),
+    );
+    expect(result.current.paused).toBe(false);
   });
 
   it("should countdown seconds during work phase", async () => {
     vi.useFakeTimers();
 
     const { result } = renderHook(() => usePomodoro());
-
-    await waitFor(() => {
-      expect(result.current.state.phase).toBe("idle");
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(0);
     });
+    expect(result.current.phase).toBe("idle");
 
-    const initialSeconds = result.current.state.secondsLeft;
+    const initialSeconds = result.current.secondsLeft;
 
     // Start timer
     await act(async () => {
       await result.current.start();
     });
 
-    await waitFor(() => {
-      expect(result.current.state.phase).toBe("work");
-    });
+    expect(result.current.phase).toBe("work");
 
     // Advance time by 1 second
     await act(async () => {
-      vi.advanceTimersByTime(1000);
+      await vi.advanceTimersByTimeAsync(1000);
     });
 
-    await waitFor(() => {
-      expect(result.current.state.secondsLeft).toBe(initialSeconds - 1);
-    });
+    expect(result.current.secondsLeft).toBe(initialSeconds - 1);
 
     vi.useRealTimers();
   });
@@ -133,7 +121,7 @@ describe.skip("usePomodoro", () => {
     const { result } = renderHook(() => usePomodoro());
 
     await waitFor(() => {
-      expect(result.current.state.phase).toBe("idle");
+      expect(result.current.phase).toBe("idle");
     });
 
     // Start timer
@@ -142,7 +130,7 @@ describe.skip("usePomodoro", () => {
     });
 
     await waitFor(() => {
-      expect(result.current.state.phase).toBe("work");
+      expect(result.current.phase).toBe("work");
     });
 
     // Pause
@@ -164,7 +152,7 @@ describe.skip("usePomodoro", () => {
     const { result } = renderHook(() => usePomodoro());
 
     await waitFor(() => {
-      expect(result.current.state.phase).toBe("idle");
+      expect(result.current.phase).toBe("idle");
     });
 
     // Start timer
@@ -173,7 +161,7 @@ describe.skip("usePomodoro", () => {
     });
 
     await waitFor(() => {
-      expect(result.current.state.phase).toBe("work");
+      expect(result.current.phase).toBe("work");
     });
 
     // Reset
@@ -182,8 +170,8 @@ describe.skip("usePomodoro", () => {
     });
 
     await waitFor(() => {
-      expect(result.current.state.phase).toBe("idle");
-      expect(result.current.state.sessionId).toBeNull();
+      expect(result.current.phase).toBe("idle");
+      expect(result.current.sessionId).toBeNull();
     });
   });
 
@@ -191,10 +179,10 @@ describe.skip("usePomodoro", () => {
     const { result } = renderHook(() => usePomodoro());
 
     await waitFor(() => {
-      expect(result.current.state.phase).toBe("idle");
+      expect(result.current.phase).toBe("idle");
     });
 
-    const initialPreset = result.current.state.preset;
+    const initialPreset = result.current.preset;
 
     // Change preset
     act(() => {
@@ -202,8 +190,8 @@ describe.skip("usePomodoro", () => {
     });
 
     await waitFor(() => {
-      expect(result.current.state.preset).toBe("long");
-      expect(result.current.state.preset).not.toBe(initialPreset);
+      expect(result.current.preset).toBe("long");
+      expect(result.current.preset).not.toBe(initialPreset);
     });
   });
 
@@ -211,7 +199,7 @@ describe.skip("usePomodoro", () => {
     const { result } = renderHook(() => usePomodoro());
 
     await waitFor(() => {
-      expect(result.current.state.phase).toBe("idle");
+      expect(result.current.phase).toBe("idle");
     });
 
     // Start timer
@@ -220,24 +208,24 @@ describe.skip("usePomodoro", () => {
     });
 
     await waitFor(() => {
-      expect(result.current.state.phase).toBe("work");
+      expect(result.current.phase).toBe("work");
     });
 
-    const currentPreset = result.current.state.preset;
+    const currentPreset = result.current.preset;
 
     // Try to change preset (should be ignored)
     act(() => {
       result.current.setPreset("long");
     });
 
-    expect(result.current.state.preset).toBe(currentPreset);
+    expect(result.current.preset).toBe(currentPreset);
   });
 
   it("should persist timer state to localStorage on change", async () => {
     const { result } = renderHook(() => usePomodoro());
 
     await waitFor(() => {
-      expect(result.current.state.phase).toBe("idle");
+      expect(result.current.phase).toBe("idle");
     });
 
     // Start timer
@@ -246,7 +234,7 @@ describe.skip("usePomodoro", () => {
     });
 
     await waitFor(() => {
-      expect(result.current.state.phase).toBe("work");
+      expect(result.current.phase).toBe("work");
     });
 
     // Verify save_timer_runtime was called
@@ -258,7 +246,7 @@ describe.skip("usePomodoro", () => {
           phase: "work",
           sessionId: "session-123",
         }),
-      })
+      }),
     );
   });
 
@@ -266,33 +254,28 @@ describe.skip("usePomodoro", () => {
     vi.useFakeTimers();
 
     const { result } = renderHook(() => usePomodoro());
-
-    await waitFor(() => {
-      expect(result.current.state.phase).toBe("idle");
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(0);
     });
 
-    const initialCount = result.current.state.sessionsCompleted;
+    const initialCount = result.current.sessionsCompleted;
 
     // Start timer
     await act(async () => {
       await result.current.start();
     });
 
-    await waitFor(() => {
-      expect(result.current.state.phase).toBe("work");
-    });
+    expect(result.current.phase).toBe("work");
 
     // Simulate timer completion (advance by full duration)
-    const duration = result.current.state.totalSeconds * 1000;
+    const duration = result.current.totalSeconds * 1000;
     await act(async () => {
-      vi.advanceTimersByTime(duration);
+      await vi.advanceTimersByTimeAsync(duration);
     });
 
     // After work phase completes, should transition to celebrating
-    await waitFor(() => {
-      expect(result.current.state.phase).toBe("celebrating");
-      expect(result.current.state.sessionsCompleted).toBe(initialCount + 1);
-    });
+    expect(result.current.phase).toBe("celebrating");
+    expect(result.current.sessionsCompleted).toBe(initialCount + 1);
 
     vi.useRealTimers();
   });
@@ -301,9 +284,8 @@ describe.skip("usePomodoro", () => {
     vi.useFakeTimers();
 
     const { result } = renderHook(() => usePomodoro());
-
-    await waitFor(() => {
-      expect(result.current.state.phase).toBe("idle");
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(0);
     });
 
     // Manually set to celebrating phase for this test
@@ -311,30 +293,24 @@ describe.skip("usePomodoro", () => {
       await result.current.start();
     });
 
-    await waitFor(() => {
-      expect(result.current.state.phase).toBe("work");
-    });
+    expect(result.current.phase).toBe("work");
 
     // Fast forward to completion
-    const duration = result.current.state.totalSeconds * 1000;
+    const duration = result.current.totalSeconds * 1000;
     await act(async () => {
-      vi.advanceTimersByTime(duration);
+      await vi.advanceTimersByTimeAsync(duration);
     });
 
     // Should be in celebrating
-    await waitFor(() => {
-      expect(result.current.state.phase).toBe("celebrating");
-    });
+    expect(result.current.phase).toBe("celebrating");
 
     // Advance 3 seconds more
     await act(async () => {
-      vi.advanceTimersByTime(3000);
+      await vi.advanceTimersByTimeAsync(3000);
     });
 
     // Should transition to break
-    await waitFor(() => {
-      expect(result.current.state.phase).toBe("break");
-    });
+    expect(result.current.phase).toBe("break");
 
     vi.useRealTimers();
   });
@@ -343,19 +319,18 @@ describe.skip("usePomodoro", () => {
     const { result } = renderHook(() => usePomodoro());
 
     await waitFor(() => {
-      expect(result.current.state.phase).toBe("idle");
+      expect(result.current.phase).toBe("idle");
     });
 
-    expect(result.current.state.sessionsCompleted).toBe(0);
+    expect(result.current.sessionsCompleted).toBe(0);
   });
 
   it("should call complete_pomodoro when work phase ends", async () => {
     vi.useFakeTimers();
 
     const { result } = renderHook(() => usePomodoro());
-
-    await waitFor(() => {
-      expect(result.current.state.phase).toBe("idle");
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(0);
     });
 
     // Start timer
@@ -363,26 +338,122 @@ describe.skip("usePomodoro", () => {
       await result.current.start();
     });
 
-    await waitFor(() => {
-      expect(result.current.state.phase).toBe("work");
-    });
+    expect(result.current.phase).toBe("work");
 
-    const sessionId = result.current.state.sessionId;
+    const sessionId = result.current.sessionId;
 
     // Simulate timer completion
-    const duration = result.current.state.totalSeconds * 1000;
+    const duration = result.current.totalSeconds * 1000;
     await act(async () => {
-      vi.advanceTimersByTime(duration);
+      await vi.advanceTimersByTimeAsync(duration);
     });
 
     // Verify complete_pomodoro was called
-    const { invokeQuiet } = await import("../../lib/tauri");
-    await waitFor(() => {
-      expect(invokeQuiet).toHaveBeenCalledWith("complete_pomodoro", {
-        sessionId,
-      });
+    const { invokeMaybe } = await import("../../lib/tauri");
+    expect(invokeMaybe).toHaveBeenCalledWith("complete_pomodoro", {
+      sessionId,
     });
 
     vi.useRealTimers();
   });
+
+  it("does not overwrite runtime when hydration fails", async () => {
+    const { invokeMaybe, invokeQuiet } = await import("../../lib/tauri");
+    vi.mocked(invokeMaybe).mockResolvedValueOnce(null as never);
+    const { result } = renderHook(() => usePomodoro());
+    await act(async () => {
+      await Promise.resolve();
+    });
+    expect(result.current.phase).toBe("idle");
+    expect(invokeQuiet).not.toHaveBeenCalledWith(
+      "save_timer_runtime",
+      expect.anything(),
+    );
+  });
+
+  it("waits for delayed runtime hydration before saving", async () => {
+    const { invokeMaybe, invokeQuiet } = await import("../../lib/tauri");
+    let resolveRuntime: (value: unknown) => void = () => {};
+    vi.mocked(invokeMaybe).mockReturnValueOnce(
+      new Promise((resolve) => {
+        resolveRuntime = resolve;
+      }) as never,
+    );
+    const { result } = renderHook(() => usePomodoro());
+    await act(async () => {
+      await Promise.resolve();
+    });
+    expect(invokeQuiet).not.toHaveBeenCalledWith(
+      "save_timer_runtime",
+      expect.anything(),
+    );
+    resolveRuntime({
+      phase: "idle",
+      secondsLeft: 1_500,
+      totalSeconds: 1_500,
+      paused: false,
+      sessionId: null,
+      sessionsCompleted: 0,
+      preset: "standard",
+      lastUpdatedAt: new Date().toISOString(),
+    });
+    await act(async () => {
+      await Promise.resolve();
+    });
+    expect(result.current.phase).toBe("idle");
+    expect(invokeQuiet).toHaveBeenCalledWith(
+      "save_timer_runtime",
+      expect.anything(),
+    );
+  });
+
+  it("counts down by elapsed time across a wall-clock jump", async () => {
+    vi.useFakeTimers();
+    const { result } = renderHook(() => usePomodoro());
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(0);
+    });
+    await act(async () => {
+      await result.current.start();
+    });
+    await act(async () => {
+      vi.setSystemTime(Date.now() + 4_000);
+      await vi.advanceTimersByTimeAsync(1_000);
+    });
+    expect(result.current.secondsLeft).toBe(result.current.totalSeconds - 5);
+  });
+
+  it("hydrates active timer state under Strict Mode", async () => {
+    const { result } = renderHook(() => usePomodoro(), {
+      reactStrictMode: true,
+    });
+    await waitFor(() => expect(result.current.phase).toBe("idle"));
+    expect(result.current.preset).toBe("standard");
+  });
+
+  it("recovers an active timer from its saved timestamp", async () => {
+    vi.useFakeTimers();
+    const { invokeMaybe } = await import("../../lib/tauri");
+    const now = Date.now();
+    vi.setSystemTime(now);
+    vi.mocked(invokeMaybe).mockResolvedValueOnce({
+      phase: "work",
+      secondsLeft: 100,
+      totalSeconds: 1_500,
+      paused: false,
+      sessionId: "recovered-session",
+      sessionsCompleted: 2,
+      preset: "standard",
+      lastUpdatedAt: new Date(now - 10_000).toISOString(),
+    } as never);
+    const { result } = renderHook(() => usePomodoro());
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(0);
+    });
+    expect(result.current.phase).toBe("work");
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(1_000);
+    });
+    expect(result.current.secondsLeft).toBe(89);
+  });
 });
diff --git a/src/hooks/__tests__/useSettings.test.ts b/src/hooks/__tests__/useSettings.test.ts
index 67f3450..89274d7 100644
--- a/src/hooks/__tests__/useSettings.test.ts
+++ b/src/hooks/__tests__/useSettings.test.ts
@@ -7,39 +7,52 @@ vi.mock("../../lib/tauri", () => ({
     if (command === "update_settings") {
       return {
         timerPreset: args.patch?.timerPreset || "standard",
-        notificationsEnabled: args.patch?.notificationsEnabled !== undefined
-          ? args.patch.notificationsEnabled
-          : true,
-        toastNotificationsEnabled: args.patch?.toastNotificationsEnabled !== undefined
-          ? args.patch.toastNotificationsEnabled
-          : false,
-        trayBadgeEnabled: args.patch?.trayBadgeEnabled !== undefined
-          ? args.patch.trayBadgeEnabled
-          : true,
-        notificationWhitelist: args.patch?.notificationWhitelist || ["session_complete"],
-        soundsEnabled: args.patch?.soundsEnabled !== undefined
-          ? args.patch.soundsEnabled
-          : false,
-        soundVolume: args.patch?.soundVolume !== undefined ? args.patch.soundVolume : 0.7,
-        quietModeEnabled: args.patch?.quietModeEnabled !== undefined
-          ? args.patch.quietModeEnabled
-          : true,
-        focusModeEnabled: args.patch?.focusModeEnabled !== undefined
-          ? args.patch.focusModeEnabled
-          : false,
+        notificationsEnabled:
+          args.patch?.notificationsEnabled !== undefined
+            ? args.patch.notificationsEnabled
+            : true,
+        toastNotificationsEnabled:
+          args.patch?.toastNotificationsEnabled !== undefined
+            ? args.patch.toastNotificationsEnabled
+            : false,
+        trayBadgeEnabled:
+          args.patch?.trayBadgeEnabled !== undefined
+            ? args.patch.trayBadgeEnabled
+            : true,
+        notificationWhitelist: args.patch?.notificationWhitelist || [
+          "session_complete",
+        ],
+        soundsEnabled:
+          args.patch?.soundsEnabled !== undefined
+            ? args.patch.soundsEnabled
+            : false,
+        soundVolume:
+          args.patch?.soundVolume !== undefined ? args.patch.soundVolume : 0.7,
+        quietModeEnabled:
+          args.patch?.quietModeEnabled !== undefined
+            ? args.patch.quietModeEnabled
+            : true,
+        focusModeEnabled:
+          args.patch?.focusModeEnabled !== undefined
+            ? args.patch.focusModeEnabled
+            : false,
         animationBudget: args.patch?.animationBudget || "medium",
-        contextAwareChillEnabled: args.patch?.contextAwareChillEnabled !== undefined
-          ? args.patch.contextAwareChillEnabled
-          : true,
-        chillOnFullscreen: args.patch?.chillOnFullscreen !== undefined
-          ? args.patch.chillOnFullscreen
-          : true,
-        chillOnMeetings: args.patch?.chillOnMeetings !== undefined
-          ? args.patch.chillOnMeetings
-          : true,
-        chillOnHeavyTyping: args.patch?.chillOnHeavyTyping !== undefined
-          ? args.patch.chillOnHeavyTyping
-          : true,
+        contextAwareChillEnabled:
+          args.patch?.contextAwareChillEnabled !== undefined
+            ? args.patch.contextAwareChillEnabled
+            : true,
+        chillOnFullscreen:
+          args.patch?.chillOnFullscreen !== undefined
+            ? args.patch.chillOnFullscreen
+            : true,
+        chillOnMeetings:
+          args.patch?.chillOnMeetings !== undefined
+            ? args.patch.chillOnMeetings
+            : true,
+        chillOnHeavyTyping:
+          args.patch?.chillOnHeavyTyping !== undefined
+            ? args.patch.chillOnHeavyTyping
+            : true,
         meetingHosts: args.patch?.meetingHosts || ["zoom.us"],
         heavyTypingThresholdCpm: args.patch?.heavyTypingThresholdCpm || 220,
         enabledSeasonalPacks: args.patch?.enabledSeasonalPacks || [],
@@ -47,12 +60,14 @@ vi.mock("../../lib/tauri", () => ({
         uiTheme: args.patch?.uiTheme || "sunrise",
         petSkin: args.patch?.petSkin || "classic",
         petScene: args.patch?.petScene || "meadow",
-        focusGuardrailsEnabled: args.patch?.focusGuardrailsEnabled !== undefined
-          ? args.patch.focusGuardrailsEnabled
-          : false,
-        focusGuardrailsWorkOnly: args.patch?.focusGuardrailsWorkOnly !== undefined
-          ? args.patch.focusGuardrailsWorkOnly
-          : true,
+        focusGuardrailsEnabled:
+          args.patch?.focusGuardrailsEnabled !== undefined
+            ? args.patch.focusGuardrailsEnabled
+            : false,
+        focusGuardrailsWorkOnly:
+          args.patch?.focusGuardrailsWorkOnly !== undefined
+            ? args.patch.focusGuardrailsWorkOnly
+            : true,
         focusAllowlist: args.patch?.focusAllowlist || [],
         focusBlocklist: args.patch?.focusBlocklist || [],
       };
@@ -91,7 +106,9 @@ vi.mock("../../lib/tauri", () => ({
     }
     return defaultValue;
   }),
-  listenSafe: vi.fn(function() { return Promise.resolve(() => {}) }),
+  listenSafe: vi.fn(function () {
+    return Promise.resolve(() => {});
+  }),
 }));
 
 describe("useSettings", () => {
@@ -139,7 +156,7 @@ describe("useSettings", () => {
 
     await act(async () => {
       await result.current.updateSettings({
-        notificationsEnabled: !initialState
+        notificationsEnabled: !initialState,
       });
     });
 
diff --git a/src/hooks/__tests__/useTasks.test.ts b/src/hooks/__tests__/useTasks.test.ts
index df8d3d5..dfa8f2d 100644
--- a/src/hooks/__tests__/useTasks.test.ts
+++ b/src/hooks/__tests__/useTasks.test.ts
@@ -10,15 +10,21 @@ vi.mock("../../lib/tauri", () => ({
     if (command === "toggle_task") {
       // Return updated task list with the toggled task
       return [
-        { id: "task-1", title: "First task", completed: args.taskId === "task-1" ? true : false },
-        { id: "task-2", title: "Second task", completed: args.taskId === "task-2" ? false : true },
+        {
+          id: "task-1",
+          title: "First task",
+          completed: args.taskId === "task-1" ? true : false,
+        },
+        {
+          id: "task-2",
+          title: "Second task",
+          completed: args.taskId === "task-2" ? false : true,
+        },
       ];
     }
     if (command === "delete_task") {
       // Return updated task list without the deleted task
-      return [
-        { id: "task-2", title: "Second task", completed: true },
-      ];
+      return [{ id: "task-2", title: "Second task", completed: true }];
     }
     return null;
   }),
@@ -82,7 +88,9 @@ describe("useTasks", () => {
     });
 
     await waitFor(() => {
-      const updatedTask = result.current.tasks.find(t => t.id === firstTask.id);
+      const updatedTask = result.current.tasks.find(
+        (t) => t.id === firstTask.id,
+      );
       if (updatedTask) {
         expect(updatedTask.completed).toBe(!wasCompleted);
       }
diff --git a/src/hooks/useAchievements.ts b/src/hooks/useAchievements.ts
index d6c1e13..02ee3a1 100644
--- a/src/hooks/useAchievements.ts
+++ b/src/hooks/useAchievements.ts
@@ -1,5 +1,9 @@
 import { useEffect, useState } from "react";
-import { getAchievements, getAchievementStats, checkAchievementProgress } from "../lib/tauri";
+import {
+  getAchievements,
+  getAchievementStats,
+  checkAchievementProgress,
+} from "../lib/tauri";
 import { listenSafe } from "../lib/tauri";
 import type { Achievement, AchievementStats } from "../store/types";
 
@@ -17,7 +21,8 @@ export function useAchievements() {
     locked: 0,
   });
   const [loading, setLoading] = useState(true);
-  const [recentUnlock, setRecentUnlock] = useState<AchievementUnlockedPayload | null>(null);
+  const [recentUnlock, setRecentUnlock] =
+    useState<AchievementUnlockedPayload | null>(null);
 
   // Load achievements on mount
   useEffect(() => {
@@ -51,7 +56,7 @@ export function useAchievements() {
 
           // Clear recent unlock after 5 seconds
           setTimeout(() => setRecentUnlock(null), 5000);
-        }
+        },
       );
     };
 
@@ -94,7 +99,10 @@ export function useAchievements() {
   // Get achievement progress percentage
   const getProgressPercent = (achievement: Achievement) => {
     if (achievement.target === 0) return 0;
-    return Math.min(100, Math.round((achievement.progress / achievement.target) * 100));
+    return Math.min(
+      100,
+      Math.round((achievement.progress / achievement.target) * 100),
+    );
   };
 
   // Get overall completion percentage
diff --git a/src/hooks/useAnalytics.ts b/src/hooks/useAnalytics.ts
index 1875a6c..0ab8c71 100644
--- a/src/hooks/useAnalytics.ts
+++ b/src/hooks/useAnalytics.ts
@@ -7,7 +7,9 @@ export function useAnalytics(days = 14) {
   const [summaries, setSummaries] = useState<DailySummary[]>([]);
 
   const refresh = useCallback(() => {
-    invokeOr<DailySummary[]>("get_daily_summaries", { days }, []).then(setSummaries);
+    invokeOr<DailySummary[]>("get_daily_summaries", { days }, []).then(
+      setSummaries,
+    );
   }, [days]);
 
   useEffect(() => {
diff --git a/src/hooks/useCoins.ts b/src/hooks/useCoins.ts
index 16346fd..e0c5550 100644
--- a/src/hooks/useCoins.ts
+++ b/src/hooks/useCoins.ts
@@ -7,7 +7,10 @@ export function useCoins() {
   const [coins, setCoins] = useState<CoinBalance>({ total: 0, spent: 0 });
 
   useEffect(() => {
-    invokeOr<CoinBalance>("get_coin_balance", undefined, { total: 0, spent: 0 }).then(setCoins);
+    invokeOr<CoinBalance>("get_coin_balance", undefined, {
+      total: 0,
+      spent: 0,
+    }).then(setCoins);
 
     let cancelled = false;
     let unlisten = () => {};
@@ -27,12 +30,15 @@ export function useCoins() {
     };
   }, []);
 
-  const spend = useCallback(async (amount: number) => {
-    const updated = await invokeMaybe<CoinBalance>("spend_coins", { amount });
-    if (!updated) return coins;
-    setCoins(updated);
-    return updated;
-  }, [coins]);
+  const spend = useCallback(
+    async (amount: number) => {
+      const updated = await invokeMaybe<CoinBalance>("spend_coins", { amount });
+      if (!updated) return coins;
+      setCoins(updated);
+      return updated;
+    },
+    [coins],
+  );
 
   return { coins, available: coins.total - coins.spent, spend };
 }
diff --git a/src/hooks/useContextAwareChill.ts b/src/hooks/useContextAwareChill.ts
index 5fa7101..963e740 100644
--- a/src/hooks/useContextAwareChill.ts
+++ b/src/hooks/useContextAwareChill.ts
@@ -7,12 +7,14 @@ function hostMatchesPattern(host: string, pattern: string) {
 }
 
 function includesMeetingHost(hosts: string[], patterns: string[]) {
-  return hosts.some((host) => patterns.some((pattern) => hostMatchesPattern(host, pattern)));
+  return hosts.some((host) =>
+    patterns.some((pattern) => hostMatchesPattern(host, pattern)),
+  );
 }
 
 export function useContextAwareChill(
   settings: Settings,
-  guardrailStatus: FocusGuardrailsStatus | null
+  guardrailStatus: FocusGuardrailsStatus | null,
 ) {
   const keyPressTimes = useRef<number[]>([]);
   const activeSignals = useRef({
@@ -23,14 +25,19 @@ export function useContextAwareChill(
   useEffect(() => {
     const publish = () => {
       const matchedHosts = guardrailStatus
-        ? [...guardrailStatus.matchedAllowlist, ...guardrailStatus.matchedBlocklist]
+        ? [
+            ...guardrailStatus.matchedAllowlist,
+            ...guardrailStatus.matchedBlocklist,
+          ]
         : [];
       const meeting = settings.chillOnMeetings
         ? includesMeetingHost(matchedHosts, settings.meetingHosts)
         : false;
       publishChillSignals({
-        fullscreen: settings.chillOnFullscreen && activeSignals.current.fullscreen,
-        heavyTyping: settings.chillOnHeavyTyping && activeSignals.current.heavyTyping,
+        fullscreen:
+          settings.chillOnFullscreen && activeSignals.current.fullscreen,
+        heavyTyping:
+          settings.chillOnHeavyTyping && activeSignals.current.heavyTyping,
         meeting,
         focusMode: settings.focusModeEnabled,
         timestamp: Date.now(),
@@ -40,7 +47,8 @@ export function useContextAwareChill(
     const updateFullscreen = () => {
       const isFullscreen =
         !!document.fullscreenElement ||
-        (window.innerHeight >= window.screen.height && window.innerWidth >= window.screen.width);
+        (window.innerHeight >= window.screen.height &&
+          window.innerWidth >= window.screen.width);
       activeSignals.current.fullscreen = isFullscreen;
       publish();
     };
@@ -49,17 +57,14 @@ export function useContextAwareChill(
       const now = Date.now();
       keyPressTimes.current.push(now);
       const windowMs = 15_000;
-      keyPressTimes.current = keyPressTimes.current.filter((ts) => now - ts <= windowMs);
-      const charsPerMinute = Math.round(keyPressTimes.current.length * (60_000 / windowMs));
-      activeSignals.current.heavyTyping = charsPerMinute >= settings.heavyTypingThresholdCpm;
-      publish();
-    };
-
-    const onBlur = () => {
-      if (!settings.chillOnFullscreen) {
-        return;
-      }
-      activeSignals.current.fullscreen = true;
+      keyPressTimes.current = keyPressTimes.current.filter(
+        (ts) => now - ts <= windowMs,
+      );
+      const charsPerMinute = Math.round(
+        keyPressTimes.current.length * (60_000 / windowMs),
+      );
+      activeSignals.current.heavyTyping =
+        charsPerMinute >= settings.heavyTypingThresholdCpm;
       publish();
     };
 
@@ -69,8 +74,13 @@ export function useContextAwareChill(
 
     const decayInterval = window.setInterval(() => {
       const now = Date.now();
-      keyPressTimes.current = keyPressTimes.current.filter((ts) => now - ts <= 15_000);
-      if (keyPressTimes.current.length === 0 && activeSignals.current.heavyTyping) {
+      keyPressTimes.current = keyPressTimes.current.filter(
+        (ts) => now - ts <= 15_000,
+      );
+      if (
+        keyPressTimes.current.length === 0 &&
+        activeSignals.current.heavyTyping
+      ) {
         activeSignals.current.heavyTyping = false;
         publish();
       }
@@ -78,7 +88,6 @@ export function useContextAwareChill(
 
     document.addEventListener("fullscreenchange", updateFullscreen);
     window.addEventListener("keydown", onKeyDown);
-    window.addEventListener("blur", onBlur);
     window.addEventListener("focus", onFocus);
     updateFullscreen();
     publish();
@@ -87,7 +96,6 @@ export function useContextAwareChill(
       window.clearInterval(decayInterval);
       document.removeEventListener("fullscreenchange", updateFullscreen);
       window.removeEventListener("keydown", onKeyDown);
-      window.removeEventListener("blur", onBlur);
       window.removeEventListener("focus", onFocus);
     };
   }, [
diff --git a/src/hooks/useCustomization.ts b/src/hooks/useCustomization.ts
index ebda7ce..0452be3 100644
--- a/src/hooks/useCustomization.ts
+++ b/src/hooks/useCustomization.ts
@@ -7,7 +7,11 @@ export function useCustomization() {
 
   useEffect(() => {
     let cancelled = false;
-    invokeOr<CustomizationLoadout[]>("get_customization_loadouts", undefined, []).then((value) => {
+    invokeOr<CustomizationLoadout[]>(
+      "get_customization_loadouts",
+      undefined,
+      [],
+    ).then((value) => {
       if (!cancelled) {
         setLoadouts(value);
       }
@@ -17,19 +21,28 @@ export function useCustomization() {
     };
   }, []);
 
-  const saveLoadout = useCallback(async (loadout: CustomizationLoadout) => {
-    const updated = await invokeMaybe<CustomizationLoadout[]>("save_customization_loadout", {
-      loadout,
-    });
-    if (!updated) return loadouts;
-    setLoadouts(updated);
-    return updated;
-  }, [loadouts]);
+  const saveLoadout = useCallback(
+    async (loadout: CustomizationLoadout) => {
+      const updated = await invokeMaybe<CustomizationLoadout[]>(
+        "save_customization_loadout",
+        {
+          loadout,
+        },
+      );
+      if (!updated) return loadouts;
+      setLoadouts(updated);
+      return updated;
+    },
+    [loadouts],
+  );
 
   const applyLoadout = useCallback(async (name: string) => {
-    const applied = await invokeMaybe<CustomizationLoadout>("apply_customization_loadout", {
-      name,
-    });
+    const applied = await invokeMaybe<CustomizationLoadout>(
+      "apply_customization_loadout",
+      {
+        name,
+      },
+    );
     if (!applied) return null;
     return applied;
   }, []);
diff --git a/src/hooks/useFocusGuardrails.ts b/src/hooks/useFocusGuardrails.ts
index 6e881f4..f9a3c71 100644
--- a/src/hooks/useFocusGuardrails.ts
+++ b/src/hooks/useFocusGuardrails.ts
@@ -1,6 +1,9 @@
 import { useCallback, useEffect, useRef, useState } from "react";
 import { invokeMaybe } from "../lib/tauri";
-import type { FocusGuardrailEvent, FocusGuardrailsStatus } from "../store/types";
+import type {
+  FocusGuardrailEvent,
+  FocusGuardrailsStatus,
+} from "../store/types";
 
 export function useFocusGuardrails() {
   const [status, setStatus] = useState<FocusGuardrailsStatus | null>(null);
@@ -8,16 +11,20 @@ export function useFocusGuardrails() {
   const mounted = useRef(true);
 
   useEffect(() => {
+    mounted.current = true;
     return () => {
       mounted.current = false;
     };
   }, []);
 
   const evaluate = useCallback(async (phase: string, hosts: string[]) => {
-    const result = await invokeMaybe<FocusGuardrailsStatus>("evaluate_focus_guardrails", {
-      phase,
-      hosts,
-    });
+    const result = await invokeMaybe<FocusGuardrailsStatus>(
+      "evaluate_focus_guardrails",
+      {
+        phase,
+        hosts,
+      },
+    );
     if (!result) return null;
     if (!mounted.current) return null;
     setStatus(result);
@@ -25,14 +32,20 @@ export function useFocusGuardrails() {
   }, []);
 
   const intervene = useCallback(async (phase: string, hosts: string[]) => {
-    const result = await invokeMaybe<FocusGuardrailsStatus>("apply_focus_guardrails_intervention", {
-      phase,
-      hosts,
-    });
+    const result = await invokeMaybe<FocusGuardrailsStatus>(
+      "apply_focus_guardrails_intervention",
+      {
+        phase,
+        hosts,
+      },
+    );
     if (!result) return null;
     if (!mounted.current) return null;
     setStatus(result);
-    const latest = await invokeMaybe<FocusGuardrailEvent[]>("get_focus_guardrail_events", { limit: 10 });
+    const latest = await invokeMaybe<FocusGuardrailEvent[]>(
+      "get_focus_guardrail_events",
+      { limit: 10 },
+    );
     if (latest && mounted.current) {
       setEvents(latest);
     }
@@ -40,7 +53,10 @@ export function useFocusGuardrails() {
   }, []);
 
   const refreshEvents = useCallback(async () => {
-    const latest = await invokeMaybe<FocusGuardrailEvent[]>("get_focus_guardrail_events", { limit: 10 });
+    const latest = await invokeMaybe<FocusGuardrailEvent[]>(
+      "get_focus_guardrail_events",
+      { limit: 10 },
+    );
     if (!latest) return [];
     if (!mounted.current) return [];
     setEvents(latest);
diff --git a/src/hooks/usePet.ts b/src/hooks/usePet.ts
index 1e38bfd..60b2825 100644
--- a/src/hooks/usePet.ts
+++ b/src/hooks/usePet.ts
@@ -49,22 +49,29 @@ export function usePet() {
     };
   }, []);
 
-  const thresholds = pet.evolutionThresholds.length >= 3
-    ? pet.evolutionThresholds
-    : [0, EVOLUTION_THRESHOLDS.stage1, EVOLUTION_THRESHOLDS.stage2];
+  const thresholds =
+    pet.evolutionThresholds.length >= 3
+      ? pet.evolutionThresholds
+      : [0, EVOLUTION_THRESHOLDS.stage1, EVOLUTION_THRESHOLDS.stage2];
 
   const nextThreshold =
-    pet.currentStage === 0 ? thresholds[1] : pet.currentStage === 1 ? thresholds[2] : null;
+    pet.currentStage === 0
+      ? thresholds[1]
+      : pet.currentStage === 1
+        ? thresholds[2]
+        : null;
 
   const prevThreshold = pet.currentStage === 1 ? thresholds[1] : 0;
 
   const stageSpan = nextThreshold !== null ? nextThreshold - prevThreshold : 0;
-  const stageProgress = nextThreshold !== null ? pet.totalPomodoros - prevThreshold : 0;
+  const stageProgress =
+    nextThreshold !== null ? pet.totalPomodoros - prevThreshold : 0;
 
   const progressToNext = stageSpan > 0 ? stageProgress / stageSpan : 1;
 
   const species = getSpeciesPackById(pet.speciesId);
-  const stageName = species.stageNames[Math.max(0, Math.min(2, pet.currentStage))];
+  const stageName =
+    species.stageNames[Math.max(0, Math.min(2, pet.currentStage))];
 
   const interact = useCallback(async (action: string) => {
     const updated = await invokeMaybe<PetState>("pet_interact", { action });
@@ -73,22 +80,31 @@ export function usePet() {
     return updated;
   }, []);
 
-  const setCustomization = useCallback(async (skin?: string, scene?: string) => {
-    const updated = await invokeMaybe<PetState>("set_pet_customization", { skin, scene });
-    if (!updated) return null;
-    setPet(updated);
-    return updated;
-  }, []);
+  const setCustomization = useCallback(
+    async (skin?: string, scene?: string) => {
+      const updated = await invokeMaybe<PetState>("set_pet_customization", {
+        skin,
+        scene,
+      });
+      if (!updated) return null;
+      setPet(updated);
+      return updated;
+    },
+    [],
+  );
 
-  const setSpecies = useCallback(async (speciesId: string, evolutionThresholds: number[]) => {
-    const updated = await invokeMaybe<PetState>("set_pet_species", {
-      speciesId,
-      evolutionThresholds,
-    });
-    if (!updated) return null;
-    setPet(updated);
-    return updated;
-  }, []);
+  const setSpecies = useCallback(
+    async (speciesId: string, evolutionThresholds: number[]) => {
+      const updated = await invokeMaybe<PetState>("set_pet_species", {
+        speciesId,
+        evolutionThresholds,
+      });
+      if (!updated) return null;
+      setPet(updated);
+      return updated;
+    },
+    [],
+  );
 
   return {
     pet,
diff --git a/src/hooks/usePomodoro.ts b/src/hooks/usePomodoro.ts
index a1b67b7..c41d1e4 100644
--- a/src/hooks/usePomodoro.ts
+++ b/src/hooks/usePomodoro.ts
@@ -9,7 +9,7 @@ import {
   EVENT_TRAY_TIMER_START,
 } from "../lib/events";
 import { removeLocalStorage, writeLocalStorage } from "../lib/safeStorage";
-import { invokeMaybe, invokeOr, invokeQuiet, listenSafe } from "../lib/tauri";
+import { invokeMaybe, invokeQuiet, listenSafe } from "../lib/tauri";
 import type { TimerPreset } from "../lib/constants";
 import type {
   FocusGuardrailsStatus,
@@ -51,21 +51,6 @@ function normalizePhase(phase: string): TimerPhase {
     : "idle";
 }
 
-function getRotatingSample(
-  hosts: string[],
-  sampleSize: number,
-  startIndex: number,
-) {
-  if (hosts.length <= sampleSize) {
-    return hosts;
-  }
-  const output: string[] = [];
-  for (let i = 0; i < sampleSize; i += 1) {
-    output.push(hosts[(startIndex + i) % hosts.length]);
-  }
-  return output;
-}
-
 function playSoundCue(volume: number) {
   try {
     const audio = new AudioContext();
@@ -105,7 +90,7 @@ export function usePomodoro() {
   const previousPhaseRef = useRef<TimerPhase>("idle");
   const toastHistoryRef = useRef<number[]>([]);
   const trayBadgeCountRef = useRef(0);
-  const hostSampleOffsetRef = useRef(0);
+  const deadlineRef = useRef<number | null>(null);
 
   const clearTimer = useCallback(() => {
     if (intervalRef.current) {
@@ -147,6 +132,7 @@ export function usePomodoro() {
       breakDuration: p.break,
     });
     if (!result) return;
+    deadlineRef.current = Date.now() + p.work * 1000;
     setState((s) => ({
       ...s,
       phase: "work",
@@ -157,12 +143,19 @@ export function usePomodoro() {
     setPaused(false);
   }, [state.phase, state.preset]);
 
-  const pause = useCallback(() => setPaused(true), []);
-  const resume = useCallback(() => setPaused(false), []);
+  const pause = useCallback(() => {
+    deadlineRef.current = null;
+    setPaused(true);
+  }, []);
+  const resume = useCallback(() => {
+    deadlineRef.current = Date.now() + state.secondsLeft * 1000;
+    setPaused(false);
+  }, [state.secondsLeft]);
 
   const reset = useCallback(() => {
     clearTimer();
     const p = TIMER_PRESETS[state.preset];
+    deadlineRef.current = null;
     invokeQuiet("set_pet_animation", { animation: "idle" });
     setState((s) => ({
       ...s,
@@ -176,16 +169,8 @@ export function usePomodoro() {
   }, [clearTimer, state.preset]);
 
   useEffect(() => {
-    invokeOr<TimerRuntimeState>("get_timer_runtime", undefined, {
-      phase: "idle",
-      secondsLeft: TIMER_PRESETS[DEFAULT_PRESET].work,
-      totalSeconds: TIMER_PRESETS[DEFAULT_PRESET].work,
-      paused: false,
-      sessionId: null,
-      sessionsCompleted: 0,
-      preset: DEFAULT_PRESET,
-      lastUpdatedAt: new Date().toISOString(),
-    }).then((runtime) => {
+    invokeMaybe<TimerRuntimeState>("get_timer_runtime").then((runtime) => {
+      if (!runtime) return;
       const preset = isTimerPreset(runtime.preset)
         ? runtime.preset
         : DEFAULT_PRESET;
@@ -198,10 +183,32 @@ export function usePomodoro() {
         preset,
       });
       setPaused(runtime.paused);
+      const lastUpdated = Date.parse(runtime.lastUpdatedAt);
+      const elapsedSeconds =
+        runtime.paused || !Number.isFinite(lastUpdated)
+          ? 0
+          : Math.max(0, Math.floor((Date.now() - lastUpdated) / 1000));
+      deadlineRef.current =
+        Date.now() + Math.max(0, runtime.secondsLeft - elapsedSeconds) * 1000;
       setHydrated(true);
     });
   }, []);
 
+  const completedSessionRef = useRef<string | null>(null);
+  useEffect(() => {
+    if (state.phase !== "celebrating" || !state.sessionId) return;
+    if (completedSessionRef.current === state.sessionId) return;
+    completedSessionRef.current = state.sessionId;
+    void (async () => {
+      for (let attempt = 0; attempt < 2; attempt += 1) {
+        const completed = await invokeMaybe("complete_pomodoro", {
+          sessionId: state.sessionId,
+        });
+        if (completed) return;
+      }
+    })();
+  }, [state.phase, state.sessionId]);
+
   useEffect(() => {
     if (!hydrated) return;
     invokeQuiet("save_timer_runtime", {
@@ -225,13 +232,14 @@ export function usePomodoro() {
       return;
 
     intervalRef.current = setInterval(() => {
+      const remaining =
+        deadlineRef.current === null
+          ? Math.max(0, state.secondsLeft - 1)
+          : Math.max(0, Math.ceil((deadlineRef.current - Date.now()) / 1000));
       setState((prev) => {
-        if (prev.secondsLeft <= 1) {
+        if (remaining <= 0) {
           if (prev.phase === "work") {
-            // Work complete → celebrate (Rust awards coins + updates pet + tracks goals)
-            if (prev.sessionId) {
-              invokeQuiet("complete_pomodoro", { sessionId: prev.sessionId });
-            }
+            // Completion is awaited and retried by the phase effect below.
             return {
               ...prev,
               phase: "celebrating" as TimerPhase,
@@ -242,6 +250,7 @@ export function usePomodoro() {
             // Break complete → idle
             invokeQuiet("set_pet_animation", { animation: "idle" });
             const p = TIMER_PRESETS[prev.preset];
+            deadlineRef.current = null;
             return {
               ...prev,
               phase: "idle" as TimerPhase,
@@ -251,7 +260,7 @@ export function usePomodoro() {
             };
           }
         }
-        return { ...prev, secondsLeft: prev.secondsLeft - 1 };
+        return { ...prev, secondsLeft: remaining };
       });
     }, 1000);
 
@@ -263,12 +272,9 @@ export function usePomodoro() {
     if (state.phase !== "celebrating") return;
     const timeout = setTimeout(() => {
       const p = TIMER_PRESETS[state.preset];
+      deadlineRef.current = Date.now() + p.break * 1000;
       invokeQuiet("set_pet_animation", { animation: "break" });
       // Track break goal (absolute count — each completed work session starts a break)
-      invokeQuiet("update_goal_progress", {
-        goalId: "breaks",
-        progress: state.sessionsCompleted,
-      });
       setState((s) => ({
         ...s,
         phase: "break",
@@ -283,6 +289,10 @@ export function usePomodoro() {
     if (!hydrated) return;
     if (previousPhaseRef.current === state.phase) return;
 
+    if (previousPhaseRef.current === "break" && state.phase === "idle") {
+      void invokeMaybe("record_break_completion");
+    }
+
     previousPhaseRef.current = state.phase;
     invokeMaybe<Settings>("get_settings").then((settings) => {
       if (!settings) return;
@@ -347,87 +357,8 @@ export function usePomodoro() {
         trayBadgeCountRef.current = 0;
         void setTrayBadge(0);
       }
-
-      if (state.phase === "idle") {
-        setGuardrailMessage(null);
-        return;
-      }
-
-      const sampledHosts = getRotatingSample(
-        settings.focusBlocklist,
-        5,
-        hostSampleOffsetRef.current,
-      );
-      hostSampleOffsetRef.current =
-        settings.focusBlocklist.length === 0
-          ? 0
-          : (hostSampleOffsetRef.current + 5) % settings.focusBlocklist.length;
-      invokeMaybe<FocusGuardrailsStatus>(
-        "apply_focus_guardrails_intervention",
-        {
-          phase: state.phase,
-          hosts: sampledHosts,
-        },
-      ).then((status) => {
-        if (!status || !settings.focusGuardrailsEnabled) {
-          setGuardrailMessage(null);
-          return;
-        }
-        if (status.active) {
-          setGuardrailMessage(
-            `${status.message} [${status.nudgeLevel}] action: ${status.recommendedAction}`,
-          );
-          if (
-            status.recommendedAction === "pause_timer" &&
-            state.phase === "work" &&
-            !paused
-          ) {
-            setPaused(true);
-          }
-        } else {
-          setGuardrailMessage(null);
-        }
-      });
     });
-  }, [hydrated, paused, setTrayBadge, state.phase]);
-
-  useEffect(() => {
-    const onBlur = () => {
-      if (state.phase !== "work") return;
-      invokeMaybe<Settings>("get_settings").then((settings) => {
-        if (!settings?.focusGuardrailsEnabled) return;
-        const sampledHosts = getRotatingSample(
-          settings.focusBlocklist,
-          5,
-          hostSampleOffsetRef.current,
-        );
-        hostSampleOffsetRef.current =
-          settings.focusBlocklist.length === 0
-            ? 0
-            : (hostSampleOffsetRef.current + 5) %
-              settings.focusBlocklist.length;
-        invokeMaybe<FocusGuardrailsStatus>(
-          "apply_focus_guardrails_intervention",
-          {
-            phase: "work",
-            hosts: sampledHosts,
-          },
-        ).then((status) => {
-          if (!status?.active) return;
-          setGuardrailMessage(
-            `Intervention: ${status.message} (${status.matchedBlocklist.join(", ") || "no host details"}; sampled ${sampledHosts.length} hosts)`,
-          );
-          if (status.recommendedAction === "pause_timer" && !paused) {
-            setPaused(true);
-          }
-        });
-      });
-    };
-    window.addEventListener("blur", onBlur);
-    return () => {
-      window.removeEventListener("blur", onBlur);
-    };
-  }, [paused, state.phase]);
+  }, [hydrated, setTrayBadge, state.phase]);
 
   useEffect(() => {
     let cancelled = false;
diff --git a/src/hooks/useProgress.ts b/src/hooks/useProgress.ts
index bc14fe1..ac4787f 100644
--- a/src/hooks/useProgress.ts
+++ b/src/hooks/useProgress.ts
@@ -18,7 +18,11 @@ export function useProgress() {
   const [progress, setProgress] = useState<UserProgress>(defaultProgress);
 
   useEffect(() => {
-    invokeOr<UserProgress>("get_user_progress", undefined, defaultProgress).then(setProgress);
+    invokeOr<UserProgress>(
+      "get_user_progress",
+      undefined,
+      defaultProgress,
+    ).then(setProgress);
 
     let cancelled = false;
     let unlisten = () => {};
diff --git a/src/hooks/useSettings.ts b/src/hooks/useSettings.ts
index 102599b..7f14d96 100644
--- a/src/hooks/useSettings.ts
+++ b/src/hooks/useSettings.ts
@@ -35,7 +35,9 @@ export function useSettings() {
   const [settings, setSettings] = useState<Settings>(defaultSettings);
 
   useEffect(() => {
-    invokeOr<Settings>("get_settings", undefined, defaultSettings).then(setSettings);
+    invokeOr<Settings>("get_settings", undefined, defaultSettings).then(
+      setSettings,
+    );
 
     let cancelled = false;
     let unlisten = () => {};
@@ -62,7 +64,7 @@ export function useSettings() {
       setSettings(updated);
       return updated;
     },
-    [settings]
+    [settings],
   );
 
   return { settings, updateSettings };
diff --git a/src/lib/__tests__/constants.test.ts b/src/lib/__tests__/constants.test.ts
index 52c6c74..522d40e 100644
--- a/src/lib/__tests__/constants.test.ts
+++ b/src/lib/__tests__/constants.test.ts
@@ -32,7 +32,9 @@ describe("TIMER_PRESETS", () => {
   });
 
   it("all presets have labels", () => {
-    for (const key of Object.keys(TIMER_PRESETS) as (keyof typeof TIMER_PRESETS)[]) {
+    for (const key of Object.keys(
+      TIMER_PRESETS,
+    ) as (keyof typeof TIMER_PRESETS)[]) {
       expect(TIMER_PRESETS[key].label).toBeTruthy();
     }
   });
@@ -56,7 +58,9 @@ describe("COINS_PER_POMODORO", () => {
 
 describe("EVOLUTION_THRESHOLDS", () => {
   it("stage1 < stage2", () => {
-    expect(EVOLUTION_THRESHOLDS.stage1).toBeLessThan(EVOLUTION_THRESHOLDS.stage2);
+    expect(EVOLUTION_THRESHOLDS.stage1).toBeLessThan(
+      EVOLUTION_THRESHOLDS.stage2,
+    );
   });
 
   it("stage1 is 5", () => {
diff --git a/src/lib/__tests__/photoBooth.test.ts b/src/lib/__tests__/photoBooth.test.ts
index e37e95d..62671b2 100644
--- a/src/lib/__tests__/photoBooth.test.ts
+++ b/src/lib/__tests__/photoBooth.test.ts
@@ -35,7 +35,11 @@ describe("photo booth", () => {
 
   it("creates and triggers download for pet card", async () => {
     const click = vi.fn();
-    const anchor = { click, set href(_v: string) {}, set download(_v: string) {} };
+    const anchor = {
+      click,
+      set href(_v: string) {},
+      set download(_v: string) {},
+    };
     const ctx = {
       createLinearGradient: () => ({ addColorStop: vi.fn() }),
       fillRect: vi.fn(),
@@ -54,7 +58,8 @@ describe("photo booth", () => {
       width: 0,
       height: 0,
       getContext: () => ctx,
-      toBlob: (cb: (blob: Blob) => void) => cb(new Blob(["ok"], { type: "image/png" })),
+      toBlob: (cb: (blob: Blob) => void) =>
+        cb(new Blob(["ok"], { type: "image/png" })),
     };
 
     // @ts-expect-error test override
diff --git a/src/lib/__tests__/utils.test.ts b/src/lib/__tests__/utils.test.ts
index 7accdcf..abcd1c9 100644
--- a/src/lib/__tests__/utils.test.ts
+++ b/src/lib/__tests__/utils.test.ts
@@ -54,7 +54,7 @@ describe("generateId", () => {
   it("returns a valid UUID", () => {
     const id = generateId();
     expect(id).toMatch(
-      /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/
+      /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/,
     );
   });
 
diff --git a/src/lib/clipboard.ts b/src/lib/clipboard.ts
index 1c5dbf6..fe4d411 100644
--- a/src/lib/clipboard.ts
+++ b/src/lib/clipboard.ts
@@ -92,68 +92,3 @@ export async function copyTextWithFallback(
   }
   return `Clipboard unavailable. ${label}`;
 }
-
-// Validation report utilities
-import type { PackValidationResult } from "../pets/packValidation";
-
-/**
- * Format validation report as readable text
- */
-export function formatValidationReport(result: PackValidationResult): string {
-  const { speciesId, pass, checks } = result;
-  const status = pass ? "✓ PASSED" : "✗ FAILED";
-  const failedChecks = checks.filter((c) => !c.pass);
-  const passedChecks = checks.filter((c) => c.pass);
-
-  let report = `Species Pack Validation Report
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-
-Species ID: ${speciesId}
-Status: ${status}
-Passed: ${passedChecks.length}/${checks.length} checks
-
-`;
-
-  if (failedChecks.length > 0) {
-    report += `Failed Checks
-────────────────────────────────────────
-
-`;
-    failedChecks.forEach((check, index) => {
-      report += `${index + 1}. ${check.label}
-   Issue: ${check.detail}
-   Fix: ${check.remediation}
-
-`;
-    });
-  }
-
-  if (passedChecks.length > 0) {
-    report += `Passed Checks
-────────────────────────────────────────
-
-`;
-    passedChecks.forEach((check) => {
-      report += `✓ ${check.label}\n`;
-    });
-  }
-
-  report += `
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-Generated: ${new Date().toISOString()}
-`;
-
-  return report;
-}
-
-/**
- * Copy validation report to clipboard
- */
-export async function copyValidationReport(
-  result: PackValidationResult,
-): Promise<string> {
-  const report = formatValidationReport(result);
-  return copyTextWithFallback(report, "Validation report", {
-    successMessage: "Validation report copied to clipboard",
-  });
-}
diff --git a/src/lib/photoBooth.ts b/src/lib/photoBooth.ts
index 796c832..9b377eb 100644
--- a/src/lib/photoBooth.ts
+++ b/src/lib/photoBooth.ts
@@ -128,7 +128,9 @@ const DEFAULT_THEME: PetCardTheme = {
   footerColor: "#64748b",
 };
 
-export function resolvePetCardTheme(input: Pick<PetCardInput, "pet" | "species" | "settings">) {
+export function resolvePetCardTheme(
+  input: Pick<PetCardInput, "pet" | "species" | "settings">,
+) {
   const key = `${input.species.id}:${input.settings.petScene}`;
   let theme =
     PHOTO_CARD_THEMES[key] ??
@@ -158,7 +160,7 @@ function roundedRect(
   y: number,
   width: number,
   height: number,
-  radius: number
+  radius: number,
 ) {
   ctx.beginPath();
   ctx.moveTo(x + radius, y);
@@ -211,7 +213,9 @@ export async function downloadPetCard(input: PetCardInput) {
   ctx.fillText(`Theme: ${theme.name}`, 82, 176);
 
   const sprite = await loadImage(
-    input.species.stageSprites[Math.max(0, Math.min(2, input.pet.currentStage))]
+    input.species.stageSprites[
+      Math.max(0, Math.min(2, input.pet.currentStage))
+    ],
   );
   ctx.drawImage(sprite, 88, 198, 250, 250);
 
@@ -222,7 +226,11 @@ export async function downloadPetCard(input: PetCardInput) {
   ctx.fillText(`Streak: ${input.progress.streakDays} days`, 390, 300);
   ctx.fillText(`Total Sessions: ${input.pet.totalPomodoros}`, 390, 342);
   ctx.fillText(`Theme: ${input.settings.uiTheme}`, 390, 384);
-  ctx.fillText(`Loadout: ${input.settings.petSkin} / ${input.settings.petScene}`, 390, 426);
+  ctx.fillText(
+    `Loadout: ${input.settings.petSkin} / ${input.settings.petScene}`,
+    390,
+    426,
+  );
 
   ctx.font = "500 16px 'Avenir Next', 'Segoe UI', sans-serif";
   ctx.fillStyle = theme.footerColor;
@@ -230,7 +238,7 @@ export async function downloadPetCard(input: PetCardInput) {
   ctx.fillText(new Date().toLocaleString(), 690, 478);
 
   const blob = await new Promise<Blob | null>((resolve) =>
-    canvas.toBlob((result) => resolve(result), "image/png")
+    canvas.toBlob((result) => resolve(result), "image/png"),
   );
 
   if (!blob) {
diff --git a/src/lib/tauri.ts b/src/lib/tauri.ts
index af33cbd..08e7008 100644
--- a/src/lib/tauri.ts
+++ b/src/lib/tauri.ts
@@ -13,7 +13,7 @@ export async function invokeOr<T>(
   cmd: string,
   args: Record<string, unknown> | undefined,
   fallback: T,
-  tag = cmd
+  tag = cmd,
 ) {
   try {
     return await invoke<T>(cmd, args);
@@ -26,7 +26,7 @@ export async function invokeOr<T>(
 export async function invokeMaybe<T>(
   cmd: string,
   args?: Record<string, unknown>,
-  tag = cmd
+  tag = cmd,
 ) {
   try {
     return await invoke<T>(cmd, args);
@@ -36,7 +36,11 @@ export async function invokeMaybe<T>(
   }
 }
 
-export function invokeQuiet(cmd: string, args?: Record<string, unknown>, tag = cmd) {
+export function invokeQuiet(
+  cmd: string,
+  args?: Record<string, unknown>,
+  tag = cmd,
+) {
   try {
     invoke(cmd, args).catch((error) => warn(tag, error));
   } catch (error) {
@@ -47,7 +51,7 @@ export function invokeQuiet(cmd: string, args?: Record<string, unknown>, tag = c
 export async function listenSafe<T>(
   event: string,
   handler: EventCallback<T>,
-  tag = `listen:${event}`
+  tag = `listen:${event}`,
 ) {
   try {
     return await listen<T>(event, handler);
@@ -69,7 +73,12 @@ export function startDraggingSafe() {
 
 // Achievement commands
 export async function getAchievements(): Promise<Achievement[]> {
-  return invokeOr<Achievement[]>("get_achievements", undefined, [], "achievements:get");
+  return invokeOr<Achievement[]>(
+    "get_achievements",
+    undefined,
+    [],
+    "achievements:get",
+  );
 }
 
 export async function getAchievementStats(): Promise<AchievementStats> {
@@ -77,18 +86,14 @@ export async function getAchievementStats(): Promise<AchievementStats> {
     "get_achievement_stats",
     undefined,
     { total: 0, unlocked: 0, locked: 0 },
-    "achievements:stats"
+    "achievements:stats",
   );
 }
 
 export async function checkAchievementProgress(): Promise<string[] | null> {
-  return invokeMaybe<string[]>("check_achievement_progress", undefined, "achievements:check");
-}
-
-export async function checkTimeAchievement(completionHour: number): Promise<string[] | null> {
   return invokeMaybe<string[]>(
-    "check_time_achievement",
-    { completionHour },
-    "achievements:check-time"
+    "check_achievement_progress",
+    undefined,
+    "achievements:check",
   );
 }
diff --git a/src/lib/themes.ts b/src/lib/themes.ts
index 9976ef1..0987c8f 100644
--- a/src/lib/themes.ts
+++ b/src/lib/themes.ts
@@ -61,7 +61,7 @@ export const THEME_TOKENS: Record<ThemeName, ThemeTokens> = {
 
 export function getThemeTokens(theme: string): ThemeTokens {
   const normalized = (["sunrise", "dusk", "mint", "mono"] as const).includes(
-    theme as ThemeName
+    theme as ThemeName,
   )
     ? (theme as ThemeName)
     : "sunrise";
diff --git a/src/panel-main.tsx b/src/panel-main.tsx
index 487e250..e961c89 100644
--- a/src/panel-main.tsx
+++ b/src/panel-main.tsx
@@ -9,5 +9,5 @@ ReactDOM.createRoot(document.getElementById("root")!).render(
     <ErrorBoundary>
       <ControlPanel />
     </ErrorBoundary>
-  </React.StrictMode>
+  </React.StrictMode>,
 );
diff --git a/src/pet-main.tsx b/src/pet-main.tsx
index f78ca36..1a64867 100644
--- a/src/pet-main.tsx
+++ b/src/pet-main.tsx
@@ -10,5 +10,5 @@ ReactDOM.createRoot(document.getElementById("root")!).render(
     <ErrorBoundary>
       <PetOverlay />
     </ErrorBoundary>
-  </React.StrictMode>
+  </React.StrictMode>,
 );
diff --git a/src/pet.css b/src/pet.css
index fffcb14..1602a7a 100644
--- a/src/pet.css
+++ b/src/pet.css
@@ -1,6 +1,8 @@
 @import "tailwindcss";
 
-html, body, #root {
+html,
+body,
+#root {
   background: transparent !important;
   margin: 0;
   padding: 0;
diff --git a/src/pets/__tests__/packValidation.test.ts b/src/pets/__tests__/packValidation.test.ts
index 6ae51d9..ef68c7e 100644
--- a/src/pets/__tests__/packValidation.test.ts
+++ b/src/pets/__tests__/packValidation.test.ts
@@ -1,5 +1,8 @@
 import { describe, expect, it } from "vitest";
-import { PACK_VALIDATION_RULEBOOK, validateSpeciesPack } from "../packValidation";
+import {
+  PACK_VALIDATION_RULEBOOK,
+  validateSpeciesPack,
+} from "../packValidation";
 import { getSpeciesPackById } from "../species";
 
 describe("pack validation", () => {
@@ -8,7 +11,9 @@ describe("pack validation", () => {
     const result = validateSpeciesPack(penguin);
     expect(result.pass).toBe(true);
     expect(result.checks.every((check) => check.pass)).toBe(true);
-    expect(result.checks.every((check) => check.remediation.length > 0)).toBe(true);
+    expect(result.checks.every((check) => check.remediation.length > 0)).toBe(
+      true,
+    );
   });
 
   it("fails malformed thresholds", () => {
diff --git a/src/pets/__tests__/species.test.ts b/src/pets/__tests__/species.test.ts
index 8ebb56d..e535fb7 100644
--- a/src/pets/__tests__/species.test.ts
+++ b/src/pets/__tests__/species.test.ts
@@ -18,11 +18,15 @@ describe("species packs", () => {
       expect(pack.stageNames).toHaveLength(3);
       expect(pack.evolutionThresholds[0]).toBe(0);
       expect(pack.evolutionThresholds[1]).toBeGreaterThanOrEqual(1);
-      expect(pack.evolutionThresholds[2]).toBeGreaterThan(pack.evolutionThresholds[1]);
-      expect(pack.behaviorProfile.interactionCadenceMs[0]).toBeGreaterThanOrEqual(250);
-      expect(pack.behaviorProfile.interactionCadenceMs[1]).toBeGreaterThanOrEqual(
-        pack.behaviorProfile.interactionCadenceMs[0]
+      expect(pack.evolutionThresholds[2]).toBeGreaterThan(
+        pack.evolutionThresholds[1],
       );
+      expect(
+        pack.behaviorProfile.interactionCadenceMs[0],
+      ).toBeGreaterThanOrEqual(250);
+      expect(
+        pack.behaviorProfile.interactionCadenceMs[1],
+      ).toBeGreaterThanOrEqual(pack.behaviorProfile.interactionCadenceMs[0]);
     }
   });
 
diff --git a/src/pets/accessoryBehavior.ts b/src/pets/accessoryBehavior.ts
index 2f83a74..43534cf 100644
--- a/src/pets/accessoryBehavior.ts
+++ b/src/pets/accessoryBehavior.ts
@@ -10,7 +10,10 @@ export interface AccessoryBehaviorProfile {
   shopHint: string;
 }
 
-export const ACCESSORY_BEHAVIOR_PROFILES: Record<ShopItemId, AccessoryBehaviorProfile> = {
+export const ACCESSORY_BEHAVIOR_PROFILES: Record<
+  ShopItemId,
+  AccessoryBehaviorProfile
+> = {
   party_hat: {
     id: "party_hat",
     behaviorClass: "behavior-partyhat",
diff --git a/src/pets/behaviorComposer.ts b/src/pets/behaviorComposer.ts
index 72548f9..1469421 100644
--- a/src/pets/behaviorComposer.ts
+++ b/src/pets/behaviorComposer.ts
@@ -26,7 +26,11 @@ export interface PetBehaviorComposition {
     | "species-intensity-subtle"
     | "species-intensity-standard"
     | "species-intensity-lively";
-  postureClass: "" | "species-posture-settle" | "species-posture-hover" | "species-posture-curl";
+  postureClass:
+    | ""
+    | "species-posture-settle"
+    | "species-posture-hover"
+    | "species-posture-curl";
   accessoryClasses: string;
   interactionCooldownMs: number;
 }
@@ -74,7 +78,7 @@ function buildAccessoryClasses(
   accessories: ShopItemId[],
   shouldChill: boolean,
   motionLevel: 0 | 1 | 2 | 3,
-  lastInteraction: string | null
+  lastInteraction: string | null,
 ) {
   const classes = new Set<string>();
   let questAccent: string | null = null;
@@ -104,20 +108,26 @@ function buildAccessoryClasses(
   return Array.from(classes).join(" ");
 }
 
-export function composePetBehavior(input: ComposePetBehaviorInput): PetBehaviorComposition {
+export function composePetBehavior(
+  input: ComposePetBehaviorInput,
+): PetBehaviorComposition {
   const hardChill = input.focusModeEnabled || input.contextChilled;
   const shouldChill = input.quietModeEnabled || hardChill;
 
   let motionLevel = baselineMotionLevel(input.species);
   for (const accessory of input.accessories) {
-    motionLevel = clampMotionLevel(motionLevel + ACCESSORY_BEHAVIOR_PROFILES[accessory].motionBoost);
+    motionLevel = clampMotionLevel(
+      motionLevel + ACCESSORY_BEHAVIOR_PROFILES[accessory].motionBoost,
+    );
   }
 
   // Precedence order: species baseline -> accessory modifiers -> chill clamp -> budget clamp.
   if (shouldChill) {
     motionLevel = clampMotionLevel(Math.min(motionLevel, 1));
   }
-  motionLevel = clampMotionLevel(Math.min(motionLevel, BUDGET_MOTION_CAP[input.animationBudget]));
+  motionLevel = clampMotionLevel(
+    Math.min(motionLevel, BUDGET_MOTION_CAP[input.animationBudget]),
+  );
 
   const animationState =
     hardChill && !shouldPreserveAnimationState(input.animationState)
@@ -129,7 +139,12 @@ export function composePetBehavior(input: ComposePetBehaviorInput): PetBehaviorC
     : input.species.behaviorProfile.interactionCadenceMs[0];
   const interactionCooldownMs = Math.max(
     250,
-    Math.min(6000, Math.round(cadenceBase * BUDGET_COOLDOWN_MULTIPLIER[input.animationBudget]))
+    Math.min(
+      6000,
+      Math.round(
+        cadenceBase * BUDGET_COOLDOWN_MULTIPLIER[input.animationBudget],
+      ),
+    ),
   );
 
   const speciesIntensityClass =
@@ -161,7 +176,7 @@ export function composePetBehavior(input: ComposePetBehaviorInput): PetBehaviorC
       input.accessories,
       shouldChill,
       motionLevel,
-      input.lastInteraction
+      input.lastInteraction,
     ),
     interactionCooldownMs,
   };
diff --git a/src/pets/packValidation.ts b/src/pets/packValidation.ts
index 7f587b5..edc3042 100644
--- a/src/pets/packValidation.ts
+++ b/src/pets/packValidation.ts
@@ -16,7 +16,10 @@ interface PackValidationRuleSpec {
   remediation: string;
 }
 
-export const PACK_VALIDATION_RULEBOOK: Record<PackValidationRuleId, PackValidationRuleSpec> = {
+export const PACK_VALIDATION_RULEBOOK: Record<
+  PackValidationRuleId,
+  PackValidationRuleSpec
+> = {
   "schema-version": {
     label: "Supported schema version",
     remediation: `Set schemaVersion to ${SUPPORTED_PACK_SCHEMA_VERSION} (current supported schema).`,
@@ -28,7 +31,8 @@ export const PACK_VALIDATION_RULEBOOK: Record<PackValidationRuleId, PackValidati
   },
   "stage-names": {
     label: "Exactly 3 stage names",
-    remediation: "Define exactly three names to map to baby, teen, and adult stages.",
+    remediation:
+      "Define exactly three names to map to baby, teen, and adult stages.",
   },
   thresholds: {
     label: "Valid ascending evolution thresholds",
@@ -37,7 +41,8 @@ export const PACK_VALIDATION_RULEBOOK: Record<PackValidationRuleId, PackValidati
   },
   sprites: {
     label: "3 stage sprites resolved with supported format",
-    remediation: "Provide one non-empty svg/png/webp sprite path for each stage.",
+    remediation:
+      "Provide one non-empty svg/png/webp sprite path for each stage.",
   },
   "blink-window": {
     label: "Idle blink range is sane",
@@ -86,7 +91,7 @@ function anchorInBounds(anchor: { x: number; y: number }) {
 function makeCheck(
   id: PackValidationRuleId,
   pass: boolean,
-  detail: string
+  detail: string,
 ): PackValidationCheck {
   const rule = PACK_VALIDATION_RULEBOOK[id];
   return {
@@ -98,20 +103,28 @@ function makeCheck(
   };
 }
 
-export function validateSpeciesPack(pack: PetSpeciesPack): PackValidationResult {
+export function validateSpeciesPack(
+  pack: PetSpeciesPack,
+): PackValidationResult {
   const checks: PackValidationCheck[] = [];
 
   checks.push(
     makeCheck(
       "schema-version",
       pack.schemaVersion === SUPPORTED_PACK_SCHEMA_VERSION,
-      `v${pack.schemaVersion}`
-    )
+      `v${pack.schemaVersion}`,
+    ),
   );
 
   checks.push(makeCheck("id-slug", isSlug(pack.id), pack.id));
 
-  checks.push(makeCheck("stage-names", pack.stageNames.length === 3, `${pack.stageNames.length} names`));
+  checks.push(
+    makeCheck(
+      "stage-names",
+      pack.stageNames.length === 3,
+      `${pack.stageNames.length} names`,
+    ),
+  );
 
   const thresholds = pack.evolutionThresholds;
   const thresholdsValid =
@@ -122,23 +135,24 @@ export function validateSpeciesPack(pack: PetSpeciesPack): PackValidationResult
   checks.push(makeCheck("thresholds", thresholdsValid, thresholds.join(" / ")));
 
   const spriteChecks = pack.stageSprites.every(
-    (sprite) => typeof sprite === "string" && sprite.trim().length > 0
+    (sprite) => typeof sprite === "string" && sprite.trim().length > 0,
   );
   checks.push(
     makeCheck(
       "sprites",
       spriteChecks && pack.stageSprites.length === 3,
-      `${pack.stageSprites.length} sprite assets`
-    )
+      `${pack.stageSprites.length} sprite assets`,
+    ),
   );
 
   checks.push(
     makeCheck(
       "blink-window",
       pack.idleBehavior.blinkIntervalMs[0] >= 1200 &&
-        pack.idleBehavior.blinkIntervalMs[1] > pack.idleBehavior.blinkIntervalMs[0],
-      `${pack.idleBehavior.blinkIntervalMs[0]}-${pack.idleBehavior.blinkIntervalMs[1]}ms`
-    )
+        pack.idleBehavior.blinkIntervalMs[1] >
+          pack.idleBehavior.blinkIntervalMs[0],
+      `${pack.idleBehavior.blinkIntervalMs[0]}-${pack.idleBehavior.blinkIntervalMs[1]}ms`,
+    ),
   );
 
   const anchors = pack.accessoryAnchors;
@@ -149,8 +163,8 @@ export function validateSpeciesPack(pack: PetSpeciesPack): PackValidationResult
         anchorInBounds(anchors.neck) &&
         anchorInBounds(anchors.left) &&
         anchorInBounds(anchors.right),
-      "head/neck/left/right"
-    )
+      "head/neck/left/right",
+    ),
   );
 
   const verbs = new Set(pack.interactionVerbs.map((verb) => verb.id));
@@ -163,8 +177,8 @@ export function validateSpeciesPack(pack: PetSpeciesPack): PackValidationResult
         verbs.has("nap") &&
         verbs.has("clean") &&
         verbs.has("train"),
-      `${verbs.size} verbs`
-    )
+      `${verbs.size} verbs`,
+    ),
   );
 
   const cadence = pack.behaviorProfile.interactionCadenceMs;
@@ -176,8 +190,8 @@ export function validateSpeciesPack(pack: PetSpeciesPack): PackValidationResult
         cadence[1] >= cadence[0] &&
         cadence[1] <= 5000 &&
         (posture === "settle" || posture === "hover" || posture === "curl"),
-      `${cadence[0]}-${cadence[1]}ms / ${posture}`
-    )
+      `${cadence[0]}-${cadence[1]}ms / ${posture}`,
+    ),
   );
 
   return {
diff --git a/src/pets/packs/axolotl.json b/src/pets/packs/axolotl.json
index 26bc0dc..dd82d37 100644
--- a/src/pets/packs/axolotl.json
+++ b/src/pets/packs/axolotl.json
@@ -22,7 +22,11 @@
     "interactionCadenceMs": [700, 1240],
     "chillPosture": "hover"
   },
-  "stageSpriteFiles": ["axolotl-stage-0.svg", "axolotl-stage-1.svg", "axolotl-stage-2.svg"],
+  "stageSpriteFiles": [
+    "axolotl-stage-0.svg",
+    "axolotl-stage-1.svg",
+    "axolotl-stage-2.svg"
+  ],
   "accessoryAnchors": {
     "head": { "x": 100, "y": 44 },
     "neck": { "x": 100, "y": 120 },
diff --git a/src/pets/packs/corgi.json b/src/pets/packs/corgi.json
index 7b724d4..7b7ccc5 100644
--- a/src/pets/packs/corgi.json
+++ b/src/pets/packs/corgi.json
@@ -22,7 +22,11 @@
     "interactionCadenceMs": [460, 860],
     "chillPosture": "hover"
   },
-  "stageSpriteFiles": ["corgi-stage-0.svg", "corgi-stage-1.svg", "corgi-stage-2.svg"],
+  "stageSpriteFiles": [
+    "corgi-stage-0.svg",
+    "corgi-stage-1.svg",
+    "corgi-stage-2.svg"
+  ],
   "accessoryAnchors": {
     "head": { "x": 100, "y": 38 },
     "neck": { "x": 100, "y": 108 },
diff --git a/src/pets/packs/penguin.json b/src/pets/packs/penguin.json
index 9958346..cf3fb34 100644
--- a/src/pets/packs/penguin.json
+++ b/src/pets/packs/penguin.json
@@ -22,7 +22,11 @@
     "interactionCadenceMs": [540, 940],
     "chillPosture": "settle"
   },
-  "stageSpriteFiles": ["penguin-stage-0.svg", "penguin-stage-1.svg", "penguin-stage-2.svg"],
+  "stageSpriteFiles": [
+    "penguin-stage-0.svg",
+    "penguin-stage-1.svg",
+    "penguin-stage-2.svg"
+  ],
   "accessoryAnchors": {
     "head": { "x": 100, "y": 40 },
     "neck": { "x": 100, "y": 118 },
diff --git a/src/pets/seasonal/spring-blossom.json b/src/pets/seasonal/spring-blossom.json
index ba2e670..019d355 100644
--- a/src/pets/seasonal/spring-blossom.json
+++ b/src/pets/seasonal/spring-blossom.json
@@ -4,7 +4,19 @@
   "description": "Soft pastel palette and cozy meadow vibes.",
   "activeMonths": [3, 4, 5],
   "bundles": [
-    { "name": "Petal Morning", "uiTheme": "sunrise", "petSkin": "plush", "petScene": "meadow", "speciesId": "cat" },
-    { "name": "Garden Drift", "uiTheme": "mint", "petSkin": "classic", "petScene": "forest", "speciesId": "axolotl" }
+    {
+      "name": "Petal Morning",
+      "uiTheme": "sunrise",
+      "petSkin": "plush",
+      "petScene": "meadow",
+      "speciesId": "cat"
+    },
+    {
+      "name": "Garden Drift",
+      "uiTheme": "mint",
+      "petSkin": "classic",
+      "petScene": "forest",
+      "speciesId": "axolotl"
+    }
   ]
 }
diff --git a/src/pets/seasonal/winter-cozy.json b/src/pets/seasonal/winter-cozy.json
index 7bc41d9..a2d01cf 100644
--- a/src/pets/seasonal/winter-cozy.json
+++ b/src/pets/seasonal/winter-cozy.json
@@ -4,7 +4,19 @@
   "description": "Warm knits and low-contrast evening scenes.",
   "activeMonths": [11, 12, 1],
   "bundles": [
-    { "name": "Fireside Focus", "uiTheme": "mono", "petSkin": "plush", "petScene": "cozy_room", "speciesId": "corgi" },
-    { "name": "Aurora Watch", "uiTheme": "dusk", "petSkin": "neon", "petScene": "space", "speciesId": "penguin" }
+    {
+      "name": "Fireside Focus",
+      "uiTheme": "mono",
+      "petSkin": "plush",
+      "petScene": "cozy_room",
+      "speciesId": "corgi"
+    },
+    {
+      "name": "Aurora Watch",
+      "uiTheme": "dusk",
+      "petSkin": "neon",
+      "petScene": "space",
+      "speciesId": "penguin"
+    }
   ]
 }
diff --git a/src/pets/seasonalPacks.ts b/src/pets/seasonalPacks.ts
index 51334e7..752a5d3 100644
--- a/src/pets/seasonalPacks.ts
+++ b/src/pets/seasonalPacks.ts
@@ -21,7 +21,9 @@ const SEASONAL_PACKS: SeasonalPack[] = Object.values(seasonalModules)
   .map((pack) => ({
     ...pack,
     id: pack.id.trim().toLowerCase(),
-    activeMonths: pack.activeMonths.map((month) => Math.max(1, Math.min(12, month))),
+    activeMonths: pack.activeMonths.map((month) =>
+      Math.max(1, Math.min(12, month)),
+    ),
   }))
   .sort((a, b) => a.name.localeCompare(b.name));
 
diff --git a/src/pets/species.ts b/src/pets/species.ts
index 73aeaa6..8d6a0ee 100644
--- a/src/pets/species.ts
+++ b/src/pets/species.ts
@@ -66,7 +66,9 @@ const spriteAssets = {
 export const SUPPORTED_PACK_SCHEMA_VERSION = 1 as const;
 
 function resolveSprite(fileName: string): string {
-  const entry = Object.entries(spriteAssets).find(([path]) => path.endsWith(`/${fileName}`));
+  const entry = Object.entries(spriteAssets).find(([path]) =>
+    path.endsWith(`/${fileName}`),
+  );
   if (!entry) {
     throw new Error(`Missing species sprite asset: ${fileName}`);
   }
@@ -74,17 +76,20 @@ function resolveSprite(fileName: string): string {
 }
 
 function normalizeThresholds(
-  thresholds: [number, number, number]
+  thresholds: [number, number, number],
 ): [number, number, number] {
   const stage1 = Math.max(1, thresholds[1]);
   const stage2 = Math.max(stage1 + 1, thresholds[2]);
   return [0, stage1, stage2];
 }
 
-function normalizePack(input: RawSpeciesPack, sourcePath: string): PetSpeciesPack {
+function normalizePack(
+  input: RawSpeciesPack,
+  sourcePath: string,
+): PetSpeciesPack {
   if (input.schemaVersion !== SUPPORTED_PACK_SCHEMA_VERSION) {
     throw new Error(
-      `Unsupported species pack schemaVersion=${input.schemaVersion} in ${sourcePath}. Supported: ${SUPPORTED_PACK_SCHEMA_VERSION}.`
+      `Unsupported species pack schemaVersion=${input.schemaVersion} in ${sourcePath}. Supported: ${SUPPORTED_PACK_SCHEMA_VERSION}.`,
     );
   }
 
@@ -99,8 +104,14 @@ function normalizePack(input: RawSpeciesPack, sourcePath: string): PetSpeciesPac
     chillPosture: "settle",
   };
   const behaviorProfile = input.behaviorProfile ?? defaultProfile;
-  const cadenceFast = Math.max(250, Math.min(3000, behaviorProfile.interactionCadenceMs[0]));
-  const cadenceSlow = Math.max(cadenceFast, Math.min(5000, behaviorProfile.interactionCadenceMs[1]));
+  const cadenceFast = Math.max(
+    250,
+    Math.min(3000, behaviorProfile.interactionCadenceMs[0]),
+  );
+  const cadenceSlow = Math.max(
+    cadenceFast,
+    Math.min(5000, behaviorProfile.interactionCadenceMs[1]),
+  );
 
   return {
     schemaVersion: SUPPORTED_PACK_SCHEMA_VERSION,
@@ -123,7 +134,7 @@ function normalizePack(input: RawSpeciesPack, sourcePath: string): PetSpeciesPac
 
 const SPECIES_PACKS: PetSpeciesPack[] = Object.entries(rawPacks)
   .map(([sourcePath, entry]) =>
-    normalizePack((entry as { default: RawSpeciesPack }).default, sourcePath)
+    normalizePack((entry as { default: RawSpeciesPack }).default, sourcePath),
   )
   .sort((a, b) => a.name.localeCompare(b.name));
 
diff --git a/src/store/types.ts b/src/store/types.ts
index 19d04f6..6b36d15 100644
--- a/src/store/types.ts
+++ b/src/store/types.ts
@@ -4,6 +4,7 @@ export interface PetState {
   currentStage: number;
   animationState: AnimationState;
   accessories: ShopItemId[];
+  ownedAccessories?: ShopItemId[];
   totalPomodoros: number;
   speciesId: string;
   evolutionThresholds: number[];
@@ -37,6 +38,7 @@ export interface Task {
   id: string;
   title: string;
   completed: boolean;
+  rewardClaimed?: boolean;
   createdAt: string;
 }
 
@@ -187,7 +189,8 @@ export interface FocusGuardrailEvent {
   createdAt: string;
 }
 
-export type AchievementCategory = "focus" | "streak" | "pet" | "progression" | "special";
+export type AchievementCategory =
+  "focus" | "streak" | "pet" | "progression" | "special";
 
 export interface Achievement {
   id: string;
@@ -236,6 +239,7 @@ export interface AppState {
 }
 
 export interface AppSnapshot {
+  format: string;
   schemaVersion: number;
   exportedAt: string;
   pet: PetState;
@@ -251,6 +255,12 @@ export interface AppSnapshot {
   petEvents: PetEvent[];
   petActiveQuest: PetQuest | null;
   focusGuardrailEvents: FocusGuardrailEvent[];
+  achievementState: AchievementState;
+  questRecentFocus: number;
+  questRecentCare: number;
+  questLastKind: string | null;
+  questLastRollAt: string | null;
+  breakEvents: string[];
 }
 
 export interface AppDiagnostics {