pulumi · adamgordonbell · Jul 8, 2026 · Jul 3, 2026 · Jul 3, 2026 · Jul 3, 2026
diff --git a/AGENTS.md b/AGENTS.md
@@ -92,6 +92,16 @@ The left nav is data-driven from `data/docs_menu_sections.yml`, which is consume
 
 ---
 
+## AI and agent positioning
+
+Pulumi supports the full spectrum of AI agents, and content must never present Neo as the only way to use AI with Pulumi or frame Neo as an either-or choice against other coding agents.
+
+- **Docs** (`content/docs/`, `content/what-is/`, `content/tutorials/`): community-centric and balanced. Third-party coding agents (Claude Code, Codex, Cursor, GitHub Copilot, etc.) working with Pulumi — through IaC, [Agent Skills](/docs/ai/skills/), and the [Pulumi MCP server](/docs/ai/mcp-server/) — are first-class. Neo is Pulumi's purpose-built infrastructure agent: the deepest integration and the fastest path to a great infrastructure agent out of the box, but one option on a spectrum, and most teams benefit from using both.
+- **Product/marketing pages** (`content/product/`, homepage): may lead with Neo and sell it hard, but should still acknowledge that Pulumi's code-first approach works with the agent a reader already uses. Avoid copy that disparages other agents (e.g. "unlike generic AI tools").
+- **When listing agent options** (e.g. in migration guides), follow the pattern in `content/docs/iac/guides/migration/migrating-to-pulumi/from-terraform.md`: list Neo alongside Claude Code, Cursor, and Codex as equally legitimate choices, with at most a light note on Neo's built-in advantage.
+
+---
+
 ## Resource options
 
 The reference pages under `content/docs/iac/concepts/resources/options/` show a classification callout (custom resource / component resource / both, plus per-SDK enforcement) rendered by the `resource-option-scope` shortcode. The classification data — and the summary table on that section's `_index.md` — is generated from `data/resource_options.yaml`, which is the single source of truth. **When you add a new resource option, you must add an entry to `data/resource_options.yaml` and place the `{{< resource-option-scope "<name>" >}}` shortcode on the new page.** That file's header comment is the authoritative step-by-step checklist; the build fails if a page references an option missing from the data file.

diff --git a/content/_index.md b/content/_index.md
@@ -271,7 +271,7 @@ sections:
       - image: /images/home/ai-card-image.svg
         image_alt: AI for infrastructure illustration
         title: AI for infrastructure
-        description: Generate, debug, and refactor your infrastructure code with built-in best practices and full organizational context.
+        description: Bring your own coding agent — or use Pulumi Neo — to generate, debug, and refactor infrastructure code with built-in best practices and full organizational context.
     anchor: platform
 
   - type: testimonial
@@ -294,7 +294,7 @@ sections:
         cta_link: /product/infrastructure-as-code/
       - title: Meet Neo, your AI platform engineer
         description: |
-          The first AI agent built for infrastructure. Pulumi Neo understands your code and organizational context, respects your policies, and executes complex tasks end-to-end — with or without a human in the loop.
+          The first AI agent built for infrastructure. Pulumi Neo understands your code and organizational context, respects your policies, and executes complex tasks end-to-end — with or without a human in the loop. It works alongside the coding agents you already use.
         image: /images/home/neo-card-image.svg
         image_alt: Pulumi Neo AI platform engineer
         cta_text: Learn more about Neo

diff --git a/content/docs/_index.md b/content/docs/_index.md
@@ -31,6 +31,10 @@ sections:
     heading: Infrastructure as Code
     description: Define and manage cloud infrastructure using TypeScript, Python, Go, .NET, Java, and YAML.
     link: /docs/iac/
+  - icon: pulumi-neo
+    heading: Infrastructure AI
+    description: Bring your own coding agent or use Pulumi Neo, the purpose-built infrastructure agent.
+    link: /docs/ai/
   - icon: rocket-launch
     heading: Deployments & Workflows
     description: Cloud-hosted deployments, drift detection, state management, and automation.
@@ -51,10 +55,6 @@ sections:
     heading: Internal Developer Platform
     description: Self-service infrastructure with templates, guardrails, and developer portals.
     link: /docs/idp/
-  - icon: pulumi-neo
-    heading: Infrastructure AI
-    description: Infrastructure automation with Pulumi Neo and natural language assistance.
-    link: /docs/ai/
 - type: button-cards
   heading: Learning Resources
   cards:

diff --git a/content/docs/administration/organizations-teams/agent-accounts.md b/content/docs/administration/organizations-teams/agent-accounts.md
@@ -76,5 +76,7 @@ In these cases, the CLI uses the existing credentials. If multiple agents run on
 ## See also
 
 - [Pulumi Cloud accounts](/docs/administration/organizations-teams/accounts/)
+- [Pulumi Agent Skills](/docs/ai/skills/)
+- [Pulumi MCP server](/docs/ai/mcp-server/)
 - [The agentic infrastructure era](/blog/the-agentic-infrastructure-era/) (blog post)
 - [Direct resource operations](/docs/iac/cli/direct-resource-operations/)
diff --git a/content/docs/ai/_index.md b/content/docs/ai/_index.md
@@ -1,13 +1,13 @@
 ---
 title_tag: "Infrastructure AI"
-meta_desc: Pulumi Neo enables conversational infrastructure management through natural language interactions with purpose-built automation agents.
+meta_desc: Use AI agents with Pulumi. Bring Claude Code, Codex, or Cursor via Agent Skills and the MCP server, or use Neo, the purpose-built infrastructure agent.
 title: Infrastructure AI
 linktitle: Infrastructure AI
 docs_home: true
 notitle: true
 norightnav: true
 h1: Infrastructure AI
-description: <p>Pulumi Neo provides AI-powered infrastructure automation with natural language assistance for platform engineering tasks.</p>
+description: <p>Pulumi works with the AI agents you already use and provides Neo, a purpose-built infrastructure agent, for the deepest integration.</p>
 aliases:
 - /docs/pulumi-cloud/neo/
 - /docs/iac/neo/
@@ -27,12 +27,32 @@ sections:
 - type: flat
   heading: Overview
   description_md: |
-    Pulumi Neo is an AI agent that enables platform engineers to make natural language requests for routine tasks, analysis, and infrastructure management. Rather than writing code or running CLI commands for every operation, you can describe what you need and let Neo handle the implementation.
+    Pulumi is built to be driven by AI agents, including the coding agents your team already uses. Because Pulumi infrastructure is real code with a verifiable plan for every change, agents like Claude Code, Codex, Cursor, and GitHub Copilot can write, preview, and deploy it directly. The [Pulumi CLI](/docs/iac/cli/) is designed for them: run any command with `npx pulumi`, perform one-shot resource operations with [`pulumi do`](/docs/iac/cli/direct-resource-operations/), and parse structured `--json` output. [Pulumi Agent Skills](/docs/ai/skills/) teach agents proven Pulumi workflows, the [Pulumi MCP server](/docs/ai/mcp-server/) offers the same reach over MCP, and [agent accounts](/docs/administration/organizations-teams/agent-accounts/) remove signup friction entirely.
 
-    Neo works across your entire infrastructure, understanding dependencies and creating execution plans that go through pull requests for review, ensuring human oversight while automating complex multi-step workflows.
+    Pulumi Neo is Pulumi's own infrastructure agent. It ships with these skills built in, and adds organizational context, policy guardrails, human-in-the-loop approvals, and scheduled autonomous work. Use your favorite agent, use Neo, or use both together: Neo for long-running, governed infrastructure tasks, and your coding agent for interactive development.
 
 - type: button-cards
-  heading: Getting started
+  heading: Bring your own agent
+  cards:
+  - icon: lightbulb
+    heading: Agent Skills
+    link: /docs/ai/skills/
+    description: Teach Claude Code, Codex, Cursor, Copilot, and other agents Pulumi workflows.
+  - icon: terminal
+    heading: Pulumi CLI
+    link: /docs/iac/cli/
+    description: An agent-friendly CLI, from npx pulumi and pulumi do to structured JSON output.
+  - icon: plug
+    heading: MCP server
+    link: /docs/ai/mcp-server/
+    description: Give any MCP-capable agent access to your Pulumi Cloud resources and the Registry.
+  - icon: rocket-launch
+    heading: Agent Accounts
+    link: /docs/administration/organizations-teams/agent-accounts/
+    description: Ephemeral Pulumi Cloud accounts provisioned automatically for AI agents.
+
+- type: button-cards
+  heading: Pulumi Neo
   cards:
   - icon: rocket-launch
     heading: Get Started
@@ -46,6 +66,10 @@ sections:
     heading: Pull Requests
     link: /docs/ai/pull-requests/
     description: AI-proposed changes submitted as pull requests for review.
+  - icon: list-checks
+    heading: Code Reviews
+    link: /docs/ai/code-reviews/
+    description: Neo reviews your pull requests against what Pulumi Cloud knows about your running infrastructure.
   - icon: eye
     heading: Previews
     link: /docs/ai/running-previews/
@@ -55,7 +79,7 @@ sections:
     link: /docs/ai/integrations/
     description: Connect Neo to external services, cloud CLIs, GitHub, and Slack.
   - icon: terminal
-    heading: Pulumi CLI
+    heading: Neo in the CLI
     link: /docs/ai/pulumi-cli/
     description: Run pulumi neo to start an interactive Neo session in your terminal.
   - icon: clock

diff --git a/content/docs/ai/get-started/_index.md b/content/docs/ai/get-started/_index.md
@@ -9,7 +9,7 @@ aliases:
 - /docs/ai/neo/get-started/
 menu:
     ai:
-        name: Get Started
+        name: Get started with Neo
         parent: ai-home
         weight: 10
         identifier: ai-get-started

diff --git a/content/docs/ai/integrations/mcp/_index.md b/content/docs/ai/integrations/mcp/_index.md
@@ -1,18 +1,21 @@
 ---
-title: MCP Integrations
-title_tag: Neo MCP Integrations
-h1: MCP Integrations
+title: External MCP Servers
+title_tag: Neo External MCP Server Integrations
+h1: External MCP Servers
 meta_desc: Connect Neo to external services through Model Context Protocol servers, bringing issue tracker, observability, and runbook context into Neo tasks.
 menu:
     ai:
-        name: MCP Integrations
+        name: External MCP servers
         parent: ai-integrations
         weight: 0
         identifier: ai-integrations-mcp
 ---
 
 MCP integrations connect Neo to external services that expose a [Model Context Protocol](https://modelcontextprotocol.io/) server. Once connected, Neo can use those services as tools during a [task](/docs/ai/tasks/), with credentials managed centrally in Pulumi Cloud.
 
+> [!INFO]
+> This page is about connecting Neo to other services' MCP servers. To connect your own AI agent (Claude Code, Cursor, and others) to Pulumi, see the [Pulumi MCP server](/docs/ai/mcp-server/).
+
 MCP integrations are configured at the organization level by an administrator. Once enabled, they are available to all Neo tasks in the organization.
 
 ## What you can do with MCP integrations

diff --git a/content/docs/ai/mcp-server/index.md b/content/docs/ai/mcp-server/index.md
@@ -7,15 +7,18 @@ menu:
     ai:
         name: MCP server
         parent: ai-home
-        weight: 70
+        weight: 8
 aliases:
 - /docs/iac/using-pulumi/mcp-server/
 - /docs/iac/guides/mcp-server.md
 - /docs/iac/using-pulumi/mcp-server/index/
 - /docs/iac/guides/ai-integration/mcp-server/
 ---
 
-The Pulumi Model Context Protocol (MCP) server enables AI-powered coding assistants to access your Pulumi Cloud resources and delegate infrastructure tasks to [Pulumi Neo](/docs/pulumi-cloud/neo/). This integration allows you to query your cloud infrastructure, search for resources, and launch automated infrastructure workflows - all from within the AI assistant of your choice.
+The Pulumi Model Context Protocol (MCP) server enables AI-powered coding assistants to access your Pulumi Cloud resources, generate infrastructure code, and optionally delegate tasks to [Pulumi Neo](/docs/pulumi-cloud/neo/). This integration allows you to query your cloud infrastructure, search for resources, and launch automated infrastructure workflows - all from within the AI assistant of your choice.
+
+> [!INFO]
+> This page is about connecting your own AI agent to Pulumi. For the opposite direction, connecting Neo to other services' MCP servers (Jira, Datadog, and others), see [External MCP servers](/docs/ai/integrations/mcp/).
 
 ## What is the Pulumi MCP server?
 
@@ -423,6 +426,9 @@ If `neo-bridge` fails to launch tasks:
 
 ## Learn more
 
+- [Pulumi Agent Skills](/docs/ai/skills/) - teach your agent proven Pulumi workflows
+- [Agent accounts](/docs/administration/organizations-teams/agent-accounts/) - ephemeral Pulumi Cloud accounts provisioned automatically for agents
+- [What is agentic infrastructure?](/what-is/what-is-agentic-infrastructure/)
 - [Pulumi Neo documentation](/docs/pulumi-cloud/neo/)
 - [Model Context Protocol specification](https://modelcontextprotocol.io)
 - [Pulumi Registry](/registry/)

diff --git a/content/docs/ai/pulumi-cli/_index.md b/content/docs/ai/pulumi-cli/_index.md
@@ -5,7 +5,7 @@ h1: Neo in the Pulumi CLI
 meta_desc: Run pulumi neo to start an interactive Neo session in your terminal with access to your local project, credentials, and stacks.
 menu:
     ai:
-        name: Pulumi CLI
+        name: Neo in the CLI
         identifier: ai-pulumi-cli
         parent: ai-home
         weight: 15

diff --git a/content/docs/ai/skills/index.md b/content/docs/ai/skills/index.md
@@ -7,7 +7,7 @@ menu:
     ai:
         name: Agent Skills
         parent: ai-home
-        weight: 60
+        weight: 5
 aliases:
 - /docs/ai/agent-skills/
 ---
@@ -197,3 +197,9 @@ We welcome contributions to Pulumi Agent Skills. Visit the [agent-skills reposit
 - Report issues
 
 See the [CONTRIBUTING.md](https://github.com/pulumi/agent-skills/blob/main/CONTRIBUTING.md) file for guidelines.
+
+## See also
+
+- [Pulumi MCP server](/docs/ai/mcp-server/) - give your agent live access to your Pulumi Cloud resources and the Registry
+- [Agent accounts](/docs/administration/organizations-teams/agent-accounts/) - ephemeral Pulumi Cloud accounts provisioned automatically for agents
+- [What is agentic infrastructure?](/what-is/what-is-agentic-infrastructure/) - the broader picture of AI agents operating infrastructure
diff --git a/content/docs/install/_index.md b/content/docs/install/_index.md
@@ -527,6 +527,8 @@ For Cursor, GitHub Copilot, VS Code, Codex, Gemini and other platforms, use the
 npx skills add pulumi/agent-skills --skill '*'
 ```
 
+You can also connect your assistant to the [Pulumi MCP server](/docs/ai/mcp-server/) for live access to your Pulumi Cloud stacks, resources, and the Pulumi Registry.
+
 ## Installing betas and previous versions
 
 Most installation methods choose the latest version by default. To install a specific version, use the following commands. You can find the list of versions on the [Available versions](/docs/install/versions/) page.

diff --git a/content/product/_index.md b/content/product/_index.md
@@ -49,7 +49,7 @@ sections:
     tag_line: Infrastructure AI
     title: Meet Neo, your AI platform engineer
     description: |
-      The industry's first AI agent purpose-built for infrastructure. Neo handles complex tasks, debugs deployments, and generates code for new and existing cloud resources.
+      Pulumi works with the coding agents your team already uses — Claude Code, Codex, Cursor, and more. Neo is the industry's first AI agent purpose-built for infrastructure: it handles complex tasks, debugs deployments, and generates code for new and existing cloud resources.
     cta_text: Meet Pulumi Neo
     cta_link: /product/neo/
     image: /images/product/overview/overview-neo.svg

diff --git a/content/product/neo.md b/content/product/neo.md
@@ -33,7 +33,7 @@ sections:
     description: |
       **Enterprise-grade AI for cloud automation.**
 
-      Neo is the industry's first AI agent built from the ground up to execute, govern, and optimize complex cloud automation at enterprise scale. Unlike generic AI tools, Neo understands infrastructure dependencies, respects your policies, and works within your existing Pulumi governance.
+      Pulumi's code-first platform already works great with the coding agents your team loves — Claude Code, Codex, Cursor, and more — and our [agent skills](/docs/ai/skills/) make them even better. Want the best infrastructure agent right out of the box? That's Neo: the industry's first AI agent built from the ground up to execute, govern, and optimize complex cloud automation at enterprise scale. Neo understands infrastructure dependencies, respects your policies, and works within your existing Pulumi governance.
     cards:
       - icon: code
         title: Faster provisioning