Skip to content

The agent that grows with you

fix(tui_gateway): a frame stamped after teardown no longer rebuilds the replay ring

kshitijk4poor1ee55ac331a4
diff --git a/tests/tui_gateway/test_tui_gateway_event_replay.py b/tests/tui_gateway/test_tui_gateway_event_replay.py
index d1f042d6f22..c0b33f014ac 100644
--- a/tests/tui_gateway/test_tui_gateway_event_replay.py
+++ b/tests/tui_gateway/test_tui_gateway_event_replay.py
@@ -316,7 +316,21 @@ def test_forget_session_frees_the_ring_and_keeps_seq_and_gap_semantics():
event_replay._stamp_event(late)
assert late["params"]["seq"] == 4
assert len(events_since("kept", 0)) == 1
- event_replay.forget_session("never-seen") # no-op
+ event_replay.forget_session("never-seen") # frees nothing, raises nothing
+
+
+def test_a_frame_stamped_after_forget_does_not_rebuild_the_ring():
+ event_replay._stamp_event(_frame("closed"))
+ event_replay.forget_session("closed")
+
+ late = _frame("closed")
+ late["params"]["payload"] = {"text": "x" * 100_000}
+ event_replay._stamp_event(late)
+
+ assert late["params"]["seq"] == 2 # numbering still advances
+ assert events_since("closed", 0) == []
+ assert replay_stats()["sessions"] == 0 and replay_stats()["bytes"] == 0
+ assert event_replay.is_truncated("closed", 1) # a client holding seq 1 refetches
def test_session_teardown_releases_the_replay_ring(monkeypatch):
diff --git a/tui_gateway/event_replay.py b/tui_gateway/event_replay.py
index 1cd707ce04c..d2f4ab26936 100644
--- a/tui_gateway/event_replay.py
+++ b/tui_gateway/event_replay.py
@@ -9,7 +9,8 @@ _REPLAY_BUFFER_MAX events AND _REPLAY_BUFFER_BYTES_MAX frozen UTF-8 payload byte
_REPLAY_PROCESS_BYTES_MAX frozen UTF-8 payload bytes across at most _REPLAY_SESSIONS_MAX sessions,
oldest evicted FIFO (their seq/truncation counters are retained so a revisited session stays
monotonic within the epoch, #100122). Evicted or never-retained (oversized) frames leave a truncation watermark so a
-reconnecting client refetches instead of trusting a replay with holes.
+reconnecting client refetches instead of trusting a replay with holes. A torn-down session's ring is freed at
+teardown (``forget_session``) and never rebuilt by late frames.
"""
from __future__ import annotations
@@ -43,6 +44,10 @@ _replay_buffer_bytes: dict[str, int] = {}
_replay_evicted_through: dict[str, int] = {}
_replay_total_bytes = 0
_replay_next_seq: dict[str, int] = {}
+# Torn-down sids (forget_session). A frame stamped later (a turn thread that outlived the teardown join, a
+# compute-host bridge echo) still gets a seq and a watermark but is never retained, so it cannot rebuild a
+# ring that nothing would free until FIFO eviction. One str per closed session, like _replay_next_seq.
+_replay_forgotten: set[str] = set()
def replay_epoch() -> str:
@@ -85,6 +90,9 @@ def _stamp_event(obj: dict) -> None:
seq = _replay_next_seq.get(sid, 0) + 1
_replay_next_seq[sid] = seq
params["seq"] = seq
+ if sid in _replay_forgotten:
+ _replay_evicted_through[sid] = seq
+ return
buf = _replay_buffers.get(sid)
if buf is None:
buf = _replay_buffers[sid] = deque()
@@ -135,6 +143,7 @@ def forget_session(sid: str) -> None:
if not sid:
return
with _replay_lock:
+ _replay_forgotten.add(sid)
_drop_ring_locked(sid)
@@ -172,6 +181,7 @@ def reset_replay_state() -> None:
_replay_buffer_bytes.clear()
_replay_evicted_through.clear()
_replay_next_seq.clear()
+ _replay_forgotten.clear()
_replay_total_bytes = 0