active battle tracking

utils/pokemon_utils.py

@@ -49,7 +49,7 @@ class MCPPokemonAgent(LLMAgentBase):
         
         # Update active battle state
         if battle.battle_tag in active_battles:
-            active_battles[battle.battle_tag]['battle_state'] = self._format_battle_state(battle)
+            active_battles[battle.battle_tag]['battle_state'] = format_battle_state(battle)
             active_battles[battle.battle_tag]['waiting_for_move'] = True
             active_battles[battle.battle_tag]['available_moves'] = [move.id for move in battle.available_moves]
             active_battles[battle.battle_tag]['available_switches'] = [pkmn.species for pkmn in battle.available_switches]
@@ -112,6 +112,26 @@ def register_player_instance(base_username: str, player: MCPPokemonAgent) -> Non
     player_instances[base_username][player.username] = player
     player_instances_by_unique[player.username] = player
 
+# Helper to ensure an untracked battle becomes tracked by scanning all players
+def ensure_battle_tracked(battle_id: str) -> bool:
+    for player in player_instances_by_unique.values():
+        for battle_obj in player.battles.values():
+            if battle_obj.battle_tag == battle_id:
+                battle_url = f"https://jofthomas.com/play.pokemonshowdown.com/testclient.html#battle-{battle_id}"
+                active_battles[battle_id] = {
+                    'type': 'recovered',
+                    'player_base_username': getattr(player, 'base_username', player.username),
+                    'player_unique_username': player.username,
+                    'player_username': getattr(player, 'base_username', player.username),
+                    'opponent': getattr(battle_obj, 'opponent_username', 'unknown'),
+                    'battle_state': format_battle_state(battle_obj),
+                    'waiting_for_move': False,
+                    'completed': False,
+                    'battle_url': battle_url
+                }
+                return True
+    return False
+
 def normalize_name(name: str) -> str:
     """Lowercase and remove non-alphanumeric characters."""
     return "".join(filter(str.isalnum, name)).lower()
@@ -403,7 +423,9 @@ async def submit_move_for_battle(battle_id: str, move_name: str = None, pokemon_
         str: Result message
     """
     if battle_id not in active_battles:
-        raise ValueError(f"Battle {battle_id} not found")
+        # Attempt to recover by scanning players
+        if not ensure_battle_tracked(battle_id):
+            raise ValueError(f"Battle {battle_id} not found")
     
     battle_info = active_battles[battle_id]
     unique_username = battle_info.get('player_unique_username') or battle_info.get('player_username')
@@ -442,7 +464,10 @@ def get_battle_state(battle_id: str) -> Dict[str, Any]:
         dict: Current battle state
     """
     if battle_id not in active_battles:
-        raise ValueError(f"Battle {battle_id} not found")
+        # Attempt to recover by scanning players
+        recovered = ensure_battle_tracked(battle_id)
+        if not recovered:
+            raise ValueError(f"Battle {battle_id} not found")
     
     return active_battles[battle_id]
 
@@ -530,7 +555,9 @@ async def download_battle_replay(battle_id: str) -> str:
         str: Path to the replay file or replay content
     """
     if battle_id not in active_battles:
-        raise ValueError(f"Battle {battle_id} not found")
+        # Attempt to recover by scanning players
+        if not ensure_battle_tracked(battle_id):
+            raise ValueError(f"Battle {battle_id} not found")
     
     battle_info = active_battles[battle_id]
     unique_username = battle_info.get('player_unique_username') or battle_info.get('player_username')