diff --git a/packages/ui-patterns/src/McpUrlBuilder/assets/warp-icon-dark.svg b/packages/ui-patterns/src/McpUrlBuilder/assets/warp-icon-dark.svg
new file mode 100644
index 00000000000..9799154c284
--- /dev/null
+++ b/packages/ui-patterns/src/McpUrlBuilder/assets/warp-icon-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.035 2.723h9.253A2.712 2.712 0 0 1 24 5.435v10.529a2.712 2.712 0 0 1-2.712 2.713H8.047Zm-1.681 2.6L6.766 19.677h5.598l-.399 1.6H2.712A2.712 2.712 0 0 1 0 18.565V8.036a2.712 2.712 0 0 1 2.712-2.712Z" fill="#FFFFFF"/>
+</svg>
diff --git a/packages/ui-patterns/src/McpUrlBuilder/assets/warp-icon.svg b/packages/ui-patterns/src/McpUrlBuilder/assets/warp-icon.svg
new file mode 100644
index 00000000000..ea1212cbc64
--- /dev/null
+++ b/packages/ui-patterns/src/McpUrlBuilder/assets/warp-icon.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.035 2.723h9.253A2.712 2.712 0 0 1 24 5.435v10.529a2.712 2.712 0 0 1-2.712 2.713H8.047Zm-1.681 2.6L6.766 19.677h5.598l-.399 1.6H2.712A2.712 2.712 0 0 1 0 18.565V8.036a2.712 2.712 0 0 1 2.712-2.712Z" fill="#0B100F"/>
+</svg>
diff --git a/packages/ui-patterns/src/McpUrlBuilder/clients.data.ts b/packages/ui-patterns/src/McpUrlBuilder/clients.data.ts
index f1bfecd348a..92e1378a46b 100644
--- a/packages/ui-patterns/src/McpUrlBuilder/clients.data.ts
+++ b/packages/ui-patterns/src/McpUrlBuilder/clients.data.ts
@@ -240,6 +240,17 @@ export const MCP_CLIENT_DATA: McpClientData[] = [
       }
     },
   },
+  {
+    key: 'warp',
+    label: 'Warp',
+    icon: 'warp',
+    hasDistinctDarkIcon: true,
+    configFile: '~/.warp/.mcp.json',
+    externalDocsUrl: 'https://docs.warp.dev/agents/capabilities/mcp',
+    // No transformConfig: Warp natively supports remote MCP servers and accepts
+    // the standard `mcpServers` config, so the base `{ mcpServers: { supabase: { url } } }`
+    // shape works both in `~/.warp/.mcp.json` and when pasted into Warp's "+ Add" input.
+  },
   {
     key: 'goose',
     label: 'Goose',
@@ -394,7 +405,7 @@ export const MCP_CLIENT_GROUPS = [
   },
   {
     heading: 'IDE',
-    keys: ['cursor', 'vscode', 'antigravity', 'kiro', 'windsurf', 'kimi'],
+    keys: ['cursor', 'vscode', 'antigravity', 'kiro', 'windsurf', 'kimi', 'warp'],
   },
 ] as const
 
diff --git a/packages/ui-patterns/src/McpUrlBuilder/clients.instructions.md.tsx b/packages/ui-patterns/src/McpUrlBuilder/clients.instructions.md.tsx
index 670b09ceade..4b03205e608 100644
--- a/packages/ui-patterns/src/McpUrlBuilder/clients.instructions.md.tsx
+++ b/packages/ui-patterns/src/McpUrlBuilder/clients.instructions.md.tsx
@@ -203,6 +203,22 @@ export const MCP_CLIENT_INSTRUCTIONS: Record<string, McpClientInstructions> = {
       </paragraph>
     ),
   },
+  warp: {
+    alternate: () => (
+      <>
+        <paragraph>
+          Warp supports remote MCP servers natively, so no local proxy is needed. You can also add
+          the server from the UI: open the MCP servers page (<strong>Settings</strong> &gt;{' '}
+          <strong>Agents</strong> &gt; <strong>MCP Servers</strong>, or search for MCP in the
+          command palette), click <strong>+ Add</strong>, and paste the same JSON.
+        </paragraph>
+        <paragraph>
+          After adding the server, Warp opens a browser window to complete the Supabase OAuth flow
+          and stores the credentials securely on your device.
+        </paragraph>
+      </>
+    ),
+  },
   goose: {
     primary: ({ url }) => (
       <>
diff --git a/packages/ui-patterns/src/McpUrlBuilder/utils/mcpIconAssets.ts b/packages/ui-patterns/src/McpUrlBuilder/utils/mcpIconAssets.ts
index cb27dd3fd29..38d5738a32a 100644
--- a/packages/ui-patterns/src/McpUrlBuilder/utils/mcpIconAssets.ts
+++ b/packages/ui-patterns/src/McpUrlBuilder/utils/mcpIconAssets.ts
@@ -21,6 +21,8 @@ import opencodeIcon from '../assets/opencode-icon.svg'
 import perplexityDarkIcon from '../assets/perplexity-icon-dark.svg'
 import perplexityIcon from '../assets/perplexity-icon.svg'
 import vscodeIcon from '../assets/vscode-icon.svg'
+import warpDarkIcon from '../assets/warp-icon-dark.svg'
+import warpIcon from '../assets/warp-icon.svg'
 import windsurfDarkIcon from '../assets/windsurf-icon-dark.svg'
 import windsurfIcon from '../assets/windsurf-icon.svg'
 
@@ -45,6 +47,7 @@ const MCP_CLIENT_ICON_ASSETS = {
   opencode: { light: opencodeIcon, dark: opencodeDarkIcon },
   perplexity: { light: perplexityIcon, dark: perplexityDarkIcon },
   vscode: { light: vscodeIcon, dark: vscodeIcon },
+  warp: { light: warpIcon, dark: warpDarkIcon },
   windsurf: { light: windsurfIcon, dark: windsurfDarkIcon },
 } satisfies Record<string, McpClientIconAsset>