From 0e4bcc5a1f8779813adb370ca6d51dc0bf3ed3e2 Mon Sep 17 00:00:00 2001 From: OpenBot Date: Tue, 6 Oct 2026 19:09:12 +0800 Subject: [PATCH] fix: server requests must not block reader thread; drop stale bindings on startup --- src/agenthub/acp_client.py | 9 +++++++++ src/agenthub/session.py | 6 ++++++ tests/test_session_manager.py | 5 +++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/agenthub/acp_client.py b/src/agenthub/acp_client.py index e9512d2..d294f08 100644 --- a/src/agenthub/acp_client.py +++ b/src/agenthub/acp_client.py @@ -226,6 +226,15 @@ class ACPClient: self._resolve_response(msg) def _handle_server_request(self, msg: dict[str, Any]) -> None: + # Handlers may BLOCK (e.g. session/request_permission waits minutes for + # the user's IM reply). Run them on a worker thread: blocking here would + # stall the reader loop, and every pending request would time out. + threading.Thread( + target=self._run_server_request, args=(msg,), daemon=True, + name=f"acp-srvreq-{msg.get('method')}-{msg.get('id')}", + ).start() + + def _run_server_request(self, msg: dict[str, Any]) -> None: rid = msg["id"] method = msg["method"] params = msg.get("params") or {} diff --git a/src/agenthub/session.py b/src/agenthub/session.py index 9b67111..3bcb223 100644 --- a/src/agenthub/session.py +++ b/src/agenthub/session.py @@ -615,6 +615,12 @@ class SessionManager: def _load_db(self) -> None: assert self._db is not None + # Persisted bindings reference ACP session ids inside agent subprocesses + # that died with the previous service run. We do not resume them + # (loadSession handling is M2): drop them so the next message creates a + # fresh session instead of failing with "session not found". + self._db.execute("DELETE FROM bindings") + self._db.commit() for channel, chat_id, agent, sid in self._db.execute( "SELECT channel, chat_id, agent, acp_session_id FROM bindings" ): diff --git a/tests/test_session_manager.py b/tests/test_session_manager.py index 1930f3d..c5e1577 100644 --- a/tests/test_session_manager.py +++ b/tests/test_session_manager.py @@ -120,8 +120,9 @@ def test_sqlite_persistence_roundtrip(tmp_path): m.stop() # closes clients but DB rows persist m2 = make_manager(tmp_path, db_path=db) - b = m2.get_binding("wecom", "chatP") - assert b is not None and b.agent == "mock" + # bindings reference ACP sessions inside dead subprocesses: NOT restored + # (next message starts a fresh session), but conversation records are. + assert m2.get_binding("wecom", "chatP") is None rec = m2._records["wecom:chatP"] assert any(e["text"] == "persist me" for e in rec.text_log) m2.stop()