Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/agents/mcp/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -332,9 +332,9 @@ def _merge_mcp_meta(
return None
merged: dict[str, Any] = {}
if resolved_meta is not None:
merged.update(resolved_meta)
merged.update(copy.deepcopy(resolved_meta))
if explicit_meta is not None:
merged.update(explicit_meta)
merged.update(copy.deepcopy(explicit_meta))
return merged

@classmethod
Expand Down
35 changes: 35 additions & 0 deletions tests/mcp/test_mcp_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,41 @@ def resolve_meta(context):
assert captured["arguments"] == {}


@pytest.mark.asyncio
async def test_to_function_tool_does_not_reuse_nested_static_mcp_meta():
class MutatingMetaServer(FakeMCPServer):
async def call_tool(
self,
tool_name: str,
arguments: dict[str, Any] | None,
meta: dict[str, Any] | None = None,
) -> CallToolResult:
if meta is not None:
meta["nested"]["headers"].append("mutated")
return await super().call_tool(tool_name, arguments, meta=meta)

server = MutatingMetaServer()
tool = MCPTool(
name="test_tool_1",
inputSchema={},
_meta={"nested": {"headers": ["original"]}},
)

function_tool = MCPUtil.to_function_tool(tool, server, convert_schemas_to_strict=False)
tool_context = ToolContext(
context=None,
tool_name="test_tool_1",
tool_call_id="test_call_static_meta",
tool_arguments="{}",
)

await function_tool.on_invoke_tool(tool_context, "{}")
await function_tool.on_invoke_tool(tool_context, "{}")

assert server.tool_metas[0] == {"nested": {"headers": ["original", "mutated"]}}
assert server.tool_metas[1] == {"nested": {"headers": ["original", "mutated"]}}


@pytest.mark.asyncio
async def test_mcp_invoke_bad_json_errors(caplog: pytest.LogCaptureFixture):
caplog.set_level(logging.DEBUG)
Expand Down