chore(release): 4.1.0 [skip ci]

## [4.1.0](https://github.com/antialias/soroban-abacus-flashcards/compare/v4.0.3...v4.1.0) (2025-10-16)

### Features

* **arcade:** migrate memory-quiz to modular game system ([f48c37a](f48c37accc))

### Code Refactoring

* **arcade:** remove memory-quiz from legacy GAMES_CONFIG ([9952e11](9952e11c27))

### Documentation

* add matching pairs battle migration plan ([3948582](39485826fc))
* add memory-quiz migration plan documentation ([7e2df10](7e2df106e6))
* **arcade:** document Phase 3 completion in ARCHITECTURAL_IMPROVEMENTS.md ([704f34f](704f34f83e))
* update playbook with memory-quiz completion ([99eee69](99eee69f28))

CHANGELOG.md

@@ -1,3 +1,96 @@
+## [4.1.0](https://github.com/antialias/soroban-abacus-flashcards/compare/v4.0.3...v4.1.0) (2025-10-16)
+
+
+### Features
+
+* **arcade:** migrate memory-quiz to modular game system ([f48c37a](https://github.com/antialias/soroban-abacus-flashcards/commit/f48c37accccb88e790c7a1b438fd0566e7120e11))
+
+
+### Code Refactoring
+
+* **arcade:** remove memory-quiz from legacy GAMES_CONFIG ([9952e11](https://github.com/antialias/soroban-abacus-flashcards/commit/9952e11c27f6cacb8eef1c5494b8cfea29dac907))
+
+
+### Documentation
+
+* add matching pairs battle migration plan ([3948582](https://github.com/antialias/soroban-abacus-flashcards/commit/39485826fc6c87f54c07795211909da0278a2ad0))
+* add memory-quiz migration plan documentation ([7e2df10](https://github.com/antialias/soroban-abacus-flashcards/commit/7e2df106e68a1a0be414852a3e603b89029635b7))
+* **arcade:** document Phase 3 completion in ARCHITECTURAL_IMPROVEMENTS.md ([704f34f](https://github.com/antialias/soroban-abacus-flashcards/commit/704f34f83e76332cb3610bda75289cbd0036e7eb))
+* update playbook with memory-quiz completion ([99eee69](https://github.com/antialias/soroban-abacus-flashcards/commit/99eee69f28d17d0f9a3c806a1b84d90ee1fad683))
+
+## [4.0.3](https://github.com/antialias/soroban-abacus-flashcards/compare/v4.0.2...v4.0.3) (2025-10-16)
+
+
+### Bug Fixes
+
+* **math-sprint:** remove unused import and autoFocus attribute ([51593eb](https://github.com/antialias/soroban-abacus-flashcards/commit/51593eb44f93e369d6a773ee80e5f5cf50f3be67))
+
+
+### Code Refactoring
+
+* **arcade:** implement Phase 3 - infer config types from game definitions ([eed468c](https://github.com/antialias/soroban-abacus-flashcards/commit/eed468c6c4057e3c09a1e8df88551a9336c490c5))
+
+
+### Documentation
+
+* **arcade:** update README with Phase 3 type inference architecture ([b47b1cc](https://github.com/antialias/soroban-abacus-flashcards/commit/b47b1cc03f4b5fcfe8340653ca8a5dd903833481))
+
+
+### Styles
+
+* **math-sprint:** apply Biome formatting ([d7d8d8b](https://github.com/antialias/soroban-abacus-flashcards/commit/d7d8d8b1e32f9c9bb73d076f5d611210f809eca8))
+
+## [4.0.2](https://github.com/antialias/soroban-abacus-flashcards/compare/v4.0.1...v4.0.2) (2025-10-16)
+
+
+### Bug Fixes
+
+* **arcade:** prevent server-side loading of React components ([784793b](https://github.com/antialias/soroban-abacus-flashcards/commit/784793ba244731edf45391da44588a978b137abe))
+
+## [4.0.1](https://github.com/antialias/soroban-abacus-flashcards/compare/v4.0.0...v4.0.1) (2025-10-16)
+
+
+### Code Refactoring
+
+* **arcade:** move config validation to game definitions ([b19437b](https://github.com/antialias/soroban-abacus-flashcards/commit/b19437b7dc418f194fb60e12f1c17034024eca2a)), closes [#3](https://github.com/antialias/soroban-abacus-flashcards/issues/3)
+
+## [4.0.0](https://github.com/antialias/soroban-abacus-flashcards/compare/v3.24.0...v4.0.0) (2025-10-16)
+
+
+### ⚠ BREAKING CHANGES
+
+* **db:** Database schemas now accept any string for game names
+
+### Code Refactoring
+
+* **db:** remove database schema coupling for game names ([e135d92](https://github.com/antialias/soroban-abacus-flashcards/commit/e135d92abb4d27f646c1fbeff6524a729d107426)), closes [#1](https://github.com/antialias/soroban-abacus-flashcards/issues/1)
+
+## [3.24.0](https://github.com/antialias/soroban-abacus-flashcards/compare/v3.23.0...v3.24.0) (2025-10-16)
+
+
+### Features
+
+* **math-sprint:** add game manifest ([1eefcc8](https://github.com/antialias/soroban-abacus-flashcards/commit/1eefcc89a58b79f928932a7425d6b88fb45a5526))
+
+## [3.23.0](https://github.com/antialias/soroban-abacus-flashcards/compare/v3.22.3...v3.23.0) (2025-10-16)
+
+
+### Features
+
+* **arcade:** add Math Sprint game implementation ([e5be09e](https://github.com/antialias/soroban-abacus-flashcards/commit/e5be09ef5f170c7544557f75b9eca17bb2069246))
+* **arcade:** register Math Sprint in game system ([0c05a7c](https://github.com/antialias/soroban-abacus-flashcards/commit/0c05a7c6bbc8d6f6e1f92e15e691d7e1aba0d8f7)), closes [#2](https://github.com/antialias/soroban-abacus-flashcards/issues/2) [#3](https://github.com/antialias/soroban-abacus-flashcards/issues/3)
+
+
+### Bug Fixes
+
+* **api:** add 'math-sprint' to settings endpoint validation ([d790e5e](https://github.com/antialias/soroban-abacus-flashcards/commit/d790e5e278f81686077dbe3ef4adca49574ae434)), closes [#1](https://github.com/antialias/soroban-abacus-flashcards/issues/1)
+* **db:** add 'math-sprint' to database schema enums ([7b112a9](https://github.com/antialias/soroban-abacus-flashcards/commit/7b112a98babe782d4c254ef18a0295e7cbf8fefa)), closes [#1](https://github.com/antialias/soroban-abacus-flashcards/issues/1)
+
+
+### Documentation
+
+* add architecture quality audit [#2](https://github.com/antialias/soroban-abacus-flashcards/issues/2) ([5b91b71](https://github.com/antialias/soroban-abacus-flashcards/commit/5b91b710782dc450405583bc196e5156a296d0df))
+
 ## [3.22.3](https://github.com/antialias/soroban-abacus-flashcards/compare/v3.22.2...v3.22.3) (2025-10-16)
 
 

apps/web/.claude/settings.local.json

@@ -75,7 +75,11 @@
       "Bash(timeout 30 npm run dev)",
       "Bash(pkill:*)",
       "Bash(for i in {1..30})",
-      "Bash(do gh run list --limit 1 --json conclusion,status,name,databaseId --jq '.[0] | \"\"\\(.status) - \\(.conclusion // \"\"running\"\") - Run ID: \\(.databaseId)\"\"')"
+      "Bash(do gh run list --limit 1 --json conclusion,status,name,databaseId --jq '.[0] | \"\"\\(.status) - \\(.conclusion // \"\"running\"\") - Run ID: \\(.databaseId)\"\"')",
+      "Bash(tsc:*)",
+      "Bash(tsc-alias:*)",
+      "Bash(npx tsc-alias:*)",
+      "Bash(timeout 20 pnpm run:*)"
     ],
     "deny": [],
     "ask": []

apps/web/docs/ARCHITECTURAL_IMPROVEMENTS.md

@@ -0,0 +1,302 @@
+# Architectural Improvements - Summary
+
+**Date**: 2025-10-16
+**Status**: ✅ **Implemented**
+**Based on**: AUDIT_2_ARCHITECTURE_QUALITY.md
+
+---
+
+## Executive Summary
+
+Successfully implemented **all 3 critical architectural improvements** identified in the audit. The modular game system is now **truly modular** - new games can be added without touching database schemas, API endpoints, helper switch statements, or manual type definitions.
+
+**Phase 1**: Eliminated database schema coupling
+**Phase 2**: Moved config validation to game definitions
+**Phase 3**: Implemented type inference from game definitions
+
+**Grade**: **A** (Up from B- after improvements)
+
+---
+
+## What Was Fixed
+
+### 1. ✅ Database Schema Coupling (CRITICAL)
+
+**Problem**: Schemas used hardcoded enums, requiring migration for each new game.
+
+**Solution**: Accept any string, validate at runtime against validator registry.
+
+**Changes**:
+- `arcade-rooms.ts`: `gameName: text('game_name')` (removed enum)
+- `arcade-sessions.ts`: `currentGame: text('current_game').notNull()` (removed enum)
+- `room-game-configs.ts`: `gameName: text('game_name').notNull()` (removed enum)
+- Added `isValidGameName()` and `assertValidGameName()` runtime validators
+- Updated settings API to use `isValidGameName()` instead of hardcoded array
+
+**Impact**:
+```diff
+- BEFORE: Update 3 database schemas + run migration for each game
++ AFTER: No database changes needed - just register validator
+```
+
+**Files Modified**: 4 files
+**Commit**: `e135d92a - refactor(db): remove database schema coupling for game names`
+
+---
+
+### 2. ✅ Config Validation in Game Definitions
+
+**Problem**: 50+ line switch statement in `game-config-helpers.ts` had to be updated for each game.
+
+**Solution**: Move validation to game definitions - games own their validation logic.
+
+**Changes**:
+- Added `validateConfig?: (config: unknown) => config is TConfig` to `GameDefinition`
+- Updated `defineGame()` to accept and return `validateConfig`
+- Added validation to Number Guesser and Math Sprint
+- Updated `validateGameConfig()` to call `game.validateConfig()` from registry
+
+**Impact**:
+```diff
+- BEFORE: Add case to 50-line switch statement in helper file
++ AFTER: Add validateConfig function to game definition
+```
+
+**Example**:
+```typescript
+// In game index.ts
+function validateMathSprintConfig(config: unknown): config is MathSprintConfig {
+  return (
+    typeof config === 'object' &&
+    config !== null &&
+    ['easy', 'medium', 'hard'].includes(config.difficulty) &&
+    typeof config.questionsPerRound === 'number' &&
+    config.questionsPerRound >= 5 &&
+    config.questionsPerRound <= 20
+  )
+}
+
+export const mathSprintGame = defineGame({
+  // ... other fields
+  validateConfig: validateMathSprintConfig,
+})
+```
+
+**Files Modified**: 5 files
+**Commit**: `b19437b7 - refactor(arcade): move config validation to game definitions`
+
+---
+
+## Before vs After Comparison
+
+### Adding a New Game
+
+| Task | Before | After (Phase 1-3) |
+|------|--------|----------|
+| **Database Schemas** | Update 3 enum types | ✅ No changes needed |
+| **Settings API** | Add to validGames array | ✅ No changes needed (runtime validation) |
+| **Config Helpers** | Add switch case + validation (25 lines) | ✅ No changes needed |
+| **Game Config Types** | Manually define interface (10-15 lines) | ✅ One-line type inference |
+| **GameConfigByName** | Add entry manually | ✅ Add entry (auto-typed) |
+| **RoomGameConfig** | Add optional property | ✅ Auto-derived from GameConfigByName |
+| **Default Config** | Add to DEFAULT_X_CONFIG constant | ✔️ Still needed (3-5 lines) |
+| **Validator Registry** | Register in validators.ts | ✔️ Still needed (1 line) |
+| **Game Registry** | Register in game-registry.ts | ✔️ Still needed (1 line) |
+| **validateConfig Function** | N/A | ✔️ Add to game definition (10-15 lines) |
+
+**Total Files to Update**: 12 → **3** (75% reduction)
+**Total Lines of Boilerplate**: ~60 lines → ~20 lines (67% reduction)
+
+### What's Left
+
+Three items still require manual updates:
+1. **Default Config Constants** (`game-configs.ts`) - 3-5 lines per game
+2. **Validator Registry** (`validators.ts`) - 1 line per game
+3. **Game Registry** (`game-registry.ts`) - 1 line per game
+4. **validateConfig Function** (in game definition) - 10-15 lines per game (but co-located with game!)
+
+---
+
+## Migration Impact
+
+### Existing Data
+- ✅ **No data migration needed** - strings remain strings
+- ✅ **Backward compatible** - existing games work unchanged
+
+### TypeScript Changes
+- ⚠️ Database columns now accept `string` instead of specific enum
+- ✅ Runtime validation prevents invalid data
+- ✅ Type safety maintained through validator registry
+
+### Developer Experience
+```diff
+- BEFORE: 15-20 minutes of boilerplate per game
++ AFTER: 2-3 minutes to add validation function
+```
+
+---
+
+## Architectural Wins
+
+### 1. Single Source of Truth
+- ✅ Validator registry is the authoritative list of games
+- ✅ All validation checks against registry at runtime
+- ✅ No duplication across database/API/helpers
+
+### 2. Self-Contained Games
+- ✅ Games define their own validation logic
+- ✅ No scattered switch statements
+- ✅ Easy to understand - everything in one place
+
+### 3. True Modularity
+- ✅ Database schemas accept any registered game
+- ✅ API endpoints dynamically validate
+- ✅ Helper functions delegate to games
+
+### 4. Developer Friction Reduced
+- ✅ No database schema changes
+- ✅ No API endpoint updates
+- ✅ No helper switch statements
+- ✅ Clear error messages (runtime validation)
+
+---
+
+### 3. ✅ Config Type Inference (Phase 3)
+
+**Problem**: Config types manually defined in `game-configs.ts`, requiring 10-15 lines per game.
+
+**Solution**: Use TypeScript utility types to infer from game definitions.
+
+**Changes**:
+- Added `InferGameConfig<T>` utility type that extracts config from game definitions
+- `NumberGuesserGameConfig` now inferred: `InferGameConfig<typeof numberGuesserGame>`
+- `MathSprintGameConfig` now inferred: `InferGameConfig<typeof mathSprintGame>`
+- `RoomGameConfig` auto-derived from `GameConfigByName` using mapped types
+- Changed `RoomGameConfig` from interface to type for auto-derivation
+
+**Impact**:
+```diff
+- BEFORE: Manually define interface with 10-15 lines per game
++ AFTER: One-line type inference from game definition
+```
+
+**Example**:
+```typescript
+// Type-only import (won't load React components)
+import type { mathSprintGame } from '@/arcade-games/math-sprint'
+
+// Utility type
+type InferGameConfig<T> = T extends { defaultConfig: infer Config } ? Config : never
+
+// Inferred type (was 6 lines, now 1 line!)
+export type MathSprintGameConfig = InferGameConfig<typeof mathSprintGame>
+
+// Auto-derived RoomGameConfig (was 5 manual entries, now automatic!)
+export type RoomGameConfig = {
+  [K in keyof GameConfigByName]?: GameConfigByName[K]
+}
+```
+
+**Files Modified**: 2 files
+**Commits**:
+- `271b8ec3 - refactor(arcade): implement Phase 3 - infer config types from game definitions`
+- `4c15c13f - docs(arcade): update README with Phase 3 type inference architecture`
+
+**Note**: Default config constants (e.g., `DEFAULT_MATH_SPRINT_CONFIG`) still manually defined. This small duplication is necessary for server-side code that can't import full game definitions with React components.
+
+---
+
+## Future Work (Optional)
+
+### Phase 4: Extract Config-Only Exports
+**Optional improvement**: Create separate `config.ts` files in each game directory that export just config and validation (no React dependencies). This would allow importing default configs directly without duplication.
+
+---
+
+## Testing
+
+### Manual Testing
+- ✅ Math Sprint works end-to-end
+- ✅ Number Guesser works end-to-end
+- ✅ Room settings API accepts math-sprint
+- ✅ Config validation rejects invalid configs
+- ✅ TypeScript compilation succeeds
+
+### Test Coverage Needed
+- [ ] Unit tests for `isValidGameName()`
+- [ ] Unit tests for game `validateConfig()` functions
+- [ ] Integration test: Add new game without touching infrastructure
+- [ ] E2E test: Verify runtime validation works
+
+---
+
+## Lessons Learned
+
+### What Worked Well
+1. **Incremental Approach** - Fixed one issue at a time
+2. **Backward Compatibility** - Legacy games still work
+3. **Runtime Validation** - Flexible and extensible
+4. **Clear Commit Messages** - Easy to track changes
+
+### Challenges
+1. **TypeScript Enums → Runtime Checks** - Required migration strategy
+2. **Fallback for Legacy Games** - Switch statement still exists for old games
+3. **Type Inference** - Config types still manually defined
+
+### Best Practices Established
+1. **Games own validation** - Self-contained, testable
+2. **Registry as source of truth** - No duplicate lists
+3. **Runtime validation** - Catch errors early with good messages
+4. **Fail-fast** - Use assertions where appropriate
+
+---
+
+## Conclusion
+
+The modular game system is now **significantly improved across all three phases**:
+
+**Before (Phases 1-3)**:
+- Must update 12 files to add a game (~60 lines of boilerplate)
+- Database migration required for each new game
+- Easy to forget a step (manual type definitions, switch statements)
+- Scattered validation logic across multiple files
+
+**After (All Phases Complete)**:
+- Update 3 files to add a game (75% reduction)
+- ~20 lines of boilerplate (67% reduction)
+- No database migration needed
+- Validation is self-contained in game definitions
+- Config types auto-inferred from game definitions
+- Clear runtime error messages
+
+**Key Achievements**:
+1. ✅ **Phase 1**: Runtime validation replaces database enums
+2. ✅ **Phase 2**: Games own their validation logic
+3. ✅ **Phase 3**: TypeScript types inferred from game definitions
+
+**Remaining Work**:
+- Optional Phase 4: Extract config-only exports to eliminate DEFAULT_*_CONFIG duplication
+- Add comprehensive test suite for validation and type inference
+- Migrate legacy games (matching, memory-quiz) to new system
+
+The architecture is now **production-ready** and can scale to dozens of games without becoming unmaintainable. Each game is truly self-contained, with all its logic, validation, and types defined in one place.
+
+---
+
+## Quick Reference: Adding a New Game
+
+1. Create game directory with required files (types, Validator, Provider, components, index)
+2. Add validation function (`validateConfig`) in index.ts and pass to `defineGame()`
+3. Register validator in `validators.ts` (1 line)
+4. Register game in `game-registry.ts` (1 line)
+5. Add type inference to `game-configs.ts`:
+   ```typescript
+   import type { myGame } from '@/arcade-games/my-game'
+   export type MyGameConfig = InferGameConfig<typeof myGame>
+   ```
+6. Add to `GameConfigByName` (1 line - type is auto-inferred!)
+7. Add defaults to `game-configs.ts` (3-5 lines)
+
+**That's it!** No database schemas, API endpoints, helper switch statements, or manual interface definitions.
+
+**Total**: 3 files to update, ~20 lines of boilerplate

apps/web/docs/AUDIT_2_ARCHITECTURE_QUALITY.md

@@ -0,0 +1,451 @@
+# Architecture Quality Audit #2
+
+**Date**: 2025-10-16
+**Context**: After implementing Number Guesser (turn-based) and starting Math Sprint (free-for-all)
+**Goal**: Assess if the system is truly modular or if there's too much boilerplate
+
+---
+
+## Executive Summary
+
+**Status**: ⚠️ **Good Foundation, But Boilerplate Issues**
+
+The unified validator registry successfully solved the dual registration problem. However, implementing a second game revealed **significant boilerplate** and **database schema coupling** that violate the modular architecture goals.
+
+**Grade**: **B-** (Down from B+ after implementation testing)
+
+---
+
+## Issues Found
+
+### 🚨 Issue #1: Database Schema Coupling (CRITICAL)
+
+**Problem**: The `room_game_configs` table schema hard-codes game names, preventing true modularity.
+
+**Evidence**:
+```typescript
+// db/schema/room-game-configs.ts
+gameName: text('game_name').$type<'matching' | 'memory-quiz' | 'number-guesser' | 'complement-race'>()
+```
+
+When adding 'math-sprint':
+```
+Type '"math-sprint"' is not assignable to type '"matching" | "memory-quiz" | "number-guesser" | "complement-race"'
+```
+
+**Impact**:
+- ❌ Must manually update database schema for every new game
+- ❌ TypeScript errors force schema migration
+- ❌ Breaks "just register and go" promise
+- ❌ Requires database migration for each game
+
+**Root Cause**: The schema uses a union type instead of a string with runtime validation.
+
+**Fix Required**: Change schema to accept any string, validate against registry at runtime.
+
+---
+
+### ⚠️ Issue #2: game-config-helpers.ts Boilerplate
+
+**Problem**: Three switch statements must be updated for every new game:
+
+1. `getDefaultGameConfig()` - add case
+2. Import default config constant
+3. `validateGameConfig()` - add validation logic
+
+**Example** (from Math Sprint):
+```typescript
+// Must add to imports
+import { DEFAULT_MATH_SPRINT_CONFIG } from './game-configs'
+
+// Must add case to switch #1
+case 'math-sprint':
+  return DEFAULT_MATH_SPRINT_CONFIG
+
+// Must add case to switch #2
+case 'math-sprint':
+  return (
+    typeof config === 'object' &&
+    config !== null &&
+    ['easy', 'medium', 'hard'].includes(config.difficulty) &&
+    // ... 10+ lines of validation
+  )
+```
+
+**Impact**:
+- ⏱️ 5-10 minutes of boilerplate per game
+- 🐛 Easy to forget a switch case
+- 📝 Repetitive validation logic
+
+**Better Approach**: Config defaults and validation should be part of the game definition.
+
+---
+
+### ⚠️ Issue #3: game-configs.ts Boilerplate
+
+**Problem**: Must update 4 places in game-configs.ts:
+
+1. Import types from game
+2. Define `XGameConfig` interface
+3. Add to `GameConfigByName` union
+4. Add to `RoomGameConfig` interface
+5. Create `DEFAULT_X_CONFIG` constant
+
+**Example** (from Math Sprint):
+```typescript
+// 1. Import
+import type { Difficulty as MathSprintDifficulty } from '@/arcade-games/math-sprint/types'
+
+// 2. Interface
+export interface MathSprintGameConfig {
+  difficulty: MathSprintDifficulty
+  questionsPerRound: number
+  timePerQuestion: number
+}
+
+// 3. Add to union
+export type GameConfigByName = {
+  'math-sprint': MathSprintGameConfig
+  // ...
+}
+
+// 4. Add to RoomGameConfig
+export interface RoomGameConfig {
+  'math-sprint'?: MathSprintGameConfig
+  // ...
+}
+
+// 5. Default constant
+export const DEFAULT_MATH_SPRINT_CONFIG: MathSprintGameConfig = {
+  difficulty: 'medium',
+  questionsPerRound: 10,
+  timePerQuestion: 30,
+}
+```
+
+**Impact**:
+- ⏱️ 10-15 lines of boilerplate per game
+- 🐛 Easy to forget one of the 5 updates
+- 🔄 Repeating type information (already in game definition)
+
+**Better Approach**: Game config types should be inferred from game definitions.
+
+---
+
+### 📊 Issue #4: High Boilerplate Ratio
+
+**Files Required Per Game**:
+
+| Category | Files | Purpose |
+|----------|-------|---------|
+| **Game Code** | 7 files | types.ts, Validator.ts, Provider.tsx, index.ts, 3x components |
+| **Registration** | 2 files | validators.ts, game-registry.ts |
+| **Config** | 2 files | game-configs.ts, game-config-helpers.ts |
+| **Database** | 1 file | schema migration |
+| **Total** | **12 files** | For one game! |
+
+**Lines of Boilerplate** (non-game-logic):
+- game-configs.ts: ~15 lines
+- game-config-helpers.ts: ~25 lines
+- validators.ts: ~2 lines
+- game-registry.ts: ~2 lines
+- **Total: ~44 lines of pure boilerplate per game**
+
+**Comparison**:
+- Number Guesser: ~500 lines of actual game logic
+- Boilerplate: ~44 lines (8.8% overhead) ✅ Acceptable
+- But spread across 4 different files ⚠️ Developer friction
+
+---
+
+## Positive Aspects
+
+### ✅ What Works Well
+
+1. **SDK Abstraction**
+   - `useArcadeSession` is clean and reusable
+   - `buildPlayerMetadata` helper reduces duplication
+   - Hook-based API is intuitive
+
+2. **Provider Pattern**
+   - Consistent across games
+   - Clear separation of concerns
+   - Easy to understand
+
+3. **Component Structure**
+   - SetupPhase, PlayingPhase, ResultsPhase pattern is clear
+   - GameComponent wrapper is simple
+   - PageWithNav integration is seamless
+
+4. **Unified Validator Registry**
+   - Single source of truth for validators ✅
+   - Auto-derived GameName type ✅
+   - Type-safe validator access ✅
+
+5. **Error Feedback**
+   - lastError/clearError pattern works well
+   - Auto-dismiss UX is good
+   - Consistent error handling
+
+---
+
+## Comparison: Number Guesser vs. Math Sprint
+
+### Similarities (Good!)
+- ✅ Same file structure
+- ✅ Same SDK usage patterns
+- ✅ Same Provider pattern
+- ✅ Same component phases
+
+### Differences (Revealing!)
+- Math Sprint uses TEAM_MOVE (no turn owner)
+- Math Sprint has server-generated questions
+- Database schema didn't support Math Sprint name
+
+**Key Insight**: The SDK handles different game types well (turn-based vs. free-for-all), but infrastructure (database, config system) is rigid.
+
+---
+
+## Developer Experience Score
+
+### Time to Add a Game
+
+| Task | Time | Notes |
+|------|------|-------|
+| Write game logic | 2-4 hours | Validator, state management, components |
+| Registration boilerplate | 15-20 min | 4 files to update |
+| Database migration | 10-15 min | Schema update, migration file |
+| Debugging type errors | 10-30 min | Database schema mismatches |
+| **Total** | **3-5 hours** | For a simple game |
+
+### Pain Points
+
+1. **Database Schema** ⚠️ Critical blocker
+   - Must update schema for each game
+   - Requires migration
+   - TypeScript errors are confusing
+
+2. **Config System** ⚠️ Medium friction
+   - 5 places to update in game-configs.ts
+   - Easy to miss one
+   - Repetitive type definitions
+
+3. **Helper Functions** ⚠️ Low friction
+   - Switch statements in game-config-helpers.ts
+   - Not hard, just tedious
+
+### What Developers Like
+
+1. ✅ SDK is intuitive
+2. ✅ Pattern is consistent
+3. ✅ Error messages are clear (once you know where to look)
+4. ✅ Documentation is comprehensive
+
+---
+
+## Architectural Recommendations
+
+### Critical (Before Adding More Games)
+
+**1. Fix Database Schema Coupling**
+
+**Current**:
+```typescript
+gameName: text('game_name').$type<'matching' | 'memory-quiz' | 'number-guesser' | 'complement-race'>()
+```
+
+**Recommended**:
+```typescript
+// Accept any string, validate at runtime
+gameName: text('game_name').$type<string>().notNull()
+
+// Runtime validation in helper functions
+export function validateGameName(gameName: string): gameName is GameName {
+  return hasValidator(gameName)
+}
+```
+
+**Benefits**:
+- ✅ No schema migration per game
+- ✅ Works with auto-derived GameName
+- ✅ Runtime validation is sufficient
+
+---
+
+**2. Infer Config Types from Game Definitions**
+
+**Current** (manual):
+```typescript
+// In game-configs.ts
+export interface MathSprintGameConfig { ... }
+export const DEFAULT_MATH_SPRINT_CONFIG = { ... }
+
+// In game definition
+const defaultConfig: MathSprintGameConfig = { ... }
+```
+
+**Recommended**:
+```typescript
+// In game definition (single source of truth)
+export const mathSprintGame = defineGame({
+  defaultConfig: {
+    difficulty: 'medium',
+    questionsPerRound: 10,
+    timePerQuestion: 30,
+  },
+  validator: mathSprintValidator,
+  // ...
+})
+
+// Auto-infer types
+type MathSprintConfig = typeof mathSprintGame.defaultConfig
+```
+
+**Benefits**:
+- ✅ No duplication
+- ✅ Single source of truth
+- ✅ Type inference handles it
+
+---
+
+**3. Move Config Validation to Game Definition**
+
+**Current** (switch statement in helper):
+```typescript
+function validateGameConfig(gameName: GameName, config: any): boolean {
+  switch (gameName) {
+    case 'math-sprint':
+      return /* 15 lines of validation */
+  }
+}
+```
+
+**Recommended**:
+```typescript
+// In game definition
+export const mathSprintGame = defineGame({
+  defaultConfig: { ... },
+  validateConfig: (config: any): config is MathSprintConfig => {
+    return /* validation logic */
+  },
+  // ...
+})
+
+// In helper (generic)
+export function validateGameConfig(gameName: GameName, config: any): boolean {
+  const game = getGame(gameName)
+  return game?.validateConfig?.(config) ?? true
+}
+```
+
+**Benefits**:
+- ✅ No switch statement
+- ✅ Validation lives with game
+- ✅ One place to update
+
+---
+
+### Medium Priority
+
+**4. Create CLI Tool for Game Generation**
+
+```bash
+npm run create-game math-sprint "Math Sprint" "🧮"
+```
+
+Generates:
+- File structure
+- Boilerplate code
+- Registration entries
+- Types
+
+**Benefits**:
+- ✅ Eliminates manual boilerplate
+- ✅ Consistent structure
+- ✅ Reduces errors
+
+---
+
+**5. Add Runtime Registry Validation**
+
+On app start, verify:
+- ✅ All games in registry have validators
+- ✅ All validators have games
+- ✅ No orphaned configs
+- ✅ All game names are unique
+
+```typescript
+function validateRegistries() {
+  const games = getAllGames()
+  const validators = getRegisteredGameNames()
+
+  for (const game of games) {
+    if (!validators.includes(game.manifest.name)) {
+      throw new Error(`Game ${game.manifest.name} has no validator!`)
+    }
+  }
+}
+```
+
+---
+
+## Updated Compliance Table
+
+| Intention | Status | Notes |
+|-----------|--------|-------|
+| Modularity | ⚠️ Partial | Validators unified, but database/config not modular |
+| Self-registration | ✅ Pass | Two registration points (validator + game), both clear |
+| Type safety | ⚠️ Partial | Types work, but database schema breaks for new games |
+| No core changes | ⚠️ Partial | Must update 4 files + database schema |
+| Drop-in games | ❌ Fail | Database migration required |
+| Stable SDK API | ✅ Pass | SDK is excellent |
+| Clear patterns | ✅ Pass | Patterns are consistent |
+| Low boilerplate | ⚠️ Partial | SDK usage is clean, registration is verbose |
+
+**Overall Grade**: **B-** (Was B+, downgraded after implementation testing)
+
+---
+
+## Summary
+
+### What We Learned
+
+✅ **The Good**:
+- SDK design is solid
+- Unified validator registry works
+- Pattern is consistent and learnable
+- Number Guesser proves the concept
+
+⚠️ **The Not-So-Good**:
+- Database schema couples to game names (critical blocker)
+- Config system has too much boilerplate
+- 12 files touched per game is high
+
+❌ **The Bad**:
+- Can't truly "drop in" a game without schema migration
+- Config types are duplicated
+- Helper switch statements are tedious
+
+### Verdict
+
+The system **works** and is **usable**, but falls short of "modular architecture" goals due to:
+1. Database schema hard-coding
+2. Config system boilerplate
+3. Required schema migrations
+
+**Recommendation**:
+1. **Option A (Quick Fix)**: Document the 12-file checklist, live with boilerplate for now
+2. **Option B (Proper Fix)**: Implement Critical recommendations 1-3 before adding Math Sprint
+
+**My Recommendation**: Option A for now (get Math Sprint working), then Option B as a refactoring sprint.
+
+---
+
+## Next Steps
+
+1. ✅ Document "Adding a Game" checklist (12 files)
+2. 🔴 Fix database schema to accept any game name
+3. 🟡 Test Math Sprint with current architecture
+4. 🟡 Evaluate if boilerplate is acceptable in practice
+5. 🟢 Consider config system refactoring for later
+

apps/web/docs/MATCHING_PAIRS_MIGRATION_PLAN.md

@@ -0,0 +1,502 @@
+# Matching Pairs Battle - Migration to Modular Game System
+
+**Status**: Planning Phase
+**Target Version**: v4.2.0
+**Created**: 2025-01-16
+**Game Name**: `matching`
+
+---
+
+## Executive Summary
+
+This document outlines the migration plan for **Matching Pairs Battle** (aka Memory Pairs Challenge) from the legacy dual-location architecture to the modern modular game system using the Game SDK.
+
+**Key Complexity Factors**:
+- **Dual Location**: Game exists in BOTH `/src/app/arcade/matching/` AND `/src/app/games/matching/`
+- **Partial Migration**: RoomMemoryPairsProvider already uses `useArcadeSession` but not in modular format
+- **Turn-Based Multiplayer**: More complex than memory-quiz (requires turn validation, player ownership)
+- **Rich UI State**: Hover state, animations, mismatch feedback, pause/resume
+- **Existing Tests**: Has playerMetadata test that must continue to pass
+
+---
+
+## Current File Structure Analysis
+
+### Location 1: `/src/app/arcade/matching/`
+
+**Components** (4 files):
+- `components/GameCard.tsx`
+- `components/PlayerStatusBar.tsx`
+- `components/ResultsPhase.tsx`
+- `components/SetupPhase.tsx`
+- `components/EmojiPicker.tsx`
+- `components/GamePhase.tsx`
+- `components/MemoryPairsGame.tsx`
+- `components/__tests__/EmojiPicker.test.tsx`
+
+**Context** (4 files):
+- `context/MemoryPairsContext.tsx` - Context definition and hook
+- `context/LocalMemoryPairsProvider.tsx` - Local mode provider (DEPRECATED)
+- `context/RoomMemoryPairsProvider.tsx` - Room mode provider (PARTIALLY MIGRATED)
+- `context/types.ts` - Type definitions
+- `context/index.ts` - Re-exports
+- `context/__tests__/playerMetadata-userId.test.ts` - Test for player ownership
+
+**Utils** (3 files):
+- `utils/cardGeneration.ts` - Card generation logic
+- `utils/gameScoring.ts` - Scoring calculations
+- `utils/matchValidation.ts` - Match validation logic
+
+**Page**:
+- `page.tsx` - Route handler for `/arcade/matching`
+
+### Location 2: `/src/app/games/matching/`
+
+**Components** (6 files - DUPLICATES):
+- `components/GameCard.tsx`
+- `components/PlayerStatusBar.tsx`
+- `components/ResultsPhase.tsx`
+- `components/SetupPhase.tsx`
+- `components/EmojiPicker.tsx`
+- `components/GamePhase.tsx`
+- `components/MemoryPairsGame.tsx`
+- `components/__tests__/EmojiPicker.test.tsx`
+- `components/PlayerStatusBar.stories.tsx` - Storybook story
+
+**Context** (2 files):
+- `context/MemoryPairsContext.tsx`
+- `context/types.ts`
+
+**Utils** (3 files - DUPLICATES):
+- `utils/cardGeneration.ts`
+- `utils/gameScoring.ts`
+- `utils/matchValidation.ts`
+
+**Page**:
+- `page.tsx` - Route handler for `/games/matching` (legacy?)
+
+### Shared Components
+
+- `/src/components/matching/HoverAvatar.tsx` - Networked presence component
+- `/src/components/matching/MemoryGrid.tsx` - Grid layout component
+
+### Validator
+
+- `/src/lib/arcade/validation/MatchingGameValidator.ts` - ✅ Already exists and comprehensive (570 lines)
+
+### Configuration
+
+- Already in `GAMES_CONFIG` as `'battle-arena'` (maps to internal name `'matching'`)
+- Config type: `MatchingGameConfig` in `/src/lib/arcade/game-configs.ts`
+
+---
+
+## Migration Complexity Assessment
+
+### Complexity: **HIGH** (8/10)
+
+**Reasons**:
+1. **Dual Locations**: Must consolidate two separate implementations
+2. **Partial Migration**: RoomMemoryPairsProvider uses useArcadeSession but not in modular format
+3. **Turn-Based Logic**: Player ownership validation, turn switching
+4. **Rich State**: Hover state, animations, pause/resume, mismatch feedback
+5. **Large Validator**: 570 lines (vs 350 for memory-quiz)
+6. **More Components**: 7 components + 2 shared (vs 7 for memory-quiz)
+7. **Tests**: Must maintain playerMetadata test coverage
+
+**Similar To**: Memory Quiz migration (same pattern)
+
+**Unique Challenges**:
+- Consolidating duplicate files from two locations
+- Deciding which version of duplicates is canonical
+- Handling `/games/matching/` route (deprecate or redirect?)
+- More complex multiplayer state (turn order, player ownership)
+
+---
+
+## Recommended Migration Approach
+
+### Phase 1: Pre-Migration Audit ✅
+
+**Goal**: Understand current state and identify discrepancies
+
+**Tasks**:
+- [x] Map all files in both locations
+- [ ] Compare duplicate files to identify differences (e.g., `diff /src/app/arcade/matching/components/GameCard.tsx /src/app/games/matching/components/GameCard.tsx`)
+- [ ] Identify which location is canonical (likely `/src/app/arcade/matching/` based on RoomProvider)
+- [ ] Verify validator completeness (already done - looks comprehensive)
+- [ ] Check for references to `/games/matching/` route
+
+**Deliverables**:
+- File comparison report
+- Decision: Which duplicate files to keep
+- List of files to delete
+
+---
+
+### Phase 2: Create Modular Game Definition
+
+**Goal**: Define game in registry following SDK pattern
+
+**Tasks**:
+1. Create `/src/arcade-games/matching/index.ts` with `defineGame()`
+2. Register in `/src/lib/arcade/game-registry.ts`
+3. Update `/src/lib/arcade/validators.ts` to import from new location
+4. Add type inference to `/src/lib/arcade/game-configs.ts`
+
+**Template**:
+```typescript
+// /src/arcade-games/matching/index.ts
+import type { GameManifest, GameConfig } from '@/lib/arcade/game-sdk/types'
+import { defineGame } from '@/lib/arcade/game-sdk'
+import { MatchingProvider } from './Provider'
+import { MemoryPairsGame } from './components/MemoryPairsGame'
+import { matchingGameValidator } from './Validator'
+import { validateMatchingConfig } from './config-validation'
+import type { MatchingConfig, MatchingState, MatchingMove } from './types'
+
+const manifest: GameManifest = {
+  name: 'matching',
+  displayName: 'Matching Pairs Battle',
+  icon: '⚔️',
+  description: 'Multiplayer memory battle with friends',
+  longDescription: 'Battle friends in epic memory challenges. Match pairs faster than your opponents in this exciting multiplayer experience.',
+  maxPlayers: 4,
+  difficulty: 'Intermediate',
+  chips: ['👥 Multiplayer', '🎯 Strategic', '🏆 Competitive'],
+  color: 'purple',
+  gradient: 'linear-gradient(135deg, #e9d5ff, #ddd6fe)',
+  borderColor: 'purple.200',
+  available: true,
+}
+
+const defaultConfig: MatchingConfig = {
+  gameType: 'abacus-numeral',
+  difficulty: 6,
+  turnTimer: 30,
+}
+
+export const matchingGame = defineGame<MatchingConfig, MatchingState, MatchingMove>({
+  manifest,
+  Provider: MatchingProvider,
+  GameComponent: MemoryPairsGame,
+  validator: matchingGameValidator,
+  defaultConfig,
+  validateConfig: validateMatchingConfig,
+})
+```
+
+**Files Modified**:
+- `/src/arcade-games/matching/index.ts` (new)
+- `/src/lib/arcade/game-registry.ts` (add import + register)
+- `/src/lib/arcade/validators.ts` (update import path)
+- `/src/lib/arcade/game-configs.ts` (add type inference)
+
+---
+
+### Phase 3: Move and Update Validator
+
+**Goal**: Move validator to modular game directory
+
+**Tasks**:
+1. Move `/src/lib/arcade/validation/MatchingGameValidator.ts` → `/src/arcade-games/matching/Validator.ts`
+2. Update imports to use local types from `./types` instead of importing from game-configs (avoid circular deps)
+3. Verify all move types are handled
+4. Check `getInitialState()` accepts all config fields
+
+**Note**: Validator looks comprehensive already - likely minimal changes needed
+
+**Files Modified**:
+- `/src/arcade-games/matching/Validator.ts` (moved)
+- Update imports in validator
+
+---
+
+### Phase 4: Consolidate and Move Types
+
+**Goal**: Create SDK-compatible type definitions in modular location
+
+**Tasks**:
+1. Compare types from both locations:
+   - `/src/app/arcade/matching/context/types.ts`
+   - `/src/app/games/matching/context/types.ts`
+2. Create `/src/arcade-games/matching/types.ts` with:
+   - `MatchingConfig extends GameConfig`
+   - `MatchingState` (from MemoryPairsState)
+   - `MatchingMove` union type (7 move types: FLIP_CARD, START_GAME, CLEAR_MISMATCH, GO_TO_SETUP, SET_CONFIG, RESUME_GAME, HOVER_CARD)
+3. Ensure compatibility with validator expectations
+4. Fix any `{}` → `Record<string, never>` warnings
+
+**Move Types**:
+```typescript
+export interface MatchingConfig extends GameConfig {
+  gameType: 'abacus-numeral' | 'complement-pairs'
+  difficulty: 6 | 8 | 12 | 15
+  turnTimer: number
+}
+
+export interface MatchingState {
+  // Core game data
+  cards: GameCard[]
+  gameCards: GameCard[]
+  flippedCards: GameCard[]
+
+  // Config
+  gameType: 'abacus-numeral' | 'complement-pairs'
+  difficulty: 6 | 8 | 12 | 15
+  turnTimer: number
+
+  // Progression
+  gamePhase: 'setup' | 'playing' | 'results'
+  currentPlayer: string
+  matchedPairs: number
+  totalPairs: number
+  moves: number
+  scores: Record<string, number>
+  activePlayers: string[]
+  playerMetadata: Record<string, PlayerMetadata>
+  consecutiveMatches: Record<string, number>
+
+  // Timing
+  gameStartTime: number | null
+  gameEndTime: number | null
+  currentMoveStartTime: number | null
+  timerInterval: NodeJS.Timeout | null
+
+  // UI state
+  celebrationAnimations: CelebrationAnimation[]
+  isProcessingMove: boolean
+  showMismatchFeedback: boolean
+  lastMatchedPair: [string, string] | null
+
+  // Pause/Resume
+  originalConfig?: {
+    gameType: 'abacus-numeral' | 'complement-pairs'
+    difficulty: 6 | 8 | 12 | 15
+    turnTimer: number
+  }
+  pausedGamePhase?: 'setup' | 'playing' | 'results'
+  pausedGameState?: PausedGameState
+
+  // Hover state
+  playerHovers: Record<string, string | null>
+}
+
+export type MatchingMove =
+  | { type: 'FLIP_CARD'; playerId: string; userId: string; data: { cardId: string } }
+  | { type: 'START_GAME'; playerId: string; userId: string; data: { cards: GameCard[]; activePlayers: string[]; playerMetadata: Record<string, PlayerMetadata> } }
+  | { type: 'CLEAR_MISMATCH'; playerId: string; userId: string; data: Record<string, never> }
+  | { type: 'GO_TO_SETUP'; playerId: string; userId: string; data: Record<string, never> }
+  | { type: 'SET_CONFIG'; playerId: string; userId: string; data: { field: 'gameType' | 'difficulty' | 'turnTimer'; value: any } }
+  | { type: 'RESUME_GAME'; playerId: string; userId: string; data: Record<string, never> }
+  | { type: 'HOVER_CARD'; playerId: string; userId: string; data: { cardId: string | null } }
+```
+
+**Files Created**:
+- `/src/arcade-games/matching/types.ts`
+
+---
+
+### Phase 5: Create Unified Provider
+
+**Goal**: Convert RoomMemoryPairsProvider to modular Provider using SDK
+
+**Tasks**:
+1. Copy RoomMemoryPairsProvider as starting point (already uses useArcadeSession)
+2. Create `/src/arcade-games/matching/Provider.tsx`
+3. Remove dependency on MemoryPairsContext (will export its own hook)
+4. Update imports to use local types
+5. Ensure all action creators are present:
+   - `startGame`
+   - `flipCard`
+   - `resetGame`
+   - `setGameType`
+   - `setDifficulty`
+   - `setTurnTimer`
+   - `goToSetup`
+   - `resumeGame`
+   - `hoverCard`
+6. Verify config persistence (nested under `gameConfig.matching`)
+7. Export `useMatching` hook
+
+**Key Changes**:
+- Import types from `./types` not from context
+- Export hook: `export function useMatching() { return useContext(MatchingContext) }`
+- Ensure hooks called before early returns (React rules)
+
+**Files Created**:
+- `/src/arcade-games/matching/Provider.tsx`
+
+---
+
+### Phase 6: Consolidate and Move Components
+
+**Goal**: Move components to modular location, choosing canonical versions
+
+**Decision Process** (for each component):
+1. If files are identical → pick either (prefer `/src/app/arcade/matching/`)
+2. If files differ → manually merge, keeping best of both
+3. Update imports to use new Provider: `from '@/arcade-games/matching/Provider'`
+4. Fix styled-system import paths (4 levels: `../../../../styled-system/css`)
+
+**Components to Move**:
+- GameCard.tsx
+- PlayerStatusBar.tsx
+- ResultsPhase.tsx
+- SetupPhase.tsx
+- EmojiPicker.tsx
+- GamePhase.tsx
+- MemoryPairsGame.tsx
+
+**Shared Components** (leave in place):
+- `/src/components/matching/HoverAvatar.tsx`
+- `/src/components/matching/MemoryGrid.tsx`
+
+**Tests**:
+- Move test to `/src/arcade-games/matching/components/__tests__/EmojiPicker.test.tsx`
+
+**Files Created**:
+- `/src/arcade-games/matching/components/*.tsx` (7 files)
+- `/src/arcade-games/matching/components/__tests__/EmojiPicker.test.tsx`
+
+---
+
+### Phase 7: Move Utility Functions
+
+**Goal**: Consolidate utils in modular location
+
+**Tasks**:
+1. Compare utils from both locations (likely identical)
+2. Move to `/src/arcade-games/matching/utils/`
+   - `cardGeneration.ts`
+   - `gameScoring.ts`
+   - `matchValidation.ts`
+3. Update imports in components and validator
+
+**Files Created**:
+- `/src/arcade-games/matching/utils/*.ts` (3 files)
+
+---
+
+### Phase 8: Update Routes and Clean Up
+
+**Goal**: Update page routes and delete legacy files
+
+**Tasks**:
+
+**Route Updates**:
+1. `/src/app/arcade/matching/page.tsx` - Replace with redirect to `/arcade` (local mode deprecated)
+2. `/src/app/games/matching/page.tsx` - Replace with redirect to `/arcade` (legacy route)
+3. Remove from `GAMES_CONFIG` in `/src/components/GameSelector.tsx`
+4. Remove from `GAME_TYPE_TO_NAME` in `/src/app/arcade/room/page.tsx`
+5. Update `/src/lib/arcade/validation/types.ts` imports (if referencing old types)
+
+**Delete Legacy Files** (~30 files):
+- `/src/app/arcade/matching/components/` (7 files + 1 test)
+- `/src/app/arcade/matching/context/` (5 files + 1 test)
+- `/src/app/arcade/matching/utils/` (3 files)
+- `/src/app/games/matching/components/` (7 files + 1 test + 1 story)
+- `/src/app/games/matching/context/` (2 files)
+- `/src/app/games/matching/utils/` (3 files)
+- `/src/lib/arcade/validation/MatchingGameValidator.ts` (moved)
+
+**Files Modified**:
+- `/src/app/arcade/matching/page.tsx` (redirect)
+- `/src/app/games/matching/page.tsx` (redirect)
+- `/src/components/GameSelector.tsx` (remove from GAMES_CONFIG)
+- `/src/app/arcade/room/page.tsx` (remove from GAME_TYPE_TO_NAME)
+
+---
+
+## Testing Checklist
+
+After migration, verify:
+
+- [ ] Type checking passes (`npm run type-check`)
+- [ ] Format/lint passes (`npm run pre-commit`)
+- [ ] EmojiPicker test passes
+- [ ] PlayerMetadata test passes
+- [ ] Game loads in room mode
+- [ ] Game selector shows one "Matching Pairs Battle" button
+- [ ] Settings persist when changed in setup
+- [ ] Turn-based gameplay works (only current player can flip)
+- [ ] Card matching works (both abacus-numeral and complement-pairs)
+- [ ] Pause/Resume works
+- [ ] Hover state shows for other players
+- [ ] Mismatch feedback displays correctly
+- [ ] Results phase calculates scores correctly
+
+---
+
+## Migration Steps Summary
+
+**8 Phases**:
+1. ✅ Pre-Migration Audit - Compare duplicate files
+2. ⏳ Create Modular Game Definition - Registry + types
+3. ⏳ Move and Update Validator - Move to new location
+4. ⏳ Consolidate and Move Types - SDK-compatible types
+5. ⏳ Create Unified Provider - Room-only provider
+6. ⏳ Consolidate and Move Components - Choose canonical versions
+7. ⏳ Move Utility Functions - Consolidate utils
+8. ⏳ Update Routes and Clean Up - Delete legacy files
+
+**Estimated Effort**: 4-6 hours (larger than memory-quiz due to dual locations and more complexity)
+
+---
+
+## Key Differences from Memory Quiz Migration
+
+1. **Dual Locations**: Must consolidate two separate implementations
+2. **More Complex**: Turn-based multiplayer vs cooperative team play
+3. **Partial Migration**: RoomProvider already uses useArcadeSession
+4. **More Components**: 7 game components + 2 shared
+5. **Existing Tests**: Must maintain test coverage
+6. **Two Routes**: Both `/arcade/matching` and `/games/matching` exist
+
+---
+
+## Risks and Mitigation
+
+### Risk 1: File Divergence
+**Risk**: Duplicate files may have different features/fixes
+**Mitigation**: Manually diff each duplicate pair, merge best of both
+
+### Risk 2: Test Breakage
+**Risk**: PlayerMetadata test may break during migration
+**Mitigation**: Run tests frequently, update test if needed
+
+### Risk 3: Turn Logic Complexity
+**Risk**: Player ownership and turn validation is complex
+**Mitigation**: Validator already handles this - trust existing logic
+
+### Risk 4: Unknown Dependencies
+**Risk**: Other parts of codebase may depend on `/games/matching/`
+**Mitigation**: Search for imports before deletion: `grep -r "from.*games/matching" src/`
+
+---
+
+## Post-Migration Verification
+
+After completing all phases:
+
+1. Run full test suite
+2. Manual testing:
+   - Create room
+   - Select "Matching Pairs Battle"
+   - Configure settings (verify persistence)
+   - Start game with multiple players
+   - Play several turns (verify turn order)
+   - Pause and resume
+   - Complete game (verify results)
+3. Verify no duplicate game buttons
+4. Check browser console for errors
+5. Verify settings load correctly on page refresh
+
+---
+
+## References
+
+- Memory Quiz Migration Plan: `docs/MEMORY_QUIZ_MIGRATION_PLAN.md`
+- Game Migration Playbook: `docs/GAME_MIGRATION_PLAYBOOK.md`
+- Game SDK Documentation: `.claude/GAME_SDK_DOCUMENTATION.md`
+- Settings Persistence: `.claude/GAME_SETTINGS_PERSISTENCE.md`

apps/web/docs/MEMORY_QUIZ_MIGRATION_PLAN.md

@@ -0,0 +1,676 @@
+# Memory Quiz Migration Plan
+
+**Game**: Memory Lightning (memory-quiz)
+**Date**: 2025-01-16
+**Target**: Migrate to Modular Game Platform (Game SDK)
+
+---
+
+## Executive Summary
+
+Migrate the Memory Lightning game from the legacy architecture to the new modular game platform. This game is unique because:
+- ✅ Already has a validator (`MemoryQuizGameValidator`)
+- ✅ Already uses `useArcadeSession` in room mode
+- ❌ Located in `/app/arcade/memory-quiz/` instead of `/arcade-games/`
+- ❌ Uses reducer pattern instead of server-driven state
+- ❌ Not using Game SDK types and structure
+
+**Complexity**: **Medium-High** (4-6 hours)
+**Risk**: Low (validator already exists, well-tested game)
+
+---
+
+## Current Architecture
+
+### File Structure
+```
+src/app/arcade/memory-quiz/
+├── page.tsx                          # Main page (local mode)
+├── types.ts                          # State and move types
+├── reducer.ts                        # State reducer (local only)
+├── context/
+│   ├── MemoryQuizContext.tsx         # Context interface
+│   ├── LocalMemoryQuizProvider.tsx   # Local (solo) provider
+│   └── RoomMemoryQuizProvider.tsx    # Multiplayer provider
+└── components/
+    ├── MemoryQuizGame.tsx            # Game wrapper component
+    ├── SetupPhase.tsx                # Setup/lobby UI
+    ├── DisplayPhase.tsx              # Card display phase
+    ├── InputPhase.tsx                # Input/guessing phase
+    ├── ResultsPhase.tsx              # End game results
+    ├── CardGrid.tsx                  # Card display component
+    └── ResultsCardGrid.tsx           # Results card display
+
+src/lib/arcade/validation/
+└── MemoryQuizGameValidator.ts        # Server validator (✅ exists!)
+```
+
+### Important Notes
+
+**⚠️ Local Mode Deprecated**: This migration only supports room mode. All games must be played in a room (even solo play is a single-player room). No local/offline mode code should be included.
+
+### Current State Type (`SorobanQuizState`)
+```typescript
+interface SorobanQuizState {
+  // Core game data
+  cards: QuizCard[]
+  quizCards: QuizCard[]
+  correctAnswers: number[]
+
+  // Game progression
+  currentCardIndex: number
+  displayTime: number
+  selectedCount: 2 | 5 | 8 | 12 | 15
+  selectedDifficulty: DifficultyLevel
+
+  // Input system state
+  foundNumbers: number[]
+  guessesRemaining: number
+  currentInput: string
+  incorrectGuesses: number
+
+  // Multiplayer state
+  activePlayers: string[]
+  playerMetadata: Record<string, PlayerMetadata>
+  playerScores: Record<string, PlayerScore>
+  playMode: 'cooperative' | 'competitive'
+  numberFoundBy: Record<number, string>
+
+  // UI state
+  gamePhase: 'setup' | 'display' | 'input' | 'results'
+  prefixAcceptanceTimeout: NodeJS.Timeout | null
+  finishButtonsBound: boolean
+  wrongGuessAnimations: Array<{...}>
+
+  // Keyboard state
+  hasPhysicalKeyboard: boolean | null
+  testingMode: boolean
+  showOnScreenKeyboard: boolean
+}
+```
+
+### Current Move Types
+```typescript
+type MemoryQuizGameMove =
+  | { type: 'START_QUIZ'; data: { numbers: number[], activePlayers, playerMetadata } }
+  | { type: 'NEXT_CARD' }
+  | { type: 'SHOW_INPUT_PHASE' }
+  | { type: 'ACCEPT_NUMBER'; data: { number: number } }
+  | { type: 'REJECT_NUMBER' }
+  | { type: 'SET_INPUT'; data: { input: string } }
+  | { type: 'SHOW_RESULTS' }
+  | { type: 'RESET_QUIZ' }
+  | { type: 'SET_CONFIG'; data: { field, value } }
+```
+
+### Current Config
+```typescript
+interface MemoryQuizGameConfig {
+  selectedCount: 2 | 5 | 8 | 12 | 15
+  displayTime: number
+  selectedDifficulty: 'beginner' | 'easy' | 'medium' | 'hard' | 'expert'
+  playMode: 'cooperative' | 'competitive'
+}
+```
+
+---
+
+## Target Architecture
+
+### New File Structure
+```
+src/arcade-games/memory-quiz/           # NEW location
+├── index.ts                            # Game definition (defineGame)
+├── Validator.ts                        # Move from /lib/arcade/validation/
+├── Provider.tsx                        # Single unified provider
+├── types.ts                            # State, config, move types
+├── game.yaml                           # Manifest (optional)
+└── components/
+    ├── GameComponent.tsx               # Main game wrapper
+    ├── SetupPhase.tsx                  # Setup UI (updated)
+    ├── DisplayPhase.tsx                # Display phase (minimal changes)
+    ├── InputPhase.tsx                  # Input phase (minimal changes)
+    ├── ResultsPhase.tsx                # Results (minimal changes)
+    ├── CardGrid.tsx                    # Unchanged
+    └── ResultsCardGrid.tsx             # Unchanged
+```
+
+### New Provider Pattern
+- ✅ Single provider (room mode only)
+- ✅ Uses `useArcadeSession` with `roomId` (always provided)
+- ✅ Uses Game SDK hooks (`useViewerId`, `useRoomData`, `useGameMode`)
+- ✅ All state driven by server validator (no client reducer)
+- ✅ All settings persist to room config automatically
+
+---
+
+## Migration Steps
+
+### Phase 1: Preparation (1 hour)
+**Goal**: Set up new structure without breaking existing game
+
+1. ✅ Create `/src/arcade-games/memory-quiz/` directory
+2. ✅ Copy Validator from `/lib/arcade/validation/` to new location
+3. ✅ Update Validator to use Game SDK types if needed
+4. ✅ Create `index.ts` stub for game definition
+5. ✅ Copy `types.ts` to new location (will be updated)
+6. ✅ Document what needs to change in each file
+
+**Verification**: Existing game still works, new directory has scaffold
+
+---
+
+### Phase 2: Create Game Definition (1 hour)
+**Goal**: Define the game using `defineGame()` helper
+
+**Steps**:
+1. Create `game.yaml` manifest (optional but recommended)
+   ```yaml
+   name: memory-quiz
+   displayName: Memory Lightning
+   icon: 🧠
+   description: Memorize soroban numbers and recall them
+   longDescription: |
+     Flash cards with soroban numbers. Memorize them during the display
+     phase, then recall and type them during the input phase.
+   maxPlayers: 8
+   difficulty: Intermediate
+   chips:
+     - 👥 Multiplayer
+     - ⚡ Fast-Paced
+     - 🧠 Memory Challenge
+   color: blue
+   gradient: linear-gradient(135deg, #dbeafe, #bfdbfe)
+   borderColor: blue.200
+   available: true
+   ```
+
+2. Create `index.ts` game definition:
+   ```typescript
+   import { defineGame } from '@/lib/arcade/game-sdk'
+   import type { GameManifest } from '@/lib/arcade/game-sdk'
+   import { GameComponent } from './components/GameComponent'
+   import { MemoryQuizProvider } from './Provider'
+   import type { MemoryQuizConfig, MemoryQuizMove, MemoryQuizState } from './types'
+   import { memoryQuizValidator } from './Validator'
+
+   const manifest: GameManifest = {
+     name: 'memory-quiz',
+     displayName: 'Memory Lightning',
+     icon: '🧠',
+     // ... (copy from game.yaml or define inline)
+   }
+
+   const defaultConfig: MemoryQuizConfig = {
+     selectedCount: 5,
+     displayTime: 2.0,
+     selectedDifficulty: 'easy',
+     playMode: 'cooperative',
+   }
+
+   function validateMemoryQuizConfig(config: unknown): config is MemoryQuizConfig {
+     return (
+       typeof config === 'object' &&
+       config !== null &&
+       'selectedCount' in config &&
+       'displayTime' in config &&
+       'selectedDifficulty' in config &&
+       'playMode' in config &&
+       [2, 5, 8, 12, 15].includes((config as any).selectedCount) &&
+       typeof (config as any).displayTime === 'number' &&
+       (config as any).displayTime > 0 &&
+       ['beginner', 'easy', 'medium', 'hard', 'expert'].includes(
+         (config as any).selectedDifficulty
+       ) &&
+       ['cooperative', 'competitive'].includes((config as any).playMode)
+     )
+   }
+
+   export const memoryQuizGame = defineGame<
+     MemoryQuizConfig,
+     MemoryQuizState,
+     MemoryQuizMove
+   >({
+     manifest,
+     Provider: MemoryQuizProvider,
+     GameComponent,
+     validator: memoryQuizValidator,
+     defaultConfig,
+     validateConfig: validateMemoryQuizConfig,
+   })
+   ```
+
+3. Register game in `game-registry.ts`:
+   ```typescript
+   import { memoryQuizGame } from '@/arcade-games/memory-quiz'
+   registerGame(memoryQuizGame)
+   ```
+
+4. Update `validators.ts` to import from new location:
+   ```typescript
+   import { memoryQuizValidator } from '@/arcade-games/memory-quiz/Validator'
+   ```
+
+5. Add type inference to `game-configs.ts`:
+   ```typescript
+   import type { memoryQuizGame } from '@/arcade-games/memory-quiz'
+   export type MemoryQuizGameConfig = InferGameConfig<typeof memoryQuizGame>
+   ```
+
+**Verification**: Game definition compiles, validator registered
+
+---
+
+### Phase 3: Update Types (30 minutes)
+**Goal**: Ensure types match Game SDK expectations
+
+**Changes to `types.ts`**:
+1. Rename `SorobanQuizState` → `MemoryQuizState`
+2. Ensure `MemoryQuizState` extends `GameState` from SDK
+3. Rename move types to match SDK patterns
+4. Export proper config type
+
+**Example**:
+```typescript
+import type { GameConfig, GameState, GameMove } from '@/lib/arcade/game-sdk'
+
+export interface MemoryQuizConfig extends GameConfig {
+  selectedCount: 2 | 5 | 8 | 12 | 15
+  displayTime: number
+  selectedDifficulty: DifficultyLevel
+  playMode: 'cooperative' | 'competitive'
+}
+
+export interface MemoryQuizState extends GameState {
+  // Core game data
+  cards: QuizCard[]
+  quizCards: QuizCard[]
+  correctAnswers: number[]
+
+  // Game progression
+  currentCardIndex: number
+  displayTime: number
+  selectedCount: number
+  selectedDifficulty: DifficultyLevel
+
+  // Input system state
+  foundNumbers: number[]
+  guessesRemaining: number
+  currentInput: string
+  incorrectGuesses: number
+
+  // Multiplayer state (from GameState)
+  activePlayers: string[]
+  playerMetadata: Record<string, PlayerMetadata>
+
+  // Game-specific multiplayer
+  playerScores: Record<string, PlayerScore>
+  playMode: 'cooperative' | 'competitive'
+  numberFoundBy: Record<number, string>
+
+  // UI state
+  gamePhase: 'setup' | 'display' | 'input' | 'results'
+  prefixAcceptanceTimeout: NodeJS.Timeout | null
+  finishButtonsBound: boolean
+  wrongGuessAnimations: Array<{...}>
+
+  // Keyboard state
+  hasPhysicalKeyboard: boolean | null
+  testingMode: boolean
+  showOnScreenKeyboard: boolean
+}
+
+export type MemoryQuizMove =
+  | { type: 'START_QUIZ'; playerId: string; userId: string; timestamp: number; data: {...} }
+  | { type: 'NEXT_CARD'; playerId: string; userId: string; timestamp: number; data: {} }
+  // ... (ensure all moves have playerId, userId, timestamp)
+```
+
+**Key Changes**:
+- All moves must have `playerId`, `userId`, `timestamp` (SDK requirement)
+- State should include `activePlayers` and `playerMetadata` (SDK standard)
+- Use `TEAM_MOVE` for moves where specific player doesn't matter
+
+**Verification**: Types compile, validator accepts move types
+
+---
+
+### Phase 4: Create Provider (2 hours)
+**Goal**: Single provider for room mode (only mode supported)
+
+**Key Pattern**:
+```typescript
+'use client'
+
+import { useCallback, useMemo } from 'react'
+import {
+  useArcadeSession,
+  useGameMode,
+  useRoomData,
+  useViewerId,
+  useUpdateGameConfig,
+  buildPlayerMetadata,
+} from '@/lib/arcade/game-sdk'
+import type { MemoryQuizState, MemoryQuizMove } from './types'
+
+export function MemoryQuizProvider({ children }: { children: ReactNode }) {
+  const { data: viewerId } = useViewerId()
+  const { roomData } = useRoomData()
+  const { activePlayers: activePlayerIds, players } = useGameMode()
+  const { mutate: updateGameConfig } = useUpdateGameConfig()
+
+  const activePlayers = Array.from(activePlayerIds)
+
+  // Merge saved config from room
+  const initialState = useMemo(() => {
+    const gameConfig = roomData?.gameConfig?.['memory-quiz']
+    return {
+      // ... default state
+      displayTime: gameConfig?.displayTime ?? 2.0,
+      selectedCount: gameConfig?.selectedCount ?? 5,
+      selectedDifficulty: gameConfig?.selectedDifficulty ?? 'easy',
+      playMode: gameConfig?.playMode ?? 'cooperative',
+      // ... rest of state
+    }
+  }, [roomData])
+
+  const { state, sendMove, exitSession, lastError, clearError } =
+    useArcadeSession<MemoryQuizState>({
+      userId: viewerId || '',
+      roomId: roomData?.id, // Always provided (room mode only)
+      initialState,
+      applyMove: (state) => state, // Server handles all updates
+    })
+
+  // Action creators
+  const startQuiz = useCallback((quizCards: QuizCard[]) => {
+    const numbers = quizCards.map(c => c.number)
+    const playerMetadata = buildPlayerMetadata(activePlayers, {}, players, viewerId)
+
+    sendMove({
+      type: 'START_QUIZ',
+      playerId: TEAM_MOVE,
+      userId: viewerId || '',
+      data: { numbers, quizCards, activePlayers, playerMetadata },
+    })
+  }, [viewerId, sendMove, activePlayers, players])
+
+  // ... more action creators
+
+  return (
+    <MemoryQuizContext.Provider value={{
+      state,
+      startQuiz,
+      // ... all other actions
+      lastError,
+      clearError,
+      exitSession,
+    }}>
+      {children}
+    </MemoryQuizContext.Provider>
+  )
+}
+```
+
+**Key Changes from Current RoomProvider**:
+1. ✅ No reducer - server handles all state
+2. ✅ Uses SDK hooks exclusively
+3. ✅ Simpler action creators (server does the work)
+4. ✅ Config persistence via `useUpdateGameConfig`
+5. ✅ Always uses roomId (no conditional logic)
+
+**Files to Delete**:
+- ❌ `reducer.ts` (no longer needed)
+- ❌ `LocalMemoryQuizProvider.tsx` (local mode deprecated)
+- ❌ Client-side `applyMoveOptimistically()` (server authoritative)
+
+**Verification**: Provider compiles, context works
+
+---
+
+### Phase 5: Update Components (1 hour)
+**Goal**: Update components to use new provider API
+
+**Changes Needed**:
+1. **GameComponent.tsx** (new file):
+   ```typescript
+   'use client'
+
+   import { useRouter } from 'next/navigation'
+   import { PageWithNav } from '@/components/PageWithNav'
+   import { useMemoryQuiz } from '../Provider'
+   import { SetupPhase } from './SetupPhase'
+   import { DisplayPhase } from './DisplayPhase'
+   import { InputPhase } from './InputPhase'
+   import { ResultsPhase } from './ResultsPhase'
+
+   export function GameComponent() {
+     const router = useRouter()
+     const { state, exitSession } = useMemoryQuiz()
+
+     return (
+       <PageWithNav
+         navTitle="Memory Lightning"
+         navEmoji="🧠"
+         emphasizePlayerSelection={state.gamePhase === 'setup'}
+         onExitSession={() => {
+           exitSession()
+           router.push('/arcade')
+         }}
+       >
+         <style dangerouslySetInnerHTML={{ __html: globalAnimations }} />
+
+         {state.gamePhase === 'setup' && <SetupPhase />}
+         {state.gamePhase === 'display' && <DisplayPhase />}
+         {state.gamePhase === 'input' && <InputPhase key="input-phase" />}
+         {state.gamePhase === 'results' && <ResultsPhase />}
+       </PageWithNav>
+     )
+   }
+   ```
+
+2. **SetupPhase.tsx**: Update to use action creators instead of dispatch
+   ```diff
+   - dispatch({ type: 'SET_DIFFICULTY', difficulty: value })
+   + setConfig('selectedDifficulty', value)
+   ```
+
+3. **DisplayPhase.tsx**: Update to use `nextCard` action
+   ```diff
+   - dispatch({ type: 'NEXT_CARD' })
+   + nextCard()
+   ```
+
+4. **InputPhase.tsx**: Update to use `acceptNumber`, `rejectNumber` actions
+   ```diff
+   - dispatch({ type: 'ACCEPT_NUMBER', number })
+   + acceptNumber(number)
+   ```
+
+5. **ResultsPhase.tsx**: Update to use `resetGame`, `showResults` actions
+   ```diff
+   - dispatch({ type: 'RESET_QUIZ' })
+   + resetGame()
+   ```
+
+**Minimal Changes**:
+- Components mostly stay the same
+- Replace `dispatch()` calls with action creators
+- No other UI changes needed
+
+**Verification**: All phases render, actions work
+
+---
+
+### Phase 6: Update Page Route (15 minutes)
+**Goal**: Update page to use new game definition
+
+**New `/app/arcade/memory-quiz/page.tsx`**:
+```typescript
+'use client'
+
+import { memoryQuizGame } from '@/arcade-games/memory-quiz'
+
+const { Provider, GameComponent } = memoryQuizGame
+
+export default function MemoryQuizPage() {
+  return (
+    <Provider>
+      <GameComponent />
+    </Provider>
+  )
+}
+```
+
+**That's it!** The game now uses the modular system.
+
+**Verification**: Game loads and plays end-to-end
+
+---
+
+### Phase 7: Testing (30 minutes)
+**Goal**: Verify all functionality works
+
+**Test Cases**:
+1. **Solo Play** (single player in room):
+   - [ ] Setup phase renders
+   - [ ] Can change all settings (count, difficulty, display time, play mode)
+   - [ ] Can start quiz
+   - [ ] Cards display with timing
+   - [ ] Input phase works
+   - [ ] Can type and submit answers
+   - [ ] Correct/incorrect feedback works
+   - [ ] Results phase shows scores
+   - [ ] Can play again
+   - [ ] Settings persist across page reloads
+
+2. **Multiplayer** (multiple players):
+   - [ ] Settings persist across page reloads
+   - [ ] All players see same cards
+   - [ ] Timing synchronized (room creator controls)
+   - [ ] Input from any player works
+   - [ ] Scores track correctly per player
+   - [ ] Cooperative mode: team score works
+   - [ ] Competitive mode: individual scores work
+   - [ ] Results show all player scores
+
+3. **Edge Cases**:
+   - [ ] Switching games preserves settings
+   - [ ] Leaving mid-game doesn't crash
+   - [ ] Keyboard detection works
+   - [ ] On-screen keyboard toggle works
+   - [ ] Wrong guess animations work
+   - [ ] Timeout handling works
+
+**Verification**: All tests pass
+
+---
+
+## Breaking Changes
+
+### For Users
+- ✅ **None** - Game should work identically
+
+### For Developers
+- ❌ Can't use `dispatch()` anymore (use action creators)
+- ❌ Can't access reducer (server-driven state only)
+- ❌ No local mode support (room mode only)
+
+---
+
+## Rollback Plan
+
+If migration fails:
+1. Revert page to use old providers
+2. Keep old files in place
+3. Remove new `/arcade-games/memory-quiz/` directory
+4. Unregister from game registry
+
+**Time to rollback**: 5 minutes
+
+---
+
+## Post-Migration Tasks
+
+1. ✅ Delete old files:
+   - `/app/arcade/memory-quiz/reducer.ts` (no longer needed)
+   - `/app/arcade/memory-quiz/context/LocalMemoryQuizProvider.tsx` (local mode deprecated)
+   - `/app/arcade/memory-quiz/page.tsx` (old local mode page, replaced by arcade page)
+   - `/lib/arcade/validation/MemoryQuizGameValidator.ts` (moved to new location)
+
+2. ✅ Update imports across codebase
+
+3. ✅ Add to `ARCHITECTURAL_IMPROVEMENTS.md`:
+   - Memory Quiz migrated successfully
+   - Now 3 games on modular platform
+
+4. ✅ Run full test suite
+
+---
+
+## Complexity Analysis
+
+### What Makes This Easier
+- ✅ Validator already exists and works
+- ✅ Already uses `useArcadeSession`
+- ✅ Move types mostly match SDK requirements
+- ✅ Well-tested, stable game
+
+### What Makes This Harder
+- ❌ Complex UI state (keyboard detection, animations)
+- ❌ Two-phase gameplay (display, then input)
+- ❌ Timing synchronization requirements
+- ❌ Local input optimization (doesn't sync every keystroke)
+
+### Estimated Time
+- **Fast path** (no issues): 3-4 hours
+- **Normal path** (minor fixes): 4-6 hours
+- **Slow path** (major issues): 6-8 hours
+
+---
+
+## Success Criteria
+
+1. ✅ Game registered in game registry
+2. ✅ Config types inferred from game definition
+3. ✅ Single provider for local and room modes
+4. ✅ All phases work in both modes
+5. ✅ Settings persist in room mode
+6. ✅ Multiplayer synchronization works
+7. ✅ No TypeScript errors
+8. ✅ No lint errors
+9. ✅ Pre-commit checks pass
+10. ✅ Manual testing confirms all features work
+
+---
+
+## Notes
+
+### UI State Challenges
+Memory Quiz has significant UI-only state:
+- `wrongGuessAnimations` - visual feedback
+- `hasPhysicalKeyboard` - device detection
+- `showOnScreenKeyboard` - toggle state
+- `prefixAcceptanceTimeout` - timeout handling
+
+**Solution**: These can remain client-only (not synced). They don't affect game logic.
+
+### Input Optimization
+Current implementation doesn't sync `currentInput` over network (only final submission).
+
+**Solution**: Keep this pattern. Use local state for input, only sync `ACCEPT_NUMBER`/`REJECT_NUMBER`.
+
+### Timing Synchronization
+Room creator controls card timing (NEXT_CARD moves).
+
+**Solution**: Check `isRoomCreator` flag, only creator can advance cards.
+
+---
+
+## References
+
+- Game SDK Documentation: `/src/arcade-games/README.md`
+- Example Migration: Number Guesser, Math Sprint
+- Architecture Docs: `/docs/ARCHITECTURAL_IMPROVEMENTS.md`
+- Validator Registry: `/src/lib/arcade/validators.ts`
+- Game Registry: `/src/lib/arcade/game-registry.ts`

apps/web/docs/arcade-game-architecture.md

@@ -0,0 +1,792 @@
+# Arcade Game Architecture
+
+> **Design Philosophy**: Modular, type-safe, multiplayer-first game development with real-time synchronization
+
+---
+
+## Table of Contents
+
+- [Design Goals](#design-goals)
+- [Architecture Overview](#architecture-overview)
+- [Core Concepts](#core-concepts)
+- [Implementation Details](#implementation-details)
+- [Design Decisions](#design-decisions)
+- [Lessons Learned](#lessons-learned)
+- [Future Improvements](#future-improvements)
+
+---
+
+## Design Goals
+
+### Primary Goals
+
+1. **Modularity**
+   - Each game is a self-contained module
+   - Games can be added/removed without affecting the core system
+   - No tight coupling between games and infrastructure
+
+2. **Type Safety**
+   - Full TypeScript support throughout the stack
+   - Compile-time validation of game definitions
+   - Type-safe move validation and state management
+
+3. **Multiplayer-First**
+   - Real-time state synchronization via WebSocket
+   - Optimistic updates for instant feedback
+   - Server-authoritative validation to prevent cheating
+
+4. **Developer Experience**
+   - Simple, intuitive API for game creators
+   - Minimal boilerplate
+   - Clear separation of concerns
+   - Comprehensive error messages
+
+5. **Consistency**
+   - Shared navigation and UI components
+   - Standardized player management
+   - Common error handling patterns
+   - Unified room/lobby experience
+
+### Non-Goals
+
+- Supporting non-multiplayer games (use existing game routes for that)
+- Backwards compatibility with old game implementations
+- Supporting games outside the monorepo
+
+---
+
+## Architecture Overview
+
+### System Layers
+
+```
+┌─────────────────────────────────────────────────────────────┐
+│                    Application Layer                         │
+│  - GameSelector (game discovery)                            │
+│  - Room management                                          │
+│  - Player management                                        │
+└─────────────────────────────────────────────────────────────┘
+                            │
+                            ▼
+┌─────────────────────────────────────────────────────────────┐
+│                   Registry Layer                             │
+│  - Game registration                                        │
+│  - Game discovery (getGame, getAllGames)                    │
+│  - Manifest validation                                      │
+└─────────────────────────────────────────────────────────────┘
+                            │
+                            ▼
+┌─────────────────────────────────────────────────────────────┐
+│                      SDK Layer                               │
+│  - Stable API surface                                       │
+│  - React hooks (useArcadeSession, etc.)                     │
+│  - Type definitions                                         │
+│  - Utilities (buildPlayerMetadata, etc.)                    │
+└─────────────────────────────────────────────────────────────┘
+                            │
+                            ▼
+┌─────────────────────────────────────────────────────────────┐
+│                   Game Layer                                 │
+│  Individual games (number-guesser, math-sprint, etc.)      │
+│  Each game: Validator + Provider + Components + Types      │
+└─────────────────────────────────────────────────────────────┘
+                            │
+                            ▼
+┌─────────────────────────────────────────────────────────────┐
+│                Infrastructure Layer                          │
+│  - WebSocket (useArcadeSocket)                              │
+│  - Optimistic state (useOptimisticGameState)                │
+│  - Database (room data, player data)                        │
+└─────────────────────────────────────────────────────────────┘
+```
+
+### Data Flow: Move Execution
+
+```
+1. User clicks button
+   │
+   ▼
+2. Provider calls sendMove()
+   │
+   ▼
+3. useArcadeSession
+   ├─→ Apply optimistically (instant UI update)
+   └─→ Send via WebSocket to server
+   │
+   ▼
+4. Server validates move
+   │
+   ├─→ VALID:
+   │   ├─→ Apply to server state
+   │   ├─→ Increment version
+   │   ├─→ Broadcast to all clients
+   │   └─→ Client: Remove from pending, confirm state
+   │
+   └─→ INVALID:
+       ├─→ Send rejection message
+       └─→ Client: Rollback optimistic state, show error
+```
+
+---
+
+## Core Concepts
+
+### 1. Game Definition
+
+A game is defined by five core pieces:
+
+```typescript
+interface GameDefinition<TConfig, TState, TMove> {
+  manifest: GameManifest          // Display metadata
+  Provider: GameProviderComponent // React context provider
+  GameComponent: GameComponent    // Main UI component
+  validator: GameValidator        // Server validation logic
+  defaultConfig: TConfig          // Default settings
+}
+```
+
+**Why this structure?**
+- `manifest`: Declarative metadata for discovery and UI
+- `Provider`: Encapsulates all game logic and state management
+- `GameComponent`: Pure UI component, no business logic
+- `validator`: Server-authoritative validation prevents cheating
+- `defaultConfig`: Sensible defaults, can be overridden per-room
+
+### 2. Validator (Server-Side)
+
+The validator is the **source of truth** for game logic.
+
+```typescript
+interface GameValidator<TState, TMove> {
+  validateMove(state: TState, move: TMove): ValidationResult
+  isGameComplete(state: TState): boolean
+  getInitialState(config: unknown): TState
+}
+```
+
+**Key Principles:**
+- **Pure functions**: No side effects, no I/O
+- **Deterministic**: Same input → same output
+- **Complete game logic**: All rules enforced here
+- **Returns new state**: Immutable state updates
+
+**Why server-side?**
+- Prevents cheating (client can't fake moves)
+- Single source of truth (no client/server divergence)
+- Easier debugging (all logic in one place)
+- Can add server-only features (analytics, anti-cheat)
+
+### 3. Provider (Client-Side)
+
+The provider manages client state and provides a clean API.
+
+```typescript
+interface GameContextValue {
+  state: GameState           // Current game state
+  lastError: string | null   // Last validation error
+  startGame: () => void      // Action creators
+  makeMove: (data) => void   // ...
+  clearError: () => void
+  exitSession: () => void
+}
+```
+
+**Responsibilities:**
+- Wrap `useArcadeSession` with game-specific actions
+- Build player metadata from game mode context
+- Provide clean, typed API to components
+- Handle room config persistence
+
+**Anti-Pattern:** Don't put game logic here. The provider is a **thin wrapper** around the SDK.
+
+### 4. Optimistic Updates
+
+The system uses **optimistic UI** for instant feedback:
+
+1. User makes a move → UI updates immediately
+2. Move sent to server for validation
+3. Server validates:
+   - ✓ Valid → Confirm optimistic state
+   - ✗ Invalid → Rollback and show error
+
+**Why optimistic updates?**
+- Instant feedback (no perceived latency)
+- Better UX for fast-paced games
+- Handles network issues gracefully
+
+**Tradeoff:**
+- More complex state management
+- Need rollback logic
+- Potential for flashing/jumpy UI on rollback
+
+**When NOT to use:**
+- High-stakes actions (payments, permanent changes)
+- Actions with irreversible side effects
+- When server latency is acceptable
+
+### 5. State Synchronization
+
+State is synchronized across all clients in a room:
+
+```
+Client A makes move → Server validates → Broadcast to all clients
+  ├─→ Client A: Confirm optimistic update
+  ├─→ Client B: Apply server state
+  └─→ Client C: Apply server state
+```
+
+**Conflict Resolution:**
+- Server state is **always authoritative**
+- Version numbers prevent out-of-order updates
+- Pending moves are reapplied after server sync
+
+---
+
+## Implementation Details
+
+### SDK Design
+
+The SDK provides a **stable API surface** that games import from:
+
+```typescript
+// ✅ GOOD: Import from SDK
+import { useArcadeSession, type GameDefinition } from '@/lib/arcade/game-sdk'
+
+// ❌ BAD: Import internal implementation
+import { useArcadeSocket } from '@/hooks/useArcadeSocket'
+```
+
+**Why?**
+- **Stability**: Internal APIs can change, SDK stays stable
+- **Discoverability**: One place to find all game APIs
+- **Encapsulation**: Hide implementation details
+- **Documentation**: SDK is the "public API" to document
+
+**SDK Exports:**
+
+```typescript
+// Types
+export type { GameDefinition, GameValidator, GameState, GameMove, ... }
+
+// React Hooks
+export { useArcadeSession, useRoomData, useGameMode, useViewerId }
+
+// Utilities
+export { defineGame, buildPlayerMetadata, loadManifest }
+```
+
+### Registry Pattern
+
+Games register themselves on module load:
+
+```typescript
+// game-registry.ts
+const registry = new Map<string, GameDefinition>()
+
+export function registerGame(game: GameDefinition) {
+  registry.set(game.manifest.name, game)
+}
+
+export function getGame(name: string) {
+  return registry.get(name)
+}
+
+// At bottom of file
+import { numberGuesserGame } from '@/arcade-games/number-guesser'
+registerGame(numberGuesserGame)
+```
+
+**Why self-registration?**
+- No central "game list" to maintain
+- Games are automatically discovered
+- Import errors are caught at module load time
+- Easy to enable/disable games (comment out registration)
+
+**Alternative Considered:** Auto-discovery via file system
+
+```typescript
+// ❌ Rejected: Magic, fragile, breaks with bundlers
+const games = import.meta.glob('../arcade-games/*/index.ts')
+```
+
+### Player Metadata
+
+Player metadata is built from multiple sources:
+
+```typescript
+function buildPlayerMetadata(
+  playerIds: string[],
+  existingMetadata: Record<string, unknown>,
+  playerMap: Map<string, Player>,
+  viewerId?: string
+): Record<string, PlayerMetadata>
+```
+
+**Sources:**
+1. `playerIds`: Which players are active
+2. `existingMetadata`: Carry over existing data (for reconnects)
+3. `playerMap`: Player details (name, emoji, color, userId)
+4. `viewerId`: Current user (for ownership checks)
+
+**Why so complex?**
+- Players can be local or remote (in rooms)
+- Need to preserve data across state updates
+- Must map player IDs to user IDs for permissions
+- Support for guest players vs. authenticated users
+
+### Move Validation Flow
+
+```typescript
+// 1. Client sends move
+sendMove({
+  type: 'MAKE_GUESS',
+  playerId: 'player-123',
+  userId: 'user-456',
+  timestamp: Date.now(),
+  data: { guess: 42 }
+})
+
+// 2. Optimistic update (client-side)
+const optimisticState = applyMove(currentState, move)
+setOptimisticState(optimisticState)
+
+// 3. Server validates
+const result = validator.validateMove(serverState, move)
+
+// 4a. Valid → Broadcast new state
+if (result.valid) {
+  serverState = result.newState
+  version++
+  broadcastToAllClients({ gameState: serverState, version })
+}
+
+// 4b. Invalid → Send rejection
+else {
+  sendToClient({ error: result.error, move })
+}
+
+// 5. Client handles response
+// Valid: Confirm optimistic state, remove from pending
+// Invalid: Rollback optimistic state, show error
+```
+
+**Key Points:**
+- Optimistic update happens **before** server response
+- Server is **authoritative** (client state can be overwritten)
+- Version numbers prevent stale updates
+- Rejected moves trigger error UI
+
+---
+
+## Design Decisions
+
+### Decision: Server-Authoritative Validation
+
+**Choice:** All game logic runs on server, client is "dumb"
+
+**Rationale:**
+- Prevents cheating (client can't manipulate state)
+- Single source of truth (no client/server divergence)
+- Easier testing (one codebase for game logic)
+- Can add server-side features (analytics, matchmaking)
+
+**Tradeoff:**
+- ➕ Secure, consistent, easier to maintain
+- ➖ Network latency affects UX (mitigated by optimistic updates)
+- ➖ Can't play offline
+
+**Alternative Considered:** Client-side validation + server verification
+- Rejected: Duplicate logic, potential for divergence
+
+### Decision: Optimistic Updates
+
+**Choice:** Apply moves immediately, rollback on rejection
+
+**Rationale:**
+- Instant feedback (no perceived latency)
+- Better UX for turn-based games
+- Handles network issues gracefully
+
+**Tradeoff:**
+- ➕ Feels instant, smooth UX
+- ➖ More complex state management
+- ➖ Potential for jarring rollbacks
+
+**When to disable:** High-stakes actions (payments, permanent bans)
+
+### Decision: TypeScript Everywhere
+
+**Choice:** Full TypeScript on client and server
+
+**Rationale:**
+- Compile-time validation catches bugs early
+- Better IDE support (autocomplete, refactoring)
+- Self-documenting code (types as documentation)
+- Easier refactoring (compiler catches breakages)
+
+**Tradeoff:**
+- ➕ Fewer runtime errors, better DX
+- ➖ Slower initial development (must define types)
+- ➖ Learning curve for new developers
+
+**Alternative Considered:** JavaScript with JSDoc
+- Rejected: JSDoc is not type-safe, easy to drift
+
+### Decision: React Context for State
+
+**Choice:** Each game has a Provider that wraps game logic
+
+**Rationale:**
+- Natural React pattern
+- Easy to compose (Provider wraps GameComponent)
+- No prop drilling
+- Easy to test (can provide mock context)
+
+**Tradeoff:**
+- ➕ Clean component APIs, easy to understand
+- ➖ Can't use context outside React tree
+- ➖ Re-renders if not memoized carefully
+
+**Alternative Considered:** Zustand/Redux
+- Rejected: Overkill for game-specific state, harder to isolate per-game
+
+### Decision: Phase-Based UI
+
+**Choice:** Each game has distinct phases (setup, playing, results)
+
+**Rationale:**
+- Clear separation of concerns
+- Easy to understand game flow
+- Each phase is independently testable
+- Natural mapping to game states
+
+**Tradeoff:**
+- ➕ Organized, predictable
+- ➖ Some duplication (multiple components)
+- ➖ Can't have overlapping phases
+
+**Pattern:**
+
+```typescript
+{state.gamePhase === 'setup' && <SetupPhase />}
+{state.gamePhase === 'playing' && <PlayingPhase />}
+{state.gamePhase === 'results' && <ResultsPhase />}
+```
+
+### Decision: Player Order from Set Iteration
+
+**Choice:** Don't sort player arrays, use Set iteration order
+
+**Rationale:**
+- Set order is consistent within a session
+- Matches UI display order (PageWithNav uses same Set)
+- Avoids alphabetical bias (first player isn't always "AAA")
+
+**Tradeoff:**
+- ➕ UI and game logic always match
+- ➖ Order is not predictable across sessions
+- ➖ Different players see different orders (based on join time)
+
+**Why not sort?**
+- Creates mismatch: UI shows Set order, game uses sorted order
+- Causes "skipping first player" bug (discovered in Number Guesser)
+
+### Decision: No Optimistic Logic in Provider
+
+**Choice:** Provider's `applyMove` just returns current state
+
+```typescript
+const { state, sendMove } = useArcadeSession({
+  applyMove: (state, move) => state // Don't apply, wait for server
+})
+```
+
+**Rationale:**
+- Keeps client logic minimal (less code to maintain)
+- Prevents client/server logic divergence
+- Server is authoritative (no client-side cheats)
+
+**Tradeoff:**
+- ➕ Simple, secure
+- ➖ Slightly slower UX (wait for server)
+
+**When to use client-side `applyMove`:**
+- Very fast-paced games (60fps animations)
+- Purely cosmetic updates (particles, sounds)
+- Never for game logic (scoring, winning, etc.)
+
+---
+
+## Lessons Learned
+
+### From Number Guesser Implementation
+
+#### 1. Type Coercion is Critical
+
+**Problem:** WebSocket/JSON serialization converts numbers to strings.
+
+```typescript
+// Client sends
+sendMove({ data: { guess: 42 } })
+
+// Server receives
+move.data.guess === "42" // String! 😱
+```
+
+**Solution:** Explicit coercion in validator
+
+```typescript
+validateMove(state, move) {
+  case 'MAKE_GUESS':
+    return this.validateGuess(state, Number(move.data.guess))
+}
+```
+
+**Lesson:** Always coerce types from `move.data` in validator.
+
+**Symptom Observed:** User reported "first guess always rejected, second guess always correct" which was caused by:
+- First guess: `"42" < 1` evaluates to `false` (string comparison)
+- Validator thinks it's valid, calculates distance as `NaN`
+- `NaN === 0` is false, so guess is "wrong"
+- Second guess: `"50" < 1` also evaluates oddly, but `Math.abs("50" - 42)` coerces correctly
+- The behavior was unpredictable due to mixed type coercion
+
+**Root Cause:** String comparison operators (`<`, `>`) have weird behavior with string numbers.
+
+#### 2. Player Ordering Must Be Consistent
+
+**Problem:** Set iteration order differed from sorted order, causing "skipped player" bug.
+
+**Root Cause:**
+- UI used `Array.from(Set)` → Set iteration order
+- Game used `Array.from(Set).sort()` → Alphabetical order
+- Leftmost UI player ≠ First game player
+
+**Solution:** Remove `.sort()` everywhere, use raw Set order.
+
+**Lesson:** Player order must be identical in UI and game logic.
+
+#### 3. Error Feedback is Essential
+
+**Problem:** Moves rejected silently, users confused.
+
+**Solution:** `lastError` state with auto-dismiss UI.
+
+```typescript
+const { lastError, clearError } = useArcadeSession()
+
+{lastError && (
+  <ErrorBanner message={lastError} onDismiss={clearError} />
+)}
+```
+
+**Lesson:** Always surface validation errors to users.
+
+#### 4. Turn Indicators Improve UX
+
+**Problem:** Players didn't know whose turn it was.
+
+**Solution:** `currentPlayerId` prop to `PageWithNav`.
+
+```typescript
+<PageWithNav
+  currentPlayerId={state.currentPlayer}
+  playerScores={state.scores}
+>
+```
+
+**Lesson:** Visual feedback for turn-based games is critical.
+
+#### 5. Round vs. Game Completion
+
+**Problem:** Validator checked `!state.winner` for next round, but winner is only set when game ends.
+
+**Root Cause:** Confused "round complete" (someone guessed) with "game complete" (someone won).
+
+**Solution:** Check if last guess was correct:
+
+```typescript
+const roundComplete = state.guesses.length > 0 &&
+  state.guesses[state.guesses.length - 1].distance === 0
+```
+
+**Lesson:** Be precise about what "complete" means (round vs. game).
+
+#### 6. Debug Logging is Invaluable
+
+**Problem:** Type issues caused subtle bugs (always correct guess).
+
+**Solution:** Add logging in validator:
+
+```typescript
+console.log('[NumberGuesser] Validating guess:', {
+  guess,
+  guessType: typeof guess,
+  secretNumber: state.secretNumber,
+  secretNumberType: typeof state.secretNumber,
+  distance: Math.abs(guess - state.secretNumber)
+})
+```
+
+**Lesson:** Log types and values during development.
+
+---
+
+## Future Improvements
+
+### 1. Automated Testing
+
+**Current State:** Manual testing only
+
+**Proposal:**
+- Unit tests for validators (pure functions, easy to test)
+- Integration tests for Provider + useArcadeSession
+- E2E tests for full game flows (Playwright)
+
+**Example:**
+
+```typescript
+describe('NumberGuesserValidator', () => {
+  it('should reject out-of-bounds guess', () => {
+    const validator = new NumberGuesserValidator()
+    const state = { minNumber: 1, maxNumber: 100, ... }
+    const move = { type: 'MAKE_GUESS', data: { guess: 200 } }
+
+    const result = validator.validateMove(state, move)
+
+    expect(result.valid).toBe(false)
+    expect(result.error).toContain('must be between')
+  })
+})
+```
+
+### 2. Move History / Replay
+
+**Current State:** No move history
+
+**Proposal:**
+- Store all moves in database
+- Allow "replay" of games
+- Enable undo/redo (for certain games)
+- Analytics on player behavior
+
+**Schema:**
+
+```typescript
+interface GameSession {
+  id: string
+  roomId: string
+  gameType: string
+  moves: GameMove[]
+  finalState: GameState
+  startTime: number
+  endTime: number
+}
+```
+
+### 3. Game Analytics
+
+**Current State:** No analytics
+
+**Proposal:**
+- Track game completions, durations, winners
+- Player skill ratings (Elo, TrueSkill)
+- Popular games dashboard
+- A/B testing for game variants
+
+### 4. Spectator Mode
+
+**Current State:** Only active players can view game
+
+**Proposal:**
+- Allow non-players to watch
+- Spectators can't send moves (read-only)
+- Show spectator count in room
+
+**Implementation:**
+
+```typescript
+interface RoomMember {
+  userId: string
+  role: 'player' | 'spectator' | 'host'
+}
+```
+
+### 5. Game Variants
+
+**Current State:** One config per game
+
+**Proposal:**
+- Preset variants (Easy, Medium, Hard)
+- Custom rules per room
+- "House rules" feature
+
+**Example:**
+
+```typescript
+const variants = {
+  beginner: { minNumber: 1, maxNumber: 20, roundsToWin: 1 },
+  standard: { minNumber: 1, maxNumber: 100, roundsToWin: 3 },
+  expert: { minNumber: 1, maxNumber: 1000, roundsToWin: 5 },
+}
+```
+
+### 6. Tournaments / Brackets
+
+**Current State:** Single-room games only
+
+**Proposal:**
+- Multi-round tournaments
+- Bracket generation
+- Leaderboards
+
+### 7. Game Mod Support
+
+**Current State:** Games are hard-coded
+
+**Proposal:**
+- Load games from external bundles
+- Community-created games
+- Sandboxed execution (Deno, WASM)
+
+**Challenges:**
+- Security (untrusted code)
+- Type safety (dynamic loading)
+- Versioning (breaking changes)
+
+### 8. Voice/Video Chat
+
+**Current State:** Text chat only (if implemented)
+
+**Proposal:**
+- WebRTC voice/video
+- Per-room channels
+- Mute/kick controls
+
+---
+
+## Appendix: Key Files Reference
+
+| Path | Purpose |
+|------|---------|
+| `src/lib/arcade/game-sdk/index.ts` | SDK exports (public API) |
+| `src/lib/arcade/game-registry.ts` | Game registration |
+| `src/lib/arcade/manifest-schema.ts` | Manifest validation |
+| `src/hooks/useArcadeSession.ts` | Session management hook |
+| `src/hooks/useArcadeSocket.ts` | WebSocket connection |
+| `src/hooks/useOptimisticGameState.ts` | Optimistic state management |
+| `src/contexts/GameModeContext.tsx` | Player management |
+| `src/components/PageWithNav.tsx` | Game navigation wrapper |
+| `src/arcade-games/number-guesser/` | Example game implementation |
+
+---
+
+## Related Documentation
+
+- [Game Development Guide](../arcade-games/README.md) - Step-by-step guide to creating games
+- [API Reference](./arcade-game-api-reference.md) - Complete SDK API documentation (TODO)
+- [Deployment Guide](./arcade-game-deployment.md) - How to deploy new games (TODO)
+
+---
+
+*Last Updated: 2025-10-15*

apps/web/package.json

@@ -70,7 +70,8 @@
     "react-dom": "^18.2.0",
     "react-resizable-layout": "^0.7.3",
     "socket.io": "^4.8.1",
-    "socket.io-client": "^4.8.1"
+    "socket.io-client": "^4.8.1",
+    "zod": "^4.1.12"
   },
   "devDependencies": {
     "@playwright/test": "^1.55.1",

apps/web/src/app/api/arcade/rooms/[roomId]/settings/route.ts

@@ -8,7 +8,8 @@ import { getRoomMembers } from '@/lib/arcade/room-membership'
 import { getSocketIO } from '@/lib/socket-io'
 import { getViewerId } from '@/lib/viewer'
 import { getAllGameConfigs, setGameConfig } from '@/lib/arcade/game-config-helpers'
-import type { GameName } from '@/lib/arcade/validation'
+import { isValidGameName } from '@/lib/arcade/validators'
+import type { GameName } from '@/lib/arcade/validators'
 
 type RouteContext = {
   params: Promise<{ roomId: string }>
@@ -20,8 +21,11 @@ type RouteContext = {
  * Body:
  *   - accessMode?: 'open' | 'locked' | 'retired' | 'password' | 'restricted' | 'approval-only'
  *   - password?: string (plain text, will be hashed)
- *   - gameName?: 'matching' | 'memory-quiz' | 'complement-race' | 'number-guesser' | null (select game for room)
+ *   - gameName?: string | null (any game with a registered validator)
  *   - gameConfig?: object (game-specific settings)
+ *
+ * Note: gameName is validated at runtime against the validator registry.
+ * No need to update this file when adding new games!
  */
 export async function PATCH(req: NextRequest, context: RouteContext) {
   try {
@@ -92,12 +96,15 @@ export async function PATCH(req: NextRequest, context: RouteContext) {
       )
     }
 
-    // Validate gameName if provided
+    // Validate gameName if provided - check against validator registry at runtime
     if (body.gameName !== undefined && body.gameName !== null) {
-      // Legacy games + registry games (TODO: make this dynamic when we refactor to lazy-load registry)
-      const validGames = ['matching', 'memory-quiz', 'complement-race', 'number-guesser']
-      if (!validGames.includes(body.gameName)) {
-        return NextResponse.json({ error: 'Invalid game name' }, { status: 400 })
+      if (!isValidGameName(body.gameName)) {
+        return NextResponse.json(
+          {
+            error: `Invalid game name: ${body.gameName}. Game must have a registered validator.`,
+          },
+          { status: 400 }
+        )
       }
     }
 

apps/web/src/app/arcade/memory-quiz/context/LocalMemoryQuizProvider.tsx

@@ -1,113 +0,0 @@
-'use client'
-
-import type { ReactNode } from 'react'
-import { useCallback, useEffect, useReducer } from 'react'
-import { useRouter } from 'next/navigation'
-import { initialState, quizReducer } from '../reducer'
-import type { QuizCard } from '../types'
-import { MemoryQuizContext, type MemoryQuizContextValue } from './MemoryQuizContext'
-
-interface LocalMemoryQuizProviderProps {
-  children: ReactNode
-}
-
-/**
- * LocalMemoryQuizProvider - Provides context for single-player local mode
- *
- * This provider wraps the memory quiz reducer and provides action creators
- * to child components. It's used for standalone local play (non-room mode).
- *
- * Action creators wrap dispatch calls to maintain same interface as RoomProvider.
- */
-export function LocalMemoryQuizProvider({ children }: LocalMemoryQuizProviderProps) {
-  const router = useRouter()
-  const [state, dispatch] = useReducer(quizReducer, initialState)
-
-  // Cleanup timeouts on unmount
-  useEffect(() => {
-    return () => {
-      if (state.prefixAcceptanceTimeout) {
-        clearTimeout(state.prefixAcceptanceTimeout)
-      }
-    }
-  }, [state.prefixAcceptanceTimeout])
-
-  // Computed values
-  const isGameActive = state.gamePhase === 'display' || state.gamePhase === 'input'
-
-  // Action creators - wrap dispatch calls to match RoomProvider interface
-  const startQuiz = useCallback((quizCards: QuizCard[]) => {
-    dispatch({ type: 'START_QUIZ', quizCards })
-  }, [])
-
-  const nextCard = useCallback(() => {
-    dispatch({ type: 'NEXT_CARD' })
-  }, [])
-
-  const showInputPhase = useCallback(() => {
-    dispatch({ type: 'SHOW_INPUT_PHASE' })
-  }, [])
-
-  const acceptNumber = useCallback((number: number) => {
-    dispatch({ type: 'ACCEPT_NUMBER', number })
-  }, [])
-
-  const rejectNumber = useCallback(() => {
-    dispatch({ type: 'REJECT_NUMBER' })
-  }, [])
-
-  const setInput = useCallback((input: string) => {
-    dispatch({ type: 'SET_INPUT', input })
-  }, [])
-
-  const showResults = useCallback(() => {
-    dispatch({ type: 'SHOW_RESULTS' })
-  }, [])
-
-  const resetGame = useCallback(() => {
-    dispatch({ type: 'RESET_QUIZ' })
-  }, [])
-
-  const setConfig = useCallback(
-    (field: 'selectedCount' | 'displayTime' | 'selectedDifficulty', value: any) => {
-      switch (field) {
-        case 'selectedCount':
-          dispatch({ type: 'SET_SELECTED_COUNT', count: value })
-          break
-        case 'displayTime':
-          dispatch({ type: 'SET_DISPLAY_TIME', time: value })
-          break
-        case 'selectedDifficulty':
-          dispatch({ type: 'SET_DIFFICULTY', difficulty: value })
-          break
-      }
-    },
-    []
-  )
-
-  const exitSession = useCallback(() => {
-    router.push('/games')
-  }, [router])
-
-  const contextValue: MemoryQuizContextValue = {
-    state,
-    dispatch: () => {
-      // No-op - local provider uses action creators instead
-      console.warn('dispatch() is not available in local mode, use action creators instead')
-    },
-    isGameActive,
-    resetGame,
-    exitSession,
-    // Expose action creators for components to use
-    startQuiz,
-    nextCard,
-    showInputPhase,
-    acceptNumber,
-    rejectNumber,
-    setInput,
-    showResults,
-    setConfig,
-  }
-
-  return <MemoryQuizContext.Provider value={contextValue}>{children}</MemoryQuizContext.Provider>
-}

apps/web/src/app/arcade/memory-quiz/context/MemoryQuizContext.tsx

@@ -1,45 +0,0 @@
-'use client'
-
-import { createContext, useContext } from 'react'
-import type { QuizAction, QuizCard, SorobanQuizState } from '../types'
-
-// Context value interface
-export interface MemoryQuizContextValue {
-  state: SorobanQuizState
-  dispatch: React.Dispatch<QuizAction>
-
-  // Computed values
-  isGameActive: boolean
-  isRoomCreator?: boolean // True if current user is room creator (controls timing in multiplayer)
-
-  // Action creators (to be implemented by providers)
-  // Local mode uses dispatch, room mode uses these action creators
-  startGame?: () => void
-  resetGame?: () => void
-  exitSession?: () => void
-
-  // Room mode action creators (optional for local mode)
-  startQuiz?: (quizCards: QuizCard[]) => void
-  nextCard?: () => void
-  showInputPhase?: () => void
-  acceptNumber?: (number: number) => void
-  rejectNumber?: () => void
-  setInput?: (input: string) => void
-  showResults?: () => void
-  setConfig?: (
-    field: 'selectedCount' | 'displayTime' | 'selectedDifficulty' | 'playMode',
-    value: any
-  ) => void
-}
-
-// Create context
-export const MemoryQuizContext = createContext<MemoryQuizContextValue | null>(null)
-
-// Hook to use the context
-export function useMemoryQuiz(): MemoryQuizContextValue {
-  const context = useContext(MemoryQuizContext)
-  if (!context) {
-    throw new Error('useMemoryQuiz must be used within a MemoryQuizProvider')
-  }
-  return context
-}

apps/web/src/app/arcade/memory-quiz/page.tsx

@@ -1,157 +1,70 @@
 'use client'
 
-import Link from 'next/link'
-import { PageWithNav } from '@/components/PageWithNav'
-import { css } from '../../../../styled-system/css'
-import { DisplayPhase } from './components/DisplayPhase'
-import { InputPhase } from './components/InputPhase'
-import { ResultsPhase } from './components/ResultsPhase'
-import { SetupPhase } from './components/SetupPhase'
-import { LocalMemoryQuizProvider } from './context/LocalMemoryQuizProvider'
-import { useMemoryQuiz } from './context/MemoryQuizContext'
+import { useEffect } from 'react'
+import { useRouter } from 'next/navigation'
 
-// CSS animations that need to be global
-const globalAnimations = `
-@keyframes pulse {
-  0% { transform: scale(1); box-shadow: 0 4px 12px rgba(59, 130, 246, 0.3); }
-  50% { transform: scale(1.05); box-shadow: 0 6px 20px rgba(59, 130, 246, 0.5); }
-  100% { transform: scale(1); box-shadow: 0 4px 12px rgba(59, 130, 246, 0.3); }
-}
+/**
+ * Memory Quiz redirect page
+ *
+ * Local mode has been deprecated. Memory Quiz is now only available
+ * through the Champion Arena (arcade) in room mode.
+ *
+ * This page redirects users to the arcade where they can:
+ * 1. Create or join a room
+ * 2. Select Memory Lightning from the game selector
+ * 3. Play in multiplayer or solo (single-player room)
+ */
+export default function MemoryQuizRedirectPage() {
+  const router = useRouter()
 
-@keyframes subtlePageFlash {
-  0% { background: linear-gradient(to bottom right, #f0fdf4, #ecfdf5); }
-  50% { background: linear-gradient(to bottom right, #dcfce7, #d1fae5); }
-  100% { background: linear-gradient(to bottom right, #f0fdf4, #ecfdf5); }
-}
-
-@keyframes fadeInScale {
-  from { opacity: 0; transform: scale(0.8); }
-  to { opacity: 1; transform: scale(1); }
-}
-
-@keyframes explode {
-  0% {
-    opacity: 1;
-    transform: translate(-50%, -50%) scale(1);
-  }
-  50% {
-    opacity: 1;
-    transform: translate(-50%, -50%) scale(1.5);
-  }
-  100% {
-    opacity: 0;
-    transform: translate(-50%, -50%) scale(2) rotate(180deg);
-  }
-}
-
-@keyframes blink {
-  0%, 50% { opacity: 1; }
-  51%, 100% { opacity: 0; }
-}
-
-@keyframes slideUp {
-  from {
-    opacity: 0;
-    transform: translateX(-50%) translateY(20px);
-  }
-  to {
-    opacity: 1;
-    transform: translateX(-50%) translateY(0);
-  }
-}
-`
-
-// Inner component that uses the context
-function MemoryQuizGame() {
-  const { state } = useMemoryQuiz()
+  useEffect(() => {
+    // Redirect to arcade
+    router.replace('/arcade')
+  }, [router])
 
   return (
-    <>
-      <style dangerouslySetInnerHTML={{ __html: globalAnimations }} />
-
+    <div
+      style={{
+        display: 'flex',
+        flexDirection: 'column',
+        alignItems: 'center',
+        justifyContent: 'center',
+        minHeight: '100vh',
+        padding: '20px',
+        background: 'linear-gradient(135deg, #f8fafc, #e2e8f0)',
+      }}
+    >
       <div
         style={{
-          flex: 1,
-          display: 'flex',
-          flexDirection: 'column',
-          overflow: 'auto',
-          padding: '20px 8px',
-          minHeight: '100vh',
-          background: 'linear-gradient(135deg, #f8fafc, #e2e8f0)',
+          fontSize: '48px',
+          marginBottom: '20px',
         }}
       >
-        <div
-          style={{
-            maxWidth: '100%',
-            margin: '0 auto',
-            flex: 1,
-            display: 'flex',
-            flexDirection: 'column',
-          }}
-        >
-          <div
-            className={css({
-              textAlign: 'center',
-              mb: '4',
-              flexShrink: 0,
-            })}
-          >
-            <Link
-              href="/games"
-              className={css({
-                display: 'inline-flex',
-                alignItems: 'center',
-                color: 'gray.600',
-                textDecoration: 'none',
-                mb: '4',
-                _hover: { color: 'gray.800' },
-              })}
-            >
-              ← Back to Games
-            </Link>
-          </div>
-
-          <div
-            className={css({
-              bg: 'white',
-              rounded: 'xl',
-              shadow: 'xl',
-              overflow: 'hidden',
-              border: '1px solid',
-              borderColor: 'gray.200',
-              flex: 1,
-              display: 'flex',
-              flexDirection: 'column',
-              maxHeight: '100%',
-            })}
-          >
-            <div
-              className={css({
-                flex: 1,
-                display: 'flex',
-                flexDirection: 'column',
-                overflow: 'auto',
-              })}
-            >
-              {state.gamePhase === 'setup' && <SetupPhase />}
-              {state.gamePhase === 'display' && <DisplayPhase />}
-              {state.gamePhase === 'input' && <InputPhase key="input-phase" />}
-              {state.gamePhase === 'results' && <ResultsPhase />}
-            </div>
-          </div>
-        </div>
+        🧠
       </div>
-    </>
-  )
-}
-
-// Main page component that provides the context
-export default function MemoryQuizPage() {
-  return (
-    <PageWithNav navTitle="Memory Lightning" navEmoji="🧠">
-      <LocalMemoryQuizProvider>
-        <MemoryQuizGame />
-      </LocalMemoryQuizProvider>
-    </PageWithNav>
+      <h1
+        style={{
+          fontSize: '24px',
+          fontWeight: 'bold',
+          marginBottom: '12px',
+          color: '#1f2937',
+          textAlign: 'center',
+        }}
+      >
+        Redirecting to Champion Arena...
+      </h1>
+      <p
+        style={{
+          fontSize: '16px',
+          color: '#6b7280',
+          textAlign: 'center',
+          maxWidth: '500px',
+        }}
+      >
+        Memory Lightning is now part of the Champion Arena.
+        <br />
+        You'll be able to play solo or with friends in multiplayer mode!
+      </p>
+    </div>
   )
 }

apps/web/src/app/arcade/memory-quiz/reducer.ts

@@ -1,138 +0,0 @@
-import type { QuizAction, SorobanQuizState } from './types'
-
-export const initialState: SorobanQuizState = {
-  cards: [],
-  quizCards: [],
-  correctAnswers: [],
-  currentCardIndex: 0,
-  displayTime: 2.0,
-  selectedCount: 5,
-  selectedDifficulty: 'easy', // Default to easy level
-  foundNumbers: [],
-  guessesRemaining: 0,
-  currentInput: '',
-  incorrectGuesses: 0,
-  // Multiplayer state
-  activePlayers: [],
-  playerMetadata: {},
-  playerScores: {},
-  playMode: 'cooperative', // Default to cooperative
-  numberFoundBy: {},
-  // UI state
-  gamePhase: 'setup',
-  prefixAcceptanceTimeout: null,
-  finishButtonsBound: false,
-  wrongGuessAnimations: [],
-  // Keyboard state (persistent across re-renders)
-  hasPhysicalKeyboard: null,
-  testingMode: false,
-  showOnScreenKeyboard: false,
-}
-
-export function quizReducer(state: SorobanQuizState, action: QuizAction): SorobanQuizState {
-  switch (action.type) {
-    case 'SET_CARDS':
-      return { ...state, cards: action.cards }
-    case 'SET_DISPLAY_TIME':
-      return { ...state, displayTime: action.time }
-    case 'SET_SELECTED_COUNT':
-      return { ...state, selectedCount: action.count }
-    case 'SET_DIFFICULTY':
-      return { ...state, selectedDifficulty: action.difficulty }
-    case 'SET_PLAY_MODE':
-      return { ...state, playMode: action.playMode }
-    case 'START_QUIZ':
-      return {
-        ...state,
-        quizCards: action.quizCards,
-        correctAnswers: action.quizCards.map((card) => card.number),
-        currentCardIndex: 0,
-        foundNumbers: [],
-        guessesRemaining: action.quizCards.length + Math.floor(action.quizCards.length / 2),
-        gamePhase: 'display',
-      }
-    case 'NEXT_CARD':
-      return { ...state, currentCardIndex: state.currentCardIndex + 1 }
-    case 'SHOW_INPUT_PHASE':
-      return { ...state, gamePhase: 'input' }
-    case 'ACCEPT_NUMBER': {
-      // In competitive mode, track which player guessed correctly
-      const newPlayerScores = { ...state.playerScores }
-      if (state.playMode === 'competitive' && action.playerId) {
-        const currentScore = newPlayerScores[action.playerId] || { correct: 0, incorrect: 0 }
-        newPlayerScores[action.playerId] = {
-          ...currentScore,
-          correct: currentScore.correct + 1,
-        }
-      }
-      return {
-        ...state,
-        foundNumbers: [...state.foundNumbers, action.number],
-        currentInput: '',
-        playerScores: newPlayerScores,
-      }
-    }
-    case 'REJECT_NUMBER': {
-      // In competitive mode, track which player guessed incorrectly
-      const newPlayerScores = { ...state.playerScores }
-      if (state.playMode === 'competitive' && action.playerId) {
-        const currentScore = newPlayerScores[action.playerId] || { correct: 0, incorrect: 0 }
-        newPlayerScores[action.playerId] = {
-          ...currentScore,
-          incorrect: currentScore.incorrect + 1,
-        }
-      }
-      return {
-        ...state,
-        guessesRemaining: state.guessesRemaining - 1,
-        incorrectGuesses: state.incorrectGuesses + 1,
-        currentInput: '',
-        playerScores: newPlayerScores,
-      }
-    }
-    case 'SET_INPUT':
-      return { ...state, currentInput: action.input }
-    case 'SET_PREFIX_TIMEOUT':
-      return { ...state, prefixAcceptanceTimeout: action.timeout }
-    case 'ADD_WRONG_GUESS_ANIMATION':
-      return {
-        ...state,
-        wrongGuessAnimations: [
-          ...state.wrongGuessAnimations,
-          {
-            number: action.number,
-            id: `wrong-${action.number}-${Date.now()}`,
-            timestamp: Date.now(),
-          },
-        ],
-      }
-    case 'CLEAR_WRONG_GUESS_ANIMATIONS':
-      return {
-        ...state,
-        wrongGuessAnimations: [],
-      }
-    case 'SHOW_RESULTS':
-      return { ...state, gamePhase: 'results' }
-    case 'RESET_QUIZ':
-      return {
-        ...initialState,
-        cards: state.cards, // Preserve generated cards
-        displayTime: state.displayTime,
-        selectedCount: state.selectedCount,
-        selectedDifficulty: state.selectedDifficulty,
-        playMode: state.playMode, // Preserve play mode
-        // Preserve keyboard state across resets
-        hasPhysicalKeyboard: state.hasPhysicalKeyboard,
-        testingMode: state.testingMode,
-        showOnScreenKeyboard: state.showOnScreenKeyboard,
-      }
-    case 'SET_PHYSICAL_KEYBOARD':
-      return { ...state, hasPhysicalKeyboard: action.hasKeyboard }
-    case 'SET_TESTING_MODE':
-      return { ...state, testingMode: action.enabled }
-    case 'TOGGLE_ONSCREEN_KEYBOARD':
-      return { ...state, showOnScreenKeyboard: !state.showOnScreenKeyboard }
-    default:
-      return state
-  }
-}

apps/web/src/app/arcade/room/page.tsx

@@ -4,8 +4,6 @@ import { useRouter } from 'next/navigation'
 import { useRoomData, useSetRoomGame } from '@/hooks/useRoomData'
 import { MemoryPairsGame } from '../matching/components/MemoryPairsGame'
 import { RoomMemoryPairsProvider } from '../matching/context/RoomMemoryPairsProvider'
-import { MemoryQuizGame } from '../memory-quiz/components/MemoryQuizGame'
-import { RoomMemoryQuizProvider } from '../memory-quiz/context/RoomMemoryQuizProvider'
 import { GAMES_CONFIG } from '@/components/GameSelector'
 import type { GameType } from '@/components/GameSelector'
 import { PageWithNav } from '@/components/PageWithNav'
@@ -15,7 +13,6 @@ import { getAllGames, getGame, hasGame } from '@/lib/arcade/game-registry'
 // Map GameType keys to internal game names
 const GAME_TYPE_TO_NAME: Record<GameType, string> = {
   'battle-arena': 'matching',
-  'memory-quiz': 'memory-quiz',
   'complement-race': 'complement-race',
   'master-organizer': 'master-organizer',
 }
@@ -343,13 +340,6 @@ export default function RoomPage() {
         </RoomMemoryPairsProvider>
       )
 
-    case 'memory-quiz':
-      return (
-        <RoomMemoryQuizProvider>
-          <MemoryQuizGame />
-        </RoomMemoryQuizProvider>
-      )
-
     // TODO: Add other games (complement-race, etc.)
     default:
       return (

apps/web/src/arcade-games/README.md

@@ -38,12 +38,44 @@ A modular, plugin-based architecture for building multiplayer arcade games with
 
 ## Architecture
 
+### Key Improvements
+
+**✨ Phase 3: Type Inference (January 2025)**
+
+Config types are now **automatically inferred** from game definitions for modern games. No more manual type definitions!
+
+```typescript
+// Before Phase 3: Manual type definition
+export interface NumberGuesserGameConfig {
+  minNumber: number
+  maxNumber: number
+  roundsToWin: number
+}
+
+// After Phase 3: Inferred from game definition
+export type NumberGuesserGameConfig = InferGameConfig<typeof numberGuesserGame>
+```
+
+**Benefits**:
+- Add a game → Config types automatically available system-wide
+- Single source of truth (the game definition)
+- Eliminates 10-15 lines of boilerplate per game
+
 ### System Components
 
 ```
 ┌─────────────────────────────────────────────────────────────┐
+│                  Validator Registry                          │
+│  - Server-side validators (isomorphic)                      │
+│  - Single source of truth for game names                    │
+│  - Auto-derived GameName type                               │
+└─────────────────────────────────────────────────────────────┘
+                            │
+                            ▼
+┌─────────────────────────────────────────────────────────────┐
 │                     Game Registry                            │
-│  - Registers all available games                            │
+│  - Client-side game definitions                             │
+│  - React components (Provider, GameComponent)               │
 │  - Provides game discovery                                  │
 └─────────────────────────────────────────────────────────────┘
                             │
@@ -53,18 +85,27 @@ A modular, plugin-based architecture for building multiplayer arcade games with
 │  - Stable API surface for games                             │
 │  - React hooks (useArcadeSession, useRoomData, etc.)        │
 │  - Type definitions and utilities                           │
+│  - defineGame() helper                                      │
 └─────────────────────────────────────────────────────────────┘
                             │
                             ▼
 ┌─────────────────────────────────────────────────────────────┐
 │                   Individual Games                           │
 │  number-guesser/                                            │
-│    ├── index.ts          (Game definition)                  │
-│    ├── Validator.ts      (Server validation)                │
+│    ├── index.ts          (Game definition + validation)     │
+│    ├── Validator.ts      (Server validation logic)          │
 │    ├── Provider.tsx      (Client state management)          │
 │    ├── GameComponent.tsx (Main UI)                          │
 │    ├── types.ts          (TypeScript types)                 │
 │    └── components/       (Phase UIs)                        │
+└─────────────────────────────────────────────────────────────┘
+                            │
+                            ▼
+┌─────────────────────────────────────────────────────────────┐
+│                   Type System (NEW)                          │
+│  - Config types inferred from game definitions              │
+│  - GameConfigByName auto-derived                            │
+│  - RoomGameConfig auto-derived                              │
 └─────────────────────────────────────────────────────────────┘
 ```
 
@@ -130,9 +171,12 @@ interface GameDefinition<TConfig, TState, TMove> {
   GameComponent: GameComponent    // Main UI component
   validator: GameValidator        // Server-side validation
   defaultConfig: TConfig          // Default game settings
+  validateConfig?: (config: unknown) => config is TConfig  // Runtime config validation
 }
 ```
 
+**Key Concept**: The `defaultConfig` property serves as the source of truth for config types. TypeScript can infer the config type from `typeof game.defaultConfig`, eliminating the need for manual type definitions in `game-configs.ts`.
+
 #### GameState
 
 The complete game state that's synchronized across all clients:
@@ -430,15 +474,32 @@ const defaultConfig: MyGameConfig = {
   timer: 30,
 }
 
+// Runtime config validation (optional but recommended)
+function validateMyGameConfig(config: unknown): config is MyGameConfig {
+  return (
+    typeof config === 'object' &&
+    config !== null &&
+    'difficulty' in config &&
+    'timer' in config &&
+    typeof config.difficulty === 'number' &&
+    typeof config.timer === 'number' &&
+    config.difficulty >= 1 &&
+    config.timer >= 10
+  )
+}
+
 export const myGame = defineGame<MyGameConfig, MyGameState, MyGameMove>({
   manifest,
   Provider: MyGameProvider,
   GameComponent,
   validator: myGameValidator,
   defaultConfig,
+  validateConfig: validateMyGameConfig, // Self-contained validation
 })
 ```
 
+**Phase 3 Benefit**: After defining your game, the config type will be automatically inferred in `game-configs.ts`. You don't need to manually add type definitions - just add a type-only import and use `InferGameConfig<typeof myGame>`.
+
 ### Step 7: Register Game
 
 #### 7a. Register Validator (Server-Side)
@@ -480,6 +541,46 @@ registerGame(myGame)
 
 **Important**: Both steps are required for a working game. The validator registry handles server logic, while the game registry handles client UI.
 
+#### 7c. Add Config Type Inference (Optional but Recommended)
+
+Update `src/lib/arcade/game-configs.ts` to infer your game's config type:
+
+```typescript
+// Add type-only import (won't load React components)
+import type { myGame } from '@/arcade-games/my-game'
+
+// Utility type (already defined)
+type InferGameConfig<T> = T extends { defaultConfig: infer Config } ? Config : never
+
+// Infer your config type
+export type MyGameConfig = InferGameConfig<typeof myGame>
+
+// Add to GameConfigByName
+export type GameConfigByName = {
+  // ... other games
+  'my-game': MyGameConfig  // TypeScript infers the type automatically!
+}
+
+// RoomGameConfig is auto-derived from GameConfigByName
+export type RoomGameConfig = {
+  [K in keyof GameConfigByName]?: GameConfigByName[K]
+}
+
+// Add default config constant
+export const DEFAULT_MY_GAME_CONFIG: MyGameConfig = {
+  difficulty: 1,
+  timer: 30,
+}
+```
+
+**Benefits**:
+- Config type automatically matches your game definition
+- No manual type definition needed
+- Single source of truth (your game's `defaultConfig`)
+- TypeScript will error if you reference undefined properties
+
+**Note**: You still need to manually add the default config constant. This is a small amount of duplication but necessary for server-side code that can't import the full game definition.
+
 ---
 
 ## File Structure

apps/web/src/arcade-games/math-sprint/Provider.tsx

@@ -0,0 +1,199 @@
+/**
+ * Math Sprint Provider
+ *
+ * Context provider for Math Sprint game state management.
+ * Demonstrates free-for-all gameplay with TEAM_MOVE pattern.
+ */
+
+'use client'
+
+import { createContext, useCallback, useContext, useMemo, type ReactNode } from 'react'
+import {
+  buildPlayerMetadata,
+  useArcadeSession,
+  useGameMode,
+  useRoomData,
+  useUpdateGameConfig,
+  useViewerId,
+} from '@/lib/arcade/game-sdk'
+import { TEAM_MOVE } from '@/lib/arcade/validation/types'
+import type { Difficulty, MathSprintState } from './types'
+
+/**
+ * Context value provided to child components
+ */
+interface MathSprintContextValue {
+  state: MathSprintState
+  lastError: string | null
+  startGame: () => void
+  submitAnswer: (answer: number) => void
+  nextQuestion: () => void
+  resetGame: () => void
+  setConfig: (field: 'difficulty' | 'questionsPerRound' | 'timePerQuestion', value: any) => void
+  clearError: () => void
+  exitSession: () => void
+}
+
+const MathSprintContext = createContext<MathSprintContextValue | null>(null)
+
+/**
+ * Hook to access Math Sprint context
+ */
+export function useMathSprint() {
+  const context = useContext(MathSprintContext)
+  if (!context) {
+    throw new Error('useMathSprint must be used within MathSprintProvider')
+  }
+  return context
+}
+
+/**
+ * Math Sprint Provider Component
+ */
+export function MathSprintProvider({ children }: { children: ReactNode }) {
+  const { data: viewerId } = useViewerId()
+  const { roomData } = useRoomData()
+  const { activePlayers: activePlayerIds, players } = useGameMode()
+  const { mutate: updateGameConfig } = useUpdateGameConfig()
+
+  // Get active players as array (keep Set iteration order)
+  const activePlayers = Array.from(activePlayerIds)
+
+  // Merge saved config from room with defaults
+  const gameConfig = useMemo(() => {
+    const allGameConfigs = roomData?.gameConfig as Record<string, unknown> | null | undefined
+    const savedConfig = allGameConfigs?.['math-sprint'] as Record<string, unknown> | undefined
+    return {
+      difficulty: (savedConfig?.difficulty as Difficulty) || 'medium',
+      questionsPerRound: (savedConfig?.questionsPerRound as number) || 10,
+      timePerQuestion: (savedConfig?.timePerQuestion as number) || 30,
+    }
+  }, [roomData?.gameConfig])
+
+  // Initial state with merged config
+  const initialState = useMemo<MathSprintState>(
+    () => ({
+      gamePhase: 'setup',
+      activePlayers: [],
+      playerMetadata: {},
+      difficulty: gameConfig.difficulty,
+      questionsPerRound: gameConfig.questionsPerRound,
+      timePerQuestion: gameConfig.timePerQuestion,
+      currentQuestionIndex: 0,
+      questions: [],
+      scores: {},
+      correctAnswersCount: {},
+      answers: [],
+      questionStartTime: 0,
+      questionAnswered: false,
+      winnerId: null,
+    }),
+    [gameConfig]
+  )
+
+  // Arcade session integration
+  const { state, sendMove, exitSession, lastError, clearError } = useArcadeSession<MathSprintState>(
+    {
+      userId: viewerId || '',
+      roomId: roomData?.id,
+      initialState,
+      applyMove: (state) => state, // Server handles all state updates
+    }
+  )
+
+  // Action: Start game
+  const startGame = useCallback(() => {
+    const playerMetadata = buildPlayerMetadata(activePlayers, {}, players, viewerId || undefined)
+
+    sendMove({
+      type: 'START_GAME',
+      playerId: TEAM_MOVE, // Free-for-all: no specific turn owner
+      userId: viewerId || '',
+      data: { activePlayers, playerMetadata },
+    })
+  }, [activePlayers, players, viewerId, sendMove])
+
+  // Action: Submit answer
+  const submitAnswer = useCallback(
+    (answer: number) => {
+      // Find this user's player ID from game state
+      const myPlayerId = state.activePlayers.find((pid) => {
+        return state.playerMetadata[pid]?.userId === viewerId
+      })
+
+      if (!myPlayerId) {
+        console.error('[MathSprint] No player found for current user')
+        return
+      }
+
+      sendMove({
+        type: 'SUBMIT_ANSWER',
+        playerId: myPlayerId, // Specific player answering
+        userId: viewerId || '',
+        data: { answer },
+      })
+    },
+    [state.activePlayers, state.playerMetadata, viewerId, sendMove]
+  )
+
+  // Action: Next question
+  const nextQuestion = useCallback(() => {
+    sendMove({
+      type: 'NEXT_QUESTION',
+      playerId: TEAM_MOVE, // Any player can advance
+      userId: viewerId || '',
+      data: {},
+    })
+  }, [viewerId, sendMove])
+
+  // Action: Reset game
+  const resetGame = useCallback(() => {
+    sendMove({
+      type: 'RESET_GAME',
+      playerId: TEAM_MOVE,
+      userId: viewerId || '',
+      data: {},
+    })
+  }, [viewerId, sendMove])
+
+  // Action: Set config
+  const setConfig = useCallback(
+    (field: 'difficulty' | 'questionsPerRound' | 'timePerQuestion', value: any) => {
+      sendMove({
+        type: 'SET_CONFIG',
+        playerId: TEAM_MOVE,
+        userId: viewerId || '',
+        data: { field, value },
+      })
+
+      // Persist to database for next session
+      if (roomData?.id) {
+        updateGameConfig({
+          roomId: roomData.id,
+          gameConfig: {
+            ...roomData.gameConfig,
+            'math-sprint': {
+              ...(roomData.gameConfig?.['math-sprint'] || {}),
+              [field]: value,
+            },
+          },
+        })
+      }
+    },
+    [viewerId, sendMove, updateGameConfig, roomData]
+  )
+
+  const contextValue: MathSprintContextValue = {
+    state,
+    lastError,
+    startGame,
+    submitAnswer,
+    nextQuestion,
+    resetGame,
+    setConfig,
+    clearError,
+    exitSession,
+  }
+
+  return <MathSprintContext.Provider value={contextValue}>{children}</MathSprintContext.Provider>
+}

apps/web/src/arcade-games/math-sprint/Validator.ts

@@ -0,0 +1,329 @@
+/**
+ * Math Sprint Validator
+ *
+ * Server-side validation for Math Sprint game.
+ * Generates questions, validates answers, awards points.
+ */
+
+import type { GameValidator, ValidationResult } from '@/lib/arcade/game-sdk'
+import type {
+  Difficulty,
+  MathSprintConfig,
+  MathSprintMove,
+  MathSprintState,
+  Operation,
+  Question,
+} from './types'
+
+export class MathSprintValidator implements GameValidator<MathSprintState, MathSprintMove> {
+  /**
+   * Validate a game move
+   */
+  validateMove(
+    state: MathSprintState,
+    move: MathSprintMove,
+    context?: { userId?: string }
+  ): ValidationResult {
+    switch (move.type) {
+      case 'START_GAME':
+        return this.validateStartGame(state, move.data.activePlayers, move.data.playerMetadata)
+
+      case 'SUBMIT_ANSWER':
+        return this.validateSubmitAnswer(
+          state,
+          move.playerId,
+          Number(move.data.answer),
+          move.timestamp
+        )
+
+      case 'NEXT_QUESTION':
+        return this.validateNextQuestion(state)
+
+      case 'RESET_GAME':
+        return this.validateResetGame(state)
+
+      case 'SET_CONFIG':
+        return this.validateSetConfig(state, move.data.field, move.data.value)
+
+      default:
+        return { valid: false, error: 'Unknown move type' }
+    }
+  }
+
+  /**
+   * Check if game is complete
+   */
+  isGameComplete(state: MathSprintState): boolean {
+    return state.gamePhase === 'results'
+  }
+
+  /**
+   * Get initial state for new game
+   */
+  getInitialState(config: unknown): MathSprintState {
+    const { difficulty, questionsPerRound, timePerQuestion } = config as MathSprintConfig
+
+    return {
+      gamePhase: 'setup',
+      activePlayers: [],
+      playerMetadata: {},
+      difficulty: difficulty || 'medium',
+      questionsPerRound: questionsPerRound || 10,
+      timePerQuestion: timePerQuestion || 30,
+      currentQuestionIndex: 0,
+      questions: [],
+      scores: {},
+      correctAnswersCount: {},
+      answers: [],
+      questionStartTime: 0,
+      questionAnswered: false,
+      winnerId: null,
+    }
+  }
+
+  // ============================================================================
+  // Validation Methods
+  // ============================================================================
+
+  private validateStartGame(
+    state: MathSprintState,
+    activePlayers: string[],
+    playerMetadata: Record<string, any>
+  ): ValidationResult {
+    if (state.gamePhase !== 'setup') {
+      return { valid: false, error: 'Game already started' }
+    }
+
+    if (activePlayers.length < 2) {
+      return { valid: false, error: 'Need at least 2 players' }
+    }
+
+    // Generate questions
+    const questions = this.generateQuestions(state.difficulty, state.questionsPerRound)
+
+    const newState: MathSprintState = {
+      ...state,
+      gamePhase: 'playing',
+      activePlayers,
+      playerMetadata,
+      questions,
+      currentQuestionIndex: 0,
+      scores: activePlayers.reduce((acc, p) => ({ ...acc, [p]: 0 }), {}),
+      correctAnswersCount: activePlayers.reduce((acc, p) => ({ ...acc, [p]: 0 }), {}),
+      answers: [],
+      questionStartTime: Date.now(),
+      questionAnswered: false,
+      winnerId: null,
+    }
+
+    return { valid: true, newState }
+  }
+
+  private validateSubmitAnswer(
+    state: MathSprintState,
+    playerId: string,
+    answer: number,
+    timestamp: number
+  ): ValidationResult {
+    if (state.gamePhase !== 'playing') {
+      return { valid: false, error: 'Game not in progress' }
+    }
+
+    if (!state.activePlayers.includes(playerId)) {
+      return { valid: false, error: 'Player not in game' }
+    }
+
+    if (state.questionAnswered) {
+      return { valid: false, error: 'Question already answered correctly' }
+    }
+
+    // Check if player already answered this question
+    const alreadyAnswered = state.answers.some((a) => a.playerId === playerId)
+    if (alreadyAnswered) {
+      return { valid: false, error: 'You already answered this question' }
+    }
+
+    const currentQuestion = state.questions[state.currentQuestionIndex]
+    const correct = answer === currentQuestion.correctAnswer
+
+    const answerRecord = {
+      playerId,
+      answer,
+      timestamp,
+      correct,
+    }
+
+    const newAnswers = [...state.answers, answerRecord]
+    let newState = { ...state, answers: newAnswers }
+
+    // If correct, award points and mark question as answered
+    if (correct) {
+      newState = {
+        ...newState,
+        questionAnswered: true,
+        winnerId: playerId,
+        scores: {
+          ...state.scores,
+          [playerId]: state.scores[playerId] + 10,
+        },
+        correctAnswersCount: {
+          ...state.correctAnswersCount,
+          [playerId]: state.correctAnswersCount[playerId] + 1,
+        },
+      }
+    }
+
+    return { valid: true, newState }
+  }
+
+  private validateNextQuestion(state: MathSprintState): ValidationResult {
+    if (state.gamePhase !== 'playing') {
+      return { valid: false, error: 'Game not in progress' }
+    }
+
+    if (!state.questionAnswered) {
+      return { valid: false, error: 'Current question not answered yet' }
+    }
+
+    const isLastQuestion = state.currentQuestionIndex >= state.questions.length - 1
+
+    if (isLastQuestion) {
+      // Game complete, go to results
+      const newState: MathSprintState = {
+        ...state,
+        gamePhase: 'results',
+      }
+      return { valid: true, newState }
+    }
+
+    // Move to next question
+    const newState: MathSprintState = {
+      ...state,
+      currentQuestionIndex: state.currentQuestionIndex + 1,
+      answers: [],
+      questionStartTime: Date.now(),
+      questionAnswered: false,
+      winnerId: null,
+    }
+
+    return { valid: true, newState }
+  }
+
+  private validateResetGame(state: MathSprintState): ValidationResult {
+    const newState = this.getInitialState({
+      difficulty: state.difficulty,
+      questionsPerRound: state.questionsPerRound,
+      timePerQuestion: state.timePerQuestion,
+    })
+
+    return { valid: true, newState }
+  }
+
+  private validateSetConfig(state: MathSprintState, field: string, value: any): ValidationResult {
+    if (state.gamePhase !== 'setup') {
+      return { valid: false, error: 'Cannot change config during game' }
+    }
+
+    const newState = {
+      ...state,
+      [field]: value,
+    }
+
+    return { valid: true, newState }
+  }
+
+  // ============================================================================
+  // Question Generation
+  // ============================================================================
+
+  private generateQuestions(difficulty: Difficulty, count: number): Question[] {
+    const questions: Question[] = []
+
+    for (let i = 0; i < count; i++) {
+      const operation = this.randomOperation()
+      const question = this.generateQuestion(difficulty, operation, `q-${i}`)
+      questions.push(question)
+    }
+
+    return questions
+  }
+
+  private generateQuestion(difficulty: Difficulty, operation: Operation, id: string): Question {
+    let operand1: number
+    let operand2: number
+    let correctAnswer: number
+
+    switch (difficulty) {
+      case 'easy':
+        operand1 = this.randomInt(1, 10)
+        operand2 = this.randomInt(1, 10)
+        break
+      case 'medium':
+        operand1 = this.randomInt(10, 50)
+        operand2 = this.randomInt(1, 20)
+        break
+      case 'hard':
+        operand1 = this.randomInt(10, 100)
+        operand2 = this.randomInt(10, 50)
+        break
+    }
+
+    switch (operation) {
+      case 'addition':
+        correctAnswer = operand1 + operand2
+        break
+      case 'subtraction':
+        // Ensure positive result
+        if (operand1 < operand2) {
+          ;[operand1, operand2] = [operand2, operand1]
+        }
+        correctAnswer = operand1 - operand2
+        break
+      case 'multiplication':
+        // Smaller numbers for multiplication
+        if (difficulty === 'hard') {
+          operand1 = this.randomInt(2, 20)
+          operand2 = this.randomInt(2, 12)
+        } else {
+          operand1 = this.randomInt(2, 10)
+          operand2 = this.randomInt(2, 10)
+        }
+        correctAnswer = operand1 * operand2
+        break
+    }
+
+    const operationSymbol = this.getOperationSymbol(operation)
+    const displayText = `${operand1} ${operationSymbol} ${operand2} = ?`
+
+    return {
+      id,
+      operand1,
+      operand2,
+      operation,
+      correctAnswer,
+      displayText,
+    }
+  }
+
+  private randomOperation(): Operation {
+    const operations: Operation[] = ['addition', 'subtraction', 'multiplication']
+    return operations[Math.floor(Math.random() * operations.length)]
+  }
+
+  private randomInt(min: number, max: number): number {
+    return Math.floor(Math.random() * (max - min + 1)) + min
+  }
+
+  private getOperationSymbol(operation: Operation): string {
+    switch (operation) {
+      case 'addition':
+        return '+'
+      case 'subtraction':
+        return '−'
+      case 'multiplication':
+        return '×'
+    }
+  }
+}
+
+export const mathSprintValidator = new MathSprintValidator()

apps/web/src/arcade-games/math-sprint/components/GameComponent.tsx

@@ -0,0 +1,40 @@
+/**
+ * Math Sprint - Game Component
+ *
+ * Main wrapper component with navigation and phase routing.
+ */
+
+'use client'
+
+import { useRouter } from 'next/navigation'
+import { PageWithNav } from '@/components/PageWithNav'
+import { useMathSprint } from '../Provider'
+import { PlayingPhase } from './PlayingPhase'
+import { ResultsPhase } from './ResultsPhase'
+import { SetupPhase } from './SetupPhase'
+
+export function GameComponent() {
+  const router = useRouter()
+  const { state, exitSession, resetGame } = useMathSprint()
+
+  return (
+    <PageWithNav
+      navTitle="Math Sprint"
+      navEmoji="🧮"
+      emphasizePlayerSelection={state.gamePhase === 'setup'}
+      // No currentPlayerId - free-for-all game, everyone can act simultaneously
+      playerScores={state.scores}
+      onExitSession={() => {
+        exitSession?.()
+        router.push('/arcade')
+      }}
+      onNewGame={() => {
+        resetGame()
+      }}
+    >
+      {state.gamePhase === 'setup' && <SetupPhase />}
+      {state.gamePhase === 'playing' && <PlayingPhase />}
+      {state.gamePhase === 'results' && <ResultsPhase />}
+    </PageWithNav>
+  )
+}

apps/web/src/arcade-games/math-sprint/components/PlayingPhase.tsx

@@ -0,0 +1,350 @@
+/**
+ * Math Sprint - Playing Phase
+ *
+ * Main gameplay: show question, accept answers, show feedback.
+ */
+
+'use client'
+
+import { useEffect, useState } from 'react'
+import { useViewerId } from '@/lib/arcade/game-sdk'
+import { css } from '../../../../styled-system/css'
+import { useMathSprint } from '../Provider'
+
+export function PlayingPhase() {
+  const { state, submitAnswer, nextQuestion, lastError, clearError } = useMathSprint()
+  const { data: viewerId } = useViewerId()
+  const [inputValue, setInputValue] = useState('')
+
+  const currentQuestion = state.questions[state.currentQuestionIndex]
+  const progress = `${state.currentQuestionIndex + 1} / ${state.questions.length}`
+
+  // Find if current user answered
+  const myPlayerId = Object.keys(state.playerMetadata).find(
+    (pid) => state.playerMetadata[pid]?.userId === viewerId
+  )
+  const myAnswer = state.answers.find((a) => a.playerId === myPlayerId)
+
+  // Auto-clear error after 3 seconds
+  useEffect(() => {
+    if (lastError) {
+      const timeout = setTimeout(() => clearError(), 3000)
+      return () => clearTimeout(timeout)
+    }
+  }, [lastError, clearError])
+
+  // Clear input after question changes
+  useEffect(() => {
+    setInputValue('')
+  }, [state.currentQuestionIndex])
+
+  const handleSubmit = () => {
+    const answer = Number.parseInt(inputValue, 10)
+    if (Number.isNaN(answer)) return
+
+    submitAnswer(answer)
+  }
+
+  const handleKeyDown = (e: React.KeyboardEvent) => {
+    if (e.key === 'Enter') {
+      handleSubmit()
+    }
+  }
+
+  return (
+    <div
+      className={css({
+        display: 'flex',
+        flexDirection: 'column',
+        gap: '24px',
+        maxWidth: '700px',
+        margin: '0 auto',
+        padding: '32px 20px',
+      })}
+    >
+      {/* Progress Bar */}
+      <div
+        className={css({
+          background: 'white',
+          border: '1px solid',
+          borderColor: 'gray.200',
+          borderRadius: '12px',
+          padding: '16px',
+        })}
+      >
+        <div
+          className={css({
+            display: 'flex',
+            justifyContent: 'space-between',
+            alignItems: 'center',
+            marginBottom: '8px',
+          })}
+        >
+          <span className={css({ fontSize: 'sm', fontWeight: 'semibold' })}>
+            Question {progress}
+          </span>
+          <span className={css({ fontSize: 'sm', color: 'gray.600' })}>
+            {state.difficulty.charAt(0).toUpperCase() + state.difficulty.slice(1)}
+          </span>
+        </div>
+        <div
+          className={css({
+            background: 'gray.200',
+            height: '8px',
+            borderRadius: '4px',
+            overflow: 'hidden',
+          })}
+        >
+          <div
+            className={css({
+              background: 'linear-gradient(90deg, #a78bfa, #8b5cf6)',
+              height: '100%',
+              borderRadius: '4px',
+              transition: 'width 0.3s',
+            })}
+            style={{
+              width: `${((state.currentQuestionIndex + 1) / state.questions.length) * 100}%`,
+            }}
+          />
+        </div>
+      </div>
+
+      {/* Error Banner */}
+      {lastError && (
+        <div
+          className={css({
+            background: 'linear-gradient(135deg, #fef2f2, #fee2e2)',
+            border: '2px solid',
+            borderColor: 'red.300',
+            borderRadius: '12px',
+            padding: '12px 16px',
+            display: 'flex',
+            alignItems: 'center',
+            justifyContent: 'space-between',
+          })}
+        >
+          <div className={css({ display: 'flex', alignItems: 'center', gap: '8px' })}>
+            <span>⚠️</span>
+            <span className={css({ fontSize: 'sm', color: 'red.700' })}>{lastError}</span>
+          </div>
+          <button
+            type="button"
+            onClick={clearError}
+            className={css({
+              fontSize: 'xs',
+              padding: '4px 8px',
+              background: 'red.100',
+              border: 'none',
+              borderRadius: '4px',
+              cursor: 'pointer',
+              _hover: { background: 'red.200' },
+            })}
+          >
+            Dismiss
+          </button>
+        </div>
+      )}
+
+      {/* Question Display */}
+      <div
+        className={css({
+          background: 'linear-gradient(135deg, #ede9fe, #ddd6fe)',
+          border: '2px solid',
+          borderColor: 'purple.300',
+          borderRadius: '16px',
+          padding: '48px',
+          textAlign: 'center',
+        })}
+      >
+        <div
+          className={css({
+            fontSize: '4xl',
+            fontWeight: 'bold',
+            color: 'purple.700',
+            fontFamily: 'monospace',
+          })}
+        >
+          {currentQuestion.displayText}
+        </div>
+      </div>
+
+      {/* Answer Input */}
+      {!state.questionAnswered && (
+        <div
+          className={css({
+            background: 'white',
+            border: '2px solid',
+            borderColor: myAnswer ? 'gray.300' : 'purple.500',
+            borderRadius: '12px',
+            padding: '24px',
+          })}
+        >
+          {myAnswer ? (
+            <div className={css({ textAlign: 'center' })}>
+              <div
+                className={css({
+                  fontSize: 'lg',
+                  color: 'gray.600',
+                  marginBottom: '8px',
+                })}
+              >
+                Your answer: <strong>{myAnswer.answer}</strong>
+              </div>
+              <div className={css({ fontSize: 'sm', color: 'gray.500' })}>
+                Waiting for others or correct answer...
+              </div>
+            </div>
+          ) : (
+            <div>
+              <label
+                className={css({
+                  display: 'block',
+                  fontSize: 'sm',
+                  fontWeight: 'semibold',
+                  marginBottom: '8px',
+                })}
+              >
+                Your Answer
+              </label>
+              <div className={css({ display: 'flex', gap: '12px' })}>
+                <input
+                  type="number"
+                  value={inputValue}
+                  onChange={(e) => setInputValue(e.target.value)}
+                  onKeyDown={handleKeyDown}
+                  placeholder="Type your answer..."
+                  className={css({
+                    flex: 1,
+                    padding: '12px 16px',
+                    fontSize: 'lg',
+                    border: '2px solid',
+                    borderColor: 'gray.300',
+                    borderRadius: '8px',
+                    _focus: {
+                      outline: 'none',
+                      borderColor: 'purple.500',
+                    },
+                  })}
+                />
+                <button
+                  type="button"
+                  onClick={handleSubmit}
+                  disabled={!inputValue}
+                  className={css({
+                    padding: '12px 24px',
+                    fontSize: 'md',
+                    fontWeight: 'semibold',
+                    color: 'white',
+                    background: inputValue ? 'purple.600' : 'gray.400',
+                    border: 'none',
+                    borderRadius: '8px',
+                    cursor: inputValue ? 'pointer' : 'not-allowed',
+                    _hover: {
+                      background: inputValue ? 'purple.700' : 'gray.400',
+                    },
+                  })}
+                >
+                  Submit
+                </button>
+              </div>
+            </div>
+          )}
+        </div>
+      )}
+
+      {/* Winner Display */}
+      {state.questionAnswered && state.winnerId && (
+        <div
+          className={css({
+            background: 'linear-gradient(135deg, #d1fae5, #a7f3d0)',
+            border: '2px solid',
+            borderColor: 'green.400',
+            borderRadius: '12px',
+            padding: '24px',
+            textAlign: 'center',
+          })}
+        >
+          <div className={css({ fontSize: '3xl', marginBottom: '8px' })}>🎉</div>
+          <div className={css({ fontSize: 'lg', fontWeight: 'bold', color: 'green.700' })}>
+            {state.playerMetadata[state.winnerId]?.name || 'Someone'} got it right!
+          </div>
+          <div className={css({ fontSize: 'md', color: 'green.600', marginTop: '4px' })}>
+            Answer: {currentQuestion.correctAnswer}
+          </div>
+
+          <button
+            type="button"
+            onClick={nextQuestion}
+            className={css({
+              marginTop: '16px',
+              padding: '12px 32px',
+              fontSize: 'md',
+              fontWeight: 'semibold',
+              color: 'white',
+              background: 'green.600',
+              border: 'none',
+              borderRadius: '8px',
+              cursor: 'pointer',
+              _hover: { background: 'green.700' },
+            })}
+          >
+            Next Question →
+          </button>
+        </div>
+      )}
+
+      {/* Scoreboard */}
+      <div
+        className={css({
+          background: 'white',
+          border: '1px solid',
+          borderColor: 'gray.200',
+          borderRadius: '12px',
+          padding: '16px',
+        })}
+      >
+        <h3
+          className={css({
+            fontSize: 'sm',
+            fontWeight: 'semibold',
+            marginBottom: '12px',
+          })}
+        >
+          Scores
+        </h3>
+        <div className={css({ display: 'flex', flexDirection: 'column', gap: '8px' })}>
+          {Object.entries(state.scores)
+            .sort(([, a], [, b]) => b - a)
+            .map(([playerId, score]) => {
+              const player = state.playerMetadata[playerId]
+              return (
+                <div
+                  key={playerId}
+                  className={css({
+                    display: 'flex',
+                    justifyContent: 'space-between',
+                    alignItems: 'center',
+                    padding: '8px 12px',
+                    background: 'gray.50',
+                    borderRadius: '8px',
+                  })}
+                >
+                  <div className={css({ display: 'flex', alignItems: 'center', gap: '8px' })}>
+                    <span className={css({ fontSize: 'xl' })}>{player?.emoji}</span>
+                    <span className={css({ fontSize: 'sm', fontWeight: 'medium' })}>
+                      {player?.name}
+                    </span>
+                  </div>
+                  <span
+                    className={css({ fontSize: 'sm', fontWeight: 'bold', color: 'purple.600' })}
+                  >
+                    {score} pts
+                  </span>
+                </div>
+              )
+            })}
+        </div>
+      </div>
+    </div>
+  )
+}

apps/web/src/arcade-games/math-sprint/components/ResultsPhase.tsx

@@ -0,0 +1,194 @@
+/**
+ * Math Sprint - Results Phase
+ *
+ * Show final scores and winner.
+ */
+
+'use client'
+
+import { css } from '../../../../styled-system/css'
+import { useMathSprint } from '../Provider'
+
+export function ResultsPhase() {
+  const { state, resetGame } = useMathSprint()
+
+  // Sort players by score
+  const sortedPlayers = Object.entries(state.scores)
+    .map(([playerId, score]) => ({
+      playerId,
+      score,
+      correct: state.correctAnswersCount[playerId] || 0,
+      player: state.playerMetadata[playerId],
+    }))
+    .sort((a, b) => b.score - a.score)
+
+  const winner = sortedPlayers[0]
+
+  return (
+    <div
+      className={css({
+        display: 'flex',
+        flexDirection: 'column',
+        gap: '24px',
+        maxWidth: '600px',
+        margin: '0 auto',
+        padding: '32px 20px',
+      })}
+    >
+      {/* Winner Announcement */}
+      <div
+        className={css({
+          background: 'linear-gradient(135deg, #fef3c7, #fde68a)',
+          border: '2px solid',
+          borderColor: 'yellow.400',
+          borderRadius: '16px',
+          padding: '32px',
+          textAlign: 'center',
+        })}
+      >
+        <div className={css({ fontSize: '4xl', marginBottom: '12px' })}>🏆</div>
+        <h2
+          className={css({
+            fontSize: '2xl',
+            fontWeight: 'bold',
+            color: 'yellow.800',
+            marginBottom: '8px',
+          })}
+        >
+          {winner.player?.name} Wins!
+        </h2>
+        <div className={css({ fontSize: 'lg', color: 'yellow.700' })}>
+          {winner.score} points • {winner.correct} correct
+        </div>
+      </div>
+
+      {/* Final Scores */}
+      <div
+        className={css({
+          background: 'white',
+          border: '1px solid',
+          borderColor: 'gray.200',
+          borderRadius: '12px',
+          padding: '24px',
+        })}
+      >
+        <h3
+          className={css({
+            fontSize: 'lg',
+            fontWeight: 'semibold',
+            marginBottom: '16px',
+          })}
+        >
+          Final Scores
+        </h3>
+        <div className={css({ display: 'flex', flexDirection: 'column', gap: '12px' })}>
+          {sortedPlayers.map((item, index) => (
+            <div
+              key={item.playerId}
+              className={css({
+                display: 'flex',
+                alignItems: 'center',
+                gap: '12px',
+                padding: '16px',
+                background: index === 0 ? 'linear-gradient(135deg, #fef3c7, #fde68a)' : 'gray.50',
+                border: '1px solid',
+                borderColor: index === 0 ? 'yellow.300' : 'gray.200',
+                borderRadius: '12px',
+              })}
+            >
+              {/* Rank */}
+              <div
+                className={css({
+                  width: '32px',
+                  height: '32px',
+                  display: 'flex',
+                  alignItems: 'center',
+                  justifyContent: 'center',
+                  background: index === 0 ? 'yellow.500' : 'gray.300',
+                  color: index === 0 ? 'white' : 'gray.700',
+                  borderRadius: '50%',
+                  fontWeight: 'bold',
+                  fontSize: 'sm',
+                })}
+              >
+                {index + 1}
+              </div>
+
+              {/* Player Info */}
+              <div className={css({ flex: 1 })}>
+                <div className={css({ display: 'flex', alignItems: 'center', gap: '8px' })}>
+                  <span className={css({ fontSize: 'xl' })}>{item.player?.emoji}</span>
+                  <span className={css({ fontSize: 'md', fontWeight: 'semibold' })}>
+                    {item.player?.name}
+                  </span>
+                </div>
+                <div className={css({ fontSize: 'xs', color: 'gray.600', marginTop: '2px' })}>
+                  {item.correct} / {state.questions.length} correct
+                </div>
+              </div>
+
+              {/* Score */}
+              <div
+                className={css({
+                  fontSize: 'xl',
+                  fontWeight: 'bold',
+                  color: index === 0 ? 'yellow.700' : 'purple.600',
+                })}
+              >
+                {item.score}
+              </div>
+            </div>
+          ))}
+        </div>
+      </div>
+
+      {/* Stats */}
+      <div
+        className={css({
+          background: 'linear-gradient(135deg, #ede9fe, #ddd6fe)',
+          border: '1px solid',
+          borderColor: 'purple.300',
+          borderRadius: '12px',
+          padding: '20px',
+        })}
+      >
+        <div className={css({ display: 'grid', gridTemplateColumns: '1fr 1fr', gap: '16px' })}>
+          <div className={css({ textAlign: 'center' })}>
+            <div className={css({ fontSize: '2xl', fontWeight: 'bold', color: 'purple.700' })}>
+              {state.questions.length}
+            </div>
+            <div className={css({ fontSize: 'sm', color: 'purple.600' })}>Questions</div>
+          </div>
+          <div className={css({ textAlign: 'center' })}>
+            <div className={css({ fontSize: '2xl', fontWeight: 'bold', color: 'purple.700' })}>
+              {state.difficulty.charAt(0).toUpperCase() + state.difficulty.slice(1)}
+            </div>
+            <div className={css({ fontSize: 'sm', color: 'purple.600' })}>Difficulty</div>
+          </div>
+        </div>
+      </div>
+
+      {/* Play Again Button */}
+      <button
+        type="button"
+        onClick={resetGame}
+        className={css({
+          padding: '14px 28px',
+          fontSize: 'lg',
+          fontWeight: 'semibold',
+          color: 'white',
+          background: 'purple.600',
+          border: 'none',
+          borderRadius: '12px',
+          cursor: 'pointer',
+          transition: 'background 0.2s',
+          _hover: {
+            background: 'purple.700',
+          },
+        })}
+      >
+        Play Again
+      </button>
+    </div>
+  )
+}

apps/web/src/arcade-games/math-sprint/components/SetupPhase.tsx

@@ -0,0 +1,198 @@
+/**
+ * Math Sprint - Setup Phase
+ *
+ * Configure game settings before starting.
+ */
+
+'use client'
+
+import { css } from '../../../../styled-system/css'
+import { useMathSprint } from '../Provider'
+import type { Difficulty } from '../types'
+
+export function SetupPhase() {
+  const { state, startGame, setConfig } = useMathSprint()
+
+  const handleDifficultyChange = (difficulty: Difficulty) => {
+    setConfig('difficulty', difficulty)
+  }
+
+  const handleQuestionsChange = (questions: number) => {
+    setConfig('questionsPerRound', questions)
+  }
+
+  return (
+    <div
+      className={css({
+        display: 'flex',
+        flexDirection: 'column',
+        gap: '24px',
+        maxWidth: '600px',
+        margin: '0 auto',
+        padding: '32px 20px',
+      })}
+    >
+      {/* Game Title */}
+      <div className={css({ textAlign: 'center' })}>
+        <h1
+          className={css({
+            fontSize: '2xl',
+            fontWeight: 'bold',
+            color: 'purple.700',
+            marginBottom: '8px',
+          })}
+        >
+          🧮 Math Sprint
+        </h1>
+        <p className={css({ color: 'gray.600' })}>
+          Race to solve math problems! First correct answer wins points.
+        </p>
+      </div>
+
+      {/* Settings Card */}
+      <div
+        className={css({
+          background: 'white',
+          border: '1px solid',
+          borderColor: 'gray.200',
+          borderRadius: '12px',
+          padding: '24px',
+        })}
+      >
+        <h2
+          className={css({
+            fontSize: 'lg',
+            fontWeight: 'semibold',
+            marginBottom: '16px',
+          })}
+        >
+          Game Settings
+        </h2>
+
+        {/* Difficulty */}
+        <div className={css({ marginBottom: '20px' })}>
+          <label
+            className={css({
+              display: 'block',
+              fontSize: 'sm',
+              fontWeight: 'medium',
+              marginBottom: '8px',
+            })}
+          >
+            Difficulty
+          </label>
+          <div className={css({ display: 'flex', gap: '8px' })}>
+            {(['easy', 'medium', 'hard'] as Difficulty[]).map((diff) => (
+              <button
+                key={diff}
+                type="button"
+                onClick={() => handleDifficultyChange(diff)}
+                className={css({
+                  flex: 1,
+                  padding: '10px 16px',
+                  borderRadius: '8px',
+                  border: '2px solid',
+                  borderColor: state.difficulty === diff ? 'purple.500' : 'gray.300',
+                  background: state.difficulty === diff ? 'purple.50' : 'white',
+                  color: state.difficulty === diff ? 'purple.700' : 'gray.700',
+                  fontWeight: state.difficulty === diff ? 'semibold' : 'normal',
+                  cursor: 'pointer',
+                  transition: 'all 0.2s',
+                  _hover: {
+                    borderColor: 'purple.400',
+                  },
+                })}
+              >
+                {diff.charAt(0).toUpperCase() + diff.slice(1)}
+              </button>
+            ))}
+          </div>
+          <p className={css({ fontSize: 'xs', color: 'gray.500', marginTop: '4px' })}>
+            {state.difficulty === 'easy' && 'Numbers 1-10, simple operations'}
+            {state.difficulty === 'medium' && 'Numbers 1-50, varied operations'}
+            {state.difficulty === 'hard' && 'Numbers 1-100, harder calculations'}
+          </p>
+        </div>
+
+        {/* Questions Per Round */}
+        <div>
+          <label
+            className={css({
+              display: 'block',
+              fontSize: 'sm',
+              fontWeight: 'medium',
+              marginBottom: '8px',
+            })}
+          >
+            Questions: {state.questionsPerRound}
+          </label>
+          <input
+            type="range"
+            min="5"
+            max="20"
+            step="5"
+            value={state.questionsPerRound}
+            onChange={(e) => handleQuestionsChange(Number(e.target.value))}
+            className={css({
+              width: '100%',
+            })}
+          />
+          <div
+            className={css({ display: 'flex', justifyContent: 'space-between', fontSize: 'xs' })}
+          >
+            <span>5</span>
+            <span>10</span>
+            <span>15</span>
+            <span>20</span>
+          </div>
+        </div>
+      </div>
+
+      {/* Instructions */}
+      <div
+        className={css({
+          background: 'linear-gradient(135deg, #fef3c7, #fde68a)',
+          border: '1px solid',
+          borderColor: 'yellow.300',
+          borderRadius: '12px',
+          padding: '16px',
+        })}
+      >
+        <h3 className={css({ fontSize: 'sm', fontWeight: 'semibold', marginBottom: '8px' })}>
+          How to Play
+        </h3>
+        <ul className={css({ fontSize: 'sm', color: 'gray.700', paddingLeft: '20px' })}>
+          <li>Solve math problems as fast as you can</li>
+          <li>First correct answer earns 10 points</li>
+          <li>Everyone can answer at the same time</li>
+          <li>Most points wins!</li>
+        </ul>
+      </div>
+
+      {/* Start Button */}
+      <button
+        type="button"
+        onClick={startGame}
+        disabled={state.activePlayers.length < 2}
+        className={css({
+          padding: '14px 28px',
+          fontSize: 'lg',
+          fontWeight: 'semibold',
+          color: 'white',
+          background: state.activePlayers.length < 2 ? 'gray.400' : 'purple.600',
+          borderRadius: '12px',
+          border: 'none',
+          cursor: state.activePlayers.length < 2 ? 'not-allowed' : 'pointer',
+          transition: 'all 0.2s',
+          _hover: {
+            background: state.activePlayers.length < 2 ? 'gray.400' : 'purple.700',
+          },
+        })}
+      >
+        {state.activePlayers.length < 2
+          ? `Need ${2 - state.activePlayers.length} more player(s)`
+          : 'Start Game'}
+      </button>
+    </div>
+  )
+}

apps/web/src/arcade-games/math-sprint/game.yaml

@@ -0,0 +1,16 @@
+name: math-sprint
+displayName: Math Sprint
+icon: 🧮
+description: Fast-paced math racing game
+longDescription: Race against other players to solve math problems! Answer questions quickly to earn points. First person to answer correctly wins the round. Features multiple difficulty levels and customizable question counts.
+maxPlayers: 6
+difficulty: Beginner
+chips:
+  - 👥 Multiplayer
+  - ⚡ Free-for-All
+  - 🧮 Math Skills
+  - 🏃 Speed
+color: purple
+gradient: linear-gradient(135deg, #ddd6fe, #c4b5fd)
+borderColor: purple.200
+available: true

apps/web/src/arcade-games/math-sprint/index.ts

@@ -0,0 +1,61 @@
+/**
+ * Math Sprint Game Definition
+ *
+ * A free-for-all math game demonstrating the TEAM_MOVE pattern.
+ * Players race to solve math problems - first correct answer wins points.
+ */
+
+import { defineGame } from '@/lib/arcade/game-sdk'
+import type { GameManifest } from '@/lib/arcade/game-sdk'
+import { GameComponent } from './components/GameComponent'
+import { MathSprintProvider } from './Provider'
+import type { MathSprintConfig, MathSprintMove, MathSprintState } from './types'
+import { mathSprintValidator } from './Validator'
+
+const manifest: GameManifest = {
+  name: 'math-sprint',
+  displayName: 'Math Sprint',
+  icon: '🧮',
+  description: 'Race to solve math problems!',
+  longDescription:
+    'A fast-paced free-for-all game where players compete to solve math problems. First correct answer earns points. Choose your difficulty and test your mental math skills!',
+  maxPlayers: 8,
+  difficulty: 'Beginner',
+  chips: ['👥 Multiplayer', '⚡ Fast-Paced', '🧠 Mental Math'],
+  color: 'purple',
+  gradient: 'linear-gradient(135deg, #ddd6fe, #c4b5fd)',
+  borderColor: 'purple.200',
+  available: true,
+}
+
+const defaultConfig: MathSprintConfig = {
+  difficulty: 'medium',
+  questionsPerRound: 10,
+  timePerQuestion: 30,
+}
+
+// Config validation function
+function validateMathSprintConfig(config: unknown): config is MathSprintConfig {
+  return (
+    typeof config === 'object' &&
+    config !== null &&
+    'difficulty' in config &&
+    'questionsPerRound' in config &&
+    'timePerQuestion' in config &&
+    ['easy', 'medium', 'hard'].includes((config as any).difficulty) &&
+    typeof (config as any).questionsPerRound === 'number' &&
+    typeof (config as any).timePerQuestion === 'number' &&
+    (config as any).questionsPerRound >= 5 &&
+    (config as any).questionsPerRound <= 20 &&
+    (config as any).timePerQuestion >= 10
+  )
+}
+
+export const mathSprintGame = defineGame<MathSprintConfig, MathSprintState, MathSprintMove>({
+  manifest,
+  Provider: MathSprintProvider,
+  GameComponent,
+  validator: mathSprintValidator,
+  defaultConfig,
+  validateConfig: validateMathSprintConfig,
+})

apps/web/src/arcade-games/math-sprint/types.ts

@@ -0,0 +1,120 @@
+/**
+ * Math Sprint Game Types
+ *
+ * A free-for-all game where players race to solve math problems.
+ * Demonstrates the TEAM_MOVE pattern (no specific turn owner).
+ */
+
+import type { GameConfig, GameMove, GameState } from '@/lib/arcade/game-sdk'
+
+/**
+ * Difficulty levels for math problems
+ */
+export type Difficulty = 'easy' | 'medium' | 'hard'
+
+/**
+ * Math operation types
+ */
+export type Operation = 'addition' | 'subtraction' | 'multiplication'
+
+/**
+ * Game configuration (persisted to database)
+ */
+export interface MathSprintConfig extends GameConfig {
+  difficulty: Difficulty
+  questionsPerRound: number
+  timePerQuestion: number // seconds
+}
+
+/**
+ * A math question
+ */
+export interface Question {
+  id: string
+  operand1: number
+  operand2: number
+  operation: Operation
+  correctAnswer: number
+  displayText: string // e.g., "5 + 3 = ?"
+}
+
+/**
+ * Player answer submission
+ */
+export interface Answer {
+  playerId: string
+  answer: number
+  timestamp: number
+  correct: boolean
+}
+
+/**
+ * Game state (synchronized across all clients)
+ */
+export interface MathSprintState extends GameState {
+  gamePhase: 'setup' | 'playing' | 'results'
+  activePlayers: string[]
+  playerMetadata: Record<string, { name: string; emoji: string; color: string; userId: string }>
+
+  // Configuration
+  difficulty: Difficulty
+  questionsPerRound: number
+  timePerQuestion: number
+
+  // Game progress
+  currentQuestionIndex: number
+  questions: Question[]
+
+  // Scoring
+  scores: Record<string, number> // playerId -> score
+  correctAnswersCount: Record<string, number> // playerId -> count
+
+  // Current question state
+  answers: Answer[] // All answers for current question
+  questionStartTime: number // Timestamp when question was shown
+  questionAnswered: boolean // True if someone got it right
+  winnerId: string | null // Winner of current question (first correct)
+}
+
+/**
+ * Move types for Math Sprint
+ */
+export type MathSprintMove =
+  | StartGameMove
+  | SubmitAnswerMove
+  | NextQuestionMove
+  | ResetGameMove
+  | SetConfigMove
+
+export interface StartGameMove extends GameMove {
+  type: 'START_GAME'
+  data: {
+    activePlayers: string[]
+    playerMetadata: Record<string, unknown>
+  }
+}
+
+export interface SubmitAnswerMove extends GameMove {
+  type: 'SUBMIT_ANSWER'
+  data: {
+    answer: number
+  }
+}
+
+export interface NextQuestionMove extends GameMove {
+  type: 'NEXT_QUESTION'
+  data: Record<string, never>
+}
+
+export interface ResetGameMove extends GameMove {
+  type: 'RESET_GAME'
+  data: Record<string, never>
+}
+
+export interface SetConfigMove extends GameMove {
+  type: 'SET_CONFIG'
+  data: {
+    field: 'difficulty' | 'questionsPerRound' | 'timePerQuestion'
+    value: Difficulty | number
+  }
+}

apps/web/src/arcade-games/memory-quiz/Provider.tsx

@@ -1,32 +1,31 @@
 'use client'
 
 import type { ReactNode } from 'react'
-import { useCallback, useEffect, useMemo, useState } from 'react'
+import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react'
 import { useGameMode } from '@/contexts/GameModeContext'
 import { useArcadeSession } from '@/hooks/useArcadeSession'
 import { useRoomData, useUpdateGameConfig } from '@/hooks/useRoomData'
 import { useViewerId } from '@/hooks/useViewerId'
-import type { GameMove } from '@/lib/arcade/validation'
-import { TEAM_MOVE } from '@/lib/arcade/validation/types'
 import {
   buildPlayerMetadata as buildPlayerMetadataUtil,
   buildPlayerOwnershipFromRoomData,
 } from '@/lib/arcade/player-ownership.client'
-import { initialState } from '../reducer'
-import type { QuizCard, SorobanQuizState } from '../types'
-import { MemoryQuizContext, type MemoryQuizContextValue } from './MemoryQuizContext'
+import { TEAM_MOVE } from '@/lib/arcade/validation/types'
+import type { QuizCard, MemoryQuizState, MemoryQuizMove } from './types'
+
+import type { GameMove } from '@/lib/arcade/validation'
 
 /**
  * Optimistic move application (client-side prediction)
  * The server will validate and send back the authoritative state
  */
-function applyMoveOptimistically(state: SorobanQuizState, move: GameMove): SorobanQuizState {
-  switch (move.type) {
+function applyMoveOptimistically(state: MemoryQuizState, move: GameMove): MemoryQuizState {
+  const typedMove = move as MemoryQuizMove
+  switch (typedMove.type) {
     case 'START_QUIZ': {
       // Handle both client-generated moves (with quizCards) and server-generated moves (with numbers only)
-      // Server can't serialize React components, so it only sends numbers
-      const clientQuizCards = move.data.quizCards
-      const serverNumbers = move.data.numbers
+      const clientQuizCards = typedMove.data.quizCards
+      const serverNumbers = typedMove.data.numbers
 
       let quizCards: QuizCard[]
       let correctAnswers: number[]
@@ -36,7 +35,7 @@ function applyMoveOptimistically(state: SorobanQuizState, move: GameMove): Sorob
         quizCards = clientQuizCards
         correctAnswers = clientQuizCards.map((card: QuizCard) => card.number)
       } else if (serverNumbers) {
-        // Server update: create minimal quizCards from numbers (no React components needed for validation)
+        // Server update: create minimal quizCards from numbers
         quizCards = serverNumbers.map((number: number) => ({
           number,
           svgComponent: null,
@@ -44,18 +43,16 @@ function applyMoveOptimistically(state: SorobanQuizState, move: GameMove): Sorob
         }))
         correctAnswers = serverNumbers
       } else {
-        // Fallback: preserve existing state
         quizCards = state.quizCards
         correctAnswers = state.correctAnswers
       }
 
       const cardCount = quizCards.length
 
-      // Initialize player scores for all active players (by userId, not playerId)
-      const activePlayers = move.data.activePlayers || []
-      const playerMetadata = move.data.playerMetadata || {}
+      // Initialize player scores for all active players (by userId)
+      const activePlayers = typedMove.data.activePlayers || []
+      const playerMetadata = typedMove.data.playerMetadata || {}
 
-      // Extract unique userIds from playerMetadata
       const uniqueUserIds = new Set<string>()
       for (const playerId of activePlayers) {
         const metadata = playerMetadata[playerId]
@@ -64,11 +61,13 @@ function applyMoveOptimistically(state: SorobanQuizState, move: GameMove): Sorob
         }
       }
 
-      // Initialize scores for each userId
-      const playerScores = Array.from(uniqueUserIds).reduce((acc: any, userId: string) => {
-        acc[userId] = { correct: 0, incorrect: 0 }
-        return acc
-      }, {})
+      const playerScores = Array.from(uniqueUserIds).reduce(
+        (acc: Record<string, { correct: number; incorrect: number }>, userId: string) => {
+          acc[userId] = { correct: 0, incorrect: 0 }
+          return acc
+        },
+        {}
+      )
 
       return {
         ...state,
@@ -82,10 +81,10 @@ function applyMoveOptimistically(state: SorobanQuizState, move: GameMove): Sorob
         currentInput: '',
         wrongGuessAnimations: [],
         prefixAcceptanceTimeout: null,
-        // Multiplayer state
         activePlayers,
         playerMetadata,
         playerScores,
+        numberFoundBy: {},
       }
     }
 
@@ -102,8 +101,6 @@ function applyMoveOptimistically(state: SorobanQuizState, move: GameMove): Sorob
       }
 
     case 'ACCEPT_NUMBER': {
-      // Track scores by userId (not playerId) since we can't determine which player typed
-      // Defensive check: ensure state properties exist
       const playerScores = state.playerScores || {}
       const foundNumbers = state.foundNumbers || []
       const numberFoundBy = state.numberFoundBy || {}
@@ -111,44 +108,51 @@ function applyMoveOptimistically(state: SorobanQuizState, move: GameMove): Sorob
       const newPlayerScores = { ...playerScores }
       const newNumberFoundBy = { ...numberFoundBy }
 
-      if (move.userId) {
-        const currentScore = newPlayerScores[move.userId] || { correct: 0, incorrect: 0 }
-        newPlayerScores[move.userId] = {
+      if (typedMove.userId) {
+        const currentScore = newPlayerScores[typedMove.userId] || { correct: 0, incorrect: 0 }
+        newPlayerScores[typedMove.userId] = {
           ...currentScore,
           correct: currentScore.correct + 1,
         }
-        // Track who found this number
-        newNumberFoundBy[move.data.number] = move.userId
+        newNumberFoundBy[typedMove.data.number] = typedMove.userId
       }
+
       return {
         ...state,
-        foundNumbers: [...foundNumbers, move.data.number],
+        foundNumbers: [...foundNumbers, typedMove.data.number],
+        currentInput: '',
         playerScores: newPlayerScores,
         numberFoundBy: newNumberFoundBy,
       }
     }
 
     case 'REJECT_NUMBER': {
-      // Track scores by userId (not playerId) since we can't determine which player typed
-      // Defensive check: ensure state properties exist
       const playerScores = state.playerScores || {}
-
       const newPlayerScores = { ...playerScores }
-      if (move.userId) {
-        const currentScore = newPlayerScores[move.userId] || { correct: 0, incorrect: 0 }
-        newPlayerScores[move.userId] = {
+
+      if (typedMove.userId) {
+        const currentScore = newPlayerScores[typedMove.userId] || { correct: 0, incorrect: 0 }
+        newPlayerScores[typedMove.userId] = {
           ...currentScore,
           incorrect: currentScore.incorrect + 1,
         }
       }
+
       return {
         ...state,
         guessesRemaining: state.guessesRemaining - 1,
         incorrectGuesses: state.incorrectGuesses + 1,
+        currentInput: '',
         playerScores: newPlayerScores,
       }
     }
 
+    case 'SET_INPUT':
+      return {
+        ...state,
+        currentInput: typedMove.data.input,
+      }
+
     case 'SHOW_RESULTS':
       return {
         ...state,
@@ -172,10 +176,7 @@ function applyMoveOptimistically(state: SorobanQuizState, move: GameMove): Sorob
       }
 
     case 'SET_CONFIG': {
-      const { field, value } = move.data as {
-        field: 'selectedCount' | 'displayTime' | 'selectedDifficulty' | 'playMode'
-        value: any
-      }
+      const { field, value } = typedMove.data
       return {
         ...state,
         [field]: value,
@@ -187,65 +188,115 @@ function applyMoveOptimistically(state: SorobanQuizState, move: GameMove): Sorob
   }
 }
 
+// Context interface
+export interface MemoryQuizContextValue {
+  state: MemoryQuizState
+  isGameActive: boolean
+  isRoomCreator: boolean
+  resetGame: () => void
+  exitSession?: () => void
+  startQuiz: (quizCards: QuizCard[]) => void
+  nextCard: () => void
+  showInputPhase: () => void
+  acceptNumber: (number: number) => void
+  rejectNumber: () => void
+  setInput: (input: string) => void
+  showResults: () => void
+  setConfig: (
+    field: 'selectedCount' | 'displayTime' | 'selectedDifficulty' | 'playMode',
+    value: unknown
+  ) => void
+  // Legacy dispatch for UI-only actions (to be migrated to local state)
+  dispatch: (action: unknown) => void
+}
+
+// Create context
+const MemoryQuizContext = createContext<MemoryQuizContextValue | null>(null)
+
+// Hook to use the context
+export function useMemoryQuiz(): MemoryQuizContextValue {
+  const context = useContext(MemoryQuizContext)
+  if (!context) {
+    throw new Error('useMemoryQuiz must be used within MemoryQuizProvider')
+  }
+  return context
+}
+
 /**
- * RoomMemoryQuizProvider - Provides context for room-based multiplayer mode
+ * MemoryQuizProvider - Unified provider for room-based multiplayer
  *
  * This provider uses useArcadeSession for network-synchronized gameplay.
  * All state changes are sent as moves and validated on the server.
  */
-export function RoomMemoryQuizProvider({ children }: { children: ReactNode }) {
+export function MemoryQuizProvider({ children }: { children: ReactNode }) {
   const { data: viewerId } = useViewerId()
   const { roomData } = useRoomData()
   const { activePlayers: activePlayerIds, players } = useGameMode()
   const { mutate: updateGameConfig } = useUpdateGameConfig()
 
-  // Get active player IDs as array
   const activePlayers = Array.from(activePlayerIds)
 
   // LOCAL-ONLY state for current input (not synced over network)
-  // This prevents sending a network request for every keystroke
   const [localCurrentInput, setLocalCurrentInput] = useState('')
 
-  // Merge saved game config from room with initialState
-  // Settings are scoped by game name to preserve settings when switching games
+  // Merge saved game config from room with default initial state
   const mergedInitialState = useMemo(() => {
-    const gameConfig = roomData?.gameConfig as Record<string, any> | null | undefined
+    const gameConfig = roomData?.gameConfig as Record<string, unknown> | null | undefined
 
-    if (!gameConfig) {
-      return initialState
+    const savedConfig = gameConfig?.['memory-quiz'] as Record<string, unknown> | null | undefined
+
+    // Default initial state
+    const defaultState: MemoryQuizState = {
+      cards: [],
+      quizCards: [],
+      correctAnswers: [],
+      currentCardIndex: 0,
+      displayTime: 2.0,
+      selectedCount: 5,
+      selectedDifficulty: 'easy',
+      foundNumbers: [],
+      guessesRemaining: 0,
+      currentInput: '',
+      incorrectGuesses: 0,
+      activePlayers: [],
+      playerMetadata: {},
+      playerScores: {},
+      playMode: 'cooperative',
+      numberFoundBy: {},
+      gamePhase: 'setup',
+      prefixAcceptanceTimeout: null,
+      finishButtonsBound: false,
+      wrongGuessAnimations: [],
+      hasPhysicalKeyboard: null,
+      testingMode: false,
+      showOnScreenKeyboard: false,
     }
 
-    // Get settings for this specific game (memory-quiz)
-    const savedConfig = gameConfig['memory-quiz'] as Record<string, any> | null | undefined
-
     if (!savedConfig) {
-      return initialState
+      return defaultState
     }
 
     return {
-      ...initialState,
-      // Restore settings from saved config
-      selectedCount: savedConfig.selectedCount ?? initialState.selectedCount,
-      displayTime: savedConfig.displayTime ?? initialState.displayTime,
-      selectedDifficulty: savedConfig.selectedDifficulty ?? initialState.selectedDifficulty,
-      playMode: savedConfig.playMode ?? initialState.playMode,
+      ...defaultState,
+      selectedCount:
+        (savedConfig.selectedCount as 2 | 5 | 8 | 12 | 15) ?? defaultState.selectedCount,
+      displayTime: (savedConfig.displayTime as number) ?? defaultState.displayTime,
+      selectedDifficulty:
+        (savedConfig.selectedDifficulty as MemoryQuizState['selectedDifficulty']) ??
+        defaultState.selectedDifficulty,
+      playMode: (savedConfig.playMode as 'cooperative' | 'competitive') ?? defaultState.playMode,
     }
   }, [roomData?.gameConfig])
 
-  // Arcade session integration WITH room sync
-  const {
-    state,
-    sendMove,
-    connected: _connected,
-    exitSession,
-  } = useArcadeSession<SorobanQuizState>({
+  // Arcade session integration
+  const { state, sendMove, exitSession } = useArcadeSession<MemoryQuizState>({
     userId: viewerId || '',
-    roomId: roomData?.id, // CRITICAL: Pass roomId for network sync across room members
+    roomId: roomData?.id || undefined,
     initialState: mergedInitialState,
     applyMove: applyMoveOptimistically,
   })
 
-  // Clear local input when game phase changes or when game resets
+  // Clear local input when game phase changes
   useEffect(() => {
     if (state.gamePhase !== 'input') {
       setLocalCurrentInput('')
@@ -261,7 +312,7 @@ export function RoomMemoryQuizProvider({ children }: { children: ReactNode }) {
     }
   }, [state.prefixAcceptanceTimeout])
 
-  // Detect state corruption/mismatch (e.g., game type mismatch between sessions)
+  // Detect state corruption
   const hasStateCorruption =
     !state.quizCards ||
     !state.correctAnswers ||
@@ -271,32 +322,33 @@ export function RoomMemoryQuizProvider({ children }: { children: ReactNode }) {
   // Computed values
   const isGameActive = state.gamePhase === 'display' || state.gamePhase === 'input'
 
-  // Build player metadata from room data and player map
+  // Build player metadata
   const buildPlayerMetadata = useCallback(() => {
     const playerOwnership = buildPlayerOwnershipFromRoomData(roomData)
-    const metadata = buildPlayerMetadataUtil(activePlayers, playerOwnership, players, viewerId)
+    const metadata = buildPlayerMetadataUtil(
+      activePlayers,
+      playerOwnership,
+      players,
+      viewerId || undefined
+    )
     return metadata
   }, [activePlayers, players, roomData, viewerId])
 
-  // Action creators - send moves to arcade session
+  // Action creators
   const startQuiz = useCallback(
     (quizCards: QuizCard[]) => {
-      // Extract only serializable data (numbers) for server
-      // React components can't be sent over Socket.IO
       const numbers = quizCards.map((card) => card.number)
-
-      // Build player metadata for multiplayer
       const playerMetadata = buildPlayerMetadata()
 
       sendMove({
         type: 'START_QUIZ',
-        playerId: TEAM_MOVE, // Team move - all players act together
-        userId: viewerId || '', // User who initiated
+        playerId: TEAM_MOVE,
+        userId: viewerId || '',
         data: {
-          numbers, // Send to server
-          quizCards, // Keep for optimistic local update
-          activePlayers, // Send active players list
-          playerMetadata, // Send player display info
+          numbers,
+          quizCards,
+          activePlayers,
+          playerMetadata,
         },
       })
     },
@@ -323,13 +375,11 @@ export function RoomMemoryQuizProvider({ children }: { children: ReactNode }) {
 
   const acceptNumber = useCallback(
     (number: number) => {
-      // Clear local input immediately
       setLocalCurrentInput('')
-
       sendMove({
         type: 'ACCEPT_NUMBER',
-        playerId: TEAM_MOVE, // Team move - can't identify specific player
-        userId: viewerId || '', // User who guessed correctly
+        playerId: TEAM_MOVE,
+        userId: viewerId || '',
         data: { number },
       })
     },
@@ -337,20 +387,17 @@ export function RoomMemoryQuizProvider({ children }: { children: ReactNode }) {
   )
 
   const rejectNumber = useCallback(() => {
-    // Clear local input immediately
     setLocalCurrentInput('')
-
     sendMove({
       type: 'REJECT_NUMBER',
-      playerId: TEAM_MOVE, // Team move - can't identify specific player
-      userId: viewerId || '', // User who guessed incorrectly
+      playerId: TEAM_MOVE,
+      userId: viewerId || '',
       data: {},
     })
   }, [viewerId, sendMove])
 
   const setInput = useCallback((input: string) => {
-    // LOCAL ONLY - no network sync!
-    // This makes typing instant with zero network lag
+    // LOCAL ONLY - no network sync for instant typing
     setLocalCurrentInput(input)
   }, [])
 
@@ -373,9 +420,10 @@ export function RoomMemoryQuizProvider({ children }: { children: ReactNode }) {
   }, [viewerId, sendMove])
 
   const setConfig = useCallback(
-    (field: 'selectedCount' | 'displayTime' | 'selectedDifficulty' | 'playMode', value: any) => {
-      console.log(`[RoomMemoryQuizProvider] setConfig called: ${field} = ${value}`)
-
+    (
+      field: 'selectedCount' | 'displayTime' | 'selectedDifficulty' | 'playMode',
+      value: unknown
+    ) => {
       sendMove({
         type: 'SET_CONFIG',
         playerId: TEAM_MOVE,
@@ -383,12 +431,11 @@ export function RoomMemoryQuizProvider({ children }: { children: ReactNode }) {
         data: { field, value },
       })
 
-      // Save setting to room's gameConfig for persistence
-      // Settings are scoped by game name to preserve settings when switching games
+      // Save to room config for persistence
       if (roomData?.id) {
-        const currentGameConfig = (roomData.gameConfig as Record<string, any>) || {}
+        const currentGameConfig = (roomData.gameConfig as Record<string, unknown>) || {}
         const currentMemoryQuizConfig =
-          (currentGameConfig['memory-quiz'] as Record<string, any>) || {}
+          (currentGameConfig['memory-quiz'] as Record<string, unknown>) || {}
 
         updateGameConfig({
           roomId: roomData.id,
@@ -405,13 +452,27 @@ export function RoomMemoryQuizProvider({ children }: { children: ReactNode }) {
     [viewerId, sendMove, roomData?.id, roomData?.gameConfig, updateGameConfig]
   )
 
-  // Merge network state with local input state
+  // Legacy dispatch stub for UI-only actions
+  // TODO: Migrate these to local component state
+  const dispatch = useCallback((action: unknown) => {
+    console.warn(
+      '[MemoryQuizProvider] dispatch() is deprecated for UI-only actions. These should be migrated to local component state:',
+      action
+    )
+    // No-op - UI-only state changes should be handled locally
+  }, [])
+
+  // Merge network state with local input
   const mergedState = {
     ...state,
-    currentInput: localCurrentInput, // Override network state with local input
+    currentInput: localCurrentInput,
   }
 
-  // If state is corrupted, show error message instead of crashing
+  // Determine if current user is room creator
+  const isRoomCreator =
+    roomData?.members.find((member) => member.userId === viewerId)?.isCreator || false
+
+  // Handle state corruption
   if (hasStateCorruption) {
     return (
       <div
@@ -425,68 +486,18 @@ export function RoomMemoryQuizProvider({ children }: { children: ReactNode }) {
           minHeight: '400px',
         }}
       >
-        <div
-          style={{
-            fontSize: '48px',
-            marginBottom: '20px',
-          }}
-        >
-          ⚠️
-        </div>
+        <div style={{ fontSize: '48px', marginBottom: '20px' }}>⚠️</div>
         <h2
-          style={{
-            fontSize: '24px',
-            fontWeight: 'bold',
-            marginBottom: '12px',
-            color: '#dc2626',
-          }}
+          style={{ fontSize: '24px', fontWeight: 'bold', marginBottom: '12px', color: '#dc2626' }}
         >
           Game State Mismatch
         </h2>
-        <p
-          style={{
-            fontSize: '16px',
-            color: '#6b7280',
-            marginBottom: '24px',
-            maxWidth: '500px',
-          }}
-        >
+        <p style={{ fontSize: '16px', color: '#6b7280', marginBottom: '24px', maxWidth: '500px' }}>
           There's a mismatch between game types in this room. This usually happens when room members
           are playing different games.
         </p>
-        <div
-          style={{
-            background: '#f9fafb',
-            border: '1px solid #e5e7eb',
-            borderRadius: '8px',
-            padding: '16px',
-            marginBottom: '24px',
-            maxWidth: '500px',
-          }}
-        >
-          <p
-            style={{
-              fontSize: '14px',
-              fontWeight: '600',
-              marginBottom: '8px',
-            }}
-          >
-            To fix this:
-          </p>
-          <ol
-            style={{
-              fontSize: '14px',
-              textAlign: 'left',
-              paddingLeft: '20px',
-              lineHeight: '1.6',
-            }}
-          >
-            <li>Make sure all room members are on the same game page</li>
-            <li>Try refreshing the page</li>
-            <li>If the issue persists, leave and rejoin the room</li>
-          </ol>
-        </div>
         <button
+          type="button"
           onClick={() => window.location.reload()}
           style={{
             padding: '10px 20px',
@@ -505,21 +516,12 @@ export function RoomMemoryQuizProvider({ children }: { children: ReactNode }) {
     )
   }
 
-  // Determine if current user is the room creator (controls card timing)
-  const isRoomCreator =
-    roomData?.members.find((member) => member.userId === viewerId)?.isCreator || false
-
   const contextValue: MemoryQuizContextValue = {
     state: mergedState,
-    dispatch: () => {
-      // No-op - replaced with action creators
-      console.warn('dispatch() is deprecated in room mode, use action creators instead')
-    },
     isGameActive,
     resetGame,
     exitSession,
-    isRoomCreator, // Pass room creator flag to components
-    // Expose action creators for components to use
+    isRoomCreator,
     startQuiz,
     nextCard,
     showInputPhase,
@@ -528,10 +530,8 @@ export function RoomMemoryQuizProvider({ children }: { children: ReactNode }) {
     setInput,
     showResults,
     setConfig,
+    dispatch,
   }
 
   return <MemoryQuizContext.Provider value={contextValue}>{children}</MemoryQuizContext.Provider>
 }
-
-// Export the hook for this provider
-export { useMemoryQuiz } from './MemoryQuizContext'

apps/web/src/arcade-games/memory-quiz/Validator.ts

@@ -3,21 +3,18 @@
  * Validates all game moves and state transitions
  */
 
-import type { SorobanQuizState } from '@/app/arcade/memory-quiz/types'
-import type { MemoryQuizGameConfig } from '@/lib/arcade/game-configs'
+import type { GameValidator, ValidationResult } from '@/lib/arcade/game-sdk'
 import type {
-  GameValidator,
-  MemoryQuizGameMove,
+  MemoryQuizConfig,
+  MemoryQuizState,
+  MemoryQuizMove,
   MemoryQuizSetConfigMove,
-  ValidationResult,
 } from './types'
 
-export class MemoryQuizGameValidator
-  implements GameValidator<SorobanQuizState, MemoryQuizGameMove>
-{
+export class MemoryQuizGameValidator implements GameValidator<MemoryQuizState, MemoryQuizMove> {
   validateMove(
-    state: SorobanQuizState,
-    move: MemoryQuizGameMove,
+    state: MemoryQuizState,
+    move: MemoryQuizMove,
     context?: { userId?: string; playerOwnership?: Record<string, string> }
   ): ValidationResult {
     switch (move.type) {
@@ -58,7 +55,7 @@ export class MemoryQuizGameValidator
     }
   }
 
-  private validateStartQuiz(state: SorobanQuizState, data: any): ValidationResult {
+  private validateStartQuiz(state: MemoryQuizState, data: any): ValidationResult {
     // Can start quiz from setup or results phase
     if (state.gamePhase !== 'setup' && state.gamePhase !== 'results') {
       return {
@@ -102,7 +99,7 @@ export class MemoryQuizGameValidator
       return acc
     }, {})
 
-    const newState: SorobanQuizState = {
+    const newState: MemoryQuizState = {
       ...state,
       quizCards,
       correctAnswers: numbers,
@@ -127,7 +124,7 @@ export class MemoryQuizGameValidator
     }
   }
 
-  private validateNextCard(state: SorobanQuizState): ValidationResult {
+  private validateNextCard(state: MemoryQuizState): ValidationResult {
     // Must be in display phase
     if (state.gamePhase !== 'display') {
       return {
@@ -136,7 +133,7 @@ export class MemoryQuizGameValidator
       }
     }
 
-    const newState: SorobanQuizState = {
+    const newState: MemoryQuizState = {
       ...state,
       currentCardIndex: state.currentCardIndex + 1,
     }
@@ -147,7 +144,7 @@ export class MemoryQuizGameValidator
     }
   }
 
-  private validateShowInputPhase(state: SorobanQuizState): ValidationResult {
+  private validateShowInputPhase(state: MemoryQuizState): ValidationResult {
     // Must have shown all cards
     if (state.currentCardIndex < state.quizCards.length) {
       return {
@@ -156,7 +153,7 @@ export class MemoryQuizGameValidator
       }
     }
 
-    const newState: SorobanQuizState = {
+    const newState: MemoryQuizState = {
       ...state,
       gamePhase: 'input',
     }
@@ -168,7 +165,7 @@ export class MemoryQuizGameValidator
   }
 
   private validateAcceptNumber(
-    state: SorobanQuizState,
+    state: MemoryQuizState,
     number: number,
     userId?: string
   ): ValidationResult {
@@ -212,7 +209,7 @@ export class MemoryQuizGameValidator
       newNumberFoundBy[number] = userId
     }
 
-    const newState: SorobanQuizState = {
+    const newState: MemoryQuizState = {
       ...state,
       foundNumbers: [...state.foundNumbers, number],
       currentInput: '',
@@ -226,7 +223,7 @@ export class MemoryQuizGameValidator
     }
   }
 
-  private validateRejectNumber(state: SorobanQuizState, userId?: string): ValidationResult {
+  private validateRejectNumber(state: MemoryQuizState, userId?: string): ValidationResult {
     // Must be in input phase
     if (state.gamePhase !== 'input') {
       return {
@@ -254,7 +251,7 @@ export class MemoryQuizGameValidator
       }
     }
 
-    const newState: SorobanQuizState = {
+    const newState: MemoryQuizState = {
       ...state,
       guessesRemaining: state.guessesRemaining - 1,
       incorrectGuesses: state.incorrectGuesses + 1,
@@ -268,7 +265,7 @@ export class MemoryQuizGameValidator
     }
   }
 
-  private validateSetInput(state: SorobanQuizState, input: string): ValidationResult {
+  private validateSetInput(state: MemoryQuizState, input: string): ValidationResult {
     // Must be in input phase
     if (state.gamePhase !== 'input') {
       return {
@@ -285,7 +282,7 @@ export class MemoryQuizGameValidator
       }
     }
 
-    const newState: SorobanQuizState = {
+    const newState: MemoryQuizState = {
       ...state,
       currentInput: input,
     }
@@ -296,7 +293,7 @@ export class MemoryQuizGameValidator
     }
   }
 
-  private validateShowResults(state: SorobanQuizState): ValidationResult {
+  private validateShowResults(state: MemoryQuizState): ValidationResult {
     // Can show results from input phase
     if (state.gamePhase !== 'input') {
       return {
@@ -305,7 +302,7 @@ export class MemoryQuizGameValidator
       }
     }
 
-    const newState: SorobanQuizState = {
+    const newState: MemoryQuizState = {
       ...state,
       gamePhase: 'results',
     }
@@ -316,9 +313,9 @@ export class MemoryQuizGameValidator
     }
   }
 
-  private validateResetQuiz(state: SorobanQuizState): ValidationResult {
+  private validateResetQuiz(state: MemoryQuizState): ValidationResult {
     // Can reset from any phase
-    const newState: SorobanQuizState = {
+    const newState: MemoryQuizState = {
       ...state,
       gamePhase: 'setup',
       quizCards: [],
@@ -340,7 +337,7 @@ export class MemoryQuizGameValidator
   }
 
   private validateSetConfig(
-    state: SorobanQuizState,
+    state: MemoryQuizState,
     field: 'selectedCount' | 'displayTime' | 'selectedDifficulty' | 'playMode',
     value: any
   ): ValidationResult {
@@ -392,11 +389,11 @@ export class MemoryQuizGameValidator
     }
   }
 
-  isGameComplete(state: SorobanQuizState): boolean {
+  isGameComplete(state: MemoryQuizState): boolean {
     return state.gamePhase === 'results'
   }
 
-  getInitialState(config: MemoryQuizGameConfig): SorobanQuizState {
+  getInitialState(config: MemoryQuizConfig): MemoryQuizState {
     return {
       cards: [],
       quizCards: [],

apps/web/src/arcade-games/memory-quiz/components/CardGrid.tsx

@@ -1,8 +1,8 @@
 import { AbacusReact } from '@soroban/abacus-react'
-import type { SorobanQuizState } from '../types'
+import type { MemoryQuizState } from '../types'
 
 interface CardGridProps {
-  state: SorobanQuizState
+  state: MemoryQuizState
 }
 
 export function CardGrid({ state }: CardGridProps) {

apps/web/src/arcade-games/memory-quiz/components/DisplayPhase.tsx

@@ -1,6 +1,6 @@
 import { AbacusReact, useAbacusConfig } from '@soroban/abacus-react'
 import { useEffect, useMemo, useRef, useState } from 'react'
-import { useMemoryQuiz } from '../context/MemoryQuizContext'
+import { useMemoryQuiz } from '../Provider'
 import type { QuizCard } from '../types'
 
 // Calculate maximum columns needed for a set of numbers

apps/web/src/arcade-games/memory-quiz/components/InputPhase.tsx

@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useState } from 'react'
 import { isPrefix } from '@/lib/memory-quiz-utils'
-import { useMemoryQuiz } from '../context/MemoryQuizContext'
+import { useMemoryQuiz } from '../Provider'
 import { CardGrid } from './CardGrid'
 
 export function InputPhase() {

apps/web/src/arcade-games/memory-quiz/components/MemoryQuizGame.tsx

@@ -3,8 +3,8 @@
 import Link from 'next/link'
 import { useRouter } from 'next/navigation'
 import { PageWithNav } from '@/components/PageWithNav'
-import { css } from '../../../../../styled-system/css'
-import { useMemoryQuiz } from '../context/MemoryQuizContext'
+import { css } from '../../../../styled-system/css'
+import { useMemoryQuiz } from '../Provider'
 import { DisplayPhase } from './DisplayPhase'
 import { InputPhase } from './InputPhase'
 import { ResultsPhase } from './ResultsPhase'

apps/web/src/arcade-games/memory-quiz/components/ResultsCardGrid.tsx

@@ -1,8 +1,8 @@
 import { AbacusReact } from '@soroban/abacus-react'
-import type { SorobanQuizState } from '../types'
+import type { MemoryQuizState } from '../types'
 
 interface ResultsCardGridProps {
-  state: SorobanQuizState
+  state: MemoryQuizState
 }
 
 export function ResultsCardGrid({ state }: ResultsCardGridProps) {

apps/web/src/arcade-games/memory-quiz/components/ResultsPhase.tsx

@@ -1,5 +1,5 @@
 import { useAbacusConfig } from '@soroban/abacus-react'
-import { useMemoryQuiz } from '../context/MemoryQuizContext'
+import { useMemoryQuiz } from '../Provider'
 import { DIFFICULTY_LEVELS, type DifficultyLevel, type QuizCard } from '../types'
 import { ResultsCardGrid } from './ResultsCardGrid'
 
@@ -384,7 +384,7 @@ export function ResultsPhase() {
                 // Group players by userId
                 const userTeams = new Map<
                   string,
-                  { userId: string; players: any[]; score: { correct: number; incorrect: 0 } }
+                  { userId: string; players: any[]; score: { correct: number; incorrect: number } }
                 >()
 
                 console.log('🤝 [ResultsPhase] Building team contributions:', {

apps/web/src/arcade-games/memory-quiz/components/SetupPhase.tsx

@@ -1,5 +1,5 @@
 import { AbacusReact, useAbacusConfig } from '@soroban/abacus-react'
-import { useMemoryQuiz } from '../context/MemoryQuizContext'
+import { useMemoryQuiz } from '../Provider'
 import { DIFFICULTY_LEVELS, type DifficultyLevel, type QuizCard } from '../types'
 
 // Generate quiz cards with difficulty-based number ranges

apps/web/src/arcade-games/memory-quiz/index.ts

@@ -0,0 +1,85 @@
+/**
+ * Memory Quiz (Memory Lightning) Game Definition
+ *
+ * A memory game where players memorize soroban numbers and recall them.
+ * Supports both cooperative and competitive multiplayer modes.
+ */
+
+import { defineGame } from '@/lib/arcade/game-sdk'
+import type { GameManifest } from '@/lib/arcade/game-sdk'
+import { MemoryQuizGame } from './components/MemoryQuizGame'
+import { MemoryQuizProvider } from './Provider'
+import type { MemoryQuizConfig, MemoryQuizMove, MemoryQuizState } from './types'
+import { memoryQuizGameValidator } from './Validator'
+
+const manifest: GameManifest = {
+  name: 'memory-quiz',
+  displayName: 'Memory Lightning',
+  icon: '🧠',
+  description: 'Memorize soroban numbers and recall them',
+  longDescription:
+    'Test your memory by studying soroban numbers for a brief time, then recall as many as you can. ' +
+    'Choose your difficulty level, number of cards, and display time. Play cooperatively with friends or compete for the highest score!',
+  maxPlayers: 8,
+  difficulty: 'Intermediate',
+  chips: ['👥 Multiplayer', '🧠 Memory', '🧮 Soroban'],
+  color: 'blue',
+  gradient: 'linear-gradient(135deg, #dbeafe, #bfdbfe)',
+  borderColor: 'blue.200',
+  available: true,
+}
+
+const defaultConfig: MemoryQuizConfig = {
+  selectedCount: 5,
+  displayTime: 2.0,
+  selectedDifficulty: 'easy',
+  playMode: 'cooperative',
+}
+
+// Config validation function
+function validateMemoryQuizConfig(config: unknown): config is MemoryQuizConfig {
+  if (typeof config !== 'object' || config === null) {
+    return false
+  }
+
+  const c = config as any
+
+  // Validate selectedCount
+  if (!('selectedCount' in c) || ![2, 5, 8, 12, 15].includes(c.selectedCount)) {
+    return false
+  }
+
+  // Validate displayTime
+  if (
+    !('displayTime' in c) ||
+    typeof c.displayTime !== 'number' ||
+    c.displayTime < 0.5 ||
+    c.displayTime > 10
+  ) {
+    return false
+  }
+
+  // Validate selectedDifficulty
+  if (
+    !('selectedDifficulty' in c) ||
+    !['beginner', 'easy', 'medium', 'hard', 'expert'].includes(c.selectedDifficulty)
+  ) {
+    return false
+  }
+
+  // Validate playMode
+  if (!('playMode' in c) || !['cooperative', 'competitive'].includes(c.playMode)) {
+    return false
+  }
+
+  return true
+}
+
+export const memoryQuizGame = defineGame<MemoryQuizConfig, MemoryQuizState, MemoryQuizMove>({
+  manifest,
+  Provider: MemoryQuizProvider,
+  GameComponent: MemoryQuizGame,
+  validator: memoryQuizGameValidator,
+  defaultConfig,
+  validateConfig: validateMemoryQuizConfig,
+})

apps/web/src/arcade-games/memory-quiz/types.ts

@@ -1,3 +1,4 @@
+import type { GameConfig, GameState } from '@/lib/arcade/game-sdk'
 import type { PlayerMetadata } from '@/lib/arcade/player-ownership.client'
 
 export interface QuizCard {
@@ -11,7 +12,16 @@ export interface PlayerScore {
   incorrect: number
 }
 
-export interface SorobanQuizState {
+// Memory Quiz Configuration
+export interface MemoryQuizConfig extends GameConfig {
+  selectedCount: 2 | 5 | 8 | 12 | 15
+  displayTime: number
+  selectedDifficulty: DifficultyLevel
+  playMode: 'cooperative' | 'competitive'
+}
+
+// Memory Quiz State
+export interface MemoryQuizState extends GameState {
   // Core game data
   cards: QuizCard[]
   quizCards: QuizCard[]
@@ -52,6 +62,7 @@ export interface SorobanQuizState {
   showOnScreenKeyboard: boolean
 }
 
+// Legacy reducer actions (deprecated - will be removed)
 export type QuizAction =
   | { type: 'SET_CARDS'; cards: QuizCard[] }
   | { type: 'SET_DISPLAY_TIME'; time: number }
@@ -103,3 +114,79 @@ export const DIFFICULTY_LEVELS = {
 } as const
 
 export type DifficultyLevel = keyof typeof DIFFICULTY_LEVELS
+
+// Memory Quiz Move Types (SDK-compatible)
+export type MemoryQuizMove =
+  | {
+      type: 'START_QUIZ'
+      playerId: string
+      userId: string
+      timestamp: number
+      data: {
+        numbers: number[]
+        quizCards?: QuizCard[]
+        activePlayers: string[]
+        playerMetadata: Record<string, PlayerMetadata>
+      }
+    }
+  | {
+      type: 'NEXT_CARD'
+      playerId: string
+      userId: string
+      timestamp: number
+      data: Record<string, never>
+    }
+  | {
+      type: 'SHOW_INPUT_PHASE'
+      playerId: string
+      userId: string
+      timestamp: number
+      data: Record<string, never>
+    }
+  | {
+      type: 'ACCEPT_NUMBER'
+      playerId: string
+      userId: string
+      timestamp: number
+      data: { number: number }
+    }
+  | {
+      type: 'REJECT_NUMBER'
+      playerId: string
+      userId: string
+      timestamp: number
+      data: Record<string, never>
+    }
+  | {
+      type: 'SET_INPUT'
+      playerId: string
+      userId: string
+      timestamp: number
+      data: { input: string }
+    }
+  | {
+      type: 'SHOW_RESULTS'
+      playerId: string
+      userId: string
+      timestamp: number
+      data: Record<string, never>
+    }
+  | {
+      type: 'RESET_QUIZ'
+      playerId: string
+      userId: string
+      timestamp: number
+      data: Record<string, never>
+    }
+  | {
+      type: 'SET_CONFIG'
+      playerId: string
+      userId: string
+      timestamp: number
+      data: {
+        field: 'selectedCount' | 'displayTime' | 'selectedDifficulty' | 'playMode'
+        value: any
+      }
+    }
+
+export type MemoryQuizSetConfigMove = Extract<MemoryQuizMove, { type: 'SET_CONFIG' }>

apps/web/src/arcade-games/number-guesser/index.ts

@@ -34,6 +34,23 @@ const defaultConfig: NumberGuesserConfig = {
   roundsToWin: 3,
 }
 
+// Config validation function
+function validateNumberGuesserConfig(config: unknown): config is NumberGuesserConfig {
+  return (
+    typeof config === 'object' &&
+    config !== null &&
+    'minNumber' in config &&
+    'maxNumber' in config &&
+    'roundsToWin' in config &&
+    typeof config.minNumber === 'number' &&
+    typeof config.maxNumber === 'number' &&
+    typeof config.roundsToWin === 'number' &&
+    config.minNumber >= 1 &&
+    config.maxNumber > config.minNumber &&
+    config.roundsToWin >= 1
+  )
+}
+
 // Export game definition
 export const numberGuesserGame = defineGame<
   NumberGuesserConfig,
@@ -45,4 +62,5 @@ export const numberGuesserGame = defineGame<
   GameComponent,
   validator: numberGuesserValidator,
   defaultConfig,
+  validateConfig: validateNumberGuesserConfig,
 })

apps/web/src/components/GameSelector.tsx

@@ -8,21 +8,6 @@ import { GameCard } from './GameCard'
 
 // Game configuration defining player limits
 export const GAMES_CONFIG = {
-  'memory-quiz': {
-    name: 'Memory Lightning',
-    fullName: 'Memory Lightning ⚡',
-    maxPlayers: 4,
-    description: 'Test your memory speed with rapid-fire abacus calculations',
-    longDescription:
-      'Challenge yourself or compete with friends in lightning-fast memory tests. Work together cooperatively or compete for the highest score!',
-    url: '/arcade/memory-quiz',
-    icon: '⚡',
-    chips: ['👥 Multiplayer', '🔥 Speed Challenge', '🧮 Abacus Focus'],
-    color: 'green',
-    gradient: 'linear-gradient(135deg, #dcfce7, #bbf7d0)',
-    borderColor: 'green.200',
-    difficulty: 'Beginner',
-  },
   'battle-arena': {
     name: 'Matching Pairs Battle',
     fullName: 'Matching Pairs Battle ⚔️',

apps/web/src/components/nav/JoinRoomModal.tsx

@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react'
 import { io } from 'socket.io-client'
 import { Modal } from '@/components/common/Modal'
-import type { schema } from '@/db'
+import type { RoomData } from '@/hooks/useRoomData'
 import { useGetRoomByCode, useJoinRoom } from '@/hooks/useRoomData'
 
 export interface JoinRoomModalProps {
@@ -26,12 +26,12 @@ export interface JoinRoomModalProps {
  */
 export function JoinRoomModal({ isOpen, onClose, onSuccess }: JoinRoomModalProps) {
   const { mutateAsync: getRoomByCode } = useGetRoomByCode()
-  const { mutate: joinRoom } = useJoinRoom()
+  const { mutateAsync: joinRoom } = useJoinRoom()
   const [code, setCode] = useState('')
   const [password, setPassword] = useState('')
   const [error, setError] = useState('')
   const [isLoading, setIsLoading] = useState(false)
-  const [roomInfo, setRoomInfo] = useState<schema.ArcadeRoom | null>(null)
+  const [roomInfo, setRoomInfo] = useState<RoomData | null>(null)
   const [needsPassword, setNeedsPassword] = useState(false)
   const [needsApproval, setNeedsApproval] = useState(false)
   const [approvalRequested, setApprovalRequested] = useState(false)
@@ -102,7 +102,7 @@ export function JoinRoomModal({ isOpen, onClose, onSuccess }: JoinRoomModalProps
       }
 
       // Join the room (with password if needed)
-      await joinRoom(room.id, password || undefined)
+      await joinRoom({ roomId: room.id, password: password || undefined })
 
       // Success! Close modal
       handleClose()
@@ -175,7 +175,7 @@ export function JoinRoomModal({ isOpen, onClose, onSuccess }: JoinRoomModalProps
           if (data.roomId === roomInfo.id) {
             console.log('[JoinRoomModal] Joining room automatically...')
             try {
-              await joinRoom(roomInfo.id)
+              await joinRoom({ roomId: roomInfo.id })
               handleClose()
               onSuccess?.()
             } catch (err) {

apps/web/src/components/nav/ModerationPanel.tsx

@@ -1,7 +1,8 @@
 import * as Dialog from '@radix-ui/react-dialog'
 import { useEffect, useState } from 'react'
 import { Modal } from '@/components/common/Modal'
-import type { RoomBan, RoomMember, RoomReport } from '@/db/schema'
+import type { RoomBan, RoomReport } from '@/db/schema'
+import type { RoomMember } from '@/hooks/useRoomData'
 
 export interface RoomPlayer {
   id: string

apps/web/src/db/schema/arcade-rooms.ts

@@ -33,9 +33,8 @@ export const arcadeRooms = sqliteTable('arcade_rooms', {
   displayPassword: text('display_password', { length: 100 }), // Plain text password for display to room owner
 
   // Game configuration (nullable to support game selection in room)
-  gameName: text('game_name', {
-    enum: ['matching', 'memory-quiz', 'complement-race', 'number-guesser'],
-  }),
+  // Accepts any string - validation happens at runtime against validator registry
+  gameName: text('game_name'),
   gameConfig: text('game_config', { mode: 'json' }), // Game-specific settings (nullable when no game selected)
 
   // Current state

apps/web/src/db/schema/arcade-sessions.ts

@@ -16,9 +16,8 @@ export const arcadeSessions = sqliteTable('arcade_sessions', {
     .references(() => users.id, { onDelete: 'cascade' }),
 
   // Session metadata
-  currentGame: text('current_game', {
-    enum: ['matching', 'memory-quiz', 'complement-race', 'number-guesser'],
-  }).notNull(),
+  // Accepts any string - validation happens at runtime against validator registry
+  currentGame: text('current_game').notNull(),
 
   gameUrl: text('game_url').notNull(), // e.g., '/arcade/matching'
 

apps/web/src/db/schema/room-game-configs.ts

@@ -19,15 +19,16 @@ export const roomGameConfigs = sqliteTable(
       .references(() => arcadeRooms.id, { onDelete: 'cascade' }),
 
     // Game identifier
-    gameName: text('game_name', {
-      enum: ['matching', 'memory-quiz', 'complement-race', 'number-guesser'],
-    }).notNull(),
+    // Accepts any string - validation happens at runtime against validator registry
+    gameName: text('game_name').notNull(),
 
     // Game-specific configuration JSON
     // Structure depends on gameName:
     // - matching: { gameType, difficulty, turnTimer }
     // - memory-quiz: { selectedCount, displayTime, selectedDifficulty, playMode }
     // - complement-race: TBD
+    // - number-guesser: { minNumber, maxNumber, roundsToWin }
+    // - math-sprint: { difficulty, questionsPerRound, timePerQuestion }
     config: text('config', { mode: 'json' }).notNull(),
 
     // Timestamps

apps/web/src/lib/arcade/game-config-helpers.ts

@@ -15,8 +15,25 @@ import {
   DEFAULT_MEMORY_QUIZ_CONFIG,
   DEFAULT_COMPLEMENT_RACE_CONFIG,
   DEFAULT_NUMBER_GUESSER_CONFIG,
+  DEFAULT_MATH_SPRINT_CONFIG,
 } from './game-configs'
 
+// Lazy-load game registry to avoid loading React components on server
+function getGame(gameName: string) {
+  // Only load game registry in browser environment
+  // On server, we fall back to switch statement validation
+  if (typeof window !== 'undefined') {
+    try {
+      const { getGame: registryGetGame } = require('./game-registry')
+      return registryGetGame(gameName)
+    } catch (error) {
+      console.warn('[GameConfig] Failed to load game registry:', error)
+      return undefined
+    }
+  }
+  return undefined
+}
+
 /**
  * Extended game name type that includes both registered validators and legacy games
  * TODO: Remove 'complement-race' once migrated to the new modular system
@@ -36,6 +53,8 @@ function getDefaultGameConfig(gameName: ExtendedGameName): GameConfigByName[Exte
       return DEFAULT_COMPLEMENT_RACE_CONFIG
     case 'number-guesser':
       return DEFAULT_NUMBER_GUESSER_CONFIG
+    case 'math-sprint':
+      return DEFAULT_MATH_SPRINT_CONFIG
     default:
       throw new Error(`Unknown game: ${gameName}`)
   }
@@ -173,8 +192,20 @@ export async function deleteAllGameConfigs(roomId: string): Promise<void> {
 /**
  * Validate a game config at runtime
  * Returns true if the config is valid for the given game
+ *
+ * NEW: Uses game registry validation functions instead of switch statements.
+ * Games now own their own validation logic!
  */
 export function validateGameConfig(gameName: ExtendedGameName, config: any): boolean {
+  // Try to get game from registry
+  const game = getGame(gameName)
+
+  // If game has a validateConfig function, use it
+  if (game && game.validateConfig) {
+    return game.validateConfig(config)
+  }
+
+  // Fallback for legacy games without registry (e.g., complement-race, matching, memory-quiz)
   switch (gameName) {
     case 'matching':
       return (
@@ -203,19 +234,8 @@ export function validateGameConfig(gameName: ExtendedGameName, config: any): boo
       // TODO: Add validation when complement-race settings are defined
       return typeof config === 'object' && config !== null
 
-    case 'number-guesser':
-      return (
-        typeof config === 'object' &&
-        config !== null &&
-        typeof config.minNumber === 'number' &&
-        typeof config.maxNumber === 'number' &&
-        typeof config.roundsToWin === 'number' &&
-        config.minNumber >= 1 &&
-        config.maxNumber > config.minNumber &&
-        config.roundsToWin >= 1
-      )
-
     default:
-      return false
+      // If no validator found, accept any object
+      return typeof config === 'object' && config !== null
   }
 }

apps/web/src/lib/arcade/game-configs.ts

@@ -1,7 +1,10 @@
 /**
  * Shared game configuration types
  *
- * This is the single source of truth for all game settings.
+ * ARCHITECTURE: Phase 3 - Type Inference
+ * - Modern games (number-guesser, math-sprint, memory-quiz): Types inferred from game definitions
+ * - Legacy games (matching, complement-race): Manual types until migrated
+ *
  * These types are used across:
  * - Database storage (room_game_configs table)
  * - Validators (getInitialState method signatures)
@@ -9,9 +12,46 @@
  * - Helper functions (reading/writing configs)
  */
 
-import type { DifficultyLevel } from '@/app/arcade/memory-quiz/types'
 import type { Difficulty, GameType } from '@/app/games/matching/context/types'
 
+// Type-only imports (won't load React components at runtime)
+import type { numberGuesserGame } from '@/arcade-games/number-guesser'
+import type { mathSprintGame } from '@/arcade-games/math-sprint'
+import type { memoryQuizGame } from '@/arcade-games/memory-quiz'
+
+/**
+ * Utility type: Extract config type from a game definition
+ * Uses TypeScript's infer keyword to extract the TConfig generic
+ */
+type InferGameConfig<T> = T extends { defaultConfig: infer Config } ? Config : never
+
+// ============================================================================
+// Modern Games (Type Inference from Game Definitions)
+// ============================================================================
+
+/**
+ * Configuration for number-guesser game
+ * INFERRED from numberGuesserGame.defaultConfig
+ */
+export type NumberGuesserGameConfig = InferGameConfig<typeof numberGuesserGame>
+
+/**
+ * Configuration for math-sprint game
+ * INFERRED from mathSprintGame.defaultConfig
+ */
+export type MathSprintGameConfig = InferGameConfig<typeof mathSprintGame>
+
+/**
+ * Configuration for memory-quiz (soroban lightning) game
+ * INFERRED from memoryQuizGame.defaultConfig
+ */
+export type MemoryQuizGameConfig = InferGameConfig<typeof memoryQuizGame>
+
+// ============================================================================
+// Legacy Games (Manual Type Definitions)
+// TODO: Migrate these games to the modular system for type inference
+// ============================================================================
+
 /**
  * Configuration for matching (memory pairs) game
  */
@@ -21,16 +61,6 @@ export interface MatchingGameConfig {
   turnTimer: number
 }
 
-/**
- * Configuration for memory-quiz (soroban lightning) game
- */
-export interface MemoryQuizGameConfig {
-  selectedCount: 2 | 5 | 8 | 12 | 15
-  displayTime: number
-  selectedDifficulty: DifficultyLevel
-  playMode: 'cooperative' | 'competitive'
-}
-
 /**
  * Configuration for complement-race game
  * TODO: Define when implementing complement-race settings
@@ -40,34 +70,33 @@ export interface ComplementRaceGameConfig {
   placeholder?: never
 }
 
-/**
- * Configuration for number-guesser game
- */
-export interface NumberGuesserGameConfig {
-  minNumber: number
-  maxNumber: number
-  roundsToWin: number
-}
+// ============================================================================
+// Combined Types
+// ============================================================================
 
 /**
  * Union type of all game configs for type-safe access
+ * Modern games use inferred types, legacy games use manual types
  */
 export type GameConfigByName = {
-  matching: MatchingGameConfig
-  'memory-quiz': MemoryQuizGameConfig
-  'complement-race': ComplementRaceGameConfig
+  // Modern games (inferred types)
   'number-guesser': NumberGuesserGameConfig
+  'math-sprint': MathSprintGameConfig
+  'memory-quiz': MemoryQuizGameConfig
+
+  // Legacy games (manual types)
+  matching: MatchingGameConfig
+  'complement-race': ComplementRaceGameConfig
 }
 
 /**
  * Room's game configuration object (nested by game name)
  * This matches the structure stored in room_game_configs table
+ *
+ * AUTO-DERIVED: Adding a game to GameConfigByName automatically adds it here
  */
-export interface RoomGameConfig {
-  matching?: MatchingGameConfig
-  'memory-quiz'?: MemoryQuizGameConfig
-  'complement-race'?: ComplementRaceGameConfig
-  'number-guesser'?: NumberGuesserGameConfig
+export type RoomGameConfig = {
+  [K in keyof GameConfigByName]?: GameConfigByName[K]
 }
 
 /**
@@ -95,3 +124,9 @@ export const DEFAULT_NUMBER_GUESSER_CONFIG: NumberGuesserGameConfig = {
   maxNumber: 100,
   roundsToWin: 3,
 }
+
+export const DEFAULT_MATH_SPRINT_CONFIG: MathSprintGameConfig = {
+  difficulty: 'medium',
+  questionsPerRound: 10,
+  timePerQuestion: 30,
+}

apps/web/src/lib/arcade/game-registry.ts

@@ -107,5 +107,9 @@ export function clearRegistry(): void {
 // ============================================================================
 
 import { numberGuesserGame } from '@/arcade-games/number-guesser'
+import { mathSprintGame } from '@/arcade-games/math-sprint'
+import { memoryQuizGame } from '@/arcade-games/memory-quiz'
 
 registerGame(numberGuesserGame)
+registerGame(mathSprintGame)
+registerGame(memoryQuizGame)

apps/web/src/lib/arcade/game-sdk/define-game.ts

@@ -36,6 +36,9 @@ export interface DefineGameOptions<
 
   /** Default configuration for the game */
   defaultConfig: TConfig
+
+  /** Optional: Runtime config validation function */
+  validateConfig?: (config: unknown) => config is TConfig
 }
 
 /**
@@ -63,7 +66,7 @@ export function defineGame<
   TState extends GameState,
   TMove extends GameMove,
 >(options: DefineGameOptions<TConfig, TState, TMove>): GameDefinition<TConfig, TState, TMove> {
-  const { manifest, Provider, GameComponent, validator, defaultConfig } = options
+  const { manifest, Provider, GameComponent, validator, defaultConfig, validateConfig } = options
 
   // Validate that manifest.name matches the game identifier
   if (!manifest.name) {
@@ -76,5 +79,6 @@ export function defineGame<
     GameComponent,
     validator,
     defaultConfig,
+    validateConfig,
   }
 }

apps/web/src/lib/arcade/game-sdk/types.ts

@@ -77,4 +77,13 @@ export interface GameDefinition<
 
   /** Default configuration */
   defaultConfig: TConfig
+
+  /**
+   * Validate a config object at runtime
+   * Returns true if config is valid for this game
+   *
+   * @param config - Configuration object to validate
+   * @returns true if valid, false otherwise
+   */
+  validateConfig?: (config: unknown) => config is TConfig
 }

apps/web/src/lib/arcade/validation/types.ts

@@ -4,7 +4,7 @@
  */
 
 import type { MemoryPairsState } from '@/app/games/matching/context/types'
-import type { SorobanQuizState } from '@/app/arcade/memory-quiz/types'
+import type { MemoryQuizState as SorobanQuizState } from '@/arcade-games/memory-quiz/types'
 
 /**
  * Game name type - auto-derived from validator registry

apps/web/src/lib/arcade/validators.ts

@@ -11,8 +11,9 @@
  */
 
 import { matchingGameValidator } from './validation/MatchingGameValidator'
-import { memoryQuizGameValidator } from './validation/MemoryQuizGameValidator'
+import { memoryQuizGameValidator } from '@/arcade-games/memory-quiz/Validator'
 import { numberGuesserValidator } from '@/arcade-games/number-guesser/Validator'
+import { mathSprintValidator } from '@/arcade-games/math-sprint/Validator'
 import type { GameValidator } from './validation/types'
 
 /**
@@ -24,6 +25,7 @@ export const validatorRegistry = {
   matching: matchingGameValidator,
   'memory-quiz': memoryQuizGameValidator,
   'number-guesser': numberGuesserValidator,
+  'math-sprint': mathSprintValidator,
   // Add new games here - GameName type will auto-update
 } as const
 
@@ -62,7 +64,37 @@ export function getRegisteredGameNames(): GameName[] {
   return Object.keys(validatorRegistry) as GameName[]
 }
 
+/**
+ * Validate a game name at runtime
+ * Use this instead of TypeScript enums to check if a game is valid
+ *
+ * @param gameName - Game name to validate
+ * @returns true if game has a registered validator
+ */
+export function isValidGameName(gameName: unknown): gameName is GameName {
+  return typeof gameName === 'string' && hasValidator(gameName)
+}
+
+/**
+ * Assert that a game name is valid, throw if not
+ *
+ * @param gameName - Game name to validate
+ * @throws Error if game name is invalid
+ */
+export function assertValidGameName(gameName: unknown): asserts gameName is GameName {
+  if (!isValidGameName(gameName)) {
+    throw new Error(
+      `Invalid game name: ${gameName}. Must be one of: ${getRegisteredGameNames().join(', ')}`
+    )
+  }
+}
+
 /**
  * Re-export validators for backwards compatibility
  */
-export { matchingGameValidator, memoryQuizGameValidator, numberGuesserValidator }
+export {
+  matchingGameValidator,
+  memoryQuizGameValidator,
+  numberGuesserValidator,
+  mathSprintValidator,
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "soroban-monorepo",
-  "version": "3.22.3",
+  "version": "4.1.0",
   "private": true,
   "description": "Beautiful Soroban Flashcard Generator - Monorepo",
   "workspaces": [

packages/core/client/browser/node_modules/.bin/tsc

@@ -6,12 +6,12 @@ case `uname` in
 esac
 
 if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/bin/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/bin/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules"
 else
-  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/bin/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules:$NODE_PATH"
+  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/bin/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules:$NODE_PATH"
 fi
 if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../../../../../../node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/bin/tsc" "$@"
+  exec "$basedir/node"  "$basedir/../typescript/bin/tsc" "$@"
 else
-  exec node  "$basedir/../../../../../../node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/bin/tsc" "$@"
+  exec node  "$basedir/../typescript/bin/tsc" "$@"
 fi

packages/core/client/browser/node_modules/.bin/tsserver

@@ -6,12 +6,12 @@ case `uname` in
 esac
 
 if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/bin/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/bin/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules"
 else
-  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/bin/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules:$NODE_PATH"
+  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/bin/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules:$NODE_PATH"
 fi
 if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../../../../../../node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/bin/tsserver" "$@"
+  exec "$basedir/node"  "$basedir/../typescript/bin/tsserver" "$@"
 else
-  exec node  "$basedir/../../../../../../node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/bin/tsserver" "$@"
+  exec node  "$basedir/../typescript/bin/tsserver" "$@"
 fi

packages/core/client/browser/node_modules/.bin/vite

@@ -6,12 +6,12 @@ case `uname` in
 esac
 
 if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/vite@5.0.0_@types+node@20.0.0/node_modules/vite/bin/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/vite@5.0.0_@types+node@20.0.0/node_modules/vite/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/vite@5.0.0_@types+node@20.0.0/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/vite@5.4.20_@types+node@20.19.19_terser@5.44.0/node_modules/vite/bin/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/vite@5.4.20_@types+node@20.19.19_terser@5.44.0/node_modules/vite/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/vite@5.4.20_@types+node@20.19.19_terser@5.44.0/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules"
 else
-  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/vite@5.0.0_@types+node@20.0.0/node_modules/vite/bin/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/vite@5.0.0_@types+node@20.0.0/node_modules/vite/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/vite@5.0.0_@types+node@20.0.0/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules:$NODE_PATH"
+  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/vite@5.4.20_@types+node@20.19.19_terser@5.44.0/node_modules/vite/bin/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/vite@5.4.20_@types+node@20.19.19_terser@5.44.0/node_modules/vite/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/vite@5.4.20_@types+node@20.19.19_terser@5.44.0/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules:$NODE_PATH"
 fi
 if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../../../../../../node_modules/.pnpm/vite@5.0.0_@types+node@20.0.0/node_modules/vite/bin/vite.js" "$@"
+  exec "$basedir/node"  "$basedir/../vite/bin/vite.js" "$@"
 else
-  exec node  "$basedir/../../../../../../node_modules/.pnpm/vite@5.0.0_@types+node@20.0.0/node_modules/vite/bin/vite.js" "$@"
+  exec node  "$basedir/../vite/bin/vite.js" "$@"
 fi

packages/core/client/browser/node_modules/vite

@@ -1 +1 @@
-../../../../../node_modules/.pnpm/vite@5.0.0_@types+node@20.0.0/node_modules/vite
+../../../../../node_modules/.pnpm/vite@5.4.20_@types+node@20.19.19_terser@5.44.0/node_modules/vite

packages/core/client/node/node_modules/.bin/tsc

@@ -6,12 +6,12 @@ case `uname` in
 esac
 
 if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/bin/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/bin/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules"
 else
-  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/bin/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules:$NODE_PATH"
+  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/bin/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules:$NODE_PATH"
 fi
 if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../../../../../../node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/bin/tsc" "$@"
+  exec "$basedir/node"  "$basedir/../typescript/bin/tsc" "$@"
 else
-  exec node  "$basedir/../../../../../../node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/bin/tsc" "$@"
+  exec node  "$basedir/../typescript/bin/tsc" "$@"
 fi

packages/core/client/node/node_modules/.bin/tsserver

@@ -6,12 +6,12 @@ case `uname` in
 esac
 
 if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/bin/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/bin/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules"
 else
-  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/bin/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules:$NODE_PATH"
+  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/bin/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules:$NODE_PATH"
 fi
 if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../../../../../../node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/bin/tsserver" "$@"
+  exec "$basedir/node"  "$basedir/../typescript/bin/tsserver" "$@"
 else
-  exec node  "$basedir/../../../../../../node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/bin/tsserver" "$@"
+  exec node  "$basedir/../typescript/bin/tsserver" "$@"
 fi

packages/core/client/node/node_modules/.bin/tsup

@@ -6,12 +6,12 @@ case `uname` in
 esac
 
 if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules/tsup/dist/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules/tsup/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.3.0_postcss@8.5.6_typescript@5.9.3/node_modules/tsup/dist/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.3.0_postcss@8.5.6_typescript@5.9.3/node_modules/tsup/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.3.0_postcss@8.5.6_typescript@5.9.3/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules"
 else
-  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules/tsup/dist/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules/tsup/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules:$NODE_PATH"
+  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.3.0_postcss@8.5.6_typescript@5.9.3/node_modules/tsup/dist/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.3.0_postcss@8.5.6_typescript@5.9.3/node_modules/tsup/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.3.0_postcss@8.5.6_typescript@5.9.3/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules:$NODE_PATH"
 fi
 if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../../../../../../node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules/tsup/dist/cli-default.js" "$@"
+  exec "$basedir/node"  "$basedir/../tsup/dist/cli-default.js" "$@"
 else
-  exec node  "$basedir/../../../../../../node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules/tsup/dist/cli-default.js" "$@"
+  exec node  "$basedir/../tsup/dist/cli-default.js" "$@"
 fi

packages/core/client/node/node_modules/.bin/tsup-node

@@ -6,12 +6,12 @@ case `uname` in
 esac
 
 if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules/tsup/dist/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules/tsup/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.3.0_postcss@8.5.6_typescript@5.9.3/node_modules/tsup/dist/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.3.0_postcss@8.5.6_typescript@5.9.3/node_modules/tsup/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.3.0_postcss@8.5.6_typescript@5.9.3/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules"
 else
-  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules/tsup/dist/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules/tsup/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules:$NODE_PATH"
+  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.3.0_postcss@8.5.6_typescript@5.9.3/node_modules/tsup/dist/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.3.0_postcss@8.5.6_typescript@5.9.3/node_modules/tsup/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.3.0_postcss@8.5.6_typescript@5.9.3/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules:$NODE_PATH"
 fi
 if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../../../../../../node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules/tsup/dist/cli-node.js" "$@"
+  exec "$basedir/node"  "$basedir/../tsup/dist/cli-node.js" "$@"
 else
-  exec node  "$basedir/../../../../../../node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules/tsup/dist/cli-node.js" "$@"
+  exec node  "$basedir/../tsup/dist/cli-node.js" "$@"
 fi

packages/core/client/node/node_modules/.bin/vitest

@@ -6,12 +6,12 @@ case `uname` in
 esac
 
 if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/vitest@1.0.0_@types+node@20.0.0_@vitest+ui@3.2.4_jsdom@27.0.0/node_modules/vitest/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/vitest@1.0.0_@types+node@20.0.0_@vitest+ui@3.2.4_jsdom@27.0.0/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/vitest@1.6.1_@types+node@20.19.19_@vitest+ui@3.2.4_happy-dom@18.0.1_jsdom@27.0.0_postcss@8.5.6__terser@5.44.0/node_modules/vitest/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/vitest@1.6.1_@types+node@20.19.19_@vitest+ui@3.2.4_happy-dom@18.0.1_jsdom@27.0.0_postcss@8.5.6__terser@5.44.0/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules"
 else
-  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/vitest@1.0.0_@types+node@20.0.0_@vitest+ui@3.2.4_jsdom@27.0.0/node_modules/vitest/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/vitest@1.0.0_@types+node@20.0.0_@vitest+ui@3.2.4_jsdom@27.0.0/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules:$NODE_PATH"
+  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/vitest@1.6.1_@types+node@20.19.19_@vitest+ui@3.2.4_happy-dom@18.0.1_jsdom@27.0.0_postcss@8.5.6__terser@5.44.0/node_modules/vitest/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/vitest@1.6.1_@types+node@20.19.19_@vitest+ui@3.2.4_happy-dom@18.0.1_jsdom@27.0.0_postcss@8.5.6__terser@5.44.0/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules:$NODE_PATH"
 fi
 if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../../../../../../node_modules/.pnpm/vitest@1.0.0_@types+node@20.0.0_@vitest+ui@3.2.4_jsdom@27.0.0/node_modules/vitest/vitest.mjs" "$@"
+  exec "$basedir/node"  "$basedir/../vitest/vitest.mjs" "$@"
 else
-  exec node  "$basedir/../../../../../../node_modules/.pnpm/vitest@1.0.0_@types+node@20.0.0_@vitest+ui@3.2.4_jsdom@27.0.0/node_modules/vitest/vitest.mjs" "$@"
+  exec node  "$basedir/../vitest/vitest.mjs" "$@"
 fi

packages/core/client/node/node_modules/tsup

@@ -1 +1 @@
-../../../../../node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules/tsup
+../../../../../node_modules/.pnpm/tsup@7.3.0_postcss@8.5.6_typescript@5.9.3/node_modules/tsup

packages/core/client/node/node_modules/vitest

@@ -1 +1 @@
-../../../../../node_modules/.pnpm/vitest@1.0.0_@types+node@20.0.0_@vitest+ui@3.2.4_jsdom@27.0.0/node_modules/vitest
+../../../../../node_modules/.pnpm/vitest@1.6.1_@types+node@20.19.19_@vitest+ui@3.2.4_happy-dom@18.0.1_jsdom@27.0.0_postcss@8.5.6__terser@5.44.0/node_modules/vitest

packages/core/client/typescript/node_modules/.bin/tsc

@@ -6,12 +6,12 @@ case `uname` in
 esac
 
 if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/bin/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/bin/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules"
 else
-  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/bin/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules:$NODE_PATH"
+  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/bin/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules:$NODE_PATH"
 fi
 if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../../../../../../node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/bin/tsc" "$@"
+  exec "$basedir/node"  "$basedir/../typescript/bin/tsc" "$@"
 else
-  exec node  "$basedir/../../../../../../node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/bin/tsc" "$@"
+  exec node  "$basedir/../typescript/bin/tsc" "$@"
 fi

packages/core/client/typescript/node_modules/.bin/tsserver

@@ -6,12 +6,12 @@ case `uname` in
 esac
 
 if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/bin/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/bin/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules"
 else
-  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/bin/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.0.2/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules:$NODE_PATH"
+  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/bin/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/typescript@5.9.3/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules:$NODE_PATH"
 fi
 if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../../../../../../node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/bin/tsserver" "$@"
+  exec "$basedir/node"  "$basedir/../typescript/bin/tsserver" "$@"
 else
-  exec node  "$basedir/../../../../../../node_modules/.pnpm/typescript@5.0.2/node_modules/typescript/bin/tsserver" "$@"
+  exec node  "$basedir/../typescript/bin/tsserver" "$@"
 fi

packages/core/client/typescript/node_modules/.bin/tsup

@@ -6,12 +6,12 @@ case `uname` in
 esac
 
 if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules/tsup/dist/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules/tsup/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.3.0_postcss@8.5.6_typescript@5.9.3/node_modules/tsup/dist/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.3.0_postcss@8.5.6_typescript@5.9.3/node_modules/tsup/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.3.0_postcss@8.5.6_typescript@5.9.3/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules"
 else
-  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules/tsup/dist/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules/tsup/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules:$NODE_PATH"
+  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.3.0_postcss@8.5.6_typescript@5.9.3/node_modules/tsup/dist/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.3.0_postcss@8.5.6_typescript@5.9.3/node_modules/tsup/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.3.0_postcss@8.5.6_typescript@5.9.3/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules:$NODE_PATH"
 fi
 if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../../../../../../node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules/tsup/dist/cli-default.js" "$@"
+  exec "$basedir/node"  "$basedir/../tsup/dist/cli-default.js" "$@"
 else
-  exec node  "$basedir/../../../../../../node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules/tsup/dist/cli-default.js" "$@"
+  exec node  "$basedir/../tsup/dist/cli-default.js" "$@"
 fi

packages/core/client/typescript/node_modules/.bin/tsup-node

@@ -6,12 +6,12 @@ case `uname` in
 esac
 
 if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules/tsup/dist/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules/tsup/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.3.0_postcss@8.5.6_typescript@5.9.3/node_modules/tsup/dist/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.3.0_postcss@8.5.6_typescript@5.9.3/node_modules/tsup/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.3.0_postcss@8.5.6_typescript@5.9.3/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules"
 else
-  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules/tsup/dist/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules/tsup/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules:$NODE_PATH"
+  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.3.0_postcss@8.5.6_typescript@5.9.3/node_modules/tsup/dist/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.3.0_postcss@8.5.6_typescript@5.9.3/node_modules/tsup/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/tsup@7.3.0_postcss@8.5.6_typescript@5.9.3/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules:$NODE_PATH"
 fi
 if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../../../../../../node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules/tsup/dist/cli-node.js" "$@"
+  exec "$basedir/node"  "$basedir/../tsup/dist/cli-node.js" "$@"
 else
-  exec node  "$basedir/../../../../../../node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules/tsup/dist/cli-node.js" "$@"
+  exec node  "$basedir/../tsup/dist/cli-node.js" "$@"
 fi

packages/core/client/typescript/node_modules/.bin/vitest

@@ -6,12 +6,12 @@ case `uname` in
 esac
 
 if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/vitest@1.0.0_@types+node@20.0.0_@vitest+ui@3.2.4_jsdom@27.0.0/node_modules/vitest/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/vitest@1.0.0_@types+node@20.0.0_@vitest+ui@3.2.4_jsdom@27.0.0/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/vitest@1.6.1_@types+node@20.19.19_@vitest+ui@3.2.4_happy-dom@18.0.1_jsdom@27.0.0_postcss@8.5.6__terser@5.44.0/node_modules/vitest/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/vitest@1.6.1_@types+node@20.19.19_@vitest+ui@3.2.4_happy-dom@18.0.1_jsdom@27.0.0_postcss@8.5.6__terser@5.44.0/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules"
 else
-  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/vitest@1.0.0_@types+node@20.0.0_@vitest+ui@3.2.4_jsdom@27.0.0/node_modules/vitest/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/vitest@1.0.0_@types+node@20.0.0_@vitest+ui@3.2.4_jsdom@27.0.0/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules:$NODE_PATH"
+  export NODE_PATH="/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/vitest@1.6.1_@types+node@20.19.19_@vitest+ui@3.2.4_happy-dom@18.0.1_jsdom@27.0.0_postcss@8.5.6__terser@5.44.0/node_modules/vitest/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/vitest@1.6.1_@types+node@20.19.19_@vitest+ui@3.2.4_happy-dom@18.0.1_jsdom@27.0.0_postcss@8.5.6__terser@5.44.0/node_modules:/Users/antialias/projects/soroban-abacus-flashcards/node_modules/.pnpm/node_modules:$NODE_PATH"
 fi
 if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../../../../../../node_modules/.pnpm/vitest@1.0.0_@types+node@20.0.0_@vitest+ui@3.2.4_jsdom@27.0.0/node_modules/vitest/vitest.mjs" "$@"
+  exec "$basedir/node"  "$basedir/../vitest/vitest.mjs" "$@"
 else
-  exec node  "$basedir/../../../../../../node_modules/.pnpm/vitest@1.0.0_@types+node@20.0.0_@vitest+ui@3.2.4_jsdom@27.0.0/node_modules/vitest/vitest.mjs" "$@"
+  exec node  "$basedir/../vitest/vitest.mjs" "$@"
 fi

packages/core/client/typescript/node_modules/tsup

@@ -1 +1 @@
-../../../../../node_modules/.pnpm/tsup@7.0.0_typescript@5.0.2/node_modules/tsup
+../../../../../node_modules/.pnpm/tsup@7.3.0_postcss@8.5.6_typescript@5.9.3/node_modules/tsup

packages/core/client/typescript/node_modules/vitest

@@ -1 +1 @@
-../../../../../node_modules/.pnpm/vitest@1.0.0_@types+node@20.0.0_@vitest+ui@3.2.4_jsdom@27.0.0/node_modules/vitest
+../../../../../node_modules/.pnpm/vitest@1.6.1_@types+node@20.19.19_@vitest+ui@3.2.4_happy-dom@18.0.1_jsdom@27.0.0_postcss@8.5.6__terser@5.44.0/node_modules/vitest

pnpm-lock.yaml

@@ -188,6 +188,9 @@ importers:
       socket.io-client:
         specifier: ^4.8.1
         version: 4.8.1
+      zod:
+        specifier: ^4.1.12
+        version: 4.1.12
     devDependencies:
       '@playwright/test':
         specifier: ^1.55.1
@@ -9379,6 +9382,9 @@ packages:
     resolution: {integrity: sha512-AyeEbWOu/TAXdxlV9wmGcR0+yh2j3vYPGOECcIj2S7MkrLyC7ne+oye2BKTItt0ii2PHk4cDy+95+LshzbXnGg==}
     engines: {node: '>=12.20'}
 
+  zod@4.1.12:
+    resolution: {integrity: sha512-JInaHOamG8pt5+Ey8kGmdcAcg3OL9reK8ltczgHTAwNhMys/6ThXHityHxVV2p3fkw/c+MAvBHFVYHFZDmjMCQ==}
+
 snapshots:
 
   '@adobe/css-tools@4.4.4': {}
@@ -19393,3 +19399,5 @@ snapshots:
   yocto-queue@0.1.0: {}
 
   yocto-queue@1.2.1: {}
+
+  zod@4.1.12: {}