The agent that grows with you
Python aiai-agentai-agentsanthropicchatgptclaudeclaude-codecodexhermeshermes-agentllmnous-researchopenai
fix(pty): keep a reattach replay below the size that last timed out
emozilla241aa72c4334
diff --git a/hermes_cli/pty_session.py b/hermes_cli/pty_session.pyindex f07e6740fbe..b63ad100a71 100644--- a/hermes_cli/pty_session.py+++ b/hermes_cli/pty_session.py@@ -30,7 +30,9 @@ _VIEWER_SEND_TIMEOUT_SECONDS = 5.0# A reattach replay is a single frame of up to the 1 MiB buffer (host-terminal clients take exactly# the next binary frame as the replay, so it is not chunked). It gets the stall limit plus the time# to cross a link this slow (about 256 kbit/s; 37 s for 1 MiB). A replay that misses that deadline is-# halved for the session's next attach, so a viewer on a slower link redials onto a replay it carries.+# halved for the session's next attaches and never grows back: a send returns once the socket's buffers+# take the frame, so a quick one does not show that the link carries more, and growing back would+# replay a size that already timed out. A viewer on a slower link redials onto a replay it carries._REPLAY_MIN_BYTES_PER_SECOND = 32 * 1024# The smallest replay a timed-out one shrinks to, so a reattach always shows the newest output. Its# deadline needs about 3 KB/s, less than a link needs to keep up with live output (one frame per@@ -102,9 +104,8 @@ class PtySession:self.active_session_file = active_session_fileself.active_session_cleanup: Optional[Callable[[], None]] = Noneself.buffer = RingBuffer(buffer_cap)- # How many of the buffer's newest bytes a reattach replays: a replay that times out halves it- # (down to _REPLAY_FLOOR_BYTES), one that arrives well inside its deadline doubles it back.- self._buffer_cap = buffer_cap+ # How many of the buffer's newest bytes a reattach replays: a replay that times out halves it,+ # down to _REPLAY_FLOOR_BYTES, for the rest of the session.self._replay_limit = buffer_capself.alive = Trueself.attached = False@@ -259,16 +260,11 @@ class PtySession:# frame never loses terminal-query replies on an empty history.if snap or initial_text is not None:replay_timeout = _VIEWER_SEND_TIMEOUT_SECONDS + len(snap) / _REPLAY_MIN_BYTES_PER_SECOND- started = time.monotonic()try:await asyncio.wait_for(ws.send_bytes(snap), timeout=replay_timeout)except TimeoutError:self._replay_limit = max(_REPLAY_FLOOR_BYTES, len(snap) // 2)raise- # A replay that arrived within half its deadline means twice as much fits in- # the larger replay's deadline, so a limit an earlier slow viewer cut grows back.- if len(snap) < len(held) and time.monotonic() - started <= replay_timeout / 2:- self._replay_limit = min(self._buffer_cap, 2 * len(snap))except _VIEWER_SEND_ERRORS:self.detach(ws)return Falsediff --git a/tests/hermes_cli/test_pty_session.py b/tests/hermes_cli/test_pty_session.pyindex fe9e049661b..33f85be19be 100644--- a/tests/hermes_cli/test_pty_session.py+++ b/tests/hermes_cli/test_pty_session.py@@ -261,11 +261,9 @@ async def test_redials_over_a_link_too_slow_for_the_whole_replay_reach_a_replay_@pytest.mark.asyncio-async def test_a_shrunk_replay_keeps_a_floor_and_grows_back_once_viewers_keep_up(monkeypatch):+async def test_a_shrunk_replay_keeps_a_floor(monkeypatch):"""Replays that keep timing out shrink the next one only down to a floor, so a reattach still- shows the newest output instead of nothing. Replays that arrive well inside their deadline grow- it back, so a viewer on a good link gets the whole retained history again after a few- reattaches."""+ shows the newest output instead of nothing."""from hermes_cli import pty_sessionfrom hermes_cli.pty_session import PtySession@@ -279,17 +277,36 @@ async def test_a_shrunk_replay_keeps_a_floor_and_grows_back_once_viewers_keep_upfor _stall in range(20):await session.attach(NarrowLinkWS(0)) # never finishes a frame of output- replays = []- for _reattach in range(10):- viewer = FakeWS()- assert await session.attach(viewer)+ viewer = FakeWS()+ assert await session.attach(viewer)+ assert viewer.sent == [("bytes", history[-1024:])]+++async def test_a_replay_size_that_timed_out_is_not_replayed_again(monkeypatch):+ """A replay send returns once the socket's buffers take the frame, so a quick send does not show+ that the link carries more. After a replay times out, the session never replays that size again:+ a viewer that keeps redialing over the same slow link gets the replay it carries every time,+ instead of timing out on every second redial."""+ from hermes_cli import pty_session+ from hermes_cli.pty_session import PtySession++ monkeypatch.setattr(pty_session, "_VIEWER_SEND_TIMEOUT_SECONDS", 0.01)+ monkeypatch.setattr(pty_session, "_REPLAY_MIN_BYTES_PER_SECOND", 1024 ** 3)+ monkeypatch.setattr(pty_session, "_REPLAY_FLOOR_BYTES", 1024)+ history = bytes(range(256)) * 256+ session = PtySession("k", FakeBridge([]), buffer_cap=len(history), read_timeout=0.01)+ session.buffer.append(history)++ attached, replays = [], []+ for _redial in range(6):+ # The buffers take half the history at once; the whole of it never crosses in time.+ viewer = NarrowLinkWS(len(history) // 2)+ attached.append(await session.attach(viewer))replays.append(viewer.sent[0][1] if viewer.sent else b"")- if replays[-1] == history:- break- assert replays[0] == history[-1024:]- assert all(history.endswith(replay) for replay in replays)- assert [len(replay) for replay in replays] == sorted(len(replay) for replay in replays)- assert replays[-1] == history++ assert attached == [False] + [True] * 5+ assert replays[1:] == [history[len(history) // 2:]] * 5@pytest.mark.asyncio@@ -337,6 +354,11 @@ async def test_a_reattach_that_replays_part_of_the_history_says_output_was_trimmreturn json.loads(text.removeprefix(META_PREFIX))try:+ whole = Viewer(len(history))+ await host_terminal(whole)+ assert whole.sent[1] == ("bytes", history)+ assert metadata(whole)["truncated"] is False+stalled = Viewer(0)await host_terminal(stalled)assert stalled.close_code == 1001 and metadata(stalled)["truncated"] is False@@ -346,11 +368,6 @@ async def test_a_reattach_that_replays_part_of_the_history_says_output_was_trimmkind, replay = partial.sent[1]assert kind == "bytes" and len(replay) < len(history) and history.endswith(replay)assert metadata(partial)["truncated"] is True-- whole = Viewer(len(history))- await host_terminal(whole)- assert whole.sent[1] == ("bytes", history)- assert metadata(whole)["truncated"] is Falsefinally:await registry.close_all()