refactor: replace dual _iteration_panel/_iteration_spinner fields with single _active_renderable

The two fields were always set mutually exclusively — one held the
active panel/spinner while the other was None.  Collapsing them into a
single _LivePanelBase field eliminates the redundant state and removes
the @Property that merged them back together at every access.

Co-authored-by: Ralphify <noreply@ralphify.co>

Author: 2 people

src/ralphify/_console_emitter.py

@@ -971,8 +971,7 @@ def __init__(self, console: Console) -> None:
         self._peek_enabled = _interactive_default_peek(console)
         self._structured_agent: bool = False
         self._peek_broken: bool = False
-        self._iteration_panel: _IterationPanel | None = None
-        self._iteration_spinner: _IterationSpinner | None = None
+        self._active_renderable: _LivePanelBase | None = None
         # Iteration number of the currently-active panel (the one
         # receiving events).  ``None`` between iterations.
         self._current_iteration: int | None = None
@@ -1014,11 +1013,6 @@ def __init__(self, console: Console) -> None:
             EventType.AGENT_ACTIVITY: self._on_agent_activity,
         }
 
-    @property
-    def _active_renderable(self) -> _LivePanelBase | None:
-        """The panel or spinner for the current iteration, or ``None``."""
-        return self._iteration_panel or self._iteration_spinner
-
     # ── _IterationNavigator implementation ───────────────────────────
     #
     # These three methods expose the emitter's iteration state to
@@ -1130,8 +1124,7 @@ def _archive_current_iteration_unlocked(self, outcome: str) -> None:
                 break
             self._iteration_order.remove(candidate)
             self._iteration_history.pop(candidate, None)
-        self._iteration_panel = None
-        self._iteration_spinner = None
+        self._active_renderable = None
         self._current_iteration = None
 
     def _refresh_live_unlocked(self, renderable: _LivePanelBase) -> None:
@@ -1271,15 +1264,10 @@ def _create_panel_unlocked(self) -> _LivePanelBase:
         Caller must hold ``_console_lock``.
         """
         if self._structured_agent:
-            panel = _IterationPanel()
-            self._iteration_panel = panel
-            self._iteration_spinner = None
-            renderable: _LivePanelBase = panel
+            renderable: _LivePanelBase = _IterationPanel()
         else:
-            spinner = _IterationSpinner()
-            self._iteration_panel = None
-            self._iteration_spinner = spinner
-            renderable = spinner
+            renderable = _IterationSpinner()
+        self._active_renderable = renderable
         # Carry the current peek visibility into the new renderable so
         # an iteration that starts with peek already off doesn't flash
         # the empty scroll feed before the first event lands.
@@ -1317,8 +1305,7 @@ def _stop_live_unlocked(self) -> None:
         if self._live is not None:
             self._live.stop()
             self._live = None
-        self._iteration_panel = None
-        self._iteration_spinner = None
+        self._active_renderable = None
         self._current_iteration = None
 
     def _stop_live(self) -> None:

tests/test_console_emitter.py

@@ -69,7 +69,7 @@ def test_toggle_peek_enables_rendering(self):
                 iteration=1,
             )
         )
-        spinner = emitter._iteration_spinner
+        spinner = emitter._active_renderable
         assert spinner is not None
         assert any("visible line" in line.plain for line in spinner._scroll_lines)
         emitter._stop_live()
@@ -94,7 +94,7 @@ def test_toggle_peek_off_keeps_buffering_but_hides_lines(self):
                 iteration=1,
             )
         )
-        spinner = emitter._iteration_spinner
+        spinner = emitter._active_renderable
         assert spinner is not None
         # Buffer keeps recording even with peek off…
         assert any(
@@ -146,7 +146,7 @@ def worker(line: str) -> None:
         for t in threads:
             t.join()
 
-        spinner = emitter._iteration_spinner
+        spinner = emitter._active_renderable
         assert spinner is not None
         # Each worker adds ``iterations`` whole copies of its line to the
         # scroll buffer.  If the lock is working, both substrings appear
@@ -186,7 +186,7 @@ def test_peek_line_escapes_rich_markup(self):
                 iteration=1,
             )
         )
-        spinner = emitter._iteration_spinner
+        spinner = emitter._active_renderable
         assert spinner is not None
         assert any(
             "[bold red]not markup[/]" in line.plain for line in spinner._scroll_lines
@@ -425,7 +425,7 @@ def _emit_tool(name: str, arg: str) -> None:
         # Toggle back on — both the original and the catch-up event are
         # in the buffer, so the user sees current state, not stale state.
         emitter.toggle_peek()
-        panel = emitter._iteration_panel
+        panel = emitter._active_renderable
         assert panel is not None
         plains = [line.plain for line in panel._scroll_lines]
         assert any("seen-while-on.py" in p for p in plains)
@@ -461,7 +461,7 @@ def test_toggle_peek_off_preserves_scroll_buffer(self):
                 iteration=1,
             )
         )
-        panel = emitter._iteration_panel
+        panel = emitter._active_renderable
         assert panel is not None
         assert len(panel._scroll_lines) == 1
         before = list(panel._scroll_lines)
@@ -482,7 +482,7 @@ def test_toggle_peek_in_live_sets_peek_message(self):
         emitter.emit(_make_event(EventType.ITERATION_STARTED, iteration=1))
         # Toggle peek off — should set peek message on the spinner
         emitter.toggle_peek()
-        spinner = emitter._iteration_spinner
+        spinner = emitter._active_renderable
         assert spinner is not None
         assert spinner._peek_message is not None
         assert "peek off" in spinner._peek_message.plain
@@ -535,7 +535,7 @@ def test_non_claude_agent_keeps_raw_line_rendering(self):
                 iteration=1,
             )
         )
-        spinner = emitter._iteration_spinner
+        spinner = emitter._active_renderable
         assert spinner is not None
         assert any("raw agent output" in line.plain for line in spinner._scroll_lines)
         emitter._stop_live()
@@ -563,7 +563,7 @@ def test_tool_use_scroll_line(self):
                 iteration=1,
             )
         )
-        panel = emitter._iteration_panel
+        panel = emitter._active_renderable
         assert panel is not None
         assert len(panel._scroll_lines) == 1
         assert "Bash" in panel._scroll_lines[0].plain
@@ -586,7 +586,7 @@ def test_assistant_text_scroll_line(self):
                 iteration=1,
             )
         )
-        panel = emitter._iteration_panel
+        panel = emitter._active_renderable
         assert panel is not None
         assert any("fix the bug" in line.plain for line in panel._scroll_lines)
         emitter._stop_live()
@@ -607,7 +607,7 @@ def test_thinking_produces_scroll_lines(self):
                 iteration=1,
             )
         )
-        panel = emitter._iteration_panel
+        panel = emitter._active_renderable
         assert panel is not None
         assert len(panel._scroll_lines) == 1
         assert "let me think..." in panel._scroll_lines[0].plain
@@ -629,7 +629,7 @@ def test_rate_limit_scroll_line(self):
                 iteration=1,
             )
         )
-        panel = emitter._iteration_panel
+        panel = emitter._active_renderable
         assert panel is not None
         assert any("rate limit" in line.plain for line in panel._scroll_lines)
         assert any("rate_limited" in line.plain for line in panel._scroll_lines)
@@ -659,7 +659,7 @@ def test_parse_exception_caught_and_logged_once(self):
 
         # Monkeypatch the panel to raise
         with patch.object(
-            emitter._iteration_panel, "apply", side_effect=ValueError("parse boom")
+            emitter._active_renderable, "apply", side_effect=ValueError("parse boom")
         ):
             emitter.emit(
                 _make_event(
@@ -716,7 +716,7 @@ def test_peek_off_still_buffers_activity(self):
                 iteration=1,
             )
         )
-        panel = emitter._iteration_panel
+        panel = emitter._active_renderable
         assert panel is not None
         # Buffer captures activity even with peek off…
         assert len(panel._scroll_lines) == 1
@@ -749,7 +749,7 @@ def test_tool_error_scroll_line(self):
                 iteration=1,
             )
         )
-        panel = emitter._iteration_panel
+        panel = emitter._active_renderable
         assert panel is not None
         assert any("tool error" in line.plain for line in panel._scroll_lines)
         assert any("File not found" in line.plain for line in panel._scroll_lines)
@@ -1693,7 +1693,7 @@ def test_enter_with_structured_iteration_creates_view(self):
             assert emitter.enter_fullscreen() is True
             assert emitter._fullscreen_view is not None
             assert emitter._fullscreen_live is not None
-            assert emitter._fullscreen_view._source is emitter._iteration_panel
+            assert emitter._fullscreen_view._source is emitter._active_renderable
             assert emitter._fullscreen_view.iteration_id == 1
         finally:
             emitter._stop_live()
@@ -1703,7 +1703,7 @@ def test_enter_with_raw_iteration_uses_spinner(self):
         try:
             assert emitter.enter_fullscreen() is True
             assert emitter._fullscreen_view is not None
-            assert emitter._fullscreen_view._source is emitter._iteration_spinner
+            assert emitter._fullscreen_view._source is emitter._active_renderable
         finally:
             emitter._stop_live()
 
@@ -1727,7 +1727,7 @@ def test_exit_restores_compact_live(self):
             assert emitter._fullscreen_live is None
             # Compact Live is back, still pointing at the same panel.
             assert emitter._live is not None
-            assert emitter._iteration_panel is not None
+            assert emitter._active_renderable is not None
         finally:
             emitter._stop_live()
 
@@ -1744,7 +1744,7 @@ def test_iteration_end_keeps_fullscreen_and_archives_panel(self):
         emitter, _ = self._make_emitter_with_iteration(structured=True)
         try:
             emitter.enter_fullscreen()
-            panel_before = emitter._iteration_panel
+            panel_before = emitter._active_renderable
             assert panel_before is not None
             emitter.emit(
                 _make_event(
@@ -1759,7 +1759,7 @@ def test_iteration_end_keeps_fullscreen_and_archives_panel(self):
             assert emitter._fullscreen_view is not None
             assert emitter._fullscreen_live is not None
             # Active iteration cleared, but the panel lives on in history.
-            assert emitter._iteration_panel is None
+            assert emitter._active_renderable is None
             assert emitter._current_iteration is None
             assert emitter._iteration_history.get(1) is panel_before
             # Frozen with the right outcome — surfaced in the header.
@@ -1931,7 +1931,7 @@ def test_handle_key_q_exits_fullscreen(self):
     def test_handle_key_scroll_keys_move_offset(self):
         emitter, _ = self._make_emitter_with_iteration(structured=True)
         try:
-            panel = emitter._iteration_panel
+            panel = emitter._active_renderable
             assert panel is not None
             _populate_buffer(panel, 500)
             emitter.enter_fullscreen()