Skip to content

The agent that grows with you

fix(tui_gateway): a raising session teardown still frees the replay ring

kshitijk4poor6e9f6e862c3c
diff --git a/tests/tui_gateway/test_tui_gateway_event_replay.py b/tests/tui_gateway/test_tui_gateway_event_replay.py
index 1682a903cb6..d1f042d6f22 100644
--- a/tests/tui_gateway/test_tui_gateway_event_replay.py
+++ b/tests/tui_gateway/test_tui_gateway_event_replay.py
@@ -333,3 +333,18 @@ def test_session_teardown_releases_the_replay_ring(monkeypatch):
assert events_since("closed-sid", 0) == []
assert event_replay.is_truncated("closed-sid", 0)
assert len(events_since("live-sid", 0)) == 1
+
+
+def test_a_raising_teardown_still_releases_the_replay_ring(monkeypatch):
+ from tui_gateway import session_lifecycle
+
+ def _boom(session, end_reason="tui_close"):
+ raise RuntimeError("finalize failed")
+
+ monkeypatch.setattr(session_lifecycle, "_teardown_session", _boom)
+ event_replay._stamp_event(_frame("failed-sid"))
+
+ with pytest.raises(RuntimeError):
+ session_lifecycle._teardown_popped_session({"_sid": "failed-sid"}, end_reason="tui_shutdown")
+
+ assert events_since("failed-sid", 0) == []
diff --git a/tui_gateway/session_lifecycle.py b/tui_gateway/session_lifecycle.py
index e923d6543bd..c4e8a0b768d 100644
--- a/tui_gateway/session_lifecycle.py
+++ b/tui_gateway/session_lifecycle.py
@@ -660,9 +660,13 @@ def _teardown_popped_session(session: dict | None, *, end_reason: str = "tui_clo
logger.debug("failed waiting for session turn thread", exc_info=True)
if end_reason != "tui_shutdown":
_settle_isolated_turn_before_close(session)
- _teardown_session(session, end_reason=end_reason)
- from tui_gateway.event_replay import forget_session
- forget_session(str(session.get("_sid") or "")) # after the reclaim announcement, the sid's last frame
+ try:
+ _teardown_session(session, end_reason=end_reason)
+ finally:
+ # Last, so the reclaim announcement is the final frame the ring would have held; finally, so a
+ # raising finalize (callers log and move on) still frees it.
+ from tui_gateway.event_replay import forget_session
+ forget_session(session.get("_sid") or "")
return True