adding transformer to cleanly handle special toolsets

Author: tonytrg

internal/ghmcp/server.go

@@ -10,6 +10,7 @@ import (
 	"net/url"
 	"os"
 	"os/signal"
+	"slices"
 	"strings"
 	"syscall"
 	"time"
@@ -117,7 +118,7 @@ func NewMCPServer(cfg MCPServerConfig) (*server.MCPServer, error) {
 		}
 	}
 
-	enabledToolsets = transformDefault(enabledToolsets)
+	enabledToolsets = transformSpecialToolsets(enabledToolsets)
 
 	// Generate instructions based on enabled toolsets
 	instructions := github.GenerateInstructions(enabledToolsets)
@@ -473,19 +474,24 @@ func (t *bearerAuthTransport) RoundTrip(req *http.Request) (*http.Response, erro
 	return t.transport.RoundTrip(req)
 }
 
-// transformDefault replaces "default" in the enabled toolsets with the actual default toolset IDs.
-// If "default" is present, it removes it and adds the default toolset IDs from GetDefaultToolsetIDs().
+// transformSpecialToolsets handles special toolset keywords in the enabled toolsets list:
+// - "all": Returns ["all"] immediately, ignoring all other toolsets
+// - "default": Replaces with the actual default toolset IDs from GetDefaultToolsetIDs()
 // Duplicates are removed from the final result.
-func transformDefault(enabledToolsets []string) []string {
-	hasDefault := false
-	result := make([]string, 0, len(enabledToolsets))
+func transformSpecialToolsets(enabledToolsets []string) []string {
+	// Check if "all" is present - if so, return immediately
+	if slices.Contains(enabledToolsets, github.ToolsetMetadataAll.ID) {
+		return []string{github.ToolsetMetadataAll.ID}
+	}
+
+	hasDefault := slices.Contains(enabledToolsets, github.ToolsetMetadataDefault.ID)
+
 	seen := make(map[string]bool)
+	result := make([]string, 0, len(enabledToolsets))
 
-	// First pass: check if "default" exists and collect non-default toolsets
+	// Add non-default toolsets, removing duplicates
 	for _, toolset := range enabledToolsets {
-		if toolset == github.ToolsetMetadataDefault.ID {
-			hasDefault = true
-		} else if !seen[toolset] {
+		if toolset != github.ToolsetMetadataDefault.ID && !seen[toolset] {
 			result = append(result, toolset)
 			seen[toolset] = true
 		}

internal/ghmcp/server_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestTransformDefault(t *testing.T) {
+func TestTransformSpecialToolsets(t *testing.T) {
 	tests := []struct {
 		name     string
 		input    []string
@@ -19,6 +19,26 @@ func TestTransformDefault(t *testing.T) {
 			input:    []string{},
 			expected: []string{},
 		},
+		{
+			name:     "all only",
+			input:    []string{"all"},
+			expected: []string{"all"},
+		},
+		{
+			name:     "all with other toolsets",
+			input:    []string{"all", "actions", "gists"},
+			expected: []string{"all"},
+		},
+		{
+			name:     "all at the end",
+			input:    []string{"actions", "gists", "all"},
+			expected: []string{"all"},
+		},
+		{
+			name:     "all with default",
+			input:    []string{"default", "all", "actions"},
+			expected: []string{"all"},
+		},
 		{
 			name:  "default only",
 			input: []string{"default"},
@@ -104,7 +124,7 @@ func TestTransformDefault(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			result := transformDefault(tt.input)
+			result := transformSpecialToolsets(tt.input)
 
 			// Check that the result has the correct length
 			require.Len(t, result, len(tt.expected), "result length should match expected length")
@@ -132,10 +152,10 @@ func TestTransformDefault(t *testing.T) {
 	}
 }
 
-func TestTransformDefaultWithActualDefaults(t *testing.T) {
+func TestTransformSpecialToolsetsWithActualDefaults(t *testing.T) {
 	// This test verifies that the function uses the actual default toolsets from GetDefaultToolsetIDs()
 	input := []string{"default"}
-	result := transformDefault(input)
+	result := transformSpecialToolsets(input)
 
 	defaultToolsets := github.GetDefaultToolsetIDs()