diff --git a/src/current/_includes/head.html b/src/current/_includes/head.html
index 7815053ec23..6b4fe57fa4e 100755
--- a/src/current/_includes/head.html
+++ b/src/current/_includes/head.html
@@ -78,6 +78,11 @@
 </script>
 
 <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.3/dist/jquery.min.js" integrity="sha256-pvPw+upLPUjgMXY0G+8O0xUf+/Im1MZjXxxgOcBQBXU=" crossorigin="anonymous"></script>
+<script src="{{ 'js/searchInputRendering.js' | relative_url }}"></script>
+<!-- Algolia client for autocomplete -->
+<script src="https://cdn.jsdelivr.net/npm/algoliasearch@4.14.3/dist/algoliasearch-lite.umd.min.js"></script>
+<!-- Algolia Autocomplete with Kapa Integration -->
+<script src="{{ 'js/algoliaAutocomplete.js' | relative_url }}"></script>
 
 {%- comment -%} Add the Brand Website segment source and fire a page impression. {%- endcomment -%}
 <script>
@@ -153,6 +158,11 @@
   data-modal-disclaimer="This AI bot is experimental. Don't rely on it for production workloads. Always consult the official CockroachDB documentation. Interactions with this AI bot may be monitored or recorded, and your use of the AI bot is subject to the Cockroach Labs' [Terms of Use](https://www.cockroachlabs.com/website-terms-of-use/) and [Privacy policy](https://www.cockroachlabs.com/privacy/)."
   data-modal-y-offset="12vh"
   data-modal-z-index="1000"
+  data-mcp-enabled="true"
+  data-mcp-server-url="https://cockroachdb.mcp.kapa.ai"
+  data-search-mode-enabled="true"
+  data-search-source-ids-include="142a5371-2b4f-4d42-91aa-9c18142991d5"
+  data-modal-open-on-command-k="true"
 ></script>
 
 <style>
diff --git a/src/current/_includes/topnav.html b/src/current/_includes/topnav.html
index 098963298f4..1389dd5328b 100755
--- a/src/current/_includes/topnav.html
+++ b/src/current/_includes/topnav.html
@@ -53,7 +53,60 @@
               <img width="16" src="{{ 'images/icon-search.svg' | relative_url }}" alt="search">
             </span>
           </div>
-          <input type="text" class="form-control border-0" placeholder="Search" aria-label="Search" aria-describedby="basic-addon1">
+          <input 
+            id="search-input"
+            type="text" 
+            class="form-control border-0" 
+            placeholder="Search" 
+            aria-label="Search" 
+            aria-describedby="basic-addon1"
+          >
+          <div class="input-group-append">
+            <button 
+              id="mcp-dropdown-toggle"
+              class="btn btn-outline-primary dropdown-toggle" 
+              type="button" 
+              data-toggle="dropdown" 
+              aria-haspopup="true" 
+              aria-expanded="false"
+              title="AI & MCP Tools"
+            >
+              <i class="fas fa-robot"></i> AI
+            </button>
+            <div class="dropdown-menu dropdown-menu-right" aria-labelledby="mcp-dropdown-toggle" style="min-width: 250px;">
+              <h6 class="dropdown-header">AI Assistant</h6>
+              <button 
+                class="dropdown-item" 
+                type="button" 
+                onclick="if(window.Kapa) { window.Kapa.open(); } else { alert('AI Assistant not available'); }"
+              >
+                <i class="fas fa-comments"></i> Ask AI Assistant
+              </button>
+              <div class="dropdown-divider"></div>
+              <h6 class="dropdown-header">MCP Integration</h6>
+              <button 
+                class="dropdown-item" 
+                type="button"
+                onclick="if(window.Kapa) { window.Kapa.open(); alert('Connect to MCP server at: https://cockroachdb.mcp.kapa.ai'); } else { alert('MCP not available'); }"
+              >
+                <i class="fas fa-plug"></i> Connect with MCP
+              </button>
+              <button 
+                class="dropdown-item" 
+                type="button"
+                onclick="window.open('https://docs.kapa.ai/dev/kapa-mcp', '_blank')"
+              >
+                <i class="fas fa-book"></i> MCP Documentation
+              </button>
+              <button 
+                class="dropdown-item" 
+                type="button"
+                onclick="window.open('https://www.cockroachlabs.com/docs/stable/mcp-setup', '_blank')"
+              >
+                <i class="fas fa-cog"></i> Setup Guide
+              </button>
+            </div>
+          </div>
         </div>
         <ul class="navbar-nav">
           <li class="nav-item text-nowrap mb-0">
diff --git a/src/current/_includes/v21.2/sidebar-data/reference.json b/src/current/_includes/v21.2/sidebar-data/reference.json
index 9de10775d12..fee6cf50bc9 100644
--- a/src/current/_includes/v21.2/sidebar-data/reference.json
+++ b/src/current/_includes/v21.2/sidebar-data/reference.json
@@ -1687,6 +1687,12 @@
           "https://www.cockroachlabs.com/docs/api/cloud/v1"
         ]
       },
+      {
+        "title": "Docs MCP Server",
+        "urls": [
+          "/${VERSION}/docs-mcp-integration.html"
+        ]
+      },
       {
         "title": "Logging",
         "items": [
diff --git a/src/current/_includes/v22.1/sidebar-data/reference.json b/src/current/_includes/v22.1/sidebar-data/reference.json
index 560f98af121..55b89032a4a 100644
--- a/src/current/_includes/v22.1/sidebar-data/reference.json
+++ b/src/current/_includes/v22.1/sidebar-data/reference.json
@@ -1795,6 +1795,12 @@
           "https://www.cockroachlabs.com/docs/api/cloud/v1"
         ]
       },
+      {
+        "title": "Docs MCP Server",
+        "urls": [
+          "/${VERSION}/docs-mcp-integration.html"
+        ]
+      },
       {
         "title": "Logging",
         "items": [
diff --git a/src/current/_includes/v22.2/sidebar-data/reference.json b/src/current/_includes/v22.2/sidebar-data/reference.json
index 49952f96087..5a6c452b7e5 100644
--- a/src/current/_includes/v22.2/sidebar-data/reference.json
+++ b/src/current/_includes/v22.2/sidebar-data/reference.json
@@ -1687,6 +1687,12 @@
           "https://www.cockroachlabs.com/docs/api/cloud/v1"
         ]
       },
+      {
+        "title": "Docs MCP Server",
+        "urls": [
+          "/${VERSION}/docs-mcp-integration.html"
+        ]
+      },
       {
         "title": "Logging",
         "items": [
diff --git a/src/current/_includes/v23.1/sidebar-data/reference.json b/src/current/_includes/v23.1/sidebar-data/reference.json
index 2dfaf93caf5..7a51665f5b4 100644
--- a/src/current/_includes/v23.1/sidebar-data/reference.json
+++ b/src/current/_includes/v23.1/sidebar-data/reference.json
@@ -67,6 +67,12 @@
           "https://www.cockroachlabs.com/docs/api/cluster/v2"
         ]
       },
+      {
+        "title": "Docs MCP Server",
+        "urls": [
+          "/${VERSION}/docs-mcp-integration.html"
+        ]
+      },
       {
         "title": "Cluster Settings",
         "urls": [
diff --git a/src/current/_includes/v23.2/sidebar-data/reference.json b/src/current/_includes/v23.2/sidebar-data/reference.json
index 6c192e4a264..b4c2bd3c366 100644
--- a/src/current/_includes/v23.2/sidebar-data/reference.json
+++ b/src/current/_includes/v23.2/sidebar-data/reference.json
@@ -67,6 +67,12 @@
           "https://www.cockroachlabs.com/docs/api/cluster/v2"
         ]
       },
+      {
+        "title": "Docs MCP Server",
+        "urls": [
+          "/${VERSION}/docs-mcp-integration.html"
+        ]
+      },
       {
         "title": "Cluster Settings",
         "urls": [
diff --git a/src/current/_includes/v24.1/sidebar-data/reference.json b/src/current/_includes/v24.1/sidebar-data/reference.json
index d42c2bd32a9..b4cb937a5cd 100644
--- a/src/current/_includes/v24.1/sidebar-data/reference.json
+++ b/src/current/_includes/v24.1/sidebar-data/reference.json
@@ -67,6 +67,12 @@
           "https://www.cockroachlabs.com/docs/api/cluster/v2"
         ]
       },
+      {
+        "title": "Docs MCP Server",
+        "urls": [
+          "/${VERSION}/docs-mcp-integration.html"
+        ]
+      },
       {
         "title": "Cluster Settings",
         "urls": [
diff --git a/src/current/_includes/v24.2/sidebar-data/reference.json b/src/current/_includes/v24.2/sidebar-data/reference.json
index 4691b0f8bbd..84c7f3aca56 100644
--- a/src/current/_includes/v24.2/sidebar-data/reference.json
+++ b/src/current/_includes/v24.2/sidebar-data/reference.json
@@ -67,6 +67,12 @@
           "https://www.cockroachlabs.com/docs/api/cluster/v2"
         ]
       },
+      {
+        "title": "Docs MCP Server",
+        "urls": [
+          "/${VERSION}/docs-mcp-integration.html"
+        ]
+      },
       {
         "title": "Cluster Settings",
         "urls": [
diff --git a/src/current/_includes/v24.3/sidebar-data/reference.json b/src/current/_includes/v24.3/sidebar-data/reference.json
index 4691b0f8bbd..84c7f3aca56 100644
--- a/src/current/_includes/v24.3/sidebar-data/reference.json
+++ b/src/current/_includes/v24.3/sidebar-data/reference.json
@@ -67,6 +67,12 @@
           "https://www.cockroachlabs.com/docs/api/cluster/v2"
         ]
       },
+      {
+        "title": "Docs MCP Server",
+        "urls": [
+          "/${VERSION}/docs-mcp-integration.html"
+        ]
+      },
       {
         "title": "Cluster Settings",
         "urls": [
diff --git a/src/current/_includes/v25.1/sidebar-data/reference.json b/src/current/_includes/v25.1/sidebar-data/reference.json
index 3c6fe8ff298..f0fd0625e54 100644
--- a/src/current/_includes/v25.1/sidebar-data/reference.json
+++ b/src/current/_includes/v25.1/sidebar-data/reference.json
@@ -67,6 +67,12 @@
           "https://www.cockroachlabs.com/docs/api/cluster/v2"
         ]
       },
+      {
+        "title": "Docs MCP Server",
+        "urls": [
+          "/${VERSION}/docs-mcp-integration.html"
+        ]
+      },
       {
         "title": "Cluster Settings",
         "urls": [
diff --git a/src/current/_includes/v25.2/sidebar-data/reference.json b/src/current/_includes/v25.2/sidebar-data/reference.json
index efcd6296367..b2c3171dc7e 100644
--- a/src/current/_includes/v25.2/sidebar-data/reference.json
+++ b/src/current/_includes/v25.2/sidebar-data/reference.json
@@ -67,6 +67,12 @@
           "https://www.cockroachlabs.com/docs/api/cluster/v2"
         ]
       },
+      {
+        "title": "Docs MCP Server",
+        "urls": [
+          "/${VERSION}/docs-mcp-integration.html"
+        ]
+      },
       {
         "title": "Cluster Settings",
         "urls": [
diff --git a/src/current/_includes/v25.3/sidebar-data/reference.json b/src/current/_includes/v25.3/sidebar-data/reference.json
index efcd6296367..b2c3171dc7e 100644
--- a/src/current/_includes/v25.3/sidebar-data/reference.json
+++ b/src/current/_includes/v25.3/sidebar-data/reference.json
@@ -67,6 +67,12 @@
           "https://www.cockroachlabs.com/docs/api/cluster/v2"
         ]
       },
+      {
+        "title": "Docs MCP Server",
+        "urls": [
+          "/${VERSION}/docs-mcp-integration.html"
+        ]
+      },
       {
         "title": "Cluster Settings",
         "urls": [
diff --git a/src/current/_includes/v25.4/sidebar-data/reference.json b/src/current/_includes/v25.4/sidebar-data/reference.json
index efcd6296367..b2c3171dc7e 100644
--- a/src/current/_includes/v25.4/sidebar-data/reference.json
+++ b/src/current/_includes/v25.4/sidebar-data/reference.json
@@ -67,6 +67,12 @@
           "https://www.cockroachlabs.com/docs/api/cluster/v2"
         ]
       },
+      {
+        "title": "Docs MCP Server",
+        "urls": [
+          "/${VERSION}/docs-mcp-integration.html"
+        ]
+      },
       {
         "title": "Cluster Settings",
         "urls": [
diff --git a/src/current/_includes/v26.1/sidebar-data/reference.json b/src/current/_includes/v26.1/sidebar-data/reference.json
index efcd6296367..b2c3171dc7e 100644
--- a/src/current/_includes/v26.1/sidebar-data/reference.json
+++ b/src/current/_includes/v26.1/sidebar-data/reference.json
@@ -67,6 +67,12 @@
           "https://www.cockroachlabs.com/docs/api/cluster/v2"
         ]
       },
+      {
+        "title": "Docs MCP Server",
+        "urls": [
+          "/${VERSION}/docs-mcp-integration.html"
+        ]
+      },
       {
         "title": "Cluster Settings",
         "urls": [
diff --git a/src/current/docs-mcp-integration.md b/src/current/docs-mcp-integration.md
new file mode 100644
index 00000000000..467807e2977
--- /dev/null
+++ b/src/current/docs-mcp-integration.md
@@ -0,0 +1,181 @@
+---
+title: CockroachDB Docs MCP Server
+summary: Connect to CockroachDB documentation directly from your IDE or AI assistant
+toc: true
+docs_area: reference
+---
+
+The CockroachDB Docs MCP Server ([Model Context Protocol](https://modelcontextprotocol.io/introduction)) enables AI assistants like Claude Desktop, Cursor, and VS Code to access CockroachDB documentation directly. This integration allows you to get instant, context-aware answers about CockroachDB without leaving your development environment.
+
+## Setup
+
+Connect your AI assistant to CockroachDB documentation by configuring the MCP server. Choose your platform below for specific instructions.
+
+### Cursor
+
+1. Open Cursor Settings (⌘+,)
+2. Navigate to **Models** → **Model Context Protocol**
+3. Add the following configuration:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+4. Restart Cursor to apply the configuration
+5. You can now ask questions about CockroachDB documentation directly in Cursor
+
+### VS Code
+
+1. Install the [Claude for VS Code](https://marketplace.visualstudio.com/items?itemName=Anthropic.claude) extension
+2. Open VS Code Settings (⌘+,)
+3. Search for "Claude MCP"
+4. Add the following to your MCP configuration:
+    ```json
+    {
+      "claude.mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+5. Reload VS Code window (⌘+R)
+6. The CockroachDB documentation is now available through Claude in VS Code
+
+### Claude Code
+
+1. Open Claude Code settings
+2. Navigate to MCP Servers configuration
+3. Add the CockroachDB Docs server:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+4. Restart Claude Code
+5. CockroachDB documentation is now accessible in your Claude Code environment
+
+### ChatGPT Desktop
+
+{{site.data.alerts.callout_info}}
+MCP support for ChatGPT Desktop is coming soon. Check back for updates.
+{{site.data.alerts.end}}
+
+### Claude Desktop
+
+1. Open Claude Desktop configuration file:
+   - **macOS**: `~/Library/Application Support/Claude/claude_desktop_config.json`
+   - **Windows**: `%APPDATA%\Claude\claude_desktop_config.json`
+   - **Linux**: `~/.config/Claude/claude_desktop_config.json`
+
+2. Add the CockroachDB Docs MCP server to your configuration:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+3. Save the file and restart Claude Desktop
+4. You can now query CockroachDB documentation directly in Claude Desktop
+
+### Other
+
+For other MCP-compatible clients, use the following server configuration:
+
+**Server URL**: `https://cockroachdb.mcp.kapa.ai`
+
+Generic configuration format:
+```json
+{
+  "servers": [{
+    "name": "cockroachdb-docs",
+    "url": "https://cockroachdb.mcp.kapa.ai"
+  }]
+}
+```
+
+Consult your client's documentation for specific configuration instructions.
+
+## Capabilities
+
+Once connected, your AI assistant can answer questions about CockroachDB directly from the official documentation. Example queries include:
+
+### Multi-Region Configuration
+- "How do I set up a multi-region CockroachDB cluster?"
+- "What are the best practices for configuring region survival goals?"
+- "Show me how to implement follow-the-workload patterns"
+
+### Performance Optimization
+- "What are the recommended techniques for optimizing query performance?"
+- "How do I identify and resolve hot spots in my cluster?"
+- "Explain the best practices for index design in CockroachDB"
+
+### Security Features
+- "How do I configure TLS/SSL encryption for my cluster?"
+- "What are the steps to implement role-based access control?"
+- "Show me how to set up audit logging in CockroachDB"
+
+### SQL Syntax and Features
+- "What's the syntax for creating a changefeed?"
+- "How do I use window functions in CockroachDB?"
+- "Explain the differences between JSONB operators in CockroachDB"
+
+### Troubleshooting
+- "How do I diagnose and fix connection refused errors?"
+- "What steps should I take when encountering transaction retry errors?"
+- "How do I investigate and resolve node liveness issues?"
+
+### Operations and Maintenance
+- "What's the recommended backup strategy for production clusters?"
+- "How do I perform a rolling upgrade of my cluster?"
+- "Show me the best practices for monitoring CockroachDB"
+
+## Troubleshooting
+
+### Connection Issues
+If your AI assistant cannot connect to the CockroachDB documentation:
+1. Verify your internet connection
+2. Check that the MCP server URL is correctly configured: `https://cockroachdb.mcp.kapa.ai`
+3. Restart your AI assistant application
+4. Ensure you have the latest version of your AI assistant
+
+### No Results
+If queries return no results:
+1. Try rephrasing your question to be more specific
+2. Include "CockroachDB" in your query for better context
+3. Check the [CockroachDB documentation](https://www.cockroachlabs.com/docs/) directly to verify the information exists
+
+### Configuration Not Working
+If the configuration doesn't seem to take effect:
+1. Ensure the configuration file is saved in the correct location
+2. Check for JSON syntax errors in your configuration
+3. Fully quit and restart your application (not just reload)
+4. Verify that `npx` is available in your system `PATH`
+
+## Feedback and Support
+
+For issues or feedback about the CockroachDB Docs MCP Server:
+- Report documentation issues on [GitHub](https://github.com/cockroachdb/docs/issues)
+- For MCP-specific problems, check [Kapa AI support](https://docs.kapa.ai)
+- Join the [CockroachDB Community Slack](https://www.cockroachlabs.com/join-community/) for help
+
+## See Also
+
+- [CockroachDB Documentation](https://www.cockroachlabs.com/docs/)
+- [Model Context Protocol](https://modelcontextprotocol.io/)
+- [Kapa AI Documentation](https://docs.kapa.ai)
\ No newline at end of file
diff --git a/src/current/js/algoliaAutocomplete.js b/src/current/js/algoliaAutocomplete.js
new file mode 100644
index 00000000000..55360faacd1
--- /dev/null
+++ b/src/current/js/algoliaAutocomplete.js
@@ -0,0 +1,477 @@
+// Algolia Autocomplete with Kapa Integration
+// Following: https://docs.kapa.ai/integrations/website-widget/examples/algolia-integration
+(function() {
+  // Wait for DOM and dependencies
+  function initializeAutocomplete() {
+    if (typeof algoliasearch === 'undefined' || !document.getElementById('search-input')) {
+      setTimeout(initializeAutocomplete, 100);
+      return;
+    }
+
+    // Algolia configuration from Jekyll
+    const ALGOLIA_APP_ID = '7RXZLDVR5F';
+    const ALGOLIA_SEARCH_KEY = '372a10456f4ed7042c531ff3a658771b';
+    const ALGOLIA_INDEX_NAME = 'stage_cockroach_docs';
+    
+    // Initialize Algolia client
+    const searchClient = algoliasearch(ALGOLIA_APP_ID, ALGOLIA_SEARCH_KEY);
+    const index = searchClient.initIndex(ALGOLIA_INDEX_NAME);
+    
+    let searchTimeout;
+    let currentRequest;
+    
+    // Search Algolia
+    async function searchAlgolia(query) {
+      // Cancel previous request if pending
+      if (currentRequest && currentRequest.cancel) {
+        currentRequest.cancel();
+      }
+      
+      try {
+        currentRequest = index.search(query, {
+          hitsPerPage: 6,
+          attributesToRetrieve: ['title', 'url', 'doc_type', 'content', 'version'],
+          attributesToHighlight: ['title', 'content'],
+          highlightPreTag: '<mark>',
+          highlightPostTag: '</mark>'
+        });
+        
+        const results = await currentRequest;
+        currentRequest = null;
+        return results;
+      } catch (error) {
+        currentRequest = null;
+        if (error.name === 'AbortError') {
+          return null;
+        }
+        console.error('Algolia search error:', error);
+        return null;
+      }
+    }
+    
+    // Display autocomplete suggestions
+    function displaySuggestions(results, query, inputElement) {
+      // Remove existing suggestions
+      const existingSuggestions = document.getElementById('algolia-autocomplete');
+      if (existingSuggestions) {
+        existingSuggestions.remove();
+      }
+      
+      if (!query || query.length < 2) {
+        return;
+      }
+      
+      // Create suggestions container
+      const suggestionsContainer = document.createElement('div');
+      suggestionsContainer.id = 'algolia-autocomplete';
+      suggestionsContainer.className = 'algolia-autocomplete-dropdown';
+      suggestionsContainer.innerHTML = '';
+      
+      // Add "Ask AI" button first (following Kapa integration guide)
+      const askAIItem = document.createElement('button');
+      askAIItem.className = 'aa-item ask-ai-item';
+      askAIItem.innerHTML = `
+        <div class="ask-ai-content">
+          <i class="fas fa-robot"></i>
+          <span class="ask-ai-text">Ask AI about "${escapeHtml(query)}"</span>
+        </div>
+      `;
+      askAIItem.onclick = function(e) {
+        e.preventDefault();
+        // Following Kapa integration guide - pass query and submit: true
+        if (window.Kapa && window.Kapa.open) {
+          window.Kapa.open({ 
+            query: query,
+            submit: true  // Auto-submit the query
+          });
+          hideAutocomplete();
+          inputElement.value = '';
+        } else {
+          console.warn('Kapa widget not available');
+        }
+      };
+      suggestionsContainer.appendChild(askAIItem);
+      
+      // Add divider
+      const divider = document.createElement('div');
+      divider.className = 'aa-divider';
+      suggestionsContainer.appendChild(divider);
+      
+      // Add search results
+      if (results && results.hits && results.hits.length > 0) {
+        results.hits.forEach((hit, index) => {
+          const item = document.createElement('a');
+          item.className = 'aa-item search-result-item';
+          item.href = hit.url || '#';
+          
+          const title = hit._highlightResult?.title?.value || hit.title || 'Untitled';
+          const content = hit._highlightResult?.content?.value || hit.content || '';
+          const docType = hit.doc_type || '';
+          const version = hit.version || '';
+          
+          // Truncate content
+          const truncatedContent = content.length > 150 
+            ? content.substring(0, 150) + '...' 
+            : content;
+          
+          item.innerHTML = `
+            <div class="result-content">
+              <div class="result-title">${title}</div>
+              ${truncatedContent ? `<div class="result-snippet">${truncatedContent}</div>` : ''}
+              <div class="result-meta">
+                ${docType ? `<span class="doc-type">${docType}</span>` : ''}
+                ${version ? `<span class="version">v${version}</span>` : ''}
+              </div>
+            </div>
+          `;
+          
+          item.onclick = function(e) {
+            e.preventDefault();
+            window.location.href = hit.url || '#';
+            hideAutocomplete();
+          };
+          
+          suggestionsContainer.appendChild(item);
+        });
+        
+        // Add "View all results" link
+        const viewAllItem = document.createElement('button');
+        viewAllItem.className = 'aa-item view-all-item';
+        viewAllItem.innerHTML = `
+          <span>View all results for "${escapeHtml(query)}" →</span>
+        `;
+        viewAllItem.onclick = function() {
+          const searchPath = getSearchPath();
+          window.location.href = searchPath + '?query=' + encodeURIComponent(query);
+        };
+        suggestionsContainer.appendChild(viewAllItem);
+      } else if (results && results.hits && results.hits.length === 0) {
+        // No results found
+        const noResultsItem = document.createElement('div');
+        noResultsItem.className = 'aa-item no-results';
+        noResultsItem.innerHTML = '<span>No results found. Try the AI Assistant above.</span>';
+        suggestionsContainer.appendChild(noResultsItem);
+      }
+      
+      // Position relative to input
+      const parent = inputElement.parentElement;
+      parent.style.position = 'relative';
+      parent.appendChild(suggestionsContainer);
+      
+      // Add active class for animation
+      setTimeout(() => {
+        suggestionsContainer.classList.add('active');
+      }, 10);
+    }
+    
+    // Hide autocomplete
+    function hideAutocomplete() {
+      const suggestions = document.getElementById('algolia-autocomplete');
+      if (suggestions) {
+        suggestions.classList.remove('active');
+        setTimeout(() => {
+          suggestions.remove();
+        }, 200);
+      }
+    }
+    
+    // Escape HTML
+    function escapeHtml(text) {
+      const div = document.createElement('div');
+      div.textContent = text;
+      return div.innerHTML;
+    }
+    
+    // Get search path
+    function getSearchPath() {
+      const currentPath = window.location.pathname;
+      if (currentPath.includes('/docs/') || currentPath === '/docs' || currentPath.startsWith('/docs/')) {
+        return '/docs/search';
+      }
+      return '/search';
+    }
+    
+    // Initialize autocomplete on search input
+    const searchInput = document.getElementById('search-input');
+    if (!searchInput) return;
+    
+    // Handle input changes
+    searchInput.addEventListener('input', async function(e) {
+      const query = e.target.value.trim();
+      
+      // Clear timeout from previous input
+      if (searchTimeout) {
+        clearTimeout(searchTimeout);
+      }
+      
+      // Hide suggestions if query is too short
+      if (query.length < 2) {
+        hideAutocomplete();
+        return;
+      }
+      
+      // Debounce search (wait 250ms after user stops typing)
+      searchTimeout = setTimeout(async () => {
+        // Show loading state
+        const loadingContainer = document.createElement('div');
+        loadingContainer.id = 'algolia-autocomplete';
+        loadingContainer.className = 'algolia-autocomplete-dropdown loading';
+        loadingContainer.innerHTML = `
+          <div class="aa-item loading-item">
+            <i class="fas fa-spinner fa-spin"></i> Searching...
+          </div>
+        `;
+        
+        // Remove existing and add loading
+        const existing = document.getElementById('algolia-autocomplete');
+        if (existing) existing.remove();
+        
+        const parent = searchInput.parentElement;
+        parent.style.position = 'relative';
+        parent.appendChild(loadingContainer);
+        
+        // Search Algolia
+        const results = await searchAlgolia(query);
+        if (results !== null) {
+          displaySuggestions(results, query, searchInput);
+        } else {
+          hideAutocomplete();
+        }
+      }, 250);
+    });
+    
+    // Handle focus
+    searchInput.addEventListener('focus', function(e) {
+      if (e.target.value.trim().length >= 2) {
+        e.target.dispatchEvent(new Event('input'));
+      }
+    });
+    
+    // Hide suggestions on click outside
+    document.addEventListener('click', function(e) {
+      if (!e.target.closest('#search-input') && !e.target.closest('#algolia-autocomplete')) {
+        hideAutocomplete();
+      }
+    });
+    
+    // Handle keyboard navigation
+    searchInput.addEventListener('keydown', function(e) {
+      const suggestions = document.getElementById('algolia-autocomplete');
+      if (!suggestions) return;
+      
+      const items = suggestions.querySelectorAll('.aa-item:not(.no-results)');
+      if (items.length === 0) return;
+      
+      const currentActive = suggestions.querySelector('.aa-item.active');
+      let currentIndex = Array.from(items).indexOf(currentActive);
+      
+      switch(e.key) {
+        case 'ArrowDown':
+          e.preventDefault();
+          if (currentActive) currentActive.classList.remove('active');
+          currentIndex = (currentIndex + 1) % items.length;
+          items[currentIndex].classList.add('active');
+          break;
+          
+        case 'ArrowUp':
+          e.preventDefault();
+          if (currentActive) currentActive.classList.remove('active');
+          currentIndex = currentIndex <= 0 ? items.length - 1 : currentIndex - 1;
+          items[currentIndex].classList.add('active');
+          break;
+          
+        case 'Enter':
+          if (currentActive && !e.defaultPrevented) {
+            e.preventDefault();
+            currentActive.click();
+          }
+          break;
+          
+        case 'Escape':
+          hideAutocomplete();
+          e.target.blur();
+          break;
+      }
+    });
+  }
+  
+  // Initialize when DOM is ready
+  if (document.readyState === 'loading') {
+    document.addEventListener('DOMContentLoaded', initializeAutocomplete);
+  } else {
+    initializeAutocomplete();
+  }
+})();
+
+// CSS Styles for Algolia Autocomplete
+const style = document.createElement('style');
+style.textContent = `
+  /* Algolia Autocomplete Dropdown */
+  .algolia-autocomplete-dropdown {
+    position: absolute;
+    top: 100%;
+    left: 0;
+    right: 0;
+    margin-top: 4px;
+    background: white;
+    border: 1px solid #e0e0e0;
+    border-radius: 8px;
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+    max-height: 400px;
+    overflow-y: auto;
+    z-index: 1000;
+    opacity: 0;
+    transform: translateY(-10px);
+    transition: opacity 0.2s, transform 0.2s;
+  }
+  
+  .algolia-autocomplete-dropdown.active {
+    opacity: 1;
+    transform: translateY(0);
+  }
+  
+  .algolia-autocomplete-dropdown.loading {
+    opacity: 1;
+    transform: translateY(0);
+  }
+  
+  /* Items */
+  .aa-item {
+    display: block;
+    padding: 12px 16px;
+    cursor: pointer;
+    transition: background 0.2s;
+    text-decoration: none;
+    color: inherit;
+    border: none;
+    width: 100%;
+    text-align: left;
+    background: transparent;
+    font-size: 14px;
+  }
+  
+  .aa-item:hover,
+  .aa-item.active {
+    background: #f5f5f5;
+  }
+  
+  /* Ask AI Item (Kapa Integration) */
+  .ask-ai-item {
+    background: linear-gradient(135deg, #f5f3ff 0%, #ffffff 100%);
+    border-bottom: 1px solid #e0d6ff;
+  }
+  
+  .ask-ai-item:hover {
+    background: linear-gradient(135deg, #ebe8ff 0%, #f8f7ff 100%);
+  }
+  
+  .ask-ai-content {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    font-weight: 500;
+    color: #6933FF;
+  }
+  
+  .ask-ai-content i {
+    font-size: 18px;
+  }
+  
+  /* Divider */
+  .aa-divider {
+    height: 1px;
+    background: #e0e0e0;
+    margin: 0;
+  }
+  
+  /* Search Result Items */
+  .search-result-item {
+    border-bottom: 1px solid #f0f0f0;
+  }
+  
+  .search-result-item:last-child {
+    border-bottom: none;
+  }
+  
+  .result-content {
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+  }
+  
+  .result-title {
+    font-weight: 500;
+    color: #333;
+    font-size: 14px;
+    line-height: 1.4;
+  }
+  
+  .result-title mark {
+    background: #ffeb3b;
+    padding: 0 2px;
+    border-radius: 2px;
+  }
+  
+  .result-snippet {
+    font-size: 12px;
+    color: #666;
+    line-height: 1.4;
+  }
+  
+  .result-snippet mark {
+    background: #ffeb3b;
+    padding: 0 2px;
+    border-radius: 2px;
+  }
+  
+  .result-meta {
+    display: flex;
+    gap: 8px;
+    font-size: 11px;
+    color: #999;
+    margin-top: 2px;
+  }
+  
+  .doc-type {
+    background: #f0f0f0;
+    padding: 2px 6px;
+    border-radius: 3px;
+  }
+  
+  .version {
+    background: #e8f4f8;
+    padding: 2px 6px;
+    border-radius: 3px;
+    color: #0074a2;
+  }
+  
+  /* View All Results */
+  .view-all-item {
+    text-align: center;
+    color: #6933FF;
+    font-weight: 500;
+    border-top: 1px solid #f0f0f0;
+  }
+  
+  .view-all-item:hover {
+    background: #f5f3ff;
+  }
+  
+  /* No Results */
+  .no-results {
+    text-align: center;
+    color: #999;
+    pointer-events: none;
+  }
+  
+  /* Loading */
+  .loading-item {
+    text-align: center;
+    color: #666;
+  }
+  
+  .loading-item i {
+    margin-right: 8px;
+  }
+`;
+document.head.appendChild(style);
\ No newline at end of file
diff --git a/src/current/js/searchInputRendering.js b/src/current/js/searchInputRendering.js
index a60d1e0f525..e0b90fd023b 100644
--- a/src/current/js/searchInputRendering.js
+++ b/src/current/js/searchInputRendering.js
@@ -29,4 +29,39 @@ $(document).ready(function() {
       $('.clear-search').hide();
     }
   });
+
+  // Handle search input in topnav - redirect to Algolia search page
+  $('#search-input').on('keypress', function(e) {
+    if (e.which === 13) { // Enter key
+      e.preventDefault();
+      const query = $(this).val().trim();
+      if (query) {
+        // Redirect to Algolia search page
+        const searchPath = getSearchPath();
+        window.location.href = searchPath + '?query=' + encodeURIComponent(query);
+      }
+    }
+  });
+
+  // Disable old suggestions - now handled by kapaLiveSuggestions.js
+  // which provides real-time search results from Kapa API
+
+  // Old suggestions removed - now handled by kapaLiveSuggestions.js
+
+  function getSearchPath() {
+    // Based on your error URL pattern: http://127.0.0.1:3000/docs/search?query=db
+    // We need to return '/docs/search' for docs-based URLs
+    
+    const currentPath = window.location.pathname;
+    const currentOrigin = window.location.origin;
+    
+    // Check if we're in the docs section
+    if (currentPath.includes('/docs/') || currentPath === '/docs' || currentPath.startsWith('/docs/')) {
+      return '/docs/search';
+    }
+    // For non-docs URLs (like development/testing), default to /search
+    else {
+      return '/search';
+    }
+  }
 });
diff --git a/src/current/search.html b/src/current/search.html
index c593ca1bae6..59ba9d2adca 100644
--- a/src/current/search.html
+++ b/src/current/search.html
@@ -6,10 +6,72 @@
 docs_area: search
 ---
 
+<style>
+  /* Ask AI Button Styling (following Kapa-Algolia integration guide) */
+  .ask-ai-container {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    padding: 16px;
+    background: linear-gradient(135deg, #f5f3ff 0%, #ffffff 100%);
+    border: 1px solid #e0d6ff;
+    border-radius: 8px;
+    margin-bottom: 24px;
+    box-shadow: 0 2px 4px rgba(105, 51, 255, 0.1);
+  }
+  
+  .ask-ai-button {
+    background: #6933FF !important;
+    border: none !important;
+    color: white !important;
+    padding: 12px 24px !important;
+    font-size: 16px !important;
+    font-weight: 500 !important;
+    border-radius: 6px !important;
+    cursor: pointer;
+    transition: all 0.2s ease;
+    display: inline-flex;
+    align-items: center;
+    gap: 8px;
+  }
+  
+  .ask-ai-button:hover {
+    background: #5829CC !important;
+    transform: translateY(-1px);
+    box-shadow: 0 4px 12px rgba(105, 51, 255, 0.3);
+  }
+  
+  .ask-ai-button:active {
+    transform: translateY(0);
+  }
+  
+  .ask-ai-button i {
+    font-size: 18px;
+  }
+  
+  /* Smooth animation for button appearance */
+  @keyframes fadeInUp {
+    from {
+      opacity: 0;
+      transform: translateY(10px);
+    }
+    to {
+      opacity: 1;
+      transform: translateY(0);
+    }
+  }
+  
+  .ask-ai-container {
+    animation: fadeInUp 0.3s ease-out;
+  }
+</style>
+
 <div id="search-refinements"></div>
 <div id="search-stats"></div>
 <div id="search-hits"></div>
 <div id="search-pages"></div>
+
+<!-- Algolia Search Integration -->
 <script src="https://cdn.jsdelivr.net/npm/algoliasearch@4.14.3/dist/algoliasearch-lite.umd.js" integrity="sha256-dyJcbGuYfdzNfifkHxYVd/rzeR6SLLcDFYEidcybldM=" crossorigin="anonymous"></script>
 <script src="https://cdn.jsdelivr.net/npm/instantsearch.js@4.50.1/dist/instantsearch.production.min.js" integrity="sha256-xtz5Q60cdtw/7BDkzWiTgCXLvwLrUqlKqegFqvNHiNM=" crossorigin="anonymous"></script>
 <script>
@@ -20,21 +82,16 @@
   };
 
   const queryString = (function() {
-    // This function is anonymous, is executed immediately and
-    // the return value is assigned to QueryString!
     const query_string = {};
     const query = window.location.search.substring(1);
     const vars = query.split("&");
     for (var i = 0; i < vars.length; i++) {
       const pair = vars[i].split("=");
-      // If first entry with this name
       if (typeof query_string[pair[0]] === "undefined") {
         query_string[pair[0]] = decodeURIComponent(pair[1]);
-        // If second entry with this name
       } else if (typeof query_string[pair[0]] === "string") {
         const arr = [query_string[pair[0]], decodeURIComponent(pair[1])];
         query_string[pair[0]] = arr;
-        // If third or later entry with this name
       } else {
         query_string[pair[0]].push(decodeURIComponent(pair[1]));
       }
@@ -42,6 +99,9 @@
     return htmlEncode((query_string.query || "").replace(/\+/g, " "));
   })();
 
+  /* =========================================
+     ALGOLIA SEARCH IMPLEMENTATION (ACTIVE)
+     ========================================= */
   const router = instantsearch.routers.history({
     windowTitle({ category, query }) {
       const queryTitle = query ? `Results for "${query}"` : "Search";
@@ -89,7 +149,6 @@
 
     routeToState(routeState) {
       return {
-        // eslint-disable-next-line camelcase
         "{{site.algolia.index_name}}": {
           query: routeState.query,
           page: routeState.page
@@ -98,7 +157,7 @@
     }
   };
 
-  $("#search-input").val(queryString);
+  // ALGOLIA SEARCH CLIENT
   const searchClient = algoliasearch(
     "{{site.algolia.application_id}}",
     "{{site.algolia.search_api_key}}"
@@ -113,6 +172,9 @@
     searchClient
   });
 
+  /* =========================================
+     ALGOLIA SEARCH WIDGETS
+     ========================================= */
   const addToResultsIfPresent = (match) => {
     if(match && match.matchLevel && match.matchLevel !== 'none' && match.value) {
       return (match.value || '') + '<br>';
@@ -127,13 +189,30 @@
     return addToResultsIfPresent(title) + addToResultsIfPresent(tags);
   }
 
-  // Create the render function
+  // Create the render function with Ask AI button (following Kapa integration guide)
   const renderHits = (renderOptions, isFirstRender) => {
     const { hits, widgetParams } = renderOptions;
-    var div = $("<div/>");
     let results = "";
+    
+    // Add Ask AI button following the Kapa-Algolia integration pattern
+    // Only show when there's a query (matching the guide's behavior)
+    if (queryString && queryString.trim()) {
+      results = `
+        <div class="ask-ai-container" style="margin-bottom: 20px;">
+          <button 
+            type="button" 
+            class="ask-ai-button btn btn-primary"
+            onclick="handleAskAI()"
+            style="background: #6933FF; border-color: #6933FF; padding: 10px 20px; font-size: 16px; border-radius: 6px;"
+          >
+            <i class="fas fa-robot"></i> Ask AI about "${htmlEncode(queryString)}"
+          </button>
+        </div>
+      `;
+    }
+    
     if (hits.length) {
-      results = hits
+      results += hits
         .map(
           hit =>
             `<div class="search-item">
@@ -145,17 +224,33 @@
         </div>`
         )
         .join("");
+    } else if (queryString) {
+      results += "<p>No results found. Try clicking the 'Ask AI' button above for assistance.</p>";
     } else {
-      results = "<p>No results.</p>";
+      results += "<p>Enter a search query to see results.</p>";
     }
     widgetParams.container.innerHTML = results;
   };
+  
+  // Handle Ask AI button click (following Kapa guide pattern)
+  function handleAskAI() {
+    if (window.Kapa && window.Kapa.open) {
+      // Pass query and submit: true as per the integration guide
+      window.Kapa.open({ 
+        query: queryString.replace(/&amp;/g, '&').replace(/&#39;/g, "'").replace(/&quot;/g, '"'),
+        submit: true  // This auto-submits the query in the widget
+      });
+    } else {
+      console.error('Kapa widget not available');
+      alert('AI Assistant is not available at the moment. Please try again later.');
+    }
+  }
 
   // Create the custom widget
   const customHits = instantsearch.connectors.connectHits(renderHits);
 
   search.addWidgets([
-  instantsearch.widgets.refinementList({
+    instantsearch.widgets.refinementList({
       container: document.querySelector("#search-refinements"),
       attribute: 'version',
       operator: 'or',
@@ -178,7 +273,7 @@
           } else {
             count += `no result`;
           }
-          return `${count} found for ‘${queryString}’`;
+          return `${count} found for '${queryString}'`;
         }
       }
     }),
@@ -200,4 +295,7 @@
 
   // Starting the search
   search.start();
-</script>
+  
+  // Make handleAskAI globally available
+  window.handleAskAI = handleAskAI;
+</script>
\ No newline at end of file
diff --git a/src/current/v21.2/docs-mcp-integration.md b/src/current/v21.2/docs-mcp-integration.md
new file mode 100644
index 00000000000..467807e2977
--- /dev/null
+++ b/src/current/v21.2/docs-mcp-integration.md
@@ -0,0 +1,181 @@
+---
+title: CockroachDB Docs MCP Server
+summary: Connect to CockroachDB documentation directly from your IDE or AI assistant
+toc: true
+docs_area: reference
+---
+
+The CockroachDB Docs MCP Server ([Model Context Protocol](https://modelcontextprotocol.io/introduction)) enables AI assistants like Claude Desktop, Cursor, and VS Code to access CockroachDB documentation directly. This integration allows you to get instant, context-aware answers about CockroachDB without leaving your development environment.
+
+## Setup
+
+Connect your AI assistant to CockroachDB documentation by configuring the MCP server. Choose your platform below for specific instructions.
+
+### Cursor
+
+1. Open Cursor Settings (⌘+,)
+2. Navigate to **Models** → **Model Context Protocol**
+3. Add the following configuration:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+4. Restart Cursor to apply the configuration
+5. You can now ask questions about CockroachDB documentation directly in Cursor
+
+### VS Code
+
+1. Install the [Claude for VS Code](https://marketplace.visualstudio.com/items?itemName=Anthropic.claude) extension
+2. Open VS Code Settings (⌘+,)
+3. Search for "Claude MCP"
+4. Add the following to your MCP configuration:
+    ```json
+    {
+      "claude.mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+5. Reload VS Code window (⌘+R)
+6. The CockroachDB documentation is now available through Claude in VS Code
+
+### Claude Code
+
+1. Open Claude Code settings
+2. Navigate to MCP Servers configuration
+3. Add the CockroachDB Docs server:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+4. Restart Claude Code
+5. CockroachDB documentation is now accessible in your Claude Code environment
+
+### ChatGPT Desktop
+
+{{site.data.alerts.callout_info}}
+MCP support for ChatGPT Desktop is coming soon. Check back for updates.
+{{site.data.alerts.end}}
+
+### Claude Desktop
+
+1. Open Claude Desktop configuration file:
+   - **macOS**: `~/Library/Application Support/Claude/claude_desktop_config.json`
+   - **Windows**: `%APPDATA%\Claude\claude_desktop_config.json`
+   - **Linux**: `~/.config/Claude/claude_desktop_config.json`
+
+2. Add the CockroachDB Docs MCP server to your configuration:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+3. Save the file and restart Claude Desktop
+4. You can now query CockroachDB documentation directly in Claude Desktop
+
+### Other
+
+For other MCP-compatible clients, use the following server configuration:
+
+**Server URL**: `https://cockroachdb.mcp.kapa.ai`
+
+Generic configuration format:
+```json
+{
+  "servers": [{
+    "name": "cockroachdb-docs",
+    "url": "https://cockroachdb.mcp.kapa.ai"
+  }]
+}
+```
+
+Consult your client's documentation for specific configuration instructions.
+
+## Capabilities
+
+Once connected, your AI assistant can answer questions about CockroachDB directly from the official documentation. Example queries include:
+
+### Multi-Region Configuration
+- "How do I set up a multi-region CockroachDB cluster?"
+- "What are the best practices for configuring region survival goals?"
+- "Show me how to implement follow-the-workload patterns"
+
+### Performance Optimization
+- "What are the recommended techniques for optimizing query performance?"
+- "How do I identify and resolve hot spots in my cluster?"
+- "Explain the best practices for index design in CockroachDB"
+
+### Security Features
+- "How do I configure TLS/SSL encryption for my cluster?"
+- "What are the steps to implement role-based access control?"
+- "Show me how to set up audit logging in CockroachDB"
+
+### SQL Syntax and Features
+- "What's the syntax for creating a changefeed?"
+- "How do I use window functions in CockroachDB?"
+- "Explain the differences between JSONB operators in CockroachDB"
+
+### Troubleshooting
+- "How do I diagnose and fix connection refused errors?"
+- "What steps should I take when encountering transaction retry errors?"
+- "How do I investigate and resolve node liveness issues?"
+
+### Operations and Maintenance
+- "What's the recommended backup strategy for production clusters?"
+- "How do I perform a rolling upgrade of my cluster?"
+- "Show me the best practices for monitoring CockroachDB"
+
+## Troubleshooting
+
+### Connection Issues
+If your AI assistant cannot connect to the CockroachDB documentation:
+1. Verify your internet connection
+2. Check that the MCP server URL is correctly configured: `https://cockroachdb.mcp.kapa.ai`
+3. Restart your AI assistant application
+4. Ensure you have the latest version of your AI assistant
+
+### No Results
+If queries return no results:
+1. Try rephrasing your question to be more specific
+2. Include "CockroachDB" in your query for better context
+3. Check the [CockroachDB documentation](https://www.cockroachlabs.com/docs/) directly to verify the information exists
+
+### Configuration Not Working
+If the configuration doesn't seem to take effect:
+1. Ensure the configuration file is saved in the correct location
+2. Check for JSON syntax errors in your configuration
+3. Fully quit and restart your application (not just reload)
+4. Verify that `npx` is available in your system `PATH`
+
+## Feedback and Support
+
+For issues or feedback about the CockroachDB Docs MCP Server:
+- Report documentation issues on [GitHub](https://github.com/cockroachdb/docs/issues)
+- For MCP-specific problems, check [Kapa AI support](https://docs.kapa.ai)
+- Join the [CockroachDB Community Slack](https://www.cockroachlabs.com/join-community/) for help
+
+## See Also
+
+- [CockroachDB Documentation](https://www.cockroachlabs.com/docs/)
+- [Model Context Protocol](https://modelcontextprotocol.io/)
+- [Kapa AI Documentation](https://docs.kapa.ai)
\ No newline at end of file
diff --git a/src/current/v22.1/docs-mcp-integration.md b/src/current/v22.1/docs-mcp-integration.md
new file mode 100644
index 00000000000..467807e2977
--- /dev/null
+++ b/src/current/v22.1/docs-mcp-integration.md
@@ -0,0 +1,181 @@
+---
+title: CockroachDB Docs MCP Server
+summary: Connect to CockroachDB documentation directly from your IDE or AI assistant
+toc: true
+docs_area: reference
+---
+
+The CockroachDB Docs MCP Server ([Model Context Protocol](https://modelcontextprotocol.io/introduction)) enables AI assistants like Claude Desktop, Cursor, and VS Code to access CockroachDB documentation directly. This integration allows you to get instant, context-aware answers about CockroachDB without leaving your development environment.
+
+## Setup
+
+Connect your AI assistant to CockroachDB documentation by configuring the MCP server. Choose your platform below for specific instructions.
+
+### Cursor
+
+1. Open Cursor Settings (⌘+,)
+2. Navigate to **Models** → **Model Context Protocol**
+3. Add the following configuration:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+4. Restart Cursor to apply the configuration
+5. You can now ask questions about CockroachDB documentation directly in Cursor
+
+### VS Code
+
+1. Install the [Claude for VS Code](https://marketplace.visualstudio.com/items?itemName=Anthropic.claude) extension
+2. Open VS Code Settings (⌘+,)
+3. Search for "Claude MCP"
+4. Add the following to your MCP configuration:
+    ```json
+    {
+      "claude.mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+5. Reload VS Code window (⌘+R)
+6. The CockroachDB documentation is now available through Claude in VS Code
+
+### Claude Code
+
+1. Open Claude Code settings
+2. Navigate to MCP Servers configuration
+3. Add the CockroachDB Docs server:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+4. Restart Claude Code
+5. CockroachDB documentation is now accessible in your Claude Code environment
+
+### ChatGPT Desktop
+
+{{site.data.alerts.callout_info}}
+MCP support for ChatGPT Desktop is coming soon. Check back for updates.
+{{site.data.alerts.end}}
+
+### Claude Desktop
+
+1. Open Claude Desktop configuration file:
+   - **macOS**: `~/Library/Application Support/Claude/claude_desktop_config.json`
+   - **Windows**: `%APPDATA%\Claude\claude_desktop_config.json`
+   - **Linux**: `~/.config/Claude/claude_desktop_config.json`
+
+2. Add the CockroachDB Docs MCP server to your configuration:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+3. Save the file and restart Claude Desktop
+4. You can now query CockroachDB documentation directly in Claude Desktop
+
+### Other
+
+For other MCP-compatible clients, use the following server configuration:
+
+**Server URL**: `https://cockroachdb.mcp.kapa.ai`
+
+Generic configuration format:
+```json
+{
+  "servers": [{
+    "name": "cockroachdb-docs",
+    "url": "https://cockroachdb.mcp.kapa.ai"
+  }]
+}
+```
+
+Consult your client's documentation for specific configuration instructions.
+
+## Capabilities
+
+Once connected, your AI assistant can answer questions about CockroachDB directly from the official documentation. Example queries include:
+
+### Multi-Region Configuration
+- "How do I set up a multi-region CockroachDB cluster?"
+- "What are the best practices for configuring region survival goals?"
+- "Show me how to implement follow-the-workload patterns"
+
+### Performance Optimization
+- "What are the recommended techniques for optimizing query performance?"
+- "How do I identify and resolve hot spots in my cluster?"
+- "Explain the best practices for index design in CockroachDB"
+
+### Security Features
+- "How do I configure TLS/SSL encryption for my cluster?"
+- "What are the steps to implement role-based access control?"
+- "Show me how to set up audit logging in CockroachDB"
+
+### SQL Syntax and Features
+- "What's the syntax for creating a changefeed?"
+- "How do I use window functions in CockroachDB?"
+- "Explain the differences between JSONB operators in CockroachDB"
+
+### Troubleshooting
+- "How do I diagnose and fix connection refused errors?"
+- "What steps should I take when encountering transaction retry errors?"
+- "How do I investigate and resolve node liveness issues?"
+
+### Operations and Maintenance
+- "What's the recommended backup strategy for production clusters?"
+- "How do I perform a rolling upgrade of my cluster?"
+- "Show me the best practices for monitoring CockroachDB"
+
+## Troubleshooting
+
+### Connection Issues
+If your AI assistant cannot connect to the CockroachDB documentation:
+1. Verify your internet connection
+2. Check that the MCP server URL is correctly configured: `https://cockroachdb.mcp.kapa.ai`
+3. Restart your AI assistant application
+4. Ensure you have the latest version of your AI assistant
+
+### No Results
+If queries return no results:
+1. Try rephrasing your question to be more specific
+2. Include "CockroachDB" in your query for better context
+3. Check the [CockroachDB documentation](https://www.cockroachlabs.com/docs/) directly to verify the information exists
+
+### Configuration Not Working
+If the configuration doesn't seem to take effect:
+1. Ensure the configuration file is saved in the correct location
+2. Check for JSON syntax errors in your configuration
+3. Fully quit and restart your application (not just reload)
+4. Verify that `npx` is available in your system `PATH`
+
+## Feedback and Support
+
+For issues or feedback about the CockroachDB Docs MCP Server:
+- Report documentation issues on [GitHub](https://github.com/cockroachdb/docs/issues)
+- For MCP-specific problems, check [Kapa AI support](https://docs.kapa.ai)
+- Join the [CockroachDB Community Slack](https://www.cockroachlabs.com/join-community/) for help
+
+## See Also
+
+- [CockroachDB Documentation](https://www.cockroachlabs.com/docs/)
+- [Model Context Protocol](https://modelcontextprotocol.io/)
+- [Kapa AI Documentation](https://docs.kapa.ai)
\ No newline at end of file
diff --git a/src/current/v22.2/docs-mcp-integration.md b/src/current/v22.2/docs-mcp-integration.md
new file mode 100644
index 00000000000..467807e2977
--- /dev/null
+++ b/src/current/v22.2/docs-mcp-integration.md
@@ -0,0 +1,181 @@
+---
+title: CockroachDB Docs MCP Server
+summary: Connect to CockroachDB documentation directly from your IDE or AI assistant
+toc: true
+docs_area: reference
+---
+
+The CockroachDB Docs MCP Server ([Model Context Protocol](https://modelcontextprotocol.io/introduction)) enables AI assistants like Claude Desktop, Cursor, and VS Code to access CockroachDB documentation directly. This integration allows you to get instant, context-aware answers about CockroachDB without leaving your development environment.
+
+## Setup
+
+Connect your AI assistant to CockroachDB documentation by configuring the MCP server. Choose your platform below for specific instructions.
+
+### Cursor
+
+1. Open Cursor Settings (⌘+,)
+2. Navigate to **Models** → **Model Context Protocol**
+3. Add the following configuration:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+4. Restart Cursor to apply the configuration
+5. You can now ask questions about CockroachDB documentation directly in Cursor
+
+### VS Code
+
+1. Install the [Claude for VS Code](https://marketplace.visualstudio.com/items?itemName=Anthropic.claude) extension
+2. Open VS Code Settings (⌘+,)
+3. Search for "Claude MCP"
+4. Add the following to your MCP configuration:
+    ```json
+    {
+      "claude.mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+5. Reload VS Code window (⌘+R)
+6. The CockroachDB documentation is now available through Claude in VS Code
+
+### Claude Code
+
+1. Open Claude Code settings
+2. Navigate to MCP Servers configuration
+3. Add the CockroachDB Docs server:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+4. Restart Claude Code
+5. CockroachDB documentation is now accessible in your Claude Code environment
+
+### ChatGPT Desktop
+
+{{site.data.alerts.callout_info}}
+MCP support for ChatGPT Desktop is coming soon. Check back for updates.
+{{site.data.alerts.end}}
+
+### Claude Desktop
+
+1. Open Claude Desktop configuration file:
+   - **macOS**: `~/Library/Application Support/Claude/claude_desktop_config.json`
+   - **Windows**: `%APPDATA%\Claude\claude_desktop_config.json`
+   - **Linux**: `~/.config/Claude/claude_desktop_config.json`
+
+2. Add the CockroachDB Docs MCP server to your configuration:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+3. Save the file and restart Claude Desktop
+4. You can now query CockroachDB documentation directly in Claude Desktop
+
+### Other
+
+For other MCP-compatible clients, use the following server configuration:
+
+**Server URL**: `https://cockroachdb.mcp.kapa.ai`
+
+Generic configuration format:
+```json
+{
+  "servers": [{
+    "name": "cockroachdb-docs",
+    "url": "https://cockroachdb.mcp.kapa.ai"
+  }]
+}
+```
+
+Consult your client's documentation for specific configuration instructions.
+
+## Capabilities
+
+Once connected, your AI assistant can answer questions about CockroachDB directly from the official documentation. Example queries include:
+
+### Multi-Region Configuration
+- "How do I set up a multi-region CockroachDB cluster?"
+- "What are the best practices for configuring region survival goals?"
+- "Show me how to implement follow-the-workload patterns"
+
+### Performance Optimization
+- "What are the recommended techniques for optimizing query performance?"
+- "How do I identify and resolve hot spots in my cluster?"
+- "Explain the best practices for index design in CockroachDB"
+
+### Security Features
+- "How do I configure TLS/SSL encryption for my cluster?"
+- "What are the steps to implement role-based access control?"
+- "Show me how to set up audit logging in CockroachDB"
+
+### SQL Syntax and Features
+- "What's the syntax for creating a changefeed?"
+- "How do I use window functions in CockroachDB?"
+- "Explain the differences between JSONB operators in CockroachDB"
+
+### Troubleshooting
+- "How do I diagnose and fix connection refused errors?"
+- "What steps should I take when encountering transaction retry errors?"
+- "How do I investigate and resolve node liveness issues?"
+
+### Operations and Maintenance
+- "What's the recommended backup strategy for production clusters?"
+- "How do I perform a rolling upgrade of my cluster?"
+- "Show me the best practices for monitoring CockroachDB"
+
+## Troubleshooting
+
+### Connection Issues
+If your AI assistant cannot connect to the CockroachDB documentation:
+1. Verify your internet connection
+2. Check that the MCP server URL is correctly configured: `https://cockroachdb.mcp.kapa.ai`
+3. Restart your AI assistant application
+4. Ensure you have the latest version of your AI assistant
+
+### No Results
+If queries return no results:
+1. Try rephrasing your question to be more specific
+2. Include "CockroachDB" in your query for better context
+3. Check the [CockroachDB documentation](https://www.cockroachlabs.com/docs/) directly to verify the information exists
+
+### Configuration Not Working
+If the configuration doesn't seem to take effect:
+1. Ensure the configuration file is saved in the correct location
+2. Check for JSON syntax errors in your configuration
+3. Fully quit and restart your application (not just reload)
+4. Verify that `npx` is available in your system `PATH`
+
+## Feedback and Support
+
+For issues or feedback about the CockroachDB Docs MCP Server:
+- Report documentation issues on [GitHub](https://github.com/cockroachdb/docs/issues)
+- For MCP-specific problems, check [Kapa AI support](https://docs.kapa.ai)
+- Join the [CockroachDB Community Slack](https://www.cockroachlabs.com/join-community/) for help
+
+## See Also
+
+- [CockroachDB Documentation](https://www.cockroachlabs.com/docs/)
+- [Model Context Protocol](https://modelcontextprotocol.io/)
+- [Kapa AI Documentation](https://docs.kapa.ai)
\ No newline at end of file
diff --git a/src/current/v23.1/docs-mcp-integration.md b/src/current/v23.1/docs-mcp-integration.md
new file mode 100644
index 00000000000..467807e2977
--- /dev/null
+++ b/src/current/v23.1/docs-mcp-integration.md
@@ -0,0 +1,181 @@
+---
+title: CockroachDB Docs MCP Server
+summary: Connect to CockroachDB documentation directly from your IDE or AI assistant
+toc: true
+docs_area: reference
+---
+
+The CockroachDB Docs MCP Server ([Model Context Protocol](https://modelcontextprotocol.io/introduction)) enables AI assistants like Claude Desktop, Cursor, and VS Code to access CockroachDB documentation directly. This integration allows you to get instant, context-aware answers about CockroachDB without leaving your development environment.
+
+## Setup
+
+Connect your AI assistant to CockroachDB documentation by configuring the MCP server. Choose your platform below for specific instructions.
+
+### Cursor
+
+1. Open Cursor Settings (⌘+,)
+2. Navigate to **Models** → **Model Context Protocol**
+3. Add the following configuration:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+4. Restart Cursor to apply the configuration
+5. You can now ask questions about CockroachDB documentation directly in Cursor
+
+### VS Code
+
+1. Install the [Claude for VS Code](https://marketplace.visualstudio.com/items?itemName=Anthropic.claude) extension
+2. Open VS Code Settings (⌘+,)
+3. Search for "Claude MCP"
+4. Add the following to your MCP configuration:
+    ```json
+    {
+      "claude.mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+5. Reload VS Code window (⌘+R)
+6. The CockroachDB documentation is now available through Claude in VS Code
+
+### Claude Code
+
+1. Open Claude Code settings
+2. Navigate to MCP Servers configuration
+3. Add the CockroachDB Docs server:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+4. Restart Claude Code
+5. CockroachDB documentation is now accessible in your Claude Code environment
+
+### ChatGPT Desktop
+
+{{site.data.alerts.callout_info}}
+MCP support for ChatGPT Desktop is coming soon. Check back for updates.
+{{site.data.alerts.end}}
+
+### Claude Desktop
+
+1. Open Claude Desktop configuration file:
+   - **macOS**: `~/Library/Application Support/Claude/claude_desktop_config.json`
+   - **Windows**: `%APPDATA%\Claude\claude_desktop_config.json`
+   - **Linux**: `~/.config/Claude/claude_desktop_config.json`
+
+2. Add the CockroachDB Docs MCP server to your configuration:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+3. Save the file and restart Claude Desktop
+4. You can now query CockroachDB documentation directly in Claude Desktop
+
+### Other
+
+For other MCP-compatible clients, use the following server configuration:
+
+**Server URL**: `https://cockroachdb.mcp.kapa.ai`
+
+Generic configuration format:
+```json
+{
+  "servers": [{
+    "name": "cockroachdb-docs",
+    "url": "https://cockroachdb.mcp.kapa.ai"
+  }]
+}
+```
+
+Consult your client's documentation for specific configuration instructions.
+
+## Capabilities
+
+Once connected, your AI assistant can answer questions about CockroachDB directly from the official documentation. Example queries include:
+
+### Multi-Region Configuration
+- "How do I set up a multi-region CockroachDB cluster?"
+- "What are the best practices for configuring region survival goals?"
+- "Show me how to implement follow-the-workload patterns"
+
+### Performance Optimization
+- "What are the recommended techniques for optimizing query performance?"
+- "How do I identify and resolve hot spots in my cluster?"
+- "Explain the best practices for index design in CockroachDB"
+
+### Security Features
+- "How do I configure TLS/SSL encryption for my cluster?"
+- "What are the steps to implement role-based access control?"
+- "Show me how to set up audit logging in CockroachDB"
+
+### SQL Syntax and Features
+- "What's the syntax for creating a changefeed?"
+- "How do I use window functions in CockroachDB?"
+- "Explain the differences between JSONB operators in CockroachDB"
+
+### Troubleshooting
+- "How do I diagnose and fix connection refused errors?"
+- "What steps should I take when encountering transaction retry errors?"
+- "How do I investigate and resolve node liveness issues?"
+
+### Operations and Maintenance
+- "What's the recommended backup strategy for production clusters?"
+- "How do I perform a rolling upgrade of my cluster?"
+- "Show me the best practices for monitoring CockroachDB"
+
+## Troubleshooting
+
+### Connection Issues
+If your AI assistant cannot connect to the CockroachDB documentation:
+1. Verify your internet connection
+2. Check that the MCP server URL is correctly configured: `https://cockroachdb.mcp.kapa.ai`
+3. Restart your AI assistant application
+4. Ensure you have the latest version of your AI assistant
+
+### No Results
+If queries return no results:
+1. Try rephrasing your question to be more specific
+2. Include "CockroachDB" in your query for better context
+3. Check the [CockroachDB documentation](https://www.cockroachlabs.com/docs/) directly to verify the information exists
+
+### Configuration Not Working
+If the configuration doesn't seem to take effect:
+1. Ensure the configuration file is saved in the correct location
+2. Check for JSON syntax errors in your configuration
+3. Fully quit and restart your application (not just reload)
+4. Verify that `npx` is available in your system `PATH`
+
+## Feedback and Support
+
+For issues or feedback about the CockroachDB Docs MCP Server:
+- Report documentation issues on [GitHub](https://github.com/cockroachdb/docs/issues)
+- For MCP-specific problems, check [Kapa AI support](https://docs.kapa.ai)
+- Join the [CockroachDB Community Slack](https://www.cockroachlabs.com/join-community/) for help
+
+## See Also
+
+- [CockroachDB Documentation](https://www.cockroachlabs.com/docs/)
+- [Model Context Protocol](https://modelcontextprotocol.io/)
+- [Kapa AI Documentation](https://docs.kapa.ai)
\ No newline at end of file
diff --git a/src/current/v23.2/docs-mcp-integration.md b/src/current/v23.2/docs-mcp-integration.md
new file mode 100644
index 00000000000..467807e2977
--- /dev/null
+++ b/src/current/v23.2/docs-mcp-integration.md
@@ -0,0 +1,181 @@
+---
+title: CockroachDB Docs MCP Server
+summary: Connect to CockroachDB documentation directly from your IDE or AI assistant
+toc: true
+docs_area: reference
+---
+
+The CockroachDB Docs MCP Server ([Model Context Protocol](https://modelcontextprotocol.io/introduction)) enables AI assistants like Claude Desktop, Cursor, and VS Code to access CockroachDB documentation directly. This integration allows you to get instant, context-aware answers about CockroachDB without leaving your development environment.
+
+## Setup
+
+Connect your AI assistant to CockroachDB documentation by configuring the MCP server. Choose your platform below for specific instructions.
+
+### Cursor
+
+1. Open Cursor Settings (⌘+,)
+2. Navigate to **Models** → **Model Context Protocol**
+3. Add the following configuration:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+4. Restart Cursor to apply the configuration
+5. You can now ask questions about CockroachDB documentation directly in Cursor
+
+### VS Code
+
+1. Install the [Claude for VS Code](https://marketplace.visualstudio.com/items?itemName=Anthropic.claude) extension
+2. Open VS Code Settings (⌘+,)
+3. Search for "Claude MCP"
+4. Add the following to your MCP configuration:
+    ```json
+    {
+      "claude.mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+5. Reload VS Code window (⌘+R)
+6. The CockroachDB documentation is now available through Claude in VS Code
+
+### Claude Code
+
+1. Open Claude Code settings
+2. Navigate to MCP Servers configuration
+3. Add the CockroachDB Docs server:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+4. Restart Claude Code
+5. CockroachDB documentation is now accessible in your Claude Code environment
+
+### ChatGPT Desktop
+
+{{site.data.alerts.callout_info}}
+MCP support for ChatGPT Desktop is coming soon. Check back for updates.
+{{site.data.alerts.end}}
+
+### Claude Desktop
+
+1. Open Claude Desktop configuration file:
+   - **macOS**: `~/Library/Application Support/Claude/claude_desktop_config.json`
+   - **Windows**: `%APPDATA%\Claude\claude_desktop_config.json`
+   - **Linux**: `~/.config/Claude/claude_desktop_config.json`
+
+2. Add the CockroachDB Docs MCP server to your configuration:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+3. Save the file and restart Claude Desktop
+4. You can now query CockroachDB documentation directly in Claude Desktop
+
+### Other
+
+For other MCP-compatible clients, use the following server configuration:
+
+**Server URL**: `https://cockroachdb.mcp.kapa.ai`
+
+Generic configuration format:
+```json
+{
+  "servers": [{
+    "name": "cockroachdb-docs",
+    "url": "https://cockroachdb.mcp.kapa.ai"
+  }]
+}
+```
+
+Consult your client's documentation for specific configuration instructions.
+
+## Capabilities
+
+Once connected, your AI assistant can answer questions about CockroachDB directly from the official documentation. Example queries include:
+
+### Multi-Region Configuration
+- "How do I set up a multi-region CockroachDB cluster?"
+- "What are the best practices for configuring region survival goals?"
+- "Show me how to implement follow-the-workload patterns"
+
+### Performance Optimization
+- "What are the recommended techniques for optimizing query performance?"
+- "How do I identify and resolve hot spots in my cluster?"
+- "Explain the best practices for index design in CockroachDB"
+
+### Security Features
+- "How do I configure TLS/SSL encryption for my cluster?"
+- "What are the steps to implement role-based access control?"
+- "Show me how to set up audit logging in CockroachDB"
+
+### SQL Syntax and Features
+- "What's the syntax for creating a changefeed?"
+- "How do I use window functions in CockroachDB?"
+- "Explain the differences between JSONB operators in CockroachDB"
+
+### Troubleshooting
+- "How do I diagnose and fix connection refused errors?"
+- "What steps should I take when encountering transaction retry errors?"
+- "How do I investigate and resolve node liveness issues?"
+
+### Operations and Maintenance
+- "What's the recommended backup strategy for production clusters?"
+- "How do I perform a rolling upgrade of my cluster?"
+- "Show me the best practices for monitoring CockroachDB"
+
+## Troubleshooting
+
+### Connection Issues
+If your AI assistant cannot connect to the CockroachDB documentation:
+1. Verify your internet connection
+2. Check that the MCP server URL is correctly configured: `https://cockroachdb.mcp.kapa.ai`
+3. Restart your AI assistant application
+4. Ensure you have the latest version of your AI assistant
+
+### No Results
+If queries return no results:
+1. Try rephrasing your question to be more specific
+2. Include "CockroachDB" in your query for better context
+3. Check the [CockroachDB documentation](https://www.cockroachlabs.com/docs/) directly to verify the information exists
+
+### Configuration Not Working
+If the configuration doesn't seem to take effect:
+1. Ensure the configuration file is saved in the correct location
+2. Check for JSON syntax errors in your configuration
+3. Fully quit and restart your application (not just reload)
+4. Verify that `npx` is available in your system `PATH`
+
+## Feedback and Support
+
+For issues or feedback about the CockroachDB Docs MCP Server:
+- Report documentation issues on [GitHub](https://github.com/cockroachdb/docs/issues)
+- For MCP-specific problems, check [Kapa AI support](https://docs.kapa.ai)
+- Join the [CockroachDB Community Slack](https://www.cockroachlabs.com/join-community/) for help
+
+## See Also
+
+- [CockroachDB Documentation](https://www.cockroachlabs.com/docs/)
+- [Model Context Protocol](https://modelcontextprotocol.io/)
+- [Kapa AI Documentation](https://docs.kapa.ai)
\ No newline at end of file
diff --git a/src/current/v24.1/docs-mcp-integration.md b/src/current/v24.1/docs-mcp-integration.md
new file mode 100644
index 00000000000..467807e2977
--- /dev/null
+++ b/src/current/v24.1/docs-mcp-integration.md
@@ -0,0 +1,181 @@
+---
+title: CockroachDB Docs MCP Server
+summary: Connect to CockroachDB documentation directly from your IDE or AI assistant
+toc: true
+docs_area: reference
+---
+
+The CockroachDB Docs MCP Server ([Model Context Protocol](https://modelcontextprotocol.io/introduction)) enables AI assistants like Claude Desktop, Cursor, and VS Code to access CockroachDB documentation directly. This integration allows you to get instant, context-aware answers about CockroachDB without leaving your development environment.
+
+## Setup
+
+Connect your AI assistant to CockroachDB documentation by configuring the MCP server. Choose your platform below for specific instructions.
+
+### Cursor
+
+1. Open Cursor Settings (⌘+,)
+2. Navigate to **Models** → **Model Context Protocol**
+3. Add the following configuration:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+4. Restart Cursor to apply the configuration
+5. You can now ask questions about CockroachDB documentation directly in Cursor
+
+### VS Code
+
+1. Install the [Claude for VS Code](https://marketplace.visualstudio.com/items?itemName=Anthropic.claude) extension
+2. Open VS Code Settings (⌘+,)
+3. Search for "Claude MCP"
+4. Add the following to your MCP configuration:
+    ```json
+    {
+      "claude.mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+5. Reload VS Code window (⌘+R)
+6. The CockroachDB documentation is now available through Claude in VS Code
+
+### Claude Code
+
+1. Open Claude Code settings
+2. Navigate to MCP Servers configuration
+3. Add the CockroachDB Docs server:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+4. Restart Claude Code
+5. CockroachDB documentation is now accessible in your Claude Code environment
+
+### ChatGPT Desktop
+
+{{site.data.alerts.callout_info}}
+MCP support for ChatGPT Desktop is coming soon. Check back for updates.
+{{site.data.alerts.end}}
+
+### Claude Desktop
+
+1. Open Claude Desktop configuration file:
+   - **macOS**: `~/Library/Application Support/Claude/claude_desktop_config.json`
+   - **Windows**: `%APPDATA%\Claude\claude_desktop_config.json`
+   - **Linux**: `~/.config/Claude/claude_desktop_config.json`
+
+2. Add the CockroachDB Docs MCP server to your configuration:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+3. Save the file and restart Claude Desktop
+4. You can now query CockroachDB documentation directly in Claude Desktop
+
+### Other
+
+For other MCP-compatible clients, use the following server configuration:
+
+**Server URL**: `https://cockroachdb.mcp.kapa.ai`
+
+Generic configuration format:
+```json
+{
+  "servers": [{
+    "name": "cockroachdb-docs",
+    "url": "https://cockroachdb.mcp.kapa.ai"
+  }]
+}
+```
+
+Consult your client's documentation for specific configuration instructions.
+
+## Capabilities
+
+Once connected, your AI assistant can answer questions about CockroachDB directly from the official documentation. Example queries include:
+
+### Multi-Region Configuration
+- "How do I set up a multi-region CockroachDB cluster?"
+- "What are the best practices for configuring region survival goals?"
+- "Show me how to implement follow-the-workload patterns"
+
+### Performance Optimization
+- "What are the recommended techniques for optimizing query performance?"
+- "How do I identify and resolve hot spots in my cluster?"
+- "Explain the best practices for index design in CockroachDB"
+
+### Security Features
+- "How do I configure TLS/SSL encryption for my cluster?"
+- "What are the steps to implement role-based access control?"
+- "Show me how to set up audit logging in CockroachDB"
+
+### SQL Syntax and Features
+- "What's the syntax for creating a changefeed?"
+- "How do I use window functions in CockroachDB?"
+- "Explain the differences between JSONB operators in CockroachDB"
+
+### Troubleshooting
+- "How do I diagnose and fix connection refused errors?"
+- "What steps should I take when encountering transaction retry errors?"
+- "How do I investigate and resolve node liveness issues?"
+
+### Operations and Maintenance
+- "What's the recommended backup strategy for production clusters?"
+- "How do I perform a rolling upgrade of my cluster?"
+- "Show me the best practices for monitoring CockroachDB"
+
+## Troubleshooting
+
+### Connection Issues
+If your AI assistant cannot connect to the CockroachDB documentation:
+1. Verify your internet connection
+2. Check that the MCP server URL is correctly configured: `https://cockroachdb.mcp.kapa.ai`
+3. Restart your AI assistant application
+4. Ensure you have the latest version of your AI assistant
+
+### No Results
+If queries return no results:
+1. Try rephrasing your question to be more specific
+2. Include "CockroachDB" in your query for better context
+3. Check the [CockroachDB documentation](https://www.cockroachlabs.com/docs/) directly to verify the information exists
+
+### Configuration Not Working
+If the configuration doesn't seem to take effect:
+1. Ensure the configuration file is saved in the correct location
+2. Check for JSON syntax errors in your configuration
+3. Fully quit and restart your application (not just reload)
+4. Verify that `npx` is available in your system `PATH`
+
+## Feedback and Support
+
+For issues or feedback about the CockroachDB Docs MCP Server:
+- Report documentation issues on [GitHub](https://github.com/cockroachdb/docs/issues)
+- For MCP-specific problems, check [Kapa AI support](https://docs.kapa.ai)
+- Join the [CockroachDB Community Slack](https://www.cockroachlabs.com/join-community/) for help
+
+## See Also
+
+- [CockroachDB Documentation](https://www.cockroachlabs.com/docs/)
+- [Model Context Protocol](https://modelcontextprotocol.io/)
+- [Kapa AI Documentation](https://docs.kapa.ai)
\ No newline at end of file
diff --git a/src/current/v24.2/docs-mcp-integration.md b/src/current/v24.2/docs-mcp-integration.md
new file mode 100644
index 00000000000..467807e2977
--- /dev/null
+++ b/src/current/v24.2/docs-mcp-integration.md
@@ -0,0 +1,181 @@
+---
+title: CockroachDB Docs MCP Server
+summary: Connect to CockroachDB documentation directly from your IDE or AI assistant
+toc: true
+docs_area: reference
+---
+
+The CockroachDB Docs MCP Server ([Model Context Protocol](https://modelcontextprotocol.io/introduction)) enables AI assistants like Claude Desktop, Cursor, and VS Code to access CockroachDB documentation directly. This integration allows you to get instant, context-aware answers about CockroachDB without leaving your development environment.
+
+## Setup
+
+Connect your AI assistant to CockroachDB documentation by configuring the MCP server. Choose your platform below for specific instructions.
+
+### Cursor
+
+1. Open Cursor Settings (⌘+,)
+2. Navigate to **Models** → **Model Context Protocol**
+3. Add the following configuration:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+4. Restart Cursor to apply the configuration
+5. You can now ask questions about CockroachDB documentation directly in Cursor
+
+### VS Code
+
+1. Install the [Claude for VS Code](https://marketplace.visualstudio.com/items?itemName=Anthropic.claude) extension
+2. Open VS Code Settings (⌘+,)
+3. Search for "Claude MCP"
+4. Add the following to your MCP configuration:
+    ```json
+    {
+      "claude.mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+5. Reload VS Code window (⌘+R)
+6. The CockroachDB documentation is now available through Claude in VS Code
+
+### Claude Code
+
+1. Open Claude Code settings
+2. Navigate to MCP Servers configuration
+3. Add the CockroachDB Docs server:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+4. Restart Claude Code
+5. CockroachDB documentation is now accessible in your Claude Code environment
+
+### ChatGPT Desktop
+
+{{site.data.alerts.callout_info}}
+MCP support for ChatGPT Desktop is coming soon. Check back for updates.
+{{site.data.alerts.end}}
+
+### Claude Desktop
+
+1. Open Claude Desktop configuration file:
+   - **macOS**: `~/Library/Application Support/Claude/claude_desktop_config.json`
+   - **Windows**: `%APPDATA%\Claude\claude_desktop_config.json`
+   - **Linux**: `~/.config/Claude/claude_desktop_config.json`
+
+2. Add the CockroachDB Docs MCP server to your configuration:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+3. Save the file and restart Claude Desktop
+4. You can now query CockroachDB documentation directly in Claude Desktop
+
+### Other
+
+For other MCP-compatible clients, use the following server configuration:
+
+**Server URL**: `https://cockroachdb.mcp.kapa.ai`
+
+Generic configuration format:
+```json
+{
+  "servers": [{
+    "name": "cockroachdb-docs",
+    "url": "https://cockroachdb.mcp.kapa.ai"
+  }]
+}
+```
+
+Consult your client's documentation for specific configuration instructions.
+
+## Capabilities
+
+Once connected, your AI assistant can answer questions about CockroachDB directly from the official documentation. Example queries include:
+
+### Multi-Region Configuration
+- "How do I set up a multi-region CockroachDB cluster?"
+- "What are the best practices for configuring region survival goals?"
+- "Show me how to implement follow-the-workload patterns"
+
+### Performance Optimization
+- "What are the recommended techniques for optimizing query performance?"
+- "How do I identify and resolve hot spots in my cluster?"
+- "Explain the best practices for index design in CockroachDB"
+
+### Security Features
+- "How do I configure TLS/SSL encryption for my cluster?"
+- "What are the steps to implement role-based access control?"
+- "Show me how to set up audit logging in CockroachDB"
+
+### SQL Syntax and Features
+- "What's the syntax for creating a changefeed?"
+- "How do I use window functions in CockroachDB?"
+- "Explain the differences between JSONB operators in CockroachDB"
+
+### Troubleshooting
+- "How do I diagnose and fix connection refused errors?"
+- "What steps should I take when encountering transaction retry errors?"
+- "How do I investigate and resolve node liveness issues?"
+
+### Operations and Maintenance
+- "What's the recommended backup strategy for production clusters?"
+- "How do I perform a rolling upgrade of my cluster?"
+- "Show me the best practices for monitoring CockroachDB"
+
+## Troubleshooting
+
+### Connection Issues
+If your AI assistant cannot connect to the CockroachDB documentation:
+1. Verify your internet connection
+2. Check that the MCP server URL is correctly configured: `https://cockroachdb.mcp.kapa.ai`
+3. Restart your AI assistant application
+4. Ensure you have the latest version of your AI assistant
+
+### No Results
+If queries return no results:
+1. Try rephrasing your question to be more specific
+2. Include "CockroachDB" in your query for better context
+3. Check the [CockroachDB documentation](https://www.cockroachlabs.com/docs/) directly to verify the information exists
+
+### Configuration Not Working
+If the configuration doesn't seem to take effect:
+1. Ensure the configuration file is saved in the correct location
+2. Check for JSON syntax errors in your configuration
+3. Fully quit and restart your application (not just reload)
+4. Verify that `npx` is available in your system `PATH`
+
+## Feedback and Support
+
+For issues or feedback about the CockroachDB Docs MCP Server:
+- Report documentation issues on [GitHub](https://github.com/cockroachdb/docs/issues)
+- For MCP-specific problems, check [Kapa AI support](https://docs.kapa.ai)
+- Join the [CockroachDB Community Slack](https://www.cockroachlabs.com/join-community/) for help
+
+## See Also
+
+- [CockroachDB Documentation](https://www.cockroachlabs.com/docs/)
+- [Model Context Protocol](https://modelcontextprotocol.io/)
+- [Kapa AI Documentation](https://docs.kapa.ai)
\ No newline at end of file
diff --git a/src/current/v24.3/docs-mcp-integration.md b/src/current/v24.3/docs-mcp-integration.md
new file mode 100644
index 00000000000..467807e2977
--- /dev/null
+++ b/src/current/v24.3/docs-mcp-integration.md
@@ -0,0 +1,181 @@
+---
+title: CockroachDB Docs MCP Server
+summary: Connect to CockroachDB documentation directly from your IDE or AI assistant
+toc: true
+docs_area: reference
+---
+
+The CockroachDB Docs MCP Server ([Model Context Protocol](https://modelcontextprotocol.io/introduction)) enables AI assistants like Claude Desktop, Cursor, and VS Code to access CockroachDB documentation directly. This integration allows you to get instant, context-aware answers about CockroachDB without leaving your development environment.
+
+## Setup
+
+Connect your AI assistant to CockroachDB documentation by configuring the MCP server. Choose your platform below for specific instructions.
+
+### Cursor
+
+1. Open Cursor Settings (⌘+,)
+2. Navigate to **Models** → **Model Context Protocol**
+3. Add the following configuration:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+4. Restart Cursor to apply the configuration
+5. You can now ask questions about CockroachDB documentation directly in Cursor
+
+### VS Code
+
+1. Install the [Claude for VS Code](https://marketplace.visualstudio.com/items?itemName=Anthropic.claude) extension
+2. Open VS Code Settings (⌘+,)
+3. Search for "Claude MCP"
+4. Add the following to your MCP configuration:
+    ```json
+    {
+      "claude.mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+5. Reload VS Code window (⌘+R)
+6. The CockroachDB documentation is now available through Claude in VS Code
+
+### Claude Code
+
+1. Open Claude Code settings
+2. Navigate to MCP Servers configuration
+3. Add the CockroachDB Docs server:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+4. Restart Claude Code
+5. CockroachDB documentation is now accessible in your Claude Code environment
+
+### ChatGPT Desktop
+
+{{site.data.alerts.callout_info}}
+MCP support for ChatGPT Desktop is coming soon. Check back for updates.
+{{site.data.alerts.end}}
+
+### Claude Desktop
+
+1. Open Claude Desktop configuration file:
+   - **macOS**: `~/Library/Application Support/Claude/claude_desktop_config.json`
+   - **Windows**: `%APPDATA%\Claude\claude_desktop_config.json`
+   - **Linux**: `~/.config/Claude/claude_desktop_config.json`
+
+2. Add the CockroachDB Docs MCP server to your configuration:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+3. Save the file and restart Claude Desktop
+4. You can now query CockroachDB documentation directly in Claude Desktop
+
+### Other
+
+For other MCP-compatible clients, use the following server configuration:
+
+**Server URL**: `https://cockroachdb.mcp.kapa.ai`
+
+Generic configuration format:
+```json
+{
+  "servers": [{
+    "name": "cockroachdb-docs",
+    "url": "https://cockroachdb.mcp.kapa.ai"
+  }]
+}
+```
+
+Consult your client's documentation for specific configuration instructions.
+
+## Capabilities
+
+Once connected, your AI assistant can answer questions about CockroachDB directly from the official documentation. Example queries include:
+
+### Multi-Region Configuration
+- "How do I set up a multi-region CockroachDB cluster?"
+- "What are the best practices for configuring region survival goals?"
+- "Show me how to implement follow-the-workload patterns"
+
+### Performance Optimization
+- "What are the recommended techniques for optimizing query performance?"
+- "How do I identify and resolve hot spots in my cluster?"
+- "Explain the best practices for index design in CockroachDB"
+
+### Security Features
+- "How do I configure TLS/SSL encryption for my cluster?"
+- "What are the steps to implement role-based access control?"
+- "Show me how to set up audit logging in CockroachDB"
+
+### SQL Syntax and Features
+- "What's the syntax for creating a changefeed?"
+- "How do I use window functions in CockroachDB?"
+- "Explain the differences between JSONB operators in CockroachDB"
+
+### Troubleshooting
+- "How do I diagnose and fix connection refused errors?"
+- "What steps should I take when encountering transaction retry errors?"
+- "How do I investigate and resolve node liveness issues?"
+
+### Operations and Maintenance
+- "What's the recommended backup strategy for production clusters?"
+- "How do I perform a rolling upgrade of my cluster?"
+- "Show me the best practices for monitoring CockroachDB"
+
+## Troubleshooting
+
+### Connection Issues
+If your AI assistant cannot connect to the CockroachDB documentation:
+1. Verify your internet connection
+2. Check that the MCP server URL is correctly configured: `https://cockroachdb.mcp.kapa.ai`
+3. Restart your AI assistant application
+4. Ensure you have the latest version of your AI assistant
+
+### No Results
+If queries return no results:
+1. Try rephrasing your question to be more specific
+2. Include "CockroachDB" in your query for better context
+3. Check the [CockroachDB documentation](https://www.cockroachlabs.com/docs/) directly to verify the information exists
+
+### Configuration Not Working
+If the configuration doesn't seem to take effect:
+1. Ensure the configuration file is saved in the correct location
+2. Check for JSON syntax errors in your configuration
+3. Fully quit and restart your application (not just reload)
+4. Verify that `npx` is available in your system `PATH`
+
+## Feedback and Support
+
+For issues or feedback about the CockroachDB Docs MCP Server:
+- Report documentation issues on [GitHub](https://github.com/cockroachdb/docs/issues)
+- For MCP-specific problems, check [Kapa AI support](https://docs.kapa.ai)
+- Join the [CockroachDB Community Slack](https://www.cockroachlabs.com/join-community/) for help
+
+## See Also
+
+- [CockroachDB Documentation](https://www.cockroachlabs.com/docs/)
+- [Model Context Protocol](https://modelcontextprotocol.io/)
+- [Kapa AI Documentation](https://docs.kapa.ai)
\ No newline at end of file
diff --git a/src/current/v25.1/docs-mcp-integration.md b/src/current/v25.1/docs-mcp-integration.md
new file mode 100644
index 00000000000..467807e2977
--- /dev/null
+++ b/src/current/v25.1/docs-mcp-integration.md
@@ -0,0 +1,181 @@
+---
+title: CockroachDB Docs MCP Server
+summary: Connect to CockroachDB documentation directly from your IDE or AI assistant
+toc: true
+docs_area: reference
+---
+
+The CockroachDB Docs MCP Server ([Model Context Protocol](https://modelcontextprotocol.io/introduction)) enables AI assistants like Claude Desktop, Cursor, and VS Code to access CockroachDB documentation directly. This integration allows you to get instant, context-aware answers about CockroachDB without leaving your development environment.
+
+## Setup
+
+Connect your AI assistant to CockroachDB documentation by configuring the MCP server. Choose your platform below for specific instructions.
+
+### Cursor
+
+1. Open Cursor Settings (⌘+,)
+2. Navigate to **Models** → **Model Context Protocol**
+3. Add the following configuration:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+4. Restart Cursor to apply the configuration
+5. You can now ask questions about CockroachDB documentation directly in Cursor
+
+### VS Code
+
+1. Install the [Claude for VS Code](https://marketplace.visualstudio.com/items?itemName=Anthropic.claude) extension
+2. Open VS Code Settings (⌘+,)
+3. Search for "Claude MCP"
+4. Add the following to your MCP configuration:
+    ```json
+    {
+      "claude.mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+5. Reload VS Code window (⌘+R)
+6. The CockroachDB documentation is now available through Claude in VS Code
+
+### Claude Code
+
+1. Open Claude Code settings
+2. Navigate to MCP Servers configuration
+3. Add the CockroachDB Docs server:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+4. Restart Claude Code
+5. CockroachDB documentation is now accessible in your Claude Code environment
+
+### ChatGPT Desktop
+
+{{site.data.alerts.callout_info}}
+MCP support for ChatGPT Desktop is coming soon. Check back for updates.
+{{site.data.alerts.end}}
+
+### Claude Desktop
+
+1. Open Claude Desktop configuration file:
+   - **macOS**: `~/Library/Application Support/Claude/claude_desktop_config.json`
+   - **Windows**: `%APPDATA%\Claude\claude_desktop_config.json`
+   - **Linux**: `~/.config/Claude/claude_desktop_config.json`
+
+2. Add the CockroachDB Docs MCP server to your configuration:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+3. Save the file and restart Claude Desktop
+4. You can now query CockroachDB documentation directly in Claude Desktop
+
+### Other
+
+For other MCP-compatible clients, use the following server configuration:
+
+**Server URL**: `https://cockroachdb.mcp.kapa.ai`
+
+Generic configuration format:
+```json
+{
+  "servers": [{
+    "name": "cockroachdb-docs",
+    "url": "https://cockroachdb.mcp.kapa.ai"
+  }]
+}
+```
+
+Consult your client's documentation for specific configuration instructions.
+
+## Capabilities
+
+Once connected, your AI assistant can answer questions about CockroachDB directly from the official documentation. Example queries include:
+
+### Multi-Region Configuration
+- "How do I set up a multi-region CockroachDB cluster?"
+- "What are the best practices for configuring region survival goals?"
+- "Show me how to implement follow-the-workload patterns"
+
+### Performance Optimization
+- "What are the recommended techniques for optimizing query performance?"
+- "How do I identify and resolve hot spots in my cluster?"
+- "Explain the best practices for index design in CockroachDB"
+
+### Security Features
+- "How do I configure TLS/SSL encryption for my cluster?"
+- "What are the steps to implement role-based access control?"
+- "Show me how to set up audit logging in CockroachDB"
+
+### SQL Syntax and Features
+- "What's the syntax for creating a changefeed?"
+- "How do I use window functions in CockroachDB?"
+- "Explain the differences between JSONB operators in CockroachDB"
+
+### Troubleshooting
+- "How do I diagnose and fix connection refused errors?"
+- "What steps should I take when encountering transaction retry errors?"
+- "How do I investigate and resolve node liveness issues?"
+
+### Operations and Maintenance
+- "What's the recommended backup strategy for production clusters?"
+- "How do I perform a rolling upgrade of my cluster?"
+- "Show me the best practices for monitoring CockroachDB"
+
+## Troubleshooting
+
+### Connection Issues
+If your AI assistant cannot connect to the CockroachDB documentation:
+1. Verify your internet connection
+2. Check that the MCP server URL is correctly configured: `https://cockroachdb.mcp.kapa.ai`
+3. Restart your AI assistant application
+4. Ensure you have the latest version of your AI assistant
+
+### No Results
+If queries return no results:
+1. Try rephrasing your question to be more specific
+2. Include "CockroachDB" in your query for better context
+3. Check the [CockroachDB documentation](https://www.cockroachlabs.com/docs/) directly to verify the information exists
+
+### Configuration Not Working
+If the configuration doesn't seem to take effect:
+1. Ensure the configuration file is saved in the correct location
+2. Check for JSON syntax errors in your configuration
+3. Fully quit and restart your application (not just reload)
+4. Verify that `npx` is available in your system `PATH`
+
+## Feedback and Support
+
+For issues or feedback about the CockroachDB Docs MCP Server:
+- Report documentation issues on [GitHub](https://github.com/cockroachdb/docs/issues)
+- For MCP-specific problems, check [Kapa AI support](https://docs.kapa.ai)
+- Join the [CockroachDB Community Slack](https://www.cockroachlabs.com/join-community/) for help
+
+## See Also
+
+- [CockroachDB Documentation](https://www.cockroachlabs.com/docs/)
+- [Model Context Protocol](https://modelcontextprotocol.io/)
+- [Kapa AI Documentation](https://docs.kapa.ai)
\ No newline at end of file
diff --git a/src/current/v25.2/docs-mcp-integration.md b/src/current/v25.2/docs-mcp-integration.md
new file mode 100644
index 00000000000..467807e2977
--- /dev/null
+++ b/src/current/v25.2/docs-mcp-integration.md
@@ -0,0 +1,181 @@
+---
+title: CockroachDB Docs MCP Server
+summary: Connect to CockroachDB documentation directly from your IDE or AI assistant
+toc: true
+docs_area: reference
+---
+
+The CockroachDB Docs MCP Server ([Model Context Protocol](https://modelcontextprotocol.io/introduction)) enables AI assistants like Claude Desktop, Cursor, and VS Code to access CockroachDB documentation directly. This integration allows you to get instant, context-aware answers about CockroachDB without leaving your development environment.
+
+## Setup
+
+Connect your AI assistant to CockroachDB documentation by configuring the MCP server. Choose your platform below for specific instructions.
+
+### Cursor
+
+1. Open Cursor Settings (⌘+,)
+2. Navigate to **Models** → **Model Context Protocol**
+3. Add the following configuration:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+4. Restart Cursor to apply the configuration
+5. You can now ask questions about CockroachDB documentation directly in Cursor
+
+### VS Code
+
+1. Install the [Claude for VS Code](https://marketplace.visualstudio.com/items?itemName=Anthropic.claude) extension
+2. Open VS Code Settings (⌘+,)
+3. Search for "Claude MCP"
+4. Add the following to your MCP configuration:
+    ```json
+    {
+      "claude.mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+5. Reload VS Code window (⌘+R)
+6. The CockroachDB documentation is now available through Claude in VS Code
+
+### Claude Code
+
+1. Open Claude Code settings
+2. Navigate to MCP Servers configuration
+3. Add the CockroachDB Docs server:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+4. Restart Claude Code
+5. CockroachDB documentation is now accessible in your Claude Code environment
+
+### ChatGPT Desktop
+
+{{site.data.alerts.callout_info}}
+MCP support for ChatGPT Desktop is coming soon. Check back for updates.
+{{site.data.alerts.end}}
+
+### Claude Desktop
+
+1. Open Claude Desktop configuration file:
+   - **macOS**: `~/Library/Application Support/Claude/claude_desktop_config.json`
+   - **Windows**: `%APPDATA%\Claude\claude_desktop_config.json`
+   - **Linux**: `~/.config/Claude/claude_desktop_config.json`
+
+2. Add the CockroachDB Docs MCP server to your configuration:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+3. Save the file and restart Claude Desktop
+4. You can now query CockroachDB documentation directly in Claude Desktop
+
+### Other
+
+For other MCP-compatible clients, use the following server configuration:
+
+**Server URL**: `https://cockroachdb.mcp.kapa.ai`
+
+Generic configuration format:
+```json
+{
+  "servers": [{
+    "name": "cockroachdb-docs",
+    "url": "https://cockroachdb.mcp.kapa.ai"
+  }]
+}
+```
+
+Consult your client's documentation for specific configuration instructions.
+
+## Capabilities
+
+Once connected, your AI assistant can answer questions about CockroachDB directly from the official documentation. Example queries include:
+
+### Multi-Region Configuration
+- "How do I set up a multi-region CockroachDB cluster?"
+- "What are the best practices for configuring region survival goals?"
+- "Show me how to implement follow-the-workload patterns"
+
+### Performance Optimization
+- "What are the recommended techniques for optimizing query performance?"
+- "How do I identify and resolve hot spots in my cluster?"
+- "Explain the best practices for index design in CockroachDB"
+
+### Security Features
+- "How do I configure TLS/SSL encryption for my cluster?"
+- "What are the steps to implement role-based access control?"
+- "Show me how to set up audit logging in CockroachDB"
+
+### SQL Syntax and Features
+- "What's the syntax for creating a changefeed?"
+- "How do I use window functions in CockroachDB?"
+- "Explain the differences between JSONB operators in CockroachDB"
+
+### Troubleshooting
+- "How do I diagnose and fix connection refused errors?"
+- "What steps should I take when encountering transaction retry errors?"
+- "How do I investigate and resolve node liveness issues?"
+
+### Operations and Maintenance
+- "What's the recommended backup strategy for production clusters?"
+- "How do I perform a rolling upgrade of my cluster?"
+- "Show me the best practices for monitoring CockroachDB"
+
+## Troubleshooting
+
+### Connection Issues
+If your AI assistant cannot connect to the CockroachDB documentation:
+1. Verify your internet connection
+2. Check that the MCP server URL is correctly configured: `https://cockroachdb.mcp.kapa.ai`
+3. Restart your AI assistant application
+4. Ensure you have the latest version of your AI assistant
+
+### No Results
+If queries return no results:
+1. Try rephrasing your question to be more specific
+2. Include "CockroachDB" in your query for better context
+3. Check the [CockroachDB documentation](https://www.cockroachlabs.com/docs/) directly to verify the information exists
+
+### Configuration Not Working
+If the configuration doesn't seem to take effect:
+1. Ensure the configuration file is saved in the correct location
+2. Check for JSON syntax errors in your configuration
+3. Fully quit and restart your application (not just reload)
+4. Verify that `npx` is available in your system `PATH`
+
+## Feedback and Support
+
+For issues or feedback about the CockroachDB Docs MCP Server:
+- Report documentation issues on [GitHub](https://github.com/cockroachdb/docs/issues)
+- For MCP-specific problems, check [Kapa AI support](https://docs.kapa.ai)
+- Join the [CockroachDB Community Slack](https://www.cockroachlabs.com/join-community/) for help
+
+## See Also
+
+- [CockroachDB Documentation](https://www.cockroachlabs.com/docs/)
+- [Model Context Protocol](https://modelcontextprotocol.io/)
+- [Kapa AI Documentation](https://docs.kapa.ai)
\ No newline at end of file
diff --git a/src/current/v25.3/docs-mcp-integration.md b/src/current/v25.3/docs-mcp-integration.md
new file mode 100644
index 00000000000..467807e2977
--- /dev/null
+++ b/src/current/v25.3/docs-mcp-integration.md
@@ -0,0 +1,181 @@
+---
+title: CockroachDB Docs MCP Server
+summary: Connect to CockroachDB documentation directly from your IDE or AI assistant
+toc: true
+docs_area: reference
+---
+
+The CockroachDB Docs MCP Server ([Model Context Protocol](https://modelcontextprotocol.io/introduction)) enables AI assistants like Claude Desktop, Cursor, and VS Code to access CockroachDB documentation directly. This integration allows you to get instant, context-aware answers about CockroachDB without leaving your development environment.
+
+## Setup
+
+Connect your AI assistant to CockroachDB documentation by configuring the MCP server. Choose your platform below for specific instructions.
+
+### Cursor
+
+1. Open Cursor Settings (⌘+,)
+2. Navigate to **Models** → **Model Context Protocol**
+3. Add the following configuration:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+4. Restart Cursor to apply the configuration
+5. You can now ask questions about CockroachDB documentation directly in Cursor
+
+### VS Code
+
+1. Install the [Claude for VS Code](https://marketplace.visualstudio.com/items?itemName=Anthropic.claude) extension
+2. Open VS Code Settings (⌘+,)
+3. Search for "Claude MCP"
+4. Add the following to your MCP configuration:
+    ```json
+    {
+      "claude.mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+5. Reload VS Code window (⌘+R)
+6. The CockroachDB documentation is now available through Claude in VS Code
+
+### Claude Code
+
+1. Open Claude Code settings
+2. Navigate to MCP Servers configuration
+3. Add the CockroachDB Docs server:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+4. Restart Claude Code
+5. CockroachDB documentation is now accessible in your Claude Code environment
+
+### ChatGPT Desktop
+
+{{site.data.alerts.callout_info}}
+MCP support for ChatGPT Desktop is coming soon. Check back for updates.
+{{site.data.alerts.end}}
+
+### Claude Desktop
+
+1. Open Claude Desktop configuration file:
+   - **macOS**: `~/Library/Application Support/Claude/claude_desktop_config.json`
+   - **Windows**: `%APPDATA%\Claude\claude_desktop_config.json`
+   - **Linux**: `~/.config/Claude/claude_desktop_config.json`
+
+2. Add the CockroachDB Docs MCP server to your configuration:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+3. Save the file and restart Claude Desktop
+4. You can now query CockroachDB documentation directly in Claude Desktop
+
+### Other
+
+For other MCP-compatible clients, use the following server configuration:
+
+**Server URL**: `https://cockroachdb.mcp.kapa.ai`
+
+Generic configuration format:
+```json
+{
+  "servers": [{
+    "name": "cockroachdb-docs",
+    "url": "https://cockroachdb.mcp.kapa.ai"
+  }]
+}
+```
+
+Consult your client's documentation for specific configuration instructions.
+
+## Capabilities
+
+Once connected, your AI assistant can answer questions about CockroachDB directly from the official documentation. Example queries include:
+
+### Multi-Region Configuration
+- "How do I set up a multi-region CockroachDB cluster?"
+- "What are the best practices for configuring region survival goals?"
+- "Show me how to implement follow-the-workload patterns"
+
+### Performance Optimization
+- "What are the recommended techniques for optimizing query performance?"
+- "How do I identify and resolve hot spots in my cluster?"
+- "Explain the best practices for index design in CockroachDB"
+
+### Security Features
+- "How do I configure TLS/SSL encryption for my cluster?"
+- "What are the steps to implement role-based access control?"
+- "Show me how to set up audit logging in CockroachDB"
+
+### SQL Syntax and Features
+- "What's the syntax for creating a changefeed?"
+- "How do I use window functions in CockroachDB?"
+- "Explain the differences between JSONB operators in CockroachDB"
+
+### Troubleshooting
+- "How do I diagnose and fix connection refused errors?"
+- "What steps should I take when encountering transaction retry errors?"
+- "How do I investigate and resolve node liveness issues?"
+
+### Operations and Maintenance
+- "What's the recommended backup strategy for production clusters?"
+- "How do I perform a rolling upgrade of my cluster?"
+- "Show me the best practices for monitoring CockroachDB"
+
+## Troubleshooting
+
+### Connection Issues
+If your AI assistant cannot connect to the CockroachDB documentation:
+1. Verify your internet connection
+2. Check that the MCP server URL is correctly configured: `https://cockroachdb.mcp.kapa.ai`
+3. Restart your AI assistant application
+4. Ensure you have the latest version of your AI assistant
+
+### No Results
+If queries return no results:
+1. Try rephrasing your question to be more specific
+2. Include "CockroachDB" in your query for better context
+3. Check the [CockroachDB documentation](https://www.cockroachlabs.com/docs/) directly to verify the information exists
+
+### Configuration Not Working
+If the configuration doesn't seem to take effect:
+1. Ensure the configuration file is saved in the correct location
+2. Check for JSON syntax errors in your configuration
+3. Fully quit and restart your application (not just reload)
+4. Verify that `npx` is available in your system `PATH`
+
+## Feedback and Support
+
+For issues or feedback about the CockroachDB Docs MCP Server:
+- Report documentation issues on [GitHub](https://github.com/cockroachdb/docs/issues)
+- For MCP-specific problems, check [Kapa AI support](https://docs.kapa.ai)
+- Join the [CockroachDB Community Slack](https://www.cockroachlabs.com/join-community/) for help
+
+## See Also
+
+- [CockroachDB Documentation](https://www.cockroachlabs.com/docs/)
+- [Model Context Protocol](https://modelcontextprotocol.io/)
+- [Kapa AI Documentation](https://docs.kapa.ai)
\ No newline at end of file
diff --git a/src/current/v25.4/docs-mcp-integration.md b/src/current/v25.4/docs-mcp-integration.md
new file mode 100644
index 00000000000..467807e2977
--- /dev/null
+++ b/src/current/v25.4/docs-mcp-integration.md
@@ -0,0 +1,181 @@
+---
+title: CockroachDB Docs MCP Server
+summary: Connect to CockroachDB documentation directly from your IDE or AI assistant
+toc: true
+docs_area: reference
+---
+
+The CockroachDB Docs MCP Server ([Model Context Protocol](https://modelcontextprotocol.io/introduction)) enables AI assistants like Claude Desktop, Cursor, and VS Code to access CockroachDB documentation directly. This integration allows you to get instant, context-aware answers about CockroachDB without leaving your development environment.
+
+## Setup
+
+Connect your AI assistant to CockroachDB documentation by configuring the MCP server. Choose your platform below for specific instructions.
+
+### Cursor
+
+1. Open Cursor Settings (⌘+,)
+2. Navigate to **Models** → **Model Context Protocol**
+3. Add the following configuration:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+4. Restart Cursor to apply the configuration
+5. You can now ask questions about CockroachDB documentation directly in Cursor
+
+### VS Code
+
+1. Install the [Claude for VS Code](https://marketplace.visualstudio.com/items?itemName=Anthropic.claude) extension
+2. Open VS Code Settings (⌘+,)
+3. Search for "Claude MCP"
+4. Add the following to your MCP configuration:
+    ```json
+    {
+      "claude.mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+5. Reload VS Code window (⌘+R)
+6. The CockroachDB documentation is now available through Claude in VS Code
+
+### Claude Code
+
+1. Open Claude Code settings
+2. Navigate to MCP Servers configuration
+3. Add the CockroachDB Docs server:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+4. Restart Claude Code
+5. CockroachDB documentation is now accessible in your Claude Code environment
+
+### ChatGPT Desktop
+
+{{site.data.alerts.callout_info}}
+MCP support for ChatGPT Desktop is coming soon. Check back for updates.
+{{site.data.alerts.end}}
+
+### Claude Desktop
+
+1. Open Claude Desktop configuration file:
+   - **macOS**: `~/Library/Application Support/Claude/claude_desktop_config.json`
+   - **Windows**: `%APPDATA%\Claude\claude_desktop_config.json`
+   - **Linux**: `~/.config/Claude/claude_desktop_config.json`
+
+2. Add the CockroachDB Docs MCP server to your configuration:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+3. Save the file and restart Claude Desktop
+4. You can now query CockroachDB documentation directly in Claude Desktop
+
+### Other
+
+For other MCP-compatible clients, use the following server configuration:
+
+**Server URL**: `https://cockroachdb.mcp.kapa.ai`
+
+Generic configuration format:
+```json
+{
+  "servers": [{
+    "name": "cockroachdb-docs",
+    "url": "https://cockroachdb.mcp.kapa.ai"
+  }]
+}
+```
+
+Consult your client's documentation for specific configuration instructions.
+
+## Capabilities
+
+Once connected, your AI assistant can answer questions about CockroachDB directly from the official documentation. Example queries include:
+
+### Multi-Region Configuration
+- "How do I set up a multi-region CockroachDB cluster?"
+- "What are the best practices for configuring region survival goals?"
+- "Show me how to implement follow-the-workload patterns"
+
+### Performance Optimization
+- "What are the recommended techniques for optimizing query performance?"
+- "How do I identify and resolve hot spots in my cluster?"
+- "Explain the best practices for index design in CockroachDB"
+
+### Security Features
+- "How do I configure TLS/SSL encryption for my cluster?"
+- "What are the steps to implement role-based access control?"
+- "Show me how to set up audit logging in CockroachDB"
+
+### SQL Syntax and Features
+- "What's the syntax for creating a changefeed?"
+- "How do I use window functions in CockroachDB?"
+- "Explain the differences between JSONB operators in CockroachDB"
+
+### Troubleshooting
+- "How do I diagnose and fix connection refused errors?"
+- "What steps should I take when encountering transaction retry errors?"
+- "How do I investigate and resolve node liveness issues?"
+
+### Operations and Maintenance
+- "What's the recommended backup strategy for production clusters?"
+- "How do I perform a rolling upgrade of my cluster?"
+- "Show me the best practices for monitoring CockroachDB"
+
+## Troubleshooting
+
+### Connection Issues
+If your AI assistant cannot connect to the CockroachDB documentation:
+1. Verify your internet connection
+2. Check that the MCP server URL is correctly configured: `https://cockroachdb.mcp.kapa.ai`
+3. Restart your AI assistant application
+4. Ensure you have the latest version of your AI assistant
+
+### No Results
+If queries return no results:
+1. Try rephrasing your question to be more specific
+2. Include "CockroachDB" in your query for better context
+3. Check the [CockroachDB documentation](https://www.cockroachlabs.com/docs/) directly to verify the information exists
+
+### Configuration Not Working
+If the configuration doesn't seem to take effect:
+1. Ensure the configuration file is saved in the correct location
+2. Check for JSON syntax errors in your configuration
+3. Fully quit and restart your application (not just reload)
+4. Verify that `npx` is available in your system `PATH`
+
+## Feedback and Support
+
+For issues or feedback about the CockroachDB Docs MCP Server:
+- Report documentation issues on [GitHub](https://github.com/cockroachdb/docs/issues)
+- For MCP-specific problems, check [Kapa AI support](https://docs.kapa.ai)
+- Join the [CockroachDB Community Slack](https://www.cockroachlabs.com/join-community/) for help
+
+## See Also
+
+- [CockroachDB Documentation](https://www.cockroachlabs.com/docs/)
+- [Model Context Protocol](https://modelcontextprotocol.io/)
+- [Kapa AI Documentation](https://docs.kapa.ai)
\ No newline at end of file
diff --git a/src/current/v26.1/docs-mcp-integration.md b/src/current/v26.1/docs-mcp-integration.md
new file mode 100644
index 00000000000..467807e2977
--- /dev/null
+++ b/src/current/v26.1/docs-mcp-integration.md
@@ -0,0 +1,181 @@
+---
+title: CockroachDB Docs MCP Server
+summary: Connect to CockroachDB documentation directly from your IDE or AI assistant
+toc: true
+docs_area: reference
+---
+
+The CockroachDB Docs MCP Server ([Model Context Protocol](https://modelcontextprotocol.io/introduction)) enables AI assistants like Claude Desktop, Cursor, and VS Code to access CockroachDB documentation directly. This integration allows you to get instant, context-aware answers about CockroachDB without leaving your development environment.
+
+## Setup
+
+Connect your AI assistant to CockroachDB documentation by configuring the MCP server. Choose your platform below for specific instructions.
+
+### Cursor
+
+1. Open Cursor Settings (⌘+,)
+2. Navigate to **Models** → **Model Context Protocol**
+3. Add the following configuration:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+4. Restart Cursor to apply the configuration
+5. You can now ask questions about CockroachDB documentation directly in Cursor
+
+### VS Code
+
+1. Install the [Claude for VS Code](https://marketplace.visualstudio.com/items?itemName=Anthropic.claude) extension
+2. Open VS Code Settings (⌘+,)
+3. Search for "Claude MCP"
+4. Add the following to your MCP configuration:
+    ```json
+    {
+      "claude.mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+5. Reload VS Code window (⌘+R)
+6. The CockroachDB documentation is now available through Claude in VS Code
+
+### Claude Code
+
+1. Open Claude Code settings
+2. Navigate to MCP Servers configuration
+3. Add the CockroachDB Docs server:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+4. Restart Claude Code
+5. CockroachDB documentation is now accessible in your Claude Code environment
+
+### ChatGPT Desktop
+
+{{site.data.alerts.callout_info}}
+MCP support for ChatGPT Desktop is coming soon. Check back for updates.
+{{site.data.alerts.end}}
+
+### Claude Desktop
+
+1. Open Claude Desktop configuration file:
+   - **macOS**: `~/Library/Application Support/Claude/claude_desktop_config.json`
+   - **Windows**: `%APPDATA%\Claude\claude_desktop_config.json`
+   - **Linux**: `~/.config/Claude/claude_desktop_config.json`
+
+2. Add the CockroachDB Docs MCP server to your configuration:
+    ```json
+    {
+      "mcpServers": {
+        "cockroachdb-docs": {
+          "command": "npx",
+          "args": ["-y", "@modelcontextprotocol/server-everything", "https://cockroachdb.mcp.kapa.ai"]
+        }
+      }
+    }
+    ```
+3. Save the file and restart Claude Desktop
+4. You can now query CockroachDB documentation directly in Claude Desktop
+
+### Other
+
+For other MCP-compatible clients, use the following server configuration:
+
+**Server URL**: `https://cockroachdb.mcp.kapa.ai`
+
+Generic configuration format:
+```json
+{
+  "servers": [{
+    "name": "cockroachdb-docs",
+    "url": "https://cockroachdb.mcp.kapa.ai"
+  }]
+}
+```
+
+Consult your client's documentation for specific configuration instructions.
+
+## Capabilities
+
+Once connected, your AI assistant can answer questions about CockroachDB directly from the official documentation. Example queries include:
+
+### Multi-Region Configuration
+- "How do I set up a multi-region CockroachDB cluster?"
+- "What are the best practices for configuring region survival goals?"
+- "Show me how to implement follow-the-workload patterns"
+
+### Performance Optimization
+- "What are the recommended techniques for optimizing query performance?"
+- "How do I identify and resolve hot spots in my cluster?"
+- "Explain the best practices for index design in CockroachDB"
+
+### Security Features
+- "How do I configure TLS/SSL encryption for my cluster?"
+- "What are the steps to implement role-based access control?"
+- "Show me how to set up audit logging in CockroachDB"
+
+### SQL Syntax and Features
+- "What's the syntax for creating a changefeed?"
+- "How do I use window functions in CockroachDB?"
+- "Explain the differences between JSONB operators in CockroachDB"
+
+### Troubleshooting
+- "How do I diagnose and fix connection refused errors?"
+- "What steps should I take when encountering transaction retry errors?"
+- "How do I investigate and resolve node liveness issues?"
+
+### Operations and Maintenance
+- "What's the recommended backup strategy for production clusters?"
+- "How do I perform a rolling upgrade of my cluster?"
+- "Show me the best practices for monitoring CockroachDB"
+
+## Troubleshooting
+
+### Connection Issues
+If your AI assistant cannot connect to the CockroachDB documentation:
+1. Verify your internet connection
+2. Check that the MCP server URL is correctly configured: `https://cockroachdb.mcp.kapa.ai`
+3. Restart your AI assistant application
+4. Ensure you have the latest version of your AI assistant
+
+### No Results
+If queries return no results:
+1. Try rephrasing your question to be more specific
+2. Include "CockroachDB" in your query for better context
+3. Check the [CockroachDB documentation](https://www.cockroachlabs.com/docs/) directly to verify the information exists
+
+### Configuration Not Working
+If the configuration doesn't seem to take effect:
+1. Ensure the configuration file is saved in the correct location
+2. Check for JSON syntax errors in your configuration
+3. Fully quit and restart your application (not just reload)
+4. Verify that `npx` is available in your system `PATH`
+
+## Feedback and Support
+
+For issues or feedback about the CockroachDB Docs MCP Server:
+- Report documentation issues on [GitHub](https://github.com/cockroachdb/docs/issues)
+- For MCP-specific problems, check [Kapa AI support](https://docs.kapa.ai)
+- Join the [CockroachDB Community Slack](https://www.cockroachlabs.com/join-community/) for help
+
+## See Also
+
+- [CockroachDB Documentation](https://www.cockroachlabs.com/docs/)
+- [Model Context Protocol](https://modelcontextprotocol.io/)
+- [Kapa AI Documentation](https://docs.kapa.ai)
\ No newline at end of file