From 5725d635b22c2bc4144d0158f7636280fdfe2887 Mon Sep 17 00:00:00 2001 From: Pheby Date: Wed, 2 Sep 2026 23:30:01 +0000 Subject: [PATCH] fix: bind server/adapter contextvars per WS task; fix session pre-create call MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Two live-deployment bugs found during end-to-end verification: 1. server.py: ContextVars set in adapter.connect() do not propagate into aiohttp handler tasks, so hermes_bridge._current_server()/_current_adapter() resolved to None inside message handlers (conversation.list returned empty snapshots, broadcast fan-out and notification paths silently no-oped). Bind both contextvars at the top of _handle_ws — the per-connection task owns the context for all its handler dispatch and agent-thread bridges. 2. hermes_bridge.py: create_conversation passed two extra positional args to SessionStore.get_or_create_session() (source, False, False) — the actual signature is (source, force_new=False). TypeError was swallowed by the guard, so pre-creating an empty Hermes session at conversation.create always failed; sessions were only created on first message. Verified live against the running gateway: full 11-point E2E (auth 401, hello/ready, conversation list/create/delete with persistence, chat.send round-trip through the agent, run lifecycle events, models.current, reasoning.current). 46/46 unit tests pass. --- plugin/pheby/hermes_bridge.py | 2 +- plugin/pheby/server.py | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/plugin/pheby/hermes_bridge.py b/plugin/pheby/hermes_bridge.py index 691a217..fb3340c 100644 --- a/plugin/pheby/hermes_bridge.py +++ b/plugin/pheby/hermes_bridge.py @@ -134,7 +134,7 @@ async def create_conversation(server: Any, name: Optional[str]) -> str: if store is not None: try: await asyncio.to_thread( - store.get_or_create_session, _source_for(cid), False, False) + store.get_or_create_session, _source_for(cid)) if name: await rename_conversation(cid, name) except Exception: diff --git a/plugin/pheby/server.py b/plugin/pheby/server.py index 941ac82..2e2747d 100644 --- a/plugin/pheby/server.py +++ b/plugin/pheby/server.py @@ -173,6 +173,14 @@ class PhebyServer: # ── WebSocket handler ──────────────────────────────────────────────── async def _handle_ws(self, request: web.Request) -> web.WebSocketResponse: + # Bind server/adapter identity to THIS task's context. ContextVars set + # in adapter.connect() do not propagate into aiohttp handler tasks, so + # every per-connection task must bind them itself — hermes_bridge's + # _current_server()/_current_adapter() resolve from here in all + # message handlers and agent-thread callbacks. + hermes_bridge.set_server(self) + if self.adapter is not None: + hermes_bridge.set_adapter(self.adapter) ws = web.WebSocketResponse(max_msg_size=proto.MAX_WS_MESSAGE_BYTES, heartbeat=30.0, autoping=True) await ws.prepare(request)