From 3ff975b02825e11d99d4164561578ce69a392dce Mon Sep 17 00:00:00 2001
From: hannesrudolph <hrudolph@gmail.com>
Date: Fri, 25 Apr 2025 16:41:58 -0600
Subject: [PATCH 1/2] docs: Update using modes and boomerang tasks
 documentation to include Orchestrator mode details

---
 docs/basic-usage/using-modes.md   | 20 ++++++++--
 docs/features/boomerang-tasks.mdx | 64 +++++--------------------------
 docs/features/custom-modes.md     | 18 ++++-----
 3 files changed, 35 insertions(+), 67 deletions(-)

diff --git a/docs/basic-usage/using-modes.md b/docs/basic-usage/using-modes.md
index 4170e42f..3487c580 100644
--- a/docs/basic-usage/using-modes.md
+++ b/docs/basic-usage/using-modes.md
@@ -3,7 +3,7 @@
 Modes in Roo Code are specialized personas that tailor the assistant's behavior to your current task. Each mode offers different capabilities, expertise, and access levels to help you accomplish specific goals.
 
 :::info Sticky Models
-Each mode remembers your last-used model. When switching modes, Roo automatically selects that model—no manual selection needed. Assign different models to different modes (Gemini 2.5 Flash thinking for architect mode, Claude Sonnet 3.7 for code mode) and Roo will switch models automatically when you change modes.
+Each mode remembers your last-used model. When switching modes, Roo automatically selects that model—no manual selection needed. Assign different models to different modes (e.g., Gemini 2.5 Preview for `🏗️ Architect` mode, Claude Sonnet 3.7 for `💻 Code` mode) and Roo will switch models automatically when you change modes.
 :::
 
 ## Why Use Different Modes?
@@ -21,7 +21,7 @@ Four ways to switch modes:
    
    <img src="/img/modes/modes.png" alt="Using the dropdown menu to switch modes" width="400" />
 
-2. **Slash command:** Type `/architect`, `/ask`, `/debug`, or `/code` in the chat input
+2. **Slash command:** Type `/architect`, `/ask`, `/debug`, `/code`, or `/orchestrator` in the chat input
    
    <img src="/img/modes/modes-1.png" alt="Using slash commands to switch modes" width="400" />
 
@@ -43,6 +43,7 @@ Four ways to switch modes:
 
 | Aspect | Details |
 |--------|---------|
+| **Name** | `💻 Code` |
 | **Description** | A skilled software engineer with expertise in programming languages, design patterns, and best practices |
 | **Tool Access** | Full access to all tool groups: `read`, `edit`, `browser`, `command`, `mcp` |
 | **Ideal For** | Writing code, implementing features, debugging, and general development |
@@ -52,6 +53,7 @@ Four ways to switch modes:
 
 | Aspect | Details |
 |--------|---------|
+| **Name** | `❓ Ask` |
 | **Description** | A knowledgeable technical assistant focused on answering questions without changing your codebase |
 | **Tool Access** | Limited access: `read`, `browser`, `mcp` only (cannot edit files or run commands) |
 | **Ideal For** | Code explanation, concept exploration, and technical learning |
@@ -61,6 +63,7 @@ Four ways to switch modes:
 
 | Aspect | Details |
 |--------|---------|
+| **Name** | `🏗️ Architect` |
 | **Description** | An experienced technical leader and planner who helps design systems and create implementation plans |
 | **Tool Access** | Access to `read`, `browser`, `mcp`, and restricted `edit` (markdown files only) |
 | **Ideal For** | System design, high-level planning, and architecture discussions |
@@ -70,10 +73,21 @@ Four ways to switch modes:
 
 | Aspect | Details |
 |--------|---------|
+| **Name** | `🪲 Debug` |
 | **Description** | An expert problem solver specializing in systematic troubleshooting and diagnostics |
 | **Tool Access** | Full access to all tool groups: `read`, `edit`, `browser`, `command`, `mcp` |
 | **Ideal For** | Tracking down bugs, diagnosing errors, and resolving complex issues |
-| **Special Features** | Uses a methodical approach of analyzing, narrowing possibilities, and fixing issues |
+| **Special Features** | Uses a methodical approach of analyzing, narrowing possibilities, and fixing issues. Includes custom instructions to reflect, distill possibilities, add logs, and confirm before fixing. |
+
+### Orchestrator Mode (aka [Boomerang Mode](/features/boomerang-tasks))
+
+| Aspect | Details |
+|--------|---------|
+| **Name** | `🪃 Orchestrator` |
+| **Description** | A strategic workflow orchestrator (aka Boomerang Mode) that breaks down complex tasks and delegates them to specialized modes |
+| **Tool Access** | Access to `read`, `browser`, `command`, `mcp`, and restricted `edit` (mode configuration files only: `.roomodes`, `custom_modes.json`) |
+| **Ideal For** | Managing multi-step projects, coordinating work across different modes, and automating complex workflows |
+| **Special Features** | Uses the [`new_task`](/features/tools/new-task) tool to delegate subtasks to other modes. See [Boomerang Tasks](/features/boomerang-tasks) for details. |
 
 ## Custom Modes
 
diff --git a/docs/features/boomerang-tasks.mdx b/docs/features/boomerang-tasks.mdx
index a785e3bc..381d9e96 100644
--- a/docs/features/boomerang-tasks.mdx
+++ b/docs/features/boomerang-tasks.mdx
@@ -4,7 +4,7 @@ sidebar_label: 'Boomerang Tasks'
 
 # Boomerang Tasks: Orchestrate Complex Workflows
 
-Boomerang Tasks (also known as subtasks or task orchestration) allow you to break down complex projects into smaller, manageable pieces. Think of it like delegating parts of your work to specialized assistants. Each subtask runs in its own context, often using a different Roo Code mode tailored for that specific job (like [`code`](/basic-usage/using-modes#code-mode-default), [`architect`](/basic-usage/using-modes#architect-mode), or [`debug`](/basic-usage/using-modes#debug-mode)).
+Boomerang Tasks (also known as subtasks or task orchestration) allow you to break down complex projects into smaller, manageable pieces using the built-in **`🪃 Orchestrator` Mode (aka Boomerang Mode)**. Think of it like delegating parts of your work to specialized assistants. Each subtask runs in its own context, often using a different Roo Code mode tailored for that specific job (like [`💻 Code`](/basic-usage/using-modes#code-mode-default), [`🏗️ Architect`](/basic-usage/using-modes#architect-mode), or [`🪲 Debug`](/basic-usage/using-modes#debug-mode)). The Orchestrator mode manages this process.
 
 <div style={{ position: 'relative', paddingBottom: '56.25%', height: 0, overflow: 'hidden' }}>
   <iframe
@@ -24,12 +24,10 @@ Boomerang Tasks (also known as subtasks or task orchestration) allow you to brea
 
 <br />
 
-:::info Boomerang Mode is a Custom Mode
-The `Boomerang Mode` mentioned here is not a built-in mode but a custom mode you can create yourself. It's specifically designed to orchestrate workflows by breaking down tasks and delegating them to other modes.
+:::info Orchestrator Mode is Built-In
+The `🪃 Orchestrator` mode (previously achieved via a custom "Boomerang Mode") is now a built-in mode specifically designed to orchestrate workflows by breaking down tasks and delegating them to other modes. You no longer need to create a custom mode for this functionality.
 
-[**Jump to Boomerang Mode Setup & Download**](#setting-up-boomerang-mode)
-
-Learn more about [Built-in Modes](/basic-usage/using-modes#built-in-modes) or the general process of creating [Custom Modes](/features/custom-modes).
+Learn more about [Built-in Modes](/basic-usage/using-modes#built-in-modes).
 :::
 
 ## Why Use Boomerang Tasks?
@@ -41,9 +39,9 @@ Learn more about [Built-in Modes](/basic-usage/using-modes#built-in-modes) or th
 
 ## How It Works
 
-1.  Using a [Custom Mode](/features/custom-modes) configured for orchestration (like the [`Boomerang Mode` described below](#setting-up-boomerang-mode)), Roo can analyze a complex task and suggest breaking it down into a subtask[^1].
+1.  When in the [`🪃 Orchestrator`](/basic-usage/using-modes#orchestrator-mode) mode (aka Boomerang Mode), Roo analyzes a complex task and suggests breaking it down into a subtask[^1].
 
-2.  The parent task pauses, and the new subtask begins in a different mode[^2].
+2.  The parent task (in Orchestrator mode) pauses, and the new subtask begins in a different, specialized mode[^2].
 3.  When the subtask's goal is achieved, Roo signals completion.
 4.  The parent task resumes with only the summary[^3] of the subtask. The parent uses this summary to continue the main workflow.
 
@@ -58,54 +56,10 @@ Learn more about [Built-in Modes](/basic-usage/using-modes#built-in-modes) or th
 Boomerang Tasks provide a powerful way to manage complex development workflows directly within Roo Code, leveraging specialized modes for maximum efficiency.
 
 :::tip Keep Tasks Focused
-
-## Setting Up Boomerang Mode
-
-### Download Configuration
-
-You can download the Boomerang Mode configuration file below. Rename the downloaded file to `.roomodes` and place it in the root directory of your project.
-
-[**Download boomerang-mode.roomodes**](/downloads/boomerang-tasks/roomodes.json)
-
-### Manual Configuration
-
-You can also create your own Boomerang Mode. Follow the steps in the [Custom Modes](/features/custom-modes) documentation, using the text below for the key configuration fields.
-
-**Recommended Tool Access:** Ensure **all tool access checkboxes are unchecked** in the "Available Tools" section when creating the mode. Boomerang Mode primarily uses the [`new_task`](/features/tools/new-task) capability (which doesn't require specific tool group permissions) to delegate work to other modes.
-
-**Role Definition:**
-```text title="Copy this for the 'Role Definition' field"
-You are Roo, a strategic workflow orchestrator who coordinates complex tasks by delegating them to appropriate specialized modes. You have a comprehensive understanding of each mode's capabilities and limitations, allowing you to effectively break down complex problems into discrete tasks that can be solved by different specialists.
-```
-
-**Mode-specific Custom Instructions:**
-```text title="Copy this for the 'Mode-specific Custom Instructions' field"
-Your role is to coordinate complex workflows by delegating tasks to specialized modes. As an orchestrator, you should:
-
-1. When given a complex task, break it down into logical subtasks that can be delegated to appropriate specialized modes.
-
-2. For each subtask, use the `new_task` tool to delegate. Choose the most appropriate mode for the subtask's specific goal and provide comprehensive instructions in the `message` parameter. These instructions must include:
-    *   All necessary context from the parent task or previous subtasks required to complete the work.
-    *   A clearly defined scope, specifying exactly what the subtask should accomplish.
-    *   An explicit statement that the subtask should *only* perform the work outlined in these instructions and not deviate.
-    *   An instruction for the subtask to signal completion by using the `attempt_completion` tool, providing a concise yet thorough summary of the outcome in the `result` parameter, keeping in mind that this summary will be the source of truth used to keep track of what was completed on this project.
-    *   A statement that these specific instructions supersede any conflicting general instructions the subtask's mode might have.
-
-3. Track and manage the progress of all subtasks. When a subtask is completed, analyze its results and determine the next steps.
-
-4. Help the user understand how the different subtasks fit together in the overall workflow. Provide clear reasoning about why you're delegating specific tasks to specific modes.
-
-5. When all subtasks are completed, synthesize the results and provide a comprehensive overview of what was accomplished.
-
-6. Ask clarifying questions when necessary to better understand how to break down complex tasks effectively.
-
-7. Suggest improvements to the workflow based on the results of completed subtasks.
-
-Use subtasks to maintain clarity. If a request significantly shifts focus or requires a different expertise (mode), consider creating a subtask rather than overloading the current one.
-```
+Use subtasks (delegated via Orchestrator mode) to maintain clarity. If a request significantly shifts focus or requires a different expertise (mode), consider creating a subtask rather than overloading the current one.
 :::
 
 
-[^1]: This context is passed via the `message` parameter of the [`new_task`](/features/tools/new-task) tool.
-[^2]: The mode for the subtask is specified via the `mode` parameter of the [`new_task`](/features/tools/new-task) tool during initiation.
+[^1]: This context is passed via the `message` parameter of the [`new_task`](/features/tools/new-task) tool when the Orchestrator mode delegates the task.
+[^2]: The mode for the subtask is specified via the `mode` parameter of the [`new_task`](/features/tools/new-task) tool during initiation by the Orchestrator mode.
 [^3]: This summary is passed via the `result` parameter of the [`attempt_completion`](/features/tools/attempt-completion) tool when the subtask finishes.
\ No newline at end of file
diff --git a/docs/features/custom-modes.md b/docs/features/custom-modes.md
index f00ec641..440f3eda 100644
--- a/docs/features/custom-modes.md
+++ b/docs/features/custom-modes.md
@@ -153,7 +153,7 @@ Mode configurations are applied in this order:
 2. Global mode configurations (from `custom_modes.json`)
 3. Default mode configurations
 
-This means that project-specific configurations will override global configurations, which in turn override default configurations. You can override any default mode (like "code", "debug", etc.) by including a mode with the same slug in either your global or project-specific configuration.
+This means that project-specific configurations will override global configurations, which in turn override default configurations. You can override any default mode (like `code`, `debug`, `architect`, `ask`, `orchestrator` (aka Boomerang Mode)) by including a mode with the same slug in either your global or project-specific configuration.
 
 *   **Note on Instruction Files:** Within the loading of mode-specific instructions from the filesystem, the directory `.roo/rules-{mode-slug}/` takes precedence over the single file `.roorules-{mode-slug}` found in the workspace root.
 
@@ -239,7 +239,7 @@ Each example shows different aspects of mode configuration:
 
 ## Overriding Default Modes
 
-You can override Roo Code's built-in modes (like "code", "debug", "ask") with customized versions that better suit your workflow. This is done by creating a custom mode with the same slug as a default mode.
+You can override Roo Code's built-in modes (like `💻 Code`, `🪲 Debug`, `❓ Ask`, `🏗️ Architect`, `🪃 Orchestrator` (aka Boomerang Mode)) with customized versions that better suit your workflow. This is done by creating a custom mode with the same slug as a default mode (e.g., `code`, `debug`, `orchestrator`).
 
 ### Overriding Modes Globally
 
@@ -253,8 +253,8 @@ To customize a default mode across all your projects:
 ```json
 {
   "customModes": [{
-    "slug": "code",
-    "name": "Code",
+    "slug": "code", // Matches the default 'code' mode slug
+    "name": "💻 Code (Global Override)", // Custom display name
     "roleDefinition": "You are a software engineer with global-specific constraints",
     "groups": [
       "read",
@@ -265,7 +265,7 @@ To customize a default mode across all your projects:
 }
 ```
 
-This example replaces the default "Code" mode with a custom version that can only edit JavaScript and TypeScript files.
+This example replaces the default `💻 Code` mode with a custom version that can only edit JavaScript and TypeScript files.
 
 ### Project-Specific Mode Override
 
@@ -279,8 +279,8 @@ To override a default mode for just one project:
 ```json
 {
   "customModes": [{
-    "slug": "code",
-    "name": "Code (Project-Specific)",
+    "slug": "code", // Matches the default 'code' mode slug
+    "name": "💻 Code (Project-Specific)", // Custom display name
     "roleDefinition": "You are a software engineer with project-specific constraints",
     "groups": [
       "read",
@@ -297,8 +297,8 @@ Project-specific overrides take precedence over global overrides, which in turn
 
 Common reasons to override built-in modes include:
 
-* **Restricting file access:** Limit a mode to specific file types for safety (e.g., restricting "Code" mode to only edit non-production files)
-* **Specializing behavior:** Customize a mode's expertise for your tech stack (e.g., making "Debug" mode focus on your framework)
+* **Restricting file access:** Limit a mode to specific file types for safety (e.g., restricting `💻 Code` mode to only edit non-production files)
+* **Specializing behavior:** Customize a mode's expertise for your tech stack (e.g., making `🪲 Debug` mode focus on your framework)
 * **Adding custom instructions:** Integrate project standards or team guidelines directly into modes
 * **Changing available tools:** Remove certain tools from modes to prevent unwanted operations
 

From 1a0346bb0a322c5ccfc8e7c85fa54819529a7039 Mon Sep 17 00:00:00 2001
From: hannesrudolph <hrudolph@gmail.com>
Date: Fri, 25 Apr 2025 22:50:08 -0600
Subject: [PATCH 2/2] docs: Update Orchestrator mode link in Boomerang Tasks
 documentation

---
 docs/features/boomerang-tasks.mdx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/features/boomerang-tasks.mdx b/docs/features/boomerang-tasks.mdx
index 381d9e96..c07d1b08 100644
--- a/docs/features/boomerang-tasks.mdx
+++ b/docs/features/boomerang-tasks.mdx
@@ -39,7 +39,7 @@ Learn more about [Built-in Modes](/basic-usage/using-modes#built-in-modes).
 
 ## How It Works
 
-1.  When in the [`🪃 Orchestrator`](/basic-usage/using-modes#orchestrator-mode) mode (aka Boomerang Mode), Roo analyzes a complex task and suggests breaking it down into a subtask[^1].
+1.  When in the [`🪃 Orchestrator`](/basic-usage/using-modes#orchestrator-mode-aka-boomerang-mode) mode (aka Boomerang Mode), Roo analyzes a complex task and suggests breaking it down into a subtask[^1].
 
 2.  The parent task (in Orchestrator mode) pauses, and the new subtask begins in a different, specialized mode[^2].
 3.  When the subtask's goal is achieved, Roo signals completion.