bmad-method 6.0.0-alpha.12 → 6.0.0-alpha.13

package/tools/cli/installers/lib/ide/antigravity.js

@@ -1,4 +1,5 @@
 const path = require('node:path');
+const fs = require('fs-extra');
 const { BaseIdeSetup } = require('./_base-ide');
 const chalk = require('chalk');
 const { getProjectRoot, getSourcePath, getModulePath } = require('../../../lib/project-root');
@@ -20,7 +21,7 @@ const { getAgentsFromBmad, getAgentsFromDir } = require('./shared/bmad-artifacts
  */
 class AntigravitySetup extends BaseIdeSetup {
   constructor() {
-    super('antigravity', 'Google Antigravity', false);
+    super('antigravity', 'Google Antigravity', true);
     this.configDir = '.agent';
     this.workflowsDir = 'workflows';
   }
@@ -44,7 +45,6 @@ class AntigravitySetup extends BaseIdeSetup {
       const injectionConfigPath = path.join(sourceModulesPath, moduleName, 'sub-modules', 'antigravity', 'injections.yaml');
 
       if (await this.exists(injectionConfigPath)) {
-        const fs = require('fs-extra');
         const yaml = require('js-yaml');
 
         try {
@@ -88,7 +88,6 @@ class AntigravitySetup extends BaseIdeSetup {
    * @param {string} projectDir - Project directory
    */
   async cleanup(projectDir) {
-    const fs = require('fs-extra');
     const bmadWorkflowsDir = path.join(projectDir, this.configDir, this.workflowsDir, 'bmad');
 
     if (await fs.pathExists(bmadWorkflowsDir)) {
@@ -191,7 +190,6 @@ class AntigravitySetup extends BaseIdeSetup {
    * Read and process file content
    */
   async readAndProcess(filePath, metadata) {
-    const fs = require('fs-extra');
     const content = await fs.readFile(filePath, 'utf8');
     return this.processContent(content, metadata);
   }
@@ -208,7 +206,6 @@ class AntigravitySetup extends BaseIdeSetup {
    * Get agents from source modules (not installed location)
    */
   async getAgentsFromSource(sourceDir, selectedModules) {
-    const fs = require('fs-extra');
     const agents = [];
 
     // Add core agents
@@ -387,7 +384,6 @@ class AntigravitySetup extends BaseIdeSetup {
    * Inject content at specified point in file
    */
   async injectContent(projectDir, injection, subagentChoices = null) {
-    const fs = require('fs-extra');
     const targetPath = path.join(projectDir, injection.file);
 
     if (await this.exists(targetPath)) {
@@ -413,7 +409,6 @@ class AntigravitySetup extends BaseIdeSetup {
    * Copy selected subagents to appropriate Antigravity agents directory
    */
   async copySelectedSubagents(projectDir, handlerBaseDir, subagentConfig, choices, location) {
-    const fs = require('fs-extra');
     const os = require('node:os');
 
     // Determine target directory based on user choice
@@ -458,6 +453,55 @@ class AntigravitySetup extends BaseIdeSetup {
       console.log(chalk.dim(`  Total subagents installed: ${copiedCount}`));
     }
   }
+
+  /**
+   * Install a custom agent launcher for Antigravity
+   * @param {string} projectDir - Project directory
+   * @param {string} agentName - Agent name (e.g., "fred-commit-poet")
+   * @param {string} agentPath - Path to compiled agent (relative to project root)
+   * @param {Object} metadata - Agent metadata
+   * @returns {Object} Installation result
+   */
+  async installCustomAgentLauncher(projectDir, agentName, agentPath, metadata) {
+    // Create .agent/workflows/bmad directory structure (same as regular agents)
+    const agentDir = path.join(projectDir, this.configDir);
+    const workflowsDir = path.join(agentDir, this.workflowsDir);
+    const bmadWorkflowsDir = path.join(workflowsDir, 'bmad');
+
+    await fs.ensureDir(bmadWorkflowsDir);
+
+    // Create custom agent launcher with same pattern as regular agents
+    const launcherContent = `name: '${agentName}'
+description: '${agentName} agent'
+usage: |
+  Custom BMAD agent: ${agentName}
+
+  Launch with: /${agentName}
+
+  You must fully embody this agent's persona and follow all activation instructions exactly as specified. NEVER break character until given an exit command.
+<agent-activation CRITICAL="TRUE">
+1. LOAD the FULL agent file from @${agentPath}
+2. READ its entire contents - this contains the complete agent persona, menu, and instructions
+3. EXECUTE as ${agentName} with full persona adoption
+</agent-activation>
+
+---
+
+⚠️ **IMPORTANT**: Run @${agentPath} to load the complete agent before using this launcher!`;
+
+    const fileName = `bmad-custom-agents-${agentName}.md`;
+    const launcherPath = path.join(bmadWorkflowsDir, fileName);
+
+    // Write the launcher file
+    await fs.writeFile(launcherPath, launcherContent, 'utf8');
+
+    return {
+      ide: 'antigravity',
+      path: path.relative(projectDir, launcherPath),
+      command: `/${agentName}`,
+      type: 'custom-agent-launcher',
+    };
+  }
 }
 
 module.exports = { AntigravitySetup };

package/tools/cli/installers/lib/ide/auggie.js

@@ -1,4 +1,5 @@
 const path = require('node:path');
+const fs = require('fs-extra');
 const { BaseIdeSetup } = require('./_base-ide');
 const chalk = require('chalk');
 const { AgentCommandGenerator } = require('./shared/agent-command-generator');
@@ -174,6 +175,58 @@ BMAD ${workflow.module.toUpperCase()} module
       console.log(chalk.dim(`  Removed old BMAD commands`));
     }
   }
+
+  /**
+   * Install a custom agent launcher for Auggie
+   * @param {string} projectDir - Project directory
+   * @param {string} agentName - Agent name (e.g., "fred-commit-poet")
+   * @param {string} agentPath - Path to compiled agent (relative to project root)
+   * @param {Object} metadata - Agent metadata
+   * @returns {Object} Installation result
+   */
+  async installCustomAgentLauncher(projectDir, agentName, agentPath, metadata) {
+    // Auggie uses .augment/commands directory
+    const location = path.join(projectDir, '.augment', 'commands');
+    const bmadCommandsDir = path.join(location, 'bmad');
+    const agentsDir = path.join(bmadCommandsDir, 'agents');
+
+    // Create .augment/commands/bmad/agents directory if it doesn't exist
+    await fs.ensureDir(agentsDir);
+
+    // Create custom agent launcher
+    const launcherContent = `---
+description: "Use the ${agentName} custom agent"
+---
+
+# ${agentName} Custom Agent
+
+**⚠️ IMPORTANT**: Run @${agentPath} first to load the complete agent!
+
+This is a launcher for the custom BMAD agent "${agentName}".
+
+## Usage
+1. First run: \`${agentPath}\` to load the complete agent
+2. Then use this command to activate ${agentName}
+
+The agent will follow the persona and instructions from the main agent file.
+
+## Module
+BMAD Custom agent
+`;
+
+    const fileName = `custom-${agentName.toLowerCase()}.md`;
+    const launcherPath = path.join(agentsDir, fileName);
+
+    // Write the launcher file
+    await fs.writeFile(launcherPath, launcherContent, 'utf8');
+
+    return {
+      ide: 'auggie',
+      path: path.relative(projectDir, launcherPath),
+      command: agentName,
+      type: 'custom-agent-launcher',
+    };
+  }
 }
 
 module.exports = { AuggieSetup };

package/tools/cli/installers/lib/ide/claude-code.js

@@ -1,4 +1,5 @@
 const path = require('node:path');
+const fs = require('fs-extra');
 const { BaseIdeSetup } = require('./_base-ide');
 const chalk = require('chalk');
 const { getProjectRoot, getSourcePath, getModulePath } = require('../../../lib/project-root');
@@ -43,7 +44,6 @@ class ClaudeCodeSetup extends BaseIdeSetup {
       const injectionConfigPath = path.join(sourceModulesPath, moduleName, 'sub-modules', 'claude-code', 'injections.yaml');
 
       if (await this.exists(injectionConfigPath)) {
-        const fs = require('fs-extra');
         const yaml = require('js-yaml');
 
         try {
@@ -87,7 +87,6 @@ class ClaudeCodeSetup extends BaseIdeSetup {
    * @param {string} projectDir - Project directory
    */
   async cleanup(projectDir) {
-    const fs = require('fs-extra');
     const bmadCommandsDir = path.join(projectDir, this.configDir, this.commandsDir, 'bmad');
 
     if (await fs.pathExists(bmadCommandsDir)) {
@@ -199,7 +198,6 @@ class ClaudeCodeSetup extends BaseIdeSetup {
    * Read and process file content
    */
   async readAndProcess(filePath, metadata) {
-    const fs = require('fs-extra');
     const content = await fs.readFile(filePath, 'utf8');
     return this.processContent(content, metadata);
   }
@@ -216,7 +214,6 @@ class ClaudeCodeSetup extends BaseIdeSetup {
    * Get agents from source modules (not installed location)
    */
   async getAgentsFromSource(sourceDir, selectedModules) {
-    const fs = require('fs-extra');
     const agents = [];
 
     // Add core agents
@@ -395,7 +392,6 @@ class ClaudeCodeSetup extends BaseIdeSetup {
    * Inject content at specified point in file
    */
   async injectContent(projectDir, injection, subagentChoices = null) {
-    const fs = require('fs-extra');
     const targetPath = path.join(projectDir, injection.file);
 
     if (await this.exists(targetPath)) {
@@ -421,7 +417,6 @@ class ClaudeCodeSetup extends BaseIdeSetup {
    * Copy selected subagents to appropriate Claude agents directory
    */
   async copySelectedSubagents(projectDir, handlerBaseDir, subagentConfig, choices, location) {
-    const fs = require('fs-extra');
     const os = require('node:os');
 
     // Determine target directory based on user choice

package/tools/cli/installers/lib/ide/cline.js

@@ -209,6 +209,55 @@ class ClineSetup extends BaseIdeSetup {
     console.log(chalk.dim(`Removed ${this.name} BMAD configuration`));
   }
 
+  /**
+   * Install a custom agent launcher for Cline
+   * @param {string} projectDir - Project directory
+   * @param {string} agentName - Agent name (e.g., "fred-commit-poet")
+   * @param {string} agentPath - Path to compiled agent (relative to project root)
+   * @param {Object} metadata - Agent metadata
+   * @returns {Object} Installation result
+   */
+  async installCustomAgentLauncher(projectDir, agentName, agentPath, metadata) {
+    const clineDir = path.join(projectDir, this.configDir);
+    const workflowsDir = path.join(clineDir, this.workflowsDir);
+
+    // Create .clinerules/workflows directory if it doesn't exist
+    await fs.ensureDir(workflowsDir);
+
+    // Create custom agent launcher workflow
+    const launcherContent = `name: ${agentName}
+description: Custom BMAD agent: ${agentName}
+
+# ${agentName} Custom Agent
+
+**⚠️ IMPORTANT**: Run @${agentPath} first to load the complete agent!
+
+This is a launcher for the custom BMAD agent "${agentName}".
+
+## Usage
+1. First run: \`${agentPath}\` to load the complete agent
+2. Then use this workflow as ${agentName}
+
+The agent will follow the persona and instructions from the main agent file.
+
+---
+
+*Generated by BMAD Method*`;
+
+    const fileName = `bmad-custom-${agentName.toLowerCase()}.md`;
+    const launcherPath = path.join(workflowsDir, fileName);
+
+    // Write the launcher file
+    await fs.writeFile(launcherPath, launcherContent, 'utf8');
+
+    return {
+      ide: 'cline',
+      path: path.relative(projectDir, launcherPath),
+      command: agentName,
+      type: 'custom-agent-launcher',
+    };
+  }
+
   /**
    * Utility: Ensure directory exists
    */

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

@@ -354,7 +354,7 @@ class CodexSetup extends BaseIdeSetup {
    * @returns {Object|null} Info about created command
    */
   async installCustomAgentLauncher(projectDir, agentName, agentPath, metadata) {
-    const destDir = this.getCodexPromptDir();
+    const destDir = this.getCodexPromptDir(projectDir, 'project');
     await fs.ensureDir(destDir);
 
     const launcherContent = `---
@@ -379,7 +379,7 @@ You must fully embody this agent's persona and follow all activation instruction
     await fs.writeFile(launcherPath, launcherContent, 'utf8');
 
     return {
-      path: launcherPath,
+      path: path.relative(projectDir, launcherPath),
       command: `/${fileName.replace('.md', '')}`,
     };
   }

package/tools/cli/installers/lib/ide/crush.js

@@ -1,4 +1,5 @@
 const path = require('node:path');
+const fs = require('fs-extra');
 const { BaseIdeSetup } = require('./_base-ide');
 const chalk = require('chalk');
 const { AgentCommandGenerator } = require('./shared/agent-command-generator');
@@ -235,6 +236,52 @@ Part of the BMAD ${workflow.module.toUpperCase()} module.
       console.log(chalk.dim(`Removed BMAD commands from Crush`));
     }
   }
+
+  /**
+   * Install a custom agent launcher for Crush
+   * @param {string} projectDir - Project directory
+   * @param {string} agentName - Agent name (e.g., "fred-commit-poet")
+   * @param {string} agentPath - Path to compiled agent (relative to project root)
+   * @param {Object} metadata - Agent metadata
+   * @returns {Object} Installation result
+   */
+  async installCustomAgentLauncher(projectDir, agentName, agentPath, metadata) {
+    const crushDir = path.join(projectDir, this.configDir);
+    const bmadCommandsDir = path.join(crushDir, this.commandsDir, 'bmad');
+
+    // Create .crush/commands/bmad directory if it doesn't exist
+    await fs.ensureDir(bmadCommandsDir);
+
+    // Create custom agent launcher
+    const launcherContent = `# ${agentName} Custom Agent
+
+**⚠️ IMPORTANT**: Run @${agentPath} first to load the complete agent!
+
+This is a launcher for the custom BMAD agent "${agentName}".
+
+## Usage
+1. First run: \`${agentPath}\` to load the complete agent
+2. Then use this command to activate ${agentName}
+
+The agent will follow the persona and instructions from the main agent file.
+
+---
+
+*Generated by BMAD Method*`;
+
+    const fileName = `custom-${agentName.toLowerCase()}.md`;
+    const launcherPath = path.join(bmadCommandsDir, fileName);
+
+    // Write the launcher file
+    await fs.writeFile(launcherPath, launcherContent, 'utf8');
+
+    return {
+      ide: 'crush',
+      path: path.relative(projectDir, launcherPath),
+      command: agentName,
+      type: 'custom-agent-launcher',
+    };
+  }
 }
 
 module.exports = { CrushSetup };

package/tools/cli/installers/lib/ide/gemini.js

@@ -201,6 +201,53 @@ ${contentWithoutFrontmatter}
       }
     }
   }
+
+  /**
+   * Install a custom agent launcher for Gemini
+   * @param {string} projectDir - Project directory
+   * @param {string} agentName - Agent name (e.g., "fred-commit-poet")
+   * @param {string} agentPath - Path to compiled agent (relative to project root)
+   * @param {Object} metadata - Agent metadata
+   * @returns {Object} Installation result
+   */
+  async installCustomAgentLauncher(projectDir, agentName, agentPath, metadata) {
+    const geminiDir = path.join(projectDir, this.configDir);
+    const commandsDir = path.join(geminiDir, this.commandsDir);
+
+    // Create .gemini/commands directory if it doesn't exist
+    await fs.ensureDir(commandsDir);
+
+    // Create custom agent launcher in TOML format
+    const launcherContent = `description = "Custom BMAD Agent: ${agentName}"
+prompt = """
+**⚠️ IMPORTANT**: Run @${agentPath} first to load the complete agent!
+
+This is a launcher for the custom BMAD agent "${agentName}".
+
+## Usage
+1. First run: \`${agentPath}\` to load the complete agent
+2. Then use this command to activate ${agentName}
+
+The agent will follow the persona and instructions from the main agent file.
+
+---
+
+*Generated by BMAD Method*
+"""`;
+
+    const fileName = `bmad-custom-${agentName.toLowerCase()}.toml`;
+    const launcherPath = path.join(commandsDir, fileName);
+
+    // Write the launcher file
+    await fs.writeFile(launcherPath, launcherContent, 'utf8');
+
+    return {
+      ide: 'gemini',
+      path: path.relative(projectDir, launcherPath),
+      command: agentName,
+      type: 'custom-agent-launcher',
+    };
+  }
 }
 
 module.exports = { GeminiSetup };

package/tools/cli/installers/lib/ide/github-copilot.js

@@ -6,13 +6,13 @@ const { AgentCommandGenerator } = require('./shared/agent-command-generator');
 
 /**
  * GitHub Copilot setup handler
- * Creates chat modes in .github/chatmodes/ and configures VS Code settings
+ * Creates agents in .github/agents/ and configures VS Code settings
  */
 class GitHubCopilotSetup extends BaseIdeSetup {
   constructor() {
     super('github-copilot', 'GitHub Copilot', true); // preferred IDE
     this.configDir = '.github';
-    this.chatmodesDir = 'chatmodes';
+    this.agentsDir = 'agents';
     this.vscodeDir = '.vscode';
   }
 
@@ -50,7 +50,8 @@ class GitHubCopilotSetup extends BaseIdeSetup {
           message: 'Maximum requests per session (1-50)?',
           default: '15',
           validate: (input) => {
-            const num = parseInt(input);
+            const num = parseInt(input, 10);
+            if (isNaN(num)) return 'Enter a valid number 1-50';
             return (num >= 1 && num <= 50) || 'Enter 1-50';
           },
         },
@@ -97,10 +98,10 @@ class GitHubCopilotSetup extends BaseIdeSetup {
     const config = options.preCollectedConfig || {};
     await this.configureVsCodeSettings(projectDir, { ...options, ...config });
 
-    // Create .github/chatmodes directory
+    // Create .github/agents directory
     const githubDir = path.join(projectDir, this.configDir);
-    const chatmodesDir = path.join(githubDir, this.chatmodesDir);
-    await this.ensureDir(chatmodesDir);
+    const agentsDir = path.join(githubDir, this.agentsDir);
+    await this.ensureDir(agentsDir);
 
     // Clean up any existing BMAD files before reinstalling
     await this.cleanup(projectDir);
@@ -109,29 +110,29 @@ class GitHubCopilotSetup extends BaseIdeSetup {
     const agentGen = new AgentCommandGenerator(this.bmadFolderName);
     const { artifacts: agentArtifacts } = await agentGen.collectAgentArtifacts(bmadDir, options.selectedModules || []);
 
-    // Create chat mode files with bmad- prefix
-    let modeCount = 0;
+    // Create agent files with bmd- prefix
+    let agentCount = 0;
     for (const artifact of agentArtifacts) {
       const content = artifact.content;
-      const chatmodeContent = await this.createChatmodeContent({ module: artifact.module, name: artifact.name }, content);
+      const agentContent = await this.createAgentContent({ module: artifact.module, name: artifact.name }, content);
 
-      // Use bmad- prefix: bmad-agent-{module}-{name}.chatmode.md
-      const targetPath = path.join(chatmodesDir, `bmad-agent-${artifact.module}-${artifact.name}.chatmode.md`);
-      await this.writeFile(targetPath, chatmodeContent);
-      modeCount++;
+      // Use bmd- prefix: bmd-custom-{module}-{name}.agent.md
+      const targetPath = path.join(agentsDir, `bmd-custom-${artifact.module}-${artifact.name}.agent.md`);
+      await this.writeFile(targetPath, agentContent);
+      agentCount++;
 
-      console.log(chalk.green(`  ✓ Created chat mode: bmad-agent-${artifact.module}-${artifact.name}`));
+      console.log(chalk.green(`  ✓ Created agent: bmd-custom-${artifact.module}-${artifact.name}`));
     }
 
     console.log(chalk.green(`✓ ${this.name} configured:`));
-    console.log(chalk.dim(`  - ${modeCount} chat modes created`));
-    console.log(chalk.dim(`  - Chat modes directory: ${path.relative(projectDir, chatmodesDir)}`));
+    console.log(chalk.dim(`  - ${agentCount} agents created`));
+    console.log(chalk.dim(`  - Agents directory: ${path.relative(projectDir, agentsDir)}`));
     console.log(chalk.dim(`  - VS Code settings configured`));
-    console.log(chalk.dim('\n  Chat modes available in VS Code Chat view'));
+    console.log(chalk.dim('\n  Agents available in VS Code Chat view'));
 
     return {
       success: true,
-      chatmodes: modeCount,
+      agents: agentCount,
       settings: true,
     };
   }
@@ -187,9 +188,10 @@ class GitHubCopilotSetup extends BaseIdeSetup {
       // Manual configuration - use pre-collected settings
       const manual = options.manualSettings || {};
 
+      const maxRequests = parseInt(manual.maxRequests || '15', 10);
       bmadSettings = {
         'chat.agent.enabled': true,
-        'chat.agent.maxRequests': parseInt(manual.maxRequests || 15),
+        'chat.agent.maxRequests': isNaN(maxRequests) ? 15 : maxRequests,
         'github.copilot.chat.agent.runTasks': manual.runTasks === undefined ? true : manual.runTasks,
         'chat.mcp.discovery.enabled': manual.mcpDiscovery === undefined ? true : manual.mcpDiscovery,
         'github.copilot.chat.agent.autoFix': manual.autoFix === undefined ? true : manual.autoFix,
@@ -206,9 +208,9 @@ class GitHubCopilotSetup extends BaseIdeSetup {
   }
 
   /**
-   * Create chat mode content
+   * Create agent content
    */
-  async createChatmodeContent(agent, content) {
+  async createAgentContent(agent, content) {
     // Extract metadata from launcher frontmatter if present
     const descMatch = content.match(/description:\s*"([^"]+)"/);
     const title = descMatch ? descMatch[1] : this.formatTitle(agent.name);
@@ -226,30 +228,21 @@ class GitHubCopilotSetup extends BaseIdeSetup {
     // Reference: https://code.visualstudio.com/docs/copilot/reference/copilot-vscode-features#_chat-tools
     const tools = [
       'changes', // List of source control changes
-      'codebase', // Perform code search in workspace
-      'createDirectory', // Create new directory in workspace
-      'createFile', // Create new file in workspace
-      'editFiles', // Apply edits to files in workspace
+      'edit', // Edit files in your workspace including: createFile, createDirectory, editNotebook, newJupyterNotebook and editFiles
       'fetch', // Fetch content from web page
-      'fileSearch', // Search files using glob patterns
       'githubRepo', // Perform code search in GitHub repo
-      'listDirectory', // List files in a directory
       'problems', // Add workspace issues from Problems panel
-      'readFile', // Read content of a file in workspace
-      'runInTerminal', // Run shell command in integrated terminal
-      'runTask', // Run existing task in workspace
+      'runCommands', // Runs commands in the terminal including: getTerminalOutput, terminalSelection, terminalLastCommand and runInTerminal
+      'runTasks', // Runs tasks and gets their output for your workspace
       'runTests', // Run unit tests in workspace
-      'runVscodeCommand', // Run VS Code command
-      'search', // Enable file searching in workspace
-      'searchResults', // Get search results from Search view
-      'terminalLastCommand', // Get last terminal command and output
-      'terminalSelection', // Get current terminal selection
+      'search', // Search and read files in your workspace, including:fileSearch, textSearch, listDirectory, readFile, codebase and searchResults
+      'runSubagent', // Runs a task within an isolated subagent context. Enables efficient organization of tasks and context window management.
       'testFailure', // Get unit test failure information
-      'textSearch', // Find text in files
+      'todos', // Tool for managing and tracking todo items for task planning
       'usages', // Find references and navigate definitions
     ];
 
-    let chatmodeContent = `---
+    let agentContent = `---
 description: "${description.replaceAll('"', String.raw`\"`)}"
 tools: ${JSON.stringify(tools)}
 ---
@@ -260,7 +253,7 @@ ${cleanContent}
 
 `;
 
-    return chatmodeContent;
+    return agentContent;
   }
 
   /**
@@ -278,10 +271,10 @@ ${cleanContent}
    */
   async cleanup(projectDir) {
     const fs = require('fs-extra');
-    const chatmodesDir = path.join(projectDir, this.configDir, this.chatmodesDir);
 
+    // Clean up old chatmodes directory
+    const chatmodesDir = path.join(projectDir, this.configDir, 'chatmodes');
     if (await fs.pathExists(chatmodesDir)) {
-      // Only remove files that start with bmad- prefix
       const files = await fs.readdir(chatmodesDir);
       let removed = 0;
 
@@ -293,7 +286,25 @@ ${cleanContent}
       }
 
       if (removed > 0) {
-        console.log(chalk.dim(`  Cleaned up ${removed} existing BMAD chat modes`));
+        console.log(chalk.dim(`  Cleaned up ${removed} old BMAD chat modes`));
+      }
+    }
+
+    // Clean up new agents directory
+    const agentsDir = path.join(projectDir, this.configDir, this.agentsDir);
+    if (await fs.pathExists(agentsDir)) {
+      const files = await fs.readdir(agentsDir);
+      let removed = 0;
+
+      for (const file of files) {
+        if (file.startsWith('bmd-') && file.endsWith('.agent.md')) {
+          await fs.remove(path.join(agentsDir, file));
+          removed++;
+        }
+      }
+
+      if (removed > 0) {
+        console.log(chalk.dim(`  Cleaned up ${removed} existing BMAD agents`));
       }
     }
   }
@@ -307,13 +318,13 @@ ${cleanContent}
    * @returns {Object|null} Info about created command
    */
   async installCustomAgentLauncher(projectDir, agentName, agentPath, metadata) {
-    const chatmodesDir = path.join(projectDir, this.configDir, this.chatmodesDir);
+    const agentsDir = path.join(projectDir, this.configDir, this.agentsDir);
 
     if (!(await this.exists(path.join(projectDir, this.configDir)))) {
       return null; // IDE not configured for this project
     }
 
-    await this.ensureDir(chatmodesDir);
+    await this.ensureDir(agentsDir);
 
     const launcherContent = `You must fully embody this agent's persona and follow all activation instructions exactly as specified. NEVER break character until given an exit command.
 
@@ -353,7 +364,7 @@ ${cleanContent}
       'usages',
     ];
 
-    const chatmodeContent = `---
+    const agentContent = `---
 description: "Activates the ${metadata.title || agentName} agent persona."
 tools: ${JSON.stringify(copilotTools)}
 ---
@@ -363,12 +374,12 @@ tools: ${JSON.stringify(copilotTools)}
 ${launcherContent}
 `;
 
-    const chatmodePath = path.join(chatmodesDir, `bmad-agent-custom-${agentName}.chatmode.md`);
-    await this.writeFile(chatmodePath, chatmodeContent);
+    const agentFilePath = path.join(agentsDir, `bmd-custom-${agentName}.agent.md`);
+    await this.writeFile(agentFilePath, agentContent);
 
     return {
-      path: chatmodePath,
-      command: `bmad-agent-custom-${agentName}`,
+      path: agentFilePath,
+      command: `bmd-custom-${agentName}`,
     };
   }
 }