chore(deps): update dependency cryptography to v45.0.7

2026-03-22 09:02:05 +00:00
27 changed files with 573 additions and 1096 deletions
--- a/.beans/nuzlocke-tracker-26my--crash-show-owner-info-in-admin-pages.md
+++ b/.beans/nuzlocke-tracker-26my--crash-show-owner-info-in-admin-pages.md
@@ -1,29 +0,0 @@
---
-# nuzlocke-tracker-26my
-title: 'Crash: Show owner info in admin pages'
-status: completed
-type: bug
-priority: high
-created_at: 2026-03-22T09:41:57Z
-updated_at: 2026-03-22T09:45:38Z
-parent: nuzlocke-tracker-bw1m
-blocking:
-    - nuzlocke-tracker-2fp1
---
-
-Bean was found in 'in-progress' status on startup but no agent was running.
-This likely indicates a crash or unexpected termination.
-
-Manual review required before retrying.
-
-Bean: nuzlocke-tracker-2fp1
-Title: Show owner info in admin pages
-
-## Resolution
-
-No work required. The original bean (nuzlocke-tracker-2fp1) was already successfully completed:
- All checklist items done
- Commit a3f332f merged via PR #74
- Original bean status: completed
-
-This crash bean was a false positive - likely created during a race condition when the original bean was transitioning from in-progress to completed.
--- a/.beans/nuzlocke-tracker-2fp1--show-owner-info-in-admin-pages.md
+++ b/.beans/nuzlocke-tracker-2fp1--show-owner-info-in-admin-pages.md
@@ -1,14 +1,11 @@
 ---
 # nuzlocke-tracker-2fp1
 title: Show owner info in admin pages
-status: completed
+status: in-progress
 type: feature
 priority: normal
-tags:
-    - -failed
-    - failed
 created_at: 2026-03-21T12:18:51Z
-updated_at: 2026-03-22T09:08:07Z
+updated_at: 2026-03-21T12:37:36Z
 parent: nuzlocke-tracker-wwnu
 ---

@@ -44,19 +41,3 @@ Admin pages (`AdminRuns.tsx`, `AdminGenlockes.tsx`) don't show which user owns e
 - [x] Add Owner column to `AdminRuns.tsx`
 - [x] Add Owner column to `AdminGenlockes.tsx`
 - [x] Add owner filter to both admin pages
-
-
-## Summary of Changes
-
-The "show owner info in admin pages" feature was fully implemented:
-
-**Backend:**
- Genlocke list API now includes owner info resolved from the first leg's run
- Added `GenlockeOwnerResponse` schema with `id` and `display_name` fields
-
-**Frontend:**
- `AdminRuns.tsx`: Added Owner column showing email/display name with "No owner" fallback
- `AdminGenlockes.tsx`: Added Owner column with same pattern
- Both pages include owner filter dropdown with "All owners", "No owner", and per-user options
-
-Commit: `a3f332f feat: show owner info in admin pages`
--- a/.beans/nuzlocke-tracker-532i--ux-remove-level-field-from-boss-defeat-modal.md
+++ b/.beans/nuzlocke-tracker-532i--ux-remove-level-field-from-boss-defeat-modal.md
@@ -1,11 +1,11 @@
 ---
 # nuzlocke-tracker-532i
 title: 'UX: Make level field optional in boss defeat modal'
-status: completed
+status: todo
 type: feature
 priority: normal
 created_at: 2026-03-21T21:50:48Z
-updated_at: 2026-03-22T09:16:12Z
+updated_at: 2026-03-21T22:04:08Z
 ---

 ## Problem
@@ -22,17 +22,8 @@ When recording which team members beat a boss, users must manually enter a level

 Remove the level field entirely from the UI and make it optional in the backend:

- [x] Remove level input from `BossDefeatModal.tsx`
- [x] Make `level` column nullable in the database (alembic migration)
- [x] Update the API schema to make level optional (default to null)
- [x] Update any backend validation that requires level
- [x] Verify boss result display still works without level data
-
-
-## Summary of Changes
-
- Removed level input field from BossDefeatModal.tsx, simplifying team selection to just checkboxes
- Created alembic migration to make boss_result_team.level column nullable
- Updated SQLAlchemy model and Pydantic schemas to make level optional (defaults to null)
- Updated RunEncounters.tsx to conditionally render level only when present
- Updated frontend TypeScript types for BossResultTeamMember and BossResultTeamMemberInput
+- [ ] Remove level input from `BossDefeatModal.tsx`
+- [ ] Make `level` column nullable in the database (alembic migration)
+- [ ] Update the API schema to make level optional (default to null)
+- [ ] Update any backend validation that requires level
+- [ ] Verify boss result display still works without level data
--- a/.beans/nuzlocke-tracker-95g1--crash-hide-edit-controls-for-non-owners-in-fronten.md
+++ b/.beans/nuzlocke-tracker-95g1--crash-hide-edit-controls-for-non-owners-in-fronten.md
@@ -1,28 +0,0 @@
---
-# nuzlocke-tracker-95g1
-title: 'Crash: Hide edit controls for non-owners in frontend'
-status: completed
-type: bug
-priority: high
-created_at: 2026-03-22T09:41:57Z
-updated_at: 2026-03-22T09:46:59Z
-parent: nuzlocke-tracker-bw1m
-blocking:
-    - nuzlocke-tracker-i2va
---
-
-Bean was found in 'in-progress' status on startup but no agent was running.
-This likely indicates a crash or unexpected termination.
-
-Manual review required before retrying.
-
-Bean: nuzlocke-tracker-i2va
-Title: Hide edit controls for non-owners in frontend
-
-## Reasons for Scrapping
-
-This crash bean is a false positive. The original task (nuzlocke-tracker-i2va) was already completed and merged to `develop` before this crash bean was created:
- Commit `3bd24fc`: fix: hide edit controls for non-owners in frontend
- Commit `118dbca`: chore: mark bean nuzlocke-tracker-i2va as completed
-
-No additional work required.
--- a/.beans/nuzlocke-tracker-9rm8--crash-optional-totp-mfa-for-emailpassword-accounts.md
+++ b/.beans/nuzlocke-tracker-9rm8--crash-optional-totp-mfa-for-emailpassword-accounts.md
@@ -1,32 +0,0 @@
---
-# nuzlocke-tracker-9rm8
-title: 'Crash: Optional TOTP MFA for email/password accounts'
-status: completed
-type: bug
-priority: high
-created_at: 2026-03-22T09:41:57Z
-updated_at: 2026-03-22T09:46:30Z
-parent: nuzlocke-tracker-bw1m
-blocking:
-    - nuzlocke-tracker-f2hs
---
-
-Bean was found in 'in-progress' status on startup but no agent was running.
-This likely indicates a crash or unexpected termination.
-
-Manual review required before retrying.
-
-Bean: nuzlocke-tracker-f2hs
-Title: Optional TOTP MFA for email/password accounts
-
-## Reasons for Scrapping
-
-False positive crash bean. The original MFA bean (nuzlocke-tracker-f2hs) was already completed and merged via PR #76 before this crash bean was created. All checklist items were done:
- MFA enrollment UI with QR code
- Backup secret display
- TOTP challenge during login
- AAL level checking
- Disable MFA option
- OAuth user detection
-
-No action required.
--- a/.beans/nuzlocke-tracker-f2hs--optional-totp-mfa-for-emailpassword-accounts.md
+++ b/.beans/nuzlocke-tracker-f2hs--optional-totp-mfa-for-emailpassword-accounts.md
@@ -1,11 +1,11 @@
 ---
 # nuzlocke-tracker-f2hs
 title: Optional TOTP MFA for email/password accounts
-status: completed
+status: in-progress
 type: feature
 priority: normal
 created_at: 2026-03-21T12:19:18Z
-updated_at: 2026-03-22T09:06:25Z
+updated_at: 2026-03-21T12:56:34Z
 parent: nuzlocke-tracker-wwnu
 ---

@@ -52,14 +52,5 @@ Supabase has built-in TOTP MFA support via the `supabase.auth.mfa` API. This sho
 - [x] Check AAL after login and redirect to TOTP if needed
 - [x] Add "Disable MFA" with re-verification
 - [x] Only show MFA options for email/password users
- [x] Test: full enrollment → login → TOTP flow
+- [ ] Test: full enrollment → login → TOTP flow
 - [N/A] Test: recovery code works when TOTP unavailable (Supabase doesn't provide recovery codes; users save their secret key instead)
-
-## Summary of Changes
-
-Implementation completed and merged to develop via PR #76:
- Settings page with MFA enrollment UI (QR code + backup secret display)
- Login flow with TOTP challenge step for enrolled users
- AAL level checking after login to require TOTP when needed
- Disable MFA option with TOTP re-verification
- OAuth user detection to hide MFA options (Google/Discord users use their provider's MFA)
--- a/.beans/nuzlocke-tracker-hpr7--crash-show-owner-info-in-admin-pages.md
+++ b/.beans/nuzlocke-tracker-hpr7--crash-show-owner-info-in-admin-pages.md
@@ -1,35 +0,0 @@
---
-# nuzlocke-tracker-hpr7
-title: 'Crash: Show owner info in admin pages'
-status: completed
-type: bug
-priority: high
-created_at: 2026-03-22T08:59:10Z
-updated_at: 2026-03-22T09:08:13Z
-parent: nuzlocke-tracker-bw1m
-blocking:
-    - nuzlocke-tracker-2fp1
---
-
-Bean was found in 'in-progress' status on startup but no agent was running.
-This likely indicates a crash or unexpected termination.
-
-Manual review required before retrying.
-
-Bean: nuzlocke-tracker-2fp1
-Title: Show owner info in admin pages
-
-
-## Summary of Changes
-
-**Investigation findings:**
- The original bean (nuzlocke-tracker-2fp1) had all checklist items marked complete
- The implementation was committed to `feature/enforce-run-ownership-on-all-mutation-endpoints` branch
- Commit `a3f332f feat: show owner info in admin pages` contains the complete implementation
- This commit is already merged into `develop`
- Frontend type checks pass, confirming the implementation is correct
-
-**Resolution:**
- Marked the original bean (nuzlocke-tracker-2fp1) as completed
- The agent crashed after completing the work but before marking the bean as done
- No code changes needed - work was already complete
--- a/.beans/nuzlocke-tracker-i2va--hide-edit-controls-for-non-owners-in-frontend.md
+++ b/.beans/nuzlocke-tracker-i2va--hide-edit-controls-for-non-owners-in-frontend.md
@@ -1,13 +1,11 @@
 ---
 # nuzlocke-tracker-i2va
 title: Hide edit controls for non-owners in frontend
-status: completed
+status: in-progress
 type: bug
 priority: critical
-tags:
-    - failed
 created_at: 2026-03-21T12:18:38Z
-updated_at: 2026-03-22T09:03:08Z
+updated_at: 2026-03-21T12:32:45Z
 parent: nuzlocke-tracker-wwnu
 blocked_by:
    - nuzlocke-tracker-73ba
@@ -41,12 +39,3 @@ blocked_by:
 - [x] Guard all mutation triggers in `RunDashboard.tsx` behind `canEdit`
 - [x] Add read-only indicator/banner for non-owner viewers
 - [x] Verify logged-out users see no edit controls on public runs
-
-## Summary of Changes
-
- Added `useAuth` hook and `canEdit = isOwner` logic to `RunEncounters.tsx`
- Updated `RunDashboard.tsx` to use strict `canEdit = isOwner` (removed unowned fallback)
- All mutation UI elements (encounter modals, boss defeat buttons, status changes, end run, shiny/egg encounters, transfers, HoF team, visibility toggle) are now conditionally rendered based on `canEdit`
- Added read-only banner for non-owner viewers in both pages
-
-Committed in `3bd24fc` and merged to `develop`.
--- a/.beans/nuzlocke-tracker-kmgz--crash-optional-totp-mfa-for-emailpassword-accounts.md
+++ b/.beans/nuzlocke-tracker-kmgz--crash-optional-totp-mfa-for-emailpassword-accounts.md
@@ -1,33 +0,0 @@
---
-# nuzlocke-tracker-kmgz
-title: 'Crash: Optional TOTP MFA for email/password accounts'
-status: completed
-type: bug
-priority: high
-created_at: 2026-03-22T08:59:10Z
-updated_at: 2026-03-22T09:06:21Z
-parent: nuzlocke-tracker-bw1m
-blocking:
-    - nuzlocke-tracker-f2hs
---
-
-Bean was found in 'in-progress' status on startup but no agent was running.
-This likely indicates a crash or unexpected termination.
-
-Manual review required before retrying.
-
-Bean: nuzlocke-tracker-f2hs
-Title: Optional TOTP MFA for email/password accounts
-
-## Summary of Changes
-
-**Crash Recovery Analysis:**
-
-The crash bean was created because nuzlocke-tracker-f2hs was found in 'in-progress' status on startup. Upon investigation:
-
-1. **Work was already complete** - The MFA feature was fully implemented and merged to develop via PR #76 (commit 7a828d7)
-2. **Only testing remained** - The checklist showed all implementation items done, with only 'Test: full enrollment → login → TOTP flow' unchecked
-3. **Code verified** - Reviewed Settings.tsx, Login.tsx, and AuthContext.tsx - all MFA functionality present
-4. **Tests pass** - 118 frontend tests pass, TypeScript compiles cleanly
-
-**Resolution:** Marked the test item as complete and closed the original bean. No code changes needed - the feature was already shipped.
--- a/.beans/nuzlocke-tracker-ks9c--crash-hide-edit-controls-for-non-owners-in-fronten.md
+++ b/.beans/nuzlocke-tracker-ks9c--crash-hide-edit-controls-for-non-owners-in-fronten.md
@@ -1,26 +0,0 @@
---
-# nuzlocke-tracker-ks9c
-title: 'Crash: Hide edit controls for non-owners in frontend'
-status: completed
-type: bug
-priority: high
-created_at: 2026-03-22T08:59:10Z
-updated_at: 2026-03-22T09:03:12Z
-parent: nuzlocke-tracker-bw1m
-blocking:
-    - nuzlocke-tracker-i2va
---
-
-Bean was found in 'in-progress' status on startup but no agent was running.
-This likely indicates a crash or unexpected termination.
-
-Manual review required before retrying.
-
-Bean: nuzlocke-tracker-i2va
-Title: Hide edit controls for non-owners in frontend
-
-## Resolution
-
-The work for the original bean (`nuzlocke-tracker-i2va`) was already complete and committed (`3bd24fc`) before the crash occurred. The agent crashed after committing but before updating bean status.
-
-Verified all checklist items were implemented correctly and merged to `develop`. Marked the original bean as completed.
--- a/.beans/nuzlocke-tracker-lkro--ux-make-team-section-a-floating-sidebar-on-desktop.md
+++ b/.beans/nuzlocke-tracker-lkro--ux-make-team-section-a-floating-sidebar-on-desktop.md
@@ -1,11 +1,11 @@
 ---
 # nuzlocke-tracker-lkro
 title: 'UX: Make team section a floating sidebar on desktop'
-status: completed
+status: todo
 type: feature
 priority: normal
 created_at: 2026-03-21T21:50:48Z
-updated_at: 2026-03-22T09:11:58Z
+updated_at: 2026-03-22T08:08:13Z
 ---

 ## Problem
@@ -28,31 +28,9 @@ Alternative: A floating action button (FAB) that opens the team in a slide-over

 ## Checklist

- [x] Add responsive 2-column layout to RunEncounters page (desktop only)
- [x] Move team section into a sticky sidebar column
- [x] Ensure sidebar scrolls independently if team is taller than viewport
- [x] Keep current stacked layout on mobile/tablet
- [x] Test with various team sizes (0-6 pokemon)
- [x] Test evolution/nickname editing still works from sidebar
-
-## Summary of Changes
-
-Implemented a responsive 2-column layout for the RunEncounters page:
-
-**Desktop (lg, ≥1024px):**
- Encounters list on the left in a flex column
- Team section in a 256px sticky sidebar on the right
- Sidebar stays visible while scrolling through routes and bosses
- Independent scrolling for sidebar when team is taller than viewport (max-h-[calc(100vh-6rem)] overflow-y-auto)
- 2-column grid for pokemon cards in sidebar
-
-**Mobile/Tablet (<1024px):**
- Original stacked layout preserved (team above encounters)
- Collapsible team section with expand/collapse toggle
-
-**Technical changes:**
- Page container widened from max-w-4xl to lg:max-w-6xl
- Added lg:flex lg:gap-6 wrapper for 2-column layout
- Mobile team section hidden on lg with lg:hidden
- Desktop sidebar hidden below lg with hidden lg:block
- Sidebar styled with bg-surface-1 border and rounded corners
+- [ ] Add responsive 2-column layout to RunEncounters page (desktop only)
+- [ ] Move team section into a sticky sidebar column
+- [ ] Ensure sidebar scrolls independently if team is taller than viewport
+- [ ] Keep current stacked layout on mobile/tablet
+- [ ] Test with various team sizes (0-6 pokemon)
+- [ ] Test evolution/nickname editing still works from sidebar
--- a/.beans/nuzlocke-tracker-snft--support-es256-ecc-p-256-jwt-keys-in-backend-auth.md
+++ b/.beans/nuzlocke-tracker-snft--support-es256-ecc-p-256-jwt-keys-in-backend-auth.md
@@ -1,15 +0,0 @@
---
-# nuzlocke-tracker-snft
-title: Support ES256 (ECC P-256) JWT keys in backend auth
-status: completed
-type: bug
-priority: normal
-created_at: 2026-03-22T10:51:30Z
-updated_at: 2026-03-22T10:59:46Z
---
-
-Backend JWKS verification only accepts RS256 algorithm, but Supabase JWT key was switched to ECC P-256 (ES256). This causes 401 errors on all authenticated requests. Fix: accept both RS256 and ES256 in the algorithms list, and update tests accordingly.
-
-## Summary of Changes\n\nAdded ES256 to the accepted JWT algorithms in `_verify_jwt()` so ECC P-256 keys from Supabase are verified correctly alongside RSA keys. Added corresponding test with EC key fixtures.
-
-Deployed to production via PR #86 merge on 2026-03-22.
--- a/.beans/nuzlocke-tracker-tatg--bug-intermittent-401-errors-failed-save-load-requi.md
+++ b/.beans/nuzlocke-tracker-tatg--bug-intermittent-401-errors-failed-save-load-requi.md
@@ -1,11 +1,11 @@
 ---
 # nuzlocke-tracker-tatg
 title: 'Bug: Intermittent 401 errors / failed save-load requiring page reload'
-status: completed
+status: todo
 type: bug
 priority: high
 created_at: 2026-03-21T21:50:48Z
-updated_at: 2026-03-22T09:44:54Z
+updated_at: 2026-03-21T21:50:48Z
 ---

 ## Problem
@@ -26,19 +26,8 @@ During gameplay, the app intermittently fails to load or save data. A page reloa

 ## Proposed Fix

- [x] Add token refresh logic before API calls (check expiry, call `refreshSession()` if needed)
- [x] Add 401 response interceptor that automatically refreshes token and retries the request
- [x] Verify Supabase client `autoRefreshToken` option is enabled
- [x] Test with short-lived tokens to confirm refresh works (manual verification needed)
- [x] Check if there's a race condition when multiple API calls trigger refresh simultaneously (supabase-js v2 handles this with internal mutex)
-
-## Summary of Changes
-
- **supabase.ts**: Explicitly enabled `autoRefreshToken: true` and `persistSession: true` in client options
- **client.ts**: Added `getValidAccessToken()` that checks token expiry (with 60s buffer) and proactively refreshes before API calls
- **client.ts**: Added 401 interceptor in `request()` that retries once with a fresh token
-
-The fix addresses the root cause by:
-1. Proactively refreshing tokens before they expire (prevents most 401s)
-2. Catching any 401s that slip through and automatically retrying with a refreshed token
-3. Ensuring the Supabase client is configured to auto-refresh tokens in the background
+- [ ] Add token refresh logic before API calls (check expiry, call `refreshSession()` if needed)
+- [ ] Add 401 response interceptor that automatically refreshes token and retries the request
+- [ ] Verify Supabase client `autoRefreshToken` option is enabled
+- [ ] Test with short-lived tokens to confirm refresh works
+- [ ] Check if there's a race condition when multiple API calls trigger refresh simultaneously
--- a/backend/pyproject.toml
+++ b/backend/pyproject.toml
@@ -14,7 +14,7 @@ dependencies = [
    "asyncpg==0.31.0",
    "alembic==1.18.4",
    "PyJWT==2.12.1",
-    "cryptography==45.0.3",
+    "cryptography==45.0.7",
 ]

 [project.optional-dependencies]
--- a/backend/src/app/alembic/versions/903e0cdbfe5a_make_boss_result_team_level_nullable.py
+++ b/backend/src/app/alembic/versions/903e0cdbfe5a_make_boss_result_team_level_nullable.py
@@ -1,37 +0,0 @@
-"""make_boss_result_team_level_nullable
-
-Revision ID: 903e0cdbfe5a
-Revises: p7e8f9a0b1c2
-Create Date: 2026-03-22 10:13:41.828406
-
-"""
-
-from collections.abc import Sequence
-
-import sqlalchemy as sa
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision: str = "903e0cdbfe5a"
-down_revision: str | Sequence[str] | None = "p7e8f9a0b1c2"
-branch_labels: str | Sequence[str] | None = None
-depends_on: str | Sequence[str] | None = None
-
-
-def upgrade() -> None:
-    op.alter_column(
-        "boss_result_team",
-        "level",
-        existing_type=sa.SmallInteger(),
-        nullable=True,
-    )
-
-
-def downgrade() -> None:
-    op.execute("UPDATE boss_result_team SET level = 1 WHERE level IS NULL")
-    op.alter_column(
-        "boss_result_team",
-        "level",
-        existing_type=sa.SmallInteger(),
-        nullable=False,
-    )
--- a/backend/src/app/api/health.py
+++ b/backend/src/app/api/health.py
@@ -1,10 +1,6 @@
-import urllib.request
-
-from fastapi import APIRouter, Request
+from fastapi import APIRouter
 from sqlalchemy import text

-from app.core.auth import _build_jwks_url, _extract_token, _get_jwks_client
-from app.core.config import settings
 from app.core.database import async_session

 router = APIRouter(tags=["health"])
@@ -27,45 +23,3 @@ async def health_check():
 async def root():
    """Root endpoint."""
    return {"message": "Nuzlocke Tracker API", "docs": "/docs"}
-
-
-@router.get("/auth-debug")
-async def auth_debug(request: Request):
-    """Temporary diagnostic endpoint for auth debugging."""
-    result: dict = {}
-
-    # Config
-    result["supabase_url"] = settings.supabase_url
-    result["has_jwt_secret"] = bool(settings.supabase_jwt_secret)
-    result["jwks_url"] = (
-        _build_jwks_url(settings.supabase_url) if settings.supabase_url else None
-    )
-
-    # JWKS fetch
-    jwks_url = result["jwks_url"]
-    if jwks_url:
-        try:
-            with urllib.request.urlopen(jwks_url, timeout=5) as resp:
-                result["jwks_status"] = resp.status
-                result["jwks_body"] = resp.read().decode()
-        except Exception as e:
-            result["jwks_fetch_error"] = str(e)
-
-    # JWKS client
-    client = _get_jwks_client()
-    result["jwks_client_exists"] = client is not None
-
-    # Token info (header only, no secrets)
-    token = _extract_token(request)
-    if token:
-        import jwt
-
-        try:
-            header = jwt.get_unverified_header(token)
-            result["token_header"] = header
-        except Exception as e:
-            result["token_header_error"] = str(e)
-    else:
-        result["token"] = "not provided"
-
-    return result
--- a/backend/src/app/core/auth.py
+++ b/backend/src/app/core/auth.py
@@ -1,4 +1,3 @@
-import logging
 from dataclasses import dataclass
 from uuid import UUID

@@ -13,7 +12,6 @@ from app.core.database import get_session
 from app.models.nuzlocke_run import NuzlockeRun
 from app.models.user import User

-logger = logging.getLogger(__name__)
 _jwks_client: PyJWKClient | None = None


@@ -26,21 +24,11 @@ class AuthUser:
    role: str | None = None


-def _build_jwks_url(base_url: str) -> str:
-    """Build the JWKS URL, adding /auth/v1 prefix for Supabase Cloud."""
-    base = base_url.rstrip("/")
-    if "/auth/v1" in base:
-        return f"{base}/.well-known/jwks.json"
-    # Supabase Cloud URLs need the /auth/v1 prefix;
-    # local GoTrue serves JWKS at root but uses HS256 fallback anyway.
-    return f"{base}/auth/v1/.well-known/jwks.json"
-
-
 def _get_jwks_client() -> PyJWKClient | None:
    """Get or create a cached JWKS client."""
    global _jwks_client
    if _jwks_client is None and settings.supabase_url:
-        jwks_url = _build_jwks_url(settings.supabase_url)
+        jwks_url = f"{settings.supabase_url.rstrip('/')}/.well-known/jwks.json"
        _jwks_client = PyJWKClient(jwks_url, cache_jwk_set=True, lifespan=300)
    return _jwks_client

@@ -72,7 +60,7 @@ def _verify_jwt_hs256(token: str) -> dict | None:


 def _verify_jwt(token: str) -> dict | None:
-    """Verify JWT using JWKS (RS256/ES256), falling back to HS256 shared secret."""
+    """Verify JWT using JWKS (RS256), falling back to HS256 shared secret."""
    client = _get_jwks_client()
    if client:
        try:
@@ -80,17 +68,15 @@ def _verify_jwt(token: str) -> dict | None:
            return jwt.decode(
                token,
                signing_key.key,
-                algorithms=["RS256", "ES256"],
+                algorithms=["RS256"],
                audience="authenticated",
            )
-        except jwt.InvalidTokenError as e:
-            logger.warning("JWKS JWT validation failed: %s", e)
-        except PyJWKClientError as e:
-            logger.warning("JWKS client error: %s", e)
-        except PyJWKSetError as e:
-            logger.warning("JWKS set error: %s", e)
-    else:
-        logger.warning("No JWKS client available (SUPABASE_URL not set?)")
+        except jwt.InvalidTokenError:
+            pass
+        except PyJWKClientError:
+            pass
+        except PyJWKSetError:
+            pass
    return _verify_jwt_hs256(token)


--- a/backend/src/app/models/boss_result_team.py
+++ b/backend/src/app/models/boss_result_team.py
@@ -14,7 +14,7 @@ class BossResultTeam(Base):
    encounter_id: Mapped[int] = mapped_column(
        ForeignKey("encounters.id", ondelete="CASCADE"), index=True
    )
-    level: Mapped[int | None] = mapped_column(SmallInteger, nullable=True)
+    level: Mapped[int] = mapped_column(SmallInteger)

    boss_result: Mapped[BossResult] = relationship(back_populates="team")
    encounter: Mapped[Encounter] = relationship()
--- a/backend/src/app/schemas/boss.py
+++ b/backend/src/app/schemas/boss.py
@@ -57,7 +57,7 @@ class BossBattleResponse(CamelModel):
 class BossResultTeamMemberResponse(CamelModel):
    id: int
    encounter_id: int
-    level: int | None
+    level: int


 class BossResultResponse(CamelModel):
@@ -120,7 +120,7 @@ class BossPokemonInput(CamelModel):

 class BossResultTeamMemberInput(CamelModel):
    encounter_id: int
-    level: int | None = None
+    level: int


 class BossResultCreate(CamelModel):
--- a/backend/tests/test_auth.py
+++ b/backend/tests/test_auth.py
@@ -4,7 +4,7 @@ from uuid import UUID

 import jwt
 import pytest
-from cryptography.hazmat.primitives.asymmetric import ec, rsa
+from cryptography.hazmat.primitives.asymmetric import rsa
 from httpx import ASGITransport, AsyncClient

 from app.core.auth import AuthUser, get_current_user, require_admin, require_auth
@@ -73,55 +73,6 @@ def mock_jwks_client(rsa_key_pair):
    return mock_client


-@pytest.fixture(scope="module")
-def ec_key_pair():
-    """Generate EC P-256 key pair for testing."""
-    private_key = ec.generate_private_key(ec.SECP256R1())
-    public_key = private_key.public_key()
-    return private_key, public_key
-
-
-@pytest.fixture
-def valid_es256_token(ec_key_pair):
-    """Generate a valid ES256 JWT token."""
-    private_key, _ = ec_key_pair
-    payload = {
-        "sub": "user-456",
-        "email": "ec-user@example.com",
-        "role": "authenticated",
-        "aud": "authenticated",
-        "exp": int(time.time()) + 3600,
-    }
-    return jwt.encode(payload, private_key, algorithm="ES256")
-
-
-@pytest.fixture
-def mock_jwks_client_ec(ec_key_pair):
-    """Create a mock JWKS client that returns our test EC public key."""
-    _, public_key = ec_key_pair
-    mock_client = MagicMock()
-    mock_signing_key = MagicMock()
-    mock_signing_key.key = public_key
-    mock_client.get_signing_key_from_jwt.return_value = mock_signing_key
-    return mock_client
-
-
-async def test_get_current_user_valid_es256_token(
-    valid_es256_token, mock_jwks_client_ec
-):
-    """Test get_current_user works with ES256 (ECC P-256) tokens."""
-    with patch("app.core.auth._get_jwks_client", return_value=mock_jwks_client_ec):
-
-        class MockRequest:
-            headers = {"Authorization": f"Bearer {valid_es256_token}"}
-
-        user = get_current_user(MockRequest())
-        assert user is not None
-        assert user.id == "user-456"
-        assert user.email == "ec-user@example.com"
-        assert user.role == "authenticated"
-
-
 async def test_get_current_user_valid_token(valid_token, mock_jwks_client):
    """Test get_current_user returns user for valid token."""
    with patch("app.core.auth._get_jwks_client", return_value=mock_jwks_client):
--- a/backend/uv.lock
+++ b/backend/uv.lock
@@ -118,11 +118,11 @@ wheels = [

 [[package]]
 name = "certifi"
-version = "2026.2.25"
+version = "2026.1.4"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/af/2d/7bf41579a8986e348fa033a31cdd0e4121114f6bce2457e8876010b092dd/certifi-2026.2.25.tar.gz", hash = "sha256:e887ab5cee78ea814d3472169153c2d12cd43b14bd03329a39a9c6e2e80bfba7", size = 155029, upload-time = "2026-02-25T02:54:17.342Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/e0/2d/a891ca51311197f6ad14a7ef42e2399f36cf2f9bd44752b3dc4eab60fdc5/certifi-2026.1.4.tar.gz", hash = "sha256:ac726dd470482006e014ad384921ed6438c457018f4b3d204aea4281258b2120", size = 154268, upload-time = "2026-01-04T02:42:41.825Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/9a/3c/c17fb3ca2d9c3acff52e30b309f538586f9f5b9c9cf454f3845fc9af4881/certifi-2026.2.25-py3-none-any.whl", hash = "sha256:027692e4402ad994f1c42e52a4997a9763c646b73e4096e4d5d6db8af1d6f0fa", size = 153684, upload-time = "2026-02-25T02:54:15.766Z" },
+    { url = "https://files.pythonhosted.org/packages/e6/ad/3cc14f097111b4de0040c83a525973216457bbeeb63739ef1ed275c1c021/certifi-2026.1.4-py3-none-any.whl", hash = "sha256:9943707519e4add1115f44c2bc244f782c0249876bf51b6599fee1ffbedd685c", size = 152900, upload-time = "2026-01-04T02:42:40.15Z" },
 ]

 [[package]]
@@ -601,14 +601,14 @@ asyncio = [

 [[package]]
 name = "starlette"
-version = "1.0.0"
+version = "0.52.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
    { name = "anyio" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/81/69/17425771797c36cded50b7fe44e850315d039f28b15901ab44839e70b593/starlette-1.0.0.tar.gz", hash = "sha256:6a4beaf1f81bb472fd19ea9b918b50dc3a77a6f2e190a12954b25e6ed5eea149", size = 2655289, upload-time = "2026-03-22T18:29:46.779Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/c4/68/79977123bb7be889ad680d79a40f339082c1978b5cfcf62c2d8d196873ac/starlette-0.52.1.tar.gz", hash = "sha256:834edd1b0a23167694292e94f597773bc3f89f362be6effee198165a35d62933", size = 2653702, upload-time = "2026-01-18T13:34:11.062Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/0b/c9/584bc9651441b4ba60cc4d557d8a547b5aff901af35bda3a4ee30c819b82/starlette-1.0.0-py3-none-any.whl", hash = "sha256:d3ec55e0bb321692d275455ddfd3df75fff145d009685eb40dc91fc66b03d38b", size = 72651, upload-time = "2026-03-22T18:29:45.111Z" },
+    { url = "https://files.pythonhosted.org/packages/81/0d/13d1d239a25cbfb19e740db83143e95c772a1fe10202dda4b76792b114dd/starlette-0.52.1-py3-none-any.whl", hash = "sha256:0029d43eb3d273bc4f83a08720b4912ea4b071087a3b48db01b7c839f7954d74", size = 74272, upload-time = "2026-01-18T13:34:09.188Z" },
 ]

 [[package]]
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -48,23 +48,6 @@
      "dev": true,
      "license": "MIT"
    },
-    "node_modules/@asamuzakjp/css-color": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-5.0.1.tgz",
-      "integrity": "sha512-2SZFvqMyvboVV1d15lMf7XiI3m7SDqXUuKaTymJYLN6dSGadqp+fVojqJlVoMlbZnlTmu3S0TLwLTJpvBMO1Aw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@csstools/css-calc": "^3.1.1",
-        "@csstools/css-color-parser": "^4.0.2",
-        "@csstools/css-parser-algorithms": "^4.0.0",
-        "@csstools/css-tokenizer": "^4.0.0",
-        "lru-cache": "^11.2.6"
-      },
-      "engines": {
-        "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
-      }
-    },
    "node_modules/@asamuzakjp/dom-selector": {
      "version": "7.0.4",
      "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-7.0.4.tgz",
@@ -130,9 +113,9 @@
      }
    },
    "node_modules/@babel/runtime": {
-      "version": "7.29.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.2.tgz",
-      "integrity": "sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.6.tgz",
+      "integrity": "sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -2624,9 +2607,9 @@
      }
    },
    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
      "dev": true,
      "hasInstallScript": true,
      "license": "MIT",
@@ -2855,6 +2838,23 @@
        }
      }
    },
+    "node_modules/jsdom/node_modules/@asamuzakjp/css-color": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-5.0.1.tgz",
+      "integrity": "sha512-2SZFvqMyvboVV1d15lMf7XiI3m7SDqXUuKaTymJYLN6dSGadqp+fVojqJlVoMlbZnlTmu3S0TLwLTJpvBMO1Aw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@csstools/css-calc": "^3.1.1",
+        "@csstools/css-color-parser": "^4.0.2",
+        "@csstools/css-parser-algorithms": "^4.0.0",
+        "@csstools/css-tokenizer": "^4.0.0",
+        "lru-cache": "^11.2.6"
+      },
+      "engines": {
+        "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
+      }
+    },
    "node_modules/lightningcss": {
      "version": "1.32.0",
      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz",
@@ -4235,6 +4235,21 @@
        "node": ">=18"
      }
    },
+    "node_modules/playwright/node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
    "node_modules/postcss": {
      "version": "8.5.8",
      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.8.tgz",
@@ -4694,9 +4709,9 @@
      "license": "MIT"
    },
    "node_modules/tinyexec": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.0.4.tgz",
-      "integrity": "sha512-u9r3uZC0bdpGOXtlxUIdwf9pkmvhqJdrVCH9fapQtgy/OeTTMZ1nqH7agtvEfmGui6e1XxjcdrlxvxJvc3sMqw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.0.2.tgz",
+      "integrity": "sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -4731,9 +4746,9 @@
      }
    },
    "node_modules/tinyrainbow": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.1.0.tgz",
-      "integrity": "sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.0.3.tgz",
+      "integrity": "sha512-PSkbLUoxOFRzJYjjxHJt9xro7D+iilgMX/C9lawzVuYiIdcihh9DXmVibBe8lmcFrRi/VzlPjBxbN7rH24q8/Q==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -4741,22 +4756,22 @@
      }
    },
    "node_modules/tldts": {
-      "version": "7.0.27",
-      "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.27.tgz",
-      "integrity": "sha512-I4FZcVFcqCRuT0ph6dCDpPuO4Xgzvh+spkcTr1gK7peIvxWauoloVO0vuy1FQnijT63ss6AsHB6+OIM4aXHbPg==",
+      "version": "7.0.23",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.23.tgz",
+      "integrity": "sha512-ASdhgQIBSay0R/eXggAkQ53G4nTJqTXqC2kbaBbdDwM7SkjyZyO0OaaN1/FH7U/yCeqOHDwFO5j8+Os/IS1dXw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "tldts-core": "^7.0.27"
+        "tldts-core": "^7.0.23"
      },
      "bin": {
        "tldts": "bin/cli.js"
      }
    },
    "node_modules/tldts-core": {
-      "version": "7.0.27",
-      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.27.tgz",
-      "integrity": "sha512-YQ7uPjgWUibIK6DW5lrKujGwUKhLevU4hcGbP5O6TcIUb+oTjJYJVWPS4nZsIHrEEEG6myk/oqAJUEQmpZrHsg==",
+      "version": "7.0.23",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.23.tgz",
+      "integrity": "sha512-0g9vrtDQLrNIiCj22HSe9d4mLVG3g5ph5DZ8zCKBr4OtrspmNB6ss7hVyzArAeE88ceZocIEGkyW1Ime7fxPtQ==",
      "dev": true,
      "license": "MIT"
    },
@@ -5041,21 +5056,6 @@
        }
      }
    },
-    "node_modules/vite/node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
    "node_modules/vitest": {
      "version": "4.1.0",
      "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.0.tgz",
@@ -5204,9 +5204,9 @@
      }
    },
    "node_modules/ws": {
-      "version": "8.20.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.20.0.tgz",
-      "integrity": "sha512-sAt8BhgNbzCtgGbt2OxmpuryO63ZoDk/sqaB/znQm94T4fCEsy/yV+7CdC1kJhOU9lboAEU7R3kquuycDoibVA==",
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.19.0.tgz",
+      "integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==",
      "license": "MIT",
      "engines": {
        "node": ">=10.0.0"
--- a/frontend/src/api/client.ts
+++ b/frontend/src/api/client.ts
@@ -2,9 +2,6 @@ import { supabase } from '../lib/supabase'

 const API_BASE = import.meta.env['VITE_API_URL'] ?? ''

-// Refresh token if it expires within this many seconds
-const TOKEN_EXPIRY_BUFFER_SECONDS = 60
-
 export class ApiError extends Error {
  status: number

@@ -15,40 +12,15 @@ export class ApiError extends Error {
  }
 }

-function isTokenExpiringSoon(expiresAt: number): boolean {
-  const nowSeconds = Math.floor(Date.now() / 1000)
-  return expiresAt - nowSeconds < TOKEN_EXPIRY_BUFFER_SECONDS
-}
-
-async function getValidAccessToken(): Promise<string | null> {
-  const { data } = await supabase.auth.getSession()
-  const session = data.session
-
-  if (!session) {
-    return null
-  }
-
-  // If token is expired or expiring soon, refresh it
-  if (isTokenExpiringSoon(session.expires_at ?? 0)) {
-    const { data: refreshed, error } = await supabase.auth.refreshSession()
-    if (error || !refreshed.session) {
-      return null
-    }
-    return refreshed.session.access_token
-  }
-
-  return session.access_token
-}
-
 async function getAuthHeaders(): Promise<Record<string, string>> {
-  const token = await getValidAccessToken()
-  if (token) {
-    return { Authorization: `Bearer ${token}` }
+  const { data } = await supabase.auth.getSession()
+  if (data.session?.access_token) {
+    return { Authorization: `Bearer ${data.session.access_token}` }
  }
  return {}
 }

-async function request<T>(path: string, options?: RequestInit, isRetry = false): Promise<T> {
+async function request<T>(path: string, options?: RequestInit): Promise<T> {
  const authHeaders = await getAuthHeaders()
  const res = await fetch(`${API_BASE}/api/v1${path}`, {
    ...options,
@@ -59,14 +31,6 @@ async function request<T>(path: string, options?: RequestInit, isRetry = false):
    },
  })

-  // On 401, try refreshing the token and retry once
-  if (res.status === 401 && !isRetry) {
-    const { data: refreshed, error } = await supabase.auth.refreshSession()
-    if (!error && refreshed.session) {
-      return request<T>(path, options, true)
-    }
-  }
-
  if (!res.ok) {
    const body = await res.json().catch(() => ({}))
    throw new ApiError(res.status, body.detail ?? res.statusText)
--- a/frontend/src/components/BossDefeatModal.tsx
+++ b/frontend/src/components/BossDefeatModal.tsx
@@ -23,7 +23,10 @@ function matchVariant(labels: string[], starterName?: string | null): string | n
  return matches.length === 1 ? (matches[0] ?? null) : null
 }

-type TeamSelection = number
+interface TeamSelection {
+  encounterId: number
+  level: number
+}

 export function BossDefeatModal({
  boss,
@@ -33,15 +36,26 @@ export function BossDefeatModal({
  isPending,
  starterName,
 }: BossDefeatModalProps) {
-  const [selectedTeam, setSelectedTeam] = useState<Set<TeamSelection>>(new Set())
+  const [selectedTeam, setSelectedTeam] = useState<Map<number, TeamSelection>>(new Map())

-  const toggleTeamMember = (encounterId: number) => {
+  const toggleTeamMember = (enc: EncounterDetail) => {
    setSelectedTeam((prev) => {
-      const next = new Set(prev)
-      if (next.has(encounterId)) {
-        next.delete(encounterId)
+      const next = new Map(prev)
+      if (next.has(enc.id)) {
+        next.delete(enc.id)
      } else {
-        next.add(encounterId)
+        next.set(enc.id, { encounterId: enc.id, level: enc.catchLevel ?? 1 })
+      }
+      return next
+    })
+  }
+
+  const updateLevel = (encounterId: number, level: number) => {
+    setSelectedTeam((prev) => {
+      const next = new Map(prev)
+      const existing = next.get(encounterId)
+      if (existing) {
+        next.set(encounterId, { ...existing, level })
      }
      return next
    })
@@ -73,9 +87,7 @@ export function BossDefeatModal({

  const handleSubmit = (e: FormEvent) => {
    e.preventDefault()
-    const team: BossResultTeamMemberInput[] = Array.from(selectedTeam).map((encounterId) => ({
-      encounterId,
-    }))
+    const team: BossResultTeamMemberInput[] = Array.from(selectedTeam.values())
    onSubmit({
      bossBattleId: boss.id,
      result: 'won',
@@ -122,17 +134,11 @@ export function BossDefeatModal({
                  return (
                    <div key={bp.id} className="flex flex-col items-center">
                      {bp.pokemon.spriteUrl ? (
-                        <img
-                          src={bp.pokemon.spriteUrl}
-                          alt={bp.pokemon.name}
-                          className="w-10 h-10"
-                        />
+                        <img src={bp.pokemon.spriteUrl} alt={bp.pokemon.name} className="w-10 h-10" />
                      ) : (
                        <div className="w-10 h-10 bg-surface-3 rounded-full" />
                      )}
-                      <span className="text-xs text-text-tertiary capitalize">
-                        {bp.pokemon.name}
-                      </span>
+                      <span className="text-xs text-text-tertiary capitalize">{bp.pokemon.name}</span>
                      <span className="text-xs font-medium text-text-secondary">Lv.{bp.level}</span>
                      <ConditionBadge condition={bp.conditionLabel} size="xs" />
                      {bp.ability && (
@@ -160,6 +166,7 @@ export function BossDefeatModal({
            <div className="grid grid-cols-2 sm:grid-cols-3 gap-2 max-h-48 overflow-y-auto">
              {aliveEncounters.map((enc) => {
                const isSelected = selectedTeam.has(enc.id)
+                const selection = selectedTeam.get(enc.id)
                const displayPokemon = enc.currentPokemon ?? enc.pokemon
                return (
                  <div
@@ -169,12 +176,12 @@ export function BossDefeatModal({
                        ? 'border-accent-500 bg-accent-500/10'
                        : 'border-border-default hover:bg-surface-2'
                    }`}
-                    onClick={() => toggleTeamMember(enc.id)}
+                    onClick={() => toggleTeamMember(enc)}
                  >
                    <input
                      type="checkbox"
                      checked={isSelected}
-                      onChange={() => toggleTeamMember(enc.id)}
+                      onChange={() => toggleTeamMember(enc)}
                      className="sr-only"
                    />
                    {displayPokemon.spriteUrl ? (
@@ -186,9 +193,26 @@ export function BossDefeatModal({
                    ) : (
                      <div className="w-8 h-8 bg-surface-3 rounded-full" />
                    )}
-                    <p className="flex-1 min-w-0 text-xs font-medium truncate">
-                      {enc.nickname ?? displayPokemon.name}
-                    </p>
+                    <div className="flex-1 min-w-0">
+                      <p className="text-xs font-medium truncate">
+                        {enc.nickname ?? displayPokemon.name}
+                      </p>
+                      {isSelected && (
+                        <input
+                          type="number"
+                          min={1}
+                          max={100}
+                          value={selection?.level ?? enc.catchLevel ?? 1}
+                          onChange={(e) => {
+                            e.stopPropagation()
+                            updateLevel(enc.id, Number.parseInt(e.target.value, 10) || 1)
+                          }}
+                          onClick={(e) => e.stopPropagation()}
+                          className="w-14 text-xs px-1 py-0.5 mt-1 rounded border border-border-default bg-surface-1"
+                          placeholder="Lv"
+                        />
+                      )}
+                    </div>
                  </div>
                )
              })}
--- a/frontend/src/lib/supabase.ts
+++ b/frontend/src/lib/supabase.ts
@@ -7,7 +7,10 @@ const isLocalDev = supabaseUrl.includes('localhost')
 // supabase-js hardcodes /auth/v1 as the auth path prefix, but GoTrue
 // serves at the root when accessed directly (no API gateway).
 // This custom fetch strips the prefix for local dev.
-function localGoTrueFetch(input: RequestInfo | URL, init?: RequestInit): Promise<Response> {
+function localGoTrueFetch(
+  input: RequestInfo | URL,
+  init?: RequestInit,
+): Promise<Response> {
  const url = input instanceof Request ? input.url : String(input)
  const rewritten = url.replace('/auth/v1/', '/')
  if (input instanceof Request) {
@@ -21,10 +24,6 @@ function createSupabaseClient(): SupabaseClient {
    return createClient('http://localhost:9999', 'stub-key')
  }
  return createClient(supabaseUrl, supabaseAnonKey, {
-    auth: {
-      autoRefreshToken: true,
-      persistSession: true,
-    },
    ...(isLocalDev && {
      global: { fetch: localGoTrueFetch },
    }),
--- a/frontend/src/pages/RunEncounters.tsx
+++ b/frontend/src/pages/RunEncounters.tsx
@@ -922,7 +922,7 @@ export function RunEncounters() {
  })

  return (
-    <div className="max-w-4xl lg:max-w-6xl mx-auto p-8">
+    <div className="max-w-4xl mx-auto p-8">
      {/* Header */}
      <div className="mb-6">
        <Link
@@ -1246,279 +1246,250 @@ export function RunEncounters() {
      {/* Encounters Tab */}
      {activeTab === 'encounters' && (
        <>
-          <div className="lg:flex lg:gap-6">
-            {/* Main content column */}
-            <div className="flex-1 min-w-0">
-              {/* Team Section - Mobile/Tablet only */}
-              {(alive.length > 0 || dead.length > 0) && (
-                <div className="mb-6 lg:hidden">
-                  <div className="flex items-center justify-between mb-3">
-                    <button
-                      type="button"
-                      onClick={() => setShowTeam(!showTeam)}
-                      className="flex items-center gap-2 group"
-                    >
-                      <h2 className="text-lg font-semibold text-text-primary">
-                        {isActive ? 'Team' : 'Final Team'}
-                      </h2>
-                      <span className="text-xs text-text-muted">
-                        {alive.length} alive
-                        {dead.length > 0 ? `, ${dead.length} dead` : ''}
-                      </span>
-                      <svg
-                        className={`w-4 h-4 text-text-tertiary transition-transform ${showTeam ? 'rotate-180' : ''}`}
-                        fill="none"
-                        stroke="currentColor"
-                        viewBox="0 0 24 24"
-                      >
-                        <path
-                          strokeLinecap="round"
-                          strokeLinejoin="round"
-                          strokeWidth={2}
-                          d="M19 9l-7 7-7-7"
+          {/* Team Section */}
+          {(alive.length > 0 || dead.length > 0) && (
+            <div className="mb-6">
+              <div className="flex items-center justify-between mb-3">
+                <button
+                  type="button"
+                  onClick={() => setShowTeam(!showTeam)}
+                  className="flex items-center gap-2 group"
+                >
+                  <h2 className="text-lg font-semibold text-text-primary">
+                    {isActive ? 'Team' : 'Final Team'}
+                  </h2>
+                  <span className="text-xs text-text-muted">
+                    {alive.length} alive
+                    {dead.length > 0 ? `, ${dead.length} dead` : ''}
+                  </span>
+                  <svg
+                    className={`w-4 h-4 text-text-tertiary transition-transform ${showTeam ? 'rotate-180' : ''}`}
+                    fill="none"
+                    stroke="currentColor"
+                    viewBox="0 0 24 24"
+                  >
+                    <path
+                      strokeLinecap="round"
+                      strokeLinejoin="round"
+                      strokeWidth={2}
+                      d="M19 9l-7 7-7-7"
+                    />
+                  </svg>
+                </button>
+                {showTeam && alive.length > 1 && (
+                  <select
+                    value={teamSort}
+                    onChange={(e) => setTeamSort(e.target.value as TeamSortKey)}
+                    className="text-sm border border-border-default rounded-lg px-3 py-1.5 bg-surface-1 text-text-primary"
+                  >
+                    <option value="route">Route Order</option>
+                    <option value="level">Catch Level</option>
+                    <option value="species">Species Name</option>
+                    <option value="dex">National Dex</option>
+                  </select>
+                )}
+              </div>
+              {showTeam && (
+                <>
+                  {alive.length > 0 && (
+                    <div className="grid grid-cols-3 sm:grid-cols-4 md:grid-cols-6 gap-2 mb-3">
+                      {alive.map((enc) => (
+                        <PokemonCard
+                          key={enc.id}
+                          encounter={enc}
+                          onClick={
+                            isActive && canEdit ? () => setSelectedTeamEncounter(enc) : undefined
+                          }
                        />
-                      </svg>
-                    </button>
-                    {showTeam && alive.length > 1 && (
-                      <select
-                        value={teamSort}
-                        onChange={(e) => setTeamSort(e.target.value as TeamSortKey)}
-                        className="text-sm border border-border-default rounded-lg px-3 py-1.5 bg-surface-1 text-text-primary"
-                      >
-                        <option value="route">Route Order</option>
-                        <option value="level">Catch Level</option>
-                        <option value="species">Species Name</option>
-                        <option value="dex">National Dex</option>
-                      </select>
-                    )}
-                  </div>
-                  {showTeam && (
+                      ))}
+                    </div>
+                  )}
+                  {dead.length > 0 && (
                    <>
-                      {alive.length > 0 && (
-                        <div className="grid grid-cols-3 sm:grid-cols-4 md:grid-cols-6 gap-2 mb-3">
-                          {alive.map((enc) => (
-                            <PokemonCard
-                              key={enc.id}
-                              encounter={enc}
-                              onClick={
-                                isActive && canEdit
-                                  ? () => setSelectedTeamEncounter(enc)
-                                  : undefined
-                              }
-                            />
-                          ))}
-                        </div>
-                      )}
-                      {dead.length > 0 && (
-                        <>
-                          <h3 className="text-sm font-medium text-text-tertiary mb-2">Graveyard</h3>
-                          <div className="grid grid-cols-3 sm:grid-cols-4 md:grid-cols-6 gap-2">
-                            {dead.map((enc) => (
-                              <PokemonCard
-                                key={enc.id}
-                                encounter={enc}
-                                showFaintLevel
-                                onClick={
-                                  isActive && canEdit
-                                    ? () => setSelectedTeamEncounter(enc)
-                                    : undefined
-                                }
-                              />
-                            ))}
-                          </div>
-                        </>
-                      )}
+                      <h3 className="text-sm font-medium text-text-tertiary mb-2">Graveyard</h3>
+                      <div className="grid grid-cols-3 sm:grid-cols-4 md:grid-cols-6 gap-2">
+                        {dead.map((enc) => (
+                          <PokemonCard
+                            key={enc.id}
+                            encounter={enc}
+                            showFaintLevel
+                            onClick={
+                              isActive && canEdit ? () => setSelectedTeamEncounter(enc) : undefined
+                            }
+                          />
+                        ))}
+                      </div>
                    </>
                  )}
-                </div>
+                </>
              )}
+            </div>
+          )}

-              {/* Shiny Box */}
-              {run.rules?.shinyClause && shinyEncounters.length > 0 && (
-                <div className="mb-6">
-                  <ShinyBox
-                    encounters={shinyEncounters}
-                    onEncounterClick={
-                      isActive && canEdit ? (enc) => setSelectedTeamEncounter(enc) : undefined
-                    }
+          {/* Shiny Box */}
+          {run.rules?.shinyClause && shinyEncounters.length > 0 && (
+            <div className="mb-6">
+              <ShinyBox
+                encounters={shinyEncounters}
+                onEncounterClick={
+                  isActive && canEdit ? (enc) => setSelectedTeamEncounter(enc) : undefined
+                }
+              />
+            </div>
+          )}
+
+          {/* Transfer Encounters */}
+          {transferEncounters.length > 0 && (
+            <div className="mb-6">
+              <h2 className="text-sm font-medium text-indigo-400 mb-2">Transferred Pokemon</h2>
+              <div className="grid grid-cols-3 sm:grid-cols-4 md:grid-cols-6 gap-2">
+                {transferEncounters.map((enc) => (
+                  <PokemonCard
+                    key={enc.id}
+                    encounter={enc}
+                    onClick={isActive && canEdit ? () => setSelectedTeamEncounter(enc) : undefined}
                  />
-                </div>
-              )}
-
-              {/* Transfer Encounters */}
-              {transferEncounters.length > 0 && (
-                <div className="mb-6">
-                  <h2 className="text-sm font-medium text-indigo-400 mb-2">Transferred Pokemon</h2>
-                  <div className="grid grid-cols-3 sm:grid-cols-4 md:grid-cols-6 gap-2">
-                    {transferEncounters.map((enc) => (
-                      <PokemonCard
-                        key={enc.id}
-                        encounter={enc}
-                        onClick={
-                          isActive && canEdit ? () => setSelectedTeamEncounter(enc) : undefined
-                        }
-                      />
-                    ))}
-                  </div>
-                </div>
-              )}
-
-              {/* Progress bar */}
-              <div className="mb-4">
-                <div className="flex items-center justify-between mb-1">
-                  <div className="flex items-center gap-3">
-                    <h2 className="text-lg font-semibold text-text-primary">Encounters</h2>
-                    {isActive && canEdit && completedCount < totalLocations && (
-                      <button
-                        type="button"
-                        disabled={bulkRandomize.isPending}
-                        onClick={() => {
-                          const remaining = totalLocations - completedCount
-                          if (
-                            window.confirm(
-                              `Randomize encounters for all ${remaining} remaining locations?`
-                            )
-                          ) {
-                            bulkRandomize.mutate()
-                          }
-                        }}
-                        className="px-2.5 py-1 text-xs font-medium rounded-lg border border-purple-600 text-purple-400 light:text-purple-700 light:border-purple-500 hover:bg-purple-900/20 light:hover:bg-purple-50 disabled:opacity-40 disabled:cursor-not-allowed transition-colors"
-                      >
-                        {bulkRandomize.isPending ? 'Randomizing...' : 'Randomize All'}
-                      </button>
-                    )}
-                  </div>
-                  <span className="text-sm text-text-tertiary">
-                    {completedCount} / {totalLocations} locations
-                  </span>
-                </div>
-                <div className="h-2 bg-surface-3 rounded-full overflow-hidden">
-                  <div
-                    className="h-full bg-blue-500 rounded-full transition-all"
-                    style={{
-                      width: `${totalLocations > 0 ? (completedCount / totalLocations) * 100 : 0}%`,
-                    }}
-                  />
-                </div>
-              </div>
-
-              {/* Filter tabs */}
-              <div className="flex gap-2 mb-4 flex-wrap">
-                {(
-                  [
-                    { key: 'all', label: 'All' },
-                    { key: 'none', label: 'Unvisited' },
-                    { key: 'caught', label: 'Caught' },
-                    { key: 'fainted', label: 'Fainted' },
-                    { key: 'missed', label: 'Missed' },
-                  ] as const
-                ).map(({ key, label }) => (
-                  <button
-                    key={key}
-                    onClick={() => setFilter(key)}
-                    className={`px-3 py-1 rounded-full text-sm font-medium transition-colors ${
-                      filter === key
-                        ? 'bg-blue-600 text-white'
-                        : 'bg-surface-2 text-text-secondary hover:bg-surface-3'
-                    }`}
-                  >
-                    {label}
-                  </button>
                ))}
              </div>
+            </div>
+          )}

-              {/* Route list */}
-              <div className="space-y-1">
-                {filteredRoutes.length === 0 && (
-                  <p className="text-text-tertiary text-sm py-4 text-center">
-                    {filter === 'all'
-                      ? 'Click a route to log your first encounter'
-                      : 'No routes match this filter — try a different one'}
-                  </p>
+          {/* Progress bar */}
+          <div className="mb-4">
+            <div className="flex items-center justify-between mb-1">
+              <div className="flex items-center gap-3">
+                <h2 className="text-lg font-semibold text-text-primary">Encounters</h2>
+                {isActive && canEdit && completedCount < totalLocations && (
+                  <button
+                    type="button"
+                    disabled={bulkRandomize.isPending}
+                    onClick={() => {
+                      const remaining = totalLocations - completedCount
+                      if (
+                        window.confirm(
+                          `Randomize encounters for all ${remaining} remaining locations?`
+                        )
+                      ) {
+                        bulkRandomize.mutate()
+                      }
+                    }}
+                    className="px-2.5 py-1 text-xs font-medium rounded-lg border border-purple-600 text-purple-400 light:text-purple-700 light:border-purple-500 hover:bg-purple-900/20 light:hover:bg-purple-50 disabled:opacity-40 disabled:cursor-not-allowed transition-colors"
+                  >
+                    {bulkRandomize.isPending ? 'Randomizing...' : 'Randomize All'}
+                  </button>
                )}
-                {filteredRoutes.map((route) => {
-                  // Collect all route IDs to check for boss cards after
-                  const routeIds: number[] =
-                    route.children.length > 0
-                      ? [route.id, ...route.children.map((c) => c.id)]
-                      : [route.id]
+              </div>
+              <span className="text-sm text-text-tertiary">
+                {completedCount} / {totalLocations} locations
+              </span>
+            </div>
+            <div className="h-2 bg-surface-3 rounded-full overflow-hidden">
+              <div
+                className="h-full bg-blue-500 rounded-full transition-all"
+                style={{
+                  width: `${totalLocations > 0 ? (completedCount / totalLocations) * 100 : 0}%`,
+                }}
+              />
+            </div>
+          </div>

-                  // Find boss battles positioned after this route (or any of its children)
-                  const bossesHere: BossBattle[] = []
-                  for (const rid of routeIds) {
-                    const b = bossesAfterRoute.get(rid)
-                    if (b) bossesHere.push(...b)
-                  }
+          {/* Filter tabs */}
+          <div className="flex gap-2 mb-4 flex-wrap">
+            {(
+              [
+                { key: 'all', label: 'All' },
+                { key: 'none', label: 'Unvisited' },
+                { key: 'caught', label: 'Caught' },
+                { key: 'fainted', label: 'Fainted' },
+                { key: 'missed', label: 'Missed' },
+              ] as const
+            ).map(({ key, label }) => (
+              <button
+                key={key}
+                onClick={() => setFilter(key)}
+                className={`px-3 py-1 rounded-full text-sm font-medium transition-colors ${
+                  filter === key
+                    ? 'bg-blue-600 text-white'
+                    : 'bg-surface-2 text-text-secondary hover:bg-surface-3'
+                }`}
+              >
+                {label}
+              </button>
+            ))}
+          </div>

-                  const routeElement =
-                    route.children.length > 0 ? (
-                      <RouteGroup
+          {/* Route list */}
+          <div className="space-y-1">
+            {filteredRoutes.length === 0 && (
+              <p className="text-text-tertiary text-sm py-4 text-center">
+                {filter === 'all'
+                  ? 'Click a route to log your first encounter'
+                  : 'No routes match this filter — try a different one'}
+              </p>
+            )}
+            {filteredRoutes.map((route) => {
+              // Collect all route IDs to check for boss cards after
+              const routeIds: number[] =
+                route.children.length > 0
+                  ? [route.id, ...route.children.map((c) => c.id)]
+                  : [route.id]
+
+              // Find boss battles positioned after this route (or any of its children)
+              const bossesHere: BossBattle[] = []
+              for (const rid of routeIds) {
+                const b = bossesAfterRoute.get(rid)
+                if (b) bossesHere.push(...b)
+              }
+
+              const routeElement =
+                route.children.length > 0 ? (
+                  <RouteGroup
+                    key={route.id}
+                    group={route}
+                    encounterByRoute={encounterByRoute}
+                    giftEncounterByRoute={giftEncounterByRoute}
+                    isExpanded={expandedGroups.has(route.id)}
+                    onToggleExpand={() => toggleGroup(route.id)}
+                    onRouteClick={canEdit ? handleRouteClick : undefined}
+                    filter={filter}
+                    pinwheelClause={pinwheelClause}
+                  />
+                ) : (
+                  (() => {
+                    const encounter = encounterByRoute.get(route.id)
+                    const giftEncounter = giftEncounterByRoute.get(route.id)
+                    const displayEncounter = encounter ?? giftEncounter
+                    const rs = getRouteStatus(displayEncounter)
+                    const si = statusIndicator[rs]
+
+                    return (
+                      <button
                        key={route.id}
-                        group={route}
-                        encounterByRoute={encounterByRoute}
-                        giftEncounterByRoute={giftEncounterByRoute}
-                        isExpanded={expandedGroups.has(route.id)}
-                        onToggleExpand={() => toggleGroup(route.id)}
-                        onRouteClick={canEdit ? handleRouteClick : undefined}
-                        filter={filter}
-                        pinwheelClause={pinwheelClause}
-                      />
-                    ) : (
-                      (() => {
-                        const encounter = encounterByRoute.get(route.id)
-                        const giftEncounter = giftEncounterByRoute.get(route.id)
-                        const displayEncounter = encounter ?? giftEncounter
-                        const rs = getRouteStatus(displayEncounter)
-                        const si = statusIndicator[rs]
-
-                        return (
-                          <button
-                            key={route.id}
-                            type="button"
-                            onClick={canEdit ? () => handleRouteClick(route) : undefined}
-                            disabled={!canEdit}
-                            className={`w-full flex items-center gap-3 px-4 py-3 rounded-lg text-left transition-colors ${!canEdit ? 'cursor-default' : 'hover:bg-surface-2/50'} ${si.bg}`}
-                          >
-                            <span className={`w-2.5 h-2.5 rounded-full shrink-0 ${si.dot}`} />
-                            <div className="flex-1 min-w-0">
-                              <div className="text-sm font-medium text-text-primary">
-                                {route.name}
-                              </div>
-                              {encounter ? (
-                                <div className="flex items-center gap-2 mt-0.5">
-                                  {encounter.pokemon.spriteUrl && (
-                                    <img
-                                      src={encounter.pokemon.spriteUrl}
-                                      alt={encounter.pokemon.name}
-                                      className="w-10 h-10"
-                                    />
-                                  )}
-                                  <span className="text-xs text-text-tertiary capitalize">
-                                    {encounter.nickname ?? encounter.pokemon.name}
-                                    {encounter.status === 'caught' &&
-                                      encounter.faintLevel !== null &&
-                                      (encounter.deathCause
-                                        ? ` — ${encounter.deathCause}`
-                                        : ' (dead)')}
-                                  </span>
-                                  {giftEncounter && (
-                                    <>
-                                      {giftEncounter.pokemon.spriteUrl && (
-                                        <img
-                                          src={giftEncounter.pokemon.spriteUrl}
-                                          alt={giftEncounter.pokemon.name}
-                                          className="w-8 h-8 opacity-60"
-                                        />
-                                      )}
-                                      <span className="text-xs text-text-tertiary capitalize">
-                                        {giftEncounter.nickname ?? giftEncounter.pokemon.name}
-                                        <span className="text-text-muted ml-1">(gift)</span>
-                                      </span>
-                                    </>
-                                  )}
-                                </div>
-                              ) : giftEncounter ? (
-                                <div className="flex items-center gap-2 mt-0.5">
+                        type="button"
+                        onClick={canEdit ? () => handleRouteClick(route) : undefined}
+                        disabled={!canEdit}
+                        className={`w-full flex items-center gap-3 px-4 py-3 rounded-lg text-left transition-colors ${!canEdit ? 'cursor-default' : 'hover:bg-surface-2/50'} ${si.bg}`}
+                      >
+                        <span className={`w-2.5 h-2.5 rounded-full shrink-0 ${si.dot}`} />
+                        <div className="flex-1 min-w-0">
+                          <div className="text-sm font-medium text-text-primary">{route.name}</div>
+                          {encounter ? (
+                            <div className="flex items-center gap-2 mt-0.5">
+                              {encounter.pokemon.spriteUrl && (
+                                <img
+                                  src={encounter.pokemon.spriteUrl}
+                                  alt={encounter.pokemon.name}
+                                  className="w-10 h-10"
+                                />
+                              )}
+                              <span className="text-xs text-text-tertiary capitalize">
+                                {encounter.nickname ?? encounter.pokemon.name}
+                                {encounter.status === 'caught' &&
+                                  encounter.faintLevel !== null &&
+                                  (encounter.deathCause ? ` — ${encounter.deathCause}` : ' (dead)')}
+                              </span>
+                              {giftEncounter && (
+                                <>
                                  {giftEncounter.pokemon.spriteUrl && (
                                    <img
                                      src={giftEncounter.pokemon.spriteUrl}
@@ -1530,250 +1501,194 @@ export function RunEncounters() {
                                    {giftEncounter.nickname ?? giftEncounter.pokemon.name}
                                    <span className="text-text-muted ml-1">(gift)</span>
                                  </span>
-                                </div>
-                              ) : (
-                                route.encounterMethods.length > 0 && (
-                                  <div className="flex flex-wrap gap-1 mt-0.5">
-                                    {route.encounterMethods.map((m) => (
-                                      <EncounterMethodBadge key={m} method={m} size="xs" />
-                                    ))}
-                                  </div>
-                                )
+                                </>
                              )}
                            </div>
-                            <span className="text-xs text-text-muted shrink-0">{si.label}</span>
-                          </button>
-                        )
-                      })()
-                    )
-
-                  return (
-                    <div key={route.id}>
-                      {routeElement}
-                      {/* Boss battle cards after this route */}
-                      {bossesHere.map((boss) => {
-                        const isDefeated = defeatedBossIds.has(boss.id)
-                        const sectionAfter = sectionDividerAfterBoss.get(boss.id)
-                        const bossTypeLabel: Record<string, string> = {
-                          gym_leader: 'Gym Leader',
-                          elite_four: 'Elite Four',
-                          champion: 'Champion',
-                          rival: 'Rival',
-                          evil_team: 'Evil Team',
-                          kahuna: 'Kahuna',
-                          totem: 'Totem',
-                          other: 'Boss',
-                        }
-                        const bossTypeColors: Record<string, string> = {
-                          gym_leader: 'border-yellow-600',
-                          elite_four: 'border-purple-600',
-                          champion: 'border-red-600',
-                          rival: 'border-blue-600',
-                          evil_team: 'border-gray-400',
-                          kahuna: 'border-orange-600',
-                          totem: 'border-teal-600',
-                          other: 'border-gray-500',
-                        }
-
-                        const isBossExpanded = expandedBosses.has(boss.id)
-                        const toggleBoss = () => {
-                          setExpandedBosses((prev) => {
-                            const next = new Set(prev)
-                            if (next.has(boss.id)) next.delete(boss.id)
-                            else next.add(boss.id)
-                            return next
-                          })
-                        }
-
-                        return (
-                          <div key={`boss-${boss.id}`}>
-                            <div
-                              className={`my-2 rounded-lg border-2 ${bossTypeColors[boss.bossType] ?? bossTypeColors['other']} ${
-                                isDefeated ? 'bg-green-900/10' : 'bg-surface-1'
-                              } px-4 py-3`}
-                            >
-                              <div
-                                className="flex items-start justify-between cursor-pointer select-none"
-                                onClick={toggleBoss}
-                              >
-                                <div className="flex items-center gap-3">
-                                  <svg
-                                    className={`w-4 h-4 text-text-tertiary transition-transform ${isBossExpanded ? 'rotate-90' : ''}`}
-                                    fill="none"
-                                    viewBox="0 0 24 24"
-                                    stroke="currentColor"
-                                    strokeWidth={2}
-                                  >
-                                    <path
-                                      strokeLinecap="round"
-                                      strokeLinejoin="round"
-                                      d="M9 5l7 7-7 7"
-                                    />
-                                  </svg>
-                                  {boss.spriteUrl && (
-                                    <img
-                                      src={boss.spriteUrl}
-                                      alt={boss.name}
-                                      className="h-10 w-auto"
-                                    />
-                                  )}
-                                  <div>
-                                    <div className="flex items-center gap-2">
-                                      <span className="text-sm font-semibold text-text-primary">
-                                        {boss.name}
-                                      </span>
-                                      <span className="px-2 py-0.5 text-xs font-medium rounded-full bg-surface-2 text-text-secondary">
-                                        {bossTypeLabel[boss.bossType] ?? boss.bossType}
-                                      </span>
-                                      {boss.specialtyType && (
-                                        <TypeBadge type={boss.specialtyType} />
-                                      )}
-                                    </div>
-                                    <p className="text-xs text-text-tertiary">
-                                      {boss.location} &middot; Level Cap: {boss.levelCap}
-                                    </p>
-                                  </div>
-                                </div>
-                                <div onClick={(e) => e.stopPropagation()}>
-                                  {isDefeated ? (
-                                    <span className="inline-flex items-center gap-1 px-2 py-1 text-xs font-medium rounded-full bg-green-900/40 text-green-300 light:bg-green-100 light:text-green-800">
-                                      Defeated &#10003;
-                                    </span>
-                                  ) : isActive && canEdit ? (
-                                    <button
-                                      onClick={() => setSelectedBoss(boss)}
-                                      className="px-3 py-1 text-xs font-medium rounded-full bg-accent-600 text-white hover:bg-accent-500 transition-colors"
-                                    >
-                                      Battle
-                                    </button>
-                                  ) : null}
-                                </div>
-                              </div>
-                              {/* Boss pokemon team */}
-                              {isBossExpanded && boss.pokemon.length > 0 && (
-                                <BossTeamPreview pokemon={boss.pokemon} starterName={starterName} />
+                          ) : giftEncounter ? (
+                            <div className="flex items-center gap-2 mt-0.5">
+                              {giftEncounter.pokemon.spriteUrl && (
+                                <img
+                                  src={giftEncounter.pokemon.spriteUrl}
+                                  alt={giftEncounter.pokemon.name}
+                                  className="w-8 h-8 opacity-60"
+                                />
                              )}
-                              {/* Player team snapshot */}
-                              {isDefeated &&
-                                (() => {
-                                  const result = bossResultByBattleId.get(boss.id)
-                                  if (!result || result.team.length === 0) return null
-                                  return (
-                                    <div className="mt-3 pt-3 border-t border-border-default">
-                                      <p className="text-xs font-medium text-text-secondary mb-2">
-                                        Your Team
-                                      </p>
-                                      <div className="flex gap-2 flex-wrap">
-                                        {result.team.map((tm: BossResultTeamMember) => {
-                                          const enc = encounterById.get(tm.encounterId)
-                                          if (!enc) return null
-                                          const dp = enc.currentPokemon ?? enc.pokemon
-                                          return (
-                                            <div key={tm.id} className="flex flex-col items-center">
-                                              {dp.spriteUrl ? (
-                                                <img
-                                                  src={dp.spriteUrl}
-                                                  alt={dp.name}
-                                                  className="w-10 h-10"
-                                                />
-                                              ) : (
-                                                <div className="w-10 h-10 bg-surface-3 rounded-full" />
-                                              )}
-                                              <span className="text-[10px] text-text-tertiary capitalize">
-                                                {enc.nickname ?? dp.name}
-                                              </span>
-                                              {tm.level != null && (
-                                                <span className="text-[10px] text-text-muted">
-                                                  Lv.{tm.level}
-                                                </span>
-                                              )}
-                                            </div>
-                                          )
-                                        })}
-                                      </div>
-                                    </div>
-                                  )
-                                })()}
+                              <span className="text-xs text-text-tertiary capitalize">
+                                {giftEncounter.nickname ?? giftEncounter.pokemon.name}
+                                <span className="text-text-muted ml-1">(gift)</span>
+                              </span>
                            </div>
-                            {sectionAfter && (
-                              <div className="flex items-center gap-3 my-4">
-                                <div className="flex-1 h-px bg-surface-3" />
-                                <span className="text-sm font-semibold text-text-tertiary uppercase tracking-wider">
-                                  {sectionAfter}
-                                </span>
-                                <div className="flex-1 h-px bg-surface-3" />
+                          ) : (
+                            route.encounterMethods.length > 0 && (
+                              <div className="flex flex-wrap gap-1 mt-0.5">
+                                {route.encounterMethods.map((m) => (
+                                  <EncounterMethodBadge key={m} method={m} size="xs" />
+                                ))}
                              </div>
-                            )}
-                          </div>
-                        )
-                      })}
-                    </div>
-                  )
-                })}
-              </div>
-            </div>
-
-            {/* Team Sidebar - Desktop only */}
-            {(alive.length > 0 || dead.length > 0) && (
-              <div className="hidden lg:block w-64 shrink-0">
-                <div className="sticky top-20 max-h-[calc(100vh-6rem)] overflow-y-auto">
-                  <div className="bg-surface-1 border border-border-default rounded-lg p-4">
-                    <div className="flex items-center justify-between mb-3">
-                      <h2 className="text-lg font-semibold text-text-primary">
-                        {isActive ? 'Team' : 'Final Team'}
-                      </h2>
-                      <span className="text-xs text-text-muted">
-                        {alive.length}/{alive.length + dead.length}
-                      </span>
-                    </div>
-                    {alive.length > 1 && (
-                      <select
-                        value={teamSort}
-                        onChange={(e) => setTeamSort(e.target.value as TeamSortKey)}
-                        className="w-full text-sm border border-border-default rounded-lg px-3 py-1.5 bg-surface-0 text-text-primary mb-3"
-                      >
-                        <option value="route">Route Order</option>
-                        <option value="level">Catch Level</option>
-                        <option value="species">Species Name</option>
-                        <option value="dex">National Dex</option>
-                      </select>
-                    )}
-                    {alive.length > 0 && (
-                      <div className="grid grid-cols-2 gap-2 mb-3">
-                        {alive.map((enc) => (
-                          <PokemonCard
-                            key={enc.id}
-                            encounter={enc}
-                            onClick={
-                              isActive && canEdit ? () => setSelectedTeamEncounter(enc) : undefined
-                            }
-                          />
-                        ))}
-                      </div>
-                    )}
-                    {dead.length > 0 && (
-                      <>
-                        <h3 className="text-sm font-medium text-text-tertiary mb-2">Graveyard</h3>
-                        <div className="grid grid-cols-2 gap-2">
-                          {dead.map((enc) => (
-                            <PokemonCard
-                              key={enc.id}
-                              encounter={enc}
-                              showFaintLevel
-                              onClick={
-                                isActive && canEdit
-                                  ? () => setSelectedTeamEncounter(enc)
-                                  : undefined
-                              }
-                            />
-                          ))}
+                            )
+                          )}
                        </div>
-                      </>
-                    )}
-                  </div>
+                        <span className="text-xs text-text-muted shrink-0">{si.label}</span>
+                      </button>
+                    )
+                  })()
+                )
+
+              return (
+                <div key={route.id}>
+                  {routeElement}
+                  {/* Boss battle cards after this route */}
+                  {bossesHere.map((boss) => {
+                    const isDefeated = defeatedBossIds.has(boss.id)
+                    const sectionAfter = sectionDividerAfterBoss.get(boss.id)
+                    const bossTypeLabel: Record<string, string> = {
+                      gym_leader: 'Gym Leader',
+                      elite_four: 'Elite Four',
+                      champion: 'Champion',
+                      rival: 'Rival',
+                      evil_team: 'Evil Team',
+                      kahuna: 'Kahuna',
+                      totem: 'Totem',
+                      other: 'Boss',
+                    }
+                    const bossTypeColors: Record<string, string> = {
+                      gym_leader: 'border-yellow-600',
+                      elite_four: 'border-purple-600',
+                      champion: 'border-red-600',
+                      rival: 'border-blue-600',
+                      evil_team: 'border-gray-400',
+                      kahuna: 'border-orange-600',
+                      totem: 'border-teal-600',
+                      other: 'border-gray-500',
+                    }
+
+                    const isBossExpanded = expandedBosses.has(boss.id)
+                    const toggleBoss = () => {
+                      setExpandedBosses((prev) => {
+                        const next = new Set(prev)
+                        if (next.has(boss.id)) next.delete(boss.id)
+                        else next.add(boss.id)
+                        return next
+                      })
+                    }
+
+                    return (
+                      <div key={`boss-${boss.id}`}>
+                        <div
+                          className={`my-2 rounded-lg border-2 ${bossTypeColors[boss.bossType] ?? bossTypeColors['other']} ${
+                            isDefeated ? 'bg-green-900/10' : 'bg-surface-1'
+                          } px-4 py-3`}
+                        >
+                          <div
+                            className="flex items-start justify-between cursor-pointer select-none"
+                            onClick={toggleBoss}
+                          >
+                            <div className="flex items-center gap-3">
+                              <svg
+                                className={`w-4 h-4 text-text-tertiary transition-transform ${isBossExpanded ? 'rotate-90' : ''}`}
+                                fill="none"
+                                viewBox="0 0 24 24"
+                                stroke="currentColor"
+                                strokeWidth={2}
+                              >
+                                <path
+                                  strokeLinecap="round"
+                                  strokeLinejoin="round"
+                                  d="M9 5l7 7-7 7"
+                                />
+                              </svg>
+                              {boss.spriteUrl && (
+                                <img src={boss.spriteUrl} alt={boss.name} className="h-10 w-auto" />
+                              )}
+                              <div>
+                                <div className="flex items-center gap-2">
+                                  <span className="text-sm font-semibold text-text-primary">
+                                    {boss.name}
+                                  </span>
+                                  <span className="px-2 py-0.5 text-xs font-medium rounded-full bg-surface-2 text-text-secondary">
+                                    {bossTypeLabel[boss.bossType] ?? boss.bossType}
+                                  </span>
+                                  {boss.specialtyType && <TypeBadge type={boss.specialtyType} />}
+                                </div>
+                                <p className="text-xs text-text-tertiary">
+                                  {boss.location} &middot; Level Cap: {boss.levelCap}
+                                </p>
+                              </div>
+                            </div>
+                            <div onClick={(e) => e.stopPropagation()}>
+                              {isDefeated ? (
+                                <span className="inline-flex items-center gap-1 px-2 py-1 text-xs font-medium rounded-full bg-green-900/40 text-green-300 light:bg-green-100 light:text-green-800">
+                                  Defeated &#10003;
+                                </span>
+                              ) : isActive && canEdit ? (
+                                <button
+                                  onClick={() => setSelectedBoss(boss)}
+                                  className="px-3 py-1 text-xs font-medium rounded-full bg-accent-600 text-white hover:bg-accent-500 transition-colors"
+                                >
+                                  Battle
+                                </button>
+                              ) : null}
+                            </div>
+                          </div>
+                          {/* Boss pokemon team */}
+                          {isBossExpanded && boss.pokemon.length > 0 && (
+                            <BossTeamPreview pokemon={boss.pokemon} starterName={starterName} />
+                          )}
+                          {/* Player team snapshot */}
+                          {isDefeated &&
+                            (() => {
+                              const result = bossResultByBattleId.get(boss.id)
+                              if (!result || result.team.length === 0) return null
+                              return (
+                                <div className="mt-3 pt-3 border-t border-border-default">
+                                  <p className="text-xs font-medium text-text-secondary mb-2">
+                                    Your Team
+                                  </p>
+                                  <div className="flex gap-2 flex-wrap">
+                                    {result.team.map((tm: BossResultTeamMember) => {
+                                      const enc = encounterById.get(tm.encounterId)
+                                      if (!enc) return null
+                                      const dp = enc.currentPokemon ?? enc.pokemon
+                                      return (
+                                        <div key={tm.id} className="flex flex-col items-center">
+                                          {dp.spriteUrl ? (
+                                            <img
+                                              src={dp.spriteUrl}
+                                              alt={dp.name}
+                                              className="w-10 h-10"
+                                            />
+                                          ) : (
+                                            <div className="w-10 h-10 bg-surface-3 rounded-full" />
+                                          )}
+                                          <span className="text-[10px] text-text-tertiary capitalize">
+                                            {enc.nickname ?? dp.name}
+                                          </span>
+                                          <span className="text-[10px] text-text-muted">
+                                            Lv.{tm.level}
+                                          </span>
+                                        </div>
+                                      )
+                                    })}
+                                  </div>
+                                </div>
+                              )
+                            })()}
+                        </div>
+                        {sectionAfter && (
+                          <div className="flex items-center gap-3 my-4">
+                            <div className="flex-1 h-px bg-surface-3" />
+                            <span className="text-sm font-semibold text-text-tertiary uppercase tracking-wider">
+                              {sectionAfter}
+                            </span>
+                            <div className="flex-1 h-px bg-surface-3" />
+                          </div>
+                        )}
+                      </div>
+                    )
+                  })}
                </div>
-              </div>
-            )}
+              )
+            })}
          </div>

          {/* Encounter Modal */}
--- a/frontend/src/types/game.ts
+++ b/frontend/src/types/game.ts
@@ -238,7 +238,7 @@ export interface BossBattle {
 export interface BossResultTeamMember {
  id: number
  encounterId: number
-  level: number | null
+  level: number
 }

 export interface BossResult {
@@ -253,7 +253,7 @@ export interface BossResult {

 export interface BossResultTeamMemberInput {
  encounterId: number
-  level?: number | null
+  level: number
 }

 export interface CreateBossResultInput {