Return protocol errors for invalid tool arguments#2173
Closed
FU-max-boop wants to merge 1 commit into
Closed
Conversation
🦋 Changeset detectedLatest commit: eaf4444 The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
@modelcontextprotocol/client
@modelcontextprotocol/codemod
@modelcontextprotocol/server
@modelcontextprotocol/express
@modelcontextprotocol/fastify
@modelcontextprotocol/hono
@modelcontextprotocol/node
commit: |
Author
|
CI note: the Node 20/22 failures are both in |
Author
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 #2162.
Invalid tool arguments are request-level validation failures, but
McpServerwas wrapping input schema validation failures in aCallToolResultwithisError: true. This rethrows input validationProtocolErrorCode.InvalidParamserrors so clients receive a protocol error for malformed tool calls, while preserving tool execution errors asCallToolResultfailures.The tests update the existing Zod, union, ArkType, Valibot, and JSON Schema invalid-input cases to assert
InvalidParamsinstead of tool error content.Tests
npx -y pnpm@10.26.1 --filter @modelcontextprotocol/server test -- mcp.test.ts standardSchema.test.tsnpx -y pnpm@10.26.1 --filter @modelcontextprotocol/server lintnpx -y pnpm@10.26.1 --filter @modelcontextprotocol/server typechecknpx -y pnpm@10.26.1 --filter @modelcontextprotocol/server buildgit diff --check HEAD~1..HEADNote:
git pushhit repeated network timeouts to github.com:443 from this environment, so I created the fork branch via the GitHub Git Data API after the local checks passed.