fix rebase

Author: JBUinfo

client/elicitation_test.go

@@ -144,6 +144,23 @@ func TestClient_Initialize_WithElicitationHandler(t *testing.T) {
 				t.Fatalf("expected initialize method, got %s", request.Method)
 			}
 
+			// Verify that elicitation capability is included in the request
+			paramsBytes, err := json.Marshal(request.Params)
+			if err != nil {
+				t.Fatalf("failed to marshal params: %v", err)
+			}
+
+			var initParams struct {
+				Capabilities mcp.ClientCapabilities `json:"capabilities"`
+			}
+			if err := json.Unmarshal(paramsBytes, &initParams); err != nil {
+				t.Fatalf("failed to unmarshal params: %v", err)
+			}
+
+			if initParams.Capabilities.Elicitation == nil {
+				t.Error("expected elicitation capability to be declared")
+			}
+
 			// Return successful initialization response
 			result := mcp.InitializeResult{
 				ProtocolVersion: mcp.LATEST_PROTOCOL_VERSION,

examples/elicitation/main.go

@@ -58,7 +58,11 @@ func demoElicitationHandler(s *server.MCPServer) server.ToolHandlerFunc {
 				return nil, fmt.Errorf("unexpected response format")
 			}
 
-			projectName := data["projectName"].(string)
+			projectName, ok := data["projectName"].(string)
+			if !ok || projectName == "" {
+				return nil, fmt.Errorf("invalid or missing 'projectName' in elicitation response")
+			}
+			
 			framework := "none"
 			if fw, ok := data["framework"].(string); ok {
 				framework = fw
@@ -123,8 +127,7 @@ func main() {
 			mcp.WithString("data", mcp.Required(), mcp.Description("Data to process")),
 		),
 		func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-			data := request.GetArguments()["data"].(string)
-
+			data := request.GetString("data", "")
 			// Only request elicitation if data seems sensitive
 			if len(data) > 100 {
 				elicitationRequest := mcp.ElicitationRequest{
@@ -160,7 +163,11 @@ func main() {
 					}, nil
 				}
 
-				responseData := result.Response.Value.(map[string]interface{})
+				responseData, ok := result.Response.Value.(map[string]interface{})
+				if !ok {
+					responseData = make(map[string]interface{})
+				}
+
 				if proceed, ok := responseData["proceed"].(bool); !ok || !proceed {
 					reason := "No reason provided"
 					if r, ok := responseData["reason"].(string); ok && r != "" {

server/session.go

@@ -59,13 +59,6 @@ type SessionWithElicitation interface {
 	RequestElicitation(ctx context.Context, request mcp.ElicitationRequest) (*mcp.ElicitationResult, error)
 }
 
-// SessionWithElicitation is an extension of ClientSession that can send elicitation requests
-type SessionWithElicitation interface {
-	ClientSession
-	// RequestElicitation sends an elicitation request to the client and waits for response
-	RequestElicitation(ctx context.Context, request mcp.ElicitationRequest) (*mcp.ElicitationResult, error)
-}
-
 // SessionWithStreamableHTTPConfig extends ClientSession to support streamable HTTP transport configurations
 type SessionWithStreamableHTTPConfig interface {
 	ClientSession