junobuild · peterpeterparker · Apr 16, 2026 · Apr 16, 2026 · Apr 16, 2026 · Apr 16, 2026
diff --git a/.llms-snapshots/llms-full.txt b/.llms-snapshots/llms-full.txt
@@ -6683,7 +6683,10 @@ It’s a great reference for more advanced setups and orchestration.
 
 # Using Juno with AI
 
-If you're using AI to build with Juno, you can use our `llms.txt` files to help AI tools better understand the platform.
+Juno provides several ways to integrate with AI tools, from documentation context files to a full MCP server for managing your project through natural language.
+
+*   ([LLMs.txt](#llmstxt)): help AI tools better understand the platform
+*   ([MCP Server](#mcp-server)): interact with Juno directly from your AI tool
 
 ---
 
@@ -6733,14 +6736,53 @@ Type `@Docs` in chat to view available docs and select the Juno entries to begin
 
 **Important:**
 
-You must reference the Juno docs in chat using `@Docs` — Cursor won't use them otherwise.
+You must reference the Juno docs in chat using `@Docs` - Cursor won't use them otherwise.
 
 For example, you could start a conversation with: _I want to create a web shop app with Next.js using @Juno and @Juno (full)._
 
 #### Resources
 
 Read more in the [Cursor documentation](https://docs.cursor.com/context/@-symbols/@-docs).
 
+---
+
+## MCP Server
+
+A [Model Context Protocol (MCP)](https://modelcontextprotocol.io/) server for Juno is available, built and maintained by a Juno community contributor. It allows MCP-compatible AI tools - such as Claude, Cursor, or VS Code Copilot - to interact with Juno directly through natural language.
+
+It provides tools to manage identity, config, hosting, serverless functions, and changes - with built-in access to Juno's documentation. Long-running operations like deploys and publishes support real-time progress streaming.
+
+**Note:**
+
+This is a community-maintained project. It is not part of the core, but we absolutely 💙 it!
+
+### Setup
+
+Follow these steps to connect the MCP server to your AI tool of choice.
+
+#### 1\. Add to your MCP client
+
+No install needed - `npx` handles downloading automatically.
+
+```
+{  "mcpServers": {    "junobuild": {      "command": "npx",      "args": ["-y", "junobuild-mcp-server"]    }  }}
+```
+
+#### 2\. Authenticate the Juno CLI
+
+The server wraps the [Juno CLI](/docs/reference/cli.md), which must be installed and authenticated:
+
+```
+npm i -g @junobuild/clijuno login
+```
+
+Once configured, you can interact with Juno directly through your AI tool. Just describe what you want in natural language - for example, _"deploy my satellite"_ or _"list my pending changes"_ - and the AI will call the right tools automatically.
+
+### Resources
+
+*   [npm package](https://www.npmjs.com/package/junobuild-mcp-server)
+*   [Source repository](https://github.com/nami2111/junobuild-mcp)
+
 # Angular
 
 Explore how to create a Juno project developed with Angular.

diff --git a/.llms-snapshots/llms.txt b/.llms-snapshots/llms.txt
@@ -104,7 +104,7 @@ Juno is your self-contained serverless platform for building full-stack web apps
 
 ## Guides
 
-- [AI](https://juno.build/docs/guides/ai.md): Learn how to use Juno's llms.txt files to provide AI tools with better context for building serverless functions, deploying Satellites, and integrating the SDK.
+- [AI](https://juno.build/docs/guides/ai.md): Learn how to use Juno with AI tools, from llms.txt files for better context to an MCP server for managing your project through natural language.
 - [Angular](https://juno.build/docs/guides/angular.md): Explore how to create a Juno project developed with Angular.
 - [Astro](https://juno.build/docs/guides/astro.md): Explore how to create a Juno project developed with Astro.
 - [Docusaurus](https://juno.build/docs/guides/docusaurus.md): Explore how to deploy a Juno project developed with Docusaurus.

diff --git a/docs/guides/ai.md b/docs/guides/ai.md
@@ -1,12 +1,15 @@
 ---
 id: ai
 title: AI
-description: Learn how to use Juno's llms.txt files to provide AI tools with better context for building serverless functions, deploying Satellites, and integrating the SDK.
+description: Learn how to use Juno with AI tools, from llms.txt files for better context to an MCP server for managing your project through natural language.
 ---
 
 # Using Juno with AI
 
-If you're using AI to build with Juno, you can use our `llms.txt` files to help AI tools better understand the platform.
+Juno provides several ways to integrate with AI tools, from documentation context files to a full MCP server for managing your project through natural language.
+
+- [LLMs.txt](#llmstxt): help AI tools better understand the platform
+- [MCP Server](#mcp-server): interact with Juno directly from your AI tool
 
 ---
 
@@ -58,7 +61,7 @@ Type `@Docs` in chat to view available docs and select the Juno entries to begin
 
 :::important
 
-You must reference the Juno docs in chat using `@Docs` — Cursor won't use them otherwise.
+You must reference the Juno docs in chat using `@Docs` - Cursor won't use them otherwise.
 
 :::
 
@@ -67,3 +70,52 @@ For example, you could start a conversation with: _I want to create a web shop a
 #### Resources
 
 Read more in the [Cursor documentation](https://docs.cursor.com/context/@-symbols/@-docs).
+
+---
+
+## MCP Server
+
+A [Model Context Protocol (MCP)](https://modelcontextprotocol.io/) server for Juno is available, built and maintained by a Juno community contributor. It allows MCP-compatible AI tools - such as Claude, Cursor, or VS Code Copilot - to interact with Juno directly through natural language.
+
+It provides tools to manage identity, config, hosting, serverless functions, and changes - with built-in access to Juno's documentation. Long-running operations like deploys and publishes support real-time progress streaming.
+
+:::note
+
+This is a community-maintained project. It is not part of the core, but we absolutely 💙 it!
+
+:::
+
+### Setup
+
+Follow these steps to connect the MCP server to your AI tool of choice.
+
+#### 1. Add to your MCP client
+
+No install needed - `npx` handles downloading automatically.
+
+```json
+{
+  "mcpServers": {
+    "junobuild": {
+      "command": "npx",
+      "args": ["-y", "junobuild-mcp-server"]
+    }
+  }
+}
+```
+
+#### 2. Authenticate the Juno CLI
+
+The server wraps the [Juno CLI](/docs/reference/cli), which must be installed and authenticated:
+
+```bash
+npm i -g @junobuild/cli
+juno login
+```
+
+Once configured, you can interact with Juno directly through your AI tool. Just describe what you want in natural language - for example, _"deploy my satellite"_ or _"list my pending changes"_ - and the AI will call the right tools automatically.
+
+### Resources
+
+- [npm package](https://www.npmjs.com/package/junobuild-mcp-server)
+- [Source repository](https://github.com/nami2111/junobuild-mcp)