Fix MCP tool timeouts halting agent flow #2249
Open
+127
−4
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes an issue where MCP tool timeouts (and other errors) would halt the entire agent flow instead of being handled gracefully.
Problem:
When an MCP tool timed out or errored, it would raise an
AgentsExceptionthat propagated up and stopped the agent. This was inconsistent with regular function tools, which handle errors gracefully viafailure_error_function.Solution:
Wrapped the MCP tool invocation in
to_function_toolwith error handling that catches exceptions and converts them to error messages usingdefault_tool_error_function, matching the behavior of regular function tools.Changes:
MCPUtil.to_function_tool()Repro Script: