diff --git a/MCPForUnity/Editor/Data/McpClients.cs b/MCPForUnity/Editor/Data/McpClients.cs
index 68717510..f001fd5f 100644
--- a/MCPForUnity/Editor/Data/McpClients.cs
+++ b/MCPForUnity/Editor/Data/McpClients.cs
@@ -208,6 +208,31 @@ public class McpClients
                 mcpType = McpTypes.Codex,
                 configStatus = "Not Configured",
             },
+            //  Warp
+            new()
+            {
+                name = "Warp",
+                windowsConfigPath = Path.Combine(
+                    Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+                    "Warp",
+                    "mcp.json"
+                ),
+                macConfigPath = Path.Combine(
+                    Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+                    "Library",
+                    "Application Support",
+                    "Warp",
+                    "mcp.json"
+                ),
+                linuxConfigPath = Path.Combine(
+                    Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+                    ".config",
+                    "Warp",
+                    "mcp.json"
+                ),
+                mcpType = McpTypes.Warp,
+                configStatus = "Not Configured",
+            },
         };
 
         // Initialize status enums after construction
diff --git a/MCPForUnity/Editor/Models/McpTypes.cs b/MCPForUnity/Editor/Models/McpTypes.cs
index 7c864897..cb487c6a 100644
--- a/MCPForUnity/Editor/Models/McpTypes.cs
+++ b/MCPForUnity/Editor/Models/McpTypes.cs
@@ -10,5 +10,6 @@ public enum McpTypes
         VSCode,
         Windsurf,
         Trae,
+        Warp
     }
 }
diff --git a/MCPForUnity/Editor/Services/ClientConfigurationService.cs b/MCPForUnity/Editor/Services/ClientConfigurationService.cs
index 8a9c4caf..24221786 100644
--- a/MCPForUnity/Editor/Services/ClientConfigurationService.cs
+++ b/MCPForUnity/Editor/Services/ClientConfigurationService.cs
@@ -469,6 +469,13 @@ public string GetInstallationSteps(McpClient client)
                     "4. For local servers, Node.js (npx) or uvx must be installed\n" +
                     "5. Save and restart Trae",
 
+                 McpTypes.Warp =>
+                    "1. Open Warp\n" +
+                    "2. Open 'Warp Drive' — click the Warp icon in the top-left corner, or press (Ctrl + Shift + | on Windows / ⌘ + | on macOS)\n" +
+                    "3. Go to MCP Servers > Add\n" +
+                    "4. Paste the configuration JSON\n" +
+                    "5. Save",
+
                 _ => "Configuration steps not available for this client."
             };
 
diff --git a/UnityMcpBridge/Editor/Data/McpClients.cs b/UnityMcpBridge/Editor/Data/McpClients.cs
index 1616c464..782b50df 100644
--- a/UnityMcpBridge/Editor/Data/McpClients.cs
+++ b/UnityMcpBridge/Editor/Data/McpClients.cs
@@ -206,6 +206,31 @@ public class McpClients
                 mcpType = McpTypes.Codex,
                 configStatus = "Not Configured",
             },
+            //  Warp
+            new()
+            {
+                name = "Warp",
+                windowsConfigPath = Path.Combine(
+                    Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+                    "Warp",
+                    "mcp.json"
+                ),
+                macConfigPath = Path.Combine(
+                    Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+                    "Library",
+                    "Application Support",
+                    "Warp",
+                    "mcp.json"
+                ),
+                linuxConfigPath = Path.Combine(
+                    Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+                    ".config",
+                    "Warp",
+                    "mcp.json"
+                ),
+                mcpType = McpTypes.Warp,
+                configStatus = "Not Configured",
+            },
         };
 
         // Initialize status enums after construction
diff --git a/UnityMcpBridge/Editor/Models/McpTypes.cs b/UnityMcpBridge/Editor/Models/McpTypes.cs
index 7c864897..de491792 100644
--- a/UnityMcpBridge/Editor/Models/McpTypes.cs
+++ b/UnityMcpBridge/Editor/Models/McpTypes.cs
@@ -10,5 +10,6 @@ public enum McpTypes
         VSCode,
         Windsurf,
         Trae,
+        Warp,
     }
 }
diff --git a/UnityMcpBridge/Editor/Windows/ManualConfigEditorWindow.cs b/UnityMcpBridge/Editor/Windows/ManualConfigEditorWindow.cs
index ec3f9be9..2bac4606 100644
--- a/UnityMcpBridge/Editor/Windows/ManualConfigEditorWindow.cs
+++ b/UnityMcpBridge/Editor/Windows/ManualConfigEditorWindow.cs
@@ -115,6 +115,14 @@ protected virtual void OnGUI()
                     instructionStyle
                 );
             }
+            else if (mcpClient?.mcpType == McpTypes.Warp)
+            {
+                EditorGUILayout.LabelField(
+                 "a) Open 'Warp Drive' by clicking the Warp icon in the top-left corner or press (Ctrl + Shift + | on Windows / ⌘ + | on macOS) >  MCP Servers > Add",
+                    instructionStyle
+                );
+            }
+
             EditorGUILayout.LabelField("    OR", instructionStyle);
             EditorGUILayout.LabelField(
                 "    b) Opening the configuration file at:",