strapi · pwizla · May 20, 2026 · May 20, 2026 · May 20, 2026 · May 20, 2026
@@ -1 +1,3 @@
 .claude/
+.superpowers/
+docs/superpowers/
@@ -209,6 +209,10 @@ Beyond the 12 rules, also check for:
   - In TabItems: `value` must be lowercase (`yarn`, `npm`), `label` must be `Yarn` or `NPM`
   - Do NOT flag these as inconsistencies when used correctly per context.
 
+### Strapi terminology
+- **Detect:** Internationalization (i18n) referred to as a "plugin" instead of a "feature". Since Strapi 5, i18n is a core feature, not a plugin. Also watch for other core features (Upload, Content Manager, Content-Type Builder) being called "plugins".
+- **Severity:** warning
+
 ### Cross-reference formatting
 - **Detect:** Standalone "See [link]." sentences that could be integrated as parentheticals into the preceding sentence (e.g., "Configure X. See [Y]." → "Configure X (see [Y]).")
 - **Severity:** warning

diff --git a/docusaurus/docs/cms/ai/docs-mcp-server.md b/docusaurus/docs/cms/ai/docs-mcp-server.md
@@ -0,0 +1,113 @@
+---
+title: Docs MCP server
+description: Connect an MCP server for the Strapi documentation to your IDE for Strapi-aware code suggestions and answers.
+sidebar_label: Docs MCP server
+displayed_sidebar: cmsSidebar
+tags:
+  - ai
+  - MCP
+  - developer tools
+toc_max_heading_level: 3
+---
+
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+# Docs MCP server
+
+<Tldr>
+
+A Docs MCP server exposes the Strapi documentation to AI coding tools. Connect it to your IDE to get Strapi-aware code suggestions and answers directly in your development environment.
+
+</Tldr>
+
+The Docs [MCP](https://modelcontextprotocol.io) (Model Context Protocol) server is powered by [Kapa](https://kapa.ai), the same service behind the **Ask AI** button on the documentation website. It draws from the full Strapi documentation, including guides, API references, and code examples. The Docs MCP server is part of the [AI tools for developers](/cms/ai/for-developers) that Strapi offers.
+
+:::strapi MCP servers for Strapi
+Strapi offers 2 different MCP servers:
+
+- the Docs MCP server, covered on the present page,
+- and the Strapi MCP server for content management, covered on its [dedicated feature page](/cms/features/strapi-mcp-server).
+:::
+
+## Compatible tools
+
+The MCP server works with any tool that supports the MCP protocol, including:
+
+- [Cursor](https://cursor.com)
+- [VS Code](https://code.visualstudio.com) with GitHub Copilot
+- [Claude Code](https://docs.anthropic.com/en/docs/claude-code)
+- [Windsurf](https://codeium.com/windsurf)
+- Any other MCP-compatible IDE or tool
+
+## Connection details
+
+When opening the Ask AI window, you should see a **Use MCP** dropdown in the top right corner. Click on it and choose which tool you'd like to connect:
+
+<ThemedImage
+  alt="Ask AI modal with Use MCP options highlighted"
+  sources={{
+    light: '/img/assets/ai/use-mcp-button.png',
+    dark: '/img/assets/ai/use-mcp-button.png',
+  }}
+/>
+
+If manual MCP server configuration is required:
+
+1. Click the **Copy MCP URL** from the dropdown. The server URL should be: `https://strapi-docs.mcp.kapa.ai`
+2. Add the server to your IDE's MCP configuration file:
+
+    <Tabs>
+    <TabItem value="cursor" label="Cursor">
+
+    Add to your `.cursor/mcp.json` file:
+
+    ```json title=".cursor/mcp.json"
+    {
+      "mcpServers": {
+        "strapi-docs": {
+          "url": "https://strapi-docs.mcp.kapa.ai"
+        }
+      }
+    }
+    ```
+
+    </TabItem>
+    <TabItem value="vscode" label="VS Code">
+
+    Add to your `.vscode/mcp.json` file:
+
+    ```json title=".vscode/mcp.json"
+    {
+      "servers": {
+        "strapi-docs": {
+          "type": "http",
+          "url": "https://strapi-docs.mcp.kapa.ai"
+        }
+      }
+    }
+    ```
+
+    </TabItem>
+    <TabItem value="windsurf" label="Windsurf">
+
+    Add to your `~/.codeium/windsurf/mcp_config.json` file:
+
+    ```json title="~/.codeium/windsurf/mcp_config.json"
+    {
+      "mcpServers": {
+        "strapi-docs": {
+          "serverUrl": "https://strapi-docs.mcp.kapa.ai"
+        }
+      }
+    }
+    ```
+
+    </TabItem>
+    </Tabs>
+
+Once connected, your AI coding assistant can query the Strapi documentation directly to answer questions, suggest implementations, and verify API usage.
+
+:::tip
+For docs-related questions, start your prompts with `Use the strapi-docs MCP server to answer:`. This will ensure the tool queries docs.strapi.io instead of returning answers based on its training data, which can be outdated.
+:::
diff --git a/docusaurus/docs/cms/ai/for-content-managers.md b/docusaurus/docs/cms/ai/for-content-managers.md
@@ -1,11 +1,12 @@
 ---
-title: Strapi AI for content managers
-description: Learn about AI-powered features in the Strapi admin panel, such as content-type design, automatic translations, and media metadata generation.
+title: AI for content managers
+description: Learn about AI-powered features in the Strapi admin panel and the built-in MCP server that lets AI clients manage your content.
 sidebar_label: AI for content managers
 displayed_sidebar: cmsSidebar
 tags:
 - ai
 - features
+- MCP
 - Content-Type Builder
 - Internationalization (i18n)
 - Media Library
@@ -15,13 +16,17 @@ toc_max_heading_level: 3
 
 import StrapiAiCredits from '/docs/snippets/strapi-ai-credits.md'
 
-# Strapi AI for content management
+# AI for content managers
+
+This page covers the AI-powered capabilities available to content managers in Strapi: the Strapi AI features built into the admin panel, and the MCP server that lets AI clients manage your content.
+
+## Strapi AI
 
 <GrowthBadge /> <VersionBadge version="5.30+" />
 
 Some Strapi CMS features can be enhanced with Strapi AI, helping content managers and administrators design content structures, translate content automatically, and generate asset metadata, all from the admin panel.
 
-## Activation and configuration {#activation}
+### Activation and configuration {#activation}
 
 Strapi AI is available for Growth plan users since Strapi 5.30 and works with both Strapi Cloud and self-hosted deployments. To get started:
 
@@ -42,14 +47,15 @@ module.exports = {
 
 <Icon name="arrow-fat-right"/> See [Admin panel configuration > Strapi AI](/cms/configurations/admin-panel#strapi-ai) for all configuration options.
 
-## Available features {#features}
+### Available features {#features}
 
 | Feature | Description |
 |---------|-------------|
 | [Content-Type Builder](/cms/features/content-type-builder#strapi-ai) | AI chat assistant that helps design content-type structures, explain existing schemas, and plan data models. Uses your existing content types as context. |
 | [Internationalization](/cms/features/internationalization#ai-powered-internationalization) | Automatically translates content from the default locale to all other configured locales when you save an entry. |
 | [Media Library](/cms/features/media-library#ai-powered-metadata-generation) | Generates alternative text, captions, and descriptions for uploaded images. |
-## Credits and data handling {#credits}
+
+### Credits and data handling {#credits}
 
 Strapi AI features consume AI credits.
 
@@ -58,3 +64,9 @@ Strapi AI features consume AI credits.
 All AI requests are processed through Strapi-managed infrastructure. Content is only used temporarily during each request and is not stored outside your instance. Strapi AI follows the same GDPR-aligned framework as Strapi Cloud.
 
  <Icon name="arrow-fat-right" /> See [Usage information > Strapi AI data handling](/cms/usage-information#strapi-ai-data-handling) for more details.
+
+## Strapi MCP server
+
+Strapi includes a built-in [Model Context Protocol (MCP)](https://modelcontextprotocol.io) server that lets AI clients like Claude, Cursor, or any MCP-compatible tool manage your content through natural language. Once enabled and connected, an AI client can create, read, update, delete, publish, and unpublish entries directly through Strapi's Content Manager, all gated by Admin token permissions.
+
+<CustomDocCard icon="feather" title="MCP server" description="Learn how to enable, configure, connect to, and use Strapi's built-in MCP server." link="/cms/features/strapi-mcp-server" />
diff --git a/docusaurus/docs/cms/ai/for-developers.md b/docusaurus/docs/cms/ai/for-developers.md
@@ -104,77 +104,20 @@ This is particularly useful for understanding configuration examples, API respon
 - **`llms-full.txt`**: Use this when you need the AI to have access to the complete documentation content. This is a large file; make sure your model's context window can handle it.
 - **`llms-code.txt`**: Use this when you're working on code and want to give an AI all of Strapi's documented code examples. Each snippet includes the source page URL and anchor for traceability.
 
-## Docs MCP server {#docs-mcp}
+## MCP servers {#mcp}
 
-A [Model Context Protocol (MCP)](https://modelcontextprotocol.io) server for the documentation is available. The Docs MCP server exposes the Strapi documentation to AI coding tools. Connect it to your IDE to get Strapi-aware code suggestions and answers directly in your development environment.
+The [Model Context Protocol (MCP)](https://modelcontextprotocol.io) is an open standard that lets AI tools interact with external services. 2 MCP servers are available for Strapi:
 
-### Compatible tools
-
-The MCP server works with any tool that supports the MCP protocol, including:
-
-- [Cursor](https://cursor.com)
-- [VS Code](https://code.visualstudio.com) with GitHub Copilot
-- [Claude Code](https://docs.anthropic.com/en/docs/claude-code)
-- [Windsurf](https://codeium.com/windsurf)
-- Any other MCP-compatible IDE or tool
-
-### Connection details
-
-When opening the Ask AI window, you should see a **Use MCP** dropdown in the top right corner. Click on it and choose which tool you'd like to connect:
-
-<ThemedImage
-  alt="Ask AI modal with Use MCP options higlighted"
-  sources={{
-    light: '/img/assets/ai/use-mcp-button.png',
-    dark: '/img/assets/ai/use-mcp-button.png',
-  }}
-/>
-
-If manual MCP server configuration is required:
-
-1. Click the **Copy MCP URL** from the dropdown. The server URL should be: `https://strapi-docs.mcp.kapa.ai`
-2. Update the MCP server configuration in your IDE:
-
-    <Tabs>
-    <TabItem value="cursor" label="Cursor">
-
-    Add to your `.cursor/mcp.json` file:
-
-    ```json title=".cursor/mcp.json"
-    {
-      "mcpServers": {
-        "strapi-docs": {
-          "url": "https://strapi-docs.mcp.kapa.ai"
-        }
-      }
-    }
-    ```
-
-    </TabItem>
-    <TabItem value="vscode" label="VS Code">
-
-    Add to your `.vscode/mcp.json` file:
-
-    ```json title=".vscode/mcp.json"
-    {
-      "servers": {
-        "strapi-docs": {
-          "type": "http",
-          "url": "https://strapi-docs.mcp.kapa.ai"
-        }
-      }
-    }
-    ```
-
-    </TabItem>
-    </Tabs>
-
-Once connected, your AI coding assistant can query the Strapi documentation directly to answer questions, suggest implementations, and verify API usage.
+<CustomDocCardsWrapper>
+<CustomDocCard icon="feather" title="Strapi MCP server" description="Connect AI clients to your Strapi instance to manage content through natural language." link="/cms/features/strapi-mcp-server" />
+<CustomDocCard icon="book-open" title="Docs MCP server" description="Connect the Strapi documentation to your IDE for up-to-date, reliable information." link="/cms/ai/docs-mcp-server" />
+</CustomDocCardsWrapper>
 
 ## Tips for better results {#tips}
 
+The following tips will help you fine-tune your prompts to get the best results:
+- Use the [Docs MCP server](/cms/ai/docs-mcp-server) in your IDE for the fastest developer experience. For docs-related questions, prefix your prompt with `Use the strapi-docs MCP server to answer:` so the tool queries docs.strapi.io instead of using potentially outdated training data.
 - Include the page URL so the assistant grounds its answer in the right context.
 - Mention your Strapi version (e.g., Strapi 5) to avoid outdated suggestions.
 - Pair code examples with their source page when sharing snippets from `llms-code.txt`.
 - Prefer documented APIs over private internals when asking for code generation.
-- Use the MCP server in your IDE for the fastest developer experience.
diff --git a/docusaurus/docs/cms/configurations/features.md b/docusaurus/docs/cms/configurations/features.md
@@ -35,16 +35,16 @@ To enable a future flag:
 
 1. (_optional_) If the server is running, stop it with `Ctrl-C`.
 2. Open the `config/features.js|ts` file or create it if the file does not exist yet. The file will export a `future` object with all the future flags to enable.
-3. To enable a future flag, add its property name (see [full list](#available-future-flags)) to the `future` object and ensure the property's value is set to `true`. The following example shows how to enable the `adminTokens` future flag:
+3. To enable a future flag, add its property name (see [full list](#available-future-flags)) to the `future` object and ensure the property's value is set to `true`. The following example shows how to enable the `experimental_firstPublishedAt` future flag:
 
   <Tabs groupId='js-ts'>
 
   <TabItem value="js" label="JavaScript">
 
-  ```ts title="/config/features.ts"
+  ```js title="/config/features.js"
   module.exports = ({ env }) => ({
     future: {
-      adminTokens: env.bool('STRAPI_FUTURE_ADMIN_TOKENS', false),
+      experimental_firstPublishedAt: env.bool('STRAPI_FUTURE_EXPERIMENTAL_FIRST_PUBLISHED_AT', false),
     },
   })
 
@@ -53,27 +53,27 @@ To enable a future flag:
   This example assumes that you have an `.env` environment file at the root of your application and that the file includes the following line:
 
   ```json title=".env"
-  STRAPI_FUTURE_ADMIN_TOKENS=true
+  STRAPI_FUTURE_EXPERIMENTAL_FIRST_PUBLISHED_AT=true
   ```
 
-  If your environment file does not include this value, the `adminTokens` future flag property value will default to `false` and the experimental feature will not be enabled.
+  If your environment file does not include this value, the `experimental_firstPublishedAt` future flag property value will default to `false` and the experimental feature will not be enabled.
 
   </TabItem>
 
   <TabItem value="ts" label="TypeScript">
 
   ```ts title="/config/features.ts"
-  export default {
+  export default ({ env }) => ({
     future: {
-      adminTokens: env.bool('STRAPI_FUTURE_ADMIN_TOKENS', false),
+      experimental_firstPublishedAt: env.bool('STRAPI_FUTURE_EXPERIMENTAL_FIRST_PUBLISHED_AT', false),
     },
-  };
+  });
   ```
 
   This example assumes that you have an `.env` environment file at the root of your application and that the file includes the following line:
 
   ```json title=".env"
-  STRAPI_FUTURE_ADMIN_TOKENS=true
+  STRAPI_FUTURE_EXPERIMENTAL_FIRST_PUBLISHED_AT=true
   ```
 
   If your environment file does not include this value, the `experimental_firstPublishedAt` future flag property value will default to `false` and the experimental feature will not be enabled.
@@ -112,5 +112,4 @@ Developers can use the following APIs to interact with future flags:
 | Property name | Related feature | Suggested environment variable name |
 | ------------- | --------------- | ---------------------------------- |
 | `experimental_firstPublishedAt` | [Draft & Publish](/cms/features/draft-and-publish#recording-the-first-publication-date) | `STRAPI_FUTURE_EXPERIMENTAL_FIRST_PUBLISHED_AT` |
-| `adminTokens` | [Admin Tokens](/cms/features/admin-tokens) | `STRAPI_FUTURE_ADMIN_TOKENS` |
 
diff --git a/docusaurus/docs/cms/faq.md b/docusaurus/docs/cms/faq.md
@@ -23,7 +23,7 @@ tags:
 
 ---
 
-# Frequently Asked Questions
+# Frequently asked questions
 
 Below are answers and solutions to most common issues that you may experience when working with Strapi.
 
@@ -152,5 +152,6 @@ You can see the <ExternalLink to="https://feedback.strapi.io/" text="public road
 
 ## Is there an MCP server for Strapi?
 
-A Strapi MCP (<ExternalLink to="https://www.anthropic.com/news/model-context-protocol" text="Model Context Protocol" />) server is in [development](https://github.com/strapi/strapi/discussions/25398) and will be available soon.
-Meanwhile, a different [MCP server for Strapi Docs](https://docs.strapi.io/cms/ai/for-developers#docs-mcp) is already available.
+Yes. Strapi includes a built-in [Model Context Protocol (MCP)](https://modelcontextprotocol.io) server that exposes content management tools to AI clients. See the [MCP server feature page](/cms/features/strapi-mcp-server) for configuration and usage details.
+
+A separate [Docs MCP server](/cms/ai/docs-mcp-server) is also available for querying the Strapi documentation.