The agent that grows with you
Python aiai-agentai-agentsanthropicchatgptclaudeclaude-codecodexhermeshermes-agentllmnous-researchopenai
fix(mcp): release a subscription granted after its route was removed
emozillaa99069c0d0f9
diff --git a/tests/tools/test_mcp_events.py b/tests/tools/test_mcp_events.pyindex fb916d2413d..99fe0bdd2e7 100644--- a/tests/tools/test_mcp_events.py+++ b/tests/tools/test_mcp_events.py@@ -211,6 +211,22 @@ class TestRefresh:asyncio.run(events.refresh_server_subscriptions(_server(session), force=True))assert session.sent == []+ def test_a_route_removed_during_the_refresh_is_released(self, home):+ _subscribe(FakeSession(_grant()))++ class RacingSession(FakeSession):+ async def send_request(self, request, result_type):+ reply = await super().send_request(request, result_type)+ if request.method == "events/subscribe": # another process unsubscribed meanwhile+ (home / "webhook_subscriptions.json").write_text("{}")+ return reply++ session = RacingSession(_grant(), {})+ asyncio.run(events.refresh_server_subscriptions(_server(session), force=True))+ assert [sent["method"] for sent in session.sent] == ["events/subscribe", "events/unsubscribe"]+ assert session.sent[1]["params"]["delivery"] == {"url": session.sent[0]["params"]["delivery"]["url"]}+ assert _routes(home) == {}+def test_a_new_subscription_wakes_the_refresh_loop(self, home, monkeypatch):passes = []diff --git a/tools/mcp_tool_events.py b/tools/mcp_tool_events.pyindex b2abdde9b6c..5fbaaa39f9b 100644--- a/tools/mcp_tool_events.py+++ b/tools/mcp_tool_events.py@@ -208,12 +208,24 @@ def _load_routes(server_name: str) -> dict[str, dict]:async def _subscribe_route(session, route_name: str, route: dict, url_base: str) -> Optional[dict]:- """``events/subscribe`` for one route and record the grant; returns the stored state, None when the- route was removed while the request was in flight."""+ """``events/subscribe`` for one route and record the grant; returns the stored state. When the+ route was removed while the request was in flight (an unsubscribe in another process holds its own+ lock, not this one), the subscription just granted is released again and None is returned."""state = (await asyncio.to_thread(_load_state)).get(route_name, {})params = _subscribe_params(route_name, route, url_base, state)result = await _send(session, "events/subscribe", params)- return await asyncio.to_thread(_store_grant, route_name, result, params["delivery"]["url"])+ url = params["delivery"]["url"]+ stored = await asyncio.to_thread(_store_grant, route_name, result, url)+ if stored is None:+ event = route["mcp_event"]+ try:+ await _send(session, "events/unsubscribe",+ {"name": event["name"], "arguments": event["arguments"], "delivery": {"url": url}})+ except Exception as exc:+ error = _mcp_error(exc)+ logger.warning("MCP events: releasing subscription %s after its route was removed failed: %s",+ route_name, error or exc, exc_info=error is None)+ return storeddef _wake_refresh_loops(server_name: str) -> None:@@ -355,9 +367,11 @@ async def _subscribe_event(session, args: dict, server_name: str) -> dict:if error is None:raisereturn {"error": error}+ if stored is None:+ return {"error": f"The subscription to '{args['name']}' was removed while it was being made."}_wake_refresh_loops(server_name)return {"subscribed": {"name": args["name"], "arguments": arguments, "deliver": route["deliver"],- "refreshBefore": (stored or {}).get("refresh_before")}}+ "refreshBefore": stored.get("refresh_before")}}async def _unsubscribe_event(session, args: dict, server_name: str) -> dict: