fixing cli message

Author: tonytrg

internal/ghmcp/server.go

@@ -463,20 +463,22 @@ func (t *bearerAuthTransport) RoundTrip(req *http.Request) (*http.Response, erro
 }
 
 // cleanToolsets handles special toolset keywords in the enabled toolsets list:
-// Duplicates are removed from the result.
+// - Duplicates are removed from the result.
+// - Removes whitespaces
 // - "all": Returns ["all"] immediately, ignoring all other toolsets (unless dynamicToolsets is true)
 // - "default": Replaces with the actual default toolset IDs from GetDefaultToolsetIDs()
 // When dynamicToolsets is true, filters out "all" from the enabled toolsets.
 func cleanToolsets(enabledToolsets []string, dynamicToolsets bool) []string {
 	seen := make(map[string]bool)
 	result := make([]string, 0, len(enabledToolsets))
 
-	// Add non-default toolsets, removing duplicates
+	// Add non-default toolsets, removing duplicates and trimming whitespace
 	for _, toolset := range enabledToolsets {
-		if !seen[toolset] {
-			seen[toolset] = true
-			if toolset != github.ToolsetMetadataDefault.ID && toolset != github.ToolsetMetadataAll.ID {
-				result = append(result, toolset)
+		trimmed := strings.TrimSpace(toolset)
+		if !seen[trimmed] {
+			seen[trimmed] = true
+			if trimmed != github.ToolsetMetadataDefault.ID && trimmed != github.ToolsetMetadataAll.ID {
+				result = append(result, trimmed)
 			}
 		}
 	}

internal/ghmcp/server_test.go

@@ -185,6 +185,33 @@ func TestTransformSpecialToolsets(t *testing.T) {
 				"users",
 			},
 		},
+		// Whitespace test cases
+		{
+			name:            "whitespace check- leading and trailing whitespace on regular toolsets",
+			input:           []string{" actions ", "  gists  ", "notifications"},
+			dynamicToolsets: false,
+			expected:        []string{"actions", "gists", "notifications"},
+		},
+		{
+			name:            "whitespace check - default toolset",
+			input:           []string{" actions ", "  default  ", "notifications"},
+			dynamicToolsets: false,
+			expected: []string{
+				"actions",
+				"notifications",
+				"context",
+				"repos",
+				"issues",
+				"pull_requests",
+				"users",
+			},
+		},
+		{
+			name:            "whitespace check - all toolset",
+			input:           []string{" actions ", "  gists  ", "notifications", "  all   "},
+			dynamicToolsets: false,
+			expected:        []string{"all"},
+		},
 	}
 
 	for _, tt := range tests {

pkg/github/tools.go

@@ -422,8 +422,14 @@ func GenerateToolsetsHelp() string {
 	availableTools := strings.Join(availableToolsLines, ",\n\t     ")
 
 	toolsetsHelp := fmt.Sprintf("Comma-separated list of tool groups to enable (no spaces).\n"+
-		"Default: %s\n"+
-		"Available: %s\n", defaultTools, availableTools) +
-		"To enable all tools, use \"all\"."
+		"Available: %s\n", availableTools) +
+		"Special toolset keywords:\n" +
+		"  - all: Enables all available toolsets\n" +
+		fmt.Sprintf("  - default: Enables the default toolset configuration of:\n\t     %s\n", defaultTools) +
+		"Examples:\n" +
+		"  - --toolsets=actions,gists,notifications\n" +
+		"  - Default + additional: --toolsets=default,actions,gists\n" +
+		"  - All tools: --toolsets=all"
+
 	return toolsetsHelp
 }