Added a client picker for MCP setup command (#1446)

Author: KevyVo

src/cmd/cli/command/commands.go

@@ -300,7 +300,6 @@ func SetupCommands(ctx context.Context, version string) {
 	mcpCmd.AddCommand(mcpServerCmd)
 	mcpSetupCmd.Flags().String("client", "", fmt.Sprintf("MCP setup client %v", mcp.ValidClients))
 	mcpServerCmd.Flags().Int("auth-server", 0, "auth server port")
-	mcpSetupCmd.MarkFlagRequired("client")
 	RootCmd.AddCommand(mcpCmd)
 
 	// Send Command

src/cmd/cli/command/mcp.go

@@ -79,9 +79,36 @@ var mcpSetupCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		term.Debug("Setting up MCP client")
 		client, _ := cmd.Flags().GetString("client")
-		term.Debugf("MCP Client: %q", client)
-		if err := mcp.SetupClient(client); err != nil {
-			return err
+
+		if client != "" {
+
+			// Aliases mapping
+			switch client {
+			case "code":
+				client = string(mcp.MCPClientVSCode)
+			case "code-insiders":
+				client = string(mcp.MCPClientVSCodeInsiders)
+			case "cascade", "codeium":
+				client = string(mcp.MCPClientWindsurf)
+			}
+
+			term.Debugf("Using MCP client flag: %q", client)
+			if err := mcp.SetupClient(client); err != nil {
+				return err
+			}
+		} else {
+			term.Debugf("Using MCP client picker: %q", client)
+			clients, err := mcp.SelectMCPclients()
+			if err != nil {
+				return err
+			}
+			for _, client := range clients {
+				term.Debugf("Selected MCP client using picker: %q", client)
+
+				if err := mcp.SetupClient(client); err != nil {
+					return err
+				}
+			}
 		}
 
 		return nil

src/pkg/mcp/setup.go

@@ -10,6 +10,8 @@ import (
 	"slices"
 	"strings"
 
+	"github.com/AlecAivazis/survey/v2"
+
 	"github.com/DefangLabs/defang/src/pkg/term"
 	"github.com/DefangLabs/defang/src/pkg/track"
 )
@@ -53,24 +55,18 @@ type MCPClient string
 
 const (
 	MCPClientVSCode         MCPClient = "vscode"
-	MCPClientCode           MCPClient = "code"
 	MCPClientVSCodeInsiders MCPClient = "vscode-insiders"
-	MCPClientInsiders       MCPClient = "code-insiders"
 	MCPClientClaudeDesktop  MCPClient = "claude-desktop"
 	MCPClientClaudeCode     MCPClient = "claude-code"
 	MCPClientWindsurf       MCPClient = "windsurf"
-	MCPClientCascade        MCPClient = "cascade"
-	MCPClientCodeium        MCPClient = "codeium"
 	MCPClientCursor         MCPClient = "cursor"
 	MCPClientKiro           MCPClient = "kiro"
 )
 
 // ValidVSCodeClients is a list of supported VSCode MCP clients with shorthand names
 var ValidVSCodeClients = []MCPClient{
 	MCPClientVSCode,
-	MCPClientCode,
 	MCPClientVSCodeInsiders,
-	MCPClientInsiders,
 }
 
 // ValidClients is a list of supported MCP clients
@@ -79,14 +75,13 @@ var ValidClients = append(
 		MCPClientClaudeDesktop,
 		MCPClientClaudeCode,
 		MCPClientWindsurf,
-		MCPClientCascade,
-		MCPClientCodeium,
 		MCPClientCursor,
 		MCPClientKiro,
 	},
 	ValidVSCodeClients...,
 )
 
+// ParseMCPClient parses and validates the MCP client string
 func ParseMCPClient(clientStr string) (MCPClient, error) {
 	clientStr = strings.ToLower(clientStr)
 	client := MCPClient(clientStr)
@@ -96,6 +91,29 @@ func ParseMCPClient(clientStr string) (MCPClient, error) {
 	return client, nil
 }
 
+// ValidClientStrings converts ValidClients to []string for survey options
+func ValidClientStrings() []string {
+	strings := make([]string, len(ValidClients))
+	for i, client := range ValidClients {
+		strings[i] = string(client)
+	}
+	return strings
+}
+
+// SelectMCPclients prompts the user to select one or more MCP clients
+func SelectMCPclients() ([]string, error) {
+	var clients []string
+	err := survey.AskOne(&survey.MultiSelect{
+		Message: "Choose a client(s):",
+		Options: ValidClientStrings(),
+	}, &clients)
+	if err != nil {
+		return nil, fmt.Errorf("failed to select MCP client(s): %w", err)
+	}
+
+	return clients, nil
+}
+
 // ClientInfo defines where each client stores its MCP configuration
 type ClientInfo struct {
 	configFile string // Configuration file name
@@ -140,12 +158,8 @@ var kiroConfig = ClientInfo{
 // clientRegistry maps client names to their configuration details
 var clientRegistry = map[MCPClient]ClientInfo{
 	MCPClientWindsurf:       windsurfConfig,
-	MCPClientCascade:        windsurfConfig,
-	MCPClientCodeium:        windsurfConfig,
 	MCPClientVSCode:         vscodeConfig,
-	MCPClientCode:           vscodeConfig,
 	MCPClientVSCodeInsiders: codeInsidersConfig,
-	MCPClientInsiders:       codeInsidersConfig,
 	MCPClientClaudeDesktop:  claudeDesktopConfig,
 	MCPClientClaudeCode:     claudeCodeConfig,
 	MCPClientCursor:         cursorConfig,

src/pkg/mcp/setup_test.go

@@ -30,16 +30,6 @@ func TestGetClientConfigPath(t *testing.T) {
 			client:       MCPClientWindsurf,
 			expectedPath: filepath.Join(homeDir, ".codeium", "windsurf", "mcp_config.json"),
 		},
-		{
-			name:         "cascade",
-			client:       MCPClientCascade,
-			expectedPath: filepath.Join(homeDir, ".codeium", "windsurf", "mcp_config.json"),
-		},
-		{
-			name:         "codeium",
-			client:       MCPClientCodeium,
-			expectedPath: filepath.Join(homeDir, ".codeium", "windsurf", "mcp_config.json"),
-		},
 
 		// Claude Desktop tests - Darwin
 		{
@@ -159,12 +149,6 @@ func TestGetClientConfigPath(t *testing.T) {
 			goos:         "darwin",
 			expectedPath: filepath.Join(homeDir, "Library", "Application Support", "Code", "User", "mcp.json"),
 		},
-		{
-			name:         "code_darwin",
-			client:       MCPClientCode,
-			goos:         "darwin",
-			expectedPath: filepath.Join(homeDir, "Library", "Application Support", "Code", "User", "mcp.json"),
-		},
 
 		// VSCode tests - Windows with APPDATA
 		{
@@ -209,12 +193,6 @@ func TestGetClientConfigPath(t *testing.T) {
 			goos:         "darwin",
 			expectedPath: filepath.Join(homeDir, "Library", "Application Support", "Code - Insiders", "User", "mcp.json"),
 		},
-		{
-			name:         "insiders_darwin",
-			client:       MCPClientInsiders,
-			goos:         "darwin",
-			expectedPath: filepath.Join(homeDir, "Library", "Application Support", "Code - Insiders", "User", "mcp.json"),
-		},
 
 		// VSCode Insiders tests - Windows with APPDATA
 		{