The agent that grows with you
Python aiai-agentai-agentsanthropicchatgptclaudeclaude-codecodexhermeshermes-agentllmnous-researchopenai
fix(cli): a cancelled reconnect cancels its session.resume again
David Dudok de Wit25fc06bb8db8
diff --git a/hermes_cli/gateway_connection.py b/hermes_cli/gateway_connection.pyindex 761702f514d..2613969ad54 100644--- a/hermes_cli/gateway_connection.py+++ b/hermes_cli/gateway_connection.py@@ -36,6 +36,19 @@ class CallStopped(GatewayClientError):"""The caller stopped waiting (:meth:`GatewayConnection.call_until`); the request was sent."""+def _resume_plain(exc, session_id, typed):+ """A keyed ``session.resume`` the owner refused with ``exc``: returns when the caller resumes plain,+ else raises. Only a refusal in ``_KEY_NOT_TAKEN`` resumes plain (a keyed startup alias on a Desktop/TUI+ session); any other is raised, not hidden by a keyless attach whose first turn fails. ``typed`` (a typed+ ``--api-key`` the user resumes with) never resumes plain: ``admission_conflict`` is the thin client's+ refusal."""+ if typed and str(exc) == "admission_conflict":+ raise GatewayClientError(RESUME_KEY_MISMATCH) from None+ if typed or str(exc) not in _KEY_NOT_TAKEN:+ raise exc+ logger.debug("session.resume %s: launch key not taken (%s); resuming without it", session_id, exc)++def lost_before(frame, epoch) -> bool:"""``frame`` is a transport error from a connection older than ``epoch``: a reconnect replaced it,so it is no outcome of anything submitted on ``epoch``."""@@ -254,15 +267,11 @@ class GatewayConnection:that resumed it. Resume each session this viewer had open; one gone meanwhile is dropped. Anyother failure fails the reconnect: ready without the subscription, every prompt is refused on alive socket that never redials, while a failed redial is retried by the next call."""- loop = asyncio.get_running_loop()-- def call(method, **params): # :meth:`resume` runs on a worker thread; this loop carries its requests- return asyncio.run_coroutine_threadsafe(client.rpc(method, **params), loop).result()for session_id, state in list(self.states.items()):if state.subscription_id is None:continuetry:- state.adopt_snapshot(await asyncio.to_thread(self.resume, call, session_id))+ state.adopt_snapshot(await self._resume(client, session_id))except GatewayClientError as exc:if str(exc) not in _GONE:raise@@ -270,23 +279,28 @@ class GatewayConnection:state.subscription_id = Nonedef resume(self, call, session_id, *, typed=False):- """``session.resume`` through ``call`` (the store's attach; :meth:`_resubscribe`), re-supplying- :attr:`launch_api_key`. Only a refusal in ``_KEY_NOT_TAKEN`` resumes plain (a keyed startup alias on- a Desktop/TUI session); any other is raised, not hidden by a keyless attach whose first turn fails.- ``typed`` (a typed ``--api-key`` the user resumes with) never resumes plain: ``admission_conflict``- is the thin client's refusal. A reconnect passes False: nothing was typed there."""+ """``session.resume`` through ``call`` (the store's attach), re-supplying :attr:`launch_api_key`;+ a refusal of the keyed resume is :func:`_resume_plain`'s to decide. ``typed``: the user resumes with+ a typed ``--api-key``."""key = self.launch_api_keyif key:try:return call("session.resume", session_id=session_id, api_key=key)except GatewayRPCError as exc:- if typed and str(exc) == "admission_conflict":- raise GatewayClientError(RESUME_KEY_MISMATCH) from None- if typed or str(exc) not in _KEY_NOT_TAKEN:- raise- logger.debug("session.resume %s: launch key not taken (%s); resuming without it", session_id, exc)+ _resume_plain(exc, session_id, typed)return call("session.resume", session_id=session_id)+ async def _resume(self, client, session_id):+ """:meth:`resume` for :meth:`_resubscribe`, awaited on this loop so a cancelled reconnect cancels+ its request. A reconnect types nothing: never ``typed``."""+ key = self.launch_api_key+ if key:+ try:+ return await client.rpc("session.resume", session_id=session_id, api_key=key)+ except GatewayRPCError as exc:+ _resume_plain(exc, session_id, typed=False)+ return await client.rpc("session.resume", session_id=session_id)+async def _pump(self, client):while True:frame = await client.events.get()diff --git a/tests/hermes_cli/test_gateway_connection_reconnect.py b/tests/hermes_cli/test_gateway_connection_reconnect.pyindex 22d2f8c643a..15e4ea00ff6 100644--- a/tests/hermes_cli/test_gateway_connection_reconnect.py+++ b/tests/hermes_cli/test_gateway_connection_reconnect.py@@ -264,6 +264,40 @@ def test_close_after_a_failed_resume_is_still_final(gateway, conn):assert len(gateway.lives) == 2+class _Unanswered:+ """A socket that takes every request and never answers one (a gateway stalled mid-reconnect)."""++ def __init__(self):+ self.sent = asyncio.Event()++ async def send(self, raw):+ self.sent.set()++ def __aiter__(self):+ return self++ async def __anext__(self):+ return await asyncio.Future()+++async def test_a_cancelled_reconnect_cancels_its_session_resume():+ """The viewer closes while a reconnect's ``session.resume`` goes unanswered: cancelling the+ resubscribe cancels the request with it. One left pending on the client held a worker thread+ that process exit joins until the request timed out."""+ from hermes_cli.gateway_client import GatewayClient+ conn = GatewayConnection()+ conn.state(SID).subscription_id = "sub-1"+ socket = _Unanswered()+ async with GatewayClient(socket) as client:+ resubscribe = asyncio.create_task(conn._resubscribe(client))+ await asyncio.wait_for(socket.sent.wait(), 5)+ resubscribe.cancel()+ with pytest.raises(asyncio.CancelledError):+ await resubscribe+ assert client.pending == {}++def _cli(store):return types.SimpleNamespace(_session_db=store, _gateway_session_open=True)