The agent that grows with you
Python aiai-agentai-agentsanthropicchatgptclaudeclaude-codecodexhermeshermes-agentllmnous-researchopenai
fix(gateway): read the held MCP policy on the loop, hash it off the loop
Teknium38ec5e42849a
diff --git a/gateway/session_ancillary.py b/gateway/session_ancillary.pyindex 29af104e17d..3fb8c97b866 100644--- a/gateway/session_ancillary.py+++ b/gateway/session_ancillary.py@@ -6,6 +6,7 @@ reconciles only the requesting profile's MCP servers; ``file.attach`` stages for"""import asynciofrom functools import partial+from pathlib import Pathimport sysfrom gateway.session_busy_controls import authorize@@ -280,7 +281,7 @@ async def reload_mcp(connection, ref, params):multiplex = bool(getattr(runner.config, 'multiplex_profiles', False))runner._mcp_reload_refresh_cached_agents(multiplex, served_profile_name(connection.authority.profile_id))session = await _commit_session_mcp(connection, ref, params)- held_rev = await asyncio.to_thread(_held_mcp_rev, connection, ref) if params.get('rev') else ''+ held_rev = await _held_mcp_rev(connection, ref) if params.get('rev') else ''# Refuse only a reload whose own work did not take effect: a call that names the revision the session# already holds has nothing left to load, and refusing it leaves a client that acknowledges on# ``reloaded`` retrying a parked server at poll rate with no way to close the handshake (#141769).@@ -300,20 +301,26 @@ async def reload_mcp(connection, ref, params):**({'session': session} if session else {}), **({'unavailable': failed} if failed else {}), **selected}-def _held_mcp_rev(connection, ref):+async def _held_mcp_rev(connection, ref):"""The ``mcp_rev`` this session's committed policy already holds — the value ``config.get mtime`` shipped- the client — or ``''`` when the call names no live local session."""+ the client — or ``''`` when the call names no live local session. The policy is read on the loop (it+ walks ``authority.sessions`` and the adapter's maps, which only the loop mutates); only the config read+ and hash go to a worker thread."""sid = getattr(ref, 'session_id', None)live = connection.authority.sessions.get(sid) if sid else Noneif live is None or live.source is None:return ''- from pathlib import Path+ from gateway.session_policy import policy_for_source+ policy = policy_for_source(connection.authority.runner, live.source)+ return await asyncio.to_thread(_mcp_revision_in_scope, Path(connection.authority.profile_id), policy)+++def _mcp_revision_in_scope(home, policy):from gateway.run import _profile_runtime_scopefrom gateway.session_config import mcp_revision- from gateway.session_policy import policy_for_sourcefrom hermes_cli.config import load_config- with _profile_runtime_scope(Path(connection.authority.profile_id)):- return mcp_revision(policy_for_source(connection.authority.runner, live.source), load_config())+ with _profile_runtime_scope(home):+ return mcp_revision(policy, load_config())def _session_servers(authority, sid, ready):diff --git a/tests/gateway/test_mcp_reload_held_revision.py b/tests/gateway/test_mcp_reload_held_revision.pyindex 899e308ed51..8f68a1d83b8 100644--- a/tests/gateway/test_mcp_reload_held_revision.py+++ b/tests/gateway/test_mcp_reload_held_revision.py@@ -71,3 +71,33 @@ async def test_a_reload_naming_the_revision_the_session_holds_is_not_refused(tmpfinally:await owner.close()store.close_all_db_handles()+++async def test_the_held_policy_is_read_on_the_loop(tmp_path, monkeypatch):+ """``policy_for_source`` walks ``authority.sessions`` and the local adapter's maps, which only the loop+ mutates; reading it from a worker thread raced them. Only the config read and hash leave the loop."""+ import threading+ from gateway import session_policy+ home = _home(monkeypatch)+ monkeypatch.setattr('gateway.session_policy.launch_key', lambda authority, policy: None)+ store, authority = await _owner_authority(home)+ _reloaded_profile(authority, monkeypatch)+ owner = _connect(authority)+ loop_thread, threads = threading.get_ident(), []+ real = session_policy.policy_for_source++ def recording(runner, source):+ threads.append(threading.get_ident())+ return real(runner, source)++ try:+ sid = (await _call(owner, 'session.create', request_id='a', source='cli', cwd=str(tmp_path)))['session_id']+ rev = (await _call(owner, 'config.get', key='mtime', session_id=sid))['mcp_rev']+ monkeypatch.setattr(session_policy, 'policy_for_source', recording)+ result = await _call(owner, 'reload.mcp', session_id=sid, confirm=True, rev=rev)+ assert result['loaded_rev'] == rev, result+ assert threads and set(threads) == {loop_thread}, threads+ finally:+ await owner.close()+ store.close_all_db_handles()