feature/1155/add-windsurf - Enhance client configuration to support Windsurf IDE and IntelliJ plugin (#1156)

Solves issue: #1155

Co-authored-by: Mauricio Bonetti <[email protected]>
Co-authored-by: Don Browne <[email protected]>

Author: 3 people

cmd/thv/app/client.go

@@ -148,11 +148,12 @@ func clientRegisterCmdFunc(cmd *cobra.Command, args []string) error {
 
 	// Validate the client type
 	switch clientType {
-	case "roo-code", "cline", "cursor", "claude-code", "vscode-insider", "vscode":
+	case "roo-code", "cline", "cursor", "claude-code", "vscode-insider", "vscode", "windsurf", "windsurf-intellij":
 		// Valid client type
 	default:
 		return fmt.Errorf(
-			"invalid client type: %s (valid types: roo-code, cline, cursor, claude-code, vscode, vscode-insider)",
+			"invalid client type: %s (valid types: roo-code, cline, cursor, claude-code, vscode, "+
+				"vscode-insider, windsurf, windsurf-intellij)",
 			clientType)
 	}
 
@@ -178,11 +179,12 @@ func clientRemoveCmdFunc(cmd *cobra.Command, args []string) error {
 
 	// Validate the client type
 	switch clientType {
-	case "roo-code", "cline", "cursor", "claude-code", "vscode-insider", "vscode":
+	case "roo-code", "cline", "cursor", "claude-code", "vscode-insider", "vscode", "windsurf", "windsurf-intellij":
 		// Valid client type
 	default:
 		return fmt.Errorf(
-			"invalid client type: %s (valid types: roo-code, cline, cursor, claude-code, vscode, vscode-insider)",
+			"invalid client type: %s (valid types: roo-code, cline, cursor, claude-code, vscode, "+
+				"vscode-insider, windsurf, windsurf-intellij)",
 			clientType)
 	}
 

docs/server/docs.go

@@ -38,6 +38,10 @@ const (
 	VSCode MCPClient = "vscode"
 	// ClaudeCode represents the Claude Code CLI.
 	ClaudeCode MCPClient = "claude-code"
+	// Windsurf represents the Windsurf IDE.
+	Windsurf MCPClient = "windsurf"
+	// WindsurfIntelliJ represents the Windsurf plugin for IntelliJ.
+	WindsurfIntelliJ MCPClient = "windsurf-intellij"
 )
 
 // Extension is extension of the client config file.
@@ -59,6 +63,7 @@ type mcpClientConfig struct {
 	Extension                     Extension
 	SupportedTransportTypesMap    map[types.TransportType]string // stdio should be mapped to sse
 	IsTransportTypeFieldSupported bool
+	MCPServersUrlLabel            string
 }
 
 var (
@@ -87,6 +92,7 @@ var supportedClientIntegrations = []mcpClientConfig{
 			types.TransportTypeStreamableHTTP: "streamable-http",
 		},
 		IsTransportTypeFieldSupported: true,
+		MCPServersUrlLabel:            "url",
 	},
 	{
 		ClientType:   Cline,
@@ -107,6 +113,7 @@ var supportedClientIntegrations = []mcpClientConfig{
 			types.TransportTypeStdio: "sse",
 		},
 		IsTransportTypeFieldSupported: false,
+		MCPServersUrlLabel:            "url",
 	},
 	{
 		ClientType:   VSCodeInsider,
@@ -128,6 +135,7 @@ var supportedClientIntegrations = []mcpClientConfig{
 			types.TransportTypeStreamableHTTP: "http",
 		},
 		IsTransportTypeFieldSupported: true,
+		MCPServersUrlLabel:            "url",
 	},
 	{
 		ClientType:   VSCode,
@@ -149,6 +157,7 @@ var supportedClientIntegrations = []mcpClientConfig{
 			types.TransportTypeStreamableHTTP: "http",
 		},
 		IsTransportTypeFieldSupported: true,
+		MCPServersUrlLabel:            "url",
 	},
 	{
 		ClientType:           Cursor,
@@ -165,6 +174,7 @@ var supportedClientIntegrations = []mcpClientConfig{
 		// Adding type field is not explicitly required though, Cursor auto-detects and is able to
 		// connect to both sse and streamable-http types
 		IsTransportTypeFieldSupported: true,
+		MCPServersUrlLabel:            "url",
 	},
 	{
 		ClientType:           ClaudeCode,
@@ -179,6 +189,37 @@ var supportedClientIntegrations = []mcpClientConfig{
 			types.TransportTypeStreamableHTTP: "http",
 		},
 		IsTransportTypeFieldSupported: true,
+		MCPServersUrlLabel:            "url",
+	},
+	{
+		ClientType:           Windsurf,
+		Description:          "Windsurf IDE",
+		SettingsFile:         "mcp_config.json",
+		MCPServersPathPrefix: "/mcpServers",
+		RelPath:              []string{".codeium", "windsurf"},
+		Extension:            JSON,
+		SupportedTransportTypesMap: map[types.TransportType]string{
+			types.TransportTypeStdio:          "sse",
+			types.TransportTypeSSE:            "sse",
+			types.TransportTypeStreamableHTTP: "http",
+		},
+		IsTransportTypeFieldSupported: true,
+		MCPServersUrlLabel:            "serverUrl",
+	},
+	{
+		ClientType:           WindsurfIntelliJ,
+		Description:          "Windsurf plugin for IntelliJ",
+		SettingsFile:         "mcp_config.json",
+		MCPServersPathPrefix: "/mcpServers",
+		RelPath:              []string{".codeium"},
+		Extension:            JSON,
+		SupportedTransportTypesMap: map[types.TransportType]string{
+			types.TransportTypeStdio:          "sse",
+			types.TransportTypeSSE:            "sse",
+			types.TransportTypeStreamableHTTP: "http",
+		},
+		IsTransportTypeFieldSupported: true,
+		MCPServersUrlLabel:            "serverUrl",
 	},
 }
 
@@ -323,10 +364,17 @@ func Upsert(cf ConfigFile, name string, url string, transportType string) error
 		if cf.ClientType != supportedClientIntegrations[i].ClientType {
 			continue
 		}
+		isServerUrl := supportedClientIntegrations[i].MCPServersUrlLabel == "serverUrl"
 		mappedTransportType, ok := supportedClientIntegrations[i].SupportedTransportTypesMap[types.TransportType(transportType)]
 		if supportedClientIntegrations[i].IsTransportTypeFieldSupported && ok {
+			if isServerUrl {
+				return cf.ConfigUpdater.Upsert(name, MCPServer{ServerUrl: url, Type: mappedTransportType})
+			}
 			return cf.ConfigUpdater.Upsert(name, MCPServer{Url: url, Type: mappedTransportType})
 		}
+		if isServerUrl {
+			return cf.ConfigUpdater.Upsert(name, MCPServer{ServerUrl: url})
+		}
 		return cf.ConfigUpdater.Upsert(name, MCPServer{Url: url})
 	}
 	return nil

docs/server/swagger.json

@@ -23,8 +23,9 @@ type ConfigUpdater interface {
 
 // MCPServer represents an MCP server in a MCP client config file
 type MCPServer struct {
-	Url  string `json:"url,omitempty"`
-	Type string `json:"type,omitempty"`
+	Url       string `json:"url,omitempty"`
+	ServerUrl string `json:"serverUrl,omitempty"`
+	Type      string `json:"type,omitempty"`
 }
 
 // JSONConfigUpdater is a ConfigUpdater that is responsible for updating

docs/server/swagger.yaml

@@ -312,6 +312,12 @@ func TestSuccessfulClientConfigOperations(t *testing.T) {
 			case Cline:
 				assert.Contains(t, string(content), `"mcpServers":`,
 					"Cline config should contain mcpServers key")
+			case Windsurf:
+				assert.Contains(t, string(content), `"mcpServers":`,
+					"Windsurf config should contain mcpServers key")
+			case WindsurfIntelliJ:
+				assert.Contains(t, string(content), `"mcpServers":`,
+					"WindsurfIntelliJ config should contain mcpServers key")
 			}
 		}
 	})
@@ -337,7 +343,7 @@ func TestSuccessfulClientConfigOperations(t *testing.T) {
 			case VSCode, VSCodeInsider:
 				assert.Contains(t, string(content), testURL,
 					"VSCode config should contain the server URL")
-			case Cursor, RooCode, ClaudeCode, Cline:
+			case Cursor, RooCode, ClaudeCode, Cline, Windsurf, WindsurfIntelliJ:
 				assert.Contains(t, string(content), testURL,
 					"Config should contain the server URL")
 			}