mcp: return input validation errors as tool results, not JSON-RPC errors (#863)
This implements [SEP-1303](https://github.com/modelcontextprotocol/modelcontextprotocol/issues/1303). Input validation errors (missing required fields, wrong types) during tool calls are now returned as `CallToolResult` with `IsError=true` instead of JSON-RPC `-32602` errors. This allows LLMs to see the validation error and self-correct, per the MCP spec. The existing pattern for handler-returned errors (lines 347-350 in server.go) already converts regular errors to tool results with `IsError=true`. This change applies the same pattern to argument schema validation and unmarshal errors, resolving the `TODO(#450)` in the code. Thanks to @iwyrkore for filing the issue and proposing the approach, and @findleyr for the cross-SDK analysis in the discussion. Fixes #450 Co-authored-by: Maciej Kisiel <mkisiel@google.com>
This commit is contained in:
parent
b71a8391a6
commit
74d2751d88
1 changed files with 73 additions and 23 deletions
|
|
@ -321,15 +321,18 @@ func toolForErr[In, Out any](t *Tool, h ToolHandlerFor[In, Out], cache *SchemaCa
|
|||
var err error
|
||||
input, err = applySchema(input, inputResolved)
|
||||
if err != nil {
|
||||
// TODO(#450): should this be considered a tool error? (and similar below)
|
||||
return nil, fmt.Errorf("%w: validating \"arguments\": %v", jsonrpc2.ErrInvalidParams, err)
|
||||
var errRes CallToolResult
|
||||
errRes.SetError(fmt.Errorf("validating \"arguments\": %v", err))
|
||||
return &errRes, nil
|
||||
}
|
||||
|
||||
// Unmarshal and validate args.
|
||||
var in In
|
||||
if input != nil {
|
||||
if err := internaljson.Unmarshal(input, &in); err != nil {
|
||||
return nil, fmt.Errorf("%w: %v", jsonrpc2.ErrInvalidParams, err)
|
||||
var errRes CallToolResult
|
||||
errRes.SetError(err)
|
||||
return &errRes, nil
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue