diff --git a/.gitignore b/.gitignore
index f1d2443..10cfc26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 # AI-related files
 .cursorrules
 .cursorignore
+.windsurf
+.codeiumignore
 CLAUDE.md
 
 # Code-copy related files
diff --git a/UnityMcpBridge/Editor/Data/McpClients.cs b/UnityMcpBridge/Editor/Data/McpClients.cs
index dec53c8..aa97d33 100644
--- a/UnityMcpBridge/Editor/Data/McpClients.cs
+++ b/UnityMcpBridge/Editor/Data/McpClients.cs
@@ -77,6 +77,24 @@ namespace UnityMcpBridge.Editor.Data
                 mcpType = McpTypes.VSCode,
                 configStatus = "Not Configured",
             },
+            new()
+            {
+                name = "Windsurf",
+                windowsConfigPath = Path.Combine(
+                    Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+                    ".codeium",
+                    "windsurf",
+                    "mcp_config.json"
+                ),
+                linuxConfigPath = Path.Combine(
+                    Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+                    ".codeium",
+                    "windsurf",
+                    "mcp_config.json"
+                ),
+                mcpType = McpTypes.Windsurf,
+                configStatus = "Not Configured",
+            },
         };
 
         // Initialize status enums after construction
diff --git a/UnityMcpBridge/Editor/Models/McpTypes.cs b/UnityMcpBridge/Editor/Models/McpTypes.cs
index cb691a2..0e7a18a 100644
--- a/UnityMcpBridge/Editor/Models/McpTypes.cs
+++ b/UnityMcpBridge/Editor/Models/McpTypes.cs
@@ -2,10 +2,11 @@ namespace UnityMcpBridge.Editor.Models
 {
     public enum McpTypes
     {
+        ClaudeCode,
         ClaudeDesktop,
         Cursor,
         VSCode,
-        ClaudeCode,
+        Windsurf,
     }
 }
 
diff --git a/UnityMcpBridge/Editor/Windows/ManualConfigEditorWindow.cs b/UnityMcpBridge/Editor/Windows/ManualConfigEditorWindow.cs
index 89f6099..8cdf0dc 100644
--- a/UnityMcpBridge/Editor/Windows/ManualConfigEditorWindow.cs
+++ b/UnityMcpBridge/Editor/Windows/ManualConfigEditorWindow.cs
@@ -87,6 +87,13 @@ namespace UnityMcpBridge.Editor.Windows
                     instructionStyle
                 );
             }
+            else if (mcpClient.mcpType == McpTypes.Windsurf)
+            {
+                EditorGUILayout.LabelField(
+                    "    a) Going to File > Preferences > Windsurf Settings > MCP > Manage MCPs -> View raw config",
+                    instructionStyle
+                );
+            }
             EditorGUILayout.LabelField("    OR", instructionStyle);
             EditorGUILayout.LabelField(
                 "    b) Opening the configuration file at:",