README.md

@@ -32,7 +32,7 @@ npx bmad-method install
 
 > If you are getting a stale beta version, use: `npx bmad-method@6.0.1 install`
 
-Follow the installer prompts, then open your AI IDE (Claude Code, Cursor, etc.) in your project folder.
+Follow the installer prompts, then open your AI IDE (Claude Code, Codex, Windsurf, etc.) in your project folder.
 
 **Non-Interactive Installation** (for CI/CD):
 

docs/how-to/established-projects.md

@@ -12,7 +12,7 @@ This guide covers the essential workflow for onboarding to existing projects wit
 :::note[Prerequisites]
 - BMad Method installed (`npx bmad-method install`)
 - An existing codebase you want to work on
-- Access to an AI-powered IDE (Claude Code or Cursor)
+- Access to an AI-powered IDE (Claude Code, Cursor, or Windsurf)
 :::
 
 ## Step 1: Clean Up Completed Planning Artifacts

docs/how-to/install-bmad.md

@@ -18,7 +18,7 @@ If you want to use a non interactive installer and provide all install options o
 :::note[Prerequisites]
 - **Node.js** 20+ (required for the installer)
 - **Git** (recommended)
-- **AI tool** (Claude Code, Cursor, or similar)
+- **AI tool** (Claude Code, Cursor, Windsurf, or similar)
 :::
 
 ## Steps
@@ -49,6 +49,8 @@ Pick which AI tools you use:
 
 - Claude Code
 - Cursor
+- Windsurf
+- Kiro
 - Others
 
 Each tool has its own way of integrating commands. The installer creates tiny prompt files to activate workflows and agents — it just puts them where your tool expects to find them.

docs/how-to/non-interactive-installation.md

@@ -59,7 +59,7 @@ Check the [BMad registry](https://github.com/bmad-code-org) for available extern
 
 Available tool IDs for the `--tools` flag:
 
-**Preferred:** `claude-code`, `cursor`
+**Preferred:** `claude-code`, `cursor`, `windsurf`
 
 Run `npx bmad-method install` interactively once to see the full current list of supported tools, or check the [platform codes configuration](https://github.com/bmad-code-org/BMAD-METHOD/blob/main/tools/cli/installers/lib/ide/platform-codes.yaml).
 

docs/how-to/quick-fixes.md

@@ -16,7 +16,7 @@ Use the **DEV agent** directly for bug fixes, refactorings, or small targeted ch
 
 :::note[Prerequisites]
 - BMad Method installed (`npx bmad-method install`)
-- An AI-powered IDE (Claude Code, Cursor, or similar)
+- An AI-powered IDE (Claude Code, Cursor, Windsurf, or similar)
 :::
 
 ## Choose Your Approach

docs/index.md

@@ -39,7 +39,9 @@ BMad works with any AI coding assistant that supports custom system prompts or p
 
 - **[Claude Code](https://code.claude.com)** — Anthropic's CLI tool (recommended)
 - **[Cursor](https://cursor.sh)** — AI-first code editor
-- **[Codex CLI](https://github.com/openai/codex)** — OpenAI's terminal coding agent
+- **[Windsurf](https://codeium.com/windsurf)** — Codeium's AI IDE
+- **[Kiro](https://kiro.dev)** — Amazon's AI-powered IDE
+- **[Roo Code](https://roocode.com)** — VS Code extension
 
 You should be comfortable with basic software development concepts like version control, project structure, and agile workflows. No prior experience with BMad-style agent systems is required—that's what these docs are for.
 

docs/tutorials/getting-started.md

@@ -16,7 +16,7 @@ Build software faster using AI-powered workflows with specialized agents that gu
 :::note[Prerequisites]
 - **Node.js 20+** — Required for the installer
 - **Git** — Recommended for version control
-- **AI-powered IDE** — Claude Code, Cursor, or similar
+- **AI-powered IDE** — Claude Code, Cursor, Windsurf, or similar
 - **A project idea** — Even a simple one works for learning
 :::
 

src/bmm/workflows/3-solutioning/create-architecture/steps/step-03-starter.md

@@ -232,6 +232,7 @@ Prepare the content to append to the document:
 ```bash
 {{full_starter_command_with_options}}
 ```
+````
 
 **Architectural Decisions Provided by Starter:**
 
@@ -255,7 +256,7 @@ Prepare the content to append to the document:
 
 **Note:** Project initialization using this command should be the first implementation story.
 
-````
+```
 
 ### 9. Present Content and Menu
 

tools/cli/installers/lib/ide/codex.js

@@ -14,7 +14,7 @@ const prompts = require('../../../lib/prompts');
  */
 class CodexSetup extends BaseIdeSetup {
   constructor() {
-    super('codex', 'Codex', false);
+    super('codex', 'Codex', true); // preferred IDE
   }
 
   /**

tools/cli/installers/lib/ide/platform-codes.yaml

@@ -168,7 +168,7 @@ platforms:
 
   windsurf:
     name: "Windsurf"
-    preferred: false
+    preferred: true
     category: ide
     description: "AI-powered IDE with cascade flows"
     installer:

tools/cli/lib/ui.js

@@ -582,7 +582,7 @@ class UI {
   /**
    * Prompt for tool/IDE selection (called after module configuration)
    * Uses a split prompt approach:
-   *   1. Recommended tools - standard multiselect for preferred tools
+   *   1. Recommended tools - standard multiselect for 3 preferred tools
    *   2. Additional tools - autocompleteMultiselect with search capability
    * @param {string} projectDir - Project directory to check for existing IDEs
    * @param {Object} options - Command-line options

tools/platform-codes.yaml

@@ -18,6 +18,12 @@ platforms:
     category: cli
     description: "Anthropic's official CLI for Claude"
 
+  windsurf:
+    name: "Windsurf"
+    preferred: true
+    category: ide
+    description: "AI-powered IDE with cascade flows"
+
   cursor:
     name: "Cursor"
     preferred: true
@@ -121,12 +127,6 @@ platforms:
     category: ide
     description: "AI coding tool"
 
-  windsurf:
-    name: "Windsurf"
-    preferred: false
-    category: ide
-    description: "AI-powered IDE with cascade flows"
-
 # Platform categories
 categories:
   ide: