fix: interpretation of unstructured content and tests #602
+119
−45
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.
Motivation and Context
Update structured output validation to align with spec allowing multiple unstructured content blocks.
Previously, the inspector incorrectly validated that unstructured output must contain only a single text block with JSON matching the structured output. This PR updates the validation to correctly reflect the spec, which allows unstructured output to include a JSON text block matching the structured output, alongside any number of other content blocks (text, image, linked/embedded resources, etc.) in any order, as clarified in modelcontextprotocol/modelcontextprotocol#889.
How Has This Been Tested?
Ran it locally with my own MCP server:
Also, the tests have been updated and are passing.
Breaking Changes
No.
Types of changes
Checklist
Additional context
This was written by Cursor Agents, but reviewed and run by me.