Preserve structured-only MCP error payloads - #1840
Open
sylvesterkaczmarek wants to merge 1 commit into
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
Preserve MCP error details when a
CallToolResultcontainsstructuredContentbut no regularcontentblocks._convert_tool_result()currently handlesisErrorbefore the existingstructuredContentfallback. As a result, an MCP result such ascontent=[],structuredContent={...},isError=TrueraisesToolError([])and discards the only useful error payload. The tool runner then surfaces a genericTool errorinstead of the structured details returned by the MCP server.Fix
Read
structuredContentbefore branching onisErrorand use it as the error fallback only when normal content is empty.Precedence remains:
contentblocks win when present;ToolError;Regression coverage
Adds focused tests covering:
structuredContent;The production change is confined to the hand-maintained MCP tool-result conversion helper.