bmad-method 6.0.0-alpha.7 → 6.0.0-alpha.9

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

@@ -2,41 +2,19 @@ const path = require('node:path');
 const fs = require('fs-extra');
 const os = require('node:os');
 const chalk = require('chalk');
-const inquirer = require('inquirer');
 const { BaseIdeSetup } = require('./_base-ide');
-const { WorkflowCommandGenerator } = require('./workflow-command-generator');
-const { getAgentsFromBmad, getTasksFromBmad } = require('./shared/bmad-artifacts');
+const { WorkflowCommandGenerator } = require('./shared/workflow-command-generator');
+const { AgentCommandGenerator } = require('./shared/agent-command-generator');
+const { getTasksFromBmad } = require('./shared/bmad-artifacts');
 
 /**
- * Codex setup handler (supports both CLI and Web)
+ * Codex setup handler (CLI mode)
  */
 class CodexSetup extends BaseIdeSetup {
   constructor() {
     super('codex', 'Codex', true); // preferred IDE
   }
 
-  /**
-   * Collect configuration choices before installation
-   * @param {Object} options - Configuration options
-   * @returns {Object} Collected configuration
-   */
-  async collectConfiguration(options = {}) {
-    const response = await inquirer.prompt([
-      {
-        type: 'list',
-        name: 'mode',
-        message: 'Select Codex deployment mode:',
-        choices: [
-          { name: 'CLI (Command-line interface)', value: 'cli' },
-          { name: 'Web (Browser-based interface)', value: 'web' },
-        ],
-        default: 'cli',
-      },
-    ]);
-
-    return { codexMode: response.mode };
-  }
-
   /**
    * Setup Codex configuration
    * @param {string} projectDir - Project directory
@@ -46,8 +24,8 @@ class CodexSetup extends BaseIdeSetup {
   async setup(projectDir, bmadDir, options = {}) {
     console.log(chalk.cyan(`Setting up ${this.name}...`));
 
-    const config = options.preCollectedConfig || {};
-    const mode = config.codexMode || options.codexMode || 'cli';
+    // Always use CLI mode
+    const mode = 'cli';
 
     const { artifacts, counts } = await this.collectClaudeArtifacts(projectDir, bmadDir, options);
 
@@ -57,16 +35,13 @@ class CodexSetup extends BaseIdeSetup {
     const written = await this.flattenAndWriteArtifacts(artifacts, destDir);
 
     console.log(chalk.green(`✓ ${this.name} configured:`));
-    console.log(chalk.dim(`  - Mode: ${mode === 'web' ? 'Web' : 'CLI'}`));
+    console.log(chalk.dim(`  - Mode: CLI`));
     console.log(chalk.dim(`  - ${counts.agents} agents exported`));
     console.log(chalk.dim(`  - ${counts.tasks} tasks exported`));
     console.log(chalk.dim(`  - ${counts.workflows} workflow commands exported`));
     if (counts.workflowLaunchers > 0) {
       console.log(chalk.dim(`  - ${counts.workflowLaunchers} workflow launchers exported`));
     }
-    if (counts.subagents > 0) {
-      console.log(chalk.dim(`  - ${counts.subagents} subagents exported`));
-    }
     console.log(chalk.dim(`  - ${written} Codex prompt files written`));
     console.log(chalk.dim(`  - Destination: ${destDir}`));
 
@@ -118,23 +93,17 @@ class CodexSetup extends BaseIdeSetup {
     const selectedModules = options.selectedModules || [];
     const artifacts = [];
 
-    const agents = await getAgentsFromBmad(bmadDir, selectedModules);
-    for (const agent of agents) {
-      const content = await this.readAndProcessWithProject(
-        agent.path,
-        {
-          module: agent.module,
-          name: agent.name,
-        },
-        projectDir,
-      );
+    // Generate agent launchers
+    const agentGen = new AgentCommandGenerator(this.bmadFolderName);
+    const { artifacts: agentArtifacts } = await agentGen.collectAgentArtifacts(bmadDir, selectedModules);
 
+    for (const artifact of agentArtifacts) {
       artifacts.push({
         type: 'agent',
-        module: agent.module,
-        sourcePath: agent.path,
-        relativePath: path.join(agent.module, 'agents', `${agent.name}.md`),
-        content,
+        module: artifact.module,
+        sourcePath: artifact.sourcePath,
+        relativePath: artifact.relativePath,
+        content: artifact.content,
       });
     }
 
@@ -158,14 +127,14 @@ class CodexSetup extends BaseIdeSetup {
       });
     }
 
-    const workflowGenerator = new WorkflowCommandGenerator();
+    const workflowGenerator = new WorkflowCommandGenerator(this.bmadFolderName);
     const { artifacts: workflowArtifacts, counts: workflowCounts } = await workflowGenerator.collectWorkflowArtifacts(bmadDir);
     artifacts.push(...workflowArtifacts);
 
     return {
       artifacts,
       counts: {
-        agents: agents.length,
+        agents: agentArtifacts.length,
         tasks: tasks.length,
         workflows: workflowCounts.commands,
         workflowLaunchers: workflowCounts.launchers,

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

@@ -1,6 +1,7 @@
 const path = require('node:path');
 const { BaseIdeSetup } = require('./_base-ide');
 const chalk = require('chalk');
+const { AgentCommandGenerator } = require('./shared/agent-command-generator');
 
 /**
  * Crush IDE setup handler
@@ -28,14 +29,17 @@ class CrushSetup extends BaseIdeSetup {
 
     await this.ensureDir(commandsDir);
 
-    // Get agents, tasks, tools, and workflows (standalone only)
-    const agents = await this.getAgents(bmadDir);
+    // Generate agent launchers
+    const agentGen = new AgentCommandGenerator(this.bmadFolderName);
+    const { artifacts: agentArtifacts } = await agentGen.collectAgentArtifacts(bmadDir, options.selectedModules || []);
+
+    // Get tasks, tools, and workflows (standalone only)
     const tasks = await this.getTasks(bmadDir, true);
     const tools = await this.getTools(bmadDir, true);
     const workflows = await this.getWorkflows(bmadDir, true);
 
     // Organize by module
-    const agentCount = await this.organizeByModule(commandsDir, agents, tasks, tools, workflows, projectDir);
+    const agentCount = await this.organizeByModule(commandsDir, agentArtifacts, tasks, tools, workflows, projectDir);
 
     console.log(chalk.green(`✓ ${this.name} configured:`));
     console.log(chalk.dim(`  - ${agentCount.agents} agent commands created`));
@@ -54,10 +58,10 @@ class CrushSetup extends BaseIdeSetup {
   /**
    * Organize commands by module
    */
-  async organizeByModule(commandsDir, agents, tasks, tools, workflows, projectDir) {
+  async organizeByModule(commandsDir, agentArtifacts, tasks, tools, workflows, projectDir) {
     // Get unique modules
     const modules = new Set();
-    for (const agent of agents) modules.add(agent.module);
+    for (const artifact of agentArtifacts) modules.add(artifact.module);
     for (const task of tasks) modules.add(task.module);
     for (const tool of tools) modules.add(tool.module);
     for (const workflow of workflows) modules.add(workflow.module);
@@ -80,13 +84,11 @@ class CrushSetup extends BaseIdeSetup {
       await this.ensureDir(moduleToolsDir);
       await this.ensureDir(moduleWorkflowsDir);
 
-      // Copy module-specific agents
-      const moduleAgents = agents.filter((a) => a.module === module);
-      for (const agent of moduleAgents) {
-        const content = await this.readFile(agent.path);
-        const commandContent = this.createAgentCommand(agent, content, projectDir);
-        const targetPath = path.join(moduleAgentsDir, `${agent.name}.md`);
-        await this.writeFile(targetPath, commandContent);
+      // Write module-specific agent launchers
+      const moduleAgents = agentArtifacts.filter((a) => a.module === module);
+      for (const artifact of moduleAgents) {
+        const targetPath = path.join(moduleAgentsDir, `${artifact.name}.md`);
+        await this.writeFile(targetPath, artifact.content);
         agentCount++;
       }
 
@@ -129,44 +131,6 @@ class CrushSetup extends BaseIdeSetup {
     };
   }
 
-  /**
-   * Create agent command content
-   */
-  createAgentCommand(agent, content, projectDir) {
-    // Extract metadata
-    const titleMatch = content.match(/title="([^"]+)"/);
-    const title = titleMatch ? titleMatch[1] : this.formatTitle(agent.name);
-
-    const iconMatch = content.match(/icon="([^"]+)"/);
-    const icon = iconMatch ? iconMatch[1] : '🤖';
-
-    // Get relative path
-    const relativePath = path.relative(projectDir, agent.path).replaceAll('\\', '/');
-
-    let commandContent = `# /${agent.name} Command
-
-When this command is used, adopt the following agent persona:
-
-## ${icon} ${title} Agent
-
-${content}
-
-## Command Usage
-
-This command activates the ${title} agent from the BMAD ${agent.module.toUpperCase()} module.
-
-## File Reference
-
-Complete agent definition: [${relativePath}](${relativePath})
-
-## Module
-
-Part of the BMAD ${agent.module.toUpperCase()} module.
-`;
-
-    return commandContent;
-  }
-
   /**
    * Create task command content
    */

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

@@ -1,6 +1,7 @@
 const path = require('node:path');
 const { BaseIdeSetup } = require('./_base-ide');
 const chalk = require('chalk');
+const { AgentCommandGenerator } = require('./shared/agent-command-generator');
 
 /**
  * Cursor IDE setup handler
@@ -45,8 +46,14 @@ class CursorSetup extends BaseIdeSetup {
 
     await this.ensureDir(bmadRulesDir);
 
-    // Get agents, tasks, tools, and workflows (standalone only)
-    const agents = await this.getAgents(bmadDir);
+    // Generate agent launchers first
+    const agentGen = new AgentCommandGenerator(this.bmadFolderName);
+    const { artifacts: agentArtifacts } = await agentGen.collectAgentArtifacts(bmadDir, options.selectedModules || []);
+
+    // Convert artifacts to agent format for index creation
+    const agents = agentArtifacts.map((a) => ({ module: a.module, name: a.name }));
+
+    // Get tasks, tools, and workflows (standalone only)
     const tasks = await this.getTasks(bmadDir, true);
     const tools = await this.getTools(bmadDir, true);
     const workflows = await this.getWorkflows(bmadDir, true);
@@ -63,15 +70,16 @@ class CursorSetup extends BaseIdeSetup {
       await this.ensureDir(path.join(bmadRulesDir, module, 'workflows'));
     }
 
-    // Process and copy agents
+    // Process and write agent launchers with MDC format
     let agentCount = 0;
-    for (const agent of agents) {
-      const content = await this.readAndProcess(agent.path, {
-        module: agent.module,
-        name: agent.name,
+    for (const artifact of agentArtifacts) {
+      // Add MDC metadata header to launcher (but don't call processContent which adds activation headers)
+      const content = this.wrapLauncherWithMDC(artifact.content, {
+        module: artifact.module,
+        name: artifact.name,
       });
 
-      const targetPath = path.join(bmadRulesDir, agent.module, 'agents', `${agent.name}.mdc`);
+      const targetPath = path.join(bmadRulesDir, artifact.module, 'agents', `${artifact.name}.mdc`);
 
       await this.writeFile(targetPath, content);
       agentCount++;
@@ -256,6 +264,13 @@ specific agent expertise, task workflows, tools, or guided workflows.
     // First apply base processing (includes activation injection for agents)
     let processed = super.processContent(content, metadata);
 
+    // Strip any existing frontmatter from the processed content
+    // This prevents duplicate frontmatter blocks
+    const frontmatterRegex = /^---\s*\n[\s\S]*?\n---\s*\n/;
+    if (frontmatterRegex.test(processed)) {
+      processed = processed.replace(frontmatterRegex, '');
+    }
+
     // Determine the type and description based on content
     const isAgent = content.includes('<agent');
     const isTask = content.includes('<task');
@@ -304,6 +319,34 @@ alwaysApply: false
     // Add the MDC header to the processed content
     return mdcHeader + processed;
   }
+
+  /**
+   * Wrap launcher content with MDC metadata (without base processing)
+   * Launchers are already complete and should not have activation headers injected
+   */
+  wrapLauncherWithMDC(launcherContent, metadata = {}) {
+    // Strip the launcher's frontmatter - we'll replace it with MDC frontmatter
+    const frontmatterRegex = /^---\s*\n[\s\S]*?\n---\s*\n/;
+    const contentWithoutFrontmatter = launcherContent.replace(frontmatterRegex, '');
+
+    // Extract metadata from launcher frontmatter for MDC description
+    const nameMatch = launcherContent.match(/name:\s*"([^"]+)"/);
+    const name = nameMatch ? nameMatch[1] : metadata.name;
+
+    const description = `BMAD ${metadata.module.toUpperCase()} Agent: ${name}`;
+
+    // Create MDC metadata header
+    const mdcHeader = `---
+description: ${description}
+globs:
+alwaysApply: false
+---
+
+`;
+
+    // Return MDC header + launcher content (without its original frontmatter)
+    return mdcHeader + contentWithoutFrontmatter;
+  }
 }
 
 module.exports = { CursorSetup };

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

@@ -1,6 +1,9 @@
 const path = require('node:path');
+const fs = require('fs-extra');
+const yaml = require('js-yaml');
 const { BaseIdeSetup } = require('./_base-ide');
 const chalk = require('chalk');
+const { AgentCommandGenerator } = require('./shared/agent-command-generator');
 
 /**
  * Gemini CLI setup handler
@@ -8,9 +11,39 @@ const chalk = require('chalk');
  */
 class GeminiSetup extends BaseIdeSetup {
   constructor() {
-    super('gemini', 'Gemini CLI', true); // preferred IDE
+    super('gemini', 'Gemini CLI', false);
     this.configDir = '.gemini';
     this.commandsDir = 'commands';
+    this.agentTemplatePath = path.join(__dirname, 'templates', 'gemini-agent-command.toml');
+    this.taskTemplatePath = path.join(__dirname, 'templates', 'gemini-task-command.toml');
+  }
+
+  /**
+   * Load config values from bmad installation
+   * @param {string} bmadDir - BMAD installation directory
+   * @returns {Object} Config values
+   */
+  async loadConfigValues(bmadDir) {
+    const configValues = {
+      user_name: 'User', // Default fallback
+    };
+
+    // Try to load core config.yaml
+    const coreConfigPath = path.join(bmadDir, 'core', 'config.yaml');
+    if (await fs.pathExists(coreConfigPath)) {
+      try {
+        const configContent = await fs.readFile(coreConfigPath, 'utf8');
+        const config = yaml.load(configContent);
+
+        if (config.user_name) {
+          configValues.user_name = config.user_name;
+        }
+      } catch (error) {
+        console.warn(chalk.yellow(`  Warning: Could not load config values: ${error.message}`));
+      }
+    }
+
+    return configValues;
   }
 
   /**
@@ -31,29 +64,31 @@ class GeminiSetup extends BaseIdeSetup {
     // Clean up any existing BMAD files before reinstalling
     await this.cleanup(projectDir);
 
-    // Get agents and tasks
-    const agents = await this.getAgents(bmadDir);
+    // Generate agent launchers
+    const agentGen = new AgentCommandGenerator(this.bmadFolderName);
+    const { artifacts: agentArtifacts } = await agentGen.collectAgentArtifacts(bmadDir, options.selectedModules || []);
+
+    // Get tasks
     const tasks = await this.getTasks(bmadDir);
 
     // Install agents as TOML files with bmad- prefix (flat structure)
     let agentCount = 0;
-    for (const agent of agents) {
-      const content = await this.readFile(agent.path);
-      const tomlContent = this.createAgentToml(agent, content, bmadDir);
+    for (const artifact of agentArtifacts) {
+      const tomlContent = await this.createAgentLauncherToml(artifact);
 
       // Flat structure: bmad-agent-{module}-{name}.toml
-      const tomlPath = path.join(commandsDir, `bmad-agent-${agent.module}-${agent.name}.toml`);
+      const tomlPath = path.join(commandsDir, `bmad-agent-${artifact.module}-${artifact.name}.toml`);
       await this.writeFile(tomlPath, tomlContent);
       agentCount++;
 
-      console.log(chalk.green(`  ✓ Added agent: /bmad:agents:${agent.module}:${agent.name}`));
+      console.log(chalk.green(`  ✓ Added agent: /bmad:agents:${artifact.module}:${artifact.name}`));
     }
 
     // Install tasks as TOML files with bmad- prefix (flat structure)
     let taskCount = 0;
     for (const task of tasks) {
       const content = await this.readFile(task.path);
-      const tomlContent = this.createTaskToml(task, content, bmadDir);
+      const tomlContent = await this.createTaskToml(task, content);
 
       // Flat structure: bmad-task-{module}-{name}.toml
       const tomlPath = path.join(commandsDir, `bmad-task-${task.module}-${task.name}.toml`);
@@ -78,51 +113,66 @@ class GeminiSetup extends BaseIdeSetup {
   }
 
   /**
-   * Create agent TOML content
+   * Create agent launcher TOML content from artifact
    */
-  createAgentToml(agent, content, bmadDir) {
-    // Extract metadata
-    const titleMatch = content.match(/title="([^"]+)"/);
-    const title = titleMatch ? titleMatch[1] : this.formatTitle(agent.name);
+  async createAgentLauncherToml(artifact) {
+    // Strip frontmatter from launcher content
+    const frontmatterRegex = /^---\s*\n[\s\S]*?\n---\s*\n/;
+    const contentWithoutFrontmatter = artifact.content.replace(frontmatterRegex, '').trim();
 
-    // Get relative path from project root to agent file
-    const relativePath = path.relative(process.cwd(), agent.path).replaceAll('\\', '/');
+    // Extract title from launcher frontmatter
+    const titleMatch = artifact.content.match(/description:\s*"([^"]+)"/);
+    const title = titleMatch ? titleMatch[1] : this.formatTitle(artifact.name);
 
-    // Create TOML content
-    const tomlContent = `description = "Activates the ${title} agent from the BMad Method."
-prompt = """
-CRITICAL: You are now the BMad '${title}' agent. Adopt its persona and capabilities as defined in the following configuration.
+    // Create TOML wrapper around launcher content (without frontmatter)
+    const description = `BMAD ${artifact.module.toUpperCase()} Agent: ${title}`;
 
-Read and internalize the full agent definition, following all instructions and maintaining this persona until explicitly told to switch or exit.
-
-@${relativePath}
+    return `description = "${description}"
+prompt = """
+${contentWithoutFrontmatter}
 """
 `;
+  }
+
+  /**
+   * Create agent TOML content using template
+   */
+  async createAgentToml(agent, content) {
+    // Extract metadata
+    const titleMatch = content.match(/title="([^"]+)"/);
+    const title = titleMatch ? titleMatch[1] : this.formatTitle(agent.name);
+
+    // Load template
+    const template = await fs.readFile(this.agentTemplatePath, 'utf8');
+
+    // Replace template variables
+    // Note: {user_name} and other {config_values} are left as-is for runtime substitution by Gemini
+    const tomlContent = template
+      .replaceAll('{{title}}', title)
+      .replaceAll('{{bmad_folder}}', this.bmadFolderName)
+      .replaceAll('{{module}}', agent.module)
+      .replaceAll('{{name}}', agent.name);
 
     return tomlContent;
   }
 
   /**
-   * Create task TOML content
+   * Create task TOML content using template
    */
-  createTaskToml(task, content, bmadDir) {
+  async createTaskToml(task, content) {
     // Extract task name from XML if available
     const nameMatch = content.match(/<name>([^<]+)<\/name>/);
     const taskName = nameMatch ? nameMatch[1] : this.formatTitle(task.name);
 
-    // Get relative path from project root to task file
-    const relativePath = path.relative(process.cwd(), task.path).replaceAll('\\', '/');
-
-    // Create TOML content
-    const tomlContent = `description = "Executes the ${taskName} task from the BMad Method."
-prompt = """
-Execute the following BMad Method task workflow:
-
-@${relativePath}
+    // Load template
+    const template = await fs.readFile(this.taskTemplatePath, 'utf8');
 
-Follow all instructions and complete the task as defined.
-"""
-`;
+    // Replace template variables
+    const tomlContent = template
+      .replaceAll('{{taskName}}', taskName)
+      .replaceAll('{{bmad_folder}}', this.bmadFolderName)
+      .replaceAll('{{module}}', task.module)
+      .replaceAll('{{filename}}', task.filename);
 
     return tomlContent;
   }

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

@@ -2,6 +2,7 @@ const path = require('node:path');
 const { BaseIdeSetup } = require('./_base-ide');
 const chalk = require('chalk');
 const inquirer = require('inquirer');
+const { AgentCommandGenerator } = require('./shared/agent-command-generator');
 
 /**
  * GitHub Copilot setup handler
@@ -104,21 +105,22 @@ class GitHubCopilotSetup extends BaseIdeSetup {
     // Clean up any existing BMAD files before reinstalling
     await this.cleanup(projectDir);
 
-    // Get agents
-    const agents = await this.getAgents(bmadDir);
+    // Generate agent launchers
+    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;
-    for (const agent of agents) {
-      const content = await this.readFile(agent.path);
-      const chatmodeContent = this.createChatmodeContent(agent, content);
+    for (const artifact of agentArtifacts) {
+      const content = artifact.content;
+      const chatmodeContent = await this.createChatmodeContent({ module: artifact.module, name: artifact.name }, content);
 
       // Use bmad- prefix: bmad-agent-{module}-{name}.chatmode.md
-      const targetPath = path.join(chatmodesDir, `bmad-agent-${agent.module}-${agent.name}.chatmode.md`);
+      const targetPath = path.join(chatmodesDir, `bmad-agent-${artifact.module}-${artifact.name}.chatmode.md`);
       await this.writeFile(targetPath, chatmodeContent);
       modeCount++;
 
-      console.log(chalk.green(`  ✓ Created chat mode: bmad-agent-${agent.module}-${agent.name}`));
+      console.log(chalk.green(`  ✓ Created chat mode: bmad-agent-${artifact.module}-${artifact.name}`));
     }
 
     console.log(chalk.green(`✓ ${this.name} configured:`));
@@ -206,32 +208,45 @@ class GitHubCopilotSetup extends BaseIdeSetup {
   /**
    * Create chat mode content
    */
-  createChatmodeContent(agent, content) {
-    // Extract metadata
-    const titleMatch = content.match(/title="([^"]+)"/);
-    const title = titleMatch ? titleMatch[1] : this.formatTitle(agent.name);
-
-    const whenToUseMatch = content.match(/whenToUse="([^"]+)"/);
-    const description = whenToUseMatch ? whenToUseMatch[1] : `Activates the ${title} agent persona.`;
+  async createChatmodeContent(agent, content) {
+    // Extract metadata from launcher frontmatter if present
+    const descMatch = content.match(/description:\s*"([^"]+)"/);
+    const title = descMatch ? descMatch[1] : this.formatTitle(agent.name);
+
+    const description = `Activates the ${title} agent persona.`;
+
+    // Strip any existing frontmatter from the content
+    const frontmatterRegex = /^---\s*\n[\s\S]*?\n---\s*\n/;
+    let cleanContent = content;
+    if (frontmatterRegex.test(content)) {
+      cleanContent = content.replace(frontmatterRegex, '').trim();
+    }
 
-    // Available GitHub Copilot tools
+    // Available GitHub Copilot tools (November 2025 - Official VS Code Documentation)
+    // Reference: https://code.visualstudio.com/docs/copilot/reference/copilot-vscode-features#_chat-tools
     const tools = [
-      'changes',
-      'codebase',
-      'fetch',
-      'findTestFiles',
-      'githubRepo',
-      'problems',
-      'usages',
-      'editFiles',
-      'runCommands',
-      'runTasks',
-      'runTests',
-      'search',
-      'searchResults',
-      'terminalLastCommand',
-      'terminalSelection',
-      'testFailure',
+      '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
+      '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
+      '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
+      'testFailure', // Get unit test failure information
+      'textSearch', // Find text in files
+      'usages', // Find references and navigate definitions
     ];
 
     let chatmodeContent = `---
@@ -241,11 +256,8 @@ tools: ${JSON.stringify(tools)}
 
 # ${title} Agent
 
-${content}
-
-## Module
+${cleanContent}
 
-Part of the BMAD ${agent.module.toUpperCase()} module.
 `;
 
     return chatmodeContent;