update examples for client roots

Author: yuehaii

examples/roots_client/main.go

@@ -4,8 +4,10 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"net/url"
 	"os"
 	"os/signal"
+	"path/filepath"
 	"syscall"
 
 	"github.com/mark3labs/mcp-go/client"
@@ -18,15 +20,18 @@ import (
 type MockRootsHandler struct{}
 
 func (h *MockRootsHandler) ListRoots(ctx context.Context, request mcp.ListRootsRequest) (*mcp.ListRootsResult, error) {
+	home, _ := os.UserHomeDir()
+	app := filepath.ToSlash(filepath.Join(home, "app"))
+	proj := filepath.ToSlash(filepath.Join(home, "projects", "test-project"))
 	result := &mcp.ListRootsResult{
 		Roots: []mcp.Root{
 			{
 				Name: "app",
-				URI:  "file:///User/haxxx/app",
+				URI:  (&url.URL{Scheme: "file", Path: "/" + app}).String(),
 			},
 			{
 				Name: "test-project",
-				URI:  "file:///User/haxxx/projects/test-project",
+				URI:  (&url.URL{Scheme: "file", Path: "/" + proj}).String(),
 			},
 		},
 	}
@@ -119,6 +124,8 @@ func main() {
 	result, err := mcpClient.CallTool(ctx, request)
 	if err != nil {
 		log.Fatalf("failed to call tool roots: %v", err)
+	} else if result.IsError {
+		log.Printf("tool reported error")
 	} else if len(result.Content) > 0 {
 		resultStr := ""
 		for _, content := range result.Content {
@@ -133,4 +140,12 @@ func main() {
 	if err := mcpClient.RootListChanges(ctx); err != nil {
 		log.Printf("fail to notify root list change: %v", err)
 	}
+
+	// Keep running until cancelled by signal
+	select {
+	case <-ctx.Done():
+		log.Println("Client context cancelled")
+	case <-sigChan:
+		log.Println("Received shutdown signal")
+	}
 }

examples/roots_http_client/main.go

@@ -4,8 +4,10 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"net/url"
 	"os"
 	"os/signal"
+	"path/filepath"
 	"syscall"
 
 	"github.com/mark3labs/mcp-go/client"
@@ -18,15 +20,18 @@ import (
 type MockRootsHandler struct{}
 
 func (h *MockRootsHandler) ListRoots(ctx context.Context, request mcp.ListRootsRequest) (*mcp.ListRootsResult, error) {
+	home, _ := os.UserHomeDir()
+	app := filepath.ToSlash(filepath.Join(home, "app"))
+	proj := filepath.ToSlash(filepath.Join(home, "projects", "test-project"))
 	result := &mcp.ListRootsResult{
 		Roots: []mcp.Root{
 			{
 				Name: "app",
-				URI:  "file:///User/haxxx/app",
+				URI:  (&url.URL{Scheme: "file", Path: "/" + app}).String(),
 			},
 			{
 				Name: "test-project",
-				URI:  "file:///User/haxxx/projects/test-project",
+				URI:  (&url.URL{Scheme: "file", Path: "/" + proj}).String(),
 			},
 		},
 	}
@@ -62,6 +67,11 @@ func main() {
 	if err != nil {
 		log.Fatalf("Failed to start client: %v", err)
 	}
+	defer func() {
+		if cerr := mcpClient.Close(); cerr != nil {
+			log.Printf("Error closing client: %v", cerr)
+		}
+	}()
 
 	// Initialize the MCP session
 	initRequest := mcp.InitializeRequest{
@@ -101,6 +111,8 @@ func main() {
 	result, err := mcpClient.CallTool(ctx, request)
 	if err != nil {
 		log.Fatalf("failed to call tool roots: %v", err)
+	} else if result.IsError {
+		log.Printf("tool reported error")
 	} else if len(result.Content) > 0 {
 		resultStr := ""
 		for _, content := range result.Content {
@@ -115,10 +127,13 @@ func main() {
 	sigChan := make(chan os.Signal, 1)
 	signal.Notify(sigChan, os.Interrupt, syscall.SIGTERM)
 
-	select {
-	case <-ctx.Done():
-		log.Println("Client context cancelled")
-	case <-sigChan:
+	ctx, cancel := context.WithCancel(ctx)
+	defer cancel()
+
+	go func() {
+		<-sigChan
 		log.Println("Received shutdown signal")
-	}
+		cancel()
+	}()
+	<-ctx.Done()
 }

examples/roots_server/main.go

@@ -15,8 +15,8 @@ func handleNotification(ctx context.Context, notification mcp.JSONRPCNotificatio
 }
 
 // main sets up and runs an MCP stdio server named "roots-stdio-server" with tool and roots capabilities.
-// It registers a handler for ToolsListChanged notifications, enables sampling, and adds a "roots" tool
-// that requests and returns the current root list. The program serves the MCP server over stdio and
+// It registers a handler for RootsListChanged notifications and adds a "roots" tool
+// that requests and returns the current roots list. The program serves the MCP server over stdio and
 // logs a fatal error if the server fails to start.
 func main() {
 	// Enable roots capability
@@ -42,7 +42,6 @@ func main() {
 					"description": "is this test only?",
 				},
 			},
-			Required: []string{"testonly"},
 		},
 	}, func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
 		rootRequest := mcp.ListRootsRequest{}
@@ -55,6 +54,9 @@ func main() {
 						Text: fmt.Sprintf("Root list: %v", result.Roots),
 					},
 				},
+				StructuredContent: map[string]any{
+					"roots": result.Roots,
+				},
 			}, nil
 
 		} else {