-
Notifications
You must be signed in to change notification settings - Fork 328
feat: add embeddedResourceProps for annotations #99
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have a nit about naming:
uiMetadatametadataresourcePropsembeddedResourcePropsI am confused about which to use for what. I recall we had some discussion around reserved properties and arbitrary properties. I think we still need that! But, I wonder if it would be clearer to have literal properties for
_metaandannotations... then keepuiMetadataas is or maybe name it something close.Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, so:
Metadata handling
uiMetadata- reserved formcp-uipropsmetadata- populates the_metaproperty on the resource (for any other arbitraray metadata)Props handling
resourceProps- are being spread as-is on the resource levelembeddedResourceProps- are being spread as-is on the embedded resource level (top-level) - good forannotationsNote: In general -
resourcePropsshouldn't be used for_metaat allThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Gotcha. This explanation helps. Please don't over-index on my personal preference; we might want to open this up to the community for other opinions. But I do feel like the current approach is hard to understand and easy to get them mixed up.
I did not realize there is a distinction between "resource" and "embedded resource" from a tool response POV. I thought that tools return embedded resources, not resources.
I think it could be simpler if we avoided specific terms and conformed to the MCP spec. So I am curious to learn if there are any reasons why we might not be able to simplify down to two properties.
The TL;DR is
_metaand parse for reserved keysannotationsas opposed to being open-ended onresourcePropsandembeddedResourcePropsUh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note that according to the spec there are two
_metafields - one on the embedded resource (top level), and one on the actual resource.mcp-ui "cares" only about the one on the inner resource (and not on the top level), since this is what's being passed to it, and this is where the actual UI definitions lie.
So the
uiMetadatashould be there (on the inner resource_metafield)However the
annotationsfield is on the top level. So we have to make a distinction between the top level props and the inner resource props.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's a good point. Would you entertain the idea of renaming the properties for metadata to better align with the mental model of
resourcePropsandembeddedResourceProps? I think I have these conversions right:metadatacould becomeembeddedResourceMetauiMetadatacould becomeresourceMetaSo if a server author wants to define stuff at the top level, they can use:
embeddedResourceMetaembeddedResourcePropsAnd if they want to define stuff at the resources level, they can use:
resourceMetaresourcePropsThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@aharvard maybe we'll open an issue with this proposal? We should probably consider this for the next major