Comfy-Org · comfyui-wiki · Aug 8, 2026 · Aug 8, 2026 · Aug 8, 2026 · Aug 8, 2026
diff --git a/agent-tools/cli.mdx b/agent-tools/cli.mdx
@@ -15,7 +15,7 @@
 import GenerateUpload24hNote from "/snippets/comfy-cli/generate-upload-24h-note.mdx";
 import GenerateVideoAsync from "/snippets/comfy-cli/generate-video-async.mdx";

 [comfy-cli](https://github.com/Comfy-Org/comfy-cli) is Comfy's command-line tool. Alongside [MCP servers](/agent-tools), it gives agents and developers another way to drive Comfy from outside the UI.

 Use it for **terminal or script access**: batch jobs, CI pipelines, workflow automation, and pairing with coding agents via bundled CLI skills.

@@ -27,14 +27,14 @@
 
 ## How it fits with MCP
 
-| | Comfy Cloud MCP | Comfy CLI |
+| | Comfy MCP (cloud) | Comfy CLI |
 |---|---|---|
 | **Interface** | Chat with an MCP client (Claude Code, Claude Desktop, …) | Terminal commands and scripts |
 | **Best for** | Interactive agent workflows in chat | Automation, batch runs, CI, shell pipelines |
 | **Auth** | OAuth in MCP clients, or API key (headless) | `comfy cloud login` (OAuth) or API key (CI) |
 | **Output** | Returned in the chat session | Saved to disk (`--download`) or JSON (`--json`) |
 
-For MCP setup, installation, tool lists, and auth methods, see [Comfy Cloud MCP](/agent-tools/mcp).
+For MCP setup, installation, tool lists, and auth methods, see [Comfy MCP](/agent-tools/mcp).
 
 ## What the CLI does
 
@@ -134,9 +134,9 @@

 | Resource | What it's for |
 |---|---|
 | [Comfy CLI getting started](/comfy-cli/getting-started) | **Complete** install guide and command walkthrough |
 | [Comfy CLI reference](/comfy-cli/reference) | Commands, flags, and model aliases |
-| [Comfy Cloud MCP](/agent-tools/mcp) | Connect agents via MCP for chat-driven generation |
+| [Comfy MCP](/agent-tools/mcp) | Connect agents via MCP for chat-driven generation |
 | [comfy-cli on GitHub](https://github.com/Comfy-Org/comfy-cli) | Source repo, issues, and latest behavior |
 
 ## Feedback

diff --git a/agent-tools/in-app-agent.mdx b/agent-tools/in-app-agent.mdx
@@ -1,20 +1,20 @@
 ---
 title: "Comfy In-App Agent"
 sidebarTitle: "In-App Agent"
 description: "Join the private alpha waitlist for Comfy In-App Agent on Comfy Cloud."
 icon: "comments"
 ---

 <Note>
   **Private alpha.** Comfy In-App Agent is rolling out to a limited set of users. Public docs and website pages are not available yet. Join the waitlist to request access.
 </Note>
 
-**Comfy In-App Agent** is the agent experience inside Comfy Cloud: prompt in chat, and the agent can build or edit workflows on your graph (with confirmation before generation).
+**Comfy In-App Agent** is the agent experience inside Comfy Cloud: prompt in chat, and the agent can build or edit workflows on your graph.
 
 ## Join the waitlist
 
 <Card title="Join the alpha waitlist" icon="list" href="https://links.comfy.org/agentalpha">
-  Request access to Comfy In-App Agent private alpha.
+  Request access to the Comfy In-App Agent private alpha.
 </Card>
 
 ## Feedback
@@ -30,10 +30,10 @@
 Looking for agent tools that work from Claude, Cursor, Codex, and other MCP clients (outside the ComfyUI canvas)?
 
 <CardGroup cols={2}>
-  <Card title="Comfy Cloud MCP" icon="cloud" href="/agent-tools/mcp">
-    Connect external MCP clients to Comfy Cloud for generation, search, and workflows.
+  <Card title="Comfy MCP" icon="bolt" href="/agent-tools/mcp">
+    Connect external MCP clients to ComfyUI for generation, search, and workflows.
   </Card>
-  <Card title="Agent Tools / MCP overview" icon="robot" href="/agent-tools">
-    Compare Cloud MCP, Local MCP, and Comfy CLI.
+  <Card title="Agent Tools overview" icon="robot" href="/agent-tools">
+    Compare the cloud connection, the local connection, and the In-App Agent.
   </Card>
 </CardGroup>
diff --git a/agent-tools/index.mdx b/agent-tools/index.mdx
@@ -1,66 +1,36 @@
 ---
-title: "Agent Tools / MCP"
-description: "Connect AI agents to ComfyUI via the Model Context Protocol (MCP) for image, video, audio, and 3D content generation."
+title: "Agent Tools"
+description: "Leverage AI agents to use ComfyUI smarter and faster. Comfy MCP, Comfy CLI, and the Comfy In-App Agent."
 sidebarTitle: "Overview"
 icon: "robot"
 ---
 
-ComfyUI provides **MCP servers** and **Comfy CLI** so AI agents and developers can generate images, video, audio, and 3D content without always opening the ComfyUI canvas.
-
-<Note>
-  **Comfy Cloud MCP is in public beta.** Setup, feedback channels, and related tools (Comfy Skills, Comfy CLI) are on the [Comfy Cloud MCP](/agent-tools/mcp) page.
-</Note>
-
-<Note>
-  **Comfy In-App Agent is in private alpha.** Full docs are not public yet. [Join the waitlist](/agent-tools/in-app-agent) to request access.
-</Note>
-
 <CardGroup cols={2}>
-  <Card title="Comfy Cloud MCP" icon="cloud" href="/agent-tools/mcp">
-    Connect to the hosted MCP server at <code>cloud.comfy.org/mcp</code>. Generate images, video, audio, and 3D on Cloud GPUs, search templates/models/nodes, run workflows, and share saved workflows from chat.
+  <Card title="Comfy MCP" icon="bolt" href="/agent-tools/mcp">
+    Connect any AI agent to ComfyUI, on Comfy Cloud or on your own machine. **Start here.**
   </Card>
   <Card title="Comfy In-App Agent" icon="comments" href="/agent-tools/in-app-agent">
     Agent experience inside Comfy Cloud (chat builds and edits your graph). *Private alpha; waitlist only for now.*
   </Card>
-  <Card title="Comfy Local MCP" icon="server" href="/agent-tools/local">
-    First-party local MCP server that drives your **own** ComfyUI install via <code>comfy-cli</code>. *Private test; not publicly available yet.*
-  </Card>
   <Card title="Comfy CLI" icon="terminal" href="/agent-tools/cli">
-    Short agent-oriented overview of <code>comfy generate</code>. For the complete CLI guide, see [Getting started](/comfy-cli/getting-started).
+    ComfyUI in the terminal. Install and update ComfyUI, manage models and nodes, and generate from scripts, CI, or batch jobs.
   </Card>
 </CardGroup>
 
 ---
 
-## Which One Should I Use?
+## Which one should I use?
 
-| | Comfy Cloud MCP | Comfy Local MCP | Comfy CLI |
+| | Comfy MCP<br />Cloud Connection | Comfy MCP<br />Local Connection | Comfy In-App Agent |
 |---|---|---|---|
-| **Type** | Remote (hosted) | Local MCP server | Local CLI |
-| **Requires** | Comfy Cloud subscription | Local ComfyUI + [comfy-cli](https://github.com/Comfy-Org/comfy-cli) | [Comfy API key](/development/api-development/getting-an-api-key) |
-| **Models** | Comfy Cloud models (pre-installed) | Your local models and custom nodes | Partner nodes via `comfy generate` |
-| **Workflows** | Full ComfyUI workflow execution | Full local ComfyUI workflow execution | One-shot partner API calls (no workflow JSON) |
-| **GPU** | Cloud GPUs (no local GPU needed) | Your local GPU | No GPU needed (API-based) |
-| **Best for** | Chat-driven agents, template search | Driving your own local ComfyUI from chat | Scripts, CI, batch jobs |
-
----
-
-## What about local ComfyUI?
-
-Want to drive a **local** ComfyUI install with an agent instead of (or alongside) Comfy Cloud MCP? See [**Comfy Local MCP**](/agent-tools/local) for our first-party local MCP server, setup, and client configuration. It is in **private test** and not publicly available yet.
-
-**Community MCP servers.** Several community projects also connect MCP clients to a local ComfyUI instance:
-
-| Project | Repository |
-| --- | --- |
-| comfyui-mcp | [artokun/comfyui-mcp](https://github.com/artokun/comfyui-mcp) |
-| comfyui-mcp | [shawnrushefsky/comfyui-mcp](https://github.com/shawnrushefsky/comfyui-mcp) |
-| comfyui-mcp-server | [joenorton/comfyui-mcp-server](https://github.com/joenorton/comfyui-mcp-server) |
-| comfy-mcp-server | [lalanikarim/comfy-mcp-server](https://github.com/lalanikarim/comfy-mcp-server) |
-
-These are **community-maintained**. We link them for convenience; support, features, and compatibility vary by project.
-
-**Want a terminal workflow instead of chat?** See [Comfy CLI](/agent-tools/cli) (`comfy generate`, beta) for scripts and automation. To install and launch local ComfyUI from the terminal, start with [Comfy CLI getting started](/comfy-cli/getting-started).
+| **What is it** | Run Comfy Cloud workflows with your own agent. | Drive your own local ComfyUI with your own agent. | Chat with AI inside the app and watch it build and run workflows for you. |
+| **Best for** | Beginners who don't want to set up ComfyUI locally.<br />People who want to share workflows. | People who have ComfyUI locally.<br />People who have private custom nodes.<br />People who need to interact with the local file system. | Everyone from beginners to advanced workflow builders.<br />People who want to see the canvas and check workflows visually. |
+| **Requires** | Your own agent.<br />An active Comfy Cloud subscription. | Your own agent.<br />A local ComfyUI setup. | No setup.<br />An active Comfy Cloud subscription. |
+| **GPU** | Cloud GPUs (no hardware requirements) | Your local GPU | Cloud GPUs (no hardware requirements) |
+| **Models** | Comfy Cloud models.<br />You can import your own models. | Local models downloaded to your machine. | Comfy Cloud models.<br />You can import your own models. |
+| **Custom nodes** | The custom nodes supported on Comfy Cloud. | You can install any custom node. | The custom nodes supported on Comfy Cloud. |
+
+Both MCP columns are the **same product and the same page**. See [Comfy MCP](/agent-tools/mcp) to pick one. You can connect both at once.
 
 ---
 

diff --git a/agent-tools/local.mdx b/agent-tools/local.mdx