modelcontextprotocol/go-sdk
Watch
1
0
Fork
You've already forked go-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

mcp: tool.InputSchema and tool.OutputSchema validation (SEP-2106) (#1009)

Browse source 
Fixes #990
This commit is contained in:
Guglielmo Colombo 2026-06-16 13:55:47 +02:00 • committed by GitHub
commit 79e1a13dcf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 377 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

79
mcp/tool_test.go
View file

@ -46,7 +46,7 @@ func TestApplySchema(t *testing.T) {
{`{"x": 0}`, new(map[string]any), &map[string]any{"x": 0.0}},
} {
raw := json.RawMessage(tt.data)
raw, err = applySchema(raw, resolved)
raw, err = applySchema(raw, resolved, false)
if err != nil {
t.Fatal(err)
}
@ -59,6 +59,83 @@ func TestApplySchema(t *testing.T) {
}
}
func TestApplySchemaOutput(t *testing.T) {
// SEP-2106: when forOutput is true, the schema may have a non-object root.
for _, tc := range []struct {
name string
schema *jsonschema.Schema
data string
want string
wantErr string
}{
{
name: "array root accepts array",
schema: &jsonschema.Schema{Type: "array", Items: &jsonschema.Schema{Type: "integer"}},
data: `[1,2,3]`,
want: `[1,2,3]`,
},
{
name: "array root rejects wrong element type",
schema: &jsonschema.Schema{Type: "array", Items: &jsonschema.Schema{Type: "integer"}},
data: `[1,"two",3]`,
wantErr: `"integer"`,
},
{
name: "primitive number root",
schema: &jsonschema.Schema{Type: "number"},
data: `42`,
want: `42`,
},
{
name: "primitive string root",
schema: &jsonschema.Schema{Type: "string"},
data: `"hello"`,
want: `"hello"`,
},
{
name: "object root with defaults",
schema: &jsonschema.Schema{Type: "object", Properties: map[string]*jsonschema.Schema{"x": {Type: "integer", Default: json.RawMessage("3")}}},
data: `{}`,
want: `{"x":3}`,
},
{
name: "empty object root with defaults",
schema: &jsonschema.Schema{Type: "object", Properties: map[string]*jsonschema.Schema{"x": {Type: "integer", Default: json.RawMessage("3")}}},
data: ``,
want: `{"x":3}`,
},
{
name: "object root accepts null as empty object",
schema: &jsonschema.Schema{Type: "object"},
data: `null`,
want: `{}`,
},
} {
t.Run(tc.name, func(t *testing.T) {
resolved, err := tc.schema.Resolve(&jsonschema.ResolveOptions{ValidateDefaults: true})
if err != nil {
t.Fatal(err)
}
got, err := applySchema(json.RawMessage(tc.data), resolved, true)
if tc.wantErr != "" {
if err == nil {
t.Fatalf("got %s, want error containing %q", got, tc.wantErr)
}
if !strings.Contains(err.Error(), tc.wantErr) {
t.Errorf("got error %q, want containing %q", err, tc.wantErr)
}
return
}
if err != nil {
t.Fatal(err)
}
if string(got) != tc.want {
t.Errorf("got %s, want %s", got, tc.want)
}
})
}
}
func TestToolErrorHandling(t *testing.T) {
// Construct server and add both tools at the top level
server := NewServer(testImpl, nil)