update app.py

app.py

@@ -56,10 +56,13 @@ def parse_board(board_text):
     return board
 
 
+# ALIGN: coordinate system with bot_runner
+# Rows are 0-indexed, row 0 = TOP (black side), row 7 = BOTTOM (white side).
+# UCI rank = row + 1  (so row 0 -> rank 1, row 7 -> rank 8).
 def move_to_uci(move):
     fr, fc, tr, tc = move
     cols = "abcdefgh"
-    return cols[fc] + str(8 - fr) + cols[tc] + str(8 - tr)
+    return cols[fc] + str(fr + 1) + cols[tc] + str(tr + 1)
 
 
 def fen_to_board(fen):
@@ -86,23 +89,25 @@ def fen_to_board(fen):
             raise ValueError(f"Row {r} has {c} columns, should be 8")
     return board
 
+# ALIGN: only return legal moves in get_move
 def get_move(board_text, player=None):
     print(f"[DEBUG] get_move FEN board_text={repr(board_text)}, player={player}")
     game = Breakthrough()
     game.board = fen_to_board(board_text)
-
     if player == "1":
         game.move_count = 0
     elif player == "2":
         game.move_count = 1
     else:
+        # Default: infer from FEN suffix or assume white
         game.move_count = 0 if " w" in board_text.lower() else 1
-
     game._cached_matrix = None
     searcher = MCVSSearcher(None, None, zonedb, lambda_zone=1.0, k_zone=5)
     visits, _ = searcher.search_with_time_budget(game, 1.0)
 
+    # Debug: show how many legal moves and visits
     legal_moves = list(game.get_legal_moves())
+    legal_set = set(legal_moves)
     print(f"[DEBUG] legal moves count: {len(legal_moves)}")
     if legal_moves:
         print(f"[DEBUG] sample legal move: {legal_moves[0]}")
@@ -110,26 +115,25 @@ def get_move(board_text, player=None):
     if visits:
         print(f"[DEBUG] sample visit key: {next(iter(visits))}")
 
-    # Safely pick a move that is actually legal
+    # Pick the best visited move that is also legal
+    best_move = None
     if visits:
-        candidates = [(move, visits[move]) for move in visits if move in set(legal_moves)]
-        if candidates:
-            best_move, _ = max(candidates, key=lambda x: x[1])
-        else:
-            # Fallback to first legal move if no visited move is legal
-            if not legal_moves:
-                print("[WARNING] No legal moves; returning dummy move d4d4.")
-                best_move = (3, 3, 3, 3)  # d4 -> d4
-            else:
-                best_move = legal_moves[0]
-                print(f"[WARNING] no visited move is legal; using fallback move: {best_move}")
-    else:
-        if not legal_moves:
-            print("[WARNING] No legal moves; returning dummy move d4d4.")
-            best_move = (3, 3, 3, 3)
-        else:
+        for candidate in sorted(visits, key=visits.get, reverse=True):
+            if candidate in legal_set:
+                best_move = candidate
+                break
+        if best_move is None:
+            print(f"[WARNING] no visited move is legal; visited={list(visits.keys())[:5]}")
+
+    # Fall back to first legal move if needed
+    if best_move is None:
+        if legal_moves:
             best_move = legal_moves[0]
-            print(f"[WARNING] visits empty; using fallback move: {best_move}")
+            print(f"[WARNING] using first legal move as fallback: {best_move}")
+        else:
+            # No legal moves at all — return a safe dummy
+            print("[WARNING] no legal moves in position; returning dummy move")
+            return move_to_uci((3, 3, 3, 3))
 
     move = move_to_uci(best_move)
     print(f"[DEBUG] get_move OK: FEN={board_text} -> {move}")