+| Vapi CLI | Overview ยท GitHub ยท Project Integration ยท MCP Setup ยท Webhook Testing |
| Real-time SDKs | Web ยท Flutter ยท React Native ยท iOS ยท Python ยท Vanilla |
| Client Examples | Next.js ยท React ยท Flutter ยท React Native |
| Server Examples | Vercel ยท Cloudflare ยท Supabase ยท Node ยท Bun ยท Deno ยท Flask ยท Laravel ยท Go ยท Rust |
diff --git a/fern/sdk/mcp-server.mdx b/fern/sdk/mcp-server.mdx
index 581f78bd5..c88e369f3 100644
--- a/fern/sdk/mcp-server.mdx
+++ b/fern/sdk/mcp-server.mdx
@@ -14,6 +14,16 @@ Use this server to connect your AI workflows to real-world telephony, automate v
Looking to use MCP tools *inside* a Vapi assistant? See the [MCP Tool documentation](/tools/mcp) for integrating *external* MCP servers with your Vapi agents.
+
+**Using the Vapi CLI?** Auto-configure MCP in your IDE with one command:
+
+```bash
+vapi mcp setup
+```
+
+This automatically configures Cursor, Windsurf, or VSCode with the Vapi MCP server. [Learn more โ](/cli/mcp)
+
+
## Quickstart: Claude Desktop Config
**Fastest way to get started:** connect Claude Desktop to the Vapi MCP Server.
diff --git a/fern/server-url.mdx b/fern/server-url.mdx
index 1bbe417cb..5b6a0f082 100644
--- a/fern/server-url.mdx
+++ b/fern/server-url.mdx
@@ -52,8 +52,24 @@ To get started using server URLs, read our guides:
>
Learn about receiving server events in your local development environment.
+
+ Test webhooks instantly with the Vapi CLI - no ngrok required.
+
+
+**Quick local testing with Vapi CLI:**
+```bash
+vapi listen --forward-to localhost:3000/webhook
+```
+This instantly forwards all webhook events to your local server for debugging.
+
+
## FAQ
diff --git a/fern/server-url/developing-locally.mdx b/fern/server-url/developing-locally.mdx
index 970af54c0..f8d120dd5 100644
--- a/fern/server-url/developing-locally.mdx
+++ b/fern/server-url/developing-locally.mdx
@@ -9,6 +9,24 @@ slug: server-url/developing-locally
+## Quick solution: Vapi CLI
+
+The easiest way to test webhooks locally is with the Vapi CLI:
+
+```bash
+# Install Vapi CLI
+curl -sSL https://vapi.ai/install.sh | bash
+
+# Forward webhooks to your local server
+vapi listen --forward-to localhost:3000/webhook
+```
+
+This eliminates the need for ngrok or other tunneling services. [Learn more about the Vapi CLI โ](/cli/webhook)
+
+## Manual setup with ngrok
+
+If you prefer to use ngrok or need more control over the tunneling process, follow the guide below.
+
## The Problem
When Vapi dispatches events to a server, it must be able to reach the server via the open Internet.
diff --git a/fern/tools/custom-tools.mdx b/fern/tools/custom-tools.mdx
index 3d61abd6e..0350a0845 100644
--- a/fern/tools/custom-tools.mdx
+++ b/fern/tools/custom-tools.mdx
@@ -84,6 +84,37 @@ Tools created in the Tools section are automatically available in the workflow b
2. Select your custom tool from the **Tool** dropdown
3. Configure any node-specific settings
+### Using the Vapi CLI
+
+Manage your custom tools directly from the terminal:
+
+```bash
+# List all tools
+vapi tool list
+
+# Get tool details
+vapi tool get
+
+# Create a new tool (interactive)
+vapi tool create
+
+# Test a tool with sample data
+vapi tool test
+
+# Delete a tool
+vapi tool delete
+```
+
+
+**Local development tip:** When developing custom tools, use the Vapi CLI to test webhooks locally:
+
+```bash
+vapi listen --forward-to localhost:3000/tools/webhook
+```
+
+This forwards all tool execution requests to your local server for real-time debugging. [Learn more โ](/cli/webhook)
+
+
## Alternative: API Configuration
For advanced users who prefer programmatic control, you can also create and manage tools via the Vapi API:
diff --git a/fern/workflows/quickstart.mdx b/fern/workflows/quickstart.mdx
index 0effd00d3..7bea279b5 100644
--- a/fern/workflows/quickstart.mdx
+++ b/fern/workflows/quickstart.mdx
@@ -30,6 +30,20 @@ Build a simple voice agent using Vapi's visual workflow builder that greets user
* A [Vapi account](https://dashboard.vapi.ai)
* For SDK usage: API key from the Dashboard
+
+**Developing with the Vapi CLI?** You can manage workflows and test webhook integrations from your terminal:
+
+```bash
+# List all workflows
+vapi workflow list
+
+# Test workflow webhooks locally
+vapi listen --forward-to localhost:3000/webhook
+```
+
+[Learn more about the Vapi CLI โ](/cli)
+
+
## Scenario
We will create a simple information-gathering workflow that demonstrates the core features of Vapi's workflow builder. This workflow will showcase conversation flow, variable extraction, and escalation patterns that form the foundation of more complex workflows.