belote-cli 2.9.2__tar.gz → 2.9.5__tar.gz

{belote_cli-2.9.2 → belote_cli-2.9.5}/CHANGELOG.md

@@ -5,6 +5,43 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.9.5] - 2026-05-07
+
+In-game keyboard shortcuts cleaned up, the trick mat now anchors every played card inside a visible per-seat slot, the round history overlay carries the full per-round picture, and the cards have been redrawn in a GRIMAUD-1898 style with both-corner indices and patterned pip layouts.
+
+### Fixed
+
+- **`src/belote/input.py`** — `Key.THEME` was defined but never mapped to a keystroke; the help text falsely advertised `Shift+T` (which terminals can't generally distinguish in raw mode). Theme cycling during gameplay was unreachable. New mapping: `t/T → Key.THEME`, `h/H → Key.HIST`, `?` → `Key.HELP`, `o/O → Key.SORT`. Both the Unix and Windows readers updated.
+- **`src/belote/input.py`** — `s` was previously stolen by `Key.SORT`, so pressing `S` in round-2 bidding triggered a sort instead of the **Sans Atout** quick-bid the help text promised. Sort now lives on `O` (matching what the help screen always claimed) and `s` falls through to `Key.CHAR` so SA bidding works.
+- **`src/belote/gameflow.py::run_play`** — when the user had already pressed any key earlier in the round (which sets `skip_anims`), the post-trick pause was skipped entirely and the 4th card vanished before it could be read. New `MIN_TRICK_DWELL = 0.5s` non-skippable hold runs after every completed trick (even on the `instant` speed preset) so the player always sees all four cards before the mat clears.
+
+### Added
+
+- **`src/belote/ui/render.py`** — visible **slot frames** drawn around each compass position on the trick mat. Implemented via three new helpers (`_slot_anchors`, `_slot_frame_row`, `_felt_pad_ns`, `_we_row`) that paint thin `─`/`│` borders on the felt cells immediately surrounding each card slot, in the felt-placeholder dim colour. Total mat dimensions (`6 + 3*card_h`) are unchanged, so `_calculate_base_row` and `patch_trick_card` continue to work without any coordinate adjustments — patched cards land exactly inside the existing frame.
+- **`src/belote/game.py::RoundScore`** — eight new optional fields (`contract`, `trump`, `taker_seat`, `tricks_ns`, `tricks_ew`, `last_trick_winner`, `decl_summary_ns`, `decl_summary_ew`) populated from `state` and `state.completed_tricks` at scoring time. All fields default so existing test fixtures and any historical `RoundScore` constructions remain valid.
+- **`src/belote/scoring.py::apply_round_score`** — now computes per-team trick counts via `trick_winner_seat`/`team_of`, builds short declaration labels (`"100♥"`, `"Belote"`, `"Carré-J"`, …) gated on the team's `*_decl_pts > 0` so only the *scored* declarations appear, and threads everything into `RoundScore`. New helper `_decl_short_label` covers belote/rebelote/sequence/carre.
+- **`src/belote/ui/prompts.py::show_history`** — rewritten as an 8-column table (`RD | TAKER | CONTRACT | TRICKS | DECLARATIONS | NS | EW | STATUS`) for terminals ≥78 cols, with a 2-line-per-round fallback for narrower terminals. Status colouring: gold `CAPOT`, red `CHUTE`, dim `LITIGE`. Existing scrolling, view-height clamp, and exit-on-any-key behaviour preserved.
+- **`src/belote/ui/render.py::_card_face_internal`** — full GRIMAUD-1898-inspired redraw:
+  - Both corners now carry a 3-cell `rank+suit` index (`A♠` top-left, `♠A` bottom-right). The index padding scales with `inner_w`.
+  - Pip cards (7-10) at `card_h ≥ 7` get a recognisable pip arrangement instead of a single centred suit symbol.
+  - Court cards J/Q/K each get a distinct multi-row motif (sword, jewelled headdress, crown).
+  - Aces get a decorative `╭─◆─╮` / `╰─◆─╯` wreath around the central suit.
+  - Compact 6×5 layout keeps the single inner row but still benefits from both-corner indices.
+  - All variants honour the active theme (`face_card_bg`, `card_face_bg`, `highlight_bg`, `red_fg`/`black_fg`) and the `DIM` prefix for illegal cards. ASCII fallback paths preserved.
+- **`tests/test_extended.py::test_round_score_history_extra_fields`** — pins the new `RoundScore` fields end-to-end through `apply_round_score`.
+
+### Changed
+
+- **`src/belote/ui/menu.py`** — main-menu loop now handles `Key.THEME` (cycles forward through `THEMES`), so the new in-game `T` shortcut works at the menu too.
+- **`src/belote/main.py`**, **`src/belote/ui/render.py`** — game-over hint and HUD compact hint updated to advertise the new `[H] History` / `[T] Theme` shortcuts.
+- **`src/belote/ui/prompts.py::show_help`** — help-screen text rewritten to match the new bindings.
+- **`README.md`** — Controls section rewritten; theme section now lists all six themes by name.
+- **`tests/test_layout.py::test_hud_compact_omits_help_hints_and_theme`** — assertion updated for the new compact-HUD hint substring.
+
+### Notes
+
+436/436 tests pass. No gameplay, scoring, or AI-decision changes — all updates are UX (keys, slot framing, dwell, history depth, card glyphs).
+
 ## [2.9.2] - 2026-05-07
 
 Render-pipeline fix for Konsole (KDE/Kubuntu) and other strict ANSI terminals where UI elements visibly stacked on top of each other — the top HUD repeating ~6 times, "Theme: Sepia Vintage" duplicating in the right column, "Partner" doubling, the bid prompt repainting below itself, and bid history accumulating between frames. The bug existed in the code on every terminal but VTE-based emulators (LXTerminal, GNOME Terminal, xterm) auto-blanked the leaking cells, masking it. Konsole's Vt102Emulation does not, so the leakage was visible.

{belote_cli-2.9.2 → belote_cli-2.9.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: belote-cli
-Version: 2.9.2
+Version: 2.9.5
 Summary: A 4-player terminal card game
 Project-URL: Homepage, https://github.com/ElysiumDisc/belote
 Project-URL: Repository, https://github.com/ElysiumDisc/belote
@@ -170,12 +170,12 @@ belote --difficulty hard --target 500 --seed 123 --speed fast
 ## Controls
 
 **General:**
-- `?` or `H`: Show keyboard shortcut help
+- `?`: Show keyboard shortcut help
 - `M`: Toggle sound effects on/off
-- `I`: Toggle BelAtro score overlay (per-trick breakdown popup)
+- `I` or `V`: Toggle BelAtro score overlay (per-trick breakdown popup)
 - `Q`: Quit to main menu or exit
-- `t`: View Game History (Round-by-round)
-- `T`: Switch UI Theme
+- `H`: View Game History (round-by-round, with contract / taker / tricks / declarations)
+- `T`: Cycle UI Theme
 
 **Classic Belote:**
 - `↑` `↓`: Navigate options
@@ -183,7 +183,6 @@ belote --difficulty hard --target 500 --seed 123 --speed fast
 - `Enter`: Select option / Enter submenu
 
 **BelAtro (Roguelite):**
-- `S`: View current Run State and Jokers
 - `1`-`5`: Inspect specific Jokers in the Shop
 - `U`: Use a consumable (Tarot/Planet) during gameplay
 
@@ -194,6 +193,7 @@ belote --difficulty hard --target 500 --seed 123 --speed fast
 - `O`: Sort hand by suit and rank
 - `Z`: Undo last move
 - `Space` or `Esc`: Skip animations
+- During bidding round 2: `P` = Pass, `A` = Tout Atout, `S` = Sans Atout
 
 ## Features
 
@@ -204,7 +204,7 @@ belote --difficulty hard --target 500 --seed 123 --speed fast
 - **Partner Trust:** Build a relationship with your AI partner to unlock synergies.
 - **Rich Terminal UI:** Full-screen green felt table with detailed card graphics and "You" vs "Partner" terminology.
 - **Enhanced Hard AI**: Advanced void inference and 2-ply lookahead for critical tricks (Dix de Der).
-- **Customizable Themes:** Switch between different color palettes (e.g., Classic Green, Dark Blue, Royal Purple) using the `T` key during gameplay.
+- **Customizable Themes:** Switch between six color palettes (Classic Green, Dark Mode, Blue Velvet, Red Casino, Sepia Vintage, High Contrast) using the `T` key during gameplay.
 - **Incremental Rendering:** High-performance cursor-based updates for zero-flicker gameplay even at high speeds.
 - **Hand Sorting:** Strategic "play value" organization (honors grouped together) for better tactical awareness.
 - **Main Menu:** Simple single-player entry point with configurable AI difficulty, Target Score, and Speed.

{belote_cli-2.9.2 → belote_cli-2.9.5}/README.md

@@ -127,12 +127,12 @@ belote --difficulty hard --target 500 --seed 123 --speed fast
 ## Controls
 
 **General:**
-- `?` or `H`: Show keyboard shortcut help
+- `?`: Show keyboard shortcut help
 - `M`: Toggle sound effects on/off
-- `I`: Toggle BelAtro score overlay (per-trick breakdown popup)
+- `I` or `V`: Toggle BelAtro score overlay (per-trick breakdown popup)
 - `Q`: Quit to main menu or exit
-- `t`: View Game History (Round-by-round)
-- `T`: Switch UI Theme
+- `H`: View Game History (round-by-round, with contract / taker / tricks / declarations)
+- `T`: Cycle UI Theme
 
 **Classic Belote:**
 - `↑` `↓`: Navigate options
@@ -140,7 +140,6 @@ belote --difficulty hard --target 500 --seed 123 --speed fast
 - `Enter`: Select option / Enter submenu
 
 **BelAtro (Roguelite):**
-- `S`: View current Run State and Jokers
 - `1`-`5`: Inspect specific Jokers in the Shop
 - `U`: Use a consumable (Tarot/Planet) during gameplay
 
@@ -151,6 +150,7 @@ belote --difficulty hard --target 500 --seed 123 --speed fast
 - `O`: Sort hand by suit and rank
 - `Z`: Undo last move
 - `Space` or `Esc`: Skip animations
+- During bidding round 2: `P` = Pass, `A` = Tout Atout, `S` = Sans Atout
 
 ## Features
 
@@ -161,7 +161,7 @@ belote --difficulty hard --target 500 --seed 123 --speed fast
 - **Partner Trust:** Build a relationship with your AI partner to unlock synergies.
 - **Rich Terminal UI:** Full-screen green felt table with detailed card graphics and "You" vs "Partner" terminology.
 - **Enhanced Hard AI**: Advanced void inference and 2-ply lookahead for critical tricks (Dix de Der).
-- **Customizable Themes:** Switch between different color palettes (e.g., Classic Green, Dark Blue, Royal Purple) using the `T` key during gameplay.
+- **Customizable Themes:** Switch between six color palettes (Classic Green, Dark Mode, Blue Velvet, Red Casino, Sepia Vintage, High Contrast) using the `T` key during gameplay.
 - **Incremental Rendering:** High-performance cursor-based updates for zero-flicker gameplay even at high speeds.
 - **Hand Sorting:** Strategic "play value" organization (honors grouped together) for better tactical awareness.
 - **Main Menu:** Simple single-player entry point with configurable AI difficulty, Target Score, and Speed.

{belote_cli-2.9.2 → belote_cli-2.9.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "belote-cli"
-version = "2.9.2"
+version = "2.9.5"
 description = "A 4-player terminal card game"
 readme = "README.md"
 requires-python = ">=3.10"

{belote_cli-2.9.2 → belote_cli-2.9.5}/src/belote/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "2.9.2"
+__version__ = "2.9.5"
 
 __all__ = ["__version__"]

{belote_cli-2.9.2 → belote_cli-2.9.5}/src/belote/game.py

@@ -149,6 +149,14 @@ class RoundScore:
     is_capot: bool
     is_litige: bool = False
     litige_points: int = 0
+    contract: str | None = None
+    trump: Suit | None = None
+    taker_seat: Seat | None = None
+    tricks_ns: int = 0
+    tricks_ew: int = 0
+    last_trick_winner: Seat | None = None
+    decl_summary_ns: tuple[str, ...] = ()
+    decl_summary_ew: tuple[str, ...] = ()
 
 
 @dataclass(frozen=True, slots=True)

{belote_cli-2.9.2 → belote_cli-2.9.5}/src/belote/gameflow.py

@@ -50,6 +50,12 @@ from .ui import (
 )
 
 
+# Minimum time the four cards stay on the mat before a trick clears. This
+# applies even when the user has skipped earlier animations (so a fast-paced
+# session still lets the player read every completed trick).
+MIN_TRICK_DWELL: float = 0.5
+
+
 def create_ai_players(diffs_map: dict[Seat, str]) -> dict[Seat, AIPlayer]:
     """Create AI players for seats not occupied by humans."""
     ai_seats = {Seat.EAST, Seat.NORTH, Seat.WEST}
@@ -177,6 +183,10 @@ def run_play(
         # 3. If this completes a trick, pause longer and show announcements
         if len(display_state.current_trick) == 4:
             play_sound("trick")
+            # Non-skippable minimum dwell so all four cards are always visible
+            # before the trick clears, even when the user has skipped earlier
+            # animations or is on the "instant" speed preset.
+            interruptible_sleep(MIN_TRICK_DWELL, None)
             if len(current.completed_tricks) == 7:  # This was the 8th trick
                 se_trump = current.boss_modifiers.seven_eight_trump
                 is_sa = current.contract == "sans_atout"

{belote_cli-2.9.2 → belote_cli-2.9.5}/src/belote/input.py

@@ -143,14 +143,16 @@ class _UnixKeyReader:
             ch = chr(byte)
             if ch.lower() == "q":
                 return KeyEvent(Key.QUIT)
-            if ch.lower() == "h":
+            if ch == "?":
                 return KeyEvent(Key.HELP)
-            if ch.lower() == "s":
+            if ch.lower() == "h":
+                return KeyEvent(Key.HIST)
+            if ch.lower() == "t":
+                return KeyEvent(Key.THEME)
+            if ch.lower() == "o":
                 return KeyEvent(Key.SORT)
             if ch.lower() == "m":
                 return KeyEvent(Key.MUTE)
-            if ch.lower() == "t":
-                return KeyEvent(Key.HIST)
             if ch.lower() == "i" or ch.lower() == "v":
                 return KeyEvent(Key.OVERLAY)
 
@@ -262,14 +264,16 @@ if os.name == "nt":
                 return KeyEvent(Key.SPACE)
             if ch.lower() == b"q":
                 return KeyEvent(Key.QUIT)
-            if ch.lower() == b"h":
+            if ch == b"?":
                 return KeyEvent(Key.HELP)
-            if ch.lower() == b"s":
+            if ch.lower() == b"h":
+                return KeyEvent(Key.HIST)
+            if ch.lower() == b"t":
+                return KeyEvent(Key.THEME)
+            if ch.lower() == b"o":
                 return KeyEvent(Key.SORT)
             if ch.lower() == b"m":
                 return KeyEvent(Key.MUTE)
-            if ch.lower() == b"t":
-                return KeyEvent(Key.HIST)
             if ch.lower() in (b"i", b"v"):
                 return KeyEvent(Key.OVERLAY)
 

{belote_cli-2.9.2 → belote_cli-2.9.5}/src/belote/main.py

@@ -240,7 +240,7 @@ def main() -> None:
                     # Wait for Enter/R/Q/T
                     sys.stdout.write(f"\n  {BOLD}{gold_fg()}GAME OVER{RESET}")
                     sys.stdout.write(
-                        f"\n  {white_fg()}[Enter/Q] Menu  [R] Rematch  [T] History{RESET} "
+                        f"\n  {white_fg()}[Enter/Q] Menu  [R] Rematch  [H] History{RESET} "
                     )
                     sys.stdout.flush()
 
@@ -254,7 +254,7 @@ def main() -> None:
                             show_final_screen(state)
                             sys.stdout.write(f"\n  {BOLD}{gold_fg()}GAME OVER{RESET}")
                             sys.stdout.write(
-                                f"\n  {white_fg()}[Enter/Q] Menu  [R] Rematch  [t] History{RESET} "
+                                f"\n  {white_fg()}[Enter/Q] Menu  [R] Rematch  [H] History{RESET} "
                             )
                             sys.stdout.flush()
                         if ev.key in (Key.ENTER, Key.QUIT):

{belote_cli-2.9.2 → belote_cli-2.9.5}/src/belote/scoring.py

@@ -719,6 +719,20 @@ def score_round(state: GameState) -> ScoringBreakdown:
     )
 
 
+def _decl_short_label(d: Declaration) -> str:
+    if d.kind == "belote":
+        return "Belote"
+    if d.kind == "rebelote":
+        return "Rebelote"
+    if d.kind == "carre" and isinstance(d.detail, Carre):
+        rank = _VALUE_TO_RANK.get(d.detail.rank)
+        return f"Carré-{rank.value}" if rank else "Carré"
+    if d.kind == "sequence" and isinstance(d.detail, Sequence):
+        pts = _SEQUENCE_POINTS.get(d.detail.length, 0)
+        return f"{pts}{d.detail.suit.symbol}"
+    return d.kind
+
+
 def apply_round_score(state: GameState, breakdown: ScoringBreakdown) -> GameState:
     """Apply round scoring result to team scores and advance state."""
     ns, ew = state.team_scores
@@ -731,6 +745,46 @@ def apply_round_score(state: GameState, breakdown: ScoringBreakdown) -> GameStat
 
     new_scores = (ns, ew)
 
+    # Trick counts per team across the played round.
+    se_trump = state.boss_modifiers.seven_eight_trump
+    is_sa = state.contract == "sans_atout"
+    tricks_ns = 0
+    tricks_ew = 0
+    for trick in state.completed_tricks:
+        winner = trick_winner_seat(trick, state.trump, se_trump, is_sa)
+        if winner is None:
+            continue
+        if team_of(winner) == 0:
+            tricks_ns += 1
+        else:
+            tricks_ew += 1
+
+    # Declaration summaries — only show the team(s) that actually scored decls,
+    # which matches Belote's "best team takes all decls" rule.
+    ns_decl_total = breakdown.taker_declarations if breakdown.taker_team == 0 else breakdown.defender_declarations
+    ew_decl_total = breakdown.defender_declarations if breakdown.taker_team == 0 else breakdown.taker_declarations
+    ns_decls = tuple(
+        _decl_short_label(d) for d in state.declarations if team_of(d.seat) == 0
+    ) if ns_decl_total > 0 else ()
+    ew_decls = tuple(
+        _decl_short_label(d) for d in state.declarations if team_of(d.seat) == 1
+    ) if ew_decl_total > 0 else ()
+
+    common_kwargs = dict(
+        is_failed=breakdown.is_failed,
+        is_capot=breakdown.is_capot,
+        is_litige=breakdown.is_litige,
+        litige_points=breakdown.litige_points_awarded,
+        contract=state.contract,
+        trump=state.trump,
+        taker_seat=state.taker,
+        tricks_ns=tricks_ns,
+        tricks_ew=tricks_ew,
+        last_trick_winner=state.last_trick_winner,
+        decl_summary_ns=ns_decls,
+        decl_summary_ew=ew_decls,
+    )
+
     # Create RoundScore for history
     if breakdown.taker_team == 0:
         round_score = RoundScore(
@@ -745,10 +799,7 @@ def apply_round_score(state: GameState, breakdown: ScoringBreakdown) -> GameStat
             ew_rebelote=breakdown.defender_rebelote,
             ns_total=breakdown.taker_total,
             ew_total=breakdown.defender_total,
-            is_failed=breakdown.is_failed,
-            is_capot=breakdown.is_capot,
-            is_litige=breakdown.is_litige,
-            litige_points=breakdown.litige_points_awarded,
+            **common_kwargs,
         )
     else:
         round_score = RoundScore(
@@ -763,10 +814,7 @@ def apply_round_score(state: GameState, breakdown: ScoringBreakdown) -> GameStat
             ew_rebelote=breakdown.taker_rebelote,
             ns_total=breakdown.defender_total,
             ew_total=breakdown.taker_total,
-            is_failed=breakdown.is_failed,
-            is_capot=breakdown.is_capot,
-            is_litige=breakdown.is_litige,
-            litige_points=breakdown.litige_points_awarded,
+            **common_kwargs,
         )
 
     new_history = state.score_history + (round_score,)

{belote_cli-2.9.2 → belote_cli-2.9.5}/src/belote/ui/menu.py

@@ -281,6 +281,11 @@ def show_main_menu(
                 show_help(reader)
             case Key.MUTE:
                 toggle_mute()
+            case Key.THEME:
+                themes_list = list(THEMES.keys())
+                curr_theme = theme_manager._current_theme_name
+                new_idx = (themes_list.index(curr_theme) + 1) % len(themes_list)
+                theme_manager.set_current(themes_list[new_idx])
             case Key.UP:
                 sel = (sel - 1) % len(options_labels)
             case Key.DOWN:

{belote_cli-2.9.2 → belote_cli-2.9.5}/src/belote/ui/prompts.py

@@ -200,11 +200,11 @@ def show_help(reader: KeyReader) -> None:
         "=" * 20,
         "",
         f"{white_fg()}General:{RESET}",
-        "  [?] or [H]  Show this help screen",
+        "  [?]         Show this help screen",
         "  [Q]         Quit to menu / Exit",
         "  [M]         Toggle Sound Effects",
         f"              (Currently: {sound_status})",
-        "  [Shift+T]   Cycle Theme",
+        "  [T]         Cycle Theme",
         "  [Esc]       Cancel / Back",
         "",
         f"{white_fg()}Gameplay:{RESET}",
@@ -213,7 +213,7 @@ def show_help(reader: KeyReader) -> None:
         "  [1-8]       Quick card select",
         "  [O]         Sort hand by suit/rank",
         "  [Space]     Skip animations",
-        "  [t]         View Game History",
+        "  [H]         View Game History",
         "  [Z]         Undo last move",
         "",
         f"{white_fg()}Bidding:{RESET}",
@@ -222,7 +222,7 @@ def show_help(reader: KeyReader) -> None:
         "",
         f"{white_fg()}Menus:{RESET}",
         "  [R]         Rematch (Game Over)",
-        "  [t]         View Game History",
+        "  [H]         View Game History",
         "",
         f"{DIM}Press [Any Key] to Return{RESET}",
     ]
@@ -305,6 +305,46 @@ def show_rules(reader: KeyReader) -> None:
                     scroll = 0
 
 
+def _hist_taker_label(rs) -> str:
+    team = "NS" if rs.taker_team == 0 else "EW"
+    if rs.taker_seat is None:
+        return team
+    return f"{rs.taker_seat.name[0]} ({team})"
+
+
+def _hist_contract_label(rs) -> str:
+    if rs.contract == "sans_atout":
+        return "SA"
+    if rs.contract == "tout_atout":
+        return "TA"
+    sym = rs.trump.symbol if rs.trump is not None and hasattr(rs.trump, "symbol") else "?"
+    return f"NORM {sym}"
+
+
+def _hist_status(rs) -> str:
+    if rs.is_capot:
+        return f"{gold_fg()}CAPOT{RESET}"
+    if rs.is_failed:
+        return f"{red_fg()}CHUTE{RESET}"
+    if rs.is_litige:
+        return f"{DIM}LITIGE{RESET}"
+    return "─"
+
+
+def _hist_decl_str(items: tuple[str, ...], width: int) -> str:
+    if not items:
+        return "─"
+    s = " ".join(items)
+    if len(s) > width:
+        s = s[: max(0, width - 1)] + "…"
+    return s
+
+
+def _ljust_visible(s: str, width: int) -> str:
+    pad = max(0, width - visible_len(s))
+    return s + " " * pad
+
+
 def show_history(state: GameState, reader: KeyReader) -> None:
     """Display a scrollable overlay of round-by-round scores."""
     scroll = 0
@@ -312,7 +352,7 @@ def show_history(state: GameState, reader: KeyReader) -> None:
     while True:
         term_w, term_h = get_term_size()
 
-        lines = []
+        lines: list[str] = []
         lines.append(f"{BOLD}{gold_fg()}GAME HISTORY{RESET}")
         lines.append("=" * 12)
         lines.append("")
@@ -320,32 +360,76 @@ def show_history(state: GameState, reader: KeyReader) -> None:
         if not state.score_history:
             lines.append(f"{DIM}No rounds completed yet.{RESET}")
         else:
-            # Table Header
-            header = f"{'RD':<3} | {'TAKER':<5} | {'NS':^15} | {'EW':^15}"
-            lines.append(f"{BOLD}{white_fg()}{header}{RESET}")
-            lines.append("-" * len(header))
-
-            for i, rs in enumerate(state.score_history):
-                rd = i + 1
-                taker = "NS" if rs.taker_team == 0 else "EW"
-
-                # Format: "Card+Decl+Bel"
-                ns_break = f"{rs.ns_card_pts}+{rs.ns_decl_pts}+{rs.ns_belote_pts}"
-                ew_break = f"{rs.ew_card_pts}+{rs.ew_decl_pts}+{rs.ew_belote_pts}"
-
-                ns_total = f"{BOLD}{rs.ns_total}{RESET}"
-                ew_total = f"{BOLD}{rs.ew_total}{RESET}"
-
-                row = f"{rd:<3} | {taker:<5} | {ns_total:>3} ({ns_break:<9}) | {ew_total:>3} ({ew_break:<9})"
-
-                if rs.is_capot:
-                    status = f" {gold_fg()}CAPOT!{RESET}"
-                elif rs.is_failed:
-                    status = f" {red_fg()}CHUTE!{RESET}"
-                else:
-                    status = ""
-
-                lines.append(row + status)
+            wide = term_w >= 78
+            if wide:
+                # Single-row layout. Column widths sum to ~76 with separators.
+                W_RD, W_TKR, W_CON, W_TRK, W_DECL, W_NS, W_EW, W_ST = 3, 7, 8, 7, 16, 5, 5, 7
+                header_cells = [
+                    _ljust_visible("RD", W_RD),
+                    _ljust_visible("TAKER", W_TKR),
+                    _ljust_visible("CONTRACT", W_CON),
+                    _ljust_visible("TRICKS", W_TRK),
+                    _ljust_visible("DECLARATIONS", W_DECL),
+                    _ljust_visible("NS", W_NS),
+                    _ljust_visible("EW", W_EW),
+                    _ljust_visible("STATUS", W_ST),
+                ]
+                header = " │ ".join(header_cells)
+                lines.append(f"{BOLD}{white_fg()}{header}{RESET}")
+                lines.append("─" * visible_len(header))
+
+                for i, rs in enumerate(state.score_history):
+                    rd = f"{i + 1:02d}"
+                    taker = _hist_taker_label(rs)
+                    contract = _hist_contract_label(rs)
+                    tricks = f"{rs.tricks_ns} / {rs.tricks_ew}"
+                    decl_ns = _hist_decl_str(rs.decl_summary_ns, W_DECL // 2 - 1)
+                    decl_ew = _hist_decl_str(rs.decl_summary_ew, W_DECL // 2 - 1)
+                    if rs.decl_summary_ns and rs.decl_summary_ew:
+                        decls = f"{decl_ns} / {decl_ew}"
+                    elif rs.decl_summary_ns:
+                        decls = decl_ns
+                    elif rs.decl_summary_ew:
+                        decls = decl_ew
+                    else:
+                        decls = "─"
+                    if visible_len(decls) > W_DECL:
+                        decls = decls[: W_DECL - 1] + "…"
+                    ns = f"{BOLD}{rs.ns_total}{RESET}"
+                    ew = f"{BOLD}{rs.ew_total}{RESET}"
+                    status = _hist_status(rs)
+
+                    row_cells = [
+                        _ljust_visible(rd, W_RD),
+                        _ljust_visible(taker, W_TKR),
+                        _ljust_visible(contract, W_CON),
+                        _ljust_visible(tricks, W_TRK),
+                        _ljust_visible(decls, W_DECL),
+                        _ljust_visible(ns, W_NS),
+                        _ljust_visible(ew, W_EW),
+                        _ljust_visible(status, W_ST),
+                    ]
+                    lines.append(" │ ".join(row_cells))
+            else:
+                # Compact two-line-per-round layout for narrow terminals.
+                lines.append(f"{BOLD}{white_fg()}{'RD':<3} {'TAKER':<7} {'CON':<8} {'TRICKS':<7} STATUS{RESET}")
+                lines.append("─" * 40)
+                for i, rs in enumerate(state.score_history):
+                    rd = f"{i + 1:02d}"
+                    taker = _hist_taker_label(rs)
+                    contract = _hist_contract_label(rs)
+                    tricks = f"{rs.tricks_ns}/{rs.tricks_ew}"
+                    status = _hist_status(rs)
+                    lines.append(
+                        f"{rd:<3} {_ljust_visible(taker, 7)} {contract:<8} {tricks:<7} {status}"
+                    )
+                    decl_n = _hist_decl_str(rs.decl_summary_ns, 14)
+                    decl_e = _hist_decl_str(rs.decl_summary_ew, 14)
+                    lines.append(
+                        f"   NS:{BOLD}{rs.ns_total:>4}{RESET}  EW:{BOLD}{rs.ew_total:>4}{RESET}  "
+                        f"decl: {decl_n} / {decl_e}"
+                    )
+                    lines.append("")
 
         lines.append("")
         lines.append(f"{DIM}[↑↓] Scroll  [Any Key] Return{RESET}")