Merge pull request #350 from dgageot/output-schemas

Start supporting output schemas

Author: dgageot

pkg/tools/mcp/client.go

@@ -151,6 +151,11 @@ func (c *Client) ListTools(ctx context.Context, toolFilter []string) ([]tools.To
 					IdempotentHint:  t.Annotations.IdempotentHint,
 					OpenWorldHint:   t.Annotations.OpenWorldHint,
 				},
+				OutputSchema: tools.ToolOutputSchema{
+					Type:       t.OutputSchema.Type,
+					Properties: t.OutputSchema.Properties,
+					Required:   t.OutputSchema.Required,
+				},
 			},
 		}
 		toolsList = append(toolsList, tool)

pkg/tools/tools.go

@@ -32,11 +32,12 @@ type Tool struct {
 }
 
 type FunctionDefinition struct {
-	Name        string             `json:"name"`
-	Description string             `json:"description,omitempty"`
-	Strict      bool               `json:"strict,omitempty"`
-	Parameters  FunctionParameters `json:"parameters"`
-	Annotations ToolAnnotation     `json:"annotations"`
+	Name         string             `json:"name"`
+	Description  string             `json:"description,omitempty"`
+	Strict       bool               `json:"strict,omitempty"`
+	Parameters   FunctionParameters `json:"parameters"`
+	Annotations  ToolAnnotation     `json:"annotations"`
+	OutputSchema ToolOutputSchema   `json:"outputSchema"`
 }
 
 type ToolAnnotation struct {
@@ -47,6 +48,12 @@ type ToolAnnotation struct {
 	OpenWorldHint   *bool  `json:"openWorldHint,omitempty"`
 }
 
+type ToolOutputSchema struct {
+	Type       string         `json:"type"`
+	Properties map[string]any `json:"properties,omitempty"`
+	Required   []string       `json:"required,omitempty"`
+}
+
 type FunctionParameters struct {
 	Type       string         `json:"type"`
 	Properties map[string]any `json:"properties"`