merge main and fix conflict

Author: dugenkui03

client/client.go

@@ -42,9 +42,15 @@ func WithClientCapabilities(capabilities mcp.ClientCapabilities) ClientOption {
 //	    log.Fatalf("Failed to create client: %v", err)
 //	}
 func NewClient(transport transport.Interface, options ...ClientOption) *Client {
-	return &Client{
+	client := &Client{
 		transport: transport,
 	}
+
+	for _, opt := range options {
+		opt(client)
+	}
+
+	return client
 }
 
 // Start initiates the connection to the server.

client/http.go

@@ -0,0 +1,17 @@
+package client
+
+import (
+	"fmt"
+
+	"github.com/mark3labs/mcp-go/client/transport"
+)
+
+// NewStreamableHttpClient is a convenience method that creates a new streamable-http-based MCP client
+// with the given base URL. Returns an error if the URL is invalid.
+func NewStreamableHttpClient(baseURL string, options ...transport.StreamableHTTPCOption) (*Client, error) {
+	trans, err := transport.NewStreamableHTTP(baseURL, options...)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create SSE transport: %w", err)
+	}
+	return NewClient(trans), nil
+}

client/sse_test.go

@@ -11,7 +11,7 @@ import (
 )
 
 func TestSSEMCPClient(t *testing.T) {
-	// Create MCP server with serverCapabilities
+	// Create MCP server with capabilities
 	mcpServer := server.NewMCPServer(
 		"test-server",
 		"1.0.0",
@@ -25,6 +25,13 @@ func TestSSEMCPClient(t *testing.T) {
 		"test-tool",
 		mcp.WithDescription("Test tool"),
 		mcp.WithString("parameter-1", mcp.Description("A string tool parameter")),
+		mcp.WithToolAnnotation(mcp.ToolAnnotation{
+			Title:           "Test Tool Annotation Title",
+			ReadOnlyHint:    true,
+			DestructiveHint: false,
+			IdempotentHint:  true,
+			OpenWorldHint:   false,
+		}),
 	), func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
 		return &mcp.CallToolResult{
 			Content: []mcp.Content{
@@ -95,10 +102,21 @@ func TestSSEMCPClient(t *testing.T) {
 
 		// Test ListTools
 		toolsRequest := mcp.ListToolsRequest{}
-		_, err = client.ListTools(ctx, toolsRequest)
+		toolListResult, err := client.ListTools(ctx, toolsRequest)
 		if err != nil {
 			t.Errorf("ListTools failed: %v", err)
 		}
+		if toolListResult == nil || len((*toolListResult).Tools) == 0 {
+			t.Errorf("Expected one tool")
+		}
+		testToolAnnotations := (*toolListResult).Tools[0].Annotations
+		if testToolAnnotations.Title != "Test Tool Annotation Title" ||
+			testToolAnnotations.ReadOnlyHint != true ||
+			testToolAnnotations.DestructiveHint != false ||
+			testToolAnnotations.IdempotentHint != true ||
+			testToolAnnotations.OpenWorldHint != false {
+			t.Errorf("The annotations of the tools are invalid")
+		}
 	})
 
 	// t.Run("Can handle notifications", func(t *testing.T) {

client/transport/stdio_test.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"runtime"
 	"sync"
 	"testing"
 	"time"
@@ -31,6 +32,10 @@ func compileTestServer(outputPath string) error {
 func TestStdio(t *testing.T) {
 	// Compile mock server
 	mockServerPath := filepath.Join(os.TempDir(), "mockstdio_server")
+	// Add .exe suffix on Windows
+	if runtime.GOOS == "windows" {
+		mockServerPath += ".exe"
+	}
 	if err := compileTestServer(mockServerPath); err != nil {
 		t.Fatalf("Failed to compile mock server: %v", err)
 	}
@@ -302,16 +307,19 @@ func TestStdioErrors(t *testing.T) {
 	})
 
 	t.Run("RequestBeforeStart", func(t *testing.T) {
-		// 创建一个新的 Stdio 实例但不调用 Start 方法
 		mockServerPath := filepath.Join(os.TempDir(), "mockstdio_server")
+		// Add .exe suffix on Windows
+		if runtime.GOOS == "windows" {
+			mockServerPath += ".exe"
+		}
 		if err := compileTestServer(mockServerPath); err != nil {
 			t.Fatalf("Failed to compile mock server: %v", err)
 		}
 		defer os.Remove(mockServerPath)
 
 		uninitiatedStdio := NewStdio(mockServerPath, nil)
 
-		// 准备一个请求
+		// Prepare a request
 		request := JSONRPCRequest{
 			JSONRPC: "2.0",
 			ID:      99,
@@ -331,6 +339,10 @@ func TestStdioErrors(t *testing.T) {
 	t.Run("RequestAfterClose", func(t *testing.T) {
 		// Compile mock server
 		mockServerPath := filepath.Join(os.TempDir(), "mockstdio_server")
+		// Add .exe suffix on Windows
+		if runtime.GOOS == "windows" {
+			mockServerPath += ".exe"
+		}
 		if err := compileTestServer(mockServerPath); err != nil {
 			t.Fatalf("Failed to compile mock server: %v", err)
 		}