mirror of
https://github.com/bmad-code-org/BMAD-METHOD.git
synced 2026-01-30 04:32:02 +00:00
fix(ide): add support for Gemini CLI TOML format (#1431)
* fix(ide): add support for Gemini CLI TOML format * fix(ide): Added normalization for config.extension, added .yml to the extension array --------- Co-authored-by: Brian <bmadcode@gmail.com>
This commit is contained in:
@@ -132,12 +132,12 @@ class ConfigDrivenIdeSetup extends BaseIdeSetup {
|
|||||||
*/
|
*/
|
||||||
async writeAgentArtifacts(targetPath, artifacts, templateType, config = {}) {
|
async writeAgentArtifacts(targetPath, artifacts, templateType, config = {}) {
|
||||||
// Try to load platform-specific template, fall back to default-agent
|
// Try to load platform-specific template, fall back to default-agent
|
||||||
const template = await this.loadTemplate(templateType, 'agent', config, 'default-agent');
|
const { content: template, extension } = await this.loadTemplate(templateType, 'agent', config, 'default-agent');
|
||||||
let count = 0;
|
let count = 0;
|
||||||
|
|
||||||
for (const artifact of artifacts) {
|
for (const artifact of artifacts) {
|
||||||
const content = this.renderTemplate(template, artifact);
|
const content = this.renderTemplate(template, artifact);
|
||||||
const filename = this.generateFilename(artifact, 'agent');
|
const filename = this.generateFilename(artifact, 'agent', extension);
|
||||||
const filePath = path.join(targetPath, filename);
|
const filePath = path.join(targetPath, filename);
|
||||||
await this.writeFile(filePath, content);
|
await this.writeFile(filePath, content);
|
||||||
count++;
|
count++;
|
||||||
@@ -167,9 +167,10 @@ class ConfigDrivenIdeSetup extends BaseIdeSetup {
|
|||||||
|
|
||||||
// Fall back to default templates if specific ones don't exist
|
// Fall back to default templates if specific ones don't exist
|
||||||
const finalTemplateType = artifact.isYamlWorkflow ? 'default-workflow-yaml' : 'default-workflow';
|
const finalTemplateType = artifact.isYamlWorkflow ? 'default-workflow-yaml' : 'default-workflow';
|
||||||
const template = await this.loadTemplate(workflowTemplateType, 'workflow', config, finalTemplateType);
|
// workflowTemplateType already contains full name (e.g., 'gemini-workflow-yaml'), so pass empty artifactType
|
||||||
|
const { content: template, extension } = await this.loadTemplate(workflowTemplateType, '', config, finalTemplateType);
|
||||||
const content = this.renderTemplate(template, artifact);
|
const content = this.renderTemplate(template, artifact);
|
||||||
const filename = this.generateFilename(artifact, 'workflow');
|
const filename = this.generateFilename(artifact, 'workflow', extension);
|
||||||
const filePath = path.join(targetPath, filename);
|
const filePath = path.join(targetPath, filename);
|
||||||
await this.writeFile(filePath, content);
|
await this.writeFile(filePath, content);
|
||||||
count++;
|
count++;
|
||||||
@@ -185,34 +186,47 @@ class ConfigDrivenIdeSetup extends BaseIdeSetup {
|
|||||||
* @param {string} artifactType - Artifact type (agent, workflow, task, tool)
|
* @param {string} artifactType - Artifact type (agent, workflow, task, tool)
|
||||||
* @param {Object} config - Installation configuration
|
* @param {Object} config - Installation configuration
|
||||||
* @param {string} fallbackTemplateType - Fallback template type if requested template not found
|
* @param {string} fallbackTemplateType - Fallback template type if requested template not found
|
||||||
* @returns {Promise<string>} Template content
|
* @returns {Promise<{content: string, extension: string}>} Template content and extension
|
||||||
*/
|
*/
|
||||||
async loadTemplate(templateType, artifactType, config = {}, fallbackTemplateType = null) {
|
async loadTemplate(templateType, artifactType, config = {}, fallbackTemplateType = null) {
|
||||||
const { header_template, body_template } = config;
|
const { header_template, body_template } = config;
|
||||||
|
|
||||||
// Check for separate header/body templates
|
// Check for separate header/body templates
|
||||||
if (header_template || body_template) {
|
if (header_template || body_template) {
|
||||||
return await this.loadSplitTemplates(templateType, artifactType, header_template, body_template);
|
const content = await this.loadSplitTemplates(templateType, artifactType, header_template, body_template);
|
||||||
|
// Allow config to override extension, default to .md
|
||||||
|
const ext = config.extension || '.md';
|
||||||
|
const normalizedExt = ext.startsWith('.') ? ext : `.${ext}`;
|
||||||
|
return { content, extension: normalizedExt };
|
||||||
}
|
}
|
||||||
|
|
||||||
// Load combined template
|
// Load combined template - try multiple extensions
|
||||||
const templateName = `${templateType}-${artifactType}.md`;
|
// If artifactType is empty, templateType already contains full name (e.g., 'gemini-workflow-yaml')
|
||||||
const templatePath = path.join(__dirname, 'templates', 'combined', templateName);
|
const templateBaseName = artifactType ? `${templateType}-${artifactType}` : templateType;
|
||||||
|
const templateDir = path.join(__dirname, 'templates', 'combined');
|
||||||
|
const extensions = ['.md', '.toml', '.yaml', '.yml'];
|
||||||
|
|
||||||
|
for (const ext of extensions) {
|
||||||
|
const templatePath = path.join(templateDir, templateBaseName + ext);
|
||||||
if (await fs.pathExists(templatePath)) {
|
if (await fs.pathExists(templatePath)) {
|
||||||
return await fs.readFile(templatePath, 'utf8');
|
const content = await fs.readFile(templatePath, 'utf8');
|
||||||
|
return { content, extension: ext };
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fall back to default template (if provided)
|
// Fall back to default template (if provided)
|
||||||
if (fallbackTemplateType) {
|
if (fallbackTemplateType) {
|
||||||
const fallbackPath = path.join(__dirname, 'templates', 'combined', `${fallbackTemplateType}.md`);
|
for (const ext of extensions) {
|
||||||
|
const fallbackPath = path.join(templateDir, `${fallbackTemplateType}${ext}`);
|
||||||
if (await fs.pathExists(fallbackPath)) {
|
if (await fs.pathExists(fallbackPath)) {
|
||||||
return await fs.readFile(fallbackPath, 'utf8');
|
const content = await fs.readFile(fallbackPath, 'utf8');
|
||||||
|
return { content, extension: ext };
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ultimate fallback - minimal template
|
// Ultimate fallback - minimal template
|
||||||
return this.getDefaultTemplate(artifactType);
|
return { content: this.getDefaultTemplate(artifactType), extension: '.md' };
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -326,13 +340,26 @@ LOAD and execute from: {project-root}/{{bmadFolderName}}/{{path}}
|
|||||||
* Generate filename for artifact
|
* Generate filename for artifact
|
||||||
* @param {Object} artifact - Artifact data
|
* @param {Object} artifact - Artifact data
|
||||||
* @param {string} artifactType - Artifact type (agent, workflow, task, tool)
|
* @param {string} artifactType - Artifact type (agent, workflow, task, tool)
|
||||||
|
* @param {string} extension - File extension to use (e.g., '.md', '.toml')
|
||||||
* @returns {string} Generated filename
|
* @returns {string} Generated filename
|
||||||
*/
|
*/
|
||||||
generateFilename(artifact, artifactType) {
|
generateFilename(artifact, artifactType, extension = '.md') {
|
||||||
const { toDashPath } = require('./shared/path-utils');
|
const { toDashPath } = require('./shared/path-utils');
|
||||||
// toDashPath already handles the .agent.md suffix for agents correctly
|
|
||||||
// No need to add it again here
|
// Reuse central logic to ensure consistent naming conventions
|
||||||
return toDashPath(artifact.relativePath);
|
const standardName = toDashPath(artifact.relativePath);
|
||||||
|
|
||||||
|
// Clean up potential double extensions from source files (e.g. .yaml.md -> .md)
|
||||||
|
const baseName = standardName.replace(/\.(yaml|yml)\.md$/, '.md');
|
||||||
|
|
||||||
|
// If using default markdown, preserve original behavior (keeps .agent.md suffix)
|
||||||
|
if (extension === '.md') {
|
||||||
|
return baseName;
|
||||||
|
}
|
||||||
|
|
||||||
|
// For other extensions (e.g., .toml), remove .agent suffix as well
|
||||||
|
// Gemini doesn't support double-dot patterns like .agent.toml
|
||||||
|
return baseName.replace(/(\.agent)?(\.md|\.yaml|\.yml)$/, extension);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -32,7 +32,9 @@ class AgentCommandGenerator {
|
|||||||
// Use relativePath if available (for nested agents), otherwise just name with .md
|
// Use relativePath if available (for nested agents), otherwise just name with .md
|
||||||
const agentPathInModule = agent.relativePath || `${agent.name}.md`;
|
const agentPathInModule = agent.relativePath || `${agent.name}.md`;
|
||||||
// Calculate the relative agent path (e.g., bmm/agents/pm.md)
|
// Calculate the relative agent path (e.g., bmm/agents/pm.md)
|
||||||
let agentRelPath = agent.path;
|
let agentRelPath = agent.path || '';
|
||||||
|
// Normalize path separators for cross-platform compatibility
|
||||||
|
agentRelPath = agentRelPath.replaceAll('\\', '/');
|
||||||
// Remove _bmad/ prefix if present to get relative path from project root
|
// Remove _bmad/ prefix if present to get relative path from project root
|
||||||
// Handle both absolute paths (/path/to/_bmad/...) and relative paths (_bmad/...)
|
// Handle both absolute paths (/path/to/_bmad/...) and relative paths (_bmad/...)
|
||||||
if (agentRelPath.includes('_bmad/')) {
|
if (agentRelPath.includes('_bmad/')) {
|
||||||
|
|||||||
@@ -68,7 +68,9 @@ class WorkflowCommandGenerator {
|
|||||||
for (const workflow of allWorkflows) {
|
for (const workflow of allWorkflows) {
|
||||||
const commandContent = await this.generateCommandContent(workflow, bmadDir);
|
const commandContent = await this.generateCommandContent(workflow, bmadDir);
|
||||||
// Calculate the relative workflow path (e.g., bmm/workflows/4-implementation/sprint-planning/workflow.yaml)
|
// Calculate the relative workflow path (e.g., bmm/workflows/4-implementation/sprint-planning/workflow.yaml)
|
||||||
let workflowRelPath = workflow.path;
|
let workflowRelPath = workflow.path || '';
|
||||||
|
// Normalize path separators for cross-platform compatibility
|
||||||
|
workflowRelPath = workflowRelPath.replaceAll('\\', '/');
|
||||||
// Remove _bmad/ prefix if present to get relative path from project root
|
// Remove _bmad/ prefix if present to get relative path from project root
|
||||||
// Handle both absolute paths (/path/to/_bmad/...) and relative paths (_bmad/...)
|
// Handle both absolute paths (/path/to/_bmad/...) and relative paths (_bmad/...)
|
||||||
if (workflowRelPath.includes('_bmad/')) {
|
if (workflowRelPath.includes('_bmad/')) {
|
||||||
@@ -76,9 +78,15 @@ class WorkflowCommandGenerator {
|
|||||||
if (parts.length > 1) {
|
if (parts.length > 1) {
|
||||||
workflowRelPath = parts.slice(1).join('/');
|
workflowRelPath = parts.slice(1).join('/');
|
||||||
}
|
}
|
||||||
|
} else if (workflowRelPath.includes('/src/')) {
|
||||||
|
// Normalize source paths (e.g. .../src/bmm/...) to relative module path (e.g. bmm/...)
|
||||||
|
const match = workflowRelPath.match(/\/src\/([^/]+)\/(.+)/);
|
||||||
|
if (match) {
|
||||||
|
workflowRelPath = `${match[1]}/${match[2]}`;
|
||||||
}
|
}
|
||||||
// Determine if this is a YAML workflow
|
}
|
||||||
const isYamlWorkflow = workflow.path.endsWith('.yaml') || workflow.path.endsWith('.yml');
|
// Determine if this is a YAML workflow (use normalized path which is guaranteed to be a string)
|
||||||
|
const isYamlWorkflow = workflowRelPath.endsWith('.yaml') || workflowRelPath.endsWith('.yml');
|
||||||
artifacts.push({
|
artifacts.push({
|
||||||
type: 'workflow-command',
|
type: 'workflow-command',
|
||||||
isYamlWorkflow: isYamlWorkflow, // For template selection
|
isYamlWorkflow: isYamlWorkflow, // For template selection
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
description = "Activates the {{name}} agent from the BMad Method."
|
||||||
|
prompt = """
|
||||||
|
CRITICAL: You are now the BMad '{{name}}' agent.
|
||||||
|
|
||||||
|
PRE-FLIGHT CHECKLIST:
|
||||||
|
1. [ ] IMMEDIATE ACTION: Load and parse {project-root}/{{bmadFolderName}}/{{module}}/config.yaml - store ALL config values in memory for use throughout the session.
|
||||||
|
2. [ ] IMMEDIATE ACTION: Read and internalize the full agent definition at {project-root}/{{bmadFolderName}}/{{path}}.
|
||||||
|
3. [ ] CONFIRM: The user's name from config is {user_name}.
|
||||||
|
|
||||||
|
Only after all checks are complete, greet the user by name and display the menu.
|
||||||
|
Acknowledge this checklist is complete in your first response.
|
||||||
|
|
||||||
|
AGENT DEFINITION: {project-root}/{{bmadFolderName}}/{{path}}
|
||||||
|
"""
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
description = """{{description}}"""
|
||||||
|
prompt = """
|
||||||
|
Execute the BMAD '{{name}}' workflow.
|
||||||
|
|
||||||
|
CRITICAL: This is a structured YAML workflow. Follow these steps precisely:
|
||||||
|
|
||||||
|
1. LOAD the workflow definition from {project-root}/{{bmadFolderName}}/{{workflow_path}}
|
||||||
|
2. PARSE the YAML structure to understand:
|
||||||
|
- Workflow phases and steps
|
||||||
|
- Required inputs and outputs
|
||||||
|
- Dependencies between steps
|
||||||
|
3. EXECUTE each step in order
|
||||||
|
4. VALIDATE outputs before proceeding to next step
|
||||||
|
|
||||||
|
WORKFLOW FILE: {project-root}/{{bmadFolderName}}/{{workflow_path}}
|
||||||
|
"""
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
description = """{{description}}"""
|
||||||
|
prompt = """
|
||||||
|
Execute the BMAD '{{name}}' workflow.
|
||||||
|
|
||||||
|
CRITICAL: You must load and follow the workflow definition exactly.
|
||||||
|
|
||||||
|
WORKFLOW INSTRUCTIONS:
|
||||||
|
1. LOAD the workflow file from {project-root}/{{bmadFolderName}}/{{workflow_path}}
|
||||||
|
2. READ its entire contents
|
||||||
|
3. FOLLOW every step precisely as specified
|
||||||
|
4. DO NOT skip or modify any steps
|
||||||
|
|
||||||
|
WORKFLOW FILE: {project-root}/{{bmadFolderName}}/{{workflow_path}}
|
||||||
|
"""
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
description = "Activates the {{title}} agent from the BMad Method."
|
|
||||||
prompt = """
|
|
||||||
CRITICAL: You are now the BMad '{{title}}' agent.
|
|
||||||
|
|
||||||
PRE-FLIGHT CHECKLIST:
|
|
||||||
1. [ ] IMMEDIATE ACTION: Load and parse @{_bmad}/{{module}}/config.yaml - store ALL config values in memory for use throughout the session.
|
|
||||||
2. [ ] IMMEDIATE ACTION: Read and internalize the full agent definition at @{_bmad}/{{module}}/agents/{{name}}.md.
|
|
||||||
3. [ ] CONFIRM: The user's name from config is {user_name}.
|
|
||||||
|
|
||||||
Only after all checks are complete, greet the user by name and display the menu.
|
|
||||||
Acknowledge this checklist is complete in your first response.
|
|
||||||
|
|
||||||
AGENT DEFINITION: @{_bmad}/{{module}}/agents/{{name}}.md
|
|
||||||
"""
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
description = "Executes the {{taskName}} task from the BMad Method."
|
|
||||||
prompt = """
|
|
||||||
Execute the following BMad Method task workflow:
|
|
||||||
|
|
||||||
PRE-FLIGHT CHECKLIST:
|
|
||||||
1. [ ] IMMEDIATE ACTION: Load and parse @{_bmad}/{{module}}/config.yaml.
|
|
||||||
2. [ ] IMMEDIATE ACTION: Read and load the task definition at @{_bmad}/{{module}}/tasks/{{filename}}.
|
|
||||||
|
|
||||||
Follow all instructions and complete the task as defined.
|
|
||||||
|
|
||||||
TASK DEFINITION: @{_bmad}/{{module}}/tasks/{{filename}}
|
|
||||||
"""
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
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 {project-root}/_bmad/{{path}}
|
|
||||||
2. READ its entire contents - this contains the complete agent persona, menu, and instructions
|
|
||||||
3. FOLLOW every step in the <activation> section precisely
|
|
||||||
4. DISPLAY the welcome/greeting as instructed
|
|
||||||
5. PRESENT the numbered menu
|
|
||||||
6. WAIT for user input before proceeding
|
|
||||||
</agent-activation>
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
name = "{{name}}"
|
|
||||||
description = "{{description}}"
|
|
||||||
Reference in New Issue
Block a user