split up tooling

Author: tonytrg

internal/ghmcp/server.go

@@ -106,7 +106,20 @@ func NewMCPServer(cfg MCPServerConfig) (*server.MCPServer, error) {
 		},
 	}
 
-	enabledToolsets, invalidToolsets := github.CleanToolsets(cfg.EnabledToolsets, cfg.DynamicToolsets)
+	enabledToolsets := cfg.EnabledToolsets
+
+	// If dynamic toolsets are enabled, remove "all" from the enabled toolsets
+	if cfg.DynamicToolsets {
+		enabledToolsets = github.RemoveToolset(enabledToolsets, github.ToolsetMetadataAll.ID)
+	}
+
+	// Clean up the passed toolsets
+	enabledToolsets, invalidToolsets := github.CleanToolsets(enabledToolsets)
+
+	// If "all" is present, override all other toolsets
+	if github.ContainsToolset(enabledToolsets, github.ToolsetMetadataAll.ID) {
+		enabledToolsets = []string{github.ToolsetMetadataAll.ID}
+	}
 
 	if len(invalidToolsets) > 0 {
 		fmt.Fprintf(os.Stderr, "Invalid toolsets ignored: %s\n", strings.Join(invalidToolsets, ", "))

pkg/github/tools.go

@@ -450,11 +450,9 @@ func GenerateToolsetsHelp() string {
 // - Duplicates are removed from the result
 // - Removes whitespaces
 // - Validates toolset names and returns invalid ones separately
-// - "all": Returns ["all"] immediately, ignoring all other toolsets
-// - when dynamicToolsets is true, filters out "all" from the enabled toolsets
 // - "default": Replaces with the actual default toolset IDs from GetDefaultToolsetIDs()
-// Returns: (validToolsets, invalidToolsets)
-func CleanToolsets(enabledToolsets []string, dynamicToolsets bool) ([]string, []string) {
+// Returns: (toolsets, invalidToolsets)
+func CleanToolsets(enabledToolsets []string) ([]string, []string) {
 	seen := make(map[string]bool)
 	result := make([]string, 0, len(enabledToolsets))
 	invalid := make([]string, 0)
@@ -470,22 +468,15 @@ func CleanToolsets(enabledToolsets []string, dynamicToolsets bool) ([]string, []
 			seen[trimmed] = true
 			if trimmed != ToolsetMetadataDefault.ID && trimmed != ToolsetMetadataAll.ID {
 				// Validate the toolset name
-				if validIDs[trimmed] {
-					result = append(result, trimmed)
-				} else {
+				result = append(result, trimmed)
+				if !validIDs[trimmed] {
 					invalid = append(invalid, trimmed)
 				}
 			}
 		}
 	}
 
 	hasDefault := seen[ToolsetMetadataDefault.ID]
-	hasAll := seen[ToolsetMetadataAll.ID]
-
-	// Handle "all" keyword - return early if not in dynamic mode
-	if hasAll && !dynamicToolsets {
-		return []string{ToolsetMetadataAll.ID}, invalid
-	}
 
 	// Expand "default" keyword to actual default toolsets
 	if hasDefault {
@@ -499,3 +490,22 @@ func CleanToolsets(enabledToolsets []string, dynamicToolsets bool) ([]string, []
 
 	return result, invalid
 }
+
+func RemoveToolset(tools []string, toRemove string) []string {
+	result := []string{}
+	for _, tool := range tools {
+		if tool != toRemove {
+			result = append(result, tool)
+		}
+	}
+	return result
+}
+
+func ContainsToolset(tools []string, toCheck string) bool {
+	for _, tool := range tools {
+		if tool == toCheck {
+			return true
+		}
+	}
+	return false
+}