Allow unknown toolsets to be ignored

Author: omgitsads

internal/ghmcp/server.go

@@ -17,6 +17,7 @@ import (
 	"github.com/github/github-mcp-server/pkg/github"
 	mcplog "github.com/github/github-mcp-server/pkg/log"
 	"github.com/github/github-mcp-server/pkg/raw"
+	"github.com/github/github-mcp-server/pkg/toolsets"
 	"github.com/github/github-mcp-server/pkg/translations"
 	gogithub "github.com/google/go-github/v74/github"
 	"github.com/mark3labs/mcp-go/mcp"
@@ -142,7 +143,7 @@ func NewMCPServer(cfg MCPServerConfig) (*server.MCPServer, error) {
 
 	// Create default toolsets
 	tsg := github.DefaultToolsetGroup(cfg.ReadOnly, getClient, getGQLClient, getRawClient, cfg.Translator, cfg.ContentWindowSize)
-	err = tsg.EnableToolsets(enabledToolsets)
+	err = tsg.EnableToolsets(enabledToolsets, &toolsets.EnableToolsetsOptions{})
 
 	if err != nil {
 		return nil, fmt.Errorf("failed to enable toolsets: %w", err)

pkg/toolsets/toolsets.go

@@ -203,23 +203,33 @@ func (tg *ToolsetGroup) IsEnabled(name string) bool {
 	return feature.Enabled
 }
 
-func (tg *ToolsetGroup) EnableToolsets(names []string) error {
+type EnableToolsetsOptions struct {
+	IgnoreUnknown bool
+}
+
+func (tg *ToolsetGroup) EnableToolsets(names []string, options *EnableToolsetsOptions) error {
+	if options == nil {
+		options = &EnableToolsetsOptions{
+			IgnoreUnknown: false,
+		}
+	}
+
 	// Special case for "all"
 	for _, name := range names {
 		if name == "all" {
 			tg.everythingOn = true
 			break
 		}
 		err := tg.EnableToolset(name)
-		if err != nil {
+		if err != nil && !options.IgnoreUnknown {
 			return err
 		}
 	}
 	// Do this after to ensure all toolsets are enabled if "all" is present anywhere in list
 	if tg.everythingOn {
 		for name := range tg.Toolsets {
 			err := tg.EnableToolset(name)
-			if err != nil {
+			if err != nil && !options.IgnoreUnknown {
 				return err
 			}
 		}

pkg/toolsets/toolsets_test.go

@@ -134,7 +134,7 @@ func TestEnableToolsets(t *testing.T) {
 	tsg.AddToolset(toolset2)
 
 	// Test enabling multiple toolsets
-	err := tsg.EnableToolsets([]string{"toolset1", "toolset2"})
+	err := tsg.EnableToolsets([]string{"toolset1", "toolset2"}, &EnableToolsetsOptions{})
 	if err != nil {
 		t.Errorf("Expected no error when enabling toolsets, got: %v", err)
 	}
@@ -148,23 +148,28 @@ func TestEnableToolsets(t *testing.T) {
 	}
 
 	// Test with non-existent toolset in the list
-	err = tsg.EnableToolsets([]string{"toolset1", "non-existent"})
+	err = tsg.EnableToolsets([]string{"toolset1", "non-existent"}, &EnableToolsetsOptions{})
 	if err == nil {
 		t.Error("Expected error when enabling list with non-existent toolset")
 	}
 	if !errors.Is(err, NewToolsetDoesNotExistError("non-existent")) {
 		t.Errorf("Expected ToolsetDoesNotExistError when enabling non-existent toolset, got: %v", err)
 	}
 
+	err = tsg.EnableToolsets([]string{"toolset1", "non-existent"}, &EnableToolsetsOptions{IgnoreUnknown: true})
+	if err != nil {
+		t.Errorf("Expected no error when ignoring unknown toolsets, got: %v", err)
+	}
+
 	// Test with empty list
-	err = tsg.EnableToolsets([]string{})
+	err = tsg.EnableToolsets([]string{}, &EnableToolsetsOptions{})
 	if err != nil {
 		t.Errorf("Expected no error with empty toolset list, got: %v", err)
 	}
 
 	// Test enabling everything through EnableToolsets
 	tsg = NewToolsetGroup(false)
-	err = tsg.EnableToolsets([]string{"all"})
+	err = tsg.EnableToolsets([]string{"all"}, &EnableToolsetsOptions{})
 	if err != nil {
 		t.Errorf("Expected no error when enabling 'all', got: %v", err)
 	}
@@ -187,14 +192,14 @@ func TestEnableEverything(t *testing.T) {
 	}
 
 	// Enable "all"
-	err := tsg.EnableToolsets([]string{"all"})
+	err := tsg.EnableToolsets([]string{"all"}, &EnableToolsetsOptions{})
 	if err != nil {
-		t.Errorf("Expected no error when enabling 'eall', got: %v", err)
+		t.Errorf("Expected no error when enabling 'all', got: %v", err)
 	}
 
 	// Verify everythingOn was set
 	if !tsg.everythingOn {
-		t.Error("Expected everythingOn to be true after enabling 'eall'")
+		t.Error("Expected everythingOn to be true after enabling 'all'")
 	}
 
 	// Verify the previously disabled toolset is now enabled
@@ -212,7 +217,7 @@ func TestIsEnabledWithEverythingOn(t *testing.T) {
 	tsg := NewToolsetGroup(false)
 
 	// Enable "all"
-	err := tsg.EnableToolsets([]string{"all"})
+	err := tsg.EnableToolsets([]string{"all"}, &EnableToolsetsOptions{})
 	if err != nil {
 		t.Errorf("Expected no error when enabling 'all', got: %v", err)
 	}