chore(release): 2.7.2 [skip ci]

## [2.7.2](https://github.com/antialias/soroban-abacus-flashcards/compare/v2.7.1...v2.7.2) (2025-10-08)

### Bug Fixes

* add hasAttemptedFetch flag to prevent premature redirect ([c30f585](c30f585810))

CHANGELOG.md

@@ -1,3 +1,24 @@
+## [2.7.2](https://github.com/antialias/soroban-abacus-flashcards/compare/v2.7.1...v2.7.2) (2025-10-08)
+
+
+### Bug Fixes
+
+* add hasAttemptedFetch flag to prevent premature redirect ([c30f585](https://github.com/antialias/soroban-abacus-flashcards/commit/c30f58581028878350282cad5231d614590d9f2b))
+
+## [2.7.1](https://github.com/antialias/soroban-abacus-flashcards/compare/v2.7.0...v2.7.1) (2025-10-08)
+
+
+### Bug Fixes
+
+* resolve race condition in /arcade/room redirect ([5ed2ab2](https://github.com/antialias/soroban-abacus-flashcards/commit/5ed2ab21cab408147081a493c8dd6b1de48b2d01))
+
+## [2.7.0](https://github.com/antialias/soroban-abacus-flashcards/compare/v2.6.0...v2.7.0) (2025-10-08)
+
+
+### Features
+
+* extend GameModeContext to support room-based multiplayer ([ee6094d](https://github.com/antialias/soroban-abacus-flashcards/commit/ee6094d59d26a9e80ba5d023ca6dc13143bea308))
+
 ## [2.6.0](https://github.com/antialias/soroban-abacus-flashcards/compare/v2.5.0...v2.6.0) (2025-10-08)
 
 

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

@@ -34,7 +34,8 @@
       "Bash(npm run pre-commit:*)",
       "Bash(npm run:*)",
       "Bash(git pull:*)",
-      "Bash(git stash:*)"
+      "Bash(git stash:*)",
+      "Bash(members of the room\" requirement for room-based gameplay.\n\n🤖 Generated with [Claude Code](https://claude.com/claude-code)\n\nCo-Authored-By: Claude <noreply@anthropic.com>\nEOF\n)\")"
     ],
     "deny": [],
     "ask": []

apps/web/src/app/api/arcade/rooms/current/route.ts

@@ -12,11 +12,14 @@ import { getViewerId } from '@/lib/viewer'
 export async function GET() {
   try {
     const userId = await getViewerId()
+    console.log('[Current Room API] Fetching for user:', userId)
 
     // Get all rooms user is in (should be at most 1 due to modal room enforcement)
     const roomIds = await getUserRooms(userId)
+    console.log('[Current Room API] User rooms:', roomIds)
 
     if (roomIds.length === 0) {
+      console.log('[Current Room API] User is not in any room')
       return NextResponse.json({ room: null }, { status: 200 })
     }
 
@@ -25,6 +28,7 @@ export async function GET() {
     // Get room data
     const room = await getRoomById(roomId)
     if (!room) {
+      console.log('[Current Room API] Room not found:', roomId)
       return NextResponse.json({ error: 'Room not found' }, { status: 404 })
     }
 
@@ -40,6 +44,12 @@ export async function GET() {
       memberPlayersObj[uid] = players
     }
 
+    console.log('[Current Room API] Returning room:', {
+      roomId: room.id,
+      roomName: room.name,
+      memberCount: members.length,
+    })
+
     return NextResponse.json({
       room,
       members,

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

@@ -15,6 +15,11 @@ export default function RoomPage() {
   const router = useRouter()
   const { roomData, isLoading } = useRoomData()
 
+  // Debug logging
+  useEffect(() => {
+    console.log('[RoomPage] State:', { isLoading, hasRoomData: !!roomData, roomData })
+  }, [isLoading, roomData])
+
   // Redirect to arcade if no room
   useEffect(() => {
     if (!isLoading && !roomData) {

apps/web/src/contexts/GameModeContext.tsx

@@ -8,6 +8,8 @@ import {
   useUpdatePlayer,
   useUserPlayers,
 } from '@/hooks/useUserPlayers'
+import { useRoomData } from '@/hooks/useRoomData'
+import { useViewerId } from '@/hooks/useViewerId'
 import { getNextPlayerColor } from '../types/player'
 
 // Client-side Player type (compatible with old type)
@@ -66,28 +68,72 @@ export function GameModeProvider({ children }: { children: ReactNode }) {
   const { mutate: createPlayer } = useCreatePlayer()
   const { mutate: updatePlayerMutation } = useUpdatePlayer()
   const { mutate: deletePlayer } = useDeletePlayer()
+  const { roomData } = useRoomData()
+  const { data: viewerId } = useViewerId()
 
   const [isInitialized, setIsInitialized] = useState(false)
 
-  // Convert DB players to Map
-  const players = useMemo(() => {
+  // Convert DB players to Map (local players)
+  const localPlayers = useMemo(() => {
     const map = new Map<string, Player>()
     dbPlayers.forEach((dbPlayer) => {
-      map.set(dbPlayer.id, toClientPlayer(dbPlayer))
+      map.set(dbPlayer.id, {
+        ...toClientPlayer(dbPlayer),
+        isLocal: true,
+      })
     })
     return map
   }, [dbPlayers])
 
-  // Track active players from DB isActive status
+  // When in a room, merge all players from all room members
+  const players = useMemo(() => {
+    const map = new Map<string, Player>(localPlayers)
+
+    if (roomData) {
+      // Add players from other room members (marked as remote)
+      Object.entries(roomData.memberPlayers).forEach(([userId, memberPlayers]) => {
+        // Skip the current user's players (already in localPlayers)
+        if (userId === viewerId) return
+
+        memberPlayers.forEach((roomPlayer) => {
+          map.set(roomPlayer.id, {
+            id: roomPlayer.id,
+            name: roomPlayer.name,
+            emoji: roomPlayer.emoji,
+            color: roomPlayer.color,
+            createdAt: Date.now(),
+            isActive: true, // Players in memberPlayers are active
+            isLocal: false, // Remote player
+          })
+        })
+      })
+    }
+
+    return map
+  }, [localPlayers, roomData, viewerId])
+
+  // Track active players (local + room members when in a room)
   const activePlayers = useMemo(() => {
     const set = new Set<string>()
-    dbPlayers.forEach((player) => {
-      if (player.isActive) {
-        set.add(player.id)
-      }
-    })
+
+    if (roomData) {
+      // In room mode: all players from all members are active
+      Object.values(roomData.memberPlayers).forEach((memberPlayers) => {
+        memberPlayers.forEach((player) => {
+          set.add(player.id)
+        })
+      })
+    } else {
+      // Solo mode: only local active players
+      dbPlayers.forEach((player) => {
+        if (player.isActive) {
+          set.add(player.id)
+        }
+      })
+    }
+
     return set
-  }, [dbPlayers])
+  }, [dbPlayers, roomData])
 
   // Initialize with default players if none exist
   useEffect(() => {
@@ -125,15 +171,33 @@ export function GameModeProvider({ children }: { children: ReactNode }) {
   }
 
   const updatePlayer = (id: string, updates: Partial<Player>) => {
-    updatePlayerMutation({ id, updates })
+    const player = players.get(id)
+    // Only allow updating local players
+    if (player?.isLocal) {
+      updatePlayerMutation({ id, updates })
+    } else {
+      console.warn('[GameModeContext] Cannot update remote player:', id)
+    }
   }
 
   const removePlayer = (id: string) => {
-    deletePlayer(id)
+    const player = players.get(id)
+    // Only allow removing local players
+    if (player?.isLocal) {
+      deletePlayer(id)
+    } else {
+      console.warn('[GameModeContext] Cannot remove remote player:', id)
+    }
   }
 
   const setActive = (id: string, active: boolean) => {
-    updatePlayerMutation({ id, updates: { isActive: active } })
+    const player = players.get(id)
+    // Only allow changing active status of local players
+    if (player?.isLocal) {
+      updatePlayerMutation({ id, updates: { isActive: active } })
+    } else {
+      console.warn('[GameModeContext] Cannot change active status of remote player:', id)
+    }
   }
 
   const getActivePlayers = (): Player[] => {

apps/web/src/hooks/useRoomData.ts

@@ -31,45 +31,57 @@ export interface RoomData {
  * Returns null if user is not in any room
  */
 export function useRoomData() {
-  const { data: userId } = useViewerId()
+  const { data: userId, isPending: isUserIdPending } = useViewerId()
   const [socket, setSocket] = useState<Socket | null>(null)
   const [roomData, setRoomData] = useState<RoomData | null>(null)
   const [isLoading, setIsLoading] = useState(false)
+  const [hasAttemptedFetch, setHasAttemptedFetch] = useState(false)
 
   // Fetch the user's current room
   useEffect(() => {
     if (!userId) {
+      console.log('[useRoomData] No userId, clearing room data')
       setRoomData(null)
+      setHasAttemptedFetch(false)
       return
     }
 
+    console.log('[useRoomData] Fetching current room for user:', userId)
     setIsLoading(true)
+    setHasAttemptedFetch(false)
 
     // Fetch current room data
     fetch('/api/arcade/rooms/current')
       .then((res) => {
+        console.log('[useRoomData] API response status:', res.status)
         if (!res.ok) throw new Error('Failed to fetch current room')
         return res.json()
       })
       .then((data) => {
+        console.log('[useRoomData] API response data:', data)
         if (data.room) {
-          setRoomData({
+          const roomData = {
             id: data.room.id,
             name: data.room.name,
             code: data.room.code,
             gameName: data.room.gameName,
             members: data.members || [],
             memberPlayers: data.memberPlayers || {},
-          })
+          }
+          console.log('[useRoomData] Setting room data:', roomData)
+          setRoomData(roomData)
         } else {
+          console.log('[useRoomData] No room in response, clearing room data')
           setRoomData(null)
         }
         setIsLoading(false)
+        setHasAttemptedFetch(true)
       })
       .catch((error) => {
-        console.error('Failed to fetch room data:', error)
+        console.error('[useRoomData] Failed to fetch room data:', error)
         setRoomData(null)
         setIsLoading(false)
+        setHasAttemptedFetch(true)
       })
   }, [userId])
 
@@ -197,7 +209,8 @@ export function useRoomData() {
 
   return {
     roomData,
-    isLoading,
+    // Loading if: userId is pending, currently fetching, or have userId but haven't tried fetching yet
+    isLoading: isUserIdPending || isLoading || (!!userId && !hasAttemptedFetch),
     isInRoom: !!roomData,
   }
 }

package.json

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