Merge pull request #29 from dustywusty/codex/fix-game-state-and-ui-issues

Author: dustywusty

internal/game/game_test.go

@@ -1,6 +1,7 @@
 package game
 
 import (
+	"strings"
 	"testing"
 	"time"
 
@@ -36,3 +37,22 @@ func TestMakeMoveInvalidUCI(t *testing.T) {
 		t.Fatalf("expected error for invalid UCI, got nil")
 	}
 }
+
+func TestCheckmateState(t *testing.T) {
+	g := newTestGame()
+	moves := []string{"f2f3", "e7e5", "g2g4", "d8h4"}
+	for _, m := range moves {
+		if err := g.MakeMove(m); err != nil {
+			t.Fatalf("move %s failed: %v", m, err)
+		}
+	}
+	g.Mu.Lock()
+	st := g.StateLocked()
+	g.Mu.Unlock()
+	if st.Status == "" {
+		t.Fatalf("expected status to be set after checkmate")
+	}
+	if !strings.Contains(strings.ToLower(st.Status), "checkmate") {
+		t.Fatalf("expected checkmate in status, got %s", st.Status)
+	}
+}

internal/templates/game.html

@@ -272,6 +272,12 @@
         line-height: 1;
       }
 
+      .caps span.recent {
+        outline: 2px solid var(--accent);
+        outline-offset: 2px;
+        border-radius: 4px;
+      }
+
       .reactions {
         display: flex;
         gap: 6px;
@@ -486,6 +492,8 @@
         let playerColor = "white";
         let playerColorSet = false;
         let isSpectator = false;
+        let gameOver = false;
+        let prevCaptured = { byWhite: [], byBlack: [] };
 
         function normalizeColor(c) {
           if (!c) return "white";
@@ -799,7 +807,7 @@
 
         // Board-level click handler
         boardEl.addEventListener("click", (e) => {
-          if (isSpectator) return;
+          if (isSpectator || gameOver) return;
           const rect = boardEl.getBoundingClientRect();
           const x = Math.min(
             Math.max(0, e.clientX - rect.left),
@@ -839,6 +847,22 @@
           statusEl.style.color = isErr ? "var(--err)" : "inherit";
         }
 
+        function updateTurn(st) {
+          if (!turnEl) return;
+          if (st.status) {
+            turnEl.textContent = "Game over";
+            return;
+          }
+          const t = normalizeColor(st.turn);
+          if (isSpectator) {
+            turnEl.textContent = t || "";
+          } else if (t === playerColor) {
+            turnEl.textContent = "Your turn";
+          } else {
+            turnEl.textContent = "Their turn";
+          }
+        }
+
         // ---- Captured pieces (derived from FEN) + persisted per game ----
         var startCounts = {
           P: 8,
@@ -947,13 +971,19 @@
           for (var i = 0; i < byWhite.length; i++) {
             var s1 = document.createElement("span");
             s1.textContent = byWhite[i];
+            s1.classList.add("black-piece");
+            if (i >= prevCaptured.byWhite.length) s1.classList.add("recent");
             capWhiteEl.appendChild(s1);
           }
           for (var j = 0; j < byBlack.length; j++) {
             var s2 = document.createElement("span");
             s2.textContent = byBlack[j];
+            s2.classList.add("white-piece");
+            if (j >= prevCaptured.byBlack.length) s2.classList.add("recent");
             capBlackEl.appendChild(s2);
           }
+          prevCaptured.byWhite = byWhite.slice();
+          prevCaptured.byBlack = byBlack.slice();
         }
 
         function capKey(id) {
@@ -1058,7 +1088,7 @@
 
         // Render start position immediately (prevents blank board)
         renderFEN(START_FEN);
-        turnEl.textContent = "white";
+        turnEl.textContent = "";
         status("");
 
         if (gameId) {
@@ -1095,10 +1125,11 @@
                 releaseBtn.style.display = isSpectator ? "none" : "";
               lastMoveSquares = deriveLastMoveSquares(st.uci || []);
               renderFEN(st.fen);
-              turnEl.textContent = st.turn || "";
+              updateTurn(st);
               pgnEl.textContent = formatPGNLines(st.pgn || "");
               lanEl.textContent = formatUCIMoves(st.uci || []);
               status(st.status || "");
+              gameOver = !!st.status;
               const caps = capturedFromFEN(st.fen);
               renderCaptured(caps.byWhite, caps.byBlack);
               try {
@@ -1130,6 +1161,9 @@
               });
             }
           };
+          es.onopen = () => {
+            status("");
+          };
           es.onerror = () => {
             status("Disconnected. Reconnecting…", true);
           };