Fix(mcp): Unreachable structured content branch in invoke_mcp_tool #1250
+357
−16
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
This PR handles the MCP tool output where structured content could never be returned exclusively when
use_structured_content=True
. The conditional logic checked for content length first, making the structured content branch unreachable when both content types were present.Before (broken logic):
After (fixed logic):
Example usage:
Test plan
I've added thorough test coverage to make sure this fix works properly:
Issue number
Fixes #1236
Checks
make lint
andmake format
- Code follows project formatting standards