Skip to content

Commit 6bfb870

Browse files
CopilotCopilot
andcommitted
Fix streaming path to deliver mcp_server_tool_result content (#4814)
Stop eagerly emitting mcp_server_tool_result on response.output_item.added (when output is always None). Instead, handle response.output_item.done for mcp_call items, which carries the full McpCall with populated output. This matches the non-streaming path which guards with 'if item.output is not None' before emitting the result. Co-authored-by: Copilot <[email protected]>
1 parent e0858c9 commit 6bfb870

2 files changed

Lines changed: 21 additions & 22 deletions

File tree

‎python/packages/core/agent_framework/openai/_responses_client.py‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1932,7 +1932,7 @@ def _parse_chunk_from_openai(
19321932
raw_representation=event_item,
19331933
)
19341934
)
1935-
# Result deferred to response.mcp_call.completed
1935+
# Result deferred to response.output_item.done
19361936
case "code_interpreter_call": # ResponseOutputCodeInterpreterCall
19371937
call_id = getattr(event_item, "call_id", None) or getattr(event_item, "id", None)
19381938
outputs: list[Content] = []
@@ -2202,22 +2202,21 @@ def _get_ann_value(key: str) -> Any:
22022202
)
22032203
else:
22042204
logger.debug("Unparsed annotation type in streaming: %s", ann_type)
2205-
case "response.mcp_call.completed":
2206-
item = event.item
2207-
call_id = getattr(item, "id", None) or ""
2208-
output_text = getattr(item, "output", None)
2209-
parsed_output: list[Content] | None = (
2210-
[Content.from_text(text=output_text)]
2211-
if isinstance(output_text, str)
2212-
else None
2213-
)
2214-
contents.append(
2215-
Content.from_mcp_server_tool_result(
2216-
call_id=call_id,
2217-
output=parsed_output,
2218-
raw_representation=event,
2205+
case "response.output_item.done":
2206+
done_item = event.item
2207+
if getattr(done_item, "type", None) == "mcp_call":
2208+
call_id = getattr(done_item, "id", None) or ""
2209+
output_text = getattr(done_item, "output", None)
2210+
parsed_output: list[Content] | None = (
2211+
[Content.from_text(text=output_text)] if isinstance(output_text, str) else None
2212+
)
2213+
contents.append(
2214+
Content.from_mcp_server_tool_result(
2215+
call_id=call_id,
2216+
output=parsed_output,
2217+
raw_representation=event,
2218+
)
22192219
)
2220-
)
22212220
case _:
22222221
logger.debug("Unparsed event of type: %s: %s", event.type, event)
22232222

‎python/packages/core/tests/openai/test_openai_responses_client.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1225,12 +1225,12 @@ def test_parse_chunk_from_openai_with_mcp_call_added_defers_result() -> None:
12251225
assert len(result_contents) == 0
12261226

12271227

1228-
def test_parse_chunk_from_openai_with_mcp_call_completed() -> None:
1229-
"""Test that response.mcp_call.completed emits mcp_server_tool_result with output."""
1228+
def test_parse_chunk_from_openai_with_mcp_output_item_done() -> None:
1229+
"""Test that response.output_item.done for mcp_call emits mcp_server_tool_result with output."""
12301230
client = OpenAIResponsesClient(model_id="test-model", api_key="test-key")
12311231

12321232
mock_event = MagicMock()
1233-
mock_event.type = "response.mcp_call.completed"
1233+
mock_event.type = "response.output_item.done"
12341234

12351235
mock_item = MagicMock()
12361236
mock_item.type = "mcp_call"
@@ -1252,12 +1252,12 @@ def test_parse_chunk_from_openai_with_mcp_call_completed() -> None:
12521252
assert result_content.output[0].text == "The weather in Seattle is 72F and sunny."
12531253

12541254

1255-
def test_parse_chunk_from_openai_with_mcp_call_completed_no_output() -> None:
1256-
"""Test that response.mcp_call.completed with no output emits result with None output."""
1255+
def test_parse_chunk_from_openai_with_mcp_output_item_done_no_output() -> None:
1256+
"""Test that response.output_item.done for mcp_call with no output emits result with None output."""
12571257
client = OpenAIResponsesClient(model_id="test-model", api_key="test-key")
12581258

12591259
mock_event = MagicMock()
1260-
mock_event.type = "response.mcp_call.completed"
1260+
mock_event.type = "response.output_item.done"
12611261

12621262
mock_item = MagicMock()
12631263
mock_item.type = "mcp_call"

0 commit comments

Comments
 (0)