fix(server): preserve plain JSON Schema in deprecated server.tool() overload#1617
Open
stakeswky wants to merge 1 commit intomodelcontextprotocol:v1.xfrom
Open
fix(server): preserve plain JSON Schema in deprecated server.tool() overload#1617stakeswky wants to merge 1 commit intomodelcontextprotocol:v1.xfrom
stakeswky wants to merge 1 commit intomodelcontextprotocol:v1.xfrom
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
Fixes #1585.
When using deprecated
server.tool(name, description, inputSchema, callback)with a plain JSON Schema object, the schema was misclassified asToolAnnotationsand silently discarded.This PR updates the overload parsing logic to:
type: 'object'orproperties) asinputSchemaToolAnnotationsIt also ensures listed tool schemas preserve plain JSON Schema definitions rather than converting them through Zod-shape normalization.
Changes
src/server/mcp.tsisToolAnnotations()runtime guardisLikelyJsonSchema()runtime guardtool()overload argument parsing to distinguish schema vs annotations safelytools/listresponse pathtest/server/mcp.test.tstool()overloadValidation
pnpm exec vitest run test/server/mcp.test.ts(230 passed)