add fix for e2e

Author: tonytrg

cmd/github-mcp-server/main.go

@@ -45,6 +45,11 @@ var (
 				return fmt.Errorf("failed to unmarshal toolsets: %w", err)
 			}
 
+			// If no toolsets are specified, use the default ones
+			if len(enabledToolsets) == 0 {
+				enabledToolsets = github.DefaultTools()
+			}
+
 			stdioServerConfig := ghmcp.StdioServerConfig{
 				Version:              version,
 				Host:                 viper.GetString("host"),
@@ -69,7 +74,7 @@ func init() {
 	rootCmd.SetVersionTemplate("{{.Short}}\n{{.Version}}\n")
 
 	// Add global flags that will be shared by all commands
-	rootCmd.PersistentFlags().StringSlice("toolsets", github.DefaultTools(), "An optional comma separated list of groups of tools to allow")
+	rootCmd.PersistentFlags().StringSlice("toolsets", nil, github.GenerateToolsetsHelp())
 	rootCmd.PersistentFlags().Bool("dynamic-toolsets", false, "Enable dynamic toolsets")
 	rootCmd.PersistentFlags().Bool("read-only", false, "Restrict the server to read-only operations")
 	rootCmd.PersistentFlags().String("log-file", "", "Path to log file")

e2e/e2e_test.go

@@ -16,7 +16,6 @@ import (
 	"time"
 
 	"github.com/github/github-mcp-server/internal/ghmcp"
-	"github.com/github/github-mcp-server/pkg/github"
 	"github.com/github/github-mcp-server/pkg/translations"
 	gogithub "github.com/google/go-github/v74/github"
 	mcpClient "github.com/mark3labs/mcp-go/client"
@@ -141,17 +140,20 @@ func setupMCPClient(t *testing.T, options ...clientOption) *mcpClient.Client {
 		}
 
 		// Add toolsets environment variable to the Docker arguments
-		if len(opts.enabledToolsets) > 0 {
-			args = append(args, "-e", "GITHUB_TOOLSETS")
+		// Default to "all" if no specific toolsets are configured
+		enabledToolsets := opts.enabledToolsets
+		if len(enabledToolsets) == 0 {
+			enabledToolsets = []string{"all"}
 		}
+		args = append(args, "-e", "GITHUB_TOOLSETS")
 
 		// Add the image name
 		args = append(args, "github/e2e-github-mcp-server")
 
 		// Construct the env vars for the MCP Client to execute docker with
 		dockerEnvVars := []string{
 			fmt.Sprintf("GITHUB_PERSONAL_ACCESS_TOKEN=%s", token),
-			fmt.Sprintf("GITHUB_TOOLSETS=%s", strings.Join(opts.enabledToolsets, ",")),
+			fmt.Sprintf("GITHUB_TOOLSETS=%s", strings.Join(enabledToolsets, ",")),
 		}
 
 		if host != "" {
@@ -168,8 +170,8 @@ func setupMCPClient(t *testing.T, options ...clientOption) *mcpClient.Client {
 		// not in scope for using the MCP server directly. This probably indicates that we should refactor
 		// so that there is a shared setup mechanism, but let's wait till we feel more friction.
 		enabledToolsets := opts.enabledToolsets
-		if enabledToolsets == nil {
-			enabledToolsets = github.DefaultTools
+		if len(enabledToolsets) == 0 {
+			enabledToolsets = []string{"all"}
 		}
 
 		ghServer, err := ghmcp.NewMCPServer(ghmcp.MCPServerConfig{
@@ -190,7 +192,7 @@ func setupMCPClient(t *testing.T, options ...clientOption) *mcpClient.Client {
 	})
 
 	// Initialize the client
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
 
 	request := mcp.InitializeRequest{}

pkg/github/tools.go

@@ -2,6 +2,8 @@ package github
 
 import (
 	"context"
+	"fmt"
+	"strings"
 
 	"github.com/github/github-mcp-server/pkg/raw"
 	"github.com/github/github-mcp-server/pkg/toolsets"
@@ -79,6 +81,14 @@ func DefaultTools() []string {
 	return tools
 }
 
+func AvailableTools() []string {
+	tools := make([]string, len(AvailableToolsets))
+	for i, toolset := range AvailableToolsets {
+		tools[i] = string(toolset)
+	}
+	return tools
+}
+
 func DefaultToolsetGroup(readOnly bool, getClient GetClientFn, getGQLClient GetGQLClientFn, getRawClient raw.GetRawClientFn, t translations.TranslationHelperFunc, contentWindowSize int) *toolsets.ToolsetGroup {
 	tsg := toolsets.NewToolsetGroup(readOnly)
 
@@ -336,3 +346,37 @@ func ToStringPtr(s string) *string {
 	}
 	return &s
 }
+
+// GenerateToolsetsHelp generates the help text for the toolsets flag
+func GenerateToolsetsHelp() string {
+	// Format default tools
+	defaultTools := strings.Join(DefaultTools(), ", ")
+
+	// Format available tools with line breaks for better readability
+	allTools := AvailableTools()
+	var availableToolsLines []string
+	const maxLineLength = 70
+	currentLine := ""
+
+	for i, tool := range allTools {
+		if i == 0 {
+			currentLine = tool
+		} else if len(currentLine)+len(tool)+2 <= maxLineLength {
+			currentLine += ", " + tool
+		} else {
+			availableToolsLines = append(availableToolsLines, currentLine)
+			currentLine = tool
+		}
+	}
+	if currentLine != "" {
+		availableToolsLines = append(availableToolsLines, currentLine)
+	}
+
+	availableTools := strings.Join(availableToolsLines, ",\n\t     ")
+
+	toolsetsHelp := fmt.Sprintf("Comma-separated list of tool groups to enable (no spaces).\n"+
+		"Default: %s\n"+
+		"To enable all tools, use all\n"+
+		"Available: %s", defaultTools, availableTools)
+	return toolsetsHelp
+}