address comments #352

jba · jba · commit 7e78ba08b3f7 · 2025-08-25T15:59:59.000-04:00
diff --git a/mcp/server.go b/mcp/server.go
@@ -264,7 +264,7 @@ func toolForErr[In, Out any](t *Tool, h ToolHandlerFor[In, Out]) (*Tool, ToolHan
 		// Skip if out is nil: we've removed "null" from the output schema, so nil won't validate.
 		if v := reflect.ValueOf(out); v.Kind() == reflect.Pointer && v.IsNil() {
 		} else if err := validateSchema(outputResolved, &out); err != nil {
-			return nil, err
+			return nil, fmt.Errorf("tool output: %w", err)
 		}
 
 		// TODO: return the serialized JSON in a TextContent block, as per spec?

Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ func toolForErr[In, Out any](t Tool, h ToolHandlerFor[In, Out]) (Tool, ToolHan`
`264`	`264`	`// Skip if out is nil: we've removed "null" from the output schema, so nil won't validate.`
`265`	`265`	`if v := reflect.ValueOf(out); v.Kind() == reflect.Pointer && v.IsNil() {`
`266`	`266`	`} else if err := validateSchema(outputResolved, &out); err != nil {`
`267`		`- return nil, err`
	`267`	`+ return nil, fmt.Errorf("tool output: %w", err)`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`// TODO: return the serialized JSON in a TextContent block, as per spec?`