fix: add correct elicit example

Author: krtkvrm

mcp/client.go

@@ -274,7 +274,24 @@ func (c *Client) elicit(ctx context.Context, cs *ClientSession, params *ElicitPa
 		return nil, jsonrpc2.NewError(CodeInvalidParams, err.Error())
 	}
 
-	return c.opts.ElicitationHandler(ctx, cs, params)
+	res, err := c.opts.ElicitationHandler(ctx, cs, params)
+	if err != nil {
+		return nil, err
+	}
+
+	// Validate elicitation result content against requested schema
+	if params.RequestedSchema != nil && res.Content != nil {
+		resolved, err := params.RequestedSchema.Resolve(nil)
+		if err != nil {
+			return nil, jsonrpc2.NewError(CodeInvalidParams, fmt.Sprintf("failed to resolve requested schema: %v", err))
+		}
+
+		if err := resolved.Validate(res.Content); err != nil {
+			return nil, jsonrpc2.NewError(CodeInvalidParams, fmt.Sprintf("elicitation result content does not match requested schema: %v", err))
+		}
+	}
+
+	return res, nil
 }
 
 // validateElicitSchema validates that the schema conforms to MCP elicitation schema requirements.

mcp/elicitation_example_test.go

@@ -26,18 +26,19 @@ func Example_elicitation() {
 	}
 
 	// Create client with elicitation handler
+	// Note: Never use elicitation for sensitive data like API keys or passwords
 	client := mcp.NewClient(&mcp.Implementation{Name: "config-client", Version: "v1.0.0"}, &mcp.ClientOptions{
 		ElicitationHandler: func(ctx context.Context, cs *mcp.ClientSession, params *mcp.ElicitParams) (*mcp.ElicitResult, error) {
 			fmt.Printf("Server requests: %s\n", params.Message)
-			
+
 			// In a real application, this would prompt the user for input
 			// Here we simulate user providing configuration data
 			return &mcp.ElicitResult{
 				Action: "accept",
 				Content: map[string]any{
-					"apiKey":     "sk-test123",
-					"maxRetries": float64(3),
-					"enableLogs": true,
+					"serverEndpoint": "https://api.example.com",
+					"maxRetries":     float64(3),
+					"enableLogs":     true,
 				},
 			}, nil
 		},
@@ -52,11 +53,11 @@ func Example_elicitation() {
 	configSchema := &jsonschema.Schema{
 		Type: "object",
 		Properties: map[string]*jsonschema.Schema{
-			"apiKey":     {Type: "string", Description: "API key for authentication"},
-			"maxRetries": {Type: "number", Minimum: ptr(1.0), Maximum: ptr(10.0)},
-			"enableLogs": {Type: "boolean", Description: "Enable debug logging"},
+			"serverEndpoint": {Type: "string", Description: "Server endpoint URL"},
+			"maxRetries":     {Type: "number", Minimum: ptr(1.0), Maximum: ptr(10.0)},
+			"enableLogs":     {Type: "boolean", Description: "Enable debug logging"},
 		},
-		Required: []string{"apiKey"},
+		Required: []string{"serverEndpoint"},
 	}
 
 	result, err := serverSession.Elicit(ctx, &mcp.ElicitParams{
@@ -68,18 +69,18 @@ func Example_elicitation() {
 	}
 
 	if result.Action == "accept" {
-		fmt.Printf("Configuration received: API Key: %v, Max Retries: %.0f, Logs: %v\n",
-			result.Content["apiKey"],
+		fmt.Printf("Configuration received: Endpoint: %v, Max Retries: %.0f, Logs: %v\n",
+			result.Content["serverEndpoint"],
 			result.Content["maxRetries"],
 			result.Content["enableLogs"])
 	}
 
 	// Output:
 	// Server requests: Please provide your configuration settings
-	// Configuration received: API Key: sk-test123, Max Retries: 3, Logs: true
+	// Configuration received: Endpoint: https://api.example.com, Max Retries: 3, Logs: true
 }
 
 // ptr is a helper function to create pointers for schema constraints
 func ptr[T any](v T) *T {
 	return &v
-}
+}