Skip to content

Commit 17b1a14

Browse files
authored
Python: Isolate MCP lifecycle task context (#9451)
* Isolate MCP lifecycle task context * Narrow MCP lifecycle context isolation * Simplify MCP lifecycle context masking
1 parent 1c6c5c4 commit 17b1a14

2 files changed

Lines changed: 38 additions & 5 deletions

File tree

‎python/packages/core/agent_framework/_mcp.py‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ class MCPSpecificApproval(TypedDict, total=False):
227227
"_meta",
228228
})
229229
# object is a reference to the owner of the headers, so we keep track which headers belong to which tool
230-
_mcp_call_headers: ContextVar[tuple[object, dict[str, str]]] = ContextVar("_mcp_call_headers")
230+
_mcp_call_headers: ContextVar[tuple[object, dict[str, str]] | None] = ContextVar("_mcp_call_headers")
231231
_mcp_tool_runtime_context: ContextVar[tuple[object, Mapping[str, Any]] | None] = ContextVar(
232232
"_mcp_tool_runtime_context", default=None
233233
)
@@ -2010,10 +2010,14 @@ async def _ensure_lifecycle_owner(self) -> None:
20102010
return
20112011

20122012
self._lifecycle_queue = asyncio.Queue()
2013-
self._lifecycle_owner_task = asyncio.create_task(
2014-
self._run_lifecycle_owner(),
2015-
name=f"mcp-lifecycle:{self.name}",
2016-
)
2013+
token = _mcp_call_headers.set(None)
2014+
try:
2015+
self._lifecycle_owner_task = asyncio.create_task(
2016+
self._run_lifecycle_owner(),
2017+
name=f"mcp-lifecycle:{self.name}",
2018+
)
2019+
finally:
2020+
_mcp_call_headers.reset(token)
20172021

20182022
async def _run_lifecycle_owner(self) -> None:
20192023
queue = self._lifecycle_queue

‎python/packages/core/tests/core/test_mcp.py‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10740,6 +10740,35 @@ async def _pending_lifecycle_task_names() -> list[str]:
1074010740
return names
1074110741

1074210742

10743+
async def test_lifecycle_owner_does_not_inherit_call_headers():
10744+
"""Connection-lifetime work must not inherit headers from the call that starts it."""
10745+
from agent_framework._mcp import _mcp_call_headers
10746+
10747+
tool = MCPStreamableHTTPTool(name="context-check", url="https://mcp.example/mcp")
10748+
observed_call_headers: list[Any] = []
10749+
observed_request_context: list[str | None] = []
10750+
request_context = ContextVar[str]("request_context")
10751+
10752+
async def record_owner_context(**_: Any) -> None:
10753+
observed_call_headers.append(_mcp_call_headers.get(None))
10754+
observed_request_context.append(request_context.get(None))
10755+
tool.is_connected = True
10756+
10757+
call_headers_token = _mcp_call_headers.set((tool._header_request_owner, {"Authorization": "principal-a"}))
10758+
request_context_token = request_context.set("request-a")
10759+
try:
10760+
with patch.object(tool, "_connect_on_owner", new=record_owner_context):
10761+
await tool.connect()
10762+
10763+
assert observed_call_headers == [None]
10764+
assert observed_request_context == ["request-a"]
10765+
finally:
10766+
request_context.reset(request_context_token)
10767+
_mcp_call_headers.reset(call_headers_token)
10768+
tool.is_connected = False
10769+
await tool.close()
10770+
10771+
1074310772
async def test_failed_connect_stops_the_lifecycle_owner():
1074410773
"""A connect that fails must not leave its owner task blocked on the queue forever."""
1074510774
client = _unauthorized_http_client()

0 commit comments

Comments
 (0)