Fixed dynamic MCP naming by pydantic

Author: asimurka

src/utils/agents/tool_processor.py

@@ -33,6 +33,7 @@
 logger = get_logger(__name__)
 
 _FILE_SEARCH_URL_KEYS = ("doc_url", "docs_url", "url", "link", "reference_url")
+_MCP_SERVER_TOOL_PREFIX = f"{MCPServerTool.kind}:"
 
 
 def summarize_function_tool_call(part: ToolCallPart) -> ToolCallSummary:
@@ -80,8 +81,8 @@ def summarize_native_tool_call(
                 args=args,
                 type="file_search_call",
             )
-        case MCPServerTool.kind:
-            label = part.tool_name.removeprefix(f"{MCPServerTool.kind}:")
+        case tool_name if tool_name.startswith(_MCP_SERVER_TOOL_PREFIX):
+            label = tool_name.removeprefix(_MCP_SERVER_TOOL_PREFIX)
             action = args.get("action")
             # MCP list tools
             if action == "list_tools":
@@ -180,7 +181,7 @@ def process_native_tool_result(
             state.turn_summary.referenced_documents.extend(referenced_documents)
         case WebSearchTool.kind:
             tool_result = summarize_web_search_result(part, state.tool_round)
-        case MCPServerTool.kind:
+        case tool_name if tool_name.startswith(_MCP_SERVER_TOOL_PREFIX):
             tool_result = summarize_mcp_tool_result(part, state.tool_round)
         case _:
             logger.warning(f"Unknown tool name: {part.tool_name}")

tests/unit/utils/agents/test_tool_processor.py

@@ -106,7 +106,7 @@ def test_file_search_call(self) -> None:
     def test_mcp_list_tools_call(self) -> None:
         """Test MCP list-tools action summary."""
         part = NativeToolCallPart(
-            tool_name=MCPServerTool.kind,
+            tool_name=f"{MCPServerTool.kind}:srv",
             args={"action": "list_tools"},
             tool_call_id="mcp-list-1",
         )
@@ -115,13 +115,26 @@ def test_mcp_list_tools_call(self) -> None:
 
         assert summary is not None
         assert summary.name == "mcp_list_tools"
-        assert summary.args == {"server_label": MCPServerTool.kind}
+        assert summary.args == {"server_label": "srv"}
         assert summary.type == "mcp_list_tools"
 
+    def test_mcp_list_tools_call_with_label(self) -> None:
+        """Test labeled MCP list-tools action uses the server label suffix."""
+        part = NativeToolCallPart(
+            tool_name=f"{MCPServerTool.kind}:myserver",
+            args={"action": "list_tools"},
+            tool_call_id="mcp-list-labeled",
+        )
+
+        summary = summarize_native_tool_call(part)
+
+        assert summary is not None
+        assert summary.args == {"server_label": "myserver"}
+
     def test_mcp_call(self) -> None:
         """Test MCP tool call summary."""
         part = NativeToolCallPart(
-            tool_name=MCPServerTool.kind,
+            tool_name=f"{MCPServerTool.kind}:srv",
             args={
                 "action": "call",
                 "tool_name": "remote_tool",
@@ -553,6 +566,19 @@ def test_records_file_search_result(self, turn_state: AgentTurnAccumulator) -> N
         assert len(turn_state.turn_summary.referenced_documents) == 1
         assert turn_state.round_increment_pending
 
+    def test_records_labeled_mcp_result(self, turn_state: AgentTurnAccumulator) -> None:
+        """Test labeled MCP tool return is processed like unlabeled MCP returns."""
+        part = NativeToolReturnPart(
+            tool_name=f"{MCPServerTool.kind}:srv",
+            tool_call_id="mcp-labeled",
+            content={"output": "labeled-output"},
+        )
+
+        result = process_native_tool_result(turn_state, part)
+
+        assert result is not None
+        assert result.content == "labeled-output"
+
     def test_records_web_search_and_mcp_results(
         self, turn_state: AgentTurnAccumulator
     ) -> None:
@@ -563,7 +589,7 @@ def test_records_web_search_and_mcp_results(
             content={"status": "success"},
         )
         mcp_part = NativeToolReturnPart(
-            tool_name=MCPServerTool.kind,
+            tool_name=f"{MCPServerTool.kind}:srv",
             tool_call_id="mcp-process",
             content={"output": "mcp-output"},
         )