@hyperdrive.bot/bmad-workflow 1.0.21 → 1.0.23

package/dist/services/orchestration/workflow-orchestrator.js

@@ -46,6 +46,7 @@
 import { isEpicStory } from '../../models/story.js';
 import { ParserError, ValidationError } from '../../utils/errors.js';
 import { runAgentWithRetry } from '../../utils/retry.js';
+import { AssetResolver } from '../file-system/asset-resolver.js';
 import { PrdFixer } from '../parsers/prd-fixer.js';
 import { FileScaffolder } from '../scaffolding/file-scaffolder.js';
 import { BatchProcessor } from './batch-processor.js';
@@ -60,6 +61,7 @@ import { ReviewQueue } from '../review/review-queue.js';
  */
 export class WorkflowOrchestrator {
     agentRunner;
+    assetResolver;
     batchProcessor;
     callbacks;
     epicParser;
@@ -80,6 +82,7 @@ export class WorkflowOrchestrator {
      * @param config - Configuration object containing all service dependencies
      */
     constructor(config) {
+        this.assetResolver = config.assetResolver ?? new AssetResolver({});
         this.inputDetector = config.inputDetector;
         this.prdParser = config.prdParser;
         this.epicParser = config.epicParser;
@@ -173,7 +176,9 @@ export class WorkflowOrchestrator {
         const { cwd, outputPath, prdPath, references, smAgent } = options;
         const referencesText = references.length > 0 ? `\nReferences: ${references.join(', ')}` : '';
         const cwdText = cwd ? `\n\nWorking directory: ${cwd}` : '';
-        const agentRef = smAgent ? `@${smAgent}` : `@.bmad-core/agents/sm.md`;
+        const resolved = this.assetResolver.resolveAgent('sm', smAgent);
+        const agentRef = `@${resolved.path}`;
+        const templateResolved = this.assetResolver.resolveTemplate('epic-tmpl.yaml');
         return `${agentRef}${cwdText}
 
 Create epic '${epic.number}: ${epic.title}' for PRD '${prdPath}'.${referencesText}.
@@ -182,7 +187,7 @@ IMPORTANT: The file at '${outputPath}' has been pre-scaffolded with structure an
 - DO NOT modify the Epic Header section (Epic ID, Status: Draft, Created date are already set)
 - DO NOT change the document structure or section headers
 - ONLY populate the empty content sections marked with [AI Agent will populate]
-- Follow the template structure at @.bmad-core/templates/epic-tmpl.yaml for content guidance
+- Follow the template structure at @${templateResolved.path} for content guidance
 
 Write output to: '${outputPath}'`;
     }
@@ -220,7 +225,9 @@ Write output to: '${outputPath}'`;
         const { cwd, epicPath, outputPath, references, smAgent } = options;
         const referencesText = references.length > 0 ? `\nReferences: ${references.join(', ')}` : '';
         const cwdText = cwd ? `\n\nWorking directory: ${cwd}` : '';
-        const agentRef = smAgent ? `@${smAgent}` : `@.bmad-core/agents/sm.md`;
+        const resolved = this.assetResolver.resolveAgent('sm', smAgent);
+        const agentRef = `@${resolved.path}`;
+        const templateResolved = this.assetResolver.resolveTemplate('story-tmpl.yaml');
         return `${agentRef}${cwdText}
 
 Create story '${story.fullNumber}: ${story.title}' for epic '${epicPath}'. ${referencesText}
@@ -230,7 +237,7 @@ IMPORTANT: The file at '${outputPath}' has been pre-scaffolded with structure an
 - DO NOT modify the Created date in Change Log
 - DO NOT change the document structure or section headers
 - ONLY populate the empty content sections marked with [AI Agent will populate]
-- Follow the template structure at @.bmad-core/templates/story-tmpl.yaml for content guidance
+- Follow the template structure at @${templateResolved.path} for content guidance
 
 Write output to: ${outputPath}`;
     }
@@ -626,14 +633,17 @@ Write output to: ${outputPath}`;
                     // Build prompt with auto-detected references
                     const mcpPrefix = await this.getMcpPromptPrefix('dev', 'dev', config);
                     let prompt = mcpPrefix ? `${mcpPrefix}\n\n` : '';
-                    prompt += config.devAgent ? `@${config.devAgent}\n\n` : `@.bmad-core/agents/dev.md\n\n`;
+                    const devResolved = this.assetResolver.resolveAgent('dev', config.devAgent);
+                    prompt += `@${devResolved.path}\n\n`;
                     // Add working directory instruction if specified
                     if (config.cwd) {
                         prompt += `Working directory: ${config.cwd}\n\n`;
                     }
                     prompt += `*develop-story ${storyFilePath}\n\n`;
-                    // Combine auto-detected references with user-provided references
-                    const allReferences = [...autoReferences, ...(config.references || [])];
+                    // Parse Dev Context section for sidecars and deploy target
+                    const devContext = this.parseDevContext(storyContent);
+                    // Combine auto-detected references with user-provided references and sidecars
+                    const allReferences = [...autoReferences, ...(config.references || []), ...devContext.sidecarRefs];
                     if (allReferences.length > 0) {
                         prompt += 'References:\n';
                         for (const ref of allReferences) {
@@ -641,6 +651,10 @@ Write output to: ${outputPath}`;
                         }
                         prompt += '\n';
                     }
+                    // Add deploy target context if specified in story
+                    if (devContext.deployTarget) {
+                        prompt += `Deploy target: ${devContext.deployTarget}\n\n`;
+                    }
                     prompt += '*yolo mode*\n';
                     // Generate unique spawn ID
                     const spawnId = `dev-${story.fullNumber}-${storyStartTime}`;
@@ -659,6 +673,7 @@ Write output to: ${outputPath}`;
                     // Execute dev agent with retry on timeout/killed
                     const result = await runAgentWithRetry(this.agentRunner, prompt, {
                         agentType: 'dev',
+                        cwd: config.cwd,
                         references: config.references,
                         timeout: config.timeout ?? 2_700_000,
                     }, {
@@ -901,14 +916,17 @@ Write output to: ${outputPath}`;
                 // Build prompt with auto-detected references
                 const mcpPrefix = await this.getMcpPromptPrefix('dev', 'dev', config);
                 let prompt = mcpPrefix ? `${mcpPrefix}\n\n` : '';
-                prompt += config.devAgent ? `@${config.devAgent}\n\n` : `@.bmad-core/agents/dev.md\n\n`;
+                const devResolved = this.assetResolver.resolveAgent('dev', config.devAgent);
+                prompt += `@${devResolved.path}\n\n`;
                 // Add working directory instruction if specified
                 if (config.cwd) {
                     prompt += `Working directory: ${config.cwd}\n\n`;
                 }
                 prompt += `Implement story: ${storyFilePath}\n\n`;
-                // Combine auto-detected references with user-provided references
-                const allReferences = [...autoReferences, ...(config.references || [])];
+                // Parse Dev Context section for sidecars and deploy target
+                const devContext = this.parseDevContext(storyContent);
+                // Combine auto-detected references with user-provided references and sidecars
+                const allReferences = [...autoReferences, ...(config.references || []), ...devContext.sidecarRefs];
                 if (allReferences.length > 0) {
                     prompt += 'References:\n';
                     for (const ref of allReferences) {
@@ -916,6 +934,10 @@ Write output to: ${outputPath}`;
                     }
                     prompt += '\n';
                 }
+                // Add deploy target context if specified in story
+                if (devContext.deployTarget) {
+                    prompt += `Deploy target: ${devContext.deployTarget}\n\n`;
+                }
                 prompt += '*yolo mode*\n';
                 // Generate unique spawn ID and timestamp
                 const spawnStartTime = Date.now();
@@ -933,6 +955,7 @@ Write output to: ${outputPath}`;
                 });
                 const result = await runAgentWithRetry(this.agentRunner, prompt, {
                     agentType: 'dev',
+                    cwd: config.cwd,
                     references: config.references,
                     timeout: config.timeout ?? 2_700_000,
                 }, {
@@ -1258,6 +1281,7 @@ Write output to: ${outputPath}`;
                     // Step 3: Run Claude agent to populate content sections
                     const result = await runAgentWithRetry(this.agentRunner, prompt, {
                         agentType: 'architect',
+                        cwd: config.cwd,
                         references: config.references,
                         timeout: config.timeout ?? 2_700_000,
                     }, {
@@ -2250,6 +2274,7 @@ Write output to: ${outputPath}`;
                     // Step 4: Run Claude agent to populate content sections
                     const result = await runAgentWithRetry(this.agentRunner, prompt, {
                         agentType: 'sm',
+                        cwd: config.cwd,
                         references: config.references,
                         timeout: config.timeout ?? 2_700_000,
                     }, {
@@ -2576,6 +2601,7 @@ Write output to: ${outputPath}`;
                     // Step 4: Run Claude agent to populate content sections
                     const result = await runAgentWithRetry(this.agentRunner, prompt, {
                         agentType: 'sm',
+                        cwd: config.cwd,
                         references: config.references,
                         timeout: config.timeout ?? 2_700_000,
                     }, {
@@ -3085,6 +3111,49 @@ Write output to: ${outputPath}`;
     async sleep(ms) {
         await new Promise((resolve) => setTimeout(resolve, ms));
     }
+    /**
+     * Parse the `### Dev Context` section from a story file's content.
+     *
+     * Returns sidecar reference paths and an optional deploy target string.
+     * If the section is missing or empty, returns empty arrays / undefined (backward compatible).
+     */
+    parseDevContext(storyContent) {
+        const sidecarRefs = [];
+        let deployTarget;
+        // Find the ### Dev Context section
+        const devCtxMatch = storyContent.match(/^### Dev Context\s*$/m);
+        if (!devCtxMatch || devCtxMatch.index === undefined) {
+            return { deployTarget, sidecarRefs };
+        }
+        // Extract section content up to the next heading or end of file
+        const sectionStart = devCtxMatch.index + devCtxMatch[0].length;
+        const nextHeadingMatch = storyContent.slice(sectionStart).match(/^#{1,3} /m);
+        const sectionEnd = nextHeadingMatch?.index !== undefined ? sectionStart + nextHeadingMatch.index : storyContent.length;
+        const sectionContent = storyContent.slice(sectionStart, sectionEnd);
+        // Parse Sidecars line — supports "- **Sidecars:**" or "- Sidecars:" (flexible)
+        const sidecarsMatch = sectionContent.match(/^-\s+\*{0,2}Sidecars:?\*{0,2}\s*(.+)$/im);
+        if (sidecarsMatch?.[1]) {
+            const raw = sidecarsMatch[1].trim();
+            for (const part of raw.split(',')) {
+                const name = part.trim();
+                if (name.length === 0)
+                    continue;
+                // If already a path, use as-is; otherwise prefix with _bmad/bmm/agents/
+                if (name.includes('/')) {
+                    sidecarRefs.push(name);
+                }
+                else {
+                    sidecarRefs.push(`_bmad/bmm/agents/${name}`);
+                }
+            }
+        }
+        // Parse Deploy target line
+        const deployMatch = sectionContent.match(/^-\s+\*{0,2}Deploy target:?\*{0,2}\s*(.+)$/im);
+        if (deployMatch?.[1]) {
+            deployTarget = deployMatch[1].trim();
+        }
+        return { deployTarget, sidecarRefs };
+    }
     /**
      * Update story status in file
      *

package/dist/utils/config-merge.d.ts

@@ -0,0 +1,60 @@
+/**
+ * Config Merge Utility
+ *
+ * Implements three-layer merge for execution config:
+ * CLI flags (highest) → .bmad-workflow.yaml → hardcoded defaults (lowest)
+ *
+ * Pure function — no side effects, easy to test.
+ */
+import type { ConfigExecutionDefaults } from '../services/file-system/asset-resolver.js';
+/**
+ * Merged execution config with all fields resolved
+ */
+export interface MergedExecutionConfig {
+    epicInterval: number;
+    maxRetries: number;
+    model: string | undefined;
+    parallel: number;
+    pipeline: boolean;
+    prdInterval: number;
+    provider: 'claude' | 'gemini' | 'opencode';
+    qa: boolean;
+    retryBackoffMs: number;
+    storyInterval: number;
+    timeout: number;
+}
+/**
+ * CLI flags that may be undefined when user didn't pass them.
+ * Only fields explicitly passed by the user should be present.
+ */
+export interface CliExecutionFlags {
+    epicInterval?: number;
+    maxRetries?: number;
+    model?: string;
+    parallel?: number;
+    pipeline?: boolean;
+    prdInterval?: number;
+    provider?: string;
+    qa?: boolean;
+    retryBackoffMs?: number;
+    storyInterval?: number;
+    timeout?: number;
+}
+/**
+ * Hardcoded defaults — final fallback when neither CLI nor config provides a value
+ */
+export declare const EXECUTION_DEFAULTS: MergedExecutionConfig;
+/**
+ * Merge execution config from three layers: CLI flags → config file → hardcoded defaults.
+ *
+ * For each field, the first defined value wins (left to right):
+ * 1. CLI flag (explicit user input)
+ * 2. Config file value (from .bmad-workflow.yaml)
+ * 3. Hardcoded default
+ *
+ * @param cliFlags - Flags explicitly passed via CLI (undefined = not passed)
+ * @param configFile - Execution defaults from .bmad-workflow.yaml
+ * @param defaults - Hardcoded fallback values
+ * @returns Fully resolved execution config
+ */
+export declare function mergeExecutionConfig(cliFlags: CliExecutionFlags, configFile: ConfigExecutionDefaults, defaults?: MergedExecutionConfig): MergedExecutionConfig;

package/dist/utils/config-merge.js

@@ -0,0 +1,52 @@
+/**
+ * Config Merge Utility
+ *
+ * Implements three-layer merge for execution config:
+ * CLI flags (highest) → .bmad-workflow.yaml → hardcoded defaults (lowest)
+ *
+ * Pure function — no side effects, easy to test.
+ */
+/**
+ * Hardcoded defaults — final fallback when neither CLI nor config provides a value
+ */
+export const EXECUTION_DEFAULTS = {
+    epicInterval: 60,
+    maxRetries: 0,
+    model: undefined,
+    parallel: 3,
+    pipeline: true,
+    prdInterval: 60,
+    provider: 'claude',
+    qa: false,
+    retryBackoffMs: 5000,
+    storyInterval: 60,
+    timeout: 2_700_000,
+};
+/**
+ * Merge execution config from three layers: CLI flags → config file → hardcoded defaults.
+ *
+ * For each field, the first defined value wins (left to right):
+ * 1. CLI flag (explicit user input)
+ * 2. Config file value (from .bmad-workflow.yaml)
+ * 3. Hardcoded default
+ *
+ * @param cliFlags - Flags explicitly passed via CLI (undefined = not passed)
+ * @param configFile - Execution defaults from .bmad-workflow.yaml
+ * @param defaults - Hardcoded fallback values
+ * @returns Fully resolved execution config
+ */
+export function mergeExecutionConfig(cliFlags, configFile, defaults = EXECUTION_DEFAULTS) {
+    return {
+        epicInterval: cliFlags.epicInterval ?? defaults.epicInterval,
+        maxRetries: cliFlags.maxRetries ?? defaults.maxRetries,
+        model: cliFlags.model ?? configFile.model ?? defaults.model,
+        parallel: cliFlags.parallel ?? configFile.parallel ?? defaults.parallel,
+        pipeline: cliFlags.pipeline ?? configFile.pipeline ?? defaults.pipeline,
+        prdInterval: cliFlags.prdInterval ?? defaults.prdInterval,
+        provider: cliFlags.provider ?? configFile.provider ?? defaults.provider,
+        qa: cliFlags.qa ?? configFile.qa_enabled ?? defaults.qa,
+        retryBackoffMs: cliFlags.retryBackoffMs ?? defaults.retryBackoffMs,
+        storyInterval: cliFlags.storyInterval ?? defaults.storyInterval,
+        timeout: cliFlags.timeout ?? configFile.timeout ?? defaults.timeout,
+    };
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hyperdrive.bot/bmad-workflow",
   "description": "AI-driven development workflow orchestration CLI for BMAD projects",
-  "version": "1.0.21",
+  "version": "1.0.23",
   "author": {
     "name": "DevSquad",
     "email": "marcelo@devsquad.email",
@@ -15,6 +15,7 @@
   },
   "dependencies": {
     "@hyperdrive.bot/plugin-telemetry": "file:../telemetry-plugin",
+    "@inquirer/prompts": "^8.3.2",
     "@oclif/core": "^4",
     "@oclif/plugin-help": "^6",
     "bcrypt": "^6.0.0",
@@ -71,7 +72,8 @@
     "dist/",
     "oclif.manifest.json",
     "README.md",
-    "LICENSE"
+    "LICENSE",
+    "assets/"
   ],
   "homepage": "https://gitlab.com/dev_squad/repo/cli/bmad-orchestrator#readme",
   "keywords": [